@cerbur/clutch-dsh-worktree 0.1.2 → 0.1.3

package/lib/client.js

@@ -4,10 +4,10 @@ window.__ModuleLoader__.load({
 		var module = { exports: {} };
 		var exports = module.exports;
 		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+		let _deepseek_ai_dsh_client_runtime_client = require("@deepseek-ai/dsh-client-runtime/client");
 		let react_jsx_runtime = require("react/jsx-runtime");
 		let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
 		let react = require("react");
-		let _deepseek_ai_dsh_client_runtime_client = require("@deepseek-ai/dsh-client-runtime/client");
 		//#region lib/client/locales.js
 		const WORKTREE_NS = "worktree";
 		const zh = {
@@ -15,6 +15,8 @@ window.__ModuleLoader__.load({
 			"mode.exit": "退出 Worktree 模式",
 			"mode.label": "Worktree",
 			"mode.navigation": "Worktree 导航",
+			"context.main": "当前分支：{name}",
+			"context.worktree": "Worktree：{name}",
 			"workspace.rename": "重命名",
 			"workspace.delete": "删除",
 			"workspace.expand": "展开 {name}",
@@ -30,7 +32,8 @@ window.__ModuleLoader__.load({
 			"workspace.deleteTitle": "删除工作区",
 			"workspace.deleteDescription": "删除“{name}”？这只会移除 DSH 工作区注册。目录、会话和 Git Worktree 会保留。",
 			"worktree.title": "Worktree",
-			"worktree.main": "Main",
+			"worktree.main": "本地",
+			"worktree.mainWithBranch": "本地（{branch}）",
 			"worktree.detached": "已分离 Worktree",
 			"worktree.repair": "Worktree 需要修复",
 			"worktree.ready": "活动 Worktree 已就绪",
@@ -46,9 +49,14 @@ window.__ModuleLoader__.load({
 			"worktree.baseBranch": "Worktree 基线分支",
 			"worktree.noLocalBranch": "没有本地分支",
 			"worktree.noBranches": "此工作区中没有找到本地分支。",
+			"worktree.setup.noRepository": "此 Workspace 不是 Git 仓库。请在 Workspace 目录执行以下命令：",
+			"worktree.setup.noInitialCommit": "此 Git 仓库还没有首次 commit。请先执行以下命令：",
+			"worktree.setup.noLocalBranch": "此 Git 仓库没有本地分支。请先创建一个本地分支：",
+			"worktree.setup.commands": "可复制的命令",
 			"worktree.name": "Worktree 名称",
 			"worktree.create": "创建 Worktree",
 			"session.options": "会话选项：{name}",
+			"session.new": "新会话",
 			"session.rename": "重命名会话",
 			"session.fork": "Fork 会话",
 			"session.archive": "归档会话",
@@ -73,6 +81,7 @@ window.__ModuleLoader__.load({
 			"error.invalidResult": "Worktree endpoint {endpoint} 返回了无效结果，请重试请求。",
 			"error.workspaceOrderingUnavailable": "工作区排序不可用，请重新连接后重试。",
 			"error.sessionOrderingUnavailable": "会话排序不可用，请重新连接后重试。",
+			"error.worktreeOrderingUnavailable": "Worktree 排序不可用，请重新连接后重试。",
 			"error.worktreeCreatedSessionUnavailable": "Worktree 已创建，但 Session 创建不可用，请重新连接后重试。",
 			"error.sessionCreationUnavailable": "Session 创建不可用，请重新连接后重试。",
 			"error.worktreeRecordMissing": "Worktree 创建未返回 Worktree 记录，请重试请求。",
@@ -80,6 +89,12 @@ window.__ModuleLoader__.load({
 			"error.workspaceDeleteUnavailable": "工作区删除不可用，请重新连接后重试。",
 			"error.sessionRenameUnavailable": "会话重命名不可用，请重新连接后重试。",
 			"error.sessionBindingFailed": "Session {sessionId} 已创建，但 Worktree 绑定失败：{reason}",
+			"error.sessionAlreadyBound": "Session 已绑定到其他 Worktree，未创建新的 Session。",
+			"error.sessionListNotReady": "Session 列表尚未就绪，请重试。",
+			"error.sessionFactsIncomplete": "Session 信息尚未完整，请重试。",
+			"error.worktreeSessionRepairRequired": "当前 Worktree 的 Session 绑定需要修复，请重试。",
+			"error.worktreeSessionUnavailable": "当前 Worktree 不可用，请重试。",
+			"error.sessionArchived": "该 Session 已归档，无法重试绑定。",
 			"branch.current": "（当前）",
 			"branch.checkedOut": "（已检出）"
 		};
@@ -88,6 +103,8 @@ window.__ModuleLoader__.load({
 			"mode.exit": "Exit Worktree mode",
 			"mode.label": "Worktree",
 			"mode.navigation": "Worktree navigation",
+			"context.main": "Current branch: {name}",
+			"context.worktree": "Worktree: {name}",
 			"workspace.rename": "Rename",
 			"workspace.delete": "Delete",
 			"workspace.expand": "Expand {name}",
@@ -103,7 +120,8 @@ window.__ModuleLoader__.load({
 			"workspace.deleteTitle": "Delete Workspace",
 			"workspace.deleteDescription": "Delete {name}? This removes only the DSH Workspace registration. The directory, Sessions, and Git Worktrees will be retained.",
 			"worktree.title": "Worktrees",
-			"worktree.main": "Main",
+			"worktree.main": "Local",
+			"worktree.mainWithBranch": "Local ({branch})",
 			"worktree.detached": "Detached Worktree",
 			"worktree.repair": "Worktree needs repair",
 			"worktree.ready": "Active Worktree ready",
@@ -119,9 +137,14 @@ window.__ModuleLoader__.load({
 			"worktree.baseBranch": "Worktree base branch",
 			"worktree.noLocalBranch": "No local branch",
 			"worktree.noBranches": "No local branches found in this Workspace.",
+			"worktree.setup.noRepository": "This Workspace is not a Git repository. Run these commands in the Workspace directory:",
+			"worktree.setup.noInitialCommit": "This Git repository has no initial commit. Run these commands first:",
+			"worktree.setup.noLocalBranch": "This Git repository has no local branch. Create one first:",
+			"worktree.setup.commands": "Copyable commands",
 			"worktree.name": "Worktree name",
 			"worktree.create": "Create Worktree",
 			"session.options": "Session options for {name}",
+			"session.new": "New Session",
 			"session.rename": "Rename session",
 			"session.fork": "Fork session",
 			"session.archive": "Archive session",
@@ -146,6 +169,7 @@ window.__ModuleLoader__.load({
 			"error.invalidResult": "Worktree endpoint {endpoint} returned an invalid result; retry the request.",
 			"error.workspaceOrderingUnavailable": "Workspace ordering is unavailable; retry after reconnecting.",
 			"error.sessionOrderingUnavailable": "Session ordering is unavailable; retry after reconnecting.",
+			"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.",
@@ -153,6 +177,12 @@ window.__ModuleLoader__.load({
 			"error.workspaceDeleteUnavailable": "Workspace delete is unavailable; retry after reconnecting.",
 			"error.sessionRenameUnavailable": "Session rename is unavailable; retry after reconnecting.",
 			"error.sessionBindingFailed": "Session {sessionId} was created, but Worktree binding failed: {reason}",
+			"error.sessionAlreadyBound": "The Session is already bound to another Worktree; no new Session was created.",
+			"error.sessionListNotReady": "The Session list is not ready yet; retry the request.",
+			"error.sessionFactsIncomplete": "Session facts are incomplete; retry the request.",
+			"error.worktreeSessionRepairRequired": "The current Worktree Session binding needs repair; retry the request.",
+			"error.worktreeSessionUnavailable": "The current Worktree is unavailable; retry the request.",
+			"error.sessionArchived": "This Session is archived and cannot be retried for binding.",
 			"branch.current": " (current)",
 			"branch.checkedOut": " (checked out)"
 		};
@@ -169,6 +199,7 @@ window.__ModuleLoader__.load({
 			listBranches: "worktreeManager/listBranches",
 			createWorktree: "worktreeManager/createWorktree",
 			removeWorktree: "worktreeManager/removeWorktree",
+			insertWorktreeBefore: "worktreeManager/insertWorktreeBefore",
 			listBindings: "worktreeManager/listBindings",
 			bindSession: "worktreeManager/bindSession"
 		});
@@ -275,6 +306,9 @@ window.__ModuleLoader__.load({
 				async removeWorktree(input) {
 					await invoke("removeWorktree", input);
 				},
+				async insertWorktreeBefore(input) {
+					return invoke("insertWorktreeBefore", input);
+				},
 				listBindings: (input) => invoke("listBindings", input),
 				bindSession: (input) => invoke("bindSession", input),
 				dispose() {
@@ -286,8 +320,53 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
+		//#region \0clutch-dsh-worktree-css:/Users/yuancheng/Documents/Code/clutch-dsh/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-heroContext {\n  position: absolute;\n  z-index: 1;\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: none;\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) {
+			const tag = document.createElement("style");
+			tag.dataset.plugin = "@cerbur/clutch-dsh-worktree";
+			tag.dataset.pluginCss = styleId$1;
+			tag.textContent = css$1;
+			document.head.appendChild(tag);
+		}
+		var worktree_context_css_default = {
+			"headerContext": "-cerbur-clutch-dsh-worktree-headerContext",
+			"contextIcon": "-cerbur-clutch-dsh-worktree-contextIcon",
+			"contextLabel": "-cerbur-clutch-dsh-worktree-contextLabel",
+			"heroContext": "-cerbur-clutch-dsh-worktree-heroContext"
+		};
+		//#endregion
+		//#region lib/client/WorktreeContext.js
+		function WorktreeContextLabel({ value, t }) {
+			if (value.kind === "none") return null;
+			const ariaLabel = value.kind === "main" ? t("context.main", { name: value.label }) : t("context.worktree", { name: value.label });
+			return (0, react_jsx_runtime.jsxs)("span", {
+				className: worktree_context_css_default.headerContext,
+				title: value.label,
+				"aria-label": ariaLabel,
+				children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBranchOutline16, {
+					size: 14,
+					className: worktree_context_css_default.contextIcon,
+					"aria-hidden": "true"
+				}), (0, react_jsx_runtime.jsx)("span", {
+					className: worktree_context_css_default.contextLabel,
+					children: value.label
+				})]
+			});
+		}
+		/** Render the current branch or active Worktree branch beside the Session title. */
+		function WorktreeHeaderContext({ sessionId, useWorktreeContext, t }) {
+			const state = useWorktreeContext((snapshot) => snapshot);
+			if (state.sessionId !== sessionId) return null;
+			return (0, react_jsx_runtime.jsx)(WorktreeContextLabel, {
+				value: state.value,
+				t
+			});
+		}
+		//#endregion
 		//#region \0clutch-dsh-worktree-css:/Users/yuancheng/Documents/Code/clutch-dsh/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  overflow: hidden;\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.-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-railContent {\n  display: none;\n}\n\n.-cerbur-clutch-dsh-worktree-surface[data-collapsed='true'] .-cerbur-clutch-dsh-worktree-railContent {\n  display: flex;\n  flex: 1;\n  align-items: flex-start;\n  justify-content: center;\n  padding-top: 12px;\n}\n\n.-cerbur-clutch-dsh-worktree-railButton,\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-railButton {\n  width: 36px;\n  height: 36px;\n  color: var(--dsw-alias-label-secondary);\n  font-size: 11px;\n  font-weight: 600;\n}\n\n.-cerbur-clutch-dsh-worktree-railButton:hover,\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-actionLabel {\n  display: grid;\n  gap: 3px;\n  color: var(--dsw-alias-label-tertiary);\n  font-size: 11px;\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-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  text-transform: uppercase;\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-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";
+		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  overflow: hidden;\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-railContent {\n  display: none;\n}\n\n.-cerbur-clutch-dsh-worktree-surface[data-collapsed='true'] .-cerbur-clutch-dsh-worktree-railContent {\n  display: flex;\n  flex: 1;\n  align-items: flex-start;\n  justify-content: center;\n  padding-top: 12px;\n}\n\n.-cerbur-clutch-dsh-worktree-railButton,\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-railButton {\n  width: 36px;\n  height: 36px;\n  color: var(--dsw-alias-label-secondary);\n  font-size: 11px;\n  font-weight: 600;\n}\n\n.-cerbur-clutch-dsh-worktree-railButton:hover,\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-actionLabel {\n  display: grid;\n  gap: 3px;\n  color: var(--dsw-alias-label-tertiary);\n  font-size: 11px;\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";
 		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");
@@ -320,6 +399,8 @@ window.__ModuleLoader__.load({
 			"sectionTitle": "-cerbur-clutch-dsh-worktree-sectionTitle",
 			"empty": "-cerbur-clutch-dsh-worktree-empty",
 			"message": "-cerbur-clutch-dsh-worktree-message",
+			"gitReadiness": "-cerbur-clutch-dsh-worktree-gitReadiness",
+			"commandBlock": "-cerbur-clutch-dsh-worktree-commandBlock",
 			"worktree": "-cerbur-clutch-dsh-worktree-worktree",
 			"session": "-cerbur-clutch-dsh-worktree-session",
 			"worktreeLabel": "-cerbur-clutch-dsh-worktree-worktreeLabel",
@@ -385,6 +466,104 @@ window.__ModuleLoader__.load({
 			});
 		}
 		//#endregion
+		//#region lib/client/WorktreeHeroContext.js
+		function labelFor(state) {
+			if (state.status !== "ready" || state.workspaceTitle === void 0 || state.value.kind === "none") return;
+			return `${state.workspaceTitle} (${state.value.label})`;
+		}
+		function elementWithClassSuffix(root, suffix) {
+			const candidates = root.querySelectorAll("[class]");
+			for (const candidate of candidates) if ([...candidate.classList].some((token) => token === suffix || token.endsWith(`_${suffix}`))) return candidate;
+			return null;
+		}
+		function headlineElement(root) {
+			return elementWithClassSuffix(root, "previewBadge") ?? elementWithClassSuffix(root, "headlineText") ?? elementWithClassSuffix(root, "headline");
+		}
+		function positionedAncestor(element) {
+			if (element.offsetParent instanceof HTMLElement) return element.offsetParent;
+			for (let ancestor = element.parentElement; ancestor !== null; ancestor = ancestor.parentElement) if (getComputedStyle(ancestor).position !== "static") return ancestor;
+			return null;
+		}
+		function measurePlacement(element) {
+			const hero = document.querySelector("[data-phase=\"hero\"]");
+			const overlay = positionedAncestor(element);
+			const headline = hero === null ? null : headlineElement(hero);
+			if (hero === null || headline === null || overlay === null) return null;
+			const anchor = headline.getBoundingClientRect();
+			const frame = overlay.getBoundingClientRect();
+			const width = element.getBoundingClientRect().width;
+			const afterHeadlineLeft = anchor.right - frame.left + 8;
+			const fitsAfterHeadline = afterHeadlineLeft + width <= frame.width - 8;
+			return {
+				left: fitsAfterHeadline ? afterHeadlineLeft : Math.max(8, frame.width - width - 8),
+				top: fitsAfterHeadline ? Math.max(8, anchor.top - frame.top + (anchor.height - 22) / 2) : Math.max(8, anchor.bottom - frame.top + 8)
+			};
+		}
+		function contextAriaLabel(state, t) {
+			if (state.value.kind === "main") return t("context.main", { name: state.value.label });
+			if (state.value.kind === "worktree") return t("context.worktree", { name: state.value.label });
+		}
+		/**
+		* Browser-local Hero suffix. It intentionally uses the frame overlay because
+		* rc.8 exposes no additive slot beside the native Hero headline.
+		*/
+		function WorktreeHeroContext({ useWorktreeContext, t }) {
+			const state = useWorktreeContext((snapshot) => snapshot);
+			const label = labelFor(state);
+			const [placement, setPlacement] = (0, react.useState)(null);
+			const measure = (0, react.useCallback)((element) => {
+				if (element === null) {
+					setPlacement(null);
+					return;
+				}
+				setPlacement(measurePlacement(element));
+			}, []);
+			(0, react.useLayoutEffect)(() => {
+				if (typeof document === "undefined" || typeof window === "undefined") return void 0;
+				const element = document.querySelector("[data-worktree-hero-context]");
+				if (element === null) return void 0;
+				let frameRequest;
+				const schedule = () => {
+					if (frameRequest !== void 0) window.cancelAnimationFrame(frameRequest);
+					frameRequest = window.requestAnimationFrame(() => {
+						frameRequest = void 0;
+						measure(element);
+					});
+				};
+				const mutationObserver = typeof MutationObserver === "undefined" ? void 0 : new MutationObserver(schedule);
+				mutationObserver?.observe(document.body, {
+					subtree: true,
+					childList: true,
+					attributes: true,
+					attributeFilter: ["class", "data-phase"]
+				});
+				const resizeObserver = typeof ResizeObserver === "undefined" ? void 0 : new ResizeObserver(schedule);
+				resizeObserver?.observe(positionedAncestor(element) ?? element);
+				window.addEventListener("resize", schedule);
+				schedule();
+				return () => {
+					if (frameRequest !== void 0) window.cancelAnimationFrame(frameRequest);
+					mutationObserver?.disconnect();
+					resizeObserver?.disconnect();
+					window.removeEventListener("resize", schedule);
+				};
+			}, [label, measure]);
+			const ariaLabel = contextAriaLabel(state, t);
+			if (label === void 0) return null;
+			return (0, react_jsx_runtime.jsx)("span", {
+				ref: measure,
+				className: worktree_context_css_default.heroContext,
+				"data-worktree-hero-context": true,
+				"aria-label": ariaLabel,
+				title: label,
+				style: placement === null ? { visibility: "hidden" } : {
+					left: `${placement.left}px`,
+					top: `${placement.top}px`
+				},
+				children: label
+			});
+		}
+		//#endregion
 		//#region lib/client/navigation.js
 		/** Open an existing Session through DSH without touching the peer view mode. */
 		function openWorktreeSession(opener, sessionId) {
@@ -419,6 +598,13 @@ window.__ModuleLoader__.load({
 				bottom: rect.bottom
 			};
 		}
+		function syncObservedElement(observer, previous, next) {
+			const nextElement = next ?? void 0;
+			if (previous === nextElement) return previous;
+			if (previous !== void 0) observer?.unobserve(previous);
+			if (nextElement !== void 0) observer?.observe(nextElement);
+			return nextElement;
+		}
 		function resolveNativeSidebarRoot(sidebar) {
 			const directChild = sidebar.firstElementChild;
 			if (directChild === null) return void 0;
@@ -460,34 +646,37 @@ window.__ModuleLoader__.load({
 					setBounds(EMPTY_BOUNDS);
 					return;
 				}
+				const overlayElement = overlay;
+				const sidebarElement = sidebar;
+				const nativeRootElement = nativeRoot;
 				let frameHandle;
-				const update = () => {
-					const newSession = findNewSessionAnchor(nativeRoot);
-					const footer = nativeRoot.lastElementChild;
-					const nextWidth = sidebar.getBoundingClientRect().width;
+				let observedNewSession;
+				let observedFooter;
+				function update() {
+					const newSession = findNewSessionAnchor(nativeRootElement);
+					const footer = nativeRootElement.lastElementChild;
+					observedNewSession = syncObservedElement(resizeObserver, observedNewSession, newSession);
+					observedFooter = syncObservedElement(resizeObserver, observedFooter, footer);
+					const nextWidth = sidebarElement.getBoundingClientRect().width;
 					if (nextWidth > 0) setWidth(nextWidth);
-					setBounds(computeOverlayBounds(asRect(overlay), newSession === void 0 ? void 0 : asRect(newSession), footer === null ? void 0 : asRect(footer)));
-				};
-				const scheduleUpdate = () => {
+					setBounds(computeOverlayBounds(asRect(overlayElement), newSession === void 0 ? void 0 : asRect(newSession), footer === null ? void 0 : asRect(footer)));
+				}
+				function scheduleUpdate() {
 					if (frameHandle !== void 0) return;
 					frameHandle = requestAnimationFrame(() => {
 						frameHandle = void 0;
 						update();
 					});
-				};
-				update();
+				}
 				const resizeObserver = typeof ResizeObserver === "function" ? new ResizeObserver(scheduleUpdate) : void 0;
 				for (const element of [
-					overlay,
-					sidebar,
-					nativeRoot
+					overlayElement,
+					sidebarElement,
+					nativeRootElement
 				]) resizeObserver?.observe(element);
-				const newSession = findNewSessionAnchor(nativeRoot);
-				const footer = nativeRoot.lastElementChild;
-				if (newSession !== void 0) resizeObserver?.observe(newSession);
-				if (footer !== null) resizeObserver?.observe(footer);
+				update();
 				const mutationObserver = typeof MutationObserver === "function" ? new MutationObserver(scheduleUpdate) : void 0;
-				mutationObserver?.observe(nativeRoot, {
+				mutationObserver?.observe(nativeRootElement, {
 					childList: true,
 					subtree: true
 				});
@@ -576,6 +765,7 @@ window.__ModuleLoader__.load({
 				case "WORKTREE_RPC_INVALID_RESULT": return t("error.invalidResult", { endpoint: detail(error, "endpoint") });
 				case "WORKSPACE_ORDER_UNAVAILABLE": return t("error.workspaceOrderingUnavailable");
 				case "SESSION_ORDER_UNAVAILABLE": return t("error.sessionOrderingUnavailable");
+				case "WORKTREE_ORDER_UNAVAILABLE": return t("error.worktreeOrderingUnavailable");
 				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");
@@ -586,21 +776,58 @@ window.__ModuleLoader__.load({
 					sessionId: detail(error, "sessionId"),
 					reason: reason(error, t)
 				});
+				case "SESSION_ALREADY_BOUND": return t("error.sessionAlreadyBound");
+				case "SESSION_LIST_NOT_READY": return t("error.sessionListNotReady");
+				case "SESSION_FACTS_INCOMPLETE": return t("error.sessionFactsIncomplete");
+				case "WORKTREE_SESSION_REPAIR_REQUIRED": return t("error.worktreeSessionRepairRequired");
+				case "WORKTREE_SESSION_UNAVAILABLE": return t("error.worktreeSessionUnavailable");
+				case "SESSION_ARCHIVED": return t("error.sessionArchived");
 				default: return error.message.length > 0 ? error.message : t("error.worktreeDataUnavailable");
 			}
 		}
 		//#endregion
+		//#region lib/client/session-view.js
+		/** Read the native blank flag without inferring blankness from title or id. */
+		function isBlankSession(sessionId, sessions) {
+			return sessions.byId[sessionId]?.blank === true;
+		}
+		/** Native tree visibility: ordinary rows plus the currently selected blank row. */
+		function isVisibleSession(sessionId, sessions) {
+			return !isBlankSession(sessionId, sessions) || sessions.current === sessionId;
+		}
+		/** Filter a group without mutating its source order. */
+		function filterVisibleSessionIds(sessionIds, sessions) {
+			return sessionIds.filter((sessionId) => isVisibleSession(sessionId, sessions));
+		}
+		/** Resolve a row title while keeping the blank label outside the DSH summary. */
+		function sessionDisplayLabel(sessionId, sessions, blankLabel) {
+			const summary = sessions.byId[sessionId];
+			return summary?.blank === true ? blankLabel : summary?.displayTitle ?? sessionId;
+		}
+		/** Match only durable Session titles or the final diagnostic id fallback. */
+		function sessionMatchesQuery(sessionId, sessions, normalizedQuery) {
+			const summary = sessions.byId[sessionId];
+			if (summary?.blank === true) return false;
+			return (summary?.displayTitle ?? sessionId).toLocaleLowerCase().includes(normalizedQuery);
+		}
+		//#endregion
 		//#region lib/client/worktree-view.js
 		/** A DSH Session exists even when the external Worktree binding needs repair. */
 		var WorktreeSessionBindingError = class extends Error {
-			code = "SESSION_BINDING_FAILED";
-			retryable = true;
+			code;
+			retryable;
+			details;
 			sessionId;
 			cause;
 			constructor(sessionId, cause) {
-				const reason = cause instanceof Error ? cause.message : String(cause);
+				const candidate = typeof cause === "object" && cause !== null ? cause : void 0;
+				const reason = cause instanceof Error ? cause.message : typeof candidate?.message === "string" ? candidate.message : String(cause);
 				super(reason);
 				this.name = "WorktreeSessionBindingError";
+				const conflict = candidate?.code === "SESSION_ALREADY_BOUND";
+				this.code = conflict ? "SESSION_ALREADY_BOUND" : "SESSION_BINDING_FAILED";
+				this.retryable = conflict ? false : candidate?.retryable !== false;
+				this.details = typeof candidate?.details === "object" && candidate.details !== null && !Array.isArray(candidate.details) ? candidate.details : {};
 				this.sessionId = sessionId;
 				this.cause = cause;
 			}
@@ -611,10 +838,63 @@ window.__ModuleLoader__.load({
 			for (let index = 0; index < previous.length; index += 1) if (previous[index] !== next[index]) return next;
 			return previous;
 		}
+		/** Keep only the most recently started Worktree surface refresh authoritative. */
+		function createWorktreeRefreshGuard() {
+			let latestGeneration = 0;
+			const begin = () => {
+				latestGeneration += 1;
+				return latestGeneration;
+			};
+			const isCurrent = (generation) => generation === latestGeneration;
+			const invalidate = () => {
+				latestGeneration += 1;
+			};
+			return {
+				begin,
+				isCurrent,
+				invalidate,
+				async run(load, onSuccess, onError) {
+					const generation = begin();
+					let value;
+					try {
+						value = await load();
+					} catch (error) {
+						if (!isCurrent(generation)) return;
+						onError(error);
+						return;
+					}
+					if (!isCurrent(generation)) return;
+					onSuccess(value);
+				}
+			};
+		}
 		/** Prefer the branch checked out by the DSH Workspace, then fall back to any local branch. */
 		function selectDefaultBaseBranch(branches) {
 			return branches.find((branch) => branch.isCurrent)?.name ?? branches[0]?.name ?? "";
 		}
+		/** Keep a valid user choice across branch-list refreshes, otherwise choose the current branch. */
+		function reconcileBaseBranchSelection(selectedBranch, branches) {
+			if (branches.some((branch) => branch.name === selectedBranch)) return selectedBranch;
+			return selectDefaultBaseBranch(branches);
+		}
+		/** Return copyable, read-only setup commands for a Git readiness state. */
+		function worktreeSetupCommands(status) {
+			switch (status) {
+				case "noRepository": return [
+					"git init",
+					"printf \"# README\\n\" > README.md",
+					"git add README.md",
+					"git commit -m \"Initial commit\""
+				];
+				case "noInitialCommit": return [
+					"printf \"# README\\n\" > README.md",
+					"git add README.md",
+					"git commit -m \"Initial commit\""
+				];
+				case "noLocalBranch": return ["git switch -c main"];
+				case "ready": return [];
+			}
+		}
 		function browserRandomUuid() {
 			const randomUUID = globalThis.crypto?.randomUUID;
 			if (typeof randomUUID === "function") return randomUUID.call(globalThis.crypto);
@@ -635,25 +915,62 @@ window.__ModuleLoader__.load({
 		function filterArchivedSessionIds(sessionIds, archivedSessionIds) {
 			return sessionIds.filter((sessionId) => !archivedSessionIds.includes(sessionId));
 		}
+		function readinessFromBranchError(error) {
+			const viewError = toWorktreeViewError(error);
+			if (viewError.code === "WORKSPACE_NOT_GIT_REPOSITORY") return {
+				status: "noRepository",
+				error: viewError
+			};
+			if (viewError.code === "WORKTREE_REQUIRES_INITIAL_COMMIT") return {
+				status: "noInitialCommit",
+				error: viewError
+			};
+		}
 		/** Read all three Worktree projections needed by the surface in one refresh. */
 		async function loadWorktreeView(manager, workspaceId) {
-			const [worktrees, branches, bindings] = await Promise.all([
+			const [worktreesResult, branchesResult, bindingsResult] = await Promise.allSettled([
 				manager.listWorktrees({ workspaceId }),
 				manager.listBranches({ workspaceId }),
 				manager.listBindings({ workspaceId })
 			]);
+			if (worktreesResult.status === "rejected") throw worktreesResult.reason;
+			if (bindingsResult.status === "rejected") throw bindingsResult.reason;
+			if (branchesResult.status === "rejected") {
+				const readiness = readinessFromBranchError(branchesResult.reason);
+				if (readiness !== void 0) return {
+					worktrees: worktreesResult.value,
+					branches: [],
+					bindings: bindingsResult.value,
+					readiness
+				};
+				throw branchesResult.reason;
+			}
 			return {
-				worktrees,
-				branches,
-				bindings
+				worktrees: worktreesResult.value,
+				branches: branchesResult.value,
+				bindings: bindingsResult.value,
+				readiness: branchesResult.value.length > 0 ? { status: "ready" } : { status: "noLocalBranch" }
 			};
 		}
 		/** Load one independent projection per DSH Workspace for the flat sidebar hierarchy. */
-		async function loadWorktreeViews(manager, workspaceIds) {
-			return Promise.all(workspaceIds.map(async (workspaceId) => ({
+		async function loadWorktreeViews(manager, workspaceIds, options = {}) {
+			const views = await Promise.all(workspaceIds.map(async (workspaceId) => ({
 				workspaceId,
 				...await loadWorktreeView(manager, workspaceId)
 			})));
+			if (options.invalidateContext !== false) await options.invalidateWorktreeContext?.();
+			return views;
+		}
+		/** Resolve a row-half drop target to native-style optional before-anchor semantics. */
+		function resolveWorktreeMove(worktreeIds, sourceWorktreeId, targetWorktreeId, half) {
+			const sourceIndex = worktreeIds.indexOf(sourceWorktreeId);
+			const targetIndex = worktreeIds.indexOf(targetWorktreeId);
+			if (sourceIndex === -1 || targetIndex === -1) return void 0;
+			const beforeWorktreeId = half === "before" ? targetWorktreeId : worktreeIds[targetIndex + 1];
+			if (beforeWorktreeId === sourceWorktreeId) return void 0;
+			const anchorIndex = beforeWorktreeId === void 0 ? worktreeIds.length : worktreeIds.indexOf(beforeWorktreeId);
+			if (anchorIndex === sourceIndex || anchorIndex === sourceIndex + 1) return void 0;
+			return beforeWorktreeId === void 0 ? {} : { beforeWorktreeId };
 		}
 		/** Keep mutation routing in the browser Consumer while leaving wire details to the adapter. */
 		async function executeWorktreeAction(manager, action) {
@@ -709,8 +1026,174 @@ window.__ModuleLoader__.load({
 				retryable: true
 			};
 		}
+		/** Keep ordering mutation/refresh failures reachable from the surface Retry control. */
+		function toRetryableWorktreeOrderError(error) {
+			return {
+				...toWorktreeViewError(error),
+				retryable: true
+			};
+		}
+		//#endregion
+		//#region lib/client/worktree-session.js
+		var WorktreeSessionActionError = class extends Error {
+			code;
+			retryable;
+			details;
+			constructor(code, message, retryable, details = {}) {
+				super(message);
+				this.code = code;
+				this.retryable = retryable;
+				this.name = "WorktreeSessionActionError";
+				this.details = details;
+			}
+		};
+		function resolveWorktreeSessionAction(input) {
+			if (input.target.status !== "active" || input.target.health === "repair") return {
+				kind: "reject",
+				reason: "worktree-not-available"
+			};
+			if (input.sessions.phase !== "ready") return {
+				kind: "wait",
+				reason: "sessions-not-ready"
+			};
+			const targetBinding = input.bindings.find((binding) => binding.worktreeId === input.target.worktreeId && binding.status === "active");
+			if (targetBinding !== void 0) {
+				const summary = input.sessions.byId[targetBinding.sessionId];
+				if (summary === void 0) return {
+					kind: "repair",
+					reason: "active-binding-session-missing",
+					sessionId: targetBinding.sessionId
+				};
+				if (summary.cwd !== input.target.absolutePath) return {
+					kind: "repair",
+					reason: "active-binding-cwd-mismatch",
+					sessionId: targetBinding.sessionId
+				};
+				if (summary.blank === true && !input.archivedSessionIds.includes(targetBinding.sessionId)) return {
+					kind: "open-bound",
+					sessionId: targetBinding.sessionId
+				};
+			}
+			for (const sessionId of input.sessions.ids) {
+				const summary = input.sessions.byId[sessionId];
+				if (summary === void 0 || summary.blank === void 0 || summary.blank === true && summary.cwd === void 0) return {
+					kind: "wait",
+					reason: "session-facts-incomplete"
+				};
+			}
+			for (const sessionId of input.sessions.ids) {
+				const summary = input.sessions.byId[sessionId];
+				if (summary?.blank !== true || summary.cwd !== input.target.absolutePath || input.archivedSessionIds.includes(sessionId)) continue;
+				if (!input.bindings.some((binding) => binding.sessionId === sessionId)) return {
+					kind: "bind-existing",
+					sessionId
+				};
+			}
+			return { kind: "create" };
+		}
+		function actionError(action) {
+			switch (action.kind) {
+				case "wait": return new WorktreeSessionActionError(action.reason === "sessions-not-ready" ? "SESSION_LIST_NOT_READY" : "SESSION_FACTS_INCOMPLETE", "", true);
+				case "repair": return new WorktreeSessionActionError("WORKTREE_SESSION_REPAIR_REQUIRED", action.reason, true, { ...action.sessionId === void 0 ? {} : { sessionId: action.sessionId } });
+				case "reject": return new WorktreeSessionActionError("WORKTREE_SESSION_UNAVAILABLE", action.reason, false);
+				default: return new WorktreeSessionActionError("WORKTREE_SESSION_ACTION_FAILED", "", true);
+			}
+		}
+		async function retryWorktreeSessionBinding(input) {
+			if (input.archived) throw new WorktreeSessionActionError("SESSION_ARCHIVED", "", false, { sessionId: input.pending.sessionId });
+			try {
+				await input.manager.bindSession({
+					workspaceId: input.pending.workspaceId,
+					worktreeId: input.pending.worktreeId,
+					sessionId: input.pending.sessionId
+				});
+			} catch (error) {
+				throw new WorktreeSessionBindingError(input.pending.sessionId, error);
+			}
+			input.ensureSessionWorkspace(input.pending.workspaceId, input.pending.sessionId);
+			input.openSession(input.pending.sessionId);
+			return input.pending.sessionId;
+		}
+		/**
+		* Browser-only Worktree `+` connector. It owns the read/resolve/bind/create/open
+		* sequence and coalesces repeated calls for one Worktree within one Client fiber.
+		*/
+		function createWorktreeSessionConnector(options) {
+			const inFlight = /* @__PURE__ */ new Map();
+			let disposed = false;
+			const run = async (input) => {
+				const [worktrees, bindings] = await Promise.all([options.manager.listWorktrees({ workspaceId: input.workspaceId }), options.manager.listBindings({ workspaceId: input.workspaceId })]);
+				if (disposed) throw new WorktreeSessionActionError("CLIENT_DISPOSED", "", false);
+				const target = worktrees.find((record) => record.worktreeId === input.worktreeId);
+				if (target === void 0 || target.absolutePath !== input.cwd) throw new WorktreeSessionActionError("WORKTREE_SESSION_REPAIR_REQUIRED", "worktree target unavailable", true);
+				const action = resolveWorktreeSessionAction({
+					target,
+					sessions: options.sessions.getSnapshot(),
+					archivedSessionIds: options.archivedSessionIds(),
+					bindings
+				});
+				if (action.kind === "open-bound") {
+					options.ensureSessionWorkspace(input.workspaceId, action.sessionId);
+					if (!disposed) options.openSession(action.sessionId);
+					return action.sessionId;
+				}
+				if (action.kind === "bind-existing") {
+					try {
+						await options.manager.bindSession({
+							workspaceId: input.workspaceId,
+							worktreeId: input.worktreeId,
+							sessionId: action.sessionId
+						});
+					} catch (error) {
+						throw new WorktreeSessionBindingError(action.sessionId, error);
+					}
+					if (!disposed) {
+						options.ensureSessionWorkspace(input.workspaceId, action.sessionId);
+						if (!disposed) options.openSession(action.sessionId);
+					}
+					return action.sessionId;
+				}
+				if (action.kind !== "create") throw actionError(action);
+				if (disposed) throw new WorktreeSessionActionError("CLIENT_DISPOSED", "", false);
+				return createSessionForWorktree({
+					...input,
+					createSession: options.createSession,
+					manager: options.manager,
+					beforeOpen: (sessionId) => {
+						if (disposed) throw new WorktreeSessionActionError("CLIENT_DISPOSED", "", false);
+						options.ensureSessionWorkspace(input.workspaceId, sessionId);
+					},
+					openSession: (sessionId) => {
+						if (!disposed) options.openSession(sessionId);
+					}
+				});
+			};
+			return {
+				create(input) {
+					const key = `${input.workspaceId}\u0000${input.worktreeId}`;
+					const current = inFlight.get(key);
+					if (current !== void 0) return current;
+					const promise = run(input).finally(() => {
+						if (inFlight.get(key) === promise) inFlight.delete(key);
+					});
+					inFlight.set(key, promise);
+					return promise;
+				},
+				dispose() {
+					disposed = true;
+					inFlight.clear();
+				}
+			};
+		}
 		//#endregion
 		//#region lib/client/WorktreeSurface.js
+		function worktreeSetupMessage(status, t) {
+			switch (status) {
+				case "noRepository": return t("worktree.setup.noRepository");
+				case "noInitialCommit": return t("worktree.setup.noInitialCommit");
+				case "noLocalBranch": return t("worktree.setup.noLocalBranch");
+			}
+		}
 		function toNativeWorktreeViewError(error) {
 			const viewError = toWorktreeViewError(error);
 			if (typeof error === "object" && error !== null) return viewError;
@@ -730,8 +1213,8 @@ window.__ModuleLoader__.load({
 			if (stable !== previousRef.current) previousRef.current = stable;
 			return previousRef.current;
 		}
-		function sessionLabel(sessionId, sessions) {
-			return sessions.byId[sessionId]?.displayTitle ?? sessionId;
+		function sessionLabel(sessionId, sessions, t) {
+			return sessionDisplayLabel(sessionId, sessions, t("session.new"));
 		}
 		function rowHalf(event) {
 			const rect = event.currentTarget.getBoundingClientRect();
@@ -746,10 +1229,10 @@ window.__ModuleLoader__.load({
 		function workspaceMatches(workspace, view, sessions, query) {
 			if (query.length === 0) return true;
 			if (includesText(workspace.title, query)) return true;
-			if (workspace.sessionIds.some((sessionId) => includesText(sessionLabel(sessionId, sessions), query))) return true;
+			if (workspace.sessionIds.some((sessionId) => sessionMatchesQuery(sessionId, sessions, query))) return true;
 			if (view === void 0) return false;
 			if (view.worktrees.some((record) => includesText(record.branch, query) || includesText(record.absolutePath, query))) return true;
-			return view.bindings.some((binding) => includesText(sessionLabel(binding.sessionId, sessions), query));
+			return view.bindings.some((binding) => sessionMatchesQuery(binding.sessionId, sessions, query));
 		}
 		/** Workspace row using the native DSH menu, fixed action column, and drag contract. */
 		function WorktreeWorkspaceRow({ t, workspace, expanded, actionPending, menuOpen, drag, onToggle, onCreateWorktree, onRename, onDelete, onMenuOpenChange }) {
@@ -857,13 +1340,36 @@ window.__ModuleLoader__.load({
 			});
 		}
 		/** Shared Main/Worktree group row with parameterized icon, state, and actions. */
-		function WorktreeGroupRow({ t, kind, label, expanded, icon, workspaceTitle, state, stateLabel, onToggle, onCreateSession, menu }) {
+		function WorktreeGroupRow({ t, kind, label, worktreeId, expanded, icon, workspaceTitle, state, stateLabel, onToggle, onCreateSession, menu, drag }) {
 			const main = kind === "main";
+			const markerClass = drag?.marker === "before" ? worktree_css_default.dropBefore : drag?.marker === "after" ? worktree_css_default.dropAfter : "";
+			const dragProps = drag === void 0 ? {} : {
+				draggable: true,
+				onDragStart: (event) => {
+					event.dataTransfer.effectAllowed = "move";
+					event.dataTransfer.setData("text/plain", worktreeId ?? label);
+					drag.start();
+				},
+				onDragEnd: drag.end,
+				onDragOver: (event) => {
+					if (!drag.active) return;
+					event.preventDefault();
+					event.dataTransfer.dropEffect = "move";
+					drag.hover(rowHalf(event));
+				},
+				onDrop: (event) => {
+					if (!drag.active) return;
+					event.preventDefault();
+					drag.drop(rowHalf(event));
+				}
+			};
 			const row = (0, react_jsx_runtime.jsxs)("div", {
-				className: worktree_css_default.worktreeRow,
+				className: `${worktree_css_default.worktreeRow} ${markerClass}`,
 				"data-main-group": main ? "true" : void 0,
 				"data-main-expanded": main ? String(expanded) : void 0,
 				"data-menu-open": menu?.open ? "true" : void 0,
+				"data-worktree-drag": drag?.active ? "active" : void 0,
+				...dragProps,
 				onClick: onToggle,
 				children: [
 					(0, react_jsx_runtime.jsx)("button", {
@@ -954,7 +1460,7 @@ window.__ModuleLoader__.load({
 			});
 		}
 		/** Worktree-mode Session row with the same trailing options menu as native DSH rows. */
-		function WorktreeSessionRow({ t, sessionId, label, drag, actionPending, onOpen, onRename, onFork, onArchive }) {
+		function WorktreeSessionRow({ t, sessionId, blank, 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 = [
@@ -980,6 +1486,7 @@ window.__ModuleLoader__.load({
 			return (0, react_jsx_runtime.jsxs)("div", {
 				className: `${worktree_css_default.treeSessionRow} ${markerClass}`,
 				"data-session-id": sessionId,
+				"data-session-blank": blank ? "true" : void 0,
 				"data-session-drag": drag.active ? "active" : void 0,
 				"data-menu-open": menuOpen || void 0,
 				role: "treeitem",
@@ -1013,7 +1520,7 @@ window.__ModuleLoader__.load({
 						className: worktree_css_default.sessionLabel,
 						children: label
 					})]
-				}), (0, react_jsx_runtime.jsx)("span", {
+				}), !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, {
 						open: menuOpen,
@@ -1050,7 +1557,8 @@ window.__ModuleLoader__.load({
 			return (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [visibleSessionIds.map((sessionId) => (0, react_jsx_runtime.jsx)(WorktreeSessionRow, {
 				t,
 				sessionId,
-				label: sessionLabel(sessionId, sessions),
+				blank: isBlankSession(sessionId, sessions),
+				label: sessionLabel(sessionId, sessions, t),
 				drag: {
 					active: sameGroupDrag,
 					marker: sameGroupDrag && dragState.over?.sessionId === sessionId ? dragState.over.half : null,
@@ -1092,12 +1600,14 @@ 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, createWorkspace, createSessionForWorktree: createSessionCallback, createMainSession, renameWorkspace, deleteWorkspace, insertWorkspaceBefore, insertSessionBefore, renameSession, forkSession, archiveSession, ensureSessionWorkspace, syncSessionWorkspaces, openSession }) {
+		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 }) {
 			const mode = effectiveViewMode(useStore((state) => state.viewMode), available && manager !== void 0);
 			const sessions = useSessions((state) => state);
 			const workspaces = useWorkspaces((state) => state);
 			const workspaceIds = useStableWorkspaceIds(workspaces.items);
 			const [readState, setReadState] = (0, react.useState)(EMPTY_READ_STATE);
+			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)({});
@@ -1127,36 +1637,52 @@ window.__ModuleLoader__.load({
 			const [sessionDrag, setSessionDrag] = (0, react.useState)();
 			const [expandedSessionGroups, setExpandedSessionGroups] = (0, react.useState)({});
 			const sessionDropCommitted = (0, react.useRef)(false);
+			const [worktreeDrag, setWorktreeDrag] = (0, react.useState)();
+			const worktreeDropCommitted = (0, react.useRef)(false);
+			const refreshGuard = (0, react.useRef)(createWorktreeRefreshGuard());
 			const { ref, width, bounds } = useSidebarOverlayGeometry(mode === "worktree");
 			const collapsed = width <= 64;
 			const query = searchQuery.trim().toLocaleLowerCase();
 			const archivedSessionIds = workspaces.archivedSessionIds ?? [];
-			const refresh = (0, react.useCallback)(async () => {
+			const pendingSessionArchived = pendingSessionBinding !== void 0 && archivedSessionIds.includes(pendingSessionBinding.sessionId);
+			const refresh = (0, react.useCallback)(async (options = {}) => {
 				if (manager === void 0) {
+					refreshGuard.current.invalidate();
 					setReadState(EMPTY_READ_STATE);
 					return;
 				}
-				setReadState({
+				const preserveCurrent = options.preserveCurrent === true;
+				if (!preserveCurrent) setReadState({
 					status: "loading",
 					views: []
 				});
-				try {
-					const views = await loadWorktreeViews(manager, workspaceIds);
+				await refreshGuard.current.run(() => loadWorktreeViews(manager, workspaceIds, {
+					invalidateContext: options.invalidateContext !== false,
+					invalidateWorktreeContext
+				}), (views) => {
 					setReadState({
 						status: "ready",
 						views
 					});
-				} catch (error) {
+				}, (error) => {
+					if (preserveCurrent) throw error;
 					setReadState({
 						status: "error",
 						views: [],
 						error: toWorktreeViewError(error)
 					});
-				}
-			}, [manager, workspaceIds]);
+				});
+			}, [
+				invalidateWorktreeContext,
+				manager,
+				workspaceIds
+			]);
 			(0, react.useEffect)(() => {
-				if (mode === "worktree") refresh();
-				else setReadState(EMPTY_READ_STATE);
+				if (mode === "worktree") refresh({ preserveCurrent: readStateRef.current.status === "ready" });
+				else {
+					refreshGuard.current.invalidate();
+					setReadState(EMPTY_READ_STATE);
+				}
 			}, [mode, refresh]);
 			(0, react.useEffect)(() => {
 				if (readState.status !== "ready" || syncSessionWorkspaces === void 0) return;
@@ -1172,12 +1698,23 @@ window.__ModuleLoader__.load({
 			const viewByWorkspace = (0, react.useMemo)(() => new Map(readState.views.map((view) => [view.workspaceId, view])), [readState.views]);
 			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";
+			(0, react.useEffect)(() => {
+				if (worktreeModalWorkspaceId === void 0 || modalView === void 0) return;
+				if (modalView.readiness.status !== "ready") {
+					setSelectedBranch("");
+					return;
+				}
+				setSelectedBranch((current) => reconcileBaseBranchSelection(current, modalView.branches));
+			}, [modalView, worktreeModalWorkspaceId]);
 			const runMutation = async (operation) => {
 				setActionPending(true);
 				setActionError(void 0);
 				try {
 					await operation();
-					await refresh();
+					await refresh({ preserveCurrent: true });
 				} catch (error) {
 					setActionError(toWorktreeViewError(error));
 				} finally {
@@ -1303,6 +1840,29 @@ window.__ModuleLoader__.load({
 					setActionError(toWorktreeViewError(error));
 				});
 			};
+			const commitWorktreeDrag = (activeDrag, over, worktreeIds, workspaceId) => {
+				if (worktreeDropCommitted.current) return;
+				worktreeDropCommitted.current = true;
+				setWorktreeDrag(void 0);
+				if (activeDrag.workspaceId !== workspaceId) return;
+				const move = resolveWorktreeMove(worktreeIds, activeDrag.worktreeId, over.worktreeId, over.half);
+				if (move === void 0) return;
+				if (insertWorktreeBefore === void 0) {
+					setActionError({
+						code: "WORKTREE_ORDER_UNAVAILABLE",
+						message: "",
+						retryable: true
+					});
+					return;
+				}
+				setActionError(void 0);
+				insertWorktreeBefore(workspaceId, activeDrag.worktreeId, move.beforeWorktreeId).then(() => refresh({
+					preserveCurrent: true,
+					invalidateContext: false
+				})).catch((error) => {
+					setActionError(toRetryableWorktreeOrderError(error));
+				});
+			};
 			const openSessionRename = (sessionId, currentTitle) => {
 				setSessionRenameTarget({
 					sessionId,
@@ -1372,7 +1932,7 @@ window.__ModuleLoader__.load({
 			};
 			const submitWorktree = async () => {
 				const worktreeName = newBranch.trim();
-				if (manager === void 0 || modalWorkspace === void 0 || selectedBranch.length === 0 || worktreeName.length === 0) return;
+				if (manager === void 0 || modalWorkspace === void 0 || !modalCanCreate || selectedBranch.length === 0 || worktreeName.length === 0) return;
 				const input = {
 					workspaceId: modalWorkspace.workspaceId,
 					branch: selectedBranch,
@@ -1393,7 +1953,7 @@ window.__ModuleLoader__.load({
 					};
 					setWorktreeModalWorkspaceId(void 0);
 					if (createSessionCallback === void 0) {
-						await refresh();
+						await refresh({ preserveCurrent: true });
 						setActionError({
 							code: "WORKTREE_CREATED_SESSION_UNAVAILABLE",
 							message: "",
@@ -1408,14 +1968,15 @@ window.__ModuleLoader__.load({
 					};
 					try {
 						await createSessionCallback(sessionInput);
+						await invalidateWorktreeContext?.(createdWorktree.workspaceId);
 					} catch (error) {
-						if (error instanceof WorktreeSessionBindingError) setPendingSessionBinding({
+						if (error instanceof WorktreeSessionBindingError && error.retryable) setPendingSessionBinding({
 							...sessionInput,
 							sessionId: error.sessionId
 						});
 						throw error;
 					}
-					await refresh();
+					await refresh({ preserveCurrent: true });
 				} catch (error) {
 					setActionError(toWorktreeViewError(error));
 				} finally {
@@ -1436,9 +1997,10 @@ window.__ModuleLoader__.load({
 				setPendingSessionBinding(void 0);
 				try {
 					await createSessionCallback(input);
-					await refresh();
+					await invalidateWorktreeContext?.(input.workspaceId);
+					await refresh({ preserveCurrent: true });
 				} catch (error) {
-					if (error instanceof WorktreeSessionBindingError) setPendingSessionBinding({
+					if (error instanceof WorktreeSessionBindingError && error.retryable) setPendingSessionBinding({
 						...input,
 						sessionId: error.sessionId
 					});
@@ -1448,21 +2010,25 @@ window.__ModuleLoader__.load({
 				}
 			};
 			const retrySessionBinding = async () => {
-				if (manager === void 0 || pendingSessionBinding === void 0) return;
+				if (manager === void 0 || pendingSessionBinding === void 0 || pendingSessionArchived) return;
+				const pending = pendingSessionBinding;
 				setActionPending(true);
 				setActionError(void 0);
 				try {
-					await manager.bindSession({
-						workspaceId: pendingSessionBinding.workspaceId,
-						worktreeId: pendingSessionBinding.worktreeId,
-						sessionId: pendingSessionBinding.sessionId
+					await retryWorktreeSessionBinding({
+						manager,
+						pending,
+						archived: false,
+						ensureSessionWorkspace: (workspaceId, sessionId) => {
+							ensureSessionWorkspace?.(workspaceId, sessionId);
+						},
+						openSession
 					});
-					const sessionId = pendingSessionBinding.sessionId;
 					setPendingSessionBinding(void 0);
-					ensureSessionWorkspace?.(pendingSessionBinding.workspaceId, sessionId);
-					await refresh();
-					openSession(sessionId);
+					await refresh({ preserveCurrent: true });
+					await invalidateWorktreeContext?.(pending.workspaceId);
 				} catch (error) {
+					if (error instanceof WorktreeSessionBindingError && !error.retryable) setPendingSessionBinding(void 0);
 					setActionError(toWorktreeViewError(error));
 				} finally {
 					setActionPending(false);
@@ -1556,7 +2122,7 @@ window.__ModuleLoader__.load({
 												children: [(0, react_jsx_runtime.jsx)("button", {
 													type: "button",
 													className: worktree_css_default.actionButton,
-													disabled: actionPending,
+													disabled: actionPending || pendingSessionArchived,
 													onClick: () => {
 														retrySessionBinding();
 													},
@@ -1612,14 +2178,17 @@ window.__ModuleLoader__.load({
 											children: t("workspace.noMatches")
 										}) : visibleWorkspaces.map((workspace) => {
 											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 workspaceMatchesQuery = includesText(workspace.title, query);
 											const allWorkspaceSessionIds = filterArchivedSessionIds(workspaceSessionIds(workspaces, workspace.workspaceId, sessions.ids), archivedSessionIds);
 											const bindings = view?.bindings ?? [];
-											const visibleMainSessionIds = unboundSessionIds(allWorkspaceSessionIds, [...new Set(bindings.map((binding) => binding.sessionId))]).filter((sessionId) => workspaceMatchesQuery || includesText(sessionLabel(sessionId, sessions), query));
+											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 mainGroupKey = `main:${workspace.workspaceId}`;
 											const worktrees = view?.worktrees ?? [];
+											const sameWorkspaceWorktreeDrag = worktreeDrag?.workspaceId === workspace.workspaceId;
 											return (0, react_jsx_runtime.jsxs)("section", {
 												className: worktree_css_default.workspaceGroup,
 												"data-workspace-id": workspace.workspaceId,
@@ -1682,7 +2251,7 @@ window.__ModuleLoader__.load({
 														(0, react_jsx_runtime.jsx)(WorktreeGroupRow, {
 															t,
 															kind: "main",
-															label: t("worktree.main"),
+															label: mainLabel,
 															expanded: mainExpanded,
 															icon: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBranchOutline16, {}),
 															workspaceTitle: workspace.title,
@@ -1744,10 +2313,10 @@ window.__ModuleLoader__.load({
 															children: t("worktree.noWorktrees")
 														}),
 														worktrees.map((record) => {
-															const worktreeSessionIds = filterArchivedSessionIds(bindingIdsFor(bindings, record.worktreeId).filter((sessionId) => sessions.ids.includes(sessionId)), archivedSessionIds);
+															const worktreeSessionIds = filterVisibleSessionIds(filterArchivedSessionIds(bindingIdsFor(bindings, record.worktreeId).filter((sessionId) => sessions.ids.includes(sessionId)), archivedSessionIds), sessions);
 															const worktreeMatchesQuery = workspaceMatchesQuery || includesText(record.branch, query) || includesText(record.absolutePath, query);
-															if (query.length > 0 && !worktreeMatchesQuery && !worktreeSessionIds.some((sessionId) => includesText(sessionLabel(sessionId, sessions), query))) return null;
-															const visibleWorktreeSessionIds = worktreeSessionIds.filter((sessionId) => worktreeMatchesQuery || includesText(sessionLabel(sessionId, sessions), query));
+															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 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");
@@ -1759,6 +2328,7 @@ window.__ModuleLoader__.load({
 																	t,
 																	kind: "worktree",
 																	label: record.branch,
+																	worktreeId: record.worktreeId,
 																	expanded: worktreeExpanded,
 																	icon: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBranchOutline16, {}),
 																	workspaceTitle: workspace.title,
@@ -1767,7 +2337,7 @@ window.__ModuleLoader__.load({
 																	onToggle: () => {
 																		toggleWorktree(record.worktreeId);
 																	},
-																	onCreateSession: record.status === "active" ? () => {
+																	onCreateSession: record.status === "active" && record.health !== "repair" ? () => {
 																		createSession({
 																			workspaceId: record.workspaceId,
 																			worktreeId: record.worktreeId,
@@ -1785,7 +2355,39 @@ window.__ModuleLoader__.load({
 																			setWorktreeRemoval(record);
 																			setActionError(void 0);
 																		}
-																	} : void 0
+																	} : void 0,
+																	drag: {
+																		active: sameWorkspaceWorktreeDrag,
+																		marker: worktreeDrag?.over?.worktreeId === record.worktreeId ? worktreeDrag.over.half : null,
+																		start: () => {
+																			worktreeDropCommitted.current = false;
+																			setWorktreeDrag({
+																				workspaceId: workspace.workspaceId,
+																				worktreeId: record.worktreeId,
+																				over: null
+																			});
+																		},
+																		hover: (half) => {
+																			setWorktreeDrag((current) => current === void 0 || current.workspaceId !== workspace.workspaceId ? current : {
+																				...current,
+																				over: {
+																					worktreeId: record.worktreeId,
+																					half
+																				}
+																			});
+																		},
+																		drop: (half) => {
+																			if (worktreeDrag === void 0) return;
+																			commitWorktreeDrag(worktreeDrag, {
+																				worktreeId: record.worktreeId,
+																				half
+																			}, worktrees.map((candidate) => candidate.worktreeId), workspace.workspaceId);
+																		},
+																		end: () => {
+																			setWorktreeDrag(void 0);
+																			worktreeDropCommitted.current = false;
+																		}
+																	}
 																}), worktreeExpanded && (0, react_jsx_runtime.jsx)(WorktreeSessionGroup, {
 																	t,
 																	groupKey: worktreeGroupKey,
@@ -1974,7 +2576,7 @@ window.__ModuleLoader__.load({
 							children: formatWorktreeViewError(workspaceDeleteError, t)
 						})
 					}),
-					worktreeModalWorkspaceId !== void 0 && modalWorkspace !== void 0 && (0, react_jsx_runtime.jsxs)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
+					worktreeModalWorkspaceId !== void 0 && modalWorkspace !== void 0 && (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
 						open: worktreeModalWorkspaceId !== void 0,
 						onClose: () => {
 							if (actionPending) return;
@@ -1998,48 +2600,50 @@ window.__ModuleLoader__.load({
 							},
 							children: t("worktree.create")
 						})] }),
-						children: [
-							(0, react_jsx_runtime.jsxs)("label", {
-								className: worktree_css_default.modalField,
-								children: [t("worktree.baseBranch"), (0, react_jsx_runtime.jsxs)("select", {
-									className: worktree_css_default.actionSelect,
-									"aria-label": t("worktree.baseBranch"),
-									value: selectedBranch,
-									disabled: actionPending,
-									onChange: (event) => {
-										setSelectedBranch(event.currentTarget.value);
-									},
-									children: [(0, react_jsx_runtime.jsx)("option", {
-										value: "",
-										children: t("worktree.noLocalBranch")
-									}), (modalView?.branches ?? []).map((branch) => (0, react_jsx_runtime.jsxs)("option", {
-										value: branch.name,
-										children: [
-											branch.name,
-											branch.isCurrent ? t("branch.current") : "",
-											branch.checkedOut ? t("branch.checkedOut") : ""
-										]
-									}, branch.name))]
-								})]
-							}),
-							(0, react_jsx_runtime.jsxs)("label", {
-								className: worktree_css_default.modalField,
-								children: [t("worktree.name"), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Input, {
-									className: worktree_css_default.renameInput,
-									"aria-label": t("worktree.name"),
-									value: newBranch,
-									placeholder: "dsh/12345678",
-									disabled: actionPending,
-									onChange: (event) => {
-										setNewBranch(event.currentTarget.value);
-									}
-								})]
-							}),
-							modalView?.branches.length === 0 && (0, react_jsx_runtime.jsx)("p", {
-								className: worktree_css_default.empty,
-								children: t("worktree.noBranches")
-							})
-						]
+						children: modalCanCreate ? (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,
+								"aria-label": t("worktree.baseBranch"),
+								value: selectedBranch,
+								disabled: actionPending,
+								onChange: (event) => {
+									setSelectedBranch(event.currentTarget.value);
+								},
+								children: modalView?.branches.map((branch) => (0, react_jsx_runtime.jsxs)("option", {
+									value: branch.name,
+									children: [
+										branch.name,
+										branch.isCurrent ? t("branch.current") : "",
+										branch.checkedOut ? t("branch.checkedOut") : ""
+									]
+								}, branch.name))
+							})]
+						}), (0, react_jsx_runtime.jsxs)("label", {
+							className: worktree_css_default.modalField,
+							children: [t("worktree.name"), (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Input, {
+								className: worktree_css_default.renameInput,
+								"aria-label": t("worktree.name"),
+								value: newBranch,
+								placeholder: "dsh/12345678",
+								disabled: actionPending,
+								onChange: (event) => {
+									setNewBranch(event.currentTarget.value);
+								}
+							})]
+						})] }) : (0, react_jsx_runtime.jsxs)("div", {
+							className: worktree_css_default.gitReadiness,
+							"data-worktree-readiness": modalSetupStatus ?? "loading",
+							role: "alert",
+							children: [(0, react_jsx_runtime.jsx)("p", {
+								className: worktree_css_default.message,
+								children: modalSetupStatus === void 0 ? t("status.loading") : worktreeSetupMessage(modalSetupStatus, t)
+							}), modalSetupStatus !== void 0 && (0, react_jsx_runtime.jsx)("pre", {
+								className: worktree_css_default.commandBlock,
+								"aria-label": t("worktree.setup.commands"),
+								children: worktreeSetupCommands(modalSetupStatus).join("\n")
+							})]
+						})
 					}),
 					worktreeRemoval !== void 0 && (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
 						open: worktreeRemoval !== void 0,
@@ -2071,6 +2675,7 @@ window.__ModuleLoader__.load({
 											worktreeId: target.worktreeId
 										}
 									});
+									await invalidateWorktreeContext?.(target.workspaceId);
 									setWorktreeRemoval(void 0);
 								});
 							},
@@ -2081,6 +2686,240 @@ window.__ModuleLoader__.load({
 			});
 		}
 		//#endregion
+		//#region lib/client/WorktreeOverlay.js
+		/** Compose the independent Hero context and Worktree navigation overlays. */
+		function WorktreeOverlay(props) {
+			return (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)(WorktreeHeroContext, { ...props }), (0, react_jsx_runtime.jsx)(WorktreeSurface, { ...props })] });
+		}
+		//#endregion
+		//#region lib/client/worktree-context.js
+		const none = (reason) => ({
+			kind: "none",
+			reason
+		});
+		/** Resolve the branch or active Worktree label for one current DSH Session. */
+		function resolveWorktreeSessionContext(input) {
+			const sessionId = input.currentSessionId;
+			if (sessionId === void 0 && input.currentWorkspaceId === void 0) return none("no-session");
+			const workspace = sessionId === void 0 ? input.workspaces.find(({ workspaceId }) => workspaceId === input.currentWorkspaceId) : input.workspaces.find(({ sessionIds }) => sessionIds.includes(sessionId));
+			if (workspace === void 0) return none("unbound");
+			const binding = sessionId === void 0 ? void 0 : input.bindings.find((candidate) => candidate.sessionId === sessionId);
+			if (binding !== void 0) {
+				if (binding.workspaceId !== workspace.workspaceId) return none("workspace-mismatch");
+				if (binding.status === "detached") return none("detached");
+				const record = input.worktrees.find((candidate) => candidate.worktreeId === binding.worktreeId);
+				if (record === void 0 || record.workspaceId !== workspace.workspaceId) return none(record === void 0 ? "stale" : "workspace-mismatch");
+				if (record.status !== "active") return none("stale");
+				if (record.health === "repair") return none("repair");
+				if (record.branch.length === 0) return none("not-ready");
+				return {
+					kind: "worktree",
+					workspaceId: workspace.workspaceId,
+					worktreeId: record.worktreeId,
+					label: record.branch,
+					source: "active-binding"
+				};
+			}
+			const currentBranch = input.branches.find(({ isCurrent }) => isCurrent);
+			if (currentBranch === void 0 || currentBranch.name.length === 0) return none("not-ready");
+			return {
+				kind: "main",
+				workspaceId: workspace.workspaceId,
+				label: currentBranch.name,
+				source: "current-branch"
+			};
+		}
+		//#endregion
+		//#region lib/client/worktree-context-store.js
+		const notReady = () => ({
+			kind: "none",
+			reason: "not-ready"
+		});
+		function scheduledRefresh() {
+			let resolve;
+			return {
+				promise: new Promise((resolvePromise) => {
+					resolve = resolvePromise;
+				}),
+				resolve
+			};
+		}
+		function identityFrom(sessions, workspaces) {
+			const sessionId = sessions.getSnapshot().current;
+			if (sessionId === void 0) return { workspaceId: workspaces.getSnapshot().recentWorkspaceId };
+			return {
+				sessionId,
+				workspaceId: workspaces.getSnapshot().items.find((candidate) => candidate.sessionIds.includes(sessionId))?.workspaceId
+			};
+		}
+		/**
+		* Build one browser-local current-Session projection shared by the header
+		* consumer. Superseded requests may still finish on the transport, but their
+		* results never become visible in the current snapshot.
+		*/
+		function createWorktreeContextProjection(input) {
+			const store = input.storeFactory({
+				status: "idle",
+				value: notReady()
+			});
+			let disposed = false;
+			let generation = 0;
+			let scheduled = false;
+			let scheduleTicket = 0;
+			let scheduledCompletion;
+			let latestRefresh = Promise.resolve();
+			const setPending = (identity) => {
+				if (identity.workspaceId === void 0) {
+					store.set({
+						status: "ready",
+						value: resolveWorktreeSessionContext({
+							currentSessionId: identity.sessionId,
+							currentWorkspaceId: identity.workspaceId,
+							workspaces: input.workspaces.getSnapshot().items,
+							branches: [],
+							worktrees: [],
+							bindings: []
+						})
+					});
+					return;
+				}
+				const workspace = input.workspaces.getSnapshot().items.find((candidate) => candidate.workspaceId === identity.workspaceId);
+				store.set({
+					status: "loading",
+					...identity.sessionId === void 0 ? {} : { sessionId: identity.sessionId },
+					workspaceId: identity.workspaceId,
+					workspaceTitle: workspace?.title,
+					value: notReady()
+				});
+			};
+			const matchesCurrent = (request, requestGeneration) => {
+				if (disposed || generation !== requestGeneration) return false;
+				const current = identityFrom(input.sessions, input.workspaces);
+				return current.sessionId === request.sessionId && current.workspaceId === request.workspaceId;
+			};
+			const runRefresh = async () => {
+				if (disposed) return;
+				const requestGeneration = ++generation;
+				const identity = identityFrom(input.sessions, input.workspaces);
+				setPending(identity);
+				if (identity.workspaceId === void 0) return;
+				const request = {
+					sessionId: identity.sessionId,
+					workspaceId: identity.workspaceId
+				};
+				try {
+					const data = await loadWorktreeView(input.manager, request.workspaceId);
+					if (!matchesCurrent(request, requestGeneration)) return;
+					const workspace = input.workspaces.getSnapshot().items.find((candidate) => candidate.workspaceId === request.workspaceId);
+					if ("error" in data.readiness) {
+						store.set({
+							status: "error",
+							...request.sessionId === void 0 ? {} : { sessionId: request.sessionId },
+							workspaceId: request.workspaceId,
+							workspaceTitle: workspace?.title,
+							value: notReady(),
+							error: data.readiness.error
+						});
+						return;
+					}
+					store.set({
+						status: "ready",
+						...request.sessionId === void 0 ? {} : { sessionId: request.sessionId },
+						workspaceId: request.workspaceId,
+						workspaceTitle: workspace?.title,
+						value: resolveWorktreeSessionContext({
+							currentSessionId: request.sessionId,
+							currentWorkspaceId: request.workspaceId,
+							workspaces: input.workspaces.getSnapshot().items,
+							branches: data.branches,
+							worktrees: data.worktrees,
+							bindings: data.bindings
+						})
+					});
+				} catch (error) {
+					if (!matchesCurrent(request, requestGeneration)) return;
+					store.set({
+						status: "error",
+						...request.sessionId === void 0 ? {} : { sessionId: request.sessionId },
+						workspaceId: request.workspaceId,
+						workspaceTitle: input.workspaces.getSnapshot().items.find((candidate) => candidate.workspaceId === request.workspaceId)?.title,
+						value: notReady(),
+						error: toWorktreeViewError(error)
+					});
+				}
+			};
+			const cancelScheduledRefresh = () => {
+				scheduleTicket += 1;
+				scheduled = false;
+				const completion = scheduledCompletion;
+				scheduledCompletion = void 0;
+				completion?.resolve();
+			};
+			const refresh = () => {
+				cancelScheduledRefresh();
+				const completion = runRefresh();
+				latestRefresh = completion;
+				return completion;
+			};
+			const scheduleRefresh = () => {
+				if (disposed) return;
+				generation += 1;
+				if (scheduled) return;
+				setPending(identityFrom(input.sessions, input.workspaces));
+				scheduled = true;
+				const ticket = ++scheduleTicket;
+				const completion = scheduledRefresh();
+				scheduledCompletion = completion;
+				latestRefresh = completion.promise;
+				queueMicrotask(() => {
+					if (disposed || ticket !== scheduleTicket) {
+						completion.resolve();
+						return;
+					}
+					scheduled = false;
+					runRefresh().finally(() => {
+						if (scheduledCompletion === completion) scheduledCompletion = void 0;
+						completion.resolve();
+					});
+				});
+			};
+			const waitForLatestRefresh = async (workspaceId) => {
+				let observed;
+				while (!disposed) {
+					if (workspaceId !== void 0 && identityFrom(input.sessions, input.workspaces).workspaceId !== workspaceId) return;
+					const completion = latestRefresh;
+					if (completion === observed) return;
+					observed = completion;
+					await completion;
+				}
+			};
+			const unsubscribeSessions = input.sessions.subscribe(scheduleRefresh);
+			const unsubscribeWorkspaces = input.workspaces.subscribe(scheduleRefresh);
+			return {
+				store,
+				refresh,
+				async invalidate(workspaceId) {
+					if (disposed) return;
+					const identity = identityFrom(input.sessions, input.workspaces);
+					if (workspaceId !== void 0 && workspaceId !== identity.workspaceId) return;
+					await refresh();
+					await waitForLatestRefresh(workspaceId ?? identity.workspaceId);
+				},
+				dispose() {
+					if (disposed) return;
+					disposed = true;
+					generation += 1;
+					cancelScheduledRefresh();
+					unsubscribeSessions();
+					unsubscribeWorkspaces();
+					store.set({
+						status: "idle",
+						value: notReady()
+					});
+				}
+			};
+		}
+		//#endregion
 		//#region lib/client/view-mode-store.js
 		/** Create one root-scoped, browser-local view-mode store for the two slot entries. */
 		function createWorktreeViewStore() {
@@ -2122,17 +2961,24 @@ window.__ModuleLoader__.load({
 			let bindings = [];
 			let disposed = false;
 			let applying = false;
-			const apply = (nextBindings) => {
-				const current = list.getSnapshot();
-				const next = projectVirtualWorkspaceMembership(current, bindings, nextBindings);
-				if (sameWorkspaceItems(current, next)) return;
+			const nativeSet = list.set;
+			const write = (next) => {
 				applying = true;
 				try {
-					list.set(next);
+					nativeSet(next);
 				} finally {
 					applying = false;
 				}
 			};
+			list.set = (next) => {
+				write(projectVirtualWorkspaceMembership(next, bindings, bindings));
+			};
+			const apply = (nextBindings) => {
+				const current = list.getSnapshot();
+				const next = projectVirtualWorkspaceMembership(current, bindings, nextBindings);
+				if (sameWorkspaceItems(current, next)) return;
+				write(next);
+			};
 			const replay = () => {
 				if (disposed || applying) return;
 				apply(bindings);
@@ -2160,6 +3006,7 @@ window.__ModuleLoader__.load({
 					bindings = [];
 					disposed = true;
 					unsubscribe();
+					list.set = nativeSet;
 				}
 			};
 		}
@@ -2185,8 +3032,16 @@ window.__ModuleLoader__.load({
 			const manager = createWorktreeConnectionAdapter(ctx.connection.rpc);
 			const sessions = ctx.sessions;
 			const virtualWorkspaceMembership = createVirtualWorkspaceMembership(ctx.workspaces.list);
+			const contextProjection = createWorktreeContextProjection({
+				sessions: ctx.sessions.list,
+				workspaces: ctx.workspaces.list,
+				manager,
+				storeFactory: _deepseek_ai_dsh_client_runtime_client.createSnapshotStore
+			});
 			ctx.effect(() => () => manager.dispose(), "clutch-dsh-worktree: connection cleanup");
 			ctx.effect(() => () => virtualWorkspaceMembership.dispose(), "clutch-dsh-worktree: Workspace membership cleanup");
+			ctx.effect(() => () => contextProjection.dispose(), "clutch-dsh-worktree: Session context cleanup");
+			contextProjection.refresh();
 			const viewStore = createWorktreeViewStore();
 			const ensureSessionWorkspace = (workspaceId, sessionId) => {
 				virtualWorkspaceMembership.ensure({
@@ -2197,6 +3052,24 @@ window.__ModuleLoader__.load({
 			const syncSessionWorkspaces = (bindings) => {
 				virtualWorkspaceMembership.sync(bindings);
 			};
+			const worktreeSessionConnector = createWorktreeSessionConnector({
+				manager,
+				sessions: ctx.sessions.list,
+				archivedSessionIds: () => ctx.workspaces.list.getSnapshot().archivedSessionIds ?? [],
+				createSession: async (input) => String(await sessions.create(input)),
+				ensureSessionWorkspace,
+				openSession: (sessionId) => {
+					ctx.sessions.open(sessionId);
+				}
+			});
+			ctx.effect(() => () => worktreeSessionConnector.dispose(), "clutch-dsh-worktree: Worktree Session connector cleanup");
+			ctx.slots.inject("conversation.session.header.actions", () => ctx.slots.register({
+				name: "conversation.session.header.actions",
+				id: "clutch-dsh-worktree-context-header",
+				order: -5,
+				locale: WORKTREE_NS,
+				inject: () => ({ hooks: { worktreeContext: contextProjection.store } })
+			}, WorktreeHeaderContext));
 			ctx.slots.inject("sidebar.footer.action", () => ctx.slots.register({
 				name: "sidebar.footer.action",
 				id: "clutch-dsh-worktree-mode-action",
@@ -2211,22 +3084,14 @@ window.__ModuleLoader__.load({
 				locale: WORKTREE_NS,
 				inject: () => ({
 					available: true,
+					hooks: { worktreeContext: contextProjection.store },
 					manager,
 					createWorkspace: async () => {
 						const workspacePath = await ctx.workspaces.pickDirectory();
 						if (workspacePath !== null) await ctx.workspaces.create({ path: workspacePath });
 					},
-					createSessionForWorktree: (input) => createSessionForWorktree({
-						...input,
-						createSession: (sessionInput) => sessions.create(sessionInput),
-						manager,
-						beforeOpen: (sessionId) => {
-							ensureSessionWorkspace(input.workspaceId, sessionId);
-						},
-						openSession: (sessionId) => {
-							ctx.sessions.open(sessionId);
-						}
-					}),
+					createSessionForWorktree: (input) => worktreeSessionConnector.create(input),
+					invalidateWorktreeContext: (workspaceId) => contextProjection.invalidate(workspaceId),
 					createMainSession: (workspaceId) => {
 						ctx.workspaces.startSession(workspaceId);
 					},
@@ -2242,6 +3107,11 @@ window.__ModuleLoader__.load({
 					insertSessionBefore: async (workspaceId, sessionId, beforeSessionId) => {
 						await ctx.workspaces.insertSessionBefore(workspaceId, sessionId, beforeSessionId);
 					},
+					insertWorktreeBefore: (workspaceId, worktreeId, beforeWorktreeId) => manager.insertWorktreeBefore({
+						workspaceId,
+						worktreeId,
+						beforeWorktreeId
+					}),
 					renameSession: async (sessionId, title) => {
 						const session = ctx.sessions.binding(sessionId)?.session;
 						if (session === void 0) throw new Error(`unknown session "${sessionId}"`);
@@ -2263,7 +3133,7 @@ window.__ModuleLoader__.load({
 						ctx.sessions.open(sessionId);
 					}
 				})
-			}, WorktreeSurface));
+			}, WorktreeOverlay));
 		}
 		//#endregion
 		exports.WORKTREE_CONNECTION_CHANNEL = WORKTREE_CONNECTION_CHANNEL;