@rooode/dsh-plugin-preview 0.1.13 → 0.1.15

package/lib/client.js

@@ -252,12 +252,37 @@
 
     function getAllAvailableWorkspaces() {
       const map = new Map();
-      const currentRoot = getCurrentWorkspaceRoot().replace(/[\\/]+$/, '').toLowerCase();
+      const currentRoot = (getCurrentWorkspaceRoot() || '').replace(/[\\/]+$/, '').toLowerCase();
 
-      // 1. Collect from active & historical sessions in clientCtx.sessions
+      // 1. Collect from workspaces store in clientCtx.workspaces
+      if (clientCtx && clientCtx.workspaces) {
+        try {
+          const wSnap = clientCtx.workspaces.list?.getSnapshot?.();
+          const items = (wSnap && (wSnap.items || wSnap.workspaces || wSnap.byId)) || [];
+          const list = Array.isArray(items) ? items : Object.values(items);
+          for (const w of list) {
+            const dir = (w && (w.path || w.directory || w.cwd)) || '';
+            if (dir && typeof dir === 'string' && dir.trim()) {
+              const norm = dir.trim().replace(/[\\/]+$/, '');
+              const key = norm.toLowerCase();
+              if (!map.has(key)) {
+                map.set(key, {
+                  id: w.workspaceId || w.id || norm,
+                  path: norm,
+                  name: w.title || w.name || getFileName(norm) || norm,
+                  isCurrent: key === currentRoot,
+                  source: 'workspace',
+                });
+              }
+            }
+          }
+        } catch (e) {}
+      }
+
+      // 2. Collect from active & historical sessions in clientCtx.sessions
       if (clientCtx && clientCtx.sessions) {
         try {
-          const sSnap = clientCtx.sessions.list?.getSnapshot();
+          const sSnap = clientCtx.sessions.list?.getSnapshot?.();
           if (sSnap && sSnap.byId) {
             for (const sid of Object.keys(sSnap.byId)) {
               const s = sSnap.byId[sid];
@@ -279,33 +304,6 @@
         } catch (e) {}
       }
 
-      // 2. Collect from workspaces store in clientCtx.workspaces
-      if (clientCtx && clientCtx.workspaces) {
-        try {
-          const wSnap = clientCtx.workspaces.list?.getSnapshot();
-          if (wSnap) {
-            const rawList = wSnap.workspaces || wSnap.items || wSnap.byId || [];
-            const list = Array.isArray(rawList) ? rawList : Object.values(rawList);
-            for (const w of list) {
-              const dir = (w && (w.directory || w.path || w.cwd)) || '';
-              if (dir && typeof dir === 'string' && dir.trim()) {
-                const norm = dir.trim().replace(/[\\/]+$/, '');
-                const key = norm.toLowerCase();
-                if (!map.has(key)) {
-                  map.set(key, {
-                    id: w.id || norm,
-                    path: norm,
-                    name: w.title || w.name || getFileName(norm) || norm,
-                    isCurrent: key === currentRoot,
-                    source: 'workspace',
-                  });
-                }
-              }
-            }
-          }
-        } catch (e) {}
-      }
-
       // 3. Collect from globalManualWorkspace if set
       if (globalManualWorkspace && typeof globalManualWorkspace === 'string' && globalManualWorkspace.trim()) {
         const norm = globalManualWorkspace.trim().replace(/[\\/]+$/, '');
@@ -331,51 +329,62 @@
     }
 
     function getCurrentWorkspaceRoot() {
-      // Priority 1: User manual override selection
+      // Priority 1: User manual override selection (if explicitly chosen by user)
       if (globalManualWorkspace && typeof globalManualWorkspace === 'string' && globalManualWorkspace.trim()) {
         return globalManualWorkspace.trim();
       }
 
-      // Priority 2: Active session working directory (cwd)
-      if (clientCtx && clientCtx.sessions) {
+      // Priority 2: Derive active workspace from clientCtx (workspaces + sessions)
+      if (clientCtx) {
         try {
-          const sSnap = clientCtx.sessions.list?.getSnapshot();
+          const sSnap = clientCtx.sessions?.list?.getSnapshot?.();
+          const wSnap = clientCtx.workspaces?.list?.getSnapshot?.();
           const currentSessionId = sSnap?.current;
-          if (currentSessionId && sSnap?.byId?.[currentSessionId]?.cwd) {
-            const cwd = sSnap.byId[currentSessionId].cwd;
-            if (cwd && typeof cwd === 'string' && cwd.trim()) {
-              return cwd.trim();
+
+          // A. Find workspace in wSnap.items containing currentSessionId
+          if (currentSessionId && wSnap && Array.isArray(wSnap.items) && wSnap.items.length > 0) {
+            const match = wSnap.items.find(item => item.sessionIds && Array.isArray(item.sessionIds) && item.sessionIds.includes(currentSessionId));
+            if (match && match.path && typeof match.path === 'string' && match.path.trim()) {
+              return match.path.trim();
             }
           }
-        } catch (e) {}
-      }
 
-      // Priority 3: Current workspace in workspaces store
-      if (clientCtx && clientCtx.workspaces) {
-        try {
-          const wSnap = clientCtx.workspaces.list?.getSnapshot();
-          if (wSnap) {
-            const curId = wSnap.current;
-            if (curId && wSnap.workspaces && wSnap.workspaces[curId]) {
-              const w = wSnap.workspaces[curId];
-              const dir = w.directory || w.path || w.cwd;
-              if (dir) return dir.trim();
+          // B. Check active session summary cwd or workspaceId
+          if (currentSessionId && sSnap && sSnap.byId && sSnap.byId[currentSessionId]) {
+            const sess = sSnap.byId[currentSessionId];
+            if (sess.cwd && typeof sess.cwd === 'string' && sess.cwd.trim()) {
+              return sess.cwd.trim();
             }
-            if (wSnap.byId && curId && wSnap.byId[curId]) {
-              const w = wSnap.byId[curId];
-              const dir = w.directory || w.path || w.cwd;
-              if (dir) return dir.trim();
+            if (sess.workspaceId && wSnap && Array.isArray(wSnap.items)) {
+              const match = wSnap.items.find(item => item.workspaceId === sess.workspaceId);
+              if (match && match.path && typeof match.path === 'string' && match.path.trim()) {
+                return match.path.trim();
+              }
             }
-            if (Array.isArray(wSnap.items) && wSnap.items.length > 0) {
-              const first = wSnap.items[0];
-              const dir = first.directory || first.path || first.cwd;
-              if (dir) return dir.trim();
+          }
+
+          // C. Check recentWorkspaceId in wSnap
+          if (wSnap && wSnap.recentWorkspaceId && Array.isArray(wSnap.items)) {
+            const recent = wSnap.items.find(item => item.workspaceId === wSnap.recentWorkspaceId);
+            if (recent && recent.path && typeof recent.path === 'string' && recent.path.trim()) {
+              return recent.path.trim();
             }
           }
-        } catch (e) {}
+
+          // D. Fallback to first workspace in wSnap.items
+          if (wSnap && Array.isArray(wSnap.items) && wSnap.items.length > 0) {
+            const first = wSnap.items[0];
+            const dir = first.path || first.directory || first.cwd;
+            if (dir && typeof dir === 'string' && dir.trim()) {
+              return dir.trim();
+            }
+          }
+        } catch (e) {
+          console.warn('[Preview] getCurrentWorkspaceRoot failed:', e);
+        }
       }
 
-      // Priority 4: URL hash or search parameter
+      // Priority 3: URL hash or search parameter
       if (typeof location !== 'undefined') {
         if (location.hash) {
           const m = location.hash.match(/workspace=([^&]+)/);
@@ -1629,13 +1638,28 @@
       const [dragOverNode, setDragOverNode] = useState(null);
       const [clipboard, setClipboard] = useState(null); // { action: 'cut', path: string, name: string, isDir: boolean } | null
 
-      const currentWs = getCurrentWorkspaceRoot();
+      const [currentWs, setCurrentWs] = useState(getCurrentWorkspaceRoot());
+
+      useEffect(() => {
+        const handleStateUpdate = () => {
+          const newWs = getCurrentWorkspaceRoot();
+          if (newWs !== currentWs) {
+            setCurrentWs(newWs);
+          }
+        };
+        stateListeners.add(handleStateUpdate);
+        return () => stateListeners.delete(handleStateUpdate);
+      }, [currentWs]);
 
-      const loadTree = useCallback(async (force = false) => {
+      const loadTree = useCallback(async (force = false, targetWs) => {
         setIsLoading(true);
         setError(null);
         try {
-          const rootPath = getCurrentWorkspaceRoot();
+          const rootPath = targetWs || currentWs || getCurrentWorkspaceRoot();
+          if (!rootPath) {
+            setTreeData(null);
+            return;
+          }
           const query = encodeURIComponent(rootPath);
           const res = await fetch(`/api/preview/workspace-tree?path=${query}`);
           if (!res.ok) throw new Error(`HTTP ${res.status}`);
@@ -1652,11 +1676,11 @@
         } finally {
           setIsLoading(false);
         }
-      }, []);
+      }, [currentWs]);
 
       useEffect(() => {
-        loadTree();
-      }, [loadTree, globalManualWorkspace]);
+        loadTree(false, currentWs);
+      }, [loadTree, currentWs, globalManualWorkspace]);
 
       const handleToggleExpand = (dirPath) => {
         setExpandedPaths(prev => {
@@ -3134,10 +3158,12 @@
       }, [normalizedContent, category, isHighlighted, searchQuery]);
 
       const lineCount = highlightedLines.length;
-      const digitCount = Math.max(2, String(lineCount).length);
-      const gutterWidth = Math.max(24, digitCount * 7.5 + 12);
+      const digitCount = Math.max(1, String(lineCount).length);
 
-      return h('div', { className: `dsh-code-editor-view ${isWordWrap ? 'word-wrap' : ''}` },
+      return h('div', {
+        className: `dsh-code-editor-view ${isWordWrap ? 'word-wrap' : ''}`,
+        style: { '--dsh-gutter-digits': digitCount }
+      },
         highlightedLines.map((lineHtml, i) => {
           const lineNum = i + 1;
           return h('div', {
@@ -3148,7 +3174,6 @@
             h('span', {
               id: `line-gutter-${lineNum}`,
               className: 'dsh-line-gutter',
-              style: { minWidth: `${gutterWidth}px` },
               onClick: () => onLineClick && onLineClick(lineNum),
               title: `第 ${lineNum} 行 (点击定位)`,
             }, lineNum),
@@ -3951,6 +3976,37 @@
           }
         }, true); // Use capture phase to intercept early!
       }
+
+      // 3. Listen to DSH Workspaces and Sessions state changes for auto-switching
+      let lastKnownWorkspace = getCurrentWorkspaceRoot();
+
+      const handleWorkspaceSync = () => {
+        // Clear manual override when user switches workspace/session in host DSH
+        globalManualWorkspace = null;
+        const current = getCurrentWorkspaceRoot();
+        if (current && current !== lastKnownWorkspace) {
+          console.log('[Preview] Active workspace auto-switched:', lastKnownWorkspace, '->', current);
+          lastKnownWorkspace = current;
+          notifyStateChange();
+        }
+      };
+
+      if (ctx && ctx.workspaces && ctx.workspaces.list && typeof ctx.workspaces.list.subscribe === 'function') {
+        try {
+          ctx.workspaces.list.subscribe(handleWorkspaceSync);
+        } catch (e) {}
+      }
+
+      if (ctx && ctx.sessions && ctx.sessions.list && typeof ctx.sessions.list.subscribe === 'function') {
+        try {
+          ctx.sessions.list.subscribe(handleWorkspaceSync);
+        } catch (e) {}
+      }
+
+      if (typeof window !== 'undefined') {
+        window.addEventListener('hashchange', handleWorkspaceSync);
+        window.addEventListener('popstate', handleWorkspaceSync);
+      }
     }
 
     // =========================================================================
@@ -5906,10 +5962,13 @@
         .dsh-line-gutter {
           display: inline-block;
           box-sizing: border-box;
-          padding: 0 8px 0 6px;
+          width: calc(var(--dsh-gutter-digits, 2) * 1ch + 8px);
+          min-width: calc(var(--dsh-gutter-digits, 2) * 1ch + 8px);
+          padding: 0 4px 0 2px;
           text-align: right;
           user-select: none;
           color: var(--dsw-alias-label-tertiary, #94a3b8);
+          font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Cascadia Code", "Fira Code", monospace;
           font-size: 11px;
           line-height: 20px;
           flex-shrink: 0;
@@ -5932,7 +5991,7 @@
         .dsh-line-code {
           flex: 1;
           min-width: 0;
-          padding: 0 12px 0 10px;
+          padding: 0 8px 0 6px;
           white-space: pre;
           font-family: inherit;
           font-size: inherit;

package/lib/index.js

@@ -29,7 +29,7 @@ export class PreviewService extends Service {
             handler: this.handleHttpRequest.bind(this),
           });
         });
-        console.log('[PreviewService] Registered /api/preview route on webServer (v0.1.13)');
+        console.log('[PreviewService] Registered /api/preview route on webServer (v0.1.15)');
       } else {
         console.warn('[PreviewService] webServer not available yet in ctx');
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rooode/dsh-plugin-preview",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "DeepSeek Harness Markdown 文档与工作空间文件浏览器右侧预览插件 (支持工作区文件树、文件夹创建与文件移动、JSON 交互结构树/格式化、Java/C++/Python/JS/TS/YAML/Go/Rust 多语言语法高亮与符号大纲、自动换行与多标签 FileTabs)",
   "type": "module",
   "main": "lib/index.js",