@harness-mix/cli 0.2.3 → 0.3.0

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/host/runtime.js

@@ -295,6 +295,9 @@ class HostRuntime {
     this.verificationGates.assertSatisfied(thread, '合并隔离分支');
     const review = await reviewWorkspace(thread.workspace);
     const result = await applyWorkspace(thread.workspace, digest || review.digest);
+    // off 策略下的零配置安全网：结果附一次 advisory 验证（不阻断、不改门禁语义）
+    const advisory = await this.verificationGates.advisory(thread).catch(() => null);
+    if (advisory) result.verification = { mode: 'advisory', status: advisory.status, checks: advisory.checks };
     this.#notify('status', '已成功将隔离分支改动应用到主项目', thread.id);
     await this.#save();
     this.#broadcast();
@@ -666,11 +669,13 @@ class HostRuntime {
     const thread = this.threads.find(t => t.id === threadId);
     // send 进行中（会话恢复 / prompt 尚未投递）时 abort 可能落空：按票据登记取消请求，由 #send 在投递前结算
     if (this.sending.has(threadId)) this.cancelRequests.set(threadId, this.sendTickets.get(threadId));
-    // If this thread is a collaboration child task, mark the collaboration job as cancelled immediately
+    // If this thread is a collaboration child task, stop its job through the shared
+    // settle path so the team graph (task/member status) is unwedged too — a bare
+    // status write here previously left the team task in_progress forever.
     const childJob = [...this.collaboration.jobs.values()].find(j => j.childId === threadId && j.status === 'running');
     if (childJob) {
-      childJob.status = 'cancelled';
-      void this.collaboration.save();
+      childJob.status = this.collaboration.closing ? 'interrupted' : 'cancelled';
+      void this.collaboration.settleStoppedJob(childJob).catch(() => {});
     }
     // Record the user's cancellation immediately so UI and Core become idle without waiting on subtasks
     if (thread && this.execution.isRunning(thread.id)) this.#applyEvent({ threadId, event: { kind: 'completed', stopReason: 'cancelled' } });
@@ -1093,6 +1098,7 @@ class HostRuntime {
       await removeWorkspace(thread.workspace).catch(() => {});
     }
     this.threads = this.threads.filter((t) => t.id !== threadId);
+    await this.collaboration.forgetThread(threadId).catch(() => {});
     await this.#save();
     await this.store.remove(threadId);
     this.#broadcast();

package/src/main/host/verification-gates.js

@@ -82,8 +82,19 @@ class VerificationGates {
     this.running.set(thread.id, task);
     return task;
   }
-  async #run(thread, turnId) {
-    const policy = this.policy(thread);
+  // Apply 路径的零配置安全网：线程策略为 off 时仍跑一遍内建本地检查（advisory）。
+  // 不跑用户命令、不写 latestReport、不发 verification.updated——显式策略
+  // （advisory/required）的语义完全不变；返回的报告只附在 apply 结果里。
+  advisory(thread) {
+    if (this.policy(thread).mode !== 'off') return null;
+    if (this.running.has(thread.id)) return this.running.get(thread.id);
+    const task = this.#run(thread, undefined, { schemaVersion: 1, mode: 'advisory', autoRun: false, checks: { ...DEFAULT_CHECKS }, commands: [] }, false)
+      .finally(() => this.running.delete(thread.id));
+    this.running.set(thread.id, task);
+    return task;
+  }
+  async #run(thread, turnId, policyOverride, persist = true) {
+    const policy = policyOverride ?? this.policy(thread);
     const startedAt = Date.now();
     const turn = turnId ? this.runtime.core.getTurn(turnId) : this.runtime.execution.lastTurn(thread.id);
     const items = turn ? this.runtime.core.getItemsForTurn(turn.id) : [];
@@ -106,6 +117,7 @@ class VerificationGates {
       startedAt, completedAt: Date.now(), checks, commands,
     };
     report.contentDigest = createHash('sha256').update(JSON.stringify(report)).digest('hex');
+    if (!persist) return report;
     thread.verificationGate = { policy, latestReport: report };
     if (turn) {
       this.runtime.core.dispatch({ threadId: thread.id, turnId: turn.id, type: 'verification.updated', payload: { report }, timestamp: report.completedAt });

package/src/main/native/codex-accounts.js

@@ -80,6 +80,8 @@ class CodexAccountManager {
         if (!entry || !ACCOUNT_ID.test(entry.accountId) || typeof entry.label !== 'string' || !entry.label.trim() || entry.accountId === OFFICIAL_ACCOUNT_ID || seen.has(entry.accountId)) return false;
         seen.add(entry.accountId);
         entry.label = entry.label.trim().slice(0, 256);
+        // 旧结构条目才带 codexHome；非字符串的残留一律丢弃，回落到托管 profile 路径
+        if (typeof entry.codexHome !== 'string' || !entry.codexHome.trim()) delete entry.codexHome;
         return true;
       }).slice(0, 127);
       const activeAccountId = value.activeAccountId === OFFICIAL_ACCOUNT_ID || accounts.some(entry => entry.accountId === value.activeAccountId)
@@ -102,8 +104,17 @@ class CodexAccountManager {
     if (accountId === OFFICIAL_ACCOUNT_ID) return { accountId, label: 'Codex 官方账号', codexHome: process.env.CODEX_HOME || path.join(os.homedir(), '.codex'), native: true };
     const entry = this.registry.accounts.find(candidate => candidate.accountId === accountId);
     if (!entry) throw new Error('Unknown Codex account');
+    // 旧结构条目带显式绝对 codexHome（如 default → ~/.codex）：尊重原路径。
+    // codex 拒绝在不存在的 CODEX_HOME 下启动（进程退出码 1），改写路径会让这类账号
+    // 的每次会话都死在拉起阶段，且用户无从看到原因。
+    if (typeof entry.codexHome === 'string' && path.isAbsolute(entry.codexHome)) {
+      return { ...entry, codexHome: path.resolve(entry.codexHome), native: false };
+    }
     const codexHome = path.resolve(this.profilesRoot, entry.accountId);
     if (!codexHome.startsWith(`${path.resolve(this.profilesRoot)}${path.sep}`)) throw new Error('Invalid Codex account directory');
+    // 托管 profile 目录缺失时自愈：目录被删/迁移未带上时补建空目录（未登录态），
+    // 而不是让 codex app-server 直接拒绝启动
+    if (!fs.existsSync(codexHome)) fs.mkdirSync(codexHome, { recursive: true });
     return { ...entry, codexHome, native: false };
   }
 
@@ -161,10 +172,10 @@ class CodexAccountManager {
     const entry = this.#entry(accountId);
     if (entry.native) throw new Error('The official Codex account cannot be deleted');
     if ([...this.logins.values()].some(login => login.accountId === accountId)) throw new Error('Cancel account sign-in before deleting it');
-    const resolved = path.resolve(entry.codexHome);
-    const root = path.resolve(this.profilesRoot);
-    if (!resolved.startsWith(`${root}${path.sep}`)) throw new Error('Refusing to delete an account outside the managed profile directory');
-    fs.rmSync(resolved, { recursive: true, force: true });
+    // 只删除托管 profile 目录（profiles/<accountId>）；旧条目指向的外部目录
+    // （如 ~/.codex）绝不能随账号删除，但账号槽位本身要能移除
+    const managed = path.join(path.resolve(this.profilesRoot), entry.accountId);
+    if (path.resolve(entry.codexHome) === managed) fs.rmSync(managed, { recursive: true, force: true });
     this.registry.accounts = this.registry.accounts.filter(candidate => candidate.accountId !== accountId);
     if (this.registry.activeAccountId === accountId) this.registry.activeAccountId = OFFICIAL_ACCOUNT_ID;
     this.#save();

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'));