@harness-mix/cli 0.2.3 → 0.2.4

package/src/main/host/jsonl.js

@@ -1,120 +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"] });
-    // 子进程异常退出/管道破裂时，迟到的 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) => 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/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'));