zen-gitsync 2.13.28 → 2.13.30

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,30 +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-BTHO-83r.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-B666KMk3.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-rcpA4EGF.js">
-    <link rel="modulepreload" crossorigin href="/assets/vendor-DoD2dmIW.js">
-    <link rel="modulepreload" crossorigin href="/assets/_plugin-vue_export-helper-CHzCpi8c.js">
+    <link rel="modulepreload" crossorigin href="/assets/element-plus-CRTdimvR.js">
+    <link rel="modulepreload" crossorigin href="/assets/vendor-BxotT5qN.js">
+    <link rel="modulepreload" crossorigin href="/assets/_plugin-vue_export-helper-CpTW8798.js">
     <link rel="modulepreload" crossorigin href="/assets/socket-io-z4n873W1.js">
-    <link rel="modulepreload" crossorigin href="/assets/vue-flow-CfamgGcL.js">
+    <link rel="modulepreload" crossorigin href="/assets/vue-flow-Bx03URoq.js">
     <link rel="stylesheet" crossorigin href="/assets/monaco-UXx6YYK1.css">
     <link rel="stylesheet" crossorigin href="/assets/element-plus-CYGtZ7Nz.css">
     <link rel="stylesheet" crossorigin href="/assets/vendor-DNI_idR2.css">
     <link rel="stylesheet" crossorigin href="/assets/vue-flow-CavUTEzp.css">
     <link rel="stylesheet" crossorigin href="/assets/index-BYAxMGne.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

@@ -355,6 +355,7 @@ async function startUIServer(noOpen = false, savePort = false) {
     noOpen,
     isGitRepo,
     savePortToFile,
+    fsSync,
     maxTries: 100,
     callbackExecutedRef
   }).catch((e) => {

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

@@ -16,9 +16,11 @@ import express from 'express';
 import fs from 'fs/promises';
 import fsSync from 'fs';
 import path from 'path';
+import os from 'os';
 import { exec, spawn } from 'child_process';
 import https from 'https';
 import { fileURLToPath } from 'url';
+import { getRegistryPath } from '../utils/instanceRegistry.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -29,9 +31,36 @@ export function registerNpmRoutes({
 }) {
   // 标记是否有升级任务在跑（防并发）
   let activeUpgrade = false;
+  // 标记是否有重启任务在跑（防并发）
+  let activeRestart = false;
+  // 自拉起重启相关常量
+  const RESTART_TIMEOUT_MS = 8000;   // 子进程必须在此时间内注册到 instanceRegistry
+  const REGISTRY_POLL_MS = 250;      // 轮询注册表文件间隔
+  const EXIT_DELAY_MS = 100;         // 子进程就绪后给前端的最后缓冲时间
 
   // ========== 应用自升级相关 API ==========
 
+  // 解析"自拉起"要 spawn 的入口绝对路径。
+  // 优先 process.argv[1](开发态 server.js / 生产态 src/gitCommit.js 都是绝对路径),
+  // 但 launch.json 的 backend 是 `node -e "...process.argv = [...]; require('./server.js')"`,
+  // 这种篡改出来的 argv[1] 是相对路径 "server.js",不能直接 spawn。
+  // 回退: 用 __dirname 推导 src/ui/server/index.js 的同级 server.js(仓库根)
+  function resolveRestartEntry() {
+    const arg = process.argv[1]
+    if (arg && path.isAbsolute(arg) && fsSync.existsSync(arg)) {
+      return { entry: arg, args: process.argv.slice(2) }
+    }
+    // 回退到仓库根的 server.js(开发态入口),保留原 PORT 等环境变量
+    const fallback = path.resolve(__dirname, '../../../..', 'server.js')
+    if (fsSync.existsSync(fallback)) {
+      // 透传用户原始 argv[2..](--no-open 等);如果原 argv[1] 是 "server.js" 这类相对路径,
+      // 用户大概率没传任何 args,所以空数组也合理
+      const originalArgs = (arg && !path.isAbsolute(arg)) ? process.argv.slice(2) : []
+      return { entry: fallback, args: originalArgs }
+    }
+    return null
+  }
+
   // 当前安装的版本（从外层 package.json 读取）
   function getCurrentVersion() {
     try {
@@ -191,15 +220,139 @@ export function registerNpmRoutes({
   })
 
 
-  // POST /api/app-restart  - 优雅退出当前 Node 进程，由外层 launcher/desktop 自动拉起
+  // 同步读取 instanceRegistry 文件并返回 Map<pid, entry>
+  // npm.js 在自拉起重启场景下需要轮询此文件判断子进程是否已绑定端口
+  function readRegistrySync(p) {
+    const m = new Map();
+    try {
+      const raw = fsSync.readFileSync(p, 'utf-8');
+      const obj = JSON.parse(raw);
+      const instances = (obj && obj.instances) || {};
+      for (const [pidStr, entry] of Object.entries(instances)) {
+        const pid = Number(pidStr);
+        if (Number.isFinite(pid) && entry && typeof entry === 'object') {
+          m.set(pid, entry);
+        }
+      }
+    } catch (_) {
+      // 文件不存在或 JSON 损坏 → 返回空 Map，调用方按"还没注册"处理
+    }
+    return m;
+  }
+
+  // POST /api/app-restart  - 自拉起重启：spawn 当前进程入口 + 轮询 instanceRegistry
+  //                           拿到子进程端口后通过 NDJSON 流告知前端；旧进程再退出
   app.post('/api/app-restart', (_req, res) => {
-    res.json({ success: true, message: '正在重启服务…' })
-    // 给响应一点时间落到客户端再退出
-    setTimeout(() => {
-      console.log('[app-restart] 收到重启指令，退出当前进程')
-      process.exit(0)
-    }, 300)
-  })
+    if (activeRestart) {
+      res.status(409).json({ success: false, error: '已有重启任务在进行中' });
+      return;
+    }
+    activeRestart = true;
+
+    res.setHeader('Content-Type', 'application/x-ndjson; charset=utf-8');
+    res.setHeader('Cache-Control', 'no-cache');
+    res.setHeader('Connection', 'keep-alive');
+    res.flushHeaders?.();
+
+    const send = (obj) => { try { res.write(JSON.stringify(obj) + '\n') } catch (_) {} };
+    const finish = () => { try { res.end() } catch (_) {} };
+    const release = () => { activeRestart = false };
+
+    // 1. 记录当前所有 instance,后续用"出现的新 pid"判定子进程
+    const registryPath = getRegistryPath();
+    const before = readRegistrySync(registryPath);
+    const start = Date.now();
+    const spawnAt = Date.now();
+
+    // 2. 准备子进程 ready 信号文件 —— startServerOnAvailablePort 在 listen 成功后会写入
+    //    （instanceRegistry 在 EPERM 环境下不可用,这是回退通道）
+    const notifyPath = path.join(
+      os.tmpdir(),
+      `zen-gitsync-restart-${process.pid}-${Date.now()}.port`
+    );
+    try { fsSync.unlinkSync(notifyPath) } catch (_) {}  // 清掉旧同名文件
+
+    const entryInfo = resolveRestartEntry();
+    if (!entryInfo) {
+      send({ type: 'error', message: '无法解析重启入口（process.argv[1] 既不是绝对路径,仓库根也没有 server.js）' });
+      finish();
+      release();
+      return;
+    }
+
+    let child;
+    try {
+      // spawn 当前进程当时是怎么被 node 启的同一个入口（开发态 server.js / 生产态 gitCommit.js）
+      // detached: true + stdio: 'ignore' + child.unref() → Windows 上父进程 exit 不会带走子进程
+      child = spawn(process.execPath, [entryInfo.entry, ...entryInfo.args], {
+        detached: true,
+        stdio: 'ignore',
+        windowsHide: true,
+        env: { ...process.env, ZEN_RESTART_NOTIFY_PATH: notifyPath }
+      });
+      child.unref();
+    } catch (err) {
+      send({ type: 'error', message: `拉起子进程失败: ${err?.message || err}` });
+      try { fsSync.unlinkSync(notifyPath) } catch (_) {}
+      finish();
+      release();
+      return;
+    }
+
+    send({ type: 'stdout', message: `[restart] 已在 PID ${child.pid} 拉起子进程 (${entryInfo.entry})，等待端口就绪…\n` });
+
+    const poll = setInterval(() => {
+      if (Date.now() - start > RESTART_TIMEOUT_MS) {
+        clearInterval(poll);
+        try { child.kill('SIGTERM') } catch (_) {}
+        send({ type: 'error', message: `子进程 ${RESTART_TIMEOUT_MS / 1000}s 内未就绪（未读到 ${notifyPath}），已 kill` });
+        send({ type: 'timeout' });
+        finish();
+        try { fsSync.unlinkSync(notifyPath) } catch (_) {}
+        // 关键：超时分支旧进程不退出，用户仍可继续手动刷新页面
+        release();
+        return;
+      }
+
+      // 优先判定：子进程是否写了 notify 文件（最可靠,不走 instanceRegistry）
+      let notifiedPort = null;
+      try {
+        const raw = fsSync.readFileSync(notifyPath, 'utf8').trim();
+        const p = Number(raw);
+        if (Number.isInteger(p) && p > 0 && p < 65536) notifiedPort = p;
+      } catch (_) {}
+
+      // 兜底：instanceRegistry 里出现的新 pid + port（用于没有 savePort 的环境）
+      let registryPort = null;
+      if (!notifiedPort) {
+        const after = readRegistrySync(registryPath);
+        for (const [pid, entry] of after) {
+          if (
+            !before.has(pid) &&
+            Number.isInteger(entry.port) && entry.port > 0 &&
+            (entry.lastHeartbeat ?? entry.startedAt ?? 0) >= spawnAt
+          ) {
+            registryPort = entry.port;
+            break;
+          }
+        }
+      }
+
+      const newPort = notifiedPort ?? registryPort;
+      if (newPort) {
+        clearInterval(poll);
+        // 给 EXIT_DELAY_MS 让新进程稳定，再通知前端 + 旧进程退出
+        setTimeout(() => {
+          send({ type: 'ready', port: newPort });
+          finish();
+          try { fsSync.unlinkSync(notifyPath) } catch (_) {}
+          console.log('[app-restart] 子进程已就绪，退出当前进程');
+          process.exit(0);
+        }, EXIT_DELAY_MS);
+        return;
+      }
+    }, REGISTRY_POLL_MS);
+  });
 
 
   // 读取 package.json 文件内容

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

@@ -2724,7 +2724,7 @@ ${desc ? `描述：${desc}` : '描述：（无）'}${attachmentBlock}${templateB
 
   // ── 续接简单任务对话 ────────────────────────────────────────────
   // POST /api/workbench/jobs/:id/continue
-  // 入参 body: { userMessage: string }
+  // 入参 body: { userMessage: string, attachments?: Attachment[] }
   // 行为:
   //   - 仅用于 type==='simple' 的任务,基于上一轮 job 捕获到的 claudeSessionId,
   //     用 claude --resume <id> 续接历史对话,**新一轮 = 新 job**
@@ -2732,6 +2732,11 @@ ${desc ? `描述：${desc}` : '描述：（无）'}${attachmentBlock}${templateB
   //     区分;前端按 subId 前缀聚合渲染对话流
   //   - 上一轮还在 pending/running 时拒绝(避免 session 并发跑乱)
   //   - 上一轮未捕获到 session_id(claude 在 init 前就 crash)时拒绝
+  //   - 附件处理(2026-06 改):
+  //     · 默认复用 task.attachments(claude --resume 上下文里已经看过这些图,
+  //       不重复推,节省 token)
+  //     · 前端可显式传 attachments 数组做"追加"(用户续聊时新增的图片)
+  //     · 透传到 virtualSub.attachments,继续走 runSingleSubtask 的拼装逻辑
   app.post('/api/workbench/jobs/:id/continue', async (req, res) => {
     try {
       const userMessage = String(req.body?.userMessage || '').trim();
@@ -2769,6 +2774,15 @@ ${desc ? `描述：${desc}` : '描述：（无）'}${attachmentBlock}${templateB
         }
       }
       const nextRound = maxRound + 1;
+      // 续接轮的 attachments:
+      //   - 前端显式传 attachments:用前端值(复用 task.attachments + 续聊时新增的)
+      //   - 前端没传:回退到 task.attachments(向后兼容)
+      // 注意:本轮 attachments 不写盘,只用于拼 prompt,claude --resume 上下文已看过
+      // 大部分图(默认复用的那些),真正"新加"的图是这次对话的关键信息。
+      const bodyAtts = req.body?.attachments;
+      const carryAtts = Array.isArray(bodyAtts) && bodyAtts.length > 0
+        ? bodyAtts
+        : (Array.isArray(task.attachments) ? task.attachments : []);
       const virtualSub = {
         id: `${task.id}__simple__r${nextRound}`,
         title: `续接 #${nextRound}`,
@@ -2776,8 +2790,8 @@ ${desc ? `描述：${desc}` : '描述：（无）'}${attachmentBlock}${templateB
         status: 'todo',
         // 用户输入的续接消息直接作为本轮 prompt(走 promptOverride,不再拼模板)
         promptOverride: userMessage,
-        // 续接轮不带附件,避免重复推附件给 claude(已在首轮 prompt 里)
-        attachments: []
+        // 透传:复用 task 上已有附件 + 本轮新增(如果有)
+        attachments: carryAtts
       };
       const repoPath = typeof getCurrentProjectPath === 'function' ? getCurrentProjectPath() : '';
       res.json({ success: true, message: '已加入续接队列' });

package/src/ui/server/utils/instanceRegistry.js

@@ -17,10 +17,21 @@
 // 多进程并发写采用 atomic temp+rename + 进程内串行化 Promise 链
 // stale 判定：PID 不存在 或 lastHeartbeat 超过阈值
 
+import nodePath from 'node:path';
+import nodeOs from 'node:os';
+
 const STALE_MS = 30_000;          // 心跳超时阈值（毫秒）
 const WATCH_DEBOUNCE_MS = 100;    // fs.watch 防抖时间
 const REGISTRY_VERSION = 1;
 
+/**
+ * 默认注册表文件路径（与 createInstanceRegistry({ registryPath }) 的约定一致）
+ * 用于：npm.js 的 /api/app-restart 自拉起时，父进程轮询此路径判断子进程是否就绪。
+ */
+export function getRegistryPath() {
+  return nodePath.join(nodeOs.homedir(), '.zen-gitsync-instances.json');
+}
+
 function isProcessAlive(pid) {
   if (!Number.isInteger(pid) || pid <= 0) return false;
   try {