npm - zen-gitsync - Versions diffs - 2.16.48 → 2.16.49 - Mend

zen-gitsync 2.16.48 → 2.16.49

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (28) hide show

package/src/ui/public/index.html CHANGED Viewed

@@ -10,18 +10,18 @@
     <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-BrshD3VG.js"></script>
+    <script type="module" crossorigin src="/assets/index-Cn4CA40E.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-BM3Ffeng.js">
     <link rel="modulepreload" crossorigin href="/assets/monaco-Dje8Rg13.js">
     <link rel="modulepreload" crossorigin href="/assets/element-plus-C3mePHEv.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-EBzJAuo1.js">
-    <link rel="modulepreload" crossorigin href="/assets/_plugin-vue_export-helper-CtcBeUZZ.js">
+    <link rel="modulepreload" crossorigin href="/assets/_plugin-vue_export-helper-VkarRGOe.js">
     <link rel="modulepreload" crossorigin href="/assets/socket-io-CGezBd--.js">
     <link rel="modulepreload" crossorigin href="/assets/vue-flow-DB6byJul.js">
     <link rel="modulepreload" crossorigin href="/assets/flow-mindmap-BzX-PWap.js">
-    <link rel="modulepreload" crossorigin href="/assets/CommonDialog-D2T9hYSC.js">
-    <link rel="modulepreload" crossorigin href="/assets/SvgIcon-BuyQHvwg.js">
-    <link rel="modulepreload" crossorigin href="/assets/configStore-Ceu0TxZJ.js">
+    <link rel="modulepreload" crossorigin href="/assets/CommonDialog-CliNZp_i.js">
+    <link rel="modulepreload" crossorigin href="/assets/SvgIcon-koi3MuB8.js">
+    <link rel="modulepreload" crossorigin href="/assets/configStore-vksEBmTc.js">
     <link rel="modulepreload" crossorigin href="/assets/toolsStore-CHBnAWFM.js">
     <link rel="stylesheet" crossorigin href="/assets/monaco-B2lPvkrc.css">
     <link rel="stylesheet" crossorigin href="/assets/element-plus-D3Dn7nX0.css">
@@ -30,7 +30,7 @@
     <link rel="stylesheet" crossorigin href="/assets/flow-mindmap-DnzM9SlK.css">
     <link rel="stylesheet" crossorigin href="/assets/CommonDialog-jP0E9mco.css">
     <link rel="stylesheet" crossorigin href="/assets/SvgIcon-CDNsk4-Q.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-BF9NCKhe.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-C3zoLat6.css">
   </head>
   <body>
     <div id="app"></div>

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

@@ -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 ADDED Viewed

@@ -0,0 +1,209 @@
+// 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 成功即说明是仓库,失败即非仓库),
+//      避免 rev-parse + status 两次 spawn;
+//   2. 并发上限 + 单目录超时,别让某个大仓库(或网络盘)拖死整个请求;
+//   3. 结果短 TTL 缓存,弹窗反复打开不必重复扫盘。
+//
+// 不用 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, ...extra };
+}
+/**
+ * 解析 `git status --porcelain=v1` 输出 → 计数。
+ * 纯函数,单测覆盖。
+ *
+ * 格式:`XY path`,X=暂存区状态,Y=工作区状态。
+ *   - `??` → 未跟踪
+ *   - `!!` → 被忽略(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$/, '');
+    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;
+}
+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',
+        // 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) };
+  } 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 ADDED Viewed

@@ -0,0 +1,163 @@
+// 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,
+  normalizeDirKey,
+  probeDirectoryGitState,
+  probeDirectoryGitStates,
+  clearGitStateCache,
+} from './directoryGitState.js';
+const execFileAsync = promisify(execFile);
+const git = (args, cwd) => execFileAsync('git', args, { cwd, windowsHide: true });
+// ── 纯函数: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);
+});
+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 });
+  }
+});
+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 });
+  }
+});