zen-gitsync 2.13.25 → 2.13.27

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,28 +1,30 @@
-<!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-D_T4XWSf.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-SLuwYU5Z.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">
     <link rel="modulepreload" crossorigin href="/assets/vendor-0YbzMuxw.js">
-    <link rel="modulepreload" crossorigin href="/assets/_plugin-vue_export-helper-BVVLmyjZ.js">
+    <link rel="modulepreload" crossorigin href="/assets/_plugin-vue_export-helper-Cpm3JOKV.js">
     <link rel="modulepreload" crossorigin href="/assets/socket-io-z4n873W1.js">
+    <link rel="modulepreload" crossorigin href="/assets/vue-flow-HHfhvx4N.js">
     <link rel="stylesheet" crossorigin href="/assets/monaco-UXx6YYK1.css">
     <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>
+    <link rel="stylesheet" crossorigin href="/assets/vue-flow-CavUTEzp.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-Cn3n2mx6.css">
+  </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/routes/config.js

@@ -1027,6 +1027,7 @@ export function registerConfigRoutes({
       await configManager.writeRawConfigFile(rawConfig)
       res.json({ success: true })
     } catch (error) {
+      logger.error('[save-ui-settings] failed:', error)
       res.status(500).json({ success: false, error: error.message })
     }
   })
@@ -1094,7 +1095,7 @@ export function registerConfigRoutes({
       const models = Array.isArray(rawConfig.models) ? rawConfig.models : []
       const defaultModel = models.find(m => m.isDefault) || models[0]
       if (!defaultModel) {
-        return res.json({ success: false, error: '未配置 AI 模型，请先在通用设置中添加模型' })
+        return res.json({ success: false, error: '未配置 AI 模型，请先在通用设置中添加模型', code: 'NO_MODEL' })
       }
 
       // 后端自己收集 diff,确保 untracked 文件也能进 prompt
@@ -1152,7 +1153,7 @@ ${diffText || '(no staged content, please infer from the file list)'}`
         stream: false
       })
       const controller = new AbortController()
-      const timer = setTimeout(() => controller.abort(), 30000)
+      const timer = setTimeout(() => controller.abort(), 60000)
       let response
       try {
         response = await fetch(url, { method: 'POST', headers, body, signal: controller.signal })
@@ -1162,7 +1163,7 @@ ${diffText || '(no staged content, please infer from the file list)'}`
       const data = await response.json().catch(() => ({}))
       if (!response.ok) {
         const msg = data?.error?.message || data?.message || `HTTP ${response.status}`
-        return res.json({ success: false, error: msg })
+        return res.json({ success: false, error: msg, code: 'HTTP_ERR' })
       }
       const content = data?.choices?.[0]?.message?.content || ''
       // 响应内容只走 debug(默认关闭),前 600 字截断防 token 泄露
@@ -1175,7 +1176,7 @@ ${diffText || '(no staged content, please infer from the file list)'}`
 
       if (!jsonMatch) {
         console.error('[generate-commit] no JSON found, full content:', content)
-        return res.json({ success: false, error: 'model returned no valid JSON' })
+        return res.json({ success: false, error: 'model returned no valid JSON', code: 'NO_JSON' })
       }
       let parsed
       try {
@@ -1192,7 +1193,7 @@ ${diffText || '(no staged content, please infer from the file list)'}`
             description: (descM?.[1] || '').trim()
           })
         }
-        return res.json({ success: false, error: 'JSON parse failed' })
+        return res.json({ success: false, error: 'JSON parse failed', code: 'PARSE_FAILED' })
       }
       res.json({
         success: true,
@@ -1201,8 +1202,9 @@ ${diffText || '(no staged content, please infer from the file list)'}`
         description: String(parsed.description || '').trim()
       })
     } catch (error) {
-      const msg = error.name === 'AbortError' ? 'timeout 30s' : error.message
-      res.json({ success: false, error: msg })
+      const isTimeout = error.name === 'AbortError'
+      const msg = isTimeout ? 'AI 请求超时（60s），请重试或检查模型响应速度' : error.message
+      res.json({ success: false, error: msg, code: isTimeout ? 'TIMEOUT' : 'GENERATE_FAILED' })
     }
   })
 }

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

@@ -1961,7 +1961,7 @@ ${desc ? `描述：${desc}` : '描述：（无）'}${attachmentBlock}${templateB
           if (delta.thinking) send({ type: 'thinking', delta: delta.thinking });
           if (delta.content) send({ type: 'content', delta: delta.content });
         },
-        { maxTokens: 16000, timeoutMs: 600000, images: imageDataUrls, signal: abortController.signal }
+        { maxTokens: 32000, timeoutMs: 600000, images: imageDataUrls, signal: abortController.signal }
       );
 
       if (aborted) {
@@ -2230,7 +2230,7 @@ ${desc ? `描述：${desc}` : '描述：（无）'}${attachmentBlock}${templateB
           if (delta.thinking) send({ type: 'thinking', delta: delta.thinking });
           if (delta.content) send({ type: 'content', delta: delta.content });
         },
-        { maxTokens: 16000, timeoutMs: 600000, signal: abortController.signal }
+        { maxTokens: 32000, timeoutMs: 600000, signal: abortController.signal }
       );
 
       if (aborted) {

package/src/utils/index.js

@@ -315,8 +315,10 @@ function execGitCommand(command, options = {}) {
       }
 
       // Add command to history
+      // 用 head(已 join)而不是原始 command,确保历史里的 command 永远是字符串
+      // 防止 execGitCommand(['status']) 这类数组调用把数组塞进历史 → 前端 item.command.trim() 崩
       const historyItem = {
-        command,
+        command: head,
         stdout: truncatedStdout || '',
         stderr: truncatedStderr || '',
         error: error ? error.message : null,
@@ -415,7 +417,14 @@ function getCommandHistory() {
 // Function to manually add command to history (for commands not using execGitCommand)
 function addCommandToHistory(command, stdout = '', stderr = '', error = null, executionTime = 0) {
   const MAX_OUTPUT_LENGTH = 5000;
-  
+
+  // 防御:历史里的 command 必须始终是字符串,防止前端 item.command.trim() 抛错
+  if (Array.isArray(command)) {
+    command = command.join(' ')
+  } else if (typeof command !== 'string') {
+    command = String(command ?? '')
+  }
+
   // Truncate outputs if too long
   const isStdoutTruncated = stdout.length > MAX_OUTPUT_LENGTH;
   const isStderrTruncated = stderr.length > MAX_OUTPUT_LENGTH;