npm - zen-gitsync - Versions diffs - 2.17.6 → 2.17.8 - Mend

zen-gitsync 2.17.6 → 2.17.8

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 (70) hide show

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

@@ -10,28 +10,28 @@
     <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-DNHOYMCg.js"></script>
+    <script type="module" crossorigin src="/assets/index-yXm9JLGv.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-C0FnF6B9.js">
     <link rel="modulepreload" crossorigin href="/assets/element-plus-KTmRV-so.js">
     <link rel="modulepreload" crossorigin href="/assets/monaco-DkJuNcCr.js">
-    <link rel="modulepreload" crossorigin href="/assets/vendor-92fKgtnz.js">
-    <link rel="modulepreload" crossorigin href="/assets/_plugin-vue_export-helper-B7A-NgBp.js">
-    <link rel="modulepreload" crossorigin href="/assets/SvgIcon-DxazW7dI.js">
-    <link rel="modulepreload" crossorigin href="/assets/IconButton-BltPKVbV.js">
-    <link rel="modulepreload" crossorigin href="/assets/configStore-Dx84lvTX.js">
+    <link rel="modulepreload" crossorigin href="/assets/vendor-dO4B7wQf.js">
+    <link rel="modulepreload" crossorigin href="/assets/_plugin-vue_export-helper-C8OE7U9H.js">
+    <link rel="modulepreload" crossorigin href="/assets/SvgIcon-SRAeYjnN.js">
+    <link rel="modulepreload" crossorigin href="/assets/IconButton-CnoW2on6.js">
+    <link rel="modulepreload" crossorigin href="/assets/configStore-CuMElTgV.js">
     <link rel="modulepreload" crossorigin href="/assets/socket-io-TBtw0msS.js">
-    <link rel="modulepreload" crossorigin href="/assets/gitStore-CYrdjXPU.js">
+    <link rel="modulepreload" crossorigin href="/assets/gitStore-CpcS-MzM.js">
     <link rel="modulepreload" crossorigin href="/assets/useThemeObserver-B01D-Vl6.js">
     <link rel="modulepreload" crossorigin href="/assets/flow-mindmap-CurCIiCp.js">
-    <link rel="modulepreload" crossorigin href="/assets/previewSandbox-D_j5PWX1.js">
-    <link rel="modulepreload" crossorigin href="/assets/FileDiffViewer-C4ZANajI.js">
-    <link rel="modulepreload" crossorigin href="/assets/toolsStore-BiC2mmC3.js">
-    <link rel="modulepreload" crossorigin href="/assets/CommonDialog-DWMCeujE.js">
-    <link rel="modulepreload" crossorigin href="/assets/TemplateManager-BN6gWFWX.js">
+    <link rel="modulepreload" crossorigin href="/assets/previewSandbox-DkXYEpLP.js">
+    <link rel="modulepreload" crossorigin href="/assets/FileDiffViewer-BvX9cQjR.js">
+    <link rel="modulepreload" crossorigin href="/assets/toolsStore-DGxlRe3Y.js">
+    <link rel="modulepreload" crossorigin href="/assets/CommonDialog-CAaEi-4T.js">
+    <link rel="modulepreload" crossorigin href="/assets/TemplateManager-gedqAXl8.js">
     <link rel="modulepreload" crossorigin href="/assets/vue-flow-CsvDD38k.js">
     <link rel="stylesheet" crossorigin href="/assets/element-plus-BWbXh9mk.css">
     <link rel="stylesheet" crossorigin href="/assets/monaco-B2lPvkrc.css">
-    <link rel="stylesheet" crossorigin href="/assets/vendor-B1UrVTTI.css">
+    <link rel="stylesheet" crossorigin href="/assets/vendor-4ojsjDYc.css">
     <link rel="stylesheet" crossorigin href="/assets/SvgIcon-BQ6bR7l0.css">
     <link rel="stylesheet" crossorigin href="/assets/IconButton-CTwyZrv2.css">
     <link rel="stylesheet" crossorigin href="/assets/flow-mindmap-DnzM9SlK.css">
@@ -40,7 +40,7 @@
     <link rel="stylesheet" crossorigin href="/assets/CommonDialog-C_RjF9Mp.css">
     <link rel="stylesheet" crossorigin href="/assets/TemplateManager-C0rm8xfC.css">
     <link rel="stylesheet" crossorigin href="/assets/vue-flow-CavUTEzp.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-Dsfmp6w8.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-cApp6w0b.css">
   </head>
   <body>
     <div id="app"></div>

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

@@ -986,10 +986,10 @@ export function registerConfigRoutes({
     }
   })
-  // 保存通用设置（主题和语言）
+  // 保存通用设置（主题、语言、工作台任务执行器）
   app.post('/api/config/save-general-settings', express.json(), async (req, res) => {
     try {
-      const { theme, locale } = req.body
+      const { theme, locale, taskExecutor } = req.body
       // 读取原始配置以保留项目设置
       const rawConfig = await configManager.readRawConfigFile()
@@ -1001,10 +1001,15 @@ export function registerConfigRoutes({
       if (locale && ['zh-CN', 'en-US'].includes(locale)) {
         rawConfig.locale = locale
       }
+      // 任务执行器是全局配置（跨项目共享）；白名单外的值静默忽略，不落盘
+      const normalizedExecutor = configManager.normalizeTaskExecutor(taskExecutor)
+      if (normalizedExecutor) {
+        rawConfig.taskExecutor = normalizedExecutor
+      }
       // 直接写入原始配置，避免覆盖项目设置
       await configManager.writeRawConfigFile(rawConfig)
-      res.json({ success: true })
+      res.json({ success: true, taskExecutor: normalizedExecutor || undefined })
     } catch (error) {
       res.status(500).json({ success: false, error: error.message })
     }

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

@@ -17,7 +17,11 @@ import { asyncRoute, HttpError } from '../utils/asyncRoute.js';
 import path from 'path';
 import os from 'os';
 import open from 'open';
-import { spawn, spawnSync } from 'child_process';
+import { spawn, spawnSync, execFile } from 'child_process';
+import { fileURLToPath } from 'node:url';
+import { promisify } from 'node:util';
+const execFileAsync = promisify(execFile);
 const TOOL_INSTALL_PACKAGES = Object.freeze({
   claude: '@anthropic-ai/claude-code',
@@ -367,6 +371,32 @@ async function launchOpenCode(dirPath) {
   return launchInTerminal(dirPath, 'opencode');
 }
+// Run the CLI shipped with this server, even when `g` is not in PATH or points
+// to another install. Directory paths remain spawn options, never CMD source.
+export async function launchGai(dirPath, {
+  platform = process.platform,
+  spawnFn = execFileAsync,
+  terminalFn = launchInTerminal,
+} = {}) {
+  const entry = fileURLToPath(new URL('../../../gitCommit.js', import.meta.url));
+  if (platform !== 'win32') return terminalFn(dirPath, process.execPath, [entry, 'ai']);
+  const psLiteral = value => `'${String(value).replace(/'/g, "''")}'`;
+  const encode = value => Buffer.from(value, 'utf16le').toString('base64');
+  const command = `& ${psLiteral(process.execPath)} ${psLiteral(entry)} 'ai'`;
+  // The hidden launcher opens a visible interactive console. -NoExit leaves
+  // startup errors readable; no model request is sent until the user types.
+  const launcher = [
+    "$ErrorActionPreference = 'Stop';",
+    "Start-Process -FilePath (Join-Path $PSHOME 'powershell.exe')",
+    `-ArgumentList '-NoLogo','-NoProfile','-NoExit','-EncodedCommand','${encode(command)}'`,
+    '-WorkingDirectory (Get-Location).ProviderPath -WindowStyle Normal',
+  ].join(' ');
+  return spawnFn('powershell.exe', ['-NoLogo', '-NoProfile', '-NonInteractive', '-EncodedCommand', encode(launcher)], {
+    cwd: dirPath, windowsHide: true, timeout: 10000,
+  });
+}
 async function launchKimiCode(dirPath) {
   if (process.platform === 'win32') {
     const executable = await findKimiExecutable();
@@ -548,8 +578,24 @@ async function launchToolInstaller(installer, dirPath = process.cwd(), { update
 }
 export function registerFileOpenRoutes({
-  app
+  app,
+  launchAi = launchGai,
 }) {
+  app.post('/api/open-directory-with-g-ai', asyncRoute(async (req, res) => {
+    const dirPath = req.body?.path;
+    if (typeof dirPath !== 'string' || !dirPath.trim() || /[\0\r\n]/.test(dirPath)) {
+      throw new HttpError(400, '目录路径不能为空或包含控制字符');
+    }
+    const target = path.resolve(dirPath);
+    let stat;
+    try { stat = await fs.stat(target); }
+    catch { throw new HttpError(400, '目录不存在或不可访问'); }
+    if (!stat.isDirectory()) throw new HttpError(400, '指定路径不是目录');
+    try { await launchAi(target); }
+    catch (error) { throw new HttpError(400, `无法启动 g ai: ${error.message}`); }
+    res.json({ success: true, message: '已在新终端中启动 g ai' });
+  }));
   // 打开文件
   app.post('/api/open-file', asyncRoute(async (req, res) => {
       try {

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

@@ -23,6 +23,7 @@ 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 { fetchDirectoryRemotes } from '../utils/directoryFetch.js';
 import { invalidateCurrentProjectKey, invalidateRawConfigCache } from '../../../config.js';
 import { invalidateCwdCache } from '../../../utils/index.js';
@@ -404,6 +405,42 @@ export function registerFsRoutes({
     res.json({ success: true, results });
   }));
+  // 对**单个**「最近目录」执行 git fetch，让卡片上的「领先/落后」从
+  // "上次 fetch 时的快照"回到真实状态。
+  //
+  // 为什么是单目录接口，而不是一个"一次刷新全部"的批量接口：
+  //   十几个仓库并发联网既慢又容易撞凭据提示；拆成一个个请求后，每个请求的
+  //   耗时被单目录超时箍住（不会出现一挂两分钟、还看不到进度的大请求），
+  //   刷新顺序与并发由调用方（列表组件）决定，还能每完成一个就地更新那张卡片。
+  //   服务端因此不需要任何调度逻辑，也不会被一个慢仓库拖住其他仓库。
+  //
+  // 安全口径与上面的 git-state 完全一致：只接受**配置里的最近目录**。
+  // 否则这个接口就是一个"对磁盘上任意仓库发起网络请求"的口子。
+  app.post('/api/recent_directories/fetch', asyncRoute(async (req, res) => {
+    const recentDirs = (await configManager.getRecentDirectories()) || [];
+    const allowed = new Map(recentDirs.map(d => [normalizeDirKey(d), d]));
+    const requested = typeof req.body?.path === 'string' ? req.body.path.trim() : '';
+    if (!requested) throw new HttpError(400, '缺少 path 参数');
+    const target = allowed.get(normalizeDirKey(requested));
+    if (!target) throw new HttpError(403, '该目录不在最近项目列表中');
+    const result = await fetchDirectoryRemotes(target);
+    // fetch 动了本地 remote-tracking 引用 → 顺手重探一次状态回给前端：
+    // 省掉一次往返，且 useCache:false 保证读到的是 fetch 之后的值
+    // （否则会拿到 15s TTL 里那份 fetch 之前的快照，等于白刷）。
+    let state = null;
+    if (result.status === 'ok') {
+      const probed = await probeDirectoryGitStates([target], { useCache: false });
+      state = probed[target] || null;
+    }
+    logger.info(`[recent_directories/fetch] ${result.status}${result.reason ? `(${result.reason})` : ''} ${target}`);
+    // success 表示"这次请求处理完了"，fetch 本身的结果在 status 里 ——
+    // 跳过（非仓库/无 remote）不是接口错误，前端要按三态分别计数。
+    res.json({ success: true, path: target, ...result, state });
+  }));
   // 在资源管理器/访达中打开当前目录
   app.post('/api/open_directory', asyncRoute(async (req, res) => {
     try {

package/src/ui/server/routes/gAiLauncher.test.js ADDED Viewed

@@ -0,0 +1,70 @@
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { promises as fs } from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+import { launchGai, registerFileOpenRoutes } from './fileOpen.js'
+test('Windows g ai launcher keeps directory characters out of shell source', async () => {
+  const directory = "C:\\项目 & test's %name%\\current"
+  let actual
+  await launchGai(directory, { platform: 'win32', spawnFn: async (...args) => { actual = args } })
+  assert.equal(actual[0], 'powershell.exe')
+  assert.equal(actual[2].cwd, directory)
+  assert.equal(actual[2].windowsHide, true)
+  const script = Buffer.from(actual[1].at(-1), 'base64').toString('utf16le')
+  assert.doesNotMatch(script, /%name%|test's/)
+  assert.match(script, /-WorkingDirectory \(Get-Location\).ProviderPath/)
+  assert.match(script, /-WindowStyle Normal/)
+  const inner = script.match(/'-EncodedCommand','([^']+)'/)[1]
+  const command = Buffer.from(inner, 'base64').toString('utf16le')
+  assert.ok(command.includes(process.execPath.replace(/'/g, "''")))
+  assert.match(command, /gitCommit\.js' 'ai'$/)
+})
+test('POSIX launches the bundled CLI with structured arguments in the selected directory', async () => {
+  let actual
+  await launchGai('/tmp/project with spaces', { platform: 'linux', terminalFn: async (...args) => { actual = args } })
+  assert.equal(actual[0], '/tmp/project with spaces')
+  assert.equal(actual[1], process.execPath)
+  assert.equal(actual[2][1], 'ai')
+  assert.ok((await fs.stat(actual[2][0])).isFile())
+})
+test('g ai endpoint validates directories and reports launch failures', async t => {
+  const fixture = await fs.mkdtemp(path.join(os.tmpdir(), 'zen-g-ai-launch-'))
+  const project = path.join(fixture, "项目 & test's %name%")
+  await fs.mkdir(project)
+  const file = path.join(fixture, 'file.txt')
+  await fs.writeFile(file, 'not a directory')
+  t.after(async () => {
+    assert.equal(path.dirname(fixture), path.resolve(os.tmpdir()))
+    assert.ok(path.basename(fixture).startsWith('zen-g-ai-launch-'))
+    await fs.rm(fixture, { recursive: true, force: true })
+  })
+  const routes = new Map(), launches = []
+  let fail = false
+  registerFileOpenRoutes({
+    app: { get: () => {}, post: (url, handler) => routes.set(url, handler) },
+    launchAi: async directory => { if (fail) throw new Error('terminal unavailable'); launches.push(directory) },
+  })
+  const handler = routes.get('/api/open-directory-with-g-ai')
+  async function request(body) {
+    const response = { code: 200, body: null, status(code) { this.code = code; return this }, json(value) { this.body = value; return this } }
+    await handler({ method: 'POST', path: '/api/open-directory-with-g-ai', body }, response)
+    return response
+  }
+  for (const value of [undefined, '', ' ', {}, 42, 'bad\npath', file, path.join(fixture, 'missing')]) {
+    const response = await request({ path: value })
+    assert.equal(response.code, 400)
+    assert.equal(response.body.success, false)
+  }
+  assert.equal(launches.length, 0)
+  const good = await request({ path: project })
+  assert.equal(good.body.success, true)
+  assert.deepEqual(launches, [project])
+  fail = true
+  const error = await request({ path: project })
+  assert.equal(error.code, 400)
+  assert.match(error.body.error, /terminal unavailable/)
+})

package/src/ui/server/routes/workbench/index.js CHANGED Viewed

@@ -105,6 +105,7 @@ import {
 } from './jobStore.js';
 import {
   launchClaudeInNewWindow,
+  normalizeTaskExecutor,
   runTaskQueue,
   runSingleSubtask,
   syncSubToCancelled,
@@ -138,6 +139,25 @@ import {
 const { genSessionId, read: readSessionFile, write: writeSessionFile, delete: deleteSessionFile, listMeta: listSessionsMeta, enforceRetention: enforceSessionsRetention } = sessionStore;
+/**
+ * 解析本次执行用哪个执行器：body.executor 显式指定 > 配置里的全局默认 > 'claude'。
+ * 配置读失败一律回落 'claude' —— 执行器选不出来不该挡住任务本身能跑。
+ */
+async function resolveExecutor(requested) {
+  const explicit = normalizeTaskExecutor(requested);
+  if (explicit) return explicit;
+  try {
+    if (configManager) {
+      const cfg = await configManager.loadConfig();
+      const fallback = normalizeTaskExecutor(cfg?.taskExecutor);
+      if (fallback) return fallback;
+    }
+  } catch (err) {
+    logger.warn('[workbench] 读取 taskExecutor 配置失败,回落 claude:', err && err.message || err);
+  }
+  return 'claude';
+}
 /**
  * 注册所有 workbench 路由（共 45 个端点）。
  * @param {Object} deps
@@ -1059,9 +1079,10 @@ ${desc ? `描述：${desc}` : '描述：（无）'}${attachmentBlock}${templateB
       throw new HttpError(400, '任务没有子任务');
     }
     const repoPath = resolveTaskRepoPath(task, typeof getCurrentProjectPath === 'function' ? getCurrentProjectPath() : '');
+    const executor = await resolveExecutor(req.body?.executor);
     // 异步执行，立即返回
     res.json({ success: true, message: '已开始执行' });
-    runTaskQueue(task, repoPath, '').catch(err => {
+    runTaskQueue(task, repoPath, '', { executor }).catch(err => {
       publish('task:error', { taskId: task.id, error: err.message });
     });
   }));
@@ -1078,8 +1099,9 @@ ${desc ? `描述：${desc}` : '描述：（无）'}${attachmentBlock}${templateB
       throw new HttpError(400, 'startSubIndex 越界');
     }
     const repoPath = resolveTaskRepoPath(task, typeof getCurrentProjectPath === 'function' ? getCurrentProjectPath() : '');
+    const executor = await resolveExecutor(req.body?.executor);
     res.json({ success: true, message: `已从第 ${startSubIndex + 1} 个子任务开始执行` });
-    runTaskQueue(task, repoPath, '', { fromIndex: startSubIndex }).catch(err => {
+    runTaskQueue(task, repoPath, '', { fromIndex: startSubIndex, executor }).catch(err => {
       publish('task:error', { taskId: task.id, error: err.message });
     });
   }));
@@ -1092,6 +1114,7 @@ ${desc ? `描述：${desc}` : '描述：（无）'}${attachmentBlock}${templateB
       throw new HttpError(400, '该任务不是简单任务,请使用普通执行接口');
     }
     const repoPath = resolveTaskRepoPath(task, typeof getCurrentProjectPath === 'function' ? getCurrentProjectPath() : '');
+    const executor = await resolveExecutor(req.body?.executor);
     const virtualSub = {
       id: `${task.id}__simple`,
       title: task.title,
@@ -1101,7 +1124,7 @@ ${desc ? `描述：${desc}` : '描述：（无）'}${attachmentBlock}${templateB
       attachments: Array.isArray(task.attachments) ? task.attachments : []
     };
     res.json({ success: true, message: '已开始执行简单任务' });
-    runSingleSubtask(task, virtualSub, repoPath, '', []).catch(err => {
+    runSingleSubtask(task, virtualSub, repoPath, '', [], { executor }).catch(err => {
       publish('task:error', { taskId: task.id, error: err.message });
     });
   }));
@@ -1124,11 +1147,12 @@ ${desc ? `描述：${desc}` : '描述：（无）'}${attachmentBlock}${templateB
     const liveJob = snapshotJobs().find(j => j.subId === subId && (j.status === 'running' || j.status === 'pending'));
     if (liveJob) throw new HttpError(400, '该子任务已有正在执行的 job');
     const repoPath = resolveTaskRepoPath(foundTask, typeof getCurrentProjectPath === 'function' ? getCurrentProjectPath() : '');
+    const executor = await resolveExecutor(req.body?.executor);
     res.json({ success: true, message: `已开始执行子任务：${foundSub.title || subId}` });
     (async () => {
       try {
         const priorOutputs = await collectPriorOutputs(foundTask, foundSub);
-        await runSingleSubtask(foundTask, foundSub, repoPath, '', priorOutputs);
+        await runSingleSubtask(foundTask, foundSub, repoPath, '', priorOutputs, { executor });
         await persistTaskAfterRun(foundTask);
       } catch (err) {
         publish('task:error', { taskId: foundTask.id, error: err.message });
@@ -1240,7 +1264,12 @@ ${desc ? `描述：${desc}` : '描述：（无）'}${attachmentBlock}${templateB
     };
     const repoPath = typeof getCurrentProjectPath === 'function' ? getCurrentProjectPath() : '';
     res.json({ success: true, message: '已加入续接队列' });
-    runSingleSubtask(task, virtualSub, repoPath, '', [], { resumeSessionId: prevJob.claudeSessionId })
+    // 执行器必须沿用上一轮 job 的 agent：claude 的 --resume 和 opencode 的 --session
+    // 互不认对方的会话 id，串了执行器续接必然失败。
+    runSingleSubtask(task, virtualSub, repoPath, '', [], {
+      resumeSessionId: prevJob.claudeSessionId,
+      executor: normalizeTaskExecutor(prevJob.agent)
+    })
       .catch(err => {
         publish('task:error', { taskId: task.id, error: err.message });
       });
@@ -2113,7 +2142,9 @@ ${desc ? `描述：${desc}` : '描述：（无）'}${attachmentBlock}${templateB
         promptOverride: task.simpleOverride || '',
         attachments: [],
       };
-      runSingleSubtask(task, virtualSub, targetPath, '', []).catch(err => {
+      // 派发控制台可以显式指定执行器；不传则用配置里的全局默认（resolveExecutor 走回落链）
+      const executor = await resolveExecutor(req.body?.executor);
+      runSingleSubtask(task, virtualSub, targetPath, '', [], { executor }).catch(err => {
         publish('task:error', { taskId: task.id, error: err.message });
       });
     }

package/src/ui/server/routes/workbench/jobStore.js CHANGED Viewed

@@ -309,11 +309,15 @@ export function snapshotJobs() {
     status: j.status,
     prompt: j.prompt || '',
     output: j.output || '',
+    thinking: j.thinking || '',
     pid: j.pid || null,
     startedAt: j.startedAt || null,
     endedAt: j.endedAt || null,
     exitCode: typeof j.exitCode === 'number' ? j.exitCode : null,
     error: j.error || null,
+    // 本轮用的执行器（claude | opencode）。前端对话区助手名 / 日志详情按它显示;
+    // 加字段时记得同步这里 —— 白名单投影会把没列出的字段静默剥掉。
+    agent: j.agent || null,
     // 续接对话用:claude --output-format stream-json 的 system.init 事件捕获到的 session_id
     claudeSessionId: j.claudeSessionId || null
   }));