agent-relay-server 0.118.3 → 0.118.4

package/docs/openapi.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "Agent Relay API",
-    "version": "0.118.3",
+    "version": "0.118.4",
     "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.3",
+  "version": "0.118.4",
   "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.3",
+    "agent-relay-channels-host": "0.118.4",
     "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.3",
+  "version": "0.118.4",
   "agentRelayContracts": {
     "providerPluginProtocol": 1
   }

package/src/workspace-auto-merge.ts

@@ -21,7 +21,6 @@
 import {
   createActivityEvent,
   getActiveMergePause,
-  getAgent,
   listOrchestrators,
   listWorkspaces,
   patchWorkspaceMetadata,
@@ -36,10 +35,10 @@ import { renderTemplate } from "./prompt-resolver";
 import { isAwaitingReviewerApproval } from "./reviewer-pipeline";
 import { emitWorkspaceTaskSemanticNotifications } from "./services/task-lifecycle";
 import { ensureRepoSteward } from "./steward";
-import { requestWorkspaceMerge } from "./workspace-merge";
+import { requestWorkspaceMerge, workspaceMergeOrchestrators } from "./workspace-merge";
 import { workspaceActiveClaim } from "./workspace-claim";
 import { DIRTY_WORKTREE_LAND_SKIP_REASON, READY_TO_LAND_STATUSES } from "./workspace-phase";
-import { fetchHostMergePreview, workspacePathWithinBase } from "./workspace-probe";
+import { fetchHostMergePreview } from "./workspace-probe";
 import type { WorkspaceAutoMergePolicy, WorkspaceLandingPolicy, WorkspaceMergePreview, WorkspaceMergeStrategy, WorkspaceRecord } from "./types";
 import { STEWARD_WAKE_COOLDOWN_MS, stewardFallbackTarget, workspaceAutoMergeEnabled } from "./config";
 
@@ -263,25 +262,11 @@ function emptyLandSweep(): LandSweepResult {
   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)) {
+  for (const orch of workspaceMergeOrchestrators(ws, orchestrators)) {
     if (!orch.apiUrl) continue;
     const preview = await fetchHostMergePreview(orch.apiUrl, ws);
     if (!preview || (preview as { available?: false }).available === false) continue;

package/src/workspace-merge.ts

@@ -14,6 +14,7 @@ import {
 import { getLandingConfig } from "./config-store";
 import type {
   Command,
+  Orchestrator,
   WorkspaceAutoMergePolicy,
   WorkspaceLandingPolicy,
   WorkspaceMergeStrategy,
@@ -142,6 +143,39 @@ export function withOwnerOnline<T extends { ownerAgentId?: string }>(workspace:
   return { ...workspace, ownerOnline: isOwnerAlive(workspace.ownerAgentId) };
 }
 
+function workspaceOwnerHostKeys(workspace: WorkspaceRecord): Set<string> {
+  const keys = new Set<string>();
+  const owner = workspace.ownerAgentId ? getAgent(workspace.ownerAgentId) : undefined;
+  if (!owner) return keys;
+  if (owner.machine) keys.add(owner.machine);
+  const meta = isRecord(owner.meta) ? owner.meta : undefined;
+  const orchestratorId = meta ? stringValue(meta.orchestratorId) : undefined;
+  if (orchestratorId) keys.add(orchestratorId);
+  if (orchestratorId) keys.add(`orchestrator-${orchestratorId}`);
+  return keys;
+}
+
+/**
+ * Online hosts that can operate on a workspace, ordered by ownership first.
+ * The fallback to any matching host is intentional for manual recovery, but the
+ * owner host must win when known: isolated worktree paths are host-local.
+ */
+export function workspaceMergeOrchestrators(
+  workspace: WorkspaceRecord,
+  orchestrators: Orchestrator[] = listOrchestrators(),
+): Orchestrator[] {
+  const candidates = orchestrators.filter((candidate) =>
+    candidate.status === "online" && isPathWithinBase(workspace.sourceCwd, candidate.baseDir),
+  );
+  const ownerKeys = workspaceOwnerHostKeys(workspace);
+  if (ownerKeys.size === 0) return candidates;
+  return [...candidates].sort((a, b) => {
+    const aOwner = ownerKeys.has(a.id) || ownerKeys.has(a.hostname) || ownerKeys.has(a.agentId) ? 0 : 1;
+    const bOwner = ownerKeys.has(b.id) || ownerKeys.has(b.hostname) || ownerKeys.has(b.agentId) ? 0 : 1;
+    return aOwner - bOwner;
+  });
+}
+
 /**
  * Resolved cwds of every live (non-offline) agent, including the workspace sourceCwd
  * they were spawned in. The third "nobody is using it" signal the reaper needs: a
@@ -206,9 +240,7 @@ export function requestWorkspaceMerge(workspace: WorkspaceRecord, opts: RequestW
   }
   try {
     // Merge needs a live host: rebasing against a stale base later is unsafe.
-    const onlineOwner = listOrchestrators().find(
-      (candidate) => candidate.status === "online" && isPathWithinBase(workspace.sourceCwd, candidate.baseDir),
-    );
+    const onlineOwner = workspaceMergeOrchestrators(workspace)[0];
     if (!onlineOwner) {
       releaseMergeLease({ repoRoot: workspace.repoRoot, workspaceId: workspace.id });
       return { ok: false, status: 409, error: "no online orchestrator available for workspace merge" };