agent-relay-server 0.29.0 → 0.30.1

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,
@@ -77208,7 +77210,7 @@ function SidebarContent() {
 }
 function Sidebar() {
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("aside", {
-		className: "hidden xl:flex w-[250px] min-w-[250px] h-dvh sticky top-0 flex-col border-r border-border bg-card",
+		className: "hidden xl:flex w-[250px] min-w-[250px] h-[calc(100dvh-var(--sat))] sticky top-[var(--sat)] flex-col border-r border-border bg-card",
 		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 			className: "px-5 py-4 font-bold text-base border-b border-border flex items-center gap-2",
 			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Radio, { className: "w-4 h-4 text-primary" }), "Agent Relay"]
@@ -77230,7 +77232,7 @@ function MobileDrawer() {
 		className: cn$2("xl:hidden fixed inset-0 z-40 bg-black/50 transition-opacity duration-200", open ? "opacity-100" : "opacity-0 pointer-events-none"),
 		onClick: () => set({ mobileMenuOpen: false })
 	}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("aside", {
-		className: cn$2("xl:hidden fixed inset-y-0 left-0 z-50 w-[280px] flex flex-col bg-card border-r border-border transition-transform duration-200 ease-out", open ? "translate-x-0" : "-translate-x-full"),
+		className: cn$2("xl:hidden fixed inset-y-0 left-0 z-50 w-[280px] flex flex-col pt-[var(--sat)] bg-card border-r border-border transition-transform duration-200 ease-out", open ? "translate-x-0" : "-translate-x-full"),
 		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 			className: "px-5 py-4 font-bold text-base border-b border-border flex items-center gap-2",
 			children: [
@@ -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.
@@ -126385,11 +126441,24 @@ function TerminalViewer({ orchestratorId, session, interactive: initialInteracti
 	});
 }
 function TerminalDialog({ open, onOpenChange, orchestratorId, session, interactive }) {
+	const [vpHeight, setVpHeight] = (0, import_react.useState)(null);
+	(0, import_react.useEffect)(() => {
+		if (!open) return;
+		const vv = window.visualViewport;
+		if (!vv) return;
+		function onResize() {
+			setVpHeight(vv.height);
+		}
+		onResize();
+		vv.addEventListener("resize", onResize);
+		return () => vv.removeEventListener("resize", onResize);
+	}, [open]);
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Dialog, {
 		open,
 		onOpenChange,
 		children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DialogContent, {
-			className: "inset-0 translate-x-0 translate-y-0 w-auto h-auto max-w-none rounded-none p-0 bg-background border-border gap-0 overflow-hidden",
+			className: "inset-x-0 top-0 translate-x-0 translate-y-0 w-auto max-w-none rounded-none p-0 pt-[var(--sat)] bg-background border-border gap-0 overflow-hidden",
+			style: { height: vpHeight ? `${vpHeight}px` : "100dvh" },
 			showCloseButton: false,
 			blurOverlay: false,
 			onEscapeKeyDown: (e) => e.preventDefault(),
@@ -127362,16 +127431,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 +127750,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 +129265,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 +129615,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 +129659,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 +129691,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 +129705,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 +129724,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 +129732,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 +129740,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 +129748,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 +129756,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 +129764,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 +129772,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 +129785,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 +129800,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"]
@@ -130046,7 +130126,7 @@ function ChatView() {
 	}
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		className: "flex -m-4 md:-m-6",
-		style: { height: "calc(100dvh - var(--header-h))" },
+		style: { height: "calc(100dvh - var(--header-h) - var(--sat))" },
 		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 			className: "hidden md:flex w-full",
 			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
@@ -130082,7 +130162,7 @@ function MobileChatContainer({ children }) {
 		return () => vv.removeEventListener("resize", onResize);
 	}, []);
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-		className: "fixed inset-x-0 top-0 z-40 flex flex-col bg-background",
+		className: "fixed inset-x-0 top-0 z-40 flex flex-col bg-background pt-[var(--sat)]",
 		style: { height: height ? `${height}px` : "100dvh" },
 		children
 	});
@@ -130101,6 +130181,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 +130234,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 +130326,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 +130670,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 +131951,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 +132109,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 +133726,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 +133917,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 +134067,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 +134230,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 +134523,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 +134933,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 +134977,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 +135560,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 +136072,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 +155850,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 +155928,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 +157072,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 +157747,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 +158209,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 +158335,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 +159008,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
 									]
@@ -160579,12 +160690,12 @@ function App() {
 	}, [commandPaletteOpen]);
 	const ViewComponent = views[view] || OverviewView;
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ErrorBoundary, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TooltipProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-		className: "flex min-h-dvh",
+		className: "flex min-h-[calc(100dvh-var(--sat))] mt-[var(--sat)]",
 		children: [
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Sidebar, {}),
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(MobileDrawer, {}),
 			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("main", {
-				className: "flex-1 h-dvh overflow-y-auto",
+				className: "flex-1 h-[calc(100dvh-var(--sat))] overflow-y-auto",
 				children: [
 					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(MobileNav, {}),
 					!authNeeded && connectionError && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
@@ -161107,6 +161218,10 @@ if ("serviceWorker" in navigator) {
     container: card-header / inline-size;
   }
 
+  .\@container\/chat {
+    container: chat / inline-size;
+  }
+
   .pointer-events-none {
     pointer-events: none;
   }
@@ -161203,6 +161318,10 @@ if ("serviceWorker" in navigator) {
     top: calc(var(--header-h, 3rem) + .5rem);
   }
 
+  .top-\[var\(--sat\)\] {
+    top: var(--sat);
+  }
+
   .-right-0\.5 {
     right: calc(var(--spacing) * -.5);
   }
@@ -161405,6 +161524,10 @@ if ("serviceWorker" in navigator) {
     margin-top: calc(var(--spacing) * 4);
   }
 
+  .mt-\[var\(--sat\)\] {
+    margin-top: var(--sat);
+  }
+
   .mt-auto {
     margin-top: auto;
   }
@@ -161659,16 +161782,12 @@ if ("serviceWorker" in navigator) {
     height: calc(100dvh - 24rem);
   }
 
-  .h-\[var\(--header-h\)\] {
-    height: var(--header-h);
-  }
-
-  .h-auto {
-    height: auto;
+  .h-\[calc\(100dvh-var\(--sat\)\)\] {
+    height: calc(100dvh - var(--sat));
   }
 
-  .h-dvh {
-    height: 100dvh;
+  .h-\[var\(--header-h\)\] {
+    height: var(--header-h);
   }
 
   .h-fit {
@@ -161791,8 +161910,8 @@ if ("serviceWorker" in navigator) {
     min-height: 360px;
   }
 
-  .min-h-dvh {
-    min-height: 100dvh;
+  .min-h-\[calc\(100dvh-var\(--sat\)\)\] {
+    min-height: calc(100dvh - var(--sat));
   }
 
   .w-\(--radix-dropdown-menu-trigger-width\) {
@@ -163811,6 +163930,10 @@ if ("serviceWorker" in navigator) {
     padding-top: 15vh;
   }
 
+  .pt-\[var\(--sat\)\] {
+    padding-top: var(--sat);
+  }
+
   .pr-2 {
     padding-right: calc(var(--spacing) * 2);
   }
@@ -164684,6 +164807,10 @@ if ("serviceWorker" in navigator) {
     animation-play-state: paused;
   }
 
+  .ring-inset {
+    --tw-ring-inset: inset;
+  }
+
   .running {
     animation-play-state: running;
   }
@@ -165011,6 +165138,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 +165197,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 +165711,6 @@ if ("serviceWorker" in navigator) {
       display: block;
     }
 
-    .sm\:flex {
-      display: flex;
-    }
-
     .sm\:hidden {
       display: none;
     }
@@ -165868,6 +166018,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);
   }
@@ -166954,6 +167124,7 @@ if ("serviceWorker" in navigator) {
 
 :root {
   --header-h: 3rem;
+  --sat: env(safe-area-inset-top, 0px);
 }
 
 .code-preview .shiki {