github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-08 11:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

iOS/Gateway: harden pairing resolution and settings-driven capability refresh (#22120)

Browse Source 
Merged via /review-pr -> /prepare-pr -> /merge-pr.

Prepared head SHA: 55b8a93a99
Co-authored-by: mbelinky <132747814+mbelinky@users.noreply.github.com>
Co-authored-by: mbelinky <132747814+mbelinky@users.noreply.github.com>
Reviewed-by: @mbelinky
This commit is contained in:
Mariano
2026-02-20 18:57:04 +00:00
committed by GitHub
parent 61f646c41f
commit 5828708343
6 changed files with 82 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/agents/tools/nodes-tool.ts
View File

@@ -48,6 +48,20 @@ const NOTIFY_DELIVERIES = ["system", "overlay", "auto"] as const;
const CAMERA_FACING = ["front", "back", "both"] as const;
const LOCATION_ACCURACY = ["coarse", "balanced", "precise"] as const;
function isPairingRequiredMessage(message: string): boolean {
const lower = message.toLowerCase();
return lower.includes("pairing required") || lower.includes("not_paired");
}
function extractPairingRequestId(message: string): string | null {
const match = message.match(/\(requestId:\s*([^)]+)\)/i);
if (!match) {
return null;
}
const value = (match[1] ?? "").trim();
return value.length > 0 ? value : null;
}
// Flattened schema: runtime validates per-action requirements.
const NodesToolSchema = Type.Object({
action: stringEnum(NODES_TOOL_ACTIONS),
@@ -544,7 +558,14 @@ export function createNodesTool(options?: {
? gatewayOpts.gatewayUrl.trim()
: "default";
const agentLabel = agentId ?? "unknown";
const message = err instanceof Error ? err.message : String(err);
let message = err instanceof Error ? err.message : String(err);
if (action === "invoke" && isPairingRequiredMessage(message)) {
const requestId = extractPairingRequestId(message);
const approveHint = requestId
? `Approve pairing request ${requestId} and retry.`
: "Approve the pending pairing request and retry.";
message = `pairing required before node invoke. ${approveHint}`;
}
throw new Error(
`agent=${agentLabel} node=${nodeLabel} gateway=${gatewayLabel} action=${action}: ${message}`,
{ cause: err },