dsh-worktree-switch 0.5.0 → 0.5.1

package/lib/client.js

@@ -77,196 +77,21 @@ function WorktreeBadge(props) {
 		})
 	});
 }
-// src/client/Chip.tsx
+// src/types.ts
 /**
-* The New Session switch.
+* Whether a leave that kept a copy left a 保留副本 behind.
 *
-* The slot it occupies (`conversation.input.left`) renders in the composer of
-* every open session, and gives its occupant no `variant`; the blank-session
-* hero is instead recognised from the session itself, exactly as the shell
-* recognises it: a session whose list summary says blank and whose history is
-* open. Outside that state this component renders nothing at all — the spec's
-* "no greyed remnant" — and it releases the composer block it raised.
-* @module dsh-worktree-switch/client/Chip
-*/
-/**
-* The line the switch shows.
-* @param state - current state.
-* @param t - bound translate.
-* @returns visible label.
-*/
-function chipLabel(state, t) {
-	switch (state.phase) {
-		case "checking": return t("chip.checking");
-		case "off": return t("chip.off");
-		case "creating": return t("chip.creating");
-		case "reverting": return t("chip.reverting");
-		case "ready": return t("chip.ready", { name: state.worktree?.name ?? "" });
-		case "failed": return t("chip.failed");
-		case "disabled": return t("chip.disabled");
-	}
-}
-/**
-* The hover text: why the switch is where it is, and what the copy is.
-* @param state - current state.
-* @param t - bound translate.
-* @returns tooltip text.
-*/
-function chipHint(state, t) {
-	switch (state.phase) {
-		case "checking": return t("chip.hint.checking");
-		case "off": {
-			const parts = [t("chip.hint.off")];
-			if (state.kept !== null) parts.push(state.kept.reason === "dirty" ? t("chip.hint.keptDirty", { name: state.kept.worktree.name }) : t("chip.hint.keptNotOwned", { name: state.kept.worktree.name }));
-			if (state.error !== null) parts.push(state.error);
-			return parts.join(" ");
-		}
-		case "creating": return t("chip.hint.creating");
-		case "reverting": return t("chip.hint.reverting");
-		case "ready": {
-			const copy = state.worktree;
-			const parts = [copy === null || copy.branch === null ? t("chip.hint.detached", { path: copy?.path ?? "" }) : t("chip.hint.ready", {
-				branch: copy.branch,
-				path: copy.path
-			})];
-			if (state.base?.kind === "fallback") parts.push(t("chip.hint.baseFallback"));
-			if (!state.intent) parts.push(t("chip.hint.intentOff", { name: state.worktree?.name ?? "" }));
-			if (state.sourceDirty > 0) parts.push(t("chip.hint.dirty", { count: state.sourceDirty }));
-			if (state.error !== null) parts.push(state.error);
-			return parts.join(" ");
-		}
-		case "failed": {
-			const base = t("chip.hint.failed");
-			return state.error === null ? base : `${base} ${state.error}`;
-		}
-		case "disabled": return t("chip.hint.disabled");
-	}
-}
-/**
-* Render the Worktree switch.
-* @param props - slot runtime props, the binding face, and the locale seat.
-* @returns the switch, or null outside the blank-session hero.
-*/
-function WorktreeChip(props) {
-	const { useSession, useToggle, ensure, setIntent, retry, block, t } = props;
-	const hero = useSession((session) => session.blank && session.openState === "open");
-	const state = useToggle((current) => current);
-	(0, react.useEffect)(() => {
-		if (hero) ensure();
-	}, [ensure, hero]);
-	(0, react.useEffect)(() => {
-		if (!hero) {
-			block(null);
-			return;
-		}
-		const reason = state.phase === "checking" ? t("chip.blocked.checking") : state.phase === "creating" ? t("chip.blocked.creating") : state.phase === "reverting" ? t("chip.blocked.reverting") : state.phase === "failed" && state.intent ? t("chip.blocked.failed") : null;
-		block(reason);
-	}, [
-		block,
-		hero,
-		state.intent,
-		state.phase,
-		t
-	]);
-	(0, react.useEffect)(() => () => {
-		block(null);
-	}, [block]);
-	if (!hero) return null;
-	const hint = chipHint(state, t);
-	const locked = state.phase === "checking" || state.phase === "disabled" || state.phase === "reverting";
-	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-		className: "dsh-wt-chip",
-		"data-phase": state.phase,
-		"data-intent": state.intent ? "on" : "off",
-		"data-kept": state.kept === null ? "false" : state.kept.reason,
-		"data-hint": hint,
-		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
-			label: hint,
-			side: "top",
-			delayMs: 200,
-			children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-				className: "dsh-wt-anchor",
-				children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
-					type: "button",
-					role: "switch",
-					"aria-checked": state.intent,
-					"aria-label": t("chip.label"),
-					className: "dsh-wt-switch",
-					"data-phase": state.phase,
-					disabled: locked,
-					onClick: () => {
-						setIntent(!state.intent);
-					},
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-						className: "dsh-wt-dot",
-						"aria-hidden": "true"
-					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-						className: "dsh-wt-label",
-						children: chipLabel(state, t)
-					})]
-				})
-			})
-		}), state.phase === "failed" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-			type: "button",
-			className: "dsh-wt-retry",
-			onClick: () => {
-				retry();
-			},
-			children: t("chip.retry")
-		}) : null]
-	});
-}
-// src/client/Notice.tsx
-/**
-* The sentence a notice shows.
-* @param notice - what the leave reported.
-* @param t - bound translate.
-* @returns the localized explanation.
+* Not every copy a leave leaves on disk is a leftover: only `dirty` is. A copy
+* kept because this session never owned it (`not-owned`) is the ordinary result
+* of leaving someone else's copy — explained in the switch's hover, never
+* reported as cleanup. The host registers a kept copy for the panel count and
+* the browser half raises the one-shot notice only when this returns true, so
+* the two halves cannot drift apart on the rule.
+* @param reason - why the host kept the copy, or null when it kept nothing.
+* @returns whether the kept copy is a leftover this host has to clean up.
 */
-function noticeText(notice, t) {
-	if (notice.kind === "failed") return t("notice.failed", { message: notice.message ?? "" });
-	const name = notice.worktree?.name ?? "";
-	return notice.reason === "dirty" ? t("notice.keptDirty", { name }) : t("notice.keptNotOwned", { name });
-}
-/**
-* Render the one-shot notice.
-* @param props - overlay runtime props, the notice face, and the locale seat.
-* @returns the banner, or null while nothing happened.
-*/
-function WorktreeNotice(props) {
-	const { useNotice, dismiss, openPanel, t } = props;
-	const notice = useNotice((current) => current);
-	if (notice === null) return null;
-	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-		className: "dsh-wt-notice",
-		"data-kind": notice.kind,
-		"data-seq": notice.seq,
-		role: "status",
-		children: [
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-				className: "dsh-wt-notice-text",
-				title: notice.kind === "kept" && notice.message !== null ? notice.message : void 0,
-				children: noticeText(notice, t)
-			}),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-				type: "button",
-				className: "dsh-wt-notice-open",
-				onClick: () => {
-					openPanel();
-				},
-				children: t("notice.openPanel")
-			}),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-				type: "button",
-				className: "dsh-wt-notice-dismiss",
-				"aria-label": t("notice.dismiss"),
-				onClick: () => {
-					dismiss();
-				},
-				children: "×"
-			})
-		]
-	}, notice.seq);
+function isKeptLeftover(reason) {
+	return reason === "dirty";
 }
 // src/client/intent.ts
 /**
@@ -340,6 +165,21 @@ async function callHost(ctx, endpoint, payload, signal) {
 	return result.value;
 }
 // src/client/state.ts
+/**
+* The switch position the page shows: on exactly while the session runs in a
+* copy.
+*
+* The position is derived, not stored: `ready` means the host confirmed a copy
+* for this session, and every other face falls back to the project's isolation
+* default. Keeping the two apart is what lets `/new` inherit a copy in a
+* project whose default is off without the control claiming the session runs
+* in the source checkout.
+* @param state - the current switch state.
+* @returns whether the switch reads as on.
+*/
+function switchPosition(state) {
+	return state.phase === "ready" ? true : state.intent;
+}
 /** The initial state: nothing is known until the host answers. */
 const INITIAL = {
 	phase: "checking",
@@ -349,6 +189,7 @@ const INITIAL = {
 	sourceDirty: 0,
 	base: null,
 	error: null,
+	leaveFailed: false,
 	kept: null
 };
 /** A thrown value's message, without leaking `undefined`. */
@@ -562,6 +403,16 @@ var InternalBinding = class {
 	creating = false;
 	/** The release in flight, shared by callers that ask to leave at once. */
 	releasing = null;
+	/** A check is in flight; a recheck that arrives meanwhile must not double it. */
+	checking = false;
+	/** A recheck arrived while one was running: run exactly one more afterwards. */
+	checkAgain = false;
+	/**
+	* Whether the chip is still in the blank-session hero. A session that has
+	* history must never be moved, even by a check that was in flight when its
+	* first prompt landed.
+	*/
+	following = false;
 	face;
 	/**
 	* @param ctx - browser Cordis context.
@@ -579,6 +430,12 @@ var InternalBinding = class {
 			ensure: () => {
 				this.ensure();
 			},
+			recheck: () => {
+				this.recheck();
+			},
+			follow: (active) => {
+				this.following = active;
+			},
 			setIntent: (next) => {
 				this.setIntent(next);
 			},
@@ -594,7 +451,40 @@ var InternalBinding = class {
 	ensure() {
 		if (this.started) return;
 		this.started = true;
-		this.check();
+		this.run();
+	}
+	/**
+	* Re-run the whole check after the session's working directory moved.
+	*
+	* The working-directory projection is the only announcement of a `/new`
+	* inheritance, a host self-heal, or a completed leave, so the switch follows
+	* it with the same round trip as the first check. That allows one more
+	* `prepare` — only for a session the host reports without a copy while the
+	* isolation default is on. A create or leave in flight owns the switch: the
+	* change it caused is already covered by its own answer, and a second
+	* prepare/release must never race it.
+	*/
+	recheck() {
+		if (this.creating || this.releasing !== null) return;
+		if (!this.started) {
+			this.ensure();
+			return;
+		}
+		this.run();
+	}
+	/** Run one check, coalescing a recheck that arrives while it is in flight. */
+	run() {
+		if (this.checking) {
+			this.checkAgain = true;
+			return;
+		}
+		this.checking = true;
+		this.check().finally(() => {
+			this.checking = false;
+			if (!this.checkAgain) return;
+			this.checkAgain = false;
+			this.recheck();
+		});
 	}
 	/** Ask the host for the project's facts and act on the remembered choice. */
 	async check() {
@@ -605,28 +495,32 @@ var InternalBinding = class {
 					...this.store.getSnapshot(),
 					phase: "disabled",
 					intent: status.defaultEnabled,
-					error: null
+					error: null,
+					leaveFailed: false
 				});
 				return;
 			}
 			this.project = status.repositoryRoot;
+			const now = this.store.getSnapshot();
 			const intent = readIntent(status.repositoryRoot) ?? status.defaultEnabled;
+			const sameCopy = now.worktree !== null && status.sessionWorktree !== null && now.worktree.path === status.sessionWorktree.path;
+			const kept = !intent && now.phase === "off" && now.kept !== null && status.sessionWorktree === null ? now.kept : null;
 			const base = {
 				phase: "off",
 				intent,
 				worktree: status.sessionWorktree,
 				repositoryRoot: status.repositoryRoot,
 				sourceDirty: status.sourceDirty,
-				base: null,
+				base: sameCopy ? now.base : null,
 				error: null,
-				kept: null
+				leaveFailed: false,
+				kept
 			};
 			if (status.sessionWorktree !== null) {
 				this.store.set({
 					...base,
 					phase: "ready"
 				});
-				if (!intent) this.release();
 				return;
 			}
 			if (!intent) {
@@ -637,8 +531,16 @@ var InternalBinding = class {
 			await this.create();
 		} catch (error) {
 			if (this.signal.aborted) return;
+			const now = this.store.getSnapshot();
+			if (now.worktree !== null) {
+				this.store.set({
+					...now,
+					error: messageOf(error)
+				});
+				return;
+			}
 			this.store.set({
-				...this.store.getSnapshot(),
+				...now,
 				phase: "failed",
 				error: messageOf(error)
 			});
@@ -646,7 +548,7 @@ var InternalBinding = class {
 	}
 	/** Create the copy for a session the switch says should have one. */
 	async create() {
-		if (this.creating) return;
+		if (!this.following || this.creating) return;
 		const before = this.store.getSnapshot();
 		if (before.repositoryRoot === null || !before.intent) return;
 		this.creating = true;
@@ -670,6 +572,7 @@ var InternalBinding = class {
 				sourceDirty: prepared.sourceDirty,
 				base: prepared.state === "created" ? prepared.base : null,
 				error: null,
+				leaveFailed: false,
 				kept: null
 			});
 		} catch (error) {
@@ -727,13 +630,13 @@ var InternalBinding = class {
 				worktree: null,
 				base: null,
 				error: null,
+				leaveFailed: false,
 				kept
 			});
-			if (kept !== null) {
+			if (kept !== null && isKeptLeftover(kept.reason)) {
 				this.notices.raise({
 					kind: "kept",
 					worktree: kept.worktree,
-					reason: kept.reason,
 					message: kept.error ?? null
 				});
 				this.onLeftover();
@@ -747,16 +650,16 @@ var InternalBinding = class {
 				phase: now.worktree === null ? "off" : "ready",
 				intent: false,
 				error: message,
+				leaveFailed: true,
 				kept: null
 			});
 			this.notices.raise({
 				kind: "failed",
 				worktree: now.worktree,
-				reason: null,
 				message
 			});
 			this.onLeftover();
-			this.recheck();
+			this.reread();
 		}
 	}
 	/**
@@ -767,7 +670,7 @@ var InternalBinding = class {
 	* asks once which directory the host now records and shows that; it never
 	* creates, releases, or retries anything.
 	*/
-	async recheck() {
+	async reread() {
 		try {
 			const status = await callHost(this.ctx, "status", { sessionId: this.sessionId }, this.signal);
 			if (this.signal.aborted || !status.supported) return;
@@ -787,7 +690,7 @@ var InternalBinding = class {
 		if (state.phase === "checking" || state.phase === "disabled" || state.phase === "reverting") return;
 		if (this.project !== null) writeIntent(this.project, next);
 		if (!next) {
-			if (state.intent === next) return;
+			if (state.phase === "off" && state.worktree === null && !state.intent) return;
 			this.store.set({
 				...state,
 				intent: false,
@@ -1096,6 +999,216 @@ var PanelController = class {
 		this.lifetime.abort(/* @__PURE__ */ new Error("worktree switch unloaded"));
 	}
 };
+// src/client/Chip.tsx
+/**
+* The New Session switch.
+*
+* The slot it occupies (`conversation.input.left`) renders in the composer of
+* every open session, and gives its occupant no `variant`; the blank-session
+* hero is instead recognised from the session itself, exactly as the shell
+* recognises it: a session whose list summary says blank and whose history is
+* open. Outside that state this component renders nothing at all — the spec's
+* "no greyed remnant" — and it releases the composer block it raised.
+* @module dsh-worktree-switch/client/Chip
+*/
+/**
+* The line the switch shows.
+* @param state - current state.
+* @param t - bound translate.
+* @returns visible label.
+*/
+function chipLabel(state, t) {
+	switch (state.phase) {
+		case "checking": return t("chip.checking");
+		case "off": return t("chip.off");
+		case "creating": return t("chip.creating");
+		case "reverting": return t("chip.reverting");
+		case "ready": return t("chip.ready", { name: state.worktree?.name ?? "" });
+		case "failed": return t("chip.failed");
+		case "disabled": return t("chip.disabled");
+	}
+}
+/**
+* The hover text: why the switch is where it is, and what the copy is.
+* @param state - current state.
+* @param t - bound translate.
+* @returns tooltip text.
+*/
+function chipHint(state, t) {
+	switch (state.phase) {
+		case "checking": return t("chip.hint.checking");
+		case "off": {
+			const parts = [t("chip.hint.off")];
+			if (state.kept !== null) parts.push(state.kept.reason === "dirty" ? t("chip.hint.keptDirty", { name: state.kept.worktree.name }) : t("chip.hint.keptNotOwned", { name: state.kept.worktree.name }));
+			if (state.error !== null) parts.push(state.error);
+			return parts.join(" ");
+		}
+		case "creating": return t("chip.hint.creating");
+		case "reverting": return t("chip.hint.reverting");
+		case "ready": {
+			const copy = state.worktree;
+			const parts = [copy === null || copy.branch === null ? t("chip.hint.detached", { path: copy?.path ?? "" }) : t("chip.hint.ready", {
+				branch: copy.branch,
+				path: copy.path
+			})];
+			if (state.base?.kind === "fallback") parts.push(t("chip.hint.baseFallback"));
+			if (!state.intent) parts.push(state.leaveFailed ? t("chip.hint.intentOff", { name: state.worktree?.name ?? "" }) : t("chip.hint.isolationOff"));
+			if (state.sourceDirty > 0) parts.push(t("chip.hint.dirty", { count: state.sourceDirty }));
+			if (state.error !== null) parts.push(state.error);
+			return parts.join(" ");
+		}
+		case "failed": {
+			const base = t("chip.hint.failed");
+			return state.error === null ? base : `${base} ${state.error}`;
+		}
+		case "disabled": return t("chip.hint.disabled");
+	}
+}
+/**
+* Render the Worktree switch.
+* @param props - slot runtime props, the binding face, and the locale seat.
+* @returns the switch, or null outside the blank-session hero.
+*/
+function WorktreeChip(props) {
+	const { useSession, useProjection, useToggle, ensure, recheck, follow, setIntent, retry, block, t } = props;
+	const hero = useSession((session) => session.blank && session.openState === "open");
+	const workingDirectory = useProjection("workingDirectory");
+	const state = useToggle((current) => current);
+	const position = switchPosition(state);
+	(0, react.useEffect)(() => {
+		follow(hero);
+		return () => {
+			follow(false);
+		};
+	}, [follow, hero]);
+	const followed = (0, react.useRef)(false);
+	(0, react.useEffect)(() => {
+		if (!hero) return;
+		if (!followed.current) {
+			followed.current = true;
+			ensure();
+			return;
+		}
+		recheck();
+	}, [
+		ensure,
+		hero,
+		recheck,
+		workingDirectory
+	]);
+	(0, react.useEffect)(() => {
+		if (!hero) {
+			block(null);
+			return;
+		}
+		const reason = state.phase === "checking" ? t("chip.blocked.checking") : state.phase === "creating" ? t("chip.blocked.creating") : state.phase === "reverting" ? t("chip.blocked.reverting") : state.phase === "failed" && state.intent ? t("chip.blocked.failed") : null;
+		block(reason);
+	}, [
+		block,
+		hero,
+		state.intent,
+		state.phase,
+		t
+	]);
+	(0, react.useEffect)(() => () => {
+		block(null);
+	}, [block]);
+	if (!hero) return null;
+	const hint = chipHint(state, t);
+	const locked = state.phase === "checking" || state.phase === "disabled" || state.phase === "reverting";
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+		className: "dsh-wt-chip",
+		"data-phase": state.phase,
+		"data-position": position ? "on" : "off",
+		"data-kept": state.kept === null ? "false" : state.kept.reason,
+		"data-hint": hint,
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
+			label: hint,
+			side: "top",
+			delayMs: 200,
+			children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				className: "dsh-wt-anchor",
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+					type: "button",
+					role: "switch",
+					"aria-checked": position,
+					"aria-label": t("chip.label"),
+					className: "dsh-wt-switch",
+					"data-phase": state.phase,
+					disabled: locked,
+					onClick: () => {
+						setIntent(!position);
+					},
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-wt-dot",
+						"aria-hidden": "true"
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-wt-label",
+						children: chipLabel(state, t)
+					})]
+				})
+			})
+		}), state.phase === "failed" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+			type: "button",
+			className: "dsh-wt-retry",
+			onClick: () => {
+				retry();
+			},
+			children: t("chip.retry")
+		}) : null]
+	});
+}
+// src/client/Notice.tsx
+/**
+* The sentence a notice shows.
+* @param notice - what the leave reported.
+* @param t - bound translate.
+* @returns the localized explanation.
+*/
+function noticeText(notice, t) {
+	if (notice.kind === "failed") return t("notice.failed", { message: notice.message ?? "" });
+	return t("notice.keptDirty", { name: notice.worktree?.name ?? "" });
+}
+/**
+* Render the one-shot notice.
+* @param props - overlay runtime props, the notice face, and the locale seat.
+* @returns the banner, or null while nothing happened.
+*/
+function WorktreeNotice(props) {
+	const { useNotice, dismiss, openPanel, t } = props;
+	const notice = useNotice((current) => current);
+	if (notice === null) return null;
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+		className: "dsh-wt-notice",
+		"data-kind": notice.kind,
+		"data-seq": notice.seq,
+		role: "status",
+		children: [
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				className: "dsh-wt-notice-text",
+				title: notice.kind === "kept" && notice.message !== null ? notice.message : void 0,
+				children: noticeText(notice, t)
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+				type: "button",
+				className: "dsh-wt-notice-open",
+				onClick: () => {
+					openPanel();
+				},
+				children: t("notice.openPanel")
+			}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+				type: "button",
+				className: "dsh-wt-notice-dismiss",
+				"aria-label": t("notice.dismiss"),
+				onClick: () => {
+					dismiss();
+				},
+				children: "×"
+			})
+		]
+	}, notice.seq);
+}
 // src/client/Panel.tsx
 /**
 * The Worktrees panel and its sidebar entry.
@@ -1521,8 +1634,9 @@ const en = {
 	"chip.hint.disabled": "This project is not a Git repository, so there is nothing to copy.",
 	"chip.hint.dirty": "The source checkout has {count} uncommitted change(s); the copy starts from the last commit.",
 	"chip.hint.intentOff": "Turning off could not leave {name}; this session still runs in it.",
+	"chip.hint.isolationOff": "This session runs in the copy; new sessions in this project start in the source checkout.",
 	"chip.hint.keptDirty": "The copy {name} was kept when the switch turned off: it has uncommitted changes or commits of its own.",
-	"chip.hint.keptNotOwned": "The copy {name} was kept when the switch turned off: the switch cannot prove it created this copy, so it never deletes it.",
+	"chip.hint.keptNotOwned": "The copy {name} is not deleted by the switch: it was not created for this session.",
 	"chip.blocked.checking": "Checking whether this session gets a worktree…",
 	"chip.blocked.creating": "Creating the worktree before the first prompt…",
 	"chip.blocked.reverting": "Leaving the worktree before the first prompt…",
@@ -1563,7 +1677,6 @@ const en = {
 	"badge.detached": "⎇ detached copy",
 	"badge.hint": "This session runs in a copy of the project. Directory: {path}. Repository: {root}. Uncommitted files: {count}.",
 	"notice.keptDirty": "The Worktree switch is off. The copy {name} was kept because it has uncommitted changes or commits of its own; delete it from the Worktrees panel when you are done.",
-	"notice.keptNotOwned": "The Worktree switch is off. The copy {name} was kept because the switch cannot prove it created it, so it never deletes it.",
 	"notice.failed": "The Worktree switch is off, but leaving the copy failed: {message}",
 	"notice.openPanel": "Open panel",
 	"notice.dismiss": "Dismiss",
@@ -1591,9 +1704,10 @@ const zh = {
 	"chip.hint.failed": "副本没有创建成功，本会话仍然在项目目录里。",
 	"chip.hint.disabled": "这个项目不是 Git 仓库，没有可复制的内容。",
 	"chip.hint.dirty": "源仓库有 {count} 处未提交改动；副本会从最后一次提交开始。",
-	"chip.hint.intentOff": "关闭时没能离开 {name}，本会话仍在副本里运行。",
+	"chip.hint.intentOff": "拨回后没能离开 {name}；本会话仍在副本里。",
+	"chip.hint.isolationOff": "本会话在副本里运行；这个项目的新会话从源检出开始。",
 	"chip.hint.keptDirty": "关闭开关时保留了副本 {name}：它有自己的提交或未提交改动。",
-	"chip.hint.keptNotOwned": "关闭开关时保留了副本 {name}：无法证明这份副本是开关创建的，所以不会删除它。",
+	"chip.hint.keptNotOwned": "开关不删这份副本 {name}：它不是为这条会话建的。",
 	"chip.blocked.checking": "正在检查本会话是否需要 Worktree…",
 	"chip.blocked.creating": "正在创建 Worktree，副本就绪前暂停发送…",
 	"chip.blocked.reverting": "正在离开 Worktree，切回项目目录前暂停发送…",
@@ -1634,7 +1748,6 @@ const zh = {
 	"badge.detached": "⎇ 分离副本",
 	"badge.hint": "本会话在项目的一份副本里运行。目录：{path}。仓库：{root}。未提交文件：{count}。",
 	"notice.keptDirty": "Worktree 开关已关闭。副本 {name} 被保留，因为它有自己的提交或未提交改动；用完请在 Worktree 面板里删除。",
-	"notice.keptNotOwned": "Worktree 开关已关闭。副本 {name} 被保留，因为无法证明它是开关创建的，插件不会删除它。",
 	"notice.failed": "Worktree 开关已关闭，但离开副本失败：{message}",
 	"notice.openPanel": "打开面板",
 	"notice.dismiss": "关闭提示",
@@ -1670,7 +1783,7 @@ const CSS = `
   width: 6px; height: 6px; border-radius: 999px;
   background: color-mix(in oklab, currentColor 40%, transparent);
 }
-.dsh-wt-chip[data-intent="on"] .dsh-wt-dot { background: #2da44e; }
+.dsh-wt-chip[data-position="on"] .dsh-wt-dot { background: #2da44e; }
 .dsh-wt-chip[data-phase="failed"] .dsh-wt-dot { background: #e5534b; }
 .dsh-wt-chip[data-phase="creating"] .dsh-wt-dot { background: #bf8700; }
 .dsh-wt-label { max-width: 240px; overflow: hidden; text-overflow: ellipsis; }