agent-relay-server 0.119.7 → 0.119.10

package/src/routes/workspaces.ts

@@ -15,6 +15,7 @@ import { AUTO_MERGE_POLICIES } from "../workspace-merge";
 import { workspaceActiveClaim } from "../workspace-claim";
 import { resolveCoordinatorAgentId } from "../steward-identity";
 import { relayToken } from "../config";
+import { workspaceOwnerOrchestrator } from "../workspace-host";
 
 export const getWorkspaces: Handler = (req) => {
   try {
@@ -44,9 +45,7 @@ async function proxyWorkspaceHostGet(workspaceId: string, hostPath: string, extr
   if (workspace.mode !== "isolated" || !workspace.worktreePath) {
     return json({ available: false, reason: "no isolated worktree" });
   }
-  const orch = listOrchestrators().find(
-    (candidate) => candidate.status === "online" && candidate.apiUrl && isPathWithinBase(workspace.sourceCwd, candidate.baseDir),
-  );
+  const orch = workspaceOwnerOrchestrator(workspace, listOrchestrators(), { requireApiUrl: true });
   if (!orch?.apiUrl) return json({ available: false, reason: "owning orchestrator offline" });
   const query = new URLSearchParams({ path: workspace.worktreePath });
   if (workspace.baseRef) query.set("baseRef", workspace.baseRef);
@@ -287,9 +286,7 @@ export const postWorkspaceOrphanReclaim: Handler = async (req) => {
 
 async function fetchWorkspaceGitState(workspace: WorkspaceRecord): Promise<{ state: WorkspaceGitState } | { unavailable: string }> {
   if (workspace.mode !== "isolated" || !workspace.worktreePath) return { unavailable: "no isolated worktree" };
-  const orch = listOrchestrators().find(
-    (candidate) => candidate.status === "online" && candidate.apiUrl && isPathWithinBase(workspace.sourceCwd, candidate.baseDir),
-  );
+  const orch = workspaceOwnerOrchestrator(workspace, listOrchestrators(), { requireApiUrl: true });
   if (!orch?.apiUrl) return { unavailable: "owning orchestrator offline" };
   const query = new URLSearchParams({ path: workspace.worktreePath });
   if (workspace.baseRef) query.set("baseRef", workspace.baseRef);
@@ -342,7 +339,7 @@ export const getWorkspaceDiagnostics: Handler = async (_req, params) => {
   // #640 — surface the branch agent's coordinator (owner's `spawnedBy` lineage) so a steward
   // inspecting the workspace knows who to escalate to, not just `repoRoot`.
   const coordinatorAgentId = resolveCoordinatorAgentId(workspace.ownerAgentId);
-  const orch = listOrchestrators().find((candidate) => isPathWithinBase(workspace.sourceCwd, candidate.baseDir));
+  const orch = workspaceOwnerOrchestrator(workspace, listOrchestrators(), { onlineOnly: false });
   const orchOnline = Boolean(orch) && orch!.status === "online";
   const fetched = await fetchWorkspaceGitState(workspace);
   const gitState = "state" in fetched ? fetched.state : undefined;

package/src/services/transient-agent-reaper.ts

@@ -1,11 +1,11 @@
 import { RELAY_TOKEN_HEADER } from "agent-relay-sdk";
 import { createCommand } from "../commands-db";
 import { emitRelayEvent } from "../events";
-import { createActivityEvent, getAgent, listAgents, listOrchestrators, listWorkspaces, recordTerminalEvent } from "../db";
+import { createActivityEvent, getAgent, hasArtifactCreatedBy, listAgents, listFinalResponseCaptureMessages, listOrchestrators, listWorkspaces, recordTerminalEvent } from "../db";
 import { routeNotification } from "../notification-router";
 import { isProviderBlocked } from "../provider-state";
 import { relayToken } from "../config";
-import { isPathWithinBase } from "../utils";
+import { workspaceOwnerOrchestrator } from "../workspace-host";
 import { TERMINAL_WORKSPACE_STATUSES } from "../workspace-phase";
 import { finalizeEphemeralTasksOnReap } from "./task-entity";
 import type { AgentCard, Command, WorkspaceGitState, WorkspaceRecord } from "../types";
@@ -72,9 +72,7 @@ export function resetTransientTrackerForTests(): void {
 // "unknown" and preserve the safe #614 hold-pending bias: only 0 is fast-reaped.
 async function defaultCommitsAhead(ws: WorkspaceRecord): Promise<number | null> {
   if (!ws.branch || !ws.worktreePath) return null;
-  const orch = listOrchestrators().find(
-    (candidate) => candidate.status === "online" && candidate.apiUrl && isPathWithinBase(ws.sourceCwd, candidate.baseDir),
-  );
+  const orch = workspaceOwnerOrchestrator(ws, listOrchestrators(), { requireApiUrl: true });
   if (!orch?.apiUrl) return null;
   const query = new URLSearchParams({ path: ws.worktreePath });
   if (ws.baseRef) query.set("baseRef", ws.baseRef);
@@ -130,14 +128,61 @@ function workspaceProducedWork(ws: WorkspaceRecord | undefined): boolean {
   return typeof ws.metadata.mergedAt === "number";
 }
 
+const ACK_ONLY_RESPONSES = new Set([
+  "ok",
+  "okay",
+  "done",
+  "finished",
+  "complete",
+  "completed",
+  "ack",
+  "acknowledged",
+  "thanks",
+  "thank you",
+]);
+
+const REPORT_SIGNAL_RE = /\b(ship|hold|pass|fail|finding|findings|issue|issues|blocker|blockers|reviewed|verified|tested|tests?|risk|regression|artifact|summary|audited|inspected)\b/i;
+const GENERIC_COMPLETION_RE = /\b(?:i(?:'m| am)|we(?:'re| are))?\s*(?:done|finished|complete|completed)\b|\b(?:task|work)\s+(?:is\s+)?(?:done|finished|complete|completed)\b|\b(?:all set|nothing else|nothing more|no further action|no more to do|do not need to do anything else|don't need to do anything else)\b/i;
+
+function genericCompletionOnly(normalized: string): boolean {
+  return GENERIC_COMPLETION_RE.test(normalized) && !REPORT_SIGNAL_RE.test(normalized);
+}
+
+function substantiveFinalReport(body: string): boolean {
+  const normalized = body.trim().replace(/\s+/g, " ");
+  if (!normalized) return false;
+  const ackKey = normalized.toLowerCase().replace(/[.!?]+$/g, "");
+  if (ACK_ONLY_RESPONSES.has(ackKey)) return false;
+  if (genericCompletionOnly(normalized)) return false;
+  const words = normalized.match(/[A-Za-z0-9][A-Za-z0-9'_-]*/g) ?? [];
+  if (normalized.length >= 80 && words.length >= 6) return true;
+  if (normalized.length >= 40 && words.length >= 8) return true;
+  return normalized.length >= 30
+    && words.length >= 5
+    && REPORT_SIGNAL_RE.test(normalized);
+}
+
+function reportOnlyWorkEvidence(agent: AgentCard): { producedWork: boolean; reason?: string } {
+  const since = typeof agent.createdAt === "number" && Number.isFinite(agent.createdAt) ? agent.createdAt : 0;
+  if (hasArtifactCreatedBy(agent.id, since)) return { producedWork: true, reason: "artifact-upload" };
+  const reports = listFinalResponseCaptureMessages(agent.id, since);
+  const hasSubstantiveReport = reports.some((message) => {
+    if (agent.spawnedBy && message.to !== agent.spawnedBy) return false;
+    return substantiveFinalReport(message.body);
+  });
+  return hasSubstantiveReport ? { producedWork: true, reason: "final-response-report" } : { producedWork: false };
+}
+
 async function transientLandComplete(agent: AgentCard): Promise<{ complete: boolean; producedWork: boolean; workspaceId?: string; status?: string; reason?: string }> {
   const agentId = agent.id;
+  const reportEvidence = reportOnlyWorkEvidence(agent);
   const isolated = listWorkspaces({ ownerAgentId: agentId }).filter((ws) => ws.mode === "isolated");
-  if (!isolated.length) return { complete: true, producedWork: completedProviderTurns(agent) > 0, reason: "no-isolated-workspace" };
+  if (!isolated.length) return { complete: true, producedWork: reportEvidence.producedWork, reason: reportEvidence.reason ?? "no-isolated-workspace" };
   const live = isolated.find((ws) => !TERMINAL_WORKSPACE_STATUSES.has(ws.status));
   if (!live) {
     const latest = isolated[0];
-    return { complete: true, producedWork: workspaceProducedWork(latest), workspaceId: latest?.id, status: latest?.status, reason: "terminal-workspace" };
+    const producedWork = workspaceProducedWork(latest);
+    return { complete: true, producedWork: producedWork || reportEvidence.producedWork, workspaceId: latest?.id, status: latest?.status, reason: producedWork ? "terminal-workspace" : reportEvidence.reason ?? "terminal-workspace" };
   }
   const mergedAt = typeof live.metadata.mergedAt === "number" ? live.metadata.mergedAt : undefined;
   const landReportedAt = typeof live.metadata.landReportedAt === "number" ? live.metadata.landReportedAt : undefined;
@@ -149,7 +194,7 @@ async function transientLandComplete(agent: AgentCard): Promise<{ complete: bool
   // branch is provably empty (count === 0); null (unknown/git error) falls through to
   // the safe #614 hold-pending bias below.
   if (live.status === "active" && await _commitsAheadFn(live) === 0) {
-    return { complete: true, producedWork: false, workspaceId: live.id, status: live.status, reason: "empty-branch" };
+    return { complete: true, producedWork: reportEvidence.producedWork, workspaceId: live.id, status: live.status, reason: reportEvidence.reason ?? "empty-branch" };
   }
   return { complete: false, producedWork: false, workspaceId: live.id, status: live.status, reason: "land-pending" };
 }
@@ -226,7 +271,7 @@ export async function reapTransientAgents(): Promise<Record<string, unknown>> {
       workspaceId: land.workspaceId,
       workspaceStatus: land.status,
       activityTitle: "Transient agent complete",
-      activityBody: "Agent idle grace elapsed and branch work is land-complete; shutdown requested",
+      activityBody: "Agent idle grace elapsed and transient work is complete; shutdown requested",
       landReason: land.reason,
       now,
     });

package/src/workspace-actions.ts

@@ -10,7 +10,7 @@
 // the Command and the caller emits via its own `emitCommand` (kept module-local).
 
 import { createCommand } from "./commands-db";
-import { isPathWithinBase } from "./utils";
+import { workspaceOwnerOrchestrator } from "./workspace-host";
 import {
   createActivityEvent,
   getWorkspace,
@@ -301,7 +301,7 @@ export function buildWorkspaceCleanupCommand(
       error: `workspace ${workspace.id} owner is still online; pass force:true to clean it up intentionally`,
     };
   }
-  const owner = listOrchestrators().find((candidate) => candidate.status === "online" && isPathWithinBase(workspace.sourceCwd, candidate.baseDir));
+  const owner = workspaceOwnerOrchestrator(workspace);
   if (!owner) return { ok: false, status: 409, error: "no online orchestrator owns this workspace path; retry when the host is online or use DELETE /api/workspaces/:id to purge the record" };
   const command = createCommand({
     type: "workspace.cleanup",
@@ -332,8 +332,7 @@ function buildWorkspaceDepsRefreshCommand(
   requestedBy: string,
   checkOnly: boolean,
 ): { ok: true; command: Command } | { ok: false; status: number; error: string } {
-  const owners = listOrchestrators().filter((candidate) => isPathWithinBase(workspace.sourceCwd, candidate.baseDir));
-  const owner = owners.find((candidate) => candidate.status === "online") ?? owners[0];
+  const owner = workspaceOwnerOrchestrator(workspace, listOrchestrators(), { onlineOnly: false });
   if (!owner) return { ok: false, status: 409, error: "no online orchestrator owns this workspace path" };
   const command = createCommand({
     type: "workspace.deps-refresh",

package/src/workspace-auto-merge.ts

@@ -154,6 +154,8 @@ export const MAX_NO_PROGRESS_MERGE_ATTEMPTS = 3;
 
 // Don't re-escalate a backed-off lane more than once per this window.
 const NO_PROGRESS_ESCALATION_COOLDOWN_MS = 30 * 60 * 1000;
+export const AUTO_MERGE_ERROR_BACKOFF_MS = 3_000;
+export const AUTO_MERGE_WATCHDOG_STALE_MS = 5 * 60 * 1000;
 
 /** The recorded count of consecutive no-progress merge attempts for a workspace (#638). */
 export function mergeNoProgressCount(metadata: Record<string, unknown>): number {
@@ -377,30 +379,105 @@ async function landCandidates(
 // in flight for the repo just flags a rerun, so concurrent readies don't fan out
 // redundant host probes. Errors are swallowed: the runOnStart backstop is the
 // self-healer for anything a dropped run strands.
-const repoMergeRunning = new Map<string, { rerun: boolean }>();
+type RepoMergeRunState = {
+  rerun: boolean;
+  lastProgressAt: number;
+};
+
+const repoMergeRunning = new Map<string, RepoMergeRunState>();
+const repoMergeLastCompletedAt = new Map<string, number>();
+let autoMergeWatchdogStartedAt = Date.now();
+
+function errMessage(error: unknown): string {
+  if (error instanceof Error) return `${error.name}: ${error.message}`;
+  return String(error);
+}
+
+function landableWorkspaces(repoRoot?: string): WorkspaceRecord[] {
+  return listWorkspaces(repoRoot ? { repoRoot } : undefined).filter(
+    (ws) => ws.mode === "isolated" && Boolean(ws.worktreePath) && READY_TO_LAND_STATUSES.has(ws.status),
+  );
+}
+
+function noteAutoMergeCycleCompleted(repoRoot: string): void {
+  const completedAt = Date.now();
+  repoMergeLastCompletedAt.set(repoRoot, completedAt);
+  const state = repoMergeRunning.get(repoRoot);
+  if (state) state.lastProgressAt = completedAt;
+}
+
+async function sleep(ms: number): Promise<void> {
+  await new Promise<void>((resolve) => {
+    const timer = setTimeout(resolve, ms);
+    timer.unref?.();
+  });
+}
 
 export function scheduleRepoMerge(repoRoot: string | undefined): void {
   if (!repoRoot) return;
   if (!workspaceAutoMergeEnabled()) return;
   const existing = repoMergeRunning.get(repoRoot);
   if (existing) { existing.rerun = true; return; }
-  const state = { rerun: false };
+  const state: RepoMergeRunState = { rerun: false, lastProgressAt: Date.now() };
   repoMergeRunning.set(repoRoot, state);
   void (async () => {
+    let retriedAfterError = false;
     try {
       do {
         state.rerun = false;
-        await autoMergeForRepo(repoRoot);
+        state.lastProgressAt = Date.now();
+        try {
+          await autoMergeForRepo(repoRoot);
+        } catch (err) {
+          console.warn(`[workspace-auto-merge] Repo auto-merge cycle failed for ${repoRoot}: ${errMessage(err)}`);
+          if (!retriedAfterError) {
+            retriedAfterError = true;
+            await sleep(AUTO_MERGE_ERROR_BACKOFF_MS);
+            state.rerun = true;
+          }
+        }
       } while (state.rerun);
     } catch {
       // Swallow — the periodic backstop (runOnStart + interval) is the self-healer.
     } finally {
-      repoMergeRunning.delete(repoRoot);
+      if (repoMergeRunning.get(repoRoot) === state) repoMergeRunning.delete(repoRoot);
     }
   })();
 }
 
-export function resetRepoMergeSchedulerForTests(): void { repoMergeRunning.clear(); }
+export function resetRepoMergeSchedulerForTests(): void {
+  repoMergeRunning.clear();
+  repoMergeLastCompletedAt.clear();
+  autoMergeWatchdogStartedAt = Date.now();
+}
+
+export function runAutoMergeWatchdog(
+  opts: { now?: number; staleMs?: number; log?: (message: string) => void } = {},
+): Record<string, unknown> {
+  const now = opts.now ?? Date.now();
+  const staleMs = opts.staleMs ?? AUTO_MERGE_WATCHDOG_STALE_MS;
+  const ready = landableWorkspaces();
+  const repoRoots = [...new Set(ready.map((ws) => ws.repoRoot).filter(Boolean))];
+  const repoStaleForMs = Object.fromEntries(repoRoots.map((repoRoot) => {
+    const state = repoMergeRunning.get(repoRoot);
+    const lastProgressAt = state?.lastProgressAt ?? repoMergeLastCompletedAt.get(repoRoot) ?? autoMergeWatchdogStartedAt;
+    return [repoRoot, now - lastProgressAt];
+  }));
+  const staleForMs = Object.values(repoStaleForMs).reduce((max, value) => Math.max(max, value), 0);
+  if (!ready.length) return { readyCount: 0, staleForMs, repoStaleForMs, restartedRepoRoots: [] };
+
+  const restartedRepoRoots = repoRoots.filter((repoRoot) => repoStaleForMs[repoRoot]! >= staleMs);
+  if (!restartedRepoRoots.length) return { readyCount: ready.length, staleForMs, repoStaleForMs, restartedRepoRoots: [] };
+
+  const log = opts.log ?? console.warn;
+  log(`[workspace-auto-merge] Watchdog: no auto-merge cycle completed for ${staleForMs}ms while ${ready.length} ready workspace(s) exist; restarting ${restartedRepoRoots.length} repo merge loop(s)`);
+  for (const repoRoot of restartedRepoRoots) {
+    const existing = repoMergeRunning.get(repoRoot);
+    if (existing) existing.rerun = true;
+    else scheduleRepoMerge(repoRoot);
+  }
+  return { readyCount: ready.length, staleForMs, repoStaleForMs, restartedRepoRoots };
+}
 
 // Drain the landable rows for ONE repo (the event-driven fast path). Scoped to the
 // repo whose ready/settle event fired so it doesn't re-probe every other repo's worktrees.
@@ -408,10 +485,12 @@ async function autoMergeForRepo(repoRoot: string): Promise<LandSweepResult> {
   if (!workspaceAutoMergeEnabled()) return emptyLandSweep();
   const orchestrators = listOrchestrators().filter((orch) => orch.status === "online" && orch.apiUrl);
   if (!orchestrators.length) return emptyLandSweep();
-  const candidates = listWorkspaces({ repoRoot }).filter(
-    (ws) => ws.mode === "isolated" && Boolean(ws.worktreePath) && READY_TO_LAND_STATUSES.has(ws.status),
-  );
-  return landCandidates(candidates, orchestrators);
+  const candidates = landableWorkspaces(repoRoot);
+  try {
+    return await landCandidates(candidates, orchestrators);
+  } finally {
+    noteAutoMergeCycleCompleted(repoRoot);
+  }
 }
 
 // Self-healing backstop (#237): the periodic resync (workspace-auto-merge maintenance
@@ -424,10 +503,13 @@ export async function autoMergeCleanFastForwards(): Promise<Record<string, unkno
   const orchestrators = listOrchestrators().filter((orch) => orch.status === "online" && orch.apiUrl);
   if (!orchestrators.length) return { scanned: 0, skipped: "no online orchestrators" };
 
-  const candidates = listWorkspaces().filter(
-    (ws) => ws.mode === "isolated" && Boolean(ws.worktreePath) && READY_TO_LAND_STATUSES.has(ws.status),
-  );
+  const candidates = landableWorkspaces();
+  const repoRoots = [...new Set(candidates.map((ws) => ws.repoRoot).filter(Boolean))];
   // Spread to a plain Record for the maintenance-job result contract (the named
   // LandSweepResult interface has no index signature).
-  return { ...(await landCandidates(candidates, orchestrators)) };
+  try {
+    return { ...(await landCandidates(candidates, orchestrators)) };
+  } finally {
+    for (const repoRoot of repoRoots) noteAutoMergeCycleCompleted(repoRoot);
+  }
 }

package/src/workspace-host.ts

@@ -0,0 +1,55 @@
+import type { Command, Orchestrator, WorkspaceRecord } from "./types";
+import { getOrchestrator, listOrchestrators } from "./db";
+import { isPathWithinBase } from "./utils";
+
+interface WorkspaceHost {
+  id: string;
+  status?: string;
+  apiUrl?: string;
+  baseDir?: string;
+  agentId?: string;
+}
+
+interface WorkspaceHostOptions {
+  onlineOnly?: boolean;
+  requireApiUrl?: boolean;
+}
+
+function hostUsable<T extends WorkspaceHost>(orch: T | undefined, opts: WorkspaceHostOptions): orch is T {
+  if (!orch) return false;
+  if (opts.onlineOnly !== false && orch.status !== "online") return false;
+  if (opts.requireApiUrl && !orch.apiUrl) return false;
+  return true;
+}
+
+export function workspaceOwnerOrchestrators<T extends WorkspaceHost = Orchestrator>(
+  workspace: WorkspaceRecord,
+  orchestrators?: T[],
+  opts: WorkspaceHostOptions = {},
+): T[] {
+  const hosts = orchestrators ?? (listOrchestrators() as unknown as T[]);
+  if (workspace.orchestratorId) {
+    const owner = hosts.find((candidate) => candidate.id === workspace.orchestratorId);
+    return hostUsable(owner, opts) ? [owner] : [];
+  }
+  return hosts.filter((candidate) =>
+    hostUsable(candidate, opts) && Boolean(candidate.baseDir) && isPathWithinBase(workspace.sourceCwd, candidate.baseDir!),
+  );
+}
+
+export function workspaceOwnerOrchestrator<T extends WorkspaceHost = Orchestrator>(
+  workspace: WorkspaceRecord,
+  orchestrators?: T[],
+  opts: WorkspaceHostOptions = {},
+): T | undefined {
+  return workspaceOwnerOrchestrators(workspace, orchestrators, opts)[0];
+}
+
+export function commandTargetsWorkspaceOwner(command: Command, workspace: WorkspaceRecord): boolean {
+  const ownerId = workspace.orchestratorId;
+  if (!ownerId) return true;
+  const owner = getOrchestrator(ownerId);
+  return command.target === ownerId
+    || command.target === `orchestrator-${ownerId}`
+    || (owner?.agentId ? command.target === owner.agentId : false);
+}

package/src/workspace-merge.ts

@@ -22,6 +22,7 @@ import type {
 } from "./types";
 import { AUTO_MERGE_POLICIES } from "./types";
 import { isPathWithinBase } from "./utils";
+import { workspaceOwnerOrchestrators } from "./workspace-host";
 
 // Re-export so consumers can import the tuple from the strategy home without a
 // second import hop.
@@ -164,11 +165,9 @@ export function workspaceMergeOrchestrators(
   workspace: WorkspaceRecord,
   orchestrators: Orchestrator[] = listOrchestrators(),
 ): Orchestrator[] {
-  const candidates = orchestrators.filter((candidate) =>
-    candidate.status === "online" && isPathWithinBase(workspace.sourceCwd, candidate.baseDir),
-  );
+  const candidates = workspaceOwnerOrchestrators(workspace, orchestrators);
   const ownerKeys = workspaceOwnerHostKeys(workspace);
-  if (ownerKeys.size === 0) return candidates;
+  if (workspace.orchestratorId || 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;

package/src/workspace-orphans.ts

@@ -28,6 +28,7 @@ import { isPathWithinBase } from "./utils";
 import { TERMINAL_WORKSPACE_STATUSES, worktreeReapable, type WorktreeReapState } from "./workspace-phase";
 import { isOwnerAlive, liveAgentCwds, worktreeInUseByLiveAgent } from "./workspace-merge";
 import { applyWorkspaceAction } from "./workspace-actions";
+import { workspaceOwnerOrchestrator } from "./workspace-host";
 import { UNLANDED_FLAG_COOLDOWN_MS, orphanGraceMs, orphanWorktreeReapEnabled, relayToken } from "./config";
 
 // Don't re-flag the same un-landed orphan every sweep — surface it once, then
@@ -139,6 +140,17 @@ function knownRepoRoots(workspaces: WorkspaceRecord[]): string[] {
   return [...new Set(workspaces.map((ws) => ws.repoRoot).filter(Boolean))];
 }
 
+function repoProbeHosts(repoRoot: string, workspaces: WorkspaceRecord[], orchestrators: OnlineOrchestrator[]): OnlineOrchestrator[] {
+  const ownerIds = new Set(
+    workspaces
+      .filter((ws) => ws.orchestratorId && resolve(ws.repoRoot) === resolve(repoRoot))
+      .map((ws) => ws.orchestratorId!),
+  );
+  if (ownerIds.size > 0) return orchestrators.filter((candidate) => ownerIds.has(candidate.id));
+  const legacy = orchestrators.find((candidate) => isPathWithinBase(repoRoot, candidate.baseDir));
+  return legacy ? [legacy] : [];
+}
+
 interface CollectOrphansResult {
   orphans: WorkspaceOrphan[];
   /** Live isolated rows whose worktree is missing on disk (DB→disk drift). */
@@ -196,64 +208,72 @@ export async function collectWorkspaceOrphans(): Promise<CollectOrphansResult> {
   // (their worktree lives under a different repo's probe than the one iterating). #278
   const onDiskAll = new Set<string>();
   const probedRepoRoots = new Set<string>();
+  const onDiskByOwner = new Set<string>();
+  const probedOwnerRepoRoots = new Set<string>();
 
   for (const repoRoot of knownRepoRoots(all)) {
-    const orch = orchestrators.find((candidate) => candidate.apiUrl && isPathWithinBase(repoRoot, candidate.baseDir));
-    if (!orch?.apiUrl) continue;
-    const probe = await fetchHostProbe(orch.apiUrl, repoRoot);
-    if (!probe?.worktrees) continue;
-
-    probedRepoRoots.add(resolve(repoRoot));
-    for (const wt of probe.worktrees) if (wt.path) onDiskAll.add(resolve(wt.path));
-
-    // disk→DB drift: a worktree on disk with no live row → orphan. A worktree with a
-    // live isolated row is NOT an orphan, but if its owner has died it's the #279
-    // dead-owner case — surface it for the reaper to evaluate (liveness + grace).
-    for (const worktree of probe.worktrees) {
-      if (!worktree.path || resolve(worktree.path) === resolve(repoRoot)) continue;
-      // Only agent-relay-created worktrees (agent/* branches) are reclaimable —
-      // never touch a user's own linked worktrees.
-      if (!worktree.branch?.startsWith("agent/")) continue;
-      const row = rowsByPath.get(resolve(worktree.path));
-      if (row && !TERMINAL_WORKSPACE_STATUSES.has(row.status)) {
-        if (row.mode === "isolated") {
-          deadOwnerWorkspaces.push({
-            workspaceId: row.id,
-            worktreePath: worktree.path,
-            repoRoot: row.repoRoot,
-            branch: row.branch ?? worktree.branch,
-            baseRef: row.baseRef,
-            baseSha: row.baseSha,
-            ownerAgentId: row.ownerAgentId,
-          });
-        }
-        continue; // tracked & live — not an orphan
+    for (const orch of repoProbeHosts(repoRoot, all, orchestrators)) {
+      if (!orch.apiUrl) continue;
+      const probe = await fetchHostProbe(orch.apiUrl, repoRoot);
+      if (!probe?.worktrees) continue;
+
+      probedRepoRoots.add(resolve(repoRoot));
+      probedOwnerRepoRoots.add(`${orch.id}:${resolve(repoRoot)}`);
+      for (const wt of probe.worktrees) {
+        if (!wt.path) continue;
+        onDiskAll.add(resolve(wt.path));
+        onDiskByOwner.add(`${orch.id}:${resolve(wt.path)}`);
       }
 
-      const orphan: WorkspaceOrphan = {
-        worktreePath: worktree.path,
-        repoRoot,
-        branch: worktree.branch,
-        headSha: worktree.headSha,
-        baseRef: probe.branch,
-        hadTerminalRow: Boolean(row),
-      };
-      const preview = await fetchWorktreeReapState(orch.apiUrl, worktree.path, probe.branch);
-      if (preview && !preview.missing && !preview.error) {
-        const state: WorktreeReapState = {
-          landed: preview.landed,
-          ahead: preview.ahead,
-          unmergedAhead: preview.unmergedAhead,
-          dirtyCount: preview.dirtyCount,
+      // disk→DB drift: a worktree on disk with no live row → orphan. A worktree with a
+      // live isolated row is NOT an orphan, but if its owner has died it's the #279
+      // dead-owner case — surface it for the reaper to evaluate (liveness + grace).
+      for (const worktree of probe.worktrees) {
+        if (!worktree.path || resolve(worktree.path) === resolve(repoRoot)) continue;
+        // Only agent-relay-created worktrees (agent/* branches) are reclaimable —
+        // never touch a user's own linked worktrees.
+        if (!worktree.branch?.startsWith("agent/")) continue;
+        const row = rowsByPath.get(resolve(worktree.path));
+        if (row && !TERMINAL_WORKSPACE_STATUSES.has(row.status)) {
+          if (row.mode === "isolated") {
+            deadOwnerWorkspaces.push({
+              workspaceId: row.id,
+              worktreePath: worktree.path,
+              repoRoot: row.repoRoot,
+              branch: row.branch ?? worktree.branch,
+              baseRef: row.baseRef,
+              baseSha: row.baseSha,
+              ownerAgentId: row.ownerAgentId,
+            });
+          }
+          continue; // tracked & live — not an orphan
+        }
+
+        const orphan: WorkspaceOrphan = {
+          worktreePath: worktree.path,
+          repoRoot,
+          branch: worktree.branch,
+          headSha: worktree.headSha,
+          baseRef: probe.branch,
+          hadTerminalRow: Boolean(row),
         };
-        orphan.landed = preview.landed;
-        orphan.ahead = preview.ahead;
-        orphan.unmergedAhead = preview.unmergedAhead;
-        orphan.dirty = (preview.dirtyCount ?? 0) > 0;
-        orphan.safeToReap = worktreeReapable(state);
+        const preview = await fetchWorktreeReapState(orch.apiUrl, worktree.path, probe.branch);
+        if (preview && !preview.missing && !preview.error) {
+          const state: WorktreeReapState = {
+            landed: preview.landed,
+            ahead: preview.ahead,
+            unmergedAhead: preview.unmergedAhead,
+            dirtyCount: preview.dirtyCount,
+          };
+          orphan.landed = preview.landed;
+          orphan.ahead = preview.ahead;
+          orphan.unmergedAhead = preview.unmergedAhead;
+          orphan.dirty = (preview.dirtyCount ?? 0) > 0;
+          orphan.safeToReap = worktreeReapable(state);
+        }
+        // No probe → safeToReap stays undefined (treated as not-safe by callers).
+        orphans.push(orphan);
       }
-      // No probe → safeToReap stays undefined (treated as not-safe by callers).
-      orphans.push(orphan);
     }
   }
 
@@ -268,7 +288,10 @@ export async function collectWorkspaceOrphans(): Promise<CollectOrphansResult> {
     if (ws.mode !== "isolated" || !ws.worktreePath) continue;
     if (TERMINAL_WORKSPACE_STATUSES.has(ws.status)) continue;
     if (onDiskAll.has(resolve(ws.worktreePath))) continue;
-    const coverable = probedRepoRoots.has(resolve(ws.repoRoot)) || onDiskAll.has(resolve(ws.repoRoot));
+    const coverable = ws.orchestratorId
+      ? probedOwnerRepoRoots.has(`${ws.orchestratorId}:${resolve(ws.repoRoot)}`)
+        || onDiskByOwner.has(`${ws.orchestratorId}:${resolve(ws.repoRoot)}`)
+      : probedRepoRoots.has(resolve(ws.repoRoot)) || onDiskAll.has(resolve(ws.repoRoot));
     if (!coverable) continue;
     missingWorktrees.push({
       workspaceId: ws.id,
@@ -420,7 +443,7 @@ export async function reapOrphanedWorktrees(): Promise<Record<string, unknown>>
       continue;
     }
 
-    const orch = orchestrators.find((candidate) => candidate.apiUrl && isPathWithinBase(workspace.repoRoot, candidate.baseDir));
+    const orch = workspaceOwnerOrchestrator(workspace, orchestrators, { onlineOnly: false, requireApiUrl: true });
     const probe = orch?.apiUrl
       ? await fetchBranchReapState(orch.apiUrl, workspace.repoRoot, workspace.branch, workspace.baseRef, workspace.baseSha)
       : { kind: "unavailable" } as const;
@@ -520,7 +543,7 @@ export async function reapOrphanedWorktrees(): Promise<Record<string, unknown>>
     if (now - firstSeenDeadAt < graceMs) continue;
 
     // Grace elapsed + owner dead. Gate on land-state — "nothing would be lost".
-    const orch = orchestrators.find((candidate) => candidate.apiUrl && isPathWithinBase(workspace.repoRoot, candidate.baseDir));
+    const orch = workspaceOwnerOrchestrator(workspace, orchestrators, { onlineOnly: false, requireApiUrl: true });
     const preview = orch?.apiUrl
       ? await fetchWorktreeReapState(orch.apiUrl, workspace.worktreePath, workspace.baseRef)
       : null;

package/src/workspace-probe.ts

@@ -17,6 +17,7 @@ import {
   patchWorkspaceMetadata,
 } from "./db";
 import { isPathWithinBase } from "./utils";
+import { workspaceOwnerOrchestrator } from "./workspace-host";
 import { deriveBranchState } from "./workspace-phase";
 import type { AgentCard, WorkspaceMergePreview, WorkspaceRecord } from "./types";
 import { relayToken } from "./config";
@@ -95,9 +96,7 @@ export async function probeWorkspaceState(agentId: string): Promise<ProbeResult>
   const ws = ownedIsolatedWorkspace(agentId);
   if (!ws || !ws.worktreePath) return { probed: false, skipped: "no live isolated workspace" };
   if (ws.status !== "active") return { probed: false, workspaceId: ws.id, skipped: `status ${ws.status} derives badge without git counts` };
-  const orch = listOrchestrators().find(
-    (candidate) => candidate.status === "online" && candidate.apiUrl && workspacePathWithinBase(ws.sourceCwd, candidate.baseDir),
-  );
+  const orch = workspaceOwnerOrchestrator(ws, listOrchestrators(), { requireApiUrl: true });
   if (!orch?.apiUrl) return { probed: false, workspaceId: ws.id, skipped: "no online orchestrator owns this path" };
   // checkPr:false — a badge probe never needs the gh round-trip (#304).
   const preview = await fetchHostMergePreview(orch.apiUrl, ws, { checkPr: false });

package/public/assets/PlanGraphPanel-B9TN_KQr.js

@@ -1,2 +0,0 @@
-import{r as e}from"./chunk-CilyBKbf.js";import{Mt as t,Qn as n,Zn as r,er as i,hr as a,mt as o,nr as s,rr as c,wn as l,xn as u}from"./lucide-react-Dc3ZwCBi.js";import{i as d,r as f,t as p}from"./store-OLe8gFh0.js";import{t as m}from"./task-chip-kxk4eNm1.js";import{J as h}from"./index-TamtghSr.js";var g=e(a(),1),_=`(max-width: 767px)`;function v(e){if(typeof window>`u`)return()=>{};let t=window.matchMedia(_);return t.addEventListener(`change`,e),()=>t.removeEventListener(`change`,e)}function y(){return(0,g.useSyncExternalStore)(v,()=>typeof window<`u`?window.matchMedia(_).matches:!1,()=>!1)}var b=s(),x=196,S=84,C=52,w=16,T=14,E=[`landed`,`in-progress`,`pending`,`blocked`],D={landed:{label:`landed`,dot:`bg-emerald-400`,accent:`border-l-emerald-400`,text:`text-emerald-300`,wire:`#34d399`},"in-progress":{label:`in progress`,dot:`bg-sky-400`,accent:`border-l-sky-400`,text:`text-sky-300`,wire:`#38bdf8`},pending:{label:`pending`,dot:`bg-amber-400`,accent:`border-l-amber-400`,text:`text-amber-300`,wire:`#fbbf24`},blocked:{label:`blocked`,dot:`bg-red-400`,accent:`border-l-red-400`,text:`text-red-300`,wire:`#f87171`}};function O(e){return e?e.label||(e.policyName?`policy:${e.policyName}`:e.agentId||``):``}function k(e){let t=new Map(e.nodes.map(e=>[e.id,e])),n=new Map(e.nodes.map((e,t)=>[e.id,t])),r=new Map,i=new Map(e.nodes.map(e=>[e.id,0]));for(let n of e.edges)!t.has(n.from)||!t.has(n.to)||(r.set(n.from,[...r.get(n.from)??[],n.to]),i.set(n.to,(i.get(n.to)??0)+1));let a=new Map(e.nodes.map(e=>[e.id,0])),o=e.nodes.filter(e=>(i.get(e.id)??0)===0).map(e=>e.id),s=new Set;for(;o.length;){let e=o.shift();s.add(e);let t=a.get(e)??0;for(let n of r.get(e)??[])a.set(n,Math.max(a.get(n)??0,t+1)),i.set(n,(i.get(n)??0)-1),(i.get(n)??0)===0&&o.push(n)}let c=Math.max(0,...Array.from(a.values()))+1;for(let t of e.nodes)s.has(t.id)||a.set(t.id,c++);let l=new Map;for(let t of e.nodes){let e=a.get(t.id)??0;l.set(e,[...l.get(e)??[],t])}let u=[...l.entries()].sort(([e],[t])=>e-t),d=Math.max(1,...u.map(([,e])=>e.length)),f=S+w,p=[];u.forEach(([e,t],r)=>{let i=[...t].sort((e,t)=>(e.lane||``).localeCompare(t.lane||``)||(n.get(e.id)??0)-(n.get(t.id)??0)),a=(d-i.length)*f/2;i.forEach((t,n)=>{p.push({node:t,layer:e,x:T+r*(x+C),y:T+a+n*f})})});let m=u.length;return{nodes:p,width:Math.max(320,T*2+m*x+Math.max(0,m-1)*C),height:Math.max(S+T*2,T*2+d*S+Math.max(0,d-1)*w)}}function A(e,t){let n=e.x+x,r=e.y+S/2,i=t.x,a=t.y+S/2,o=n+Math.max(20,(i-n)/2);return`M ${n} ${r} C ${o} ${r}, ${o} ${a}, ${i} ${a}`}function j({threadId:e,teamId:a,channel:o}){let s=a?d(a,o):e?f(e,o):``,c=p(e=>a?e.plansByTeam[s]:s?e.plansByThread[s]:null),_=p(e=>e.fetchPlan),v=p(e=>e.setPlanArchived),C=p(e=>e.planCollapsed),w=p(e=>e.setPlanCollapsed),T=p(e=>e.issueRefsById),j=p(e=>e.deliverableTasks),M=p(e=>e.openTaskDetailById),N=y(),P=C??N;(0,g.useEffect)(()=>{if(a){_({teamId:a,channel:o});return}e&&_({threadId:e,channel:o})},[o,_,a,e]);let F=(0,g.useMemo)(()=>c?k(c):null,[c]),I=(0,g.useMemo)(()=>new Map(F?.nodes.map(e=>[e.node.id,e])??[]),[F]),L=(0,g.useMemo)(()=>{if(!c)return[];let e=new Map;for(let t of c.nodes)e.set(t.status,(e.get(t.status)??0)+1);return E.filter(t=>e.has(t)).map(t=>({status:t,count:e.get(t)??0}))},[c]);if(!c||!F)return null;if(c.archived)return(0,b.jsx)(`section`,{className:`shrink-0 border-b border-border bg-card/45 px-3 py-2`,children:(0,b.jsxs)(`div`,{className:`flex min-w-0 items-center gap-2`,children:[(0,b.jsx)(`span`,{className:`flex h-5 w-5 shrink-0 items-center justify-center rounded bg-muted/60`,children:(0,b.jsx)(r,{className:`h-3 w-3 text-muted-foreground`})}),(0,b.jsxs)(`div`,{className:`min-w-0 flex-1`,children:[(0,b.jsx)(`div`,{className:`truncate text-[13px] font-semibold leading-tight text-muted-foreground`,children:c.title||`Plan`}),(0,b.jsx)(`div`,{className:`truncate text-[11px] leading-tight text-muted-foreground`,children:`Archived plan`})]}),(0,b.jsx)(`span`,{className:`shrink-0 rounded border border-border bg-muted/40 px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground`,children:`archived`}),(0,b.jsx)(`button`,{type:`button`,onClick:()=>void v(c.id,!1),title:`Unarchive plan`,"aria-label":`Unarchive plan`,className:`flex h-6 w-6 shrink-0 items-center justify-center rounded text-muted-foreground hover:bg-muted/60 hover:text-foreground`,children:(0,b.jsx)(n,{className:`h-3.5 w-3.5`})})]})});let R=c.nodes.length,z=L.find(e=>e.status===`landed`)?.count??0,B=`${R} node${R===1?``:`s`}${z>0?` · ${z} landed`:``}`;return(0,b.jsxs)(`section`,{className:`shrink-0 border-b border-border bg-card/45 px-3 py-2`,children:[(0,b.jsxs)(`div`,{className:i(`flex min-w-0 items-center gap-2`,!P&&`mb-2`),children:[(0,b.jsxs)(`button`,{type:`button`,onClick:()=>w(!P),"aria-expanded":!P,"aria-label":P?`Expand plan graph`:`Collapse plan graph`,className:`flex min-w-0 flex-1 items-center gap-2 text-left`,children:[(0,b.jsx)(`span`,{className:`flex h-5 w-5 shrink-0 items-center justify-center rounded bg-muted/60`,children:(0,b.jsx)(t,{className:`h-3 w-3 text-muted-foreground`})}),(0,b.jsxs)(`div`,{className:`min-w-0 flex-1`,children:[(0,b.jsx)(`div`,{className:`truncate text-[13px] font-semibold leading-tight text-foreground`,children:c.title||`Plan`}),(0,b.jsx)(`div`,{className:`truncate text-[11px] leading-tight text-muted-foreground`,children:P?B:c.objective||B})]})]}),L.length>0&&(0,b.jsx)(`div`,{className:`hidden shrink-0 items-center gap-2.5 sm:flex`,children:L.map(({status:e,count:t})=>(0,b.jsxs)(`span`,{className:`flex items-center gap-1 text-[10px] text-muted-foreground`,children:[(0,b.jsx)(`span`,{className:i(`h-1.5 w-1.5 rounded-full`,D[e].dot)}),(0,b.jsx)(`span`,{className:i(`font-medium tabular-nums`,D[e].text),children:t}),(0,b.jsx)(`span`,{children:D[e].label})]},e))}),(0,b.jsxs)(`span`,{className:`shrink-0 rounded bg-muted/60 px-1.5 py-0.5 text-[10px] font-medium tabular-nums text-muted-foreground`,children:[`v`,c.version]}),(0,b.jsx)(`button`,{type:`button`,onClick:()=>void v(c.id,!0),title:`Archive plan`,"aria-label":`Archive plan`,className:`flex h-5 w-5 shrink-0 items-center justify-center rounded text-muted-foreground hover:bg-muted/60 hover:text-foreground`,children:(0,b.jsx)(r,{className:`h-3.5 w-3.5`})}),(0,b.jsx)(`button`,{type:`button`,onClick:()=>w(!P),"aria-expanded":!P,"aria-label":P?`Expand plan graph`:`Collapse plan graph`,className:`flex h-5 w-5 shrink-0 items-center justify-center rounded text-muted-foreground hover:bg-muted/60 hover:text-foreground`,children:P?(0,b.jsx)(l,{className:`h-3.5 w-3.5`}):(0,b.jsx)(u,{className:`h-3.5 w-3.5`})})]}),P?null:c.nodes.length===0?(0,b.jsx)(`div`,{className:`rounded-md border border-dashed border-border px-3 py-3 text-center text-xs text-muted-foreground`,children:`No nodes yet — the plan graph fills in as the team is composed.`}):(0,b.jsx)(`div`,{className:`max-h-[min(46vh,360px)] overflow-auto`,children:(0,b.jsxs)(`div`,{className:`relative`,style:{width:F.width,height:F.height},children:[(0,b.jsxs)(`svg`,{className:`pointer-events-none absolute inset-0`,width:F.width,height:F.height,"aria-hidden":`true`,children:[(0,b.jsx)(`defs`,{children:E.map(e=>(0,b.jsx)(`marker`,{id:`plan-arrow-${e}`,viewBox:`0 0 8 8`,refX:`6.5`,refY:`4`,markerWidth:`6`,markerHeight:`6`,orient:`auto-start-reverse`,children:(0,b.jsx)(`path`,{d:`M0 0 L8 4 L0 8 z`,fill:D[e].wire})},e))}),c.edges.map(e=>{let t=I.get(e.from),n=I.get(e.to);if(!t||!n)return null;let r=D[t.node.status];return(0,b.jsx)(`path`,{d:A(t,n),stroke:r.wire,strokeOpacity:.7,strokeWidth:2,fill:`none`,strokeLinecap:`round`,markerEnd:`url(#plan-arrow-${t.node.status})`},`${e.from}->${e.to}`)})]}),F.nodes.map(({node:e,x:t,y:n})=>{let r=D[e.status],a=O(e.ownerRef),o=e.refs?.issueId?T[e.refs.issueId]:null,s=e.refs?.taskId?parseInt(e.refs.taskId,10):null,c=s==null?void 0:j.find(e=>e.id===s)?.title;return(0,b.jsxs)(`article`,{className:i(`group absolute flex flex-col justify-between rounded-md border border-l-[3px] bg-background/95 p-2`,`shadow-sm transition-all hover:-translate-y-px hover:border-border hover:shadow-md hover:bg-background`,r.accent),style:{left:t,top:n,width:x,height:S},title:e.scopeBlurb||e.label,children:[(0,b.jsx)(`div`,{className:`truncate text-xs font-semibold leading-tight text-foreground`,children:e.label}),(e.scopeBlurb||e.id)&&(0,b.jsx)(`div`,{className:`truncate text-[10px] leading-tight text-muted-foreground`,children:e.scopeBlurb||e.id}),(o||s!=null)&&(0,b.jsxs)(`div`,{className:`flex min-w-0 flex-wrap gap-1`,children:[o&&(0,b.jsx)(h,{issueRef:o,compact:!0,className:`max-w-full`}),s!=null&&(0,b.jsx)(m,{id:s,title:c,onClick:()=>M(s),className:`max-w-full`})]}),(0,b.jsxs)(`div`,{className:`flex min-w-0 items-center justify-between gap-1.5`,children:[(0,b.jsxs)(`div`,{className:`flex shrink-0 items-center gap-1.5`,children:[(0,b.jsx)(`span`,{className:i(`h-1.5 w-1.5 shrink-0 rounded-full`,r.dot)}),(0,b.jsx)(`span`,{className:i(`text-[10px] font-medium`,r.text),children:r.label})]}),(0,b.jsxs)(`div`,{className:`flex min-w-0 items-center gap-1.5`,children:[a&&(0,b.jsx)(`span`,{className:`truncate text-[10px] text-muted-foreground`,children:a}),e.lane&&(0,b.jsx)(`span`,{className:`shrink-0 rounded-sm bg-muted/70 px-1 py-px text-[9px] font-medium uppercase tracking-wide text-muted-foreground`,children:e.lane})]})]})]},e.id)})]})})]})}function M({agentId:e}){let t=p(e=>e.openTaskDetailById),n=p(e=>e.sessionTasksCollapsed),r=p(e=>e.setSessionTasksCollapsed),[a,s]=(0,g.useState)([]);return(0,g.useEffect)(()=>{c(`GET`,`/task-entities?createdBy=`+encodeURIComponent(e)).then(e=>s(e)).catch(()=>{})},[e]),a.length===0?null:(0,b.jsxs)(`section`,{className:`shrink-0 border-b border-border bg-card/45 px-3 py-2`,children:[(0,b.jsxs)(`button`,{type:`button`,onClick:()=>r(!n),"aria-expanded":!n,"aria-label":n?`Expand session tasks`:`Collapse session tasks`,className:i(`flex w-full min-w-0 items-center gap-2 text-left`,!n&&`mb-1.5`),children:[(0,b.jsx)(`span`,{className:`flex h-5 w-5 shrink-0 items-center justify-center rounded bg-muted/60`,children:(0,b.jsx)(o,{className:`h-3 w-3 text-muted-foreground`})}),(0,b.jsxs)(`span`,{className:`flex-1 text-[11px] font-semibold uppercase tracking-wider text-muted-foreground`,children:[`Tasks from this session (`,a.length,`)`]}),(0,b.jsx)(`span`,{className:`flex h-5 w-5 shrink-0 items-center justify-center rounded text-muted-foreground hover:bg-muted/60 hover:text-foreground`,children:n?(0,b.jsx)(l,{className:`h-3.5 w-3.5`}):(0,b.jsx)(u,{className:`h-3.5 w-3.5`})})]}),!n&&(0,b.jsx)(`div`,{className:`flex flex-wrap gap-1`,children:a.map(e=>(0,b.jsx)(m,{id:e.id,title:e.title,status:e.status,onClick:()=>t(e.id),compact:!0},e.id))})]})}export{M as n,j as t};
-//# sourceMappingURL=PlanGraphPanel-B9TN_KQr.js.map