zen-gitsync 2.17.15 → 2.17.17

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

@@ -25,6 +25,7 @@ import path from 'node:path';
 import { asyncRoute, HttpError } from '../../utils/asyncRoute.js';
 import { agentSessionStore } from './agentSessionStore.js';
 import { runAgentTurn } from './agentChat.js';
+import { saveAgentAttachments, MAX_ATTACHMENTS } from '../../utils/agentAttachments.js';
 import { registerAgentMarketplaceRoutes } from './agentMarketplace.js';
 import { createProjectListProvider } from './projectTool.js';
 import { nowIso } from './shared.js';
@@ -51,11 +52,14 @@ function sessionBelongsTo(sessionCwd, projectCwd) {
 // matching response. The entry is removed on every completion or disconnect.
 const pendingAgentQuestions = new Map();
 
+/** 正在进行中的会话 id 集合：同一会话同一时刻只允许一个生成中的轮次 */
+const activeSessionTurns = new Set();
+
 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 +79,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 +93,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 };
 }
 
@@ -181,10 +191,19 @@ export function registerAgentRoutes({ app, getCurrentProjectPath, configManager
       .filter(u => typeof u === 'string' && /^data:image\/[\w.+-]+;base64,/.test(u))
       .slice(0, 10);
 
-    if (!userMessage && images.length === 0) {
+    // 非图片附件：前端只传文件名 + 字节，服务端落盘到数据目录，只把**绝对路径**交给模型。
+    // 内容不进消息体（省 token，模型自己用 read/grep 按需取），校验见 utils/agentAttachments.js。
+    const rawAttachments = (Array.isArray(req.body?.attachments) ? req.body.attachments : [])
+      .slice(0, MAX_ATTACHMENTS)
+      .map(a => ({ name: a?.name, dataUrl: a?.dataUrl }));
+
+    if (!userMessage && images.length === 0 && rawAttachments.length === 0) {
       return res.status(400).json({ success: false, error: '消息内容不能为空' });
     }
 
+    // 文件空间对话：客户端把"当前打开的文档"带上来，服务端只在请求副本里注入上下文（不落库）
+    const openFilePath = String(req.body?.openFilePath || '').trim().slice(0, 512);
+
     // SSE 头
     res.set({
       'Content-Type': 'text/event-stream',
@@ -201,6 +220,15 @@ export function registerAgentRoutes({ app, getCurrentProjectPath, configManager
     let finished = false;
     let activeChild = null;
 
+    // 同一会话同一时刻只允许一个进行中的生成：跨视图（对话 Tab / 文件空间面板）
+    // 或前端连点都靠这道闸挡住，否则两个流各自的会话快照会互相覆盖。
+    if (sessionIdInput && activeSessionTurns.has(sessionIdInput)) {
+      send({ type: 'error', error: '该会话正在生成中，请等它结束后再发送' });
+      finished = true;
+      return res.end();
+    }
+    let activeSessionKey = null;
+
     // 客户端断开
     if (req.socket) {
       req.socket.once('close', () => {
@@ -258,6 +286,19 @@ export function registerAgentRoutes({ app, getCurrentProjectPath, configManager
         isNew = true;
       }
 
+      // 本轮占用该会话（finally 里释放）
+      activeSessionKey = session.sessionId;
+      activeSessionTurns.add(activeSessionKey);
+
+      // 附件落盘（拿到绝对路径后再把路径交给模型）。落盘失败不该拖垮整轮对话：
+      // 拿不到路径最多是模型看不到附件，用户仍能正常对话。
+      const attachments = await saveAgentAttachments(rawAttachments, {
+        onSkip: (info) => console.warn('[agent] 附件被忽略:', info.name, info.reason)
+      }).catch((err) => {
+        console.warn('[agent] 附件落盘失败:', err?.message || err);
+        return [];
+      });
+
       // 获取模型配置
       let model;
       try {
@@ -291,13 +332,15 @@ export function registerAgentRoutes({ app, getCurrentProjectPath, configManager
       });
 
       // 运行 agent 循环
-      const { aborted } = await runAgentTurn({
+      await runAgentTurn({
         session,
         model,
         userMessage,
         images,
         cwd,
         locale,
+        openFilePath,
+        attachments,
         signal: abortController.signal,
         send,
         onChild: (child) => { activeChild = child; },
@@ -307,23 +350,20 @@ 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,
         }),
         listProjects
       });
 
-      if (aborted) {
-        finished = true;
-        return res.end();
-      }
-
       // 更新标题(新会话从第一条 user 消息自动生成)
       if (isNew) {
         session.title = autoTitle(session.messages);
       }
 
-      // 持久化
+      // 持久化。中止(用户点"停止")的轮次同样要落盘 —— 磁盘上没有这条会话时，
+      // 前端停止后立刻刷新列表会把左栏这一条整个吞掉（表现为"一停止任务就没了"）。
       session.updatedAt = nowIso();
       await writeSession(session.sessionId, session);
       enforceRetention().catch(() => {});
@@ -334,6 +374,8 @@ export function registerAgentRoutes({ app, getCurrentProjectPath, configManager
       send({ type: 'error', error: '智能体对话失败: ' + (err?.message || String(err)) });
       finished = true;
       res.end();
+    } finally {
+      if (activeSessionKey) activeSessionTurns.delete(activeSessionKey);
     }
   });
 }

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

@@ -1,7 +1,29 @@
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
+import { mkdtempSync, readdirSync, readFileSync } from 'node:fs';
+import os from 'node:os';
 import path from 'node:path';
-import { registerAgentRoutes, waitForAgentAnswer } from './agentRoutes.js';
+
+// agentSessionStore 的落盘目录在模块加载时由 os.homedir() 求值，必须在 import 之前
+// 把 HOME 指到沙箱，否则这个文件会往真实 ~/.zen-gitsync/agent-sessions 里写会话。
+const SANDBOX = mkdtempSync(path.join(os.tmpdir(), 'zen-agent-routes-'));
+process.env.USERPROFILE = SANDBOX;
+process.env.HOME = SANDBOX;
+delete process.env.HOMEDRIVE;
+delete process.env.HOMEPATH;
+
+const { registerAgentRoutes, waitForAgentAnswer } = await import('./agentRoutes.js');
+
+const event = data => `data: ${JSON.stringify(data)}\n\n`;
+
+// 轮询等待条件成立（SSE 是边跑边写出来的，没有可 await 的句柄）
+async function waitUntil(check, timeoutMs = 2000) {
+  const start = Date.now();
+  while (!check()) {
+    if (Date.now() - start > timeoutMs) throw new Error('等待超时');
+    await new Promise(resolve => setTimeout(resolve, 5));
+  }
+}
 
 test('agent respond resolves a pending ask_user question and validates answers', async () => {
   let respondHandler;
@@ -29,7 +51,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 +74,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 = {
@@ -87,3 +155,75 @@ test('agent chat rejects a cwd that differs from the active server project', asy
   assert.match(output, /PROJECT_MISMATCH/);
   assert.match(output, /项目不一致/);
 });
+
+// 回归：用户点"停止"（客户端断开连接 → 服务端 abort）后，这条会话仍要落盘。
+// 之前中止分支直接 res.end()，磁盘上没有会话文件，前端停止后立刻刷新列表
+// 就把左栏这一条整个吞掉了 —— 用户看到的是"一停止任务就没了"。
+test('停止(客户端断开)后会话仍要落盘，并带上自动标题与已流出的正文', async () => {
+  const activeCwd = path.resolve('active-project');
+  let chatHandler;
+  const app = {
+    get() {},
+    delete() {},
+    put() {},
+    post(route, handler) {
+      if (route === '/api/agent/chat') chatHandler = handler;
+    }
+  };
+  registerAgentRoutes({
+    app,
+    getCurrentProjectPath: () => activeCwd,
+    configManager: {
+      readRawConfigFile: async () => ({
+        models: [{ model: 'test', name: 'T', baseURL: 'https://example.invalid/v1', apiKey: 'k', isDefault: true }]
+      })
+    }
+  });
+
+  // 模型流：吐一段正文后挂住（模拟"停在生成中"）。真 fetch 在 signal abort 时会打断
+  // body 读取，桩里照做才能真的走到中止分支
+  const hanging = init => new Response(new ReadableStream({
+    start(stream) {
+      const bytes = new TextEncoder();
+      stream.enqueue(bytes.encode(event({ choices: [{ delta: { content: '已经写了一半' } }] })));
+      init?.signal?.addEventListener('abort', () => stream.error(new DOMException('Aborted', 'AbortError')));
+    }
+  }), { status: 200, headers: { 'content-type': 'text/event-stream' } });
+
+  const originalFetch = globalThis.fetch;
+  globalThis.fetch = async (_url, init) => hanging(init);
+
+  let onSocketClose;
+  let output = '';
+  let ended = false;
+  const req = {
+    body: { userMessage: '请列出当前项目的目录结构', cwd: activeCwd },
+    headers: {},
+    socket: { once(_evt, cb) { onSocketClose = cb; } }
+  };
+  const res = {
+    set() {},
+    flushHeaders() {},
+    write(chunk) { output += chunk; },
+    end() { ended = true; }
+  };
+
+  try {
+    const route = chatHandler(req, res);
+    await waitUntil(() => output.includes('"type":"content"'));
+    onSocketClose();
+    await route;
+  } finally {
+    globalThis.fetch = originalFetch;
+  }
+
+  assert.equal(ended, true, '中止后也要正常收尾');
+  const dir = path.join(SANDBOX, '.zen-gitsync', 'agent-sessions');
+  const files = readdirSync(dir).filter(f => f.endsWith('.json'));
+  assert.equal(files.length, 1, '被停止的会话必须落盘，否则左栏这一条会消失');
+  const saved = JSON.parse(readFileSync(path.join(dir, files[0]), 'utf-8'));
+  assert.equal(saved.title, '请列出当前项目的目录结构');
+  const last = saved.messages[saved.messages.length - 1];
+  assert.equal(last.role, 'assistant');
+  assert.equal(last.content, '已经写了一半');
+});

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);
+});