zen-gitsync 2.17.14 → 2.17.16

package/src/ui/server/routes/explorerContextMenu.test.js

@@ -0,0 +1,180 @@
+// 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.
+//
+// 资源管理器右键菜单（设置 → 通用设置 → 系统集成）的回归测试。
+// 全程用假的 execFileFn —— 真的往 HKCU 写注册表会污染跑测试的这台机器。
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import {
+  buildMenuCommand,
+  getExplorerContextMenuStatus,
+  installExplorerContextMenu,
+  MENU_REGISTRY_ROOTS,
+  registerExplorerContextMenuRoutes,
+  sanitizeMenuLabel,
+  uninstallExplorerContextMenu,
+} from './explorerContextMenu.js'
+
+/** 记录所有 reg.exe 调用并返回空输出的假实现 */
+function createFakeReg({ fail = () => false } = {}) {
+  const calls = []
+  const execFileFn = async (file, args) => {
+    calls.push({ file, args })
+    const error = fail(args)
+    if (error) throw error
+    return { stdout: '', stderr: '' }
+  }
+  return { calls, execFileFn }
+}
+
+/** 从假调用记录里取出某个 reg 子命令的目标键 */
+function targetsOf(calls, subcommand) {
+  return calls.filter((c) => c.args[0] === subcommand).map((c) => c.args[1])
+}
+
+test('sanitizeMenuLabel: 空值/非字符串退回默认标题', () => {
+  const fallback = '用 g UI 打开'
+  for (const input of [undefined, null, '', '   ', 42, {}, '\n\t']) {
+    assert.equal(sanitizeMenuLabel(input), fallback)
+  }
+})
+
+test('sanitizeMenuLabel: 控制字符换空格、首尾裁剪、超长截断', () => {
+  assert.equal(sanitizeMenuLabel('  用 g UI 打开  '), '用 g UI 打开')
+  assert.equal(sanitizeMenuLabel('用 g UI\n打开'), '用 g UI 打开')
+  assert.equal(sanitizeMenuLabel('x'.repeat(200)).length, 64)
+})
+
+test('buildMenuCommand: 指向本包 CLI 的 ui 子命令，目录交给 %V', () => {
+  const command = buildMenuCommand({ nodePath: 'C:\\Program Files\\nodejs\\node.exe', entryPath: 'D:\\a b\\gitCommit.js' })
+  assert.equal(command, '"C:\\Program Files\\nodejs\\node.exe" "D:\\a b\\gitCommit.js" ui --path="%V"')
+  // 不带 cmd.exe / start：%V 由 Explorer 展开后才交给 node，中间没有第二层词法
+  assert.doesNotMatch(command, /cmd\.exe/i)
+})
+
+test('install: 两个落点都写入标题 + 图标 + command 子键', async () => {
+  const { calls, execFileFn } = createFakeReg()
+  const { label } = await installExplorerContextMenu({ label: '用 g UI 打开', execFileFn, nodePath: 'C:\\node\\node.exe', entryPath: 'D:\\zen\\gitCommit.js' })
+
+  assert.equal(label, '用 g UI 打开')
+  const menuKeys = targetsOf(calls, 'add').filter((k) => !k.endsWith('\\command'))
+  assert.deepEqual([...new Set(menuKeys)], [...MENU_REGISTRY_ROOTS])
+  assert.deepEqual(targetsOf(calls, 'add').filter((k) => k.endsWith('\\command')), MENU_REGISTRY_ROOTS.map((k) => `${k}\\command`))
+  for (const call of calls) {
+    assert.equal(call.file, 'reg.exe')
+    assert.ok(call.args.includes('/f'), 'reg add 必须带 /f，否则第二次点击会弹覆盖确认')
+  }
+  const titleCall = calls.find((c) => c.args[1] === MENU_REGISTRY_ROOTS[0] && c.args[2] === '/ve')
+  assert.deepEqual(titleCall.args.slice(-2), ['用 g UI 打开', '/f'])
+  const commandCall = calls.find((c) => c.args[1] === `${MENU_REGISTRY_ROOTS[0]}\\command`)
+  assert.equal(commandCall.args.at(-2), '"C:\\node\\node.exe" "D:\\zen\\gitCommit.js" ui --path="%V"')
+})
+
+test('install: 客户端传来的脏标题被清洗后写入', async () => {
+  const { calls, execFileFn } = createFakeReg()
+  await installExplorerContextMenu({ label: 'Open with g UI\r\nrm -rf /', execFileFn })
+  const titleCall = calls.find((c) => c.args[1] === MENU_REGISTRY_ROOTS[0] && c.args[2] === '/ve')
+  assert.equal(titleCall.args.at(-2), 'Open with g UI  rm -rf /')
+})
+
+test('uninstall: 两个落点都删，键不存在(退出码 1)不算失败', async () => {
+  const missing = Object.assign(new Error('reg.exe exited with code 1'), { code: 1 })
+  const { calls, execFileFn } = createFakeReg({ fail: (args) => (args[0] === 'delete' && args[1].includes('Background') ? missing : false) })
+  await uninstallExplorerContextMenu({ execFileFn })
+  assert.deepEqual(targetsOf(calls, 'delete'), [...MENU_REGISTRY_ROOTS])
+})
+
+test('uninstall: 真正的删除失败(非"键不存在")必须抛出来', async () => {
+  const { execFileFn } = createFakeReg({ fail: () => Object.assign(new Error('拒绝访问'), { code: 5 }) })
+  await assert.rejects(() => uninstallExplorerContextMenu({ execFileFn }), /拒绝访问/)
+})
+
+test('status: 两个键都在才算已安装', async () => {
+  const both = createFakeReg()
+  assert.equal((await getExplorerContextMenuStatus({ execFileFn: both.execFileFn })).installed, true)
+  assert.deepEqual(targetsOf(both.calls, 'query'), [...MENU_REGISTRY_ROOTS])
+
+  const half = createFakeReg({ fail: (args) => (args[1].includes('Background') ? Object.assign(new Error('missing'), { code: 1 }) : false) })
+  const status = await getExplorerContextMenuStatus({ execFileFn: half.execFileFn })
+  assert.equal(status.installed, false)
+  assert.equal(status.keys[MENU_REGISTRY_ROOTS[1]], false)
+})
+
+// ── 路由层 ────────────────────────────────────────────────────────────────
+
+function createRouteHarness(options) {
+  const routes = new Map()
+  const app = {
+    get(path, handler) { routes.set(`GET ${path}`, handler) },
+    post(path, handler) { routes.set(`POST ${path}`, handler) },
+  }
+  registerExplorerContextMenuRoutes({ app, ...options })
+  async function request(key, body) {
+    const response = { code: 200, body: null, status(code) { this.code = code; return this }, json(value) { this.body = value; return this } }
+    await routes.get(key)({ method: key.split(' ')[0], path: key.split(' ')[1], body }, response, () => {})
+    return response
+  }
+  return { request }
+}
+
+test('route: 非 Windows 返回 supported=false，写操作直接 400', async () => {
+  const { calls, execFileFn } = createFakeReg()
+  const { request } = createRouteHarness({ platform: 'darwin', execFileFn })
+
+  const status = await request('GET /api/explorer-context-menu')
+  assert.equal(status.body.supported, false)
+  assert.equal(status.body.installed, false)
+
+  for (const key of ['POST /api/explorer-context-menu/install', 'POST /api/explorer-context-menu/uninstall']) {
+    const response = await request(key)
+    assert.equal(response.code, 400)
+    assert.equal(response.body.success, false)
+  }
+  assert.equal(calls.length, 0, '非 Windows 不该调用 reg.exe')
+})
+
+test('route: 安装→查询→卸载 的状态流转', async () => {
+  const installedKeys = new Set()
+  const execFileFn = async (file, args) => {
+    assert.equal(file, 'reg.exe')
+    if (args[0] === 'add') return { stdout: '', stderr: '' }
+    if (args[0] === 'delete') { installedKeys.delete(args[1]); return { stdout: '', stderr: '' } }
+    if (installedKeys.has(args[1])) return { stdout: '', stderr: '' }
+    throw Object.assign(new Error('missing'), { code: 1 })
+  }
+  // add 之后把键记成已存在，模拟真实注册表
+  const wrapping = async (file, args) => { const r = await execFileFn(file, args); if (args[0] === 'add' && !args[1].endsWith('\\command')) installedKeys.add(args[1]); return r }
+
+  const { request } = createRouteHarness({ platform: 'win32', execFileFn: wrapping, nodePath: 'C:\\node\\node.exe', entryPath: 'D:\\zen\\gitCommit.js' })
+
+  assert.equal((await request('GET /api/explorer-context-menu')).body.installed, false)
+
+  const install = await request('POST /api/explorer-context-menu/install', { label: '用 g UI 打开' })
+  assert.equal(install.body.success, true)
+  assert.match(install.body.message, /用 g UI 打开/)
+
+  assert.equal((await request('GET /api/explorer-context-menu')).body.installed, true)
+
+  const uninstall = await request('POST /api/explorer-context-menu/uninstall')
+  assert.equal(uninstall.body.success, true)
+  assert.equal((await request('GET /api/explorer-context-menu')).body.installed, false)
+})
+
+test('route: reg.exe 写失败时返回 400 和原因', async () => {
+  const { execFileFn } = createFakeReg({ fail: () => Object.assign(new Error('拒绝访问注册表'), { code: 5 }) })
+  const { request } = createRouteHarness({ platform: 'win32', execFileFn })
+  const response = await request('POST /api/explorer-context-menu/install', { label: '用 g UI 打开' })
+  assert.equal(response.code, 400)
+  assert.match(response.body.error, /拒绝访问注册表/)
+})

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

@@ -22,8 +22,9 @@
 //   - { type: 'thinking', delta }          — 推理过程增量
 //   - { type: 'content', delta }           — 正文增量
 //   - { type: 'tool_call_start', toolCallId, name, argsPreview }
+//   - { type: 'tool_output', toolCallId, chunk }       — 命令执行中的增量输出(仅展示)
 //   - { type: 'tool_result', toolCallId, name, result }
-//   - { type: 'ask_user', interactionId, question, options, allowFreeText }
+//   - { type: 'ask_user', interactionId, question, options, allowFreeText, multiple }
 //   - { type: 'done', content }            — 本轮最终完成
 //   - { type: 'error', error }
 
@@ -134,6 +135,7 @@ ${isWin ? `- 当前是 Windows,以下 Unix 命令**不存在**,用了必定报"
 # 与用户交互
 - 需要向用户确认、提问或汇报重要决策时,直接用普通文本输出
 - 需要暂停当前任务并等待用户决定或补充信息时,调用 ask_user,不要猜测或只在普通文本里提问
+- 一次要让用户从多个选项里选好几项时(如"要我改哪几个文件"),传 multiple: true,用户会勾选后统一提交
 - 不要调用不存在的工具,可用工具只有上面列出的 ${builtinToolCount} 个
 - 用户可能随消息附带图片:图片以 image_url 部件出现在 user 消息里;如果当前模型不支持视觉(带图请求报错),提醒用户换用支持视觉的模型
 - 发现高风险或状态不一致的情况时:先用文本说明发现和影响,停下来等用户指示,不要擅自继续破坏性操作
@@ -204,7 +206,7 @@ ${isWin ? `- This is Windows. The following Unix commands do NOT exist here:
 
 # How you work
 - Act first, ask later: use tools to investigate before asking the user
-- When a decision or missing detail must come from the user, call ask_user. Do not guess or merely describe a question in plain text.
+- When a decision or missing detail must come from the user, call ask_user. Do not guess or merely describe a question in plain text. Pass multiple: true when the user should pick several options at once.
 - After modifying code, verify: run tests, build, or at least syntax check
 - Prefer edit_file for precise replacements; read_file first to confirm original text
 - Use offset/limit for large files
@@ -355,7 +357,16 @@ export async function runAgentTurn({ session, model, userMessage, images = [], c
       const argsPreview = summarizeArgs(name, args);
       send({ type: 'tool_call_start', toolCallId, name, argsPreview });
 
-      const toolCtx = { ...ctx, signal };
+      const toolCtx = {
+        ...ctx,
+        signal,
+        // run_command 执行期间的增量输出 → 前端实时显示。
+        // 只用于展示,不进会话历史 —— 历史里存的仍是带 exit code 的最终结果。
+        onOutput: (chunk) => {
+          const text = String(chunk || '');
+          if (text) send({ type: 'tool_output', toolCallId, name, chunk: text });
+        },
+      };
       if (name === 'ask_user' && typeof ctx.askUser === 'function') {
         toolCtx.askUser = askArgs => ctx.askUser(askArgs, {
           sessionId: session.sessionId,

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

@@ -225,6 +225,15 @@ function isSafeSubpath(value) {
   return SAFE_SUBPATH.test(String(value || ''));
 }
 
+// 本地关键词匹配:与 awesomeSkills 同一套语义(小写子串)。
+// 静态来源(builtin / Anthropic 官方仓库)也必须过这一关 ——
+// 它们不走目录站的 query 参数,漏掉过滤就等于搜索框对这两组完全失效。
+function matchesQuery(query, ...fields) {
+  const q = String(query || '').trim().toLowerCase();
+  if (!q) return true;
+  return fields.join(' ').toLowerCase().includes(q);
+}
+
 function resolveProjectPath(value, fallback) {
   const raw = String(value || fallback || '').trim();
   if (!raw) throw new HttpError(400, '项目路径不能为空');
@@ -292,15 +301,17 @@ async function cached(key, loader) {
 // ── provider: Skill ───────────────────────────────────────────
 
 // builtin:纯静态,不联网
-function builtinSkills() {
-  return BUILTIN_SKILLS.map(item => ({ ...item, type: 'skill' }));
+function builtinSkills(query) {
+  return BUILTIN_SKILLS
+    .filter(item => matchesQuery(query, item.name, item.description, ...(item.tags || [])))
+    .map(item => ({ ...item, type: 'skill' }));
 }
 
 // Anthropic 官方仓库:用 GitHub contents API 列出 skills/ 下的目录。
 // 这是所有 skill 的"源头",目录结构稳定(path = skills/<name>)。
 // contents API 不返回描述,所以用内置表里的描述补上(两边都以目录名为键),
 // 补不到的条目在前端只显示名字,不会假装有描述。
-async function officialSkills() {
+async function officialSkills(query) {
   const data = await fetchJson('https://api.github.com/repos/anthropics/skills/contents/skills', { headers: githubHeaders() });
   if (!Array.isArray(data)) throw new Error('GitHub 返回结构异常');
   const described = new Map(ANTHROPIC_SKILLS);
@@ -315,7 +326,8 @@ async function officialSkills() {
       subpath: `skills/${entry.name}`,
       upstream: entry.html_url,
       tags: ['official'],
-    }));
+    }))
+    .filter(item => matchesQuery(query, item.name, item.description));
 }
 
 // SkillsMP:第三方 skill 目录站,给的是 owner/repo + 仓库内路径,可直接安装。
@@ -467,8 +479,10 @@ function normalizeNpmSearch(data, type) {
 
 // ── provider: MCP ─────────────────────────────────────────────
 
-function builtinMcps() {
-  return BUILTIN_MCPS.map(item => ({ ...item, type: 'mcp', command: 'npx' }));
+function builtinMcps(query) {
+  return BUILTIN_MCPS
+    .filter(item => matchesQuery(query, item.name, item.description, item.package, ...(item.tags || [])))
+    .map(item => ({ ...item, type: 'mcp', command: 'npx' }));
 }
 
 // MCP 官方注册表:canonical 数据源,直接给出 npm identifier 与所需环境变量,
@@ -562,15 +576,15 @@ async function npmMcps(query) {
 
 const PROVIDERS = {
   skill: {
-    builtin: () => builtinSkills(),
-    official: () => officialSkills(),
+    builtin: ({ query }) => builtinSkills(query),
+    official: ({ query }) => officialSkills(query),
     skillsmp: ({ query }) => skillsmpSkills(query),
     awesome: ({ query }) => awesomeSkills(query),
     github: ({ query }) => (query ? githubSkills(query) : Promise.resolve([])),
     npm: ({ query }) => npmSkills(query),
   },
   mcp: {
-    builtin: () => builtinMcps(),
+    builtin: ({ query }) => builtinMcps(query),
     registry: ({ query }) => registryMcps(query),
     smithery: ({ query }) => smitheryMcps(query),
     npm: ({ query }) => npmMcps(query),

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

@@ -91,6 +91,38 @@ test('catalog: 只查内置来源时完全离线,并保留按来源分组的形
   }
 });
 
+test('catalog: 内置来源也按关键词过滤(skill / MCP 都不例外)', async () => {
+  const { call } = harness();
+
+  const all = await call('GET /api/agent/marketplace/catalog', {
+    query: { type: 'skill', sources: 'builtin', cwd: sandboxProject },
+  });
+  const unfiltered = all.payload.groups[0].items.length;
+
+  const { payload } = await call('GET /api/agent/marketplace/catalog', {
+    query: { type: 'skill', sources: 'builtin', cwd: sandboxProject, q: 'pdf' },
+  });
+  const [group] = payload.groups;
+  assert.equal(group.status, 'ok');
+  assert.ok(group.items.length > 0, 'pdf 是内置条目,不该被过滤掉');
+  assert.ok(group.items.length < unfiltered, '关键词必须真的收窄结果');
+  assert.equal(group.items.some(item => item.name === 'docx'), false, '关键词 pdf 不该命中 docx');
+  for (const item of group.items) {
+    assert.match(`${item.name} ${item.description}`, /pdf/i, `${item.name} 与关键词无关`);
+  }
+
+  const { payload: mcp } = await call('GET /api/agent/marketplace/catalog', {
+    query: { type: 'mcp', sources: 'builtin', cwd: sandboxProject, q: 'memory' },
+  });
+  assert.deepEqual(mcp.groups[0].items.map(item => item.name), ['Memory']);
+
+  // 清空关键词必须回到全量,否则用户删掉搜索词后会看到一片空
+  const { payload: cleared } = await call('GET /api/agent/marketplace/catalog', {
+    query: { type: 'mcp', sources: 'builtin', cwd: sandboxProject, q: '' },
+  });
+  assert.ok(cleared.groups[0].items.length > 1, '空关键词应返回全部内置 MCP');
+});
+
 test('catalog: 未指定来源时返回全部来源,每个来源是独立的一组', async () => {
   const { call } = harness();
   const { payload } = await call('GET /api/agent/marketplace/catalog', {

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

@@ -55,7 +55,7 @@ function interactionKey(sessionId, interactionId) {
   return `${String(sessionId)}:${String(interactionId)}`;
 }
 
-export function waitForAgentAnswer({ sessionId, interactionId, question, options, allowFreeText, send, signal }) {
+export function waitForAgentAnswer({ sessionId, interactionId, question, options, allowFreeText, multiple, send, signal }) {
   const key = interactionKey(sessionId, interactionId);
   return new Promise((resolve) => {
     let settled = false;
@@ -75,10 +75,11 @@ export function waitForAgentAnswer({ sessionId, interactionId, question, options
       question,
       options,
       allowFreeText,
+      multiple: multiple === true,
       settle,
     });
     signal?.addEventListener?.('abort', onAbort, { once: true });
-    send({ type: 'ask_user', interactionId, question, options, allowFreeText });
+    send({ type: 'ask_user', interactionId, question, options, allowFreeText, multiple: multiple === true });
     if (signal?.aborted) onAbort();
   });
 }
@@ -88,12 +89,17 @@ export function submitAgentAnswer({ sessionId, interactionId, answer }) {
   const pending = pendingAgentQuestions.get(key);
   if (!pending) return { ok: false, status: 404, error: 'No pending question for this session.' };
 
-  const value = String(answer || '').trim();
-  if (!value) return { ok: false, status: 400, error: 'Answer cannot be empty.' };
-  if (!pending.allowFreeText && pending.options.length > 0 && !pending.options.includes(value)) {
-    return { ok: false, status: 400, error: 'Choose one of the listed options.' };
+  // 单选发字符串、多选发数组；这里统一归一成"非空的字符串列表"
+  const values = (Array.isArray(answer) ? answer : [answer])
+    .map((v) => String(v ?? '').trim())
+    .filter(Boolean);
+  if (!values.length) return { ok: false, status: 400, error: 'Answer cannot be empty.' };
+  if (!pending.allowFreeText && pending.options.length > 0) {
+    const unknown = values.filter((v) => !pending.options.includes(v));
+    if (unknown.length) return { ok: false, status: 400, error: 'Choose one of the listed options.' };
   }
-  pending.settle(value);
+  // 多选回给模型的是 JSON 数组字符串（单选/自由输入保持原样字符串）
+  pending.settle(pending.multiple ? JSON.stringify(values) : values[0]);
   return { ok: true };
 }
 
@@ -307,6 +313,7 @@ export function registerAgentRoutes({ app, getCurrentProjectPath, configManager
           question: args.question,
           options: Array.isArray(args.options) ? args.options : [],
           allowFreeText: args.allowFreeText !== false,
+          multiple: args.multiple === true,
           send,
           signal: abortController.signal,
         }),

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

@@ -29,7 +29,7 @@ test('agent respond resolves a pending ask_user question and validates answers',
     send: event => sent.push(event),
   });
   await new Promise(resolve => setImmediate(resolve));
-  assert.deepEqual(sent, [{ type: 'ask_user', interactionId: 'call-test', question: 'Pick one', options: ['A', 'B'], allowFreeText: false }]);
+  assert.deepEqual(sent, [{ type: 'ask_user', interactionId: 'call-test', question: 'Pick one', options: ['A', 'B'], allowFreeText: false, multiple: false }]);
 
   let statusCode = 200;
   let responseBody;
@@ -52,6 +52,52 @@ test('agent respond resolves a pending ask_user question and validates answers',
   assert.equal(responseBody.success, false);
 });
 
+test('agent respond: 多选提交逐项校验,回给模型的是 JSON 数组字符串', async () => {
+  let respondHandler;
+  const app = {
+    get() {},
+    delete() {},
+    put() {},
+    post(route, handler) {
+      if (route === '/api/agent/respond') respondHandler = handler;
+    }
+  };
+  registerAgentRoutes({
+    app,
+    getCurrentProjectPath: () => path.resolve('active-project'),
+    configManager: null
+  });
+
+  const sent = [];
+  const pending = waitForAgentAnswer({
+    sessionId: 'session-multi',
+    interactionId: 'call-multi',
+    question: 'Pick some',
+    options: ['A', 'B', 'C'],
+    allowFreeText: false,
+    multiple: true,
+    send: event => sent.push(event),
+  });
+  await new Promise(resolve => setImmediate(resolve));
+  assert.equal(sent[0].multiple, true);
+
+  let statusCode = 200;
+  let responseBody;
+  const response = {
+    status(code) { statusCode = code; return this; },
+    json(body) { responseBody = body; return body; },
+  };
+
+  // 只要有一项不在选项里就整体拒绝
+  await respondHandler({ body: { sessionId: 'session-multi', interactionId: 'call-multi', answer: ['A', 'X'] } }, response);
+  assert.equal(statusCode, 400);
+  assert.equal(responseBody.success, false);
+
+  await respondHandler({ body: { sessionId: 'session-multi', interactionId: 'call-multi', answer: ['A', 'C'] } }, response);
+  assert.deepEqual(responseBody, { success: true });
+  assert.equal(await pending, '["A","C"]');
+});
+
 test('agent chat rejects a cwd that differs from the active server project', async () => {
   let chatHandler;
   const app = {

package/src/ui/server/routes/workbench/taskRunner.codex.test.js

@@ -0,0 +1,173 @@
+// 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.
+//
+
+// codex 执行器事件处理器的回归测试（2026-09-27）。
+//
+// 钉住 codex `exec --json` 适配层的五条口径（事件样例取自 codex-cli 0.157.x 实测输出）：
+//   1. thread.started 的 thread_id 落 job.claudeSessionId（续接 exec resume 的取值来源）
+//   2. agent_message / reasoning 分别落 output / thinking，且按 item.id 去重累积推送
+//   3. command_execution / file_change / mcp_tool_call / web_search 归一成工具调用，
+//      item.started(status=in_progress) → item.completed 更新同一条
+//   4. error 类事件（顶层 error / item.type=error）是非致命信息，只贴 output，
+//      绝不写 job.agentError —— 否则配置告警会被误判成任务失败
+//   5. turn.failed 才是终态失败：error.message 写进 job.agentError
+//
+// 隔离策略同 taskRunner.opencode.test.js：import taskRunner.js 之前把
+// USERPROFILE/HOME 指向 mkdtemp 沙箱（taskRunner → jobStore import 时就会 hydrate）。
+
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import path from 'node:path';
+import os from 'node:os';
+import { mkdtempSync } from 'node:fs';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const projectRoot = path.resolve(__dirname, '../../../../..');
+
+// ---- 环境隔离:必须在 import taskRunner.js 之前完成 ----
+const sandbox = mkdtempSync(path.join(os.tmpdir(), 'zen-taskrunner-codex-test-'));
+process.env.USERPROFILE = sandbox;
+process.env.HOME = sandbox;
+delete process.env.HOMEDRIVE;
+delete process.env.HOMEPATH;
+
+const { createCodexEventHandler } = await import(
+  pathToFileURL(path.join(projectRoot, 'src/ui/server/routes/workbench/taskRunner.js')).href
+);
+
+/** 可断言的 appendOutput/appendThinking 收集器 */
+function makeSink() {
+  const sink = { output: [], thinking: [] };
+  sink.appendOutput = (t) => { if (t) sink.output.push(t); };
+  sink.appendThinking = (t) => { if (t) sink.thinking.push(t); };
+  return sink;
+}
+
+test('codex 事件：thread_id 落 claudeSessionId，正文/思考分别归位', () => {
+  const job = {};
+  const sink = makeSink();
+  const handle = createCodexEventHandler(job, sink.appendOutput, sink.appendThinking);
+
+  handle({ type: 'thread.started', thread_id: '01a0e088-32fc-7511-aa6e-4e836bf138f7' });
+  handle({ type: 'turn.started' });
+  handle({ type: 'item.completed', item: { id: 'item_0', type: 'reasoning', text: '先看一眼目录' } });
+  handle({ type: 'item.completed', item: { id: 'item_1', type: 'agent_message', text: '改好了' } });
+  handle({ type: 'turn.completed', usage: { input_tokens: 1, output_tokens: 1 } });
+
+  assert.equal(job.claudeSessionId, '01a0e088-32fc-7511-aa6e-4e836bf138f7');
+  assert.deepEqual(sink.output, ['改好了']);
+  assert.deepEqual(sink.thinking, ['先看一眼目录']);
+  assert.equal(job.agentError, undefined);
+});
+
+test('codex 事件：同一 item.id 累积推送只追加增量', () => {
+  const job = {};
+  const sink = makeSink();
+  const handle = createCodexEventHandler(job, sink.appendOutput, sink.appendThinking);
+
+  // 累积语义：第二次的 text 是第一次的前缀延长
+  handle({ type: 'item.updated', item: { id: 'item_0', type: 'agent_message', text: 'Hello' } });
+  handle({ type: 'item.updated', item: { id: 'item_0', type: 'agent_message', text: 'Hello, world' } });
+  // 重复事件（完全相同）：不产生任何输出
+  handle({ type: 'item.updated', item: { id: 'item_0', type: 'agent_message', text: 'Hello, world' } });
+  // 不同 item.id：各自独立，整段落下
+  handle({ type: 'item.completed', item: { id: 'item_1', type: 'agent_message', text: 'Hello' } });
+
+  assert.deepEqual(sink.output, ['Hello', ', world', 'Hello']);
+});
+
+test('codex 事件：command_execution 的 started → completed 更新同一条工具调用', () => {
+  const job = {};
+  const sink = makeSink();
+  const handle = createCodexEventHandler(job, sink.appendOutput, sink.appendThinking);
+
+  handle({ type: 'item.started', item: { id: 'item_0', type: 'command_execution', command: 'npm test', aggregated_output: '', exit_code: null, status: 'in_progress' } });
+  assert.equal(job.toolCalls.length, 1);
+  assert.equal(job.toolCalls[0].status, 'running');
+  assert.equal(job.toolCalls[0].argsPreview, 'npm test');
+
+  handle({ type: 'item.completed', item: { id: 'item_0', type: 'command_execution', command: 'npm test', aggregated_output: 'ok 12 tests', exit_code: 0, status: 'completed' } });
+  assert.equal(job.toolCalls.length, 1, '同一 id 不新增记录');
+  assert.equal(job.toolCalls[0].status, 'done');
+  assert.equal(job.toolCalls[0].result, 'ok 12 tests');
+  assert.ok(!job.toolCalls[0].error);
+});
+
+test('codex 事件：命令失败/文件改动的工具调用落 error、文件清单作结果', () => {
+  const job = {};
+  const sink = makeSink();
+  const handle = createCodexEventHandler(job, sink.appendOutput, sink.appendThinking);
+
+  handle({ type: 'item.completed', item: { id: 'item_0', type: 'command_execution', command: 'npm run build', aggregated_output: 'boom', exit_code: 1, status: 'failed' } });
+  assert.equal(job.toolCalls[0].status, 'error');
+  assert.match(job.toolCalls[0].error, /exit_code=1/);
+
+  handle({ type: 'item.completed', item: { id: 'item_1', type: 'file_change', changes: [{ path: 'src/a.js', kind: 'update' }, { path: 'src/b.js', kind: 'add' }], status: 'completed' } });
+  assert.equal(job.toolCalls[1].status, 'done');
+  assert.equal(job.toolCalls[1].result, 'update src/a.js\nadd src/b.js');
+});
+
+test('codex 事件：mcp_tool_call / web_search 归一成工具调用', () => {
+  const job = {};
+  const sink = makeSink();
+  const handle = createCodexEventHandler(job, sink.appendOutput, sink.appendThinking);
+
+  handle({ type: 'item.completed', item: { id: 'item_0', type: 'mcp_tool_call', server: 'node_repl', tool: 'run', arguments: { code: '1+1' }, result: { content: [{ type: 'text', text: '2' }] }, status: 'completed' } });
+  assert.equal(job.toolCalls[0].name, 'node_repl.run');
+  assert.equal(job.toolCalls[0].status, 'done');
+  assert.equal(job.toolCalls[0].result, '2');
+
+  handle({ type: 'item.completed', item: { id: 'item_1', type: 'web_search', query: 'codex exec json', action: 'search', status: 'completed' } });
+  assert.equal(job.toolCalls[1].name, 'web_search');
+  assert.equal(job.toolCalls[1].argsPreview, 'codex exec json');
+});
+
+test('codex 事件：告警只贴 output，不置 agentError；turn.failed 才判失败', () => {
+  const job = {};
+  const sink = makeSink();
+  const handle = createCodexEventHandler(job, sink.appendOutput, sink.appendThinking);
+
+  // 配置告警（item.type=error）与重试提示（顶层 error）都是非终止信息
+  handle({ type: 'item.completed', item: { id: 'item_0', type: 'error', message: 'Codex is ignoring 2 unrecognized configuration settings.' } });
+  handle({ type: 'error', message: 'Reconnecting... 1/5 (unexpected status 401 Unauthorized)' });
+  assert.equal(job.agentError, undefined, '告警不能把任务判成失败');
+  assert.equal(sink.output.length, 2);
+
+  // 终态失败
+  handle({ type: 'turn.failed', error: { message: 'unexpected status 401 Unauthorized' } });
+  assert.equal(job.agentError, 'unexpected status 401 Unauthorized');
+  // 只记第一条
+  handle({ type: 'turn.failed', error: { message: 'second one' } });
+  assert.equal(job.agentError, 'unexpected status 401 Unauthorized');
+});
+
+test('codex 事件：未知 item 类型 / 缺字段事件不抛错也不产生输出', () => {
+  const job = {};
+  const sink = makeSink();
+  const handle = createCodexEventHandler(job, sink.appendOutput, sink.appendThinking);
+
+  handle({ type: 'item.completed', item: { id: 'item_0', type: 'todo_list', items: [{ text: 'step', completed: false }] } });
+  handle({ type: 'item.completed', item: { id: 'item_1', type: 'collab_tool_call', tool: 'wait', status: 'completed' } });
+  handle({ type: 'item.completed', item: { id: 'item_2', type: 'some_future_item_type' } });
+  handle({ type: 'item.completed' });
+  handle({ type: 'turn.started' });
+  handle(null);
+
+  assert.deepEqual(sink.output, []);
+  assert.deepEqual(sink.thinking, []);
+  assert.equal(job.claudeSessionId, undefined);
+  assert.equal(job.agentError, undefined);
+});