agent-relay-server 0.29.0 → 0.30.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-server",
-  "version": "0.29.0",
+  "version": "0.30.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.18"
+    "agent-relay-sdk": "0.2.19"
   },
   "scripts": {
     "prepack": "bun run build:dashboard:bundle >&2",

package/public/index.html

@@ -11190,6 +11190,17 @@ function shortPath$1(cwd, segments = 2) {
 	const parts = cwd.replace(/\/+$/, "").split("/");
 	return parts.length <= segments ? cwd : parts.slice(-segments).join("/");
 }
+function normalizePathForCompare(path) {
+	return path.trim().replace(/\\/g, "/").replace(/\/+$/, "") || "/";
+}
+function pathWithinBase(path, baseDir) {
+	if (!path?.trim() || !baseDir?.trim()) return false;
+	const normalizedPath = normalizePathForCompare(path);
+	const normalizedBase = normalizePathForCompare(baseDir);
+	if (normalizedBase === "/") return normalizedPath.startsWith("/");
+	if (normalizedPath === "/") return false;
+	return normalizedPath === normalizedBase || normalizedPath.startsWith(normalizedBase + "/");
+}
 function isBuiltInAgent(agent) {
 	return agent?.meta?.builtin === true || agent?.id === "user" || agent?.id === "system";
 }
@@ -11355,7 +11366,7 @@ function isClaimableTaskWaiting(task) {
 function isClaimableMessageWaiting(msg) {
 	return Boolean(msg.claimable && !msg.claimedBy && !(msg.kind === "task" && Number.isSafeInteger(msg.payload?.taskId)));
 }
-function targetMatchesAgent(target, agent) {
+function dashboardTargetMatchesAgent(target, agent) {
 	if (!target || !agent) return false;
 	if (target === "broadcast" || target === agent.id) return true;
 	if (target.startsWith("tag:")) return (agent.tags || []).includes(target.slice(4));
@@ -11749,7 +11760,7 @@ function timeAgo(now, iso) {
 	if (diff < 86400) return Math.floor(diff / 3600) + "h ago";
 	return Math.floor(diff / 86400) + "d ago";
 }
-function fmtTime$1(iso) {
+function fmtTime(iso) {
 	if (!iso) return "";
 	return new Date(iso).toLocaleString();
 }
@@ -12066,12 +12077,6 @@ function firstAvailableProvider(orchestrator) {
 function defaultModelFor(provider) {
 	return PROVIDER_CATALOG[provider]?.defaultModel ?? "";
 }
-function pathWithinBase(path, baseDir) {
-	const value = path.trim().replace(/\\/g, "/").replace(/\/+$/, "");
-	const base = (baseDir || "").trim().replace(/\\/g, "/").replace(/\/+$/, "");
-	if (!value || !base) return false;
-	return value === base || value.startsWith(base + "/");
-}
 function indexAgents(agents) {
 	const byId = {};
 	for (const agent of agents) byId[agent.id] = agent;
@@ -12191,16 +12196,8 @@ function renderTimelineMarkdown(events, exportedAt) {
 	}
 	return lines.join("\n");
 }
-function normalizePathForCompare$1(path) {
-	return path.replace(/\/+$/, "") || "/";
-}
-function pathWithin$1(path, baseDir) {
-	const normalizedPath = normalizePathForCompare$1(path);
-	const normalizedBase = normalizePathForCompare$1(baseDir);
-	return normalizedPath === normalizedBase || normalizedPath.startsWith(normalizedBase + "/");
-}
 function orchestratorForPath(orchestrators, path) {
-	return orchestrators.filter((orch) => orch.status === "online" && pathWithin$1(path, orch.baseDir)).sort((a, b) => normalizePathForCompare$1(b.baseDir).length - normalizePathForCompare$1(a.baseDir).length)[0];
+	return orchestrators.filter((orch) => orch.status === "online" && pathWithinBase(path, orch.baseDir)).sort((a, b) => normalizePathForCompare(b.baseDir).length - normalizePathForCompare(a.baseDir).length)[0];
 }
 function orchestratorForAgent(orchestrators, agent) {
 	const managed = orchestrators.find((orch) => orch.managedAgents.some((managedAgent) => managedAgent.agentId === agent.id));
@@ -12293,6 +12290,7 @@ var useRelayStore = create$1()(persist((set, get) => ({
 	health: null,
 	maintenanceJobs: [],
 	workspaces: [],
+	workspaceFocusId: null,
 	workspaceGitState: {},
 	workspaceMergePreview: {},
 	workspaceDiff: {},
@@ -12593,6 +12591,10 @@ var useRelayStore = create$1()(persist((set, get) => ({
 		if (view === "files") await s.fetchOrchestrators();
 		if (view === "analytics") await s.fetchAnalytics();
 	},
+	async openWorkspaceFocus(workspaceId) {
+		set({ workspaceFocusId: workspaceId });
+		await get().switchView("workspaces");
+	},
 	startClock() {
 		useClock.getState().start();
 	},
@@ -25823,7 +25825,7 @@ function useAgentAttention(agent) {
 		const archivedAt = Number(archivedThreads[agent.id] || 0);
 		const unread = archivedAt >= peerMessages.filter(isHumanInboundMessage).reduce((max, m) => Math.max(max, m.id), 0) && archivedAt > 0 ? 0 : peerMessages.filter((m) => isHumanInboundMessage(m) && !isSessionActivityStep(m) && !(m.readBy || []).includes("user") && m.id > cursor).length;
 		const pendingPairInvite = pairs.find((p) => (p.status === "active" || p.status === "pending") && (p.requesterId === agent.id || p.targetId === agent.id))?.status === "pending";
-		const claimableTasks = tasks.filter((t) => isClaimableTaskWaiting(t) && targetMatchesAgent(t.target, agent)).length + messages.filter((m) => isClaimableMessageWaiting(m) && targetMatchesAgent(m.to, agent)).length;
+		const claimableTasks = tasks.filter((t) => isClaimableTaskWaiting(t) && dashboardTargetMatchesAgent(t.target, agent)).length + messages.filter((m) => isClaimableMessageWaiting(m) && dashboardTargetMatchesAgent(m.to, agent)).length;
 		return {
 			unread,
 			pendingPairInvite,
@@ -109163,6 +109165,60 @@ function formatTokenCount(tokens) {
 	return String(tokens);
 }
 //#endregion
+//#region src/components/shared/branch-state-badge.tsx
+var BRANCH_STATE_META = {
+	idle: {
+		label: "idle",
+		tip: "Branch worktree — nothing to land yet.",
+		className: "bg-zinc-500/10 text-zinc-400 border-zinc-500/20",
+		Icon: Circle
+	},
+	changes: {
+		label: "changes",
+		tip: "Unlanded work in this branch — use \"Mark workspace ready\" to land it.",
+		className: "bg-amber-500/10 text-amber-400 border-amber-500/20",
+		Icon: GitCommitHorizontal
+	},
+	ready: {
+		label: "ready",
+		tip: "Handed off — the relay auto-merge will land it (~2 min sweep).",
+		className: "bg-blue-500/10 text-blue-400 border-blue-500/20",
+		Icon: CircleArrowUp
+	},
+	steward: {
+		label: "steward",
+		tip: "Under reconciliation — a steward is landing it. No action needed.",
+		className: "bg-orange-500/10 text-orange-400 border-orange-500/20",
+		Icon: Wrench
+	},
+	blocked: {
+		label: "blocked",
+		tip: "Escalated — the auto-merge/steward path is stuck. Needs human attention.",
+		className: "bg-red-500/10 text-red-400 border-red-500/20",
+		Icon: TriangleAlert
+	}
+};
+function BranchStateBadge({ state, onClick, iconOnly = false, className }) {
+	const meta = BRANCH_STATE_META[state];
+	const { Icon } = meta;
+	const interactive = Boolean(onClick);
+	const tip = interactive ? `${meta.tip} Click to open this workspace.` : meta.tip;
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+		role: interactive ? "button" : void 0,
+		tabIndex: interactive ? 0 : void 0,
+		title: tip,
+		onClick,
+		onKeyDown: interactive ? (e) => {
+			if (e.key === "Enter" || e.key === " ") {
+				e.preventDefault();
+				onClick?.(e);
+			}
+		} : void 0,
+		className: cn$2("inline-flex items-center gap-1 rounded-full border px-1.5 py-0.5 text-[10px] font-medium leading-none", meta.className, interactive && "cursor-pointer hover:brightness-125 focus:outline-none focus:ring-1 focus:ring-current", className),
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Icon, { className: "h-2.5 w-2.5 shrink-0" }), !iconOnly && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: meta.label })]
+	});
+}
+//#endregion
 //#region node_modules/@xterm/xterm/lib/xterm.mjs
 /**
 * Copyright (c) 2014-2024 The xterm.js authors. All rights reserved.
@@ -127362,16 +127418,8 @@ function parentPath$1(path) {
 	const index = trimmed.lastIndexOf("/");
 	return index > 0 ? trimmed.slice(0, index) : "/";
 }
-function normalizePathForCompare(path) {
-	return path.replace(/\/+$/, "") || "/";
-}
-function pathWithin(path, baseDir) {
-	const normalizedPath = normalizePathForCompare(path);
-	const normalizedBase = normalizePathForCompare(baseDir);
-	return normalizedPath === normalizedBase || normalizedPath.startsWith(normalizedBase + "/");
-}
 function orchestratorForFilePreview(orchestrators, path) {
-	return orchestrators.filter((orch) => orch.status === "online" && pathWithin(path, orch.baseDir)).sort((a, b) => normalizePathForCompare(b.baseDir).length - normalizePathForCompare(a.baseDir).length)[0] || orchestrators.find((orch) => orch.status === "online");
+	return orchestrators.filter((orch) => orch.status === "online" && pathWithinBase(path, orch.baseDir)).sort((a, b) => normalizePathForCompare(b.baseDir).length - normalizePathForCompare(a.baseDir).length)[0] || orchestrators.find((orch) => orch.status === "online");
 }
 function supportsSideFilePreview() {
 	return typeof window !== "undefined" && window.matchMedia("(min-width: 1280px)").matches;
@@ -127689,7 +127737,7 @@ function AgentListPanel({ threads, onSelectAgent }) {
 							className: "flex items-center gap-1 shrink-0",
 							children: [lastActivityAt > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 								className: "text-[10px] text-muted-foreground",
-								title: fmtTime$1(lastActivityAt),
+								title: fmtTime(lastActivityAt),
 								children: timeAgo(now, lastActivityAt)
 							}), unread > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Badge$1, {
 								className: "bg-red-500 text-white text-xs min-w-[18px] h-[18px] flex items-center justify-center shrink-0 px-1",
@@ -129204,6 +129252,8 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 	const setReplyDraft = useRelayStore((s) => s.setReplyDraft);
 	const exportThread = useRelayStore((s) => s.exportThread);
 	const doAgentAction = useRelayStore((s) => s.doAgentAction);
+	const workspaceAction = useRelayStore((s) => s.workspaceAction);
+	const openWorkspaceFocus = useRelayStore((s) => s.openWorkspaceFocus);
 	const forkFromAgent = useRelayStore((s) => s.forkFromAgent);
 	const chatHistoryImports = useRelayStore((s) => s.chatHistoryImports);
 	const peerHistory = useRelayStore((s) => s.threadHistory[s.selectedInboxThread] ?? NO_THREAD_HISTORY);
@@ -129552,7 +129602,7 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 		/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 			className: "flex h-full min-w-0",
 			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-				className: "flex h-full min-w-0 flex-1 flex-col",
+				className: "@container/chat flex h-full min-w-0 flex-1 flex-col",
 				children: [
 					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 						className: "flex items-center justify-between px-3 md:px-4 py-2.5 md:py-3 border-b border-border shrink-0",
@@ -129596,11 +129646,16 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 								agent && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AgentRuntimeChips, {
 									agent,
 									compact: true,
-									className: "hidden md:flex shrink-0"
+									className: "hidden @4xl/chat:flex shrink-0"
 								}),
 								agent?.context && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ContextRing, { utilization: agent.context.utilization }),
+								agent?.branchState && agent.branchWorkspaceId && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(BranchStateBadge, {
+									state: agent.branchState,
+									className: "shrink-0",
+									onClick: () => void openWorkspaceFocus(agent.branchWorkspaceId)
+								}),
 								thread?.attention.unread ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Badge$1, {
-									className: "bg-red-500/20 text-red-400 text-xs shrink-0 hidden sm:flex",
+									className: "bg-red-500/20 text-red-400 text-xs shrink-0 hidden @2xl/chat:flex",
 									children: [thread.attention.unread, " unread"]
 								}) : null
 							]
@@ -129623,7 +129678,7 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 								canOpenTerminal && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
 									variant: "ghost",
 									size: "icon-sm",
-									className: "hidden sm:inline-flex",
+									className: "hidden @4xl/chat:inline-flex",
 									disabled: terminalOpening,
 									title: "Terminal",
 									onClick: () => void handleOpenTerminal(),
@@ -129637,10 +129692,18 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 									onClick: interruptAgent,
 									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CircleStop, { className: "w-3.5 h-3.5" })
 								}),
+								agent.branchState === "changes" && agent.branchWorkspaceId && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+									variant: "ghost",
+									size: "icon-sm",
+									className: "hidden @4xl/chat:inline-flex text-amber-400 hover:text-amber-300",
+									title: "Mark workspace ready — hand off to the auto-merge",
+									onClick: () => openConfirm("Mark Workspace Ready", `Mark ${displayName(agent)}'s branch ready to land? The relay auto-merge will rebase and land it.`, () => workspaceAction(agent.branchWorkspaceId, "ready")),
+									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Flag, { className: "w-3.5 h-3.5" })
+								}),
 								canCompact && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
 									variant: "ghost",
 									size: "icon-sm",
-									className: "hidden sm:inline-flex",
+									className: "hidden @4xl/chat:inline-flex",
 									title: "Compact",
 									onClick: () => openConfirm("Compact Agent", `Compact context for ${displayName(agent)}?`, () => doAgentAction(agent, "compact")),
 									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Minimize2, { className: "w-3.5 h-3.5" })
@@ -129648,7 +129711,7 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 								canClearContext && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
 									variant: "ghost",
 									size: "icon-sm",
-									className: "hidden sm:inline-flex",
+									className: "hidden @4xl/chat:inline-flex",
 									title: "Clear context",
 									onClick: () => openConfirm("Clear Context", `Clear context for ${displayName(agent)}?`, () => doAgentAction(agent, "clearContext")),
 									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Eraser, { className: "w-3.5 h-3.5" })
@@ -129656,7 +129719,7 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 								canShutdown && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
 									variant: "ghost",
 									size: "icon-sm",
-									className: "hidden sm:inline-flex",
+									className: "hidden @4xl/chat:inline-flex",
 									title: "Shutdown",
 									onClick: () => openConfirm("Shutdown Agent", `Shutdown ${displayName(agent)}?`, () => doAgentAction(agent, "shutdown")),
 									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Power, { className: "w-3.5 h-3.5" })
@@ -129664,7 +129727,7 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 								agent && typeof agent.meta?.cwd === "string" && agent.meta.cwd && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
 									variant: "ghost",
 									size: "icon-sm",
-									className: "hidden sm:inline-flex",
+									className: "hidden @4xl/chat:inline-flex",
 									title: `Open ${agent.meta.cwd} in Files`,
 									onClick: () => void openFilesForAgent(agent),
 									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FolderOpen, { className: "w-3.5 h-3.5" })
@@ -129672,7 +129735,7 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 								agent && thread && thread.messages.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
 									variant: "ghost",
 									size: "icon-sm",
-									className: "hidden sm:inline-flex",
+									className: "hidden @4xl/chat:inline-flex",
 									title: "Fork — spawn new agent with this chat history",
 									onClick: () => forkFromAgent(agent.id, thread.messages),
 									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitFork, { className: "w-3.5 h-3.5" })
@@ -129680,7 +129743,7 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 								thread && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
 									variant: "ghost",
 									size: "icon-sm",
-									className: "hidden sm:inline-flex",
+									className: "hidden @4xl/chat:inline-flex",
 									title: "Mark unread",
 									onClick: () => markInboxThreadUnread(selectedInboxThread),
 									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MailX, { className: "w-3.5 h-3.5" })
@@ -129688,7 +129751,7 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 								thread && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
 									variant: "ghost",
 									size: "icon-sm",
-									className: "hidden sm:inline-flex",
+									className: "hidden @4xl/chat:inline-flex",
 									title: "Mark read",
 									onClick: () => markInboxThreadRead(thread.peer, thread.messages),
 									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MailOpen, { className: "w-3.5 h-3.5" })
@@ -129696,7 +129759,7 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 								exportableThread && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
 									variant: "ghost",
 									size: "icon-sm",
-									className: "hidden sm:inline-flex",
+									className: "hidden @4xl/chat:inline-flex",
 									title: "Export thread",
 									onClick: () => exportThread({
 										...exportableThread,
@@ -129709,7 +129772,7 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
 										variant: "ghost",
 										size: "icon-sm",
-										className: "sm:hidden",
+										className: "@4xl/chat:hidden",
 										children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Ellipsis, { className: "w-3.5 h-3.5" })
 									})
 								}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuContent, {
@@ -129724,6 +129787,10 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 											onClick: interruptAgent,
 											children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(CircleStop, { className: "w-3.5 h-3.5" }), "Interrupt"]
 										}),
+										agent.branchState === "changes" && agent.branchWorkspaceId && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
+											onClick: () => openConfirm("Mark Workspace Ready", `Mark ${displayName(agent)}'s branch ready to land? The relay auto-merge will rebase and land it.`, () => workspaceAction(agent.branchWorkspaceId, "ready")),
+											children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Flag, { className: "w-3.5 h-3.5" }), "Mark Ready"]
+										}),
 										canCompact && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
 											onClick: () => openConfirm("Compact Agent", `Compact context for ${displayName(agent)}?`, () => doAgentAction(agent, "compact")),
 											children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Minimize2, { className: "w-3.5 h-3.5" }), "Compact"]
@@ -130101,6 +130168,8 @@ function AgentCard({ agent }) {
 	const doAgentAction = useRelayStore((s) => s.doAgentAction);
 	const doDeleteAgent = useRelayStore((s) => s.doDeleteAgent);
 	const openFilesForAgent = useRelayStore((s) => s.openFilesForAgent);
+	const workspaceAction = useRelayStore((s) => s.workspaceAction);
+	const openWorkspaceFocus = useRelayStore((s) => s.openWorkspaceFocus);
 	const { terminalOpen, terminalTarget, terminalOpening, openTerminal: handleOpenTerminal, closeTerminal: handleCloseTerminal } = useAgentTerminal(agent.id);
 	const pairsMap = usePairsByAgentId();
 	const rawAttention = useAgentAttention(agent);
@@ -130152,6 +130221,14 @@ function AgentCard({ agent }) {
 									children: shortPath$1(agent.meta.cwd)
 								})
 							]
+						}),
+						agent.branchState && agent.branchWorkspaceId && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(BranchStateBadge, {
+							state: agent.branchState,
+							className: "mt-0.5 shrink-0",
+							onClick: (e) => {
+								e.stopPropagation();
+								openWorkspaceFocus(agent.branchWorkspaceId);
+							}
 						})
 					]
 				}),
@@ -130236,6 +130313,14 @@ function AgentCard({ agent }) {
 							onClick: () => void handleOpenTerminal(),
 							children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Terminal, { className: "w-3 h-3" })
 						}),
+						agent.branchState === "changes" && agent.branchWorkspaceId && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+							size: "icon",
+							variant: "ghost",
+							className: "h-7 w-7 text-amber-400 hover:text-amber-300",
+							title: "Mark workspace ready — hand off to the auto-merge",
+							onClick: () => openConfirm("Mark Workspace Ready", `Mark ${displayName(agent)}'s branch ready to land? The relay auto-merge will rebase and land it.`, () => workspaceAction(agent.branchWorkspaceId, "ready")),
+							children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Flag, { className: "w-3 h-3" })
+						}),
 						canCompact && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
 							size: "icon",
 							variant: "ghost",
@@ -130572,10 +130657,6 @@ function LogViewer({ orchestratorId, session, lines = 200 }) {
 }
 //#endregion
 //#region src/components/views/managed-agents.tsx
-function fmtTime(value) {
-	if (!value) return "-";
-	return new Date(value).toLocaleString();
-}
 function terminalSessionFor(item, agent) {
 	const agentSession = agent?.meta?.tmuxSession;
 	if (typeof agentSession === "string" && agentSession.trim()) return agentSession;
@@ -131857,11 +131938,20 @@ function WorkspaceRow({ workspace }) {
 	const now = useNow();
 	const [expanded, setExpanded] = (0, import_react.useState)(false);
 	const agentsById = useRelayStore((s) => s.agentsById);
+	const focused = useRelayStore((s) => s.workspaceFocusId === workspace.id);
 	const owner = workspace.ownerAgentId ? agentsById[workspace.ownerAgentId] : void 0;
 	const steward = workspace.stewardAgentId ? agentsById[workspace.stewardAgentId] : void 0;
 	const path = workspace.worktreePath || workspace.sourceCwd || workspace.repoRoot;
+	const rowRef = (0, import_react.useRef)(null);
+	(0, import_react.useEffect)(() => {
+		if (focused) rowRef.current?.scrollIntoView({
+			behavior: "smooth",
+			block: "center"
+		});
+	}, [focused]);
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-		className: "border-t border-border",
+		ref: rowRef,
+		className: `border-t border-border ${focused ? "bg-primary/5 ring-1 ring-inset ring-primary/40" : ""}`,
 		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 			className: "grid gap-3 px-3 py-3 text-sm lg:grid-cols-[minmax(180px,1.2fr)_minmax(220px,1.5fr)_minmax(160px,1fr)_minmax(170px,auto)]",
 			children: [
@@ -132006,6 +132096,14 @@ function RepoGroup({ repoRoot, workspaces }) {
 function WorkspacesView() {
 	const [filter, setFilter] = (0, import_react.useState)("active");
 	const workspaces = useRelayStore((s) => s.workspaces);
+	const set = useRelayStore((s) => s.set);
+	const workspaceFocusId = useRelayStore((s) => s.workspaceFocusId);
+	(0, import_react.useEffect)(() => {
+		if (workspaceFocusId) setFilter("all");
+	}, [workspaceFocusId]);
+	(0, import_react.useEffect)(() => () => {
+		set({ workspaceFocusId: null });
+	}, [set]);
 	const visibleWorkspaces = (0, import_react.useMemo)(() => filterWorkspaces(workspaces, filter), [workspaces, filter]);
 	const grouped = (0, import_react.useMemo)(() => groupWorkspaces(visibleWorkspaces), [visibleWorkspaces]);
 	const liveCount = workspaces.filter((item) => LIVE_STATUSES.has(item.status)).length;
@@ -133615,7 +133713,7 @@ function MemoryView() {
 								}),
 								/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 									className: "text-xs text-muted-foreground",
-									title: fmtTime$1(selectedMemory.updatedAt),
+									title: fmtTime(selectedMemory.updatedAt),
 									children: ["updated ", timeAgo(now, selectedMemory.updatedAt)]
 								}),
 								/* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", {
@@ -133806,7 +133904,7 @@ function MemoryRow({ memory, selected, now, onSelect }) {
 					}),
 					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 						className: "text-[10px] text-muted-foreground",
-						title: fmtTime$1(memory.updatedAt),
+						title: fmtTime(memory.updatedAt),
 						children: timeAgo(now, memory.updatedAt)
 					}),
 					memory.accessCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
@@ -133956,7 +134054,7 @@ function ActivityView() {
 											}),
 											/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 												className: "text-xs text-muted-foreground ml-auto shrink-0",
-												title: fmtTime$1(item.ts ?? item.createdAt),
+												title: fmtTime(item.ts ?? item.createdAt),
 												children: timeAgo(now, item.ts ?? item.createdAt)
 											})
 										]
@@ -134119,7 +134217,7 @@ function PairCard({ pair, now, agentName, onAccept, onReject, onMessage, onHangu
 					children: pair.id.slice(-10)
 				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 					className: "text-xs text-muted-foreground",
-					title: fmtTime$1(pair.updatedAt),
+					title: fmtTime(pair.updatedAt),
 					children: timeAgo(now, pair.updatedAt)
 				})]
 			})]
@@ -134412,7 +134510,7 @@ function MessageRow({ msg, now, agentLabel, agentsById, onReply, onClaim, onRetr
 						}),
 						/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
 							className: "ml-auto shrink-0",
-							title: fmtTime$1(msg.createdAt),
+							title: fmtTime(msg.createdAt),
 							children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
 								className: "opacity-40 mr-1",
 								children: ["#", msg.id]
@@ -134822,7 +134920,7 @@ function TaskCard({ task, now, agentName, onClaim, onEvents, onStatusChange }) {
 					})]
 				}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
 					className: "text-xs text-muted-foreground shrink-0",
-					title: fmtTime$1(task.createdAt),
+					title: fmtTime(task.createdAt),
 					children: ["#", task.id]
 				})]
 			}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", {
@@ -134866,7 +134964,7 @@ function TaskCard({ task, now, agentName, onClaim, onEvents, onStatusChange }) {
 					}),
 					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 						className: "flex items-center gap-1 mt-0.5",
-						title: fmtTime$1(task.updatedAt),
+						title: fmtTime(task.updatedAt),
 						children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 							className: "text-muted-foreground/60",
 							children: "updated"
@@ -135449,7 +135547,7 @@ function AutomationCard({ automation, runs, now, selected, onEdit, onRun, onTogg
 				className: "flex flex-wrap items-center gap-2 text-xs text-muted-foreground",
 				children: [
 					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
-						title: automation.nextRunAt ? fmtTime$1(automation.nextRunAt) : void 0,
+						title: automation.nextRunAt ? fmtTime(automation.nextRunAt) : void 0,
 						children: ["next ", automation.nextRunAt ? timeAgo(now, automation.nextRunAt) : "disabled"]
 					}),
 					latestRun && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Badge$1, {
@@ -135961,7 +136059,7 @@ function RunHistory({ runs, automations, agents, orchestrators, now, logRunId, o
 							}),
 							/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 								className: "text-muted-foreground",
-								title: fmtTime$1(run.updatedAt),
+								title: fmtTime(run.updatedAt),
 								children: timeAgo(now, run.updatedAt)
 							}),
 							logTarget ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
@@ -155739,14 +155837,14 @@ function MaintenanceCard({ job, now, onRun }) {
 						className: "text-muted-foreground",
 						children: "Last run"
 					}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("dd", { children: job.lastRunAt ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-						title: fmtTime$1(job.lastRunAt),
+						title: fmtTime(job.lastRunAt),
 						children: timeAgo(now, job.lastRunAt)
 					}) : "never" })] }),
 					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("dt", {
 						className: "text-muted-foreground",
 						children: "Next run"
 					}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("dd", { children: job.nextRunAt ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-						title: fmtTime$1(job.nextRunAt),
+						title: fmtTime(job.nextRunAt),
 						children: nextRunText(now, job.nextRunAt)
 					}) : "-" })] }),
 					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("dt", {
@@ -155817,14 +155915,14 @@ function MaintenanceRow({ job, now, onRun }) {
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)("td", {
 				className: "px-3 py-3 text-xs text-muted-foreground",
 				children: job.lastRunAt ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-					title: fmtTime$1(job.lastRunAt),
+					title: fmtTime(job.lastRunAt),
 					children: timeAgo(now, job.lastRunAt)
 				}) : "never"
 			}),
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)("td", {
 				className: "px-3 py-3 text-xs text-muted-foreground",
 				children: job.nextRunAt ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-					title: fmtTime$1(job.nextRunAt),
+					title: fmtTime(job.nextRunAt),
 					children: nextRunText(now, job.nextRunAt)
 				}) : "-"
 			}),
@@ -156961,7 +157059,7 @@ function AgentDiagnostics({ agent, orchestrators }) {
 						}),
 						managedAgent.startedAt && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(KV, {
 							label: "Started",
-							value: fmtTime$1(managedAgent.startedAt)
+							value: fmtTime(managedAgent.startedAt)
 						}),
 						managedOrch && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(KV, {
 							label: "Orchestrator",
@@ -157636,7 +157734,7 @@ function AgentDetailDrawer() {
 													children: "Created"
 												}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 													className: "truncate",
-													children: fmtTime$1(agent.createdAt)
+													children: fmtTime(agent.createdAt)
 												})]
 											}),
 											agent.machine && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
@@ -158098,7 +158196,7 @@ function ActiveMemoryRow({ memory, now, onOpen }) {
 				]
 			}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 				className: "shrink-0 text-right text-[10px] text-muted-foreground",
-				title: fmtTime$1(memory.lastAccessedAt ?? memory.updatedAt),
+				title: fmtTime(memory.lastAccessedAt ?? memory.updatedAt),
 				children: timeAgo(now, memory.lastAccessedAt ?? memory.updatedAt)
 			})]
 		})
@@ -158224,7 +158322,7 @@ function TimelineRow({ entry, now }) {
 						children: entry.title
 					}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 						className: "ml-auto shrink-0 text-[10px] text-muted-foreground",
-						title: fmtTime$1(entry.ts),
+						title: fmtTime(entry.ts),
 						children: timeAgo(now, entry.ts)
 					})]
 				}),
@@ -158897,7 +158995,7 @@ function TaskEventsModal() {
 								/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 									className: "text-xs text-muted-foreground mt-1",
 									children: [
-										fmtTime$1(evt.createdAt),
+										fmtTime(evt.createdAt),
 										" · ",
 										evt.source
 									]
@@ -161107,6 +161205,10 @@ if ("serviceWorker" in navigator) {
     container: card-header / inline-size;
   }
 
+  .\@container\/chat {
+    container: chat / inline-size;
+  }
+
   .pointer-events-none {
     pointer-events: none;
   }
@@ -164684,6 +164786,10 @@ if ("serviceWorker" in navigator) {
     animation-play-state: paused;
   }
 
+  .ring-inset {
+    --tw-ring-inset: inset;
+  }
+
   .running {
     animation-play-state: running;
   }
@@ -165011,6 +165117,10 @@ if ("serviceWorker" in navigator) {
       }
     }
 
+    .hover\:text-amber-300:hover {
+      color: var(--color-amber-300);
+    }
+
     .hover\:text-blue-300:hover {
       color: var(--color-blue-300);
     }
@@ -165066,13 +165176,36 @@ if ("serviceWorker" in navigator) {
     .hover\:opacity-100:hover {
       opacity: 1;
     }
+
+    .hover\:brightness-125:hover {
+      --tw-brightness: brightness(125%);
+      filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
+    }
   }
 
   .focus\:bg-accent:focus {
     background-color: var(--accent);
   }
 
-  .focus\:text-accent-foreground:focus, :is(.focus\:\*\*\:text-accent-foreground:focus *), :is(.not-data-\[variant\=destructive\]\:focus\:\*\*\:text-accent-foreground:not([data-variant="destructive"]):focus *) {
+  .focus\:text-accent-foreground:focus {
+    color: var(--accent-foreground);
+  }
+
+  .focus\:ring-1:focus {
+    --tw-ring-shadow: var(--tw-ring-inset, ) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
+    box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+  }
+
+  .focus\:ring-current:focus {
+    --tw-ring-color: currentcolor;
+  }
+
+  .focus\:outline-none:focus {
+    --tw-outline-style: none;
+    outline-style: none;
+  }
+
+  :is(.focus\:\*\*\:text-accent-foreground:focus *), :is(.not-data-\[variant\=destructive\]\:focus\:\*\*\:text-accent-foreground:not([data-variant="destructive"]):focus *) {
     color: var(--accent-foreground);
   }
 
@@ -165557,10 +165690,6 @@ if ("serviceWorker" in navigator) {
       display: block;
     }
 
-    .sm\:flex {
-      display: flex;
-    }
-
     .sm\:hidden {
       display: none;
     }
@@ -165868,6 +165997,26 @@ if ("serviceWorker" in navigator) {
     }
   }
 
+  @container chat (min-width: 42rem) {
+    .\@2xl\/chat\:flex {
+      display: flex;
+    }
+  }
+
+  @container chat (min-width: 56rem) {
+    .\@4xl\/chat\:flex {
+      display: flex;
+    }
+
+    .\@4xl\/chat\:hidden {
+      display: none;
+    }
+
+    .\@4xl\/chat\:inline-flex {
+      display: inline-flex;
+    }
+  }
+
   .dark\:border-input:is(.dark *) {
     border-color: var(--input);
   }

package/runner/src/adapter.ts

@@ -174,7 +174,7 @@ export function profileAllowsRelayFeature(config: RunnerSpawnConfig, feature: ke
 
 export const RELAY_CONTEXT = `[agent-relay] You are connected to Agent Relay, a real-time message bus between agents and users. When you receive a relay message: read it, do what it asks, and reply through the relay when a text response is needed. Use agent-relay /react <messageId> <emoji> for lightweight acknowledgement or approval. If Relay MCP tools are available, prefer relay_reply, relay_get_message, relay_get_thread, relay_send_message, relay_upload_artifact, relay_attach_artifact, relay_agent_status, relay_find_agents, relay_spawn_agent, and relay_shutdown_agent. You never need to know or pass your own agent id — relay fills it from your token; use relay_whoami only if you need to reason about yourself. relay_spawn_agent / relay_shutdown_agent only appear if your profile grants spawning (a live-children quota); when present you can stand up long-living child agents and shut down your own — find them later with relay_find_agents spawnedBy:me. CLI fallback: agent-relay /reply <messageId> --stdin < response.md; if a delivered message says it was truncated, fetch the full body with: agent-relay get-message <messageId>. For command details, run: agent-relay /guide`;
 
-const PROVIDER_MESSAGE_BODY_PREVIEW_CHARS = 4000;
+export const PROVIDER_MESSAGE_BODY_PREVIEW_CHARS = 4000;
 
 function attachmentRefs(message: Message): Record<string, unknown>[] {
   const payloadRefs = message.payload?.attachments;

package/runner/src/config.ts

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir, hostname } from "node:os";
 import { join, resolve } from "node:path";
-import { stringValue } from "agent-relay-sdk";
+import { DEFAULT_RELAY_URL, stringValue } from "agent-relay-sdk";
 import { sanitizeFsName } from "agent-relay-sdk/fs-name";
 import type { ProviderConfig } from "./adapter";
 
@@ -15,8 +15,6 @@ interface LoadedProviderConfig extends ProviderConfig {
   path: string;
 }
 
-const DEFAULT_RELAY_URL = "http://127.0.0.1:4850";
-
 function agentRelayHome(): string {
   return process.env.AGENT_RELAY_HOME || join(homedir(), ".agent-relay");
 }

package/src/agent-branch-state.ts

@@ -0,0 +1,36 @@
+// Branch-state enrichment for the agent payload (#236). The single server-side
+// place that hangs the derived `branchState` (+ owning `branchWorkspaceId`) onto an
+// AgentCard before it leaves over the API or SSE — so the dashboard never recomputes
+// it and the projection can't drift between surfaces. The mapping itself lives in
+// deriveBranchState (workspace-phase.ts, pure & CLI-importable); this module is just
+// the agent↔workspace join.
+
+import { listWorkspaces, ownedIsolatedWorkspace } from "./db";
+import type { AgentCard, WorkspaceRecord } from "./types";
+import { deriveBranchState, isLiveIsolatedWorkspace } from "./workspace-phase";
+
+function withWorkspace(agent: AgentCard, workspace: WorkspaceRecord | undefined): AgentCard {
+  const branchState = deriveBranchState(workspace);
+  if (!branchState || !workspace) return agent;
+  return { ...agent, branchState, branchWorkspaceId: workspace.id };
+}
+
+/** Enrich a single agent with its branch-state badge fields (one workspace query). */
+export function attachBranchState(agent: AgentCard): AgentCard {
+  return withWorkspace(agent, ownedIsolatedWorkspace(agent.id));
+}
+
+/**
+ * Batched enrichment for list endpoints: one workspace scan, mapped by owner, so a
+ * fleet of N agents costs a single query instead of N. listWorkspaces is ORDER BY
+ * updated_at DESC, so the first live isolated workspace seen per owner is the most
+ * recent one — same selection as ownedIsolatedWorkspace.
+ */
+export function attachBranchStates(agents: AgentCard[]): AgentCard[] {
+  const byOwner = new Map<string, WorkspaceRecord>();
+  for (const ws of listWorkspaces()) {
+    if (!ws.ownerAgentId || !isLiveIsolatedWorkspace(ws)) continue;
+    if (!byOwner.has(ws.ownerAgentId)) byOwner.set(ws.ownerAgentId, ws);
+  }
+  return agents.map((agent) => withWorkspace(agent, byOwner.get(agent.id)));
+}

package/src/agent-ref.ts

@@ -12,7 +12,7 @@
 // never silently picks among several — it reports candidates instead.
 
 import { STALE_TTL_MS } from "./config";
-import type { AgentCard } from "./types";
+import type { AgentCard, Message } from "./types";
 
 interface ResolveOptions {
   /** Exclude this agent id from matches (e.g. the requester, when pairing). */
@@ -121,6 +121,23 @@ export function resolveAgentRef(ref: string, agents: AgentCard[], opts: ResolveO
   return { status: "not_found", offlineMatches: matches };
 }
 
+export function targetMatchesAgent(target: string, agentId: string, agent?: AgentCard | null): boolean {
+  if (!agent) return false;
+  if (target === agentId || target === "broadcast") return true;
+  if (target.startsWith("tag:") && agent.tags.includes(target.slice(4))) return true;
+  if (target.startsWith("cap:") && agent.capabilities.includes(target.slice(4))) return true;
+  if (target.startsWith("label:") && agent.label === target.slice(6)) return true;
+  return false;
+}
+
+export function messageMatchesAgent(msg: Message, agentId: string, agent?: AgentCard | null): boolean {
+  if (!agent) return false;
+  if (msg.claimable && msg.claimedBy && msg.claimedBy !== agentId) return false;
+  if (msg.resolvedToAgent === agentId) return true;
+  if (msg.to === agentId || msg.from === agentId) return true;
+  return targetMatchesAgent(msg.to, agentId, agent);
+}
+
 // --- messaging send planning -------------------------------------------------
 
 export interface DeliveryReceipt {

package/src/branch-landed.ts

@@ -18,6 +18,13 @@ export interface BranchLandedInput {
   subject?: string;
   /** Fresh branch the worktree was recycled onto (land-and-continue), if any. */
   newBranch?: string;
+  /**
+   * Whether the advanced base was pushed to its remote. `false` means the land is
+   * local-only (push disabled, or the base has no upstream) and has NOT reached
+   * `origin` yet — the notice says so instead of implying a published merge (#285).
+   * `undefined` from older orchestrators that don't report it → message stays generic.
+   */
+  pushed?: boolean;
 }
 
 /**
@@ -47,6 +54,7 @@ export function notifyBranchLanded(input: BranchLandedInput): void {
       subject: input.subject,
       author: workspace.ownerAgentId,
       newBranch: input.newBranch,
+      pushed: input.pushed,
     },
   });
 
@@ -65,8 +73,14 @@ export function notifyBranchLanded(input: BranchLandedInput): void {
     sha: input.mergedSha,
     author,
     newBranch: input.newBranch,
+    pushed: input.pushed,
   };
 
+  // A local-only land (push disabled, or base has no upstream) has NOT reached the
+  // remote — say so rather than implying a published merge an agent would report as
+  // shipped (#285). `undefined` (older orchestrators) keeps the message generic.
+  const publishLabel = input.pushed === false ? ` Not yet pushed to \`origin/${base}\` — local only.` : "";
+
   // 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) {
@@ -76,7 +90,7 @@ export function notifyBranchLanded(input: BranchLandedInput): void {
       : " Worktree reclaimed.";
     notifySystemMessage(author, {
       subject: "Your branch landed",
-      body: `✅ ${branchLabel} landed on \`${base}\`${shaLabel}${subjectLabel}.${continueLabel}`,
+      body: `✅ ${branchLabel} landed on \`${base}\`${shaLabel}${subjectLabel}.${publishLabel}${continueLabel}`,
       payload,
       replyExpected: false,
     });
@@ -92,7 +106,7 @@ export function notifyBranchLanded(input: BranchLandedInput): void {
   for (const agent of agentsOnMain(workspace.repoRoot, author)) {
     notifySystemMessage(agent.id, {
       subject: `Merged to ${base}`,
-      body: `🔀 ${branchLabel}${authorLabel} merged to \`${base}\`${shaLabel}${subjectLabel}.`,
+      body: `🔀 ${branchLabel}${authorLabel} merged to \`${base}\`${shaLabel}${subjectLabel}.${publishLabel}`,
       payload,
       replyExpected: false,
     });

package/src/bus.ts

@@ -7,6 +7,7 @@ import { emitCommandEvent } from "./command-events";
 import { getLifecycleManager } from "./lifecycle-manager";
 import { noteAgentTimelineEvent, noteCompactionCommandCompleted } from "./compaction-watch";
 import { applyCommandToRecipe } from "./recipe-runner";
+import { messageMatchesAgent, targetMatchesAgent } from "./agent-ref";
 import {
   BusProtocolError,
   parseBusFrame,
@@ -465,11 +466,11 @@ function broadcastRelayEvent(event: RelayEvent): void {
 function connectionWantsEvent(conn: BusConnection, event: RelayEvent): boolean {
   if (!matchesSubscription(conn.subscriptions, event.type)) return false;
   if (event.type === "message.new" && conn.agentId) {
-    return messageMatchesAgent(event.data as unknown as Message, conn.agentId);
+    return messageMatchesAgent(event.data as unknown as Message, conn.agentId, getAgent(conn.agentId));
   }
   if (event.type.startsWith("task.") && conn.agentId) {
     const target = typeof event.data.target === "string" ? event.data.target : "";
-    return targetMatchesAgent(target, conn.agentId);
+    return targetMatchesAgent(target, conn.agentId, getAgent(conn.agentId));
   }
   if (event.type.startsWith("command.")) {
     const command = isRecord(event.data.command) ? event.data.command : undefined;
@@ -490,25 +491,6 @@ function matchesSubscription(subscriptions: Set<string>, eventType: string): boo
   return false;
 }
 
-function messageMatchesAgent(msg: Message, agentId: string): boolean {
-  const agent = getAgent(agentId);
-  if (!agent) return false;
-  if (msg.claimable && msg.claimedBy && msg.claimedBy !== agentId) return false;
-  if (msg.resolvedToAgent === agentId) return true;
-  if (msg.to === agentId || msg.from === agentId) return true;
-  return targetMatchesAgent(msg.to, agentId, agent);
-}
-
-function targetMatchesAgent(target: string, agentId: string, knownAgent?: AgentCard): boolean {
-  const agent = knownAgent ?? getAgent(agentId);
-  if (!agent) return false;
-  if (target === agentId || target === "broadcast") return true;
-  if (target.startsWith("tag:") && agent.tags.includes(target.slice(4))) return true;
-  if (target.startsWith("cap:") && agent.capabilities.includes(target.slice(4))) return true;
-  if (target.startsWith("label:") && agent.label === target.slice(6)) return true;
-  return false;
-}
-
 function outboxToPayload(event: BusEvent) {
   return {
     seq: event.seq,

package/src/db.ts

@@ -3,6 +3,7 @@ import { randomUUID } from "node:crypto";
 import { isRecord, stringValue, isMechanicalMessageKind } from "agent-relay-sdk";
 import { ORCHESTRATOR_PROTOCOL_VERSION, VERSION } from "./config.ts";
 import { parseJson } from "./utils";
+import { isLiveIsolatedWorkspace } from "./workspace-phase";
 import {
   CONTRACT_REQUIREMENTS,
   contractCompatibility,
@@ -5281,20 +5282,24 @@ function upsertWorkspaceFromManagedAgent(agent: ManagedAgent): WorkspaceRecord |
     // preserved and metadata is merged, not replaced.
     const existing = getWorkspace(workspace.id);
     const preserveStatus = existing != null && existing.status !== "active";
-    // The branch (and advanced base) change ONLY via the relay's own land-and-continue
-    // recycle (setWorkspaceBranch repoints to `<branch>-N` and bumps base_sha). The
-    // runner keeps re-reporting its spawn-time branch on every heartbeat, and the
-    // recycle returns status to "active" — so without this the next heartbeat clobbers
-    // the repoint back to the original branch, and the next land targets a deleted
-    // branch and strands the work (vent #62 follow-up). Trust the existing row's
-    // branch/base over registration; only a brand-new row takes the runner's values.
+    // The branch and base change ONLY via the relay's own land-and-continue recycle
+    // (setWorkspaceBranch repoints to `<branch>-N` and bumps base_sha; base_ref is fixed
+    // at spawn and never re-targeted). The runner keeps re-reporting its spawn-time
+    // branch/base on every heartbeat, and the recycle returns status to "active" — so
+    // without this the next heartbeat clobbers the repoint back to the original branch,
+    // and the next land targets a deleted branch and strands the work (vent #62 follow-up).
+    // baseRef needs the same pin: a heartbeat carrying a stale/wrong base (e.g. a recycled
+    // `-N` branch when the agent was spawned from inside a managed worktree) would otherwise
+    // overwrite the true base, and the next land advances a local-only branch that never
+    // reaches origin/main (#285). Trust the existing row's branch/base over registration;
+    // only a brand-new row takes the runner's values.
     return upsertWorkspace({
       id: workspace.id,
       repoRoot: workspace.repoRoot,
       sourceCwd: workspace.sourceCwd ?? agent.cwd,
       worktreePath: workspace.worktreePath,
       branch: existing?.branch ?? workspace.branch,
-      baseRef: workspace.baseRef,
+      baseRef: existing?.baseRef ?? workspace.baseRef,
       baseSha: existing?.baseSha ?? workspace.baseSha,
       mode: workspace.mode,
       requestedMode: workspace.requestedMode,
@@ -5394,6 +5399,14 @@ export function deleteWorkspace(id: string): boolean {
   return db.query("DELETE FROM workspaces WHERE id = ?").run(id).changes > 0;
 }
 
+// The agent's current branch worktree: its most recent live (non-terminal) isolated
+// workspace, or undefined. SINGLE HOME for the agent→workspace link — the MCP
+// owner-resolver and the #236 branch-state badge both go through here. listWorkspaces
+// is ORDER BY updated_at DESC, so `.find` returns the most recently active one.
+export function ownedIsolatedWorkspace(agentId: string): WorkspaceRecord | undefined {
+  return listWorkspaces({ ownerAgentId: agentId }).find(isLiveIsolatedWorkspace);
+}
+
 // Shared-mode rows are pure occupancy markers (no worktree on disk) that only
 // mean something while their owner is online. Deletion is normally driven by
 // the reaper's onAgentDisappeared hook, but agents also leave via clean
@@ -5416,6 +5429,26 @@ export function pruneOrphanedSharedWorkspaces(): string[] {
   })();
 }
 
+// Late-bound listeners for "a workspace row changed in a way that may change its
+// owner's branch-state badge" (#236). A hook, not a direct emit, because db.ts is
+// the lowest layer — sse.ts imports db, so db can't import sse without a cycle. sse
+// registers a listener at startup that re-emits the owner agent's status over SSE.
+type WorkspaceChangeListener = (workspace: WorkspaceRecord) => void;
+const workspaceChangeListeners = new Set<WorkspaceChangeListener>();
+export function onWorkspaceChange(listener: WorkspaceChangeListener): void {
+  workspaceChangeListeners.add(listener);
+}
+export function emitWorkspaceChange(workspace: WorkspaceRecord | null | undefined): void {
+  if (!workspace) return;
+  for (const listener of workspaceChangeListeners) {
+    try {
+      listener(workspace);
+    } catch {
+      // A badge-refresh listener must never break a workspace write.
+    }
+  }
+}
+
 export function updateWorkspaceStatus(id: string, status: WorkspaceStatus, metadata: Record<string, unknown> = {}): WorkspaceRecord | null {
   const existing = getWorkspace(id);
   if (!existing) return null;
@@ -5434,7 +5467,11 @@ export function updateWorkspaceStatus(id: string, status: WorkspaceStatus, metad
     id,
   );
   electWorkspaceStewards(existing.repoRoot);
-  return getWorkspace(id);
+  const updated = getWorkspace(id);
+  // Every status transition can flip the owner's badge (active→ready→steward→merged),
+  // so refresh it regardless of caller. Fires on the row's CURRENT owner.
+  emitWorkspaceChange(updated);
+  return updated;
 }
 
 // Repoint a workspace row at a recycled branch after a land-and-continue merge

package/src/maintenance.ts

@@ -19,6 +19,7 @@ import {
   pruneOfflineAgents,
   pruneOldMessages,
   deleteWorkspace,
+  emitWorkspaceChange,
   pruneOrphanedSharedWorkspaces,
   reapStaleAgents,
   reapStaleOrchestrators,
@@ -34,7 +35,7 @@ import type { WorkspaceMergePreview, WorkspaceRecord, WorkspaceStatus } from "./
 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 { deriveBranchState, READY_TO_LAND_STATUSES, TERMINAL_WORKSPACE_STATUSES } from "./workspace-phase";
 import { errMessage, RELAY_TOKEN_HEADER } from "agent-relay-sdk";
 import { getStewardConfig } from "./config-store";
 import { ensureRepoSteward } from "./steward";
@@ -583,6 +584,20 @@ async function scanWorkspaceConflicts(): Promise<Record<string, unknown>> {
 
     const meta = ws.metadata as Record<string, unknown>;
 
+    // #236: stash the latest ahead/dirty counts so deriveBranchState can tell idle
+    // (⚪) from changes (🟡) for an active worktree — the relay isn't in the git
+    // path, so this scan is its only window onto the tree. Only write (and refresh
+    // the owner's badge) when the derived state actually flips, to avoid SSE churn
+    // every 2 min on unchanged workspaces. Status-changing branches below own their
+    // own badge refresh via updateWorkspaceStatus.
+    const nextAhead = p.ahead ?? 0;
+    const nextDirty = p.dirtyCount ?? 0;
+    if (meta.gitAhead !== nextAhead || meta.gitDirtyCount !== nextDirty) {
+      const before = deriveBranchState(ws);
+      const patched = patchWorkspaceMetadata(ws.id, { gitAhead: nextAhead, gitDirtyCount: nextDirty, gitProbedAt: Date.now() });
+      if (patched && deriveBranchState(patched) !== before) emitWorkspaceChange(patched);
+    }
+
     // Landing wins over everything else. Once the work is in base — whether the
     // PR was squash/cherry-pick merged on GitHub or fast-forwarded locally — the
     // workspace is done, even if `git merge-tree` still predicts a textual

package/src/mcp.ts

@@ -23,6 +23,7 @@ import {
   linkArtifact,
   listAgents,
   listWorkspaces,
+  ownedIsolatedWorkspace,
   searchAgents,
   type AgentSearchFilter,
   type AgentSearchSort,
@@ -45,7 +46,7 @@ import {
 } from "./security";
 import type { ActivityKind, AgentCard, ArtifactKind, ArtifactSensitivity, AttachmentRef, Command, SendMessageInput, Message, SpawnApprovalMode, SpawnProvider, WorkspaceMergeStrategy, WorkspaceRecord } from "./types";
 import { applyWorkspaceAction, waitForWorkspaceStatus, type WorkspaceAction } from "./workspace-actions";
-import { describeWorkspacePhase, landReceipt, readyContract, TERMINAL_WORKSPACE_STATUSES, worktreeMcpInstructions } from "./workspace-phase";
+import { describeWorkspacePhase, landReceipt, readyContract, worktreeMcpInstructions } from "./workspace-phase";
 import { type ProviderEffort } from "agent-relay-sdk/provider-catalog";
 import { errMessage, isRecord, SPAWN_PROVIDERS, APPROVAL_MODES, VALID_EFFORTS } from "agent-relay-sdk";
 import { runnerRuntimeTokenEnv } from "./runtime-tokens";
@@ -964,7 +965,7 @@ function resolveWorkspaceForCaller(auth: McpAuthContext, args: Record<string, un
 function callerIsolatedWorkspace(auth: McpAuthContext): WorkspaceRecord | undefined {
   const caller = callerAgentId(auth);
   if (!caller) return undefined;
-  return listWorkspaces({ ownerAgentId: caller }).find((w) => w.mode === "isolated" && !TERMINAL_WORKSPACE_STATUSES.has(w.status));
+  return ownedIsolatedWorkspace(caller);
 }
 
 async function relayWorkspaceStatus(auth: McpAuthContext, args: Record<string, unknown>): Promise<Record<string, unknown>> {

package/src/routes.ts

@@ -160,6 +160,7 @@ import { getIntegrationTokens, INTEGRATION_RATE_LIMIT_PER_MINUTE, MAX_BODY_BYTES
 import { CONTRACT_VERSIONS, parseRuntimeCapabilities, parseRuntimeContracts, parseRuntimePackage, type RuntimeCapabilities, type RuntimeContracts, type RuntimePackageMetadata } from "./contracts";
 import { listHostDirectories } from "./agent-spawn";
 import { planSend } from "./agent-ref";
+import { attachBranchState, attachBranchStates } from "./agent-branch-state";
 import { defaultProviderConfig, loadProviderConfig, providerConfigPublic, writeProviderConfig } from "../runner/src/config";
 import type { ProviderConfig } from "../runner/src/adapter";
 import { type ProviderEffort } from "agent-relay-sdk/provider-catalog";
@@ -1327,7 +1328,7 @@ const getAgents: Handler = (req) => {
   const tag = url.searchParams.get("tag") ?? undefined;
   const machine = url.searchParams.get("machine") ?? undefined;
   const status = url.searchParams.get("status") ?? undefined;
-  return json(listAgents({ tag, machine, status }));
+  return json(attachBranchStates(listAgents({ tag, machine, status })));
 };
 
 const findAgents: Handler = (req) => {
@@ -1361,7 +1362,7 @@ const postRouteAdvice: Handler = async (req) => {
 
 const getAgentById: Handler = (_req, params) => {
   const agent = getAgent(params.id!);
-  return agent ? json(agent) : error("agent not found", 404);
+  return agent ? json(attachBranchState(agent)) : error("agent not found", 404);
 };
 
 const getAgentReplyObligations: Handler = (_req, params) => {
@@ -4495,8 +4496,12 @@ const patchCommand: Handler = async (req, params) => {
           // Repoint the row so the next merge targets the live branch, not the deleted one.
           const newBranch = cleanString(command.result.newBranch, "result.newBranch", { max: 240 });
           const mergedSha = cleanString(command.result.mergedSha, "result.mergedSha", { max: 64 });
+          // base_sha tracks the tip the recycled workspace forks from. On a no-ff land
+          // (#287) that's the merge commit (result.baseSha), not the preserved landed
+          // commit (mergedSha); fall back to mergedSha for older orchestrators.
+          const baseSha = cleanString(command.result.baseSha, "result.baseSha", { max: 64 });
           if (newBranch) {
-            setWorkspaceBranch(workspaceId, newBranch, mergedSha);
+            setWorkspaceBranch(workspaceId, newBranch, baseSha ?? mergedSha);
           }
           // #239 — push the author a "your branch landed" notice (no polling). Only on a
           // real land; a no-op resolution (#230) merged nothing, so it earns no notice.
@@ -4506,6 +4511,7 @@ const patchCommand: Handler = async (req, params) => {
               mergedSha,
               subject: cleanString(command.result.subject, "result.subject", { max: 200 }),
               newBranch,
+              pushed: typeof command.result.pushed === "boolean" ? command.result.pushed : undefined,
             });
           }
         }

package/src/sse.ts

@@ -1,5 +1,7 @@
-import { getAgent, getOrchestrator } from "./db";
+import { getAgent, getOrchestrator, onWorkspaceChange } from "./db";
+import { attachBranchState } from "./agent-branch-state";
 import { emitRelayEvent, subscribeRelayEvents, type RelayEvent } from "./events";
+import { messageMatchesAgent, targetMatchesAgent } from "./agent-ref";
 import type { ActivityEvent, AgentCard, Message, RelayNotification, Task } from "./types";
 import { isRecord } from "agent-relay-sdk";
 
@@ -68,18 +70,6 @@ function send(conn: Connection, event: string, data: unknown) {
   }
 }
 
-function messageMatchesAgent(msg: Message, agentId: string): boolean {
-  const agent = getAgent(agentId);
-  if (!agent) return false;
-  if (msg.resolvedToAgent === agentId) return true;
-  if (msg.to === agentId || msg.from === agentId) return true;
-  if (msg.to === "broadcast") return true;
-  if (msg.to.startsWith("tag:") && agent.tags.includes(msg.to.slice(4))) return true;
-  if (msg.to.startsWith("cap:") && agent.capabilities.includes(msg.to.slice(4))) return true;
-  if (msg.to.startsWith("label:") && agent.label === msg.to.slice(6)) return true;
-  return false;
-}
-
 function fanout(event: RelayEvent): void {
   if (event.type === "message.new") {
     sendNewMessage(event.data as unknown as Message);
@@ -100,8 +90,7 @@ function sendNewMessage(msg: Message): void {
       send(conn, "message.new", msg);
       continue;
     }
-    if (!messageMatchesAgent(msg, conn.agentId)) continue;
-    if (msg.claimable && msg.claimedBy && msg.claimedBy !== conn.agentId) continue;
+    if (!messageMatchesAgent(msg, conn.agentId, getAgent(conn.agentId))) continue;
     send(conn, "message.new", msg);
   }
 }
@@ -114,12 +103,21 @@ export function emitNewMessage(msg: Message) {
 
 export function emitAgentStatus(agentId: string) {
   const agent = getAgent(agentId);
-  const data = agent ?? { id: agentId, status: "offline" };
+  // Enrich with the branch-state badge fields (#236) so the dashboard's live agent
+  // updates carry the same projection as GET /api/agents.
+  const data = agent ? attachBranchState(agent) : { id: agentId, status: "offline" };
   emitRelayEvent({ type: "agent.status", source: "server", subject: agentId, data: data as unknown as Record<string, unknown> });
   const notification = agent ? notificationForAgentStatus(agent) : undefined;
   if (notification) emitNotificationCreated(notification);
 }
 
+// A workspace row changed (status transition or an idle↔changes git snapshot) →
+// re-emit its owner's agent.status so the branch-state badge updates live (#236).
+// Registered against the db hook to avoid a db→sse import cycle.
+onWorkspaceChange((workspace) => {
+  if (workspace.ownerAgentId) emitAgentStatus(workspace.ownerAgentId);
+});
+
 export function emitAgentRemoved(agentId: string) {
   emitRelayEvent({ type: "agent.removed", source: "server", subject: agentId, data: { id: agentId } });
 }
@@ -165,7 +163,7 @@ export function emitMessageReactionUpdated(msg: Message) {
 
 function sendTaskChanged(task: Task, eventType = "task.updated"): void {
   for (const conn of connections.values()) {
-    if (conn.agentId && !targetMatchesAgent(task.target, conn.agentId)) continue;
+    if (conn.agentId && !targetMatchesAgent(task.target, conn.agentId, getAgent(conn.agentId))) continue;
     send(conn, eventType, task);
   }
 }
@@ -194,16 +192,6 @@ export function getConnectionCount(): number {
   return connections.size;
 }
 
-function targetMatchesAgent(target: string, agentId: string): boolean {
-  const agent = getAgent(agentId);
-  if (!agent) return false;
-  if (target === agentId || target === "broadcast") return true;
-  if (target.startsWith("tag:") && agent.tags.includes(target.slice(4))) return true;
-  if (target.startsWith("cap:") && agent.capabilities.includes(target.slice(4))) return true;
-  if (target.startsWith("label:") && agent.label === target.slice(6)) return true;
-  return false;
-}
-
 export function emitOrchestratorStatus(orchestratorId: string) {
   const orch = getOrchestrator(orchestratorId);
   const data = orch ?? { id: orchestratorId, status: "offline" };

package/src/workspace-phase.ts

@@ -15,13 +15,23 @@
 // anti-panic signal.
 
 import { TERMINAL_WORKSPACE_STATUS_VALUES } from "agent-relay-sdk";
-import type { WorkspaceRecord, WorkspaceStatus } from "./types";
+import type { BranchState, WorkspaceRecord, WorkspaceStatus } from "./types";
+import { workspaceActiveClaim } from "./workspace-claim";
 
 // Statuses where the worktree's lifecycle is over — landed or torn down. Single
 // home; imported by maintenance (stale reap), routes (orphan scan), and the MCP
 // initialize primer (don't brief an agent on a dead workspace). Was duplicated.
 export const TERMINAL_WORKSPACE_STATUSES = new Set<WorkspaceStatus>(TERMINAL_WORKSPACE_STATUS_VALUES);
 
+// The "this is the worktree the agent is actively branch-working in" predicate:
+// isolated mode and not yet landed/torn down. SINGLE HOME — the MCP owner-workspace
+// resolver, the db owner lookup, and the #236 badge enrichment all mean the same
+// thing; they drifted into private copies before. listWorkspaces is ORDER BY
+// updated_at DESC, so the first match per owner is the most recent live worktree.
+export function isLiveIsolatedWorkspace(ws: Pick<WorkspaceRecord, "mode" | "status">): boolean {
+  return ws.mode === "isolated" && !TERMINAL_WORKSPACE_STATUSES.has(ws.status);
+}
+
 // The "handed off, waiting to land" statuses — an agent has finished and the
 // auto-merge-back is responsible for getting the branch onto base. SINGLE HOME:
 // the auto-land consumer (maintenance `autoMergeCleanFastForwards`) and the
@@ -209,6 +219,64 @@ export function describeWorkspacePhase(
   }
 }
 
+function metaNumber(meta: Record<string, unknown> | undefined, key: string): number | undefined {
+  const v = meta?.[key];
+  return typeof v === "number" ? v : undefined;
+}
+
+// THE branch-state projection for the human (#236) — the sibling of
+// describeWorkspacePhase, which targets the agent. Maps a workspace to one compact
+// state for the agent-card/chat badge, so the recurring "does this agent have
+// unlanded work, and where is it in the merge-back" question is answered at a
+// glance. SINGLE HOME (server-side); the dashboard never recomputes it.
+//
+// idle/changes need the worktree's ahead/dirty counts, which the relay isn't in the
+// git path to know live — the ~2 min conflict scan stashes them in metadata
+// (`gitAhead`/`gitDirtyCount`). Until the first scan they're absent, so an active
+// worktree shows the optimistic `changes` (the high-value "mark ready" affordance);
+// the scan then settles it to `idle` when genuinely empty (#236 v1 option a).
+//
+// Returns undefined for non-branch / torn-down workspaces (no badge).
+export function deriveBranchState(
+  workspace: Pick<WorkspaceRecord, "status" | "metadata" | "readyAt"> | null | undefined,
+  opts: { now?: number; stallMs?: number } = {},
+): BranchState | undefined {
+  if (!workspace) return undefined;
+  const now = opts.now ?? Date.now();
+  switch (workspace.status) {
+    case "active": {
+      const meta = workspace.metadata as Record<string, unknown> | undefined;
+      const ahead = metaNumber(meta, "gitAhead");
+      const dirty = metaNumber(meta, "gitDirtyCount");
+      if (ahead === undefined && dirty === undefined) return "changes";
+      return (ahead ?? 0) > 0 || (dirty ?? 0) > 0 ? "changes" : "idle";
+    }
+    case "ready":
+    case "review_requested":
+      // Handed off, waiting for the auto-merge. A steward holding the claim means a
+      // human-out-of-loop reconciliation is underway → 🟠, otherwise the robot has it → 🔵.
+      return workspaceActiveClaim(workspace, now)?.purpose === "steward" ? "steward" : "ready";
+    case "merge_planned":
+      // Merge dispatched / under reconciliation — robot-or-steward, either way not the human's move.
+      return "steward";
+    case "conflict": {
+      // Held by a steward → reconciling (🟠). Past the stall window with nobody
+      // holding it → the steward path isn't progressing → escalate to the human (🔴).
+      if (workspaceActiveClaim(workspace, now)?.purpose === "steward") return "steward";
+      const stallMs = opts.stallMs ?? LAND_PENDING_STALL_MS;
+      const since = typeof workspace.readyAt === "number" ? now - workspace.readyAt : undefined;
+      if (since !== undefined && since > stallMs) return "blocked";
+      return "steward";
+    }
+    case "merged":
+    case "abandoned":
+    case "cleanup_requested":
+    case "cleaned":
+      // Terminal/torn down: the owner lookup filters these out, so the badge clears.
+      return undefined;
+  }
+}
+
 // Plain-language contract printed/returned right when an agent marks a workspace
 // ready, so the whole "what happens next" is stated up front instead of being
 // decoded from status enums over the following minutes (#235).