@dylanpiercey/work 0.0.6 → 0.0.7

package/dist/index.mjs

@@ -3567,17 +3567,17 @@ var palette_default = _template("h", (input) => {
 				_html(`<span class=row-name><span${_attr_class(["dot", phaseOf$1(st)])}></span>${_el_resume($scope3_id, "a")}<span class=row-name-text>${_escape(row.ws.name)}${_el_resume($scope3_id, "b")}</span>`);
 				_if(() => {
 					if (row.ws.id === input.selectedId) {
-						const $scope15_id = _scope_id();
+						const $scope14_id = _scope_id();
 						_html("<span class=\"chip open\">open</span>");
-						writeScope($scope15_id, {});
+						writeScope($scope14_id, {});
 						return 0;
 					}
 				}, $scope3_id, "c", 1, 1, 1, 0, 1);
 				_if(() => {
 					if (row.archived) {
-						const $scope16_id = _scope_id();
+						const $scope15_id = _scope_id();
 						_html("<span class=chip>archived</span>");
-						writeScope($scope16_id, {});
+						writeScope($scope15_id, {});
 						return 0;
 					}
 				}, $scope3_id, "d", 1, 1, 1, 0, 1);
@@ -3590,44 +3590,35 @@ var palette_default = _template("h", (input) => {
 						return 0;
 					}
 				}, $scope3_id, "e", 1, 1, 1, 0, 1);
-				_if(() => {
-					if (st?.changes) {
-						const $scope12_id = _scope_id();
-						_html(`<span class="chip stat changes"${_attr("title", `${st.changes} changed file${st.changes === 1 ? "" : "s"}`)}>±<!>${_escape(st.changes)}${_el_resume($scope12_id, "b")}</span>${_el_resume($scope12_id, "a")}`);
-						writeScope($scope12_id, {});
-						return 0;
-					}
-				}, $scope3_id, "f", 1, 1, 1, 0, 1);
 				_if(() => {
 					if (rowPrs.length) {
-						const $scope14_id = _scope_id();
-						_html(`<span class="chip stat"${_attr("title", `${rowPrs.length} open PR${rowPrs.length === 1 ? "" : "s"}`)}>${_escape(rowPrs.length)}${_el_resume($scope14_id, "b")} PR<!>${rowPrs.length === 1 ? "" : "s"}${_el_resume($scope14_id, "c")}</span>${_el_resume($scope14_id, "a")}`);
-						writeScope($scope14_id, {});
+						const $scope13_id = _scope_id();
+						_html(`<span class="chip stat"${_attr("title", `${rowPrs.length} open PR${rowPrs.length === 1 ? "" : "s"}`)}>${_escape(rowPrs.length)}${_el_resume($scope13_id, "b")} PR<!>${rowPrs.length === 1 ? "" : "s"}${_el_resume($scope13_id, "c")}</span>${_el_resume($scope13_id, "a")}`);
+						writeScope($scope13_id, {});
 						return 0;
 					}
-				}, $scope3_id, "g", 1, 1, 1, 0, 1);
+				}, $scope3_id, "f", 1, 1, 1, 0, 1);
 				_if(() => {
 					if ((st?.ports || []).length) {
-						const $scope13_id = _scope_id();
-						_html(`<span class="chip stat"${_attr("title", st.ports.map((p) => `:${p.port} ${p.cmd}`).join("\n"))}>:<!>${_escape(st.ports.length)}${_el_resume($scope13_id, "b")}</span>${_el_resume($scope13_id, "a")}`);
-						writeScope($scope13_id, {});
+						const $scope12_id = _scope_id();
+						_html(`<span class="chip stat"${_attr("title", st.ports.map((p) => `:${p.port} ${p.cmd}`).join("\n"))}>:<!>${_escape(st.ports.length)}${_el_resume($scope12_id, "b")}</span>${_el_resume($scope12_id, "a")}`);
+						writeScope($scope12_id, {});
 						return 0;
 					}
-				}, $scope3_id, "h", 1, 1, 1, 0, 1);
+				}, $scope3_id, "g", 1, 1, 1, 0, 1);
 				_html("</span></span><span class=row-repos>");
 				_for_of(st?.repos || row.ws.repos, (repo) => {
-					const $scope17_id = _scope_id();
-					_html(`<span class=mono>${_escape(repo.worktree)}${_el_resume($scope17_id, "a")}</span>`);
-					writeScope($scope17_id, {});
-				}, "full_name", $scope3_id, "i", 1, 1, 1, "</span>", 1);
+					const $scope16_id = _scope_id();
+					_html(`<span class=mono>${_escape(repo.worktree)}${_el_resume($scope16_id, "a")}</span>`);
+					writeScope($scope16_id, {});
+				}, "full_name", $scope3_id, "h", 1, 1, 1, "</span>", 1);
 				_subscribe($si__input_status && $input_status__closures, _subscribe($si__input_selectedId && $input_selectedId__closures, writeScope($scope3_id, {
-					m: st?.agents,
-					n: st?.working,
-					o: st?.waiting,
-					p: st?.changes,
-					q: st?.ports,
-					r: st?.ports?.length,
-					t: rowPrs?.length
+					l: st?.agents,
+					m: st?.working,
+					n: st?.waiting,
+					o: st?.ports,
+					p: st?.ports?.length,
+					r: rowPrs?.length
 				})));
 				return 2;
 			}
@@ -3709,9 +3700,9 @@ var palette_default = _template("h", (input) => {
 			}, "h1", $scope6_id), () => {
 				_html("<select aria-label=\"Preferred agent\">");
 				_for_of(input.settings.agents, (agent) => {
-					const $scope18_id = _scope_id();
-					_html(`<option${_attr_option_value(agent)}>${_escape(agent)}${_el_resume($scope18_id, "b", $sg__input_settings_agents)}</option>${_el_resume($scope18_id, "a", $sg__input_settings_agents)}`);
-					$si__input_settings_agents && writeScope($scope18_id, {});
+					const $scope17_id = _scope_id();
+					_html(`<option${_attr_option_value(agent)}>${_escape(agent)}${_el_resume($scope17_id, "b", $sg__input_settings_agents)}</option>${_el_resume($scope17_id, "a", $sg__input_settings_agents)}`);
+					$si__input_settings_agents && writeScope($scope17_id, {});
 				}, (a) => a, $scope6_id, "a", $sg__input_settings_agents, 1, $sg__input_settings_agents, "</select>", 1);
 			});
 			_html("</label>");
@@ -4682,6 +4673,9 @@ function setWorkspaceTab(workspaceId, sessionId) {
 function diffTreeOpen() {
 	return get$1("diff-tree") !== "0";
 }
+function diffUncommitted() {
+	return get$1("diff-uncommitted") === "1";
+}
 //#endregion
 //#region src/tags/icons/icon-edit.marko
 var icon_edit_default = _template("w", (input) => {
@@ -4737,7 +4731,6 @@ var side_nav_item_default = _template("k", (input) => {
 	_if(() => {
 		if (ws) {
 			const $scope1_id = _scope_id();
-			const $if_content__st_changes__closures = /* @__PURE__ */ new Set();
 			const $if_content__st_repos__closures = /* @__PURE__ */ new Set();
 			const $if_content__st_ports__closures = /* @__PURE__ */ new Set();
 			const st = input.status[input.workspaceId];
@@ -4828,7 +4821,7 @@ var side_nav_item_default = _template("k", (input) => {
 						})));
 					}, "id", $scope3_id, "i", $sg__input_sessions, $sg__input_sessions, $sg__input_sessions, 0, 1);
 					_if(() => {
-						if ((st?.repos || []).some((r) => (r.prs || []).length) || (st?.ports || []).length || st?.changes) {
+						if ((st?.repos || []).some((r) => (r.prs || []).length) || (st?.ports || []).length) {
 							const $scope8_id = _scope_id();
 							const $if_content5__repoLabel__closures = /* @__PURE__ */ new Set();
 							const repoLabel = _resume((repo) => {
@@ -4838,48 +4831,40 @@ var side_nav_item_default = _template("k", (input) => {
 								return repos.some((r) => r.full_name !== repo.full_name && r.full_name.split("/")[1] === name) ? repo.full_name : name;
 							}, "k1", $scope8_id);
 							_html("<div class=side-chips>");
-							_if(() => {
-								if (st?.changes) {
-									const $scope9_id = _scope_id();
-									_html(`<button class="chip changes"${_attr("title", `${st.changes} changed file${st.changes === 1 ? "" : "s"} — review`)}>±${_sep($sg__input_workspaceId__OR__input_status)}${_escape(st.changes)}${_el_resume($scope9_id, "b", $sg__input_workspaceId__OR__input_status)}</button>${_el_resume($scope9_id, "a")}`);
-									_script($scope9_id, "k7");
-									_subscribe($si__input_workspaceId__OR__input_status && $if_content__st_changes__closures, writeScope($scope9_id, {
-										_: _scope_with_id($scope8_id),
-										Cj: $si__input_workspaceId__OR__input_status && 1
-									}));
-									return 0;
-								}
-							}, $scope8_id, "a", $sg__input_workspaceId__OR__input_status, $sg__input_workspaceId__OR__input_status, $sg__input_workspaceId__OR__input_status, 0, 1);
 							_for_of(st?.repos || [], (repo) => {
-								const $scope11_id = _scope_id();
+								const $scope9_id = _scope_id();
 								_for_of(repo.prs || [], (pr) => {
-									const $scope12_id = _scope_id();
-									_html(`<a class=${$class$2[(pr.isDraft ? 1 : 0) + (pr.reviewDecision === "CHANGES_REQUESTED" ? 2 : 0)]}${_attr("href", pr.url)} target=_blank rel=noopener${_attr("title", `${repo.worktree} — ${pr.title}${pr.reviewDecision === "APPROVED" ? " (approved)" : pr.reviewDecision === "CHANGES_REQUESTED" ? " (changes requested)" : ""}`)}>${_escape(repoLabel(repo))}${_el_resume($scope12_id, "b", $sg__input_workspaceId__OR__input_status)}#${_sep($sg__input_workspaceId__OR__input_status)}${_escape(pr.number)}${_el_resume($scope12_id, "c", $sg__input_workspaceId__OR__input_status)}${_sep($sg__input_workspaceId__OR__input_status)}${pr.reviewDecision === "APPROVED" ? " ✓" : pr.reviewDecision === "CHANGES_REQUESTED" ? " ✗" : ""}${_el_resume($scope12_id, "d", $sg__input_workspaceId__OR__input_status)}</a>${_el_resume($scope12_id, "a", $sg__input_workspaceId__OR__input_status)}`);
-									$si__input_workspaceId__OR__input_status && _subscribe($if_content5__repoLabel__closures, writeScope($scope12_id, { _: _scope_with_id($scope11_id) }));
-								}, "number", $scope11_id, "a", $sg__input_workspaceId__OR__input_status, $sg__input_workspaceId__OR__input_status, $sg__input_workspaceId__OR__input_status, 0, 1);
-								$si__input_workspaceId__OR__input_status && writeScope($scope11_id, {
-									c: repo,
+									const $scope10_id = _scope_id();
+									_html(`<button class=${$class$2[(pr.isDraft ? 1 : 0) + (pr.reviewDecision === "CHANGES_REQUESTED" ? 2 : 0)]}${_attr("title", `${repo.worktree} — ${pr.title}${pr.reviewDecision === "APPROVED" ? " (approved)" : pr.reviewDecision === "CHANGES_REQUESTED" ? " (changes requested)" : ""}`)}>${_escape(repoLabel(repo))}${_el_resume($scope10_id, "b", $sg__input_workspaceId__OR__input_status)}#${_sep($sg__input_workspaceId__OR__input_status)}${_escape(pr.number)}${_el_resume($scope10_id, "c", $sg__input_workspaceId__OR__input_status)}${_sep($sg__input_workspaceId__OR__input_status)}${pr.reviewDecision === "APPROVED" ? " ✓" : pr.reviewDecision === "CHANGES_REQUESTED" ? " ✗" : ""}${_el_resume($scope10_id, "d", $sg__input_workspaceId__OR__input_status)}</button>${_el_resume($scope10_id, "a")}`);
+									_script($scope10_id, "k7");
+									_subscribe($si__input_workspaceId__OR__input_status && $if_content5__repoLabel__closures, writeScope($scope10_id, {
+										l: pr?.number,
+										_: _scope_with_id($scope9_id)
+									}));
+								}, "number", $scope9_id, "a", $sg__input_workspaceId__OR__input_status, $sg__input_workspaceId__OR__input_status, $sg__input_workspaceId__OR__input_status, 0, 1);
+								writeScope($scope9_id, {
+									c: $si__input_workspaceId__OR__input_status && repo,
 									e: repo?.worktree,
 									_: _scope_with_id($scope8_id)
 								});
-							}, "full_name", $scope8_id, "b", $sg__input_workspaceId__OR__input_status, $sg__input_workspaceId__OR__input_status, $sg__input_workspaceId__OR__input_status);
+							}, "full_name", $scope8_id, "a", $sg__input_workspaceId__OR__input_status, $sg__input_workspaceId__OR__input_status, $sg__input_workspaceId__OR__input_status);
 							_for_of(st?.ports || [], (p) => {
-								const $scope10_id = _scope_id();
-								_html(`<span class="chip port-chip"${_attr("title", p.cmd)}><button class=port-open${_attr("title", `Open http://${typeof location === "undefined" ? "localhost" : location.hostname}:${p.port}`)}>:${_sep($sg__input_workspaceId__OR__input_status)}${_escape(p.port)}${_el_resume($scope10_id, "c", $sg__input_workspaceId__OR__input_status)}</button>${_el_resume($scope10_id, "b")}<button class=${armedPid === p.pid ? "\"port-kill armed\"" : "port-kill"}${armedPid === p.pid ? _attr("title", `Really kill ${p.cmd}?`) : _attr("title", `Kill ${p.cmd} (pid ${p.pid})`)}>×</button>${_el_resume($scope10_id, "d")}</span>${_el_resume($scope10_id, "a", $sg__input_workspaceId__OR__input_status)}`);
-								_script($scope10_id, "k8");
-								_subscribe($armedPid__closures, writeScope($scope10_id, {
+								const $scope11_id = _scope_id();
+								_html(`<span class="chip port-chip"${_attr("title", p.cmd)}><button class=port-open${_attr("title", `Open http://${typeof location === "undefined" ? "localhost" : location.hostname}:${p.port}`)}>:${_sep($sg__input_workspaceId__OR__input_status)}${_escape(p.port)}${_el_resume($scope11_id, "c", $sg__input_workspaceId__OR__input_status)}</button>${_el_resume($scope11_id, "b")}<button class=${armedPid === p.pid ? "\"port-kill armed\"" : "port-kill"}${armedPid === p.pid ? _attr("title", `Really kill ${p.cmd}?`) : _attr("title", `Kill ${p.cmd} (pid ${p.pid})`)}>×</button>${_el_resume($scope11_id, "d")}</span>${_el_resume($scope11_id, "a", $sg__input_workspaceId__OR__input_status)}`);
+								_script($scope11_id, "k8");
+								_subscribe($armedPid__closures, writeScope($scope11_id, {
 									g: p?.cmd,
 									h: p?.port,
 									i: p?.pid,
 									_: _scope_with_id($scope8_id)
 								}));
-							}, "port", $scope8_id, "c", $sg__input_workspaceId__OR__input_status, $sg__input_workspaceId__OR__input_status, $sg__input_workspaceId__OR__input_status, 0, 1);
+							}, "port", $scope8_id, "b", $sg__input_workspaceId__OR__input_status, $sg__input_workspaceId__OR__input_status, $sg__input_workspaceId__OR__input_status, 0, 1);
 							_html("</div>");
-							_subscribe($si__input_workspaceId__OR__input_status && $if_content__st_changes__closures, _subscribe($si__input_workspaceId__OR__input_status && $if_content__st_ports__closures, _subscribe($si__input_workspaceId__OR__input_status && $if_content__st_repos__closures, writeScope($scope8_id, {
-								d: $si__input_workspaceId__OR__input_status && repoLabel,
+							_subscribe($si__input_workspaceId__OR__input_status && $if_content__st_ports__closures, _subscribe($si__input_workspaceId__OR__input_status && $if_content__st_repos__closures, writeScope($scope8_id, {
+								c: $si__input_workspaceId__OR__input_status && repoLabel,
 								_: _scope_with_id($scope3_id),
-								e: $si__input_workspaceId__OR__input_status && $if_content5__repoLabel__closures
-							}))));
+								d: $si__input_workspaceId__OR__input_status && $if_content5__repoLabel__closures
+							})));
 							return 0;
 						}
 					}, $scope3_id, "j", $sg__input_workspaceId__OR__input_status, $sg__input_workspaceId__OR__input_status, $sg__input_workspaceId__OR__input_status__OR__input_onReview__OR__input_onNewSession, 0, 1);
@@ -4887,8 +4872,8 @@ var side_nav_item_default = _template("k", (input) => {
 					_script($scope3_id, "k9");
 					_subscribe($si__input_workspaces__OR__input_workspaceId && $ws_name__closures, _subscribe($si__input_sessions && $input_sessions__closures, _subscribe($si__input_onNewSession && $input_onNewSession__closures, _subscribe($si__input_onReview && $input_onReview__closures, _subscribe($si__input_current && $input_current__closures, writeScope($scope3_id, {
 						_: _scope_with_id($scope1_id),
-						Ca4: $si__input_current && 1,
-						Cad: $si__input_workspaces__OR__input_workspaceId && 1
+						Ca5: $si__input_current && 1,
+						Cae: $si__input_workspaces__OR__input_workspaceId && 1
 					}))))));
 					return 1;
 				}
@@ -4896,12 +4881,10 @@ var side_nav_item_default = _template("k", (input) => {
 			writeScope($scope1_id, {
 				c: $si__input_workspaceId__OR__input_status__OR__input_rail && st?.repos,
 				d: $si__input_workspaceId__OR__input_status__OR__input_rail && st?.ports,
-				e: $si__input_workspaceId__OR__input_status__OR__input_rail && st?.changes,
-				f: _serialize_if($scope0_reason, 11) && dot,
+				e: _serialize_if($scope0_reason, 11) && dot,
 				_: _scope_with_id($scope0_id),
-				j: $si__input_workspaceId__OR__input_status && $if_content__st_changes__closures,
-				h: $si__input_workspaceId__OR__input_status && $if_content__st_repos__closures,
-				i: $si__input_workspaceId__OR__input_status && $if_content__st_ports__closures
+				g: $si__input_workspaceId__OR__input_status && $if_content__st_repos__closures,
+				h: $si__input_workspaceId__OR__input_status && $if_content__st_ports__closures
 			});
 			return 0;
 		}
@@ -4923,21 +4906,22 @@ var side_nav_item_default = _template("k", (input) => {
 		r: input.onOpenTab,
 		s: input.onRenameSession,
 		t: input.onCloseSession,
-		u: armedKill,
-		v: armedPid,
-		x: armBox.timer,
-		y: arm,
-		a0: $si__input_workspaces__OR__input_workspaceId__OR__input_rail && ws?.name,
-		a4: $si__input_current && $input_current__closures,
-		a5: $si__input_index && $input_index__closures,
-		ad: $si__input_workspaces__OR__input_workspaceId && $ws_name__closures,
-		a8: $si__input_agents && $input_agents__closures,
-		aa: $si__input_currentTab && $input_currentTab__closures,
-		ab: $armedKill__closures,
-		ac: $armedPid__closures,
-		a6: $si__input_onReview && $input_onReview__closures,
-		a7: $si__input_onNewSession && $input_onNewSession__closures,
-		a9: $si__input_sessions && $input_sessions__closures
+		u: input.onReviewPr,
+		v: armedKill,
+		w: armedPid,
+		y: armBox.timer,
+		z: arm,
+		a1: $si__input_workspaces__OR__input_workspaceId__OR__input_rail && ws?.name,
+		a5: $si__input_current && $input_current__closures,
+		a6: $si__input_index && $input_index__closures,
+		ae: $si__input_workspaces__OR__input_workspaceId && $ws_name__closures,
+		a9: $si__input_agents && $input_agents__closures,
+		ab: $si__input_currentTab && $input_currentTab__closures,
+		ac: $armedKill__closures,
+		ad: $armedPid__closures,
+		a7: $si__input_onReview && $input_onReview__closures,
+		a8: $si__input_onNewSession && $input_onNewSession__closures,
+		aa: $si__input_sessions && $input_sessions__closures
 	});
 	_resume_branch($scope0_id);
 });
@@ -5039,7 +5023,7 @@ var $class$1 = [
 	"\"side-nav closed open\""
 ];
 var side_nav_default = _template("l", (input) => {
-	const $scope0_reason = _scope_reason(), $sg__input_workspace__OR__input_allWorkspaces__OR__input_allStatus = _serialize_guard($scope0_reason, 1), $sg__input_workspace__OR__input_allWorkspaces = _serialize_guard($scope0_reason, 0), $sg__input_workspace__OR__input_allWorkspaces__OR__input_onNewSession = _serialize_guard($scope0_reason, 2), $sg__input_workspace__OR__input_allWorkspaces__OR__input_allStatus__OR__input_sessions = _serialize_guard($scope0_reason, 3), $sg__input_agents = _serialize_guard($scope0_reason, 14), $si__input_workspace = _serialize_if($scope0_reason, 4), $si__input_workspace__OR__input_allWorkspaces = _serialize_if($scope0_reason, 0), $si__input_allStatus = _serialize_if($scope0_reason, 12), $si__input_onSelectWorkspace = _serialize_if($scope0_reason, 13), $si__input_agents = _serialize_if($scope0_reason, 14), $si__input_onNewSession = _serialize_if($scope0_reason, 15), $si__input_sessions = _serialize_if($scope0_reason, 16), $si__input_onRenameSession = _serialize_if($scope0_reason, 17), $si__input_onCloseSession = _serialize_if($scope0_reason, 18);
+	const $scope0_reason = _scope_reason(), $sg__input_workspace__OR__input_allWorkspaces__OR__input_allStatus = _serialize_guard($scope0_reason, 1), $sg__input_workspace__OR__input_allWorkspaces = _serialize_guard($scope0_reason, 0), $sg__input_workspace__OR__input_allWorkspaces__OR__input_onNewSession = _serialize_guard($scope0_reason, 2), $sg__input_workspace__OR__input_allWorkspaces__OR__input_allStatus__OR__input_sessions = _serialize_guard($scope0_reason, 3), $sg__input_agents = _serialize_guard($scope0_reason, 14), $si__input_workspace = _serialize_if($scope0_reason, 4), $si__input_workspace__OR__input_allWorkspaces = _serialize_if($scope0_reason, 0), $si__input_allStatus = _serialize_if($scope0_reason, 12), $si__input_onSelectWorkspace = _serialize_if($scope0_reason, 13), $si__input_agents = _serialize_if($scope0_reason, 14), $si__input_onNewSession = _serialize_if($scope0_reason, 15), $si__input_onReviewOpened = _serialize_if($scope0_reason, 16), $si__input_sessions = _serialize_if($scope0_reason, 17), $si__input_onRenameSession = _serialize_if($scope0_reason, 18), $si__input_onCloseSession = _serialize_if($scope0_reason, 19);
 	const $scope0_id = _scope_id();
 	const $ws_id__closures = /* @__PURE__ */ new Set();
 	const $workspaces__closures = /* @__PURE__ */ new Set();
@@ -5047,6 +5031,7 @@ var side_nav_default = _template("l", (input) => {
 	const $input_onSelectWorkspace__closures = /* @__PURE__ */ new Set();
 	const $input_agents__closures = /* @__PURE__ */ new Set();
 	const $input_onNewSession__closures = /* @__PURE__ */ new Set();
+	const $input_onReviewOpened__closures = /* @__PURE__ */ new Set();
 	const $input_sessions__closures = /* @__PURE__ */ new Set();
 	const $input_onRenameSession__closures = /* @__PURE__ */ new Set();
 	const $input_onCloseSession__closures = /* @__PURE__ */ new Set();
@@ -5080,7 +5065,7 @@ var side_nav_default = _template("l", (input) => {
 		if (drawerOpen) {
 			const $scope5_id = _scope_id();
 			_html(`<div class=drawer-backdrop></div>${_el_resume($scope5_id, "a")}`);
-			_script($scope5_id, "l14");
+			_script($scope5_id, "l16");
 			writeScope($scope5_id, {});
 			return 0;
 		}
@@ -5130,12 +5115,25 @@ var side_nav_default = _template("l", (input) => {
 			}, "l3", $scope1_id),
 			onReview: _resume(function() {
 				drawerOpen = false;
-				if (wsId === ws.id) view = view === "diff" ? "term" : "diff";
-				else {
+				if (wsId === ws.id) {
+					view = view === "diff" ? "term" : "diff";
+					if (view === "diff") input.onReviewOpened?.();
+				} else {
 					navIntent$1.requestDiff(wsId);
 					input.onSelectWorkspace?.(wsId);
 				}
 			}, "l4", $scope1_id),
+			onReviewPr: _resume(function(worktree, number) {
+				drawerOpen = false;
+				const pr = `${worktree}/${number}`;
+				if (wsId === ws.id) {
+					view = "diff";
+					input.onReviewOpened?.(pr);
+				} else {
+					navIntent$1.requestDiff(wsId, pr);
+					input.onSelectWorkspace?.(wsId);
+				}
+			}, "l5", $scope1_id),
 			sessions: wsId === ws.id && input.sessions ? input.sessions : allStatus[wsId]?.sessions || [],
 			currentTab: wsId === ws.id && view === "term" ? tab : null,
 			onOpenTab: _resume(function(sessionId) {
@@ -5144,7 +5142,7 @@ var side_nav_default = _template("l", (input) => {
 					tab = sessionId;
 					view = "term";
 				} else input.onOpenSession?.(wsId, sessionId);
-			}, "l5", $scope1_id),
+			}, "l6", $scope1_id),
 			onRenameSession: input.onRenameSession,
 			onCloseSession: input.onCloseSession
 		});
@@ -5159,13 +5157,13 @@ var side_nav_default = _template("l", (input) => {
 			const $scope2_id = _scope_id();
 			let railHover = null;
 			const railHoverBox = { timer: 0 };
-			const railKeep = _resume(() => clearTimeout(railHoverBox.timer), "l6", $scope2_id);
+			const railKeep = _resume(() => clearTimeout(railHoverBox.timer), "l7", $scope2_id);
 			const railHide = _resume(() => {
 				clearTimeout(railHoverBox.timer);
 				railHoverBox.timer = setTimeout(() => {
 					railHover = null;
 				}, 150);
-			}, "l7", $scope2_id);
+			}, "l8", $scope2_id);
 			_html("<div class=side-rail>");
 			_for_of(itemIds, (wsId, i) => {
 				const $scope3_id = _scope_id();
@@ -5194,10 +5192,10 @@ var side_nav_default = _template("l", (input) => {
 					current: wsId === ws.id,
 					onSelect: _resume(function() {
 						if (wsId !== ws.id) input.onSelectWorkspace?.(wsId);
-					}, "l8", $scope3_id)
+					}, "l9", $scope3_id)
 				});
 				_html(`</span>${_el_resume($scope3_id, "a")}`);
-				_script($scope3_id, "l15");
+				_script($scope3_id, "l17");
 				_subscribe($si__input_allStatus && $allStatus__closures, _subscribe($si__input_workspace__OR__input_allWorkspaces && $workspaces__closures, _subscribe($si__input_workspace && $ws_id__closures, writeScope($scope3_id, {
 					d: wsId,
 					_: _scope_with_id($scope2_id),
@@ -5237,24 +5235,37 @@ var side_nav_default = _template("l", (input) => {
 						onSelect: _resume(function() {
 							railHover = null;
 							if (hoverId !== ws.id) input.onSelectWorkspace?.(hoverId);
-						}, "l9", $scope4_id),
+						}, "l10", $scope4_id),
 						onManage: _resume(function() {
 							railHover = null;
 							input.onManage?.(hoverId);
-						}, "l10", $scope4_id),
+						}, "l11", $scope4_id),
 						agents: input.agents,
 						onNewSession: _resume(function(agent) {
 							railHover = null;
 							input.onNewSession(hoverId, agent);
-						}, "l11", $scope4_id),
+						}, "l12", $scope4_id),
 						onReview: _resume(function() {
 							railHover = null;
-							if (hoverId === ws.id) view = view === "diff" ? "term" : "diff";
-							else {
+							if (hoverId === ws.id) {
+								view = view === "diff" ? "term" : "diff";
+								if (view === "diff") input.onReviewOpened?.();
+							} else {
 								navIntent$1.requestDiff(hoverId);
 								input.onSelectWorkspace?.(hoverId);
 							}
-						}, "l12", $scope4_id),
+						}, "l13", $scope4_id),
+						onReviewPr: _resume(function(worktree, number) {
+							railHover = null;
+							const pr = `${worktree}/${number}`;
+							if (hoverId === ws.id) {
+								view = "diff";
+								input.onReviewOpened?.(pr);
+							} else {
+								navIntent$1.requestDiff(hoverId, pr);
+								input.onSelectWorkspace?.(hoverId);
+							}
+						}, "l14", $scope4_id),
 						sessions: hoverId === ws.id && input.sessions ? input.sessions : allStatus[hoverId]?.sessions || [],
 						currentTab: hoverId === ws.id && view === "term" ? tab : null,
 						onOpenTab: _resume(function(sessionId) {
@@ -5263,19 +5274,19 @@ var side_nav_default = _template("l", (input) => {
 								tab = sessionId;
 								view = "term";
 							} else input.onOpenSession?.(hoverId, sessionId);
-						}, "l13", $scope4_id),
+						}, "l15", $scope4_id),
 						onRenameSession: input.onRenameSession,
 						onCloseSession: input.onCloseSession
 					});
 					_html(`</div>${_el_resume($scope4_id, "a")}`);
-					_script($scope4_id, "l16");
-					_subscribe($si__input_allStatus && $allStatus__closures, _subscribe($si__input_workspace__OR__input_allWorkspaces && $workspaces__closures, _subscribe($view__closures, _subscribe($tab__closures, _subscribe($si__input_workspace && $ws_id__closures, _subscribe($si__input_onCloseSession && $input_onCloseSession__closures, _subscribe($si__input_onRenameSession && $input_onRenameSession__closures, _subscribe($si__input_sessions && $input_sessions__closures, _subscribe($si__input_onNewSession && $input_onNewSession__closures, _subscribe($si__input_agents && $input_agents__closures, _subscribe($si__input_onSelectWorkspace && $input_onSelectWorkspace__closures, writeScope($scope4_id, {
+					_script($scope4_id, "l18");
+					_subscribe($si__input_allStatus && $allStatus__closures, _subscribe($si__input_workspace__OR__input_allWorkspaces && $workspaces__closures, _subscribe($view__closures, _subscribe($tab__closures, _subscribe($si__input_workspace && $ws_id__closures, _subscribe($si__input_onCloseSession && $input_onCloseSession__closures, _subscribe($si__input_onRenameSession && $input_onRenameSession__closures, _subscribe($si__input_sessions && $input_sessions__closures, _subscribe($si__input_onReviewOpened && $input_onReviewOpened__closures, _subscribe($si__input_onNewSession && $input_onNewSession__closures, _subscribe($si__input_agents && $input_agents__closures, _subscribe($si__input_onSelectWorkspace && $input_onSelectWorkspace__closures, writeScope($scope4_id, {
 						c: hoverId,
 						b: _existing_scope($childScope3),
-						Caz: $si__input_workspace && 1,
-						Cb4: $si__input_workspace__OR__input_allWorkspaces && 1,
-						Cb5: $si__input_allStatus && 1
-					}))))))))))));
+						Cb1: $si__input_workspace && 1,
+						Cb6: $si__input_workspace__OR__input_allWorkspaces && 1,
+						Cb7: $si__input_allStatus && 1
+					})))))))))))));
 					return 0;
 				}
 			}, $scope2_id, "b", 1, 1, 1, 0, 1);
@@ -5311,7 +5322,7 @@ var side_nav_default = _template("l", (input) => {
 			_html(`<button class=${notifyOn ? "\"icon-btn notify-btn on\"" : "\"icon-btn notify-btn\""} title=${notifyOn ? "\"Disable agent-waiting notifications\"" : "\"Notify when an agent is waiting\""}>`);
 			icon_bell_default({ size: 15 });
 			_html(`</button>${_el_resume($scope6_id, "a")}`);
-			_script($scope6_id, "l17");
+			_script($scope6_id, "l19");
 			writeScope($scope6_id, { _: _scope_with_id($scope0_id) });
 			return 0;
 		}
@@ -5321,8 +5332,8 @@ var side_nav_default = _template("l", (input) => {
 	_html(`</button>${_el_resume($scope0_id, "g")}<button class=icon-btn title="New workspace">`);
 	icon_folder_plus_default({ size: 16 });
 	_html(`</button>${_el_resume($scope0_id, "i")}</div></aside>${_el_resume($scope0_id, "b")}`);
-	_script($scope0_id, "l18");
-	_script($scope0_id, "l19");
+	_script($scope0_id, "l20");
+	_script($scope0_id, "l21");
 	writeScope($scope0_id, {
 		n: _serialize_if($scope0_reason, 6) && input.tab,
 		o: _serialize_if($scope0_reason, 5) && input.tabChange,
@@ -5337,61 +5348,111 @@ var side_nav_default = _template("l", (input) => {
 		a1: input.onManage,
 		a2: input.agents,
 		a3: input.onNewSession,
-		a4: input.sessions,
-		a5: input.onOpenSession,
-		a6: input.onRenameSession,
-		a7: input.onCloseSession,
-		a8: input.onUsage,
-		a9: input.onNew,
-		aa: _serialize_if($scope0_reason, 11) && ws,
-		ac: ws?.id,
-		ae: tab,
-		ag: view,
-		ai: drawerOpen,
-		ak: navOpen,
-		am: notifyOn,
-		ao: toggleNotify,
-		ap: itemIds,
-		aq: workspaces,
-		ar: allStatus,
-		af: input.tabChange || void 0,
-		ah: input.viewChange || void 0,
-		aj: input.drawerOpenChange || void 0,
-		az: $si__input_workspace && $ws_id__closures,
-		b4: $si__input_workspace__OR__input_allWorkspaces && $workspaces__closures,
-		b5: $si__input_allStatus && $allStatus__closures,
-		at: $si__input_onSelectWorkspace && $input_onSelectWorkspace__closures,
-		au: $si__input_agents && $input_agents__closures,
-		av: $si__input_onNewSession && $input_onNewSession__closures,
-		aw: $si__input_sessions && $input_sessions__closures,
-		ax: $si__input_onRenameSession && $input_onRenameSession__closures,
-		ay: $si__input_onCloseSession && $input_onCloseSession__closures,
-		b0: $tab__closures,
-		b1: $view__closures
+		a4: input.onReviewOpened,
+		a5: input.sessions,
+		a6: input.onOpenSession,
+		a7: input.onRenameSession,
+		a8: input.onCloseSession,
+		a9: input.onUsage,
+		aa: input.onNew,
+		ab: _serialize_if($scope0_reason, 11) && ws,
+		ad: ws?.id,
+		af: tab,
+		ah: view,
+		aj: drawerOpen,
+		al: navOpen,
+		an: notifyOn,
+		ap: toggleNotify,
+		aq: itemIds,
+		ar: workspaces,
+		as: allStatus,
+		ag: input.tabChange || void 0,
+		ai: input.viewChange || void 0,
+		ak: input.drawerOpenChange || void 0,
+		b1: $si__input_workspace && $ws_id__closures,
+		b6: $si__input_workspace__OR__input_allWorkspaces && $workspaces__closures,
+		b7: $si__input_allStatus && $allStatus__closures,
+		au: $si__input_onSelectWorkspace && $input_onSelectWorkspace__closures,
+		av: $si__input_agents && $input_agents__closures,
+		aw: $si__input_onNewSession && $input_onNewSession__closures,
+		ax: $si__input_onReviewOpened && $input_onReviewOpened__closures,
+		ay: $si__input_sessions && $input_sessions__closures,
+		az: $si__input_onRenameSession && $input_onRenameSession__closures,
+		b0: $si__input_onCloseSession && $input_onCloseSession__closures,
+		b2: $tab__closures,
+		b3: $view__closures
 	});
 	_resume_branch($scope0_id);
 });
 //#endregion
 //#region src/client/review.ts
-/** Render review comments as markdown, quoting the commented lines. */
+var CONTEXT = 3;
+/** Render review comments as markdown: per-repo base/head so the agent
+* can see if it has moved on, plus ±3 lines of numbered patch context
+* so the snippet is still locatable after a small edit. */
 function commentMarkdown(comments, repos) {
-	const byFile = /* @__PURE__ */ new Map();
-	for (const c of comments) {
-		const key = `${c.worktree}/${c.path}`;
-		byFile.set(key, [...byFile.get(key) || [], c]);
-	}
+	const byRepo = /* @__PURE__ */ new Map();
+	for (const c of comments) byRepo.set(c.worktree, [...byRepo.get(c.worktree) || [], c]);
 	const chunks = ["Review feedback:"];
-	for (const [key, list] of byFile) for (const c of list) {
-		const file = (repos || []).find((r) => r.worktree === c.worktree)?.files.find((f) => f.path === c.path);
-		const source = c.side === "deletions" ? file?.old : file?.new;
-		const lines = source ? source.split("\n").slice(c.line_start - 1, c.line_end).join("\n") : null;
-		const range = c.line_start === c.line_end ? `L${c.line_start}` : `L${c.line_start}-L${c.line_end}`;
-		chunks.push(`\n\`${key}\` ${range}:`);
-		if (lines != null) chunks.push("```\n" + lines + "\n```");
-		chunks.push(c.text);
+	let n = 0;
+	for (const [worktree, list] of byRepo) {
+		const repo = (repos || []).find((r) => r.worktree === worktree);
+		chunks.push("");
+		chunks.push(repoHeader(worktree, repo));
+		for (const c of list) {
+			n++;
+			const file = repo?.files.find((f) => f.path === c.path);
+			const source = c.side === "deletions" ? file?.old : file?.new;
+			const side = c.side === "deletions" ? "Old" : "New";
+			const range = c.line_start === c.line_end ? `line ${c.line_start}` : `lines ${c.line_start}-${c.line_end}`;
+			chunks.push("");
+			chunks.push(`${n}. **${c.path}** (${side} ${range})`);
+			if (source != null) {
+				const snippet = quoteRange(source, c.line_start, c.line_end, c.side);
+				const fence = markdownFence(snippet);
+				chunks.push("");
+				chunks.push(indent(`${fence}diff\n${snippet}\n${fence}`));
+			}
+			chunks.push("");
+			chunks.push(indent(c.text));
+		}
 	}
 	return chunks.join("\n");
 }
+function repoHeader(worktree, repo) {
+	if (!repo?.head) return `${worktree}/`;
+	const head = shortSha(repo.head);
+	const base = shortSha(repo.baseSha);
+	const branch = repo.pr?.headRefName || repo.branch || "HEAD";
+	return `${worktree}/${repo.pr ? ` #${repo.pr.number}` : ""} — \`${branch}\` ${head} vs \`${repo.base}\` ${base}`;
+}
+function shortSha(sha, n = 12) {
+	return sha.slice(0, n);
+}
+/** ±CONTEXT rows around the commented range, with +/- prefixes and
+* line numbers — same shape as codiff's review payload. */
+function quoteRange(source, start, end, side) {
+	const lines = source.split("\n");
+	const from = Math.max(1, start - CONTEXT);
+	const to = Math.min(lines.length, end + CONTEXT);
+	const mark = side === "deletions" ? "-" : "+";
+	const rows = [];
+	for (let i = from; i <= to; i++) {
+		const prefix = i >= start && i <= end ? mark : " ";
+		rows.push(`${prefix}${String(i).padStart(4)} | ${lines[i - 1] ?? ""}`);
+	}
+	return rows.join("\n");
+}
+function markdownFence(body) {
+	let ticks = 3;
+	const re = /`+/g;
+	let m;
+	while (m = re.exec(body)) ticks = Math.max(ticks, m[0].length + 1);
+	return "`".repeat(ticks);
+}
+function indent(text) {
+	return text.split("\n").map((line) => line ? `   ${line}` : line).join("\n");
+}
 /** Build hierarchical rows from a sorted file list: a path trie with
 * single-child directory chains compressed into one label (GitHub-style
 * "src/util" segments), each level indented by depth — labels stay short
@@ -5486,77 +5547,11 @@ _template("c", (input) => {
 	_resume_branch($scope0_id);
 });
 //#endregion
-//#region src/tags/prompt-dialog.marko
-var prompt_dialog_default = _template("i", (input) => {
-	const $scope0_reason = _scope_reason(), $sg__input_label = _serialize_guard($scope0_reason, 1), $sg__input_onCancel = _serialize_guard($scope0_reason, 2), $si__input_submitLabel = _serialize_if($scope0_reason, 3), $si__input_label = _serialize_if($scope0_reason, 1), $si__input_placeholder = _serialize_if($scope0_reason, 4);
-	const $scope0_id = _scope_id();
-	const $modalview_content__subscribers = /* @__PURE__ */ new Set();
-	const $input_submitLabel__closures = /* @__PURE__ */ new Set();
-	const $value__closures = /* @__PURE__ */ new Set();
-	const $input_label__closures = /* @__PURE__ */ new Set();
-	const $input_placeholder__closures = /* @__PURE__ */ new Set();
-	let value = input.value || "";
-	const submit = _resume(() => {
-		const v = value.trim();
-		if (v) input.onSubmit(v);
-	}, "i1", $scope0_id);
-	_set_serialize_reason({
-		0: $sg__input_onCancel,
-		1: $sg__input_label,
-		2: $sg__input_onCancel
-	});
-	const $childScope = _peek_scope_id();
-	modal_view_default({
-		label: input.label,
-		class: "prompt-dlg",
-		onClose: _resume(function() {
-			input.onCancel();
-		}, "i2", $scope0_id),
-		footer: attrTag({ content: _content_resume("i5", () => {
-			_scope_reason();
-			const $scope1_id = _scope_id();
-			_html(`<button class="btn primary"${_attr("disabled", !value.trim())}>${_escape(input.submitLabel || "OK")}${_el_resume($scope1_id, "b", _serialize_guard($scope0_reason, 3))}</button>${_el_resume($scope1_id, "a")}<div class=spacer></div><button class=btn>Cancel</button>${_el_resume($scope1_id, "c")}`);
-			_script($scope1_id, "i3");
-			_subscribe($value__closures, _subscribe($si__input_submitLabel && $input_submitLabel__closures, writeScope($scope1_id, { _: _scope_with_id($scope0_id) })));
-			_resume_branch($scope1_id);
-		}, $scope0_id) }),
-		content: _content("i6", () => {
-			_scope_reason();
-			const $scope2_id = _scope_id();
-			_html(`<h2 class=prompt-title>${_escape(input.label)}${_el_resume($scope2_id, "a", $sg__input_label)}</h2><input${_attr_input_value($scope2_id, "b", value, _resume((_new_value) => {
-				value = _new_value;
-			}, "i0", $scope2_id))}${_attr("placeholder", input.placeholder)}>${_el_resume($scope2_id, "b")}`);
-			_script($scope2_id, "i4");
-			_subscribe($value__closures, _subscribe($si__input_placeholder && $input_placeholder__closures, _subscribe($si__input_label && $input_label__closures, _subscribe($modalview_content__subscribers, writeScope($scope2_id, {
-				_: _scope_with_id($scope0_id),
-				Cp: 1
-			})))));
-			_resume_branch($scope2_id);
-		})
-	});
-	_script($scope0_id, "i7");
-	writeScope($scope0_id, {
-		e: input.onSubmit,
-		g: input.onCancel,
-		h: input.submitLabel,
-		j: value,
-		l: submit,
-		B2: $modalview_content__subscribers,
-		n: $si__input_submitLabel && $input_submitLabel__closures,
-		p: $value__closures,
-		m: $si__input_label && $input_label__closures,
-		o: $si__input_placeholder && $input_placeholder__closures,
-		a: _serialize_if($scope0_reason, 0) && _existing_scope($childScope)
-	});
-	_resume_branch($scope0_id);
-});
-//#endregion
 //#region src/tags/diff-view.marko
 var api$3;
 var copyText;
 var getTermDims;
 var makeFileFilter;
-var CUSTOM = "__custom";
 var diff_view_default = _template("d", (input) => {
 	const $scope0_reason = _scope_reason(), $sg__input_onExit = _serialize_guard($scope0_reason, 1), $sg__input_sessions = _serialize_guard($scope0_reason, 0), $si__input_sessions = _serialize_if($scope0_reason, 0), $si__input_sessions_0_title = _serialize_if($scope0_reason, 2), $si__input_sessions_0_agent = _serialize_if($scope0_reason, 3);
 	const $scope0_id = _scope_id();
@@ -5585,16 +5580,15 @@ var diff_view_default = _template("d", (input) => {
 	let sending = false;
 	let sendTarget = null;
 	let fileFilter = "";
-	let baseRef = "";
+	let uncommitted = diffUncommitted();
 	let treeOpen = diffTreeOpen();
-	let askBase = false;
 	let collapsedDirs = /* @__PURE__ */ new Set();
 	let collapsedRepos = /* @__PURE__ */ new Set();
 	const toggleRepo = _resume((worktree) => {
 		const next = new Set(collapsedRepos);
 		if (!next.delete(worktree)) next.add(worktree);
 		collapsedRepos = next;
-	}, "d4", $scope0_id);
+	}, "d3", $scope0_id);
 	const nearBox = {
 		io: null,
 		cbs: null
@@ -5609,12 +5603,15 @@ var diff_view_default = _template("d", (input) => {
 		}, { rootMargin: "600px 0px" });
 		nearBox.cbs.set(el, cb);
 		nearBox.io.observe(el);
-	}, "d5", $scope0_id);
-	const load = _resume(async (base = baseRef) => {
+	}, "d4", $scope0_id);
+	const load = _resume(async (dirty = uncommitted) => {
 		loading = true;
 		error = null;
 		try {
-			const qs = base ? `?base=${encodeURIComponent(base)}` : "";
+			const q = new URLSearchParams();
+			if (dirty) q.set("uncommitted", "1");
+			if (input.focusPr) q.set("pr", input.focusPr);
+			const qs = q.size ? `?${q}` : "";
 			const [diffData, reviewData] = await Promise.all([api$3(`/api/workspaces/${input.workspaceId}/diff${qs}`), api$3(`/api/workspaces/${input.workspaceId}/review`)]);
 			repos = diffData;
 			comments = reviewData.comments || [];
@@ -5623,23 +5620,23 @@ var diff_view_default = _template("d", (input) => {
 			error = String(err.message || err);
 		}
 		loading = false;
-	}, "d6", $scope0_id);
+	}, "d5", $scope0_id);
 	const loadReview = _resume(async () => {
 		try {
 			const reviewData = await api$3(`/api/workspaces/${input.workspaceId}/review`);
 			comments = reviewData.comments || [];
 			viewed = new Set(reviewData.viewed || []);
 		} catch {}
-	}, "d7", $scope0_id);
+	}, "d6", $scope0_id);
 	const repoList = repos || [];
 	const allFiles = repoList.flatMap((r) => r.files.map((f) => ({
 		...f,
-		repo: r.worktree,
+		repo: r.id,
 		key: `${r.worktree}/${f.path}`
 	})));
 	const fileMatch = makeFileFilter(fileFilter);
 	const shownFiles = allFiles.filter((f) => fileMatch(f.key));
-	const filesByRepo = new Map(repoList.map((r) => [r.worktree, shownFiles.filter((f) => f.repo === r.worktree)]));
+	const filesByRepo = new Map(repoList.map((r) => [r.id, shownFiles.filter((f) => f.repo === r.id)]));
 	const commentsByFile = (() => {
 		const map = /* @__PURE__ */ new Map();
 		for (const c of comments) {
@@ -5648,12 +5645,8 @@ var diff_view_default = _template("d", (input) => {
 		}
 		return map;
 	})();
-	const defaultBranches = [...new Set(repoList.map((r) => r.default_branch).filter(Boolean))];
 	const sendPick = (input.sessions || []).some((s) => s.id === sendTarget) ? sendTarget : input.sessions?.[0]?.id ?? null;
-	const setBase = _resume((ref) => {
-		baseRef = ref;
-		load(ref);
-	}, "d8", $scope0_id);
+	const localDiffers = _resume((repo) => !!repo.pr && !!repo.localHead && (repo.localHead !== repo.head || repo.branch !== repo.pr.headRefName), "d7");
 	const toggleViewed = _resume((key) => {
 		const next = new Set(viewed);
 		const isViewed = !next.has(key);
@@ -5671,7 +5664,7 @@ var diff_view_default = _template("d", (input) => {
 		}).catch(() => {
 			error = "Saving viewed state failed — it may reset on reload.";
 		});
-	}, "d9", $scope0_id);
+	}, "d8", $scope0_id);
 	const saveComment = _resume(async (file, text) => {
 		const range = draft;
 		draft = null;
@@ -5693,11 +5686,11 @@ var diff_view_default = _template("d", (input) => {
 		} catch (err) {
 			error = String(err.message || err);
 		}
-	}, "d10", $scope0_id);
+	}, "d9", $scope0_id);
 	const removeComment = _resume(async (id) => {
 		comments = comments.filter((c) => c.id !== id);
 		await fetch(`/api/review-comments/${id}`, { method: "DELETE" });
-	}, "d11", $scope0_id);
+	}, "d10", $scope0_id);
 	const clearComments = _resume(async () => {
 		comments = [];
 		draft = null;
@@ -5706,7 +5699,7 @@ var diff_view_default = _template("d", (input) => {
 			headers: { "content-type": "application/json" },
 			body: JSON.stringify({ action: "clear" })
 		});
-	}, "d12", $scope0_id);
+	}, "d11", $scope0_id);
 	const copyMarkdown = _resume(async () => {
 		if (!await copyText(commentMarkdown(comments, repos))) {
 			error = "Copy failed — clipboard needs HTTPS on this browser.";
@@ -5717,7 +5710,7 @@ var diff_view_default = _template("d", (input) => {
 			copied = false;
 		}, 1500);
 		await clearComments();
-	}, "d13", $scope0_id);
+	}, "d12", $scope0_id);
 	const sendTo = _resume(async (sessionId) => {
 		if (!sessionId) return;
 		sending = true;
@@ -5737,57 +5730,57 @@ var diff_view_default = _template("d", (input) => {
 			error = String(err.message || err);
 			sending = false;
 		}
-	}, "d14", $scope0_id);
+	}, "d13", $scope0_id);
 	const jumpTo = _resume((key) => {
 		const el = ((scrollEl) => scrollEl())(_el_read_error).querySelector(`details[data-key="${CSS.escape(key)}"]`);
 		if (el) {
 			el.open = true;
 			el.scrollIntoView({ block: "start" });
 		}
-	}, "d15", $scope0_id);
+	}, "d14", $scope0_id);
 	_html(`<div class=diff-view><aside class=${!treeOpen ? "\"tree closed\"" : "tree"}>`);
-	_for_of(repoList.filter((r) => filesByRepo.get(r.worktree)?.length), (repo) => {
+	_for_of(repoList.filter((r) => filesByRepo.get(r.id)?.length), (repo) => {
 		const $scope5_id = _scope_id();
-		_html(`<div class=tree-repo><button class=${collapsedRepos.has(repo.worktree) ? "\"tree-repo-name mono closed\"" : "\"tree-repo-name mono\""}><span class=tree-chev>${collapsedRepos.has(repo.worktree) ? "▸" : "▾"}${_el_resume($scope5_id, "b")}</span><!>${_escape(repo.worktree)}${_el_resume($scope5_id, "c")}</button>${_el_resume($scope5_id, "a")}`);
+		_html(`<div class=tree-repo><button class=${collapsedRepos.has(repo.id) ? "\"tree-repo-name mono closed\"" : "\"tree-repo-name mono\""}><span class=tree-chev>${collapsedRepos.has(repo.id) ? "▸" : "▾"}${_el_resume($scope5_id, "b")}</span><!>${repo.pr ? `${_escape(`${repo.worktree}`)} #${_escape(`${repo.pr.number}`)}` : _escape(repo.worktree)}${_el_resume($scope5_id, "c")}</button>${_el_resume($scope5_id, "a")}`);
 		_if(() => {
-			if (!collapsedRepos.has(repo.worktree)) {
+			if (!collapsedRepos.has(repo.id)) {
 				const $scope6_id = _scope_id();
 				const $if_content4__dirKey__closures = /* @__PURE__ */ new Set();
-				const repoRows = treeRows(filesByRepo.get(repo.worktree) || []);
-				const dirKey = _resume((path) => `${repo.worktree}/${path}`, "d16", $scope6_id);
-				const rowDir = _resume((row) => row.kind === "dir" ? row.path : row.file.path.includes("/") ? row.file.path.slice(0, row.file.path.lastIndexOf("/")) : "", "d17");
+				const repoRows = treeRows(filesByRepo.get(repo.id) || []);
+				const dirKey = _resume((path) => `${repo.id}/${path}`, "d15", $scope6_id);
+				const rowDir = _resume((row) => row.kind === "dir" ? row.path : row.file.path.includes("/") ? row.file.path.slice(0, row.file.path.lastIndexOf("/")) : "", "d16");
 				const hiddenByCollapse = _resume((row) => {
 					const dir = rowDir(row);
 					for (const collapsed of collapsedDirs) {
 						const [wt, path] = [collapsed.slice(0, collapsed.indexOf("/")), collapsed.slice(collapsed.indexOf("/") + 1)];
-						if (wt !== repo.worktree) continue;
+						if (wt !== repo.id) continue;
 						if (row.kind === "dir" && row.path === path) continue;
 						if (dir === path || dir.startsWith(`${path}/`)) return true;
 					}
 					return false;
-				}, "d18", $scope6_id);
+				}, "d17", $scope6_id);
 				_for_of(repoRows, (row) => {
 					const $scope7_id = _scope_id();
 					_if(() => {
 						if (!hiddenByCollapse(row) && row.kind === "dir") {
 							const $scope22_id = _scope_id();
 							_html(`<button class=${collapsedDirs.has(dirKey(row.path)) ? "\"tree-dir dim mono closed\"" : "\"tree-dir dim mono\""}${_attr("title", row.path)}${_attr_style(`padding-left:${.35 + row.depth * .75}rem`)}><span class=tree-chev>${collapsedDirs.has(dirKey(row.path)) ? "▸" : "▾"}${_el_resume($scope22_id, "b")}</span>${_escape(row.label)}${_el_resume($scope22_id, "c")}/</button>${_el_resume($scope22_id, "a")}`);
-							_script($scope22_id, "d26");
-							_subscribe($if_content4__dirKey__closures, _subscribe($collapsedDirs__closures, writeScope($scope22_id, { Cca: 1 })));
+							_script($scope22_id, "d23");
+							_subscribe($if_content4__dirKey__closures, _subscribe($collapsedDirs__closures, writeScope($scope22_id, { Cc7: 1 })));
 							return 0;
 						} else if (!hiddenByCollapse(row) && row.kind !== "dir") {
 							const $scope8_id = _scope_id();
 							_html(`<button class=${viewed.has(row.file.key) ? "\"tree-file mono seen\"" : "\"tree-file mono\""}${_attr("title", row.file.path)}${_attr_style(`padding-left:${.5 + row.depth * .75}rem`)}><span${_attr_class(["status", row.file.status])}>${_escape(row.file.status)}${_el_resume($scope8_id, "c")}</span>${_el_resume($scope8_id, "b")}<span class=tree-file-name>${_escape(row.name)}${_el_resume($scope8_id, "d")}</span>`);
 							_if(() => {
 								if (commentsByFile.has(row.file.key)) {
-									const $scope25_id = _scope_id();
+									const $scope27_id = _scope_id();
 									_html("<span class=tree-note>💬</span>");
-									writeScope($scope25_id, {});
+									writeScope($scope27_id, {});
 									return 0;
 								}
 							}, $scope8_id, "e", 1, 1, 1, 0, 1);
 							_html(`</button>${_el_resume($scope8_id, "a")}`);
-							_script($scope8_id, "d27");
+							_script($scope8_id, "d24");
 							_subscribe($commentsByFile__closures, _subscribe($viewed__closures, writeScope($scope8_id, {})));
 							return 1;
 						}
@@ -5813,9 +5806,9 @@ var diff_view_default = _template("d", (input) => {
 			}
 		}, $scope5_id, "d");
 		_html("</div>");
-		_script($scope5_id, "d28");
-		writeScope($scope5_id, { g: repo?.worktree });
-	}, "worktree", $scope0_id, "a", 1, 1, 1, "</aside>", 1);
+		_script($scope5_id, "d25");
+		writeScope($scope5_id, { g: repo?.id });
+	}, "id", $scope0_id, "a", 1, 1, 1, "</aside>", 1);
 	_html("<div class=diff-col><div class=diff-head>");
 	_if(() => {
 		if (input.onExit) {
@@ -5823,7 +5816,7 @@ var diff_view_default = _template("d", (input) => {
 			_html("<button class=icon-btn title=\"Back to terminal\">");
 			icon_back_default({ size: 14 });
 			_html(`</button>${_el_resume($scope1_id, "a")}`);
-			_script($scope1_id, "d29");
+			_script($scope1_id, "d26");
 			writeScope($scope1_id, { _: _scope_with_id($scope0_id) });
 			return 0;
 		}
@@ -5837,7 +5830,7 @@ var diff_view_default = _template("d", (input) => {
 				if ((input.sessions || []).length === 1) {
 					const $scope3_id = _scope_id();
 					_html(`<button class="btn primary"${_attr("disabled", sending)}>${sending ? "Sending…" : `Send to ${_escape(`${input.sessions[0].title || input.sessions[0].agent}`)}`}${_el_resume($scope3_id, "b")}</button>${_el_resume($scope3_id, "a")}`);
-					_script($scope3_id, "d30");
+					_script($scope3_id, "d27");
 					_subscribe($sending__closures, _subscribe($si__input_sessions_0_agent && $input_sessions_0_agent__closures, _subscribe($si__input_sessions_0_title && $input_sessions_0_title__closures, writeScope($scope3_id, { _: _scope_with_id($scope2_id) }))));
 					return 0;
 				} else if ((input.sessions || []).length) {
@@ -5848,30 +5841,30 @@ var diff_view_default = _template("d", (input) => {
 					}, "d0", $scope4_id), () => {
 						_html(`<select aria-label="Send comments to session"${_attr("disabled", sending)}>`);
 						_for_of(input.sessions, (s) => {
-							const $scope26_id = _scope_id();
-							_html(`<option${_attr_option_value(s.id)}>${_escape(s.title || s.agent)}${_el_resume($scope26_id, "b", $sg__input_sessions)}</option>${_el_resume($scope26_id, "a", $sg__input_sessions)}`);
-							$si__input_sessions && writeScope($scope26_id, {});
+							const $scope28_id = _scope_id();
+							_html(`<option${_attr_option_value(s.id)}>${_escape(s.title || s.agent)}${_el_resume($scope28_id, "b", $sg__input_sessions)}</option>${_el_resume($scope28_id, "a", $sg__input_sessions)}`);
+							$si__input_sessions && writeScope($scope28_id, {});
 						}, "id", $scope4_id, "c", $sg__input_sessions, 1, $sg__input_sessions, "</select>", 1);
 					});
 					_html("</span>");
-					_script($scope4_id, "d31");
+					_script($scope4_id, "d28");
 					_subscribe($sendTarget__closures, _subscribe($sending__closures, _subscribe($si__input_sessions && $input_sessions__closures, writeScope($scope4_id, {
 						_: _scope_with_id($scope2_id),
-						Cc6: 1
+						Cc3: 1
 					}))));
 					return 1;
 				}
 			}, $scope2_id, "c", $sg__input_sessions, $sg__input_sessions, $sg__input_sessions, 0, 1);
-			_script($scope2_id, "d32");
+			_script($scope2_id, "d29");
 			writeScope($scope2_id, {});
 			return 0;
 		}
 	}, $scope0_id, "g", 1, 1, 1, "</span>");
 	_if(() => {
 		if (loading) {
-			const $scope27_id = _scope_id();
+			const $scope29_id = _scope_id();
 			_html("<span class=\"refresh-chip dim\"><span class=spin></span>Refreshing…</span>");
-			writeScope($scope27_id, {});
+			writeScope($scope29_id, {});
 			return 0;
 		}
 	}, $scope0_id, "h", 1, 1, 1, 0, 1);
@@ -5881,55 +5874,49 @@ var diff_view_default = _template("d", (input) => {
 	icon_refresh_default({ size: 14 });
 	_html(`</button>${_el_resume($scope0_id, "k")}<button class="btn files-btn" title="Jump to file">Files (<!>${_escape(shownFiles.length)}${_el_resume($scope0_id, "n")})</button>${_el_resume($scope0_id, "m")}<input${_attr_input_value($scope0_id, "o", fileFilter, _resume((_new_fileFilter) => {
 		fileFilter = _new_fileFilter;
-	}, "d1", $scope0_id))} class=file-filter placeholder="Filter files… (globs, !excludes)" aria-label="Filter files">${_el_resume($scope0_id, "o")}`);
-	_attr_select_value($scope0_id, "p", baseRef, _resume(function(v) {
-		if (v === CUSTOM) askBase = true;
-		else setBase(v);
-	}, "d2", $scope0_id), () => {
-		_html(`<select class=base-pick aria-label="Compare against"><option${_attr_option_value("")}>vs base</option>`);
-		_for_of(defaultBranches, (branch) => {
-			const $scope28_id = _scope_id();
-			_html(`<option${_attr_option_value(branch)}>vs <!>${_escape(branch)}${_el_resume($scope28_id, "b")}</option>${_el_resume($scope28_id, "a")}`);
-			writeScope($scope28_id, {});
-		}, (b) => b, $scope0_id, "q", 1, 1, 1, 0, 1);
-		_if(() => {
-			if (baseRef && !defaultBranches.includes(baseRef)) {
-				const $scope19_id = _scope_id();
-				_html(`<option${_attr_option_value(baseRef)}>vs <!>${_escape(baseRef)}${_el_resume($scope19_id, "b")}</option>${_el_resume($scope19_id, "a")}`);
-				writeScope($scope19_id, {});
-				return 0;
-			}
-		}, $scope0_id, "r", 1, 1, 1, 0, 1);
-		_html(`<option${_attr_option_value(CUSTOM)}>custom…</option></select>`);
-	});
-	_html(`${_el_resume($scope0_id, "p")}</div><div class=diff-main>`);
+	}, "d1", $scope0_id))} class=file-filter placeholder="Filter files… (globs, !excludes)" aria-label="Filter files">${_el_resume($scope0_id, "o")}<label class=two-dot title="Include uncommitted and untracked files in the review. Off by default — the review is commit-to-commit."><input${_attr_input_checked($scope0_id, "p", uncommitted)} type=checkbox>${_el_resume($scope0_id, "p")} include uncommitted</label></div><div class=diff-main>`);
 	_if(() => {
 		if (error) {
 			const $scope17_id = _scope_id();
 			_html(`<p class=toast-error>${_escape(error)}${_el_resume($scope17_id, "a")} <button>×</button>${_el_resume($scope17_id, "b")}</p>`);
-			_script($scope17_id, "d33");
+			_script($scope17_id, "d30");
 			writeScope($scope17_id, {});
 			return 0;
 		}
-	}, $scope0_id, "u", 1, 1, 1, 0, 1);
+	}, $scope0_id, "r", 1, 1, 1, 0, 1);
 	_for_of(repoList.filter((r) => r.baseMissing), (repo) => {
-		const $scope29_id = _scope_id();
-		_html(`<p class=toast-error>${_escape(repo.worktree)}${_el_resume($scope29_id, "a")}: base <!>${_escape(repo.base)}${_el_resume($scope29_id, "b")} not found — showing uncommitted changes only.</p>`);
-		writeScope($scope29_id, {});
-	}, "worktree", $scope0_id, "v", 1, 1, 1, 0, 1);
+		const $scope19_id = _scope_id();
+		_html(`<p class=toast-error>${_escape(repo.worktree)}${_el_resume($scope19_id, "a")}: base <!>${_escape(repo.base)}${_el_resume($scope19_id, "b")} not found<!>${uncommitted ? " — showing uncommitted changes only" : ""}${_el_resume($scope19_id, "c")}.</p>`);
+		writeScope($scope19_id, {});
+	}, "id", $scope0_id, "s", 1, 1, 1, 0, 1);
+	_for_of(repoList.filter((r) => r.contained && r.files.length), (repo) => {
+		const $scope20_id = _scope_id();
+		_html(`<p class=dim>${_escape(repo.worktree)}${_el_resume($scope20_id, "a")}<!>${repo.pr ? ` #${_escape(`${repo.pr.number}`)}` : ""}${_el_resume($scope20_id, "b")}: already in <!>${_escape(repo.base)}${_el_resume($scope20_id, "c")}<!>${uncommitted ? " — showing uncommitted changes only" : ""}${_el_resume($scope20_id, "d")}.</p>`);
+		writeScope($scope20_id, {});
+	}, "id", $scope0_id, "t", 1, 1, 1, 0, 1);
+	_for_of(repoList.filter((r) => r.githubDrift), (repo) => {
+		const $scope30_id = _scope_id();
+		_html(`<p class=toast-error>${_escape(repo.worktree)}${_el_resume($scope30_id, "a")} #<!>${_escape(repo.pr.number)}${_el_resume($scope30_id, "b")}: origin/<!>${_escape(repo.pr.headRefName)}${_el_resume($scope30_id, "c")} is <!>${_escape(shortSha(repo.head))}${_el_resume($scope30_id, "d")}, GitHub last saw <!>${_escape(shortSha(repo.pr.headRefOid))}${_el_resume($scope30_id, "e")}.</p>`);
+		writeScope($scope30_id, {});
+	}, "id", $scope0_id, "u", 1, 1, 1, 0, 1);
+	_for_of(repoList.filter(localDiffers), (repo) => {
+		const $scope21_id = _scope_id();
+		_html(`<p class=dim>${_escape(repo.worktree)}${_el_resume($scope21_id, "a")} #<!>${_escape(repo.pr.number)}${_el_resume($scope21_id, "b")}: this view is <!>${_escape(shortSha(repo.head))}${_el_resume($scope21_id, "c")} (<!>${_escape(repo.pr.headRefName)}${_el_resume($scope21_id, "d")}). Local is <!>${_escape(shortSha(repo.localHead))}${_el_resume($scope21_id, "e")} (<!>${_escape(repo.branch)}${_el_resume($scope21_id, "f")}<!>${uncommitted ? ", plus uncommitted" : ""}${_el_resume($scope21_id, "g")}).</p>`);
+		writeScope($scope21_id, {});
+	}, "id", $scope0_id, "v", 1, 1, 1, 0, 1);
 	_if(() => {
 		if (!repos && loading) {
-			const $scope30_id = _scope_id();
+			const $scope31_id = _scope_id();
 			_html("<div class=diff-skel><p class=dim><span class=spin></span>Loading diff…</p><div class=skel-row></div><div class=skel-row></div><div class=skel-row></div></div>");
-			writeScope($scope30_id, {});
+			writeScope($scope31_id, {});
 			return 0;
 		}
 	}, $scope0_id, "w", 1, 1, 1, 0, 1);
 	_if(() => {
 		if (repos && !allFiles.length) {
-			const $scope20_id = _scope_id();
-			_html(`<p class="dim center-pad">No changes vs <!>${_escape(baseRef || "base")}${_el_resume($scope20_id, "a")}.</p>`);
-			writeScope($scope20_id, {});
+			const $scope25_id = _scope_id();
+			_html(`<p class="dim center-pad">${repoList.some((r) => r.pr) ? "No file changes on these PRs." : "No changes vs base."}${_el_resume($scope25_id, "a")}</p>`);
+			writeScope($scope25_id, {});
 			return 0;
 		} else if (repos && !shownFiles.length) {
 			const $scope18_id = _scope_id();
@@ -5940,26 +5927,106 @@ var diff_view_default = _template("d", (input) => {
 	}, $scope0_id, "x", 1, 1, 1, 0, 1);
 	_for_of(repoList, (repo) => {
 		const $scope9_id = _scope_id();
-		const $for_content3__repo_worktree__closures = /* @__PURE__ */ new Set();
-		const $for_content3__repo_full_name__closures = /* @__PURE__ */ new Set();
+		const $for_content3__repo_pr_number__closures = /* @__PURE__ */ new Set();
+		const $for_content3__repo_pr_url__closures = /* @__PURE__ */ new Set();
+		const $for_content3__repo_pr_title__closures = /* @__PURE__ */ new Set();
+		const $for_content3__repo_pr_headRefName__closures = /* @__PURE__ */ new Set();
+		const $for_content3__repo_head__closures = /* @__PURE__ */ new Set();
 		const $for_content3__repo_base__closures = /* @__PURE__ */ new Set();
+		const $for_content3__repo_baseSha__closures = /* @__PURE__ */ new Set();
+		const $for_content3__repo_full_name__closures = /* @__PURE__ */ new Set();
+		const $for_content3__repo_branch__closures = /* @__PURE__ */ new Set();
+		const $for_content3__repo_localHead__closures = /* @__PURE__ */ new Set();
+		const $for_content3__repo__closures = /* @__PURE__ */ new Set();
+		const $for_content3__repo_id__closures = /* @__PURE__ */ new Set();
+		const $for_content3__repo_pr__closures = /* @__PURE__ */ new Set();
+		const $for_content3__repo_worktree__closures = /* @__PURE__ */ new Set();
 		const $for_content3__repoFiles__closures = /* @__PURE__ */ new Set();
-		const repoFiles = filesByRepo.get(repo.worktree) || [];
+		const repoFiles = filesByRepo.get(repo.id) || [];
 		_if(() => {
 			if (repoFiles.length) {
 				const $scope10_id = _scope_id();
-				_html("<section class=repo-section>");
+				_html(`<section class=repo-section${repo.pr ? _attr("data-pr", `${repo.worktree}/${repo.pr.number}`) : ""}>`);
 				_if(() => {
 					if (repoList.length > 1) {
 						const $scope23_id = _scope_id();
-						_html(`<button class=${collapsedRepos.has(repo.worktree) ? "\"repo-sep closed\"" : "repo-sep"}><span class=tree-chev>${collapsedRepos.has(repo.worktree) ? "▸" : "▾"}${_el_resume($scope23_id, "b")}</span><span class=mono>${_escape(repo.worktree)}${_el_resume($scope23_id, "c")}</span><span class=dim>${_escape(repo.full_name)}${_el_resume($scope23_id, "d")}</span><span class=chip>vs <!>${_escape(repo.base)}${_el_resume($scope23_id, "e")}</span></button>${_el_resume($scope23_id, "a")}`);
-						_script($scope23_id, "d34");
-						_subscribe($for_content3__repo_base__closures, _subscribe($for_content3__repo_full_name__closures, _subscribe($for_content3__repo_worktree__closures, _subscribe($collapsedRepos__closures, writeScope($scope23_id, { Ccb: 1 })))));
+						_html(`<button class=${collapsedRepos.has(repo.id) ? "\"repo-sep closed\"" : "repo-sep"}><span class=tree-chev>${collapsedRepos.has(repo.id) ? "▸" : "▾"}${_el_resume($scope23_id, "b")}</span><span class=mono>${_escape(repo.worktree)}${_el_resume($scope23_id, "c")}</span>`);
+						_if(() => {
+							if (repo.pr) {
+								const $scope32_id = _scope_id();
+								_html(`<a class="chip pr"${_attr("href", `${repo.pr.url}/files`)} target=_blank rel=noopener${_attr("title", `${repo.pr.title} — ${repo.pr.headRefName} ${repo.head} vs ${repo.base} ${repo.baseSha}`)}>#<!>${_escape(repo.pr.number)}${_el_resume($scope32_id, "b")}</a>${_el_resume($scope32_id, "a")}<span class=dim>${_escape(repo.pr.title)}${_el_resume($scope32_id, "c")}</span>`);
+								_script($scope32_id, "d31");
+								_subscribe($for_content3__repo_baseSha__closures, _subscribe($for_content3__repo_base__closures, _subscribe($for_content3__repo_head__closures, _subscribe($for_content3__repo_pr_headRefName__closures, _subscribe($for_content3__repo_pr_title__closures, _subscribe($for_content3__repo_pr_url__closures, _subscribe($for_content3__repo_pr_number__closures, writeScope($scope32_id, {
+									Ca1: 2,
+									Ca2: 2,
+									Ca3: 2
+								}))))))));
+								return 0;
+							} else {
+								const $scope33_id = _scope_id();
+								_html(`<span class=dim>${_escape(repo.full_name)}${_el_resume($scope33_id, "a")}</span>`);
+								_subscribe($for_content3__repo_full_name__closures, writeScope($scope33_id, {}));
+								return 1;
+							}
+						}, $scope23_id, "d");
+						_html(`<span class="chip lane"${_attr("title", `${repo.pr ? "PR head" : "checked out"} ${repo.pr ? repo.pr.headRefName : repo.branch} ${repo.head}`)}>on <!>${repo.pr ? _escape(repo.pr.headRefName) : _escape(repo.branch)}${_el_resume($scope23_id, "f")}</span>${_el_resume($scope23_id, "e")}<span class=chip${_attr("title", `${repo.base} ${repo.baseSha}`)}>vs <!>${_escape(repo.base)}${_el_resume($scope23_id, "h")}</span>${_el_resume($scope23_id, "g")}`);
+						_if(() => {
+							if (localDiffers(repo)) {
+								const $scope34_id = _scope_id();
+								_html(`<span class=chip${_attr("title", `checked out ${repo.branch} ${repo.localHead}`)}>local <!>${_escape(repo.branch)}${_el_resume($scope34_id, "b")}</span>${_el_resume($scope34_id, "a")}`);
+								_subscribe($for_content3__repo_localHead__closures, _subscribe($for_content3__repo_branch__closures, writeScope($scope34_id, { Ca5: 2 })));
+								return 0;
+							}
+						}, $scope23_id, "i", 1, 1, 1, 0, 1);
+						_html(`</button>${_el_resume($scope23_id, "a")}`);
+						_script($scope23_id, "d32");
+						_subscribe($for_content3__repo_branch__closures, _subscribe($for_content3__repo_baseSha__closures, _subscribe($for_content3__repo_base__closures, _subscribe($for_content3__repo_head__closures, _subscribe($for_content3__repo_worktree__closures, _subscribe($for_content3__repo_pr__closures, _subscribe($for_content3__repo_id__closures, _subscribe($for_content3__repo__closures, _subscribe($collapsedRepos__closures, writeScope($scope23_id, { Cc8: 1 }))))))))));
 						return 0;
+					} else {
+						const $scope26_id = _scope_id();
+						_html("<p class=repo-meta>");
+						_if(() => {
+							if (repo.pr) {
+								const $scope35_id = _scope_id();
+								_html(`<a class="chip pr"${_attr("href", `${repo.pr.url}/files`)} target=_blank rel=noopener${_attr("title", `${repo.pr.title} — ${repo.pr.headRefName} ${repo.head} vs ${repo.base} ${repo.baseSha}`)}>#<!>${_escape(repo.pr.number)}${_el_resume($scope35_id, "b")}</a>${_el_resume($scope35_id, "a")}<span class=dim>${_escape(repo.pr.title)}${_el_resume($scope35_id, "c")}</span>`);
+								_subscribe($for_content3__repo_baseSha__closures, _subscribe($for_content3__repo_base__closures, _subscribe($for_content3__repo_head__closures, _subscribe($for_content3__repo_pr_headRefName__closures, _subscribe($for_content3__repo_pr_title__closures, _subscribe($for_content3__repo_pr_url__closures, _subscribe($for_content3__repo_pr_number__closures, writeScope($scope35_id, {
+									Cx: 1,
+									Cy: 1,
+									Cz: 1,
+									Ca0: 1,
+									Ca1: 3,
+									Ca2: 3,
+									Ca3: 3
+								}))))))));
+								return 0;
+							}
+						}, $scope26_id, "a");
+						_html(`<span class="chip lane"${_attr("title", `${repo.pr ? "PR head" : "checked out"} ${repo.pr ? repo.pr.headRefName : repo.branch} ${repo.head}`)}>on <!>${repo.pr ? _escape(repo.pr.headRefName) : _escape(repo.branch)}${_el_resume($scope26_id, "c")}</span>${_el_resume($scope26_id, "b")}<span class=chip${_attr("title", `${repo.base} ${repo.baseSha}`)}>vs <!>${_escape(repo.base)}${_el_resume($scope26_id, "e")}</span>${_el_resume($scope26_id, "d")}`);
+						_if(() => {
+							if (localDiffers(repo)) {
+								const $scope36_id = _scope_id();
+								_html(`<span class=chip${_attr("title", `checked out ${repo.branch} ${repo.localHead}`)}>local <!>${_escape(repo.branch)}${_el_resume($scope36_id, "b")}</span>${_el_resume($scope36_id, "a")}`);
+								_subscribe($for_content3__repo_localHead__closures, _subscribe($for_content3__repo_branch__closures, writeScope($scope36_id, {
+									Ca5: 3,
+									Ca6: 1
+								})));
+								return 0;
+							}
+						}, $scope26_id, "f", 1, 1, 1, 0, 1);
+						_html("</p>");
+						_subscribe($for_content3__repo_branch__closures, _subscribe($for_content3__repo_baseSha__closures, _subscribe($for_content3__repo_base__closures, _subscribe($for_content3__repo_head__closures, _subscribe($for_content3__repo_pr__closures, _subscribe($for_content3__repo__closures, writeScope($scope26_id, {
+							Ct: 1,
+							Cv: 1,
+							Ca1: 1,
+							Ca2: 1,
+							Ca3: 1,
+							Ca5: 1
+						})))))));
+						return 1;
 					}
-				}, $scope10_id, "a", 1, 1, 1, 0, 1);
+				}, $scope10_id, "b", 1, 1, 1, 0, 1);
 				_if(() => {
-					if (!(repoList.length > 1 && collapsedRepos.has(repo.worktree))) {
+					if (!(repoList.length > 1 && collapsedRepos.has(repo.id))) {
 						const $scope11_id = _scope_id();
 						_html("<div class=files>");
 						_for_of(repoFiles, (file) => {
@@ -5972,30 +6039,30 @@ var diff_view_default = _template("d", (input) => {
 							_html(`<details${_attr_details_or_dialog_open($scope12_id, "a", expanded)} class=file${_attr("data-key", file.key)}><summary><span${_attr_class(["status", file.status])}>${_escape(file.status)}${_el_resume($scope12_id, "c")}</span>${_el_resume($scope12_id, "b")}<span class=path${_attr("title", file.path)}><bdi>${_escape(file.path)}${_el_resume($scope12_id, "e")}</bdi></span>${_el_resume($scope12_id, "d")}`);
 							_if(() => {
 								if (fileComments.length) {
-									const $scope31_id = _scope_id();
-									_html(`<span class=chip>💬 <!>${_escape(fileComments.length)}${_el_resume($scope31_id, "a")}</span>`);
-									writeScope($scope31_id, {});
+									const $scope37_id = _scope_id();
+									_html(`<span class=chip>💬 <!>${_escape(fileComments.length)}${_el_resume($scope37_id, "a")}</span>`);
+									writeScope($scope37_id, {});
 									return 0;
 								}
 							}, $scope12_id, "f", 1, 1, 1, 0, 1);
 							_html(`<label class=viewed><input${_attr_input_checked($scope12_id, "h", viewed.has(file.key), _resume(function() {
 								toggleViewed(file.key);
-							}, "d3", $scope12_id))} type=checkbox>${_el_resume($scope12_id, "h")}<span class=dim>viewed</span></label>${_el_resume($scope12_id, "g")}</summary>`);
+							}, "d2", $scope12_id))} type=checkbox>${_el_resume($scope12_id, "h")}<span class=dim>viewed</span></label>${_el_resume($scope12_id, "g")}</summary>`);
 							_if(() => {
 								if (file.binary) {
-									const $scope32_id = _scope_id();
+									const $scope38_id = _scope_id();
 									_html("<p class=\"dim diff-pad\">binary file</p>");
-									writeScope($scope32_id, {});
+									writeScope($scope38_id, {});
 									return 0;
 								} else if (file.tooLarge) {
-									const $scope33_id = _scope_id();
+									const $scope39_id = _scope_id();
 									_html("<p class=\"dim diff-pad\">file too large to display</p>");
-									writeScope($scope33_id, {});
+									writeScope($scope39_id, {});
 									return 1;
 								} else if (file.old == null && file.new == null) {
-									const $scope34_id = _scope_id();
+									const $scope40_id = _scope_id();
 									_html("<p class=\"dim diff-pad\">file could not be read</p>");
-									writeScope($scope34_id, {});
+									writeScope($scope40_id, {});
 									return 2;
 								} else if (expanded) {
 									const $scope15_id = _scope_id();
@@ -6003,7 +6070,7 @@ var diff_view_default = _template("d", (input) => {
 										{
 											const $scope24_id = _scope_id();
 											_html(`<div class=diff-wait></div>${_el_resume($scope24_id, "a")}`);
-											_script($scope24_id, "d35");
+											_script($scope24_id, "d33");
 											writeScope($scope24_id, {});
 											return 0;
 										}
@@ -6013,7 +6080,7 @@ var diff_view_default = _template("d", (input) => {
 								}
 							}, $scope12_id, "i");
 							_html(`</details>${_el_resume($scope12_id, "a")}`);
-							_script($scope12_id, "d36");
+							_script($scope12_id, "d34");
 							_subscribe($toggleViewed2__closures, _subscribe($commentsByFile__closures, _subscribe($viewed__closures, writeScope($scope12_id, {
 								k: file,
 								l: file?.key,
@@ -6027,57 +6094,59 @@ var diff_view_default = _template("d", (input) => {
 								z: $for_content4__file__closures,
 								a0: $for_content4__file_key__closures,
 								a1: $for_content4__fileComments__closures,
-								Cc1: 1,
-								Cch: 1
+								Cby: 1,
+								Ccf: 1
 							}))));
 						}, "key", $scope11_id, "a", 1, 1, 1, "</div>", 1);
 						_subscribe($for_content3__repoFiles__closures, writeScope($scope11_id, {}));
 						return 0;
 					}
-				}, $scope10_id, "b", 1, 1, 1, 0, 1);
-				_html("</section>");
+				}, $scope10_id, "c", 1, 1, 1, 0, 1);
+				_html(`</section>${_el_resume($scope10_id, "a")}`);
 				_subscribe($repoList_length__closures, _subscribe($collapsedRepos__closures, writeScope($scope10_id, {})));
 				return 0;
 			}
 		}, $scope9_id, "a", 1, 1, 1, 0, 1);
 		writeScope($scope9_id, {
-			d: repo?.worktree,
-			f: repo?.full_name,
-			g: repo?.base,
-			h: repoFiles,
-			j: $for_content3__repo_worktree__closures,
-			k: $for_content3__repo_full_name__closures,
-			l: $for_content3__repo_base__closures,
-			m: $for_content3__repoFiles__closures
+			c: repo,
+			d: repo?.id,
+			f: repo?.pr,
+			g: repo?.worktree,
+			h: repo?.pr?.number,
+			i: repo?.pr?.url,
+			j: repo?.pr?.title,
+			k: repo?.pr?.headRefName,
+			l: repo?.head,
+			m: repo?.base,
+			n: repo?.baseSha,
+			o: repo?.full_name,
+			p: repo?.branch,
+			q: repo?.localHead,
+			r: repoFiles,
+			x: $for_content3__repo_pr_number__closures,
+			y: $for_content3__repo_pr_url__closures,
+			z: $for_content3__repo_pr_title__closures,
+			a0: $for_content3__repo_pr_headRefName__closures,
+			a1: $for_content3__repo_head__closures,
+			a2: $for_content3__repo_base__closures,
+			a3: $for_content3__repo_baseSha__closures,
+			a4: $for_content3__repo_full_name__closures,
+			a5: $for_content3__repo_branch__closures,
+			a6: $for_content3__repo_localHead__closures,
+			t: $for_content3__repo__closures,
+			u: $for_content3__repo_id__closures,
+			v: $for_content3__repo_pr__closures,
+			w: $for_content3__repo_worktree__closures,
+			a7: $for_content3__repoFiles__closures
 		});
-	}, "worktree", $scope0_id, "y");
-	_html(`</div>${_el_resume($scope0_id, "t")}</div>`);
+	}, "id", $scope0_id, "y");
+	_html(`</div>${_el_resume($scope0_id, "q")}</div>`);
 	_if(() => {}, $scope0_id, "z");
 	_html("</div>");
-	_if(() => {
-		if (askBase) {
-			const $scope21_id = _scope_id();
-			const $childScope2 = _peek_scope_id();
-			prompt_dialog_default({
-				label: "Compare against ref",
-				placeholder: "branch, tag, or commit",
-				value: baseRef,
-				submitLabel: "Compare",
-				onSubmit: _resume(function(ref) {
-					askBase = false;
-					setBase(ref);
-				}, "d24", $scope21_id),
-				onCancel: _resume(function() {
-					askBase = false;
-				}, "d25", $scope21_id)
-			});
-			writeScope($scope21_id, { a: _existing_scope($childScope2) });
-			return 0;
-		}
-	}, $scope0_id, "a0");
-	_script($scope0_id, "d39");
-	_script($scope0_id, "d40");
+	_script($scope0_id, "d37");
+	_script($scope0_id, "d38");
 	writeScope($scope0_id, {
+		a2: input.focusPr,
 		a3: input.workspaceId,
 		a4: input.active,
 		a5: input.sessions,
@@ -6096,49 +6165,48 @@ var diff_view_default = _template("d", (input) => {
 		an: sending,
 		ao: sendTarget,
 		aq: fileFilter,
-		ar: baseRef,
+		ar: uncommitted,
 		at: treeOpen,
-		aw: collapsedDirs,
-		ax: collapsedRepos,
-		ay: toggleRepo,
-		b0: nearBox.cbs,
-		b1: nearBox.io,
-		b3: observeNear,
-		b4: load,
-		b5: loadReview,
-		b7: repoList,
-		b8: repoList.length,
-		b9: allFiles,
-		ba: allFiles?.length,
-		bb: fileMatch,
-		bd: shownFiles,
-		bh: filesByRepo,
-		bj: commentsByFile,
-		bk: defaultBranches,
-		bm: sendPick,
-		bn: setBase,
-		bp: toggleViewed,
-		bq: saveComment,
-		br: removeComment,
-		bs: clearComments,
-		bv: copyMarkdown,
-		bw: sendTo,
-		bx: jumpTo,
-		ca: $collapsedDirs__closures,
-		c1: $viewed__closures,
-		ch: $commentsByFile__closures,
-		cg: $filesByRepo__closures,
-		bz: $si__input_sessions_0_title && $input_sessions_0_title__closures,
-		c0: $si__input_sessions_0_agent && $input_sessions_0_agent__closures,
-		c6: $sending__closures,
-		by: $si__input_sessions && $input_sessions__closures,
-		c7: $sendTarget__closures,
-		cb: $collapsedRepos__closures,
-		c3: $draft__closures,
-		ck: $saveComment2__closures,
-		cl: $removeComment2__closures,
-		cj: $toggleViewed2__closures,
-		cd: $repoList_length__closures
+		av: collapsedDirs,
+		aw: collapsedRepos,
+		ax: toggleRepo,
+		az: nearBox.cbs,
+		b0: nearBox.io,
+		b2: observeNear,
+		b3: load,
+		b4: loadReview,
+		b6: repoList,
+		b7: repoList.length,
+		b8: allFiles,
+		b9: allFiles?.length,
+		ba: fileMatch,
+		bc: shownFiles,
+		bg: filesByRepo,
+		bi: commentsByFile,
+		bj: sendPick,
+		bk: localDiffers,
+		bm: toggleViewed,
+		bn: saveComment,
+		bo: removeComment,
+		bp: clearComments,
+		bs: copyMarkdown,
+		bt: sendTo,
+		bu: jumpTo,
+		c7: $collapsedDirs__closures,
+		by: $viewed__closures,
+		cf: $commentsByFile__closures,
+		ce: $filesByRepo__closures,
+		bw: $si__input_sessions_0_title && $input_sessions_0_title__closures,
+		bx: $si__input_sessions_0_agent && $input_sessions_0_agent__closures,
+		c3: $sending__closures,
+		bv: $si__input_sessions && $input_sessions__closures,
+		c4: $sendTarget__closures,
+		c8: $collapsedRepos__closures,
+		c0: $draft__closures,
+		ci: $saveComment2__closures,
+		cj: $removeComment2__closures,
+		ch: $toggleViewed2__closures,
+		cb: $repoList_length__closures
 	});
 	_resume_branch($scope0_id);
 });
@@ -6513,6 +6581,71 @@ var usage_stats_default = _template("n", (input) => {
 	_resume_branch($scope0_id);
 });
 //#endregion
+//#region src/tags/prompt-dialog.marko
+var prompt_dialog_default = _template("i", (input) => {
+	const $scope0_reason = _scope_reason(), $sg__input_label = _serialize_guard($scope0_reason, 1), $sg__input_onCancel = _serialize_guard($scope0_reason, 2), $si__input_submitLabel = _serialize_if($scope0_reason, 3), $si__input_label = _serialize_if($scope0_reason, 1), $si__input_placeholder = _serialize_if($scope0_reason, 4);
+	const $scope0_id = _scope_id();
+	const $modalview_content__subscribers = /* @__PURE__ */ new Set();
+	const $input_submitLabel__closures = /* @__PURE__ */ new Set();
+	const $value__closures = /* @__PURE__ */ new Set();
+	const $input_label__closures = /* @__PURE__ */ new Set();
+	const $input_placeholder__closures = /* @__PURE__ */ new Set();
+	let value = input.value || "";
+	const submit = _resume(() => {
+		const v = value.trim();
+		if (v) input.onSubmit(v);
+	}, "i1", $scope0_id);
+	_set_serialize_reason({
+		0: $sg__input_onCancel,
+		1: $sg__input_label,
+		2: $sg__input_onCancel
+	});
+	const $childScope = _peek_scope_id();
+	modal_view_default({
+		label: input.label,
+		class: "prompt-dlg",
+		onClose: _resume(function() {
+			input.onCancel();
+		}, "i2", $scope0_id),
+		footer: attrTag({ content: _content_resume("i5", () => {
+			_scope_reason();
+			const $scope1_id = _scope_id();
+			_html(`<button class="btn primary"${_attr("disabled", !value.trim())}>${_escape(input.submitLabel || "OK")}${_el_resume($scope1_id, "b", _serialize_guard($scope0_reason, 3))}</button>${_el_resume($scope1_id, "a")}<div class=spacer></div><button class=btn>Cancel</button>${_el_resume($scope1_id, "c")}`);
+			_script($scope1_id, "i3");
+			_subscribe($value__closures, _subscribe($si__input_submitLabel && $input_submitLabel__closures, writeScope($scope1_id, { _: _scope_with_id($scope0_id) })));
+			_resume_branch($scope1_id);
+		}, $scope0_id) }),
+		content: _content("i6", () => {
+			_scope_reason();
+			const $scope2_id = _scope_id();
+			_html(`<h2 class=prompt-title>${_escape(input.label)}${_el_resume($scope2_id, "a", $sg__input_label)}</h2><input${_attr_input_value($scope2_id, "b", value, _resume((_new_value) => {
+				value = _new_value;
+			}, "i0", $scope2_id))}${_attr("placeholder", input.placeholder)}>${_el_resume($scope2_id, "b")}`);
+			_script($scope2_id, "i4");
+			_subscribe($value__closures, _subscribe($si__input_placeholder && $input_placeholder__closures, _subscribe($si__input_label && $input_label__closures, _subscribe($modalview_content__subscribers, writeScope($scope2_id, {
+				_: _scope_with_id($scope0_id),
+				Cp: 1
+			})))));
+			_resume_branch($scope2_id);
+		})
+	});
+	_script($scope0_id, "i7");
+	writeScope($scope0_id, {
+		e: input.onSubmit,
+		g: input.onCancel,
+		h: input.submitLabel,
+		j: value,
+		l: submit,
+		B2: $modalview_content__subscribers,
+		n: $si__input_submitLabel && $input_submitLabel__closures,
+		p: $value__closures,
+		m: $si__input_label && $input_label__closures,
+		o: $si__input_placeholder && $input_placeholder__closures,
+		a: _serialize_if($scope0_reason, 0) && _existing_scope($childScope)
+	});
+	_resume_branch($scope0_id);
+});
+//#endregion
 //#region src/tags/work-view.marko
 var api$1;
 var work_view_default = _template("o", (input) => {
@@ -6532,6 +6665,7 @@ var work_view_default = _template("o", (input) => {
 	let sessions = null;
 	let tab = null;
 	let view = "term";
+	let focusPr = "";
 	let drawerOpen = false;
 	let usageOpen = false;
 	let error = null;
@@ -6648,7 +6782,7 @@ var work_view_default = _template("o", (input) => {
 		13: _serialize_guard($scope0_reason, 6),
 		14: $sg__input_agents,
 		15: 1,
-		16: 1
+		17: 1
 	});
 	const $childScope = _peek_scope_id();
 	side_nav_default({
@@ -6688,14 +6822,17 @@ var work_view_default = _template("o", (input) => {
 		}, "o13", $scope0_id),
 		onRenameSession: _resume(function(s) {
 			promptRename(s);
-		}, "o14", $scope0_id)
+		}, "o14", $scope0_id),
+		onReviewOpened: _resume(function(pr) {
+			focusPr = pr || "";
+		}, "o15", $scope0_id)
 	});
 	_html("<div class=main-col>");
 	_if(() => {
 		if (error) {
 			const $scope5_id = _scope_id();
 			_html(`<p class=toast-error>${_escape(error)}${_el_resume($scope5_id, "a")}<button title=Dismiss>×</button>${_el_resume($scope5_id, "b")}</p>`);
-			_script($scope5_id, "o28");
+			_script($scope5_id, "o29");
 			writeScope($scope5_id, {});
 			return 0;
 		}
@@ -6708,13 +6845,14 @@ var work_view_default = _template("o", (input) => {
 		workspaceId: ws.id,
 		sessions: shownSessions || [],
 		active: input.active && view === "diff",
+		focusPr,
 		onSent: _resume(function(sessionId) {
 			tab = sessionId;
 			view = "term";
-		}, "o15", $scope0_id),
+		}, "o16", $scope0_id),
 		onExit: _resume(function() {
 			view = "term";
-		}, "o16", $scope0_id)
+		}, "o17", $scope0_id)
 	});
 	_show_end($scope0_id, "f", $show);
 	_html(`<div class=${view === "diff" ? "\"term-area as-bar\"" : "term-area"}>`);
@@ -6753,31 +6891,32 @@ var work_view_default = _template("o", (input) => {
 					sessions: shownSessions,
 					onNewSession: _resume(function(agent) {
 						newSession(ws.id, agent);
-					}, "o17", $scope2_id),
+					}, "o18", $scope2_id),
 					onOpenTab: _resume(function(id) {
 						tab = id;
-					}, "o18", $scope2_id),
+					}, "o19", $scope2_id),
 					onCloseSession: _resume(function(id) {
 						closeSession(id);
-					}, "o19", $scope2_id),
+					}, "o20", $scope2_id),
 					onRenameSession: _resume(function(id) {
 						const target = (shownSessions || []).find((x) => x.id === id);
 						if (target) renaming = target;
-					}, "o20", $scope2_id),
+					}, "o21", $scope2_id),
 					active: input.active && view === "term" && s.id === curTab,
 					mode: view,
 					onToggleDiff: _resume(function() {
+						focusPr = "";
 						view = "diff";
-					}, "o21", $scope2_id),
+					}, "o22", $scope2_id),
 					onExitReview: _resume(function() {
 						view = "term";
-					}, "o22", $scope2_id),
+					}, "o23", $scope2_id),
 					onOpenNav: _resume(function() {
 						drawerOpen = true;
-					}, "o23", $scope2_id),
+					}, "o24", $scope2_id),
 					onManage: _resume(function() {
 						input.onManage?.(ws.id);
-					}, "o24", $scope2_id)
+					}, "o25", $scope2_id)
 				});
 				_show_end($scope2_id, "d", $show2);
 				_subscribe($newSession2__closures, _subscribe($closeSession2__closures, _subscribe($curTab__closures, _subscribe($shownSessions__closures, _subscribe($si__input_workspace && $ws_name__closures, _subscribe($si__input_workspace && $ws_id__closures, _subscribe($view__closures, _subscribe($si__input_agents && $input_agents__closures, _subscribe($si__input_active && $input_active__closures, writeScope($scope2_id, {
@@ -6789,7 +6928,7 @@ var work_view_default = _template("o", (input) => {
 				if (!shownSessions.length) {
 					const $scope3_id = _scope_id();
 					_html(`<div class=empty-sess><p class=dim>No sessions in this workspace.</p><button class="btn primary"${_attr("disabled", spawning)}>${spawning ? "Starting…" : `Start ${_escape(`${input.preferred || "claude"}`)}`}${_el_resume($scope3_id, "b")}</button>${_el_resume($scope3_id, "a")}</div>`);
-					_script($scope3_id, "o29");
+					_script($scope3_id, "o30");
 					_subscribe($spawning__closures, _subscribe($si__input_preferred && $input_preferred__closures, writeScope($scope3_id, {})));
 					return 0;
 				}
@@ -6809,7 +6948,7 @@ var work_view_default = _template("o", (input) => {
 			const $scope4_id = _scope_id();
 			usage_stats_default({ onClose: _resume(function() {
 				usageOpen = false;
-			}, "o25", $scope4_id) });
+			}, "o26", $scope4_id) });
 			writeScope($scope4_id, {});
 			return 0;
 		}
@@ -6825,21 +6964,21 @@ var work_view_default = _template("o", (input) => {
 				onSubmit: _resume(function(title) {
 					renameSession(renaming.id, title);
 					renaming = null;
-				}, "o26", $scope6_id),
+				}, "o27", $scope6_id),
 				onCancel: _resume(function() {
 					renaming = null;
-				}, "o27", $scope6_id)
+				}, "o28", $scope6_id)
 			});
 			writeScope($scope6_id, { a: _existing_scope($childScope4) });
 			return 0;
 		}
 	}, $scope0_id, "i");
 	_html("</div>");
-	_script($scope0_id, "o30");
 	_script($scope0_id, "o31");
 	_script($scope0_id, "o32");
 	_script($scope0_id, "o33");
 	_script($scope0_id, "o34");
+	_script($scope0_id, "o35");
 	writeScope($scope0_id, {
 		m: input.allStatus,
 		n: input.active,
@@ -6850,40 +6989,40 @@ var work_view_default = _template("o", (input) => {
 		v: sessions,
 		w: tab,
 		y: view,
-		a0: drawerOpen,
-		a2: error,
-		a3: spawning,
-		a5: renaming?.title,
-		a6: renaming?.agent,
-		a7: renaming?.id,
-		a9: ws?.id,
-		ae: ws?.status,
-		af: ws?.name,
-		ag: shownSessions,
-		ai: shownSessions?.length,
-		aj: curTab,
-		al: createSession,
-		ao: loadMem.wanted,
-		aq: loadMem.run,
-		ar: loadBody,
-		at: loadSessions,
-		av: closeSession,
-		aw: renameSession,
-		ax: newSession,
-		ay: promptRename,
+		a1: drawerOpen,
+		a3: error,
+		a4: spawning,
+		a6: renaming?.title,
+		a7: renaming?.agent,
+		a8: renaming?.id,
+		aa: ws?.id,
+		af: ws?.status,
+		ag: ws?.name,
+		ah: shownSessions,
+		aj: shownSessions?.length,
+		ak: curTab,
+		am: createSession,
+		ap: loadMem.wanted,
+		ar: loadMem.run,
+		as: loadBody,
+		au: loadSessions,
+		aw: closeSession,
+		ax: renameSession,
+		ay: newSession,
+		az: promptRename,
 		a: _existing_scope($childScope),
 		d: _existing_scope($childScope2),
-		az: $si__input_active && $input_active__closures,
-		b1: $si__input_agents && $input_agents__closures,
-		b2: $view__closures,
-		b8: $si__input_workspace && $ws_id__closures,
-		b9: $si__input_workspace && $ws_name__closures,
-		ba: $shownSessions__closures,
-		bc: $curTab__closures,
-		bd: $closeSession2__closures,
-		bf: $newSession2__closures,
-		b0: $si__input_preferred && $input_preferred__closures,
-		b4: $spawning__closures
+		b0: $si__input_active && $input_active__closures,
+		b2: $si__input_agents && $input_agents__closures,
+		b3: $view__closures,
+		b9: $si__input_workspace && $ws_id__closures,
+		ba: $si__input_workspace && $ws_name__closures,
+		bb: $shownSessions__closures,
+		bd: $curTab__closures,
+		be: $closeSession2__closures,
+		bg: $newSession2__closures,
+		b1: $si__input_preferred && $input_preferred__closures,
+		b5: $spawning__closures
 	});
 	_resume_branch($scope0_id);
 });
@@ -14022,6 +14161,12 @@ async function ensureBare(fullName) {
 async function bareDefaultBranch(bare) {
 	return (await git(["symbolic-ref", "HEAD"], bare)).replace("refs/heads/", "");
 }
+/** `ref` is this workspace branch or a `-topic` lane of it. Another
+* workspace's branch can extend this prefix, so callers must also
+* subtract `otherWorkspaceBranches`. */
+function ownsBranch(ref, prefix) {
+	return ref === prefix || ref.startsWith(`${prefix}-`);
+}
 /** Branches of every other workspace — slugs are user-chosen, so one
 * workspace's branch can be a strict prefix of another's; prefix matching
 * (cleanup, PR attribution) must exclude these. */
@@ -14032,13 +14177,11 @@ function otherWorkspaceBranches(id) {
 * minus any ref that actually belongs to another workspace whose branch
 * extends this one's (see otherWorkspaceBranches). */
 async function workspaceBranches(bare, branch, exclude) {
-	const out = await git([
+	return (await git([
 		"for-each-ref",
 		"--format=%(refname:short)",
 		"refs/heads/"
-	], bare).catch(() => "");
-	const owns = (ref, b) => ref === b || ref.startsWith(`${b}-`);
-	return out.split("\n").filter((b) => owns(b, branch) && !exclude.some((x) => owns(b, x)));
+	], bare).catch(() => "")).split("\n").filter((b) => ownsBranch(b, branch) && !exclude.some((x) => ownsBranch(b, x)));
 }
 /** Directory/branch-safe prefix for a workspace name. Decomposing first keeps
 * accented Latin readable (é → e); a name with nothing ASCII left (another
@@ -14067,16 +14210,33 @@ function writeAgentsMd(dir, branch, repos) {
 Workspace branch: **\`${branch}\`** — every repo here is checked out on it, and
 it is the required **prefix** for every other branch you create.
 
-- **Branches:** one PR? Stay on \`${branch}\`. Need more than one? Cut a lane per
-  PR — \`git switch -c ${branch}-<topic> origin/<base>\` — and keep the prefix.
-  Tooling finds PRs by that prefix, so a branch named anything else is
-  invisible: never invent one.
+- **Branches:** stay on \`${branch}\` and keep pushing it — one open PR, more
+  commits. After it lands, \`git fetch\` and reset \`${branch}\` to
+  \`origin/<base>\` so the next change reuses this branch. Do not cut a
+  \`${branch}-<topic>\` just to start the next piece of work.
+  A topic lane is only for when \`${branch}\` must stay unmerged (a larger
+  change) and you need a second PR on top of it. Then push every repo's
+  workspace branch first, cut from the parent —
+  \`git switch -c ${branch}-<topic> origin/${branch}\` — and keep the prefix.
+  Only two levels: never \`${branch}-a-b\`. Tooling finds PRs by that prefix,
+  so a branch named anything else is invisible: never invent one.
 - **Repos:**
 ${repos.map((r) => `- \`${r.worktree}/\` — ${r.full_name} (base: \`${r.base_branch}\`)`).join("\n")}
+- **No \`git stash\`:** every workspace using a repo shares one stash stack, so
+  a pop can take another workspace's work. Commit as you go — uncommitted
+  work isn't part of the review.
 - **Push:** \`git push -u origin HEAD\` in each repo, for review on GitHub.
   Never commit on a base branch.
+- **Rebase after merge:** when \`${branch}\` is still open and \`origin/<base>\`
+  moves, rebase onto it — a squash-merge does not move the fork point, so the
+  review keeps showing landed work until you do. On a topic lane, rebase onto
+  \`${branch}\` when the parent moves; after the parent merges: \`git fetch
+  --prune\`, rebase onto \`origin/<base>\`, and retarget (\`gh pr edit --base
+  <base>\`).
 - **PRs:** the description covers only what is in the diff — a few sentences on
-  what changed and why. No verification logs or file-by-file detail.
+  what changed and why. No verification logs or file-by-file detail. A topic
+  lane's PR is \`gh pr create --base ${branch}\` — GitHub will otherwise target
+  the repo default, and the local review will disagree with the files tab.
 `;
 	fs.writeFileSync(path.join(dir, "AGENTS.md"), content);
 	const claudeMd = path.join(dir, "CLAUDE.md");
@@ -15529,6 +15689,7 @@ function swr(ttlMs, load, seed) {
 }
 //#endregion
 //#region src/server/prs.ts
+var PR_JSON = "number,title,url,headRefName,baseRefName,headRefOid,isDraft,state,reviewDecision";
 var TTL_MS$3 = 12e4;
 /** PRs in every state for a repo, stale-while-revalidate cached. */
 var prs = swr(TTL_MS$3, fetchPrs);
@@ -15559,7 +15720,7 @@ var headPrs = swr(TTL_MS$3, async (key) => {
 		"--limit",
 		"20",
 		"--json",
-		"number,title,url,headRefName,isDraft,state,reviewDecision"
+		PR_JSON
 	]).catch(() => "[]");
 	return JSON.parse(out);
 });
@@ -15582,7 +15743,7 @@ async function fetchPrs(fullName) {
 		"--limit",
 		"100",
 		"--json",
-		"number,title,url,headRefName,isDraft,state,reviewDecision"
+		PR_JSON
 	]).catch(() => "[]");
 	return JSON.parse(out);
 }
@@ -15617,7 +15778,7 @@ async function refreshPrsBatch(fullNames, force = false) {
 			"-f",
 			`query=${"query {" + names.map((fullName, i) => {
 				const [owner, name] = fullName.split("/");
-				return `r${i}: repository(owner: ${JSON.stringify(owner)}, name: ${JSON.stringify(name)}) { pullRequests(first: 50, orderBy: {field: UPDATED_AT, direction: DESC}) { nodes { number title url headRefName isDraft state reviewDecision } } }`;
+				return `r${i}: repository(owner: ${JSON.stringify(owner)}, name: ${JSON.stringify(name)}) { pullRequests(first: 50, orderBy: {field: UPDATED_AT, direction: DESC}) { nodes { number title url headRefName baseRefName isDraft state reviewDecision headRef { oid } } } }`;
 			}).join(" ") + "}"}`
 		]).catch((err) => {
 			if (!err.stdout) throw err;
@@ -15628,7 +15789,10 @@ async function refreshPrsBatch(fullNames, force = false) {
 		names.forEach((fullName, i) => {
 			const repo = data[`r${i}`];
 			if (!repo) return;
-			prs.set(fullName, repo.pullRequests.nodes);
+			prs.set(fullName, repo.pullRequests.nodes.map((n) => ({
+				...n,
+				headRefOid: n.headRefOid || n.headRef?.oid
+			})));
 		});
 		return true;
 	} catch (err) {
@@ -15646,211 +15810,6 @@ function withoutDismissed(workspaceId, fullName, list) {
 	return list.filter((pr) => pr.state === "OPEN" || !dismissed.has(pr.number));
 }
 //#endregion
-//#region src/server/diff.ts
-var MAX_FILE_BYTES = 5e5;
-/** Diffs compare against remote-tracking refs, which only move when this
-* machine fetches or pushes — a PR merged on GitHub leaves them stale and
-* the diff shows already-merged work until the next fetch. Opening the
-* diff freshens the base refs itself (throttled per repo; each ref
-* fetched independently since one missing ref fails a combined fetch,
-* and capped so a slow remote can't hang the view — stale refs then
-* self-correct on the next open). */
-var FETCH_TTL_MS = 3e4;
-var FETCH_WAIT_MS = 8e3;
-var lastFetch = /* @__PURE__ */ new Map();
-async function freshenBaseRefs(dir, fullName, refs) {
-	const now = Date.now();
-	if (now - (lastFetch.get(fullName) ?? 0) < FETCH_TTL_MS) return;
-	lastFetch.set(fullName, now);
-	const fetches = [...new Set(refs)].map((ref) => git([
-		"fetch",
-		"--quiet",
-		"--no-tags",
-		"origin",
-		ref
-	], dir).catch(() => {}));
-	let timer;
-	await Promise.race([Promise.all(fetches), new Promise((resolve) => {
-		timer = setTimeout(resolve, FETCH_WAIT_MS);
-	})]);
-	clearTimeout(timer);
-}
-/** The ref the working tree is compared against by default, best first:
-* the workspace branch's remote (a lane worktree then shows its whole
-* delta vs the pushed workspace branch, and a worktree on the workspace
-* branch shows just what isn't pushed), the current branch's own remote,
-* then the configured base branch. An explicit `baseRef` (the UI's
-* "vs …" picker) overrides all. */
-async function resolveBase(dir, wsBranch, baseBranch, baseRef) {
-	const candidates = [];
-	if (baseRef) candidates.push([`origin/${baseRef}`, baseRef], [baseRef, baseRef]);
-	else {
-		candidates.push([`origin/${wsBranch}`, `origin/${wsBranch}`]);
-		const branch = await git([
-			"rev-parse",
-			"--abbrev-ref",
-			"HEAD"
-		], dir).catch(() => "HEAD");
-		if (branch !== "HEAD" && branch !== wsBranch) candidates.push([`origin/${branch}`, `origin/${branch}`]);
-		candidates.push([`origin/${baseBranch}`, baseBranch]);
-	}
-	for (const [ref, label] of candidates) try {
-		return {
-			mergeBase: await git([
-				"merge-base",
-				ref,
-				"HEAD"
-			], dir),
-			label
-		};
-	} catch {}
-	return {
-		mergeBase: "HEAD",
-		label: baseRef || baseBranch,
-		missing: true
-	};
-}
-/** Changed files per repo: merge-base of a base ref vs the working tree.
-* `baseRef` overrides each repo's default base (see resolveBase). */
-async function workspaceDiff(ws, baseRef) {
-	return Promise.all(ws.repos.map(async (repo) => {
-		const dir = path.join(ws.path, repo.worktree);
-		const branch = await git([
-			"rev-parse",
-			"--abbrev-ref",
-			"HEAD"
-		], dir).catch(() => "HEAD");
-		await freshenBaseRefs(dir, repo.full_name, [
-			ws.branch,
-			...branch !== "HEAD" ? [branch] : [],
-			...baseRef ? [baseRef] : [repo.base_branch]
-		]);
-		const { mergeBase, label, missing } = await resolveBase(dir, ws.branch, repo.base_branch, baseRef);
-		const [nameStatus, untracked] = await Promise.all([git([
-			"diff",
-			"--name-status",
-			"-z",
-			"--no-renames",
-			mergeBase
-		], dir).catch(() => ""), git([
-			"ls-files",
-			"--others",
-			"--exclude-standard",
-			"-z"
-		], dir).catch(() => "")]);
-		const entries = [];
-		const parts = nameStatus.split("\0").filter(Boolean);
-		for (let i = 0; i + 1 < parts.length; i += 2) entries.push({
-			path: parts[i + 1],
-			status: parts[i]
-		});
-		for (const file of untracked.split("\0").filter(Boolean)) entries.push({
-			path: file,
-			status: "A"
-		});
-		const olds = await batchOldContents(dir, mergeBase, entries.filter((e) => e.status !== "A").map((e) => e.path));
-		const files = await Promise.all(entries.map((e) => loadFile(dir, e.path, e.status, olds.get(e.path))));
-		files.sort((a, b) => a.path.localeCompare(b.path));
-		return {
-			worktree: repo.worktree,
-			full_name: repo.full_name,
-			base: label,
-			default_branch: repo.default_branch,
-			...missing && { baseMissing: true },
-			files
-		};
-	}));
-}
-/** Count of changed files vs the default base's merge-base (incl.
-* untracked) — same notion of "changed" as the diff view's default. */
-async function changedFileCount(dir, wsBranch, baseBranch) {
-	const { mergeBase, missing } = await resolveBase(dir, wsBranch, baseBranch);
-	if (missing) return 0;
-	const [changed, untracked] = await Promise.all([git([
-		"diff",
-		"--name-only",
-		"-z",
-		"--no-renames",
-		mergeBase
-	], dir).catch(() => ""), git([
-		"ls-files",
-		"--others",
-		"--exclude-standard",
-		"-z"
-	], dir).catch(() => "")]);
-	return changed.split("\0").filter(Boolean).length + untracked.split("\0").filter(Boolean).length;
-}
-/** Base-side contents for many paths through a single `git cat-file --batch`
-* process (instead of one `git show` per file). Blobs over MAX_FILE_BYTES
-* are skipped and mapped to "tooLarge". */
-async function batchOldContents(dir, mergeBase, paths) {
-	const result = /* @__PURE__ */ new Map();
-	if (!paths.length) return result;
-	await new Promise((resolve) => {
-		const proc = spawn("git", ["cat-file", "--batch"], { cwd: dir });
-		let buf = Buffer.alloc(0);
-		let index = 0;
-		let need = -1;
-		const parse = () => {
-			for (;;) if (need >= 0) {
-				if (buf.length < need + 1) return;
-				const content = buf.subarray(0, need);
-				buf = buf.subarray(need + 1);
-				need = -1;
-				const p = paths[index++];
-				if (content.length > MAX_FILE_BYTES) result.set(p, "tooLarge");
-				else result.set(p, content.toString("utf8"));
-			} else {
-				const nl = buf.indexOf(10);
-				if (nl < 0) return;
-				const header = buf.subarray(0, nl).toString();
-				buf = buf.subarray(nl + 1);
-				if (header.endsWith(" missing")) {
-					index++;
-					continue;
-				}
-				need = Number(header.split(" ")[2]) || 0;
-			}
-		};
-		proc.stdout.on("data", (chunk) => {
-			buf = buf.length ? Buffer.concat([buf, chunk]) : chunk;
-			parse();
-		});
-		proc.on("close", () => resolve());
-		proc.on("error", () => resolve());
-		proc.stdin.on("error", () => {});
-		proc.stdin.end(paths.map((p) => `${mergeBase}:${p}`).join("\n") + "\n");
-	});
-	return result;
-}
-async function loadFile(dir, filePath, status, old) {
-	const result = {
-		path: filePath,
-		status,
-		old: null,
-		new: null
-	};
-	if (old === "tooLarge") result.tooLarge = true;
-	else if (old !== void 0) result.old = old;
-	if (status !== "D" && !result.tooLarge) try {
-		const root = path.resolve(dir);
-		const full = path.resolve(dir, filePath);
-		if (full !== root && !full.startsWith(root + path.sep)) throw new Error(`path escapes worktree: ${filePath}`);
-		if ((await fsp.stat(full)).size > MAX_FILE_BYTES) result.tooLarge = true;
-		else result.new = await fsp.readFile(full, "utf8");
-	} catch {}
-	if (result.old?.includes("\0") || result.new?.includes("\0")) {
-		result.binary = true;
-		result.old = null;
-		result.new = null;
-	}
-	if (result.tooLarge) {
-		result.old = null;
-		result.new = null;
-	}
-	return result;
-}
-//#endregion
 //#region src/server/status.ts
 var TTL_MS$2 = 2e3;
 var snapshot = null;
@@ -15882,9 +15841,9 @@ function statusForAll() {
 }
 /** Push-based freshness: while any SSE client is connected, recompute the
 * (shared, deduped) snapshot on a slow tick and publish it only when it
-* actually changed — ports appearing, git changes, PR/CI flips reach every
-* client in ~15s instead of waiting out their 60s poll, and idle systems
-* push nothing at all. */
+* actually changed — ports appearing, PR/CI flips reach every client in
+* ~15s instead of waiting out their 60s poll, and idle systems push
+* nothing at all. */
 var WATCH_MS = 15e3;
 /** Right after a local push PR state flips within seconds — tick fast so
 * the badge lands while it still feels immediate. */
@@ -15938,6 +15897,8 @@ async function statusForAllFresh() {
 	if (await refreshPrsBatch(activeRepoNames(), true).catch(() => false)) invalidateSnapshot();
 	return statusForAll();
 }
+/** RSS here is the Node + Marko baseline (~80 MB empty, ~115 MB loaded),
+* not a leak and not worth chasing — young-gen flags do not move it. */
 async function computeStatus() {
 	const workspaces = listWorkspaces().filter((ws) => ws.status === "active");
 	const paths = new Map(workspaces.map((ws) => [ws.id, ws.path]));
@@ -15951,23 +15912,18 @@ async function computeStatus() {
 		const statuses = await Promise.all(ws.repos.map((repo) => repoStatus(ws, repo, foreign)));
 		return [ws.id, {
 			ports: ports.get(ws.id) || [],
-			repos: statuses.map((s) => s.status),
-			...sessionCounts(ws.id, states),
-			changes: statuses.reduce((sum, s) => sum + s.changed, 0)
+			repos: statuses,
+			...sessionCounts(ws.id, states)
 		}];
 	}));
 	return Object.fromEntries(entries);
 }
 async function repoStatus(ws, repo, foreign) {
-	const dir = path.join(ws.path, repo.worktree);
-	const [repoPrs, changed] = await Promise.all([workspacePrs(repo.full_name, ws.branch, foreign).then((list) => list.filter((pr) => pr.state === "OPEN")), changedFileCount(dir, ws.branch, repo.base_branch)]);
+	const repoPrs = await workspacePrs(repo.full_name, ws.branch, foreign).then((list) => list.filter((pr) => pr.state === "OPEN"));
 	return {
-		status: {
-			full_name: repo.full_name,
-			worktree: repo.worktree,
-			prs: repoPrs
-		},
-		changed
+		full_name: repo.full_name,
+		worktree: repo.worktree,
+		prs: repoPrs
 	};
 }
 function sessionCounts(workspaceId, states) {
@@ -16568,8 +16524,356 @@ function post20(context) {
 	return call(mware3, __mware22, context);
 }
 //#endregion
+//#region src/server/diff.ts
+var MAX_FILE_BYTES = 5e5;
+/** Diffs compare against remote-tracking refs, which only move when this
+* machine fetches or pushes — a PR merged on GitHub leaves them stale and
+* the diff shows already-merged work until the next fetch. Opening the
+* diff freshens the base refs itself (throttled per repo; each ref
+* fetched independently since one missing ref fails a combined fetch,
+* and capped so a slow remote can't hang the view — stale refs then
+* self-correct on the next open). */
+var FETCH_TTL_MS = 3e4;
+var FETCH_WAIT_MS = 8e3;
+var lastFetch = /* @__PURE__ */ new Map();
+async function freshenBaseRefs(dir, fullName, refs) {
+	if (Date.now() - (lastFetch.get(fullName) ?? 0) < FETCH_TTL_MS) return;
+	const fetches = [...new Set(refs)].map((ref) => git([
+		"fetch",
+		"--quiet",
+		"--no-tags",
+		"origin",
+		ref
+	], dir).catch((err) => {
+		if (missingRemoteRef(err)) return git([
+			"update-ref",
+			"-d",
+			`refs/remotes/origin/${ref}`
+		], dir).catch(() => {});
+	}));
+	fetches.push(git([
+		"remote",
+		"prune",
+		"origin"
+	], dir).catch(() => {}));
+	let timer;
+	await Promise.race([Promise.all(fetches), new Promise((resolve) => {
+		timer = setTimeout(resolve, FETCH_WAIT_MS);
+	})]);
+	clearTimeout(timer);
+	lastFetch.set(fullName, Date.now());
+}
+function missingRemoteRef(err) {
+	const msg = err && typeof err === "object" && "stderr" in err ? String(err.stderr) : String(err);
+	return /couldn't find remote ref/.test(msg);
+}
+/** The ref the working tree is compared against by default, best first.
+* Workspace branch / detached / foreign → `origin/<base>`. Our `-topic`
+* lane → `origin/<ws-branch>` (only two levels; `<ws>-a-b` still parents
+* to the workspace branch). `foreign` is other workspaces' branches so a
+* longer prefix is not stolen. An explicit `baseRef` overrides all. */
+async function resolveBase(dir, wsBranch, baseBranch, headBranch, foreign, baseRef) {
+	const ours = ownsBranch(headBranch, wsBranch) && !foreign.some((x) => ownsBranch(headBranch, x));
+	const candidates = [];
+	if (baseRef) candidates.push([`origin/${baseRef}`, baseRef], [baseRef, baseRef]);
+	else if (headBranch === wsBranch || headBranch === "HEAD" || !ours) {
+		candidates.push([`origin/${baseBranch}`, baseBranch]);
+		candidates.push([`origin/${wsBranch}`, `origin/${wsBranch}`]);
+	} else {
+		candidates.push([`origin/${wsBranch}`, `origin/${wsBranch}`]);
+		candidates.push([`origin/${headBranch}`, `origin/${headBranch}`]);
+		candidates.push([`origin/${baseBranch}`, baseBranch]);
+	}
+	for (const [ref, label] of candidates) try {
+		return {
+			mergeBase: await git([
+				"merge-base",
+				ref,
+				"HEAD"
+			], dir),
+			ref,
+			label
+		};
+	} catch {}
+	return {
+		mergeBase: "HEAD",
+		ref: "HEAD",
+		label: baseRef || baseBranch,
+		missing: true
+	};
+}
+/** True when merging `head` into `base` is a no-op (head's unique work
+* is already in `base` — the squash-merge case). A conflict is not
+* containment; the caller falls through to three-dot. */
+async function treeContainedIn(dir, base, head) {
+	try {
+		return (await git([
+			"merge-tree",
+			"--write-tree",
+			base,
+			head
+		], dir)).split("\n")[0] === await git(["rev-parse", `${base}^{tree}`], dir);
+	} catch {
+		return false;
+	}
+}
+/** Open PRs as GitHub's files tab (remote head vs the PR's `--base`).
+* Repos with no open PR fall back to the local checkout vs the derived
+* base. `pr` (`worktree/number`) focuses one PR. `uncommitted` overlays
+* the working tree on the PR whose head is the current branch. */
+async function workspaceDiff(ws, opts = {}) {
+	const { baseRef, uncommitted = false, pr: focus } = opts;
+	const foreign = otherWorkspaceBranches(ws.id);
+	return (await Promise.all(ws.repos.map(async (repo) => {
+		const dir = path.join(ws.path, repo.worktree);
+		const branch = await git([
+			"rev-parse",
+			"--abbrev-ref",
+			"HEAD"
+		], dir).catch(() => "HEAD");
+		const localHead = await git(["rev-parse", "HEAD"], dir).catch(() => "");
+		const open = (await workspacePrs(repo.full_name, ws.branch, foreign)).filter((p) => p.state === "OPEN" && p.baseRefName && p.headRefName && (!focus || focus === `${repo.worktree}/${p.number}`));
+		if (open.length) return Promise.all(open.map((p) => prDiff(dir, repo, p, {
+			uncommitted: uncommitted && branch === p.headRefName,
+			localHead,
+			branch
+		})));
+		if (focus) return [];
+		return [await localDiff(dir, ws, repo, branch, localHead, baseRef, uncommitted)];
+	}))).flat();
+}
+async function prDiff(dir, repo, pr, ctx) {
+	await freshenBaseRefs(dir, repo.full_name, [pr.baseRefName, pr.headRefName]);
+	const headRef = `origin/${pr.headRefName}`;
+	const baseRef = `origin/${pr.baseRefName}`;
+	const head = await git(["rev-parse", headRef], dir).catch(() => "") || pr.headRefOid || "";
+	const baseSha = await git(["rev-parse", baseRef], dir).catch(() => "");
+	if (!head || !baseSha) return {
+		id: `${repo.worktree}#${pr.number}`,
+		worktree: repo.worktree,
+		full_name: repo.full_name,
+		base: pr.baseRefName,
+		default_branch: repo.default_branch,
+		branch: ctx.branch,
+		head,
+		baseSha,
+		pr: prMeta(pr),
+		localHead: ctx.localHead,
+		baseMissing: true,
+		files: []
+	};
+	const mergeBase = await git([
+		"merge-base",
+		baseRef,
+		head
+	], dir).catch(() => "");
+	const contained = await treeContainedIn(dir, baseRef, head);
+	const files = await collectFiles(dir, contained ? head : mergeBase || baseRef, head, ctx.uncommitted);
+	const githubDrift = !!pr.headRefOid && head !== pr.headRefOid;
+	return {
+		id: `${repo.worktree}#${pr.number}`,
+		worktree: repo.worktree,
+		full_name: repo.full_name,
+		base: pr.baseRefName,
+		default_branch: repo.default_branch,
+		branch: ctx.branch,
+		head,
+		baseSha,
+		pr: prMeta(pr),
+		localHead: ctx.localHead,
+		...githubDrift && { githubDrift: true },
+		...contained && { contained: true },
+		files
+	};
+}
+async function localDiff(dir, ws, repo, branch, localHead, baseRef, uncommitted) {
+	await freshenBaseRefs(dir, repo.full_name, [
+		ws.branch,
+		...branch !== "HEAD" ? [branch] : [],
+		...baseRef ? [baseRef] : [repo.base_branch]
+	]);
+	const { mergeBase, ref, label, missing } = await resolveBase(dir, ws.branch, repo.base_branch, branch, otherWorkspaceBranches(ws.id), baseRef);
+	if (missing && !uncommitted) return {
+		id: repo.worktree,
+		worktree: repo.worktree,
+		full_name: repo.full_name,
+		base: label,
+		default_branch: repo.default_branch,
+		branch,
+		head: localHead,
+		baseSha: localHead,
+		baseMissing: true,
+		files: []
+	};
+	const contained = !missing && await treeContainedIn(dir, ref, "HEAD");
+	const against = contained ? "HEAD" : mergeBase;
+	const baseSha = missing ? localHead : await git(["rev-parse", ref], dir).catch(() => mergeBase);
+	const files = await collectFiles(dir, against, "HEAD", uncommitted);
+	return {
+		id: repo.worktree,
+		worktree: repo.worktree,
+		full_name: repo.full_name,
+		base: label,
+		default_branch: repo.default_branch,
+		branch,
+		head: localHead,
+		baseSha,
+		...missing && { baseMissing: true },
+		...contained && { contained: true },
+		files
+	};
+}
+function prMeta(pr) {
+	return {
+		number: pr.number,
+		title: pr.title,
+		url: pr.url,
+		headRefName: pr.headRefName,
+		baseRefName: pr.baseRefName,
+		...pr.headRefOid && { headRefOid: pr.headRefOid }
+	};
+}
+async function collectFiles(dir, oldRev, newRev, uncommitted) {
+	const diffArgs = uncommitted ? [
+		"diff",
+		"--name-status",
+		"-z",
+		"--no-renames",
+		oldRev
+	] : [
+		"diff",
+		"--name-status",
+		"-z",
+		"--no-renames",
+		oldRev,
+		newRev
+	];
+	const [nameStatus, untracked] = await Promise.all([git(diffArgs, dir).catch(() => ""), uncommitted ? git([
+		"ls-files",
+		"--others",
+		"--exclude-standard",
+		"-z"
+	], dir).catch(() => "") : Promise.resolve("")]);
+	const entries = [];
+	const parts = nameStatus.split("\0").filter(Boolean);
+	for (let i = 0; i + 1 < parts.length; i += 2) entries.push({
+		path: parts[i + 1],
+		status: parts[i]
+	});
+	for (const file of untracked.split("\0").filter(Boolean)) entries.push({
+		path: file,
+		status: "A"
+	});
+	const olds = await batchContents(dir, oldRev, entries.filter((e) => e.status !== "A").map((e) => e.path));
+	const news = uncommitted ? null : await batchContents(dir, newRev, entries.filter((e) => e.status !== "D").map((e) => e.path));
+	const files = await Promise.all(entries.map((e) => news ? fromBlobs(e.path, e.status, olds.get(e.path), news.get(e.path)) : loadWorktreeFile(dir, e.path, e.status, olds.get(e.path))));
+	files.sort((a, b) => a.path.localeCompare(b.path));
+	return files;
+}
+/** Blob contents for many paths through a single `git cat-file --batch`
+* process (instead of one `git show` per file). Blobs over MAX_FILE_BYTES
+* are skipped and mapped to "tooLarge". */
+async function batchContents(dir, rev, paths) {
+	const result = /* @__PURE__ */ new Map();
+	if (!paths.length) return result;
+	await new Promise((resolve) => {
+		const proc = spawn("git", ["cat-file", "--batch"], { cwd: dir });
+		let buf = Buffer.alloc(0);
+		let index = 0;
+		let need = -1;
+		const parse = () => {
+			for (;;) if (need >= 0) {
+				if (buf.length < need + 1) return;
+				const content = buf.subarray(0, need);
+				buf = buf.subarray(need + 1);
+				need = -1;
+				const p = paths[index++];
+				if (content.length > MAX_FILE_BYTES) result.set(p, "tooLarge");
+				else result.set(p, content.toString("utf8"));
+			} else {
+				const nl = buf.indexOf(10);
+				if (nl < 0) return;
+				const header = buf.subarray(0, nl).toString();
+				buf = buf.subarray(nl + 1);
+				if (header.endsWith(" missing")) {
+					index++;
+					continue;
+				}
+				need = Number(header.split(" ")[2]) || 0;
+			}
+		};
+		proc.stdout.on("data", (chunk) => {
+			buf = buf.length ? Buffer.concat([buf, chunk]) : chunk;
+			parse();
+		});
+		proc.on("close", () => resolve());
+		proc.on("error", () => resolve());
+		proc.stdin.on("error", () => {});
+		proc.stdin.end(paths.map((p) => `${rev}:${p}`).join("\n") + "\n");
+	});
+	return result;
+}
+function fromBlobs(filePath, status, old, neu) {
+	const result = {
+		path: filePath,
+		status,
+		old: null,
+		new: null
+	};
+	if (old === "tooLarge" || neu === "tooLarge") result.tooLarge = true;
+	else {
+		if (old !== void 0) result.old = old;
+		if (neu !== void 0) result.new = neu;
+	}
+	if (result.old?.includes("\0") || result.new?.includes("\0")) {
+		result.binary = true;
+		result.old = null;
+		result.new = null;
+	}
+	if (result.tooLarge) {
+		result.old = null;
+		result.new = null;
+	}
+	return result;
+}
+async function loadWorktreeFile(dir, filePath, status, old) {
+	const result = {
+		path: filePath,
+		status,
+		old: null,
+		new: null
+	};
+	if (old === "tooLarge") result.tooLarge = true;
+	else if (old !== void 0) result.old = old;
+	if (status !== "D" && !result.tooLarge) try {
+		const root = path.resolve(dir);
+		const full = path.resolve(dir, filePath);
+		if (full !== root && !full.startsWith(root + path.sep)) throw new Error(`path escapes worktree: ${filePath}`);
+		if ((await fsp.stat(full)).size > MAX_FILE_BYTES) result.tooLarge = true;
+		else result.new = await fsp.readFile(full, "utf8");
+	} catch {}
+	if (result.old?.includes("\0") || result.new?.includes("\0")) {
+		result.binary = true;
+		result.old = null;
+		result.new = null;
+	}
+	if (result.tooLarge) {
+		result.old = null;
+		result.new = null;
+	}
+	return result;
+}
+//#endregion
 //#region __marko-run__api.workspaces.$.diff.js
-var getHandler$4 = normalizeHandler(Run.GET({ search: (value) => ({ base: typeof value.base === "string" && value.base ? value.base : void 0 }) }, async (ctx) => Response.json(await workspaceDiff(ctx.data.workspace, ctx.search.base))), "GET");
+var getHandler$4 = normalizeHandler(Run.GET({ search: (value) => ({
+	base: typeof value.base === "string" && value.base ? value.base : void 0,
+	uncommitted: value.uncommitted === "1" || value.uncommitted === "true",
+	pr: typeof value.pr === "string" && value.pr ? value.pr : void 0
+}) }, async (ctx) => Response.json(await workspaceDiff(ctx.data.workspace, {
+	baseRef: ctx.search.base,
+	uncommitted: ctx.search.uncommitted,
+	pr: ctx.search.pr
+}))), "GET");
 var get21_options = mergeOptions(mware3, mware22, getHandler$4);
 var head21_options = mergeOptions(mware3, mware22);
 function get21(context) {
@@ -21166,4 +21470,4 @@ server.listen(port, () => {
 //#endregion
 export {};
 
-;var __MARKO_MANIFEST__={"esfPH6H":{"block":[2,"stylesheet#/assets/index-KIy0rCx1.css",6,"<link",0," rel=\"stylesheet\" crossorigin href=\"",1,"assets/index-KIy0rCx1.css\"",">"],"defer":[2,"/assets/index-BwlA-lgI.js",6,"<script",0," async type=\"module\" crossorigin src=\"",1,"assets/index-BwlA-lgI.js\"","></script>"]}};
+;var __MARKO_MANIFEST__={"esfPH6H":{"block":[2,"stylesheet#/assets/index-C_YqjXeW.css",6,"<link",0," rel=\"stylesheet\" crossorigin href=\"",1,"assets/index-C_YqjXeW.css\"",">"],"defer":[2,"/assets/index-Bx9UtyrE.js",6,"<script",0," async type=\"module\" crossorigin src=\"",1,"assets/index-Bx9UtyrE.js\"","></script>"]}};