zen-gitsync 2.18.20 → 2.18.22

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

@@ -19,7 +19,7 @@
 import { test } from 'node:test'
 import assert from 'node:assert/strict'
 import fs from 'node:fs/promises'
-import { fetchLatestVersion, findDshExecutable, getToolInstallers, parseVersionOutput, registerFileOpenRoutes } from './fileOpen.js'
+import { fetchLatestVersion, findCodeArtsExecutable, findDshExecutable, getToolInstallers, parseVersionOutput, registerFileOpenRoutes } from './fileOpen.js'
 
 // ── parseVersionOutput(版本号采集,2026-09-05 check-tools 增强)────────────
 
@@ -77,6 +77,44 @@ test('getToolInstallers: npm 包工具的升级变体带 @latest', () => {
   }
 })
 
+test('getToolInstallers: codearts 只给手动安装卡片（没有 npm 包，不提供一键安装）', () => {
+  for (const platform of ['win32', 'darwin', 'linux']) {
+    const inst = getToolInstallers(platform, () => true).codearts
+    // 缺这条时前端弹窗会一直停在「正在获取安装方式」（2026-10-25 实测）
+    assert.ok(inst, `${platform} 缺 codearts 安装信息`)
+    // 官方只有 PowerShell / bash 安装脚本，代跑等于把远程脚本塞进用户终端
+    assert.equal(inst.supported, false)
+    assert.equal(inst.packageManager, 'official-script')
+    assert.match(inst.command, /codearts\/cli_tui\/install_script\/install\.(ps1|sh)/)
+    assert.equal(inst.docsUrl, 'https://codearts.huaweicloud.com/download.html')
+    // 没有升级变体：升级靠它自己的 `codearts upgrade`
+    assert.equal(inst.updateCommand, undefined)
+  }
+})
+
+test('findCodeArtsExecutable: 按安装位置硬找，不依赖当前进程的 PATH', async () => {
+  const os = await import('node:os')
+  const path = await import('node:path')
+  const home = await fs.mkdtemp(path.join(os.tmpdir(), 'zen-codearts-inst-'))
+  const binDir = path.join(home, '.codeartsdoer', 'installers')
+  await fs.mkdir(binDir, { recursive: true })
+  const shim = path.join(binDir, 'codearts.cmd')
+  await fs.writeFile(shim, '@echo off\r\n')
+
+  const prev = process.env.USERPROFILE
+  process.env.USERPROFILE = home
+  try {
+    // 关键契约：安装脚本只改了**用户 PATH**，已运行的进程看不到 —— 必须硬找成功，
+    // 否则界面永远显示「未安装」，用户重启前怎么点都修复不了（2026-10-25 实测）
+    if (process.platform === 'win32') {
+      assert.equal(await findCodeArtsExecutable(), shim)
+    }
+  } finally {
+    if (prev === undefined) delete process.env.USERPROFILE
+    else process.env.USERPROFILE = prev
+  }
+})
+
 test('getToolInstallers: 各平台 vscode 升级用各自的 upgrade 动词', () => {
   const win = getToolInstallers('win32', () => true)
   assert.match(win.vscode.updateCommand, /^winget upgrade/)

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

@@ -53,7 +53,7 @@ import os from 'os';
 import { logger } from './shared.js';
 
 // 从 CLI 侧导入工具定义、执行器与 LLM 传输层（同一 monorepo，路径可达）
-import { TOOL_DEFINITIONS, executeTool, normalizePlanSteps, summarizePlan, splitToolOutput, toolMessageContent } from '../../../../cli/ai/tools.js';
+import { TOOL_DEFINITIONS, executeTool, normalizePlanSteps, summarizePlan, splitToolOutput, toolMessageContent, splitToolBatches, backgroundTaskRunning } from '../../../../cli/ai/tools.js';
 import { prepareRequestMessages, measureContextUsage, resolveRequestBudget } from '../../../../cli/ai/context.js';
 import { streamChatOnce } from '../../../../cli/ai/transport.js';
 import { checkDangerousCommand } from '../../../../cli/ai/safety.js';
@@ -166,6 +166,8 @@ ${isWin ? `- 当前是 Windows,以下 Unix 命令**不存在**,用了必定报"
 - 大文件用 offset/limit 分段读取,不要一次读爆上下文
 - git 操作用 run_command 执行
 - run_command 默认就在工作目录执行,不要再加 cd 前缀;默认超时 120 秒,长任务加大 timeout_seconds(最大 600)
+- 起 dev server / watch / 监听端口这类不会自己结束的命令,用 run_in_background=true(立刻拿到 bg_N),再用 background_task 看日志或 kill;直接前台跑只会一直占着,到超时被杀
+- 一轮里要读多个文件 / 搜多处时,把它们放进同一次响应里一起发 —— 只读工具会并发执行,比一个个来回快得多
 - 命令在 ${shellDesc} 下执行,注意语法兼容
 
 # 任务计划(多步任务必用)
@@ -281,6 +283,8 @@ ${isWin ? `- This is Windows. The following Unix commands do NOT exist here:
 - Use offset/limit for large files
 - git operations via run_command
 - run_command defaults to the working directory; default timeout 120s, max 600s
+- For processes that never exit on their own (dev server, watch, port listeners) pass run_in_background=true (you get a bg_N id immediately), then use background_task to read logs or kill it; running them in the foreground just blocks until the timeout kills them
+- When a turn needs several files or several searches, issue them in the same response — read-only tools run concurrently, which is far faster than one round-trip each
 - Images reach you two ways:
   · The user attached one to a message → it arrives as an image_url part in the user message; you can see it directly
   · The user only gave you a **path** (or you run into an image while exploring) → read it with the read_image tool, not read_file
@@ -564,8 +568,10 @@ export async function runAgentTurn({ session, model, userMessage, images = [], c
       tool_calls: toolCalls
     }));
 
-    // 逐个执行工具
-    for (const tc of toolCalls) {
+    // 单个工具的执行:发 tool_call_start → 执行 → 发 tool_result,返回要入历史的 tool 消息。
+    // 抽成函数是为了让"串行批"和"并发批"共用同一条路径(包括参数错误、ask_user 的
+    // interactionId 绑定这些边角),两条分支只在**什么时候 push 历史**上不同。
+    const runOneTool = async (tc) => {
       const name = tc.function?.name || '';
       const rawArgs = tc.function?.arguments || '';
       const toolCallId = tc.id || name;
@@ -577,8 +583,7 @@ export async function runAgentTurn({ session, model, userMessage, images = [], c
         const errResult = `错误: 工具参数不是合法 JSON: ${rawArgs.slice(0, 200)}`;
         send({ type: 'tool_call_start', toolCallId, name, argsPreview: rawArgs.slice(0, 200), arguments: rawArgs });
         send({ type: 'tool_result', toolCallId, name, result: errResult });
-        session.messages.push({ role: 'tool', tool_call_id: toolCallId, name, content: errResult });
-        continue;
+        return { toolCallId, name, content: errResult };
       }
 
       // 工具参数预览(前端收起态那一行副标题)。这里截断是**故意的** ——
@@ -609,8 +614,35 @@ export async function runAgentTurn({ session, model, userMessage, images = [], c
       // 直接把对象丢过去会渲染成 "[object Object]"),图片进会话历史里的
       // 多模态 tool 消息 —— 模型看得见图,用户看到的是"已读取图片 xxx.png"。
       const { text: outText, images: outImages } = splitToolOutput(output);
-      send({ type: 'tool_result', toolCallId, name, result: outText });
-      session.messages.push({ role: 'tool', tool_call_id: toolCallId, name, content: toolMessageContent(outText, outImages) });
+      // 后台命令：这一轮的工具调用已经返回（模型能接着干活），但进程还活着。
+      // 带上 status 让前端别把卡片标成"完成"—— 绿勾会让人以为 dev server 跑完了。
+      const isBackground = name === 'run_command' && args?.run_in_background === true;
+      // 后台任务刚结束（进程自己退出 / 被 kill）：叫前端把那张"运行中"的卡收尾
+      const endedBg = name === 'background_task' && args?.id && backgroundTaskRunning(args.id) === false
+        ? args.id
+        : undefined;
+      send({
+        type: 'tool_result',
+        toolCallId,
+        name,
+        result: outText,
+        ...(isBackground ? { status: 'background' } : {}),
+        ...(endedBg ? { endsBackground: endedBg } : {}),
+      });
+      return { toolCallId, name, content: toolMessageContent(outText, outImages) };
+    };
+
+    // 执行工具。连续的只读工具并发跑(分组规则与 CLI turn.js 共用 tools.js 的
+    // splitToolBatches),写类 / 命令 / 问用户仍串行 —— 它们有顺序依赖或要占住交互。
+    // 前端按 toolCallId 更新卡片,谁先完成谁先亮 "done";而**入历史**的顺序必须
+    // 与 assistant.tool_calls 一致,所以统一等这一批全部结束再按 batch 顺序 push。
+    for (const batch of splitToolBatches(toolCalls)) {
+      const results = batch.parallel
+        ? await Promise.all(batch.calls.map(tc => runOneTool(tc)))
+        : [await runOneTool(batch.calls[0])];
+      for (const r of results) {
+        session.messages.push({ role: 'tool', tool_call_id: r.toolCallId, name: r.name, content: r.content });
+      }
     }
     // 工具结果全部入历史后继续循环，让模型基于结果决定下一步
   }
@@ -635,7 +667,15 @@ function summarizeArgs(name, args) {
   try {
     switch (name) {
       case 'run_command':
-        return String(args.command || '').slice(0, 200);
+        // 后台命令要一眼看得出来(否则和普通命令长得一样,用户以为跑完了)
+        return (args.run_in_background ? '[后台] ' : '') + String(args.command || '').slice(0, 200);
+      case 'background_task': {
+        const action = String(args.action || 'read');
+        if (action === 'list') return '列出后台任务';
+        if (action === 'kill') return `停止 ${args.id || '?'}`;
+        const wait = Number(args.wait_seconds) || 0;
+        return `${args.id || '?'}${wait ? ` · 等 ${wait}s` : ''}`;
+      }
       case 'read_file':
       case 'read_image':
       case 'write_file':