agent-relay-orchestrator 0.121.5 → 0.122.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-orchestrator",
-  "version": "0.121.5",
+  "version": "0.122.0",
   "description": "Agent Relay orchestrator — manages agent lifecycle across hosts",
   "type": "module",
   "bin": {
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "agent-relay-providers": "0.104.3",
-    "agent-relay-sdk": "0.2.113",
+    "agent-relay-sdk": "0.2.114",
     "callmux": "0.23.0"
   },
   "devDependencies": {

package/src/control.ts

@@ -457,7 +457,21 @@ export function createControlHandler(
         }
         // #638 — settle `failed` (carrying the error) for a no-op merge instead of
         // `succeeded`; see mergeCommandStatus.
-        await relay.updateCommand(command.id, mergeCommandStatus(result), result as unknown as Record<string, unknown>, result.error);
+        // #924 — the merge OUTCOME is now definitive: mergeWorkspace settles its own throws
+        // into `result` at the catch above, so `result` already reflects success or failure.
+        // A transport error while REPORTING it (the SDK http client's 10s abort firing on a
+        // slow settle-response — "The operation was aborted.") must NOT cascade into the outer
+        // catch's blanket `failed` re-stamp: that stamped a genuinely-successful fast-forward
+        // land as failed/aborted WHILE result.merged=true — the self-contradictory record #924.
+        // The relay already committed the report in the common (slow-response) case; in the rare
+        // lost-write case the command strands non-terminal and the relay watchdog / TTL reconcile
+        // (recoverAgedInFlightWorkspaces, the #1025 A7 timed_out→succeeded correction) settles it.
+        // Same belt-and-suspenders as the spawn path (#930, markSpawnCommandFailed).
+        try {
+          await relay.updateCommand(command.id, mergeCommandStatus(result), result as unknown as Record<string, unknown>, result.error);
+        } catch (reportError) {
+          console.error(`[orchestrator] workspace.merge result report failed for ${command.id} (not re-stamping as failed — relay reconcile owns recovery): ${errMessage(reportError)}`);
+        }
       } else if (command.type === "workspace.pr-arm-auto-merge") {
         const rawPrNumber = command.params.prNumber;
         const result = await armWorkspacePrAutoMerge({