zen-gitsync 2.16.27 → 2.16.29

package/src/ui/server/routes/branchStatus.js

@@ -1,105 +1,105 @@
-// Copyright 2026 xz333221
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-import { asyncRoute, HttpError } from '../utils/asyncRoute.js'
-
-import logger from '../utils/logger.js'
-
-export function registerBranchStatusRoutes({
-  app,
-  execGitCommand,
-  getIsGitRepo,
-  getBranchStatusCache,
-  setBranchStatusCache,
-  getRecentPushStatus,
-  setRecentPushStatus
-}) {
-  // 获取当前分支 - 直接读取，不缓存（git symbolic-ref 极快，<5ms）
-  app.get('/api/branch', asyncRoute(async (req, res) => {
-      try {
-        const { stdout } = await execGitCommand(['symbolic-ref', '--short', 'HEAD']);
-        res.json({ branch: stdout.trim() });
-      } catch (error) {
-        res.status(500).json({ error: error.message });
-      }
-    }));
-
-  // 获取分支与远程的差异状态（领先/落后提交数）
-  app.get('/api/branch-status', asyncRoute(async (req, res) => {
-      try {
-        if (!getIsGitRepo()) {
-          return res.json({ hasUpstream: false, ahead: 0, behind: 0 });
-        }
-      
-        const now = Date.now();
-        const forceRefresh = req.query.force === 'true';
-      
-        const recentPushStatus = getRecentPushStatus();
-        const branchStatusCache = getBranchStatusCache();
-      
-        // push 后10秒内直接返回同步状态
-        if (recentPushStatus.justPushed &&
-            (now - recentPushStatus.pushTime) < recentPushStatus.validDuration) {
-          logger.info('检测到最近推送过，直接返回同步状态');
-          return res.json({
-            hasUpstream: true,
-            upstreamBranch: branchStatusCache.upstreamBranch || 'origin/main',
-            ahead: 0,
-            behind: 0
-          });
-        }
-      
-        // 5秒缓存分支名，防止短时间内重复执行 git symbolic-ref / git rev-parse
-        const branchInfoCacheValid = !forceRefresh &&
-                                     branchStatusCache.currentBranch &&
-                                     branchStatusCache.upstreamBranch &&
-                                     (now - branchStatusCache.lastUpdate) < branchStatusCache.cacheTimeout;
-      
-        let currentBranch, upstreamBranch;
-      
-        if (branchInfoCacheValid) {
-          currentBranch = branchStatusCache.currentBranch;
-          upstreamBranch = branchStatusCache.upstreamBranch;
-          logger.info(`使用5秒缓存的分支名: ${currentBranch} -> ${upstreamBranch}`);
-        } else {
-          // 直接读取，不再走5分钟长缓存
-          const { stdout: branchOut } = await execGitCommand(['symbolic-ref', '--short', 'HEAD']);
-          currentBranch = branchOut.trim();
-      
-          const { stdout: upstreamOut } = await execGitCommand(
-            ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}'],
-            { ignoreError: true }
-          );
-          upstreamBranch = upstreamOut.trim() || null;
-      
-          if (!upstreamBranch) {
-            setBranchStatusCache({ currentBranch: null, upstreamBranch: null, lastUpdate: 0, cacheTimeout: 5000 });
-            return res.json({ hasUpstream: false, ahead: 0, behind: 0 });
-          }
-      
-          setBranchStatusCache({ currentBranch, upstreamBranch, lastUpdate: now, cacheTimeout: 5000 });
-        }
-      
-        const { stdout: aheadBehindOutput } = await execGitCommand(
-          ['rev-list', '--left-right', '--count', `${currentBranch}...${upstreamBranch}`]
-        );
-        const [ahead, behind] = aheadBehindOutput.trim().split('\t').map(Number);
-      
-        res.json({ hasUpstream: true, upstreamBranch, ahead, behind });
-      } catch (error) {
-        logger.error('获取分支状态失败:', error);
-        res.status(500).json({ error: error.message });
-      }
-    }));
-}
+// Copyright 2026 xz333221
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+import { asyncRoute, HttpError } from '../utils/asyncRoute.js'
+
+import logger from '../utils/logger.js'
+
+export function registerBranchStatusRoutes({
+  app,
+  execGitCommand,
+  getIsGitRepo,
+  getBranchStatusCache,
+  setBranchStatusCache,
+  getRecentPushStatus,
+  setRecentPushStatus
+}) {
+  // 获取当前分支 - 直接读取，不缓存（git symbolic-ref 极快，<5ms）
+  app.get('/api/branch', asyncRoute(async (req, res) => {
+      try {
+        const { stdout } = await execGitCommand(['symbolic-ref', '--short', 'HEAD']);
+        res.json({ branch: stdout.trim() });
+      } catch (error) {
+        res.status(500).json({ error: error.message });
+      }
+    }));
+
+  // 获取分支与远程的差异状态（领先/落后提交数）
+  app.get('/api/branch-status', asyncRoute(async (req, res) => {
+      try {
+        if (!getIsGitRepo()) {
+          return res.json({ hasUpstream: false, ahead: 0, behind: 0 });
+        }
+      
+        const now = Date.now();
+        const forceRefresh = req.query.force === 'true';
+      
+        const recentPushStatus = getRecentPushStatus();
+        const branchStatusCache = getBranchStatusCache();
+      
+        // push 后10秒内直接返回同步状态
+        if (recentPushStatus.justPushed &&
+            (now - recentPushStatus.pushTime) < recentPushStatus.validDuration) {
+          logger.info('检测到最近推送过，直接返回同步状态');
+          return res.json({
+            hasUpstream: true,
+            upstreamBranch: branchStatusCache.upstreamBranch || 'origin/main',
+            ahead: 0,
+            behind: 0
+          });
+        }
+      
+        // 5秒缓存分支名，防止短时间内重复执行 git symbolic-ref / git rev-parse
+        const branchInfoCacheValid = !forceRefresh &&
+                                     branchStatusCache.currentBranch &&
+                                     branchStatusCache.upstreamBranch &&
+                                     (now - branchStatusCache.lastUpdate) < branchStatusCache.cacheTimeout;
+      
+        let currentBranch, upstreamBranch;
+      
+        if (branchInfoCacheValid) {
+          currentBranch = branchStatusCache.currentBranch;
+          upstreamBranch = branchStatusCache.upstreamBranch;
+          logger.info(`使用5秒缓存的分支名: ${currentBranch} -> ${upstreamBranch}`);
+        } else {
+          // 直接读取，不再走5分钟长缓存
+          const { stdout: branchOut } = await execGitCommand(['symbolic-ref', '--short', 'HEAD']);
+          currentBranch = branchOut.trim();
+      
+          const { stdout: upstreamOut } = await execGitCommand(
+            ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}'],
+            { ignoreError: true }
+          );
+          upstreamBranch = upstreamOut.trim() || null;
+      
+          if (!upstreamBranch) {
+            setBranchStatusCache({ currentBranch: null, upstreamBranch: null, lastUpdate: 0, cacheTimeout: 5000 });
+            return res.json({ hasUpstream: false, ahead: 0, behind: 0 });
+          }
+      
+          setBranchStatusCache({ currentBranch, upstreamBranch, lastUpdate: now, cacheTimeout: 5000 });
+        }
+      
+        const { stdout: aheadBehindOutput } = await execGitCommand(
+          ['rev-list', '--left-right', '--count', `${currentBranch}...${upstreamBranch}`]
+        );
+        const [ahead, behind] = aheadBehindOutput.trim().split('\t').map(Number);
+      
+        res.json({ hasUpstream: true, upstreamBranch, ahead, behind });
+      } catch (error) {
+        logger.error('获取分支状态失败:', error);
+        res.status(500).json({ error: error.message });
+      }
+    }));
+}

package/src/ui/server/routes/fileOpen.js

@@ -22,6 +22,7 @@ const TOOL_INSTALL_PACKAGES = Object.freeze({
   claude: '@anthropic-ai/claude-code',
   codex: '@openai/codex',
   opencode: 'opencode-ai',
+  dsh: '@deepseek-ai/dsh',
 });
 
 const TOOL_DOCS_URLS = Object.freeze({
@@ -31,6 +32,7 @@ const TOOL_DOCS_URLS = Object.freeze({
   opencode: 'https://opencode.ai/docs',
   kimi: 'https://moonshotai.github.io/kimi-code/en/guides/getting-started',
   zcode: 'https://zcode.z.ai/',
+  dsh: 'https://github.com/deepseek-ai/deepseek-harness',
 });
 
 function commandExists(command, platform = process.platform) {
@@ -265,6 +267,41 @@ async function launchKimiCode(dirPath) {
   return launchInTerminal(dirPath, 'kimi');
 }
 
+async function launchDsh(dirPath) {
+  const executable = await findDshExecutable();
+  if (!executable) throw new Error('未检测到 DeepSeek Harness，请先全局安装 dsh CLI');
+  if (process.platform === 'win32') {
+    // 编码 PowerShell 命令，避免 cmd start 对 dsh.cmd 完整路径中的引号进行二次解析。
+    const escapedExecutable = executable.replace(/'/g, "''");
+    const script = `& '${escapedExecutable}' web`;
+    const encoded = Buffer.from(script, 'utf16le').toString('base64');
+    return spawnDetached('cmd.exe', [
+      '/c', 'start', '""', 'powershell.exe', '-NoLogo', '-NoExit',
+      '-ExecutionPolicy', 'Bypass', '-EncodedCommand', encoded,
+    ], { cwd: dirPath });
+  }
+  return launchInTerminal(dirPath, executable, ['web']);
+}
+
+async function findDshExecutable() {
+  if (process.platform !== 'win32') return commandExists('dsh') ? 'dsh' : null;
+
+  const candidates = [path.join(process.env.APPDATA || '', 'npm', 'dsh.cmd')];
+  const npmPrefix = spawnSync('npm.cmd', ['prefix', '-g'], {
+    encoding: 'utf8',
+    windowsHide: true,
+  }).stdout?.trim();
+  if (npmPrefix) candidates.push(path.join(npmPrefix, 'dsh.cmd'));
+
+  for (const candidate of candidates.filter(Boolean)) {
+    try {
+      const stat = await fs.stat(candidate);
+      if (stat.isFile()) return candidate;
+    } catch {}
+  }
+  return null;
+}
+
 async function findKimiExecutable() {
   if (process.platform !== 'win32') return commandExists('kimi') ? 'kimi' : null;
 
@@ -669,6 +706,19 @@ export function registerFileOpenRoutes({
     }
   }));
 
+  // 用 DeepSeek Harness 打开目录
+  app.post('/api/open-directory-with-dsh', asyncRoute(async (req, res) => {
+    const { path: dirPath } = req.body || {};
+    if (!dirPath) throw new HttpError(400, '目录路径不能为空');
+    try {
+      await fs.access(dirPath);
+      await launchDsh(dirPath);
+      res.json({ success: true, message: '已启动 DeepSeek Harness' });
+    } catch (error) {
+      res.status(400).json({ success: false, error: error.message || '无法启动 DeepSeek Harness，请确认已安装 Node.js' });
+    }
+  }));
+
   // 用 ZCode 打开目录
   app.post('/api/open-directory-with-zcode', asyncRoute(async (req, res) => {
     const { path: dirPath } = req.body || {};
@@ -725,13 +775,14 @@ export function registerFileOpenRoutes({
         setTimeout(() => finish(false), 15000);
       });
 
-      const [vscode, claude, codex, opencode, kimiExecutable, zcodeExecutable] = await Promise.all([
+      const [vscode, claude, codex, opencode, kimiExecutable, zcodeExecutable, dshExecutable] = await Promise.all([
         checkCmd('code'),
         checkCmd('claude'),
         checkCmd('codex'),
         checkCmd('opencode'),
         findKimiExecutable(),
         findZCodeExecutable(),
+        findDshExecutable(),
       ]);
 
       const installers = getToolInstallers();
@@ -745,6 +796,7 @@ export function registerFileOpenRoutes({
         opencode,
         kimi: !!kimiExecutable,
         zcode: !!zcodeExecutable,
+        dsh: !!dshExecutable,
       });
     }));
 }