dsh-coding-sidebar 1.0.7 → 1.0.8

package/lib/client-editor.js

@@ -43208,19 +43208,126 @@ globalThis.__dshChunks__["editor"] = (require) => {
 	//#endregion
 	//#region src/client/conversation-draft.ts
 	/**
-	* Append `text` to the session's composer draft (space-separated, like the
-	* @-mentions). Returns false — and logs — when the conversation service or
-	* the session scope is unavailable.
+	* Splice `text` into `draft` at `caret` (replacing any live selection) with
+	* whitespace-aware joins and report the caret position right after the
+	* inserted text. `caret === null` (position unknown) appends at the end,
+	* exactly like the original behavior.
+	*/
+	function spliceInsert(draft, text, caret) {
+		if (caret === null || draft === "") {
+			const next = draft.trim() === "" ? text : `${draft} ${text}`;
+			return {
+				draft: next,
+				caretAfter: next.length
+			};
+		}
+		const prefix = draft.slice(0, caret.start);
+		const suffix = draft.slice(caret.end);
+		if (prefix === "" && suffix === "") return {
+			draft: text,
+			caretAfter: text.length
+		};
+		const left = prefix === "" || /\s$/.test(prefix) ? "" : " ";
+		return {
+			draft: `${prefix}${left}${text}${suffix === "" || /^\s/.test(suffix) ? "" : " "}${suffix}`,
+			caretAfter: prefix.length + left.length + text.length
+		};
+	}
+	/**
+	* Locate the composer `<textarea>` in the conversation column: prefer the
+	* `data-phase`-tagged textarea (the composer's marker), falling back to any
+	* textarea in the column, then to a bare data-phase textarea (older host
+	* layouts without the column attribute). Null in jsdom-less hosts.
+	*/
+	function findComposerTextarea() {
+		if (typeof document === "undefined") return null;
+		const column = document.querySelector("#root [data-slot=\"conversation\"]");
+		const find = (scope) => scope.querySelector("textarea[data-phase]") ?? scope.querySelector("textarea");
+		return column !== null ? find(column) : document.querySelector("textarea[data-phase]");
+	}
+	/**
+	* Resolve the composer's live caret from its DOM `<textarea>`. The draft
+	* store has no caret API, so the sidebar reads the composed input's selection
+	* directly; the value-sync check (`el.value === draft`) discards stale or
+	* wrong-composer reads — a caret must never be applied against a draft it
+	* was not measured on.
+	*
+	* Returns null when the composer is missing, disabled/read-only, out of
+	* sync with the store draft, or has no measurable selection (odd hosts
+	* report null selectionStart/End).
+	*/
+	function probeComposerCaret(draft) {
+		const el = findComposerTextarea();
+		if (el === null || el.disabled || el.readOnly) return null;
+		if (el.value !== draft) return null;
+		let start = el.selectionStart;
+		let end = el.selectionEnd;
+		if (typeof start !== "number" || typeof end !== "number") return null;
+		if (!Number.isFinite(start) || !Number.isFinite(end)) return null;
+		start = Math.max(0, Math.min(start, draft.length));
+		end = Math.max(start, Math.min(end, draft.length));
+		return {
+			start,
+			end
+		};
+	}
+	/**
+	* Restore the composer caret to `caretIndex` after a programmatic
+	* `setDraft` commit. A controlled textarea update resets the caret (React
+	* commits the value asynchronously and the browser moves the caret to the
+	* start/end), so the placement is scheduled and retried across at most two
+	* animation frames (setTimeout fallback), and only applied when the textarea
+	* still matches `expectedDraft` — a newer edit or a different composer wins
+	* the race untouched. The caret is clamped into the value bounds, mirroring
+	* how browsers clamp type-in positions.
+	*/
+	function placeComposerCaretAfterInsert(expectedDraft, caretIndex) {
+		let remaining = 2;
+		let scheduled = false;
+		const schedule = (fn) => {
+			if (scheduled) return;
+			scheduled = true;
+			if (typeof requestAnimationFrame === "function") requestAnimationFrame(fn);
+			else setTimeout(fn, 0);
+		};
+		const place = () => {
+			scheduled = false;
+			if (remaining <= 0) return;
+			remaining -= 1;
+			const el = findComposerTextarea();
+			if (el === null || el.disabled || el.readOnly) return;
+			if (el.value !== expectedDraft) {
+				schedule(place);
+				return;
+			}
+			const clamped = Math.max(0, Math.min(caretIndex, el.value.length));
+			el.setSelectionRange(clamped, clamped);
+		};
+		schedule(place);
+	}
+	/**
+	* Insert `text` into the session's composer draft at the composer's live
+	* caret (see {@link probeComposerCaret}), falling back to appending at the
+	* end when the caret cannot be resolved. Returns false — and logs — when the
+	* conversation service or the session scope is unavailable.
 	*/
 	function appendToDraft(ctx, sessionId, text) {
 		try {
 			const actx = ctx.sessions.scope(sessionId);
-			if (actx === void 0) return false;
+			if (actx === void 0) {
+				console.warn("[dsh-coding-sidebar] draft insert skipped: no session scope", sessionId);
+				return false;
+			}
 			const conversation = ctx.get("conversation");
-			if (conversation === void 0) return false;
+			if (conversation === void 0) {
+				console.warn("[dsh-coding-sidebar] draft insert skipped: conversation service unavailable");
+				return false;
+			}
 			const input = conversation.input.for(actx);
 			const draft = input.state.getSnapshot().draft;
-			input.setDraft(draft.trim() === "" ? text : `${draft} ${text}`);
+			const { draft: next, caretAfter } = spliceInsert(draft, text, probeComposerCaret(draft));
+			input.setDraft(next);
+			placeComposerCaretAfterInsert(next, caretAfter);
 			return true;
 		} catch (error) {
 			console.warn("[dsh-coding-sidebar] draft insert failed:", error);
@@ -43228,6 +43335,117 @@ globalThis.__dshChunks__["editor"] = (require) => {
 		}
 	}
 	//#endregion
+	//#region src/client/selection-popup.ts
+	/**
+	* The floating "add selection to conversation" popup shared by the text
+	* viewer: a viewport-anchored button portaled to `document.body`, kept alive
+	* across the selection gesture and committed on click.
+	*
+	* Dismissal contract (upstream issue #425): the popup must never outlive its
+	* editor surface. The sidebar keeps every tab MOUNTED — switching tabs only
+	* flips the pane cell to `display:none` and collapsing the panel translates
+	* it off-screen — while the portaled `position:fixed` button stays pinned to
+	* its viewport anchor, ignoring both. The caller already hides on surface
+	* scrolls, selection collapse and content swaps; this hook adds the global
+	* dismissal that covers everything else:
+	*
+	* - any `mousedown` outside the button (tab bar, composer, another pane,
+	*   the collapse toggle, …) closes it;
+	* - `Escape` closes it;
+	* - the document going hidden (`visibilitychange`) or the window losing
+	*   focus closes it;
+	* - an `IntersectionObserver` on the editor surface closes it as soon as the
+	*   surface leaves the viewport — the tab-switch (`display:none`) and
+	*   panel-collapse (translated off-screen) paths have no DOM events of their
+	*   own, so the geometry signal is the only reliable one.
+	*
+	* The button's own `mousedown` is never treated as an outside click: the
+	* caller preventDefaults it to keep the selection/caret alive until the
+	* click commits (the hook's capture-phase listener runs first and must not
+	* hide for it).
+	*/
+	function useSelectionPopup(options) {
+		const onCommitRef = (0, react.useRef)(options.onCommit);
+		const getSurfaceRef = (0, react.useRef)(options.getSurface);
+		onCommitRef.current = options.onCommit;
+		getSurfaceRef.current = options.getSurface;
+		const [popup, setPopup] = (0, react.useState)(null);
+		/** Live mirror for click/event-time reads (no re-render race). */
+		const popupRef = (0, react.useRef)(null);
+		/** The portaled button itself (for the outside-click guard). */
+		const buttonRef = (0, react.useRef)(null);
+		/** The surface visibility observer (created lazily on open). */
+		const observerRef = (0, react.useRef)(null);
+		const show = (insert, left, top) => {
+			const next = {
+				insert,
+				left: Math.min(Math.max(left, 80), window.innerWidth - 80),
+				top
+			};
+			popupRef.current = next;
+			setPopup(next);
+		};
+		const hide = () => {
+			popupRef.current = null;
+			setPopup(null);
+		};
+		const commit = () => {
+			const current = popupRef.current;
+			if (current === null) return;
+			onCommitRef.current(current.insert);
+			hide();
+		};
+		(0, react.useEffect)(() => {
+			const onMouseDown = (event) => {
+				if (popupRef.current === null) return;
+				const button = buttonRef.current;
+				if (button !== null && (button === event.target || button.contains(event.target))) return;
+				hide();
+			};
+			const onKeyDown = (event) => {
+				if (event.key === "Escape" && popupRef.current !== null) hide();
+			};
+			const onVisibilityChange = () => {
+				if (document.hidden && popupRef.current !== null) hide();
+			};
+			const onWindowBlur = () => {
+				if (popupRef.current !== null) hide();
+			};
+			document.addEventListener("mousedown", onMouseDown, true);
+			document.addEventListener("keydown", onKeyDown, true);
+			document.addEventListener("visibilitychange", onVisibilityChange);
+			window.addEventListener("blur", onWindowBlur);
+			return () => {
+				document.removeEventListener("mousedown", onMouseDown, true);
+				document.removeEventListener("keydown", onKeyDown, true);
+				document.removeEventListener("visibilitychange", onVisibilityChange);
+				window.removeEventListener("blur", onWindowBlur);
+				observerRef.current?.disconnect();
+				observerRef.current = null;
+			};
+		}, []);
+		(0, react.useEffect)(() => {
+			if (popup === null) return;
+			observerRef.current?.disconnect();
+			observerRef.current = null;
+			if (typeof IntersectionObserver === "undefined") return;
+			const surface = getSurfaceRef.current();
+			if (surface === null) return;
+			const observer = new IntersectionObserver((entries) => {
+				for (const entry of entries) if (!entry.isIntersecting) hide();
+			}, { threshold: 0 });
+			observerRef.current = observer;
+			observer.observe(surface);
+		}, [popup !== null]);
+		return {
+			popup,
+			buttonRef,
+			show,
+			hide,
+			commit
+		};
+	}
+	//#endregion
 	//#region src/client/paths.ts
 	/**
 	* The path relative to the session's working directory.
@@ -43368,6 +43586,7 @@ globalThis.__dshChunks__["editor"] = (require) => {
 		terminalDepsFailed: "终端依赖 node-pty 加载失败",
 		terminalDepsHint: "在 DSH 所在环境的终端或 cmd 中执行以下命令修复，然后点重试（node-pty 与 DSH 核心保持同一版本）：",
 		terminalDepsProfile: "（检测到 profile：{profile}）",
+		terminalShellNotFound: "未找到配置的 Shell：{name}，请到 设置 → 侧边卡片 → 终端 检查 Shell 路径",
 		refresh: "刷新",
 		refreshUnsavedConfirm: "文件已在磁盘更新，刷新将丢弃未保存编辑。继续吗？",
 		save: "保存",
@@ -43491,10 +43710,10 @@ globalThis.__dshChunks__["editor"] = (require) => {
 		settingsConflict: "设置已被其他窗口修改，请重试",
 		binaryNoPreview: "此文件类型不支持预览",
 		downloadToView: "下载查看",
-		settingsSubagentTitle: "检测到子代理时自动展开任务管理页",
-		settingsSubagentDesc: "当前会话产生新的子代理时，自动展开侧边栏并打开任务管理页；关闭后需手动打开",
-		settingsJobsTitle: "有新后台任务时自动展开后台任务页",
-		settingsJobsDesc: "当前会话出现新的后台任务时，自动展开侧边栏并打开后台任务页（每个新任务都会触发）；关闭后需手动打开",
+		settingsSubagentTitle: "检测到子代理时自动激活任务管理页",
+		settingsSubagentDesc: "当前会话产生新的子代理时，自动激活任务管理页；宽屏同时展开侧边栏，窄屏不强制展开全屏抽屉；关闭后需手动打开",
+		settingsJobsTitle: "有新后台任务时自动激活后台任务页",
+		settingsJobsDesc: "当前会话出现新的后台任务时，自动激活后台任务页（每个新任务都会触发）；宽屏同时展开侧边栏，窄屏不强制展开全屏抽屉；关闭后需手动打开",
 		settingsToolsTitle: "为模型注入终端工具",
 		settingsToolsDesc: "开启后，模型可通过 terminal_create 等 8 个工具创建并操作侧边栏终端（默认关闭）",
 		settingsFontFamilyTitle: "终端字体",
@@ -43703,6 +43922,7 @@ globalThis.__dshChunks__["editor"] = (require) => {
 		terminalDepsFailed: "Terminal dependency node-pty failed to load",
 		terminalDepsHint: "Run the command below in a terminal or cmd on the DSH machine to repair it, then retry (node-pty stays in sync with the DSH core version):",
 		terminalDepsProfile: " (detected profile: {profile})",
+		terminalShellNotFound: "Configured shell not found: {name} — check the shell path under Settings → Side card → Terminal",
 		refresh: "Refresh",
 		refreshUnsavedConfirm: "The file changed on disk. Refreshing will discard unsaved edits. Continue?",
 		save: "Save",
@@ -43826,10 +44046,10 @@ globalThis.__dshChunks__["editor"] = (require) => {
 		settingsConflict: "The setting changed in another window — please retry",
 		binaryNoPreview: "This file type cannot be previewed",
 		downloadToView: "Download to view",
-		settingsSubagentTitle: "Auto-open the Tasks page when a subagent appears",
-		settingsSubagentDesc: "Expand the side card and open the Tasks page when the current conversation spawns a new subagent; turn off to open it manually",
-		settingsJobsTitle: "Auto-open the Jobs page on a new background job",
-		settingsJobsDesc: "Expand the side card and open the Jobs page whenever a new background job appears for the current conversation (every new job triggers); turn off to open it manually",
+		settingsSubagentTitle: "Auto-activate the Tasks page when a subagent appears",
+		settingsSubagentDesc: "Activate the Tasks page when the current conversation spawns a new subagent; on wide screens the side card expands with it, narrow screens never force the full-screen drawer; turn off to open it manually",
+		settingsJobsTitle: "Auto-activate the Jobs page on a new background job",
+		settingsJobsDesc: "Activate the Jobs page whenever a new background job appears for the current conversation (every new job triggers); on wide screens the side card expands with it, narrow screens never force the full-screen drawer; turn off to open it manually",
 		settingsToolsTitle: "Inject terminal tools for the model",
 		settingsToolsDesc: "When enabled, the model can create and drive sidebar terminals through the 8 terminal_* tools (off by default)",
 		settingsFontFamilyTitle: "Terminal font family",
@@ -43991,207 +44211,207 @@ globalThis.__dshChunks__["editor"] = (require) => {
 		document.head.appendChild(tag);
 	}
 	var sidebar_module_css_default = {
-		"gitDiff": "S5HVoW_gitDiff",
-		"editorTreePanelFull": "S5HVoW_editorTreePanelFull",
-		"editorTreeDock": "S5HVoW_editorTreeDock",
-		"explorerEmpty": "S5HVoW_explorerEmpty",
-		"editorCm": "S5HVoW_editorCm",
-		"gitDiffHunk": "S5HVoW_gitDiffHunk",
-		"gitCommitInput": "S5HVoW_gitCommitInput",
-		"producedRow": "S5HVoW_producedRow",
-		"toggleButton": "S5HVoW_toggleButton",
-		"gitDiffTab": "S5HVoW_gitDiffTab",
-		"gitRowSelected": "S5HVoW_gitRowSelected",
-		"terminalWrap": "S5HVoW_terminalWrap",
-		"editorMain": "S5HVoW_editorMain",
-		"gitPlaceholder": "S5HVoW_gitPlaceholder",
 		"editorStatus": "S5HVoW_editorStatus",
-		"explorerDir": "S5HVoW_explorerDir",
-		"editorPathInput": "S5HVoW_editorPathInput",
-		"editorTreeToggleActive": "S5HVoW_editorTreeToggleActive",
-		"dirtyDot": "S5HVoW_dirtyDot",
-		"gitDiffFileChevronExpanded": "S5HVoW_gitDiffFileChevronExpanded",
+		"paneDrop": "S5HVoW_paneDrop",
+		"uploadDropZonePill": "S5HVoW_uploadDropZonePill",
+		"gitLogRow": "S5HVoW_gitLogRow",
 		"gitDiffFileOld": "S5HVoW_gitDiffFileOld",
-		"gitSectionHeader": "S5HVoW_gitSectionHeader",
-		"gitConfirmDesc": "S5HVoW_gitConfirmDesc",
-		"panelResizeActive": "S5HVoW_panelResizeActive",
-		"gitLogLine1": "S5HVoW_gitLogLine1",
-		"tabBar": "S5HVoW_tabBar",
-		"splitCol": "S5HVoW_splitCol",
-		"editorSearchHint": "S5HVoW_editorSearchHint",
-		"tabBoundaryError": "S5HVoW_tabBoundaryError",
-		"dropOverlay": "S5HVoW_dropOverlay",
-		"tabBarDrop": "S5HVoW_tabBarDrop",
-		"explorer": "S5HVoW_explorer",
-		"panelHidden": "S5HVoW_panelHidden",
-		"uploadDropHero": "S5HVoW_uploadDropHero",
-		"browserBlockedTitle": "S5HVoW_browserBlockedTitle",
-		"browserBlockedButton": "S5HVoW_browserBlockedButton",
-		"uploadOverlayProgress": "S5HVoW_uploadOverlayProgress",
-		"terminalRetry": "S5HVoW_terminalRetry",
-		"terminalDepsBanner": "S5HVoW_terminalDepsBanner",
-		"gitName": "S5HVoW_gitName",
-		"uploadDropChatCard": "S5HVoW_uploadDropChatCard",
-		"uploadDropZone": "S5HVoW_uploadDropZone",
-		"producedLabel": "S5HVoW_producedLabel",
-		"uploadDropZoneText": "S5HVoW_uploadDropZoneText",
-		"boundaryError": "S5HVoW_boundaryError",
-		"panelResize": "S5HVoW_panelResize",
-		"dsh-row-in": "S5HVoW_dsh-row-in",
-		"explorerRow": "S5HVoW_explorerRow",
-		"sandboxStatusOn": "S5HVoW_sandboxStatusOn",
-		"gitSection": "S5HVoW_gitSection",
-		"openWithLabel": "S5HVoW_openWithLabel",
-		"openWithName": "S5HVoW_openWithName",
-		"tabTitle": "S5HVoW_tabTitle",
-		"floatTitle": "S5HVoW_floatTitle",
-		"explorerHidden": "S5HVoW_explorerHidden",
+		"tabList": "S5HVoW_tabList",
+		"editorSearchInput": "S5HVoW_editorSearchInput",
+		"panel": "S5HVoW_panel",
 		"explorerRowDropTarget": "S5HVoW_explorerRowDropTarget",
-		"browserStart": "S5HVoW_browserStart",
-		"toggleCluster": "S5HVoW_toggleCluster",
-		"tabClose": "S5HVoW_tabClose",
-		"gitWorktreeLabel": "S5HVoW_gitWorktreeLabel",
+		"floatContent": "S5HVoW_floatContent",
 		"gitBranchSelect": "S5HVoW_gitBranchSelect",
-		"pane": "S5HVoW_pane",
-		"openWithPin": "S5HVoW_openWithPin",
-		"browser": "S5HVoW_browser",
-		"paneTab": "S5HVoW_paneTab",
-		"tabActive": "S5HVoW_tabActive",
-		"gitEmpty": "S5HVoW_gitEmpty",
+		"sandboxStatus": "S5HVoW_sandboxStatus",
 		"dropRight": "S5HVoW_dropRight",
-		"paneCard": "S5HVoW_paneCard",
+		"editorStatusError": "S5HVoW_editorStatusError",
+		"gitDiffMetaText": "S5HVoW_gitDiffMetaText",
+		"gitDiffExpand": "S5HVoW_gitDiffExpand",
+		"producedRow": "S5HVoW_producedRow",
+		"explorerRef": "S5HVoW_explorerRef",
+		"uploadDropChatHint": "S5HVoW_uploadDropChatHint",
+		"tabTitle": "S5HVoW_tabTitle",
+		"explorerRowRevealed": "S5HVoW_explorerRowRevealed",
+		"gitHeader": "S5HVoW_gitHeader",
+		"sandboxDot": "S5HVoW_sandboxDot",
+		"dropUp": "S5HVoW_dropUp",
 		"uploadOverlayCancel": "S5HVoW_uploadOverlayCancel",
-		"gitDiffLine": "S5HVoW_gitDiffLine",
-		"terminalRepairCommand": "S5HVoW_terminalRepairCommand",
-		"openWithPinActive": "S5HVoW_openWithPinActive",
-		"browserBlocked": "S5HVoW_browserBlocked",
-		"dsh-toc-flash": "S5HVoW_dsh-toc-flash",
-		"uploadDropZonePill": "S5HVoW_uploadDropZonePill",
-		"floatDropHintLabel": "S5HVoW_floatDropHintLabel",
-		"editorSearchResult": "S5HVoW_editorSearchResult",
+		"editorPlaceholder": "S5HVoW_editorPlaceholder",
 		"terminalDepsActions": "S5HVoW_terminalDepsActions",
-		"dropLeft": "S5HVoW_dropLeft",
-		"uploadOverlayProgressFill": "S5HVoW_uploadOverlayProgressFill",
-		"selectionPopup": "S5HVoW_selectionPopup",
-		"tab": "S5HVoW_tab",
-		"paneTabHidden": "S5HVoW_paneTabHidden",
-		"dropDown": "S5HVoW_dropDown",
-		"explorerRoot": "S5HVoW_explorerRoot",
-		"browserBar": "S5HVoW_browserBar",
-		"gitDiffCtx": "S5HVoW_gitDiffCtx",
+		"split": "S5HVoW_split",
+		"explorerName": "S5HVoW_explorerName",
+		"editorTitle": "S5HVoW_editorTitle",
+		"editorTreePanelFull": "S5HVoW_editorTreePanelFull",
+		"tabClose": "S5HVoW_tabClose",
+		"terminalDepsHint": "S5HVoW_terminalDepsHint",
+		"terminalRepairCommand": "S5HVoW_terminalRepairCommand",
+		"gitWorktreeLabel": "S5HVoW_gitWorktreeLabel",
+		"gitBadge": "S5HVoW_gitBadge",
+		"gitDiff": "S5HVoW_gitDiff",
+		"floatClose": "S5HVoW_floatClose",
+		"gitDiffNum": "S5HVoW_gitDiffNum",
+		"iconButton": "S5HVoW_iconButton",
 		"gitCommit": "S5HVoW_gitCommit",
+		"producedLabel": "S5HVoW_producedLabel",
+		"editorSearchResult": "S5HVoW_editorSearchResult",
+		"openWithName": "S5HVoW_openWithName",
+		"gitDiffFileChevronExpanded": "S5HVoW_gitDiffFileChevronExpanded",
+		"openWithPinActive": "S5HVoW_openWithPinActive",
+		"editorMain": "S5HVoW_editorMain",
+		"uploadDropChatCard": "S5HVoW_uploadDropChatCard",
+		"workbench": "S5HVoW_workbench",
+		"browserLiveTarget": "S5HVoW_browserLiveTarget",
+		"terminalRetry": "S5HVoW_terminalRetry",
+		"gitLogLine2": "S5HVoW_gitLogLine2",
+		"explorerRow": "S5HVoW_explorerRow",
+		"producedChip": "S5HVoW_producedChip",
+		"editorTreePanel": "S5HVoW_editorTreePanel",
+		"browserInput": "S5HVoW_browserInput",
+		"uploadOverlayProgress": "S5HVoW_uploadOverlayProgress",
+		"editorHeader": "S5HVoW_editorHeader",
+		"browserBlockedActions": "S5HVoW_browserBlockedActions",
+		"floatDropHint": "S5HVoW_floatDropHint",
+		"browserFrame": "S5HVoW_browserFrame",
 		"terminalDepsTitle": "S5HVoW_terminalDepsTitle",
+		"gitDiffTabHeader": "S5HVoW_gitDiffTabHeader",
+		"gitDiffFileTag": "S5HVoW_gitDiffFileTag",
+		"gitDiffHunkHeader": "S5HVoW_gitDiffHunkHeader",
+		"gitLogMeta": "S5HVoW_gitLogMeta",
+		"gitLogRef": "S5HVoW_gitLogRef",
+		"producedMore": "S5HVoW_producedMore",
+		"explorerBroken": "S5HVoW_explorerBroken",
+		"paneCard": "S5HVoW_paneCard",
+		"tabBarPlus": "S5HVoW_tabBarPlus",
+		"explorerError": "S5HVoW_explorerError",
+		"panelBody": "S5HVoW_panelBody",
+		"explorerSymlink": "S5HVoW_explorerSymlink",
+		"dropOverlay": "S5HVoW_dropOverlay",
+		"uploadDropZone": "S5HVoW_uploadDropZone",
+		"dirtyDot": "S5HVoW_dirtyDot",
+		"floatDropHintLabel": "S5HVoW_floatDropHintLabel",
+		"uploadOverlay": "S5HVoW_uploadOverlay",
 		"terminalDepsCommandRow": "S5HVoW_terminalDepsCommandRow",
-		"sandboxDot": "S5HVoW_sandboxDot",
-		"divider": "S5HVoW_divider",
+		"git": "S5HVoW_git",
+		"gitRowSelected": "S5HVoW_gitRowSelected",
+		"browserBlockedTitle": "S5HVoW_browserBlockedTitle",
+		"gitDiffCtx": "S5HVoW_gitDiffCtx",
+		"gitDiffDel": "S5HVoW_gitDiffDel",
 		"gitLogSubject": "S5HVoW_gitLogSubject",
-		"paneEmptyCards": "S5HVoW_paneEmptyCards",
-		"gitDiffFileChevron": "S5HVoW_gitDiffFileChevron",
+		"gitDiffTabTitle": "S5HVoW_gitDiffTabTitle",
+		"gitSectionHeader": "S5HVoW_gitSectionHeader",
+		"gitDiffAdd": "S5HVoW_gitDiffAdd",
+		"editorBanner": "S5HVoW_editorBanner",
+		"terminalDepsNote": "S5HVoW_terminalDepsNote",
+		"openWithChevron": "S5HVoW_openWithChevron",
+		"sandboxStatusOn": "S5HVoW_sandboxStatusOn",
+		"gitLogMore": "S5HVoW_gitLogMore",
+		"openWithPin": "S5HVoW_openWithPin",
+		"browserMessage": "S5HVoW_browserMessage",
+		"gitDiffFile": "S5HVoW_gitDiffFile",
+		"browserBar": "S5HVoW_browserBar",
+		"editorCm": "S5HVoW_editorCm",
+		"editorTreeToggleActive": "S5HVoW_editorTreeToggleActive",
+		"sandboxAction": "S5HVoW_sandboxAction",
+		"toggleCluster": "S5HVoW_toggleCluster",
+		"dsh-toc-flash": "S5HVoW_dsh-toc-flash",
 		"dividerCol": "S5HVoW_dividerCol",
-		"explorerSymlink": "S5HVoW_explorerSymlink",
+		"gitEmpty": "S5HVoW_gitEmpty",
+		"browserLiveCanvas": "S5HVoW_browserLiveCanvas",
+		"pinnedTab": "S5HVoW_pinnedTab",
+		"uploadOverlayTitle": "S5HVoW_uploadOverlayTitle",
+		"browserBlocked": "S5HVoW_browserBlocked",
 		"gitRow": "S5HVoW_gitRow",
-		"browserInput": "S5HVoW_browserInput",
-		"paneDrop": "S5HVoW_paneDrop",
-		"dropCenter": "S5HVoW_dropCenter",
-		"tabBadge": "S5HVoW_tabBadge",
-		"gitDiffTabHeader": "S5HVoW_gitDiffTabHeader",
-		"editorBody": "S5HVoW_editorBody",
-		"gitDiffFile": "S5HVoW_gitDiffFile",
-		"gitDiffMetaText": "S5HVoW_gitDiffMetaText",
-		"gitLogHash": "S5HVoW_gitLogHash",
-		"gitLogMore": "S5HVoW_gitLogMore",
+		"browserBlockedDesc": "S5HVoW_browserBlockedDesc",
+		"gitRowMain": "S5HVoW_gitRowMain",
 		"editor": "S5HVoW_editor",
 		"terminalBannerUrl": "S5HVoW_terminalBannerUrl",
+		"explorerHidden": "S5HVoW_explorerHidden",
+		"dividerRow": "S5HVoW_dividerRow",
+		"terminal": "S5HVoW_terminal",
+		"editorError": "S5HVoW_editorError",
+		"gitDiffFilePath": "S5HVoW_gitDiffFilePath",
+		"dropCenter": "S5HVoW_dropCenter",
+		"gitDiffTab": "S5HVoW_gitDiffTab",
+		"gitDiffLine": "S5HVoW_gitDiffLine",
+		"gitCommitInput": "S5HVoW_gitCommitInput",
+		"dropLeft": "S5HVoW_dropLeft",
+		"uploadDropHero": "S5HVoW_uploadDropHero",
+		"browserLive": "S5HVoW_browserLive",
 		"browserLiveStatus": "S5HVoW_browserLiveStatus",
-		"browserLiveCanvas": "S5HVoW_browserLiveCanvas",
-		"editorBanner": "S5HVoW_editorBanner",
-		"workbench": "S5HVoW_workbench",
-		"gitDiffCode": "S5HVoW_gitDiffCode",
-		"producedChip": "S5HVoW_producedChip",
-		"floatContent": "S5HVoW_floatContent",
-		"floatClose": "S5HVoW_floatClose",
-		"explorerBroken": "S5HVoW_explorerBroken",
-		"gitLogRow": "S5HVoW_gitLogRow",
-		"editorBinary": "S5HVoW_editorBinary",
-		"gitHeader": "S5HVoW_gitHeader",
-		"editorTreePanel": "S5HVoW_editorTreePanel",
-		"gitDiffHunkHeader": "S5HVoW_gitDiffHunkHeader",
-		"gitWorktreeRow": "S5HVoW_gitWorktreeRow",
-		"terminalDepsHint": "S5HVoW_terminalDepsHint",
-		"editorBinaryNotice": "S5HVoW_editorBinaryNotice",
 		"splitChild": "S5HVoW_splitChild",
-		"browserFrame": "S5HVoW_browserFrame",
-		"paneContent": "S5HVoW_paneContent",
-		"editorSearchInput": "S5HVoW_editorSearchInput",
-		"gitDiffFileTag": "S5HVoW_gitDiffFileTag",
+		"floatWindowDragging": "S5HVoW_floatWindowDragging",
+		"splitRow": "S5HVoW_splitRow",
+		"editorTreeResize": "S5HVoW_editorTreeResize",
+		"gitDiffHunk": "S5HVoW_gitDiffHunk",
 		"dividerActive": "S5HVoW_dividerActive",
-		"pinnedTab": "S5HVoW_pinnedTab",
-		"uploadOverlay": "S5HVoW_uploadOverlay",
-		"editorTreeSearch": "S5HVoW_editorTreeSearch",
-		"explorerRowRevealed": "S5HVoW_explorerRowRevealed",
-		"gitDiffExpand": "S5HVoW_gitDiffExpand",
-		"gitDiffHunkSection": "S5HVoW_gitDiffHunkSection",
+		"gitDiffFileChevron": "S5HVoW_gitDiffFileChevron",
+		"boundaryError": "S5HVoW_boundaryError",
+		"explorerEmpty": "S5HVoW_explorerEmpty",
+		"gitDiffCode": "S5HVoW_gitDiffCode",
+		"tabBadge": "S5HVoW_tabBadge",
+		"uploadOverlayStatus": "S5HVoW_uploadOverlayStatus",
 		"floatResize": "S5HVoW_floatResize",
-		"panelBody": "S5HVoW_panelBody",
+		"gitPlaceholder": "S5HVoW_gitPlaceholder",
+		"gitConfirmDesc": "S5HVoW_gitConfirmDesc",
+		"dsh-row-in": "S5HVoW_dsh-row-in",
+		"floatWindow": "S5HVoW_floatWindow",
+		"browser": "S5HVoW_browser",
 		"floatHeader": "S5HVoW_floatHeader",
-		"uploadDropChatHint": "S5HVoW_uploadDropChatHint",
-		"editorDownloadLink": "S5HVoW_editorDownloadLink",
-		"terminalDepsNote": "S5HVoW_terminalDepsNote",
-		"git": "S5HVoW_git",
-		"terminal": "S5HVoW_terminal",
-		"panel": "S5HVoW_panel",
-		"sandboxStatus": "S5HVoW_sandboxStatus",
-		"iconButton": "S5HVoW_iconButton",
-		"gitDiffNum": "S5HVoW_gitDiffNum",
-		"gitCommitButton": "S5HVoW_gitCommitButton",
-		"gitLogMeta": "S5HVoW_gitLogMeta",
-		"dropUp": "S5HVoW_dropUp",
-		"uploadOverlayStatus": "S5HVoW_uploadOverlayStatus",
-		"gitLogRef": "S5HVoW_gitLogRef",
-		"explorerName": "S5HVoW_explorerName",
-		"gitDiffMeta": "S5HVoW_gitDiffMeta",
-		"browserLiveTarget": "S5HVoW_browserLiveTarget",
-		"floatDropHint": "S5HVoW_floatDropHint",
-		"floatWindowDragging": "S5HVoW_floatWindowDragging",
-		"orphanedType": "S5HVoW_orphanedType",
-		"editorTreeResize": "S5HVoW_editorTreeResize",
-		"uploadOverlayCard": "S5HVoW_uploadOverlayCard",
-		"split": "S5HVoW_split",
-		"sandboxStatusOff": "S5HVoW_sandboxStatusOff",
-		"browserBlockedDesc": "S5HVoW_browserBlockedDesc",
-		"terminalBanner": "S5HVoW_terminalBanner",
-		"explorerHeader": "S5HVoW_explorerHeader",
-		"splitRow": "S5HVoW_splitRow",
+		"editorTreeDock": "S5HVoW_editorTreeDock",
+		"tabActive": "S5HVoW_tabActive",
+		"splitCol": "S5HVoW_splitCol",
+		"paneEmptyCards": "S5HVoW_paneEmptyCards",
+		"explorerRoot": "S5HVoW_explorerRoot",
 		"explorerBody": "S5HVoW_explorerBody",
-		"explorerError": "S5HVoW_explorerError",
-		"sandboxStatusText": "S5HVoW_sandboxStatusText",
-		"tabBarPlus": "S5HVoW_tabBarPlus",
-		"editorError": "S5HVoW_editorError",
-		"gitLogLine2": "S5HVoW_gitLogLine2",
-		"openWithChevron": "S5HVoW_openWithChevron",
-		"browserLive": "S5HVoW_browserLive",
-		"editorHeader": "S5HVoW_editorHeader",
-		"gitDiffTabTitle": "S5HVoW_gitDiffTabTitle",
-		"browserMessage": "S5HVoW_browserMessage",
-		"editorPlaceholder": "S5HVoW_editorPlaceholder",
-		"gitBadge": "S5HVoW_gitBadge",
-		"explorerRef": "S5HVoW_explorerRef",
-		"editorStatusError": "S5HVoW_editorStatusError",
-		"tabList": "S5HVoW_tabList",
-		"gitDiffDel": "S5HVoW_gitDiffDel",
-		"gitDiffAdd": "S5HVoW_gitDiffAdd",
+		"editorBinaryNotice": "S5HVoW_editorBinaryNotice",
+		"browserBlockedButton": "S5HVoW_browserBlockedButton",
+		"pane": "S5HVoW_pane",
+		"paneContent": "S5HVoW_paneContent",
+		"dropDown": "S5HVoW_dropDown",
+		"terminalDepsBanner": "S5HVoW_terminalDepsBanner",
+		"terminalBanner": "S5HVoW_terminalBanner",
+		"gitWorktreeRow": "S5HVoW_gitWorktreeRow",
+		"gitDiffHunkSection": "S5HVoW_gitDiffHunkSection",
+		"panelResizeActive": "S5HVoW_panelResizeActive",
+		"tabBarDrop": "S5HVoW_tabBarDrop",
+		"explorerDir": "S5HVoW_explorerDir",
+		"editorBinary": "S5HVoW_editorBinary",
+		"explorer": "S5HVoW_explorer",
+		"sandboxStatusOff": "S5HVoW_sandboxStatusOff",
+		"tabBar": "S5HVoW_tabBar",
 		"gitError": "S5HVoW_gitError",
-		"editorTitle": "S5HVoW_editorTitle",
-		"browserBlockedActions": "S5HVoW_browserBlockedActions",
+		"explorerHeader": "S5HVoW_explorerHeader",
+		"editorTreeSearch": "S5HVoW_editorTreeSearch",
+		"openWithLabel": "S5HVoW_openWithLabel",
 		"gitLink": "S5HVoW_gitLink",
-		"gitDiffFilePath": "S5HVoW_gitDiffFilePath",
-		"sandboxAction": "S5HVoW_sandboxAction",
-		"producedMore": "S5HVoW_producedMore",
+		"tabBoundaryError": "S5HVoW_tabBoundaryError",
+		"editorSearchHint": "S5HVoW_editorSearchHint",
+		"toggleButton": "S5HVoW_toggleButton",
+		"sandboxStatusText": "S5HVoW_sandboxStatusText",
+		"panelHidden": "S5HVoW_panelHidden",
+		"uploadOverlayProgressFill": "S5HVoW_uploadOverlayProgressFill",
+		"terminalWrap": "S5HVoW_terminalWrap",
+		"gitName": "S5HVoW_gitName",
+		"editorBody": "S5HVoW_editorBody",
+		"gitSection": "S5HVoW_gitSection",
+		"floatTitle": "S5HVoW_floatTitle",
+		"paneTabHidden": "S5HVoW_paneTabHidden",
+		"paneTab": "S5HVoW_paneTab",
 		"explorerCopied": "S5HVoW_explorerCopied",
-		"uploadOverlayTitle": "S5HVoW_uploadOverlayTitle",
-		"gitRowMain": "S5HVoW_gitRowMain",
-		"floatWindow": "S5HVoW_floatWindow",
-		"dividerRow": "S5HVoW_dividerRow"
+		"divider": "S5HVoW_divider",
+		"tab": "S5HVoW_tab",
+		"uploadDropZoneText": "S5HVoW_uploadDropZoneText",
+		"editorPathInput": "S5HVoW_editorPathInput",
+		"panelResize": "S5HVoW_panelResize",
+		"browserStart": "S5HVoW_browserStart",
+		"selectionPopup": "S5HVoW_selectionPopup",
+		"gitDiffMeta": "S5HVoW_gitDiffMeta",
+		"gitLogHash": "S5HVoW_gitLogHash",
+		"gitLogLine1": "S5HVoW_gitLogLine1",
+		"editorDownloadLink": "S5HVoW_editorDownloadLink",
+		"gitCommitButton": "S5HVoW_gitCommitButton",
+		"uploadOverlayCard": "S5HVoW_uploadOverlayCard",
+		"orphanedType": "S5HVoW_orphanedType"
 	};
 	//#endregion
 	//#region src/client/TextEditor.tsx
@@ -44222,38 +44442,26 @@ globalThis.__dshChunks__["editor"] = (require) => {
 		const themeCompRef = (0, react.useRef)(null);
 		/** The app's resolved color scheme; the editor re-themes in place on flips. */
 		const [dark, setDark] = (0, react.useState)(() => isDarkScheme());
-		/** The floating "add to conversation" popup (viewport-anchored; null = hidden). */
-		const [popup, setPopup] = (0, react.useState)(null);
-		/** Live mirror of the popup state for click-time reads (no re-render race). */
-		const popupRef = (0, react.useRef)(null);
-		const hidePopup = () => {
-			popupRef.current = null;
-			setPopup(null);
-		};
-		/** Anchor the popup above the selection center; clamp inside the viewport. */
-		const showPopup = (insert, left, top) => {
-			const next = {
-				insert,
-				left: Math.min(Math.max(left, 80), window.innerWidth - 80),
-				top
-			};
-			popupRef.current = next;
-			setPopup(next);
-		};
-		/** The popup button's click: insert the stored payload into the draft. */
-		const commitPopup = () => {
-			const current = popupRef.current;
-			if (current === null) return;
-			appendToDraft(ctx, scope.sessionId, current.insert);
-			hidePopup();
-		};
+		/**
+		* The floating "add to conversation" popup (viewport-anchored; null =
+		* hidden). The hook owns show/hide/commit plus the global dismissal
+		* listeners (outside mousedown, Escape, hidden tab/window, and the editor
+		* surface leaving the viewport — the tab-switch/panel-collapse paths have
+		* no DOM events of their own) — see selection-popup.ts.
+		*/
+		const selectionPopup = useSelectionPopup({
+			onCommit: (insert) => {
+				appendToDraft(ctx, scope.sessionId, insert);
+			},
+			getSurface: () => hostRef.current
+		});
 		(0, react.useEffect)(() => subscribeColorScheme(() => {
 			setDark(isDarkScheme());
 		}), []);
 		(0, react.useEffect)(() => {
 			setDirty(false);
 			setSaveState("idle");
-			hidePopup();
+			selectionPopup.hide();
 		}, [content]);
 		(0, react.useEffect)(() => {
 			if (content === void 0) return;
@@ -44291,31 +44499,31 @@ globalThis.__dshChunks__["editor"] = (require) => {
 						]),
 						EditorView.updateListener.of((update) => {
 							if (update.geometryChanged || update.viewportChanged) {
-								hidePopup();
+								selectionPopup.hide();
 								return;
 							}
 							if (!update.view.hasFocus) {
-								hidePopup();
+								selectionPopup.hide();
 								return;
 							}
 							if (!(update.selectionSet || update.docChanged || update.focusChanged)) return;
 							const sel = update.state.selection.main;
 							if (sel.empty) {
-								hidePopup();
+								selectionPopup.hide();
 								return;
 							}
 							const text = update.state.sliceDoc(sel.from, sel.to);
 							if (text.trim() === "") {
-								hidePopup();
+								selectionPopup.hide();
 								return;
 							}
 							const rect = update.view.coordsAtPos(sel.head);
 							if (rect === null) {
-								hidePopup();
+								selectionPopup.hide();
 								return;
 							}
 							const doc = update.state.doc;
-							showPopup(buildSelectionInsert(path, scope.cwd, {
+							selectionPopup.show(buildSelectionInsert(path, scope.cwd, {
 								start: doc.lineAt(sel.from).number,
 								end: doc.lineAt(sel.to).number
 							}, text), rect.left - window.scrollX + (rect.right - rect.left) / 2, rect.top - window.scrollY);
@@ -44403,17 +44611,18 @@ globalThis.__dshChunks__["editor"] = (require) => {
 				className: sidebar_module_css_default.editorCm,
 				ref: hostRef
 			})] }),
-			popup !== null && (0, react_dom.createPortal)(/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+			selectionPopup.popup !== null && (0, react_dom.createPortal)(/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 				type: "button",
+				ref: selectionPopup.buttonRef,
 				className: sidebar_module_css_default.selectionPopup,
 				style: {
-					left: popup.left,
-					top: popup.top
+					left: selectionPopup.popup.left,
+					top: selectionPopup.popup.top
 				},
 				onMouseDown: (event) => {
 					event.preventDefault();
 				},
-				onClick: commitPopup,
+				onClick: selectionPopup.commit,
 				children: t("addToConversation")
 			}), document.body)
 		] });