agent-relay 3.1.6 → 3.1.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. package/bin/agent-relay-broker-darwin-arm64 +0 -0
  2. package/bin/agent-relay-broker-darwin-x64 +0 -0
  3. package/bin/agent-relay-broker-linux-arm64 +0 -0
  4. package/bin/agent-relay-broker-linux-x64 +0 -0
  5. package/dist/index.cjs +130 -107
  6. package/package.json +8 -8
  7. package/packages/acp-bridge/package.json +2 -2
  8. package/packages/config/package.json +1 -1
  9. package/packages/hooks/package.json +4 -4
  10. package/packages/memory/package.json +2 -2
  11. package/packages/openclaw/dist/gateway.d.ts +2 -0
  12. package/packages/openclaw/dist/gateway.d.ts.map +1 -1
  13. package/packages/openclaw/dist/gateway.js +27 -7
  14. package/packages/openclaw/dist/gateway.js.map +1 -1
  15. package/packages/openclaw/package.json +2 -2
  16. package/packages/openclaw/skill/SKILL.md +101 -31
  17. package/packages/openclaw/src/gateway.ts +29 -9
  18. package/packages/policy/package.json +2 -2
  19. package/packages/sdk/dist/client.js +6 -8
  20. package/packages/sdk/dist/client.js.map +1 -1
  21. package/packages/sdk/dist/workflows/builder.d.ts +3 -1
  22. package/packages/sdk/dist/workflows/builder.d.ts.map +1 -1
  23. package/packages/sdk/dist/workflows/builder.js +1 -0
  24. package/packages/sdk/dist/workflows/builder.js.map +1 -1
  25. package/packages/sdk/dist/workflows/runner.d.ts +15 -1
  26. package/packages/sdk/dist/workflows/runner.d.ts.map +1 -1
  27. package/packages/sdk/dist/workflows/runner.js +146 -117
  28. package/packages/sdk/dist/workflows/runner.js.map +1 -1
  29. package/packages/sdk/package.json +2 -2
  30. package/packages/sdk/scripts/bundle-agent-relay.mjs +11 -1
  31. package/packages/sdk/src/client.ts +6 -8
  32. package/packages/sdk/src/workflows/builder.ts +4 -1
  33. package/packages/sdk/src/workflows/runner.ts +173 -119
  34. package/packages/sdk-py/pyproject.toml +1 -1
  35. package/packages/telemetry/package.json +1 -1
  36. package/packages/trajectory/package.json +2 -2
  37. package/packages/user-directory/package.json +2 -2
  38. package/packages/utils/package.json +2 -2
Binary file
Binary file
Binary file
Binary file
package/dist/index.cjs CHANGED
@@ -9455,7 +9455,8 @@ function isExplicitPath(binaryPath) {
9455
9455
  function detectPlatformSuffix() {
9456
9456
  const platformMap = {
9457
9457
  darwin: { arm64: "darwin-arm64", x64: "darwin-x64" },
9458
- linux: { arm64: "linux-arm64", x64: "linux-x64" }
9458
+ linux: { arm64: "linux-arm64", x64: "linux-x64" },
9459
+ win32: { x64: "win32-x64" }
9459
9460
  };
9460
9461
  return platformMap[process.platform]?.[process.arch] ?? null;
9461
9462
  }
@@ -9527,15 +9528,12 @@ function resolveDefaultBinaryPath() {
9527
9528
  const binDir = import_node_path.default.resolve(moduleDir, "..", "bin");
9528
9529
  const suffix = detectPlatformSuffix();
9529
9530
  if (suffix) {
9530
- const platformBinary = import_node_path.default.join(binDir, `agent-relay-broker-${suffix}`);
9531
+ const ext = process.platform === "win32" ? ".exe" : "";
9532
+ const platformBinary = import_node_path.default.join(binDir, `agent-relay-broker-${suffix}${ext}`);
9531
9533
  if (import_node_fs.default.existsSync(platformBinary)) {
9532
9534
  return platformBinary;
9533
9535
  }
9534
9536
  }
9535
- const bundled = import_node_path.default.join(binDir, brokerExe);
9536
- if (import_node_fs.default.existsSync(bundled)) {
9537
- return bundled;
9538
- }
9539
9537
  const homeDir = process.env.HOME || process.env.USERPROFILE || "";
9540
9538
  const standaloneBroker = import_node_path.default.join(homeDir, ".agent-relay", "bin", brokerExe);
9541
9539
  if (import_node_fs.default.existsSync(standaloneBroker)) {
@@ -47575,6 +47573,7 @@ var WorkflowRunner = class _WorkflowRunner {
47575
47573
  relayOptions;
47576
47574
  cwd;
47577
47575
  summaryDir;
47576
+ executor;
47578
47577
  /** @internal exposed for CLI signal-handler shutdown only */
47579
47578
  relay;
47580
47579
  relaycast;
@@ -47618,6 +47617,7 @@ var WorkflowRunner = class _WorkflowRunner {
47618
47617
  this.cwd = options.cwd ?? process.cwd();
47619
47618
  this.summaryDir = options.summaryDir ?? import_node_path8.default.join(this.cwd, ".relay", "summaries");
47620
47619
  this.workersPath = import_node_path8.default.join(this.cwd, ".agent-relay", "team", "workers.json");
47620
+ this.executor = options.executor;
47621
47621
  }
47622
47622
  // ── Progress logging ────────────────────────────────────────────────────
47623
47623
  /** Log a progress message with elapsed time since run start. */
@@ -48351,109 +48351,111 @@ ${err.suggestion}`);
48351
48351
  config3.swarm.channel = channel;
48352
48352
  await this.db.updateRun(runId, { config: config3 });
48353
48353
  }
48354
- this.log("Resolving Relaycast API key...");
48355
- await this.ensureRelaycastApiKey(channel);
48356
- this.log("API key resolved");
48357
- if (this.relayApiKeyAutoCreated && this.relayApiKey) {
48358
- this.log(`Workspace created \u2014 follow this run in Relaycast:`);
48359
- this.log(` Observer: https://observer.relaycast.dev/?key=${this.relayApiKey}`);
48360
- this.log(` Channel: ${channel}`);
48361
- }
48362
- this.log("Starting broker...");
48363
- const brokerBaseName = import_node_path8.default.basename(this.cwd) || "workflow";
48364
- const brokerName = `${brokerBaseName}-${runId.slice(0, 8)}`;
48365
- this.relay = new AgentRelay({
48366
- ...this.relayOptions,
48367
- brokerName,
48368
- channels: [channel],
48369
- env: this.getRelayEnv(),
48370
- // Workflows spawn agents across multiple waves; each spawn requires a PTY +
48371
- // Relaycast registration. 60s is too tight when the broker is saturated with
48372
- // long-running PTY processes from earlier steps. 120s gives room to breathe.
48373
- requestTimeoutMs: this.relayOptions.requestTimeoutMs ?? 12e4
48374
- });
48375
- this.relay.onWorkerOutput = ({ name, chunk }) => {
48376
- const listener = this.ptyListeners.get(name);
48377
- if (listener)
48378
- listener(chunk);
48379
- const stripped = _WorkflowRunner.stripAnsi(chunk);
48380
- const shortName = name.replace(/-[a-f0-9]{6,}$/, "");
48381
- let activity;
48382
- if (/Read\(/.test(stripped)) {
48383
- const m = stripped.match(/Read\(\s*~?([^\s)"']{8,})/);
48384
- if (m) {
48385
- const base = import_node_path8.default.basename(m[1]);
48386
- activity = base.length >= 3 ? `Reading ${base}` : "Reading file...";
48387
- } else {
48388
- activity = "Reading file...";
48354
+ if (!this.executor) {
48355
+ this.log("Resolving Relaycast API key...");
48356
+ await this.ensureRelaycastApiKey(channel);
48357
+ this.log("API key resolved");
48358
+ if (this.relayApiKeyAutoCreated && this.relayApiKey) {
48359
+ this.log(`Workspace created \u2014 follow this run in Relaycast:`);
48360
+ this.log(` Observer: https://observer.relaycast.dev/?key=${this.relayApiKey}`);
48361
+ this.log(` Channel: ${channel}`);
48362
+ }
48363
+ this.log("Starting broker...");
48364
+ const brokerBaseName = import_node_path8.default.basename(this.cwd) || "workflow";
48365
+ const brokerName = `${brokerBaseName}-${runId.slice(0, 8)}`;
48366
+ this.relay = new AgentRelay({
48367
+ ...this.relayOptions,
48368
+ brokerName,
48369
+ channels: [channel],
48370
+ env: this.getRelayEnv(),
48371
+ // Workflows spawn agents across multiple waves; each spawn requires a PTY +
48372
+ // Relaycast registration. 60s is too tight when the broker is saturated with
48373
+ // long-running PTY processes from earlier steps. 120s gives room to breathe.
48374
+ requestTimeoutMs: this.relayOptions.requestTimeoutMs ?? 12e4
48375
+ });
48376
+ this.relay.onWorkerOutput = ({ name, chunk }) => {
48377
+ const listener = this.ptyListeners.get(name);
48378
+ if (listener)
48379
+ listener(chunk);
48380
+ const stripped = _WorkflowRunner.stripAnsi(chunk);
48381
+ const shortName = name.replace(/-[a-f0-9]{6,}$/, "");
48382
+ let activity;
48383
+ if (/Read\(/.test(stripped)) {
48384
+ const m = stripped.match(/Read\(\s*~?([^\s)"']{8,})/);
48385
+ if (m) {
48386
+ const base = import_node_path8.default.basename(m[1]);
48387
+ activity = base.length >= 3 ? `Reading ${base}` : "Reading file...";
48388
+ } else {
48389
+ activity = "Reading file...";
48390
+ }
48391
+ } else if (/Edit\(/.test(stripped)) {
48392
+ const m = stripped.match(/Edit\(\s*~?([^\s)"']{8,})/);
48393
+ if (m) {
48394
+ const base = import_node_path8.default.basename(m[1]);
48395
+ activity = base.length >= 3 ? `Editing ${base}` : "Editing file...";
48396
+ } else {
48397
+ activity = "Editing file...";
48398
+ }
48399
+ } else if (/Bash\(/.test(stripped)) {
48400
+ const m = stripped.match(/Bash\(\s*(.{1,40})/);
48401
+ activity = m ? `Running: ${m[1].trim()}...` : "Running command...";
48402
+ } else if (/Explore\(/.test(stripped)) {
48403
+ const m = stripped.match(/Explore\(\s*(.{1,50})/);
48404
+ activity = m ? `Exploring: ${m[1].replace(/\).*/, "").trim()}` : "Exploring codebase...";
48405
+ } else if (/Task\(/.test(stripped)) {
48406
+ activity = "Running sub-agent...";
48407
+ } else if (/Sublimating|Thinking|Coalescing|Cultivating/.test(stripped)) {
48408
+ const m = stripped.match(/(\d+)s/);
48409
+ activity = m ? `Thinking... (${m[1]}s)` : "Thinking...";
48389
48410
  }
48390
- } else if (/Edit\(/.test(stripped)) {
48391
- const m = stripped.match(/Edit\(\s*~?([^\s)"']{8,})/);
48392
- if (m) {
48393
- const base = import_node_path8.default.basename(m[1]);
48394
- activity = base.length >= 3 ? `Editing ${base}` : "Editing file...";
48395
- } else {
48396
- activity = "Editing file...";
48411
+ if (activity && this.lastActivity.get(name) !== activity) {
48412
+ this.lastActivity.set(name, activity);
48413
+ this.log(`[${shortName}] ${activity}`);
48397
48414
  }
48398
- } else if (/Bash\(/.test(stripped)) {
48399
- const m = stripped.match(/Bash\(\s*(.{1,40})/);
48400
- activity = m ? `Running: ${m[1].trim()}...` : "Running command...";
48401
- } else if (/Explore\(/.test(stripped)) {
48402
- const m = stripped.match(/Explore\(\s*(.{1,50})/);
48403
- activity = m ? `Exploring: ${m[1].replace(/\).*/, "").trim()}` : "Exploring codebase...";
48404
- } else if (/Task\(/.test(stripped)) {
48405
- activity = "Running sub-agent...";
48406
- } else if (/Sublimating|Thinking|Coalescing|Cultivating/.test(stripped)) {
48407
- const m = stripped.match(/(\d+)s/);
48408
- activity = m ? `Thinking... (${m[1]}s)` : "Thinking...";
48409
- }
48410
- if (activity && this.lastActivity.get(name) !== activity) {
48411
- this.lastActivity.set(name, activity);
48412
- this.log(`[${shortName}] ${activity}`);
48413
- }
48414
- };
48415
- this.relay.onMessageReceived = (msg) => {
48416
- const body = msg.text.length > 120 ? msg.text.slice(0, 117) + "..." : msg.text;
48417
- const fromShort = msg.from.replace(/-[a-f0-9]{6,}$/, "");
48418
- const toShort = msg.to.replace(/-[a-f0-9]{6,}$/, "");
48419
- this.log(`[msg] ${fromShort} \u2192 ${toShort}: ${body}`);
48420
- };
48421
- this.relay.onAgentSpawned = (agent) => {
48422
- if (!this.activeAgentHandles.has(agent.name)) {
48423
- this.log(`[spawned] ${agent.name} (${agent.runtime})`);
48424
- }
48425
- };
48426
- this.relay.onAgentExited = (agent) => {
48427
- this.lastActivity.delete(agent.name);
48428
- this.lastIdleLog.delete(agent.name);
48429
- if (!this.activeAgentHandles.has(agent.name)) {
48430
- this.log(`[exited] ${agent.name} (code: ${agent.exitCode ?? "?"})`);
48415
+ };
48416
+ this.relay.onMessageReceived = (msg) => {
48417
+ const body = msg.text.length > 120 ? msg.text.slice(0, 117) + "..." : msg.text;
48418
+ const fromShort = msg.from.replace(/-[a-f0-9]{6,}$/, "");
48419
+ const toShort = msg.to.replace(/-[a-f0-9]{6,}$/, "");
48420
+ this.log(`[msg] ${fromShort} \u2192 ${toShort}: ${body}`);
48421
+ };
48422
+ this.relay.onAgentSpawned = (agent) => {
48423
+ if (!this.activeAgentHandles.has(agent.name)) {
48424
+ this.log(`[spawned] ${agent.name} (${agent.runtime})`);
48425
+ }
48426
+ };
48427
+ this.relay.onAgentExited = (agent) => {
48428
+ this.lastActivity.delete(agent.name);
48429
+ this.lastIdleLog.delete(agent.name);
48430
+ if (!this.activeAgentHandles.has(agent.name)) {
48431
+ this.log(`[exited] ${agent.name} (code: ${agent.exitCode ?? "?"})`);
48432
+ }
48433
+ };
48434
+ this.relay.onAgentIdle = ({ name, idleSecs }) => {
48435
+ const bucket = Math.floor(idleSecs / 30) * 30;
48436
+ if (bucket >= 30 && this.lastIdleLog.get(name) !== bucket) {
48437
+ this.lastIdleLog.set(name, bucket);
48438
+ const shortName = name.replace(/-[a-f0-9]{6,}$/, "");
48439
+ this.log(`[idle] ${shortName} silent for ${bucket}s`);
48440
+ }
48441
+ };
48442
+ this.relaycast = void 0;
48443
+ this.relaycastAgent = void 0;
48444
+ this.unsubBrokerStderr = this.relay.onBrokerStderr((line) => {
48445
+ console.log(`[broker] ${line}`);
48446
+ });
48447
+ this.log(`Creating channel: ${channel}...`);
48448
+ if (isResume) {
48449
+ await this.createAndJoinRelaycastChannel(channel);
48450
+ } else {
48451
+ await this.createAndJoinRelaycastChannel(channel, workflow2.description);
48431
48452
  }
48432
- };
48433
- this.relay.onAgentIdle = ({ name, idleSecs }) => {
48434
- const bucket = Math.floor(idleSecs / 30) * 30;
48435
- if (bucket >= 30 && this.lastIdleLog.get(name) !== bucket) {
48436
- this.lastIdleLog.set(name, bucket);
48437
- const shortName = name.replace(/-[a-f0-9]{6,}$/, "");
48438
- this.log(`[idle] ${shortName} silent for ${bucket}s`);
48453
+ this.log("Channel ready");
48454
+ if (isResume) {
48455
+ this.postToChannel(`Workflow **${workflow2.name}** resumed \u2014 ${pendingCount} pending steps`);
48456
+ } else {
48457
+ this.postToChannel(`Workflow **${workflow2.name}** started \u2014 ${workflow2.steps.length} steps, pattern: ${config3.swarm.pattern}`);
48439
48458
  }
48440
- };
48441
- this.relaycast = void 0;
48442
- this.relaycastAgent = void 0;
48443
- this.unsubBrokerStderr = this.relay.onBrokerStderr((line) => {
48444
- console.log(`[broker] ${line}`);
48445
- });
48446
- this.log(`Creating channel: ${channel}...`);
48447
- if (isResume) {
48448
- await this.createAndJoinRelaycastChannel(channel);
48449
- } else {
48450
- await this.createAndJoinRelaycastChannel(channel, workflow2.description);
48451
- }
48452
- this.log("Channel ready");
48453
- if (isResume) {
48454
- this.postToChannel(`Workflow **${workflow2.name}** resumed \u2014 ${pendingCount} pending steps`);
48455
- } else {
48456
- this.postToChannel(`Workflow **${workflow2.name}** started \u2014 ${workflow2.steps.length} steps, pattern: ${config3.swarm.pattern}`);
48457
48459
  }
48458
48460
  const agentMap = /* @__PURE__ */ new Map();
48459
48461
  for (const agent of config3.agents) {
@@ -48768,6 +48770,26 @@ ${trimmedOutput.slice(0, 200)}`);
48768
48770
  return value !== void 0 ? String(value) : _match;
48769
48771
  });
48770
48772
  try {
48773
+ if (this.executor?.executeDeterministicStep) {
48774
+ const result = await this.executor.executeDeterministicStep(step, resolvedCommand, this.cwd);
48775
+ const failOnError = step.failOnError !== false;
48776
+ if (failOnError && result.exitCode !== 0) {
48777
+ throw new Error(`Command failed with exit code ${result.exitCode}: ${result.output.slice(0, 500)}`);
48778
+ }
48779
+ const output2 = step.captureOutput !== false ? result.output : `Command completed (exit code ${result.exitCode})`;
48780
+ state.row.status = "completed";
48781
+ state.row.output = output2;
48782
+ state.row.completedAt = (/* @__PURE__ */ new Date()).toISOString();
48783
+ await this.db.updateStep(state.row.id, {
48784
+ status: "completed",
48785
+ output: output2,
48786
+ completedAt: state.row.completedAt,
48787
+ updatedAt: (/* @__PURE__ */ new Date()).toISOString()
48788
+ });
48789
+ await this.persistStepOutput(runId, step.name, output2);
48790
+ this.emit({ type: "step:completed", runId, stepName: step.name, output: output2 });
48791
+ return;
48792
+ }
48771
48793
  const output = await new Promise((resolve3, reject) => {
48772
48794
  const child = (0, import_node_child_process3.spawn)("sh", ["-c", resolvedCommand], {
48773
48795
  stdio: "pipe",
@@ -49041,7 +49063,7 @@ ${trimmedOutput.slice(0, 200)}`);
49041
49063
  }
49042
49064
  this.log(`[${step.name}] Spawning agent "${agentDef.name}" (cli: ${agentDef.cli})`);
49043
49065
  const resolvedStep = { ...step, task: resolvedTask };
49044
- const output = await this.spawnAndWait(agentDef, resolvedStep, timeoutMs);
49066
+ const output = this.executor ? await this.executor.executeAgentStep(resolvedStep, agentDef, resolvedTask, timeoutMs) : await this.spawnAndWait(agentDef, resolvedStep, timeoutMs);
49045
49067
  this.log(`[${step.name}] Agent "${agentDef.name}" exited`);
49046
49068
  if (step.verification) {
49047
49069
  this.runVerification(step.verification, output, step.name, resolvedTask);
@@ -50334,7 +50356,8 @@ var WorkflowBuilder = class {
50334
50356
  const config3 = this.toConfig();
50335
50357
  const runner = new WorkflowRunner({
50336
50358
  cwd: options.cwd,
50337
- relay: options.relay
50359
+ relay: options.relay,
50360
+ executor: options.executor
50338
50361
  });
50339
50362
  const isDryRun = options.dryRun ?? !!process.env.DRY_RUN;
50340
50363
  if (isDryRun) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "agent-relay",
3
- "version": "3.1.6",
3
+ "version": "3.1.7",
4
4
  "description": "Real-time agent-to-agent communication system",
5
5
  "type": "module",
6
6
  "main": "dist/index.cjs",
@@ -174,13 +174,13 @@
174
174
  },
175
175
  "homepage": "https://github.com/AgentWorkforce/relay#readme",
176
176
  "dependencies": {
177
- "@agent-relay/config": "3.1.6",
178
- "@agent-relay/hooks": "3.1.6",
179
- "@agent-relay/sdk": "3.1.6",
180
- "@agent-relay/telemetry": "3.1.6",
181
- "@agent-relay/trajectory": "3.1.6",
182
- "@agent-relay/user-directory": "3.1.6",
183
- "@agent-relay/utils": "3.1.6",
177
+ "@agent-relay/config": "3.1.7",
178
+ "@agent-relay/hooks": "3.1.7",
179
+ "@agent-relay/sdk": "3.1.7",
180
+ "@agent-relay/telemetry": "3.1.7",
181
+ "@agent-relay/trajectory": "3.1.7",
182
+ "@agent-relay/user-directory": "3.1.7",
183
+ "@agent-relay/utils": "3.1.7",
184
184
  "@modelcontextprotocol/sdk": "^1.0.0",
185
185
  "@relaycast/sdk": "^0.4.0",
186
186
  "chokidar": "^5.0.0",
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@agent-relay/acp-bridge",
3
- "version": "3.1.6",
3
+ "version": "3.1.7",
4
4
  "description": "ACP (Agent Client Protocol) bridge for Agent Relay - expose relay agents to ACP-compatible editors like Zed",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -46,7 +46,7 @@
46
46
  "access": "public"
47
47
  },
48
48
  "dependencies": {
49
- "@agent-relay/sdk": "3.1.6",
49
+ "@agent-relay/sdk": "3.1.7",
50
50
  "@agentclientprotocol/sdk": "^0.12.0"
51
51
  },
52
52
  "devDependencies": {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@agent-relay/config",
3
- "version": "3.1.6",
3
+ "version": "3.1.7",
4
4
  "description": "Shared configuration schemas and loaders for Agent Relay",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@agent-relay/hooks",
3
- "version": "3.1.6",
3
+ "version": "3.1.7",
4
4
  "description": "Hook emitter, registry, and trajectory hooks for Agent Relay",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -37,9 +37,9 @@
37
37
  "test:watch": "vitest"
38
38
  },
39
39
  "dependencies": {
40
- "@agent-relay/config": "3.1.6",
41
- "@agent-relay/trajectory": "3.1.6",
42
- "@agent-relay/sdk": "3.1.6"
40
+ "@agent-relay/config": "3.1.7",
41
+ "@agent-relay/trajectory": "3.1.7",
42
+ "@agent-relay/sdk": "3.1.7"
43
43
  },
44
44
  "devDependencies": {
45
45
  "@types/node": "^22.19.3",
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@agent-relay/memory",
3
- "version": "3.1.6",
3
+ "version": "3.1.7",
4
4
  "description": "Semantic memory storage and retrieval system for agent-relay with multiple backend support",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -22,7 +22,7 @@
22
22
  "test:watch": "vitest"
23
23
  },
24
24
  "dependencies": {
25
- "@agent-relay/hooks": "3.1.6"
25
+ "@agent-relay/hooks": "3.1.7"
26
26
  },
27
27
  "devDependencies": {
28
28
  "@types/node": "^22.19.3",
@@ -49,6 +49,8 @@ export declare class OpenClawGatewayClient {
49
49
  private static readonly MAX_CONSECUTIVE_FAILURES;
50
50
  private static readonly BASE_RECONNECT_MS;
51
51
  private static readonly MAX_RECONNECT_MS;
52
+ /** Slow retry interval after pairing rejection or max failures (60s). */
53
+ private static readonly PAIRING_RETRY_MS;
52
54
  constructor(token: string, port: number, device?: DeviceIdentity);
53
55
  /**
54
56
  * Create a client with a persisted device identity (loaded from disk or
@@ -1 +1 @@
1
- {"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../src/gateway.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../src/gateway.ts"],"names":[],"mappings":"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"}
@@ -120,6 +120,8 @@ export class OpenClawGatewayClient {
120
120
  static MAX_CONSECUTIVE_FAILURES = 5;
121
121
  static BASE_RECONNECT_MS = 3_000;
122
122
  static MAX_RECONNECT_MS = 30_000;
123
+ /** Slow retry interval after pairing rejection or max failures (60s). */
124
+ static PAIRING_RETRY_MS = 60_000;
123
125
  constructor(token, port, device) {
124
126
  this.token = token;
125
127
  this.port = port;
@@ -194,7 +196,8 @@ export class OpenClawGatewayClient {
194
196
  // Detect pairing rejection: code 1008 (Policy Violation) with pairing reason
195
197
  if (code === 1008 && /pairing|not.paired/i.test(reasonStr)) {
196
198
  console.error('[openclaw-ws] Connection closed due to pairing policy. Device is not paired.');
197
- console.error('[openclaw-ws] Ensure OPENCLAW_GATEWAY_TOKEN matches ~/.openclaw/openclaw.json gateway.auth.token');
199
+ console.error(`[openclaw-ws] Device ID: ${this.device.deviceId.slice(0, 16)}...`);
200
+ console.error('[openclaw-ws] Run: openclaw devices approve <requestId> (check gateway logs for requestId)');
198
201
  this.pairingRejected = true;
199
202
  }
200
203
  // Reject all pending RPCs
@@ -211,7 +214,7 @@ export class OpenClawGatewayClient {
211
214
  this.connectReject = null;
212
215
  this.connectResolve = null;
213
216
  }
214
- if (!this.stopped && !this.pairingRejected) {
217
+ if (!this.stopped) {
215
218
  this.scheduleReconnect();
216
219
  }
217
220
  });
@@ -308,7 +311,13 @@ export class OpenClawGatewayClient {
308
311
  const errStr = msg.error ? JSON.stringify(msg.error) : 'Authentication rejected';
309
312
  const isPairing = /pairing.required|not.paired/i.test(errStr);
310
313
  if (isPairing) {
314
+ const errObj = msg.error;
315
+ const requestId = errObj?.requestId ?? errObj?.request_id ?? '';
311
316
  console.error('[openclaw-ws] Pairing rejected — device is not paired with the OpenClaw gateway.');
317
+ if (requestId) {
318
+ console.error(`[openclaw-ws] Approve this device: openclaw devices approve ${requestId}`);
319
+ }
320
+ console.error(`[openclaw-ws] Device ID: ${this.device.deviceId.slice(0, 16)}...`);
312
321
  console.error('[openclaw-ws] Ensure OPENCLAW_GATEWAY_TOKEN matches ~/.openclaw/openclaw.json gateway.auth.token');
313
322
  this.pairingRejected = true;
314
323
  }
@@ -383,14 +392,25 @@ export class OpenClawGatewayClient {
383
392
  });
384
393
  }
385
394
  scheduleReconnect() {
386
- if (this.stopped || this.pairingRejected || this.reconnectTimer)
395
+ if (this.stopped || this.reconnectTimer)
387
396
  return;
388
- this.consecutiveFailures++;
389
- if (this.consecutiveFailures >= OpenClawGatewayClient.MAX_CONSECUTIVE_FAILURES) {
390
- console.warn(`[openclaw-ws] ${this.consecutiveFailures} consecutive connection failures — stopping reconnect.`);
391
- console.warn('[openclaw-ws] Check that the OpenClaw gateway is running and OPENCLAW_GATEWAY_TOKEN is correct.');
397
+ // After pairing rejection or max failures, switch to slow periodic retry
398
+ // so the gateway can self-heal once pairing is approved externally.
399
+ if (this.pairingRejected || this.consecutiveFailures >= OpenClawGatewayClient.MAX_CONSECUTIVE_FAILURES) {
400
+ if (this.consecutiveFailures === OpenClawGatewayClient.MAX_CONSECUTIVE_FAILURES) {
401
+ console.warn(`[openclaw-ws] ${this.consecutiveFailures} consecutive failures — switching to slow retry (every 60s).`);
402
+ console.warn('[openclaw-ws] Check that the OpenClaw gateway is running and OPENCLAW_GATEWAY_TOKEN is correct.');
403
+ }
404
+ this.consecutiveFailures++;
405
+ console.log(`[openclaw-ws] Slow retry in ${OpenClawGatewayClient.PAIRING_RETRY_MS / 1000}s...`);
406
+ this.reconnectTimer = setTimeout(() => {
407
+ this.reconnectTimer = null;
408
+ this.pairingRejected = false; // Clear flag so connect attempt proceeds
409
+ this.doConnect();
410
+ }, OpenClawGatewayClient.PAIRING_RETRY_MS);
392
411
  return;
393
412
  }
413
+ this.consecutiveFailures++;
394
414
  const delay = Math.min(OpenClawGatewayClient.BASE_RECONNECT_MS * Math.pow(2, this.consecutiveFailures - 1), OpenClawGatewayClient.MAX_RECONNECT_MS);
395
415
  console.log(`[openclaw-ws] Reconnecting in ${delay / 1000}s (attempt ${this.consecutiveFailures})...`);
396
416
  this.reconnectTimer = setTimeout(() => {