@norman-else/dsh-claude 0.1.37 → 0.1.38

package/lib/client.js

@@ -6674,6 +6674,12 @@ window.__ModuleLoader__.load({
 			if (body.mode !== "worktree" && body.mode !== "checkout" || typeof body.root !== "string" || typeof body.branch !== "string") throw new Error("Invalid repository cleanup response.");
 			return body;
 		}
+		/** Ask the Host to reconcile worktrees against the workspace registry now.
+		*  Deleting a workspace only touches the registry, so this kick is what makes
+		*  the worktree and its sessions go without waiting out the sweep interval. */
+		async function sweepWorktrees() {
+			await pluginWrite(`${CLAUDE_REPOSITORY_SETUP_PATH}/sweep`, "fast");
+		}
 		/** Lines [from, to] of a working-tree file plus its total line count, for expanding unmodified diff context. */
 		async function loadRepositoryFileLines(cwd, path, from, to, signal) {
 			const body = await pluginRead(CLAUDE_REPOSITORY_FILE_PATH, "git", signal, { query: {
@@ -7398,6 +7404,14 @@ window.__ModuleLoader__.load({
 				}) : null]
 			});
 		}
+		/** The trigger only shows on a clean branch that is behind its base -- but a
+		*  conflicted rebase leaves the tree dirty on a detached HEAD, so an open
+		*  dialog (and its resolve button) has to outlive that. */
+		function updateBranchMounted(repository, dialogOpen) {
+			const pullRequest = repository.pullRequest;
+			if (pullRequest?.baseBranch === void 0) return false;
+			return dialogOpen || pullRequest.state === "open" && repository.detached !== true && repository.dirty !== true && (repository.baseBehind ?? 0) > 0;
+		}
 		function UpdateBranchControl({ sessionId, repository, t, report, submitPrompt }) {
 			const [dialog, setDialog] = useState();
 			const [method, setMethod] = useState("rebase");
@@ -7406,7 +7420,8 @@ window.__ModuleLoader__.load({
 			const base = pullRequest?.baseBranch;
 			const behind = repository.baseBehind ?? 0;
 			useEffect(() => () => controller.current?.abort(), []);
-			if (pullRequest === void 0 || pullRequest.state !== "open" || base === void 0 || repository.detached === true || repository.dirty === true || behind <= 0) return null;
+			if (pullRequest === void 0 || base === void 0) return null;
+			if (!updateBranchMounted(repository, dialog !== void 0)) return null;
 			const openDialog = () => {
 				controller.current?.abort();
 				setDialog({
@@ -15338,13 +15353,37 @@ window.__ModuleLoader__.load({
 		function directChildContaining(parent, descendant) {
 			return Array.from(parent.children).find((child) => child === descendant || child.contains(descendant));
 		}
-		/** Locate rc.8's hero preset seat without relying on hashed CSS module names. */
-		function locateClaudePresetSeat(root = document) {
+		/** The hero's preset buttons: menu buttons without an `aria-label`, which is
+		*  what separates the preset seat from the labelled workspace picker. The
+		*  portal's own branch trigger answers that description too, so it is excluded
+		*  -- counting it made the row look like it held two staged presets from the
+		*  moment these controls mounted. */
+		function heroPresetButtons(root) {
 			const heroes = Array.from(root.querySelectorAll(HERO_SELECTOR));
 			if (heroes.length !== 1) return void 0;
 			const hero = heroes[0];
 			if (hero === void 0) return void 0;
-			const presetButtons = Array.from(hero.querySelectorAll("button[aria-haspopup=\"menu\"]")).filter((button) => button.getAttribute("aria-label") === null && isClaudePresetText(normalizedText(button)));
+			return {
+				hero,
+				presets: Array.from(hero.querySelectorAll("button[aria-haspopup=\"menu\"]")).filter((button) => button.getAttribute("aria-label") === null && button.closest(`[${PORTAL_ATTRIBUTE}]`) === null)
+			};
+		}
+		/** True once the hero has settled on a preset that is not Claude.
+		*  `locateClaudePresetSeat` reports that the same way it reports a hero
+		*  mid-render -- by missing -- so without this the retention rule below reads a
+		*  deliberate switch away from Claude as a re-render and leaves the controls up. */
+		function showsOtherPresetSeat(root = document) {
+			const found = heroPresetButtons(root);
+			if (found === void 0 || found.presets.length !== 1) return false;
+			const preset = found.presets[0];
+			return preset !== void 0 && !isClaudePresetText(normalizedText(preset));
+		}
+		/** Locate rc.8's hero preset seat without relying on hashed CSS module names. */
+		function locateClaudePresetSeat(root = document) {
+			const found = heroPresetButtons(root);
+			if (found === void 0) return void 0;
+			const { hero } = found;
+			const presetButtons = found.presets.filter((button) => isClaudePresetText(normalizedText(button)));
 			if (presetButtons.length !== 1) return void 0;
 			const preset = presetButtons[0];
 			if (preset === void 0) return void 0;
@@ -15803,7 +15842,7 @@ window.__ModuleLoader__.load({
 					scheduled = false;
 					const target = locateClaudePresetSeat();
 					if (target === void 0) {
-						if (retainsClaudeHeroPortal(current)) return;
+						if (retainsClaudeHeroPortal(current) && !showsOtherPresetSeat()) return;
 						current = void 0;
 						removeClaudeHeroPortals();
 						setPortal(void 0);
@@ -17800,6 +17839,15 @@ window.__ModuleLoader__.load({
 			const workspaces = ctx.get("workspaces");
 			const uiWorkspace = ctx.get("uiWorkspace");
 			const connectWorkspace = uiWorkspace?.connectWorkspace?.bind(uiWorkspace) ?? (typeof workspaces?.connectWorkspace === "function" ? workspaces.connectWorkspace.bind(workspaces) : void 0);
+			if (workspaces !== void 0) ctx.effect(() => {
+				let known = new Set(workspaces.list.getSnapshot().items.map((item) => item.workspaceId));
+				return workspaces.list.subscribe(() => {
+					const next = new Set(workspaces.list.getSnapshot().items.map((item) => item.workspaceId));
+					const removed = [...known].some((id) => !next.has(id));
+					known = next;
+					if (removed) sweepWorktrees().catch(() => void 0);
+				});
+			}, "dsh-claude: worktree sweep on workspace deletion");
 			const conversation = ctx.get("conversation");
 			const connection = ctx.get("connection");
 			const remote = ctx.get("remote");