zen-gitsync 2.16.48 → 2.16.50

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

@@ -22,6 +22,7 @@ import os from 'os';
 import { spawn, exec, execSync } from 'child_process';
 import { ensureWithinCwd, normalizeProjectPath } from '../utils/pathGuard.js';
 import { asyncRoute, HttpError } from '../utils/asyncRoute.js';
+import { probeDirectoryGitStates, normalizeDirKey } from '../utils/directoryGitState.js';
 import { invalidateCurrentProjectKey, invalidateRawConfigCache } from '../../../config.js';
 import { invalidateCwdCache } from '../../../utils/index.js';
 
@@ -83,6 +84,8 @@ export function registerFsRoutes({
   setProjectRoomId,
   setIsGitRepo
 }) {
+  // 单次 Git 状态探测的路径数上限(最近目录一般十几个,这里是防御性上限)
+  const MAX_GIT_PROBE_PATHS = 100;
   // ── 解析并校验 user 输入路径在当前项目 cwd 内（防 ../ 父目录逃逸、startsWith 假阳性、Windows 大小写）──
   const safePathInProject = async (userPath) => {
     const cwd = getCurrentProjectPath() || process.cwd()
@@ -380,6 +383,27 @@ export function registerFsRoutes({
     }
     }));
 
+  // 批量探测"最近目录"的 Git 状态(是不是仓库 / 有没有未提交改动)
+  //
+  // 列表卡片用它标 Git 徽标。安全上只接受**配置里的最近目录**:否则等于给前端开了
+  // 一个"任意路径 git 探测"的口子,可以拿来判断磁盘上任意目录存在与否以及仓库状态。
+  // body.paths 可选:不传就探测全部最近目录(面板场景),传了就只探这些。
+  app.post('/api/recent_directories/git-state', asyncRoute(async (req, res) => {
+    const recentDirs = (await configManager.getRecentDirectories()) || [];
+    const allowed = new Set(recentDirs.map(normalizeDirKey));
+
+    const requested = Array.isArray(req.body?.paths) ? req.body.paths : recentDirs;
+    const targets = [];
+    for (const p of requested.slice(0, MAX_GIT_PROBE_PATHS)) {
+      if (typeof p !== 'string' || !p.trim()) continue;
+      if (!allowed.has(normalizeDirKey(p))) continue; // 不在最近目录白名单里 → 忽略
+      targets.push(p);
+    }
+
+    const results = await probeDirectoryGitStates(targets);
+    res.json({ success: true, results });
+  }));
+
   // 在资源管理器/访达中打开当前目录
   app.post('/api/open_directory', asyncRoute(async (req, res) => {
     try {

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

@@ -0,0 +1,294 @@
+// 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.
+//
+// 批量探测目录的 Git 状态(是不是仓库 / 有没有未提交改动 / 与上游差多少)。
+//
+// 用途:「最近项目」「常用目录」列表要在卡片上标出 Git 状态,列表里可能有十几个目录,
+// 因此这里做四件事:
+//   1. 每个目录只跑**一次** git(status 成功即说明是仓库,失败即非仓库),
+//      并用 --branch 顺带拿到分支与领先/落后,避免额外 3 次 spawn;
+//   2. 并发上限 + 单目录超时,别让某个大仓库(或网络盘)拖死整个请求;
+//   3. 结果短 TTL 缓存,弹窗反复打开不必重复扫盘;
+//   4. 领先/落后只读**本地 remote-tracking 引用,不联网 fetch** —— 探测十几个目录
+//      去联网是不可接受的;口径与应用里那条「你的分支落后」提示一致。
+//
+// 不用 src/utils/index.js 的 execGitCommand:那个函数固定跑在当前项目 cwd,
+// 且会把每次调用写进命令历史和 socket 广播 —— 探测十几个无关目录不该污染这些。
+import { execFile } from 'node:child_process';
+import fs from 'node:fs/promises';
+
+/** 单目录 git status 超时。大仓库 status 通常 <300ms,5s 已是宽容上限 */
+export const DEFAULT_PROBE_TIMEOUT_MS = 5000;
+/** 结果缓存 TTL。用户连续开几次弹窗时命中缓存,不必重复扫盘 */
+export const DEFAULT_CACHE_TTL_MS = 15000;
+/** 并发上限:并发开满会在慢盘/大仓库上互相抢 IO,4 是实测比较稳的值 */
+export const DEFAULT_CONCURRENCY = 4;
+
+const MAX_BUFFER = 8 * 1024 * 1024;
+const cache = new Map(); // key: normalizeDirKey(path) → { ts, state }
+
+/**
+ * 路径缓存键。Windows 上同一目录可能以 `D:/x`、`d:\x`、`d:\x\` 多种写法出现,
+ * 统一成小写 + 正斜杠 + 去尾斜杠,避免同一目录缓存成多份。
+ */
+export function normalizeDirKey(dirPath) {
+  return String(dirPath || '').replace(/\\/g, '/').replace(/\/+$/, '').toLowerCase();
+}
+
+/** 空状态(非仓库 / 探测失败时复用),避免各处手写零值 */
+function emptyState(extra = {}) {
+  return {
+    exists: true,
+    isGitRepo: false,
+    // 工作区计数
+    changed: 0, staged: 0, unstaged: 0, untracked: 0,
+    // 分支与上游跟踪
+    branch: null, upstream: null, hasUpstream: false, detached: false, ahead: 0, behind: 0,
+    ...extra,
+  };
+}
+
+/**
+ * 解析 `git status --porcelain=v1` 输出 → 工作区计数。
+ * 纯函数,单测覆盖。
+ *
+ * 格式:`XY path`,X=暂存区状态,Y=工作区状态。
+ *   - `## ...` → 分支头(见 parseBranchTracking),**不计入改动**
+ *   - `??` → 未跟踪
+ *   - `!!` → 被忽略(porcelain 默认不输出,防御性跳过)
+ *   - 其余非空位 → 计入暂存/未暂存(冲突如 `UU` 会同时计入两边)
+ * `changed` 按**条目数**数,所以"已暂存又被修改"的文件只算 1 个,不重复计数。
+ */
+export function parsePorcelainStatus(stdout) {
+  const result = { changed: 0, staged: 0, unstaged: 0, untracked: 0 };
+  for (const rawLine of String(stdout || '').split('\n')) {
+    const line = rawLine.replace(/\r$/, '');
+    // 必须显式跳过分支头:`## main...origin/main` 的前两个字符是 `#`,
+    // 既不是 `!!` 也不是 `??`,漏掉会把它算成 1 个"已暂存 + 未暂存"的文件。
+    if (line.startsWith('##')) continue;
+    if (line.length < 3) continue;
+    const x = line[0];
+    const y = line[1];
+    if (x === '!' && y === '!') continue;
+    if (x === '?' && y === '?') {
+      result.untracked += 1;
+    } else {
+      if (x !== ' ' && x !== '?') result.staged += 1;
+      if (y !== ' ' && y !== '?') result.unstaged += 1;
+    }
+    result.changed += 1;
+  }
+  return result;
+}
+
+/**
+ * 解析 `git status --porcelain=v1 --branch` 的 `##` 头 → 分支与领先/落后。
+ * 纯函数,单测覆盖。
+ *
+ * 见过的几种形状:
+ *   `## main...origin/main [ahead 1, behind 2]`  有上游且有差异
+ *   `## main...origin/main`                     有上游且同步
+ *   `## main...origin/main [gone]`              上游被删了(ahead/behind 无意义)
+ *   `## main`                                   有分支但没设上游
+ *   `## HEAD (no branch)`                       分离 HEAD
+ *   `## No commits yet on main`                 空仓库(老 git 是 `## Initial commit on main`)
+ *
+ * 领先/落后取自**本地 remote-tracking 引用**,不联网 fetch —— 与应用里那条
+ * 「你的分支落后 'origin/develop' 17 个提交」同一口径(都基于上次 fetch 的结果)。
+ */
+export function parseBranchTracking(stdout) {
+  const result = { branch: null, upstream: null, hasUpstream: false, detached: false, ahead: 0, behind: 0 };
+  const headLine = String(stdout || '')
+    .split('\n')
+    .map(l => l.replace(/\r$/, ''))
+    .find(l => l.startsWith('## '));
+  if (!headLine) return result;
+
+  let head = headLine.slice(3).trim();
+  // 跟踪信息固定在末尾方括号里,先摘掉再拆分支名(分支名里不可能出现 `[`)
+  const bracket = head.match(/\s+\[(.+)\]$/);
+  let tracking = '';
+  if (bracket) {
+    tracking = bracket[1];
+    head = head.slice(0, head.length - bracket[0].length).trim();
+  }
+
+  if (/^HEAD \(no branch\)/.test(head)) {
+    result.detached = true;
+    return result;
+  }
+
+  const fresh = head.match(/^(?:No commits yet on|Initial commit on)\s+(.+)$/);
+  if (fresh) {
+    result.branch = fresh[1].trim();
+    return result;
+  }
+
+  // git 的 ref 命名规则禁止 `..`,所以 `...` 只会是分隔符
+  const sep = head.indexOf('...');
+  if (sep === -1) {
+    result.branch = head;
+  } else {
+    result.branch = head.slice(0, sep);
+    result.upstream = head.slice(sep + 3);
+    // [gone] 表示上游引用已不存在,这时不算"有上游可比较"
+    result.hasUpstream = !/gone/.test(tracking);
+  }
+
+  const ahead = tracking.match(/ahead (\d+)/);
+  const behind = tracking.match(/behind (\d+)/);
+  if (ahead) result.ahead = Number(ahead[1]);
+  if (behind) result.behind = Number(behind[1]);
+
+  return result;
+}
+
+function execFileAsync(file, args, options) {
+  return new Promise((resolve, reject) => {
+    execFile(file, args, options, (error, stdout, stderr) => {
+      if (error) {
+        error.stdout = stdout;
+        error.stderr = stderr;
+        reject(error);
+        return;
+      }
+      resolve({ stdout, stderr });
+    });
+  });
+}
+
+/**
+ * 探测单个目录。
+ * 返回 isGitRepo:true|false|null  —— null 表示"没探到"(超时/权限等),
+ * 前端对 null 不显示任何 Git 标记,避免把未知谎报成"非仓库"。
+ */
+export async function probeDirectoryGitState(dirPath, { timeoutMs = DEFAULT_PROBE_TIMEOUT_MS } = {}) {
+  try {
+    const stat = await fs.stat(dirPath);
+    if (!stat.isDirectory()) return emptyState({ exists: false });
+  } catch {
+    return emptyState({ exists: false });
+  }
+
+  try {
+    const { stdout } = await execFileAsync(
+      'git',
+      [
+        '-C', dirPath,
+        // --no-optional-locks:纯读探测不抢 index.lock,避免和用户正在跑的 git 操作打架
+        '--no-optional-locks',
+        'status',
+        '--porcelain=v1',
+        // --branch 让 status 顺带输出 `## main...origin/main [ahead 1, behind 2]`,
+        // 领先/落后就白拿 —— 否则要再起 3 个进程(symbolic-ref + rev-parse @{u} + rev-list)。
+        // 只读本地 remote-tracking 引用,**不联网**。
+        '--branch',
+        // normal 会把未跟踪目录折叠成一条,大目录(node_modules 之类)下比 all 快很多,
+        // 而这里只需要"有没有 / 有几项"
+        '--untracked-files=normal',
+      ],
+      {
+        timeout: timeoutMs,
+        maxBuffer: MAX_BUFFER,
+        windowsHide: true,
+        env: {
+          ...process.env,
+          // 与 execGitCommand 保持一致:关闭路径转义,避免中文/空格路径变成 \xxx 八进制
+          GIT_CONFIG_PARAMETERS: "'core.quotepath=false'",
+        },
+      }
+    );
+    return {
+      exists: true,
+      isGitRepo: true,
+      ...parsePorcelainStatus(stdout),
+      ...parseBranchTracking(stdout),
+    };
+  } catch (error) {
+    const text = `${error?.stderr || ''}\n${error?.message || ''}`;
+    if (/not a git repository|not a git repo/i.test(text)) {
+      // 目录存在但不是仓库:明确回答"不是",不算错误
+      return emptyState();
+    }
+    // 超时 / 权限 / git 不存在等 —— 状态未知
+    return emptyState({ isGitRepo: null, error: String(error?.message || error).split('\n')[0] });
+  }
+}
+
+/** 以固定并发跑完所有任务,保持入参顺序输出 */
+async function runWithConcurrency(items, limit, worker) {
+  const results = new Array(items.length);
+  let cursor = 0;
+  const size = Math.max(1, Math.min(limit, items.length));
+  await Promise.all(Array.from({ length: size }, async () => {
+    while (cursor < items.length) {
+      const index = cursor;
+      cursor += 1;
+      results[index] = await worker(items[index], index);
+    }
+  }));
+  return results;
+}
+
+/**
+ * 批量探测。返回 `{ [原始路径]: state }` —— 键用调用方传入的原始字符串,
+ * 前端可以直接 `states[item.path]` 取,不必关心后端的归一化规则。
+ *
+ * @param {string[]} paths
+ * @param {{ timeoutMs?: number, ttlMs?: number, concurrency?: number, useCache?: boolean }} [options]
+ */
+export async function probeDirectoryGitStates(paths, options = {}) {
+  const {
+    timeoutMs = DEFAULT_PROBE_TIMEOUT_MS,
+    ttlMs = DEFAULT_CACHE_TTL_MS,
+    concurrency = DEFAULT_CONCURRENCY,
+    useCache = true,
+  } = options;
+
+  const list = Array.isArray(paths) ? paths.filter(p => typeof p === 'string' && p.trim()) : [];
+  const results = {};
+  const pending = [];
+  const now = Date.now();
+
+  for (const original of list) {
+    if (Object.prototype.hasOwnProperty.call(results, original)) continue; // 重复路径只探一次
+    const key = normalizeDirKey(original);
+    const hit = useCache ? cache.get(key) : undefined;
+    if (hit && now - hit.ts < ttlMs) {
+      results[original] = hit.state;
+      continue;
+    }
+    pending.push({ key, original });
+  }
+
+  const probed = await runWithConcurrency(pending, concurrency, async ({ key, original }) => {
+    const state = await probeDirectoryGitState(original, { timeoutMs });
+    return { key, original, state };
+  });
+
+  for (const { key, original, state } of probed) {
+    if (state.isGitRepo !== null) {
+      // 只有确定的结果才缓存:超时/未知下次还要再试
+      cache.set(key, { ts: Date.now(), state });
+    }
+    results[original] = state;
+  }
+
+  return results;
+}
+
+/** 仅供测试:清空缓存 */
+export function clearGitStateCache() {
+  cache.clear();
+}

package/src/ui/server/utils/directoryGitState.test.js

@@ -0,0 +1,296 @@
+// 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.
+//
+// 目录 Git 状态探测 单元测试(node:test 内置)
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+import {
+  parsePorcelainStatus,
+  parseBranchTracking,
+  normalizeDirKey,
+  probeDirectoryGitState,
+  probeDirectoryGitStates,
+  clearGitStateCache,
+} from './directoryGitState.js';
+
+const execFileAsync = promisify(execFile);
+const git = (args, cwd) => execFileAsync('git', args, { cwd, windowsHide: true });
+// 提交必须显式给身份并关掉签名,否则依赖开发机的全局 git 配置 → CI 上必挂
+const gitCommit = (dir, msg) => git([
+  '-c', 'user.name=zen-test',
+  '-c', 'user.email=zen-test@example.invalid',
+  '-c', 'commit.gpgsign=false',
+  'commit', '-q', '-m', msg,
+], dir);
+// 本地路径当 remote 时统一成正斜杠,免得 Windows 反斜杠被当转义
+const asRemote = p => p.replace(/\\/g, '/');
+
+// ── 纯函数:porcelain 解析 ────────────────────────────────────────────────
+test('parsePorcelainStatus: 空输入返回全零', () => {
+  assert.deepEqual(parsePorcelainStatus(''), { changed: 0, staged: 0, unstaged: 0, untracked: 0 });
+  assert.deepEqual(parsePorcelainStatus(undefined), { changed: 0, staged: 0, unstaged: 0, untracked: 0 });
+});
+
+test('parsePorcelainStatus: 分别统计已暂存 / 未暂存 / 未跟踪', () => {
+  const out = [
+    ' M src/a.js',      // 工作区改动
+    'M  src/b.js',      // 已暂存
+    '?? notes.txt',     // 未跟踪
+    'A  src/c.js',      // 新文件已暂存
+  ].join('\n');
+  const r = parsePorcelainStatus(out);
+  assert.equal(r.staged, 2);
+  assert.equal(r.unstaged, 1);
+  assert.equal(r.untracked, 1);
+  assert.equal(r.changed, 4);
+});
+
+test('parsePorcelainStatus: 同一文件既暂存又改动(MM)只算 1 项,但两边各计一次', () => {
+  const r = parsePorcelainStatus('MM src/both.js');
+  assert.equal(r.changed, 1, 'changed 按条目数,不能重复计数');
+  assert.equal(r.staged, 1);
+  assert.equal(r.unstaged, 1);
+});
+
+test('parsePorcelainStatus: 冲突(UU)两侧都计数,条目仍为 1', () => {
+  const r = parsePorcelainStatus('UU src/conflict.js');
+  assert.equal(r.changed, 1);
+  assert.equal(r.staged, 1);
+  assert.equal(r.unstaged, 1);
+});
+
+test('parsePorcelainStatus: 重命名算 1 项(已暂存)', () => {
+  const r = parsePorcelainStatus('R  old.js -> new.js');
+  assert.equal(r.changed, 1);
+  assert.equal(r.staged, 1);
+  assert.equal(r.unstaged, 0);
+});
+
+test('parsePorcelainStatus: 忽略条目(!!)与 CRLF / 空行不计数', () => {
+  const out = '!! dist/bundle.js\r\n\r\n M a.js\r\n';
+  const r = parsePorcelainStatus(out);
+  assert.equal(r.changed, 1);
+  assert.equal(r.unstaged, 1);
+});
+
+// 回归:加了 --branch 之后 `## main...origin/main` 会出现在输出首行。
+// 它的前两个字符是 `#`,既不是 `!!` 也不是 `??`,漏判就会被算成
+// 1 个"已暂存 + 未暂存"的文件 —— 于是"干净仓库"凭空多出 1 项未提交。
+test('parsePorcelainStatus: 分支头(##)不计入改动', () => {
+  const withHeader = parsePorcelainStatus('## main...origin/main [ahead 1, behind 2]\n M a.js');
+  assert.equal(withHeader.changed, 1, '只有真实改动那条才算');
+  assert.equal(withHeader.staged, 0);
+  assert.equal(withHeader.unstaged, 1);
+
+  const cleanWithHeader = parsePorcelainStatus('## main...origin/main');
+  assert.deepEqual(cleanWithHeader, { changed: 0, staged: 0, unstaged: 0, untracked: 0 });
+});
+
+// ── 纯函数:分支头解析 ────────────────────────────────────────────────────
+test('parseBranchTracking: 有上游且有领先/落后', () => {
+  assert.deepEqual(parseBranchTracking('## main...origin/main [ahead 1, behind 2]'), {
+    branch: 'main', upstream: 'origin/main', hasUpstream: true, detached: false, ahead: 1, behind: 2,
+  });
+  assert.deepEqual(parseBranchTracking('## develop...origin/develop [behind 17]'), {
+    branch: 'develop', upstream: 'origin/develop', hasUpstream: true, detached: false, ahead: 0, behind: 17,
+  });
+  assert.deepEqual(parseBranchTracking('## main...origin/main [ahead 3]'), {
+    branch: 'main', upstream: 'origin/main', hasUpstream: true, detached: false, ahead: 3, behind: 0,
+  });
+});
+
+test('parseBranchTracking: 有上游但已同步 → 全零', () => {
+  const r = parseBranchTracking('## main...origin/main');
+  assert.equal(r.hasUpstream, true);
+  assert.equal(r.upstream, 'origin/main');
+  assert.equal(r.ahead, 0);
+  assert.equal(r.behind, 0);
+});
+
+test('parseBranchTracking: 没设上游 → hasUpstream=false 且不带上游名', () => {
+  const r = parseBranchTracking('## feature/foo-bar');
+  assert.equal(r.branch, 'feature/foo-bar', '带斜杠/短横线的分支名要完整保留');
+  assert.equal(r.upstream, null);
+  assert.equal(r.hasUpstream, false);
+  assert.equal(r.ahead, 0);
+  assert.equal(r.behind, 0);
+});
+
+test('parseBranchTracking: 上游被删([gone])不算有上游', () => {
+  const r = parseBranchTracking('## main...origin/main [gone]');
+  assert.equal(r.branch, 'main');
+  assert.equal(r.hasUpstream, false);
+  assert.equal(r.ahead, 0);
+  assert.equal(r.behind, 0);
+});
+
+test('parseBranchTracking: 分离 HEAD 与空仓库', () => {
+  const detached = parseBranchTracking('## HEAD (no branch)');
+  assert.equal(detached.detached, true);
+  assert.equal(detached.branch, null);
+  assert.equal(detached.hasUpstream, false);
+
+  assert.equal(parseBranchTracking('## No commits yet on main').branch, 'main');
+  assert.equal(parseBranchTracking('## Initial commit on trunk').branch, 'trunk');
+});
+
+test('parseBranchTracking: 无分支头 / 空输入 → 中性零值,不抛错', () => {
+  for (const input of ['', undefined, null, ' M a.js\n?? b.txt']) {
+    assert.deepEqual(parseBranchTracking(input), {
+      branch: null, upstream: null, hasUpstream: false, detached: false, ahead: 0, behind: 0,
+    });
+  }
+});
+
+test('normalizeDirKey: Windows 大小写 / 斜杠 / 尾斜杠写法归一', () => {
+  const a = normalizeDirKey('D:\\Workspace\\Proj\\');
+  const b = normalizeDirKey('d:/workspace/proj');
+  assert.equal(a, b);
+});
+
+// ── 真实文件系统 + git 进程 ────────────────────────────────────────────────
+test('probeDirectoryGitState: 不存在的目录 → exists=false', async () => {
+  const missing = path.join(os.tmpdir(), 'zen-gitsync-not-exist-' + Date.now());
+  const state = await probeDirectoryGitState(missing);
+  assert.equal(state.exists, false);
+  assert.equal(state.isGitRepo, false);
+});
+
+test('probeDirectoryGitState: 普通目录 → exists=true 且 isGitRepo=false', async () => {
+  const dir = await fs.mkdtemp(path.join(os.tmpdir(), 'zen-plain-'));
+  try {
+    const state = await probeDirectoryGitState(dir);
+    assert.equal(state.exists, true);
+    assert.equal(state.isGitRepo, false);
+    assert.equal(state.changed, 0);
+  } finally {
+    await fs.rm(dir, { recursive: true, force: true });
+  }
+});
+
+test('probeDirectoryGitState: 真实仓库 → 干净 0 项,加文件后计数递增', async () => {
+  const dir = await fs.mkdtemp(path.join(os.tmpdir(), 'zen-repo-'));
+  try {
+    await git(['init', '-q'], dir);
+    const clean = await probeDirectoryGitState(dir);
+    assert.equal(clean.isGitRepo, true);
+    assert.equal(clean.changed, 0);
+
+    await fs.writeFile(path.join(dir, 'new-file.txt'), 'hello\n');
+    const untracked = await probeDirectoryGitState(dir);
+    assert.equal(untracked.isGitRepo, true);
+    assert.equal(untracked.changed, 1);
+    assert.equal(untracked.untracked, 1);
+
+    await git(['add', 'new-file.txt'], dir);
+    const staged = await probeDirectoryGitState(dir);
+    assert.equal(staged.staged, 1);
+    assert.equal(staged.changed, 1);
+  } finally {
+    await fs.rm(dir, { recursive: true, force: true });
+  }
+});
+
+// 端到端验证 --branch 真的生效、领先/落后数字是真的:
+// 建一个裸仓库当远端,克隆两个副本,一个本地提交(领先)、另一个提交后推送再 fetch(落后)。
+test('probeDirectoryGitState: 真实远端 → 读出上游分支与领先/落后', async () => {
+  const root = await fs.mkdtemp(path.join(os.tmpdir(), 'zen-track-'));
+  const originDir = path.join(root, 'origin.git');
+  const seedDir = path.join(root, 'seed');
+  const workDir = path.join(root, 'work');
+  const otherDir = path.join(root, 'other');
+  try {
+    // 1) 造一个已有 main 的裸远端(空裸仓库克隆出来没有上游,必须先有提交)
+    await git(['init', '-q', '--bare', '-b', 'main', originDir], root);
+    await git(['init', '-q', '-b', 'main', seedDir], root);
+    await fs.writeFile(path.join(seedDir, 'README.md'), 'seed\n');
+    await git(['add', '.'], seedDir);
+    await gitCommit(seedDir, 'init');
+    await git(['remote', 'add', 'origin', asRemote(originDir)], seedDir);
+    await git(['push', '-q', '-u', 'origin', 'main'], seedDir);
+
+    // 2) 克隆出来就自带上游,且与远端同步
+    await git(['clone', '-q', asRemote(originDir), workDir], root);
+    const synced = await probeDirectoryGitState(workDir);
+    assert.equal(synced.isGitRepo, true);
+    assert.equal(synced.hasUpstream, true);
+    assert.equal(synced.upstream, 'origin/main');
+    assert.equal(synced.branch, 'main');
+    assert.equal(synced.ahead, 0);
+    assert.equal(synced.behind, 0);
+    assert.equal(synced.changed, 0, '同步且干净时不能凭空多出改动(分支头误计的回归)');
+
+    // 3) 本地提交 → 领先 1
+    await fs.writeFile(path.join(workDir, 'local.txt'), 'local\n');
+    await git(['add', '.'], workDir);
+    await gitCommit(workDir, 'local work');
+    const ahead = await probeDirectoryGitState(workDir);
+    assert.equal(ahead.ahead, 1);
+    assert.equal(ahead.behind, 0);
+    assert.equal(ahead.changed, 0, '提交后工作区应该是干净的');
+
+    // 4) 另一个人推了新提交,再 fetch → 同时领先 1 / 落后 1
+    await git(['clone', '-q', asRemote(originDir), otherDir], root);
+    await fs.writeFile(path.join(otherDir, 'remote.txt'), 'remote\n');
+    await git(['add', '.'], otherDir);
+    await gitCommit(otherDir, 'remote work');
+    await git(['push', '-q'], otherDir);
+    await git(['fetch', '-q', 'origin'], workDir);
+
+    const diverged = await probeDirectoryGitState(workDir);
+    assert.equal(diverged.ahead, 1);
+    assert.equal(diverged.behind, 1);
+    assert.equal(diverged.hasUpstream, true);
+  } finally {
+    await fs.rm(root, { recursive: true, force: true });
+  }
+});
+
+test('probeDirectoryGitStates: 结果按调用方原始路径字符串为键,重复路径只探一次', async () => {  clearGitStateCache();
+  const dir = await fs.mkdtemp(path.join(os.tmpdir(), 'zen-batch-'));
+  try {
+    await git(['init', '-q'], dir);
+    const results = await probeDirectoryGitStates([dir, dir, 'not-a-real-path-xyz'], { useCache: false });
+    assert.deepEqual(Object.keys(results).sort(), [dir, 'not-a-real-path-xyz'].sort());
+    assert.equal(results[dir].isGitRepo, true);
+    assert.equal(results['not-a-real-path-xyz'].exists, false);
+  } finally {
+    await fs.rm(dir, { recursive: true, force: true });
+  }
+});
+
+test('probeDirectoryGitStates: 命中缓存时不重新扫盘,useCache:false 可绕过', async () => {
+  clearGitStateCache();
+  const dir = await fs.mkdtemp(path.join(os.tmpdir(), 'zen-cache-'));
+  try {
+    await git(['init', '-q'], dir);
+    const first = await probeDirectoryGitStates([dir]);
+    assert.equal(first[dir].changed, 0);
+
+    // 缓存期内新增文件,结果应仍是缓存的旧值
+    await fs.writeFile(path.join(dir, 'later.txt'), 'x\n');
+    const cached = await probeDirectoryGitStates([dir]);
+    assert.equal(cached[dir].changed, 0, 'TTL 内应命中缓存');
+
+    const fresh = await probeDirectoryGitStates([dir], { useCache: false });
+    assert.equal(fresh[dir].changed, 1, 'useCache:false 必须重新探测');
+  } finally {
+    await fs.rm(dir, { recursive: true, force: true });
+  }
+});

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

@@ -1,2 +0,0 @@
-import"./rolldown-runtime-BM3Ffeng.js";import{$n as e,An as t,Bn as n,Br as r,Cn as i,Dn as a,Et as o,G as s,Hn as c,Kr as l,Ln as u,M as d,On as f,Sn as p,U as m,Wn as h,bn as g,fr as _,i as v,nt as y,r as b,rn as x,tr as S,tt as C,xn as w,yn as T}from"./element-plus-C3mePHEv.js";import{n as E,t as D}from"./_plugin-vue_export-helper-CtcBeUZZ.js";async function O(e,t){let n=e.body.getReader(),r=new TextDecoder(`utf-8`),i=``;for(;;){let{done:e,value:a}=await n.read();if(e)break;i+=r.decode(a,{stream:!0});let o=i.split(`
-`);i=o.pop()??``;for(let e of o)e.trim()&&t(e)}i.trim()&&t(i)}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}await O(t,t=>{try{e(JSON.parse(t))}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)}if(!e.body)throw Error(`响应无 body`);return new Promise((t,n)=>{let r=!1,i=e=>{r||(r=!0,e())};O(e,e=>{try{let r=JSON.parse(e);r.type===`ready`&&typeof r.port==`number`&&r.port>0?i(()=>t(r.port)):r.type===`timeout`?i(()=>n(Error(`restart.timeout`))):r.type===`error`&&i(()=>n(Error(r.message||`restart.failed`)))}catch{}}).then(()=>{i(()=>n(Error(`restart.stream-closed`)))}).catch(()=>{})})}var M=`npm install -g zen-gitsync --registry https://registry.npmjs.org/`,N=t({__name:`UpgradeDialog`,props:{modelValue:{type:Boolean,required:!0},logs:{type:String,required:!0},status:{type:String,required:!0},countdown:{type:Number,required:!1,default:0}},emits:[`update:modelValue`,`retry`,`restart`,`cancel`],setup(t,{expose:n,emit:r}){n();let i=t,a=r,s=_(null);e(()=>i.logs,async()=>{await u(),s.value&&(s.value.scrollTop=s.value.scrollHeight)});function c(){i.status!==`running`&&(i.status===`success`&&i.countdown>0&&a(`cancel`),a(`update:modelValue`,!1))}function l(){a(`retry`)}function d(){a(`restart`)}function f(){a(`cancel`),a(`update:modelValue`,!1)}async function p(){try{await navigator.clipboard.writeText(M),v.success(E(`@F13B4:已复制升级命令`))}catch{v.warning(E(`@F13B4:复制失败，请手动复制`))}}let m={MANUAL_COMMAND:M,props:i,emit:a,logEl:s,close:c,onRetry:l,onRestart:d,onLater:f,onCopyCommand:p,get Loading(){return o},get CircleCheck(){return C},get CircleClose(){return y},get $t(){return E}};return Object.defineProperty(m,`__isScriptSetup`,{enumerable:!1,value:!0}),m}}),P={key:3},F={key:4},I={key:5},L={key:0,class:`upgrade-hint`},R={key:0,class:`upgrade-countdown`},z={key:1,class:`upgrade-manual`},B={class:`upgrade-manual__label`};function V(e,t,n,o,s,c){let u=x,_=m,v=d;return h(),w(v,{"model-value":n.modelValue,"onUpdate:modelValue":t[0]||=e=>o.emit(`update:modelValue`,e),title:o.$t(`@F13B4:升级`),width:`680px`,"close-on-click-modal":!1,"close-on-press-escape":!1,"show-close":n.status!==`running`,"append-to-body":``,onClose:o.close},{footer:S(()=>[n.status===`failed`?(h(),w(_,{key:0,type:`primary`,onClick:o.onRetry},{default:S(()=>[a(l(o.$t(`@F13B4:重试`)),1)]),_:1})):p(`v-if`,!0),n.status===`failed`?(h(),w(_,{key:1,onClick:o.onCopyCommand},{default:S(()=>[a(l(o.$t(`@F13B4:复制升级命令`)),1)]),_:1})):p(`v-if`,!0),n.status===`success`?(h(),w(_,{key:2,type:`primary`,onClick:o.onRestart},{default:S(()=>[a(l(o.$t(`@F13B4:立即重启并刷新`)),1)]),_:1})):p(`v-if`,!0),n.status===`success`?(h(),w(_,{key:3,onClick:o.onLater},{default:S(()=>[a(l(o.$t(`@F13B4:稍后手动重启`)),1)]),_:1})):p(`v-if`,!0),n.status===`running`?(h(),w(_,{key:4,disabled:``},{default:S(()=>[a(l(o.$t(`@F13B4:升级中`))+`... `,1)]),_:1})):p(`v-if`,!0)]),default:S(()=>[g(`div`,{class:r([`upgrade-status`,`is-${n.status}`])},[n.status===`running`?(h(),w(u,{key:0,class:`is-loading`},{default:S(()=>[f(o.Loading)]),_:1})):n.status===`success`?(h(),w(u,{key:1,color:`#67c23a`},{default:S(()=>[f(o.CircleCheck)]),_:1})):(h(),w(u,{key:2,color:`#f56c6c`},{default:S(()=>[f(o.CircleClose)]),_:1})),n.status===`running`?(h(),i(`span`,P,l(o.$t(`@F13B4:升级中`)),1)):n.status===`success`?(h(),i(`span`,F,l(o.$t(`@F13B4:升级完成`)),1)):(h(),i(`span`,I,l(o.$t(`@F13B4:升级失败`)),1))],2),n.status===`success`?(h(),i(`p`,L,[a(l(o.$t(`@F13B4:新版本已全局安装，需要重启服务才能生效`))+` `,1),n.countdown>0?(h(),i(`span`,R,l(o.$t(`@F13B4:{seconds} 秒后自动刷新`,{seconds:n.countdown})),1)):p(`v-if`,!0)])):p(`v-if`,!0),n.status===`failed`?(h(),i(`p`,z,[g(`span`,B,l(o.$t(`@F13B4:手动升级命令`)),1),g(`code`,{class:`upgrade-manual__cmd`},l(o.MANUAL_COMMAND))])):p(`v-if`,!0),g(`pre`,{ref:`logEl`,class:`upgrade-log`},l(n.logs||o.$t(`@F13B4:等待日志输出`)),513)]),_:1},8,[`model-value`,`title`,`show-close`])}var H=D(N,[[`render`,V],[`__scopeId`,`data-v-bc566bba`],[`__file`,`D:/xz_workspace/github_workspace/zen-gitsync/src/ui/client/src/components/UpgradeDialog.vue`]]),U=`https://github.com/xz333221/zen-gitsync/releases`,W=5,G=`app-version-check`,K=3600*1e3,q=t({__name:`AppVersionBadge`,setup(e,{expose:t}){t();let r=`2.16.48`,i=_(r),a=T(()=>i.value||r),o=_(null),s=_(!1),l=_(``),u=_(`running`),d=_(0),f=null,p=_(!1);function m(){try{let e=sessionStorage.getItem(G);if(!e)return null;let{at:t,data:n}=JSON.parse(e);return Date.now()-t>K?null:n}catch{return null}}function h(e){try{sessionStorage.setItem(G,JSON.stringify({at:Date.now(),data:e}))}catch{}}async function g(e=!1){let t=m();t&&(o.value=t);try{let t=await k();o.value=t,h(t),t.current&&(i.value=t.current),!e&&t.success&&t.hasUpdate&&v({type:`success`,message:E(`@F13B4:发现新版本 {version}`,{version:t.latest??``}),duration:4e3})}catch(t){e||v({type:`warning`,message:E(`@F13B4:检查更新失败 {error}`,{error:t?.message||``})})}}async function y(){if(o.value?.hasUpdate){try{await b.confirm(E(`@F13B4:确定要从 {current} 升级到 {latest} 吗？`,{current:o.value.current,latest:o.value.latest}),E(`@F13B4:升级`),{confirmButtonText:E(`@F13B4:确定升级`),cancelButtonText:E(`@F13B4:取消`),type:`info`})}catch{return}l.value=``,u.value=`running`,s.value=!0,await A(e=>{if(e.type===`done`){if(u.value=e.code===0?`success`:`failed`,e.code===0){try{sessionStorage.removeItem(G)}catch{}o.value?.latest&&(i.value=o.value.latest),x()}}else e.message&&(l.value+=e.message)})}}function x(){S(),d.value=W,f=setInterval(()=>{--d.value,d.value<=0&&(f&&=(clearInterval(f),null),w())},1e3)}function S(){f&&=(clearInterval(f),null),d.value=0}function C(){S()}async function w(){if(S(),!p.value){p.value=!0;try{let e=await j(),{pathname:t,search:n,hash:r}=window.location;window.location.href=`http://localhost:${e}${t}${n}${r}`}catch(e){let t=e?.message||``,n={"restart.timeout":`@F13B4:重启超时`,"restart.stream-closed":`@F13B4:重启失败，请刷新页面重试`,"restart.failed":`@F13B4:重启失败`}[t];v({type:`warning`,message:n?E(n):E(`@F13B4:重启失败 {error}`,{error:t})}),p.value=!1}}}n(()=>{S()}),c(()=>{g(!0)});let D={buildVersion:r,releasesUrl:U,runtimeVersion:i,displayVersion:a,latestInfo:o,upgradeDialogVisible:s,upgradeLogs:l,upgradeStatus:u,AUTO_REFRESH_SECONDS:W,countdown:d,get countdownTimer(){return f},set countdownTimer(e){f=e},restartInFlight:p,CACHE_KEY:G,CACHE_TTL_MS:K,readCache:m,writeCache:h,checkUpdate:g,handleUpgrade:y,startAutoRefreshCountdown:x,cancelAutoRefreshCountdown:S,handleCancelAutoRefresh:C,handleRestart:w,get $t(){return E},UpgradeDialog:H};return Object.defineProperty(D,`__isScriptSetup`,{enumerable:!1,value:!0}),D}}),J={class:`app-version-badge`},Y=[`aria-label`],X=[`aria-label`],Z=[`title`,`aria-label`],Q={class:`upgrade-btn__label`},$={class:`upgrade-btn__version`};function ee(e,t,n,r,a,o){let c=s;return h(),i(`div`,J,[p(` GitHub 链接 `),f(c,{content:r.$t(`@F13B4:在 GitHub 上查看源码`),placement:`top`,effect:`dark`,"show-after":300},{default:S(()=>[g(`a`,{href:`https://github.com/xz333221/zen-gitsync`,target:`_blank`,rel:`noopener noreferrer`,class:`badge-icon-link`,"aria-label":r.$t(`@F13B4:在 GitHub 上查看源码`)},t[1]||=[g(`svg`,{viewBox:`0 0 24 24`,width:`15`,height:`15`,"aria-hidden":`true`,fill:`currentColor`,xmlns:`http://www.w3.org/2000/svg`},[g(`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,Y)]),_:1},8,[`content`]),p(` NPM 链接 `),f(c,{content:r.$t(`@F13B4:在 npm 上查看包`),placement:`top`,effect:`dark`,"show-after":300},{default:S(()=>[g(`a`,{href:`https://www.npmjs.com/package/zen-gitsync`,target:`_blank`,rel:`noopener noreferrer`,class:`badge-icon-link badge-icon-link--npm`,"aria-label":r.$t(`@F13B4:在 npm 上查看包`)},t[2]||=[g(`svg`,{viewBox:`0 0 24 24`,width:`15`,height:`15`,"aria-hidden":`true`,fill:`currentColor`,xmlns:`http://www.w3.org/2000/svg`},[g(`path`,{d:`M2 2v20h20V2H2zm17.167 17.167H12.5v-10h-3.333v10H4.833V4.833h14.334v14.334z`})],-1)],8,X)]),_:1},8,[`content`]),p(` 版本号 `),f(c,{content:r.$t(`@F13B4:查看更新`),placement:`top`,effect:`dark`,"show-after":300},{default:S(()=>[g(`a`,{href:r.releasesUrl,target:`_blank`,rel:`noopener noreferrer`,class:`version-link`},`v`+l(r.displayVersion),1)]),_:1},8,[`content`]),r.latestInfo?.hasUpdate?(h(),i(`button`,{key:0,type:`button`,class:`upgrade-btn`,title:r.$t(`@F13B4:发现新版本 {version}，点击升级`,{version:r.latestInfo.latest??``}),"aria-label":r.$t(`@F13B4:发现新版本 {version}，点击升级`,{version:r.latestInfo.latest??``}),onClick:r.handleUpgrade},[t[3]||=g(`span`,{class:`upgrade-btn__dot`,"aria-hidden":`true`},null,-1),g(`span`,Q,l(r.$t(`@F13B4:升级`)),1),g(`span`,$,`v`+l(r.latestInfo.latest),1)],8,Z)):p(`v-if`,!0),f(r.UpgradeDialog,{modelValue:r.upgradeDialogVisible,"onUpdate:modelValue":t[0]||=e=>r.upgradeDialogVisible=e,logs:r.upgradeLogs,status:r.upgradeStatus,countdown:r.countdown,onRetry:r.handleUpgrade,onRestart:r.handleRestart,onCancel:r.handleCancelAutoRefresh},null,8,[`modelValue`,`logs`,`status`,`countdown`])])}var te=D(q,[[`render`,ee],[`__scopeId`,`data-v-7e0300ec`],[`__file`,`D:/xz_workspace/github_workspace/zen-gitsync/src/ui/client/src/components/AppVersionBadge.vue`]]);export{te as default};