@qzsy/dsh-workspace-combobox 0.2.0 → 0.2.2

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.0
+dsh plugin add @qzsy/dsh-workspace-combobox@0.2.2
 ~~~
 
 ## Features

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,13 +696,14 @@ 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
 		const BRANCH_STATUS_ENDPOINT = 'api/workspace-git';
 		const BRANCH_SWITCH_ENDPOINT = 'api/workspace-git/switch';
+		const MIN_SWITCH_FEEDBACK_MS = 700;
 
 		function branchEndpoint(route) {
 			if (typeof document !== 'undefined' && typeof document.baseURI === 'string') {
@@ -717,6 +716,10 @@ window.__ModuleLoader__.load({
 			return route;
 		}
 
+		function wait(ms) {
+			return new Promise((resolve) => setTimeout(resolve, ms));
+		}
+
 		async function branchRequest(route, payload, signal) {
 			const response = await fetch(branchEndpoint(route), {
 				method: 'POST',
@@ -742,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);
@@ -871,14 +874,19 @@ window.__ModuleLoader__.load({
 			const choose = async (name, isRemote) => {
 				if (busy) return;
 				const targetPath = path;
+				const startedAt = Date.now();
 				setSwitching(name);
 				setError('');
 				try {
 					const next = await branchRequest(BRANCH_SWITCH_ENDPOINT, { path: targetPath, branch: name, remote: isRemote });
+					const remaining = MIN_SWITCH_FEEDBACK_MS - (Date.now() - startedAt);
+					if (remaining > 0) await wait(remaining);
 					if (selection !== undefined && typeof selection.get === 'function' && selection.get() !== targetPath) return;
 					setStatus(next);
 					setOpen(false);
 				} catch (failure) {
+					const remaining = MIN_SWITCH_FEEDBACK_MS - (Date.now() - startedAt);
+					if (remaining > 0) await wait(remaining);
 					setError(failure instanceof Error && failure.message.length > 0 ? failure.message : t('branch.failed'));
 				} finally {
 					setSwitching(null);
@@ -1159,7 +1167,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');
@@ -1221,7 +1228,6 @@ window.__ModuleLoader__.load({
 								createWorkspace: actions.createWorkspace
 							},
 							getHome,
-							selection: selectedPathStore,
 							shortcutLabel
 						})
 					}, HeroWorkspaceCombobox);
@@ -1230,20 +1236,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qzsy/dsh-workspace-combobox",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "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",