@harness-mix/cli 0.2.2 → 0.2.4

package/src/main/host/jsonl.js

@@ -1,116 +1,130 @@
-const { spawn } = require("node:child_process");
-const { StringDecoder } = require("node:string_decoder");
-const { terminateTree } = require("../native/process-utils");
-
-/**
- * JSONL 进程传输层。
- * - 严格 JSONL 分帧：仅以 \n 切分，剥离行尾 \r（Node readline 会把 U+2028/U+2029
- *   当作换行，不符合 Pi RPC 协议要求，这里按规范自行实现）。
- * - 同时支持两种报文形态：
- *   1. Pi 命令式：{ id, type, ... }，响应为 { type: "response", id, success, data|error }
- *   2. JSON-RPC 式：{ jsonrpc, id, method, params }（DSH/ACP），包括 Agent → Client 的请求
- */
-class JsonlProcess {
-  constructor(command, args, options, hooks) {
-    this.pending = new Map();
-    this.nextId = 1;
-    this.hooks = hooks;
-    this.child = spawn(command, args, { windowsHide: true, ...options, stdio: ["pipe", "pipe", "pipe"] });
-    this.#attachReader(this.child.stdout, (line) => this.#dispatch(line));
-    this.#attachReader(this.child.stderr, (line) => hooks.onDiagnostic?.(line));
-    this.child.on("error", (error) => this.#failAll(error));
-    this.child.on("exit", (code, signal) => this.#failAll(new Error(`Harness 进程已退出 (${code ?? signal ?? "unknown"})`)));
-  }
-
-  #attachReader(stream, onLine) {
-    const decoder = new StringDecoder("utf8");
-    let buffer = "";
-    stream.on("data", (chunk) => {
-      buffer += typeof chunk === "string" ? chunk : decoder.write(chunk);
-      let index;
-      while ((index = buffer.indexOf("\n")) !== -1) {
-        let line = buffer.slice(0, index);
-        buffer = buffer.slice(index + 1);
-        if (line.endsWith("\r")) line = line.slice(0, -1);
-        if (line.trim()) onLine(line);
-      }
-    });
-    stream.on("end", () => {
-      buffer += decoder.end();
-      if (buffer.trim()) onLine(buffer.endsWith("\r") ? buffer.slice(0, -1) : buffer);
-    });
-  }
-
-  #dispatch(line) {
-    let value;
-    try { value = JSON.parse(line); }
-    catch { this.hooks.onDiagnostic?.(`Non-JSON stdout: ${line.slice(0, 500)}`); return; }
-    // Agent → Client 请求（JSON-RPC，带 method 和 id），需要回复
-    if (value.method !== undefined && value.id !== undefined) {
-      Promise.resolve()
-        .then(() => {
-          if (!this.hooks.onRequest) throw new Error(`Unsupported native client request: ${value.method}`);
-          return this.hooks.onRequest(value);
-        })
-        .then((result) => this.#write({ jsonrpc: "2.0", id: value.id, result: result ?? {} }))
-        .catch((error) => this.#write({ jsonrpc: "2.0", id: value.id, error: { code: -32603, message: error.message } }));
-      return;
-    }
-    // 命令响应（id 匹配 pending）
-    if (value.id !== undefined && this.pending.has(value.id)) {
-      const { resolve, reject } = this.pending.get(value.id);
-      this.pending.delete(value.id);
-      if (value.error || value.success === false) {
-        reject(new Error(typeof value.error === "string" ? value.error : value.error?.message || "Harness 请求失败"));
-      } else {
-        resolve(value.result ?? value.data ?? value);
-      }
-      return;
-    }
-    // 普通事件 / 通知
-    this.hooks.onEvent?.(value);
-  }
-
-  #write(payload) {
-    if (!this.child.stdin.destroyed) this.child.stdin.write(`${JSON.stringify(payload)}\n`);
-  }
-
-  /** JSON-RPC 请求（DSH/ACP） */
-  request(method, params) {
-    const id = this.nextId++;
-    this.#write({ jsonrpc: "2.0", id, method, params });
-    return new Promise((resolve, reject) => this.pending.set(id, { resolve, reject }));
-  }
-
-  /** JSON-RPC 通知（无响应） */
-  notify(method, params) { this.#write({ jsonrpc: "2.0", method, params }); }
-
-  /** Pi 命令式请求 */
-  command(payload) {
-    const id = String(this.nextId++);
-    this.#write({ id, ...payload });
-    return new Promise((resolve, reject) => this.pending.set(id, { resolve, reject }));
-  }
-
-  /** 回复 Agent → Client 请求之外的自由格式报文（如 Pi extension_ui_response） */
-  send(payload) { this.#write(payload); }
-
-  stop() { void terminateTree(this.child.pid); }
-
-  #failAll(error) {
-    for (const { reject } of this.pending.values()) reject(error);
-    this.pending.clear();
-    this.hooks.onExit?.(error);
-  }
-}
-
-/** 跨平台 CLI 启动：Windows 上 .cmd  shim 需要经 cmd.exe 执行 */
-function cliSpawn(bin, args) {
-  if (process.platform === "win32") {
-    const safe = [`${bin}.cmd`, ...args.map(String)].map((a) => (/[&|<>^%"]/.test(a) ? `"${a.replace(/["&|<>^%]/g, "")}"` : a.includes(" ") ? `"${a}"` : a));
-    return { command: "cmd.exe", args: ["/d", "/s", "/c", safe.join(" ")] };
-  }
-  return { command: bin, args: args.map(String) };
-}
-
-module.exports = { JsonlProcess, cliSpawn };
+const { spawn } = require("node:child_process");
+const { StringDecoder } = require("node:string_decoder");
+const { terminateTree } = require("../native/process-utils");
+
+/**
+ * JSONL 进程传输层。
+ * - 严格 JSONL 分帧：仅以 \n 切分，剥离行尾 \r（Node readline 会把 U+2028/U+2029
+ *   当作换行，不符合 Pi RPC 协议要求，这里按规范自行实现）。
+ * - 同时支持两种报文形态：
+ *   1. Pi 命令式：{ id, type, ... }，响应为 { type: "response", id, success, data|error }
+ *   2. JSON-RPC 式：{ jsonrpc, id, method, params }（DSH/ACP），包括 Agent → Client 的请求
+ */
+class JsonlProcess {
+  constructor(command, args, options = {}, hooks = {}) {
+    this.pending = new Map();
+    this.nextId = 1;
+    this.hooks = hooks;
+    // jsonrpc: false = 纯 {id, method, params} 帧（省略 "jsonrpc" 字段）。
+    // ZCode app-server 的 zod 校验把 "jsonrpc" 当 unrecognized key 拒收。
+    this.jsonrpc = options.jsonrpc !== false;
+    const spawnOptions = { ...options };
+    delete spawnOptions.jsonrpc;
+    this.child = spawn(command, args, { windowsHide: true, ...spawnOptions, stdio: ["pipe", "pipe", "pipe"] });
+    // 子进程异常退出/管道破裂时，迟到的 stdin.write 会在流上异步抛 EPIPE；
+    // Writable 无 error 监听会被 Node 当作未捕获异常直接 crash 宿主进程。
+    // 真实失败由 exit/error 路径统一结算，这里仅吞掉管道噪声。
+    this.child.stdin.on("error", (error) => this.hooks.onDiagnostic?.(`stdin: ${error.message}`));
+    this.#attachReader(this.child.stdout, (line) => this.#dispatch(line));
+    this.#attachReader(this.child.stderr, (line) => hooks.onDiagnostic?.(line));
+    this.child.on("error", (error) => this.#failAll(error));
+    this.child.on("exit", (code, signal) => {
+      const error = new Error(`Harness 进程已退出 (${code ?? signal ?? "unknown"})`);
+      // 确定性失败标记：harness 二进制在应答挂起请求前就退出。调用方用它抑制重试循环。
+      error.harnessExited = true;
+      this.#failAll(error);
+    });
+  }
+
+  #attachReader(stream, onLine) {
+    const decoder = new StringDecoder("utf8");
+    let buffer = "";
+    stream.on("data", (chunk) => {
+      buffer += typeof chunk === "string" ? chunk : decoder.write(chunk);
+      let index;
+      while ((index = buffer.indexOf("\n")) !== -1) {
+        let line = buffer.slice(0, index);
+        buffer = buffer.slice(index + 1);
+        if (line.endsWith("\r")) line = line.slice(0, -1);
+        if (line.trim()) onLine(line);
+      }
+    });
+    stream.on("end", () => {
+      buffer += decoder.end();
+      if (buffer.trim()) onLine(buffer.endsWith("\r") ? buffer.slice(0, -1) : buffer);
+    });
+  }
+
+  #dispatch(line) {
+    let value;
+    try { value = JSON.parse(line); }
+    catch { this.hooks.onDiagnostic?.(`Non-JSON stdout: ${line.slice(0, 500)}`); return; }
+    // Agent → Client 请求（JSON-RPC，带 method 和 id），需要回复
+    if (value.method !== undefined && value.id !== undefined) {
+      Promise.resolve()
+        .then(() => {
+          if (!this.hooks.onRequest) throw new Error(`Unsupported native client request: ${value.method}`);
+          return this.hooks.onRequest(value);
+        })
+        .then((result) => this.#write(this.jsonrpc ? { jsonrpc: "2.0", id: value.id, result: result ?? {} } : { id: value.id, result: result ?? {} }))
+        .catch((error) => this.#write(this.jsonrpc ? { jsonrpc: "2.0", id: value.id, error: { code: -32603, message: error.message } } : { id: value.id, error: { code: -32603, message: error.message } }));
+      return;
+    }
+    // 命令响应（id 匹配 pending）
+    if (value.id !== undefined && this.pending.has(value.id)) {
+      const { resolve, reject } = this.pending.get(value.id);
+      this.pending.delete(value.id);
+      if (value.error || value.success === false) {
+        reject(new Error(typeof value.error === "string" ? value.error : value.error?.message || "Harness 请求失败"));
+      } else {
+        resolve(value.result ?? value.data ?? value);
+      }
+      return;
+    }
+    // 普通事件 / 通知
+    this.hooks.onEvent?.(value);
+  }
+
+  #write(payload) {
+    if (!this.child.stdin.destroyed) this.child.stdin.write(`${JSON.stringify(payload)}\n`);
+  }
+
+  /** JSON-RPC 请求（DSH/ACP）；纯帧模式下省略 jsonrpc 字段（ZCode） */
+  request(method, params) {
+    const id = this.nextId++;
+    this.#write(this.jsonrpc ? { jsonrpc: "2.0", id, method, params } : { id, method, params });
+    return new Promise((resolve, reject) => this.pending.set(id, { resolve, reject }));
+  }
+
+  /** JSON-RPC 通知（无响应） */
+  notify(method, params) { this.#write(this.jsonrpc ? { jsonrpc: "2.0", method, params } : { method, params }); }
+
+  /** Pi 命令式请求 */
+  command(payload) {
+    const id = String(this.nextId++);
+    this.#write({ id, ...payload });
+    return new Promise((resolve, reject) => this.pending.set(id, { resolve, reject }));
+  }
+
+  /** 回复 Agent → Client 请求之外的自由格式报文（如 Pi extension_ui_response） */
+  send(payload) { this.#write(payload); }
+
+  stop() { void terminateTree(this.child.pid); }
+
+  #failAll(error) {
+    for (const { reject } of this.pending.values()) reject(error);
+    this.pending.clear();
+    this.hooks.onExit?.(error);
+  }
+}
+
+/** 跨平台 CLI 启动：Windows 上 .cmd  shim 需要经 cmd.exe 执行 */
+function cliSpawn(bin, args) {
+  if (process.platform === "win32") {
+    const safe = [`${bin}.cmd`, ...args.map(String)].map((a) => (/[&|<>^%"]/.test(a) ? `"${a.replace(/["&|<>^%]/g, "")}"` : a.includes(" ") ? `"${a}"` : a));
+    return { command: "cmd.exe", args: ["/d", "/s", "/c", safe.join(" ")] };
+  }
+  return { command: bin, args: args.map(String) };
+}
+
+module.exports = { JsonlProcess, cliSpawn };

package/src/main/host/runtime.js

@@ -345,8 +345,9 @@ class HostRuntime {
   async #send(threadId, text, { commandId, attachments, delegateOf, collaborationOf, isolated, turnPermissions, ticket }) {
     const thread = this.#requireThread(threadId);
     if (this.execution.isRunning(thread.id)) throw new Error("任务正在执行，请先停止或等待完成");
-    // 清理上一代发送遗留的取消登记（票据不匹配说明属于已结算的旧 send）
-    if (this.cancelRequests.get(threadId) !== ticket) this.cancelRequests.delete(threadId);
+    // 不得在此按票据清理 cancelRequests：登记可能属于仍停留在 Turn 启动前阶段（会话
+    // 打开/prompt 组装）的在途旧 send——删掉会让旧 send 错过下方的取消结算而继续投递，
+    // 与新发送双双进入原生会话。陈旧登记由本次 send 的 finally（票据匹配时）回收。
     const prepared = this.#prepareAttachments(thread, attachments);
     const typed = typeof text === "string" ? text.trim() : "";
     if (!typed && !prepared.images.length && !prepared.texts.length) throw new Error("请输入消息");
@@ -447,12 +448,19 @@ class HostRuntime {
     thread.updatedAt = Date.now();
     delete thread.error;
     delete thread.errorKind;
-    this.execution.turnStarted(thread, displayPrompt);
-    // 会话打开/prompt 组装期间用户已按停止（cancel 时 Turn 尚未开始，原生侧无从 abort）：直接结算取消，不再投递
-    if (this.cancelRequests.get(thread.id) === ticket) {
-      this.cancelRequests.delete(thread.id);
-      this.#applyEvent({ threadId, event: { kind: 'completed', stopReason: 'cancelled' } });
+    // 会话打开/prompt 组装期间用户已按停止（cancel 时 Turn 尚未开始，原生侧无从 abort）：
+    // 本代发送直接结算取消、不再投递。若取消后用户已重发且新回合已在运行，旧 send 不得
+    // 再 turnStarted——那会把新回合挤出 lastTurn，使新发送在投递前自查时误判空闲而丢消息；
+    // 此时静默退出，把投影权交给新回合。
+    const cancelledBeforeTurn = this.cancelRequests.get(thread.id) === ticket;
+    if (cancelledBeforeTurn) this.cancelRequests.delete(thread.id);
+    if (cancelledBeforeTurn && this.execution.isRunning(thread.id)) {
+      await this.#save();
+      this.#broadcast();
+      return;
     }
+    const turn = this.execution.turnStarted(thread, displayPrompt);
+    if (cancelledBeforeTurn) this.#applyEvent({ threadId, event: { kind: 'completed', stopReason: 'cancelled' } });
     this.turnActivity.set(thread.id, Date.now());
     const message = thread.messages.at(-1);
     if (hasConcurrentTurn) message.concurrent = true;
@@ -460,8 +468,12 @@ class HostRuntime {
     this.#syncCore(thread);
     try { if (!collaborationOf || isolated) message.reviewId = await this.reviews.begin(thread.cwd); else message.reviewOwnerThreadId = collaborationOf; }
     catch (e) { message.reviewError = '本轮未建立文件快照：' + e.message; }
-    if (!this.execution.isRunning(thread.id)) {
-      if (message.reviewId) await this.#settleReview(thread, message);
+    // 本代回合已结算（含上方的取消结算）时退出。注意 isRunning 反映的是最新回合：
+    // 取消后用户重发的新回合一旦启动，这里会被重新置真——必须再按回合身份核验，
+    // 否则被取消的旧发送会把 review 快照与后续 prompt 投递错误地挂到新回合上。
+    const superseded = this.execution.lastTurn(thread.id)?.id !== turn.id;
+    if (!this.execution.isRunning(thread.id) || superseded) {
+      if (message.reviewId && !superseded) await this.#settleReview(thread, message);
       return;
     }
     this.startReviewUpdates(thread, message);
@@ -477,14 +489,16 @@ class HostRuntime {
           await this.#save();
           this.#broadcast();
         }
-        // 投递前最后检查：Turn 可能在 review 快照/保存期间被取消（cancel 已结算）。
+        // 投递前最后检查：Turn 可能在 review 快照/保存期间被取消（cancel 已结算），
+        // 或已被取消后重发的新回合取代（lastTurn 易主时 isRunning 仍为真）。
         // 此时再投递，先到的 abort 会在原生侧落空，形成用户看不见的僵尸运行
-        if (!this.execution.isRunning(thread.id)) {
+        const outdated = this.execution.lastTurn(thread.id)?.id !== turn.id;
+        if (!this.execution.isRunning(thread.id) || outdated) {
           if (handoff?.checkpointId) {
             handoff.phase = 'failed';
             await this.handoffs.mark(thread.id, handoff.checkpointId, 'failed').catch(() => {});
           }
-          if (message.reviewId) await this.#settleReview(thread, message);
+          if (message.reviewId && !outdated) await this.#settleReview(thread, message);
           return;
         }
         await session.adapter.send(session, promptText, hooks, { images: prepared.images, turnPermissions });
@@ -498,8 +512,10 @@ class HostRuntime {
         handoff.phase = 'failed';
         await this.handoffs.mark(thread.id, handoff.checkpointId, 'failed').catch(() => {});
       }
-      // 用户取消造成的 reject 已由 cancel() 结算，不再标错
-      if (this.execution.isRunning(thread.id)) this.#applyEvent({ threadId, event: { kind: "error", message: error.message } });
+      // 用户取消造成的 reject 已由 cancel() 结算，不再标错。若回合已易主（取消后重发 /
+      // 外部转向启动了新回合），旧发送迟到的 reject 不得击中正在运行的新回合——
+      // 仅当本代回合仍是 lastTurn 时才把错误投到它上面。
+      if (this.execution.isRunning(thread.id) && this.execution.lastTurn(thread.id)?.id === turn?.id) this.#applyEvent({ threadId, event: { kind: "error", message: error.message } });
       await this.#save().catch(() => {});
       this.#broadcast();
     }

package/src/main/native/config.js

@@ -1,18 +1,18 @@
 const fs = require('node:fs');
 const path = require('node:path');
-const { dataDirectory, executableName } = require('./platform');
+const { dataDirectory, executableName } = require('./platform');
 const root = path.resolve(__dirname, '../../..');
-const settingKeys = ['HARNESS_MIX_DSH_ROOT', 'HARNESSMIX_PI_COMMAND', 'HARNESSMIX_CLAUDE_COMMAND', 'HARNESSMIX_DEEPSEEK_HARNESS_COMMAND', 'HARNESSMIX_ANTIGRAVITY_COMMAND', 'HARNESS_MIX_CODEBUDDY_EXECUTABLE', 'HARNESS_MIX_WORKBUDDY_EXECUTABLE', 'HARNESS_MIX_KIRO_EXECUTABLE', 'HARNESS_MIX_CURSOR_EXECUTABLE', 'HARNESS_MIX_QODER_EXECUTABLE', 'HARNESS_MIX_ZCODE_ACP_EXECUTABLE', 'HARNESS_MIX_TRAE_EXECUTABLE'];
+const settingKeys = ['HARNESS_MIX_DSH_ROOT', 'HARNESSMIX_PI_COMMAND', 'HARNESSMIX_CLAUDE_COMMAND', 'HARNESSMIX_DEEPSEEK_HARNESS_COMMAND', 'HARNESSMIX_ANTIGRAVITY_COMMAND', 'HARNESS_MIX_CODEBUDDY_EXECUTABLE', 'HARNESS_MIX_WORKBUDDY_EXECUTABLE', 'HARNESS_MIX_KIRO_EXECUTABLE', 'HARNESS_MIX_CURSOR_EXECUTABLE', 'HARNESS_MIX_QODER_EXECUTABLE', 'HARNESS_MIX_ZCODE_EXECUTABLE', 'HARNESS_MIX_TRAE_EXECUTABLE'];
 
-function nativePaths(platform = process.platform) {
+function nativePaths(platform = process.platform) {
   const build = path.join(root, 'output/native-build');
   return {
     cli: path.join(root, 'scripts/launch-codex.cjs'),
-    shim: path.join(build, executableName('harness-mix-shim', platform)),
-    ...(platform === 'win32' ? {
-      activation: path.join(build, 'harness-mix-appx.exe'),
-      secret: path.join(build, 'harness-mix-secret.exe'),
-    } : {}),
+    shim: path.join(build, executableName('harness-mix-shim', platform)),
+    ...(platform === 'win32' ? {
+      activation: path.join(build, 'harness-mix-appx.exe'),
+      secret: path.join(build, 'harness-mix-secret.exe'),
+    } : {}),
     runtime: path.join(root, 'src/main/native/host.js'),
     controller: path.join(build, 'desktop-controller.mjs'),
     renderer: path.join(build, 'renderer-extension.js'),
@@ -22,7 +22,7 @@ function nativePaths(platform = process.platform) {
 
 function nativeEnvironment(environment = process.env) {
   const env = { ...environment };
-  env.HARNESSMIX_DATA_DIR = dataDirectory(env);
+  env.HARNESSMIX_DATA_DIR = dataDirectory(env);
   const settingsPath = path.join(env.HARNESSMIX_DATA_DIR, 'harness-mix-settings.json');
   if (fs.existsSync(settingsPath)) {
     const saved = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));

package/src/main/native/host.js

@@ -83,6 +83,8 @@ async function runNativeHost() {
   const passthrough = process.argv.slice(2);
   const officialArgs = passthrough.includes('--listen') ? passthrough : [...passthrough, '--listen', 'stdio://'];
   const official = spawn(stock, officialArgs, { env, windowsHide: true, stdio: ['pipe', 'pipe', 'inherit'] });
+  // official 异常退出后迟到的 stdin.write 会异步抛 EPIPE，无监听即 crash 宿主；退出由 close() 路径处理
+  official.stdin.on('error', () => {});
   const forwarded = new Map();
   const lines = readline.createInterface({ input: official.stdout });
   lines.on('line', line => {