agent-relay-server 0.10.20 → 0.10.22

package/public/index.html

@@ -11610,6 +11610,10 @@ var useRelayStore = create$1()(persist((set, get) => ({
 	health: null,
 	maintenanceJobs: [],
 	workspaces: [],
+	workspaceGitState: {},
+	workspaceMergePreview: {},
+	workspaceDiff: {},
+	workspaceOrphans: [],
 	taskEvents: [],
 	taskEventCache: {},
 	activityEvents: [],
@@ -12003,12 +12007,83 @@ var useRelayStore = create$1()(persist((set, get) => ({
 			set({ workspaces: await api("GET", "/workspaces") });
 		} catch {}
 	},
+	async fetchWorkspaceGitState(workspaceId) {
+		try {
+			const state = await api("GET", "/workspaces/" + encodeURIComponent(workspaceId) + "/git-state");
+			set((s) => ({ workspaceGitState: {
+				...s.workspaceGitState,
+				[workspaceId]: state
+			} }));
+		} catch (e) {
+			set((s) => ({ workspaceGitState: {
+				...s.workspaceGitState,
+				[workspaceId]: {
+					available: false,
+					reason: e.message
+				}
+			} }));
+		}
+	},
+	async fetchWorkspaceMergePreview(workspaceId) {
+		try {
+			const preview = await api("GET", "/workspaces/" + encodeURIComponent(workspaceId) + "/merge-preview");
+			set((s) => ({ workspaceMergePreview: {
+				...s.workspaceMergePreview,
+				[workspaceId]: preview
+			} }));
+		} catch (e) {
+			set((s) => ({ workspaceMergePreview: {
+				...s.workspaceMergePreview,
+				[workspaceId]: {
+					available: false,
+					reason: e.message
+				}
+			} }));
+		}
+	},
+	async fetchWorkspaceDiff(workspaceId) {
+		try {
+			const diff = await api("GET", "/workspaces/" + encodeURIComponent(workspaceId) + "/diff");
+			set((s) => ({ workspaceDiff: {
+				...s.workspaceDiff,
+				[workspaceId]: diff
+			} }));
+		} catch (e) {
+			set((s) => ({ workspaceDiff: {
+				...s.workspaceDiff,
+				[workspaceId]: {
+					available: false,
+					reason: e.message
+				}
+			} }));
+		}
+	},
+	async fetchWorkspaceOrphans() {
+		try {
+			set({ workspaceOrphans: (await api("GET", "/workspaces/orphans")).orphans ?? [] });
+		} catch {}
+	},
+	async reclaimWorkspaceOrphan(orphan) {
+		get().openConfirm("Reclaim Orphan Worktree", `Remove the orphaned worktree "${orphan.branch || orphan.worktreePath}" from disk? It has no live agent.`, async () => {
+			try {
+				await api("POST", "/workspaces/orphans/reclaim", {
+					worktreePath: orphan.worktreePath,
+					repoRoot: orphan.repoRoot,
+					branch: orphan.branch
+				});
+				get().showNotification("Orphan reclaim dispatched");
+				await Promise.all([get().fetchWorkspaceOrphans(), get().fetchActivityEvents()]);
+			} catch (e) {
+				get().showError("Reclaim Failed", e.message);
+			}
+		});
+	},
 	async workspaceAction(workspaceId, action) {
-		const label = action === "ready" ? "Mark ready" : action === "request-review" ? "Request review" : action === "merge-plan" ? "Mark merge planned" : action === "abandon" ? "Abandon" : "Cleanup";
+		const label = action === "ready" ? "Mark ready" : action === "request-review" ? "Request review" : action === "merge-plan" ? "Mark merge planned" : action === "merge" ? "Merge" : action === "abandon" ? "Abandon" : "Cleanup";
 		const run = async () => {
 			try {
 				await api("POST", "/workspaces/" + encodeURIComponent(workspaceId) + "/actions", { action });
-				get().showNotification(action === "cleanup" ? "Workspace cleanup requested" : `Workspace updated: ${label}`);
+				get().showNotification(action === "cleanup" ? "Workspace cleanup requested" : action === "merge" ? "Workspace merge dispatched" : `Workspace updated: ${label}`);
 				await Promise.all([
 					get().fetchWorkspaces(),
 					get().fetchOrchestrators(),
@@ -12018,14 +12093,45 @@ var useRelayStore = create$1()(persist((set, get) => ({
 				get().showError("Workspace Action Failed", e.message);
 			}
 		};
-		if (action === "cleanup" || action === "abandon") {
+		if (action === "cleanup" || action === "abandon" || action === "merge") {
 			const workspace = get().workspaces.find((item) => item.id === workspaceId);
 			const target = workspace?.branch || workspace?.worktreePath || workspaceId;
-			get().openConfirm(label + " Workspace", `${label} workspace "${target}"?`, run);
+			if (action === "merge") {
+				const preview = get().workspaceMergePreview[workspaceId];
+				const mergeDetail = preview && preview.available !== false ? ` — ${preview.strategy === "pr" ? "opens a PR" : `rebases & fast-forwards into ${preview.baseRef || "base"}, then deletes the branch`}.` : " — lands the work and deletes the branch.";
+				get().openConfirm("Merge Workspace", `Merge workspace "${target}"?${mergeDetail}`, run);
+				return;
+			}
+			if (action === "cleanup") {
+				await get().fetchWorkspaceGitState(workspaceId);
+				const gs = get().workspaceGitState[workspaceId];
+				let warn = "";
+				if (gs && gs.available !== false && !gs.missing) {
+					const ahead = gs.ahead ?? 0;
+					const dirty = gs.dirtyCount ?? 0;
+					if (ahead > 0 || dirty > 0) warn = ` ⚠ This destroys ${[ahead > 0 ? `${ahead} unmerged commit(s)` : "", dirty > 0 ? `${dirty} uncommitted change(s)` : ""].filter(Boolean).join(" and ")}.`;
+				}
+				get().openConfirm("Cleanup Workspace", `Remove the worktree for "${target}" on the host?${warn}`, run);
+				return;
+			}
+			get().openConfirm("Abandon Workspace", `Abandon workspace "${target}"?`, run);
 			return;
 		}
 		await run();
 	},
+	async purgeWorkspace(workspaceId) {
+		const workspace = get().workspaces.find((item) => item.id === workspaceId);
+		const target = workspace?.branch || workspace?.worktreePath || workspaceId;
+		get().openConfirm("Purge Workspace Record", `Permanently remove the record for "${target}"? This only clears the dashboard row — it does not touch disk.`, async () => {
+			try {
+				await api("DELETE", "/workspaces/" + encodeURIComponent(workspaceId));
+				get().showNotification("Workspace record purged");
+				await Promise.all([get().fetchWorkspaces(), get().fetchActivityEvents()]);
+			} catch (e) {
+				get().showError("Purge Failed", e.message);
+			}
+		});
+	},
 	async fetchAgentProfiles() {
 		try {
 			set({ agentProfiles: (await api("GET", "/agent-profiles")).map((entry) => entry.value) });
@@ -12227,6 +12333,8 @@ var useRelayStore = create$1()(persist((set, get) => ({
 					const msgs = [...s.messages, msg];
 					if (msgs.length > 500) msgs.splice(0, msgs.length - 500);
 					set({ messages: msgs });
+					const peer = inboxPeer(msg);
+					if (isHumanInboundMessage(msg) && peer && s.view === "chat" && s.selectedInboxThread === peer && !isDashboardHidden()) get().markInboxThreadReadTo(peer, msg.id);
 					return;
 				}
 				if (event === "message.queued" || event === "message.expired" || event === "message.delivery_updated" || event === "message.reaction_updated") {
@@ -12753,15 +12861,18 @@ var useRelayStore = create$1()(persist((set, get) => ({
 		if (!body.trim() && attachments.length === 0 || get().chatSending) return;
 		set({ chatSending: true });
 		try {
-			const payload = {
-				from: HUMAN_AGENT_ID,
-				to: thread.peer,
-				body: body.trim() || "Attachment"
-			};
-			if (thread.lastMessage?.channel) payload.channel = thread.lastMessage.channel;
-			if (thread.lastMessage?.id) payload.replyTo = thread.lastMessage.id;
-			if (attachments.length) payload.payload = { attachments };
-			await api("POST", "/messages", payload);
+			if (get().agentsById[thread.peer]?.providerCapabilities?.liveSession?.inject && attachments.length === 0) await api("POST", "/agents/" + encodeURIComponent(thread.peer) + "/prompt", { body: body.trim() });
+			else {
+				const payload = {
+					from: HUMAN_AGENT_ID,
+					to: thread.peer,
+					body: body.trim() || "Attachment"
+				};
+				if (thread.lastMessage?.channel) payload.channel = thread.lastMessage.channel;
+				if (thread.lastMessage?.id) payload.replyTo = thread.lastMessage.id;
+				if (attachments.length) payload.payload = { attachments };
+				await api("POST", "/messages", payload);
+			}
 			const next = { ...get().inboxDrafts };
 			delete next[thread.peer];
 			set({ inboxDrafts: next });
@@ -13209,6 +13320,20 @@ var useRelayStore = create$1()(persist((set, get) => ({
 			}
 		});
 	},
+	upgradeOrchestrator(orchId, targetVersion) {
+		const to = targetVersion ? ` to v${targetVersion}` : " to match the relay";
+		get().openConfirm("Upgrade Orchestrator", `Upgrade "${orchId}"${to}? It will install the new version and restart itself.`, async () => {
+			try {
+				await api("POST", "/orchestrators/" + encodeURIComponent(orchId) + "/actions", {
+					action: "upgrade",
+					...targetVersion ? { targetVersion } : {}
+				});
+				await Promise.all([get().fetchOrchestrators(), get().fetchActivityEvents()]);
+			} catch (e) {
+				get().showError("Upgrade Failed", e.message);
+			}
+		});
+	},
 	deleteOrchestrator(orchId) {
 		get().openConfirm("Remove Orchestrator", `Remove orchestrator "${orchId}"?`, async () => {
 			try {
@@ -106939,8 +107064,8 @@ function TextWithLinks({ text, onOpenPath, onPreviewPath, onPreviewPathEnd, isPa
 					e.stopPropagation();
 					onOpenPath(part.path, part.line);
 				},
-				onMouseEnter: () => onPreviewPath?.(part.path, part.line),
-				onFocus: () => onPreviewPath?.(part.path, part.line),
+				onMouseEnter: (e) => onPreviewPath?.(part.path, part.line, e.currentTarget.getBoundingClientRect()),
+				onFocus: (e) => onPreviewPath?.(part.path, part.line, e.currentTarget.getBoundingClientRect()),
 				onMouseLeave: () => onPreviewPathEnd?.(),
 				onBlur: () => onPreviewPathEnd?.(),
 				title: resolvedTitle ? `Open ${resolvedTitle}` : "Open file",
@@ -117489,15 +117614,21 @@ var h$1 = 2, _$1 = 1, o$1 = class {
 };
 //#endregion
 //#region src/components/ui/dialog.tsx
+var suppressGuardPop = false;
 function useBackClose$1(open, onOpenChange) {
 	const pushedRef = import_react.useRef(false);
 	const cbRef = import_react.useRef(onOpenChange);
 	cbRef.current = onOpenChange;
 	import_react.useEffect(() => {
 		if (!open || !cbRef.current) return;
+		suppressGuardPop = false;
 		window.history.pushState({ dialogGuard: true }, "");
 		pushedRef.current = true;
 		function onPop() {
+			if (suppressGuardPop) {
+				suppressGuardPop = false;
+				return;
+			}
 			if (pushedRef.current) {
 				pushedRef.current = false;
 				cbRef.current?.(false);
@@ -117508,6 +117639,7 @@ function useBackClose$1(open, onOpenChange) {
 			window.removeEventListener("popstate", onPop);
 			if (pushedRef.current) {
 				pushedRef.current = false;
+				suppressGuardPop = true;
 				window.history.back();
 			}
 		};
@@ -119670,6 +119802,74 @@ function PendingAttachmentPreview({ item, onRemove }) {
 		})
 	})] });
 }
+function FloatingFilePreview({ preview, error, onReadError, onMouseEnter, onMouseLeave }) {
+	const { anchor } = preview;
+	const gap = 8;
+	const width = Math.min(560, window.innerWidth - 24);
+	const height = Math.min(380, window.innerHeight - 24);
+	const left = Math.max(12, Math.min(anchor.left, window.innerWidth - width - 12));
+	return (0, import_react_dom.createPortal)(/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+		className: "fixed z-50 flex flex-col overflow-hidden rounded-lg border border-border bg-background shadow-xl",
+		style: {
+			top: window.innerHeight - anchor.bottom >= height + gap ? anchor.bottom + gap : anchor.top - gap - height >= 12 ? anchor.top - gap - height : Math.max(12, window.innerHeight - height - 12),
+			left,
+			width,
+			height
+		},
+		onMouseEnter,
+		onMouseLeave,
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+			className: "flex h-8 shrink-0 items-center gap-2 border-b border-border px-2.5",
+			children: [
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+					className: "min-w-0 flex-1 truncate text-[11px] font-medium text-muted-foreground",
+					children: preview.path
+				}),
+				error && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+					className: "max-w-[12rem] truncate text-[11px] text-red-400",
+					children: error
+				}),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+					className: "shrink-0 text-[10px] text-muted-foreground/70",
+					children: "click to pin"
+				})
+			]
+		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+			className: "min-h-0 flex-1",
+			children: preview.type === "directory" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DirectoryContent, {
+				orchestratorId: preview.orchestratorId,
+				selectedPath: preview.path,
+				onReadError
+			}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FileContent, {
+				orchestratorId: preview.orchestratorId,
+				selectedPath: preview.path,
+				line: preview.line,
+				onReadError
+			})
+		})]
+	}), document.body);
+}
+function AddReaction({ open, onToggle, onReact }) {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+		className: "relative shrink-0",
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+			type: "button",
+			title: "Add reaction",
+			onClick: onToggle,
+			className: cn$1("inline-flex h-5 w-6 items-center justify-center rounded-full border border-border bg-popover text-muted-foreground shadow-sm transition hover:bg-muted hover:text-foreground", open ? "opacity-100" : "opacity-0 pointer-events-none md:group-hover/msg:opacity-100 md:group-hover/msg:pointer-events-auto"),
+			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SmilePlus, { className: "h-3 w-3" })
+		}), open && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+			className: "absolute bottom-full left-0 z-30 mb-1 flex gap-0.5 rounded-full border border-border bg-popover p-0.5 shadow-md",
+			children: QUICK_REACTIONS.map((emoji) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+				type: "button",
+				title: `React ${emoji}`,
+				onClick: () => onReact(emoji),
+				className: "inline-flex h-6 w-7 items-center justify-center rounded-full text-xs transition-colors hover:bg-muted",
+				children: emoji
+			}, emoji))
+		})]
+	});
+}
 var MessageBubble = (0, import_react.memo)(function MessageBubble({ msg, peer, onOpenReferencedPath, onPreviewReferencedPath, onPreviewReferencedPathEnd }) {
 	const isOutbound = msg.from === HUMAN_AGENT_ID;
 	const reactToMessage = useRelayStore((s) => s.reactToMessage);
@@ -119707,9 +119907,9 @@ var MessageBubble = (0, import_react.memo)(function MessageBubble({ msg, peer, o
 		const absolute = resolvedReferencedPath(path);
 		onOpenReferencedPath?.(absolute, line);
 	}
-	function previewReferencedPath(path, line) {
+	function previewReferencedPath(path, line, anchor) {
 		const absolute = resolvedReferencedPath(path);
-		onPreviewReferencedPath?.(absolute, line);
+		onPreviewReferencedPath?.(absolute, line, anchor);
 	}
 	function handleReact(emoji) {
 		reactToMessage(msg, emoji);
@@ -119783,25 +119983,27 @@ var MessageBubble = (0, import_react.memo)(function MessageBubble({ msg, peer, o
 						})
 					]
 				}),
-				!isReactionEvent(msg) && reactions.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-					className: cn$1("flex flex-wrap gap-0.5 -mt-1 relative z-10", isOutbound ? "justify-end pr-2" : "justify-start pl-2"),
-					children: reactions.map((reaction) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("button", {
+				!isReactionEvent(msg) && reactions.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+					className: cn$1("flex flex-wrap items-center gap-0.5 -mt-1 relative z-10", isOutbound ? "justify-end pr-2" : "justify-start pl-2"),
+					children: [!isOutbound && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AddReaction, {
+						open: showQuickReact,
+						onToggle: () => setShowQuickReact((v) => !v),
+						onReact: handleReact
+					}), reactions.map((reaction) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("button", {
 						type: "button",
 						title: reaction.actors.join(", "),
 						onClick: () => handleReact(reaction.emoji),
 						className: cn$1("inline-flex h-5 items-center gap-0.5 rounded-full border px-1.5 text-[11px] shadow-sm transition-colors", reaction.mine ? "border-primary/40 bg-primary/10 text-primary" : "border-border bg-background hover:bg-muted text-foreground"),
 						children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: reaction.emoji }), reaction.count > 1 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: reaction.count })]
-					}, reaction.emoji))
+					}, reaction.emoji))]
 				}),
-				!isReactionEvent(msg) && !isOutbound && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-					className: cn$1("absolute -top-3 flex gap-0.5 transition-opacity z-20", showQuickReact ? "opacity-100" : "opacity-0 pointer-events-none md:group-hover/msg:opacity-100 md:group-hover/msg:pointer-events-auto", "left-1"),
-					children: QUICK_REACTIONS.map((emoji) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
-						type: "button",
-						title: `React ${emoji}`,
-						onClick: () => handleReact(emoji),
-						className: "inline-flex h-6 w-7 items-center justify-center rounded-full border border-border bg-popover text-xs shadow-md transition-colors hover:bg-muted",
-						children: emoji
-					}, emoji))
+				!isReactionEvent(msg) && !isOutbound && reactions.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: "absolute -bottom-2.5 left-1 z-20",
+					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AddReaction, {
+						open: showQuickReact,
+						onToggle: () => setShowQuickReact((v) => !v),
+						onReact: handleReact
+					})
 				})
 			]
 		})
@@ -119961,6 +120163,7 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 	const [terminalTarget, setTerminalTarget] = (0, import_react.useState)(null);
 	const [terminalOpening, setTerminalOpening] = (0, import_react.useState)(false);
 	const [filePreview, setFilePreview] = (0, import_react.useState)(null);
+	const [floatingPreview, setFloatingPreview] = (0, import_react.useState)(null);
 	const [filePreviewError, setFilePreviewError] = (0, import_react.useState)("");
 	const filePreviewCloseTimer = (0, import_react.useRef)(null);
 	const filePreviewRequest = (0, import_react.useRef)(0);
@@ -120059,17 +120262,17 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 			return null;
 		}
 	}, [orchestrators]);
-	const previewReferencedFile = (0, import_react.useCallback)((path, line) => {
-		if (!supportsSideFilePreview()) return;
+	const previewReferencedFile = (0, import_react.useCallback)((path, line, anchor) => {
+		if (!supportsSideFilePreview() || !anchor) return;
 		const request = ++filePreviewRequest.current;
 		resolveReferencedFile(path).then((info) => {
 			if (filePreviewRequest.current !== request) return;
 			if (!info) return;
 			clearFilePreviewCloseTimer();
-			setFilePreview({
+			setFloatingPreview({
 				...info,
 				line: line || 0,
-				pinned: false
+				anchor
 			});
 			setFilePreviewError("");
 		});
@@ -120078,7 +120281,7 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 		filePreviewRequest.current += 1;
 		clearFilePreviewCloseTimer();
 		filePreviewCloseTimer.current = window.setTimeout(() => {
-			setFilePreview((current) => current?.pinned ? current : null);
+			setFloatingPreview(null);
 		}, 250);
 	}, [clearFilePreviewCloseTimer]);
 	const openReferencedFile = (0, import_react.useCallback)((path, line) => {
@@ -120088,11 +120291,12 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 				return;
 			}
 			if (supportsSideFilePreview()) {
+				filePreviewRequest.current += 1;
 				clearFilePreviewCloseTimer();
+				setFloatingPreview(null);
 				setFilePreview({
 					...info,
-					line: line || 0,
-					pinned: true
+					line: line || 0
 				});
 				setFilePreviewError("");
 				return;
@@ -120117,8 +120321,6 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 		showError
 	]);
 	function closeFilePreview() {
-		filePreviewRequest.current += 1;
-		clearFilePreviewCloseTimer();
 		setFilePreview(null);
 		setFilePreviewError("");
 	}
@@ -120209,372 +120411,380 @@ function ChatPanel({ threads, onBack, showBackButton }) {
 			children: "Select an agent to start chatting"
 		})]
 	});
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [/* @__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",
-			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",
-					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-						className: "flex items-center gap-2 md:gap-2.5 min-w-0",
-						children: [
-							showBackButton && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
-								variant: "ghost",
-								size: "icon-sm",
-								onClick: onBack,
-								className: "shrink-0 -ml-1",
-								children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ArrowLeft, { className: "w-4 h-4" })
-							}),
-							/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("button", {
-								type: "button",
-								className: "flex items-center gap-2 md:gap-2.5 min-w-0 hover:opacity-80 transition-opacity",
-								onClick: () => agent && openAgentDetail(agent),
-								disabled: !agent,
-								children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-									className: "relative shrink-0",
-									children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(AgentTypeIcon, { agent }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(StatusDot, {
-										agent,
-										now,
-										className: "absolute -bottom-0.5 -right-0.5 w-2 h-2"
-									})]
-								}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-									className: "min-w-0 text-left",
-									children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", {
-										className: "text-sm font-medium truncate",
-										children: agent ? displayName(agent) : selectedInboxThread
-									}), agent && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", {
-										className: "text-xs text-muted-foreground truncate",
-										children: [
-											blockedState ? `blocked: ${blockedState.label}` : agent.status,
-											agent.machine && ` · ${agent.machine}`,
-											typeof agent.meta?.cwd === "string" && agent.meta.cwd && ` · ${shortPath$1(agent.meta.cwd, 1)}`
-										]
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+		/* @__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",
+				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",
+						children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+							className: "flex items-center gap-2 md:gap-2.5 min-w-0",
+							children: [
+								showBackButton && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+									variant: "ghost",
+									size: "icon-sm",
+									onClick: onBack,
+									className: "shrink-0 -ml-1",
+									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ArrowLeft, { className: "w-4 h-4" })
+								}),
+								/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("button", {
+									type: "button",
+									className: "flex items-center gap-2 md:gap-2.5 min-w-0 hover:opacity-80 transition-opacity",
+									onClick: () => agent && openAgentDetail(agent),
+									disabled: !agent,
+									children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+										className: "relative shrink-0",
+										children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(AgentTypeIcon, { agent }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(StatusDot, {
+											agent,
+											now,
+											className: "absolute -bottom-0.5 -right-0.5 w-2 h-2"
+										})]
+									}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+										className: "min-w-0 text-left",
+										children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", {
+											className: "text-sm font-medium truncate",
+											children: agent ? displayName(agent) : selectedInboxThread
+										}), agent && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", {
+											className: "text-xs text-muted-foreground truncate",
+											children: [
+												blockedState ? `blocked: ${blockedState.label}` : agent.status,
+												agent.machine && ` · ${agent.machine}`,
+												typeof agent.meta?.cwd === "string" && agent.meta.cwd && ` · ${shortPath$1(agent.meta.cwd, 1)}`
+											]
+										})]
 									})]
-								})]
-							}),
-							agent && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AgentRuntimeChips, {
-								agent,
-								compact: true,
-								className: "hidden md:flex shrink-0"
-							}),
-							agent?.context && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ContextRing, { utilization: agent.context.utilization }),
-							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",
-								children: [thread.attention.unread, " unread"]
-							}) : null
-						]
-					}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-						className: "flex items-center gap-0.5 md:gap-1 shrink-0",
-						children: agent && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
-							canOpenTerminal && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
-								variant: "ghost",
-								size: "icon-sm",
-								className: "hidden sm:inline-flex",
-								disabled: terminalOpening,
-								title: "Terminal",
-								onClick: () => void handleOpenTerminal(),
-								children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Terminal, { 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",
-								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" })
-							}),
-							canClearContext && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
-								variant: "ghost",
-								size: "icon-sm",
-								className: "hidden sm: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" })
-							}),
-							canShutdown && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
-								variant: "ghost",
-								size: "icon-sm",
-								className: "hidden sm: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" })
-							}),
-							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",
-								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" })
-							}),
-							agent && thread && thread.messages.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
-								variant: "ghost",
-								size: "icon-sm",
-								className: "hidden sm: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" })
+								}),
+								agent && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AgentRuntimeChips, {
+									agent,
+									compact: true,
+									className: "hidden md:flex shrink-0"
+								}),
+								agent?.context && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ContextRing, { utilization: agent.context.utilization }),
+								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",
+									children: [thread.attention.unread, " unread"]
+								}) : null
+							]
+						}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+							className: "flex items-center gap-0.5 md:gap-1 shrink-0",
+							children: agent && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+								canOpenTerminal && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+									variant: "ghost",
+									size: "icon-sm",
+									className: "hidden sm:inline-flex",
+									disabled: terminalOpening,
+									title: "Terminal",
+									onClick: () => void handleOpenTerminal(),
+									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Terminal, { 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",
+									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" })
+								}),
+								canClearContext && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+									variant: "ghost",
+									size: "icon-sm",
+									className: "hidden sm: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" })
+								}),
+								canShutdown && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+									variant: "ghost",
+									size: "icon-sm",
+									className: "hidden sm: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" })
+								}),
+								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",
+									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" })
+								}),
+								agent && thread && thread.messages.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+									variant: "ghost",
+									size: "icon-sm",
+									className: "hidden sm: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" })
+								}),
+								thread && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+									variant: "ghost",
+									size: "icon-sm",
+									className: "hidden sm:inline-flex",
+									title: "Mark unread",
+									onClick: () => markInboxThreadUnread(selectedInboxThread),
+									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MailX, { className: "w-3.5 h-3.5" })
+								}),
+								thread && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+									variant: "ghost",
+									size: "icon-sm",
+									className: "hidden sm: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" })
+								}),
+								exportableThread && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+									variant: "ghost",
+									size: "icon-sm",
+									className: "hidden sm:inline-flex",
+									title: "Export thread",
+									onClick: () => exportThread({
+										...exportableThread,
+										importedHistory
+									}, "json"),
+									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Download, { className: "w-3.5 h-3.5" })
+								}),
+								/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenu, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(DropdownMenuTrigger, {
+									asChild: true,
+									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+										variant: "ghost",
+										size: "icon-sm",
+										className: "sm:hidden",
+										children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Ellipsis, { className: "w-3.5 h-3.5" })
+									})
+								}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuContent, {
+									align: "end",
+									children: [
+										canOpenTerminal && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
+											disabled: terminalOpening,
+											onClick: () => void handleOpenTerminal(),
+											children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Terminal, { className: "w-3.5 h-3.5" }), "Terminal"]
+										}),
+										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"]
+										}),
+										canClearContext && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
+											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" }), "Clear Context"]
+										}),
+										canShutdown && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
+											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" }), "Shutdown"]
+										}),
+										agent && typeof agent.meta?.cwd === "string" && agent.meta.cwd && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
+											onClick: () => void openFilesForAgent(agent),
+											children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(FolderOpen, { className: "w-3.5 h-3.5" }), "Open Files"]
+										}),
+										agent && thread && thread.messages.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
+											onClick: () => forkFromAgent(agent.id, thread.messages),
+											children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitFork, { className: "w-3.5 h-3.5" }), "Fork"]
+										}),
+										(canOpenTerminal || canCompact || canClearContext || canShutdown) && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DropdownMenuSeparator, {}),
+										thread && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
+											onClick: () => markInboxThreadUnread(selectedInboxThread),
+											children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(MailX, { className: "w-3.5 h-3.5" }), "Mark Unread"]
+										}),
+										thread && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
+											onClick: () => markInboxThreadRead(thread.peer, thread.messages),
+											children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(MailOpen, { className: "w-3.5 h-3.5" }), "Mark Read"]
+										}),
+										exportableThread && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
+											onClick: () => exportThread({
+												...exportableThread,
+												importedHistory
+											}, "json"),
+											children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Download, { className: "w-3.5 h-3.5" }), "Download"]
+										})
+									]
+								})] })
+							] })
+						})]
+					}),
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+						ref: pinnedScroll.ref,
+						onScroll: pinnedScroll.onScroll,
+						className: "flex-1 overflow-y-auto px-3 md:px-4 py-3 md:py-4",
+						style: { minHeight: 0 },
+						children: timeline.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+							className: "flex flex-col items-center justify-center h-full text-center",
+							children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(MessageSquare, { className: "w-8 h-8 text-zinc-600 mb-2" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", {
+								className: "text-xs text-muted-foreground",
+								children: "No messages yet"
+							})]
+						}) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
+							timeline.map((entry) => {
+								if (entry.type === "message") return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MessageBubble, {
+									msg: entry.msg,
+									peer: selectedInboxThread,
+									onOpenReferencedPath: openReferencedFile,
+									onPreviewReferencedPath: previewReferencedFile,
+									onPreviewReferencedPathEnd: scheduleCloseReferencedFilePreview
+								}, entry.msg.id);
+								if (entry.type === "import-boundary") return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ImportedHistoryMarker, { history: entry.history }, `import-${entry.history.id}`);
+								if (entry.type === "imported-message") return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ImportedMessageBubble, {
+									entry: entry.entry,
+									sourceLabel: entry.history.sourceAgentLabel || entry.history.sourcePeerId
+								}, `import-${entry.history.id}-${entry.entry.originalMessageId}-${entry.entry.position}`);
+								if (entry.type === "status") return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(StatusMarker, { event: entry.event }, entry.event.id);
+								if (entry.type === "date") return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DateSeparator, { date: entry.date }, `d-${entry.date}`);
+								if (entry.type === "created") return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CreatedMarker, { timestamp: entry.timestamp }, "created");
+								return null;
 							}),
-							thread && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
-								variant: "ghost",
-								size: "icon-sm",
-								className: "hidden sm:inline-flex",
-								title: "Mark unread",
-								onClick: () => markInboxThreadUnread(selectedInboxThread),
-								children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MailX, { className: "w-3.5 h-3.5" })
+							pendingApproval && agent && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PermissionRequestBubble, {
+								agentId: agent.id,
+								approval: pendingApproval
 							}),
-							thread && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
-								variant: "ghost",
-								size: "icon-sm",
-								className: "hidden sm: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" })
+							agent?.status === "busy" && !pendingApproval && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(BusyIndicator, { blockedLabel: blockedState?.label })
+						] })
+					}),
+					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+						className: cn$1("shrink-0 border-t border-border px-3 md:px-4 py-2.5 md:py-3 safe-area-bottom", dragActive && "bg-primary/5 ring-1 ring-primary/40"),
+						onDragOver: (e) => {
+							e.preventDefault();
+							setDragActive(true);
+						},
+						onDragLeave: () => setDragActive(false),
+						onDrop: (e) => {
+							e.preventDefault();
+							setDragActive(false);
+							uploadFiles(e.dataTransfer.files);
+						},
+						children: [
+							pendingAttachments.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+								className: "mb-2 grid gap-2 sm:grid-cols-2",
+								children: pendingAttachments.map((item) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PendingAttachmentPreview, {
+									item,
+									onRemove: () => removePendingAttachment(item.id)
+								}, item.id))
 							}),
-							exportableThread && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
-								variant: "ghost",
-								size: "icon-sm",
-								className: "hidden sm:inline-flex",
-								title: "Export thread",
-								onClick: () => exportThread({
-									...exportableThread,
-									importedHistory
-								}, "json"),
-								children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Download, { className: "w-3.5 h-3.5" })
+							/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", {
+								ref: fileInputRef,
+								type: "file",
+								multiple: true,
+								className: "hidden",
+								onChange: (e) => {
+									if (e.target.files) uploadFiles(e.target.files);
+									e.currentTarget.value = "";
+								}
 							}),
-							/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenu, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(DropdownMenuTrigger, {
-								asChild: true,
-								children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
-									variant: "ghost",
-									size: "icon-sm",
-									className: "sm:hidden",
-									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Ellipsis, { className: "w-3.5 h-3.5" })
-								})
-							}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuContent, {
-								align: "end",
+							/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+								className: "hidden md:flex items-end gap-2",
 								children: [
-									canOpenTerminal && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
-										disabled: terminalOpening,
-										onClick: () => void handleOpenTerminal(),
-										children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Terminal, { className: "w-3.5 h-3.5" }), "Terminal"]
-									}),
-									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"]
-									}),
-									canClearContext && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
-										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" }), "Clear Context"]
-									}),
-									canShutdown && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
-										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" }), "Shutdown"]
-									}),
-									agent && typeof agent.meta?.cwd === "string" && agent.meta.cwd && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
-										onClick: () => void openFilesForAgent(agent),
-										children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(FolderOpen, { className: "w-3.5 h-3.5" }), "Open Files"]
-									}),
-									agent && thread && thread.messages.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
-										onClick: () => forkFromAgent(agent.id, thread.messages),
-										children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitFork, { className: "w-3.5 h-3.5" }), "Fork"]
-									}),
-									(canOpenTerminal || canCompact || canClearContext || canShutdown) && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DropdownMenuSeparator, {}),
-									thread && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
-										onClick: () => markInboxThreadUnread(selectedInboxThread),
-										children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(MailX, { className: "w-3.5 h-3.5" }), "Mark Unread"]
+									/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+										variant: "ghost",
+										size: "icon",
+										title: "Attach files",
+										disabled: chatSending,
+										onClick: () => fileInputRef.current?.click(),
+										className: "shrink-0 mb-0.5 rounded-xl h-[42px] w-[42px]",
+										children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Paperclip, { className: "w-4 h-4" })
 									}),
-									thread && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
-										onClick: () => markInboxThreadRead(thread.peer, thread.messages),
-										children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(MailOpen, { className: "w-3.5 h-3.5" }), "Mark Read"]
+									/* @__PURE__ */ (0, import_jsx_runtime.jsx)(AutoGrowTextarea, {
+										value: draft,
+										onChange: (e) => setReplyDraft(selectedInboxThread, e.target.value),
+										onKeyDown: handleKeyDown,
+										onPaste: handlePaste,
+										placeholder: `Message ${agent ? displayName(agent) : selectedInboxThread}…`,
+										className: "flex-1"
 									}),
-									exportableThread && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(DropdownMenuItem, {
-										onClick: () => exportThread({
-											...exportableThread,
-											importedHistory
-										}, "json"),
-										children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Download, { className: "w-3.5 h-3.5" }), "Download"]
+									/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+										size: "icon",
+										disabled: !draft.trim() && readyAttachments.length === 0 || hasPendingUploads || chatSending,
+										onClick: handleSend,
+										className: "shrink-0 mb-0.5 rounded-xl h-[42px] w-[42px]",
+										children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Send, { className: "w-4 h-4" })
 									})
 								]
-							})] })
-						] })
-					})]
-				}),
-				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-					ref: pinnedScroll.ref,
-					onScroll: pinnedScroll.onScroll,
-					className: "flex-1 overflow-y-auto px-3 md:px-4 py-3 md:py-4",
-					style: { minHeight: 0 },
-					children: timeline.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-						className: "flex flex-col items-center justify-center h-full text-center",
-						children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(MessageSquare, { className: "w-8 h-8 text-zinc-600 mb-2" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", {
-							className: "text-xs text-muted-foreground",
-							children: "No messages yet"
-						})]
-					}) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
-						timeline.map((entry) => {
-							if (entry.type === "message") return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MessageBubble, {
-								msg: entry.msg,
-								peer: selectedInboxThread,
-								onOpenReferencedPath: openReferencedFile,
-								onPreviewReferencedPath: previewReferencedFile,
-								onPreviewReferencedPathEnd: scheduleCloseReferencedFilePreview
-							}, entry.msg.id);
-							if (entry.type === "import-boundary") return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ImportedHistoryMarker, { history: entry.history }, `import-${entry.history.id}`);
-							if (entry.type === "imported-message") return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ImportedMessageBubble, {
-								entry: entry.entry,
-								sourceLabel: entry.history.sourceAgentLabel || entry.history.sourcePeerId
-							}, `import-${entry.history.id}-${entry.entry.originalMessageId}-${entry.entry.position}`);
-							if (entry.type === "status") return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(StatusMarker, { event: entry.event }, entry.event.id);
-							if (entry.type === "date") return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DateSeparator, { date: entry.date }, `d-${entry.date}`);
-							if (entry.type === "created") return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CreatedMarker, { timestamp: entry.timestamp }, "created");
-							return null;
-						}),
-						pendingApproval && agent && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PermissionRequestBubble, {
-							agentId: agent.id,
-							approval: pendingApproval
-						}),
-						agent?.status === "busy" && !pendingApproval && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(BusyIndicator, { blockedLabel: blockedState?.label })
-					] })
-				}),
-				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-					className: cn$1("shrink-0 border-t border-border px-3 md:px-4 py-2.5 md:py-3 safe-area-bottom", dragActive && "bg-primary/5 ring-1 ring-primary/40"),
-					onDragOver: (e) => {
-						e.preventDefault();
-						setDragActive(true);
-					},
-					onDragLeave: () => setDragActive(false),
-					onDrop: (e) => {
-						e.preventDefault();
-						setDragActive(false);
-						uploadFiles(e.dataTransfer.files);
-					},
-					children: [
-						pendingAttachments.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-							className: "mb-2 grid gap-2 sm:grid-cols-2",
-							children: pendingAttachments.map((item) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PendingAttachmentPreview, {
-								item,
-								onRemove: () => removePendingAttachment(item.id)
-							}, item.id))
-						}),
-						/* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", {
-							ref: fileInputRef,
-							type: "file",
-							multiple: true,
-							className: "hidden",
-							onChange: (e) => {
-								if (e.target.files) uploadFiles(e.target.files);
-								e.currentTarget.value = "";
-							}
-						}),
-						/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-							className: "hidden md:flex items-end gap-2",
-							children: [
-								/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
-									variant: "ghost",
-									size: "icon",
-									title: "Attach files",
-									disabled: chatSending,
-									onClick: () => fileInputRef.current?.click(),
-									className: "shrink-0 mb-0.5 rounded-xl h-[42px] w-[42px]",
-									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Paperclip, { className: "w-4 h-4" })
-								}),
-								/* @__PURE__ */ (0, import_jsx_runtime.jsx)(AutoGrowTextarea, {
+							}),
+							/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+								className: "md:hidden space-y-2",
+								children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(AutoGrowTextarea, {
 									value: draft,
 									onChange: (e) => setReplyDraft(selectedInboxThread, e.target.value),
 									onKeyDown: handleKeyDown,
 									onPaste: handlePaste,
 									placeholder: `Message ${agent ? displayName(agent) : selectedInboxThread}…`,
-									className: "flex-1"
-								}),
-								/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
-									size: "icon",
-									disabled: !draft.trim() && readyAttachments.length === 0 || hasPendingUploads || chatSending,
-									onClick: handleSend,
-									className: "shrink-0 mb-0.5 rounded-xl h-[42px] w-[42px]",
-									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Send, { className: "w-4 h-4" })
-								})
-							]
-						}),
-						/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-							className: "md:hidden space-y-2",
-							children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(AutoGrowTextarea, {
-								value: draft,
-								onChange: (e) => setReplyDraft(selectedInboxThread, e.target.value),
-								onKeyDown: handleKeyDown,
-								onPaste: handlePaste,
-								placeholder: `Message ${agent ? displayName(agent) : selectedInboxThread}…`,
-								className: "w-full"
-							}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-								className: "flex items-center justify-between",
-								children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
-									variant: "ghost",
-									size: "icon",
-									title: "Attach files",
-									disabled: chatSending,
-									onClick: () => fileInputRef.current?.click(),
-									className: "rounded-xl h-9 w-9",
-									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Paperclip, { className: "w-4 h-4" })
-								}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
-									size: "icon",
-									disabled: !draft.trim() && readyAttachments.length === 0 || hasPendingUploads || chatSending,
-									onClick: handleSend,
-									className: "rounded-xl h-9 w-9",
-									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Send, { className: "w-4 h-4" })
+									className: "w-full"
+								}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+									className: "flex items-center justify-between",
+									children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+										variant: "ghost",
+										size: "icon",
+										title: "Attach files",
+										disabled: chatSending,
+										onClick: () => fileInputRef.current?.click(),
+										className: "rounded-xl h-9 w-9",
+										children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Paperclip, { className: "w-4 h-4" })
+									}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+										size: "icon",
+										disabled: !draft.trim() && readyAttachments.length === 0 || hasPendingUploads || chatSending,
+										onClick: handleSend,
+										className: "rounded-xl h-9 w-9",
+										children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Send, { className: "w-4 h-4" })
+									})]
 								})]
-							})]
+							}),
+							/* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", {
+								className: "text-xs text-muted-foreground mt-1.5 hidden md:block",
+								children: "Enter to send · Shift+Enter for newline"
+							})
+						]
+					})
+				]
+			}), filePreview && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("aside", {
+				className: "hidden h-full w-[min(44vw,720px)] min-w-[360px] shrink-0 flex-col border-l border-border bg-background xl:flex",
+				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+					className: "flex h-10 shrink-0 items-center gap-2 border-b border-border px-3",
+					children: [
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+							className: "min-w-0 flex-1 text-xs font-medium text-muted-foreground",
+							children: "File preview"
 						}),
-						/* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", {
-							className: "text-xs text-muted-foreground mt-1.5 hidden md:block",
-							children: "Enter to send · Shift+Enter for newline"
+						filePreviewError && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+							className: "max-w-[18rem] truncate text-xs text-red-400",
+							children: filePreviewError
+						}),
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+							variant: "ghost",
+							size: "icon-sm",
+							title: "Close preview",
+							onClick: closeFilePreview,
+							children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(X$2, { className: "h-3.5 w-3.5" })
 						})
 					]
-				})
-			]
-		}), filePreview && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("aside", {
-			className: "hidden h-full w-[min(44vw,720px)] min-w-[360px] shrink-0 flex-col border-l border-border bg-background xl:flex",
-			onMouseEnter: clearFilePreviewCloseTimer,
-			onMouseLeave: filePreview.pinned ? void 0 : scheduleCloseReferencedFilePreview,
-			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-				className: "flex h-10 shrink-0 items-center gap-2 border-b border-border px-3",
-				children: [
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-						className: "min-w-0 flex-1 text-xs font-medium text-muted-foreground",
-						children: "File preview"
-					}),
-					filePreviewError && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-						className: "max-w-[18rem] truncate text-xs text-red-400",
-						children: filePreviewError
-					}),
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
-						variant: "ghost",
-						size: "icon-sm",
-						title: "Close preview",
-						onClick: closeFilePreview,
-						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(X$2, { className: "h-3.5 w-3.5" })
+				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: "min-h-0 flex-1",
+					children: filePreview.type === "directory" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DirectoryContent, {
+						orchestratorId: filePreview.orchestratorId,
+						selectedPath: filePreview.path,
+						onReadError: setFilePreviewError
+					}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FileContent, {
+						orchestratorId: filePreview.orchestratorId,
+						selectedPath: filePreview.path,
+						line: filePreview.line,
+						onReadError: setFilePreviewError
 					})
-				]
-			}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-				className: "min-h-0 flex-1",
-				children: filePreview.type === "directory" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DirectoryContent, {
-					orchestratorId: filePreview.orchestratorId,
-					selectedPath: filePreview.path,
-					onReadError: setFilePreviewError
-				}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FileContent, {
-					orchestratorId: filePreview.orchestratorId,
-					selectedPath: filePreview.path,
-					line: filePreview.line,
-					onReadError: setFilePreviewError
-				})
+				})]
 			})]
-		})]
-	}), terminalTarget && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TerminalDialog, {
-		open: terminalOpen,
-		onOpenChange: handleCloseTerminal,
-		orchestratorId: terminalTarget.orchestratorId,
-		session: terminalTarget.session,
-		interactive: terminalTarget.interactive || canWriteTerminal
-	})] });
+		}),
+		floatingPreview && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FloatingFilePreview, {
+			preview: floatingPreview,
+			error: filePreviewError,
+			onReadError: setFilePreviewError,
+			onMouseEnter: clearFilePreviewCloseTimer,
+			onMouseLeave: scheduleCloseReferencedFilePreview
+		}),
+		terminalTarget && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(TerminalDialog, {
+			open: terminalOpen,
+			onOpenChange: handleCloseTerminal,
+			orchestratorId: terminalTarget.orchestratorId,
+			session: terminalTarget.session,
+			interactive: terminalTarget.interactive || canWriteTerminal
+		})
+	] });
 }
 function ChatView() {
 	const threads = useAllInboxThreads();
@@ -121582,6 +121792,8 @@ function ManagedAgentRow({ agent, orch }) {
 function OrchestratorCard({ orch }) {
 	const now = useNow();
 	const orchestratorAction = useRelayStore((s) => s.orchestratorAction);
+	const upgradeOrchestrator = useRelayStore((s) => s.upgradeOrchestrator);
+	const fleetTarget = useRelayStore((s) => s.stats.version);
 	const openOrchestratorSpawnFor = useRelayStore((s) => s.openOrchestratorSpawnFor);
 	const openFilesAt = useRelayStore((s) => s.openFilesAt);
 	const deleteOrchestrator = useRelayStore((s) => s.deleteOrchestrator);
@@ -121590,6 +121802,10 @@ function OrchestratorCard({ orch }) {
 	const healthClass = orchestratorHealthClass(orch);
 	const online = orch.status === "online";
 	const packageVersion = orch.package?.version || orch.version;
+	const upgrade = orch.upgrade;
+	const upgrading = upgrade?.status === "pending";
+	const driftAvailable = online && !!orch.version && !!fleetTarget && orch.version !== fleetTarget;
+	const canUpgrade = online && !upgrading && (driftAvailable || upgrade?.status === "failed");
 	const contractEntries = Object.entries(orch.contracts || {}).filter(([, value]) => typeof value === "number");
 	const providerStatus = orch.providerStatus || orch.providers.map((provider) => ({
 		name: provider,
@@ -121642,6 +121858,27 @@ function OrchestratorCard({ orch }) {
 							" v",
 							packageVersion
 						] }),
+						upgrading && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Badge$1, {
+							className: "text-[10px] bg-amber-500/10 text-amber-400 border-amber-500/20 gap-1",
+							children: [
+								/* @__PURE__ */ (0, import_jsx_runtime.jsx)(CircleArrowUp, { className: "w-3 h-3 animate-pulse" }),
+								"upgrading → v",
+								upgrade.desiredVersion
+							]
+						}),
+						!upgrading && upgrade?.status === "failed" && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Badge$1, {
+							className: "text-[10px] bg-red-500/10 text-red-400 border-red-500/20 gap-1",
+							title: upgrade.error,
+							children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(TriangleAlert, { className: "w-3 h-3" }), "upgrade failed"]
+						}),
+						!upgrading && driftAvailable && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Badge$1, {
+							className: "text-[10px] bg-blue-500/10 text-blue-400 border-blue-500/20",
+							children: [
+								"→ v",
+								fleetTarget,
+								" available"
+							]
+						}),
 						/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 							className: "ml-auto",
 							children: timeAgo(now, orch.lastSeen)
@@ -121733,6 +121970,15 @@ function OrchestratorCard({ orch }) {
 							onClick: () => refreshOrchestratorProviders(orch.id),
 							children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(RotateCw, { className: "w-3 h-3" }), "Refresh providers"]
 						}),
+						(canUpgrade || upgrading) && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Button, {
+							size: "sm",
+							variant: "outline",
+							disabled: upgrading,
+							className: "h-7 text-xs gap-1 text-blue-400 hover:text-blue-300 border-blue-500/30 disabled:opacity-60",
+							title: upgrading ? `Upgrading to v${upgrade.desiredVersion}…` : `Upgrade to v${fleetTarget}`,
+							onClick: () => upgradeOrchestrator(orch.id),
+							children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(CircleArrowUp, { className: `w-3 h-3 ${upgrading ? "animate-pulse" : ""}` }), upgrading ? "Upgrading…" : "Upgrade"]
+						}),
 						online && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Button, {
 							size: "sm",
 							variant: "outline",
@@ -121817,12 +122063,27 @@ var LIVE_STATUSES = new Set([
 	"merge_planned",
 	"cleanup_requested"
 ]);
+var GIT_STATE_STATUSES = new Set([
+	"active",
+	"ready",
+	"conflict",
+	"review_requested",
+	"merge_planned"
+]);
+var MERGEABLE_STATUSES = new Set([
+	"active",
+	"ready",
+	"review_requested",
+	"merge_planned",
+	"conflict"
+]);
 var STATUS_CLASS$1 = {
 	active: "bg-blue-500/10 text-blue-400 border-blue-500/20",
 	ready: "bg-emerald-500/10 text-emerald-400 border-emerald-500/20",
 	conflict: "bg-red-500/10 text-red-400 border-red-500/20",
 	review_requested: "bg-yellow-500/10 text-yellow-400 border-yellow-500/20",
 	merge_planned: "bg-indigo-500/10 text-indigo-400 border-indigo-500/20",
+	merged: "bg-violet-500/10 text-violet-400 border-violet-500/20",
 	abandoned: "bg-zinc-500/10 text-zinc-400 border-zinc-500/20",
 	cleanup_requested: "bg-orange-500/10 text-orange-400 border-orange-500/20",
 	cleaned: "bg-zinc-500/10 text-zinc-400 border-zinc-500/20"
@@ -121833,6 +122094,7 @@ var STATUS_LABEL = {
 	conflict: "conflict",
 	review_requested: "review",
 	merge_planned: "merge planned",
+	merged: "merged",
 	abandoned: "abandoned",
 	cleanup_requested: "cleanup",
 	cleaned: "cleaned"
@@ -121844,9 +122106,11 @@ var STATUS_ORDER = {
 	merge_planned: 3,
 	active: 4,
 	cleanup_requested: 5,
-	abandoned: 6,
-	cleaned: 7
+	merged: 6,
+	abandoned: 7,
+	cleaned: 8
 };
+var TERMINAL_STATUSES = new Set(["cleaned", "merged"]);
 function shortPath(path) {
 	const parts = path.split("/").filter(Boolean);
 	if (parts.length <= 3) return path || "-";
@@ -121881,20 +122145,35 @@ function groupWorkspaces(workspaces) {
 }
 function filterWorkspaces(workspaces, filter) {
 	if (filter === "all") return workspaces;
-	if (filter === "cleaned") return workspaces.filter((workspace) => workspace.status === "cleaned");
-	return workspaces.filter((workspace) => workspace.status !== "cleaned");
+	if (filter === "cleaned") return workspaces.filter((workspace) => TERMINAL_STATUSES.has(workspace.status));
+	return workspaces.filter((workspace) => !TERMINAL_STATUSES.has(workspace.status));
 }
-function WorkspaceActions({ workspace }) {
+function WorkspaceActions({ workspace, expanded, onToggleDetails }) {
 	const workspaceAction = useRelayStore((s) => s.workspaceAction);
+	const purgeWorkspace = useRelayStore((s) => s.purgeWorkspace);
+	const fetchWorkspaceMergePreview = useRelayStore((s) => s.fetchWorkspaceMergePreview);
 	const openFilesAt = useRelayStore((s) => s.openFilesAt);
-	const disabled = workspace.status === "cleaned" || workspace.status === "abandoned" || workspace.status === "cleanup_requested";
+	const terminal = workspace.status === "cleaned" || workspace.status === "merged" || workspace.status === "abandoned";
+	const disabled = terminal || workspace.status === "cleanup_requested";
 	const openPath = workspace.worktreePath || workspace.sourceCwd || workspace.repoRoot;
+	const mergeable = workspace.mode === "isolated" && Boolean(workspace.worktreePath) && MERGEABLE_STATUSES.has(workspace.status);
 	async function copyPath() {
 		await navigator.clipboard?.writeText(openPath);
 	}
+	async function merge() {
+		await fetchWorkspaceMergePreview(workspace.id);
+		await workspaceAction(workspace.id, "merge");
+	}
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		className: "flex flex-wrap justify-end gap-1.5",
 		children: [
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+				size: "icon-sm",
+				variant: "ghost",
+				title: expanded ? "Hide details" : "Show diff & timeline",
+				onClick: onToggleDetails,
+				children: expanded ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ChevronDown, { className: "h-3.5 w-3.5" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ChevronRight, { className: "h-3.5 w-3.5" })
+			}),
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
 				size: "icon-sm",
 				variant: "ghost",
@@ -121933,108 +122212,477 @@ function WorkspaceActions({ workspace }) {
 				title: "Mark merge planned",
 				disabled: disabled || workspace.status === "merge_planned",
 				onClick: () => void workspaceAction(workspace.id, "merge-plan"),
+				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Flag, { className: "h-3.5 w-3.5" })
+			}),
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+				size: "icon-sm",
+				variant: "default",
+				title: "Merge & land work",
+				disabled: !mergeable,
+				onClick: () => void merge(),
 				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitMerge, { className: "h-3.5 w-3.5" })
 			}),
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
 				size: "icon-sm",
 				variant: "outline",
-				title: "Request cleanup",
+				title: "Request cleanup (removes the worktree on the host)",
 				disabled: workspace.status === "cleaned" || workspace.status === "cleanup_requested",
 				onClick: () => void workspaceAction(workspace.id, "cleanup"),
 				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Trash2, { className: "h-3.5 w-3.5" })
+			}),
+			terminal && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+				size: "icon-sm",
+				variant: "ghost",
+				title: "Purge record (clears the row, does not touch disk)",
+				onClick: () => void purgeWorkspace(workspace.id),
+				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(X$2, { className: "h-3.5 w-3.5" })
 			})
 		]
 	});
 }
-function WorkspaceRow({ workspace }) {
+function MergePreviewHint({ workspace, ahead }) {
+	const preview = useRelayStore((s) => s.workspaceMergePreview[workspace.id]);
+	const fetchWorkspaceMergePreview = useRelayStore((s) => s.fetchWorkspaceMergePreview);
+	const eligible = ahead > 0 && MERGEABLE_STATUSES.has(workspace.status);
+	(0, import_react.useEffect)(() => {
+		if (eligible && preview === void 0) fetchWorkspaceMergePreview(workspace.id);
+	}, [
+		eligible,
+		preview,
+		workspace.id,
+		fetchWorkspaceMergePreview
+	]);
+	if (!eligible || preview === void 0 || preview.available === false) return null;
+	if (preview.conflict) return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+		className: "flex items-center gap-0.5 text-amber-400",
+		title: `Merging into ${preview.baseRef || "base"} would conflict — resolve before merging`,
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(TriangleAlert, { className: "h-3 w-3" }), "conflict"]
+	});
+	if (preview.conflict === false) return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+		className: "flex items-center gap-0.5 text-emerald-400",
+		title: `Clean to merge via ${preview.strategy === "pr" ? "PR" : "rebase + fast-forward"} into ${preview.baseRef || "base"}`,
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Check, { className: "h-3 w-3" }), preview.strategy === "pr" ? "PR ready" : "clean"]
+	});
+	return null;
+}
+function GitState({ workspace }) {
 	const now = useNow();
-	const agentsById = useRelayStore((s) => s.agentsById);
-	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 gitState = useRelayStore((s) => s.workspaceGitState[workspace.id]);
+	const fetchWorkspaceGitState = useRelayStore((s) => s.fetchWorkspaceGitState);
+	const eligible = workspace.mode === "isolated" && Boolean(workspace.worktreePath) && GIT_STATE_STATUSES.has(workspace.status);
+	(0, import_react.useEffect)(() => {
+		if (eligible && gitState === void 0) fetchWorkspaceGitState(workspace.id);
+	}, [
+		eligible,
+		gitState,
+		workspace.id,
+		fetchWorkspaceGitState
+	]);
+	if (!eligible) return null;
+	const refresh = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+		size: "icon-sm",
+		variant: "ghost",
+		className: "h-5 w-5",
+		title: "Refresh git state",
+		onClick: () => void fetchWorkspaceGitState(workspace.id),
+		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RefreshCw, { className: "h-3 w-3" })
+	});
+	if (gitState === void 0) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+		className: "flex items-center gap-1 text-[11px] text-muted-foreground",
+		children: "Loading git state…"
+	});
+	if (gitState.available === false) return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+		className: "flex items-center gap-1 text-[11px] text-muted-foreground",
+		title: gitState.reason,
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: "git state unavailable" }), refresh]
+	});
+	if (gitState.missing) return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+		className: "flex items-center gap-1 text-[11px] text-muted-foreground",
+		children: ["worktree gone ", refresh]
+	});
+	if (gitState.error) return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+		className: "flex items-center gap-1 text-[11px] text-red-400",
+		title: gitState.error,
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: "git error" }), refresh]
+	});
+	const ahead = gitState.ahead ?? 0;
+	const behind = gitState.behind ?? 0;
+	const dirty = gitState.dirtyCount ?? 0;
+	const clean = ahead === 0 && dirty === 0;
+	const commit = gitState.lastCommit;
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-		className: "grid gap-3 border-t border-border px-3 py-3 text-sm lg:grid-cols-[minmax(180px,1.2fr)_minmax(220px,1.5fr)_minmax(160px,1fr)_minmax(170px,auto)]",
+		className: "space-y-0.5",
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+			className: "flex flex-wrap items-center gap-x-2 gap-y-0.5 text-[11px]",
+			children: [clean ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+				className: "text-muted-foreground",
+				children: "no unmerged work"
+			}) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+					className: ahead > 0 ? "flex items-center text-emerald-400" : "flex items-center text-muted-foreground",
+					title: `${ahead} commit(s) ahead of base`,
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ArrowUp, { className: "h-3 w-3" }), ahead]
+				}),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+					className: behind > 0 ? "flex items-center text-amber-400" : "flex items-center text-muted-foreground",
+					title: `${behind} commit(s) behind base`,
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ArrowDown, { className: "h-3 w-3" }), behind]
+				}),
+				dirty > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+					className: "flex items-center text-orange-400",
+					title: `${dirty} uncommitted change(s)`,
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(FilePen, { className: "h-3 w-3" }), dirty]
+				}),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(MergePreviewHint, {
+					workspace,
+					ahead
+				})
+			] }), refresh]
+		}), commit && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+			className: "flex min-w-0 items-center gap-1 text-[11px] text-muted-foreground",
+			title: `${commit.sha.slice(0, 8)} — ${commit.message}`,
+			children: [
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitCommitHorizontal, { className: "h-3 w-3 shrink-0" }),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+					className: "truncate",
+					children: commit.message || commit.sha.slice(0, 8)
+				}),
+				commit.at ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+					className: "shrink-0 opacity-70",
+					children: ["· ", timeAgo(now, commit.at)]
+				}) : null
+			]
+		})]
+	});
+}
+function WorkspaceTimeline({ workspace }) {
+	const now = useNow();
+	const mergedAt = typeof workspace.metadata?.mergedAt === "number" ? workspace.metadata.mergedAt : void 0;
+	const steps = [
+		{
+			label: "created",
+			at: workspace.createdAt
+		},
+		{
+			label: "ready",
+			at: workspace.readyAt
+		},
+		{
+			label: "merged",
+			at: mergedAt
+		},
+		{
+			label: "cleaned",
+			at: workspace.cleanedAt
+		}
+	].filter((step) => typeof step.at === "number" && step.at > 0);
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+		className: "flex flex-wrap items-center gap-x-3 gap-y-1 text-[11px] text-muted-foreground",
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+			className: "flex items-center gap-1 font-medium text-foreground",
+			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Clock, { className: "h-3 w-3" }), "Timeline"]
+		}), steps.map((step, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+			className: "flex items-center gap-1",
+			children: [
+				i > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+					className: "opacity-40",
+					children: "→"
+				}),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+					className: "text-foreground",
+					children: step.label
+				}),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+					title: new Date(step.at).toLocaleString(),
+					children: timeAgo(now, step.at)
+				})
+			]
+		}, step.label))]
+	});
+}
+function diffLineClass(line) {
+	if (line.startsWith("+") && !line.startsWith("+++")) return "text-emerald-400";
+	if (line.startsWith("-") && !line.startsWith("---")) return "text-red-400";
+	if (line.startsWith("@@")) return "text-cyan-400";
+	if (line.startsWith("diff ") || line.startsWith("index ") || line.startsWith("+++") || line.startsWith("---")) return "text-muted-foreground";
+	return "";
+}
+function WorkspaceDiffView({ workspace }) {
+	const diff = useRelayStore((s) => s.workspaceDiff[workspace.id]);
+	const fetchWorkspaceDiff = useRelayStore((s) => s.fetchWorkspaceDiff);
+	const eligible = workspace.mode === "isolated" && Boolean(workspace.worktreePath);
+	(0, import_react.useEffect)(() => {
+		if (eligible && diff === void 0) fetchWorkspaceDiff(workspace.id);
+	}, [
+		eligible,
+		diff,
+		workspace.id,
+		fetchWorkspaceDiff
+	]);
+	if (!eligible) return null;
+	if (diff === void 0) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+		className: "text-[11px] text-muted-foreground",
+		children: "Loading diff…"
+	});
+	if (diff.available === false) return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+		className: "text-[11px] text-muted-foreground",
+		children: ["Diff unavailable", diff.reason ? `: ${diff.reason}` : ""]
+	});
+	if (diff.missing) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+		className: "text-[11px] text-muted-foreground",
+		children: "Worktree no longer on disk"
+	});
+	if (diff.error) return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+		className: "text-[11px] text-red-400",
+		children: ["Diff error: ", diff.error]
+	});
+	if (!diff.files.length) return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+		className: "text-[11px] text-muted-foreground",
+		children: ["No committed changes against ", diff.baseRef || "base"]
+	});
+	const refresh = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+		size: "icon-sm",
+		variant: "ghost",
+		className: "h-5 w-5",
+		title: "Refresh diff",
+		onClick: () => void fetchWorkspaceDiff(workspace.id),
+		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RefreshCw, { className: "h-3 w-3" })
+	});
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+		className: "space-y-1",
 		children: [
 			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-				className: "min-w-0 space-y-1",
-				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-					className: "flex min-w-0 items-center gap-2",
-					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitBranch, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-						className: "truncate font-medium",
-						title: workspace.branch || workspace.id,
-						children: workspace.branch || workspace.id
+				className: "flex items-center gap-2 text-[11px] font-medium",
+				children: [
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(FileDiff, { className: "h-3 w-3" }),
+					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { children: [
+						diff.files.length,
+						" file",
+						diff.files.length === 1 ? "" : "s",
+						" vs ",
+						diff.baseRef || "base"
+					] }),
+					refresh
+				]
+			}),
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", {
+				className: "space-y-0.5 text-[11px]",
+				children: diff.files.map((file) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("li", {
+					className: "flex items-center gap-2 font-mono",
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+						className: "truncate",
+						title: file.path,
+						children: file.path
+					}), file.binary ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+						className: "shrink-0 text-muted-foreground",
+						children: "binary"
+					}) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+						className: "shrink-0",
+						children: [
+							/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+								className: "text-emerald-400",
+								children: ["+", file.additions ?? 0]
+							}),
+							" ",
+							/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+								className: "text-red-400",
+								children: ["−", file.deletions ?? 0]
+							})
+						]
 					})]
-				}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-					className: "flex flex-wrap gap-1",
-					children: [
-						/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Badge$1, {
-							variant: "outline",
-							className: `text-[10px] ${workspace.mode === "isolated" ? "border-sky-500/30 text-sky-400" : "border-zinc-500/30 text-zinc-400"}`,
-							children: workspace.mode
-						}),
-						workspace.requestedMode && workspace.requestedMode !== workspace.mode && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Badge$1, {
-							variant: "outline",
-							className: "text-[10px]",
-							children: ["requested ", workspace.requestedMode]
-						}),
-						/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Badge$1, {
-							variant: "outline",
-							className: `text-[10px] ${statusTone(workspace.status)}`,
-							children: STATUS_LABEL[workspace.status] || workspace.status
-						})
-					]
-				})]
+				}, file.path))
 			}),
-			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-				className: "min-w-0 space-y-1",
-				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-					className: "truncate font-mono text-xs",
-					title: path,
-					children: shortPath(path)
-				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-					className: "truncate text-xs text-muted-foreground",
-					title: workspace.sourceCwd,
-					children: workspace.sourceCwd
+			diff.patch && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("pre", {
+				className: "max-h-80 overflow-auto rounded border border-border bg-muted/30 p-2 text-[10.5px] leading-relaxed",
+				children: [diff.patch.split("\n").map((line, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: diffLineClass(line),
+					children: line || " "
+				}, i)), diff.truncated && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+					className: "mt-1 text-muted-foreground",
+					children: "… patch truncated"
 				})]
-			}),
-			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
-				className: "grid grid-cols-[4.5rem_minmax(0,1fr)] gap-x-2 gap-y-1 text-xs",
+			})
+		]
+	});
+}
+function WorkspaceDetails({ workspace }) {
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+		className: "space-y-3 border-t border-dashed border-border bg-muted/20 px-3 py-3",
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(WorkspaceTimeline, { workspace }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(WorkspaceDiffView, { workspace })]
+	});
+}
+function OrphanPanel() {
+	const orphans = useRelayStore((s) => s.workspaceOrphans);
+	const fetchWorkspaceOrphans = useRelayStore((s) => s.fetchWorkspaceOrphans);
+	const reclaimWorkspaceOrphan = useRelayStore((s) => s.reclaimWorkspaceOrphan);
+	(0, import_react.useEffect)(() => {
+		fetchWorkspaceOrphans();
+	}, [fetchWorkspaceOrphans]);
+	if (!orphans.length) return null;
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Card, {
+		className: "border-amber-500/30",
+		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(CardHeader, {
+			className: "px-4 py-3",
+			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+				className: "flex items-center gap-2",
 				children: [
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-						className: "text-muted-foreground",
-						children: "Owner"
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(PackageOpen, { className: "h-4 w-4 text-amber-400" }),
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(CardTitle, {
+						className: "text-sm font-medium",
+						children: "Orphaned worktrees"
 					}),
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-						className: "truncate",
-						title: workspace.ownerAgentId,
-						children: agentLabel(owner, workspace.ownerPolicyName || workspace.ownerAgentId)
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Badge$1, {
+						variant: "outline",
+						className: "border-amber-500/30 text-amber-400 text-[10px]",
+						children: orphans.length
 					}),
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
+						size: "icon-sm",
+						variant: "ghost",
+						className: "ml-auto h-6 w-6",
+						title: "Rescan",
+						onClick: () => void fetchWorkspaceOrphans(),
+						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RefreshCw, { className: "h-3.5 w-3.5" })
+					})
+				]
+			}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", {
+				className: "mt-1 text-xs text-muted-foreground",
+				children: "Agent worktrees on disk with no live workspace. Reclaim removes them from the host."
+			})]
+		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CardContent, {
+			className: "p-0",
+			children: orphans.map((orphan) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+				className: "flex items-center gap-3 border-t border-border px-4 py-2 text-xs",
+				children: [
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitBranch, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground" }),
 					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-						className: "text-muted-foreground",
-						children: "Steward"
+						className: "truncate font-medium",
+						title: orphan.branch,
+						children: orphan.branch || "(detached)"
 					}),
 					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-						className: "truncate",
-						title: workspace.stewardAgentId,
-						children: agentLabel(steward, workspace.stewardAgentId)
+						className: "truncate font-mono text-muted-foreground",
+						title: orphan.worktreePath,
+						children: shortPath(orphan.worktreePath)
 					}),
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-						className: "text-muted-foreground",
-						children: "Updated"
+					orphan.hadTerminalRow && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Badge$1, {
+						variant: "outline",
+						className: "text-[10px]",
+						children: "cleanup failed"
 					}),
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: timeAgo(now, workspace.updatedAt) }),
-					workspace.baseRef && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-						className: "text-muted-foreground",
-						children: "Base"
-					}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
-						className: "truncate",
-						title: workspace.baseSha,
-						children: workspace.baseRef
-					})] })
+					/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Button, {
+						size: "sm",
+						variant: "outline",
+						className: "ml-auto h-7 text-xs",
+						onClick: () => void reclaimWorkspaceOrphan(orphan),
+						children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ArchiveRestore, { className: "mr-1 h-3.5 w-3.5" }), "Reclaim"]
+					})
 				]
-			}),
-			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(WorkspaceActions, { workspace })
-		]
+			}, orphan.worktreePath))
+		})]
+	});
+}
+function WorkspaceRow({ workspace }) {
+	const now = useNow();
+	const [expanded, setExpanded] = (0, import_react.useState)(false);
+	const agentsById = useRelayStore((s) => s.agentsById);
+	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;
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+		className: "border-t border-border",
+		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: [
+				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+					className: "min-w-0 space-y-1",
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+						className: "flex min-w-0 items-center gap-2",
+						children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitBranch, { className: "h-3.5 w-3.5 shrink-0 text-muted-foreground" }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+							className: "truncate font-medium",
+							title: workspace.branch || workspace.id,
+							children: workspace.branch || workspace.id
+						})]
+					}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+						className: "flex flex-wrap gap-1",
+						children: [
+							/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Badge$1, {
+								variant: "outline",
+								className: `text-[10px] ${workspace.mode === "isolated" ? "border-sky-500/30 text-sky-400" : "border-zinc-500/30 text-zinc-400"}`,
+								children: workspace.mode
+							}),
+							workspace.requestedMode && workspace.requestedMode !== workspace.mode && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Badge$1, {
+								variant: "outline",
+								className: "text-[10px]",
+								children: ["requested ", workspace.requestedMode]
+							}),
+							/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Badge$1, {
+								variant: "outline",
+								className: `text-[10px] ${statusTone(workspace.status)}`,
+								children: STATUS_LABEL[workspace.status] || workspace.status
+							})
+						]
+					})]
+				}),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+					className: "min-w-0 space-y-1",
+					children: [
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+							className: "truncate font-mono text-xs",
+							title: path,
+							children: shortPath(path)
+						}),
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+							className: "truncate text-xs text-muted-foreground",
+							title: workspace.sourceCwd,
+							children: workspace.sourceCwd
+						}),
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitState, { workspace })
+					]
+				}),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+					className: "grid grid-cols-[4.5rem_minmax(0,1fr)] gap-x-2 gap-y-1 text-xs",
+					children: [
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+							className: "text-muted-foreground",
+							children: "Owner"
+						}),
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+							className: "truncate",
+							title: workspace.ownerAgentId,
+							children: agentLabel(owner, workspace.ownerPolicyName || workspace.ownerAgentId)
+						}),
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+							className: "text-muted-foreground",
+							children: "Steward"
+						}),
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+							className: "truncate",
+							title: workspace.stewardAgentId,
+							children: agentLabel(steward, workspace.stewardAgentId)
+						}),
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+							className: "text-muted-foreground",
+							children: "Updated"
+						}),
+						/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: timeAgo(now, workspace.updatedAt) }),
+						workspace.baseRef && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+							className: "text-muted-foreground",
+							children: "Base"
+						}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+							className: "truncate",
+							title: workspace.baseSha,
+							children: workspace.baseRef
+						})] })
+					]
+				}),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(WorkspaceActions, {
+					workspace,
+					expanded,
+					onToggleDetails: () => setExpanded((value) => !value)
+				})
+			]
+		}), expanded && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(WorkspaceDetails, { workspace })]
 	});
 }
 function RepoGroup({ repoRoot, workspaces }) {
@@ -122092,17 +122740,17 @@ function WorkspacesView() {
 	const isolatedCount = workspaces.filter((item) => item.mode === "isolated").length;
 	const readyCount = workspaces.filter((item) => item.status === "ready" || item.status === "review_requested" || item.status === "merge_planned").length;
 	const conflictCount = workspaces.filter((item) => item.status === "conflict").length;
-	const cleanedCount = workspaces.filter((item) => item.status === "cleaned").length;
+	const doneCount = workspaces.filter((item) => TERMINAL_STATUSES.has(item.status)).length;
 	const filters = [
 		{
 			key: "active",
 			label: "Active",
-			count: workspaces.length - cleanedCount
+			count: workspaces.length - doneCount
 		},
 		{
 			key: "cleaned",
-			label: "Cleaned",
-			count: cleanedCount
+			label: "Done",
+			count: doneCount
 		},
 		{
 			key: "all",
@@ -122144,6 +122792,7 @@ function WorkspacesView() {
 					]
 				})]
 			}),
+			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(OrphanPanel, {}),
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
 				className: "flex flex-wrap items-center gap-2",
 				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
@@ -125120,6 +125769,7 @@ function blankForm(orchestratorId = "") {
 		ifNoMatch: "fail",
 		cwd: "",
 		approvalMode: "guarded",
+		workspaceMode: "inherit",
 		keepAlive: false,
 		budgetMinutes: "",
 		warningMinutes: "",
@@ -125158,6 +125808,7 @@ function automationToForm(automation) {
 		ifNoMatch: policy.mode === "existing_agent" ? policy.ifNoMatch || "fail" : "fail",
 		cwd: policy.mode === "on_demand_agent" ? policy.cwd || "" : "",
 		approvalMode: policy.mode === "on_demand_agent" ? policy.approvalMode || "guarded" : "guarded",
+		workspaceMode: policy.mode === "on_demand_agent" ? policy.workspaceMode || "inherit" : "inherit",
 		keepAlive: policy.mode === "on_demand_agent" ? Boolean(policy.keepAlive) : false,
 		budgetMinutes: policy.mode === "on_demand_agent" && policy.runtimeBudget ? String(Math.round(policy.runtimeBudget.maxRuntimeMs / 6e4)) : "",
 		warningMinutes: policy.mode === "on_demand_agent" && policy.runtimeBudget?.warnAtMs !== void 0 ? String(Math.round(policy.runtimeBudget.warnAtMs / 6e4)) : "",
@@ -125195,6 +125846,7 @@ function formToInput(form) {
 		profile: form.profile || void 0,
 		cwd: form.cwd.trim() || void 0,
 		approvalMode: form.approvalMode,
+		workspaceMode: form.workspaceMode,
 		keepAlive: form.keepAlive,
 		runtimeBudget
 	};
@@ -125799,6 +126451,28 @@ function AutomationEditor({ form, selected, saving, orchestrators, agentProfiles
 										children: profile.name
 									}, profile.name))]
 								})
+							}),
+							/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Field$1, {
+								label: "Workspace",
+								children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("select", {
+									className: "h-9 w-full rounded-md border border-input bg-background px-3 text-sm",
+									value: form.workspaceMode,
+									onChange: (e) => onChange({ workspaceMode: e.target.value }),
+									children: [
+										/* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", {
+											value: "inherit",
+											children: "inherit (default → isolated worktree)"
+										}),
+										/* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", {
+											value: "shared",
+											children: "shared (run in the repo, commit to its branch)"
+										}),
+										/* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", {
+											value: "isolated",
+											children: "isolated (fresh git worktree per run)"
+										})
+									]
+								})
 							})
 						]
 					}),
@@ -150319,10 +150993,6 @@ if ("serviceWorker" in navigator) {
     inset-block: calc(var(--spacing) * 0);
   }
 
-  .-top-3 {
-    top: calc(var(--spacing) * -3);
-  }
-
   .top-0 {
     top: calc(var(--spacing) * 0);
   }
@@ -150363,6 +151033,14 @@ if ("serviceWorker" in navigator) {
     bottom: calc(var(--spacing) * -.5);
   }
 
+  .-bottom-2\.5 {
+    bottom: calc(var(--spacing) * -2.5);
+  }
+
+  .bottom-full {
+    bottom: 100%;
+  }
+
   .left-0 {
     left: calc(var(--spacing) * 0);
   }
@@ -150998,6 +151676,10 @@ if ("serviceWorker" in navigator) {
     max-width: var(--container-2xl);
   }
 
+  .max-w-\[12rem\] {
+    max-width: 12rem;
+  }
+
   .max-w-\[18rem\] {
     max-width: 18rem;
   }
@@ -151406,6 +152088,10 @@ if ("serviceWorker" in navigator) {
     column-gap: calc(var(--spacing) * 4);
   }
 
+  .gap-y-0\.5 {
+    row-gap: calc(var(--spacing) * .5);
+  }
+
   .gap-y-1 {
     row-gap: calc(var(--spacing) * 1);
   }
@@ -151590,6 +152276,16 @@ if ("serviceWorker" in navigator) {
     }
   }
 
+  .border-amber-500\/20 {
+    border-color: #f99c0033;
+  }
+
+  @supports (color: color-mix(in lab, red, red)) {
+    .border-amber-500\/20 {
+      border-color: color-mix(in oklab, var(--color-amber-500) 20%, transparent);
+    }
+  }
+
   .border-amber-500\/25 {
     border-color: #f99c0040;
   }
@@ -151912,6 +152608,16 @@ if ("serviceWorker" in navigator) {
     border-color: #0000;
   }
 
+  .border-violet-500\/20 {
+    border-color: #8d54ff33;
+  }
+
+  @supports (color: color-mix(in lab, red, red)) {
+    .border-violet-500\/20 {
+      border-color: color-mix(in oklab, var(--color-violet-500) 20%, transparent);
+    }
+  }
+
   .border-violet-500\/30 {
     border-color: #8d54ff4d;
   }
@@ -152890,6 +153596,10 @@ if ("serviceWorker" in navigator) {
     font-size: 9px;
   }
 
+  .text-\[10\.5px\] {
+    font-size: 10.5px;
+  }
+
   .text-\[10px\] {
     font-size: 10px;
   }
@@ -153124,6 +153834,16 @@ if ("serviceWorker" in navigator) {
     }
   }
 
+  .text-muted-foreground\/70 {
+    color: var(--muted-foreground);
+  }
+
+  @supports (color: color-mix(in lab, red, red)) {
+    .text-muted-foreground\/70 {
+      color: color-mix(in oklab, var(--muted-foreground) 70%, transparent);
+    }
+  }
+
   .text-muted-foreground\/80 {
     color: var(--muted-foreground);
   }
@@ -153330,6 +154050,10 @@ if ("serviceWorker" in navigator) {
     opacity: .6;
   }
 
+  .opacity-70 {
+    opacity: .7;
+  }
+
   .opacity-80 {
     opacity: .8;
   }
@@ -154029,6 +154753,10 @@ if ("serviceWorker" in navigator) {
     opacity: .5;
   }
 
+  .disabled\:opacity-60:disabled {
+    opacity: .6;
+  }
+
   .disabled\:opacity-70:disabled {
     opacity: .7;
   }