zen-gitsync 2.16.6 → 2.16.8

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

@@ -407,7 +407,8 @@ export function registerFileOpenRoutes({
 
   // 检测本地工具是否已安装(供前端根据结果决定是否显示对应按钮)
   // 检测方式: spawn 'tool --version',exit 0 即视为已安装
-  // 超时 3s 避免某个工具卡在 PATH 解析上时整个接口挂起
+  // 超时 15s:Claude CLI / opencode 等 Node 包装的工具首次冷启动
+  // 在 Windows 上经常 5-7s(磁盘 cache + Defender 扫描),3s 永远命中超时。
   app.get('/api/check-tools', asyncRoute(async (req, res) => {
       const checkCmd = (cmd) => new Promise((resolve) => {
         const child = spawn(cmd, ['--version'], {
@@ -424,7 +425,7 @@ export function registerFileOpenRoutes({
         };
         child.on('error', () => finish(false));
         child.on('exit', (code) => finish(code === 0));
-        setTimeout(() => finish(false), 3000);
+        setTimeout(() => finish(false), 15000);
       });
 
       const [vscode, claude, codex, opencode] = await Promise.all([