zen-gitsync 2.13.23 → 2.13.24

package/src/ui/public/favicon.svg

@@ -1,75 +1,75 @@
-<svg width="200" height="200" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <radialGradient id="bgGrad" cx="38%" cy="32%" r="70%">
-      <stop offset="0%" stop-color="#1e1b4b"/>
-      <stop offset="100%" stop-color="#0d0b1e"/>
-    </radialGradient>
-    <linearGradient id="mainGrad" x1="0%" y1="0%" x2="0%" y2="100%">
-      <stop offset="0%" stop-color="#c4b5fd"/>
-      <stop offset="100%" stop-color="#7c3aed"/>
-    </linearGradient>
-    <linearGradient id="featGrad" x1="0%" y1="0%" x2="100%" y2="100%">
-      <stop offset="0%" stop-color="#7dd3fc"/>
-      <stop offset="100%" stop-color="#0284c7"/>
-    </linearGradient>
-    <filter id="glow" x="-40%" y="-40%" width="180%" height="180%">
-      <feGaussianBlur in="SourceGraphic" stdDeviation="2.5" result="blur"/>
-      <feMerge><feMergeNode in="blur"/><feMergeNode in="SourceGraphic"/></feMerge>
-    </filter>
-    <filter id="softGlow" x="-20%" y="-20%" width="140%" height="140%">
-      <feGaussianBlur in="SourceGraphic" stdDeviation="1.5" result="blur"/>
-      <feMerge><feMergeNode in="blur"/><feMergeNode in="SourceGraphic"/></feMerge>
-    </filter>
-  </defs>
-
-  <!-- 背景圆 -->
-  <circle cx="100" cy="100" r="96" fill="url(#bgGrad)"/>
-
-  <!-- 同步外弧（上半，代表 sync 循环） -->
-  <path d="M 100,20 A 80,80 0 1,1 36,153"
-        stroke="rgba(167,139,250,0.18)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
-  <!-- 同步外弧（下半） -->
-  <path d="M 36,153 A 80,80 0 0,1 164,153"
-        stroke="rgba(56,189,248,0.18)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
-  <!-- 同步箭头（上） -->
-  <path d="M 91,17 L 100,20 L 96,29"
-        stroke="rgba(167,139,250,0.55)" stroke-width="2.5" fill="none"
-        stroke-linecap="round" stroke-linejoin="round"/>
-  <!-- 同步箭头（下） -->
-  <path d="M 163,145 L 164,154 L 155,151"
-        stroke="rgba(56,189,248,0.55)" stroke-width="2.5" fill="none"
-        stroke-linecap="round" stroke-linejoin="round"/>
-
-  <!-- 主分支竖线 -->
-  <line x1="76" y1="44" x2="76" y2="156"
-        stroke="url(#mainGrad)" stroke-width="5.5" stroke-linecap="round"
-        filter="url(#softGlow)"/>
-
-  <!-- 特性分支曲线（分出） -->
-  <path d="M 76,80 C 98,80 130,96 130,120 L 130,140"
-        stroke="url(#featGrad)" stroke-width="4.5" fill="none"
-        stroke-linecap="round" filter="url(#softGlow)"/>
-  <!-- 特性分支合并回主分支 -->
-  <path d="M 130,140 C 130,156 105,159 76,155"
-        stroke="url(#featGrad)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
-
-  <!-- 主分支节点 -->
-  <circle cx="76" cy="48"  r="11" fill="#13103a" stroke="#c4b5fd" stroke-width="3" filter="url(#glow)"/>
-  <circle cx="76" cy="48"  r="5"  fill="#ddd6fe"/>
-
-  <circle cx="76" cy="84"  r="11" fill="#13103a" stroke="#a78bfa" stroke-width="3"/>
-  <circle cx="76" cy="84"  r="5"  fill="#c4b5fd"/>
-
-  <circle cx="76" cy="120" r="11" fill="#13103a" stroke="#8b5cf6" stroke-width="3"/>
-  <circle cx="76" cy="120" r="5"  fill="#a78bfa"/>
-
-  <circle cx="76" cy="155" r="11" fill="#13103a" stroke="#7c3aed" stroke-width="3" filter="url(#glow)"/>
-  <circle cx="76" cy="155" r="5"  fill="#8b5cf6"/>
-
-  <!-- 特性分支节点 -->
-  <circle cx="130" cy="115" r="11" fill="#13103a" stroke="#38bdf8" stroke-width="3" filter="url(#glow)"/>
-  <circle cx="130" cy="115" r="5"  fill="#7dd3fc"/>
-
-  <circle cx="130" cy="143" r="11" fill="#13103a" stroke="#0ea5e9" stroke-width="3" filter="url(#glow)"/>
-  <circle cx="130" cy="143" r="5"  fill="#38bdf8"/>
-</svg>
+<svg width="200" height="200" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <radialGradient id="bgGrad" cx="38%" cy="32%" r="70%">
+      <stop offset="0%" stop-color="#1e1b4b"/>
+      <stop offset="100%" stop-color="#0d0b1e"/>
+    </radialGradient>
+    <linearGradient id="mainGrad" x1="0%" y1="0%" x2="0%" y2="100%">
+      <stop offset="0%" stop-color="#c4b5fd"/>
+      <stop offset="100%" stop-color="#7c3aed"/>
+    </linearGradient>
+    <linearGradient id="featGrad" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" stop-color="#7dd3fc"/>
+      <stop offset="100%" stop-color="#0284c7"/>
+    </linearGradient>
+    <filter id="glow" x="-40%" y="-40%" width="180%" height="180%">
+      <feGaussianBlur in="SourceGraphic" stdDeviation="2.5" result="blur"/>
+      <feMerge><feMergeNode in="blur"/><feMergeNode in="SourceGraphic"/></feMerge>
+    </filter>
+    <filter id="softGlow" x="-20%" y="-20%" width="140%" height="140%">
+      <feGaussianBlur in="SourceGraphic" stdDeviation="1.5" result="blur"/>
+      <feMerge><feMergeNode in="blur"/><feMergeNode in="SourceGraphic"/></feMerge>
+    </filter>
+  </defs>
+
+  <!-- 背景圆 -->
+  <circle cx="100" cy="100" r="96" fill="url(#bgGrad)"/>
+
+  <!-- 同步外弧（上半，代表 sync 循环） -->
+  <path d="M 100,20 A 80,80 0 1,1 36,153"
+        stroke="rgba(167,139,250,0.18)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
+  <!-- 同步外弧（下半） -->
+  <path d="M 36,153 A 80,80 0 0,1 164,153"
+        stroke="rgba(56,189,248,0.18)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
+  <!-- 同步箭头（上） -->
+  <path d="M 91,17 L 100,20 L 96,29"
+        stroke="rgba(167,139,250,0.55)" stroke-width="2.5" fill="none"
+        stroke-linecap="round" stroke-linejoin="round"/>
+  <!-- 同步箭头（下） -->
+  <path d="M 163,145 L 164,154 L 155,151"
+        stroke="rgba(56,189,248,0.55)" stroke-width="2.5" fill="none"
+        stroke-linecap="round" stroke-linejoin="round"/>
+
+  <!-- 主分支竖线 -->
+  <line x1="76" y1="44" x2="76" y2="156"
+        stroke="url(#mainGrad)" stroke-width="5.5" stroke-linecap="round"
+        filter="url(#softGlow)"/>
+
+  <!-- 特性分支曲线（分出） -->
+  <path d="M 76,80 C 98,80 130,96 130,120 L 130,140"
+        stroke="url(#featGrad)" stroke-width="4.5" fill="none"
+        stroke-linecap="round" filter="url(#softGlow)"/>
+  <!-- 特性分支合并回主分支 -->
+  <path d="M 130,140 C 130,156 105,159 76,155"
+        stroke="url(#featGrad)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
+
+  <!-- 主分支节点 -->
+  <circle cx="76" cy="48"  r="11" fill="#13103a" stroke="#c4b5fd" stroke-width="3" filter="url(#glow)"/>
+  <circle cx="76" cy="48"  r="5"  fill="#ddd6fe"/>
+
+  <circle cx="76" cy="84"  r="11" fill="#13103a" stroke="#a78bfa" stroke-width="3"/>
+  <circle cx="76" cy="84"  r="5"  fill="#c4b5fd"/>
+
+  <circle cx="76" cy="120" r="11" fill="#13103a" stroke="#8b5cf6" stroke-width="3"/>
+  <circle cx="76" cy="120" r="5"  fill="#a78bfa"/>
+
+  <circle cx="76" cy="155" r="11" fill="#13103a" stroke="#7c3aed" stroke-width="3" filter="url(#glow)"/>
+  <circle cx="76" cy="155" r="5"  fill="#8b5cf6"/>
+
+  <!-- 特性分支节点 -->
+  <circle cx="130" cy="115" r="11" fill="#13103a" stroke="#38bdf8" stroke-width="3" filter="url(#glow)"/>
+  <circle cx="130" cy="115" r="5"  fill="#7dd3fc"/>
+
+  <circle cx="130" cy="143" r="11" fill="#13103a" stroke="#0ea5e9" stroke-width="3" filter="url(#glow)"/>
+  <circle cx="130" cy="143" r="5"  fill="#38bdf8"/>
+</svg>

package/src/ui/public/index.html

@@ -1,16 +1,16 @@
-<!doctype html>
-<html lang="zh-CN" translate="no">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="google" content="notranslate" />
-    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Zen GitSync</title>
-    <!-- Premium fonts: Plus Jakarta Sans (UI) + JetBrains Mono (code) -->
-    <link rel="preconnect" href="https://fonts.googleapis.com" />
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link href="https://fonts.googleapis.com/css2?family=Plus+Jakarta+Sans:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;1,400&family=JetBrains+Mono:wght@400;500&display=swap" rel="stylesheet" />
-    <script type="module" crossorigin src="/assets/index-DPSGvy34.js"></script>
+<!doctype html>
+<html lang="zh-CN" translate="no">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="google" content="notranslate" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Zen GitSync</title>
+    <!-- Premium fonts: Plus Jakarta Sans (UI) + JetBrains Mono (code) -->
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link href="https://fonts.googleapis.com/css2?family=Plus+Jakarta+Sans:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;1,400&family=JetBrains+Mono:wght@400;500&display=swap" rel="stylesheet" />
+    <script type="module" crossorigin src="/assets/index-BGmxuKoN.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-CMxvf4Kt.js">
     <link rel="modulepreload" crossorigin href="/assets/monaco-DC7mqInI.js">
     <link rel="modulepreload" crossorigin href="/assets/element-plus-CJjFCgLP.js">
@@ -21,8 +21,8 @@
     <link rel="stylesheet" crossorigin href="/assets/element-plus-D36sOm0a.css">
     <link rel="stylesheet" crossorigin href="/assets/vendor-DNI_idR2.css">
     <link rel="stylesheet" crossorigin href="/assets/index-CDa9xf0V.css">
-  </head>
-  <body>
-    <div id="app"></div>
-  </body>
-</html>
+  </head>
+  <body>
+    <div id="app"></div>
+  </body>
+</html>

package/src/ui/public/logo.svg

@@ -1,75 +1,75 @@
-<svg width="200" height="200" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <radialGradient id="bgGrad" cx="38%" cy="32%" r="70%">
-      <stop offset="0%" stop-color="#1e1b4b"/>
-      <stop offset="100%" stop-color="#0d0b1e"/>
-    </radialGradient>
-    <linearGradient id="mainGrad" x1="0%" y1="0%" x2="0%" y2="100%">
-      <stop offset="0%" stop-color="#c4b5fd"/>
-      <stop offset="100%" stop-color="#7c3aed"/>
-    </linearGradient>
-    <linearGradient id="featGrad" x1="0%" y1="0%" x2="100%" y2="100%">
-      <stop offset="0%" stop-color="#7dd3fc"/>
-      <stop offset="100%" stop-color="#0284c7"/>
-    </linearGradient>
-    <filter id="glow" x="-40%" y="-40%" width="180%" height="180%">
-      <feGaussianBlur in="SourceGraphic" stdDeviation="2.5" result="blur"/>
-      <feMerge><feMergeNode in="blur"/><feMergeNode in="SourceGraphic"/></feMerge>
-    </filter>
-    <filter id="softGlow" x="-20%" y="-20%" width="140%" height="140%">
-      <feGaussianBlur in="SourceGraphic" stdDeviation="1.5" result="blur"/>
-      <feMerge><feMergeNode in="blur"/><feMergeNode in="SourceGraphic"/></feMerge>
-    </filter>
-  </defs>
-
-  <!-- 背景�?-->
-  <circle cx="100" cy="100" r="96" fill="url(#bgGrad)"/>
-
-  <!-- 同步外弧（上半，代表 sync 循环�?-->
-  <path d="M 100,20 A 80,80 0 1,1 36,153"
-        stroke="rgba(167,139,250,0.18)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
-  <!-- 同步外弧（下半） -->
-  <path d="M 36,153 A 80,80 0 0,1 164,153"
-        stroke="rgba(56,189,248,0.18)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
-  <!-- 同步箭头（上�?-->
-  <path d="M 91,17 L 100,20 L 96,29"
-        stroke="rgba(167,139,250,0.55)" stroke-width="2.5" fill="none"
-        stroke-linecap="round" stroke-linejoin="round"/>
-  <!-- 同步箭头（下�?-->
-  <path d="M 163,145 L 164,154 L 155,151"
-        stroke="rgba(56,189,248,0.55)" stroke-width="2.5" fill="none"
-        stroke-linecap="round" stroke-linejoin="round"/>
-
-  <!-- 主分支竖�?-->
-  <line x1="76" y1="44" x2="76" y2="156"
-        stroke="url(#mainGrad)" stroke-width="5.5" stroke-linecap="round"
-        filter="url(#softGlow)"/>
-
-  <!-- 特性分支曲线（分出�?-->
-  <path d="M 76,80 C 98,80 130,96 130,120 L 130,140"
-        stroke="url(#featGrad)" stroke-width="4.5" fill="none"
-        stroke-linecap="round" filter="url(#softGlow)"/>
-  <!-- 特性分支合并回主分�?-->
-  <path d="M 130,140 C 130,156 105,159 76,155"
-        stroke="url(#featGrad)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
-
-  <!-- 主分支节�?-->
-  <circle cx="76" cy="48"  r="11" fill="#13103a" stroke="#c4b5fd" stroke-width="3" filter="url(#glow)"/>
-  <circle cx="76" cy="48"  r="5"  fill="#ddd6fe"/>
-
-  <circle cx="76" cy="84"  r="11" fill="#13103a" stroke="#a78bfa" stroke-width="3"/>
-  <circle cx="76" cy="84"  r="5"  fill="#c4b5fd"/>
-
-  <circle cx="76" cy="120" r="11" fill="#13103a" stroke="#8b5cf6" stroke-width="3"/>
-  <circle cx="76" cy="120" r="5"  fill="#a78bfa"/>
-
-  <circle cx="76" cy="155" r="11" fill="#13103a" stroke="#7c3aed" stroke-width="3" filter="url(#glow)"/>
-  <circle cx="76" cy="155" r="5"  fill="#8b5cf6"/>
-
-  <!-- 特性分支节�?-->
-  <circle cx="130" cy="115" r="11" fill="#13103a" stroke="#38bdf8" stroke-width="3" filter="url(#glow)"/>
-  <circle cx="130" cy="115" r="5"  fill="#7dd3fc"/>
-
-  <circle cx="130" cy="143" r="11" fill="#13103a" stroke="#0ea5e9" stroke-width="3" filter="url(#glow)"/>
-  <circle cx="130" cy="143" r="5"  fill="#38bdf8"/>
+<svg width="200" height="200" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <radialGradient id="bgGrad" cx="38%" cy="32%" r="70%">
+      <stop offset="0%" stop-color="#1e1b4b"/>
+      <stop offset="100%" stop-color="#0d0b1e"/>
+    </radialGradient>
+    <linearGradient id="mainGrad" x1="0%" y1="0%" x2="0%" y2="100%">
+      <stop offset="0%" stop-color="#c4b5fd"/>
+      <stop offset="100%" stop-color="#7c3aed"/>
+    </linearGradient>
+    <linearGradient id="featGrad" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" stop-color="#7dd3fc"/>
+      <stop offset="100%" stop-color="#0284c7"/>
+    </linearGradient>
+    <filter id="glow" x="-40%" y="-40%" width="180%" height="180%">
+      <feGaussianBlur in="SourceGraphic" stdDeviation="2.5" result="blur"/>
+      <feMerge><feMergeNode in="blur"/><feMergeNode in="SourceGraphic"/></feMerge>
+    </filter>
+    <filter id="softGlow" x="-20%" y="-20%" width="140%" height="140%">
+      <feGaussianBlur in="SourceGraphic" stdDeviation="1.5" result="blur"/>
+      <feMerge><feMergeNode in="blur"/><feMergeNode in="SourceGraphic"/></feMerge>
+    </filter>
+  </defs>
+
+  <!-- 背景�?-->
+  <circle cx="100" cy="100" r="96" fill="url(#bgGrad)"/>
+
+  <!-- 同步外弧（上半，代表 sync 循环�?-->
+  <path d="M 100,20 A 80,80 0 1,1 36,153"
+        stroke="rgba(167,139,250,0.18)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
+  <!-- 同步外弧（下半） -->
+  <path d="M 36,153 A 80,80 0 0,1 164,153"
+        stroke="rgba(56,189,248,0.18)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
+  <!-- 同步箭头（上�?-->
+  <path d="M 91,17 L 100,20 L 96,29"
+        stroke="rgba(167,139,250,0.55)" stroke-width="2.5" fill="none"
+        stroke-linecap="round" stroke-linejoin="round"/>
+  <!-- 同步箭头（下�?-->
+  <path d="M 163,145 L 164,154 L 155,151"
+        stroke="rgba(56,189,248,0.55)" stroke-width="2.5" fill="none"
+        stroke-linecap="round" stroke-linejoin="round"/>
+
+  <!-- 主分支竖�?-->
+  <line x1="76" y1="44" x2="76" y2="156"
+        stroke="url(#mainGrad)" stroke-width="5.5" stroke-linecap="round"
+        filter="url(#softGlow)"/>
+
+  <!-- 特性分支曲线（分出�?-->
+  <path d="M 76,80 C 98,80 130,96 130,120 L 130,140"
+        stroke="url(#featGrad)" stroke-width="4.5" fill="none"
+        stroke-linecap="round" filter="url(#softGlow)"/>
+  <!-- 特性分支合并回主分�?-->
+  <path d="M 130,140 C 130,156 105,159 76,155"
+        stroke="url(#featGrad)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
+
+  <!-- 主分支节�?-->
+  <circle cx="76" cy="48"  r="11" fill="#13103a" stroke="#c4b5fd" stroke-width="3" filter="url(#glow)"/>
+  <circle cx="76" cy="48"  r="5"  fill="#ddd6fe"/>
+
+  <circle cx="76" cy="84"  r="11" fill="#13103a" stroke="#a78bfa" stroke-width="3"/>
+  <circle cx="76" cy="84"  r="5"  fill="#c4b5fd"/>
+
+  <circle cx="76" cy="120" r="11" fill="#13103a" stroke="#8b5cf6" stroke-width="3"/>
+  <circle cx="76" cy="120" r="5"  fill="#a78bfa"/>
+
+  <circle cx="76" cy="155" r="11" fill="#13103a" stroke="#7c3aed" stroke-width="3" filter="url(#glow)"/>
+  <circle cx="76" cy="155" r="5"  fill="#8b5cf6"/>
+
+  <!-- 特性分支节�?-->
+  <circle cx="130" cy="115" r="11" fill="#13103a" stroke="#38bdf8" stroke-width="3" filter="url(#glow)"/>
+  <circle cx="130" cy="115" r="5"  fill="#7dd3fc"/>
+
+  <circle cx="130" cy="143" r="11" fill="#13103a" stroke="#0ea5e9" stroke-width="3" filter="url(#glow)"/>
+  <circle cx="130" cy="143" r="5"  fill="#38bdf8"/>
 </svg>

package/src/ui/server/index.js

@@ -110,7 +110,7 @@ async function startUIServer(noOpen = false, savePort = false) {
     let dirPath = process.cwd();
     try {
       if(showConsole) console.log(`记录最近打开目录`)
-      const { stdout } = await execGitCommand('git rev-parse --show-toplevel');
+      const { stdout } = await execGitCommand(['rev-parse', '--show-toplevel']);
       const root = stdout?.trim();
       if (root) dirPath = root;
     } catch (_) {
@@ -290,7 +290,7 @@ async function startUIServer(noOpen = false, savePort = false) {
       }
 
       // 只获取porcelain格式状态，不再获取完整的git status
-      const { stdout: porcelainOutput } = await execGitCommand('git status --porcelain --untracked-files=all');
+      const { stdout: porcelainOutput } = await execGitCommand(['status', '--porcelain', '--untracked-files=all']);
 
       // 广播到当前项目房间的所有客户端
       io.to(projectRoomId).emit('git_status_update', {
@@ -309,7 +309,7 @@ async function startUIServer(noOpen = false, savePort = false) {
   // 检查当前目录是否是Git仓库
   let isGitRepo = false;
   try {
-    const { stdout } = await execGitCommand('git rev-parse --is-inside-work-tree', { log: false });
+    const { stdout } = await execGitCommand(['rev-parse', '--is-inside-work-tree'], { log: false });
     isGitRepo = stdout.trim() === 'true';
   } catch (error) {
     isGitRepo = false;

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

@@ -24,7 +24,7 @@ export function registerBranchStatusRoutes({
   // 获取当前分支 - 直接读取，不缓存（git symbolic-ref 极快，<5ms）
   app.get('/api/branch', async (req, res) => {
     try {
-      const { stdout } = await execGitCommand('git symbolic-ref --short HEAD');
+      const { stdout } = await execGitCommand(['symbolic-ref', '--short', 'HEAD']);
       res.json({ branch: stdout.trim() });
     } catch (error) {
       res.status(500).json({ error: error.message });
@@ -70,11 +70,11 @@ export function registerBranchStatusRoutes({
         console.log(`使用5秒缓存的分支名: ${currentBranch} -> ${upstreamBranch}`);
       } else {
         // 直接读取，不再走5分钟长缓存
-        const { stdout: branchOut } = await execGitCommand('git symbolic-ref --short HEAD');
+        const { stdout: branchOut } = await execGitCommand(['symbolic-ref', '--short', 'HEAD']);
         currentBranch = branchOut.trim();
 
         const { stdout: upstreamOut } = await execGitCommand(
-          'git rev-parse --abbrev-ref --symbolic-full-name @{u}',
+          ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}'],
           { ignoreError: true }
         );
         upstreamBranch = upstreamOut.trim() || null;
@@ -88,7 +88,7 @@ export function registerBranchStatusRoutes({
       }
 
       const { stdout: aheadBehindOutput } = await execGitCommand(
-        `git rev-list --left-right --count ${currentBranch}...${upstreamBranch}`
+        ['rev-list', '--left-right', '--count', `${currentBranch}...${upstreamBranch}`]
       );
       const [ahead, behind] = aheadBehindOutput.trim().split('\t').map(Number);
 

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

@@ -101,7 +101,7 @@ async function collectDiffForAi({ execGitCommand, getCurrentProjectPath, selecte
   let fileList = []
   try {
     // 1. 拿到工作区状态,识别 untracked 文件
-    const { stdout: statusOut } = await execGitCommand('git status --porcelain=1 --untracked-files=all', cwdOpts)
+    const { stdout: statusOut } = await execGitCommand(['status', '--porcelain=1', '--untracked-files=all'], cwdOpts)
     const untracked = []
     const trackedChanges = []
     for (const line of (statusOut || '').split('\n')) {
@@ -129,9 +129,8 @@ async function collectDiffForAi({ execGitCommand, getCurrentProjectPath, selecte
       const batchSize = 20
       for (let i = 0; i < untracked.length; i += batchSize) {
         const batch = untracked.slice(i, i + batchSize)
-        const quoted = batch.map(p => `"${p.replace(/"/g, '\\"')}"`).join(' ')
         try {
-          await execGitCommand(`git add -N --force ${quoted}`, cwdOpts)
+          await execGitCommand(['add', '-N', '--force', ...batch], cwdOpts)
         } catch (e) {
           // 单批失败不影响整体
           console.warn('[generate-commit] git add -N failed for batch:', e?.message)
@@ -142,12 +141,13 @@ async function collectDiffForAi({ execGitCommand, getCurrentProjectPath, selecte
     // 3. 合并 staged + unstaged diff
     //    用 --no-color 避免 ANSI 干扰, --no-ext-diff 避免外接 diff 工具
     //    选择模式下用 `-- <paths>` 限定,避免拉取无关 staged 改动
-    const pathArgs = selectedSet
-      ? ' -- ' + [...selectedSet].map(p => `"${p.replace(/"/g, '\\"')}"`).join(' ')
-      : ''
+    const pathArgs = selectedSet ? [...selectedSet] : []
+    const diffBase = ['diff', '--no-color', '--no-ext-diff']
+    const stagedArgs = ['diff', '--staged', '--no-color', '--no-ext-diff', ...(pathArgs.length ? ['--', ...pathArgs] : [])]
+    const unstagedArgs = [...diffBase, ...(pathArgs.length ? ['--', ...pathArgs] : [])]
     const [stagedRes, unstagedRes] = await Promise.all([
-      execGitCommand(`git diff --staged --no-color --no-ext-diff${pathArgs}`, cwdOpts).catch(() => ({ stdout: '' })),
-      execGitCommand(`git diff --no-color --no-ext-diff${pathArgs}`, cwdOpts).catch(() => ({ stdout: '' }))
+      execGitCommand(stagedArgs, cwdOpts).catch(() => ({ stdout: '' })),
+      execGitCommand(unstagedArgs, cwdOpts).catch(() => ({ stdout: '' }))
     ])
     let combined = ''
     if (stagedRes?.stdout) combined += stagedRes.stdout.trim() + '\n'

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

@@ -16,6 +16,12 @@ import path from 'path';
 import iconv from 'iconv-lite';
 import { spawn } from 'child_process';
 
+// 把 "git config --global key value" 这种空格分隔命令拆成 argv 数组,
+// 注意:简单 split 不处理引号/转义;保持与之前 shell 模式一致的语义。
+function splitCommandArgs(command) {
+  return command.trim().split(/\s+/).filter(Boolean);
+}
+
 export function registerExecRoutes({
   app,
   execGitCommand,
@@ -33,7 +39,7 @@ export function registerExecRoutes({
       }
 
       try {
-        const { stdout = '', stderr = '' } = await execGitCommand(command, { log: false });
+        const { stdout = '', stderr = '' } = await execGitCommand(splitCommandArgs(command), { log: false });
         return res.json({ success: true, stdout, stderr });
       } catch (err) {
         return res.status(400).json({ success: false, error: err?.message || String(err) });

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

@@ -45,7 +45,7 @@ export function registerFsRoutes({
 
       // 检查当前目录是否是Git仓库
       try {
-        await execGitCommand('git rev-parse --is-inside-work-tree');
+        await execGitCommand(['rev-parse', '--is-inside-work-tree']);
       } catch (error) {
         return res.status(400).json({
           error: '当前目录不是一个Git仓库',
@@ -86,7 +86,7 @@ export function registerFsRoutes({
 
         // 检查新目录是否是Git仓库
         try {
-          await execGitCommand('git rev-parse --is-inside-work-tree');
+          await execGitCommand(['rev-parse', '--is-inside-work-tree']);
 
           // 更新全局变量
           setCurrentProjectPath(newProjectPath);

package/src/ui/server/routes/git/diff.js

@@ -34,10 +34,11 @@ export function registerGitDiffRoutes({
         return res.status(400).json({ error: '缺少文件路径参数' });
       }
 
-      const diffCommand = `git diff -- "${filePath}"`;
+      const diffArgs = ['diff', '--', filePath];
 
-      // 使用优化的检查函数
-      const skipCheck = await checkShouldSkipDiff(filePath, diffCommand);
+      // 使用优化的检查函数(diffCommand 用于内部 numstat 检测的字符串转换,
+      // 实际走 git 时用 argv 数组,避免 Windows cmd.exe 拼引号问题)
+      const skipCheck = await checkShouldSkipDiff(filePath, `git diff -- "${filePath}"`);
       if (skipCheck.shouldSkip) {
         return res.json({
           diff: skipCheck.reason,
@@ -47,7 +48,7 @@ export function registerGitDiffRoutes({
       }
 
       // 执行git diff命令获取文件差异
-      const { stdout } = await execGitCommand(diffCommand);
+      const { stdout } = await execGitCommand(diffArgs);
 
       // 检查实际diff大小
       const sizeCheck = checkDiffSize(stdout, 500);
@@ -72,10 +73,10 @@ export function registerGitDiffRoutes({
         return res.status(400).json({ error: '缺少文件路径参数' });
       }
 
-      const diffCommand = `git diff --cached -- "${filePath}"`;
+      const diffArgs = ['diff', '--cached', '--', filePath];
 
       // 使用优化的检查函数
-      const skipCheck = await checkShouldSkipDiff(filePath, diffCommand);
+      const skipCheck = await checkShouldSkipDiff(filePath, `git diff --cached -- "${filePath}"`);
       if (skipCheck.shouldSkip) {
         return res.json({
           diff: skipCheck.reason,
@@ -85,7 +86,7 @@ export function registerGitDiffRoutes({
       }
 
       // 执行git diff --cached命令获取已暂存文件差异
-      const { stdout } = await execGitCommand(diffCommand);
+      const { stdout } = await execGitCommand(diffArgs);
 
       // 检查实际diff大小
       const sizeCheck = checkDiffSize(stdout, 500);
@@ -105,7 +106,7 @@ export function registerGitDiffRoutes({
   // 获取全量 diff（git diff HEAD，含已暂存与未暂存的所有变更）
   app.get('/api/diff-head', async (req, res) => {
     try {
-      const { stdout } = await execGitCommand('git diff HEAD');
+      const { stdout } = await execGitCommand(['diff', 'HEAD']);
       const MAX = 500 * 1024;
       const content = stdout.length > MAX
         ? stdout.slice(0, MAX) + '\n\n[内容过大，已截断]'
@@ -172,7 +173,7 @@ export function registerGitDiffRoutes({
 
       let sizeBytes = 0;
       try {
-        const { stdout: sizeOut } = await execGitCommand(`git cat-file -s "${spec}"`, { log: false });
+        const { stdout: sizeOut } = await execGitCommand(['cat-file', '-s', spec], { log: false });
         sizeBytes = parseInt(String(sizeOut).trim(), 10) || 0;
       } catch (e) {
         return res.json({ success: true, notFound: true, content: '' });
@@ -187,7 +188,7 @@ export function registerGitDiffRoutes({
         });
       }
 
-      const { stdout } = await execGitCommand(`git show "${spec}"`, { log: false });
+      const { stdout } = await execGitCommand(['show', spec], { log: false });
       return res.json({ success: true, content: stdout ?? '' });
     } catch (error) {
       res.status(500).json({ success: false, error: error.message });
@@ -253,7 +254,7 @@ export function registerGitDiffRoutes({
       }
 
       // 检查文件状态：未跟踪文件需要删除，修改文件需要恢复
-      const { stdout: statusOutput } = await execGitCommand(`git status --porcelain -- "${filePath}"`);
+      const { stdout: statusOutput } = await execGitCommand(['status', '--porcelain', '--', filePath]);
 
       // 未跟踪的文件 (??), 需要删除它
       if (statusOutput.startsWith('??')) {
@@ -270,12 +271,12 @@ export function registerGitDiffRoutes({
       // 已暂存的文件，先取消暂存
       else if (statusOutput.startsWith('A ') || statusOutput.startsWith('M ') || statusOutput.startsWith('D ')) {
         // 先取消暂存
-        await execGitCommand(`git reset HEAD -- "${filePath}"`);
+        await execGitCommand(['reset', 'HEAD', '--', filePath]);
       }
 
       // 已修改文件，取消所有本地修改
       if (statusOutput) {
-        await execGitCommand(`git checkout -- "${filePath}"`);
+        await execGitCommand(['checkout', '--', filePath]);
         return res.json({ success: true, message: '文件修改已撤回' });
       } else {
         return res.status(400).json({
@@ -307,7 +308,7 @@ export function registerGitDiffRoutes({
     for (const filePath of filePaths) {
       try {
         // 检查文件状态：未跟踪 ??、已暂存 A/M/D、已修改（空状态会返回空字符串）
-        const { stdout: statusOutput } = await execGitCommand(`git status --porcelain -- "${filePath}"`)
+        const { stdout: statusOutput } = await execGitCommand(['status', '--porcelain', '--', filePath])
 
         // 未跟踪的文件 (??) → 直接删除
         if (statusOutput.startsWith('??')) {
@@ -324,12 +325,12 @@ export function registerGitDiffRoutes({
 
         // 已暂存的文件，先取消暂存（不影响工作区）
         if (statusOutput.startsWith('A ') || statusOutput.startsWith('M ') || statusOutput.startsWith('D ')) {
-          await execGitCommand(`git reset HEAD -- "${filePath}"`)
+          await execGitCommand(['reset', 'HEAD', '--', filePath])
         }
 
         // 已修改文件：丢弃工作区修改
         if (statusOutput) {
-          await execGitCommand(`git checkout -- "${filePath}"`)
+          await execGitCommand(['checkout', '--', filePath])
           results.push({ path: filePath, success: true, message: '文件修改已撤回' })
           successCount++
         } else {