@dylanpiercey/work 0.0.20 → 0.0.22

package/dist/index.mjs

@@ -5648,38 +5648,46 @@ var icon_search_default = _template("H", (input) => {
 //#endregion
 //#region src/tags/file-filter.marko
 var file_filter_default = _template("f", (input) => {
-	_scope_reason();
+	const $scope0_reason = _scope_reason();
 	const $scope0_id = _scope_id();
-	let draft = input.value || "";
+	let value = input.value;
+	let pending = null;
+	const draft = (pending ?? value) || "";
 	const box = { timer: 0 };
 	const flush = _resume(() => {
 		if (box.timer) {
 			clearTimeout(box.timer);
 			box.timer = 0;
 		}
-		input.onChange(draft);
+		const next = pending !== null ? pending : value || "";
+		pending = null;
+		value = next;
 	}, "f1", $scope0_id);
 	const type = _resume((v) => {
-		draft = v;
 		if (box.timer) clearTimeout(box.timer);
 		if (!v) {
 			box.timer = 0;
-			input.onChange("");
+			pending = null;
+			value = "";
 			return;
 		}
+		pending = v;
 		box.timer = setTimeout(flush, 150);
 	}, "f2", $scope0_id);
 	_html(`<div class=wrap><input${_attr_input_value($scope0_id, "a", draft, _resume(function(v) {
 		type(v);
 	}, "f0", $scope0_id))} class=file-filter type=search placeholder="Filter files… (globs, !excludes)" aria-label="Filter files">${_el_resume($scope0_id, "a")}</div>`);
 	_script($scope0_id, "f3");
-	_script($scope0_id, "f4");
 	writeScope($scope0_id, {
-		e: input.onChange,
-		f: draft,
-		h: box.timer,
-		j: flush,
-		l: type
+		d: _serialize_if($scope0_reason, 1) && input.value,
+		e: _serialize_if($scope0_reason, 0) && input.valueChange,
+		g: value,
+		i: pending,
+		k: draft,
+		m: box.timer,
+		o: flush,
+		q: type,
+		h: input.valueChange || void 0
 	});
 	_resume_branch($scope0_id);
 });
@@ -5781,6 +5789,7 @@ _template("c", (input) => {
 //#region src/tags/diff-view.marko
 var api$3;
 var copyText;
+var prHeadSigFromDiff;
 var getTermDims;
 var makeFileFilter;
 var diff_view_default = _template("e", (input) => {
@@ -5869,6 +5878,10 @@ var diff_view_default = _template("e", (input) => {
 		};
 		requestAnimationFrame(tryScroll);
 	}, "e4", $scope0_id);
+	const headBox = {
+		sig: "",
+		timer: 0
+	};
 	const load = _resume(async (dirty = uncommitted, refresh = false) => {
 		loading = true;
 		error = null;
@@ -5881,6 +5894,7 @@ var diff_view_default = _template("e", (input) => {
 			repos = diffData;
 			comments = reviewData.comments || [];
 			viewed = new Set(reviewData.viewed || []);
+			headBox.sig = prHeadSigFromDiff(diffData);
 			if (input.focusPr) focusPrSection(input.focusPr);
 		} catch (err) {
 			error = String(err.message || err);
@@ -5894,6 +5908,17 @@ var diff_view_default = _template("e", (input) => {
 			viewed = new Set(reviewData.viewed || []);
 		} catch {}
 	}, "e6", $scope0_id);
+	const reload = _resume(() => {
+		dismissedDrift = /* @__PURE__ */ new Set();
+		return load(uncommitted, true);
+	}, "e7", $scope0_id);
+	const reloadSoon = _resume(() => {
+		if (headBox.timer) clearTimeout(headBox.timer);
+		headBox.timer = setTimeout(() => {
+			headBox.timer = 0;
+			reload();
+		}, 250);
+	}, "e8", $scope0_id);
 	const repoList = repos || [];
 	const allFiles = repoList.flatMap((r) => r.files.map((f) => ({
 		...f,
@@ -5916,15 +5941,11 @@ var diff_view_default = _template("e", (input) => {
 		return map;
 	})();
 	const sendPick = (input.sessions || []).some((s) => s.id === sendTarget) ? sendTarget : input.sessions?.[0]?.id ?? null;
-	const localDiffers = _resume((repo) => !!repo.pr && !!repo.localHead && (repo.localHead !== repo.head || repo.branch !== repo.pr.headRefName), "e7");
+	const localDiffers = _resume((repo) => !!repo.pr && !!repo.localHead && (repo.localHead !== repo.head || repo.branch !== repo.pr.headRefName), "e9");
 	const driftRepos = repoList.filter((r) => r.githubDrift && !dismissedDrift.has(r.id));
 	const dismissDrift = _resume(() => {
 		dismissedDrift = /* @__PURE__ */ new Set([...dismissedDrift, ...driftRepos.map((r) => r.id)]);
-	}, "e8", $scope0_id);
-	const reload = _resume(() => {
-		dismissedDrift = /* @__PURE__ */ new Set();
-		return load(uncommitted, true);
-	}, "e9", $scope0_id);
+	}, "e10", $scope0_id);
 	const toggleViewed = _resume((key) => {
 		const next = new Set(viewed);
 		const isViewed = !next.has(key);
@@ -5942,7 +5963,7 @@ var diff_view_default = _template("e", (input) => {
 		}).catch(() => {
 			error = "Saving viewed state failed — it may reset on reload.";
 		});
-	}, "e10", $scope0_id);
+	}, "e11", $scope0_id);
 	const saveComment = _resume(async (file, text) => {
 		const range = draft;
 		draft = null;
@@ -5964,11 +5985,11 @@ var diff_view_default = _template("e", (input) => {
 		} catch (err) {
 			error = String(err.message || err);
 		}
-	}, "e11", $scope0_id);
+	}, "e12", $scope0_id);
 	const removeComment = _resume(async (id) => {
 		comments = comments.filter((c) => c.id !== id);
 		await fetch(`/api/review-comments/${id}`, { method: "DELETE" });
-	}, "e12", $scope0_id);
+	}, "e13", $scope0_id);
 	const clearComments = _resume(async () => {
 		comments = [];
 		draft = null;
@@ -5977,7 +5998,7 @@ var diff_view_default = _template("e", (input) => {
 			headers: { "content-type": "application/json" },
 			body: JSON.stringify({ action: "clear" })
 		});
-	}, "e13", $scope0_id);
+	}, "e14", $scope0_id);
 	const copyMarkdown = _resume(async () => {
 		if (!await copyText(commentMarkdown(comments, repos))) {
 			error = "Copy failed — clipboard needs HTTPS on this browser.";
@@ -5988,7 +6009,7 @@ var diff_view_default = _template("e", (input) => {
 			copied = false;
 		}, 1500);
 		await clearComments();
-	}, "e14", $scope0_id);
+	}, "e15", $scope0_id);
 	const sendTo = _resume(async (sessionId) => {
 		if (!sessionId) return;
 		sending = true;
@@ -6008,22 +6029,22 @@ var diff_view_default = _template("e", (input) => {
 			error = String(err.message || err);
 			sending = false;
 		}
-	}, "e15", $scope0_id);
+	}, "e16", $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" });
 		}
-	}, "e16", $scope0_id);
+	}, "e17", $scope0_id);
 	const openFind = _resume(() => {
 		findOpen = true;
 		findTick++;
-	}, "e17", $scope0_id);
+	}, "e18", $scope0_id);
 	const onFindState = _resume((next) => {
 		findState = next;
 		if (next.hit) setTimeout(() => jumpTo(next.hit.key), 0);
-	}, "e18", $scope0_id);
+	}, "e19", $scope0_id);
 	_html(`<div class=diff-view><aside class=${!treeOpen ? "\"tree closed\"" : "tree"}>`);
 	_for_of(repoList.filter((r) => shownByRepo.get(r.id)?.length), (repo) => {
 		const $scope5_id = _scope_id();
@@ -6033,8 +6054,8 @@ var diff_view_default = _template("e", (input) => {
 				const $scope6_id = _scope_id();
 				const $if_content4__dirKey__closures = /* @__PURE__ */ new Set();
 				const repoRows = treeRows(shownByRepo.get(repo.id) || []);
-				const dirKey = _resume((path) => `${repo.id}/${path}`, "e19", $scope6_id);
-				const rowDir = _resume((row) => row.kind === "dir" ? row.path : row.file.path.includes("/") ? row.file.path.slice(0, row.file.path.lastIndexOf("/")) : "", "e20");
+				const dirKey = _resume((path) => `${repo.id}/${path}`, "e20", $scope6_id);
+				const rowDir = _resume((row) => row.kind === "dir" ? row.path : row.file.path.includes("/") ? row.file.path.slice(0, row.file.path.lastIndexOf("/")) : "", "e21");
 				const hiddenByCollapse = _resume((row) => {
 					const dir = rowDir(row);
 					for (const collapsed of collapsedDirs) {
@@ -6044,15 +6065,15 @@ var diff_view_default = _template("e", (input) => {
 						if (dir === path || dir.startsWith(`${path}/`)) return true;
 					}
 					return false;
-				}, "e21", $scope6_id);
+				}, "e22", $scope6_id);
 				_for_of(repoRows, (row) => {
 					const $scope7_id = _scope_id();
 					_if(() => {
 						if (!hiddenByCollapse(row) && row.kind === "dir") {
 							const $scope29_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($scope29_id, "b")}</span>${_escape(row.label)}${_el_resume($scope29_id, "c")}/</button>${_el_resume($scope29_id, "a")}`);
-							_script($scope29_id, "e32");
-							_subscribe($if_content4__dirKey__closures, _subscribe($collapsedDirs__closures, writeScope($scope29_id, { Cd3: 1 })));
+							_script($scope29_id, "e33");
+							_subscribe($if_content4__dirKey__closures, _subscribe($collapsedDirs__closures, writeScope($scope29_id, { Cd5: 1 })));
 							return 0;
 						} else if (!hiddenByCollapse(row) && row.kind !== "dir") {
 							const $scope8_id = _scope_id();
@@ -6066,7 +6087,7 @@ var diff_view_default = _template("e", (input) => {
 								}
 							}, $scope8_id, "e", 1, 1, 1, 0, 1);
 							_html(`</button>${_el_resume($scope8_id, "a")}`);
-							_script($scope8_id, "e33");
+							_script($scope8_id, "e34");
 							_subscribe($commentsByFile__closures, _subscribe($viewed__closures, writeScope($scope8_id, {})));
 							return 1;
 						}
@@ -6092,7 +6113,7 @@ var diff_view_default = _template("e", (input) => {
 			}
 		}, $scope5_id, "d");
 		_html("</div>");
-		_script($scope5_id, "e34");
+		_script($scope5_id, "e35");
 		writeScope($scope5_id, { g: repo?.id });
 	}, "id", $scope0_id, "a", 1, 1, 1, "</aside>", 1);
 	_html("<div class=diff-col><div class=diff-head>");
@@ -6102,7 +6123,7 @@ var diff_view_default = _template("e", (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, "e35");
+			_script($scope1_id, "e36");
 			writeScope($scope1_id, { _: _scope_with_id($scope0_id) });
 			return 0;
 		}
@@ -6116,7 +6137,7 @@ var diff_view_default = _template("e", (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, "e36");
+					_script($scope3_id, "e37");
 					_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) {
@@ -6133,40 +6154,33 @@ var diff_view_default = _template("e", (input) => {
 						}, "id", $scope4_id, "c", $sg__input_sessions, 1, $sg__input_sessions, "</select>", 1);
 					});
 					_html("</span>");
-					_script($scope4_id, "e37");
+					_script($scope4_id, "e38");
 					_subscribe($sendTarget__closures, _subscribe($sending__closures, _subscribe($si__input_sessions && $input_sessions__closures, writeScope($scope4_id, {
 						_: _scope_with_id($scope2_id),
-						Ccw: 1
+						Ccy: 1
 					}))));
 					return 1;
 				}
 			}, $scope2_id, "c", $sg__input_sessions, $sg__input_sessions, $sg__input_sessions, 0, 1);
-			_script($scope2_id, "e38");
+			_script($scope2_id, "e39");
 			writeScope($scope2_id, {});
 			return 0;
 		}
 	}, $scope0_id, "g", 1, 1, 1, "</span>");
-	_if(() => {
-		if (loading) {
-			const $scope37_id = _scope_id();
-			_html("<span class=\"refresh-chip dim\"><span class=spin></span>Refreshing…</span>");
-			writeScope($scope37_id, {});
-			return 0;
-		}
-	}, $scope0_id, "h", 1, 1, 1, 0, 1);
 	_html(`</div><div class=diff-tools><button class=${treeOpen ? "\"icon-btn tree-toggle on\"" : "\"icon-btn tree-toggle\""} title=${treeOpen ? "\"Hide file tree\"" : "\"Show file tree\""}>`);
 	icon_sidebar_default({ size: 14 });
-	_html(`</button>${_el_resume($scope0_id, "i")}<button class=${loading ? "\"icon-btn spinning\"" : "icon-btn"} title="Refresh diff"${_attr("disabled", loading)}>`);
+	_html(`</button>${_el_resume($scope0_id, "h")}<button class=${loading ? "\"icon-btn spinning\"" : "icon-btn"} title="Refresh diff"${_attr("disabled", loading)}>`);
 	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")}<button class=${findOpen ? "\"btn find-btn on\"" : "\"btn find-btn\""} title="Find in the review (⌘/Ctrl+F)">`);
+	_html(`</button>${_el_resume($scope0_id, "j")}<button class="btn files-btn" title="Jump to file">Files (<!>${_escape(shownFiles.length)}${_el_resume($scope0_id, "m")})</button>${_el_resume($scope0_id, "l")}<button class=${findOpen ? "\"btn find-btn on\"" : "\"btn find-btn\""} title="Find in the review (⌘/Ctrl+F)">`);
 	icon_search_default({ size: 14 });
-	_html(`<span class=find-label>Find</span></button>${_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, "q", uncommitted)} type=checkbox>${_el_resume($scope0_id, "q")} include uncommitted</label>`);
+	_html(`<span class=find-label>Find</span></button>${_el_resume($scope0_id, "n")}<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>`);
+	_set_serialize_reason(2);
 	const $childScope = _peek_scope_id();
 	file_filter_default({
 		value: fileFilter,
-		onChange: _resume(function(q) {
-			fileFilter = q;
-		}, "e22", $scope0_id)
+		valueChange: _resume((_new_fileFilter) => {
+			fileFilter = _new_fileFilter;
+		}, "e23", $scope0_id)
 	});
 	_html("</div>");
 	_if(() => {
@@ -6178,7 +6192,7 @@ var diff_view_default = _template("e", (input) => {
 				tick: findTick,
 				onState: _resume(function(s) {
 					onFindState(s);
-				}, "e23", $scope28_id),
+				}, "e24", $scope28_id),
 				onClose: _resume(function() {
 					findOpen = false;
 					findState = {
@@ -6186,12 +6200,12 @@ var diff_view_default = _template("e", (input) => {
 						hit: null,
 						keys: []
 					};
-				}, "e24", $scope28_id)
+				}, "e25", $scope28_id)
 			});
 			writeScope($scope28_id, { a: _existing_scope($childScope2) });
 			return 0;
 		}
-	}, $scope0_id, "s", 1, 1, 1, 0, 1);
+	}, $scope0_id, "r", 1, 1, 1, 0, 1);
 	_html("<div class=diff-main>");
 	_if(() => {
 		if (error) {
@@ -6199,8 +6213,8 @@ var diff_view_default = _template("e", (input) => {
 			toast_default({
 				onDismiss: _resume(function() {
 					error = null;
-				}, "e25", $scope17_id),
-				content: _content_resume("e39", () => {
+				}, "e26", $scope17_id),
+				content: _content_resume("e40", () => {
 					_scope_reason();
 					const $scope18_id = _scope_id();
 					_html(`${_escape(error)}${_el_resume($scope18_id, "a")}`);
@@ -6211,7 +6225,7 @@ var diff_view_default = _template("e", (input) => {
 			writeScope($scope17_id, {});
 			return 0;
 		}
-	}, $scope0_id, "u", 1, 1, 1, 0, 1);
+	}, $scope0_id, "t", 1, 1, 1, 0, 1);
 	_for_of(repoList.filter((r) => r.baseMissing), (repo) => {
 		const $scope22_id = _scope_id();
 		const $for_content6__repo_base__closures = /* @__PURE__ */ new Set();
@@ -6221,7 +6235,7 @@ var diff_view_default = _template("e", (input) => {
 			kind: "warn",
 			placement: "inline",
 			title: `${repo.worktree}: base not found`,
-			content: _content_resume("e40", () => {
+			content: _content_resume("e41", () => {
 				_scope_reason();
 				const $scope23_id = _scope_id();
 				_html(`${_escape(repo.base)}${_el_resume($scope23_id, "a")}<!>${uncommitted ? " — showing uncommitted changes only" : ""}${_el_resume($scope23_id, "b")}.`);
@@ -6234,7 +6248,7 @@ var diff_view_default = _template("e", (input) => {
 			f: $for_content6__repo_base__closures,
 			a: _existing_scope($childScope3)
 		});
-	}, "id", $scope0_id, "v", 1, 1, 1, 0, 1);
+	}, "id", $scope0_id, "u", 1, 1, 1, 0, 1);
 	_for_of(repoList.filter((r) => r.contained && r.files.length), (repo) => {
 		const $scope24_id = _scope_id();
 		const $for_content7__repo_base__closures = /* @__PURE__ */ new Set();
@@ -6244,13 +6258,13 @@ var diff_view_default = _template("e", (input) => {
 			kind: "info",
 			placement: "inline",
 			title: repo.pr ? `${repo.worktree} #${repo.pr.number}` : repo.worktree,
-			content: _content_resume("e41", () => {
+			content: _content_resume("e42", () => {
 				_scope_reason();
 				const $scope25_id = _scope_id();
 				_html(`already in <!>${_escape(repo.base)}${_el_resume($scope25_id, "a")}<!>${uncommitted ? " — showing uncommitted changes only" : ""}${_el_resume($scope25_id, "b")}.`);
 				_subscribe($for_content7__repo_base__closures, _subscribe($uncommitted__closures, writeScope($scope25_id, {
 					_: _scope_with_id($scope24_id),
-					Ccz: 1
+					Cd1: 1
 				})));
 				_resume_branch($scope25_id);
 			}, $scope24_id)
@@ -6260,7 +6274,7 @@ var diff_view_default = _template("e", (input) => {
 			h: $for_content7__repo_base__closures,
 			a: _existing_scope($childScope4)
 		});
-	}, "id", $scope0_id, "w", 1, 1, 1, 0, 1);
+	}, "id", $scope0_id, "v", 1, 1, 1, 0, 1);
 	_if(() => {
 		if (driftRepos.length) {
 			const $scope19_id = _scope_id();
@@ -6272,29 +6286,29 @@ var diff_view_default = _template("e", (input) => {
 				title: "GitHub is behind",
 				onDismiss: _resume(function() {
 					dismissDrift();
-				}, "e26", $scope19_id),
-				action: attrTag({ content: _content_resume("e43", () => {
+				}, "e27", $scope19_id),
+				action: attrTag({ content: _content_resume("e44", () => {
 					_scope_reason();
 					const $scope20_id = _scope_id();
 					_html(`<button class=btn${_attr("disabled", loading)}>${loading ? "Reloading…" : "Reload"}${_el_resume($scope20_id, "b")}</button>${_el_resume($scope20_id, "a")}`);
-					_script($scope20_id, "e42");
+					_script($scope20_id, "e43");
 					_subscribe($loading__closures, writeScope($scope20_id, { _: _scope_with_id($scope19_id) }));
 					_resume_branch($scope20_id);
 				}, $scope19_id) }),
-				content: _content_resume("e44", () => {
+				content: _content_resume("e45", () => {
 					_scope_reason();
 					const $scope34_id = _scope_id();
 					_html("<span class=dim>");
 					_for_of(driftRepos, (repo, i) => {
-						const $scope38_id = _scope_id();
-						_html(`${i > 0 ? " · " : ""}${_el_resume($scope38_id, "a")}<!>${_escape(repo.worktree)}${_el_resume($scope38_id, "b")} #<!>${_escape(repo.pr.number)}${_el_resume($scope38_id, "c")}`);
-						writeScope($scope38_id, {});
+						const $scope37_id = _scope_id();
+						_html(`${i > 0 ? " · " : ""}${_el_resume($scope37_id, "a")}<!>${_escape(repo.worktree)}${_el_resume($scope37_id, "b")} #<!>${_escape(repo.pr.number)}${_el_resume($scope37_id, "c")}`);
+						writeScope($scope37_id, {});
 					}, "id", $scope34_id, "a");
 					_html(" — this view has a newer tip than the PR page.</span><span class=\"mono dim toast-meta\">");
 					_for_of(driftRepos, (repo, i) => {
-						const $scope39_id = _scope_id();
-						_html(`<span${_attr("title", `origin/${repo.pr.headRefName} ${repo.head} · GitHub ${repo.pr.headRefOid}`)}>${i > 0 ? " · " : ""}${_el_resume($scope39_id, "b")}<!>${_escape(shortSha(repo.head))}${_el_resume($scope39_id, "c")} → <!>${_escape(shortSha(repo.pr.headRefOid))}${_el_resume($scope39_id, "d")}</span>${_el_resume($scope39_id, "a")}`);
-						writeScope($scope39_id, {});
+						const $scope38_id = _scope_id();
+						_html(`<span${_attr("title", `origin/${repo.pr.headRefName} ${repo.head} · GitHub ${repo.pr.headRefOid}`)}>${i > 0 ? " · " : ""}${_el_resume($scope38_id, "b")}<!>${_escape(shortSha(repo.head))}${_el_resume($scope38_id, "c")} → <!>${_escape(shortSha(repo.pr.headRefOid))}${_el_resume($scope38_id, "d")}</span>${_el_resume($scope38_id, "a")}`);
+						writeScope($scope38_id, {});
 					}, "id", $scope34_id, "b", 1, 1, 1, "</span>", 1);
 					_subscribe($driftRepos__closures, writeScope($scope34_id, { _: _scope_with_id($scope19_id) }));
 					_resume_branch($scope34_id);
@@ -6303,7 +6317,7 @@ var diff_view_default = _template("e", (input) => {
 			writeScope($scope19_id, { a: _existing_scope($childScope5) });
 			return 0;
 		}
-	}, $scope0_id, "x", 1, 1, 1, 0, 1);
+	}, $scope0_id, "w", 1, 1, 1, 0, 1);
 	_for_of(repoList.filter(localDiffers), (repo) => {
 		const $scope26_id = _scope_id();
 		const $for_content8__repo_head__closures = /* @__PURE__ */ new Set();
@@ -6316,13 +6330,13 @@ var diff_view_default = _template("e", (input) => {
 			kind: "info",
 			placement: "inline",
 			title: `${repo.worktree} #${repo.pr.number}`,
-			content: _content_resume("e45", () => {
+			content: _content_resume("e46", () => {
 				_scope_reason();
 				const $scope27_id = _scope_id();
 				_html(`this view is <!>${_escape(shortSha(repo.head))}${_el_resume($scope27_id, "a")} (<!>${_escape(repo.pr.headRefName)}${_el_resume($scope27_id, "b")}). Local is <!>${_escape(shortSha(repo.localHead))}${_el_resume($scope27_id, "c")} (<!>${_escape(repo.branch)}${_el_resume($scope27_id, "d")}<!>${uncommitted ? ", plus uncommitted" : ""}${_el_resume($scope27_id, "e")}).`);
 				_subscribe($for_content8__repo_branch__closures, _subscribe($for_content8__repo_localHead__closures, _subscribe($for_content8__repo_pr_headRefName__closures, _subscribe($for_content8__repo_head__closures, _subscribe($uncommitted__closures, writeScope($scope27_id, {
 					_: _scope_with_id($scope26_id),
-					Ccz: 2
+					Cd1: 2
 				}))))));
 				_resume_branch($scope27_id);
 			}, $scope26_id)
@@ -6338,15 +6352,7 @@ var diff_view_default = _template("e", (input) => {
 			o: $for_content8__repo_branch__closures,
 			a: _existing_scope($childScope6)
 		});
-	}, "id", $scope0_id, "y", 1, 1, 1, 0, 1);
-	_if(() => {
-		if (!repos && loading) {
-			const $scope40_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($scope40_id, {});
-			return 0;
-		}
-	}, $scope0_id, "z", 1, 1, 1, 0, 1);
+	}, "id", $scope0_id, "x", 1, 1, 1, 0, 1);
 	_if(() => {
 		if (repos && !allFiles.length) {
 			const $scope32_id = _scope_id();
@@ -6359,7 +6365,7 @@ var diff_view_default = _template("e", (input) => {
 			writeScope($scope21_id, {});
 			return 1;
 		}
-	}, $scope0_id, "a0", 1, 1, 1, 0, 1);
+	}, $scope0_id, "y", 1, 1, 1, 0, 1);
 	_for_of(repoList, (repo) => {
 		const $scope9_id = _scope_id();
 		const $for_content3__repo_pr_number__closures = /* @__PURE__ */ new Set();
@@ -6389,43 +6395,43 @@ var diff_view_default = _template("e", (input) => {
 						_html(`<button class=${collapsedRepos.has(repo.id) ? "\"repo-sep closed\"" : "repo-sep"}><span class=tree-chev>${collapsedRepos.has(repo.id) ? "▸" : "▾"}${_el_resume($scope30_id, "b")}</span><span class=mono>${_escape(repo.worktree)}${_el_resume($scope30_id, "c")}</span>`);
 						_if(() => {
 							if (repo.pr) {
-								const $scope41_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($scope41_id, "b")}</a>${_el_resume($scope41_id, "a")}<span class=dim>${_escape(repo.pr.title)}${_el_resume($scope41_id, "c")}</span>`);
-								_script($scope41_id, "e46");
-								_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($scope41_id, {
+								const $scope39_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($scope39_id, "b")}</a>${_el_resume($scope39_id, "a")}<span class=dim>${_escape(repo.pr.title)}${_el_resume($scope39_id, "c")}</span>`);
+								_script($scope39_id, "e47");
+								_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($scope39_id, {
 									Ca5: 2,
 									Ca6: 2,
 									Ca7: 2
 								}))))))));
 								return 0;
 							} else {
-								const $scope42_id = _scope_id();
-								_html(`<span class=dim>${_escape(repo.full_name)}${_el_resume($scope42_id, "a")}</span>`);
-								_subscribe($for_content3__repo_full_name__closures, writeScope($scope42_id, {}));
+								const $scope40_id = _scope_id();
+								_html(`<span class=dim>${_escape(repo.full_name)}${_el_resume($scope40_id, "a")}</span>`);
+								_subscribe($for_content3__repo_full_name__closures, writeScope($scope40_id, {}));
 								return 1;
 							}
 						}, $scope30_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($scope30_id, "f")}</span>${_el_resume($scope30_id, "e")}<span class=chip${_attr("title", `${repo.base} ${repo.baseSha}`)}>vs <!>${_escape(repo.base)}${_el_resume($scope30_id, "h")}</span>${_el_resume($scope30_id, "g")}`);
 						_if(() => {
 							if (localDiffers(repo)) {
-								const $scope43_id = _scope_id();
-								_html(`<span class=chip${_attr("title", `checked out ${repo.branch} ${repo.localHead}`)}>local <!>${_escape(repo.branch)}${_el_resume($scope43_id, "b")}</span>${_el_resume($scope43_id, "a")}`);
-								_subscribe($for_content3__repo_localHead__closures, _subscribe($for_content3__repo_branch__closures, writeScope($scope43_id, { Ca9: 2 })));
+								const $scope41_id = _scope_id();
+								_html(`<span class=chip${_attr("title", `checked out ${repo.branch} ${repo.localHead}`)}>local <!>${_escape(repo.branch)}${_el_resume($scope41_id, "b")}</span>${_el_resume($scope41_id, "a")}`);
+								_subscribe($for_content3__repo_localHead__closures, _subscribe($for_content3__repo_branch__closures, writeScope($scope41_id, { Ca9: 2 })));
 								return 0;
 							}
 						}, $scope30_id, "i", 1, 1, 1, 0, 1);
 						_html(`</button>${_el_resume($scope30_id, "a")}`);
-						_script($scope30_id, "e47");
-						_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($scope30_id, { Cd4: 1 }))))))))));
+						_script($scope30_id, "e48");
+						_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($scope30_id, { Cd6: 1 }))))))))));
 						return 0;
 					} else {
 						const $scope33_id = _scope_id();
 						_html("<p class=repo-meta>");
 						_if(() => {
 							if (repo.pr) {
-								const $scope44_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($scope44_id, "b")}</a>${_el_resume($scope44_id, "a")}<span class=dim>${_escape(repo.pr.title)}${_el_resume($scope44_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($scope44_id, {
+								const $scope42_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($scope42_id, "b")}</a>${_el_resume($scope42_id, "a")}<span class=dim>${_escape(repo.pr.title)}${_el_resume($scope42_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($scope42_id, {
 									Ca1: 1,
 									Ca2: 1,
 									Ca3: 1,
@@ -6440,9 +6446,9 @@ var diff_view_default = _template("e", (input) => {
 						_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($scope33_id, "c")}</span>${_el_resume($scope33_id, "b")}<span class=chip${_attr("title", `${repo.base} ${repo.baseSha}`)}>vs <!>${_escape(repo.base)}${_el_resume($scope33_id, "e")}</span>${_el_resume($scope33_id, "d")}`);
 						_if(() => {
 							if (localDiffers(repo)) {
-								const $scope45_id = _scope_id();
-								_html(`<span class=chip${_attr("title", `checked out ${repo.branch} ${repo.localHead}`)}>local <!>${_escape(repo.branch)}${_el_resume($scope45_id, "b")}</span>${_el_resume($scope45_id, "a")}`);
-								_subscribe($for_content3__repo_localHead__closures, _subscribe($for_content3__repo_branch__closures, writeScope($scope45_id, {
+								const $scope43_id = _scope_id();
+								_html(`<span class=chip${_attr("title", `checked out ${repo.branch} ${repo.localHead}`)}>local <!>${_escape(repo.branch)}${_el_resume($scope43_id, "b")}</span>${_el_resume($scope43_id, "a")}`);
+								_subscribe($for_content3__repo_localHead__closures, _subscribe($for_content3__repo_branch__closures, writeScope($scope43_id, {
 									Ca9: 3,
 									Caa: 1
 								})));
@@ -6475,9 +6481,9 @@ var diff_view_default = _template("e", (input) => {
 							_html(`<details${_attr_details_or_dialog_open($scope12_id, "a", expanded)} class=file${_attr("data-key", file.key)}${_attr("hidden", !shownKeySet.has(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 $scope46_id = _scope_id();
-									_html(`<span class=chip>💬 <!>${_escape(fileComments.length)}${_el_resume($scope46_id, "a")}</span>`);
-									writeScope($scope46_id, {});
+									const $scope44_id = _scope_id();
+									_html(`<span class=chip>💬 <!>${_escape(fileComments.length)}${_el_resume($scope44_id, "a")}</span>`);
+									writeScope($scope44_id, {});
 									return 0;
 								}
 							}, $scope12_id, "f", 1, 1, 1, 0, 1);
@@ -6486,19 +6492,19 @@ var diff_view_default = _template("e", (input) => {
 							}, "e1", $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 $scope47_id = _scope_id();
+									const $scope45_id = _scope_id();
 									_html("<p class=\"dim diff-pad\">binary file</p>");
-									writeScope($scope47_id, {});
+									writeScope($scope45_id, {});
 									return 0;
 								} else if (file.tooLarge) {
-									const $scope48_id = _scope_id();
+									const $scope46_id = _scope_id();
 									_html("<p class=\"dim diff-pad\">file too large to display</p>");
-									writeScope($scope48_id, {});
+									writeScope($scope46_id, {});
 									return 1;
 								} else if (file.old == null && file.new == null) {
-									const $scope49_id = _scope_id();
+									const $scope47_id = _scope_id();
 									_html("<p class=\"dim diff-pad\">file could not be read</p>");
-									writeScope($scope49_id, {});
+									writeScope($scope47_id, {});
 									return 2;
 								} else if (expanded) {
 									const $scope15_id = _scope_id();
@@ -6506,7 +6512,7 @@ var diff_view_default = _template("e", (input) => {
 										{
 											const $scope31_id = _scope_id();
 											_html(`<div class=diff-wait></div>${_el_resume($scope31_id, "a")}`);
-											_script($scope31_id, "e48");
+											_script($scope31_id, "e49");
 											writeScope($scope31_id, {});
 											return 0;
 										}
@@ -6516,7 +6522,7 @@ var diff_view_default = _template("e", (input) => {
 								}
 							}, $scope12_id, "i");
 							_html(`</details>${_el_resume($scope12_id, "a")}`);
-							_script($scope12_id, "e49");
+							_script($scope12_id, "e50");
 							_subscribe($toggleViewed2__closures, _subscribe($commentsByFile__closures, _subscribe($shownKeySet__closures, _subscribe($viewed__closures, writeScope($scope12_id, {
 								k: file,
 								l: file?.key,
@@ -6530,8 +6536,8 @@ var diff_view_default = _template("e", (input) => {
 								a0: $for_content4__file__closures,
 								a1: $for_content4__file_key__closures,
 								a2: $for_content4__fileComments__closures,
-								Ccq: 1,
-								Cde: 1
+								Ccs: 1,
+								Cdg: 1
 							})))));
 						}, "key", $scope11_id, "a", 1, 1, 1, "</div>", 1);
 						_subscribe($for_content3__repoFiles__closures, writeScope($scope11_id, {}));
@@ -6576,98 +6582,101 @@ var diff_view_default = _template("e", (input) => {
 			a0: $for_content3__repo_worktree__closures,
 			ab: $for_content3__repoFiles__closures
 		});
-	}, "id", $scope0_id, "a1");
-	_html(`</div>${_el_resume($scope0_id, "t")}</div>`);
-	_if(() => {}, $scope0_id, "a2");
+	}, "id", $scope0_id, "z");
+	_html(`</div>${_el_resume($scope0_id, "s")}</div>`);
+	_if(() => {}, $scope0_id, "a0");
 	_html("</div>");
-	_script($scope0_id, "e52");
 	_script($scope0_id, "e53");
+	_script($scope0_id, "e54");
 	writeScope($scope0_id, {
-		a5: input.workspaceId,
-		a6: input.focusPr,
-		a7: input.active,
-		a8: input.focusNonce,
-		a9: input.sessions,
-		ab: input.onSent,
-		ac: input.onExit,
-		ad: input.sessions?.[0]?.title,
-		ae: input.sessions?.[0]?.agent,
-		af: repos,
-		ag: comments,
-		ai: viewed,
-		ak: viewed?.size,
-		al: draft,
-		an: error,
-		ao: loading,
-		aq: copied,
-		ar: sending,
-		as: sendTarget,
-		au: fileFilter,
-		av: uncommitted,
-		aw: treeOpen,
-		az: findTick,
-		b1: findState?.query,
-		b3: findState?.hit,
-		b4: findState?.hit?.key,
-		b5: findState?.hit?.repo,
-		b6: collapsedDirs,
-		b7: collapsedRepos,
-		b8: dismissedDrift,
-		b9: toggleRepo,
-		bb: nearBox.cbs,
-		bc: nearBox.io,
-		be: observeNear,
-		bf: focusPrSection,
+		a3: input.workspaceId,
+		a4: input.focusPr,
+		a5: input.active,
+		a6: input.focusNonce,
+		a7: input.sessions,
+		a9: input.onSent,
+		aa: input.onExit,
+		ab: input.sessions?.[0]?.title,
+		ac: input.sessions?.[0]?.agent,
+		ad: repos,
+		ae: comments,
+		ag: viewed,
+		ai: viewed?.size,
+		aj: draft,
+		al: error,
+		am: loading,
+		an: copied,
+		ao: sending,
+		ap: sendTarget,
+		ar: fileFilter,
+		as: uncommitted,
+		at: treeOpen,
+		aw: findTick,
+		ay: findState?.query,
+		b0: findState?.hit,
+		b1: findState?.hit?.key,
+		b2: findState?.hit?.repo,
+		b3: collapsedDirs,
+		b4: collapsedRepos,
+		b5: dismissedDrift,
+		b6: toggleRepo,
+		b8: nearBox.cbs,
+		b9: nearBox.io,
+		bb: observeNear,
+		bc: focusPrSection,
+		be: headBox.sig,
+		bg: headBox.timer,
 		bh: load,
 		bj: loadReview,
-		bl: repoList,
-		bn: repoList.length,
-		bo: allFiles,
-		bp: allFiles?.length,
-		bq: fileMatch,
-		bs: fileFiltered,
-		bt: findKeys,
-		bv: shownFiles,
-		bz: shownKeySet,
-		c0: filesByRepo,
-		c1: shownByRepo,
-		c3: commentsByFile,
-		c4: sendPick,
-		c5: localDiffers,
-		c7: driftRepos,
-		ca: dismissDrift,
-		cb: reload,
-		cc: toggleViewed,
-		cd: saveComment,
-		ce: removeComment,
-		cf: clearComments,
-		ci: copyMarkdown,
-		cj: sendTo,
-		ck: jumpTo,
-		cl: openFind,
-		cm: onFindState,
-		d3: $collapsedDirs__closures,
-		cq: $viewed__closures,
-		de: $commentsByFile__closures,
-		dd: $shownByRepo__closures,
-		co: $si__input_sessions_0_title && $input_sessions_0_title__closures,
-		cp: $si__input_sessions_0_agent && $input_sessions_0_agent__closures,
-		cw: $sending__closures,
-		cn: $si__input_sessions && $input_sessions__closures,
-		cx: $sendTarget__closures,
-		r: _existing_scope($childScope),
-		ct: $error__closures,
-		cz: $uncommitted__closures,
-		cu: $loading__closures,
-		dg: $driftRepos__closures,
-		d4: $collapsedRepos__closures,
-		cs: $draft__closures,
-		dj: $saveComment2__closures,
-		dk: $removeComment2__closures,
-		db: $shownKeySet__closures,
-		di: $toggleViewed2__closures,
-		d2: $findState_hit_repo__closures,
-		d7: $repoList_length__closures
+		bk: reload,
+		bm: reloadSoon,
+		bo: repoList,
+		bq: repoList.length,
+		br: allFiles,
+		bs: allFiles?.length,
+		bt: fileMatch,
+		bv: fileFiltered,
+		bw: findKeys,
+		by: shownFiles,
+		c2: shownKeySet,
+		c3: filesByRepo,
+		c4: shownByRepo,
+		c6: commentsByFile,
+		c7: sendPick,
+		c8: localDiffers,
+		ca: driftRepos,
+		cd: dismissDrift,
+		ce: toggleViewed,
+		cf: saveComment,
+		cg: removeComment,
+		ch: clearComments,
+		ck: copyMarkdown,
+		cl: sendTo,
+		cm: jumpTo,
+		cn: openFind,
+		co: onFindState,
+		d5: $collapsedDirs__closures,
+		cs: $viewed__closures,
+		dg: $commentsByFile__closures,
+		df: $shownByRepo__closures,
+		cq: $si__input_sessions_0_title && $input_sessions_0_title__closures,
+		cr: $si__input_sessions_0_agent && $input_sessions_0_agent__closures,
+		cy: $sending__closures,
+		cp: $si__input_sessions && $input_sessions__closures,
+		cz: $sendTarget__closures,
+		q: _existing_scope($childScope),
+		cv: $error__closures,
+		d1: $uncommitted__closures,
+		cw: $loading__closures,
+		di: $driftRepos__closures,
+		d6: $collapsedRepos__closures,
+		cu: $draft__closures,
+		dl: $saveComment2__closures,
+		dm: $removeComment2__closures,
+		dd: $shownKeySet__closures,
+		dk: $toggleViewed2__closures,
+		d4: $findState_hit_repo__closures,
+		d9: $repoList_length__closures
 	});
 	_resume_branch($scope0_id);
 });
@@ -14421,15 +14430,7 @@ async function createWorkspace(name, repos) {
 				const bare = await ensureBare(repo.fullName);
 				const defaultBranch = await bareDefaultBranch(bare);
 				const base = repo.baseBranch || defaultBranch;
-				progress(`Adding worktree ${worktree}/ (${base})…`);
-				await git([
-					"worktree",
-					"add",
-					"-b",
-					branch,
-					path.join(dir, worktree),
-					`origin/${base}`
-				], bare);
+				await addWorkspaceWorktree(bare, path.join(dir, worktree), branch, base);
 				return {
 					full_name: repo.fullName,
 					worktree,
@@ -14467,15 +14468,7 @@ async function addRepo(workspaceId, fullName, baseBranch) {
 		const bare = await ensureBare(fullName);
 		const defaultBranch = await bareDefaultBranch(bare);
 		const base = baseBranch || defaultBranch;
-		progress(`Adding worktree ${worktree}/ (${base})…`);
-		await git([
-			"worktree",
-			"add",
-			"-b",
-			ws.branch,
-			path.join(ws.path, worktree),
-			`origin/${base}`
-		], bare);
+		await addWorkspaceWorktree(bare, path.join(ws.path, worktree), ws.branch, base);
 		return {
 			base,
 			defaultBranch
@@ -14653,6 +14646,82 @@ async function ensureBare(fullName) {
 async function bareDefaultBranch(bare) {
 	return (await git(["symbolic-ref", "HEAD"], bare)).replace("refs/heads/", "");
 }
+/** `git rev-parse --verify` → oid, or null if the ref is missing. */
+async function revParse(cwd, ref) {
+	try {
+		return await git([
+			"rev-parse",
+			"--verify",
+			ref
+		], cwd);
+	} catch {
+		return null;
+	}
+}
+/**
+* Create a worktree on the workspace branch tip that matches latest
+* `origin/<base>`.
+*
+* Fresh branch → cut from `origin/<base>` after fetch (ensureBare).
+* Existing `origin/<ws-branch>` (re-add, open PR, prior push) → restore
+* that branch then rebase onto `origin/<base>` so the checkout is not
+* stuck on an old main tip. Leftover local branches with no worktree are
+* deleted so `worktree add -b` can recreate them.
+*/
+async function addWorkspaceWorktree(bare, dest, branch, base) {
+	const baseRef = `origin/${base}`;
+	if (!await revParse(bare, baseRef)) throw new Error(`missing ${baseRef} after fetch`);
+	await git(["worktree", "prune"], bare).catch(() => {});
+	if (await revParse(bare, `refs/heads/${branch}`)) {
+		if ((await git([
+			"worktree",
+			"list",
+			"--porcelain"
+		], bare)).includes(`branch refs/heads/${branch}`)) throw new Error(`${branch} is already checked out in another worktree`);
+		await git([
+			"branch",
+			"-D",
+			branch
+		], bare);
+	}
+	const remoteWs = await revParse(bare, `refs/remotes/origin/${branch}`);
+	const label = path.basename(dest);
+	if (remoteWs) {
+		progress(`Restoring ${label}/ from origin/${branch}…`);
+		await git([
+			"worktree",
+			"add",
+			"-b",
+			branch,
+			dest,
+			`origin/${branch}`
+		], bare);
+		if (await git([
+			"merge-base",
+			branch,
+			baseRef
+		], dest) !== await git(["rev-parse", baseRef], dest)) {
+			progress(`Rebasing ${label}/ onto ${base}…`);
+			try {
+				await git(["rebase", baseRef], dest);
+			} catch (err) {
+				await git(["rebase", "--abort"], dest).catch(() => {});
+				const why = err instanceof Error ? err.message : String(err);
+				throw new Error(`Could not rebase ${branch} onto ${baseRef} for ${label}/. ${why}`);
+			}
+		}
+	} else {
+		progress(`Adding worktree ${label}/ (${base})…`);
+		await git([
+			"worktree",
+			"add",
+			"-b",
+			branch,
+			dest,
+			baseRef
+		], bare);
+	}
+}
 /** `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`. */
@@ -21965,4 +22034,4 @@ server.listen(port, () => {
 //#endregion
 export {};
 
-;var __MARKO_MANIFEST__={"esfPH6H":{"block":[2,"stylesheet#/assets/index-CxxdFG3E.css",6,"<link",0," rel=\"stylesheet\" crossorigin href=\"",1,"assets/index-CxxdFG3E.css\"",">"],"defer":[2,"/assets/index-CxXU95sL.js",6,"<script",0," async type=\"module\" crossorigin src=\"",1,"assets/index-CxXU95sL.js\"","></script>"]}};
+;var __MARKO_MANIFEST__={"esfPH6H":{"block":[2,"stylesheet#/assets/index-BxVK_c-q.css",6,"<link",0," rel=\"stylesheet\" crossorigin href=\"",1,"assets/index-BxVK_c-q.css\"",">"],"defer":[2,"/assets/index-LnMHViqj.js",6,"<script",0," async type=\"module\" crossorigin src=\"",1,"assets/index-LnMHViqj.js\"","></script>"]}};