zen-gitsync 2.13.29 → 2.13.32

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/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 {

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

@@ -20,6 +20,7 @@ export async function startServerOnAvailablePort({
   noOpen,
   isGitRepo,
   savePortToFile,
+  fsSync,
   maxTries = 100,
   callbackExecutedRef
 }) {
@@ -74,6 +75,18 @@ export async function startServerOnAvailablePort({
 
           savePortToFile(currentPort);
 
+          // 自拉起重启通知：父进程 spawn 时设置了 ZEN_RESTART_NOTIFY_PATH
+          // 子进程成功 bind 端口后,把端口写到该文件作为"已就绪"信号
+          // （instanceRegistry 在 EPERM 环境下不可用,这是回退通道）
+          const notifyPath = process.env.ZEN_RESTART_NOTIFY_PATH;
+          if (notifyPath && fsSync) {
+            try {
+              fsSync.writeFileSync(notifyPath, String(currentPort), 'utf8');
+            } catch (_) {
+              // 通知写失败不影响主流程
+            }
+          }
+
           if (!noOpen) {
             setTimeout(() => {
               open(`http://localhost:${currentPort}`);

package/src/utils/index.js

@@ -241,7 +241,13 @@ function execSyncGitCommand(command, options = {}) {
 // Add a command history array to store commands and their results
 const commandHistory = [];
 const MAX_HISTORY_SIZE = 100;
-const MAX_OUTPUT_LENGTH = 5000; // Limit the output length to avoid memory issues
+// 输出截断上限 — 单点常量,避免在 execGitCommand / addCommandToHistory /
+// 其他未来 history 写入点之间漂移导致截断行为不一致。
+// 截断提示也集中在这里,所有调用方用同一个文案,便于后续 i18n 替换。
+const MAX_OUTPUT_LENGTH = 5000;
+const TRUNCATED_SUFFIX_STDOUT = '\n... (output truncated)';
+const TRUNCATED_SUFFIX_STDERR = '\n... (error output truncated)';
+const TRUNCATED_SUFFIX_MANUAL = '...[truncated]';
 
 // 添加一个变量来保存Socket.io实例
 let ioInstance = null;
@@ -303,14 +309,14 @@ function execGitCommand(command, options = {}) {
       let truncatedStderr = stderr;
       let isStdoutTruncated = false;
       let isStderrTruncated = false;
-      
+
       if (stdout && stdout.length > MAX_OUTPUT_LENGTH) {
-        truncatedStdout = stdout.substring(0, MAX_OUTPUT_LENGTH) + '\n... (output truncated)';
+        truncatedStdout = truncateForHistory(stdout, MAX_OUTPUT_LENGTH, TRUNCATED_SUFFIX_STDOUT);
         isStdoutTruncated = true;
       }
-      
+
       if (stderr && stderr.length > MAX_OUTPUT_LENGTH) {
-        truncatedStderr = stderr.substring(0, MAX_OUTPUT_LENGTH) + '\n... (error output truncated)';
+        truncatedStderr = truncateForHistory(stderr, MAX_OUTPUT_LENGTH, TRUNCATED_SUFFIX_STDERR);
         isStderrTruncated = true;
       }
 
@@ -416,8 +422,6 @@ 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(' ')
@@ -428,8 +432,8 @@ function addCommandToHistory(command, stdout = '', stderr = '', error = null, ex
   // Truncate outputs if too long
   const isStdoutTruncated = stdout.length > MAX_OUTPUT_LENGTH;
   const isStderrTruncated = stderr.length > MAX_OUTPUT_LENGTH;
-  const truncatedStdout = isStdoutTruncated ? stdout.substring(0, MAX_OUTPUT_LENGTH) + '...[truncated]' : stdout;
-  const truncatedStderr = isStderrTruncated ? stderr.substring(0, MAX_OUTPUT_LENGTH) + '...[truncated]' : stderr;
+  const truncatedStdout = isStdoutTruncated ? truncateForHistory(stdout, MAX_OUTPUT_LENGTH, TRUNCATED_SUFFIX_MANUAL) : stdout;
+  const truncatedStderr = isStderrTruncated ? truncateForHistory(stderr, MAX_OUTPUT_LENGTH, TRUNCATED_SUFFIX_MANUAL) : stderr;
   
   const historyItem = {
     command,
@@ -619,11 +623,38 @@ async function printGitLog() {
 }
 
 function exec_exit(exit) {
-  if (exit) {
+  // 仅当显式传 true 时退出;空值/0/'false'/'no'/其他非真值都按"不退出"处理。
+  // 之前的 truthy 判断会把字符串 'false' 误判为 true(非空字符串都是 truthy),
+  // 调用方传 '--exit=false' 等解析出来的字符串时会错误退出。
+  if (exit === true) {
     process.exit()
   }
 }
 
+/**
+ * 按 char 边界安全截断,避免切断 UTF-16 代理对(emoji / 辅助平面 CJK)。
+ * 原 substring(0, N) 在 N-1 是 high surrogate 时会把半个字符拼到末尾,
+ * 前端 history 渲染可能显示 '�'。本函数检测这种情况并向前回退 1 个码元。
+ *
+ * @param {string} str
+ * @param {number} limit - 最大字符数(<=0 视为"不截断",原样返回)
+ * @param {string} suffix - 截断提示后缀
+ * @returns {string}
+ */
+function truncateForHistory(str, limit, suffix) {
+  if (typeof str !== 'string') return str;
+  if (!Number.isFinite(limit) || limit <= 0 || str.length <= limit) return str;
+  // 码元 = UTF-16 code unit;length 已经是码元数,但 surrogate pair 占 2 个码元。
+  const cutAt = limit;
+  const code = str.charCodeAt(cutAt - 1);
+  // 0xD800–0xDBFF = high surrogate,后面必须跟 low surrogate 才完整;
+  // 如果在 limit 处正好停在 high surrogate,回退一格避免半个 emoji/罕见汉字。
+  if (code >= 0xD800 && code <= 0xDBFF) {
+    return str.substring(0, cutAt - 1) + suffix;
+  }
+  return str.substring(0, cutAt) + suffix;
+}
+
 function judgeUnmerged(statusOutput) {
   const hasUnmerged = statusOutput.includes('You have unmerged paths');
   if (hasUnmerged) {
@@ -1091,6 +1122,7 @@ export {
   coloredLog, errorLog, execSyncGitCommand,
   execGitCommand, getCommandHistory, addCommandToHistory, // Add command history exports
   clearCommandHistory,
+  truncateForHistory, // 暴露便于测试与外部复用(单测会 import 这个验证 surrogate-pair 回退)
   checkAndClearGitLock,
   registerSocketIO, // 导出注册Socket.io的函数
   getCwd, parseCwdArg, judgePlatform, showHelp, judgeLog, printGitLog,

package/src/utils/parseCwdArg.test.js

@@ -83,4 +83,93 @@ test('--cwd 优先 --path 之前出现', () => {
     parseCwdArg(['--cwd=/c', '--path=/p']),
     '/c'
   )
+})
+
+// ========== 边界用例扩展(2026-06-26 增补) ==========
+
+test('带空格的路径(带引号包裹)', () => {
+  // POSIX/macOS 常见: --path="/Users/me/My Project"
+  // 解析行为:eqIdx 取第一个 `=`,整段 `--path=` 之后保留引号本身,
+  // 由下游 getCwd → process.chdir 或 exec cwd 自行去引号(shell 词法在 child_process 那层)
+  assert.equal(
+    parseCwdArg(['node', 'g.js', '--path="/Users/me/My Project"']),
+    '"/Users/me/My Project"'
+  )
+})
+
+test('带空格的路径(无引号 + 空格分隔形式)', () => {
+  // --path <value> 形式,value 含空格
+  assert.equal(
+    parseCwdArg(['node', 'g.js', '--path', '/Users/me/My Project']),
+    '/Users/me/My Project'
+  )
+})
+
+test('相对路径 ./ 与 ../', () => {
+  // 用户在子目录下用 --path=./repo 触发相对路径解析,
+  // parseCwdArg 只做字符串切片,不解析;是否 resolve 由 getCwd 决定
+  assert.equal(parseCwdArg(['--path=./repo']), './repo')
+  assert.equal(parseCwdArg(['--path=../sibling']), '../sibling')
+  assert.equal(parseCwdArg(['--path', './inner']), './inner')
+})
+
+test('Windows 盘符 C:\\Project 不被特殊处理', () => {
+  // 解析器对盘符大小写不敏感,字符串原样返回;
+  // 真正的 case-insensitive 去重在 normalizeProjectPath(config.js)层做
+  assert.equal(
+    parseCwdArg(['node', 'g.js', '--path=C:\\Project']),
+    'C:\\Project'
+  )
+  assert.equal(
+    parseCwdArg(['node', 'g.js', '--path=c:\\project']),
+    'c:\\project'
+  )
+  assert.equal(
+    parseCwdArg(['node', 'g.js', '--path=D:/work']),
+    'D:/work'
+  )
+})
+
+test('value 中嵌入等号不被截断', () => {
+  // --path=/a=b → indexOf 取第一个 `=`,value 保留嵌入等号
+  // 例: --path=/opt/some=weird-name
+  assert.equal(
+    parseCwdArg(['--path=/opt/some=weird-name']),
+    '/opt/some=weird-name'
+  )
+  // 多重等号同理
+  assert.equal(
+    parseCwdArg(['--path=x=y=z']),
+    'x=y=z'
+  )
+})
+
+test('--path= 仅在 argv 末尾也安全返回 null', () => {
+  // 防御:argv 解析不抛
+  assert.equal(parseCwdArg(['--path=']), null)
+})
+
+test('argv 中混入无关 unicode 不影响解析', () => {
+  // 中间混 emoji / CJK,只关心 --path 的值
+  assert.equal(
+    parseCwdArg(['node', 'g.js', '🚀', '--path=/repo', '中文']),
+    '/repo'
+  )
+})
+
+test('--path 等号紧贴无空格', () => {
+  // --path=/repo(无空格) vs --path /repo(空格)
+  // 行为应一致
+  assert.equal(
+    parseCwdArg(['--path=/repo']),
+    parseCwdArg(['--path', '/repo'])
+  )
+})
+
+test('重复 --path 取首个出现', () => {
+  // 已经测过,这里再确认带空格的重复
+  assert.equal(
+    parseCwdArg(['--path=/first with space', '--path=/second']),
+    '/first with space'
+  )
 })

package/src/utils/utils.test.js

@@ -0,0 +1,200 @@
+// 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.
+//
+// utils/index.js 中暴露的工具函数测试(node:test 内置)。
+// 覆盖 truncateForHistory(surrogate-pair 安全截断)+ exec_exit(字符串 'false' 回归)。
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { truncateForHistory, exec_exit } from './index.js'
+
+// ========== truncateForHistory ==========
+
+test('truncateForHistory: 短字符串原样返回', () => {
+  assert.equal(truncateForHistory('hello', 100, '...[t]'), 'hello')
+})
+
+test('truncateForHistory: 长度等于 limit 原样返回', () => {
+  // 边界条件:不超 limit 就保持原状
+  assert.equal(truncateForHistory('hello', 5, '...[t]'), 'hello')
+})
+
+test('truncateForHistory: 长 ASCII 字符串按 limit 截断 + suffix', () => {
+  const out = truncateForHistory('abcdefghijklmnop', 10, '...[t]')
+  assert.equal(out, 'abcdefghij...[t]')
+})
+
+test('truncateForHistory: 不会切断 UTF-16 代理对(emoji)', () => {
+  // 🦄 = U+1F984,UTF-16 编码是 0xD83E 0xDD84(一对 surrogate)。
+  // 如果 limit=1,substring(0,1) 会拿到 0xD83E(孤立 high surrogate),
+  // 截断函数应识别并回退 1 位,返回 suffix。
+  const out = truncateForHistory('🦄hello', 1, '...[t]')
+  // 不应包含未配对的 high surrogate
+  assert.ok(!out.startsWith('\uD83E'), '不应以孤立 high surrogate 开头')
+  assert.ok(out.endsWith('...[t]'), '应以 suffix 收尾')
+})
+
+test('truncateForHistory: 完整 emoji 不会被切坏', () => {
+  // 🦄🐢🐲 = 3 个 supplementary plane 字符,每个 2 码元,共 6 码元
+  // limit=7 → cutAt=7,正好停在 'r' 上,完整保留 3 emoji
+  const out = truncateForHistory('🦄🐢🐲rest', 7, '...[t]')
+  // 高低位 surrogate 总是成对出现 → 数 codepoint 数应等于 emoji 数
+  // 不应出现奇数个 surrogate(否则有孤立的)
+  const codeUnits = [...out].map(c => c.codePointAt(0))
+  const highSurrogates = codeUnits.filter(c => c >= 0xD800 && c <= 0xDBFF).length
+  const lowSurrogates = codeUnits.filter(c => c >= 0xDC00 && c <= 0xDFFF).length
+  assert.equal(highSurrogates, lowSurrogates, 'high/low surrogate 必须成对')
+  assert.ok(out.startsWith('🦄🐢🐲'), '前 3 个 emoji 应完整保留')
+  assert.ok(out.endsWith('...[t]'))
+})
+
+test('truncateForHistory: 截断位置恰好在 emoji 边界时回退', () => {
+  // helper: 数 surrogate 是否成对(无孤立)
+  const checkPaired = (s) => {
+    const codeUnits = [...s].map(c => c.codePointAt(0))
+    const high = codeUnits.filter(c => c >= 0xD800 && c <= 0xDBFF).length
+    const low = codeUnits.filter(c => c >= 0xDC00 && c <= 0xDFFF).length
+    return high === low
+  }
+  // 🦄 = 2 码元,limit=2 想保留前 2 码元 → 完整 emoji → 不回退
+  const out1 = truncateForHistory('🦄hello', 2, '...[t]')
+  assert.ok(out1.startsWith('🦄'), 'limit=2 应保留完整 emoji')
+  assert.ok(checkPaired(out1), '应无孤立 surrogate')
+  // limit=3 想保留前 3 码元 = 高+低+'h',emoji 已完整,直接切
+  const out2 = truncateForHistory('🦄hello', 3, '...[t]')
+  assert.ok(out2.startsWith('🦄h'), 'limit=3 应保留 emoji + 后续字符')
+  assert.ok(checkPaired(out2), '应无孤立 surrogate')
+})
+
+test('truncateForHistory: 中日韩 BMP 字符不被切断(单码元)', () => {
+  // 中文 = BMP 字符,每个 1 码元,substring 不会切坏
+  // '你好世界你好世界' 共 10 字符,substring(0, 6) = '你好世界你好'
+  const out = truncateForHistory('你好世界你好世界', 6, '...[t]')
+  assert.equal(out, '你好世界你好' + '...[t]')
+})
+
+test('truncateForHistory: 非字符串输入安全返回原值', () => {
+  // 防御:execGitCommand 失败时 stdout/stderr 可能 undefined
+  assert.equal(truncateForHistory(undefined, 100, '...[t]'), undefined)
+  assert.equal(truncateForHistory(null, 100, '...[t]'), null)
+  assert.equal(truncateForHistory(123, 100, '...[t]'), 123)
+})
+
+test('truncateForHistory: limit=0 / 负数返回原值(防御退化)', () => {
+  // limit<=0 没有合理的"保留 N 码元"语义,直接原样返回,避免误返回空+suffix
+  assert.equal(truncateForHistory('abc', 0, '...[t]'), 'abc')
+  assert.equal(truncateForHistory('abc', -1, '...[t]'), 'abc')
+})
+
+// ========== exec_exit ==========
+
+test('exec_exit: 显式 true 触发 process.exit', () => {
+  const original = process.exit
+  let exitCode = null
+  process.exit = (code) => {
+    exitCode = code
+    // 不真退出,抛个特殊标记让测试断言
+    const e = new Error('__test_exit_called__')
+    e.__isExitStub = true
+    throw e
+  }
+  try {
+    try {
+      exec_exit(true)
+    } catch (e) {
+      assert.ok(e.__isExitStub, '应调用 process.exit')
+    }
+    assert.equal(exitCode, undefined, 'process.exit 默认无参')
+  } finally {
+    process.exit = original
+  }
+})
+
+test('exec_exit: false 不退出', () => {
+  const original = process.exit
+  let called = false
+  process.exit = () => {
+    called = true
+    const e = new Error('__test_exit_called__')
+    e.__isExitStub = true
+    throw e
+  }
+  try {
+    exec_exit(false)
+    assert.equal(called, false, 'false 不应触发 exit')
+  } finally {
+    process.exit = original
+  }
+})
+
+test('exec_exit: 字符串 "false" 不退出(回归)', () => {
+  // 修复前:if (exit) 会把 'false' 当 true → 错误退出
+  // 修复后:if (exit === true) 只接受 boolean true
+  const original = process.exit
+  let called = false
+  process.exit = () => {
+    called = true
+    const e = new Error('__test_exit_called__')
+    e.__isExitStub = true
+    throw e
+  }
+  try {
+    exec_exit('false')
+    assert.equal(called, false, '字符串 "false" 不应触发 exit')
+  } finally {
+    process.exit = original
+  }
+})
+
+test('exec_exit: 字符串 "true" 也不退出(严格 boolean 契约)', () => {
+  // 修复策略:严格 === true,任何非 boolean true 都不退,
+  // 包括 "true" / 1 / {} 等 truthy 值 — 防止调用方传字符串/数字的歧义
+  const original = process.exit
+  let called = false
+  process.exit = () => {
+    called = true
+    const e = new Error('__test_exit_called__')
+    e.__isExitStub = true
+    throw e
+  }
+  try {
+    exec_exit('true')
+    assert.equal(called, false, '字符串 "true" 不应触发 exit')
+    exec_exit(1)
+    assert.equal(called, false, '数字 1 不应触发 exit')
+    exec_exit({})
+    assert.equal(called, false, '空对象不应触发 exit')
+  } finally {
+    process.exit = original
+  }
+})
+
+test('exec_exit: undefined / null 不退出', () => {
+  const original = process.exit
+  let called = false
+  process.exit = () => {
+    called = true
+    const e = new Error('__test_exit_called__')
+    e.__isExitStub = true
+    throw e
+  }
+  try {
+    exec_exit(undefined)
+    exec_exit(null)
+    exec_exit(0)
+    exec_exit('')
+    assert.equal(called, false, 'falsy 值不应触发 exit')
+  } finally {
+    process.exit = original
+  }
+})

package/src/ui/public/assets/AppVersionBadge-CTUXSSX1.css

@@ -1 +0,0 @@
-.upgrade-status[data-v-3de8edac]{align-items:center;gap:var(--spacing-base);margin-bottom:var(--spacing-md);font-size:14px;font-weight:500;display:flex}.upgrade-status.is-running[data-v-3de8edac]{color:var(--el-color-primary)}.upgrade-status.is-success[data-v-3de8edac]{color:var(--el-color-success)}.upgrade-status.is-failed[data-v-3de8edac]{color:var(--el-color-danger)}.upgrade-status .is-loading[data-v-3de8edac]{animation:2s linear infinite rotating-3de8edac}.upgrade-log[data-v-3de8edac]{color:#d4d4d4;white-space:pre-wrap;word-break:break-all;background:#1e1e1e;border-radius:4px;height:320px;margin:0;padding:12px;font-family:JetBrains Mono,Cascadia Code,Consolas,monospace;font-size:12px;line-height:1.6;overflow:auto}.upgrade-hint[data-v-3de8edac]{margin:0 0 var(--spacing-md) 0;border-left:3px solid var(--el-color-success);color:var(--el-color-success);background:#67c23a14;border-radius:4px;padding:8px 12px;font-size:13px}.upgrade-countdown[data-v-3de8edac]{background:var(--el-color-success);color:#fff;border-radius:10px;margin-left:8px;padding:1px 8px;font-size:12px;font-weight:600;animation:1s ease-in-out infinite pulse-3de8edac;display:inline-block}@keyframes pulse-3de8edac{0%,to{opacity:1}50%{opacity:.55}}@keyframes rotating-3de8edac{0%{transform:rotate(0)}to{transform:rotate(360deg)}}.app-version-badge[data-v-c04e50c5]{align-items:center;gap:var(--spacing-base);margin-left:auto;display:inline-flex}.badge-icon-link[data-v-c04e50c5]{width:22px;height:22px;color:var(--text-tertiary);opacity:.7;border-radius:4px;justify-content:center;align-items:center;text-decoration:none;transition:color .18s,opacity .18s,background .18s;display:inline-flex}.badge-icon-link[data-v-c04e50c5]:hover{opacity:1;color:var(--text-secondary);background:var(--bg-hover,#0000000f)}.badge-icon-link--npm[data-v-c04e50c5]:hover{color:#cb3837}.badge-icon-link[data-v-c04e50c5]:first-child:hover{color:var(--text-primary)}.version-link[data-v-c04e50c5]{color:#6c757d;border-radius:3px;padding:2px 6px;font-family:monospace;font-size:11px;text-decoration:none;transition:color .2s,background-color .2s}.version-link[data-v-c04e50c5]:hover{color:var(--el-color-primary);background-color:#0000000a}.upgrade-btn[data-v-c04e50c5]{appearance:none;cursor:pointer;color:#fff;background:linear-gradient(135deg, var(--color-primary) 0%, #3a8ee6 100%);height:22px;box-shadow:var(--shadow-sm);transition:transform var(--transition-fast) var(--ease-custom), box-shadow var(--transition-fast) var(--ease-custom), filter var(--transition-fast) var(--ease-custom);white-space:nowrap;-webkit-user-select:none;user-select:none;border:0;border-radius:11px;outline:none;align-items:center;gap:5px;margin:0;padding:0 10px 0 8px;font-family:inherit;font-size:11px;font-weight:600;line-height:1;display:inline-flex}.upgrade-btn[data-v-c04e50c5]:hover{filter:brightness(1.08);box-shadow:var(--shadow-md);transform:translateY(-1px)}.upgrade-btn[data-v-c04e50c5]:active{filter:brightness(.96);box-shadow:var(--shadow-sm);transform:translateY(0)}.upgrade-btn[data-v-c04e50c5]:focus-visible{outline:2px solid var(--color-primary);outline-offset:2px}.upgrade-btn__dot[data-v-c04e50c5]{background:#fff;border-radius:50%;flex-shrink:0;width:6px;height:6px;animation:1.6s ease-in-out infinite upgrade-pulse-c04e50c5;box-shadow:0 0 0 2px #ffffff59}.upgrade-btn__label[data-v-c04e50c5]{letter-spacing:.5px}.upgrade-btn__version[data-v-c04e50c5]{background:#ffffff38;border-radius:6px;padding:1px 5px;font-family:monospace;font-size:10px;font-weight:500;line-height:1.2}@keyframes upgrade-pulse-c04e50c5{0%,to{opacity:1;transform:scale(1)}50%{opacity:.55;transform:scale(.8)}}

package/src/ui/public/assets/AppVersionBadge-Dnl4p9oF.js

@@ -1,2 +0,0 @@
-import"./rolldown-runtime-CMxvf4Kt.js";import{B as e,Cn as t,D as n,Fn as r,G as i,Jn as a,Mn as o,Pn as s,Rn as c,Sn as l,Tn as u,Tt as d,Xn as f,Y as p,_n as m,_r as h,a as g,gn as _,hn as v,i as y,mn as b,mr as x,nt as S,pr as C,rt as w,sr as T,vn as E}from"./element-plus-rcpA4EGF.js";import{n as D,t as O}from"./_plugin-vue_export-helper-DKIb-p1R.js";async function k(){let e=await fetch(`/api/app-version`);return e.ok?e.json():{success:!1,current:``,latest:null,hasUpdate:!1,error:`HTTP ${e.status}`}}async function A(e){let t=await fetch(`/api/app-upgrade`,{method:`POST`});if(!t.ok){let n=`HTTP ${t.status}`;try{let e=await t.json();e?.error&&(n=e.error)}catch{}e({type:`error`,message:n}),e({type:`done`,code:t.status});return}if(!t.body){e({type:`error`,message:`响应无 body`}),e({type:`done`,code:-1});return}let n=t.body.getReader(),r=new TextDecoder(`utf-8`),i=``;for(;;){let{done:t,value:a}=await n.read();if(t)break;i+=r.decode(a,{stream:!0});let o=i.split(`
-`);i=o.pop()??``;for(let t of o)if(t.trim())try{e(JSON.parse(t))}catch{}}if(i.trim())try{e(JSON.parse(i))}catch{}}async function j(){let e=await fetch(`/api/app-restart`,{method:`POST`});if(!e.ok){let t=`HTTP ${e.status}`;try{let n=await e.json();n?.error&&(t=n.error)}catch{}throw Error(t)}}var M={key:3},N={key:4},P={key:5},F={key:0,class:`upgrade-hint`},I={key:0,class:`upgrade-countdown`},L=O(u({__name:`UpgradeDialog`,props:{modelValue:{type:Boolean},logs:{},status:{},countdown:{default:0}},emits:[`update:modelValue`,`retry`,`restart`,`cancel`],setup(r,{emit:i}){let s=r,u=i,g=T(null);a(()=>s.logs,async()=>{await o(),g.value&&(g.value.scrollTop=g.value.scrollHeight)});function y(){s.status!==`running`&&(s.status===`success`&&s.countdown>0&&u(`cancel`),u(`update:modelValue`,!1))}function b(){u(`retry`)}function O(){u(`restart`)}function k(){u(`cancel`),u(`update:modelValue`,!1)}return(i,a)=>{let o=p,s=e,T=n;return c(),_(T,{"model-value":r.modelValue,"onUpdate:modelValue":a[0]||=e=>u(`update:modelValue`,e),title:C(D)(`@F13B4:升级`),width:`680px`,"close-on-click-modal":!1,"close-on-press-escape":!1,"show-close":r.status!==`running`,"append-to-body":``,onClose:y},{footer:f(()=>[r.status===`failed`?(c(),_(s,{key:0,type:`primary`,onClick:b},{default:f(()=>[l(h(C(D)(`@F13B4:重试`)),1)]),_:1})):m(``,!0),r.status===`success`?(c(),_(s,{key:1,type:`primary`,onClick:O},{default:f(()=>[l(h(C(D)(`@F13B4:立即重启并刷新`)),1)]),_:1})):m(``,!0),r.status===`success`?(c(),_(s,{key:2,onClick:k},{default:f(()=>[l(h(C(D)(`@F13B4:稍后手动重启`)),1)]),_:1})):m(``,!0),r.status===`running`?(c(),_(s,{key:3,disabled:``},{default:f(()=>[l(h(C(D)(`@F13B4:升级中`))+`... `,1)]),_:1})):m(``,!0)]),default:f(()=>[v(`div`,{class:x([`upgrade-status`,`is-${r.status}`])},[r.status===`running`?(c(),_(o,{key:0,class:`is-loading`},{default:f(()=>[t(C(d))]),_:1})):r.status===`success`?(c(),_(o,{key:1,color:`#67c23a`},{default:f(()=>[t(C(S))]),_:1})):(c(),_(o,{key:2,color:`#f56c6c`},{default:f(()=>[t(C(w))]),_:1})),r.status===`running`?(c(),E(`span`,M,h(C(D)(`@F13B4:升级中`)),1)):r.status===`success`?(c(),E(`span`,N,h(C(D)(`@F13B4:升级完成`)),1)):(c(),E(`span`,P,h(C(D)(`@F13B4:升级失败`)),1))],2),r.status===`success`?(c(),E(`p`,F,[l(h(C(D)(`@F13B4:新版本已全局安装，需要重启服务才能生效`))+` `,1),r.countdown>0?(c(),E(`span`,I,h(C(D)(`@F13B4:{seconds} 秒后自动刷新`,{seconds:r.countdown})),1)):m(``,!0)])):m(``,!0),v(`pre`,{ref_key:`logEl`,ref:g,class:`upgrade-log`},h(r.logs||C(D)(`@F13B4:等待日志输出`)),513)]),_:1},8,[`model-value`,`title`,`show-close`])}}}),[[`__scopeId`,`data-v-3de8edac`]]),R={class:`app-version-badge`},z=[`aria-label`],B=[`aria-label`],V=[`title`,`aria-label`],H={class:`upgrade-btn__label`},U={class:`upgrade-btn__version`},W=`https://github.com/xz333221/zen-gitsync/releases`,G=5,K=`app-version-check`,q=3600*1e3,J=O(u({__name:`AppVersionBadge`,setup(e){let n=`2.13.29`,a=T(n),o=b(()=>a.value||n),l=T(null),u=T(!1),d=T(``),p=T(`running`),_=T(0),x=null;function S(){try{let e=sessionStorage.getItem(K);if(!e)return null;let{at:t,data:n}=JSON.parse(e);return Date.now()-t>q?null:n}catch{return null}}function w(e){try{sessionStorage.setItem(K,JSON.stringify({at:Date.now(),data:e}))}catch{}}async function O(e=!1){let t=S();t&&(l.value=t);try{let t=await k();l.value=t,w(t),t.current&&(a.value=t.current),!e&&t.success&&t.hasUpdate&&g({type:`success`,message:D(`@F13B4:发现新版本 {version}`,{version:t.latest??``}),duration:4e3})}catch(t){e||g({type:`warning`,message:D(`@F13B4:检查更新失败 {error}`,{error:t?.message||``})})}}async function M(){if(l.value?.hasUpdate){try{await y.confirm(D(`@F13B4:确定要从 {current} 升级到 {latest} 吗？`,{current:l.value.current,latest:l.value.latest}),D(`@F13B4:升级`),{confirmButtonText:D(`@F13B4:确定升级`),cancelButtonText:D(`@F13B4:取消`),type:`info`})}catch{return}d.value=``,p.value=`running`,u.value=!0,await A(e=>{if(e.type===`done`){if(p.value=e.code===0?`success`:`failed`,e.code===0){try{sessionStorage.removeItem(K)}catch{}l.value?.latest&&(a.value=l.value.latest),N()}}else e.message&&(d.value+=e.message)})}}function N(){P(),_.value=G,x=setInterval(()=>{--_.value,_.value<=0&&(x&&=(clearInterval(x),null),I())},1e3)}function P(){x&&=(clearInterval(x),null),_.value=0}function F(){P()}async function I(){P();try{await j(),setTimeout(()=>{window.location.reload()},600)}catch(e){g({type:`warning`,message:D(`@F13B4:重启失败 {error}`,{error:e?.message||``})})}}return s(()=>{P()}),r(()=>{O(!0)}),(e,n)=>{let r=i;return c(),E(`div`,R,[t(r,{content:C(D)(`@F13B4:在 GitHub 上查看源码`),placement:`top`,effect:`dark`,"show-after":300},{default:f(()=>[v(`a`,{href:`https://github.com/xz333221/zen-gitsync`,target:`_blank`,rel:`noopener noreferrer`,class:`badge-icon-link`,"aria-label":C(D)(`@F13B4:在 GitHub 上查看源码`)},[...n[1]||=[v(`svg`,{viewBox:`0 0 24 24`,width:`15`,height:`15`,"aria-hidden":`true`,fill:`currentColor`,xmlns:`http://www.w3.org/2000/svg`},[v(`path`,{d:`M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0 1 12 6.844a9.59 9.59 0 0 1 2.504.337c1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.02 10.02 0 0 0 22 12.017C22 6.484 17.522 2 12 2z`})],-1)]],8,z)]),_:1},8,[`content`]),t(r,{content:C(D)(`@F13B4:在 npm 上查看包`),placement:`top`,effect:`dark`,"show-after":300},{default:f(()=>[v(`a`,{href:`https://www.npmjs.com/package/zen-gitsync`,target:`_blank`,rel:`noopener noreferrer`,class:`badge-icon-link badge-icon-link--npm`,"aria-label":C(D)(`@F13B4:在 npm 上查看包`)},[...n[2]||=[v(`svg`,{viewBox:`0 0 24 24`,width:`15`,height:`15`,"aria-hidden":`true`,fill:`currentColor`,xmlns:`http://www.w3.org/2000/svg`},[v(`path`,{d:`M2 2v20h20V2H2zm17.167 17.167H12.5v-10h-3.333v10H4.833V4.833h14.334v14.334z`})],-1)]],8,B)]),_:1},8,[`content`]),t(r,{content:C(D)(`@F13B4:查看更新`),placement:`top`,effect:`dark`,"show-after":300},{default:f(()=>[v(`a`,{href:W,target:`_blank`,rel:`noopener noreferrer`,class:`version-link`},`v`+h(o.value),1)]),_:1},8,[`content`]),l.value?.hasUpdate?(c(),E(`button`,{key:0,type:`button`,class:`upgrade-btn`,title:C(D)(`@F13B4:发现新版本 {version}，点击升级`,{version:l.value.latest??``}),"aria-label":C(D)(`@F13B4:发现新版本 {version}，点击升级`,{version:l.value.latest??``}),onClick:M},[n[3]||=v(`span`,{class:`upgrade-btn__dot`,"aria-hidden":`true`},null,-1),v(`span`,H,h(C(D)(`@F13B4:升级`)),1),v(`span`,U,`v`+h(l.value.latest),1)],8,V)):m(``,!0),t(L,{modelValue:u.value,"onUpdate:modelValue":n[0]||=e=>u.value=e,logs:d.value,status:p.value,countdown:_.value,onRetry:M,onRestart:I,onCancel:F},null,8,[`modelValue`,`logs`,`status`,`countdown`])])}}}),[[`__scopeId`,`data-v-c04e50c5`]]);export{J as default};