@rooode/dsh-plugin-preview 0.1.14 → 0.1.16

package/lib/client.js

@@ -22,6 +22,7 @@
     // Storage & State Constants
     // =========================================================================
     const STORAGE_KEY_TABS = 'dsh:preview:tabs:v1';
+    const STORAGE_KEY_WS_TABS = 'dsh:preview:ws_tabs:v2';
     const STORAGE_KEY_WIDTH = 'dsh:preview:panel_width:v1';
     const STORAGE_KEY_TREE_OPEN = 'dsh:preview:tree:open:v1';
     const STORAGE_KEY_TREE_WIDTH = 'dsh:preview:tree:width:v1';
@@ -44,9 +45,11 @@
     ]);
 
     // =========================================================================
-    // Global Event Bus & State Store
+    // Global Event Bus & State Store (Workspace-Scoped Tabs)
     // =========================================================================
     let clientCtx = null;
+    let workspaceTabsMap = {}; // { [normalizedWsKey: string]: { tabs: Tab[], activeTabId: string | null } }
+    let currentWorkspaceKey = '';
     let globalTabs = [];
     let globalActiveTabId = null;
     let globalIsPanelOpen = false;
@@ -58,6 +61,11 @@
     let globalLastOpenTime = 0;
     const stateListeners = new Set();
 
+    function normalizeWorkspaceKey(rawPath) {
+      if (!rawPath || typeof rawPath !== 'string' || !rawPath.trim()) return '__default__';
+      return rawPath.trim().replace(/\\/g, '/').replace(/\/+$/, '').toLowerCase();
+    }
+
     try {
       const savedManualWs = localStorage.getItem(STORAGE_KEY_MANUAL_WS);
       if (savedManualWs && savedManualWs.trim()) {
@@ -92,28 +100,86 @@
       }
     } catch (e) {}
 
-    try {
-      const savedTabs = localStorage.getItem(STORAGE_KEY_TABS);
-      if (savedTabs) {
-        globalTabs = JSON.parse(savedTabs);
-        if (globalTabs.length > 0) {
-          globalActiveTabId = globalTabs[0].id;
+    function loadAllWorkspaceTabsFromStorage() {
+      try {
+        const raw = localStorage.getItem(STORAGE_KEY_WS_TABS);
+        if (raw) {
+          workspaceTabsMap = JSON.parse(raw) || {};
+        } else {
+          // Backward-compatible fallback for legacy STORAGE_KEY_TABS
+          const oldRaw = localStorage.getItem(STORAGE_KEY_TABS);
+          if (oldRaw) {
+            const oldTabs = JSON.parse(oldRaw);
+            if (Array.isArray(oldTabs) && oldTabs.length > 0) {
+              const wsKey = normalizeWorkspaceKey(getCurrentWorkspaceRoot());
+              workspaceTabsMap[wsKey] = {
+                tabs: oldTabs,
+                activeTabId: oldTabs[0] ? oldTabs[0].id : null,
+              };
+            }
+          }
         }
-      }
-    } catch (e) {}
-
-    function notifyStateChange() {
-      for (const fn of stateListeners) {
-        try { fn(); } catch (err) { console.error('[Preview] State notify error:', err); }
+      } catch (e) {
+        workspaceTabsMap = {};
       }
     }
 
     function saveTabsToStorage() {
       try {
-        localStorage.setItem(STORAGE_KEY_TABS, JSON.stringify(globalTabs.slice(0, 15)));
+        const wsKey = currentWorkspaceKey || normalizeWorkspaceKey(getCurrentWorkspaceRoot());
+        if (!workspaceTabsMap || typeof workspaceTabsMap !== 'object') {
+          workspaceTabsMap = {};
+        }
+        workspaceTabsMap[wsKey] = {
+          tabs: (globalTabs || []).slice(0, 20),
+          activeTabId: globalActiveTabId || null,
+        };
+        localStorage.setItem(STORAGE_KEY_WS_TABS, JSON.stringify(workspaceTabsMap));
       } catch (e) {}
     }
 
+    function syncCurrentWorkspaceTabs(targetWsRoot) {
+      const newWsRoot = targetWsRoot || getCurrentWorkspaceRoot();
+      const newKey = normalizeWorkspaceKey(newWsRoot);
+
+      // Save previous workspace's tabs
+      if (currentWorkspaceKey && currentWorkspaceKey !== newKey) {
+        if (!workspaceTabsMap || typeof workspaceTabsMap !== 'object') {
+          workspaceTabsMap = {};
+        }
+        workspaceTabsMap[currentWorkspaceKey] = {
+          tabs: (globalTabs || []).slice(0, 20),
+          activeTabId: globalActiveTabId || null,
+        };
+      }
+
+      currentWorkspaceKey = newKey;
+
+      // Load target workspace's tabs
+      const stored = workspaceTabsMap && workspaceTabsMap[newKey];
+      if (stored && Array.isArray(stored.tabs)) {
+        globalTabs = [...stored.tabs];
+        globalActiveTabId = stored.activeTabId && globalTabs.some(t => t.id === stored.activeTabId)
+          ? stored.activeTabId
+          : (globalTabs[0] ? globalTabs[0].id : null);
+      } else {
+        globalTabs = [];
+        globalActiveTabId = null;
+      }
+
+      saveTabsToStorage();
+      notifyStateChange();
+    }
+
+    // Initial load
+    loadAllWorkspaceTabsFromStorage();
+
+    function notifyStateChange() {
+      for (const fn of stateListeners) {
+        try { fn(); } catch (err) { console.error('[Preview] State notify error:', err); }
+      }
+    }
+
     function setPanelWidth(width) {
       const maxW = Math.floor(window.innerWidth * 0.92);
       globalPanelWidth = Math.max(MIN_PANEL_WIDTH, Math.min(width, maxW));
@@ -435,6 +501,13 @@
       const ext = getFileExtension(fullPath);
       const tabId = 'tab:' + fullPath.toLowerCase();
 
+      // Ensure current workspace tabs are loaded
+      const currentWs = getCurrentWorkspaceRoot();
+      const currentKey = normalizeWorkspaceKey(currentWs);
+      if (currentWorkspaceKey !== currentKey) {
+        syncCurrentWorkspaceTabs(currentWs);
+      }
+
       const existingIndex = globalTabs.findIndex(t => t.id === tabId || t.filePath.toLowerCase() === fullPath.toLowerCase());
       if (existingIndex >= 0) {
         globalActiveTabId = globalTabs[existingIndex].id;
@@ -509,43 +582,56 @@
       const oldNorm = oldPath.replace(/\\/g, '/').toLowerCase();
       const newNorm = newPath.replace(/\\/g, '/');
 
-      globalTabs = globalTabs.map(tab => {
-        const tabNorm = tab.filePath.replace(/\\/g, '/').toLowerCase();
-        if (!isDir) {
-          if (tabNorm === oldNorm) {
-            changed = true;
-            const newFileName = getFileName(newPath);
-            const newExt = getFileExtension(newPath);
-            const newCat = getFileTypeCategory(newPath);
-            return {
-              ...tab,
-              id: 'tab:' + newPath.toLowerCase(),
-              filePath: newPath,
-              title: newFileName,
-              extension: newExt,
-              category: newCat,
-            };
+      const updateList = (list) => {
+        if (!Array.isArray(list)) return [];
+        return list.map(tab => {
+          const tabNorm = tab.filePath.replace(/\\/g, '/').toLowerCase();
+          if (!isDir) {
+            if (tabNorm === oldNorm) {
+              changed = true;
+              const newFileName = getFileName(newPath);
+              const newExt = getFileExtension(newPath);
+              const newCat = getFileTypeCategory(newPath);
+              return {
+                ...tab,
+                id: 'tab:' + newPath.toLowerCase(),
+                filePath: newPath,
+                title: newFileName,
+                extension: newExt,
+                category: newCat,
+              };
+            }
+          } else {
+            if (tabNorm === oldNorm || tabNorm.startsWith(oldNorm + '/')) {
+              changed = true;
+              const subPath = tab.filePath.replace(/\\/g, '/').slice(oldNorm.length);
+              const updatedFilePath = newNorm + subPath;
+              const newFileName = getFileName(updatedFilePath);
+              const newExt = getFileExtension(updatedFilePath);
+              const newCat = getFileTypeCategory(updatedFilePath);
+              return {
+                ...tab,
+                id: 'tab:' + updatedFilePath.toLowerCase(),
+                filePath: updatedFilePath,
+                title: newFileName,
+                extension: newExt,
+                category: newCat,
+              };
+            }
           }
-        } else {
-          if (tabNorm === oldNorm || tabNorm.startsWith(oldNorm + '/')) {
-            changed = true;
-            const subPath = tab.filePath.replace(/\\/g, '/').slice(oldNorm.length);
-            const updatedFilePath = newNorm + subPath;
-            const newFileName = getFileName(updatedFilePath);
-            const newExt = getFileExtension(updatedFilePath);
-            const newCat = getFileTypeCategory(updatedFilePath);
-            return {
-              ...tab,
-              id: 'tab:' + updatedFilePath.toLowerCase(),
-              filePath: updatedFilePath,
-              title: newFileName,
-              extension: newExt,
-              category: newCat,
-            };
+          return tab;
+        });
+      };
+
+      globalTabs = updateList(globalTabs);
+
+      if (workspaceTabsMap && typeof workspaceTabsMap === 'object') {
+        for (const k of Object.keys(workspaceTabsMap)) {
+          if (workspaceTabsMap[k] && Array.isArray(workspaceTabsMap[k].tabs)) {
+            workspaceTabsMap[k].tabs = updateList(workspaceTabsMap[k].tabs);
           }
         }
-        return tab;
-      });
+      }
 
       if (changed) {
         if (globalActiveTabId) {
@@ -567,24 +653,37 @@
       if (!targetPath) return;
       let changed = false;
       const delNorm = targetPath.replace(/\\/g, '/').toLowerCase();
-      const nextTabs = globalTabs.filter(tab => {
-        const tabNorm = tab.filePath.replace(/\\/g, '/').toLowerCase();
-        if (!isDir) {
-          if (tabNorm === delNorm) {
-            changed = true;
-            return false;
+
+      const filterList = (list) => {
+        if (!Array.isArray(list)) return [];
+        return list.filter(tab => {
+          const tabNorm = tab.filePath.replace(/\\/g, '/').toLowerCase();
+          if (!isDir) {
+            if (tabNorm === delNorm) {
+              changed = true;
+              return false;
+            }
+          } else {
+            if (tabNorm === delNorm || tabNorm.startsWith(delNorm + '/')) {
+              changed = true;
+              return false;
+            }
           }
-        } else {
-          if (tabNorm === delNorm || tabNorm.startsWith(delNorm + '/')) {
-            changed = true;
-            return false;
+          return true;
+        });
+      };
+
+      globalTabs = filterList(globalTabs);
+
+      if (workspaceTabsMap && typeof workspaceTabsMap === 'object') {
+        for (const k of Object.keys(workspaceTabsMap)) {
+          if (workspaceTabsMap[k] && Array.isArray(workspaceTabsMap[k].tabs)) {
+            workspaceTabsMap[k].tabs = filterList(workspaceTabsMap[k].tabs);
           }
         }
-        return true;
-      });
+      }
 
       if (changed) {
-        globalTabs = nextTabs;
         if (!globalTabs.some(t => t.id === globalActiveTabId)) {
           globalActiveTabId = globalTabs.length > 0 ? globalTabs[0].id : null;
         }
@@ -3158,10 +3257,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', {
@@ -3172,7 +3273,6 @@
             h('span', {
               id: `line-gutter-${lineNum}`,
               className: 'dsh-line-gutter',
-              style: { minWidth: `${gutterWidth}px` },
               onClick: () => onLineClick && onLineClick(lineNum),
               title: `第 ${lineNum} 行 (点击定位)`,
             }, lineNum),
@@ -3986,7 +4086,7 @@
         if (current && current !== lastKnownWorkspace) {
           console.log('[Preview] Active workspace auto-switched:', lastKnownWorkspace, '->', current);
           lastKnownWorkspace = current;
-          notifyStateChange();
+          syncCurrentWorkspaceTabs(current);
         }
       };
 
@@ -5961,10 +6061,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;
@@ -5987,7 +6090,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;
@@ -6290,6 +6393,9 @@
         window.__dsh_open_preview = openPreviewFile;
       }
 
+      loadAllWorkspaceTabsFromStorage();
+      syncCurrentWorkspaceTabs(getCurrentWorkspaceRoot());
+
       injectStyles();
       setupFileInterceptors(ctx);
 

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.14)');
+        console.log('[PreviewService] Registered /api/preview route on webServer (v0.1.16)');
       } 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.14",
+  "version": "0.1.16",
   "description": "DeepSeek Harness Markdown 文档与工作空间文件浏览器右侧预览插件 (支持工作区文件树、文件夹创建与文件移动、JSON 交互结构树/格式化、Java/C++/Python/JS/TS/YAML/Go/Rust 多语言语法高亮与符号大纲、自动换行与多标签 FileTabs)",
   "type": "module",
   "main": "lib/index.js",