agent-relay-server 0.118.1 → 0.118.3

package/docs/openapi.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "Agent Relay API",
-    "version": "0.118.1",
+    "version": "0.118.3",
     "description": "Real-time message bus for inter-agent communication. Agent-first: this spec is designed for machine consumption — agents can self-discover the full API surface via GET /api/spec.",
     "license": {
       "name": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-server",
-  "version": "0.118.1",
+  "version": "0.118.3",
   "description": "Lightweight HTTP message relay for inter-agent communication across machines",
   "module": "src/index.ts",
   "type": "module",
@@ -36,7 +36,7 @@
     "CONTRIBUTING.md"
   ],
   "dependencies": {
-    "agent-relay-channels-host": "0.118.1",
+    "agent-relay-channels-host": "0.118.3",
     "agent-relay-providers": "0.104.1",
     "agent-relay-sdk": "0.2.101",
     "ajv": "^8.20.0"

package/runner/plugins/claude/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "agent-relay-runner",
   "description": "Thin Agent Relay runner bridge for Claude Code",
-  "version": "0.118.1",
+  "version": "0.118.3",
   "agentRelayContracts": {
     "providerPluginProtocol": 1
   }

package/src/workspace-auto-merge.ts

@@ -21,6 +21,7 @@
 import {
   createActivityEvent,
   getActiveMergePause,
+  getAgent,
   listOrchestrators,
   listWorkspaces,
   patchWorkspaceMetadata,
@@ -252,13 +253,43 @@ interface LandSweepResult {
   heldByClaim: string[];
   heldByPause: string[];
   heldAwaitingApproval: string[];
+  previewUnavailable: string[];
   backedOff: string[];
   leftForSteward: string[];
   wokeStewards: string[];
 }
 
 function emptyLandSweep(): LandSweepResult {
-  return { scanned: 0, merged: [], heldByLease: [], heldByClaim: [], heldByPause: [], heldAwaitingApproval: [], backedOff: [], leftForSteward: [], wokeStewards: [] };
+  return { scanned: 0, merged: [], heldByLease: [], heldByClaim: [], heldByPause: [], heldAwaitingApproval: [], previewUnavailable: [], backedOff: [], leftForSteward: [], wokeStewards: [] };
+}
+
+function workspaceOrchestrators(
+  ws: WorkspaceRecord,
+  orchestrators: ReturnType<typeof listOrchestrators>,
+): ReturnType<typeof listOrchestrators> {
+  const candidates = orchestrators.filter((candidate) => workspacePathWithinBase(ws.sourceCwd, candidate.baseDir));
+  const ownerMachine = ws.ownerAgentId ? getAgent(ws.ownerAgentId)?.machine : undefined;
+  if (!ownerMachine) return candidates;
+  return [...candidates].sort((a, b) => {
+    const aOwner = a.hostname === ownerMachine || a.id === ownerMachine ? 0 : 1;
+    const bOwner = b.hostname === ownerMachine || b.id === ownerMachine ? 0 : 1;
+    return aOwner - bOwner;
+  });
+}
+
+async function fetchFirstUsableMergePreview(
+  ws: WorkspaceRecord,
+  orchestrators: ReturnType<typeof listOrchestrators>,
+): Promise<WorkspaceMergePreview | { available: false } | null> {
+  for (const orch of workspaceOrchestrators(ws, orchestrators)) {
+    if (!orch.apiUrl) continue;
+    const preview = await fetchHostMergePreview(orch.apiUrl, ws);
+    if (!preview || (preview as { available?: false }).available === false) continue;
+    const p = preview as WorkspaceMergePreview;
+    if (p.error || p.missing) continue;
+    return p;
+  }
+  return null;
 }
 
 // Deterministic auto-land (Layer 0, #167/#207/#242): land conflict-free ready work
@@ -269,7 +300,7 @@ async function landCandidates(
   orchestrators: ReturnType<typeof listOrchestrators>,
 ): Promise<LandSweepResult> {
   const stewardEnabled = getStewardConfig().enabled;
-  const merged: string[] = [];
+  const merged: string[] = [], previewUnavailable: string[] = [];
   const heldByLease: string[] = [], heldByClaim: string[] = [], heldByPause: string[] = [], heldAwaitingApproval: string[] = [], backedOff: string[] = [], leftForSteward: string[] = [], wokeStewards: string[] = [];
 
   for (const ws of candidates) {
@@ -286,12 +317,12 @@ async function landCandidates(
       escalateNoProgressMerge(ws);
       continue;
     }
-    const orch = orchestrators.find((candidate) => workspacePathWithinBase(ws.sourceCwd, candidate.baseDir));
-    if (!orch?.apiUrl) continue;
-    const preview = await fetchHostMergePreview(orch.apiUrl, ws);
-    if (!preview || (preview as { available?: false }).available === false) continue;
+    const preview = await fetchFirstUsableMergePreview(ws, orchestrators);
+    if (!preview) {
+      previewUnavailable.push(ws.id);
+      continue;
+    }
     const p = preview as WorkspaceMergePreview;
-    if (p.error || p.missing) continue;
     if (p.reason === DIRTY_WORKTREE_LAND_SKIP_REASON) {
       patchWorkspaceMetadata(ws.id, { lastLandSkipReason: p.reason, lastLandSkipAt: Date.now() });
     } else if (ws.metadata.lastLandSkipReason === DIRTY_WORKTREE_LAND_SKIP_REASON) {
@@ -354,7 +385,7 @@ async function landCandidates(
     });
   }
 
-  return { scanned: candidates.length, merged, heldByLease, heldByClaim, heldByPause, heldAwaitingApproval, backedOff, leftForSteward, wokeStewards };
+  return { scanned: candidates.length, merged, heldByLease, heldByClaim, heldByPause, heldAwaitingApproval, previewUnavailable, backedOff, leftForSteward, wokeStewards };
 }
 
 // Coalesced, fire-and-forget per-repo land trigger (see module header). A run already