@agimon-ai/po-git 0.0.0-alpha.7 → 0.0.0-alpha.71

package/dist/extensions/web.mjs

@@ -1,7 +1,7 @@
 import { createApiClient, defineActivityGroup, defineChannelFile, defineFill, defineGlobalStore, defineLeaderBinding, defineRepositorySettingsPanel, defineSessionStore, defineToolRenderer, defineWebLifecycle, defineWebPlugin, sessionApiAddress } from "@agimon-ai/po-core/web";
-import { AlertIcon, ArrowRightIcon, BranchIcon, Button, CheckIcon, ChevronDownIcon, ChevronRightIcon, CloseIcon, Dialog, DialogBody, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, DiffView, Dot, DropdownMenuItem, EmptyState, Input, MessageIcon, MessageItem, MessageItemBody, MessageItemHeader, OptionRow, RadioGroup, RadioGroupCard, ReviewCommentDraft, Select, SelectContent, SelectItem, SelectTrigger, SelectValue, SettingsActions, SettingsCard, SettingsField, SettingsNote, SettingsRow, SettingsRowDescription, SettingsRowText, SettingsRowTitle, SettingsSection, SettingsSectionDescription, SettingsSectionHeader, SettingsSectionTitle, ShieldIcon, Spinner, StatusBadge, buildReviewPrompt, reviewCommentAnchor, toolTone } from "@agimon-ai/po-web-components";
-import { createElement, useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";
-import { sealedTransport } from "@agimon-ai/po-web-security/browser";
+import { ArrowRightIcon, BranchIcon, Button, CheckIcon, ChevronDownIcon, ChevronUpIcon, CodeBlock, Dialog, DialogContent, DialogTitle, DiffView, Dot, DropdownMenuItem, EmptyState, Input, MessageIcon, MessageItem, MessageItemBody, ReviewCommentDraft, Select, SelectContent, SelectItem, SelectTrigger, SelectValue, SettingsActions, SettingsCard, SettingsNote, SettingsRow, SettingsRowDescription, SettingsRowText, SettingsRowTitle, SettingsSection, SettingsSectionDescription, SettingsSectionHeader, SettingsSectionTitle, ShieldIcon, Spinner, StatusBadge, Tabs, TabsContent, TabsList, TabsTrigger, buildReviewPrompt } from "@agimon-ai/po-web-components";
+import { createElement, useCallback, useEffect, useEffectEvent, useId, useRef, useState } from "react";
+import { browserTransport } from "@agimon-ai/po-web-security/browser";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { useStore } from "@tanstack/react-store";
 const api = createApiClient({
@@ -51,10 +51,14 @@ const api = createApiClient({
 		"session"
 	],
 	basePath: "git",
-	transport: (input, init) => sealedTransport.fetch(input, init),
+	transport: (input, init) => browserTransport.fetch(input, init),
 	sessionAddress: sessionApiAddress
 });
 //#endregion
+//#region src/constants/git.ts
+/** Installs the rift CLI. Shown to the person to copy, and named in the error an agent reads. */
+const RIFT_INSTALL_COMMAND = "npm install -g rift-snapshot";
+//#endregion
 //#region src/extensions/workspaces/(frontend)/_lib/newSessionForm.ts
 const MAX_LISTED = 200;
 /** Local branches first, then remote-only ones, filtered by a case-insensitive substring. */
@@ -113,20 +117,250 @@ function createRequest(state) {
 }
 //#endregion
 //#region src/extensions/workspaces/(frontend)/fill/_components/GitNewSessionDialog.tsx
-const MODES = [
-	{
+function Field$1({ label, children }) {
+	return /* @__PURE__ */ jsxs("label", {
+		className: "flex flex-col gap-2 text-base text-po-text",
+		children: [/* @__PURE__ */ jsx("span", { children: label }), children]
+	});
+}
+/** Inline presentation also lets story capture inspect content, rather than a portal-only root. */
+function GitNewSessionDialogView({ workspaceRoot, branches, loadError = "", initialForm, busy = false, error = "", riftMissing = false, onClose, onCreate }) {
+	const [form, setForm] = useState({
 		mode: "existing",
-		label: "existing branch"
-	},
-	{
-		mode: "new",
-		label: "new branch"
-	},
-	{
-		mode: "plain",
-		label: "no branch"
-	}
-];
+		newBranch: "",
+		baseRef: branches?.defaultBase ?? "",
+		name: "",
+		...initialForm
+	});
+	const [query, setQuery] = useState("");
+	const ready = branches?.repository === true && loadError === "";
+	const loading = branches === null && loadError === "";
+	const mode = ready || loading ? form.mode : "plain";
+	const state = {
+		...form,
+		mode,
+		baseRef: form.baseRef || branches?.defaultBase || ""
+	};
+	const problem = formProblem$1(state);
+	const update = (patch) => setForm((current) => ({
+		...current,
+		...patch
+	}));
+	const options = branches === null ? [] : branchOptions(branches, query);
+	const bases = branches === null ? [] : baseOptions(branches);
+	const submit = () => {
+		if (!busy && !loading && problem === void 0) onCreate(state);
+	};
+	return /* @__PURE__ */ jsxs("section", {
+		"data-testid": "new-session-dialog",
+		"aria-label": "New session",
+		className: "shrink-0 overflow-hidden rounded-lg border border-po-border bg-po-panel shadow-sm",
+		children: [
+			/* @__PURE__ */ jsxs("header", {
+				className: "border-b border-po-border-soft px-6 py-4",
+				children: [/* @__PURE__ */ jsx("h3", {
+					className: "text-xl font-semibold text-po-hi",
+					children: "New session"
+				}), /* @__PURE__ */ jsx("p", {
+					className: "mt-1 font-mono text-sm text-po-dim",
+					children: workspaceRoot
+				})]
+			}),
+			/* @__PURE__ */ jsxs("div", {
+				className: "flex flex-col gap-5 p-6",
+				children: [
+					!ready ? /* @__PURE__ */ jsx("p", {
+						"data-testid": "git-new-session-plain-note",
+						className: "text-base text-po-dim",
+						children: loading ? "Reading branches..." : loadError || "This workspace is not a git checkout. Start a plain session in this folder."
+					}) : /* @__PURE__ */ jsxs(Tabs, {
+						value: mode,
+						onValueChange: (value) => update({ mode: value }),
+						className: "flex flex-col gap-5",
+						children: [
+							/* @__PURE__ */ jsxs(TabsList, {
+								"aria-label": "Session kind",
+								className: "rounded-md border border-po-border-soft bg-po-bg p-1",
+								children: [
+									/* @__PURE__ */ jsx(TabsTrigger, {
+										"data-testid": "git-new-session-mode-existing",
+										value: "existing",
+										disabled: busy,
+										className: "flex-1 justify-center",
+										children: "Existing branch"
+									}),
+									/* @__PURE__ */ jsx(TabsTrigger, {
+										"data-testid": "git-new-session-mode-new",
+										value: "new",
+										disabled: busy,
+										className: "flex-1 justify-center",
+										children: "New branch"
+									}),
+									/* @__PURE__ */ jsx(TabsTrigger, {
+										"data-testid": "git-new-session-mode-plain",
+										value: "plain",
+										disabled: busy,
+										className: "flex-1 justify-center",
+										children: "No branch"
+									})
+								]
+							}),
+							/* @__PURE__ */ jsxs(TabsContent, {
+								value: "existing",
+								className: "flex flex-col gap-2",
+								children: [
+									/* @__PURE__ */ jsx("p", {
+										className: "text-base font-medium",
+										children: "Branch"
+									}),
+									/* @__PURE__ */ jsx(Input, {
+										"data-testid": "git-new-session-branch-search",
+										"aria-label": "Find a branch",
+										placeholder: "Find a branch",
+										value: query,
+										onChange: (event) => setQuery(event.target.value),
+										disabled: busy
+									}),
+									/* @__PURE__ */ jsxs("fieldset", {
+										"aria-label": "Branches",
+										className: "max-h-64 min-w-0 overflow-y-auto rounded-md border border-po-border-soft bg-po-bg p-1",
+										children: [options.length === 0 ? /* @__PURE__ */ jsx("p", {
+											className: "px-3 py-2 text-sm text-po-dim",
+											children: "No matching branches"
+										}) : null, options.map((branch, index) => /* @__PURE__ */ jsxs("div", { children: [branch.remote !== void 0 && (index === 0 || options[index - 1]?.remote === void 0) ? /* @__PURE__ */ jsx("p", {
+											className: "mt-1 border-t border-po-border-soft px-3 pt-2 text-sm text-po-dim",
+											children: "Remote branches"
+										}) : null, /* @__PURE__ */ jsxs("button", {
+											"data-testid": "git-new-session-branch-option",
+											"data-branch": branch.name,
+											"data-remote": branch.remote,
+											"aria-pressed": form.selected?.key === branch.key,
+											disabled: branch.busyAt !== void 0 || busy,
+											onClick: () => update({ selected: branch }),
+											className: `flex w-full flex-col gap-1 rounded px-3 py-2 text-left text-base ${form.selected?.key === branch.key ? "bg-po-tint-green text-po-green" : "text-po-text"}`,
+											children: [/* @__PURE__ */ jsxs("span", {
+												className: "flex items-center justify-between gap-2",
+												children: [/* @__PURE__ */ jsx("span", {
+													className: "font-mono",
+													children: branch.remote === void 0 ? branch.name : `${branch.remote}/${branch.name}`
+												}), form.selected?.key === branch.key ? /* @__PURE__ */ jsx(CheckIcon, { className: "size-4" }) : null]
+											}), branch.busyAt !== void 0 ? /* @__PURE__ */ jsxs("span", {
+												className: "text-sm text-po-dim",
+												children: ["Checked out in ", /* @__PURE__ */ jsx("span", {
+													className: "font-mono break-all",
+													children: branch.busyAt
+												})]
+											}) : branch.current ? /* @__PURE__ */ jsx("span", {
+												className: "text-sm text-po-dim",
+												children: "Current"
+											}) : null]
+										})] }, branch.key))]
+									})
+								]
+							}),
+							/* @__PURE__ */ jsxs(TabsContent, {
+								value: "new",
+								className: "flex flex-col gap-4",
+								children: [/* @__PURE__ */ jsx(Field$1, {
+									label: "Branch name",
+									children: /* @__PURE__ */ jsx(Input, {
+										"data-testid": "git-new-session-new-branch",
+										"aria-label": "Branch name",
+										placeholder: "feature/my-change",
+										className: "font-mono",
+										value: form.newBranch,
+										onChange: (event) => update({ newBranch: event.target.value }),
+										disabled: busy
+									})
+								}), /* @__PURE__ */ jsx(Field$1, {
+									label: "From",
+									children: /* @__PURE__ */ jsxs(Select, {
+										value: form.baseRef || branches?.defaultBase || "",
+										onValueChange: (baseRef) => update({ baseRef }),
+										disabled: busy,
+										children: [/* @__PURE__ */ jsx(SelectTrigger, {
+											"data-testid": "git-new-session-base",
+											"aria-label": "From",
+											className: "font-mono",
+											children: /* @__PURE__ */ jsx(SelectValue, {})
+										}), /* @__PURE__ */ jsx(SelectContent, { children: bases.map((base) => /* @__PURE__ */ jsx(SelectItem, {
+											value: base,
+											children: base
+										}, base)) })]
+									})
+								})]
+							}),
+							/* @__PURE__ */ jsx(TabsContent, {
+								value: "plain",
+								children: /* @__PURE__ */ jsx("p", {
+									className: "text-base text-po-dim",
+									children: "Start in this workspace folder, without creating a worktree."
+								})
+							})
+						]
+					}),
+					/* @__PURE__ */ jsx(Field$1, {
+						label: /* @__PURE__ */ jsxs(Fragment, { children: [
+							"Name",
+							" ",
+							/* @__PURE__ */ jsx("span", {
+								className: "text-sm text-po-dim",
+								children: mode === "plain" ? "(optional)" : "(optional, defaults to the branch)"
+							})
+						] }),
+						children: /* @__PURE__ */ jsx(Input, {
+							"data-testid": "new-session-name",
+							"aria-label": "Session name",
+							placeholder: "Session name",
+							value: form.name,
+							onChange: (event) => update({ name: event.target.value }),
+							onKeyDown: (event) => {
+								if (event.key === "Enter") submit();
+							},
+							disabled: busy
+						})
+					}),
+					mode !== "plain" ? /* @__PURE__ */ jsx("p", {
+						className: "text-sm leading-relaxed text-po-dim",
+						children: "Runs in its own worktree, so this checkout stays as it is."
+					}) : null,
+					riftMissing ? /* @__PURE__ */ jsxs("div", {
+						"data-testid": "rift-install-notice",
+						role: "alert",
+						className: "flex flex-col gap-2 rounded-md border border-po-edge-magenta bg-po-tint-magenta px-3 py-3 text-sm text-po-hi",
+						children: [/* @__PURE__ */ jsx("p", { children: "This repository uses Rift, and its CLI is not installed here. Run these in the repository root, then try again." }), /* @__PURE__ */ jsx(CodeBlock, {
+							text: `${RIFT_INSTALL_COMMAND}
+rift init`,
+							className: "language-bash"
+						})]
+					}) : error ? /* @__PURE__ */ jsx("p", {
+						"data-testid": "new-session-error",
+						role: "alert",
+						className: "rounded-md border border-po-edge-red bg-po-tint-red p-3 text-sm text-po-red",
+						children: error
+					}) : null
+				]
+			}),
+			/* @__PURE__ */ jsxs("footer", {
+				className: "flex items-center justify-between border-t border-po-border-soft px-6 py-4",
+				children: [/* @__PURE__ */ jsx(Button, {
+					"data-testid": "new-session-cancel",
+					variant: "ghost",
+					disabled: busy,
+					onClick: onClose,
+					children: "Cancel"
+				}), /* @__PURE__ */ jsx(Button, {
+					"data-testid": "new-session-create",
+					variant: "primary",
+					title: problem,
+					disabled: busy || loading || problem !== void 0,
+					onClick: submit,
+					children: busy ? mode === "plain" ? "Creating session..." : "Creating worktree..." : riftMissing ? "Try again" : "Create session"
+				})]
+			})
+		]
+	});
+}
 function errorOf$1(body, status) {
 	return typeof body === "object" && body !== null && typeof body.error === "string" ? body.error : `The cockpit answered ${String(status)}.`;
 }
@@ -138,70 +372,50 @@ function errorOf$1(body, status) {
 function GitNewSessionDialog({ newSession }) {
 	const [branches, setBranches] = useState(null);
 	const [loadError, setLoadError] = useState("");
-	const [form, setForm] = useState({
-		mode: "existing",
-		newBranch: "",
-		baseRef: "",
-		name: ""
-	});
-	const [query, setQuery] = useState("");
 	const [error, setError] = useState("");
+	const [riftMissing, setRiftMissing] = useState(false);
 	const [busy, setBusy] = useState(false);
 	const workspaceId = newSession?.workspaceId;
-	const request = newSession?.requestWithStepUp;
+	const request = useEffectEvent((input) => newSession?.requestWithStepUp(input));
 	useEffect(() => {
-		if (workspaceId === void 0 || request === void 0) return;
+		if (workspaceId === void 0) return;
 		let stale = false;
 		const url = api.workspace(workspaceId).branches.url();
-		request(url).then(async (response) => {
+		request(url)?.then(async (response) => {
 			const body = await response.json().catch(() => void 0);
 			if (stale) return;
 			if (!response.ok) {
 				setLoadError(errorOf$1(body, response.status));
 				return;
 			}
-			const loaded = body;
-			setBranches(loaded);
-			setForm((current) => ({
-				...current,
-				baseRef: loaded.defaultBase ?? ""
-			}));
+			setBranches(body);
 		}).catch(() => {
 			if (!stale) setLoadError("The branches could not be loaded.");
 		});
 		return () => {
 			stale = true;
 		};
-	}, [workspaceId, request]);
+	}, [workspaceId]);
 	if (newSession === void 0) return null;
-	const gitReady = branches?.repository === true && loadError === "";
-	const mode = gitReady || branches === null ? form.mode : "plain";
-	const state = {
-		...form,
-		mode
-	};
-	const problem = formProblem$1(state);
-	const options = branches === null ? [] : branchOptions(branches, query);
-	const bases = branches === null ? [] : baseOptions(branches);
-	const update = (patch) => setForm((current) => ({
-		...current,
-		...patch
-	}));
-	const submit = async () => {
-		if (busy || problem !== void 0) return;
+	const submit = async (state) => {
+		if (busy || formProblem$1(state) !== void 0) return;
 		setBusy(true);
 		setError("");
+		setRiftMissing(false);
 		const body = createRequest(state);
 		let failure;
-		if (body === void 0) failure = await newSession.createPlain(state.name);
-		else try {
-			const response = await newSession.requestWithStepUp(api.workspace(newSession.workspaceId).createSession.url(), {
-				method: "POST",
-				headers: { "Content-Type": "application/json" },
-				body: JSON.stringify(body)
-			});
-			const answer = await response.json().catch(() => void 0);
-			failure = response.ok ? await newSession.openCreated(answer.sessionId) : errorOf$1(answer, response.status);
+		try {
+			if (body === void 0) failure = await newSession.createPlain(state.name);
+			else {
+				const response = await newSession.requestWithStepUp(api.workspace(newSession.workspaceId).createSession.url(), {
+					method: "POST",
+					headers: { "Content-Type": "application/json" },
+					body: JSON.stringify(body)
+				});
+				const answer = await response.json().catch(() => void 0);
+				failure = response.ok ? await newSession.openCreated(answer.sessionId) : errorOf$1(answer, response.status);
+				setRiftMissing(!response.ok && answer?.code === "rift_missing");
+			}
 		} catch {
 			failure = "The cockpit is unreachable.";
 		}
@@ -211,159 +425,26 @@ function GitNewSessionDialog({ newSession }) {
 	};
 	return /* @__PURE__ */ jsx(Dialog, {
 		open: true,
-		onOpenChange: (next) => !next && !busy && newSession.close(),
+		onOpenChange: (next) => {
+			if (!next && !busy) newSession.close();
+		},
 		children: /* @__PURE__ */ jsxs(DialogContent, {
 			width: "md",
-			"data-testid": "new-session-dialog",
+			className: "overflow-y-auto p-0",
 			"aria-describedby": void 0,
-			children: [/* @__PURE__ */ jsx(DialogHeader, { children: /* @__PURE__ */ jsx(DialogTitle, { children: "new session" }) }), /* @__PURE__ */ jsxs(DialogBody, { children: [
-				/* @__PURE__ */ jsx("p", {
-					className: "truncate text-sm text-po-dim",
-					title: newSession.workspaceRoot,
-					children: newSession.workspaceRoot
-				}),
-				gitReady ? /* @__PURE__ */ jsx("div", {
-					role: "radiogroup",
-					"aria-label": "session kind",
-					className: "flex gap-1",
-					children: MODES.map((entry) => /* @__PURE__ */ jsx(Button, {
-						role: "radio",
-						"aria-checked": mode === entry.mode,
-						variant: mode === entry.mode ? "outline" : "ghost",
-						size: "sm",
-						"data-testid": `git-new-session-mode-${entry.mode}`,
-						disabled: busy,
-						className: mode === entry.mode ? "border-po-blue/60 text-po-hi" : void 0,
-						onClick: () => update({ mode: entry.mode }),
-						children: entry.label
-					}, entry.mode))
-				}) : branches === null && loadError === "" ? /* @__PURE__ */ jsx("p", {
-					className: "text-sm text-po-dim",
-					children: "reading branches…"
-				}) : /* @__PURE__ */ jsx("p", {
-					"data-testid": "git-new-session-plain-note",
-					className: "text-sm text-po-dim",
-					children: loadError || "This workspace is not a git checkout, so the session starts in its folder."
-				}),
-				mode === "existing" && gitReady ? /* @__PURE__ */ jsxs("div", {
-					className: "flex flex-col gap-1",
-					children: [/* @__PURE__ */ jsx(Input, {
-						"data-testid": "git-new-session-branch-search",
-						"aria-label": "find a branch",
-						value: query,
-						autoFocus: true,
-						disabled: busy,
-						onChange: (event) => setQuery(event.target.value),
-						placeholder: "find a branch"
-					}), /* @__PURE__ */ jsxs("div", {
-						role: "listbox",
-						"aria-label": "branches",
-						className: "max-h-48 overflow-y-auto rounded border border-po-border bg-po-deep p-1",
-						children: [options.length === 0 ? /* @__PURE__ */ jsx("p", {
-							className: "px-2 py-1 text-sm text-po-dim",
-							children: "no matching branches"
-						}) : null, options.map((option) => /* @__PURE__ */ jsxs(OptionRow, {
-							density: "compact",
-							active: form.selected?.key === option.key,
-							disabled: option.busyAt !== void 0 || busy,
-							"data-testid": "git-new-session-branch-option",
-							"data-branch": option.name,
-							"data-remote": option.remote,
-							onClick: () => update({ selected: option }),
-							className: `w-full px-2.5 py-1 text-base ${option.busyAt !== void 0 ? "opacity-50" : ""}`,
-							children: [/* @__PURE__ */ jsx("span", {
-								className: "min-w-0 flex-1 truncate",
-								children: option.remote === void 0 ? option.name : `${option.remote}/${option.name}`
-							}), /* @__PURE__ */ jsx("span", {
-								className: "shrink-0 text-sm text-po-dim",
-								children: option.current && option.busyAt !== void 0 ? "current · checked out" : option.current ? "current" : option.busyAt !== void 0 ? "checked out" : option.remote !== void 0 ? "remote" : ""
-							})]
-						}, option.key))]
-					})]
-				}) : null,
-				mode === "new" && gitReady ? /* @__PURE__ */ jsxs("div", {
-					className: "flex flex-col gap-2",
-					children: [/* @__PURE__ */ jsxs("label", {
-						htmlFor: "git-new-session-new-branch",
-						className: "flex flex-col gap-1",
-						children: [/* @__PURE__ */ jsx("span", {
-							className: "text-sm text-po-dim",
-							children: "new branch"
-						}), /* @__PURE__ */ jsx(Input, {
-							id: "git-new-session-new-branch",
-							"data-testid": "git-new-session-new-branch",
-							value: form.newBranch,
-							autoFocus: true,
-							disabled: busy,
-							onChange: (event) => update({ newBranch: event.target.value }),
-							placeholder: "feature/my-change"
-						})]
-					}), /* @__PURE__ */ jsxs("span", {
-						className: "flex flex-col gap-1",
-						children: [/* @__PURE__ */ jsx("span", {
-							className: "text-sm text-po-dim",
-							children: "from"
-						}), /* @__PURE__ */ jsxs(Select, {
-							value: form.baseRef,
-							onValueChange: (baseRef) => update({ baseRef }),
-							disabled: busy,
-							children: [/* @__PURE__ */ jsx(SelectTrigger, {
-								"data-testid": "git-new-session-base",
-								"aria-label": "base branch",
-								children: /* @__PURE__ */ jsx(SelectValue, { placeholder: "base branch" })
-							}), /* @__PURE__ */ jsx(SelectContent, { children: bases.map((base) => /* @__PURE__ */ jsx(SelectItem, {
-								value: base,
-								children: base === branches?.current ? `${base} (current)` : base
-							}, base)) })]
-						})]
-					})]
-				}) : null,
-				/* @__PURE__ */ jsxs("label", {
-					htmlFor: "new-session-name",
-					className: "flex flex-col gap-1",
-					children: [/* @__PURE__ */ jsxs("span", {
-						className: "text-sm text-po-dim",
-						children: ["name ", /* @__PURE__ */ jsxs("span", {
-							className: "text-po-dim",
-							children: [
-								"(optional",
-								mode === "plain" ? "" : "; defaults to the branch",
-								")"
-							]
-						})]
-					}), /* @__PURE__ */ jsx(Input, {
-						id: "new-session-name",
-						"data-testid": "new-session-name",
-						value: form.name,
-						autoFocus: mode === "plain",
-						disabled: busy,
-						onChange: (event) => update({ name: event.target.value }),
-						onKeyDown: (event) => {
-							if (event.key === "Enter") submit();
-						},
-						placeholder: "session name"
-					})]
-				}),
-				error ? /* @__PURE__ */ jsx("pre", {
-					"data-testid": "new-session-error",
-					className: "max-h-28 overflow-y-auto rounded border border-po-edge-red bg-po-tint-red/40 px-2.5 py-2 text-sm whitespace-pre-wrap text-po-red",
-					children: error
-				}) : null,
-				/* @__PURE__ */ jsxs(DialogFooter, { children: [/* @__PURE__ */ jsx(Button, {
-					variant: "outline",
-					"data-testid": "new-session-cancel",
-					disabled: busy,
-					onClick: () => newSession.close(),
-					children: "cancel"
-				}), /* @__PURE__ */ jsx(Button, {
-					variant: "primary",
-					"data-testid": "new-session-create",
-					title: problem,
-					disabled: busy || problem !== void 0,
-					onClick: () => void submit(),
-					children: busy ? mode === "plain" ? "creating…" : "creating worktree…" : "create"
-				})] })
-			] })]
+			children: [/* @__PURE__ */ jsx(DialogTitle, {
+				className: "sr-only",
+				children: "New session"
+			}), /* @__PURE__ */ jsx(GitNewSessionDialogView, {
+				workspaceRoot: newSession.workspaceRoot,
+				branches,
+				loadError,
+				busy,
+				error,
+				riftMissing,
+				onClose: newSession.close,
+				onCreate: (state) => void submit(state)
+			})]
 		})
 	});
 }
@@ -446,11 +527,17 @@ function saveRequestOf(form) {
 * AVOID:
 * - Echoing a token back. The view the server sends has none to echo.
 */
+function Field({ label, children }) {
+	return /* @__PURE__ */ jsxs("label", {
+		className: "flex flex-col gap-2 text-base text-po-text",
+		children: [/* @__PURE__ */ jsx("span", { children: label }), children]
+	});
+}
 const METHODS = [
 	{
 		method: "none",
 		title: "This machine's git",
-		detail: "Whatever git here already does: your credential helper, SSH config and agent."
+		detail: "Your credential helper, SSH config and agent, as they are."
 	},
 	{
 		method: "ssh",
@@ -465,10 +552,14 @@ const METHODS = [
 ];
 function GitAuthForm({ saved, saving, saveError, savedNotice = false, onSave }) {
 	const [form, setForm] = useState(() => formFromView(saved));
-	const update = (patch) => setForm((current) => ({
-		...current,
-		...patch
-	}));
+	const [edited, setEdited] = useState(false);
+	const update = (patch) => {
+		setEdited(true);
+		setForm((current) => ({
+			...current,
+			...patch
+		}));
+	};
 	const problem = formProblem(form, saved);
 	const tokenSaved = saved.https?.hasToken === true && saved.https.host === form.host.trim().toLowerCase();
 	const host = form.host.trim() === "" ? "this host" : form.host.trim();
@@ -476,133 +567,156 @@ function GitAuthForm({ saved, saving, saveError, savedNotice = false, onSave })
 		"data-testid": "git-auth-form",
 		children: [
 			/* @__PURE__ */ jsxs(SettingsSectionHeader, { children: [/* @__PURE__ */ jsx(SettingsSectionTitle, { children: "Connection" }), /* @__PURE__ */ jsx(SettingsSectionDescription, { children: "Worktree sessions use the setup of the workspace they belong to." })] }),
-			/* @__PURE__ */ jsx(RadioGroup, {
+			/* @__PURE__ */ jsx("div", {
 				"aria-label": "How git reaches your remote",
-				value: form.method,
-				onValueChange: (value) => update({ method: value }),
-				className: "grid grid-cols-1 gap-3",
-				children: METHODS.map((choice) => /* @__PURE__ */ jsxs(RadioGroupCard, {
-					value: choice.method,
-					"data-testid": `git-auth-method-${choice.method}`,
-					className: "flex items-start gap-2 rounded-lg p-4",
-					children: [/* @__PURE__ */ jsxs("span", {
-						className: "flex min-w-0 flex-1 flex-col gap-1",
-						children: [/* @__PURE__ */ jsx("span", {
-							className: "text-base font-medium text-po-hi",
-							children: choice.title
-						}), /* @__PURE__ */ jsx("span", {
-							className: "text-sm leading-relaxed text-po-dim",
-							children: choice.detail
-						})]
-					}), form.method === choice.method ? /* @__PURE__ */ jsx(CheckIcon, { className: "size-4 shrink-0 text-po-green" }) : null]
+				className: "flex flex-col gap-3",
+				children: METHODS.map((choice) => /* @__PURE__ */ jsxs("div", {
+					className: `overflow-hidden rounded-lg border ${form.method === choice.method ? "border-po-green" : "border-po-border-soft"}`,
+					children: [
+						/* @__PURE__ */ jsxs("button", {
+							type: "button",
+							"aria-pressed": form.method === choice.method,
+							disabled: saving,
+							"data-testid": `git-auth-method-${choice.method}`,
+							onClick: () => update({ method: choice.method }),
+							className: `flex w-full items-start gap-3 p-4 text-left ${form.method === choice.method ? "bg-po-tint-green" : "bg-po-bg"}`,
+							children: [/* @__PURE__ */ jsxs("span", {
+								className: "flex flex-1 flex-col gap-1",
+								children: [/* @__PURE__ */ jsx("span", {
+									className: "text-base font-semibold text-po-hi",
+									children: choice.title
+								}), /* @__PURE__ */ jsx("span", {
+									className: "text-sm leading-relaxed text-po-dim",
+									children: choice.detail
+								})]
+							}), form.method === choice.method ? /* @__PURE__ */ jsx(CheckIcon, { className: "mt-0.5 size-4 shrink-0 text-po-green" }) : null]
+						}),
+						form.method === choice.method && form.method === "ssh" ? /* @__PURE__ */ jsxs("div", {
+							className: "flex flex-col gap-3 border-t border-po-border-soft p-4",
+							children: [/* @__PURE__ */ jsx(Field, {
+								label: "Key path",
+								children: /* @__PURE__ */ jsx(Input, {
+									"data-testid": "git-auth-key-path",
+									value: form.keyPath,
+									placeholder: "~/.ssh/id_ed25519",
+									spellCheck: false,
+									disabled: saving,
+									onChange: (event) => update({ keyPath: event.target.value }),
+									className: "font-mono"
+								})
+							}), /* @__PURE__ */ jsx("p", {
+								className: "text-sm leading-relaxed text-po-dim",
+								children: "Leave blank to use SSH config and ssh-agent. Passphrases need ssh-agent. Trust an unknown host in a terminal first."
+							})]
+						}) : null,
+						form.method === choice.method && form.method === "https" ? /* @__PURE__ */ jsxs("div", {
+							className: "flex flex-col gap-4 border-t border-po-border-soft p-4",
+							children: [
+								/* @__PURE__ */ jsxs("div", {
+									className: "grid grid-cols-2 gap-3",
+									children: [/* @__PURE__ */ jsx(Field, {
+										label: "Host",
+										children: /* @__PURE__ */ jsx(Input, {
+											"data-testid": "git-auth-host",
+											value: form.host,
+											spellCheck: false,
+											disabled: saving,
+											onChange: (event) => update({ host: event.target.value }),
+											className: "font-mono"
+										})
+									}), /* @__PURE__ */ jsx(Field, {
+										label: "Username",
+										children: /* @__PURE__ */ jsx(Input, {
+											"data-testid": "git-auth-username",
+											value: form.username,
+											autoComplete: "username",
+											spellCheck: false,
+											disabled: saving,
+											onChange: (event) => update({ username: event.target.value })
+										})
+									})]
+								}),
+								/* @__PURE__ */ jsx(Field, {
+									label: /* @__PURE__ */ jsxs(Fragment, { children: [
+										"Token",
+										" ",
+										tokenSaved ? /* @__PURE__ */ jsx("span", {
+											"data-testid": "git-auth-token-saved",
+											className: "ml-2 text-sm text-po-green",
+											children: "A token is saved"
+										}) : null
+									] }),
+									children: /* @__PURE__ */ jsx(Input, {
+										"data-testid": "git-auth-token",
+										type: "password",
+										value: form.token,
+										autoComplete: "new-password",
+										placeholder: tokenSaved ? "Leave blank to keep it" : "Personal access token",
+										disabled: saving,
+										onChange: (event) => update({ token: event.target.value })
+									})
+								}),
+								/* @__PURE__ */ jsxs("p", {
+									className: "text-sm text-po-dim",
+									children: [
+										"Sent only to ",
+										/* @__PURE__ */ jsx("span", {
+											className: "font-mono",
+											children: host
+										}),
+										". Other hosts use this machine's git."
+									]
+								})
+							]
+						}) : null
+					]
 				}, choice.method))
 			}),
-			form.method === "ssh" ? /* @__PURE__ */ jsx(SettingsCard, { children: /* @__PURE__ */ jsx(SettingsField, {
-				id: "git-auth-key-path",
-				label: "Key path",
-				description: /* @__PURE__ */ jsxs(Fragment, { children: [
-					"Leave it blank to use your SSH config and ssh-agent. A key with a passphrase works only through ssh-agent. An unknown host is refused: run ",
-					/* @__PURE__ */ jsx("code", {
+			/* @__PURE__ */ jsxs(SettingsNote, {
+				className: "flex items-start gap-2 leading-relaxed",
+				children: [/* @__PURE__ */ jsx(ShieldIcon, {
+					"aria-hidden": true,
+					className: "mt-0.5 size-4 shrink-0"
+				}), /* @__PURE__ */ jsxs("span", { children: [
+					"Only cockpit pull, push and rebase use these credentials, not the agent.",
+					/* @__PURE__ */ jsx("br", {}),
+					"Stored in ",
+					/* @__PURE__ */ jsx("span", {
 						className: "font-mono",
-						children: "ssh -T git@github.com"
+						children: "~/.po/git/credentials.json"
 					}),
-					" once in a terminal to trust it."
-				] }),
-				children: /* @__PURE__ */ jsx(Input, {
-					id: "git-auth-key-path",
-					"data-testid": "git-auth-key-path",
-					value: form.keyPath,
-					placeholder: "~/.ssh/id_ed25519",
-					spellCheck: false,
-					onChange: (event) => update({ keyPath: event.target.value }),
-					className: "font-mono text-sm"
-				})
-			}) }) : null,
-			form.method === "https" ? /* @__PURE__ */ jsxs(SettingsCard, { children: [
-				/* @__PURE__ */ jsx(SettingsField, {
-					id: "git-auth-host",
-					label: "Host",
-					description: "The one host this token is sent to.",
-					children: /* @__PURE__ */ jsx(Input, {
-						id: "git-auth-host",
-						"data-testid": "git-auth-host",
-						value: form.host,
-						spellCheck: false,
-						onChange: (event) => update({ host: event.target.value }),
-						className: "font-mono text-sm"
-					})
-				}),
-				/* @__PURE__ */ jsx(SettingsField, {
-					id: "git-auth-username",
-					label: "Username",
-					children: /* @__PURE__ */ jsx(Input, {
-						id: "git-auth-username",
-						"data-testid": "git-auth-username",
-						value: form.username,
-						autoComplete: "username",
-						spellCheck: false,
-						onChange: (event) => update({ username: event.target.value }),
-						className: "text-base"
-					})
-				}),
-				/* @__PURE__ */ jsx(SettingsField, {
-					id: "git-auth-token",
-					label: "Token",
-					description: /* @__PURE__ */ jsxs(Fragment, { children: [
-						tokenSaved ? /* @__PURE__ */ jsxs("span", {
-							"data-testid": "git-auth-token-saved",
-							className: "text-po-green",
-							children: ["A token is saved.", " "]
-						}) : null,
-						"Sent only to ",
-						host,
-						". A remote on any other host keeps using this machine's own git credentials."
-					] }),
-					children: /* @__PURE__ */ jsx(Input, {
-						id: "git-auth-token",
-						"data-testid": "git-auth-token",
-						type: "password",
-						value: form.token,
-						autoComplete: "new-password",
-						placeholder: tokenSaved ? "Leave blank to keep it" : "Personal access token",
-						onChange: (event) => update({ token: event.target.value }),
-						className: "text-base"
-					})
-				})
-			] }) : null,
+					", readable only by you."
+				] })]
+			}),
 			/* @__PURE__ */ jsxs(SettingsActions, {
 				className: "gap-4",
 				children: [/* @__PURE__ */ jsx(Button, {
 					variant: "primary",
-					size: "sm",
 					"data-testid": "git-auth-save",
 					disabled: problem !== void 0 || saving,
 					loading: saving,
-					loadingLabel: "Saving",
-					onClick: () => onSave(saveRequestOf(form)),
+					loadingLabel: "Saving...",
+					onClick: () => {
+						if (!saving && problem === void 0) onSave(saveRequestOf(form));
+					},
 					children: "Save connection"
-				}), problem !== void 0 ? /* @__PURE__ */ jsx(SettingsNote, {
-					"data-testid": "git-auth-problem",
-					className: "text-po-dim",
-					children: problem
-				}) : saveError !== void 0 ? /* @__PURE__ */ jsx(SettingsNote, {
-					role: "alert",
-					"data-testid": "git-auth-error",
-					className: "text-po-red",
-					children: saveError
-				}) : savedNotice ? /* @__PURE__ */ jsx(SettingsNote, {
+				}), savedNotice && !edited && problem === void 0 && saveError === void 0 ? /* @__PURE__ */ jsx("span", {
 					"data-testid": "git-auth-saved",
-					className: "text-po-green",
+					className: "text-sm text-po-green",
 					children: "Saved."
 				}) : null]
 			}),
-			/* @__PURE__ */ jsxs(SettingsNote, {
-				className: "flex items-start gap-2",
-				children: [/* @__PURE__ */ jsx(ShieldIcon, {
-					"aria-hidden": true,
-					className: "mt-0.5 size-3.5 shrink-0"
-				}), /* @__PURE__ */ jsx("span", { children: "Used only when you pull, push or rebase from this workspace's sessions in the cockpit, worktrees included. The agent's own git commands never see these credentials. Stored outside the repository in ~/.po/git/credentials.json, readable only by you, and never in the system keychain." })]
-			})
+			problem !== void 0 ? /* @__PURE__ */ jsx("p", {
+				"data-testid": "git-auth-problem",
+				className: "text-sm text-po-red",
+				children: problem
+			}) : null,
+			saveError !== void 0 ? /* @__PURE__ */ jsx("p", {
+				role: "alert",
+				"data-testid": "git-auth-error",
+				className: "text-sm text-po-red",
+				children: saveError
+			}) : null
 		]
 	});
 }
@@ -845,7 +959,10 @@ function optionalText$1(value) {
 }
 function optionalErrorTarget$1(value) {
 	if (!isRecord$2(value)) return void 0;
-	if (value.action === "create") return { action: "create" };
+	if (value.action === "create") return value.riftMissing === true ? {
+		action: "create",
+		riftMissing: true
+	} : { action: "create" };
 	if (value.action === "close" && typeof value.id === "string" && value.id !== "") return {
 		action: "close",
 		id: value.id
@@ -893,200 +1010,404 @@ function requestWorktreeClose(sessionId, id) {
 	});
 }
 //#endregion
+//#region src/extensions/workspaces/sessions/(frontend)/fill/_components/WorktreeCreateDialog.tsx
+function WorktreeSessionMenu({ sessionId, sessionReservationId }) {
+	return /* @__PURE__ */ jsx(DropdownMenuItem, {
+		disabled: sessionId === null,
+		"data-testid": `session-worktree-${sessionReservationId ?? sessionId}`,
+		onSelect: () => {
+			if (sessionId !== null) worktreeCreateDialog.update(() => ({
+				sessionId,
+				...sessionReservationId === void 0 ? {} : { reservationId: sessionReservationId }
+			}));
+		},
+		children: "Create Worktree Session..."
+	});
+}
+function WorktreeCreateOverlay(props) {
+	const target = useStore(worktreeCreateDialog.store);
+	const { holdSessionChannels } = props;
+	useEffect(() => {
+		if (target === null) return;
+		return holdSessionChannels?.(target.sessionId, (frame) => {
+			if (frame.type !== worktreesChannel.channel) return;
+			const payload = worktreesChannel.parse(frame.payload);
+			if (payload !== null) worktreesChannel.apply(target.sessionId, payload);
+		});
+	}, [target, holdSessionChannels]);
+	if (target === null) return null;
+	return /* @__PURE__ */ jsx(Dialog, {
+		open: true,
+		onOpenChange: (open) => {
+			if (!open) worktreeCreateDialog.update(() => null);
+		},
+		children: /* @__PURE__ */ jsxs(DialogContent, {
+			width: "md",
+			className: "w-96 overflow-y-auto border-0",
+			"data-testid": "session-worktree-dialog",
+			"aria-describedby": void 0,
+			children: [/* @__PURE__ */ jsx(DialogTitle, {
+				className: "sr-only",
+				children: "Create a worktree session"
+			}), /* @__PURE__ */ createElement(WorktreeCreateForm, {
+				...props,
+				key: `${target.sessionId}:${target.reservationId ?? ""}`,
+				sessionId: target.sessionId,
+				sessionReservationId: target.reservationId,
+				onCancel: () => worktreeCreateDialog.update(() => null),
+				onCreated: () => worktreeCreateDialog.update(() => null)
+			})]
+		})
+	});
+}
+function WorktreeCreateForm({ sessionId, sessionReservationId, onCancel, onRequested, onCreated }) {
+	const session = useStore(worktreeActivity.store, (state) => worktreeActivity.select(state, sessionId));
+	const [branch, setBranch] = useState("");
+	const [baseRef, setBaseRef] = useState("");
+	const sent = useRef(void 0);
+	useEffect(() => {
+		const request = sent.current;
+		if (request === void 0) return;
+		if (session.pending !== void 0) {
+			request.sawPending = true;
+			return;
+		}
+		if (!session.worktrees.some((worktree) => worktree.branch === request.branch) && !request.sawPending) return;
+		sent.current = void 0;
+		if (session.errorTarget?.action !== "create") onCreated?.();
+	}, [
+		session.pending,
+		session.worktrees,
+		session.errorTarget,
+		onCreated
+	]);
+	return /* @__PURE__ */ jsx(WorktreeCreateView, {
+		branch,
+		baseRef,
+		onBranchChange: setBranch,
+		onBaseChange: setBaseRef,
+		busy: session.pending !== void 0,
+		error: session.errorTarget?.action === "create" ? session.error : void 0,
+		riftMissing: session.errorTarget?.action === "create" && session.errorTarget.riftMissing === true,
+		onCancel,
+		onCreate: () => {
+			if (sessionId !== null) {
+				sent.current = {
+					branch: branch.trim(),
+					sawPending: false
+				};
+				onRequested?.(branch.trim());
+				requestWorktreeCreate(sessionId, branch, baseRef, sessionReservationId);
+			}
+		},
+		disabled: sessionId === null
+	});
+}
+function WorktreeCreateView({ branch, baseRef, onBranchChange, onBaseChange, busy = false, error, riftMissing = false, onCancel, onCreate, disabled = false }) {
+	const id = useId();
+	return /* @__PURE__ */ jsxs("div", {
+		className: "rounded-lg border border-po-border-soft bg-po-panel p-5 text-po-text shadow-sm",
+		children: [
+			/* @__PURE__ */ jsx("h2", {
+				id: `${id}-title`,
+				className: "text-xl font-semibold text-po-hi",
+				children: "Create a worktree session"
+			}),
+			/* @__PURE__ */ jsx("p", {
+				className: "mt-2 text-sm leading-relaxed text-po-dim",
+				children: "Create a separate checkout and session without moving your existing sessions."
+			}),
+			/* @__PURE__ */ jsxs("form", {
+				onSubmit: (event) => {
+					event.preventDefault();
+					if (!busy && !disabled && branch.trim()) onCreate?.();
+				},
+				children: [/* @__PURE__ */ jsxs("div", {
+					className: "mt-5 flex flex-col gap-4",
+					children: [/* @__PURE__ */ jsxs("div", {
+						className: "flex flex-col gap-2",
+						children: [
+							/* @__PURE__ */ jsx("label", {
+								htmlFor: `${id}-branch`,
+								className: "text-base font-medium",
+								children: "Branch"
+							}),
+							/* @__PURE__ */ jsx(Input, {
+								id: `${id}-branch`,
+								"data-testid": "git-worktree-branch",
+								className: "font-mono",
+								placeholder: "wt/fix-auth",
+								value: branch,
+								onChange: (e) => onBranchChange?.(e.target.value),
+								disabled: busy,
+								"aria-invalid": !!error,
+								"aria-describedby": error ? `${id}-error` : void 0
+							}),
+							riftMissing ? /* @__PURE__ */ jsxs("div", {
+								"data-testid": "rift-install-notice",
+								role: "alert",
+								className: "flex flex-col gap-2 rounded-md border border-po-edge-magenta bg-po-tint-magenta px-3 py-3 text-sm text-po-hi",
+								children: [/* @__PURE__ */ jsx("p", { children: "This repository uses Rift, and its CLI is not installed here. Run these in the repository root, then try again." }), /* @__PURE__ */ jsx(CodeBlock, {
+									text: `${RIFT_INSTALL_COMMAND}
+rift init`,
+									className: "language-bash"
+								})]
+							}) : error && /* @__PURE__ */ jsx("p", {
+								id: `${id}-error`,
+								role: "alert",
+								"data-testid": "git-worktree-error",
+								className: "text-sm text-po-red",
+								children: error
+							})
+						]
+					}), /* @__PURE__ */ jsxs("div", {
+						className: "flex flex-col gap-2",
+						children: [/* @__PURE__ */ jsx("label", {
+							htmlFor: `${id}-base`,
+							className: "text-base font-medium",
+							children: "Start from"
+						}), /* @__PURE__ */ jsx(Input, {
+							size: "sm",
+							id: `${id}-base`,
+							"data-testid": "git-worktree-base",
+							className: "font-mono",
+							placeholder: "Current branch",
+							value: baseRef,
+							onChange: (e) => onBaseChange?.(e.target.value),
+							disabled: busy
+						})]
+					})]
+				}), /* @__PURE__ */ jsxs("footer", {
+					className: "mt-5 flex items-center justify-end gap-2 border-t border-po-border-soft pt-4",
+					children: [/* @__PURE__ */ jsx(Button, {
+						type: "button",
+						variant: "ghost",
+						disabled: busy,
+						onClick: onCancel,
+						children: "Cancel"
+					}), /* @__PURE__ */ jsxs(Button, {
+						type: "submit",
+						variant: "primary",
+						"data-testid": "git-worktree-create",
+						disabled: busy || disabled || !branch.trim(),
+						children: [busy && /* @__PURE__ */ jsx(Spinner, {
+							className: "size-3",
+							label: "Creating worktree"
+						}), busy ? "Creating worktree..." : riftMissing ? "Try again" : "Create worktree"]
+					})]
+				})]
+			})
+		]
+	});
+}
+//#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/_components/WorktreesPanel.tsx
-/**
-* The '# git' group's tab: this session's worktrees, and the form that makes one.
-*
-* DESIGN PATTERNS:
-* - Lives in the activity dock, opened by the group's name. A worktree is work
-*   in progress belonging to the session that started it, so it sits beside
-*   agents, runners and workflows rather than in a settings screen.
-* - Header, form, then cards, the same rhythm the runners and workflows panels
-*   use. A worktree row is a card because it carries three facts and two
-*   actions, which a single line cannot hold without becoming a puzzle.
-* - Local form state is never reset by a data refresh. Direct lifecycle events
-*   update the list without discarding a half-typed branch name.
-* - Acts through the plugin's own hub channel, so a worktree made here and one
-*   made by the tool take exactly the same path.
-* - Creating waits on the cockpit starting a session, so the hub reports each
-*   phase on that channel and the header shows it turning. A button that looks
-*   idle for two minutes reads as broken.
-*
-* AVOID:
-* - Deriving form state from refreshed store data instead of the user's input.
-* - Colour classes outside the token set. `po-error`, `po-line` and
-*   `po-bright` are not tokens: they compile to nothing and the row silently
-*   loses its border.
-*/
-const WORKTREES_TAB_ID = "git-worktrees";
 function worktreesTab() {
 	return {
-		id: WORKTREES_TAB_ID,
+		id: "git-worktrees",
 		label: "worktrees",
 		panel: WorktreesPanel
 	};
 }
-function WorktreesPanel({ sessionId, sessionReservationId }) {
-	const session = useStore(worktreeActivity.store, (state) => worktreeActivity.select(state, sessionId));
-	const [branch, setBranch] = useState("");
-	const [baseRef, setBaseRef] = useState("");
-	const busy = session.pending !== void 0;
-	const canCreate = sessionId !== null && branch.trim() !== "" && !busy;
-	const createError = session.errorTarget?.action === "create" ? session.error : void 0;
-	const closeErrorId = session.errorTarget?.action === "close" ? session.errorTarget.id : void 0;
-	const panelError = session.error !== void 0 && (session.errorTarget === void 0 || closeErrorId !== void 0 && !session.worktrees.some((worktree) => worktree.id === closeErrorId));
-	const create = () => {
-		if (sessionId === null || !canCreate) return;
-		requestWorktreeCreate(sessionId, branch, baseRef, sessionReservationId);
-		if (sessionReservationId === void 0) {
-			setBranch("");
-			setBaseRef("");
-		}
-	};
+function WorktreesPanel(props) {
+	const session = useStore(worktreeActivity.store, (state) => worktreeActivity.select(state, props.sessionId));
+	const [creating, setCreating] = useState(session.errorTarget?.action === "create");
+	const [requestedBranch, setRequestedBranch] = useState();
+	const sawPending = useRef(false);
+	useEffect(() => {
+		if (!requestedBranch) return;
+		if (session.worktrees.some((w) => w.branch === requestedBranch) || sawPending.current && session.pending === void 0) setRequestedBranch(void 0);
+		else if (session.pending !== void 0) sawPending.current = true;
+	}, [
+		requestedBranch,
+		session.pending,
+		session.worktrees
+	]);
+	return /* @__PURE__ */ jsx("div", {
+		className: "min-h-0 flex-1 overflow-auto",
+		children: /* @__PURE__ */ jsx(WorktreesPanelView, {
+			worktrees: session.worktrees,
+			pending: session.pending,
+			startingBranch: session.pending === void 0 || session.worktrees.some((w) => w.branch === requestedBranch) ? void 0 : requestedBranch,
+			error: session.errorTarget?.action === "create" && creating ? void 0 : session.error,
+			closeErrorId: session.errorTarget?.action === "close" ? session.errorTarget.id : void 0,
+			onNew: () => setCreating(true),
+			onClose: props.sessionId === null ? void 0 : (id) => requestWorktreeClose(props.sessionId, id),
+			form: creating ? /* @__PURE__ */ jsx(WorktreeCreateForm, {
+				...props,
+				onCancel: () => setCreating(false),
+				onCreated: () => setCreating(false),
+				onRequested: (branch) => {
+					sawPending.current = false;
+					setRequestedBranch(branch);
+				}
+			}) : void 0
+		})
+	});
+}
+function WorktreesPanelView({ worktrees, pending, error, closeErrorId, onNew, onClose, form, startingIds = [], startingBranch }) {
+	const groups = [worktrees.filter((w) => !w.orphaned && !w.unowned), worktrees.filter((w) => w.orphaned || w.unowned)];
 	return /* @__PURE__ */ jsxs("div", {
 		"data-testid": "git-worktrees-panel",
-		className: "flex min-h-0 flex-1 flex-col overflow-auto",
+		className: "rounded-lg border border-po-border-soft bg-po-panel p-5",
 		children: [
-			/* @__PURE__ */ jsxs("div", {
-				className: "flex min-h-11 shrink-0 items-center gap-2.5 border-b border-po-border-soft px-3 sm:px-[26px]",
+			/* @__PURE__ */ jsxs("header", {
+				className: "flex items-center justify-between gap-4 border-b border-po-border-soft pb-4",
 				children: [
-					/* @__PURE__ */ jsx("span", {
+					/* @__PURE__ */ jsx("h2", {
 						className: "text-lg font-semibold text-po-hi",
-						children: "worktrees"
+						children: "Worktrees"
 					}),
 					/* @__PURE__ */ jsx("span", {
 						"data-testid": "git-worktrees-count",
-						className: "text-sm text-po-dim",
-						children: session.worktrees.length === 0 ? "none yet" : `${String(session.worktrees.length)} open`
+						className: "sr-only",
+						children: worktrees.length === 0 ? "none yet" : `${worktrees.length} open`
 					}),
-					/* @__PURE__ */ jsx("span", { className: "min-w-0 flex-1" }),
-					session.pending === void 0 ? null : /* @__PURE__ */ jsxs("span", {
-						"data-testid": "git-worktree-pending",
-						className: "flex min-w-0 items-center gap-1.5",
-						children: [/* @__PURE__ */ jsx(Spinner, {
-							className: "h-3 w-3 shrink-0 text-po-faint",
-							label: session.pending
-						}), /* @__PURE__ */ jsx("span", {
-							className: "min-w-0 truncate text-sm text-po-dim",
-							children: session.pending
-						})]
+					/* @__PURE__ */ jsx(Button, {
+						variant: "outline",
+						size: "sm",
+						onClick: onNew,
+						children: "New worktree"
 					})
 				]
 			}),
-			/* @__PURE__ */ jsxs("div", {
-				className: "flex shrink-0 flex-col gap-1.5 border-b border-po-border-soft px-3 py-2.5 sm:px-[26px]",
-				children: [/* @__PURE__ */ jsxs("div", {
-					className: "flex items-center gap-2",
-					children: [
-						/* @__PURE__ */ jsx(Input, {
-							"data-testid": "git-worktree-branch",
-							"aria-label": "Branch",
-							size: "sm",
-							className: "min-w-0 flex-1",
-							placeholder: "wt/fix-auth",
-							value: branch,
-							onChange: (event) => setBranch(event.target.value),
-							onKeyDown: (event) => {
-								if (event.key === "Enter") create();
-							}
-						}),
-						/* @__PURE__ */ jsx(Input, {
-							"data-testid": "git-worktree-base",
-							"aria-label": "Base ref",
-							size: "sm",
-							placeholder: "base (current)",
-							value: baseRef,
-							onChange: (event) => setBaseRef(event.target.value),
-							className: "w-32 shrink-0"
-						}),
-						/* @__PURE__ */ jsx(Button, {
-							"data-testid": "git-worktree-create",
-							size: "sm",
-							disabled: !canCreate,
-							onClick: create,
-							children: "Create"
-						})
-					]
-				}), createError === void 0 ? /* @__PURE__ */ jsx("p", {
-					className: "text-sm text-po-dim",
-					children: "Creates the worktree outside the repository and starts a session nested under this one."
-				}) : /* @__PURE__ */ jsx("p", {
-					role: "alert",
-					"data-testid": "git-worktree-error",
-					className: "text-sm text-po-red",
-					children: createError
+			form,
+			pending && !startingBranch && /* @__PURE__ */ jsxs("p", {
+				"data-testid": "git-worktree-pending",
+				className: "flex items-center gap-2 pt-3 text-sm text-po-dim",
+				children: [/* @__PURE__ */ jsx(Spinner, {
+					className: "size-3",
+					label: pending
+				}), /* @__PURE__ */ jsx("span", {
+					className: "inline-block first-letter:uppercase",
+					children: pending
 				})]
 			}),
-			panelError ? /* @__PURE__ */ jsx("p", {
+			error && (!closeErrorId || !worktrees.some((w) => w.id === closeErrorId)) && /* @__PURE__ */ jsx("p", {
 				role: "alert",
 				"data-testid": "git-worktree-error",
-				className: "px-3 pt-2 text-sm text-po-red sm:px-[26px]",
-				children: session.error
-			}) : null,
-			session.worktrees.length === 0 ? /* @__PURE__ */ jsx(EmptyState, {
+				className: "text-sm text-po-red",
+				children: error
+			}),
+			worktrees.length === 0 && !startingBranch ? /* @__PURE__ */ jsx(EmptyState, {
 				"data-testid": "git-worktrees-empty",
-				className: "px-4 py-8",
-				title: "no worktrees yet",
-				description: "a worktree is its own checkout on its own branch, with its own session nested under this one."
-			}) : /* @__PURE__ */ jsx("ul", {
+				className: "py-10",
+				title: "No worktrees yet",
+				description: "A worktree gives a branch its own checkout and a session nested under this one."
+			}) : /* @__PURE__ */ jsx("div", {
 				"data-testid": "git-worktrees-list",
-				className: "flex flex-col gap-2.5 px-3 py-3 sm:px-[26px]",
-				children: session.worktrees.map((worktree) => /* @__PURE__ */ jsx(WorktreeCard, {
-					worktree,
-					sessionId,
-					busy,
-					error: closeErrorId === worktree.id ? session.error : void 0
-				}, worktree.id))
+				children: groups.map((group, i) => (group.length > 0 || i === 0 && startingBranch) && /* @__PURE__ */ jsxs("section", { children: [
+					/* @__PURE__ */ jsxs("h3", {
+						className: "flex items-center gap-2 pt-5 text-lg font-semibold text-po-hi",
+						children: [
+							i === 0 ? "Working" : "Needs a look",
+							" ",
+							/* @__PURE__ */ jsxs("span", {
+								className: "text-sm font-normal text-po-dim",
+								children: [group.length + (i === 0 && startingBranch ? 1 : 0), " open"]
+							})
+						]
+					}),
+					i === 1 && /* @__PURE__ */ jsxs("p", {
+						className: "pt-2 text-sm leading-relaxed text-po-dim",
+						children: [
+							group.length === 2 ? "Two worktrees" : group.length === 1 ? "One worktree" : `${group.length} worktrees`,
+							" ",
+							"would like your eye, whenever you are ready."
+						]
+					}),
+					i === 0 && startingBranch && /* @__PURE__ */ jsxs("div", {
+						"data-testid": "git-worktree-starting",
+						className: "flex min-w-0 flex-col gap-2 border-b border-po-border-soft py-4",
+						children: [/* @__PURE__ */ jsxs("div", {
+							className: "flex min-w-0 items-center gap-2",
+							children: [/* @__PURE__ */ jsx(Spinner, {
+								className: "size-3 shrink-0 text-po-dim",
+								label: "Starting session"
+							}), /* @__PURE__ */ jsx("span", {
+								className: "min-w-0 flex-1 truncate font-mono text-base font-medium text-po-hi",
+								children: startingBranch
+							})]
+						}), /* @__PURE__ */ jsx("p", {
+							className: "pl-4 text-sm text-po-dim",
+							children: "Starting session..."
+						})]
+					}),
+					group.map((w) => /* @__PURE__ */ jsx(WorktreeRow, {
+						worktree: w,
+						starting: startingIds.includes(w.id) || !!pending?.includes("starting") && w.sessionId === null && !w.orphaned && !w.unowned,
+						disabled: !!pending || !onClose,
+						onClose: () => onClose?.(w.id),
+						error: closeErrorId === w.id ? error : void 0
+					}, w.id))
+				] }, i))
 			})
 		]
 	});
 }
-/** One worktree: what it is, where it is, and the one thing you can do to it. */
-function WorktreeCard({ worktree, sessionId, busy, error }) {
-	return /* @__PURE__ */ jsxs("li", {
+function WorktreeBadge({ worktree }) {
+	if (worktree.orphaned) return /* @__PURE__ */ jsx(StatusBadge, {
+		tone: "neutral",
+		size: "xs",
+		className: "bg-po-tint-yellow text-po-yellow",
+		children: "Orphaned"
+	});
+	if (worktree.unowned) return /* @__PURE__ */ jsx(StatusBadge, {
+		tone: "info",
+		size: "xs",
+		children: "Unowned"
+	});
+	return null;
+}
+function WorktreeRow({ worktree, compact = false, starting = false, error, disabled = false, onClose }) {
+	return /* @__PURE__ */ jsxs("div", {
 		"data-testid": `git-worktree-${worktree.id}`,
-		className: "flex min-w-0 flex-col gap-1.5 rounded-md border border-po-border-soft bg-po-panel p-2.5",
+		className: compact ? "flex min-w-0 flex-col gap-1 py-2" : "flex min-w-0 flex-col gap-2 border-b border-po-border-soft py-4",
 		children: [
 			/* @__PURE__ */ jsxs("div", {
-				className: "flex min-w-0 items-center gap-1.5",
+				className: "flex min-w-0 items-center gap-2",
 				children: [
-					/* @__PURE__ */ jsx(Dot, { tone: worktree.orphaned ? "red" : worktree.sessionId === null ? "muted" : "blue" }),
+					starting ? /* @__PURE__ */ jsx(Spinner, {
+						className: "size-3 shrink-0 text-po-dim",
+						label: "Starting session"
+					}) : /* @__PURE__ */ jsx(Dot, {
+						size: "md",
+						tone: worktree.orphaned ? "yellow" : worktree.unowned ? "blue" : "green"
+					}),
 					/* @__PURE__ */ jsx("span", {
-						className: "min-w-0 flex-1 truncate text-base font-semibold text-po-hi",
+						title: worktree.branch,
+						className: "min-w-0 flex-1 truncate font-mono text-base font-medium text-po-hi",
 						children: worktree.branch
 					}),
-					worktree.orphaned ? /* @__PURE__ */ jsx(StatusBadge, {
-						tone: "error",
-						size: "xs",
-						children: "orphaned"
-					}) : null,
-					worktree.unowned ? /* @__PURE__ */ jsx(StatusBadge, {
-						tone: "info",
-						size: "xs",
-						children: "unowned"
-					}) : null
+					/* @__PURE__ */ jsx(WorktreeBadge, { worktree }),
+					!compact && /* @__PURE__ */ jsx(Button, {
+						variant: "ghost",
+						size: "sm",
+						onClick: onClose,
+						disabled: starting || disabled,
+						"data-testid": `git-worktree-close-${worktree.id}`,
+						"aria-label": `Close ${worktree.branch}`,
+						children: "Close"
+					})
 				]
 			}),
-			/* @__PURE__ */ jsx("span", {
-				className: "min-w-0 truncate text-sm text-po-dim",
+			!compact && /* @__PURE__ */ jsx("p", {
+				className: "truncate pl-4 font-mono text-sm text-po-dim",
+				title: worktree.path,
 				children: worktree.path
 			}),
-			/* @__PURE__ */ jsxs("div", {
-				className: "flex items-center gap-1.5 pt-0.5",
-				children: [/* @__PURE__ */ jsx("span", { className: "min-w-0 flex-1" }), sessionId === null ? null : /* @__PURE__ */ jsx(Button, {
-					variant: "danger-outline",
-					size: "xs",
-					disabled: busy,
-					"data-testid": `git-worktree-close-${worktree.id}`,
-					className: "px-2 ",
-					onClick: () => requestWorktreeClose(sessionId, worktree.id),
-					children: "close"
-				})]
+			starting && /* @__PURE__ */ jsx("p", {
+				className: "pl-4 text-sm text-po-dim",
+				children: "Starting session..."
+			}),
+			!compact && (worktree.orphaned || worktree.unowned) && /* @__PURE__ */ jsx("p", {
+				className: "pl-4 text-sm text-po-dim first-letter:uppercase",
+				children: worktree.orphaned ? "its folder is missing" : "its session has ended"
 			}),
-			error === void 0 ? null : /* @__PURE__ */ jsx("p", {
+			error && /* @__PURE__ */ jsx("p", {
 				role: "alert",
 				"data-testid": "git-worktree-error",
-				className: "text-sm text-po-red",
+				className: "pl-4 text-sm text-po-red",
 				children: error
 			})
 		]
@@ -1264,56 +1585,6 @@ var gitChanges_web_default = defineChannelFile(gitChangesChannel);
 //#region src/extensions/workspaces/sessions/(frontend)/channel/gitWorktrees.web.ts
 var gitWorktrees_web_default = defineChannelFile(worktreesChannel);
 //#endregion
-//#region src/extensions/workspaces/sessions/(frontend)/fill/_components/WorktreeCreateDialog.tsx
-function WorktreeSessionMenu({ sessionId, sessionReservationId }) {
-	return /* @__PURE__ */ jsx(DropdownMenuItem, {
-		disabled: sessionId === null,
-		"data-testid": `session-worktree-${sessionReservationId ?? sessionId}`,
-		onSelect: () => {
-			if (sessionId !== null) worktreeCreateDialog.update(() => ({
-				sessionId,
-				...sessionReservationId === void 0 ? {} : { reservationId: sessionReservationId }
-			}));
-		},
-		children: "create worktree session…"
-	});
-}
-function WorktreeCreateOverlay(props) {
-	const target = useStore(worktreeCreateDialog.store);
-	const { holdSessionChannels } = props;
-	useEffect(() => {
-		if (target === null) return;
-		return holdSessionChannels?.(target.sessionId, (frame) => {
-			if (frame.type !== worktreesChannel.channel) return;
-			const payload = worktreesChannel.parse(frame.payload);
-			if (payload !== null) worktreesChannel.apply(target.sessionId, payload);
-		});
-	}, [target, holdSessionChannels]);
-	if (target === null) return null;
-	return /* @__PURE__ */ jsx(Dialog, {
-		open: true,
-		onOpenChange: (open) => {
-			if (!open) worktreeCreateDialog.update(() => null);
-		},
-		children: /* @__PURE__ */ jsxs(DialogContent, {
-			width: "lg",
-			"data-testid": "session-worktree-dialog",
-			children: [/* @__PURE__ */ jsx(DialogHeader, { children: /* @__PURE__ */ jsx(DialogTitle, { children: "create worktree session" }) }), /* @__PURE__ */ jsxs(DialogBody, { children: [/* @__PURE__ */ jsx(DialogDescription, { children: "Creates a separate checkout and a new session. Existing sessions stay in their current directories." }), /* @__PURE__ */ createElement(WorktreesPanel, {
-				...props,
-				key: `${target.sessionId}:${target.reservationId ?? ""}`,
-				sessionId: target.sessionId,
-				sessionReservationId: target.reservationId
-			})] })]
-		})
-	});
-}
-//#endregion
-//#region src/extensions/workspaces/sessions/(frontend)/fill/Worktree.session-menu.web.tsx
-var Worktree_session_menu_web_default = defineFill({ component: WorktreeSessionMenu });
-//#endregion
-//#region src/extensions/workspaces/sessions/(frontend)/fill/WorktreeCreate.overlay.web.tsx
-var WorktreeCreate_overlay_web_default = defineFill({ component: WorktreeCreateOverlay });
-//#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/_lib/gitReviewApi.ts
 /**
 * The review tab's half of the session API: the changed-file list and one
@@ -1370,16 +1641,34 @@ async function fetchReviewFile(sessionId, path, signal) {
 const gitReview = defineSessionStore({ comments: [] });
 function addReviewComment(sessionId, comment) {
 	const id = globalThis.crypto.randomUUID();
-	gitReview.update(sessionId, (current) => ({ comments: [...current.comments, {
-		...comment,
-		id
-	}] }));
+	gitReview.update(sessionId, (current) => ({
+		...current,
+		comments: [...current.comments, {
+			...comment,
+			id
+		}]
+	}));
 }
 function removeReviewComment(sessionId, id) {
-	gitReview.update(sessionId, (current) => ({ comments: current.comments.filter((comment) => comment.id !== id) }));
+	gitReview.update(sessionId, (current) => ({
+		...current,
+		comments: current.comments.filter((comment) => comment.id !== id)
+	}));
 }
 function clearReviewComments(sessionId) {
-	gitReview.update(sessionId, () => ({ comments: [] }));
+	gitReview.update(sessionId, (current) => ({
+		...current,
+		comments: []
+	}));
+}
+function focusReviewFile(sessionId, path) {
+	gitReview.update(sessionId, (current) => ({
+		...current,
+		focus: {
+			path,
+			at: Date.now()
+		}
+	}));
 }
 //#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/_lib/gitReviewView.ts
@@ -1411,6 +1700,23 @@ function conflictPrompt(branch, conflicts) {
 	].join("\n");
 }
 /**
+* The one sync the bar fills in: pull while the branch is behind (a push would
+* be rejected), push while it is only ahead or has no upstream yet. Nothing
+* while a rebase is paused, detached, or already level.
+*/
+function suggestedSyncAction(changes) {
+	if (changes?.branch === void 0 || changes.rebase !== void 0) return void 0;
+	if (changes.upstream === void 0) return "push";
+	if (changes.upstream.behind > 0) return "pull";
+	return changes.upstream.ahead > 0 ? "push" : void 0;
+}
+/** "2 to push, 1 new on origin/feat/git", or "Up to date with origin/feat/git". */
+function upstreamSummary(upstream) {
+	if (upstream === void 0) return "No upstream yet";
+	const parts = [...upstream.ahead > 0 ? [`${String(upstream.ahead)} to push`] : [], ...upstream.behind > 0 ? [`${String(upstream.behind)} new on ${upstream.ref}`] : []];
+	return parts.length === 0 ? `Up to date with ${upstream.ref}` : parts.join(", ");
+}
+/**
 * Hands one deferred follow-up to the session. Returns the reason it failed,
 * or undefined once sent. The sender throws when the session is disconnected.
 */
@@ -1426,485 +1732,302 @@ function deliverToAgent(send, sessionId, message) {
 	}
 }
 //#endregion
-//#region src/extensions/workspaces/sessions/(frontend)/_lib/gitReviewTree.ts
-function buildTree(files) {
-	const root = {
-		path: "",
-		dirs: /* @__PURE__ */ new Map(),
-		files: []
-	};
-	for (const file of files) {
-		const parts = file.path.split("/");
-		parts.pop();
-		let dir = root;
-		for (const part of parts) {
-			let next = dir.dirs.get(part);
-			if (next === void 0) {
-				next = {
-					path: dir.path === "" ? part : `${dir.path}/${part}`,
-					dirs: /* @__PURE__ */ new Map(),
-					files: []
-				};
-				dir.dirs.set(part, next);
-			}
-			dir = next;
-		}
-		dir.files.push(file);
-	}
-	return root;
-}
-/** Folders first, then files, each alphabetical; single-child folder chains render as one row. */
-function flattenTree(files, isOpen) {
-	const rows = [];
-	const walk = (dir, depth) => {
-		for (const [segment, child] of [...dir.dirs].sort(([left], [right]) => left.localeCompare(right))) {
-			let name = segment;
-			let node = child;
-			while (node.files.length === 0 && node.dirs.size === 1) {
-				const [[nextName, next]] = [...node.dirs];
-				name = `${name}/${nextName}`;
-				node = next;
-			}
-			const open = isOpen(node.path);
-			rows.push({
-				kind: "dir",
-				path: node.path,
-				name,
-				depth,
-				open
-			});
-			if (open) walk(node, depth + 1);
-		}
-		for (const file of [...dir.files].sort((left, right) => left.path.localeCompare(right.path))) rows.push({
-			kind: "file",
-			file,
-			depth
-		});
-	};
-	walk(buildTree(files), 0);
-	return rows;
-}
-//#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/_components/GitReviewBrowser.tsx
-/**
-* The review tab's file list: every changed file as a folder tree (the VS Code
-* explorer shape), with its status, its line counts and its comments.
-*
-* DESIGN PATTERNS:
-* - Picking a row scrolls the diff pane to that file; the list never opens a
-*   tab of its own. One tab holds the whole review.
-* - Rows show only the file name, so a long path never truncates away the part
-*   that tells files apart. Folders say the rest; the full path is the tooltip.
-* - Folder chains with a single child collapse into one row (`src/web/lib`),
-*   like VS Code's compact folders, so deep trees stay shallow.
-* - Folders fold on click; a search shows every match with its folders open.
-* - Each row is a button, reachable with Tab; arrow keys move and pick in one
-*   step across the visible files, so the diff follows the cursor.
-*
-* AVOID:
-* - Colour classes outside the token set.
-*/
-const STATUS_MARK = {
-	added: {
-		letter: "A",
-		tone: "text-po-green",
-		label: "added"
-	},
-	modified: {
-		letter: "M",
-		tone: "text-po-yellow",
-		label: "modified"
-	},
-	deleted: {
-		letter: "D",
-		tone: "text-po-red",
-		label: "deleted"
-	},
-	untracked: {
-		letter: "U",
-		tone: "text-po-blue",
-		label: "untracked"
-	},
-	conflicted: {
-		letter: "C",
-		tone: "text-po-red",
-		label: "conflicted"
-	}
+const status = {
+	added: [
+		"A",
+		"text-po-green",
+		"Added"
+	],
+	modified: [
+		"M",
+		"text-po-yellow",
+		"Modified"
+	],
+	deleted: [
+		"D",
+		"text-po-red",
+		"Deleted"
+	],
+	untracked: [
+		"U",
+		"text-po-blue",
+		"Untracked"
+	],
+	conflicted: [
+		"C",
+		"text-po-red",
+		"Conflicted"
+	]
 };
-const baseName = (path) => path.slice(path.lastIndexOf("/") + 1);
-/** Left padding per depth level; tight so deep files keep room for their names. */
-const indent = (depth) => ({ paddingLeft: `${String(.75 + depth * .5)}rem` });
 function GitReviewBrowser({ files, activePath, commentCounts, onPick }) {
 	const [query, setQuery] = useState("");
-	const [collapsed, setCollapsed] = useState(/* @__PURE__ */ new Set());
-	const needle = query.trim().toLocaleLowerCase();
-	const shown = needle === "" ? files : files.filter((file) => file.path.toLocaleLowerCase().includes(needle));
-	const rows = flattenTree(shown, (dirPath) => needle !== "" || !collapsed.has(dirPath));
-	const ordered = rows.flatMap((row) => row.kind === "file" ? [row.file] : []);
+	const shown = files.filter((f) => f.path.toLowerCase().includes(query.trim().toLowerCase()));
 	const listRef = useRef(null);
 	useEffect(() => {
 		if (activePath === void 0) return;
-		(listRef.current?.querySelector(`[data-path="${CSS.escape(activePath)}"]`))?.scrollIntoView({ block: "nearest" });
+		listRef.current?.querySelector(`[data-path="${CSS.escape(activePath)}"]`)?.scrollIntoView({ block: "nearest" });
 	}, [activePath]);
-	const toggle = (dirPath) => {
-		setCollapsed((prev) => {
-			const next = new Set(prev);
-			if (!next.delete(dirPath)) next.add(dirPath);
-			return next;
-		});
-	};
-	const allDirs = () => new Set(flattenTree(files, () => true).flatMap((row) => row.kind === "dir" ? [row.path] : []));
 	/** Arrow keys pick the neighbouring row and move focus with it, so the diff follows the cursor. */
 	const onKeyDown = (event) => {
 		if (event.key !== "ArrowDown" && event.key !== "ArrowUp") return;
-		if (ordered.length === 0) return;
+		if (shown.length === 0) return;
 		event.preventDefault();
-		const current = ordered.findIndex((file) => file.path === activePath);
+		const current = shown.findIndex((file) => file.path === activePath);
 		const step = event.key === "ArrowDown" ? 1 : -1;
-		const next = current === -1 ? 0 : (current + step + ordered.length) % ordered.length;
-		const file = ordered[next];
+		const next = current === -1 ? 0 : (current + step + shown.length) % shown.length;
+		const file = shown[next];
 		if (file === void 0) return;
 		onPick(file.path);
 		event.currentTarget.closest("[data-git-review-list]")?.querySelectorAll("[data-git-review-row]")[next]?.focus();
 	};
 	return /* @__PURE__ */ jsxs("nav", {
+		"aria-label": "Changed files",
 		"data-testid": "git-review-browser",
-		"aria-label": "changed files",
-		className: "flex min-h-0 w-64 shrink-0 flex-col border-r border-po-border-soft",
+		className: "flex min-h-0 w-80 shrink-0 flex-col border-r border-po-border-soft",
 		children: [/* @__PURE__ */ jsxs("div", {
-			className: "flex shrink-0 flex-col gap-1 px-3 pt-2.5 pb-1.5",
+			className: "flex flex-col gap-3 border-b border-po-border-soft p-3",
 			children: [/* @__PURE__ */ jsx(Input, {
 				"data-testid": "git-review-search",
-				"aria-label": "search changed file paths",
 				size: "sm",
-				value: query,
-				placeholder: "search paths…",
-				onChange: (event) => setQuery(event.target.value)
-			}), /* @__PURE__ */ jsxs("div", {
-				className: "flex items-center justify-between gap-2",
-				children: [/* @__PURE__ */ jsx("span", {
-					className: "text-sm text-po-dim",
-					children: needle === "" ? `${String(files.length)} changed` : `${String(shown.length)} of ${String(files.length)} match`
-				}), needle === "" ? /* @__PURE__ */ jsx(Button, {
-					variant: "link",
-					size: "xs",
-					"data-testid": "git-review-fold-all",
-					className: "h-auto px-0",
-					onClick: () => setCollapsed(collapsed.size === 0 ? allDirs() : /* @__PURE__ */ new Set()),
-					children: collapsed.size === 0 ? "collapse all" : "expand all"
-				}) : null]
+				"aria-label": "Search paths",
+				placeholder: "Search paths",
+				value: query,
+				onChange: (e) => setQuery(e.target.value)
+			}), /* @__PURE__ */ jsxs("span", {
+				className: "text-sm text-po-dim",
+				children: [shown.length, " changed"]
 			})]
 		}), /* @__PURE__ */ jsxs("div", {
 			ref: listRef,
 			"data-git-review-list": true,
-			className: "min-h-0 flex-1 overflow-y-auto pb-2",
-			children: [rows.map((row) => {
-				if (row.kind === "dir") {
-					const Chevron = row.open ? ChevronDownIcon : ChevronRightIcon;
-					return /* @__PURE__ */ jsxs(Button, {
-						variant: "ghost",
-						size: "card",
-						"aria-expanded": row.open,
-						"data-testid": `git-review-browser-dir-${row.path}`,
-						title: row.path,
-						onClick: () => toggle(row.path),
-						style: indent(row.depth),
-						className: "min-w-0 flex-row items-center gap-1 rounded-none border-l-2 border-transparent py-1 pr-3 hover:bg-po-panel/60",
-						children: [/* @__PURE__ */ jsx(Chevron, {
-							"aria-hidden": true,
-							className: "h-3 w-3 shrink-0 text-po-faint"
-						}), /* @__PURE__ */ jsx("span", {
-							className: "min-w-0 flex-1 truncate text-base text-po-dim",
-							children: row.name
-						})]
-					}, `dir:${row.path}`);
-				}
-				const { file } = row;
-				const mark = STATUS_MARK[file.status];
-				const comments = commentCounts[file.path] ?? 0;
-				const active = file.path === activePath;
-				return /* @__PURE__ */ jsxs(Button, {
-					variant: "ghost",
-					size: "card",
+			className: "min-h-0 flex-1 overflow-y-auto",
+			children: [shown.map((f) => {
+				const slash = f.path.lastIndexOf("/");
+				const count = commentCounts[f.path] ?? 0;
+				return /* @__PURE__ */ jsxs("button", {
 					"data-git-review-row": true,
-					"data-path": file.path,
-					"aria-current": active ? "true" : void 0,
-					"data-testid": `git-review-browser-file-${file.path}`,
-					title: `${file.path} (${mark.label})`,
-					onClick: () => onPick(file.path),
+					"data-path": f.path,
+					"data-testid": `git-review-browser-file-${f.path}`,
 					onKeyDown,
-					style: indent(row.depth),
-					className: `min-w-0 flex-row items-center gap-1.5 rounded-none border-l-2 py-1 pr-3 ${active ? "border-po-blue bg-po-panel" : "border-transparent hover:bg-po-panel/60"}`,
+					title: f.path,
+					"aria-current": activePath === f.path ? "true" : void 0,
+					onClick: () => onPick(f.path),
+					className: `flex w-full min-w-0 items-start gap-2 border-l-2 px-3 py-3 text-left ${activePath === f.path ? "border-po-green bg-po-tint-green" : "border-transparent hover:bg-po-panel"}`,
 					children: [
 						/* @__PURE__ */ jsx("span", {
-							"aria-label": mark.label,
-							className: `w-3 shrink-0 text-center text-sm font-semibold ${mark.tone}`,
-							children: mark.letter
-						}),
-						/* @__PURE__ */ jsx("span", {
-							className: `min-w-0 flex-1 truncate text-base text-po-hi ${active ? "font-semibold" : ""} ${file.status === "deleted" ? "line-through opacity-70" : ""}`,
-							children: baseName(file.path)
+							className: `pt-0.5 text-sm font-semibold ${status[f.status][1]}`,
+							children: status[f.status][0]
 						}),
-						comments === 0 ? null : /* @__PURE__ */ jsxs("span", {
-							className: "flex shrink-0 items-center gap-0.5 text-sm text-po-blue",
-							title: `${String(comments)} comments`,
-							children: [/* @__PURE__ */ jsx(MessageIcon, {
-								"aria-hidden": true,
-								className: "h-2.5 w-2.5"
-							}), comments]
+						/* @__PURE__ */ jsxs("span", {
+							className: "min-w-0 flex-1",
+							children: [/* @__PURE__ */ jsx("span", {
+								className: "block truncate text-base text-po-text",
+								children: f.path.slice(slash + 1)
+							}), slash < 0 ? null : /* @__PURE__ */ jsx("span", {
+								className: "block truncate font-mono text-sm text-po-dim",
+								children: f.path.slice(0, slash)
+							})]
 						}),
-						file.binary ? /* @__PURE__ */ jsx("span", {
-							className: "shrink-0 text-sm text-po-dim",
-							children: "binary"
-						}) : /* @__PURE__ */ jsxs("span", {
-							className: "shrink-0 text-2xs",
-							children: [
+						/* @__PURE__ */ jsxs("span", {
+							className: "flex shrink-0 flex-col items-end gap-1 text-sm",
+							children: [/* @__PURE__ */ jsxs("span", { children: [
 								/* @__PURE__ */ jsxs("span", {
 									className: "text-po-green",
-									children: ["+", file.added]
+									children: ["+", f.added]
 								}),
 								" ",
 								/* @__PURE__ */ jsxs("span", {
 									className: "text-po-red",
-									children: ["-", file.removed]
+									children: ["-", f.removed]
 								})
-							]
+							] }), count > 0 && /* @__PURE__ */ jsxs("span", {
+								className: "flex items-center gap-1 text-po-blue",
+								children: [/* @__PURE__ */ jsx(MessageIcon, { className: "h-3 w-3" }), count]
+							})]
 						})
 					]
-				}, file.path);
-			}), ordered.length === 0 ? /* @__PURE__ */ jsx("p", {
-				className: "px-3 py-2 text-sm text-po-dim",
-				children: "no path matches"
-			}) : null]
+				}, f.path);
+			}), shown.length === 0 && /* @__PURE__ */ jsx("p", {
+				className: "p-3 text-sm text-po-dim",
+				children: "No paths match."
+			})]
 		})]
 	});
 }
 //#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/_components/GitSyncBar.tsx
-/**
-* The review tab's header: what is being reviewed, and the manual sync that
-* goes with it.
-*
-* DESIGN PATTERNS:
-* - Everything here is a report or a request. The hub runs the git, one
-*   command per session, and answers on the channel: pending while it runs,
-*   an error target when it fails, a paused rebase when it stops on conflicts.
-* - A push the remote rejects is not an error to shrug at: the strip asks
-*   before forcing, and the force it sends is a lease, which git refuses if
-*   the remote holds commits this branch never fetched and integrated.
-* - A paused rebase blocks the sync buttons. The two ways out are named on the
-*   banner, and abort says what it throws away.
-*
-* AVOID:
-* - Colour classes outside the token set.
-*/
-function GitSyncBar({ changes, mergeBase, pending, error, errorTarget, onSync, onForcePush, onAskAgent, onDismissError }) {
-	const busy = pending !== void 0;
-	const paused = changes?.rebase !== void 0;
-	const forceRequired = errorTarget?.action === "push" && "forceRequired" in errorTarget && errorTarget.forceRequired === true;
-	const syncError = error !== void 0 && !forceRequired ? error : void 0;
-	const upstream = changes?.upstream;
+function GitSyncBar({ secondary = false, ...props }) {
+	const c = props.changes;
+	const paused = c?.rebase !== void 0;
+	const busy = props.pending !== void 0;
+	const rejected = props.errorTarget?.action === "push" && props.errorTarget.forceRequired;
+	const suggested = suggestedSyncAction(c);
+	const upstream = upstreamSummary(c?.upstream);
 	return /* @__PURE__ */ jsxs("div", {
 		"data-testid": "git-sync-bar",
-		className: "flex shrink-0 flex-col gap-2 border-b border-po-border-soft px-3 py-2.5 sm:px-[26px]",
+		className: "flex flex-col gap-3 border-b border-po-border-soft p-4",
 		children: [
 			/* @__PURE__ */ jsxs("div", {
-				className: "flex min-w-0 flex-wrap items-center gap-x-3 gap-y-1.5",
+				className: "flex flex-wrap items-center gap-3 text-sm",
 				children: [
-					/* @__PURE__ */ jsxs("span", {
-						className: "flex min-w-0 items-center gap-1.5",
-						children: [
-							/* @__PURE__ */ jsx(BranchIcon, {
-								"aria-hidden": true,
-								className: "h-3.5 w-3.5 shrink-0 text-po-faint"
-							}),
-							/* @__PURE__ */ jsx("span", {
-								"data-testid": "git-review-branch",
-								className: "truncate text-base font-semibold text-po-hi",
-								children: changes?.branch ?? "detached HEAD"
-							}),
-							/* @__PURE__ */ jsx("span", {
-								className: "shrink-0 text-sm text-po-dim",
-								children: changes?.base === void 0 ? "uncommitted changes" : `vs ${changes.base}`
-							}),
-							mergeBase === void 0 ? null : /* @__PURE__ */ jsxs("span", {
-								className: "shrink-0 text-sm text-po-dim",
-								children: ["from ", mergeBase]
-							})
-						]
+					/* @__PURE__ */ jsx(BranchIcon, { className: "h-4 w-4 text-po-dim" }),
+					/* @__PURE__ */ jsx("span", {
+						"data-testid": "git-review-branch",
+						className: "font-mono text-base font-semibold text-po-hi",
+						children: c?.branch ?? "Detached HEAD"
+					}),
+					/* @__PURE__ */ jsx("span", {
+						className: "text-po-dim",
+						children: c?.base === void 0 ? "Uncommitted changes" : /* @__PURE__ */ jsxs(Fragment, { children: ["vs ", /* @__PURE__ */ jsx("span", {
+							className: "font-mono",
+							children: c.base
+						})] })
+					}),
+					props.mergeBase && /* @__PURE__ */ jsxs("span", {
+						className: "text-po-dim",
+						children: ["from ", /* @__PURE__ */ jsx("span", {
+							className: "font-mono",
+							children: props.mergeBase
+						})]
 					}),
-					changes === void 0 ? null : /* @__PURE__ */ jsxs("span", {
+					c === void 0 ? null : /* @__PURE__ */ jsxs("span", {
 						"data-testid": "git-review-totals",
-						className: "flex shrink-0 items-center gap-1.5 text-sm",
+						className: "contents",
 						children: [
 							/* @__PURE__ */ jsxs("span", {
-								className: "font-semibold text-po-green",
-								children: ["+", changes.added]
+								className: "text-po-green",
+								children: ["+", c?.added]
 							}),
 							/* @__PURE__ */ jsxs("span", {
-								className: "font-semibold text-po-red",
-								children: ["-", changes.removed]
+								className: "text-po-red",
+								children: ["-", c?.removed]
 							}),
 							/* @__PURE__ */ jsxs("span", {
 								className: "text-po-dim",
 								children: [
-									changes.files,
-									changes.truncated ? "+" : "",
+									c?.files,
+									c?.truncated ? "+" : "",
 									" ",
-									changes.files === 1 ? "file" : "files"
+									c?.files === 1 ? "file" : "files"
 								]
 							})
 						]
 					}),
-					/* @__PURE__ */ jsx("span", { className: "min-w-0 flex-1" }),
-					upstream === void 0 ? /* @__PURE__ */ jsx("span", {
-						className: "shrink-0 text-sm text-po-dim",
-						children: "no upstream yet"
-					}) : /* @__PURE__ */ jsxs("span", {
-						className: "shrink-0 text-sm text-po-dim",
-						title: upstream.ref,
-						children: [
-							"↑",
-							upstream.ahead,
-							" ↓",
-							upstream.behind,
-							" ",
-							upstream.ref
-						]
+					/* @__PURE__ */ jsx("span", { className: "flex-1" }),
+					/* @__PURE__ */ jsx("span", {
+						className: "text-po-dim",
+						children: c?.branch === void 0 ? "No branch checked out" : c.upstream === void 0 || !upstream.endsWith(c.upstream.ref) ? upstream : /* @__PURE__ */ jsxs(Fragment, { children: [upstream.slice(0, -c.upstream.ref.length), /* @__PURE__ */ jsx("span", {
+							className: "font-mono",
+							children: c.upstream.ref
+						})] })
 					}),
-					/* @__PURE__ */ jsxs("span", {
-						className: "flex shrink-0 items-center gap-1.5",
+					/* @__PURE__ */ jsx("div", {
+						className: "flex gap-1.5",
 						children: [
-							/* @__PURE__ */ jsx(Button, {
-								size: "xs",
-								"data-testid": "git-sync-pull",
-								disabled: busy || paused || upstream === void 0,
-								title: upstream === void 0 ? "push once to set an upstream" : `fetch, then rebase onto ${upstream.ref}`,
-								onClick: () => onSync("pull"),
-								children: "pull"
-							}),
-							/* @__PURE__ */ jsx(Button, {
-								size: "xs",
-								"data-testid": "git-sync-push",
-								disabled: busy || paused || changes?.branch === void 0,
-								title: upstream === void 0 ? "push and set the upstream" : `push to ${upstream.ref}`,
-								onClick: () => onSync("push"),
-								children: "push"
-							}),
-							/* @__PURE__ */ jsx(Button, {
-								size: "xs",
-								"data-testid": "git-sync-rebase",
-								disabled: busy || paused || changes?.base === void 0,
-								title: changes?.base === void 0 ? "no base branch to rebase onto" : `fetch, then rebase onto ${changes.base}`,
-								onClick: () => onSync("rebase"),
-								children: "rebase"
-							})
-						]
+							"pull",
+							"push",
+							"rebase"
+						].map((action) => /* @__PURE__ */ jsx(Button, {
+							"data-testid": `git-sync-${action}`,
+							size: "sm",
+							variant: !busy && !paused && !rejected && !props.error && c?.branch !== void 0 && suggested === action ? secondary ? "outline" : "primary" : "ghost",
+							disabled: busy || paused || action !== "rebase" && c?.branch === void 0 || action === "pull" && c?.upstream === void 0 || action === "rebase" && c?.base === void 0,
+							onClick: () => props.onSync(action),
+							children: action === "pull" ? "Pull" : action === "push" ? "Push" : "Rebase"
+						}, action))
 					})
 				]
 			}),
-			pending === void 0 ? null : /* @__PURE__ */ jsxs("span", {
+			busy && /* @__PURE__ */ jsxs("div", {
 				"data-testid": "git-sync-pending",
-				className: "flex min-w-0 items-center gap-1.5",
+				className: "flex items-center gap-2 text-sm text-po-dim",
 				children: [/* @__PURE__ */ jsx(Spinner, {
-					className: "h-3 w-3 shrink-0 text-po-faint",
-					label: pending
-				}), /* @__PURE__ */ jsx("span", {
-					className: "min-w-0 truncate text-sm text-po-dim",
-					children: pending
-				})]
-			}),
-			syncError === void 0 ? null : /* @__PURE__ */ jsxs("div", {
-				role: "alert",
-				"data-testid": "git-sync-error",
-				className: "flex min-w-0 items-start gap-1.5 text-sm text-po-red",
-				children: [
-					/* @__PURE__ */ jsx(AlertIcon, {
-						"aria-hidden": true,
-						className: "mt-px h-3 w-3 shrink-0"
-					}),
-					/* @__PURE__ */ jsx("span", {
-						className: "min-w-0 flex-1",
-						children: syncError
-					}),
-					/* @__PURE__ */ jsx(Button, {
-						variant: "ghost",
-						size: "xs",
-						className: "h-auto min-h-0 px-1 py-0 ",
-						onClick: onDismissError,
-						children: "dismiss"
-					})
-				]
+					className: "h-4 w-4 text-po-dim",
+					label: props.pending
+				}), props.pending]
 			}),
-			forceRequired ? /* @__PURE__ */ jsxs("div", {
+			rejected ? /* @__PURE__ */ jsxs("div", {
 				"data-testid": "git-push-force-confirm",
-				className: "flex min-w-0 flex-wrap items-center gap-2 rounded-md border border-po-edge-yellow bg-po-tint-yellow px-2.5 py-2",
+				className: "flex flex-wrap items-center gap-3 rounded-md border border-po-edge-yellow bg-po-tint-yellow p-3",
 				children: [
 					/* @__PURE__ */ jsx("span", {
-						className: "min-w-0 flex-1 text-base text-po-hi",
-						children: "The remote branch has commits yours replaced, usually after a rebase. Force push with lease? It is refused if the remote holds commits you never fetched and integrated."
+						className: "flex-1 text-base text-po-text",
+						children: "origin has commits you have not pulled yet."
 					}),
 					/* @__PURE__ */ jsx(Button, {
+						size: "sm",
 						variant: "danger-outline",
-						size: "xs",
 						"data-testid": "git-push-force",
 						disabled: busy,
-						onClick: onForcePush,
-						children: "force push"
+						onClick: props.onForcePush,
+						children: "Force push with lease"
 					}),
 					/* @__PURE__ */ jsx(Button, {
+						size: "sm",
 						variant: "ghost",
-						size: "xs",
 						"data-testid": "git-push-force-cancel",
-						onClick: onDismissError,
-						children: "cancel"
+						onClick: props.onDismissError,
+						children: "Not now"
 					})
 				]
-			}) : null,
-			changes?.rebase === void 0 ? null : /* @__PURE__ */ jsxs("div", {
+			}) : props.error && /* @__PURE__ */ jsxs("div", {
+				role: "alert",
+				"data-testid": "git-sync-error",
+				className: "flex items-center gap-3 rounded-md border border-po-edge-red bg-po-tint-red p-3 text-base text-po-red",
+				children: [/* @__PURE__ */ jsx("span", {
+					className: "flex-1",
+					children: props.error
+				}), /* @__PURE__ */ jsx(Button, {
+					size: "sm",
+					variant: "ghost",
+					onClick: props.onDismissError,
+					children: "Dismiss"
+				})]
+			}),
+			paused && /* @__PURE__ */ jsxs("div", {
 				"data-testid": "git-rebase-banner",
-				className: "flex min-w-0 flex-col gap-1.5 rounded-md border border-po-edge-red bg-po-tint-red px-2.5 py-2",
+				className: "flex flex-col gap-2 rounded-md border border-po-edge-yellow bg-po-tint-yellow p-3",
 				children: [
-					/* @__PURE__ */ jsxs("span", {
-						className: "flex min-w-0 items-center gap-1.5",
-						children: [/* @__PURE__ */ jsx(StatusBadge, {
-							tone: "error",
-							size: "xs",
-							children: "rebase paused"
-						}), /* @__PURE__ */ jsx("span", {
-							className: "text-base text-po-hi",
-							children: changes.rebase.conflicts.length === 0 ? "git stopped the rebase" : `conflicts in ${String(changes.rebase.conflicts.length)} ${changes.rebase.conflicts.length === 1 ? "file" : "files"}`
-						})]
-					}),
-					changes.rebase.conflicts.length === 0 ? null : /* @__PURE__ */ jsx("ul", {
-						className: "flex flex-col gap-0.5 pl-1",
-						children: changes.rebase.conflicts.map((file) => /* @__PURE__ */ jsx("li", {
-							className: "truncate font-mono text-sm text-po-dim",
-							children: file
-						}, file))
-					}),
-					/* @__PURE__ */ jsxs("span", {
-						className: "flex flex-wrap items-center gap-1.5",
+					/* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsx(StatusBadge, {
+						tone: "running",
+						size: "xs",
+						children: "Rebase paused"
+					}), /* @__PURE__ */ jsxs("span", {
+						className: "ml-2 text-base text-po-text",
+						children: [
+							"Conflicts in ",
+							c.rebase?.conflicts.length,
+							" ",
+							c.rebase?.conflicts.length === 1 ? "file" : "files"
+						]
+					})] }),
+					c.rebase?.conflicts.map((path) => /* @__PURE__ */ jsx("p", {
+						className: "font-mono text-sm text-po-dim",
+						children: path
+					}, path)),
+					/* @__PURE__ */ jsxs("div", {
+						className: "flex items-center gap-2",
 						children: [
 							/* @__PURE__ */ jsx(Button, {
-								variant: "primary",
-								size: "xs",
+								variant: secondary ? "outline" : "primary",
+								size: "sm",
 								"data-testid": "git-rebase-ask-agent",
 								disabled: busy,
-								onClick: onAskAgent,
-								children: "ask agent to resolve"
+								onClick: props.onAskAgent,
+								children: "Ask Po to resolve"
 							}),
 							/* @__PURE__ */ jsx(Button, {
 								variant: "danger-outline",
-								size: "xs",
+								size: "sm",
 								"data-testid": "git-rebase-abort",
 								disabled: busy,
-								onClick: () => onSync("abort-rebase"),
-								children: "abort rebase"
+								onClick: () => props.onSync("abort-rebase"),
+								children: "Abort rebase"
 							}),
 							/* @__PURE__ */ jsx("span", {
 								className: "text-sm text-po-dim",
-								children: "abort discards any conflict resolution in progress"
+								children: "Abort discards conflict resolution in progress."
 							})
 						]
 					})
@@ -1915,29 +2038,7 @@ function GitSyncBar({ changes, mergeBase, pending, error, errorTarget, onSync, o
 }
 //#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/_components/GitReviewView.tsx
-/**
-* The review tab, drawn from what it is handed: the sync header, the changed
-* files on the left, every diff stacked on the right, and one footer that
-* sends every comment as a single message.
-*
-* DESIGN PATTERNS:
-* - Like a pull request's file view. Picking a file in the list scrolls to it;
-*   each file's header stays pinned while its diff scrolls past.
-* - Only nearby file bodies mount and load; distant files retain their headers
-*   and measured-height placeholders.
-* - A comment is drawn under the line it is about, on the side it is about.
-*   The open draft sits in the same place, so writing happens in context.
-* - Only UI state lives here (the open draft, which files are collapsed, which
-*   is active). Data and comments come in as props; the panel owns fetching.
-*
-* AVOID:
-* - Clearing comments here. The owner clears them once the host took the send.
-*/
-const PICK_ALIGNMENT_MS = 300;
-const ESTIMATED_ROW_HEIGHT = 21;
-const MAX_DIFF_ROWS = 5e3;
 const NO_FILES = [];
-const NO_PATHS = /* @__PURE__ */ new Set();
 /** Stable, URL-safe element id for one file's section. */
 function sectionId(index) {
 	return `git-review-file-${String(index)}`;
@@ -1945,122 +2046,30 @@ function sectionId(index) {
 function sideOf(row) {
 	return row.marker === "-" ? "old" : "new";
 }
-function GitReviewView({ sync, summary, files, comments, onLoadFile, onAddComment, onRemoveComment, onSendReview, onDiscard, onDraftChange, sendError, initialDraft }) {
+function GitReviewView({ sync, summary, files, comments, onLoadFile, onAddComment, onRemoveComment, onSendReview, onDiscard, onDraftChange, sendError, initialDraft, initialPath }) {
 	const entries = summary.state === "ready" ? summary.summary.files : NO_FILES;
-	const [openOverride, setOpenOverride] = useState({});
-	const [picked, setPicked] = useState();
-	const [navigation, setNavigation] = useState();
-	const [proximity, setProximity] = useState({
-		entries: NO_FILES,
-		paths: NO_PATHS
-	});
-	const near = proximity.entries === entries ? proximity.paths : NO_PATHS;
-	const paneRef = useRef(null);
-	const [heights, setHeights] = useState(/* @__PURE__ */ new Map());
-	const pickedAt = useRef(0);
+	const [picked, setPicked] = useState(initialPath ?? initialDraft?.path);
 	const activePath = entries.some((entry) => entry.path === picked) ? picked : entries[0]?.path;
+	const index = entries.findIndex((entry) => entry.path === activePath);
+	const file = entries[index];
 	const [draft, setDraft] = useState(initialDraft);
 	useEffect(() => {
-		const pane = paneRef.current;
-		if (pane === null || typeof IntersectionObserver === "undefined") return;
-		setHeights(/* @__PURE__ */ new Map());
-		let observer;
-		const observe = () => {
-			observer?.disconnect();
-			observer = new IntersectionObserver((changes) => {
-				for (const change of changes) {
-					if (change.isIntersecting) continue;
-					const section = change.target;
-					const path = section.dataset.reviewPath;
-					const body = section.querySelector("[data-review-body=\"measured\"]");
-					if (path !== void 0 && body !== null) {
-						const height = body.offsetHeight;
-						setHeights((measured) => new Map(measured).set(path, height));
-					}
-				}
-				setProximity((current) => {
-					const next = new Set(current.entries === entries ? current.paths : NO_PATHS);
-					for (const change of changes) {
-						const path = change.target.dataset.reviewPath;
-						if (path === void 0) continue;
-						if (change.isIntersecting) next.add(path);
-						else next.delete(path);
-					}
-					return {
-						entries,
-						paths: next
-					};
-				});
-			}, {
-				root: pane,
-				rootMargin: `${String(pane.clientHeight)}px 0px`
-			});
-			for (const section of pane.querySelectorAll("[data-review-path]")) observer.observe(section);
-		};
-		observe();
-		const resize = typeof ResizeObserver === "undefined" ? void 0 : new ResizeObserver(observe);
-		resize?.observe(pane);
-		let frame = 0;
-		const scroll = () => {
-			cancelAnimationFrame(frame);
-			frame = requestAnimationFrame(() => {
-				if (Date.now() - pickedAt.current < PICK_ALIGNMENT_MS) return;
-				const rect = pane.getBoundingClientRect();
-				const section = document.elementFromPoint(rect.left + 8, rect.top + 1)?.closest("[data-review-path]");
-				if (section !== null && section !== void 0 && pane.contains(section)) setPicked(section.dataset.reviewPath);
-			});
-		};
-		pane.addEventListener("scroll", scroll, { passive: true });
-		return () => {
-			observer.disconnect();
-			resize?.disconnect();
-			pane.removeEventListener("scroll", scroll);
-			cancelAnimationFrame(frame);
-		};
-	}, [entries]);
-	useLayoutEffect(() => {
-		if (navigation === void 0) return;
-		[...paneRef.current?.querySelectorAll("[data-review-path]") ?? []].find((element) => element.dataset.reviewPath === navigation)?.scrollIntoView({ block: "start" });
-	}, [navigation, openOverride]);
-	useEffect(() => {
-		if (navigation === void 0) return;
-		const timeout = setTimeout(() => setNavigation(void 0), PICK_ALIGNMENT_MS);
-		return () => clearTimeout(timeout);
-	}, [navigation]);
-	useEffect(() => {
-		for (const file of entries) if ((openOverride[file.path] ?? true) && (near.has(file.path) || navigation === file.path || draft?.path === file.path || comments.some((comment) => comment.path === file.path)) && files[file.path] === void 0) onLoadFile(file.path);
+		if (activePath !== void 0 && files[activePath] === void 0) onLoadFile(activePath);
 	}, [
-		entries,
+		activePath,
 		files,
-		near,
-		navigation,
-		draft,
-		comments,
-		openOverride,
 		onLoadFile
 	]);
 	const commentCounts = {};
 	for (const comment of comments) commentCounts[comment.path] = (commentCounts[comment.path] ?? 0) + 1;
-	const isOpen = (path) => openOverride[path] ?? true;
-	const open = (path) => {
-		setOpenOverride((current) => current[path] === true ? current : {
-			...current,
-			[path]: true
-		});
-	};
 	const pick = (path) => {
 		if (!entries.some((entry) => entry.path === path)) return;
-		pickedAt.current = Date.now();
+		if (path !== activePath && draft !== void 0) {
+			if (!window.confirm("Discard the unsent comment and open another file?")) return;
+			setDraft(void 0);
+			onDraftChange?.(false);
+		}
 		setPicked(path);
-		setNavigation(path);
-		open(path);
-	};
-	const toggle = (path) => {
-		if (isOpen(path)) setOpenOverride((current) => ({
-			...current,
-			[path]: false
-		}));
-		else open(path);
 	};
 	const submitDraft = (body) => {
 		if (draft === void 0) return;
@@ -2082,87 +2091,116 @@ function GitReviewView({ sync, summary, files, comments, onLoadFile, onAddCommen
 		children: [
 			/* @__PURE__ */ jsx(GitSyncBar, {
 				...sync,
+				secondary: comments.length > 0,
 				...summary.state === "ready" && summary.summary.mergeBase !== void 0 ? { mergeBase: summary.summary.mergeBase } : {}
 			}),
 			summary.state === "loading" ? /* @__PURE__ */ jsxs("div", {
 				"data-testid": "git-review-loading",
-				className: "flex flex-1 items-start gap-2 px-4 py-6",
+				className: "flex min-h-48 flex-1 items-center justify-center gap-2 text-sm text-po-dim",
 				children: [/* @__PURE__ */ jsx(Spinner, {
-					className: "h-3 w-3 text-po-faint",
-					label: "reading changes"
+					className: "h-4 w-4 text-po-dim",
+					label: "Reading changes"
 				}), /* @__PURE__ */ jsx("span", {
 					className: "text-sm text-po-dim",
-					children: "reading changes…"
+					children: "Reading changes..."
 				})]
-			}) : summary.state === "error" ? /* @__PURE__ */ jsx("p", {
-				role: "alert",
+			}) : summary.state === "error" ? /* @__PURE__ */ jsx(EmptyState, {
 				"data-testid": "git-review-error",
-				className: "flex-1 px-4 py-6 text-sm text-po-red",
-				children: summary.error
+				className: "min-h-48 text-po-red",
+				title: /* @__PURE__ */ jsx("span", {
+					className: "text-po-red",
+					children: "Changes could not be read"
+				}),
+				description: summary.error
 			}) : !summary.summary.repository ? /* @__PURE__ */ jsx(EmptyState, {
 				"data-testid": "git-review-no-repository",
-				className: "px-4 py-8",
-				title: "not a git checkout",
-				description: "this session's folder is not inside a git repository, so there is nothing to review."
+				className: "min-h-48",
+				title: "Not a Git checkout",
+				description: "This session's folder is not inside a Git repository."
 			}) : entries.length === 0 ? /* @__PURE__ */ jsx(EmptyState, {
 				"data-testid": "git-review-empty",
-				className: "px-4 py-8",
-				title: "no changes",
-				description: summary.summary.base === void 0 ? "nothing uncommitted in this checkout." : `nothing differs from ${summary.summary.base}, committed or not.`
+				className: "min-h-48",
+				title: "No changes yet",
+				description: summary.summary.base === void 0 ? "Nothing uncommitted in this checkout." : `Nothing differs from ${summary.summary.base}, committed or not.`
 			}) : /* @__PURE__ */ jsxs("div", {
+				"data-testid": "git-review-content",
 				className: "flex min-h-0 flex-1",
 				children: [/* @__PURE__ */ jsx(GitReviewBrowser, {
 					files: entries,
 					commentCounts,
 					onPick: pick,
 					...activePath === void 0 ? {} : { activePath }
-				}), /* @__PURE__ */ jsxs("div", {
-					ref: paneRef,
+				}), /* @__PURE__ */ jsxs("main", {
 					"data-testid": "git-review-diffs",
 					className: "min-h-0 min-w-0 flex-1 overflow-y-auto",
-					children: [summary.summary.truncated ? /* @__PURE__ */ jsx("p", {
-						className: "px-4 pt-2 text-sm text-po-dim",
-						children: "more files changed than the review lists; the rest are left out."
-					}) : null, entries.map((file, index) => /* @__PURE__ */ jsx(FileSection, {
-						id: sectionId(index),
-						entry: file,
-						state: files[file.path],
-						collapsed: !isOpen(file.path),
-						mounted: near.has(file.path) || navigation === file.path || draft?.path === file.path || comments.some((comment) => comment.path === file.path),
-						placeholderHeight: heights.get(file.path) ?? (file.binary ? 40 : Math.min(MAX_DIFF_ROWS, file.added + file.removed + 6) * ESTIMATED_ROW_HEIGHT),
-						comments: comments.filter((comment) => comment.path === file.path),
-						draft: draft?.path === file.path ? draft.selection : void 0,
-						onToggle: () => toggle(file.path),
-						onSelect: (selection) => {
-							setPicked(file.path);
-							setDraft({
-								path: file.path,
-								selection
-							});
-							onDraftChange?.(true);
-						},
-						onSubmitDraft: submitDraft,
-						onCancelDraft: () => {
-							setDraft(void 0);
-							onDraftChange?.(false);
-						},
-						onRemoveComment,
-						onRetry: () => onLoadFile(file.path)
-					}, file.path))]
+					children: [
+						summary.summary.truncated ? /* @__PURE__ */ jsx("p", {
+							className: "px-4 pt-2 text-sm text-po-dim",
+							children: "More files changed than the review lists; the rest are left out."
+						}) : null,
+						/* @__PURE__ */ jsxs("div", {
+							className: "flex items-center justify-between border-b border-po-border-soft px-4 py-2",
+							children: [
+								/* @__PURE__ */ jsx(Button, {
+									variant: "ghost",
+									size: "sm",
+									disabled: index <= 0,
+									onClick: () => pick(entries[index - 1].path),
+									children: "Previous file"
+								}),
+								/* @__PURE__ */ jsxs("span", {
+									className: "text-sm text-po-dim",
+									children: [
+										index + 1,
+										" of ",
+										entries.length
+									]
+								}),
+								/* @__PURE__ */ jsx(Button, {
+									variant: "ghost",
+									size: "sm",
+									disabled: index >= entries.length - 1,
+									onClick: () => pick(entries[index + 1].path),
+									children: "Next file"
+								})
+							]
+						}),
+						file === void 0 ? null : /* @__PURE__ */ jsx(FileSection, {
+							id: sectionId(index),
+							entry: file,
+							state: files[file.path],
+							comments: comments.filter((comment) => comment.path === file.path),
+							draft: draft?.path === file.path ? draft.selection : void 0,
+							onSelect: (selection) => {
+								setDraft({
+									path: file.path,
+									selection
+								});
+								onDraftChange?.(true);
+							},
+							onSubmitDraft: submitDraft,
+							onCancelDraft: () => {
+								setDraft(void 0);
+								onDraftChange?.(false);
+							},
+							onRemoveComment,
+							onRetry: () => onLoadFile(file.path)
+						}, file.path)
+					]
 				})]
 			}),
 			/* @__PURE__ */ jsxs("div", {
 				"data-testid": "git-review-footer",
-				className: "flex shrink-0 flex-wrap items-center gap-2 border-t border-po-border-soft bg-po-panel px-3 py-2 sm:px-[26px]",
+				className: "flex shrink-0 flex-wrap items-center gap-3 border-t border-po-border-soft bg-po-panel px-4 py-3",
 				children: [
 					/* @__PURE__ */ jsx(MessageIcon, {
 						"aria-hidden": true,
-						className: "h-3 w-3 text-po-faint"
+						className: "h-4 w-4 text-po-blue"
 					}),
 					/* @__PURE__ */ jsx("span", {
 						"data-testid": "git-review-comment-count",
 						className: "text-sm text-po-dim",
-						children: comments.length === 0 ? "no comments yet: select lines or click a line number" : `${String(comments.length)} ${comments.length === 1 ? "comment" : "comments"}`
+						children: comments.length === 0 ? "No comments yet: select lines or click a line number" : `${String(comments.length)} ${comments.length === 1 ? "comment" : "comments"} queued`
 					}),
 					/* @__PURE__ */ jsx("span", { className: "min-w-0 flex-1" }),
 					sendError === void 0 ? null : /* @__PURE__ */ jsx("span", {
@@ -2173,11 +2211,11 @@ function GitReviewView({ sync, summary, files, comments, onLoadFile, onAddCommen
 					}),
 					/* @__PURE__ */ jsx(Button, {
 						variant: "ghost",
-						size: "xs",
+						size: "sm",
 						"data-testid": "git-review-discard",
 						disabled: comments.length === 0,
 						onClick: onDiscard,
-						children: "discard"
+						children: "Discard"
 					}),
 					/* @__PURE__ */ jsx(Button, {
 						variant: "primary",
@@ -2185,7 +2223,7 @@ function GitReviewView({ sync, summary, files, comments, onLoadFile, onAddCommen
 						"data-testid": "git-review-send",
 						disabled: comments.length === 0,
 						onClick: onSendReview,
-						children: "send review"
+						children: "Send review"
 					})
 				]
 			})
@@ -2193,34 +2231,34 @@ function GitReviewView({ sync, summary, files, comments, onLoadFile, onAddCommen
 	});
 }
 const STATUS_WORD = {
-	added: "added",
-	modified: "modified",
-	deleted: "deleted",
-	untracked: "new, untracked",
-	conflicted: "conflicted"
+	added: "Added",
+	modified: "Modified",
+	deleted: "Deleted",
+	untracked: "Untracked",
+	conflicted: "Conflicted"
 };
 /** One file: a pinned header, then its diff with comments drawn under the lines they are about. */
-function FileSection({ id, entry, state, collapsed, mounted, placeholderHeight, comments, draft, onToggle, onSelect, onSubmitDraft, onCancelDraft, onRemoveComment, onRetry }) {
+function FileSection({ id, entry, state, comments, draft, onSelect, onSubmitDraft, onCancelDraft, onRemoveComment, onRetry }) {
 	const renderAfterRow = (row) => {
 		const side = sideOf(row);
 		const here = comments.filter((comment) => (comment.side ?? "new") === side && (comment.endLine ?? comment.startLine) === row.line);
 		const drafting = draft !== void 0 && draft.side === side && draft.endLine === row.line;
 		if (here.length === 0 && !drafting) return null;
 		return /* @__PURE__ */ jsxs("div", {
-			className: "flex flex-col gap-1.5 border-y border-po-border-soft bg-po-bg px-2 py-1.5 font-sans whitespace-normal",
+			className: "font-sans whitespace-normal",
 			children: [here.map((comment) => /* @__PURE__ */ jsxs("div", {
 				"data-testid": `git-review-comment-${comment.id}`,
-				className: "flex min-w-0 items-start gap-2 rounded-md border border-po-border-soft bg-po-panel px-2 py-1.5",
+				className: "m-3 flex items-start gap-3 rounded-md border border-po-border-soft bg-po-panel p-3 font-sans whitespace-normal",
 				children: [
 					/* @__PURE__ */ jsx(MessageIcon, {
 						"aria-hidden": true,
-						className: "mt-0.5 h-3 w-3 shrink-0 text-po-blue"
+						className: "mt-1 h-4 w-4 shrink-0 text-po-blue"
 					}),
 					/* @__PURE__ */ jsxs("span", {
-						className: "flex min-w-0 flex-1 flex-col gap-0.5",
-						children: [/* @__PURE__ */ jsx("span", {
-							className: "font-mono text-sm text-po-dim",
-							children: reviewCommentAnchor(comment)
+						className: "flex min-w-0 flex-1 flex-col",
+						children: [/* @__PURE__ */ jsxs("span", {
+							className: "mb-1 text-sm text-po-dim",
+							children: ["You · line ", comment.endLine ?? comment.startLine]
 						}), /* @__PURE__ */ jsx("span", {
 							className: "text-base whitespace-pre-wrap text-po-text",
 							children: comment.body
@@ -2228,15 +2266,15 @@ function FileSection({ id, entry, state, collapsed, mounted, placeholderHeight,
 					}),
 					/* @__PURE__ */ jsx(Button, {
 						variant: "ghost",
-						size: "icon",
-						"aria-label": "remove comment",
-						title: "remove comment",
+						size: "sm",
+						"aria-label": "Remove comment",
+						title: "Remove comment",
 						onClick: () => onRemoveComment(comment.id),
-						children: /* @__PURE__ */ jsx(CloseIcon, { className: "h-3 w-3" })
+						children: "Remove"
 					})
 				]
 			}, comment.id)), drafting ? /* @__PURE__ */ jsx("div", {
-				className: "rounded-md border border-po-border bg-po-panel",
+				className: "m-3 rounded-md border border-po-border-soft bg-po-panel font-sans whitespace-normal [&_pre]:text-sm [&_p]:first-letter:uppercase",
 				children: /* @__PURE__ */ jsx(ReviewCommentDraft, {
 					snippet: draft.snippet,
 					startLine: draft.startLine,
@@ -2253,90 +2291,73 @@ function FileSection({ id, entry, state, collapsed, mounted, placeholderHeight,
 		id,
 		"data-review-path": entry.path,
 		"data-testid": `git-review-file-${entry.path}`,
-		className: "border-b border-po-border-soft",
-		children: [/* @__PURE__ */ jsxs(Button, {
-			variant: "ghost",
-			size: "card",
-			"aria-expanded": !collapsed,
-			onClick: onToggle,
-			className: "sticky top-0 z-10 flex-row items-center gap-1.5 rounded-none border-b border-po-border-soft bg-po-rail px-3 py-1.5 hover:bg-po-panel sm:px-4",
+		children: [/* @__PURE__ */ jsxs("div", {
+			className: "flex flex-wrap items-center gap-3 border-b border-po-border-soft bg-po-panel px-4 py-3",
 			children: [
-				collapsed ? /* @__PURE__ */ jsx(ChevronRightIcon, {
-					"aria-hidden": true,
-					className: "h-3 w-3 shrink-0 text-po-faint"
-				}) : /* @__PURE__ */ jsx(ChevronDownIcon, {
-					"aria-hidden": true,
-					className: "h-3 w-3 shrink-0 text-po-faint"
-				}),
 				/* @__PURE__ */ jsx("span", {
-					className: "min-w-0 flex-1 truncate font-mono text-base font-semibold text-po-hi",
+					className: "min-w-0 flex-1 truncate font-mono text-base text-po-hi",
 					children: entry.path
 				}),
 				/* @__PURE__ */ jsx("span", {
-					className: "shrink-0 text-sm font-semibold text-po-dim",
+					className: "shrink-0 text-sm text-po-dim",
 					children: STATUS_WORD[entry.status]
 				}),
+				entry.binary ? null : /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsxs("span", {
+					className: "text-sm text-po-green",
+					children: ["+", entry.added]
+				}), /* @__PURE__ */ jsxs("span", {
+					className: "text-sm text-po-red",
+					children: ["-", entry.removed]
+				})] }),
 				comments.length === 0 ? null : /* @__PURE__ */ jsxs("span", {
-					className: "flex shrink-0 items-center gap-0.5 text-sm text-po-blue",
-					children: [/* @__PURE__ */ jsx(MessageIcon, {
-						"aria-hidden": true,
-						className: "h-2.5 w-2.5"
-					}), comments.length]
-				}),
-				entry.binary ? null : /* @__PURE__ */ jsxs("span", {
-					className: "shrink-0 text-2xs",
+					className: "flex shrink-0 items-center gap-1 text-sm text-po-blue",
 					children: [
-						/* @__PURE__ */ jsxs("span", {
-							className: "text-po-green",
-							children: ["+", entry.added]
+						/* @__PURE__ */ jsx(MessageIcon, {
+							"aria-hidden": true,
+							className: "h-3 w-3"
 						}),
+						comments.length,
 						" ",
-						/* @__PURE__ */ jsxs("span", {
-							className: "text-po-red",
-							children: ["-", entry.removed]
-						})
+						comments.length === 1 ? "comment" : "comments"
 					]
 				})
 			]
-		}), collapsed ? null : !mounted ? /* @__PURE__ */ jsx("div", {
-			"aria-hidden": true,
-			style: { height: placeholderHeight }
-		}) : /* @__PURE__ */ jsx("div", {
+		}), /* @__PURE__ */ jsx("div", {
 			"data-review-body": state === void 0 || state.state === "loading" ? "loading" : "measured",
-			style: state === void 0 || state.state === "loading" ? { minHeight: placeholderHeight } : void 0,
 			children: state === void 0 || state.state === "loading" ? /* @__PURE__ */ jsxs("div", {
 				className: "flex items-center gap-2 px-4 py-3",
 				children: [/* @__PURE__ */ jsx(Spinner, {
 					className: "h-3 w-3 text-po-faint",
-					label: `loading ${entry.path}`
+					label: `Loading ${entry.path}`
 				}), /* @__PURE__ */ jsx("span", {
 					className: "text-sm text-po-dim",
-					children: "loading diff…"
+					children: "Loading diff..."
 				})]
 			}) : state.state === "error" ? /* @__PURE__ */ jsxs("div", {
-				className: "flex items-center gap-2 px-4 py-3",
+				className: "flex min-h-48 flex-col items-center justify-center gap-3",
 				children: [/* @__PURE__ */ jsx("span", {
 					role: "alert",
-					className: "text-sm text-po-red",
+					className: "text-base text-po-red",
 					children: state.error
 				}), /* @__PURE__ */ jsx(Button, {
-					variant: "ghost",
-					size: "xs",
+					variant: "outline",
+					size: "sm",
 					onClick: onRetry,
-					children: "retry"
+					children: "Retry"
 				})]
-			}) : state.diff.binary ? /* @__PURE__ */ jsx("p", {
-				className: "px-4 py-3 text-sm text-po-dim",
-				children: "binary file, not drawn"
-			}) : state.diff.tooLarge ? /* @__PURE__ */ jsx("p", {
-				className: "px-4 py-3 text-sm text-po-dim",
-				children: "this diff is too large to draw here"
+			}) : state.diff.binary ? /* @__PURE__ */ jsx(EmptyState, {
+				className: "min-h-48",
+				title: "Binary file",
+				description: `${entry.path} cannot be shown as a text diff.`
+			}) : state.diff.tooLarge ? /* @__PURE__ */ jsx(EmptyState, {
+				className: "min-h-48",
+				title: "This diff is too large to show",
+				description: "Other changed files are still available to review."
 			}) : /* @__PURE__ */ jsx(DiffView, {
 				hunks: state.diff.hunks,
 				testId: `git-review-diff-${id}`,
 				onSelect,
-				renderAfterRow,
-				className: "py-1"
+				renderAfterRow
 			})
 		})]
 	});
@@ -2371,6 +2392,7 @@ function reviewTab() {
 function GitReviewPanel({ sessionId, sendSessionFrame }) {
 	const activity = useStore(gitChanges.store, (state) => gitChanges.select(state, sessionId));
 	const comments = useStore(gitReview.store, (state) => gitReview.select(state, sessionId).comments);
+	const focus = useStore(gitReview.store, (state) => gitReview.select(state, sessionId).focus);
 	const [summary, setSummary] = useState({ state: "loading" });
 	const [files, setFiles] = useState({});
 	const [sendError, setSendError] = useState();
@@ -2465,6 +2487,7 @@ function GitReviewPanel({ sessionId, sendSessionFrame }) {
 		if (failure === void 0) onSent?.();
 	};
 	return /* @__PURE__ */ jsx(GitReviewView, {
+		...focus === void 0 ? {} : { initialPath: focus.path },
 		onDraftChange: (open) => setDraftSnapshot((current) => open ? current?.sessionId === sessionId ? current : {
 			sessionId,
 			fingerprint
@@ -2474,7 +2497,10 @@ function GitReviewPanel({ sessionId, sendSessionFrame }) {
 			...activity.pending === void 0 ? {} : { pending: activity.pending },
 			...error === void 0 ? {} : { error },
 			...activity.errorTarget === void 0 || error === void 0 ? {} : { errorTarget: activity.errorTarget },
-			onSync: (action) => requestGitSync(sessionId, action),
+			onSync: (action) => {
+				if (action === "abort-rebase" && !window.confirm("Abort rebase? This discards conflict resolution in progress.")) return;
+				requestGitSync(sessionId, action);
+			},
 			onForcePush: () => requestGitSync(sessionId, "push", true),
 			onAskAgent: () => send(conflictPrompt(branch, changes?.rebase?.conflicts ?? [])),
 			onDismissError: () => setDismissedError(activity.error)
@@ -2488,16 +2514,40 @@ function GitReviewPanel({ sessionId, sendSessionFrame }) {
 		onSendReview: () => send(buildReviewPrompt(comments, reviewHeading(comments.length, branch, base)), () => clearReviewComments(sessionId)),
 		onDiscard: () => clearReviewComments(sessionId),
 		...sendError === void 0 ? {} : { sendError }
-	}, sessionId);
+	}, `${sessionId}:${String(focus?.at ?? 0)}`);
 }
 //#endregion
+//#region src/extensions/workspaces/sessions/(frontend)/fill/GitReview.vibe-lint.finding-review.web.ts
+/** Lets code review findings open this checkout's diff review on their file. */
+var GitReview_vibe_lint_finding_review_web_default = defineFill({
+	slot: "vibe-lint.finding-review",
+	id: "git-review",
+	data: {
+		version: 1,
+		label: "Open in review",
+		open: (props, path) => {
+			if (props.sessionId === null) return;
+			focusReviewFile(props.sessionId, path);
+			props.openTransientTab(reviewTab());
+		}
+	}
+});
+//#endregion
+//#region src/extensions/workspaces/sessions/(frontend)/fill/Worktree.session-menu.web.tsx
+var Worktree_session_menu_web_default = defineFill({ component: WorktreeSessionMenu });
+//#endregion
+//#region src/extensions/workspaces/sessions/(frontend)/fill/WorktreeCreate.overlay.web.tsx
+var WorktreeCreate_overlay_web_default = defineFill({ component: WorktreeCreateOverlay });
+//#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/fill/_components/DiffActivitySection.tsx
 /**
 * The '# git' group's branch row: this session's code change against its base.
 *
 * DESIGN PATTERNS:
-* - One lane, branch and `+A -R`. Files, base, upstream and a paused rebase live
-*   in the review tab's header, which this lane opens.
+* - One lane, branch and `+A -R`, straight on the group body like every other
+*   activity group: the dock already draws the card, so no inner card or heading.
+*   Files, base, upstream and a paused rebase live in the review tab's header,
+*   which this lane opens.
 * - Stays clickable at zero, because the review tab is also where pull, push
 *   and rebase live.
 * - Reads the focused session's checkout, whether it is a worktree or not.
@@ -2509,128 +2559,112 @@ function DiffActivitySection({ sessionId, openTransientTab }) {
 	const session = useStore(gitChanges.store, (state) => gitChanges.select(state, sessionId));
 	const changes = session.changes;
 	if (sessionId === null || changes === void 0) return null;
-	const zero = changes.added === 0 && changes.removed === 0;
-	const against = changes.base === void 0 ? "uncommitted" : `vs ${changes.base}`;
+	return /* @__PURE__ */ jsx(DiffActivityView, {
+		changes,
+		pending: session.pending,
+		onReview: () => openTransientTab(reviewTab())
+	});
+}
+function DiffActivityView({ changes, pending, onReview, branch }) {
+	const zero = changes?.added === 0 && changes?.removed === 0;
+	const against = changes?.base === void 0 ? "uncommitted" : `vs ${changes.base}`;
 	return /* @__PURE__ */ jsxs("div", {
-		className: "flex min-w-0 items-center gap-2",
+		className: "flex min-w-0 flex-col gap-1",
 		children: [/* @__PURE__ */ jsxs(Button, {
 			variant: "ghost",
-			size: "xs",
+			size: "card",
 			"data-testid": "activity-diff-changes",
-			"aria-label": `review ${changes.branch ?? "detached HEAD"} changes: ${String(changes.added)} added, ${String(changes.removed)} removed ${against}`,
-			title: `${String(changes.files)} ${changes.files === 1 ? "file" : "files"} ${against}`,
-			className: `h-auto min-w-0 flex-1 shrink gap-2 px-0 py-0.5 hover:bg-transparent ${zero ? "text-po-faint" : ""}`,
-			onClick: () => openTransientTab(reviewTab()),
-			children: [
-				/* @__PURE__ */ jsx("span", {
-					className: "min-w-0 flex-1 truncate text-left font-mono font-semibold text-po-hi",
-					children: changes.branch ?? "detached HEAD"
-				}),
-				/* @__PURE__ */ jsxs("span", {
-					className: zero ? "" : "text-po-green",
+			className: "min-w-0 flex-row items-center gap-2 rounded-md px-1 py-1 font-normal hover:bg-po-panel",
+			"aria-label": changes ? `review ${changes.branch ?? "detached HEAD"} changes: ${changes.added} added, ${changes.removed} removed ${against}` : "Changes not reported yet",
+			title: changes ? `${changes.files} ${changes.files === 1 ? "file" : "files"} ${against}` : void 0,
+			onClick: onReview,
+			children: [/* @__PURE__ */ jsx("span", {
+				className: "min-w-0 flex-1 truncate text-left font-mono text-sm text-po-hi",
+				children: changes?.branch ?? branch ?? "detached HEAD"
+			}), !changes || zero ? /* @__PURE__ */ jsx("span", {
+				className: "shrink-0 text-sm text-po-dim",
+				children: zero ? "No changes yet" : "Not reported yet"
+			}) : /* @__PURE__ */ jsxs("span", {
+				className: "flex shrink-0 gap-2 text-sm",
+				children: [/* @__PURE__ */ jsxs("span", {
+					className: "text-po-green",
 					children: ["+", changes.added]
-				}),
-				/* @__PURE__ */ jsxs("span", {
-					className: zero ? "" : "text-po-red",
+				}), /* @__PURE__ */ jsxs("span", {
+					className: "text-po-red",
 					children: ["-", changes.removed]
-				})
-			]
-		}), session.pending === void 0 ? null : /* @__PURE__ */ jsxs("span", {
-			className: "flex min-w-0 items-center gap-1.5",
+				})]
+			})]
+		}), pending && /* @__PURE__ */ jsxs("p", {
+			className: "flex items-center gap-2 px-1 text-sm text-po-dim",
 			children: [/* @__PURE__ */ jsx(Spinner, {
-				className: "h-3 w-3 shrink-0 text-po-faint",
-				label: session.pending
+				className: "size-3",
+				label: pending
 			}), /* @__PURE__ */ jsx("span", {
-				className: "min-w-0 truncate text-sm text-po-dim",
-				children: session.pending
+				className: "inline-block first-letter:uppercase",
+				children: pending
 			})]
 		})]
 	});
 }
 //#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/fill/_components/WorktreesActivitySection.tsx
-/**
-* The '# git' group's body in the activity dock.
-*
-* DESIGN PATTERNS:
-* - The focused checkout's branch and diff stay visible, even with no child worktrees.
-* - One line per worktree, the same rule the runners rail follows: enough to
-*   notice it, not enough to work with it. The group's own name opens the tab
-*   that has room.
-* - Idle still shows the launcher. A repository with no worktrees is the state
-*   where someone most wants to make one.
-*
-* AVOID:
-* - Doing work here. This section reports and launches; the panel and the tool
-*   own everything else.
-*/
 function WorktreesActivitySection(props) {
+	const session = useStore(worktreeActivity.store, (state) => worktreeActivity.select(state, props.sessionId));
 	return /* @__PURE__ */ jsxs("div", {
-		className: "flex min-w-0 flex-col gap-2",
-		children: [/* @__PURE__ */ jsx(DiffActivitySection, { ...props }), /* @__PURE__ */ jsx(WorktreesSummary, { ...props })]
+		className: "flex min-w-0 flex-col gap-1",
+		children: [/* @__PURE__ */ jsx(DiffActivitySection, { ...props }), /* @__PURE__ */ jsx(WorktreesActivityView, {
+			worktrees: session.worktrees.filter((w) => w.sessionId !== props.sessionId),
+			pending: session.pending,
+			onOpen: () => props.openTransientTab(worktreesTab()),
+			onCreate: props.sessionId === null ? void 0 : () => worktreeCreateDialog.update(() => ({
+				sessionId: props.sessionId,
+				...props.sessionReservationId === void 0 ? {} : { reservationId: props.sessionReservationId }
+			}))
+		})]
 	});
 }
-function WorktreesSummary({ sessionId, openTransientTab }) {
-	const session = useStore(worktreeActivity.store, (state) => worktreeActivity.select(state, sessionId));
-	const worktrees = session.worktrees.filter((worktree) => worktree.sessionId !== sessionId);
-	if (worktrees.length === 0 && session.pending === void 0) return /* @__PURE__ */ jsxs("div", {
-		className: "flex flex-wrap items-center gap-x-4 gap-y-1",
-		children: [/* @__PURE__ */ jsx("p", {
-			"data-testid": "activity-summary-git",
-			className: "text-sm text-po-dim",
-			children: "Idle"
-		}), sessionId === null ? null : /* @__PURE__ */ jsxs(Button, {
+function WorktreesActivityView({ worktrees, pending, onOpen, onCreate, startingIds = [] }) {
+	return /* @__PURE__ */ jsxs("div", {
+		className: "flex min-w-0 flex-col gap-1",
+		children: [pending && /* @__PURE__ */ jsxs("p", {
+			className: "flex items-center gap-2 px-1 text-sm text-po-dim",
+			children: [/* @__PURE__ */ jsx(Spinner, {
+				className: "size-3",
+				label: pending
+			}), /* @__PURE__ */ jsx("span", {
+				className: "inline-block first-letter:uppercase",
+				children: pending
+			})]
+		}), worktrees.length === 0 ? onCreate ? /* @__PURE__ */ jsxs(Button, {
 			variant: "link",
 			size: "sm",
 			"data-testid": "activity-git-create",
-			className: "h-auto gap-1 px-0 text-po-green",
-			onClick: () => openTransientTab(worktreesTab()),
+			className: "h-auto self-start gap-1 px-1 text-po-green",
+			onClick: onCreate,
 			children: ["Create a worktree", /* @__PURE__ */ jsx(ArrowRightIcon, {
 				"aria-hidden": true,
 				className: "size-3.5"
 			})]
+		}) : /* @__PURE__ */ jsx("span", {
+			"data-testid": "activity-summary-git",
+			className: "px-1 text-sm text-po-dim",
+			children: "Idle"
+		}) : /* @__PURE__ */ jsx("div", {
+			"data-testid": "activity-git-worktrees",
+			children: worktrees.map((w) => /* @__PURE__ */ jsx(Button, {
+				variant: "ghost",
+				size: "card",
+				className: "block w-full min-w-0 p-0 text-left font-normal",
+				"data-testid": `activity-git-worktree-${w.id}`,
+				onClick: onOpen,
+				children: /* @__PURE__ */ jsx(WorktreeRow, {
+					compact: true,
+					worktree: w,
+					starting: startingIds.includes(w.id) || !!pending?.includes("starting") && w.sessionId === null && !w.orphaned && !w.unowned
+				})
+			}, w.id))
 		})]
 	});
-	return /* @__PURE__ */ jsxs("div", {
-		"data-testid": "activity-git-worktrees",
-		className: "flex flex-col gap-0.5",
-		children: [session.pending === void 0 ? null : /* @__PURE__ */ jsxs("span", {
-			className: "flex min-w-0 items-center gap-1.5 px-1",
-			children: [/* @__PURE__ */ jsx(Spinner, {
-				className: "h-3 w-3 shrink-0 text-po-faint",
-				label: session.pending
-			}), /* @__PURE__ */ jsx("span", {
-				className: "min-w-0 truncate text-sm text-po-dim",
-				children: session.pending
-			})]
-		}), worktrees.map((worktree) => /* @__PURE__ */ jsx(Button, {
-			variant: "ghost",
-			size: "card",
-			"data-testid": `activity-git-worktree-${worktree.id}`,
-			className: "min-w-0 gap-1.5 px-1",
-			onClick: () => openTransientTab(worktreesTab()),
-			children: /* @__PURE__ */ jsxs("span", {
-				className: "flex w-full min-w-0 items-center gap-1.5",
-				children: [
-					/* @__PURE__ */ jsx(Dot, { tone: worktree.orphaned ? "red" : worktree.sessionId === null ? "muted" : "blue" }),
-					/* @__PURE__ */ jsx("span", {
-						className: "min-w-0 flex-1 truncate text-left text-base font-semibold text-po-hi",
-						children: worktree.branch
-					}),
-					worktree.orphaned ? /* @__PURE__ */ jsx(StatusBadge, {
-						tone: "error",
-						size: "xs",
-						children: "orphaned"
-					}) : null,
-					worktree.unowned ? /* @__PURE__ */ jsx(StatusBadge, {
-						tone: "info",
-						size: "xs",
-						children: "unowned"
-					}) : null
-				]
-			})
-		}, worktree.id))]
-	});
 }
 //#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/fill/Worktrees.activity.git.web.tsx
@@ -2664,49 +2698,162 @@ function startGitRuntime(runtime) {
 var start_web_default = defineWebLifecycle(startGitRuntime);
 //#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/tool/_components/RunWorktreeToolMessage.tsx
-const ACTION_LABEL = {
-	spawn_worktree: "Create worktree",
-	close_worktree: "Close worktree",
-	list: "List worktrees",
-	status: "Worktree status",
-	merge: "Merge worktree",
-	prune: "Prune worktrees",
-	send: "Message worktree",
-	messages: "Read worktree messages"
+const VERBS = {
+	spawn_worktree: [
+		"is creating",
+		"created",
+		"create"
+	],
+	close_worktree: [
+		"is closing",
+		"closed",
+		"close"
+	],
+	list: [
+		"is listing",
+		"listed",
+		"list"
+	],
+	status: [
+		"is checking",
+		"checked",
+		"check"
+	],
+	merge: [
+		"is merging",
+		"merged",
+		"merge"
+	],
+	prune: [
+		"is pruning",
+		"pruned",
+		"prune"
+	],
+	send: [
+		"is messaging",
+		"messaged",
+		"message"
+	],
+	messages: [
+		"is reading messages from",
+		"read messages from",
+		"read messages from"
+	]
 };
-/**
-* The timeline item for `run_worktree`.
-*
-* DESIGN PATTERNS:
-* - Built on MessageItem, like every other tool renderer in the cockpit. That
-*   is what gives it the shared collapse toggle and the RUNNING/OK/ERROR badge
-*   rather than a hand-rolled ellipsis that never resolves.
-* - The action and its subject go in the heading because that is what a reader
-*   scanning a transcript needs: "close_worktree a1b2c3d4" answers the question
-*   the raw JSON arguments make them decode.
-* - A create takes as long as the cockpit needs to start a session, and the
-*   tool streams each phase into `output`, so the body is where the wait is
-*   visible.
-*/
 function RunWorktreeToolMessage({ args, output, running, isError }) {
-	const action = typeof args.action === "string" ? args.action : "";
-	const subject = typeof args.branch === "string" ? args.branch : typeof args.id === "string" ? args.id : "";
-	return /* @__PURE__ */ jsxs(MessageItem, {
-		tone: toolTone({
-			running,
-			isError
-		}),
-		expandable: output !== "",
-		children: [/* @__PURE__ */ jsx(MessageItemHeader, {
-			title: ACTION_LABEL[action] ?? "Worktree",
-			children: subject === "" ? null : /* @__PURE__ */ jsx("span", {
-				className: "min-w-0 truncate font-mono text-po-dim",
-				children: subject
-			})
-		}), output === "" ? null : /* @__PURE__ */ jsx(MessageItemBody, { children: /* @__PURE__ */ jsx("pre", {
-			className: `whitespace-pre-wrap font-mono text-sm ${isError ? "text-po-red" : "text-po-dim"}`,
-			children: output
-		}) })]
+	return /* @__PURE__ */ jsx(RunWorktreeToolMessageView, {
+		action: typeof args.action === "string" ? args.action : "",
+		subject: typeof args.branch === "string" ? args.branch : typeof args.id === "string" ? args.id : "",
+		output,
+		running,
+		isError
+	});
+}
+function RunWorktreeToolMessageView({ action, subject = "", output = "", running = false, isError = false, defaultExpanded = false }) {
+	const tone = running ? "neutral" : isError ? "error" : "ok";
+	const verbs = VERBS[action] ?? [
+		"is running",
+		"finished",
+		"run"
+	];
+	const rows = action === "list" ? output.split("\n").map((line) => line.split(/\s{2,}/)).filter((parts) => parts.length >= 3) : [];
+	const listingCount = output.match(/^(\d+) worktree/);
+	return /* @__PURE__ */ jsx(MessageItem, {
+		tone,
+		expandable: true,
+		defaultExpanded,
+		className: "bg-po-panel",
+		children: ({ expanded, toggle }) => /* @__PURE__ */ jsxs(Fragment, { children: [
+			/* @__PURE__ */ jsxs("div", {
+				className: "flex items-start gap-3 p-4",
+				children: [/* @__PURE__ */ jsx("div", {
+					className: "min-w-0 flex-1",
+					children: /* @__PURE__ */ jsxs("p", {
+						className: "text-base font-semibold leading-relaxed text-po-hi",
+						children: [
+							"Po ",
+							isError && !running ? `could not ${verbs[2]}` : verbs[running ? 0 : 1],
+							" ",
+							action === "list" && !running && !isError ? `${listingCount?.[1] ?? rows.length} ${Number(listingCount?.[1] ?? rows.length) === 1 ? "worktree" : "worktrees"}` : subject ? /* @__PURE__ */ jsx("span", {
+								className: "font-mono",
+								children: subject
+							}) : "worktrees",
+							running ? "..." : isError && output ? `: ${output.split("\n")[0]}` : ""
+						]
+					})
+				}), /* @__PURE__ */ jsxs(StatusBadge, {
+					tone,
+					size: "xs",
+					className: running ? "gap-1 bg-po-rail text-po-dim" : "",
+					children: [running && /* @__PURE__ */ jsx(Spinner, {
+						className: "size-3",
+						label: "Running"
+					}), running ? "Running" : isError ? "Failed" : "Completed"]
+				})]
+			}),
+			/* @__PURE__ */ jsxs(Button, {
+				variant: "ghost",
+				size: "sm",
+				onClick: toggle,
+				"aria-expanded": expanded,
+				className: "mb-2 ml-3 text-po-dim",
+				children: ["Details ", expanded ? /* @__PURE__ */ jsx(ChevronUpIcon, { className: "size-3" }) : /* @__PURE__ */ jsx(ChevronDownIcon, { className: "size-3" })]
+			}),
+			expanded && /* @__PURE__ */ jsx(MessageItemBody, { children: rows.length > 0 && !isError ? /* @__PURE__ */ jsxs("table", {
+				className: "w-full text-left text-sm",
+				children: [/* @__PURE__ */ jsx("thead", { children: /* @__PURE__ */ jsxs("tr", {
+					className: "border-b border-po-border-soft",
+					children: [
+						/* @__PURE__ */ jsx("th", {
+							className: "pb-2 font-medium",
+							children: "Branch"
+						}),
+						/* @__PURE__ */ jsx("th", {
+							className: "pb-2 font-medium",
+							children: "Path"
+						}),
+						/* @__PURE__ */ jsx("th", {
+							className: "pb-2 font-medium",
+							children: "Status"
+						})
+					]
+				}) }), /* @__PURE__ */ jsx("tbody", { children: rows.map((parts, i) => {
+					const real = parts.length >= 5;
+					const status = parts[2];
+					return /* @__PURE__ */ jsxs("tr", {
+						className: "border-b border-po-border-soft",
+						children: [
+							/* @__PURE__ */ jsxs("td", {
+								className: "py-3 pr-3 font-mono text-po-text",
+								children: [real ? parts[1] : parts[0], real && /* @__PURE__ */ jsx("span", {
+									className: "mt-1 block text-po-dim",
+									children: parts[0]
+								})]
+							}),
+							/* @__PURE__ */ jsx("td", {
+								className: "py-3 pr-3 font-mono text-po-dim",
+								children: real ? parts.slice(4).join("  ") : parts[1]
+							}),
+							/* @__PURE__ */ jsxs("td", { children: [/* @__PURE__ */ jsx(StatusBadge, {
+								tone: status === "orphaned" ? "neutral" : status === "unowned" ? "info" : "ok",
+								size: "xs",
+								className: status === "orphaned" ? "bg-po-tint-yellow text-po-yellow" : "",
+								children: /* @__PURE__ */ jsx("span", {
+									className: "inline-block first-letter:uppercase",
+									children: status
+								})
+							}), real && /* @__PURE__ */ jsx("span", {
+								className: "ml-2 text-po-dim",
+								children: parts[3]
+							})] })
+						]
+					}, i);
+				}) })]
+			}) : /* @__PURE__ */ jsx("pre", {
+				className: `whitespace-pre-wrap font-mono text-sm ${isError ? "text-po-red" : "text-po-dim"}`,
+				children: output
+			}) })
+		] })
 	});
 }
 //#endregion
@@ -2740,6 +2887,10 @@ const webPlugin = defineWebPlugin({
 		},
 		get fills() {
 			return [
+				via({
+					slot: "vibe-lint.finding-review",
+					id: "git-review"
+				}, GitReview_vibe_lint_finding_review_web_default),
 				via({
 					slot: "session-menu",
 					id: "worktree"