agent-relay-server 0.25.0 → 0.27.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-server",
-  "version": "0.25.0",
+  "version": "0.27.0",
   "description": "Lightweight HTTP message relay for inter-agent communication across machines",
   "module": "src/index.ts",
   "type": "module",
@@ -33,7 +33,7 @@
     "CONTRIBUTING.md"
   ],
   "dependencies": {
-    "agent-relay-sdk": "0.2.14"
+    "agent-relay-sdk": "0.2.16"
   },
   "scripts": {
     "prepack": "bun run build:dashboard:bundle >&2",

package/public/index.html

@@ -11806,36 +11806,36 @@ function downloadText(filename, text, type) {
 }
 //#endregion
 //#region ../sdk/src/provider-catalog.ts
-var CLAUDE_LOW_TO_MAX = [
+var CLAUDE_LOW_TO_MAX$1 = [
 	"low",
 	"medium",
 	"high",
 	"max"
 ];
-var CLAUDE_LOW_TO_XHIGH_MAX = [
+var CLAUDE_LOW_TO_XHIGH_MAX$1 = [
 	"low",
 	"medium",
 	"high",
 	"xhigh",
 	"max"
 ];
-var CODEX_REASONING = [
+var CODEX_REASONING$1 = [
 	"low",
 	"medium",
 	"high",
 	"xhigh"
 ];
-var CONTEXT_200K = {
+var CONTEXT_200K$1 = {
 	value: 2e5,
 	source: "catalog",
 	confidence: "declared"
 };
-var CONTEXT_1M = {
+var CONTEXT_1M$1 = {
 	value: 1e6,
 	source: "catalog",
 	confidence: "declared"
 };
-var CODE_MODEL_CAPABILITIES = {
+var CODE_MODEL_CAPABILITIES$1 = {
 	modalities: {
 		input: {
 			text: true,
@@ -11852,88 +11852,96 @@ var CODE_MODEL_CAPABILITIES = {
 	source: "catalog",
 	confidence: "declared"
 };
-function codeModel(limits) {
+function codeModel$1(limits) {
 	return {
 		...limits ? { limits } : {},
-		capabilities: CODE_MODEL_CAPABILITIES
+		capabilities: CODE_MODEL_CAPABILITIES$1
 	};
 }
-var PROVIDER_CATALOG = {
+var PROVIDER_CATALOG$1 = {
 	claude: {
 		provider: "claude",
 		label: "Claude Code",
 		defaultModel: "sonnet-4.6",
 		models: [
+			{
+				alias: "fable-5",
+				label: "Fable 5",
+				providerModel: "claude-fable-5",
+				efforts: CLAUDE_LOW_TO_XHIGH_MAX$1,
+				defaultEffort: "medium",
+				...codeModel$1({ contextWindowTokens: CONTEXT_1M$1 })
+			},
 			{
 				alias: "opus-4.8",
 				label: "Opus 4.8",
 				providerModel: "claude-opus-4-8",
-				efforts: CLAUDE_LOW_TO_XHIGH_MAX,
+				efforts: CLAUDE_LOW_TO_XHIGH_MAX$1,
 				defaultEffort: "medium",
-				...codeModel({ contextWindowTokens: CONTEXT_200K })
+				...codeModel$1({ contextWindowTokens: CONTEXT_200K$1 })
 			},
 			{
 				alias: "opus-4.8[1m]",
 				label: "Opus 4.8 1M",
 				providerModel: "claude-opus-4-8[1m]",
-				efforts: CLAUDE_LOW_TO_XHIGH_MAX,
+				efforts: CLAUDE_LOW_TO_XHIGH_MAX$1,
 				defaultEffort: "medium",
-				...codeModel({ contextWindowTokens: CONTEXT_1M })
+				...codeModel$1({ contextWindowTokens: CONTEXT_1M$1 })
 			},
 			{
 				alias: "opus-4.7",
 				label: "Opus 4.7",
 				providerModel: "claude-opus-4-7",
-				efforts: CLAUDE_LOW_TO_XHIGH_MAX,
+				efforts: CLAUDE_LOW_TO_XHIGH_MAX$1,
 				defaultEffort: "medium",
-				...codeModel({ contextWindowTokens: CONTEXT_200K })
+				...codeModel$1({ contextWindowTokens: CONTEXT_200K$1 })
 			},
 			{
 				alias: "opus-4.7[1m]",
 				label: "Opus 4.7 1M",
 				providerModel: "claude-opus-4-7[1m]",
-				efforts: CLAUDE_LOW_TO_XHIGH_MAX,
+				efforts: CLAUDE_LOW_TO_XHIGH_MAX$1,
 				defaultEffort: "medium",
-				...codeModel({ contextWindowTokens: CONTEXT_1M })
+				...codeModel$1({ contextWindowTokens: CONTEXT_1M$1 })
 			},
 			{
 				alias: "opus-4.6",
 				label: "Opus 4.6",
 				providerModel: "claude-opus-4-6",
-				efforts: CLAUDE_LOW_TO_MAX,
+				efforts: CLAUDE_LOW_TO_MAX$1,
 				defaultEffort: "medium",
-				...codeModel({ contextWindowTokens: CONTEXT_200K })
+				...codeModel$1({ contextWindowTokens: CONTEXT_200K$1 })
 			},
 			{
 				alias: "opus-4.6[1m]",
 				label: "Opus 4.6 1M",
 				providerModel: "claude-opus-4-6[1m]",
-				efforts: CLAUDE_LOW_TO_MAX,
+				efforts: CLAUDE_LOW_TO_MAX$1,
 				defaultEffort: "medium",
-				...codeModel({ contextWindowTokens: CONTEXT_1M })
+				...codeModel$1({ contextWindowTokens: CONTEXT_1M$1 })
 			},
 			{
 				alias: "sonnet-4.6",
 				label: "Sonnet 4.6",
 				providerModel: "claude-sonnet-4-6",
-				efforts: CLAUDE_LOW_TO_MAX,
+				efforts: CLAUDE_LOW_TO_MAX$1,
 				defaultEffort: "medium",
-				...codeModel({ contextWindowTokens: CONTEXT_200K })
+				...codeModel$1({ contextWindowTokens: CONTEXT_200K$1 })
 			},
 			{
 				alias: "sonnet-4.6[1m]",
 				label: "Sonnet 4.6 1M",
 				providerModel: "claude-sonnet-4-6[1m]",
-				efforts: CLAUDE_LOW_TO_MAX,
+				efforts: CLAUDE_LOW_TO_MAX$1,
 				defaultEffort: "medium",
-				...codeModel({ contextWindowTokens: CONTEXT_1M })
+				...codeModel$1({ contextWindowTokens: CONTEXT_1M$1 })
 			},
 			{
 				alias: "haiku",
 				label: "Haiku",
 				providerModel: "haiku",
 				efforts: [],
-				...codeModel()
+				...codeModel$1()
 			}
 		]
 	},
@@ -11946,49 +11954,49 @@ var PROVIDER_CATALOG = {
 				alias: "gpt-5.5",
 				label: "GPT-5.5",
 				providerModel: "gpt-5.5",
-				efforts: CODEX_REASONING,
+				efforts: CODEX_REASONING$1,
 				defaultEffort: "medium",
-				...codeModel({ contextWindowTokens: CONTEXT_200K })
+				...codeModel$1({ contextWindowTokens: CONTEXT_200K$1 })
 			},
 			{
 				alias: "gpt-5.4",
 				label: "GPT-5.4",
 				providerModel: "gpt-5.4",
-				efforts: CODEX_REASONING,
+				efforts: CODEX_REASONING$1,
 				defaultEffort: "medium",
-				...codeModel({ contextWindowTokens: CONTEXT_200K })
+				...codeModel$1({ contextWindowTokens: CONTEXT_200K$1 })
 			},
 			{
 				alias: "gpt-5.4-mini",
 				label: "GPT-5.4 Mini",
 				providerModel: "gpt-5.4-mini",
-				efforts: CODEX_REASONING,
+				efforts: CODEX_REASONING$1,
 				defaultEffort: "medium",
-				...codeModel({ contextWindowTokens: CONTEXT_200K })
+				...codeModel$1({ contextWindowTokens: CONTEXT_200K$1 })
 			},
 			{
 				alias: "gpt-5.3-codex",
 				label: "GPT-5.3 Codex",
 				providerModel: "gpt-5.3-codex",
-				efforts: CODEX_REASONING,
+				efforts: CODEX_REASONING$1,
 				defaultEffort: "medium",
-				...codeModel({ contextWindowTokens: CONTEXT_200K })
+				...codeModel$1({ contextWindowTokens: CONTEXT_200K$1 })
 			},
 			{
 				alias: "gpt-5.3-codex-spark",
 				label: "GPT-5.3 Codex Spark",
 				providerModel: "gpt-5.3-codex-spark",
-				efforts: CODEX_REASONING,
+				efforts: CODEX_REASONING$1,
 				defaultEffort: "high",
-				...codeModel({ contextWindowTokens: CONTEXT_200K })
+				...codeModel$1({ contextWindowTokens: CONTEXT_200K$1 })
 			},
 			{
 				alias: "gpt-5.2",
 				label: "GPT-5.2",
 				providerModel: "gpt-5.2",
-				efforts: CODEX_REASONING,
+				efforts: CODEX_REASONING$1,
 				defaultEffort: "medium",
-				...codeModel({ contextWindowTokens: CONTEXT_200K })
+				...codeModel$1({ contextWindowTokens: CONTEXT_200K$1 })
 			}
 		]
 	}
@@ -11999,7 +12007,7 @@ function firstAvailableProvider(orchestrator) {
 	return orchestrator?.providers[0] ?? "claude";
 }
 function defaultModelFor(provider) {
-	return PROVIDER_CATALOG[provider]?.defaultModel ?? "";
+	return PROVIDER_CATALOG$1[provider]?.defaultModel ?? "";
 }
 function pathWithinBase(path, baseDir) {
 	const value = path.trim().replace(/\\/g, "/").replace(/\/+$/, "");
@@ -13876,7 +13884,7 @@ var useRelayStore = create$1()(persist((set, get) => ({
 		const provCaps = agent.providerCapabilities;
 		const provider = provCaps?.model?.provider || (typeof agent.meta?.provider === "string" ? agent.meta.provider : "");
 		const reportedModel = provCaps?.model?.alias || provCaps?.model?.id || "";
-		const model = ((provider ? PROVIDER_CATALOG[provider] : void 0)?.models.find((m) => m.alias === reportedModel || m.providerModel === reportedModel))?.alias || "";
+		const model = ((provider ? PROVIDER_CATALOG$1[provider] : void 0)?.models.find((m) => m.alias === reportedModel || m.providerModel === reportedModel))?.alias || "";
 		const effort = provCaps?.model?.effort || "";
 		const cwd = typeof agent.meta?.cwd === "string" ? agent.meta.cwd : "";
 		const approval = provCaps?.session?.approvalMode || (typeof agent.meta?.approvalMode === "string" ? agent.meta.approvalMode : "guarded");
@@ -91948,10 +91956,10 @@ function wrap(middleware, callback) {
 //#endregion
 //#region node_modules/vfile/lib/minpath.browser.js
 var minpath = {
-	basename: basename$2,
-	dirname,
+	basename: basename$3,
+	dirname: dirname$1,
 	extname,
-	join,
+	join: join$1,
 	sep: "/"
 };
 /**
@@ -91964,7 +91972,7 @@ var minpath = {
 * @returns {string}
 *   Stem or basename.
 */
-function basename$2(path, extname) {
+function basename$3(path, extname) {
 	if (extname !== void 0 && typeof extname !== "string") throw new TypeError("\"ext\" argument must be a string");
 	assertPath$1(path);
 	let start = 0;
@@ -92016,7 +92024,7 @@ function basename$2(path, extname) {
 * @returns {string}
 *   File path.
 */
-function dirname(path) {
+function dirname$1(path) {
 	assertPath$1(path);
 	if (path.length === 0) return ".";
 	let end = -1;
@@ -92077,7 +92085,7 @@ function extname(path) {
 * @returns {string}
 *   File path.
 */
-function join(...segments) {
+function join$1(...segments) {
 	let index = -1;
 	/** @type {string | undefined} */
 	let joined;
@@ -101370,10 +101378,10 @@ function mergeObjects(target, ...sources) {
 	});
 	return target;
 }
-function basename$1(path) {
+function basename$2(path) {
 	const idx = ~path.lastIndexOf("/") || ~path.lastIndexOf("\\");
 	if (idx === 0) return path;
-	else if (~idx === path.length - 1) return basename$1(path.substring(0, path.length - 1));
+	else if (~idx === path.length - 1) return basename$2(path.substring(0, path.length - 1));
 	else return path.substr(~idx + 1);
 }
 function strcmp(a, b) {
@@ -102426,7 +102434,7 @@ var init_dist$2 = __esmMin((() => {
 			this._contentNameIsCapturing = RegexSource.hasCaptures(this._contentName);
 		}
 		get debugName() {
-			const location = this.$location ? `${basename$1(this.$location.filename)}:${this.$location.line}` : "unknown";
+			const location = this.$location ? `${basename$2(this.$location.filename)}:${this.$location.line}` : "unknown";
 			return `${this.constructor.name}#${this.id} @ ${location}`;
 		}
 		getName(lineText, captureIndices) {
@@ -108590,7 +108598,7 @@ function getShiki() {
 function byteLength(value) {
 	return new TextEncoder().encode(value).length;
 }
-function basename(path) {
+function basename$1(path) {
 	return path.split("/").filter(Boolean).pop() || path;
 }
 function detectShebangLanguage(content) {
@@ -108609,7 +108617,7 @@ function detectShebangLanguage(content) {
 }
 function detectCodeLanguage(path, mediaType, languageHint, content) {
 	if (languageHint) return languageHint;
-	const name = basename(path).toLowerCase();
+	const name = basename$1(path).toLowerCase();
 	if (BASENAME_LANGUAGES[name]) return BASENAME_LANGUAGES[name];
 	if (name.endsWith(".d.ts")) return "typescript";
 	const shebangLanguage = detectShebangLanguage(content);
@@ -129418,6 +129426,51 @@ function OrchestratorsView() {
 	});
 }
 //#endregion
+//#region ../sdk/dist/types.js
+/** Terminal workspace statuses shared across server + dashboard filters. */
+var TERMINAL_WORKSPACE_STATUS_VALUES = [
+	"cleaned",
+	"merged",
+	"abandoned"
+];
+var CONTEXT_200K = {
+	value: 2e5,
+	source: "catalog",
+	confidence: "declared"
+};
+var CONTEXT_1M = {
+	value: 1e6,
+	source: "catalog",
+	confidence: "declared"
+};
+var CODE_MODEL_CAPABILITIES = {
+	modalities: {
+		input: {
+			text: true,
+			image: true
+		},
+		output: { text: true }
+	},
+	tools: {
+		code: true,
+		review: true,
+		debug: true,
+		refactor: true
+	},
+	source: "catalog",
+	confidence: "declared"
+};
+function codeModel(limits) {
+	return {
+		...limits ? { limits } : {},
+		capabilities: CODE_MODEL_CAPABILITIES
+	};
+}
+({ ...codeModel({ contextWindowTokens: CONTEXT_1M }) }), { ...codeModel({ contextWindowTokens: CONTEXT_200K }) }, { ...codeModel({ contextWindowTokens: CONTEXT_1M }) }, { ...codeModel({ contextWindowTokens: CONTEXT_200K }) }, { ...codeModel({ contextWindowTokens: CONTEXT_1M }) }, { ...codeModel({ contextWindowTokens: CONTEXT_200K }) }, { ...codeModel({ contextWindowTokens: CONTEXT_1M }) }, { ...codeModel({ contextWindowTokens: CONTEXT_200K }) }, { ...codeModel({ contextWindowTokens: CONTEXT_1M }) }, { ...codeModel() }, { ...codeModel({ contextWindowTokens: CONTEXT_200K }) }, { ...codeModel({ contextWindowTokens: CONTEXT_200K }) }, { ...codeModel({ contextWindowTokens: CONTEXT_200K }) }, { ...codeModel({ contextWindowTokens: CONTEXT_200K }) }, { ...codeModel({ contextWindowTokens: CONTEXT_200K }) }, { ...codeModel({ contextWindowTokens: CONTEXT_200K }) };
+(0, (/* @__PURE__ */ __commonJSMin(((exports, module) => {
+	module.exports = {};
+})))().tmpdir)();
+//#endregion
 //#region src/components/views/workspaces.tsx
 var LIVE_STATUSES = new Set([
 	"active",
@@ -129474,7 +129527,7 @@ var STATUS_ORDER = {
 	abandoned: 7,
 	cleaned: 8
 };
-var TERMINAL_STATUSES = new Set(["cleaned", "merged"]);
+var TERMINAL_STATUSES = new Set(TERMINAL_WORKSPACE_STATUS_VALUES);
 function shortPath(path) {
 	const parts = path.split("/").filter(Boolean);
 	if (parts.length <= 3) return path || "-";
@@ -133144,7 +133197,7 @@ function blankForm(orchestratorId = "") {
 		orchestratorId,
 		targetMode: "existing_agent",
 		provider: "codex",
-		model: PROVIDER_CATALOG.codex.defaultModel || "",
+		model: PROVIDER_CATALOG$1.codex.defaultModel || "",
 		effort: "",
 		profile: "default-relay",
 		label: "",
@@ -133183,7 +133236,7 @@ function automationToForm(automation) {
 		orchestratorId: automation.orchestratorId,
 		targetMode: policy.mode,
 		provider: policy.mode === "on_demand_agent" ? policy.provider : policy.selector.provider || "codex",
-		model: policy.mode === "on_demand_agent" ? policy.model || PROVIDER_CATALOG[policy.provider].defaultModel || "" : "",
+		model: policy.mode === "on_demand_agent" ? policy.model || PROVIDER_CATALOG$1[policy.provider].defaultModel || "" : "",
 		effort: policy.mode === "on_demand_agent" ? policy.effort || "" : "",
 		profile: policy.mode === "on_demand_agent" ? policy.profile || "default-relay" : "default-relay",
 		label: policy.mode === "existing_agent" ? policy.selector.label || "" : "",
@@ -133593,21 +133646,21 @@ function AutomationCard({ automation, runs, now, selected, onEdit, onRun, onTogg
 }
 function AutomationEditor({ form, selected, saving, orchestrators, agentProfiles, onChange, onSave }) {
 	const providers = orchestrators.find((orch) => orch.id === form.orchestratorId)?.providers || [];
-	const models = PROVIDER_CATALOG[form.provider]?.models || [];
+	const models = PROVIDER_CATALOG$1[form.provider]?.models || [];
 	const efforts = models.find((model) => model.alias === form.model)?.efforts || [];
 	function selectOrchestrator(orchestratorId) {
 		const provider = orchestrators.find((orch) => orch.id === orchestratorId)?.providers[0] || form.provider;
 		onChange({
 			orchestratorId,
 			provider,
-			model: PROVIDER_CATALOG[provider]?.defaultModel || "",
+			model: PROVIDER_CATALOG$1[provider]?.defaultModel || "",
 			effort: ""
 		});
 	}
 	function selectProvider(provider) {
 		onChange({
 			provider,
-			model: PROVIDER_CATALOG[provider]?.defaultModel || "",
+			model: PROVIDER_CATALOG$1[provider]?.defaultModel || "",
 			effort: ""
 		});
 	}
@@ -157363,7 +157416,7 @@ function OrchestratorSpawnModal() {
 	const agentProfiles = useRelayStore((s) => s.agentProfiles);
 	const orch = orchestrators.find((o) => o.id === orchId);
 	const providers = orch?.providers || [];
-	const models = PROVIDER_CATALOG[provider]?.models || [];
+	const models = PROVIDER_CATALOG$1[provider]?.models || [];
 	const selectedModel = models.find((m) => m.alias === model);
 	const efforts = selectedModel?.efforts || [];
 	const canSpawn = Boolean(orch && providers.length > 0 && cwd.trim());
@@ -157373,7 +157426,7 @@ function OrchestratorSpawnModal() {
 		set({
 			spawnOrchId: nextId,
 			spawnProvider: nextProvider,
-			spawnModel: nextProvider ? PROVIDER_CATALOG[nextProvider]?.defaultModel || "" : "",
+			spawnModel: nextProvider ? PROVIDER_CATALOG$1[nextProvider]?.defaultModel || "" : "",
 			spawnEffort: "",
 			spawnCwd: nextOrch?.baseDir || ""
 		});
@@ -157381,7 +157434,7 @@ function OrchestratorSpawnModal() {
 	function selectProvider(nextProvider) {
 		set({
 			spawnProvider: nextProvider,
-			spawnModel: PROVIDER_CATALOG[nextProvider]?.defaultModel || "",
+			spawnModel: PROVIDER_CATALOG$1[nextProvider]?.defaultModel || "",
 			spawnEffort: ""
 		});
 	}
@@ -157710,7 +157763,7 @@ function ManagedPolicyModal() {
 	const submitPolicy = useRelayStore((s) => s.submitPolicy);
 	const orch = orchestrators.find((o) => o.id === m.orchestratorId);
 	const providers = orch?.providers || [];
-	const models = PROVIDER_CATALOG[m.provider]?.models || [];
+	const models = PROVIDER_CATALOG$1[m.provider]?.models || [];
 	const selectedModel = models.find((model) => model.alias === m.model);
 	const efforts = selectedModel?.efforts || [];
 	const isEditing = Boolean(m.editing);
@@ -157726,7 +157779,7 @@ function ManagedPolicyModal() {
 		update({
 			orchestratorId,
 			provider,
-			model: PROVIDER_CATALOG[provider]?.defaultModel || "",
+			model: PROVIDER_CATALOG$1[provider]?.defaultModel || "",
 			effort: ""
 		});
 	}
@@ -157734,7 +157787,7 @@ function ManagedPolicyModal() {
 		update({
 			provider,
 			rig: "",
-			model: PROVIDER_CATALOG[provider]?.defaultModel || "",
+			model: PROVIDER_CATALOG$1[provider]?.defaultModel || "",
 			effort: ""
 		});
 	}

package/src/branch-landed.ts

@@ -1,7 +1,9 @@
 import { emitRelayEvent } from "./events";
 import { getNotificationsConfig } from "./config-store";
 import { notifySystemMessage } from "./notify";
-import type { WorkspaceRecord } from "./types";
+import { listAgents } from "./db";
+import { isAgentOnline } from "./agent-ref";
+import type { AgentCard, WorkspaceRecord } from "./types";
 
 export interface BranchLandedInput {
   /**
@@ -52,26 +54,58 @@ export function notifyBranchLanded(input: BranchLandedInput): void {
   if (!config.enabled || !config.branchLanded) return;
 
   const author = workspace.ownerAgentId;
-  if (!author) return;
-
-  const branchLabel = landedBranch ? `\`${landedBranch}\`` : "Your branch";
   const shaLabel = shortSha ? ` as \`${shortSha}\`` : "";
   const subjectLabel = input.subject ? ` — "${input.subject}"` : "";
-  const continueLabel = input.newBranch
-    ? ` You're now on \`${input.newBranch}\` — keep working there.`
-    : " Worktree reclaimed.";
+  const payload = {
+    kind: "branch.landed",
+    workspaceId: workspace.id,
+    repoRoot: workspace.repoRoot,
+    branch: landedBranch,
+    base,
+    sha: input.mergedSha,
+    author,
+    newBranch: input.newBranch,
+  };
 
-  notifySystemMessage(author, {
-    subject: "Your branch landed",
-    body: `✅ ${branchLabel} landed on \`${base}\`${shaLabel}${subjectLabel}.${continueLabel}`,
-    payload: {
-      kind: "branch.landed",
-      workspaceId: workspace.id,
-      repoRoot: workspace.repoRoot,
-      branch: landedBranch,
-      base,
-      sha: input.mergedSha,
-      newBranch: input.newBranch,
-    },
+  // The branch author cares most — push regardless of online (store-ahead delivers it on
+  // next poll if they've moved on, #234). They land-and-continue onto the recycled branch.
+  if (author) {
+    const branchLabel = landedBranch ? `\`${landedBranch}\`` : "Your branch";
+    const continueLabel = input.newBranch
+      ? ` You're now on \`${input.newBranch}\` — keep working there.`
+      : " Worktree reclaimed.";
+    notifySystemMessage(author, {
+      subject: "Your branch landed",
+      body: `✅ ${branchLabel} landed on \`${base}\`${shaLabel}${subjectLabel}.${continueLabel}`,
+      payload,
+    });
+  }
+
+  // Agents on `main` — those whose cwd IS the main checkout (not an isolated worktree) —
+  // get a live "merged" notice so a long-lived main agent's context stays current as work
+  // lands under it (#239). Online-only: a stale/exited main session needs no wake, and
+  // store-ahead to it would just pile up noise. The author is in a worktree (cwd ≠ repoRoot)
+  // so it's naturally excluded; guard anyway for shared-mode owners.
+  const branchLabel = landedBranch ? `\`${landedBranch}\`` : "A branch";
+  const authorLabel = author ? ` by \`${author}\`` : "";
+  for (const agent of agentsOnMain(workspace.repoRoot, author)) {
+    notifySystemMessage(agent.id, {
+      subject: `Merged to ${base}`,
+      body: `🔀 ${branchLabel}${authorLabel} merged to \`${base}\`${shaLabel}${subjectLabel}.`,
+      payload,
+    });
+  }
+}
+
+// An agent is "on `main`" when its registered cwd equals the repo's main checkout — i.e. it
+// works in the base, not an isolated worktree. Excludes the author, pseudo agents (system/
+// user), channels, and offline sessions.
+function agentsOnMain(repoRoot: string, author: string | undefined): AgentCard[] {
+  return listAgents().filter((a) => {
+    if (a.id === author || a.id === "system" || a.id === "user") return false;
+    if (a.kind === "channel" || a.meta?.kind === "channel") return false;
+    const cwd = a.meta?.cwd;
+    if (typeof cwd !== "string" || cwd !== repoRoot) return false;
+    return isAgentOnline(a);
   });
 }

package/src/maintenance.ts

@@ -33,6 +33,7 @@ import {
 import type { WorkspaceMergePreview, WorkspaceRecord, WorkspaceStatus } from "./types";
 import { requestWorkspaceMerge } from "./workspace-merge";
 import { workspaceActiveClaim } from "./workspace-claim";
+import { reapOrphanedWorktrees } from "./workspace-orphans";
 import { READY_TO_LAND_STATUSES, TERMINAL_WORKSPACE_STATUSES } from "./workspace-phase";
 import { errMessage, RELAY_TOKEN_HEADER } from "agent-relay-sdk";
 import { getStewardConfig } from "./config-store";
@@ -66,6 +67,10 @@ const DB_VACUUM_EVERY = Number(process.env.AGENT_RELAY_DB_VACUUM_EVERY) || 7;
 let dbMaintenanceRuns = 0;
 const WORKSPACE_REVIEW_TTL_MS = Number(process.env.AGENT_RELAY_WORKSPACE_REVIEW_TTL_MS) || 3 * DAY_MS;
 const WORKSPACE_GC_INTERVAL_MS = Number(process.env.AGENT_RELAY_WORKSPACE_GC_INTERVAL_MS) || 60 * 60 * 1000;
+// Disk⇄DB orphan reconcile cadence (#244). Runs on start for a boot-time pass,
+// then periodically — orphans accrue slowly (one per crashed/killed session), so
+// a 30-min sweep is plenty without hammering the hosts with probes.
+const WORKSPACE_ORPHAN_REAPER_INTERVAL_MS = Number(process.env.AGENT_RELAY_WORKSPACE_ORPHAN_REAPER_INTERVAL_MS) || 30 * 60 * 1000;
 // Deterministic auto-land (Layer 0): merge clean fast-forwards with no human in
 // the loop. Default on for the seamless workflow; set AGENT_RELAY_WORKSPACE_AUTO_MERGE=0
 // to require a manual or steward merge per repo. Read at call-time so operators can
@@ -411,6 +416,15 @@ const definitions: MaintenanceJobDefinition[] = [
     timeoutMs: 60 * 1000,
     handler: workspaceGC,
   },
+  {
+    id: "workspace-orphan-reaper",
+    title: "Workspace orphan reaper",
+    description: "Reconcile disk⇄DB: reap orphaned worktrees whose work has landed (or is empty), flag orphans holding un-landed work as needs-attention instead of deleting, and report rows whose worktree vanished. git worktree prune can't do this — it no-ops while the directory still exists.",
+    intervalMs: WORKSPACE_ORPHAN_REAPER_INTERVAL_MS,
+    runOnStart: true,
+    timeoutMs: 2 * 60 * 1000,
+    handler: reapOrphanedWorktrees,
+  },
 ];
 
 function workspacePathWithinBase(path: string | undefined, baseDir: string | undefined): boolean {