@cerbur/clutch-dsh-worktree 0.1.5 → 0.1.6

package/lib/client.js

@@ -42,10 +42,18 @@ window.__ModuleLoader__.load({
 			"worktree.options": "Worktree 选项：{name}",
 			"worktree.remove": "移除 Worktree",
 			"worktree.removeDescription": "移除“{name}”？Session 会保留在 DSH 中，并作为已分离关系继续可用。",
+			"worktree.removeExternalDescription": "移除“{name}”？这会删除关联的外部 Worktree 目录。Session 会保留在 DSH 中，并作为已分离关系继续可用。",
 			"worktree.addSession": "向 {name} 添加会话",
 			"worktree.noWorktrees": "暂无 Worktree",
 			"worktree.createTitle": "新建 Worktree",
 			"worktree.createDescription": "“{name}” · Worktree 路径由 DSH 管理。",
+			"worktree.tabCreate": "创建",
+			"worktree.tabImport": "导入",
+			"worktree.importDescription": "向“{name}”注册已有的 Worktree。注册不会移动目录；之后移除会删除关联的 Worktree 目录。",
+			"worktree.importLoading": "正在查找可导入的 Worktree…",
+			"worktree.importEmpty": "没有可导入的 Worktree。",
+			"worktree.importPlaceholder": "请选择要导入的 Worktree",
+			"worktree.importSelected": "已选择",
 			"worktree.baseBranch": "Worktree 基线分支",
 			"worktree.noLocalBranch": "没有本地分支",
 			"worktree.noBranches": "此工作区中没有找到本地分支。",
@@ -56,6 +64,7 @@ window.__ModuleLoader__.load({
 			"worktree.setup.commands": "可复制的命令",
 			"worktree.name": "Worktree 名称",
 			"worktree.create": "创建 Worktree",
+			"worktree.import": "导入 Worktree",
 			"session.options": "会话选项：{name}",
 			"session.new": "新会话",
 			"session.rename": "重命名会话",
@@ -86,7 +95,10 @@ window.__ModuleLoader__.load({
 			"error.worktreeOrderingUnavailable": "Worktree 排序不可用，请重新连接后重试。",
 			"error.worktreeCreatedSessionUnavailable": "Worktree 已创建，但 Session 创建不可用，请重新连接后重试。",
 			"error.sessionCreationUnavailable": "Session 创建不可用，请重新连接后重试。",
-			"error.worktreeRecordMissing": "Worktree 创建未返回 Worktree 记录，请重试请求。",
+			"error.worktreeRecordMissing": "Worktree 注册未返回 Worktree 记录，请重试请求。",
+			"error.worktreeImportInvalid": "这个 Worktree 无法导入，请选择同一 Workspace 中有效的绝对路径。",
+			"error.worktreeAlreadyManaged": "这个 Worktree 已由插件管理。",
+			"error.worktreeRegistrationSessionUnavailable": "Worktree 已注册，但 Session 创建不可用，请重新连接后重试。",
 			"error.workspaceRenameUnavailable": "工作区重命名不可用，请重新连接后重试。",
 			"error.workspaceDeleteUnavailable": "工作区删除不可用，请重新连接后重试。",
 			"error.sessionRenameUnavailable": "会话重命名不可用，请重新连接后重试。",
@@ -132,10 +144,18 @@ window.__ModuleLoader__.load({
 			"worktree.options": "Worktree options for {name}",
 			"worktree.remove": "Remove Worktree",
 			"worktree.removeDescription": "Remove {name}? Sessions stay in DSH and remain available as detached bindings.",
+			"worktree.removeExternalDescription": "Remove {name}? This deletes the linked external Worktree directory. Sessions stay in DSH and remain available as detached bindings.",
 			"worktree.addSession": "Add Session to {name}",
 			"worktree.noWorktrees": "No Worktrees",
 			"worktree.createTitle": "New Worktree",
 			"worktree.createDescription": "{name} · the Worktree path is managed by DSH.",
+			"worktree.tabCreate": "Create",
+			"worktree.tabImport": "Import",
+			"worktree.importDescription": "Register an existing Worktree for {name}. Registration leaves the directory in place; removing it later deletes the linked Worktree directory.",
+			"worktree.importLoading": "Finding importable Worktrees…",
+			"worktree.importEmpty": "No importable Worktrees found.",
+			"worktree.importPlaceholder": "Select a Worktree to import",
+			"worktree.importSelected": "Selected",
 			"worktree.baseBranch": "Worktree base branch",
 			"worktree.noLocalBranch": "No local branch",
 			"worktree.noBranches": "No local branches found in this Workspace.",
@@ -146,6 +166,7 @@ window.__ModuleLoader__.load({
 			"worktree.setup.commands": "Copyable commands",
 			"worktree.name": "Worktree name",
 			"worktree.create": "Create Worktree",
+			"worktree.import": "Import Worktree",
 			"session.options": "Session options for {name}",
 			"session.new": "New Session",
 			"session.rename": "Rename session",
@@ -176,7 +197,10 @@ window.__ModuleLoader__.load({
 			"error.worktreeOrderingUnavailable": "Worktree ordering is unavailable; retry after reconnecting.",
 			"error.worktreeCreatedSessionUnavailable": "Worktree created, but Session creation is unavailable; retry after reconnecting.",
 			"error.sessionCreationUnavailable": "Session creation is unavailable; retry after reconnecting.",
-			"error.worktreeRecordMissing": "Worktree creation returned no Worktree record; retry the request.",
+			"error.worktreeRecordMissing": "Worktree registration returned no Worktree record; retry the request.",
+			"error.worktreeImportInvalid": "This Worktree cannot be imported. Choose a valid absolute path in this Workspace.",
+			"error.worktreeAlreadyManaged": "This Worktree is already managed by the plugin.",
+			"error.worktreeRegistrationSessionUnavailable": "The Worktree was registered, but Session creation is unavailable; retry after reconnecting.",
 			"error.workspaceRenameUnavailable": "Workspace rename is unavailable; retry after reconnecting.",
 			"error.workspaceDeleteUnavailable": "Workspace delete is unavailable; retry after reconnecting.",
 			"error.sessionRenameUnavailable": "Session rename is unavailable; retry after reconnecting.",
@@ -200,8 +224,10 @@ window.__ModuleLoader__.load({
 		*/
 		const WORKTREE_CONNECTION_ENDPOINTS = Object.freeze({
 			listWorktrees: "worktreeManager/listWorktrees",
+			listImportCandidates: "worktreeManager/listImportCandidates",
 			listBranches: "worktreeManager/listBranches",
 			createWorktree: "worktreeManager/createWorktree",
+			importWorktree: "worktreeManager/importWorktree",
 			removeWorktree: "worktreeManager/removeWorktree",
 			insertWorktreeBefore: "worktreeManager/insertWorktreeBefore",
 			listBindings: "worktreeManager/listBindings",
@@ -220,14 +246,14 @@ window.__ModuleLoader__.load({
 				this.retryable = options.retryable;
 			}
 		};
-		function isRecord(value) {
+		function isRecord$1(value) {
 			return typeof value === "object" && value !== null && !Array.isArray(value);
 		}
 		function isWorktreeError(value) {
-			return isRecord(value) && typeof value.code === "string" && typeof value.message === "string" && isRecord(value.details);
+			return isRecord$1(value) && typeof value.code === "string" && typeof value.message === "string" && isRecord$1(value.details);
 		}
 		function isWorktreeRemoteResult(value) {
-			if (!isRecord(value) || typeof value.ok !== "boolean") return false;
+			if (!isRecord$1(value) || typeof value.ok !== "boolean") return false;
 			return value.ok || isWorktreeError(value.error) && value.error.details !== void 0;
 		}
 		function disposedError() {
@@ -248,7 +274,7 @@ window.__ModuleLoader__.load({
 			});
 		}
 		function gatewayFailure(endpoint, result) {
-			const rawDetails = isRecord(result.error.details) ? result.error.details : {};
+			const rawDetails = isRecord$1(result.error.details) ? result.error.details : {};
 			throw new WorktreeConnectionError({
 				code: result.error.code,
 				message: result.error.message,
@@ -305,8 +331,10 @@ window.__ModuleLoader__.load({
 			}
 			return {
 				listWorktrees: (input) => invoke("listWorktrees", input),
+				listImportCandidates: (input) => invoke("listImportCandidates", input),
 				listBranches: (input) => invoke("listBranches", input),
 				createWorktree: (input) => invoke("createWorktree", input),
+				importWorktree: (input) => invoke("importWorktree", input),
 				async removeWorktree(input) {
 					await invoke("removeWorktree", input);
 				},
@@ -324,7 +352,7 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
-		//#region \0clutch-dsh-worktree-css:/private/tmp/clutch-dsh-wt-worktree-0.1.5-release/packages/clutch-dsh-worktree/src/client/worktree-context.css.mjs
+		//#region \0clutch-dsh-worktree-css:/Users/yuancheng/.dsh/clutch-dsh-worktree/worktree/wt_0c53e50f-f169-4c5e-9664-1c2d58ae1212/packages/clutch-dsh-worktree/src/client/worktree-context.css.mjs
 		const css$1 = ".-cerbur-clutch-dsh-worktree-headerContext {\n  display: inline-flex;\n  min-width: 0;\n  height: 22px;\n  align-items: center;\n  gap: 4px;\n  max-width: 180px;\n  overflow: hidden;\n  border-radius: 6px;\n  padding: 0 2px 0 0;\n  background: var(--dsw-alias-fill-tsp-secondary);\n  color: var(--dsw-alias-label-secondary);\n  font-size: 12px;\n  line-height: 22px;\n  white-space: nowrap;\n}\n\n.-cerbur-clutch-dsh-worktree-contextIcon {\n  flex: none;\n  opacity: 0.7;\n}\n\n.-cerbur-clutch-dsh-worktree-contextLabel {\n  min-width: 0;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n\n.-cerbur-clutch-dsh-worktree-contextHoverTitle {\n  max-width: 360px;\n  color: var(--dsw-static-neutral-bluish-00);\n  font-size: 14px;\n  line-height: 20px;\n  overflow-wrap: anywhere;\n  white-space: normal;\n}\n\n.-cerbur-clutch-dsh-worktree-heroContextHost {\n  position: absolute;\n  z-index: 1;\n  display: block;\n  width: max-content;\n  max-width: 260px;\n  min-height: 22px;\n}\n\n.-cerbur-clutch-dsh-worktree-heroContext {\n  display: inline-flex;\n  box-sizing: border-box;\n  max-width: 260px;\n  min-height: 22px;\n  align-items: center;\n  overflow: hidden;\n  border: 1px solid var(--dsw-alias-border-l2);\n  border-radius: 999px;\n  padding: 0 8px;\n  background: var(--dsw-alias-bg-layer-1);\n  color: var(--dsw-alias-label-secondary);\n  font-size: 12px;\n  line-height: 20px;\n  pointer-events: auto;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n";
 		const styleId$1 = "@cerbur/clutch-dsh-worktree/worktree-context.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=\"@cerbur/clutch-dsh-worktree/worktree-context.css\"]") === null) {
@@ -371,8 +399,8 @@ window.__ModuleLoader__.load({
 			});
 		}
 		//#endregion
-		//#region \0clutch-dsh-worktree-css:/private/tmp/clutch-dsh-wt-worktree-0.1.5-release/packages/clutch-dsh-worktree/src/client/worktree.css.mjs
-		const css = ".-cerbur-clutch-dsh-worktree-action {\n  display: flex;\n  align-items: center;\n  justify-content: flex-start;\n  gap: 8px;\n  width: calc(100% + 4px);\n  height: 42px;\n  margin: 4px -2px;\n  box-sizing: border-box;\n  border: 0;\n  border-radius: 12px;\n  padding: 0 10px 0 8px;\n  background: transparent;\n  color: var(--dsw-alias-label-primary);\n  cursor: pointer;\n  font: inherit;\n  font-size: 14px;\n  line-height: 22px;\n  text-align: left;\n  overflow: hidden;\n}\n\n.-cerbur-clutch-dsh-worktree-action:hover,\n.-cerbur-clutch-dsh-worktree-action[data-active='true'] {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n\n.-cerbur-clutch-dsh-worktree-action[data-collapsed='true'] {\n  width: 36px;\n  height: 36px;\n  margin: 8px 0 10px;\n  justify-content: center;\n  gap: 0;\n  padding: 0;\n  border-radius: 50%;\n}\n\n.-cerbur-clutch-dsh-worktree-actionLabel {\n  display: inline-flex;\n  min-width: 0;\n  align-items: center;\n  height: 22px;\n  overflow: hidden;\n  font-weight: 400;\n  line-height: 22px;\n  white-space: nowrap;\n}\n\n.-cerbur-clutch-dsh-worktree-surface {\n  position: absolute;\n  top: 0;\n  left: 0;\n  display: flex;\n  flex-direction: column;\n  box-sizing: border-box;\n  min-width: 56px;\n  overflow: hidden;\n  border-right: 1px solid var(--dsw-alias-border-l1);\n  background: var(--dsw-specific-sidebar-fill);\n  color: var(--dsw-alias-label-primary);\n  pointer-events: auto;\n  transition: width var(--ds-transition-duration-slow) var(--ds-ease-in-out);\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .-cerbur-clutch-dsh-worktree-surface {\n    transition: none;\n  }\n}\n\n.-cerbur-clutch-dsh-worktree-wideContent {\n  display: flex;\n  min-width: 0;\n  min-height: 0;\n  flex: 1;\n  flex-direction: column;\n}\n\n.-cerbur-clutch-dsh-worktree-surface[data-collapsed='true'] .-cerbur-clutch-dsh-worktree-wideContent {\n  display: none;\n}\n\n.-cerbur-clutch-dsh-worktree-closeButton {\n  border: 0;\n  border-radius: 8px;\n  background: transparent;\n  color: inherit;\n  cursor: pointer;\n  font: inherit;\n}\n\n.-cerbur-clutch-dsh-worktree-closeButton:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n\n.-cerbur-clutch-dsh-worktree-header {\n  display: flex;\n  align-items: center;\n  gap: 8px;\n  flex: none;\n  min-height: 44px;\n  padding: 6px 10px;\n  box-sizing: border-box;\n  border-bottom: 1px solid var(--dsw-alias-border-l1);\n}\n\n.-cerbur-clutch-dsh-worktree-title {\n  min-width: 0;\n  flex: 1;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  font-size: 14px;\n  font-weight: 600;\n}\n\n.-cerbur-clutch-dsh-worktree-closeButton {\n  flex: none;\n  width: 28px;\n  height: 28px;\n  font-size: 18px;\n  line-height: 1;\n}\n\n.-cerbur-clutch-dsh-worktree-modeButton[data-active='true'] {\n  color: var(--dsw-alias-label-primary);\n}\n\n.-cerbur-clutch-dsh-worktree-workspacePicker {\n  display: block;\n  width: calc(100% - 20px);\n  margin: 6px 10px 8px;\n  padding: 6px 8px;\n  border: 1px solid var(--dsw-alias-border-l2);\n  border-radius: 7px;\n  background: var(--dsw-alias-button-elevated-fill);\n  color: var(--dsw-alias-label-primary);\n  font: inherit;\n  font-size: 12px;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceLabel {\n  display: block;\n  color: var(--dsw-alias-label-tertiary);\n  font-size: 11px;\n}\n\n.-cerbur-clutch-dsh-worktree-content {\n  min-height: 0;\n  flex: 1;\n  overflow: auto;\n  padding: 0 10px 12px;\n}\n\n.-cerbur-clutch-dsh-worktree-content:focus-visible {\n  outline: 2px solid var(--dsw-alias-border-l3);\n  outline-offset: -2px;\n}\n\n.-cerbur-clutch-dsh-worktree-error {\n  margin: 12px 0 0;\n  padding: 8px;\n  border: 1px solid var(--dsw-alias-state-error-primary);\n  border-radius: 7px;\n}\n\n.-cerbur-clutch-dsh-worktree-retryButton,\n.-cerbur-clutch-dsh-worktree-actionButton {\n  border: 0;\n  border-radius: 6px;\n  background: var(--dsw-alias-button-elevated-fill);\n  color: var(--dsw-alias-label-primary);\n  cursor: pointer;\n  font: inherit;\n  font-size: 11px;\n}\n\n.-cerbur-clutch-dsh-worktree-retryButton,\n.-cerbur-clutch-dsh-worktree-actionButton {\n  width: 100%;\n  padding: 6px 8px;\n}\n\n.-cerbur-clutch-dsh-worktree-recoveryActions {\n  display: grid;\n  gap: 6px;\n  margin-top: 6px;\n}\n\n.-cerbur-clutch-dsh-worktree-retryButton:disabled,\n.-cerbur-clutch-dsh-worktree-actionButton:disabled {\n  cursor: not-allowed;\n  opacity: 0.5;\n}\n\n.-cerbur-clutch-dsh-worktree-actions {\n  display: grid;\n  gap: 6px;\n  margin-top: 10px;\n  padding: 8px;\n  border: 1px solid var(--dsw-alias-border-l1);\n  border-radius: 7px;\n}\n\n.-cerbur-clutch-dsh-worktree-actionSelect {\n  min-width: 0;\n  padding: 5px 6px;\n  border: 1px solid var(--dsw-alias-border-l2);\n  border-radius: 6px;\n  background: var(--dsw-alias-button-elevated-fill);\n  color: var(--dsw-alias-label-primary);\n  font: inherit;\n  font-size: 11px;\n}\n\n.-cerbur-clutch-dsh-worktree-section {\n  margin: 12px 0 0;\n}\n\n.-cerbur-clutch-dsh-worktree-sectionTitle {\n  margin: 0 2px 4px;\n  color: var(--dsw-alias-label-tertiary);\n  font-size: 11px;\n  font-weight: 600;\n  letter-spacing: 0.02em;\n  text-transform: uppercase;\n}\n\n.-cerbur-clutch-dsh-worktree-empty,\n.-cerbur-clutch-dsh-worktree-message {\n  margin: 0;\n  padding: 8px 4px;\n  color: var(--dsw-alias-label-tertiary);\n  font-size: 12px;\n  line-height: 18px;\n}\n\n.-cerbur-clutch-dsh-worktree-gitReadiness {\n  display: grid;\n  gap: 4px;\n}\n\n.-cerbur-clutch-dsh-worktree-commandBlock {\n  margin: 6px 0 0;\n  padding: 8px;\n  overflow-x: auto;\n  border-radius: 6px;\n  background: var(--dsw-alias-button-elevated-fill);\n  color: var(--dsw-alias-label-secondary);\n  font: 11px/16px ui-monospace, SFMono-Regular, Menlo, monospace;\n  white-space: pre-wrap;\n}\n\n.-cerbur-clutch-dsh-worktree-message[data-error='true'] {\n  color: var(--dsw-alias-state-error-primary);\n}\n\n.-cerbur-clutch-dsh-worktree-worktree,\n.-cerbur-clutch-dsh-worktree-session {\n  display: flex;\n  align-items: center;\n  width: 100%;\n  min-width: 0;\n  box-sizing: border-box;\n  border: 0;\n  border-radius: 7px;\n  padding: 6px 8px;\n  background: transparent;\n  color: var(--dsw-alias-label-primary);\n  font: inherit;\n  font-size: 12px;\n  text-align: left;\n}\n\n.-cerbur-clutch-dsh-worktree-worktree {\n  cursor: default;\n}\n\n.-cerbur-clutch-dsh-worktree-session {\n  cursor: pointer;\n}\n\n.-cerbur-clutch-dsh-worktree-worktree:hover,\n.-cerbur-clutch-dsh-worktree-session:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeLabel,\n.-cerbur-clutch-dsh-worktree-sessionLabel {\n  min-width: 0;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n\n.-cerbur-clutch-dsh-worktree-status {\n  flex: none;\n  margin-left: auto;\n  padding-left: 8px;\n  color: var(--dsw-alias-label-tertiary);\n  font-size: 11px;\n}\n\n.-cerbur-clutch-dsh-worktree-searchRow {\n  display: flex;\n  align-items: center;\n  gap: 6px;\n  padding: 8px 10px 6px;\n}\n\n.-cerbur-clutch-dsh-worktree-searchIcon {\n  display: inline-flex;\n  flex: none;\n  align-items: center;\n  justify-content: center;\n  color: var(--dsw-alias-label-secondary);\n}\n\n.-cerbur-clutch-dsh-worktree-searchInput {\n  min-width: 0;\n  box-sizing: border-box;\n  border: 1px solid var(--dsw-alias-border-l2);\n  border-radius: 7px;\n  background: var(--dsw-alias-button-elevated-fill);\n  color: var(--dsw-alias-label-primary);\n  font: inherit;\n  outline: none;\n}\n\n.-cerbur-clutch-dsh-worktree-searchInput {\n  width: 100%;\n  padding: 6px 8px;\n  font-size: 13px;\n  line-height: 18px;\n}\n\n.-cerbur-clutch-dsh-worktree-searchInput:focus,\n.-cerbur-clutch-dsh-worktree-actionSelect:focus {\n  border-color: #3b82f6;\n}\n\n.-cerbur-clutch-dsh-worktree-iconButton {\n  display: inline-flex;\n  flex: none;\n  align-items: center;\n  justify-content: center;\n  width: 28px;\n  height: 28px;\n  border: 0;\n  border-radius: 7px;\n  background: transparent;\n  color: var(--dsw-alias-label-secondary);\n  cursor: pointer;\n  font: inherit;\n  font-size: 20px;\n  line-height: 1;\n}\n\n.-cerbur-clutch-dsh-worktree-iconButton:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n  color: var(--dsw-alias-label-primary);\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceList {\n  min-width: 0;\n  min-height: 0;\n  display: grid;\n  gap: 4px;\n  overflow-x: hidden;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceGroup {\n  min-width: 0;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow,\n.-cerbur-clutch-dsh-worktree-worktreeRow {\n  position: relative;\n  display: flex;\n  align-items: center;\n  min-width: 0;\n  min-height: 36px;\n  box-sizing: border-box;\n  border-radius: 8px;\n  padding: 3px 4px;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow:hover,\n.-cerbur-clutch-dsh-worktree-worktreeRow:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow .-cerbur-clutch-dsh-worktree-workspaceDisclosure {\n  display: none;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow:hover .-cerbur-clutch-dsh-worktree-workspaceDisclosure,\n.-cerbur-clutch-dsh-worktree-workspaceRow[data-menu-open='true'] .-cerbur-clutch-dsh-worktree-workspaceDisclosure {\n  display: inline-flex;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow:hover .-cerbur-clutch-dsh-worktree-workspaceIcon,\n.-cerbur-clutch-dsh-worktree-workspaceRow[data-menu-open='true'] .-cerbur-clutch-dsh-worktree-workspaceIcon {\n  display: none;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow .-cerbur-clutch-dsh-worktree-worktreeDisclosure {\n  display: none;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow:hover .-cerbur-clutch-dsh-worktree-worktreeDisclosure,\n.-cerbur-clutch-dsh-worktree-worktreeRow[data-menu-open='true'] .-cerbur-clutch-dsh-worktree-worktreeDisclosure {\n  display: inline-flex;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow:hover .-cerbur-clutch-dsh-worktree-worktreeIcon,\n.-cerbur-clutch-dsh-worktree-worktreeRow[data-menu-open='true'] .-cerbur-clutch-dsh-worktree-worktreeIcon {\n  display: none;\n}\n\n.-cerbur-clutch-dsh-worktree-disclosureButton {\n  flex: none;\n  display: inline-flex;\n  align-items: center;\n  justify-content: center;\n  width: 24px;\n  height: 28px;\n  border: 0;\n  border-radius: 6px;\n  padding: 0;\n  background: transparent;\n  color: var(--dsw-alias-label-secondary);\n  cursor: pointer;\n  font: inherit;\n  font-size: 17px;\n  line-height: 1;\n}\n\n.-cerbur-clutch-dsh-worktree-disclosureButton > svg {\n  display: block;\n}\n\n.-cerbur-clutch-dsh-worktree-disclosureButton:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceIcon,\n.-cerbur-clutch-dsh-worktree-worktreeIcon {\n  flex: none;\n  width: 24px;\n  color: var(--dsw-alias-label-secondary);\n  font-size: 20px;\n  line-height: 1;\n  text-align: center;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeState {\n  display: inline-flex;\n  flex: none;\n  align-items: center;\n  justify-content: center;\n  width: 12px;\n  margin-right: 0;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceIcon {\n  color: var(--dsw-alias-brand-primary);\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceTitle,\n.-cerbur-clutch-dsh-worktree-worktreeLabel {\n  min-width: 0;\n  overflow: hidden;\n  flex: 1;\n  padding: 0 6px;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  font-size: 14px;\n  font-weight: 400;\n  line-height: 20px;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow[data-main-group='true'] .-cerbur-clutch-dsh-worktree-worktreeLabel {\n  font-weight: 600;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeHoverTitle {\n  color: var(--dsw-static-neutral-bluish-00);\n  font-size: 14px;\n  line-height: 20px;\n  overflow-wrap: anywhere;\n}\n\n.-cerbur-clutch-dsh-worktree-treeActionSlot,\n.-cerbur-clutch-dsh-worktree-workspaceActions {\n  position: relative;\n  display: inline-flex;\n  flex: 0 0 64px;\n  align-items: center;\n  justify-content: flex-end;\n  width: 64px;\n  height: 28px;\n  margin-left: auto;\n}\n\n.-cerbur-clutch-dsh-worktree-treeActionSlot > .-cerbur-clutch-dsh-worktree-menuAction {\n  position: absolute;\n  top: 0;\n  right: 32px;\n}\n\n.-cerbur-clutch-dsh-worktree-treeActionSlot > .-cerbur-clutch-dsh-worktree-iconButton:last-child {\n  position: absolute;\n  top: 0;\n  right: 0;\n}\n\n.-cerbur-clutch-dsh-worktree-menuAction {\n  display: inline-flex;\n  width: 28px;\n  height: 28px;\n  visibility: hidden;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow:hover .-cerbur-clutch-dsh-worktree-menuAction,\n.-cerbur-clutch-dsh-worktree-workspaceRow[data-menu-open='true'] .-cerbur-clutch-dsh-worktree-menuAction,\n.-cerbur-clutch-dsh-worktree-worktreeRow:hover .-cerbur-clutch-dsh-worktree-menuAction,\n.-cerbur-clutch-dsh-worktree-worktreeRow[data-menu-open='true'] .-cerbur-clutch-dsh-worktree-menuAction {\n  visibility: visible;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow.-cerbur-clutch-dsh-worktree-dropBefore::before,\n.-cerbur-clutch-dsh-worktree-workspaceRow.-cerbur-clutch-dsh-worktree-dropAfter::after {\n  position: absolute;\n  right: 4px;\n  left: 4px;\n  height: 2px;\n  border-radius: 2px;\n  background: var(--dsw-alias-brand-primary);\n  content: '';\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow.-cerbur-clutch-dsh-worktree-dropBefore::before {\n  top: -1px;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow.-cerbur-clutch-dsh-worktree-dropAfter::after {\n  bottom: -1px;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow.-cerbur-clutch-dsh-worktree-dropBefore::before,\n.-cerbur-clutch-dsh-worktree-worktreeRow.-cerbur-clutch-dsh-worktree-dropAfter::after {\n  position: absolute;\n  right: 4px;\n  left: 4px;\n  height: 2px;\n  border-radius: 2px;\n  background: var(--dsw-alias-brand-primary);\n  content: '';\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow.-cerbur-clutch-dsh-worktree-dropBefore::before {\n  top: -1px;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow.-cerbur-clutch-dsh-worktree-dropAfter::after {\n  bottom: -1px;\n}\n\n.-cerbur-clutch-dsh-worktree-treeChildren {\n  margin-left: 24px;\n  padding: 2px 0 5px 12px;\n  border-left: 1px solid var(--dsw-alias-border-l1);\n}\n\n.-cerbur-clutch-dsh-worktree-groupLabel {\n  padding: 6px 8px 3px;\n  color: var(--dsw-alias-label-tertiary);\n  font-size: 10px;\n  font-weight: 600;\n  letter-spacing: 0.05em;\n  text-transform: uppercase;\n}\n\n.-cerbur-clutch-dsh-worktree-groupHeader {\n  display: flex;\n  align-items: center;\n  min-height: 34px;\n  padding-right: 4px;\n}\n\n.-cerbur-clutch-dsh-worktree-groupHeader .-cerbur-clutch-dsh-worktree-groupLabel {\n  flex: 1;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeGroup {\n  margin-top: 2px;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow {\n  min-height: 34px;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow .-cerbur-clutch-dsh-worktree-worktreeIcon,\n.-cerbur-clutch-dsh-worktree-worktreeRow .-cerbur-clutch-dsh-worktree-disclosureButton {\n  width: 22px;\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionRow {\n  position: relative;\n  display: flex;\n  align-items: center;\n  width: 100%;\n  min-width: 0;\n  min-height: 31px;\n  box-sizing: border-box;\n  border-radius: 7px;\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionRow:hover,\n.-cerbur-clutch-dsh-worktree-treeSessionRow[data-menu-open='true'] {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionRow.-cerbur-clutch-dsh-worktree-dropBefore::before,\n.-cerbur-clutch-dsh-worktree-treeSessionRow.-cerbur-clutch-dsh-worktree-dropAfter::after {\n  position: absolute;\n  right: 4px;\n  left: 4px;\n  height: 2px;\n  border-radius: 2px;\n  background: var(--dsw-alias-brand-primary);\n  content: '';\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionRow.-cerbur-clutch-dsh-worktree-dropBefore::before {\n  top: -1px;\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionRow.-cerbur-clutch-dsh-worktree-dropAfter::after {\n  bottom: -1px;\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionContent {\n  display: flex;\n  align-items: center;\n  flex: 1;\n  width: 0;\n  min-width: 0;\n  min-height: 31px;\n  box-sizing: border-box;\n  border: 0;\n  border-radius: 7px;\n  padding: 4px 4px;\n  background: transparent;\n  color: var(--dsw-alias-label-primary);\n  cursor: pointer;\n  font: inherit;\n  font-size: 14px;\n  font-weight: 400;\n  line-height: 20px;\n  text-align: left;\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionContent:hover {\n  background: transparent;\n}\n\n.-cerbur-clutch-dsh-worktree-rowActions {\n  display: none;\n  flex: none;\n  align-items: center;\n  gap: 4px;\n}\n\n.-cerbur-clutch-dsh-worktree-sessionOverflowButton {\n  display: block;\n  width: calc(100% - 24px);\n  margin: 2px 0 4px 24px;\n  padding: 4px 8px;\n  border: 0;\n  border-radius: 6px;\n  background: transparent;\n  color: var(--dsw-alias-label-secondary);\n  cursor: pointer;\n  font: inherit;\n  font-size: 12px;\n  font-weight: 400;\n  line-height: 20px;\n  text-align: left;\n}\n\n.-cerbur-clutch-dsh-worktree-sessionOverflowButton:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n  color: var(--dsw-alias-label-primary);\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionRow:hover .-cerbur-clutch-dsh-worktree-rowActions,\n.-cerbur-clutch-dsh-worktree-treeSessionRow[data-menu-open='true'] .-cerbur-clutch-dsh-worktree-rowActions {\n  display: inline-flex;\n}\n\n.-cerbur-clutch-dsh-worktree-renameInput {\n  width: 100%;\n}\n\n.-cerbur-clutch-dsh-worktree-renameError {\n  margin: 8px 0 0;\n  color: var(--dsw-alias-state-error-primary);\n  font-size: 13px;\n  line-height: 20px;\n}\n\n.-cerbur-clutch-dsh-worktree-treeGuide {\n  flex: none;\n  width: 20px;\n  color: var(--dsw-alias-label-tertiary);\n  text-align: center;\n}\n\n.-cerbur-clutch-dsh-worktree-emptyNested {\n  margin: 0;\n  padding: 4px 8px 5px 28px;\n  color: var(--dsw-alias-label-tertiary);\n  font-size: 11px;\n}\n\n.-cerbur-clutch-dsh-worktree-modalField {\n  display: grid;\n  gap: 5px;\n  color: var(--dsw-alias-label-secondary);\n  font-size: 12px;\n}\n";
+		//#region \0clutch-dsh-worktree-css:/Users/yuancheng/.dsh/clutch-dsh-worktree/worktree/wt_0c53e50f-f169-4c5e-9664-1c2d58ae1212/packages/clutch-dsh-worktree/src/client/worktree.css.mjs
+		const css = ".-cerbur-clutch-dsh-worktree-action {\n  display: flex;\n  align-items: center;\n  justify-content: flex-start;\n  gap: 8px;\n  width: calc(100% + 4px);\n  height: 42px;\n  margin: 4px -2px;\n  box-sizing: border-box;\n  border: 0;\n  border-radius: 12px;\n  padding: 0 10px 0 8px;\n  background: transparent;\n  color: var(--dsw-alias-label-primary);\n  cursor: pointer;\n  font: inherit;\n  font-size: 14px;\n  line-height: 22px;\n  text-align: left;\n  overflow: hidden;\n}\n\n.-cerbur-clutch-dsh-worktree-action:hover,\n.-cerbur-clutch-dsh-worktree-action[data-active='true'] {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n\n.-cerbur-clutch-dsh-worktree-action[data-collapsed='true'] {\n  width: 36px;\n  height: 36px;\n  margin: 8px 0 10px;\n  justify-content: center;\n  gap: 0;\n  padding: 0;\n  border-radius: 50%;\n}\n\n.-cerbur-clutch-dsh-worktree-actionLabel {\n  display: inline-flex;\n  min-width: 0;\n  align-items: center;\n  height: 22px;\n  overflow: hidden;\n  font-weight: 400;\n  line-height: 22px;\n  white-space: nowrap;\n}\n\n.-cerbur-clutch-dsh-worktree-surface {\n  position: absolute;\n  top: 0;\n  left: 0;\n  display: flex;\n  flex-direction: column;\n  box-sizing: border-box;\n  min-width: 56px;\n  overflow: hidden;\n  border-right: 1px solid var(--dsw-alias-border-l1);\n  background: var(--dsw-specific-sidebar-fill);\n  color: var(--dsw-alias-label-primary);\n  pointer-events: auto;\n  transition: width var(--ds-transition-duration-slow) var(--ds-ease-in-out);\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .-cerbur-clutch-dsh-worktree-surface {\n    transition: none;\n  }\n}\n\n.-cerbur-clutch-dsh-worktree-wideContent {\n  display: flex;\n  min-width: 0;\n  min-height: 0;\n  flex: 1;\n  flex-direction: column;\n}\n\n.-cerbur-clutch-dsh-worktree-surface[data-collapsed='true'] .-cerbur-clutch-dsh-worktree-wideContent {\n  display: none;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeModalTabs {\n  display: flex;\n  gap: 8px;\n  margin-bottom: 12px;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeModalTab {\n  border: 0;\n  border-bottom: 2px solid transparent;\n  padding: 4px 0;\n  background: transparent;\n  color: var(--dsw-alias-label-secondary);\n  cursor: pointer;\n  font: inherit;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeModalTab[aria-selected='true'] {\n  border-bottom-color: var(--dsw-alias-label-primary);\n  color: var(--dsw-alias-label-primary);\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeImportCandidates {\n  display: grid;\n  gap: 8px;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeImportSelect {\n  width: 100%;\n  min-width: 0;\n  padding: 7px 8px;\n  border: 1px solid var(--dsw-alias-border-l2);\n  border-radius: 6px;\n  background: var(--dsw-alias-button-elevated-fill);\n  color: var(--dsw-alias-label-primary);\n  font: inherit;\n  font-size: 13px;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeImportError {\n  display: grid;\n  gap: 8px;\n}\n\n.-cerbur-clutch-dsh-worktree-closeButton {\n  border: 0;\n  border-radius: 8px;\n  background: transparent;\n  color: inherit;\n  cursor: pointer;\n  font: inherit;\n}\n\n.-cerbur-clutch-dsh-worktree-closeButton:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n\n.-cerbur-clutch-dsh-worktree-header {\n  display: flex;\n  align-items: center;\n  gap: 8px;\n  flex: none;\n  min-height: 44px;\n  padding: 6px 10px;\n  box-sizing: border-box;\n  border-bottom: 1px solid var(--dsw-alias-border-l1);\n}\n\n.-cerbur-clutch-dsh-worktree-title {\n  min-width: 0;\n  flex: 1;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  font-size: 14px;\n  font-weight: 600;\n}\n\n.-cerbur-clutch-dsh-worktree-closeButton {\n  flex: none;\n  width: 28px;\n  height: 28px;\n  font-size: 18px;\n  line-height: 1;\n}\n\n.-cerbur-clutch-dsh-worktree-modeButton[data-active='true'] {\n  color: var(--dsw-alias-label-primary);\n}\n\n.-cerbur-clutch-dsh-worktree-workspacePicker {\n  display: block;\n  width: calc(100% - 20px);\n  margin: 6px 10px 8px;\n  padding: 6px 8px;\n  border: 1px solid var(--dsw-alias-border-l2);\n  border-radius: 7px;\n  background: var(--dsw-alias-button-elevated-fill);\n  color: var(--dsw-alias-label-primary);\n  font: inherit;\n  font-size: 12px;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceLabel {\n  display: block;\n  color: var(--dsw-alias-label-tertiary);\n  font-size: 11px;\n}\n\n.-cerbur-clutch-dsh-worktree-content {\n  min-height: 0;\n  flex: 1;\n  overflow: auto;\n  padding: 0 10px 12px;\n}\n\n.-cerbur-clutch-dsh-worktree-content:focus-visible {\n  outline: 2px solid var(--dsw-alias-border-l3);\n  outline-offset: -2px;\n}\n\n.-cerbur-clutch-dsh-worktree-error {\n  margin: 12px 0 0;\n  padding: 8px;\n  border: 1px solid var(--dsw-alias-state-error-primary);\n  border-radius: 7px;\n}\n\n.-cerbur-clutch-dsh-worktree-retryButton,\n.-cerbur-clutch-dsh-worktree-actionButton {\n  border: 0;\n  border-radius: 6px;\n  background: var(--dsw-alias-button-elevated-fill);\n  color: var(--dsw-alias-label-primary);\n  cursor: pointer;\n  font: inherit;\n  font-size: 11px;\n}\n\n.-cerbur-clutch-dsh-worktree-retryButton,\n.-cerbur-clutch-dsh-worktree-actionButton {\n  width: 100%;\n  padding: 6px 8px;\n}\n\n.-cerbur-clutch-dsh-worktree-recoveryActions {\n  display: grid;\n  gap: 6px;\n  margin-top: 6px;\n}\n\n.-cerbur-clutch-dsh-worktree-retryButton:disabled,\n.-cerbur-clutch-dsh-worktree-actionButton:disabled {\n  cursor: not-allowed;\n  opacity: 0.5;\n}\n\n.-cerbur-clutch-dsh-worktree-actions {\n  display: grid;\n  gap: 6px;\n  margin-top: 10px;\n  padding: 8px;\n  border: 1px solid var(--dsw-alias-border-l1);\n  border-radius: 7px;\n}\n\n.-cerbur-clutch-dsh-worktree-actionSelect {\n  min-width: 0;\n  padding: 5px 6px;\n  border: 1px solid var(--dsw-alias-border-l2);\n  border-radius: 6px;\n  background: var(--dsw-alias-button-elevated-fill);\n  color: var(--dsw-alias-label-primary);\n  font: inherit;\n  font-size: 11px;\n}\n\n.-cerbur-clutch-dsh-worktree-section {\n  margin: 12px 0 0;\n}\n\n.-cerbur-clutch-dsh-worktree-sectionTitle {\n  margin: 0 2px 4px;\n  color: var(--dsw-alias-label-tertiary);\n  font-size: 11px;\n  font-weight: 600;\n  letter-spacing: 0.02em;\n  text-transform: uppercase;\n}\n\n.-cerbur-clutch-dsh-worktree-empty,\n.-cerbur-clutch-dsh-worktree-message {\n  margin: 0;\n  padding: 8px 4px;\n  color: var(--dsw-alias-label-tertiary);\n  font-size: 12px;\n  line-height: 18px;\n}\n\n.-cerbur-clutch-dsh-worktree-gitReadiness {\n  display: grid;\n  gap: 4px;\n}\n\n.-cerbur-clutch-dsh-worktree-commandBlock {\n  margin: 6px 0 0;\n  padding: 8px;\n  overflow-x: auto;\n  border-radius: 6px;\n  background: var(--dsw-alias-button-elevated-fill);\n  color: var(--dsw-alias-label-secondary);\n  font: 11px/16px ui-monospace, SFMono-Regular, Menlo, monospace;\n  white-space: pre-wrap;\n}\n\n.-cerbur-clutch-dsh-worktree-message[data-error='true'] {\n  color: var(--dsw-alias-state-error-primary);\n}\n\n.-cerbur-clutch-dsh-worktree-worktree,\n.-cerbur-clutch-dsh-worktree-session {\n  display: flex;\n  align-items: center;\n  width: 100%;\n  min-width: 0;\n  box-sizing: border-box;\n  border: 0;\n  border-radius: 7px;\n  padding: 6px 8px;\n  background: transparent;\n  color: var(--dsw-alias-label-primary);\n  font: inherit;\n  font-size: 12px;\n  text-align: left;\n}\n\n.-cerbur-clutch-dsh-worktree-worktree {\n  cursor: default;\n}\n\n.-cerbur-clutch-dsh-worktree-session {\n  cursor: pointer;\n}\n\n.-cerbur-clutch-dsh-worktree-worktree:hover,\n.-cerbur-clutch-dsh-worktree-session:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeLabel,\n.-cerbur-clutch-dsh-worktree-sessionLabel {\n  min-width: 0;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n\n.-cerbur-clutch-dsh-worktree-status {\n  flex: none;\n  margin-left: auto;\n  padding-left: 8px;\n  color: var(--dsw-alias-label-tertiary);\n  font-size: 11px;\n}\n\n.-cerbur-clutch-dsh-worktree-searchRow {\n  display: flex;\n  align-items: center;\n  gap: 6px;\n  padding: 8px 10px 6px;\n}\n\n.-cerbur-clutch-dsh-worktree-searchIcon {\n  display: inline-flex;\n  flex: none;\n  align-items: center;\n  justify-content: center;\n  color: var(--dsw-alias-label-secondary);\n}\n\n.-cerbur-clutch-dsh-worktree-searchInput {\n  min-width: 0;\n  box-sizing: border-box;\n  border: 1px solid var(--dsw-alias-border-l2);\n  border-radius: 7px;\n  background: var(--dsw-alias-button-elevated-fill);\n  color: var(--dsw-alias-label-primary);\n  font: inherit;\n  outline: none;\n}\n\n.-cerbur-clutch-dsh-worktree-searchInput {\n  width: 100%;\n  padding: 6px 8px;\n  font-size: 13px;\n  line-height: 18px;\n}\n\n.-cerbur-clutch-dsh-worktree-searchInput:focus,\n.-cerbur-clutch-dsh-worktree-actionSelect:focus,\n.-cerbur-clutch-dsh-worktree-worktreeImportSelect:focus {\n  border-color: #3b82f6;\n}\n\n.-cerbur-clutch-dsh-worktree-iconButton {\n  display: inline-flex;\n  flex: none;\n  align-items: center;\n  justify-content: center;\n  width: 28px;\n  height: 28px;\n  border: 0;\n  border-radius: 7px;\n  background: transparent;\n  color: var(--dsw-alias-label-secondary);\n  cursor: pointer;\n  font: inherit;\n  font-size: 20px;\n  line-height: 1;\n}\n\n.-cerbur-clutch-dsh-worktree-iconButton:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n  color: var(--dsw-alias-label-primary);\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceList {\n  min-width: 0;\n  min-height: 0;\n  display: grid;\n  gap: 4px;\n  overflow-x: hidden;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceGroup {\n  min-width: 0;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow,\n.-cerbur-clutch-dsh-worktree-worktreeRow {\n  position: relative;\n  display: flex;\n  align-items: center;\n  min-width: 0;\n  min-height: 36px;\n  box-sizing: border-box;\n  border-radius: 8px;\n  padding: 3px 4px;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow:hover,\n.-cerbur-clutch-dsh-worktree-worktreeRow:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow .-cerbur-clutch-dsh-worktree-workspaceDisclosure {\n  display: none;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow:hover .-cerbur-clutch-dsh-worktree-workspaceDisclosure,\n.-cerbur-clutch-dsh-worktree-workspaceRow[data-menu-open='true'] .-cerbur-clutch-dsh-worktree-workspaceDisclosure {\n  display: inline-flex;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow:hover .-cerbur-clutch-dsh-worktree-workspaceIcon,\n.-cerbur-clutch-dsh-worktree-workspaceRow[data-menu-open='true'] .-cerbur-clutch-dsh-worktree-workspaceIcon {\n  display: none;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow .-cerbur-clutch-dsh-worktree-worktreeDisclosure {\n  display: none;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow:hover .-cerbur-clutch-dsh-worktree-worktreeDisclosure,\n.-cerbur-clutch-dsh-worktree-worktreeRow[data-menu-open='true'] .-cerbur-clutch-dsh-worktree-worktreeDisclosure {\n  display: inline-flex;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow:hover .-cerbur-clutch-dsh-worktree-worktreeIcon,\n.-cerbur-clutch-dsh-worktree-worktreeRow[data-menu-open='true'] .-cerbur-clutch-dsh-worktree-worktreeIcon {\n  display: none;\n}\n\n.-cerbur-clutch-dsh-worktree-disclosureButton {\n  flex: none;\n  display: inline-flex;\n  align-items: center;\n  justify-content: center;\n  width: 24px;\n  height: 28px;\n  border: 0;\n  border-radius: 6px;\n  padding: 0;\n  background: transparent;\n  color: var(--dsw-alias-label-secondary);\n  cursor: pointer;\n  font: inherit;\n  font-size: 17px;\n  line-height: 1;\n}\n\n.-cerbur-clutch-dsh-worktree-disclosureButton > svg {\n  display: block;\n}\n\n.-cerbur-clutch-dsh-worktree-disclosureButton:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceIcon,\n.-cerbur-clutch-dsh-worktree-worktreeIcon {\n  flex: none;\n  width: 24px;\n  color: var(--dsw-alias-label-secondary);\n  font-size: 20px;\n  line-height: 1;\n  text-align: center;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeState {\n  display: inline-flex;\n  flex: none;\n  align-items: center;\n  justify-content: center;\n  width: 12px;\n  margin-right: 0;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceIcon {\n  color: var(--dsw-alias-brand-primary);\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceTitle,\n.-cerbur-clutch-dsh-worktree-worktreeLabel {\n  min-width: 0;\n  overflow: hidden;\n  flex: 1;\n  padding: 0 6px;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  font-size: 14px;\n  font-weight: 400;\n  line-height: 20px;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow[data-main-group='true'] .-cerbur-clutch-dsh-worktree-worktreeLabel {\n  font-weight: 600;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeHoverTitle {\n  color: var(--dsw-static-neutral-bluish-00);\n  font-size: 14px;\n  line-height: 20px;\n  overflow-wrap: anywhere;\n}\n\n.-cerbur-clutch-dsh-worktree-treeActionSlot,\n.-cerbur-clutch-dsh-worktree-workspaceActions {\n  position: relative;\n  display: inline-flex;\n  flex: 0 0 64px;\n  align-items: center;\n  justify-content: flex-end;\n  width: 64px;\n  height: 28px;\n  margin-left: auto;\n}\n\n.-cerbur-clutch-dsh-worktree-treeActionSlot > .-cerbur-clutch-dsh-worktree-menuAction {\n  position: absolute;\n  top: 0;\n  right: 32px;\n}\n\n.-cerbur-clutch-dsh-worktree-treeActionSlot > .-cerbur-clutch-dsh-worktree-iconButton:last-child {\n  position: absolute;\n  top: 0;\n  right: 0;\n}\n\n.-cerbur-clutch-dsh-worktree-menuAction {\n  display: inline-flex;\n  width: 28px;\n  height: 28px;\n  visibility: hidden;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow:hover .-cerbur-clutch-dsh-worktree-menuAction,\n.-cerbur-clutch-dsh-worktree-workspaceRow[data-menu-open='true'] .-cerbur-clutch-dsh-worktree-menuAction,\n.-cerbur-clutch-dsh-worktree-worktreeRow:hover .-cerbur-clutch-dsh-worktree-menuAction,\n.-cerbur-clutch-dsh-worktree-worktreeRow[data-menu-open='true'] .-cerbur-clutch-dsh-worktree-menuAction {\n  visibility: visible;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow.-cerbur-clutch-dsh-worktree-dropBefore::before,\n.-cerbur-clutch-dsh-worktree-workspaceRow.-cerbur-clutch-dsh-worktree-dropAfter::after {\n  position: absolute;\n  right: 4px;\n  left: 4px;\n  height: 2px;\n  border-radius: 2px;\n  background: var(--dsw-alias-brand-primary);\n  content: '';\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow.-cerbur-clutch-dsh-worktree-dropBefore::before {\n  top: -1px;\n}\n\n.-cerbur-clutch-dsh-worktree-workspaceRow.-cerbur-clutch-dsh-worktree-dropAfter::after {\n  bottom: -1px;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow.-cerbur-clutch-dsh-worktree-dropBefore::before,\n.-cerbur-clutch-dsh-worktree-worktreeRow.-cerbur-clutch-dsh-worktree-dropAfter::after {\n  position: absolute;\n  right: 4px;\n  left: 4px;\n  height: 2px;\n  border-radius: 2px;\n  background: var(--dsw-alias-brand-primary);\n  content: '';\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow.-cerbur-clutch-dsh-worktree-dropBefore::before {\n  top: -1px;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow.-cerbur-clutch-dsh-worktree-dropAfter::after {\n  bottom: -1px;\n}\n\n.-cerbur-clutch-dsh-worktree-treeChildren {\n  margin-left: 16px;\n  padding: 2px 0 5px 12px;\n  border-left: 1px solid var(--dsw-alias-border-l1);\n}\n\n.-cerbur-clutch-dsh-worktree-groupLabel {\n  padding: 6px 8px 3px;\n  color: var(--dsw-alias-label-tertiary);\n  font-size: 10px;\n  font-weight: 600;\n  letter-spacing: 0.05em;\n  text-transform: uppercase;\n}\n\n.-cerbur-clutch-dsh-worktree-groupHeader {\n  display: flex;\n  align-items: center;\n  min-height: 34px;\n  padding-right: 4px;\n}\n\n.-cerbur-clutch-dsh-worktree-groupHeader .-cerbur-clutch-dsh-worktree-groupLabel {\n  flex: 1;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeGroup {\n  margin-top: 2px;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow {\n  min-height: 34px;\n}\n\n.-cerbur-clutch-dsh-worktree-worktreeRow .-cerbur-clutch-dsh-worktree-worktreeIcon,\n.-cerbur-clutch-dsh-worktree-worktreeRow .-cerbur-clutch-dsh-worktree-disclosureButton {\n  width: 22px;\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionRow {\n  position: relative;\n  display: flex;\n  align-items: center;\n  width: calc(100% - 22px);\n  margin-left: 22px;\n  min-width: 0;\n  min-height: 31px;\n  box-sizing: border-box;\n  border-radius: 7px;\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionRow:hover,\n.-cerbur-clutch-dsh-worktree-treeSessionRow[data-menu-open='true'] {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionRow[data-session-current='true'] {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionRow[data-session-current='true'] .-cerbur-clutch-dsh-worktree-treeSessionContent {\n  font-weight: 600;\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionRow.-cerbur-clutch-dsh-worktree-dropBefore::before,\n.-cerbur-clutch-dsh-worktree-treeSessionRow.-cerbur-clutch-dsh-worktree-dropAfter::after {\n  position: absolute;\n  right: 4px;\n  left: 4px;\n  height: 2px;\n  border-radius: 2px;\n  background: var(--dsw-alias-brand-primary);\n  content: '';\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionRow.-cerbur-clutch-dsh-worktree-dropBefore::before {\n  top: -1px;\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionRow.-cerbur-clutch-dsh-worktree-dropAfter::after {\n  bottom: -1px;\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionContent {\n  display: flex;\n  align-items: center;\n  flex: 1;\n  width: 0;\n  min-width: 0;\n  min-height: 31px;\n  box-sizing: border-box;\n  border: 0;\n  border-radius: 7px;\n  padding: 4px 4px;\n  background: transparent;\n  color: var(--dsw-alias-label-primary);\n  cursor: pointer;\n  font: inherit;\n  font-size: 14px;\n  font-weight: 400;\n  line-height: 20px;\n  text-align: left;\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionContent:hover {\n  background: transparent;\n}\n\n.-cerbur-clutch-dsh-worktree-rowActions {\n  display: none;\n  flex: none;\n  align-items: center;\n  gap: 4px;\n}\n\n.-cerbur-clutch-dsh-worktree-sessionOverflowButton {\n  display: block;\n  width: calc(100% - 24px);\n  margin: 2px 0 4px 24px;\n  padding: 4px 8px;\n  border: 0;\n  border-radius: 6px;\n  background: transparent;\n  color: var(--dsw-alias-label-secondary);\n  cursor: pointer;\n  font: inherit;\n  font-size: 12px;\n  font-weight: 400;\n  line-height: 20px;\n  text-align: left;\n}\n\n.-cerbur-clutch-dsh-worktree-sessionOverflowButton:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n  color: var(--dsw-alias-label-primary);\n}\n\n.-cerbur-clutch-dsh-worktree-treeSessionRow:hover .-cerbur-clutch-dsh-worktree-rowActions,\n.-cerbur-clutch-dsh-worktree-treeSessionRow[data-menu-open='true'] .-cerbur-clutch-dsh-worktree-rowActions {\n  display: inline-flex;\n}\n\n.-cerbur-clutch-dsh-worktree-renameInput {\n  width: 100%;\n}\n\n.-cerbur-clutch-dsh-worktree-renameError {\n  margin: 8px 0 0;\n  color: var(--dsw-alias-state-error-primary);\n  font-size: 13px;\n  line-height: 20px;\n}\n\n.-cerbur-clutch-dsh-worktree-emptyNested {\n  margin: 0;\n  padding: 4px 8px 5px 28px;\n  color: var(--dsw-alias-label-tertiary);\n  font-size: 11px;\n}\n\n.-cerbur-clutch-dsh-worktree-modalField {\n  display: grid;\n  gap: 5px;\n  color: var(--dsw-alias-label-secondary);\n  font-size: 12px;\n}\n";
 		const styleId = "@cerbur/clutch-dsh-worktree/worktree.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=\"@cerbur/clutch-dsh-worktree/worktree.css\"]") === null) {
 			const tag = document.createElement("style");
@@ -386,6 +414,11 @@ window.__ModuleLoader__.load({
 			"actionLabel": "-cerbur-clutch-dsh-worktree-actionLabel",
 			"surface": "-cerbur-clutch-dsh-worktree-surface",
 			"wideContent": "-cerbur-clutch-dsh-worktree-wideContent",
+			"worktreeModalTabs": "-cerbur-clutch-dsh-worktree-worktreeModalTabs",
+			"worktreeModalTab": "-cerbur-clutch-dsh-worktree-worktreeModalTab",
+			"worktreeImportCandidates": "-cerbur-clutch-dsh-worktree-worktreeImportCandidates",
+			"worktreeImportSelect": "-cerbur-clutch-dsh-worktree-worktreeImportSelect",
+			"worktreeImportError": "-cerbur-clutch-dsh-worktree-worktreeImportError",
 			"closeButton": "-cerbur-clutch-dsh-worktree-closeButton",
 			"header": "-cerbur-clutch-dsh-worktree-header",
 			"title": "-cerbur-clutch-dsh-worktree-title",
@@ -441,7 +474,6 @@ window.__ModuleLoader__.load({
 			"sessionOverflowButton": "-cerbur-clutch-dsh-worktree-sessionOverflowButton",
 			"renameInput": "-cerbur-clutch-dsh-worktree-renameInput",
 			"renameError": "-cerbur-clutch-dsh-worktree-renameError",
-			"treeGuide": "-cerbur-clutch-dsh-worktree-treeGuide",
 			"emptyNested": "-cerbur-clutch-dsh-worktree-emptyNested",
 			"modalField": "-cerbur-clutch-dsh-worktree-modalField"
 		};
@@ -512,7 +544,7 @@ window.__ModuleLoader__.load({
 		}
 		/**
 		* Browser-local Hero suffix. It intentionally uses the frame overlay because
-		* rc.8 exposes no additive slot beside the native Hero headline.
+		* The current upstream DSH exposes no additive slot beside the native Hero headline.
 		*/
 		function WorktreeHeroContext({ useWorktreeContext, t }) {
 			const state = useWorktreeContext((snapshot) => snapshot);
@@ -711,6 +743,84 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
+		//#region lib/client/worktree-expand-state.js
+		/** Browser-local storage identity; never sent to DSH or the plugin sidecar. */
+		const WORKTREE_EXPAND_STATE_STORAGE_KEY = "clutch-dsh-worktree.expand-state";
+		function emptyState() {
+			return {
+				collapsedWorkspaceIds: {},
+				collapsedMainWorkspaceIds: {},
+				collapsedWorktreeIds: {}
+			};
+		}
+		function isRecord(value) {
+			return typeof value === "object" && value !== null && !Array.isArray(value);
+		}
+		function normalizeIds(value) {
+			if (!isRecord(value)) return {};
+			return Object.fromEntries(Object.entries(value).filter(([id, collapsed]) => id.length > 0 && collapsed === true));
+		}
+		/** Turn any persisted JSON value into the current state shape. */
+		function normalizeWorktreeExpandState(value) {
+			const source = isRecord(value) ? value : {};
+			return {
+				collapsedWorkspaceIds: normalizeIds(source.collapsedWorkspaceIds),
+				collapsedMainWorkspaceIds: normalizeIds(source.collapsedMainWorkspaceIds),
+				collapsedWorktreeIds: normalizeIds(source.collapsedWorktreeIds)
+			};
+		}
+		function isWorkspaceExpanded(state, workspaceId) {
+			return state.collapsedWorkspaceIds[workspaceId] !== true;
+		}
+		function isMainExpanded(state, workspaceId) {
+			return state.collapsedMainWorkspaceIds[workspaceId] !== true;
+		}
+		function isWorktreeExpanded(state, worktreeId) {
+			return state.collapsedWorktreeIds[worktreeId] !== true;
+		}
+		function toggle(record, id) {
+			if (record[id] === true) delete record[id];
+			else record[id] = true;
+		}
+		function retain(record, ids) {
+			const allowed = new Set(ids);
+			for (const id of Object.keys(record)) if (!allowed.has(id)) delete record[id];
+		}
+		/** Create one apply-scoped store; component remounts share this instance. */
+		function createWorktreeExpandStateStore(snapshotStoreFactory) {
+			let store;
+			try {
+				store = snapshotStoreFactory(emptyState(), { persist: { name: WORKTREE_EXPAND_STATE_STORAGE_KEY } });
+			} catch {
+				store = snapshotStoreFactory(emptyState());
+			}
+			store.set(normalizeWorktreeExpandState(store.getSnapshot()));
+			return Object.assign(store, { actions: {
+				toggleWorkspace: (workspaceId) => {
+					store.update((draft) => {
+						toggle(draft.collapsedWorkspaceIds, workspaceId);
+					});
+				},
+				toggleMain: (workspaceId) => {
+					store.update((draft) => {
+						toggle(draft.collapsedMainWorkspaceIds, workspaceId);
+					});
+				},
+				toggleWorktree: (worktreeId) => {
+					store.update((draft) => {
+						toggle(draft.collapsedWorktreeIds, worktreeId);
+					});
+				},
+				retain: (workspaceIds, worktreeIds) => {
+					store.update((draft) => {
+						retain(draft.collapsedWorkspaceIds, workspaceIds);
+						retain(draft.collapsedMainWorkspaceIds, workspaceIds);
+						retain(draft.collapsedWorktreeIds, worktreeIds);
+					});
+				}
+			} });
+		}
+		//#endregion
 		//#region lib/client/view-mode.js
 		/** Browser-local storage key; it is never sent to DSH or the sidecar. */
 		const WORKTREE_VIEW_MODE_STORAGE_KEY = "clutch-dsh-worktree.view-mode";
@@ -787,6 +897,9 @@ window.__ModuleLoader__.load({
 				case "SESSION_CREATE_UNAVAILABLE": return t("error.sessionCreationUnavailable");
 				case "WORKTREE_CREATED_SESSION_UNAVAILABLE": return t("error.worktreeCreatedSessionUnavailable");
 				case "WORKTREE_RECORD_MISSING": return t("error.worktreeRecordMissing");
+				case "WORKTREE_IMPORT_INVALID": return t("error.worktreeImportInvalid");
+				case "WORKTREE_ALREADY_MANAGED": return t("error.worktreeAlreadyManaged");
+				case "WORKTREE_REGISTRATION_SESSION_UNAVAILABLE": return t("error.worktreeRegistrationSessionUnavailable");
 				case "WORKSPACE_RENAME_UNAVAILABLE": return t("error.workspaceRenameUnavailable");
 				case "WORKSPACE_DELETE_UNAVAILABLE": return t("error.workspaceDeleteUnavailable");
 				case "SESSION_RENAME_UNAVAILABLE": return t("error.sessionRenameUnavailable");
@@ -917,6 +1030,7 @@ window.__ModuleLoader__.load({
 		/** Keep mutation routing in the browser Consumer while leaving wire details to the adapter. */
 		async function executeWorktreeAction(manager, action) {
 			if (action.type === "createWorktree") return manager.createWorktree(action.input);
+			if (action.type === "importWorktree") return manager.importWorktree(action.input);
 			if (action.type === "removeWorktree") {
 				await manager.removeWorktree(action.input);
 				return;
@@ -943,6 +1057,14 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region lib/client/worktree-view-read.js
+		/** Merge one freshly read Workspace projection without clearing other ready views. */
+		function mergeWorktreeView(views, nextView) {
+			const index = views.findIndex((view) => view.workspaceId === nextView.workspaceId);
+			if (index === -1) return [...views, nextView];
+			const merged = [...views];
+			merged[index] = nextView;
+			return merged;
+		}
 		/** Reuse the previous ID snapshot when DSH republishes equivalent Workspace items. */
 		function stableWorkspaceIds(previous, next) {
 			if (previous.length !== next.length) return next;
@@ -1048,6 +1170,19 @@ window.__ModuleLoader__.load({
 				readiness: branchesResult.value.length > 0 ? { status: "ready" } : { status: "noLocalBranch" }
 			};
 		}
+		/** Isolate modal-target reads from full-surface refresh generations. */
+		function createWorktreeModalViewLoader() {
+			const guard = createWorktreeRefreshGuard();
+			return {
+				invalidate: guard.invalidate,
+				load(manager, workspaceId, onSuccess, onError) {
+					return guard.run(() => loadWorktreeView(manager, workspaceId), (data) => onSuccess({
+						workspaceId,
+						...data
+					}), (error) => onError(toWorktreeViewError(error)));
+				}
+			};
+		}
 		/** Load one independent projection per DSH Workspace for the flat sidebar hierarchy. */
 		async function loadWorktreeViews(manager, workspaceIds, options = {}) {
 			const views = await Promise.all(workspaceIds.map(async (workspaceId) => ({
@@ -1348,10 +1483,12 @@ window.__ModuleLoader__.load({
 				})
 			});
 		}
-		function WorktreeCreateDialog({ t, workspace, view, setupStatus, canCreate, selectedBranch, newBranch, actionPending, onClose, onSelectedBranchChange, onNewBranchChange, onSubmit }) {
+		function WorktreeCreateDialog({ t, workspace, view, readError, setupStatus, canCreate, mode, importCandidates, selectedImportPath, selectedBranch, newBranch, actionPending, onClose, onRetry, onModeChange, onRetryImportCandidates, onSelectedImportPathChange, onSelectedBranchChange, onNewBranchChange, onSubmit }) {
 			if (workspace === void 0) return null;
 			const setupCommands = setupStatus === void 0 ? [] : worktreeSetupCommands(setupStatus);
-			return (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
+			const importing = mode === "import";
+			const importBlocked = actionPending || importCandidates.status === "loading" || selectedImportPath === void 0;
+			return (0, react_jsx_runtime.jsxs)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
 				open: true,
 				onClose: () => {
 					if (actionPending) return;
@@ -1359,7 +1496,7 @@ window.__ModuleLoader__.load({
 				},
 				closeLabel: t("dialog.closeWorktreeCreate"),
 				title: t("worktree.createTitle"),
-				description: t("worktree.createDescription", { name: workspace.title }),
+				description: importing ? t("worktree.importDescription", { name: workspace.title }) : t("worktree.createDescription", { name: workspace.title }),
 				footer: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 					variant: "outline",
 					disabled: actionPending,
@@ -1367,13 +1504,104 @@ window.__ModuleLoader__.load({
 					children: t("dialog.cancel")
 				}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 					variant: "primary",
-					disabled: actionPending || selectedBranch.length === 0 || newBranch.trim().length === 0,
+					disabled: importing ? importBlocked : actionPending || !canCreate || selectedBranch.length === 0 || newBranch.trim().length === 0,
 					onClick: () => {
 						onSubmit();
 					},
-					children: t("worktree.create")
+					children: importing ? t("worktree.import") : t("worktree.create")
 				})] }),
-				children: canCreate ? (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsxs)("label", {
+				children: [(0, react_jsx_runtime.jsxs)("div", {
+					className: worktree_css_default.worktreeModalTabs,
+					role: "tablist",
+					"aria-label": t("worktree.title"),
+					children: [(0, react_jsx_runtime.jsx)("button", {
+						className: worktree_css_default.worktreeModalTab,
+						type: "button",
+						role: "tab",
+						"aria-selected": mode === "create",
+						disabled: actionPending,
+						onClick: () => {
+							onModeChange("create");
+						},
+						children: t("worktree.tabCreate")
+					}), (0, react_jsx_runtime.jsx)("button", {
+						className: worktree_css_default.worktreeModalTab,
+						type: "button",
+						role: "tab",
+						"aria-selected": mode === "import",
+						disabled: actionPending,
+						onClick: () => {
+							onModeChange("import");
+						},
+						children: t("worktree.tabImport")
+					})]
+				}), importing ? (0, react_jsx_runtime.jsxs)("div", {
+					className: worktree_css_default.worktreeImportCandidates,
+					role: "tabpanel",
+					children: [
+						importCandidates.status === "loading" && importCandidates.candidates.length === 0 && (0, react_jsx_runtime.jsx)("p", {
+							className: worktree_css_default.message,
+							children: t("worktree.importLoading")
+						}),
+						importCandidates.status === "error" && (0, react_jsx_runtime.jsxs)("div", {
+							className: worktree_css_default.worktreeImportError,
+							role: "alert",
+							children: [(0, react_jsx_runtime.jsx)("p", {
+								className: worktree_css_default.message,
+								children: formatWorktreeViewError(importCandidates.error, t)
+							}), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+								variant: "outline",
+								disabled: actionPending,
+								onClick: onRetryImportCandidates,
+								children: t("action.retry")
+							})]
+						}),
+						importCandidates.candidates.length === 0 && importCandidates.status === "ready" && (0, react_jsx_runtime.jsx)("p", {
+							className: worktree_css_default.message,
+							children: t("worktree.importEmpty")
+						}),
+						importCandidates.candidates.length > 0 && (0, react_jsx_runtime.jsxs)("label", {
+							className: worktree_css_default.modalField,
+							children: [t("worktree.tabImport"), (0, react_jsx_runtime.jsxs)("select", {
+								className: worktree_css_default.worktreeImportSelect,
+								"data-worktree-import-select": true,
+								"aria-label": t("worktree.tabImport"),
+								value: selectedImportPath ?? "",
+								disabled: actionPending,
+								onChange: (event) => {
+									onSelectedImportPathChange(event.currentTarget.value);
+								},
+								children: [(0, react_jsx_runtime.jsx)("option", {
+									value: "",
+									disabled: true,
+									children: t("worktree.importPlaceholder")
+								}), importCandidates.candidates.map((candidate) => (0, react_jsx_runtime.jsxs)("option", {
+									value: candidate.absolutePath,
+									children: [
+										candidate.branch,
+										" — ",
+										candidate.absolutePath
+									]
+								}, candidate.absolutePath))]
+							})]
+						})
+					]
+				}) : readError !== void 0 ? (0, react_jsx_runtime.jsxs)("div", {
+					className: worktree_css_default.gitReadiness,
+					"data-worktree-readiness": "error",
+					role: "alert",
+					children: [(0, react_jsx_runtime.jsx)("p", {
+						className: worktree_css_default.message,
+						"data-error": "true",
+						children: formatWorktreeViewError(readError, t)
+					}), readError.retryable && onRetry !== void 0 && (0, react_jsx_runtime.jsx)("button", {
+						type: "button",
+						className: worktree_css_default.retryButton,
+						disabled: actionPending,
+						onClick: onRetry,
+						children: t("action.retry")
+					})]
+				}) : canCreate ? (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsxs)("label", {
 					className: worktree_css_default.modalField,
 					children: [t("worktree.baseBranch"), (0, react_jsx_runtime.jsx)("select", {
 						className: worktree_css_default.actionSelect,
@@ -1416,7 +1644,7 @@ window.__ModuleLoader__.load({
 						"aria-label": t("worktree.setup.commands"),
 						children: setupCommands.join("\n")
 					})]
-				})
+				})]
 			});
 		}
 		function WorktreeRemovalDialog({ t, worktree, actionPending, onClose, onSubmit }) {
@@ -1429,7 +1657,7 @@ window.__ModuleLoader__.load({
 				},
 				closeLabel: t("dialog.closeWorktreeRemove"),
 				title: t("worktree.remove"),
-				description: t("worktree.removeDescription", { name: worktree.branch }),
+				description: worktree.source === "external" ? t("worktree.removeExternalDescription", { name: worktree.branch }) : t("worktree.removeDescription", { name: worktree.branch }),
 				footer: (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 					variant: "outline",
 					disabled: actionPending,
@@ -1453,6 +1681,17 @@ window.__ModuleLoader__.load({
 		function bindingIdsFor(bindings, worktreeId) {
 			return bindings.filter((binding) => binding.worktreeId === worktreeId).map((binding) => binding.sessionId);
 		}
+		function clearSessionGroupExpansion(current, groupKeys) {
+			const next = { ...current };
+			for (const key of groupKeys) delete next[key];
+			return next;
+		}
+		function isCompleteWorktreeWorkspaceSnapshot(workspaceIds, views) {
+			if (views.length !== workspaceIds.length) return false;
+			const expected = new Set(workspaceIds);
+			const actual = new Set(views.map((view) => view.workspaceId));
+			return actual.size === expected.size && [...expected].every((id) => actual.has(id));
+		}
 		function includesText(value, query) {
 			return value.toLocaleLowerCase().includes(query);
 		}
@@ -1464,6 +1703,46 @@ window.__ModuleLoader__.load({
 			if (view.worktrees.some((record) => includesText(record.branch, query) || includesText(record.absolutePath, query))) return true;
 			return view.bindings.some((binding) => sessionMatchesQuery(binding.sessionId, sessions, query));
 		}
+		function resolveCurrentSessionLocation(currentSessionId, workspaces, views) {
+			if (currentSessionId === void 0) return void 0;
+			const workspace = workspaces.find((candidate) => candidate.sessionIds.includes(currentSessionId));
+			if (workspace === void 0) return void 0;
+			const view = views.find((candidate) => candidate.workspaceId === workspace.workspaceId);
+			if (view === void 0) return void 0;
+			const binding = view.bindings.find((candidate) => candidate.sessionId === currentSessionId);
+			if (binding === void 0) return {
+				sessionId: currentSessionId,
+				workspaceId: workspace.workspaceId,
+				groupKey: "main:" + workspace.workspaceId,
+				kind: "main"
+			};
+			const worktree = view.worktrees.find((candidate) => candidate.worktreeId === binding.worktreeId && candidate.workspaceId === workspace.workspaceId);
+			if (worktree === void 0) return void 0;
+			return {
+				sessionId: currentSessionId,
+				workspaceId: workspace.workspaceId,
+				groupKey: "worktree:" + worktree.worktreeId,
+				kind: "worktree",
+				worktreeId: worktree.worktreeId
+			};
+		}
+		function currentSessionRevealKeys(location) {
+			if (location === void 0) return [];
+			return [
+				"workspace:" + location.workspaceId,
+				location.kind === "main" ? "main:" + location.workspaceId : "worktree:" + location.worktreeId,
+				"session-group:" + location.groupKey
+			];
+		}
+		//#endregion
+		//#region lib/client/worktree-session-position.js
+		function scrollCurrentSessionIntoView(root, sessionId) {
+			if (root === null) return false;
+			const row = Array.from(root.querySelectorAll("[data-session-id]")).find((candidate) => candidate.dataset.sessionId === sessionId);
+			if (row === void 0) return false;
+			row.scrollIntoView({ block: "nearest" });
+			return true;
+		}
 		//#endregion
 		//#region lib/client/worktree-surface-rows.js
 		function rowHalf(event) {
@@ -1696,7 +1975,7 @@ window.__ModuleLoader__.load({
 			});
 		}
 		/** Worktree-mode Session row with the same trailing options menu as native DSH rows. */
-		function WorktreeSessionRow({ t, sessionId, blank, label, drag, actionPending, onOpen, onRename, onFork, onArchive }) {
+		function WorktreeSessionRow({ t, sessionId, blank, current, label, drag, actionPending, onOpen, onRename, onFork, onArchive }) {
 			const [menuOpen, setMenuOpen] = (0, react.useState)(false);
 			const markerClass = drag.marker === "before" ? worktree_css_default.dropBefore : drag.marker === "after" ? worktree_css_default.dropAfter : "";
 			const sessionMenuItems = [
@@ -1723,9 +2002,11 @@ window.__ModuleLoader__.load({
 				className: `${worktree_css_default.treeSessionRow} ${markerClass}`,
 				"data-session-id": sessionId,
 				"data-session-blank": blank ? "true" : void 0,
+				"data-session-current": current ? "true" : void 0,
 				"data-session-drag": drag.active ? "active" : void 0,
 				"data-menu-open": menuOpen || void 0,
 				role: "treeitem",
+				"aria-current": current ? "true" : void 0,
 				draggable: true,
 				onDragStart: (event) => {
 					event.dataTransfer.effectAllowed = "move";
@@ -1744,18 +2025,14 @@ window.__ModuleLoader__.load({
 					event.preventDefault();
 					drag.drop(rowHalf(event));
 				},
-				children: [(0, react_jsx_runtime.jsxs)("button", {
+				children: [(0, react_jsx_runtime.jsx)("button", {
 					type: "button",
 					className: worktree_css_default.treeSessionContent,
 					onClick: onOpen,
-					children: [(0, react_jsx_runtime.jsx)("span", {
-						className: worktree_css_default.treeGuide,
-						"aria-hidden": "true",
-						children: "└"
-					}), (0, react_jsx_runtime.jsx)("span", {
+					children: (0, react_jsx_runtime.jsx)("span", {
 						className: worktree_css_default.sessionLabel,
 						children: label
-					})]
+					})
 				}), !blank && (0, react_jsx_runtime.jsx)("span", {
 					className: worktree_css_default.rowActions,
 					children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Menu, {
@@ -1787,13 +2064,14 @@ window.__ModuleLoader__.load({
 				})]
 			});
 		}
-		function WorktreeSessionGroup({ t, groupKey, sessionIds, workspaceId, expanded, actionPending, sessions, dragState, onToggleExpanded, onStartDrag, onHoverDrag, onClearDrag, onFinishDrag, onCommitDrag, onOpen, onRename, onFork, onArchive }) {
+		function WorktreeSessionGroup({ t, groupKey, sessionIds, workspaceId, currentSessionId, expanded, actionPending, sessions, dragState, onToggleExpanded, onStartDrag, onHoverDrag, onClearDrag, onFinishDrag, onCommitDrag, onOpen, onRename, onFork, onArchive }) {
 			const visibleSessionIds = expanded ? sessionIds : sessionIds.slice(0, 5);
 			const sameGroupDrag = dragState?.groupKey === groupKey;
 			return (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [visibleSessionIds.map((sessionId) => (0, react_jsx_runtime.jsx)(WorktreeSessionRow, {
 				t,
 				sessionId,
 				blank: isBlankSession(sessionId, sessions),
+				current: sessionId === currentSessionId,
 				label: sessionLabel(sessionId, sessions, t),
 				drag: {
 					active: sameGroupDrag,
@@ -1857,19 +2135,31 @@ window.__ModuleLoader__.load({
 		* Peer Worktree navigation surface. It keeps the original DSH Workspace mode
 		* intact and renders a browser-local Workspace → Worktree → Session projection.
 		*/
-		function WorktreeSurface({ useStore, actions, useSessions, useWorkspaces, t, available, manager, invalidateWorktreeContext, createWorkspace, createSessionForWorktree: createSessionCallback, createMainSession, renameWorkspace, deleteWorkspace, insertWorkspaceBefore, insertSessionBefore, insertWorktreeBefore, renameSession, forkSession, archiveSession, ensureSessionWorkspace, syncSessionWorkspaces, openSession }) {
+		function WorktreeSurface({ useStore, actions, useSessions, useWorkspaces, t, available, expandState, manager, invalidateWorktreeContext, createWorkspace, createSessionForWorktree: createSessionCallback, createMainSession, renameWorkspace, deleteWorkspace, insertWorkspaceBefore, insertSessionBefore, insertWorktreeBefore, renameSession, forkSession, archiveSession, ensureSessionWorkspace, syncSessionWorkspaces, openSession }) {
 			const mode = effectiveViewMode(useStore((state) => state.viewMode), available && manager !== void 0);
 			const sessions = useSessions((state) => state);
 			const workspaces = useWorkspaces((state) => state);
+			const currentSessionId = sessions.current;
 			const workspaceIds = useStableWorkspaceIds(workspaces.items);
 			const [readState, setReadState] = (0, react.useState)(EMPTY_READ_STATE);
+			const expandSnapshot = (0, react.useSyncExternalStore)(expandState.subscribe, expandState.getSnapshot, expandState.getSnapshot);
 			const readStateRef = (0, react.useRef)(readState);
 			readStateRef.current = readState;
 			const [searchQuery, setSearchQuery] = (0, react.useState)("");
-			const [expandedWorkspaces, setExpandedWorkspaces] = (0, react.useState)({});
-			const [expandedMains, setExpandedMains] = (0, react.useState)({});
-			const [expandedWorktrees, setExpandedWorktrees] = (0, react.useState)({});
+			const [currentSessionReveal, setCurrentSessionReveal] = (0, react.useState)();
+			const searchQueryRef = (0, react.useRef)(searchQuery);
+			searchQueryRef.current = searchQuery;
+			const locateGenerationRef = (0, react.useRef)(0);
+			const positionedLocateGenerationRef = (0, react.useRef)();
 			const [worktreeModalWorkspaceId, setWorktreeModalWorkspaceId] = (0, react.useState)();
+			const [modalReadError, setModalReadError] = (0, react.useState)();
+			const [modalReadLoading, setModalReadLoading] = (0, react.useState)(false);
+			const [worktreeModalMode, setWorktreeModalMode] = (0, react.useState)("create");
+			const [importCandidates, setImportCandidates] = (0, react.useState)({
+				status: "idle",
+				candidates: []
+			});
+			const [selectedImportPath, setSelectedImportPath] = (0, react.useState)();
 			const [openWorkspaceMenuId, setOpenWorkspaceMenuId] = (0, react.useState)();
 			const [openWorktreeMenuId, setOpenWorktreeMenuId] = (0, react.useState)();
 			const [worktreeRemoval, setWorktreeRemoval] = (0, react.useState)();
@@ -1897,6 +2187,11 @@ window.__ModuleLoader__.load({
 			const [worktreeDrag, setWorktreeDrag] = (0, react.useState)();
 			const worktreeDropCommitted = (0, react.useRef)(false);
 			const refreshGuard = (0, react.useRef)(createWorktreeRefreshGuard());
+			const modalReadLoader = (0, react.useRef)(createWorktreeModalViewLoader());
+			const modalReadViewRef = (0, react.useRef)();
+			const importCandidatesGuard = (0, react.useRef)(createWorktreeRefreshGuard());
+			const modalWorkspaceIdRef = (0, react.useRef)(worktreeModalWorkspaceId);
+			modalWorkspaceIdRef.current = worktreeModalWorkspaceId;
 			const { ref, width, bounds } = useSidebarOverlayGeometry(mode === "worktree");
 			const collapsed = width <= 64;
 			const query = searchQuery.trim().toLocaleLowerCase();
@@ -1919,13 +2214,13 @@ window.__ModuleLoader__.load({
 				}), (views) => {
 					setReadState({
 						status: "ready",
-						views
+						views: modalReadViewRef.current === void 0 ? views : mergeWorktreeView(views, modalReadViewRef.current)
 					});
 				}, (error) => {
 					if (preserveCurrent) throw error;
 					setReadState({
 						status: "error",
-						views: [],
+						views: modalReadViewRef.current === void 0 ? [] : [modalReadViewRef.current],
 						error: toWorktreeViewError(error)
 					});
 				});
@@ -1934,10 +2229,39 @@ window.__ModuleLoader__.load({
 				manager,
 				workspaceIds
 			]);
+			const loadModalWorktreeView = (0, react.useCallback)((workspaceId) => {
+				setModalReadError(void 0);
+				setModalReadLoading(true);
+				if (manager === void 0) {
+					setModalReadLoading(false);
+					setModalReadError({
+						code: "WORKTREE_VIEW_UNAVAILABLE",
+						message: "",
+						retryable: true
+					});
+					return;
+				}
+				modalReadLoader.current.load(manager, workspaceId, (view) => {
+					modalReadViewRef.current = view;
+					setModalReadLoading(false);
+					setReadState((current) => ({
+						...current,
+						views: mergeWorktreeView(current.views, view)
+					}));
+				}, (error) => {
+					setModalReadLoading(false);
+					setModalReadError(toWorktreeViewError(error));
+				});
+			}, [manager]);
 			(0, react.useEffect)(() => {
 				if (mode === "worktree") refresh({ preserveCurrent: readStateRef.current.status === "ready" });
 				else {
 					refreshGuard.current.invalidate();
+					modalReadLoader.current.invalidate();
+					modalReadViewRef.current = void 0;
+					setWorktreeModalWorkspaceId(void 0);
+					setModalReadError(void 0);
+					setModalReadLoading(false);
 					setReadState(EMPTY_READ_STATE);
 				}
 			}, [mode, refresh]);
@@ -1953,18 +2277,76 @@ window.__ModuleLoader__.load({
 				syncSessionWorkspaces
 			]);
 			const viewByWorkspace = (0, react.useMemo)(() => new Map(readState.views.map((view) => [view.workspaceId, view])), [readState.views]);
+			const currentSessionLocation = (0, react.useMemo)(() => readState.status === "ready" ? resolveCurrentSessionLocation(currentSessionId, workspaces.items, readState.views) : void 0, [
+				currentSessionId,
+				readState.status,
+				readState.views,
+				workspaces.items
+			]);
+			const currentRevealKeys = (0, react.useMemo)(() => new Set(currentSessionRevealKeys(currentSessionLocation)), [currentSessionLocation]);
+			const isCurrentSessionReveal = (key) => currentSessionReveal !== void 0 && currentSessionReveal.sessionId === currentSessionId && currentRevealKeys.has(key) && currentSessionReveal.suppressedKeys[key] !== true;
+			(0, react.useLayoutEffect)(() => {
+				locateGenerationRef.current += 1;
+				positionedLocateGenerationRef.current = void 0;
+				if (mode !== "worktree") {
+					setCurrentSessionReveal(void 0);
+					return;
+				}
+				if (searchQueryRef.current.trim().length > 0) setSearchQuery("");
+				setCurrentSessionReveal(currentSessionId === void 0 ? void 0 : {
+					sessionId: currentSessionId,
+					suppressedKeys: {}
+				});
+			}, [currentSessionId, mode]);
+			(0, react.useLayoutEffect)(() => {
+				if (mode !== "worktree" || currentSessionId === void 0 || currentSessionLocation === void 0) return;
+				const generation = locateGenerationRef.current;
+				if (positionedLocateGenerationRef.current === generation) return;
+				let cancelled = false;
+				const frame = requestAnimationFrame(() => {
+					if (cancelled || generation !== locateGenerationRef.current) return;
+					if (!scrollCurrentSessionIntoView(ref.current, currentSessionId)) return;
+					positionedLocateGenerationRef.current = generation;
+				});
+				return () => {
+					cancelled = true;
+					cancelAnimationFrame(frame);
+				};
+			}, [
+				currentSessionId,
+				currentSessionLocation,
+				currentSessionReveal,
+				expandSnapshot,
+				mode,
+				query,
+				readState.status
+			]);
+			(0, react.useEffect)(() => {
+				if (readState.status !== "ready" || !isCompleteWorktreeWorkspaceSnapshot(workspaceIds, readState.views)) return;
+				expandState.actions.retain(workspaceIds, readState.views.flatMap((view) => view.worktrees.map((record) => record.worktreeId)));
+			}, [
+				expandState,
+				readState.status,
+				readState.views,
+				workspaceIds
+			]);
 			const modalWorkspace = workspaces.items.find((workspace) => workspace.workspaceId === worktreeModalWorkspaceId);
 			const modalView = worktreeModalWorkspaceId === void 0 ? void 0 : viewByWorkspace.get(worktreeModalWorkspaceId);
 			const modalReadiness = modalView?.readiness;
 			const modalSetupStatus = modalView === void 0 ? void 0 : modalReadiness?.status === "ready" ? modalView.branches.length === 0 ? "noLocalBranch" : void 0 : modalReadiness?.status;
-			const modalCanCreate = modalSetupStatus === void 0 && modalReadiness?.status === "ready";
+			const modalCanCreate = !modalReadLoading && modalSetupStatus === void 0 && modalReadiness?.status === "ready";
 			(0, react.useEffect)(() => {
 				if (worktreeModalWorkspaceId === void 0 || modalView === void 0) return;
 				if (modalView.readiness.status !== "ready") {
 					setSelectedBranch("");
+					setNewBranch("");
 					return;
 				}
 				setSelectedBranch((current) => reconcileBaseBranchSelection(current, modalView.branches));
+				setNewBranch((current) => {
+					if (current.length > 0) return current;
+					return createDefaultWorktreeName([...modalView.branches.map((branch) => branch.name), ...modalView.worktrees.map((worktree) => worktree.branch)]);
+				});
 			}, [modalView, worktreeModalWorkspaceId]);
 			const runMutation = async (operation) => {
 				setActionPending(true);
@@ -1978,6 +2360,27 @@ window.__ModuleLoader__.load({
 					setActionPending(false);
 				}
 			};
+			const loadImportCandidates = (0, react.useCallback)(async (workspaceId) => {
+				if (manager === void 0) return;
+				setImportCandidates((current) => ({
+					status: "loading",
+					candidates: current.candidates
+				}));
+				await importCandidatesGuard.current.run(() => manager.listImportCandidates({ workspaceId }), (candidates) => {
+					if (modalWorkspaceIdRef.current !== workspaceId) return;
+					setImportCandidates({
+						status: "ready",
+						candidates
+					});
+				}, (error) => {
+					if (modalWorkspaceIdRef.current !== workspaceId) return;
+					setImportCandidates((current) => ({
+						status: "error",
+						candidates: current.candidates,
+						error: toWorktreeViewError(error)
+					}));
+				});
+			}, [manager]);
 			const workspaceRenameTrimmed = workspaceRenameDraft.trim();
 			const workspaceRenameDuplicate = workspaceRenameTarget !== void 0 && workspaceRenameTrimmed.length > 0 && workspaces.items.some((workspace) => workspace.workspaceId !== workspaceRenameTarget.workspaceId && workspace.title === workspaceRenameTrimmed);
 			const workspaceRenameBlocked = workspaceRenamePending || workspaceRenameTarget === void 0 || workspaceRenameTrimmed.length === 0 || workspaceRenameTrimmed === workspaceRenameTarget?.currentTitle || workspaceRenameDuplicate;
@@ -2160,80 +2563,172 @@ window.__ModuleLoader__.load({
 				if (archiveSession === void 0) return;
 				await runMutation(() => archiveSession(sessionId));
 			};
+			const clearSessionGroups = (groupKeys) => {
+				if (groupKeys.length === 0) return;
+				setExpandedSessionGroups((current) => clearSessionGroupExpansion(current, groupKeys));
+			};
+			const suppressCurrentSessionReveal = (key) => {
+				if (!isCurrentSessionReveal(key)) return false;
+				setCurrentSessionReveal((current) => {
+					if (current === void 0 || current.sessionId !== currentSessionId) return current;
+					return {
+						...current,
+						suppressedKeys: {
+							...current.suppressedKeys,
+							[key]: true
+						}
+					};
+				});
+				return true;
+			};
 			const toggleWorkspace = (workspaceId) => {
-				setExpandedWorkspaces((current) => ({
-					...current,
-					[workspaceId]: current[workspaceId] === false
-				}));
+				const persistedExpanded = isWorkspaceExpanded(expandSnapshot, workspaceId);
+				const autoExpanded = isCurrentSessionReveal("workspace:" + workspaceId);
+				const visuallyExpanded = persistedExpanded || autoExpanded;
+				if (visuallyExpanded && autoExpanded) suppressCurrentSessionReveal("workspace:" + workspaceId);
+				if (visuallyExpanded && !persistedExpanded) {
+					clearSessionGroups(["main:" + workspaceId, ...(viewByWorkspace.get(workspaceId)?.worktrees.map((record) => record.worktreeId) ?? []).map((worktreeId) => "worktree:" + worktreeId)]);
+					return;
+				}
+				expandState.actions.toggleWorkspace(workspaceId);
+				if (visuallyExpanded) clearSessionGroups(["main:" + workspaceId, ...(viewByWorkspace.get(workspaceId)?.worktrees.map((record) => record.worktreeId) ?? []).map((worktreeId) => "worktree:" + worktreeId)]);
 			};
 			const toggleMain = (workspaceId) => {
-				setExpandedMains((current) => ({
-					...current,
-					[workspaceId]: current[workspaceId] === false
-				}));
+				const persistedExpanded = isMainExpanded(expandSnapshot, workspaceId);
+				const autoExpanded = isCurrentSessionReveal("main:" + workspaceId);
+				const visuallyExpanded = persistedExpanded || autoExpanded;
+				if (visuallyExpanded && autoExpanded) suppressCurrentSessionReveal("main:" + workspaceId);
+				if (visuallyExpanded && !persistedExpanded) {
+					clearSessionGroups(["main:" + workspaceId]);
+					return;
+				}
+				expandState.actions.toggleMain(workspaceId);
+				if (visuallyExpanded) clearSessionGroups(["main:" + workspaceId]);
 			};
 			const toggleWorktree = (worktreeId) => {
-				setExpandedWorktrees((current) => ({
+				const persistedExpanded = isWorktreeExpanded(expandSnapshot, worktreeId);
+				const autoExpanded = isCurrentSessionReveal("worktree:" + worktreeId);
+				const visuallyExpanded = persistedExpanded || autoExpanded;
+				if (visuallyExpanded && autoExpanded) suppressCurrentSessionReveal("worktree:" + worktreeId);
+				if (visuallyExpanded && !persistedExpanded) {
+					clearSessionGroups(["worktree:" + worktreeId]);
+					return;
+				}
+				expandState.actions.toggleWorktree(worktreeId);
+				if (visuallyExpanded) clearSessionGroups(["worktree:" + worktreeId]);
+			};
+			const toggleSessionGroup = (groupKey) => {
+				const autoExpanded = isCurrentSessionReveal("session-group:" + groupKey);
+				const transientExpanded = expandedSessionGroups[groupKey] === true;
+				if (autoExpanded) {
+					suppressCurrentSessionReveal("session-group:" + groupKey);
+					setExpandedSessionGroups((current) => {
+						const next = { ...current };
+						delete next[groupKey];
+						return next;
+					});
+					return;
+				}
+				setExpandedSessionGroups((current) => ({
 					...current,
-					[worktreeId]: current[worktreeId] === false
+					[groupKey]: !transientExpanded
 				}));
 			};
+			const closeWorktreeCreator = (force = false) => {
+				if (actionPending && !force) return;
+				modalReadLoader.current.invalidate();
+				modalReadViewRef.current = void 0;
+				importCandidatesGuard.current.invalidate();
+				setWorktreeModalWorkspaceId(void 0);
+				setModalReadError(void 0);
+				setModalReadLoading(false);
+			};
 			const openWorktreeCreator = (workspace) => {
 				const view = viewByWorkspace.get(workspace.workspaceId);
-				const baseBranch = selectDefaultBaseBranch(view?.branches ?? []);
-				const existingNames = [...(view?.branches ?? []).map((branch) => branch.name), ...(view?.worktrees ?? []).map((worktree) => worktree.branch)];
+				modalReadLoader.current.invalidate();
+				modalReadViewRef.current = void 0;
+				importCandidatesGuard.current.invalidate();
 				setWorktreeModalWorkspaceId(workspace.workspaceId);
-				setSelectedBranch(baseBranch);
-				setNewBranch(createDefaultWorktreeName(existingNames));
+				setWorktreeModalMode("create");
+				setImportCandidates({
+					status: "idle",
+					candidates: []
+				});
+				setSelectedImportPath(void 0);
 				setActionError(void 0);
+				setModalReadError(void 0);
+				setModalReadLoading(false);
+				if (view === void 0) {
+					setSelectedBranch("");
+					setNewBranch("");
+					loadModalWorktreeView(workspace.workspaceId);
+					return;
+				}
+				setSelectedBranch(selectDefaultBaseBranch(view.branches));
+				setNewBranch(createDefaultWorktreeName([...view.branches.map((branch) => branch.name), ...view.worktrees.map((worktree) => worktree.branch)]));
+			};
+			const changeWorktreeModalMode = (mode) => {
+				setWorktreeModalMode(mode);
+				if (mode === "import" && worktreeModalWorkspaceId !== void 0 && importCandidates.status === "idle") loadImportCandidates(worktreeModalWorkspaceId);
+			};
+			const continueWorktreeRegistration = async (registeredWorktree) => {
+				closeWorktreeCreator(true);
+				if (createSessionCallback === void 0) {
+					await refresh({ preserveCurrent: true });
+					setActionError({
+						code: "WORKTREE_REGISTRATION_SESSION_UNAVAILABLE",
+						message: "",
+						retryable: true
+					});
+					return;
+				}
+				const sessionInput = {
+					workspaceId: registeredWorktree.workspaceId,
+					worktreeId: registeredWorktree.worktreeId,
+					cwd: registeredWorktree.absolutePath
+				};
+				try {
+					await createSessionCallback(sessionInput);
+					await invalidateWorktreeContext?.(registeredWorktree.workspaceId);
+				} catch (error) {
+					if (error instanceof WorktreeSessionBindingError && error.retryable) setPendingSessionBinding({
+						...sessionInput,
+						sessionId: error.sessionId
+					});
+					throw error;
+				}
+				await refresh({ preserveCurrent: true });
 			};
 			const submitWorktree = async () => {
 				const worktreeName = newBranch.trim();
-				if (manager === void 0 || modalWorkspace === void 0 || !modalCanCreate || selectedBranch.length === 0 || worktreeName.length === 0) return;
-				const input = {
-					workspaceId: modalWorkspace.workspaceId,
-					branch: selectedBranch,
-					newBranch: worktreeName
-				};
+				const selectedImportCandidate = importCandidates.candidates.find((candidate) => candidate.absolutePath === selectedImportPath);
+				if (manager === void 0 || modalWorkspace === void 0) return;
+				if (worktreeModalMode === "create" && (!modalCanCreate || selectedBranch.length === 0 || worktreeName.length === 0)) return;
+				if (worktreeModalMode === "import" && selectedImportCandidate === void 0) return;
 				setActionPending(true);
 				setActionError(void 0);
 				setPendingSessionBinding(void 0);
 				try {
-					const createdWorktree = await executeWorktreeAction(manager, {
+					const registeredWorktree = worktreeModalMode === "create" ? await executeWorktreeAction(manager, {
 						type: "createWorktree",
-						input
+						input: {
+							workspaceId: modalWorkspace.workspaceId,
+							branch: selectedBranch,
+							newBranch: worktreeName
+						}
+					}) : await executeWorktreeAction(manager, {
+						type: "importWorktree",
+						input: {
+							workspaceId: modalWorkspace.workspaceId,
+							absolutePath: selectedImportCandidate.absolutePath
+						}
 					});
-					if (createdWorktree === void 0) throw {
+					if (registeredWorktree === void 0) throw {
 						code: "WORKTREE_RECORD_MISSING",
 						message: "",
 						retryable: true
 					};
-					setWorktreeModalWorkspaceId(void 0);
-					if (createSessionCallback === void 0) {
-						await refresh({ preserveCurrent: true });
-						setActionError({
-							code: "WORKTREE_CREATED_SESSION_UNAVAILABLE",
-							message: "",
-							retryable: true
-						});
-						return;
-					}
-					const sessionInput = {
-						workspaceId: createdWorktree.workspaceId,
-						worktreeId: createdWorktree.worktreeId,
-						cwd: createdWorktree.absolutePath
-					};
-					try {
-						await createSessionCallback(sessionInput);
-						await invalidateWorktreeContext?.(createdWorktree.workspaceId);
-					} catch (error) {
-						if (error instanceof WorktreeSessionBindingError && error.retryable) setPendingSessionBinding({
-							...sessionInput,
-							sessionId: error.sessionId
-						});
-						throw error;
-					}
-					await refresh({ preserveCurrent: true });
+					await continueWorktreeRegistration(registeredWorktree);
 				} catch (error) {
 					setActionError(toWorktreeViewError(error));
 				} finally {
@@ -2437,13 +2932,15 @@ window.__ModuleLoader__.load({
 											const view = viewByWorkspace.get(workspace.workspaceId);
 											const currentBranch = view?.branches.find((branch) => branch.isCurrent)?.name;
 											const mainLabel = currentBranch === void 0 ? t("worktree.main") : t("worktree.mainWithBranch", { branch: currentBranch });
-											const expanded = expandedWorkspaces[workspace.workspaceId] !== false;
+											const expanded = isWorkspaceExpanded(expandSnapshot, workspace.workspaceId) || isCurrentSessionReveal("workspace:" + workspace.workspaceId);
 											const workspaceMatchesQuery = includesText(workspace.title, query);
 											const allWorkspaceSessionIds = filterArchivedSessionIds(workspaceSessionIds(workspaces, workspace.workspaceId, sessions.ids), archivedSessionIds);
 											const bindings = view?.bindings ?? [];
 											const visibleMainSessionIds = filterVisibleSessionIds(unboundSessionIds(allWorkspaceSessionIds, [...new Set(bindings.map((binding) => binding.sessionId))]), sessions).filter((sessionId) => workspaceMatchesQuery || sessionMatchesQuery(sessionId, sessions, query));
-											const mainExpanded = expandedMains[workspace.workspaceId] !== false;
+											const mainExpanded = isMainExpanded(expandSnapshot, workspace.workspaceId) || isCurrentSessionReveal("main:" + workspace.workspaceId);
 											const mainGroupKey = `main:${workspace.workspaceId}`;
+											const sessionIds = visibleMainSessionIds;
+											const mainSessionGroupExpanded = expandedSessionGroups[mainGroupKey] === true || sessionIds.length > 5 && isCurrentSessionReveal("session-group:" + mainGroupKey);
 											const worktrees = view?.worktrees ?? [];
 											const sameWorkspaceWorktreeDrag = worktreeDrag?.workspaceId === workspace.workspaceId;
 											return (0, react_jsx_runtime.jsxs)("section", {
@@ -2522,17 +3019,15 @@ window.__ModuleLoader__.load({
 														mainExpanded && (0, react_jsx_runtime.jsx)(WorktreeSessionGroup, {
 															t,
 															groupKey: mainGroupKey,
-															sessionIds: visibleMainSessionIds,
+															sessionIds,
 															workspaceId: workspace.workspaceId,
-															expanded: expandedSessionGroups[mainGroupKey] === true,
+															currentSessionId,
+															expanded: mainSessionGroupExpanded,
 															actionPending,
 															sessions,
 															dragState: sessionDrag,
 															onToggleExpanded: () => {
-																setExpandedSessionGroups((current) => ({
-																	...current,
-																	[mainGroupKey]: current[mainGroupKey] !== true
-																}));
+																toggleSessionGroup(mainGroupKey);
 															},
 															onStartDrag: (groupKey, sessionId) => {
 																sessionDropCommitted.current = false;
@@ -2575,9 +3070,11 @@ window.__ModuleLoader__.load({
 															if (query.length > 0 && !worktreeMatchesQuery && !worktreeSessionIds.some((sessionId) => sessionMatchesQuery(sessionId, sessions, query))) return null;
 															const visibleWorktreeSessionIds = worktreeSessionIds.filter((sessionId) => worktreeMatchesQuery || sessionMatchesQuery(sessionId, sessions, query));
 															const worktreeGroupKey = `worktree:${record.worktreeId}`;
+															const sessionIds = visibleWorktreeSessionIds;
+															const sessionGroupExpanded = expandedSessionGroups[worktreeGroupKey] === true || sessionIds.length > 5 && isCurrentSessionReveal("session-group:" + worktreeGroupKey);
 															const state = record.status === "removed" ? "warning" : record.health === "repair" ? "error" : "done";
 															const stateLabel = record.status === "removed" ? t("worktree.detached") : record.health === "repair" ? t("worktree.repair") : t("worktree.ready");
-															const worktreeExpanded = expandedWorktrees[record.worktreeId] !== false;
+															const worktreeExpanded = isWorktreeExpanded(expandSnapshot, record.worktreeId) || isCurrentSessionReveal("worktree:" + record.worktreeId);
 															return (0, react_jsx_runtime.jsxs)("div", {
 																className: worktree_css_default.worktreeGroup,
 																"data-worktree-id": record.worktreeId,
@@ -2648,17 +3145,15 @@ window.__ModuleLoader__.load({
 																}), worktreeExpanded && (0, react_jsx_runtime.jsx)(WorktreeSessionGroup, {
 																	t,
 																	groupKey: worktreeGroupKey,
-																	sessionIds: visibleWorktreeSessionIds,
+																	sessionIds,
 																	workspaceId: workspace.workspaceId,
-																	expanded: expandedSessionGroups[worktreeGroupKey] === true,
+																	currentSessionId,
+																	expanded: sessionGroupExpanded,
 																	actionPending,
 																	sessions,
 																	dragState: sessionDrag,
 																	onToggleExpanded: () => {
-																		setExpandedSessionGroups((current) => ({
-																			...current,
-																			[worktreeGroupKey]: current[worktreeGroupKey] !== true
-																		}));
+																		toggleSessionGroup(worktreeGroupKey);
 																	},
 																	onStartDrag: (groupKey, sessionId) => {
 																		sessionDropCommitted.current = false;
@@ -2741,14 +3236,28 @@ window.__ModuleLoader__.load({
 						t,
 						workspace: modalWorkspace,
 						view: modalView,
+						readError: modalReadError,
 						setupStatus: modalSetupStatus,
 						canCreate: modalCanCreate,
+						mode: worktreeModalMode,
+						importCandidates,
+						selectedImportPath,
 						selectedBranch,
 						newBranch,
 						actionPending,
-						onClose: () => {
-							setWorktreeModalWorkspaceId(void 0);
+						onClose: closeWorktreeCreator,
+						onRetry: () => {
+							if (worktreeModalWorkspaceId === void 0) return;
+							modalReadViewRef.current = void 0;
+							setSelectedBranch("");
+							setNewBranch("");
+							loadModalWorktreeView(worktreeModalWorkspaceId);
+						},
+						onModeChange: changeWorktreeModalMode,
+						onRetryImportCandidates: () => {
+							if (worktreeModalWorkspaceId !== void 0) loadImportCandidates(worktreeModalWorkspaceId);
 						},
+						onSelectedImportPathChange: setSelectedImportPath,
 						onSelectedBranchChange: setSelectedBranch,
 						onNewBranchChange: setNewBranch,
 						onSubmit: submitWorktree
@@ -3172,6 +3681,7 @@ window.__ModuleLoader__.load({
 			ctx.effect(() => () => contextProjection.dispose(), "clutch-dsh-worktree: Session context cleanup");
 			contextProjection.refresh();
 			const viewStore = createWorktreeViewStore();
+			const expandState = createWorktreeExpandStateStore(_deepseek_ai_dsh_client_runtime_client.createSnapshotStore);
 			const ensureSessionWorkspace = (workspaceId, sessionId) => {
 				virtualWorkspaceMembership.ensure({
 					workspaceId,
@@ -3213,6 +3723,7 @@ window.__ModuleLoader__.load({
 				locale: WORKTREE_NS,
 				inject: () => ({
 					available: true,
+					expandState,
 					hooks: { worktreeContext: contextProjection.store },
 					manager,
 					createWorkspace: async () => {