@rooode/dsh-plugin-preview 0.1.17 → 0.1.18

package/lib/client.js

@@ -394,75 +394,108 @@
       return result;
     }
 
-    function getCurrentWorkspaceRoot() {
-      // Priority 1: User manual override selection (if explicitly chosen by user)
+    function resolveActiveWorkspace(ctx) {
       if (globalManualWorkspace && typeof globalManualWorkspace === 'string' && globalManualWorkspace.trim()) {
-        return globalManualWorkspace.trim();
+        const p = globalManualWorkspace.trim().replace(/[\\/]+$/, '');
+        return { path: p, id: 'manual', title: getFileName(p) || p };
       }
-
-      // Priority 2: Derive active workspace from clientCtx (workspaces + sessions)
-      if (clientCtx) {
+      if (ctx) {
         try {
-          const sSnap = clientCtx.sessions?.list?.getSnapshot?.();
-          const wSnap = clientCtx.workspaces?.list?.getSnapshot?.();
-          const currentSessionId = sSnap?.current;
-
-          // 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();
+          const sSnap = ctx.sessions?.list?.getSnapshot?.();
+          const wSnap = ctx.workspaces?.list?.getSnapshot?.();
+          const curSessionId = sSnap?.current;
+
+          // 1. Session cwd or workspaceId
+          if (curSessionId && sSnap?.byId?.[curSessionId]) {
+            const sess = sSnap.byId[curSessionId];
+            let wsPath = sess.cwd;
+            let wsId = sess.workspaceId;
+            let wsTitle = sess.title;
+
+            if (sess.workspaceId && wSnap?.items) {
+              const match = wSnap.items.find(item => item.workspaceId === sess.workspaceId);
+              if (match) {
+                if (match.path) wsPath = match.path;
+                if (match.title) wsTitle = match.title;
+                wsId = match.workspaceId;
+              }
+            }
+            if (wsPath && typeof wsPath === 'string' && wsPath.trim()) {
+              const clean = wsPath.trim().replace(/[\\/]+$/, '');
+              return {
+                path: clean,
+                id: wsId || clean,
+                title: wsTitle || getFileName(clean) || '工作区',
+              };
             }
           }
 
-          // 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 (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();
-              }
+          // 2. Find in wSnap.items by sessionIds
+          if (curSessionId && wSnap?.items) {
+            const match = wSnap.items.find(item => Array.isArray(item.sessionIds) && item.sessionIds.includes(curSessionId));
+            if (match?.path) {
+              const clean = match.path.trim().replace(/[\\/]+$/, '');
+              return {
+                path: clean,
+                id: match.workspaceId || clean,
+                title: match.title || getFileName(clean) || '工作区',
+              };
             }
           }
 
-          // C. Check recentWorkspaceId in wSnap
-          if (wSnap && wSnap.recentWorkspaceId && Array.isArray(wSnap.items)) {
+          // 3. Recent workspace
+          if (wSnap?.recentWorkspaceId && 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();
+            if (recent?.path) {
+              const clean = recent.path.trim().replace(/[\\/]+$/, '');
+              return {
+                path: clean,
+                id: recent.workspaceId || clean,
+                title: recent.title || getFileName(clean) || '工作区',
+              };
             }
           }
 
-          // D. Fallback to first workspace in wSnap.items
-          if (wSnap && Array.isArray(wSnap.items) && wSnap.items.length > 0) {
+          // 4. First workspace item
+          if (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();
+            const p = first.path || first.directory || first.cwd;
+            if (p && typeof p === 'string' && p.trim()) {
+              const clean = p.trim().replace(/[\\/]+$/, '');
+              return {
+                path: clean,
+                id: first.workspaceId || clean,
+                title: first.title || getFileName(clean) || '工作区',
+              };
             }
           }
         } catch (e) {
-          console.warn('[Preview] getCurrentWorkspaceRoot failed:', e);
+          console.warn('[Preview] resolveActiveWorkspace error:', e);
         }
       }
 
-      // Priority 3: URL hash or search parameter
       if (typeof location !== 'undefined') {
         if (location.hash) {
           const m = location.hash.match(/workspace=([^&]+)/);
-          if (m) return decodeURIComponent(m[1]);
+          if (m) {
+            const p = decodeURIComponent(m[1]).replace(/[\\/]+$/, '');
+            return { path: p, id: p, title: getFileName(p) || p };
+          }
         }
         if (location.search) {
           const m = location.search.match(/workspace=([^&]+)/);
-          if (m) return decodeURIComponent(m[1]);
+          if (m) {
+            const p = decodeURIComponent(m[1]).replace(/[\\/]+$/, '');
+            return { path: p, id: p, title: getFileName(p) || p };
+          }
         }
       }
 
-      return '';
+      return { path: '.', id: 'default', title: '工作区' };
+    }
+
+    function getCurrentWorkspaceRoot() {
+      return resolveActiveWorkspace(clientCtx).path || '.';
     }
 
     function resolveAbsoluteFilePath(targetPath) {
@@ -1813,11 +1846,11 @@
         }
       }, [searchQuery, treeData]);
 
-      // Listen to external workspace switch events (e.g. from Git plugin)
+      // Listen to external workspace switch events (e.g. from DSH sidebar or Git plugin)
       useEffect(() => {
         const handleWsSwitch = (e) => {
-          if (e.detail?.path && e.detail.path !== globalManualWorkspace) {
-            setManualWorkspace(e.detail.path);
+          if (e.detail?.path) {
+            setCurrentWs(e.detail.path);
           }
         };
         window.addEventListener('dsh:workspace:switch', handleWsSwitch);
@@ -6399,6 +6432,59 @@
       injectStyles();
       setupFileInterceptors(ctx);
 
+      // Subscribe to DSH Session & Workspace store changes (Left Sidebar updates)
+      let lastTrackedSessionId = null;
+      let lastTrackedWsPath = getCurrentWorkspaceRoot();
+
+      function handleDshSessionOrWorkspaceChange() {
+        try {
+          const sSnap = ctx.sessions?.list?.getSnapshot?.();
+          const curSessionId = sSnap?.current;
+
+          // When user clicks a session on the left sidebar:
+          if (curSessionId && curSessionId !== lastTrackedSessionId) {
+            lastTrackedSessionId = curSessionId;
+            // Clear manual override when user actively selects a session in the left sidebar
+            if (globalManualWorkspace) {
+              globalManualWorkspace = null;
+              try { localStorage.removeItem(STORAGE_KEY_MANUAL_WS); } catch (e) {}
+            }
+          }
+
+          const activeWsInfo = resolveActiveWorkspace(ctx);
+          const activeWsPath = activeWsInfo.path;
+
+          if (activeWsPath && activeWsPath !== lastTrackedWsPath) {
+            lastTrackedWsPath = activeWsPath;
+            syncCurrentWorkspaceTabs(activeWsPath);
+            notifyStateChange();
+            if (typeof window !== 'undefined') {
+              window.dispatchEvent(new CustomEvent('dsh:workspace:switch', {
+                detail: { path: activeWsPath, id: activeWsInfo.id, title: activeWsInfo.title }
+              }));
+            }
+          }
+        } catch (e) {
+          console.warn('[Preview] Session/Workspace change handler error:', e);
+        }
+      }
+
+      if (ctx.sessions?.list?.subscribe) {
+        ctx.sessions.list.subscribe(handleDshSessionOrWorkspaceChange);
+      }
+      if (ctx.workspaces?.list?.subscribe) {
+        ctx.workspaces.list.subscribe(handleDshSessionOrWorkspaceChange);
+      }
+
+      // Safety polling every 800ms for route or state changes
+      setInterval(handleDshSessionOrWorkspaceChange, 800);
+
+      // Listen to popstate / hashchange
+      if (typeof window !== 'undefined') {
+        window.addEventListener('popstate', handleDshSessionOrWorkspaceChange);
+        window.addEventListener('hashchange', handleDshSessionOrWorkspaceChange);
+      }
+
       console.log('[Preview] Markdown Preview Client Plugin loaded successfully!');
 
       // 1. Mount Unified Right Activity Rail Host into shell.overlay

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