@qzsy/dsh-workspace-combobox 0.2.1 → 0.2.3

package/README.md

@@ -5,7 +5,7 @@ Workspace combobox plus a Git branch picker for DeepSeek Harness.
 ## Install
 
 ~~~bash
-dsh plugin add @qzsy/dsh-workspace-combobox@0.2.1
+dsh plugin add @qzsy/dsh-workspace-combobox@0.2.3
 ~~~
 
 ## Features
@@ -32,7 +32,7 @@ shortcuts.
 ### Git branch picker
 
 When the selected workspace is a Git repository, a branch chip appears in the
-New Session hero row, to the right of the agent preset (标准模式):
+New Session hero row, immediately beside the workspace chip (like Cursor):
 
 - shows the current branch, or detached HEAD with the short commit
 - local and remote tabs, each with a count and search
@@ -49,7 +49,7 @@ New Session hero row, to the right of the agent preset (标准模式):
 | Surface | Mechanism |
 | --- | --- |
 | New Session workspace dropdown | <code>conversation.hero.workspace</code> occupant at <code>priority: -1</code>; the slot registry renders the lowest priority, shadowing the shipped picker panel. The trigger chip, open state, <code>selectedId</code>, and <code>onPick</code> still come from the conversation owner. |
-| Branch chip beside the agent preset | <code>conversation.hero.options</code> list entry <code>workspace-combobox.branch</code>, after the agent-preset seat. The selected workspace path is shared through a small client store written by the workspace picker. |
+| Branch chip beside the workspace trigger | Rendered from the same <code>conversation.hero.workspace</code> slot, directly after the shipped workspace chip; the selected path comes from the slot's <code>selectedId</code>. |
 | Frame-wide switcher | <code>shell.overlay</code> entry driven by the <code>workspace.combobox</code> shortcut. |
 | Host capability | Two authenticated <code>/api</code> routes registered on <code>ctx.connection.fetch</code>: <code>/api/workspace-git</code> and <code>/api/workspace-git/switch</code>. |
 
@@ -91,5 +91,5 @@ additions.
   replaceable; typing happens inside the opened panel.
 - Remote branch lists use already-fetched remote-tracking refs, not a live
   network fetch.
-- The branch chip lives in the conversation hero row, so it is visible while
-  the new-session hero is shown.
+- The branch chip lives beside the workspace trigger in the conversation hero
+  row, so it is visible while the new-session hero is shown.

package/dist/client.js

@@ -546,7 +546,7 @@ window.__ModuleLoader__.load({
 		 * trigger chip and hands over open/close state, the anchor, and the
 		 * selection; this panel adds pinyin-aware search over names and paths.
 		 */
-		function HeroWorkspaceCombobox({ open, anchorRef, selectedId, onPick, onClose, actions, getHome, shortcutLabel, selection, useWorkspaces, useSessions, t }) {
+		function HeroWorkspaceCombobox({ open, anchorRef, selectedId, onPick, onClose, actions, getHome, shortcutLabel, useWorkspaces, useSessions, t }) {
 			const home = typeof getHome === 'function' ? getHome() : '';
 			const rows = useWorkspaceRows(useWorkspaces, useSessions, home, false);
 			const [query, setQuery] = useState('');
@@ -559,9 +559,7 @@ window.__ModuleLoader__.load({
 			const items = useWorkspaceSearch(rows, query);
 			const selectedRow = selectedId === undefined || selectedId === null ? undefined : rows.find((row) => String(row.id) === String(selectedId));
 			const selectedPath = selectedRow === undefined ? '' : String(selectedRow.path ?? '');
-			useEffect(() => {
-				if (selection !== undefined && typeof selection.set === 'function') selection.set(selectedPath);
-			}, [selection, selectedPath]);
+			const branch = selectedPath.length === 0 ? null : h(BranchSelector, { path: selectedPath, t });
 
 			useEffect(() => {
 				if (!open) return undefined;
@@ -646,7 +644,7 @@ window.__ModuleLoader__.load({
 					.finally(() => setAdding(false));
 			};
 
-			if (!open || position === null) return null;
+			if (!open || position === null) return branch;
 			const activeOption = items.length === 0 ? undefined : Math.min(Math.max(activeIndex, 0), items.length - 1);
 			const panel = h('div', {
 				className: 'wsc-card wsc-heroCard',
@@ -698,8 +696,8 @@ window.__ModuleLoader__.load({
 			);
 			// The shipped picker portals its menu out of the Hero tree; mirror that so
 			// no transformed or clipped ancestor can displace the panel.
-			if (createPortal !== null && typeof document !== 'undefined') return createPortal(panel, document.body);
-			return panel;
+			if (createPortal !== null && typeof document !== 'undefined') return h(React.Fragment, null, branch, createPortal(panel, document.body));
+			return h(React.Fragment, null, branch, panel);
 		}
 
 		//#region git branch
@@ -747,8 +745,8 @@ window.__ModuleLoader__.load({
 			return body.value === null || typeof body.value !== 'object' ? {} : body.value;
 		}
 
-		function BranchSelector({ selection, t }) {
-			const path = usePathValue(selection);
+		function BranchSelector({ path: activePath, t }) {
+			const path = typeof activePath === 'string' ? activePath : '';
 			const [status, setStatus] = useState(null);
 			const [loading, setLoading] = useState(false);
 			const [open, setOpen] = useState(false);
@@ -812,12 +810,17 @@ window.__ModuleLoader__.load({
 					const button = buttonRef.current;
 					if (button === null) return;
 					const rect = button.getBoundingClientRect();
-					const width = Math.max(280, Math.min(360, window.innerWidth - 16));
-					const left = Math.max(8, Math.min(rect.right - width, window.innerWidth - width - 8));
-					const estimated = Math.min(420, window.innerHeight * 0.72);
-					const below = rect.bottom + 6;
-					const top = below + estimated > window.innerHeight ? Math.max(8, rect.top - estimated - 6) : below;
-					setPosition({ left, top, width });
+					const margin = 8;
+					const gap = 6;
+					const width = Math.max(280, Math.min(360, window.innerWidth - margin * 2));
+					const left = Math.max(margin, Math.min(rect.left, window.innerWidth - width - margin));
+					const below = rect.bottom + gap;
+					const spaceBelow = window.innerHeight - below - margin;
+					const spaceAbove = rect.top - gap - margin;
+					const placeAbove = spaceBelow < 220 && spaceAbove > spaceBelow;
+					const maxHeight = Math.max(120, Math.min(420, placeAbove ? spaceAbove : spaceBelow));
+					const top = placeAbove ? Math.max(margin, rect.top - gap - maxHeight) : below;
+					setPosition({ left, top, width, maxHeight });
 				};
 				update();
 				window.addEventListener('resize', update);
@@ -900,7 +903,7 @@ window.__ModuleLoader__.load({
 				className: 'wsc-branch-menu',
 				role: 'dialog',
 				'aria-label': t('branch.title'),
-				style: position === null ? { visibility: 'hidden' } : { left: position.left + 'px', top: position.top + 'px', width: position.width + 'px' }
+				style: position === null ? { visibility: 'hidden' } : { left: position.left + 'px', top: position.top + 'px', width: position.width + 'px', maxHeight: position.maxHeight + 'px' }
 			},
 			h('div', { className: 'wsc-branch-head' },
 				h('span', { className: 'wsc-branch-headIcon' }, loading ? h('span', { className: 'wsc-spinner' }) : h(GitBranchIcon, null)),
@@ -1169,7 +1172,6 @@ window.__ModuleLoader__.load({
 			ctx.effect(() => installStyles(), 'workspace-combobox: styles');
 			const t = ctx.locale.bind(NS);
 			const store = createStore({ open: false });
-			const selectedPathStore = createPathStore();
 			const workspaces = ctx.get('workspaces');
 			const uiWorkspace = ctx.get('uiWorkspace');
 			const remote = ctx.get('remote');
@@ -1231,7 +1233,6 @@ window.__ModuleLoader__.load({
 								createWorkspace: actions.createWorkspace
 							},
 							getHome,
-							selection: selectedPathStore,
 							shortcutLabel
 						})
 					}, HeroWorkspaceCombobox);
@@ -1240,20 +1241,6 @@ window.__ModuleLoader__.load({
 					return () => {};
 				}
 			});
-			ctx.slots.inject('conversation.hero.options', () => {
-				try {
-					return ctx.slots.register({
-						name: 'conversation.hero.options',
-						id: 'workspace-combobox.branch',
-						order: 20,
-						locale: NS,
-						inject: () => ({ selection: selectedPathStore })
-					}, BranchSelector);
-				} catch (error) {
-					console.warn('workspace combobox: branch selector registration failed', error);
-					return () => {};
-				}
-			});
 		}
 		//#endregion
 

package/locale/en.json

@@ -1,6 +1,6 @@
 {
   "meta": {
     "title": "Workspace Combobox",
-    "description": "Turns the New Session workspace picker into a combobox with mixed Chinese/English pinyin search, adds a Git branch picker beside the agent preset with local/remote search and a visible switching state, and opens a frame-wide workspace switcher with Ctrl+."
+    "description": "Turns the New Session workspace picker into a combobox with mixed Chinese/English pinyin search, adds a Git branch picker beside the workspace chip with local/remote search and a visible switching state, and opens a frame-wide workspace switcher with Ctrl+."
   }
 }

package/locale/zh.json

@@ -1,6 +1,6 @@
 {
   "meta": {
     "title": "工作区组合框",
-    "description": "把新会话的工作区选择器换成支持中英混拼（汉字 / 全拼 / 首字母）检索的组合框，并在标准模式右侧显示 Git 分支选择器；支持本地/远程分支搜索与带加载状态的快速切换，Ctrl+. 随时打开全局工作区切换器。"
+    "description": "把新会话的工作区选择器换成支持中英混拼（汉字 / 全拼 / 首字母）检索的组合框，并在工作区选择器旁边显示 Git 分支选择器；支持本地/远程分支搜索与带加载状态的快速切换，Ctrl+. 随时打开全局工作区切换器。"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qzsy/dsh-workspace-combobox",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Pinyin-aware workspace combobox for the New Session picker, plus a Git branch picker with local/remote branch switching and a Ctrl+. frame-wide workspace switcher.",
   "type": "module",
   "license": "MIT",