zen-gitsync 2.17.5 → 2.17.7

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

@@ -35,10 +35,27 @@ import { agentSessionStore } from './agentSessionStore.js';
 import { TOOL_DEFINITIONS, executeTool } from '../../../../cli/ai/tools.js';
 import { checkDangerousCommand } from '../../../../cli/ai/safety.js';
 import { guardCommand } from '../../../../cli/ai/platformGuard.js';
+import configManager from '../../../../config.js';
+import { buildAiChatRequest, describeAiHttpError } from '../../../../utils/aiEndpoint.js';
 
-const MAX_TOOL_ITERATIONS = 40;
+// 单轮工具调用循环数的兜底值(防失控);实际值取全局配置 aiMaxToolIterations,
+// 与 CLI 侧 src/cli/ai/agent.js 共用同一个配置项。
+const DEFAULT_MAX_TOOL_ITERATIONS = 200;
 const LLM_TIMEOUT_MS = 300000; // 5 分钟
 
+// 读取全局配置里的单轮工具调用上限。
+// 读配置失败不该把整轮对话打挂 —— 退回默认值继续跑,比用户消息直接发不出去好。
+async function resolveMaxToolIterations() {
+  try {
+    const cfg = await configManager.loadConfig();
+    const n = Number(cfg?.aiMaxToolIterations);
+    if (Number.isFinite(n) && n > 0) return Math.floor(n);
+  } catch (err) {
+    logger.warn(`[agentChat] 读取 aiMaxToolIterations 失败,回退默认值: ${err?.message || err}`);
+  }
+  return DEFAULT_MAX_TOOL_ITERATIONS;
+}
+
 // ── 系统提示词构建 ──────────────────────────────────────────
 // 与 CLI agent.js 的 buildSystemPrompt 保持一致，但标注来源为 Web 端
 function buildWebSystemPrompt({ cwd, locale }) {
@@ -138,10 +155,14 @@ ${isWin ? `- This is Windows. The following Unix commands do NOT exist here:
 
 // ── LLM 流式调用(OpenAI 兼容 + function calling) ──────────
 // 返回 { content, toolCalls, aborted }
-async function streamChatOnce({ model, messages, signal, onToken }) {
-  const url = `${String(model.baseURL || '').replace(/\/$/, '')}/chat/completions`;
-  const headers = { 'Content-Type': 'application/json' };
-  if (model.apiKey) headers['Authorization'] = `Bearer ${model.apiKey}`;
+async function streamChatOnce({ model, messages, signal, onToken, sessionId }) {
+  // sessionId = 对话 ID：OpenCode 网关靠它做路由与提示缓存，同一轮对话的所有请求要复用
+  const { url, headers } = buildAiChatRequest({
+    baseURL: model.baseURL,
+    model: model.model,
+    apiKey: model.apiKey,
+    sessionId,
+  });
 
   const body = JSON.stringify({
     model: model.model,
@@ -167,7 +188,8 @@ async function streamChatOnce({ model, messages, signal, onToken }) {
     const resp = await fetch(url, { method: 'POST', headers, body, signal: controller.signal });
     if (!resp.ok || !resp.body) {
       const errText = await resp.text().catch(() => '');
-      const snippet = errText.length > 300 ? errText.slice(0, 300) + '…' : errText;
+      // 抽 error.message：网关/provider 的说明都在里面，整坨 JSON 甩到聊天窗没法看
+      const snippet = describeAiHttpError(errText, resp.status);
       if (resp.status === 400 && /tool|function/i.test(snippet)) {
         throw new Error(`HTTP 400: 当前模型可能不支持 function calling(${snippet})。请在设置中换用支持工具调用的模型。`);
       }
@@ -342,7 +364,9 @@ export async function runAgentTurn({ session, model, userMessage, images = [], c
   // 旧图片降级
   stripStaleImages(session.messages);
 
-  for (let iter = 0; iter < MAX_TOOL_ITERATIONS; iter++) {
+  const maxIterations = await resolveMaxToolIterations();
+
+  for (let iter = 0; iter < maxIterations; iter++) {
     trimHistory(session.messages);
     sanitizeMessages(session.messages);
 
@@ -352,6 +376,8 @@ export async function runAgentTurn({ session, model, userMessage, images = [], c
         model,
         messages: session.messages,
         signal,
+        // 整轮对话（含后续工具调用产生的每一轮请求）复用同一个会话 ID
+        sessionId: session.sessionId,
         onToken: ({ thinking, content }) => {
           if (thinking) send({ type: 'thinking', delta: thinking });
           if (content) send({ type: 'content', delta: content });
@@ -418,7 +444,7 @@ export async function runAgentTurn({ session, model, userMessage, images = [], c
   }
 
   // 达到最大迭代次数
-  send({ type: 'done', content: `已达单轮最大工具调用次数(${MAX_TOOL_ITERATIONS})，本轮结束。如需继续请再发一条消息。` });
+  send({ type: 'done', content: `已达单轮最大工具调用次数(${maxIterations})，本轮结束。如需继续请再发一条消息。` });
   return { aborted: false };
 }
 

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

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

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

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

@@ -23,6 +23,7 @@
 //   - cloneMsgContent       深拷贝消息 content（避免外部 mutation 污染请求）
 
 import { stripThinkingBlocks, extractFirstJsonObject } from './jsonParse.js';
+import { buildAiChatRequest, describeAiHttpError } from '../../../../utils/aiEndpoint.js';
 
 // 非流式调用 LLM，要求返回 JSON 对象。
 // 失败时抛错；成功时返回已 parse 的对象。
@@ -32,9 +33,11 @@ import { stripThinkingBlocks, extractFirstJsonObject } from './jsonParse.js';
 export async function callLlmJson(model, prompt, opts = {}) {
   const { timeoutMs = 60000, images = [] } = opts;
   const { default: fetch } = await import('node-fetch').catch(() => ({ default: globalThis.fetch }));
-  const url = `${String(model.baseURL || '').replace(/\/$/, '')}/chat/completions`;
-  const headers = { 'Content-Type': 'application/json' };
-  if (model.apiKey) headers['Authorization'] = `Bearer ${model.apiKey}`;
+  const { url, headers } = buildAiChatRequest({
+    baseURL: model.baseURL,
+    model: model.model,
+    apiKey: model.apiKey,
+  });
 
   let userContent;
   if (Array.isArray(images) && images.length > 0) {
@@ -115,11 +118,14 @@ export function cloneMsgContent(c) {
  * 函数返回 { aborted: true }，不抛错——上层决定怎么处理。
  */
 export async function callLlmStream(model, input, onDelta, opts = {}) {
-  const { maxTokens = 2000, timeoutMs = 600000, signal, images = [], systemPrompt } = opts;
+  const { maxTokens = 2000, timeoutMs = 600000, signal, images = [], systemPrompt, sessionId } = opts;
   const { default: fetch } = await import('node-fetch').catch(() => ({ default: globalThis.fetch }));
-  const url = `${String(model.baseURL || '').replace(/\/$/, '')}/chat/completions`;
-  const headers = { 'Content-Type': 'application/json' };
-  if (model.apiKey) headers['Authorization'] = `Bearer ${model.apiKey}`;
+  const { url, headers } = buildAiChatRequest({
+    baseURL: model.baseURL,
+    model: model.model,
+    apiKey: model.apiKey,
+    sessionId,
+  });
 
   // 判别 input: string(旧,直接拆分)或 messages 数组(新,对话拆分)
   let messages;
@@ -167,7 +173,8 @@ export async function callLlmStream(model, input, onDelta, opts = {}) {
     const resp = await fetch(url, { method: 'POST', headers, body, signal: controller.signal });
     if (!resp.ok || !resp.body) {
       const errText = await resp.text().catch(() => '');
-      throw new Error(errText || `HTTP ${resp.status}`);
+      // 抽 error.message，别把整坨 JSON 甩给用户（网关的报错说明都在 message 里）
+      throw new Error(describeAiHttpError(errText, resp.status));
     }
 
     // SSE 格式：每行 "data: {...}"，最后 "data: [DONE]"