agent-relay-orchestrator 0.21.0 → 0.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-orchestrator",
-  "version": "0.21.0",
+  "version": "0.23.0",
   "description": "Agent Relay orchestrator — manages agent lifecycle across hosts",
   "type": "module",
   "bin": {
@@ -16,7 +16,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "agent-relay-sdk": "0.2.12"
+    "agent-relay-sdk": "0.2.13"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/workspace-probe.ts

@@ -789,7 +789,9 @@ export function previewWorkspaceMerge(input: { worktreePath?: string; baseRef?:
       : gitState.landed
         ? "already merged into base (squash/cherry-pick)"
         : "no commits to merge";
-    return { ...base, reason };
+    // Nothing to land and the worktree is clean — a no-op the land path resolves to
+    // a terminal state rather than parking forever in the steward queue (#230).
+    return { ...base, reason, noop: true };
   }
   if (gitState.baseRef && input.worktreePath) {
     const conflict = predictConflict(resolve(input.worktreePath), gitState.baseRef);
@@ -820,6 +822,10 @@ export function mergeWorkspace(input: WorkspaceMergeInput): WorkspaceMergeResult
 
   if (preview.missing) return head({ status: "cleaned", error: preview.reason });
   if (preview.error) return head({ status: "review_requested", error: preview.error });
+  // Nothing to land (ahead=0, clean): the branch tree is already in base. Resolve it
+  // to a terminal state so it leaves the steward queue instead of looping forever in
+  // review_requested (#230). Reclaim the spent worktree/branch when the owner is gone.
+  if (preview.noop) return resolveNoopMerge(input, worktreePath, repoRoot, branch, head);
   if (preview.reason) return head({ status: "review_requested", error: preview.reason });
   if (preview.conflict) return head({ conflict: true, status: "conflict", error: "merge would conflict with base" });
 
@@ -827,6 +833,31 @@ export function mergeWorkspace(input: WorkspaceMergeInput): WorkspaceMergeResult
   return mergeRebaseFf(input, worktreePath, repoRoot, branch, preview, head);
 }
 
+/**
+ * Resolve a no-op land (#230): ahead=0 with a clean worktree, so the branch's tree
+ * is already contained in base (never diverged, or already landed via
+ * squash/cherry-pick/PR). There's nothing to merge — mark the workspace terminal
+ * (`merged`, `noop: true`) so it leaves the steward queue. When the owner is gone
+ * (`deleteBranch !== false`) the spent worktree/branch are reclaimed too, mirroring a
+ * terminal land; a live owner keeps its worktree (cleanup reclaims it later). Safe:
+ * there is no unmerged work to lose.
+ */
+function resolveNoopMerge(
+  input: WorkspaceMergeInput,
+  worktreePath: string,
+  repoRoot: string,
+  branch: string | undefined,
+  head: (field: Partial<WorkspaceMergeResult>) => WorkspaceMergeResult,
+): WorkspaceMergeResult {
+  if (input.deleteBranch !== false && branch) {
+    const removed = git(["worktree", "remove", "--force", worktreePath], repoRoot);
+    const worktreeRemoved = removed.ok;
+    const branchDeleted = worktreeRemoved ? git(["branch", "-D", branch], repoRoot).ok : false;
+    return head({ status: "merged", noop: true, worktreeRemoved, branchDeleted, error: undefined });
+  }
+  return head({ status: "merged", noop: true, error: undefined });
+}
+
 function mergePr(
   input: WorkspaceMergeInput,
   worktreePath: string,