@dungsil/dsh-plugin-ui-worktree 0.4.0 → 0.6.0

package/dist/client.js

@@ -20,14 +20,14 @@ function installStyles(css) {
 var git_branch_default = "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\" aria-hidden=\"true\">\n  <circle cx=\"6\" cy=\"5\" r=\"3\"/>\n  <circle cx=\"6\" cy=\"19\" r=\"3\"/>\n  <circle cx=\"18\" cy=\"6\" r=\"3\"/>\n  <path d=\"M6 8v8M6 14h7a5 5 0 0 0 5-5\"/>\n</svg>\n";
 // ../../tools/ui/src/composer.tsx
 const composerStyles = `
-:where(.dsh-plugin-composer-trigger) { display: flex; align-items: center; gap: 4px; min-width: 0; height: 28px; padding: 0 4px 0 8px; border: 0; border-radius: var(--dsw-radius-sm); background: transparent; color: var(--dsw-alias-label-secondary); font: inherit; font-size: 13px; line-height: 20px; cursor: pointer; }
+:where(.dsh-plugin-composer-trigger) { display: flex; align-items: center; gap: 4px; min-width: 0; height: 28px; padding: 0 4px 0 8px; border: 0; border-radius: var(--dsw-radius-sm); background: transparent; color: var(--dsw-alias-label-secondary); font: inherit; font-size: 13px; line-height: 1.5385; cursor: pointer; }
 :where(.dsh-plugin-composer-trigger):disabled { color: var(--dsw-alias-label-dimmed); cursor: default; }
 .dsh-plugin-composer-icon, .dsh-plugin-composer-chevron { display: inline-flex; flex: none; }
 .dsh-plugin-composer-label, .dsh-plugin-composer-detail { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .dsh-plugin-composer-chevron, .dsh-plugin-composer-detail { color: var(--dsw-alias-label-caption); }
 .dsh-plugin-composer-trigger[aria-expanded=true] .dsh-plugin-composer-chevron { transform: rotate(180deg); }
 `;
-const ComposerTrigger = (0, react.forwardRef)(function ComposerTrigger({ className = "", icon, label, detail, ...props }, ref) {
+const ComposerTrigger = /* @__PURE__ */ (0, react.forwardRef)(function ComposerTrigger({ className = "", icon, label, detail, ...props }, ref) {
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 		...props,
 		ref,
@@ -57,23 +57,37 @@ const ComposerTrigger = (0, react.forwardRef)(function ComposerTrigger({ classNa
 });
 // ../../tools/ui/src/settings.tsx
 /** The rc.5 settings shell has no icon slot, so decorate only the matching navigation rows. */
-function installSettingsIcon(id, labels, svg) {
+function installSettingsIcon(id, labels, icon) {
 	const attribute = "data-dsh-settings-icon";
 	const selector = `[${attribute}="${id}"]`;
 	const removeStyles = installStyles(`
 ${selector} > svg { display: none; }
-${selector}::before { content: ''; display: block; flex: none; width: 16px; height: 16px; background: currentColor; mask: url("data:image/svg+xml,${encodeURIComponent(svg)}") center / contain no-repeat; }
+${typeof icon === "string" ? `${selector}::before { content: ''; display: block; flex: none; width: 16px; height: 16px; background: currentColor; mask: url("data:image/svg+xml,${encodeURIComponent(icon)}") center / contain no-repeat; }` : ""}
+${selector} > [data-dsh-settings-icon-glyph] { display: inline-flex; flex: none; }
 `);
-	const marked = /* @__PURE__ */ new Set();
+	const marked = /* @__PURE__ */ new Map();
 	const refresh = () => {
 		const rows = new Set(document.querySelectorAll("[data-shortcut-modal=\"settings\"] nav button"));
-		for (const row of marked) if (!rows.has(row) || !labels.includes(row.textContent?.trim() ?? "")) {
+		for (const [row, dispose] of marked) if (!rows.has(row) || !labels.includes(row.textContent?.trim() ?? "")) {
 			row.removeAttribute(attribute);
+			dispose();
 			marked.delete(row);
 		}
-		for (const row of rows) if (labels.includes(row.textContent?.trim() ?? "")) {
+		for (const row of rows) if (!marked.has(row) && labels.includes(row.textContent?.trim() ?? "")) {
 			row.setAttribute(attribute, id);
-			marked.add(row);
+			let dispose = () => {};
+			if (typeof icon !== "string") {
+				const glyph = document.createElement("span");
+				glyph.setAttribute("data-dsh-settings-icon-glyph", "");
+				glyph.setAttribute("aria-hidden", "true");
+				row.prepend(glyph);
+				const unmount = icon(glyph);
+				dispose = () => {
+					unmount();
+					glyph.remove();
+				};
+			}
+			marked.set(row, dispose);
 		}
 	};
 	const observer = new MutationObserver(refresh);
@@ -85,7 +99,10 @@ ${selector}::before { content: ''; display: block; flex: none; width: 16px; heig
 	refresh();
 	return () => {
 		observer.disconnect();
-		for (const row of marked) row.removeAttribute(attribute);
+		for (const [row, dispose] of marked) {
+			row.removeAttribute(attribute);
+			dispose();
+		}
 		removeStyles();
 	};
 }
@@ -158,7 +175,10 @@ function isWorktreeProgress(value) {
 	].includes(progress.status) && Number.isFinite(progress.updatedAt) && Array.isArray(progress.durations) && progress.durations.length === 4 && progress.durations.every((duration) => Number.isFinite(duration) && duration >= 0) && (progress.branch === void 0 || typeof progress.branch === "string");
 }
 function comparablePath(path) {
-	return (/^[a-z]:[\\/]/i.test(path) || path.startsWith("\\\\") || path.startsWith("//") ? path.replaceAll("\\", "/").replace(/^[A-Z]:/, (drive) => drive.toLowerCase()) : path).replace(/\/+$/, "");
+	const value = /^[a-z]:[\\/]/i.test(path) || path.startsWith("\\\\") || path.startsWith("//") ? path.replaceAll("\\", "/").replace(/^[A-Z]:/, (drive) => drive.toLowerCase()) : path;
+	let end = value.length;
+	while (end > 0 && value[end - 1] === "/") end--;
+	return value.slice(0, end);
 }
 function currentWorktree(view) {
 	if (!view) return void 0;
@@ -168,10 +188,15 @@ function currentWorktree(view) {
 		return cwd === path || cwd.startsWith(path + "/");
 	}).sort((a, b) => comparablePath(b.path).length - comparablePath(a.path).length)[0];
 }
-function isWorktreeView(value) {
+function isWorktreeSelectionView(value) {
 	if (!value || typeof value !== "object") return false;
 	const view = value;
-	return typeof view.cwd === "string" && (view.pendingCreation === void 0 || view.pendingCreation !== null && typeof view.pendingCreation.name === "string" && typeof view.pendingCreation.failed === "boolean") && Array.isArray(view.worktrees) && view.worktrees.every((item) => item && typeof item.path === "string" && (item.branch === null || typeof item.branch === "string"));
+	return typeof view.cwd === "string" && (view.locked === void 0 || typeof view.locked === "boolean") && (view.pendingCreation === void 0 || view.pendingCreation !== null && typeof view.pendingCreation.name === "string" && typeof view.pendingCreation.failed === "boolean");
+}
+function isWorktreeView(value) {
+	if (!isWorktreeSelectionView(value)) return false;
+	const view = value;
+	return (view.needsInitialization === void 0 || typeof view.needsInitialization === "boolean") && Array.isArray(view.worktrees) && view.worktrees.every((item) => item && typeof item.path === "string" && (item.branch === null || typeof item.branch === "string"));
 }
 // src/errors.ts
 const failureCodes = [
@@ -206,17 +231,22 @@ function failureCode(error) {
 // src/requests.ts
 const copy$1 = {
 	zh: {
-		title: "Git 工作树",
+		title: "下一任务的位置",
+		choose: "选择工作树",
+		savingSelection: "正在保存下一任务的位置…",
+		selectionError: "请确认工作树选择后再发送提示。",
+		locked: "任务开始后无法更改此会话的工作树。请在其他工作树中新建会话。",
 		detached: "分离的 HEAD",
 		unknown: "无法获取分支",
 		create: "新工作树",
-		reservationHint: "发送下一条提示后，将先创建并切换到新工作树再开始任务。选择现有工作树可取消。",
-		creationError: "无法确认创建结果，尚未开始任务。请刷新列表，选择工作树或重新预约，然后重新发送提示。",
+		primaryBranch: "当前分支",
+		reservationHint: "发送下一条提示后，将先创建并切换到新工作树再开始任务。选择当前分支可取消。",
+		creationError: "无法确认创建结果，尚未开始任务。请选择当前分支或重新预约，然后重新发送提示。",
 		close: "关闭",
 		refresh: "刷新工作树",
 		loading: "正在加载工作树…",
 		busy: "正在切换工作树…",
-		changed: "已切换工作树。",
+		changed: "已选择下一任务的位置。",
 		empty: "未找到 Git 工作树。",
 		wait: "请等待会话准备就绪且当前任务结束。",
 		error: "无法确认当前状态。请刷新工作树以检查状态后再重试。",
@@ -228,12 +258,13 @@ const copy$1 = {
 		errorOperation: "请求",
 		operations: {
 			describe: "查询工作树",
+			initialize: "初始化工作树选择",
 			create: "创建工作树",
-			switch: "切换工作树"
+			select: "保存下一任务的位置"
 		},
 		reasons: {
 			busy: "会话中有正在执行的任务。请在任务结束后重新查询。",
-			conflict: "当前工作目录已更改。请刷新列表后再进行更改。",
+			conflict: "当前工作目录已更改或工作树选择已锁定。请重新查询状态。",
 			invalid: "请求无效。请刷新列表并检查分支名称或工作树。",
 			operation_failed: "主机无法完成操作。请检查 Git 和工作树配置。",
 			session_not_found: "会话不可用。请重新打开会话后重试。",
@@ -241,23 +272,28 @@ const copy$1 = {
 			auth_required: "连接需要身份验证。请重新打开应用后重试。",
 			endpoint_missing: "主机没有工作树接口。请确认插件已启用并重启应用。",
 			client_unavailable: "连接缺少工作树 RPC 客户端。请刷新页面或更新应用。",
-			invalid_response: "主机返回的工作树列表无效。请检查应用和插件版本。",
+			invalid_response: "主机返回的工作树状态无效。请检查应用和插件版本。",
 			connection_error: "收到有效响应前连接失败。请检查连接后重新查询。",
 			timeout: "请求超时。请在当前任务结束后重新查询。"
 		}
 	},
 	en: {
-		title: "Git worktree",
+		title: "Next task location",
+		choose: "Choose worktree",
+		savingSelection: "Saving next task location…",
+		selectionError: "Confirm the worktree selection before sending your prompt.",
+		locked: "The worktree cannot change after work starts. Create a new session in another worktree.",
 		detached: "Detached HEAD",
 		unknown: "Branch unavailable",
 		create: "New worktree",
-		reservationHint: "The next prompt will create and enter a new worktree before starting work. Select an existing worktree to cancel.",
-		creationError: "Creation could not be confirmed, so work did not start. Refresh the list, select a worktree or schedule a new one, then resend your prompt.",
+		primaryBranch: "Current branch",
+		reservationHint: "The next prompt will create and enter a new worktree before starting work. Select the current branch to cancel.",
+		creationError: "Creation could not be confirmed, so work did not start. Select the current branch or schedule a new worktree, then resend your prompt.",
 		close: "Close",
 		refresh: "Refresh worktrees",
 		loading: "Loading worktrees…",
 		busy: "Changing worktree…",
-		changed: "Worktree changed.",
+		changed: "Next task location selected.",
 		empty: "No Git worktrees found.",
 		wait: "Wait until the session is ready and idle.",
 		error: "Could not confirm the current state. Refresh worktrees to check before trying again.",
@@ -269,12 +305,13 @@ const copy$1 = {
 		errorOperation: "Request",
 		operations: {
 			describe: "List worktrees",
+			initialize: "Initialize worktree selection",
 			create: "Create worktree",
-			switch: "Switch worktree"
+			select: "Save next task location"
 		},
 		reasons: {
 			busy: "The session has an active task. Retry after the task stops.",
-			conflict: "The current directory changed. Reload the list before another change.",
+			conflict: "The current directory changed or the worktree selection is locked. Reload to check the state.",
 			invalid: "The request is invalid. Reload the list and check the branch name or worktree.",
 			operation_failed: "The host could not complete the operation. Check Git and the worktree configuration.",
 			session_not_found: "The session is unavailable. Reopen the session and retry.",
@@ -282,23 +319,28 @@ const copy$1 = {
 			auth_required: "The connection requires authentication. Reopen the application and retry.",
 			endpoint_missing: "The host has no worktree endpoint. Check that the plugin is active and restart the application.",
 			client_unavailable: "The connection has no worktree RPC client. Reload the page or update the application.",
-			invalid_response: "The host returned an invalid worktree list. Check the application and plugin versions.",
+			invalid_response: "The host returned an invalid worktree state. Check the application and plugin versions.",
 			connection_error: "The connection failed before a valid response. Check the connection and retry.",
 			timeout: "The request timed out. Retry after the current task stops."
 		}
 	},
 	ko: {
-		title: "Git worktree",
+		title: "다음 작업 위치",
+		choose: "워크트리 선택",
+		savingSelection: "다음 작업 위치를 저장하는 중…",
+		selectionError: "워크트리 선택을 확인한 뒤 프롬프트를 전송하세요.",
+		locked: "작업을 시작한 세션에서는 워크트리를 바꿀 수 없습니다. 다른 워크트리에서 새 세션을 만드세요.",
 		detached: "분리된 HEAD",
 		unknown: "브랜치 확인 불가",
 		create: "새 워크트리",
-		reservationHint: "다음 프롬프트를 전송하면 새 워크트리를 생성·전환한 뒤 작업을 시작합니다. 기존 워크트리를 선택하면 예약을 취소합니다.",
-		creationError: "생성 결과를 확인하지 못해 작업을 시작하지 않았습니다. 목록을 새로고침하고 워크트리를 선택하거나 다시 예약한 뒤 프롬프트를 다시 전송하세요.",
+		primaryBranch: "현재 브랜치",
+		reservationHint: "다음 프롬프트를 전송하면 새 워크트리를 생성·전환한 뒤 작업을 시작합니다. 현재 브랜치를 선택하면 예약을 취소합니다.",
+		creationError: "생성 결과를 확인하지 못해 작업을 시작하지 않았습니다. 현재 브랜치를 선택하거나 다시 예약한 뒤 프롬프트를 다시 전송하세요.",
 		close: "닫기",
 		refresh: "워크트리 새로고침",
 		loading: "워크트리를 불러오는 중…",
 		busy: "워크트리 변경 중…",
-		changed: "워크트리를 변경했습니다.",
+		changed: "다음 작업 위치를 선택했습니다.",
 		empty: "Git worktree가 없습니다.",
 		wait: "세션이 준비되고 실행 중인 작업이 끝나면 사용할 수 있습니다.",
 		error: "현재 상태를 확인하지 못했습니다. 다시 시도하기 전에 새로고침으로 상태를 확인하세요.",
@@ -310,12 +352,13 @@ const copy$1 = {
 		errorOperation: "요청",
 		operations: {
 			describe: "워크트리 조회",
+			initialize: "워크트리 선택 초기화",
 			create: "워크트리 생성",
-			switch: "워크트리 전환"
+			select: "다음 작업 위치 저장"
 		},
 		reasons: {
 			busy: "세션에서 작업을 실행 중입니다. 작업이 끝난 뒤 다시 조회하세요.",
-			conflict: "현재 작업 경로가 바뀌었습니다. 목록을 새로고침한 뒤 변경하세요.",
+			conflict: "현재 작업 경로가 바뀌었거나 워크트리 선택이 고정됐습니다. 다시 조회해 상태를 확인하세요.",
 			invalid: "요청이 올바르지 않습니다. 목록을 새로고침하고 브랜치 이름이나 워크트리를 확인하세요.",
 			operation_failed: "호스트가 작업을 완료하지 못했습니다. Git과 워크트리 설정을 확인하세요.",
 			session_not_found: "세션을 찾지 못했습니다. 세션을 다시 열고 조회하세요.",
@@ -323,7 +366,7 @@ const copy$1 = {
 			auth_required: "연결 인증이 필요합니다. 앱을 다시 열고 조회하세요.",
 			endpoint_missing: "호스트에 워크트리 API가 없습니다. 플러그인을 활성화했는지 확인하고 앱을 다시 시작하세요.",
 			client_unavailable: "연결에 워크트리 RPC 기능이 없습니다. 페이지를 새로고침하거나 앱을 업데이트하세요.",
-			invalid_response: "호스트가 올바르지 않은 워크트리 목록을 반환했습니다. 앱과 플러그인 버전을 확인하세요.",
+			invalid_response: "호스트가 올바르지 않은 워크트리 상태를 반환했습니다. 앱과 플러그인 버전을 확인하세요.",
 			connection_error: "정상 응답을 받기 전에 연결이 실패했습니다. 연결을 확인하고 다시 조회하세요.",
 			timeout: "요청 시간이 초과됐습니다. 실행 중인 작업이 끝난 뒤 다시 조회하세요."
 		}
@@ -338,6 +381,8 @@ const copy = {
 		new: "새 워크트리",
 		directory: "워크트리 풀 디렉터리",
 		remote: "추적 중인 원격 브랜치 사용",
+		deleteOnArchive: "보관 시 워크트리 삭제",
+		deleteOnArchiveDescription: "이 플러그인이 만든 워크트리만 삭제합니다. 미커밋·미추적·무시된 파일이나 다른 세션이 있으면 유지하며, 브랜치는 삭제하지 않습니다.",
 		naming: "자동 브랜치 이름 형식",
 		semantic: "시멘틱 (feat/… 또는 fix/…)",
 		dsh: "DSH (dsh/*)",
@@ -358,6 +403,8 @@ const copy = {
 		new: "新工作树",
 		directory: "工作树池目录",
 		remote: "使用跟踪的远程分支",
+		deleteOnArchive: "归档时删除工作树",
+		deleteOnArchiveDescription: "仅删除此插件创建的工作树。有未提交、未跟踪、被忽略的文件或其他会话使用时保留，不删除分支。",
 		naming: "自动分支命名格式",
 		semantic: "语义化（feat/… 或 fix/…）",
 		dsh: "DSH（dsh/*）",
@@ -378,6 +425,8 @@ const copy = {
 		new: "New worktree",
 		directory: "Worktree pool directory",
 		remote: "Use tracked remote branch",
+		deleteOnArchive: "Delete worktree on archive",
+		deleteOnArchiveDescription: "Only removes worktrees created by this plugin. Keeps worktrees with uncommitted, untracked or ignored files, or other sessions. Branches are kept.",
 		naming: "Automatic branch naming",
 		semantic: "Semantic (feat/… or fix/…)",
 		dsh: "DSH (dsh/*)",
@@ -586,6 +635,18 @@ function WorktreeSettingsSection({ ctx }) {
 								onChange: (remote) => change({ remote })
 							})
 						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SettingsRow, {
+							label: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+								className: "dsh-worktree-settings-title",
+								children: text.deleteOnArchive
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: text.deleteOnArchiveDescription })] }),
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Switch, {
+								label: text.deleteOnArchive,
+								checked: draft.deleteOnArchive,
+								disabled,
+								onChange: (deleteOnArchive) => change({ deleteOnArchive })
+							})
+						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SettingsRow, {
 							label: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 								id: `${id}-naming`,
@@ -652,10 +713,17 @@ function WorktreeSettingsSection({ ctx }) {
 // src/styles.ts
 const styles = `${settingsStyles}${composerStyles}
 .dsh-worktree-sidebar-name { flex: 0 1 auto; min-width: 0; max-width: 88px; margin-inline: 6px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: var(--dsw-alias-label-caption); font-size: 10px; line-height: 16px; }
+[data-row-key]:has(.dsh-vcs-session-request) > .dsh-worktree-sidebar-name { display: none; }
 .dsh-worktree { display: inline-flex; flex-wrap: wrap; align-items: center; min-width: 0; max-width: 100%; color: var(--dsw-alias-label-secondary); font: inherit; }
 .dsh-worktree-picker { display: inline-flex; min-width: 0; max-width: 100%; }
+.dsh-worktree-pinned { position: sticky; top: 0; z-index: 1; background: var(--dsw-alias-bg-layer-1); }
+.dsh-worktree-option { display: flex; align-items: center; gap: 8px; min-width: 0; }
+.dsh-worktree-option > span:first-child { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.dsh-worktree-option > svg { flex: none; width: 14px; height: 14px; margin-inline-start: auto; color: var(--dsw-alias-label-primary); }
+.dsh-worktree-badge { flex: none; padding: 1px 5px; border: 1px solid var(--dsw-alias-border-l2); border-radius: var(--dsw-radius-sm); color: var(--dsw-alias-label-secondary); font-size: 11px; line-height: 16px; font-weight: 400; }
 .dsh-worktree-trigger { display: inline-flex; max-width: 220px; font-weight: 500; }
 .dsh-worktree-trigger .dsh-plugin-composer-icon svg { width: 14px; height: 14px; }
+.dsh-worktree-trigger:not([aria-haspopup]) .dsh-plugin-composer-chevron { display: none; }
 .dsh-worktree-trigger:focus-visible { outline: 2px solid var(--dsw-focus-ring-color, var(--dsw-alias-state-business-primary)); outline-offset: 0; }
 @container (width <= 460px) {
   .dsh-worktree-trigger .dsh-plugin-composer-label { display: none; }
@@ -894,7 +962,8 @@ const inject = [
 	"slots",
 	"locale",
 	"connection",
-	"uiConversation"
+	"uiConversation",
+	"conversation"
 ];
 function apply(ctx) {
 	ctx.effect(() => installSettingsIcon(name, [
@@ -904,19 +973,47 @@ function apply(ctx) {
 	].map(settingsLabel), git_branch_default));
 	const connection = ctx.get("connection");
 	installProgress(ctx);
-	function Picker({ sessionId, useSession }) {
+	const synced = /* @__PURE__ */ new Map();
+	const ownedBlocks = /* @__PURE__ */ new Map();
+	const blocks = ctx.conversation.blocks;
+	ctx.effect(() => () => {
+		const owned = [...ownedBlocks];
+		ownedBlocks.clear();
+		for (const [id, block] of owned) if (blocks.storeFor(id).getSnapshot() === block) blocks.set(id, void 0);
+	});
+	function Picker({ sessionId, useSession, useProjection, useInput }) {
 		const { active: language } = useLocaleSnapshot(ctx.locale);
 		const text = copy$1[language.startsWith("ko") ? "ko" : language.startsWith("zh") ? "zh" : "en"];
-		const unavailable = useSession((s) => s.running || s.removed || s.openState !== "open" || s.pendingSubmissions.length > 0);
-		const running = useSession((s) => s.running);
-		const wasRunning = (0, react.useRef)(running);
-		const [view, setView] = (0, react.useState)();
-		const [loading, setLoading] = (0, react.useState)(true);
-		const [busy, setBusy] = (0, react.useState)(false);
+		const inputBusy = useInput((input) => input.phase !== "plain");
+		const unavailable = useSession((s) => s.running || s.removed || s.openState !== "open" || s.pendingSubmissions.length > 0) || inputBusy;
+		const unavailableRef = (0, react.useRef)(unavailable);
+		unavailableRef.current = unavailable;
+		const unreadable = useSession((s) => s.removed || s.openState !== "open");
+		const unreadableRef = (0, react.useRef)(unreadable);
+		unreadableRef.current = unreadable;
+		const cwd = useProjection("workingDirectory");
+		const started = useProjection("sessionListMetadata")?.blank === false;
+		const cached = synced.get(sessionId);
+		const initialView = cached?.cwd === cwd ? cached : void 0;
+		const previousReadiness = (0, react.useRef)({
+			unreadable: true,
+			unavailable,
+			cwd
+		});
+		const [view, setView] = (0, react.useState)(initialView);
+		const [loading, setLoading] = (0, react.useState)(!initialView);
+		const viewRef = (0, react.useRef)(view);
+		viewRef.current = view;
+		const selected = (0, react.useRef)();
+		const saving = (0, react.useRef)(false);
+		const version = (0, react.useRef)(0);
 		const [error, setError] = (0, react.useState)();
 		const [changed, setChanged] = (0, react.useState)(false);
 		const [open, setOpen] = (0, react.useState)(false);
+		const needsSync = (0, react.useRef)(true);
+		needsSync.current = !view || !view.locked && (!!view.needsInitialization || !!view.pendingCreation);
 		const pending = (0, react.useRef)(false);
+		const reloadRequested = (0, react.useRef)(false);
 		const needsRefresh = (0, react.useRef)(false);
 		const lifetime = (0, react.useRef)(null);
 		const trigger = (0, react.useRef)(null);
@@ -924,52 +1021,112 @@ function apply(ctx) {
 		const errorTitle = (0, react.useId)();
 		const errorDescription = (0, react.useId)();
 		const status = (0, react.useId)();
-		const disabled = unavailable || loading || busy || !!error || !view;
 		const creation = view?.pendingCreation;
+		const locked = !!view?.locked || started && !creation;
+		const disabled = locked || unavailable || loading || !view;
 		const detailError = error ?? (creation?.failed ? {
 			operation: "create",
 			code: "operation_failed",
 			uncertain: true
 		} : void 0);
 		const errorLabel = detailError?.uncertain ? text.mutationError : text.lookupError;
+		const gate = (reason) => {
+			const store = blocks.storeFor(sessionId);
+			const owned = ownedBlocks.get(sessionId);
+			const current = store.getSnapshot();
+			if (!reason) {
+				ownedBlocks.delete(sessionId);
+				if (owned && current === owned) blocks.set(sessionId, void 0);
+			} else {
+				synced.delete(sessionId);
+				const block = owned?.reason === reason ? owned : { reason };
+				ownedBlocks.set(sessionId, block);
+				if (!current || current === owned) blocks.set(sessionId, block);
+			}
+		};
 		const recordFailure = (operation, cause) => {
 			const code = failureCode(cause);
 			needsRefresh.current = true;
+			const uncertain = operation !== "describe" || ownedBlocks.has(sessionId);
+			if (uncertain) gate(text.selectionError);
 			setError((previous) => ({
 				operation,
 				code,
-				uncertain: operation !== "describe" || !!previous?.uncertain
+				uncertain: uncertain || !!previous?.uncertain
 			}));
 			console.warn("[dungsil-ui-worktree]", {
 				operation,
 				code
 			});
 		};
-		const request = async (operation, payload, signal) => {
+		const call = async (operation, payload, signal) => {
 			if (typeof connection?.rpc?.call !== "function") throw { code: "client_unavailable" };
 			const result = await connection.rpc.call(channel, endpointPrefix + operation, payload, signal);
 			signal.throwIfAborted();
 			if (!result.ok) throw result.error;
-			if (!isWorktreeView(result.value)) throw { code: "invalid_response" };
 			return result.value;
 		};
+		const request = async (operation, payload, signal) => {
+			const value = await call(operation, payload, signal);
+			if (!isWorktreeView(value)) throw { code: "invalid_response" };
+			return value;
+		};
+		const updateView = (next) => {
+			viewRef.current = next;
+			setView(next);
+		};
+		const mergeSelection = (next) => {
+			const previous = viewRef.current;
+			if (!previous) return;
+			updateView({
+				...previous,
+				cwd: next.cwd,
+				pendingCreation: next.pendingCreation,
+				locked: next.locked,
+				needsInitialization: false
+			});
+		};
 		const load = async (explicit = false) => {
 			const controller = lifetime.current;
-			if (!controller || controller.signal.aborted || pending.current || needsRefresh.current && !explicit) return;
+			if (!controller || controller.signal.aborted || unreadableRef.current || saving.current || needsRefresh.current && !explicit) return;
+			if (pending.current) {
+				reloadRequested.current = true;
+				return;
+			}
+			reloadRequested.current = false;
 			pending.current = true;
 			setLoading(true);
+			let operation = "describe";
 			try {
 				const view = await request("describe", { sessionId }, controller.signal);
 				if (controller.signal.aborted) return;
-				setView(view);
+				updateView(view);
+				if (view.needsInitialization && !view.locked && !unavailableRef.current) {
+					operation = "initialize";
+					gate(text.savingSelection);
+					const initialized = await request("initialize", {
+						sessionId,
+						cwd: view.cwd
+					}, controller.signal);
+					if (controller.signal.aborted) return;
+					updateView(initialized);
+				}
 				needsRefresh.current = false;
 				setError(void 0);
+				gate();
 			} catch (cause) {
-				if (!controller.signal.aborted) recordFailure("describe", cause);
+				if (!controller.signal.aborted) {
+					if (failureCode(cause) !== "busy") recordFailure(operation, cause);
+					else if (!needsRefresh.current && operation === "initialize") gate();
+				}
 			} finally {
 				if (!controller.signal.aborted) {
 					pending.current = false;
 					setLoading(false);
+					if (reloadRequested.current) {
+						reloadRequested.current = false;
+						load();
+					}
 				}
 			}
 		};
@@ -977,9 +1134,15 @@ function apply(ctx) {
 			const controller = new AbortController();
 			lifetime.current = controller;
 			pending.current = false;
-			load();
+			const store = blocks.storeFor(sessionId);
+			const restoreGate = () => {
+				const block = ownedBlocks.get(sessionId);
+				if (block && !store.getSnapshot()) blocks.set(sessionId, block);
+			};
+			restoreGate();
+			const unsubscribe = store.subscribe(restoreGate);
 			const focus = () => {
-				load();
+				if (needsSync.current && !pending.current) load();
 			};
 			const resize = () => {
 				setOpen(false);
@@ -988,50 +1151,94 @@ function apply(ctx) {
 			window.addEventListener("resize", resize);
 			return () => {
 				controller.abort();
+				unsubscribe();
 				window.removeEventListener("focus", focus);
 				window.removeEventListener("resize", resize);
 			};
 		}, []);
 		(0, react.useEffect)(() => {
-			if (wasRunning.current && !running) load();
-			wasRunning.current = running;
-		}, [running]);
+			const previous = previousReadiness.current;
+			previousReadiness.current = {
+				unreadable,
+				unavailable,
+				cwd
+			};
+			if (!unreadable && ((previous.unreadable || previous.unavailable && !unavailable) && needsSync.current || previous.cwd !== cwd)) load();
+		}, [
+			unreadable,
+			unavailable,
+			cwd
+		]);
+		(0, react.useEffect)(() => {
+			if (locked && view && !creation && view.cwd === cwd && !error && !ownedBlocks.has(sessionId)) synced.set(sessionId, {
+				...view,
+				locked: true,
+				needsInitialization: false
+			});
+			else synced.delete(sessionId);
+		}, [
+			sessionId,
+			view,
+			locked,
+			creation,
+			cwd,
+			error
+		]);
 		(0, react.useEffect)(() => {
 			if (disabled) setOpen(false);
 		}, [disabled]);
-		const change = async (endpoint, path) => {
+		const change = async (choice) => {
 			const controller = lifetime.current;
-			if (disabled || pending.current || needsRefresh.current || !view || !controller || controller.signal.aborted) return;
-			pending.current = true;
-			setBusy(true);
-			setChanged(false);
+			const currentView = viewRef.current;
+			if (locked || unavailableRef.current || loading || pending.current || !currentView || !controller || controller.signal.aborted) return;
+			const intent = {
+				version: ++version.current,
+				cwd: currentView.cwd,
+				choice
+			};
+			selected.current = intent;
+			mergeSelection({
+				cwd: currentView.cwd,
+				pendingCreation: choice === "new" ? {
+					name: text.create,
+					failed: false
+				} : void 0
+			});
+			setError(void 0);
+			setChanged(true);
+			needsRefresh.current = false;
+			gate(text.savingSelection);
+			if (saving.current) return;
+			saving.current = true;
 			try {
-				const payload = endpoint === "create" ? {
-					sessionId,
-					cwd: view.cwd
-				} : {
-					sessionId,
-					cwd: view.cwd,
-					path
-				};
-				const nextView = await request(endpoint, payload, controller.signal);
-				if (controller.signal.aborted) return;
-				setView(nextView);
-				setChanged(true);
-				pending.current = false;
-				await load();
-			} catch (cause) {
-				if (!controller.signal.aborted) recordFailure(endpoint, cause);
-			} finally {
-				if (!controller.signal.aborted) {
-					pending.current = false;
-					setBusy(false);
+				while (selected.current && !controller.signal.aborted) {
+					const next = selected.current;
+					try {
+						const value = await call("select", {
+							sessionId,
+							cwd: next.cwd,
+							choice: next.choice
+						}, controller.signal);
+						if (!isWorktreeSelectionView(value)) throw { code: "invalid_response" };
+						if (selected.current?.version !== next.version) continue;
+						mergeSelection(value);
+						selected.current = void 0;
+						gate();
+					} catch (cause) {
+						if (controller.signal.aborted) return;
+						if (selected.current?.version !== next.version) continue;
+						selected.current = void 0;
+						recordFailure("select", cause);
+						return;
+					}
 				}
+			} finally {
+				saving.current = false;
 			}
 		};
 		(0, react.useEffect)(() => {
-			if (!busy && changed) trigger.current?.focus();
-		}, [busy, changed]);
+			if (changed) trigger.current?.focus();
+		}, [changed]);
 		(0, react.useEffect)(() => {
 			if (!detailError && errorDialog.current?.open) errorDialog.current.close();
 		}, [error, creation?.failed]);
@@ -1047,9 +1254,14 @@ function apply(ctx) {
 			current,
 			view
 		]);
-		const branch = creation ? creation.failed ? text.mutationError : text.create : current ? current.branch ?? text.detached : text.unknown;
+		const selectCurrent = () => {
+			setOpen(false);
+			if (disabled) return;
+			if (viewRef.current?.pendingCreation || needsRefresh.current) change("current");
+		};
+		const branch = creation ? text.create : current ? current.branch ?? text.detached : text.unknown;
 		const label = detailError ? errorLabel : view ? branch : loading ? text.loading : text.title;
-		const notice = loading ? text.loading : busy ? text.busy : error ? errorLabel : unavailable ? text.wait : creation ? creation.failed ? text.creationError : text.reservationHint : changed ? text.changed : view?.worktrees.length === 0 ? text.empty : "";
+		const notice = loading ? text.loading : error ? errorLabel : unavailable ? text.wait : locked ? text.locked : creation ? creation.failed ? text.creationError : text.reservationHint : changed ? text.changed : view?.worktrees.length === 0 ? text.empty : "";
 		return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 			className: "dsh-worktree",
 			children: [
@@ -1058,39 +1270,23 @@ function apply(ctx) {
 					open,
 					side: "top",
 					portal: true,
-					selectedId: creation ? "create" : current ? `path:${current.path}` : void 0,
-					items: [{
-						id: "create",
-						label: text.create,
-						icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPlusOutlineRegular, {})
-					}, ...view?.worktrees.map((item) => ({
-						id: `path:${item.path}`,
-						label: item.branch ?? text.detached,
-						icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBranchOutlineRegular, {})
-					})) ?? []],
+					listClassName: "dsh-worktree-menu",
 					onClose: () => setOpen(false),
-					onSelect: (id) => {
-						setOpen(false);
-						if (disabled || pending.current) return;
-						if (id === "create") {
-							if (!creation || creation.failed) change("create");
-						} else if (id.startsWith("path:") && (creation || id !== `path:${current?.path}`)) change("switch", id.slice(5));
-					},
 					anchor: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ComposerTrigger, {
 						ref: trigger,
 						className: "dsh-worktree-trigger",
 						icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBranchOutlineRegular, {}),
 						label,
-						disabled: detailError ? loading || busy : disabled,
+						disabled: detailError ? loading : disabled,
 						"aria-label": `${text.title}: ${label}`,
-						"aria-haspopup": detailError ? "dialog" : "menu",
-						"aria-expanded": detailError ? void 0 : open,
+						"aria-haspopup": detailError ? "dialog" : locked ? void 0 : "menu",
+						"aria-expanded": detailError || locked ? void 0 : open,
 						"aria-describedby": status,
-						"aria-busy": loading || busy,
-						title: label,
+						"aria-busy": loading,
+						title: locked ? text.locked : `${text.title}: ${branch}${creation ? ` — ${text.reservationHint}` : ""}`,
 						onClick: () => {
 							if (detailError) errorDialog.current?.showModal();
-							else setOpen((value) => !value);
+							else if (!disabled) setOpen((value) => !value);
 						},
 						onKeyDown: (event) => {
 							if (!detailError && !disabled && !open && (event.key === "ArrowDown" || event.key === "ArrowUp")) {
@@ -1098,6 +1294,37 @@ function apply(ctx) {
 								setOpen(true);
 							}
 						}
+					}),
+					children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "dsh-worktree-pinned",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.MenuItemButton, {
+							icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPlusOutlineRegular, {}),
+							current: !!creation,
+							onSelect: () => {
+								setOpen(false);
+								const latest = viewRef.current?.pendingCreation;
+								if (!disabled && (!latest || latest.failed || needsRefresh.current)) change("new");
+							},
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+								className: "dsh-worktree-option",
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: text.create }), creation && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCheckOutlineRegular, {})]
+							})
+						}), current && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.MenuItemButton, {
+							icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBranchOutlineRegular, {}),
+							current: !creation,
+							onSelect: selectCurrent,
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+								className: "dsh-worktree-option",
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: current.branch ?? text.detached }),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-worktree-badge",
+										children: text.primaryBranch
+									}),
+									!creation && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCheckOutlineRegular, {})
+								]
+							})
+						}, current.path)]
 					})
 				}),
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
@@ -1132,13 +1359,22 @@ function apply(ctx) {
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dt", { children: text.errorCode }),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dd", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: detailError.code }) })
 						] })] }),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("footer", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("footer", { children: [view && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+							type: "button",
+							"data-worktree-choose": true,
+							disabled,
+							onClick: () => {
+								errorDialog.current?.close();
+								setOpen(true);
+							},
+							children: text.choose
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 							type: "button",
 							"data-worktree-retry": true,
-							disabled: loading || busy,
+							disabled: loading,
 							onClick: () => void load(true),
 							children: loading ? text.loading : text.refresh
-						}) })
+						})] })
 					]
 				})
 			]