@harness-mix/cli 0.2.3 → 0.3.0

package/src/main/adapters/native-acp-command.js

@@ -1,48 +1,51 @@
-const fs = require('node:fs');
-const path = require('node:path');
-const os = require('node:os');
-const { cliSpawn } = require('../host/jsonl');
-
-// Resolve only the named native CLI. In particular, `agent` can belong to Grok.
-function nativeCommand(id, argv) {
-  const cursor = id === 'cursor-cli';
-  const buddy = id === 'codebuddy';
-  const specs = {
-    codebuddy: ['codebuddy', 'HARNESS_MIX_CODEBUDDY_EXECUTABLE', 'https://www.codebuddy.ai/docs/cli/overview'],
-    'cursor-cli': ['cursor-agent', 'HARNESS_MIX_CURSOR_EXECUTABLE', 'https://cursor.com/docs/cli/installation'],
-    'kiro-cli': ['kiro-cli', 'HARNESS_MIX_KIRO_EXECUTABLE', 'https://kiro.dev/docs/cli/'],
-    qoder: ['qodercli', 'HARNESS_MIX_QODER_EXECUTABLE', 'https://docs.qoder.com/cli/acp'],
-    trae: ['traecli', 'HARNESS_MIX_TRAE_EXECUTABLE', 'https://github.com/bytedance/trae-agent'],
-    cline: ['cline', 'HARNESS_MIX_CLINE_EXECUTABLE', 'https://docs.cline.bot/usage/cli-overview'],
-    zcode: ['zcode-acp-server', 'HARNESS_MIX_ZCODE_ACP_EXECUTABLE', 'https://zcode.z.ai/'],
-  };
-  if (!specs[id]) throw new Error(`Unknown native CLI: ${id}`);
-  const [bin, variable, url] = specs[id];
-  const override = process.env[variable] || (buddy ? process.env.HARNESS_MIX_WORKBUDDY_EXECUTABLE : undefined);
-  if (id === 'trae' && !override) throw new Error('Trae 官方仓库未确认 ACP 服务入口；请设置已验证的 HARNESS_MIX_TRAE_EXECUTABLE，不会猜测 traecli acp serve');
-  if (id === 'zcode' && !override) throw new Error('ZCode 原生 CLI 提供 app-server 而非 ACP；需要显式配置 HARNESS_MIX_ZCODE_ACP_EXECUTABLE 指向兼容 ACP 桥接器');
-  const roots = cursor
-    ? [path.join(process.env.LOCALAPPDATA || os.homedir(), 'cursor-agent'), path.join(os.homedir(), '.local', 'bin')]
-    : [path.join(process.env.LOCALAPPDATA || os.homedir(), 'Kiro-Cli'), path.join(os.homedir(), '.kiro', 'bin'), path.join(os.homedir(), '.local', 'bin')];
-  const dirs = [...roots, path.join(process.env.APPDATA || os.homedir(), 'npm'), ...(process.env.PATH || '').split(path.delimiter).filter(Boolean)];
-  const suffixes = process.platform === 'win32' ? ['.exe', '.cmd', '.ps1', ''] : [''];
-  const bundled = buddy ? [path.join(process.env.ProgramFiles || 'C:/Program Files', 'WorkBuddy/resources/app.asar.unpacked/cli/bin/codebuddy'), path.join(process.env.LOCALAPPDATA || os.homedir(), 'Programs/WorkBuddy/resources/app.asar.unpacked/cli/bin/codebuddy')] : [];
-  const bins = id === 'qoder' ? [bin, 'qoder'] : [bin];
-  const found = override || [...dirs.flatMap(dir => bins.flatMap(name => suffixes.map(ext => path.join(dir, name + ext)))), ...bundled].find(file => fs.existsSync(file) && fs.statSync(file).isFile());
-  if (!found || !fs.existsSync(found)) throw new Error(`${bin} 未安装；请从 ${url} 安装并原生登录`);
-  if ((buddy && bundled.includes(found)) || /\.(cjs|mjs|js)$/i.test(found)) return { command: process.execPath, args: [found, ...argv] };
-  if (id === 'qoder' && /\.(cmd|ps1)$/i.test(found)) {
-    const bundle = path.join(path.dirname(found), 'node_modules/@qoder-ai/qodercli/bundle/qodercli.js');
-    if (fs.existsSync(bundle)) return { command: process.execPath, args: [bundle, ...argv] };
-  }
-  if (cursor && /\.(cmd|ps1)$/i.test(found)) {
-    const versions = path.join(path.dirname(found), 'versions');
-    const version = fs.existsSync(versions) && fs.readdirSync(versions).filter(v => /^\d{4}\.\d{2}\.\d{2}-[a-z0-9-]+$/i.test(v)).sort().reverse().find(v => ['node.exe', 'index.js'].every(f => fs.existsSync(path.join(versions, v, f))));
-    if (!version) throw new Error('Cursor launcher 缺少原生 bundle；请重新安装 Cursor CLI');
-    return { command: path.join(versions, version, 'node.exe'), args: [path.join(versions, version, 'index.js'), ...argv] };
-  }
-  if (/\.(cmd|bat)$/i.test(found)) return cliSpawn(found.replace(/\.(cmd|bat)$/i, ''), argv);
-  if (/\.ps1$/i.test(found)) return { command: 'pwsh.exe', args: ['-NoLogo', '-NoProfile', '-File', found, ...argv] };
-  return { command: found, args: argv };
-}
-module.exports = { nativeCommand };
+const fs = require('node:fs');
+const path = require('node:path');
+const os = require('node:os');
+const { cliSpawn } = require('../host/jsonl');
+
+// Resolve only the named native CLI. In particular, `agent` can belong to Grok.
+function nativeCommand(id, argv) {
+  const cursor = id === 'cursor-cli';
+  const buddy = id === 'codebuddy';
+  const specs = {
+    codebuddy: ['codebuddy', 'HARNESS_MIX_CODEBUDDY_EXECUTABLE', 'https://www.codebuddy.ai/docs/cli/overview'],
+    'cursor-cli': ['cursor-agent', 'HARNESS_MIX_CURSOR_EXECUTABLE', 'https://cursor.com/docs/cli/installation'],
+    'kiro-cli': ['kiro-cli', 'HARNESS_MIX_KIRO_EXECUTABLE', 'https://kiro.dev/docs/cli/'],
+    qoder: ['qodercli', 'HARNESS_MIX_QODER_EXECUTABLE', 'https://docs.qoder.com/cli/acp'],
+    trae: ['traecli', 'HARNESS_MIX_TRAE_EXECUTABLE', 'https://github.com/bytedance/trae-agent'],
+    cline: ['cline', 'HARNESS_MIX_CLINE_EXECUTABLE', 'https://docs.cline.bot/usage/cli-overview'],
+  };
+  if (!specs[id]) throw new Error(`Unknown native CLI: ${id}`);
+  const [bin, variable, url] = specs[id];
+  const override = process.env[variable] || (buddy ? process.env.HARNESS_MIX_WORKBUDDY_EXECUTABLE : undefined);
+  if (id === 'trae' && !override) throw new Error('Trae 官方仓库未确认 ACP 服务入口；请设置已验证的 HARNESS_MIX_TRAE_EXECUTABLE，不会猜测 traecli acp serve');
+  const roots = cursor
+    ? [path.join(process.env.LOCALAPPDATA || os.homedir(), 'cursor-agent'), path.join(os.homedir(), '.local', 'bin')]
+    : [path.join(process.env.LOCALAPPDATA || os.homedir(), 'Kiro-Cli'), path.join(os.homedir(), '.kiro', 'bin'), path.join(os.homedir(), '.local', 'bin')];
+  const dirs = [...roots, path.join(process.env.APPDATA || os.homedir(), 'npm'), ...(process.env.PATH || '').split(path.delimiter).filter(Boolean)];
+  const suffixes = process.platform === 'win32' ? ['.exe', '.cmd', '.ps1', ''] : [''];
+  const bundled = buddy ? [path.join(process.env.ProgramFiles || 'C:/Program Files', 'WorkBuddy/resources/app.asar.unpacked/cli/bin/codebuddy'), path.join(process.env.LOCALAPPDATA || os.homedir(), 'Programs/WorkBuddy/resources/app.asar.unpacked/cli/bin/codebuddy')] : [];
+  // Only the headless qodercli speaks ACP over stdio. The bare `qoder` on PATH
+  // is the IDE launcher: it passes the --version availability probe, but every
+  // --acp session open becomes a full GUI launch that never completes the ACP
+  // handshake. A working custom entry can still be set via
+  // HARNESS_MIX_QODER_EXECUTABLE.
+  const bins = [bin];
+  const found = override || [...dirs.flatMap(dir => bins.flatMap(name => suffixes.map(ext => path.join(dir, name + ext)))), ...bundled].find(file => fs.existsSync(file) && fs.statSync(file).isFile());
+  if (!found || !fs.existsSync(found)) throw new Error(`${bin} 未安装；请从 ${url} 安装并原生登录`);
+  if ((buddy && bundled.includes(found)) || /\.(cjs|mjs|js)$/i.test(found)) return { command: process.execPath, args: [found, ...argv] };
+  if (id === 'qoder' && /\.(cmd|ps1)$/i.test(found)) {
+    const bundle = path.join(path.dirname(found), 'node_modules/@qoder-ai/qodercli/bundle/qodercli.js');
+    if (fs.existsSync(bundle)) return { command: process.execPath, args: [bundle, ...argv] };
+  }
+  if (cursor && /\.(cmd|ps1)$/i.test(found)) {
+    const versions = path.join(path.dirname(found), 'versions');
+    const version = fs.existsSync(versions) && fs.readdirSync(versions).filter(v => /^\d{4}\.\d{2}\.\d{2}-[a-z0-9-]+$/i.test(v)).sort().reverse().find(v => ['node.exe', 'index.js'].every(f => fs.existsSync(path.join(versions, v, f))));
+    if (!version) throw new Error('Cursor launcher 缺少原生 bundle；请重新安装 Cursor CLI');
+    return { command: path.join(versions, version, 'node.exe'), args: [path.join(versions, version, 'index.js'), ...argv] };
+  }
+  if (/\.(cmd|bat)$/i.test(found)) return cliSpawn(found.replace(/\.(cmd|bat)$/i, ''), argv);
+  if (/\.ps1$/i.test(found)) return { command: 'pwsh.exe', args: ['-NoLogo', '-NoProfile', '-File', found, ...argv] };
+  return { command: found, args: argv };
+}
+module.exports = { nativeCommand };

package/src/main/adapters/native-acp.js

@@ -27,7 +27,8 @@ function extractToolOutput(tool, update) {
 const options = list => (list || []).flatMap(o => Array.isArray(o.options) ? options(o.options) : typeof o.value === 'string' ? [o] : []);
 const finite = n => Number.isFinite(n) && n >= 0;
 function config(s, kind) {
-  const ids = { model: ['model'], thinking: ['effortLevel', 'thought_level'], mode: ['mode'] }[kind];
+  // qoder names its effort selector `reasoning_effort` and files it under the model category.
+  const ids = { model: ['model'], thinking: ['effortLevel', 'thought_level', 'reasoning_effort'], mode: ['mode'] }[kind];
   return s.state.configOptions.find(o => ids.includes(o.id) || o.category === (kind === 'thinking' ? 'thought_level' : kind));
 }
 function catalog(s) {
@@ -237,12 +238,12 @@ function nativeAcp({ id, name, args, aliases = [], command = argv => nativeComma
       async describe() { return { models: null, thinkingLevels: [], permissionModes: [] }; },
       async describeFor(s) { return catalog(s); },
       async listModelsFor(s) { return catalog(s).models; },
-      async open({ thread, emit, diagnostic = () => {}, collaboration, managedMcp = [] }) {
+      async open({ thread, emit, diagnostic = () => {}, collaboration, managedMcp = [] }) {
         const s = { vendor: id, cwd: thread.cwd, nativeSessionId: thread.restore ? thread.nativeSessionId : null,
           generation: 0, loading: true, active: false, closed: false, fault: null, emit, diagnostic,
           environment: thread.environment || {}, tools: new Map(), charges: new Map(), confirmed: {},
           state: { configOptions: [], models: null, modes: null, commands: [], usage: {} },
-          mcpServers: require('./managed-mcp').acpServers(managedMcp, collaboration),
+          mcpServers: require('./managed-mcp').acpServers(managedMcp, collaboration),
           collaborationEnabled: !!collaboration,
         };
         s.interactions = new AcpInteractions(s, id);
@@ -256,7 +257,28 @@ function nativeAcp({ id, name, args, aliases = [], command = argv => nativeComma
         } catch (error) { await adapter.close(s); throw error; }
       },
       async send(s, prompt, hooks, attachments) {
-        if (s.active || s.configuring || s.closed || s.fault) throw s.fault || new Error('Native session is busy or closed');
+        if (s.active || s.configuring) throw s.fault || new Error('Native session is busy or closed');
+        // A native CLI that died between turns (crash-on-exit bugs, idle
+        // reaping) used to poison the thread until a desktop restart: the
+        // session stayed cached with its fault and every later send rethrew
+        // it. Restore the native session once instead, replaying the
+        // confirmed model/thinking/permission selections.
+        if (s.fault || s.closed) {
+          const confirmed = { ...s.confirmed };
+          try {
+            ++s.generation;
+            s.fault = null; s.closed = false;
+            s.interactions.close();
+            s.diagnostic?.(`${name}: native session disconnected between turns, restoring ${s.nativeSessionId}`);
+            await connect(s, true);
+            if (confirmed.model) await adapter.setModel(s, confirmed.model).catch(error => s.diagnostic?.(`${name}: model restore after reconnect failed: ${error.message}`));
+            if (confirmed.thinking) await adapter.setThinkingLevel(s, confirmed.thinking).catch(error => s.diagnostic?.(`${name}: thinking restore after reconnect failed: ${error.message}`));
+            if (confirmed.mode) await adapter.setPermissionMode(s, confirmed.mode).catch(error => s.diagnostic?.(`${name}: permission mode restore after reconnect failed: ${error.message}`));
+          } catch (error) {
+            s.fault = s.fault || error;
+            throw s.fault;
+          }
+        }
         if (attachments?.images?.length && (!manifest.capabilities.attachments || !s.state.agentCapabilities.promptCapabilities?.image)) throw new Error(`${name} native image input is not supported`);
         s.active = true; s.tools.clear(); s.cancelRequested = false; s.turnAnswer = ''; s.turnProgressSeen = false; s.turnTextSeen = false;
         s.turnSettling = false; s.turnDrainWake = null;
@@ -385,7 +407,19 @@ function nativeAcp({ id, name, args, aliases = [], command = argv => nativeComma
           } else throw new Error(`Native ${kind} option unavailable`);
         } finally { s.configuring = false; }
       },
-      async setModel(s, model) { await adapter.configure(s, 'model', model.id); s.model = catalog(s).models.find(m => m.id === model.id); s.confirmed.model = s.model; delete s.confirmed.thinking; return s.model; },
+      async setModel(s, model) {
+        const previousThinking = s.confirmed.thinking;
+        await adapter.configure(s, 'model', model.id); s.model = catalog(s).models.find(m => m.id === model.id); s.confirmed.model = s.model;
+        // Some natives reset the effort selector on model switches (qodercli
+        // Max→Flash resets reasoning_effort to its default). Replay the
+        // confirmed level while the new model still offers it, so the UI
+        // selection and the native session stay in sync.
+        if (previousThinking && catalog(s).thinkingLevels.some(o => o.id === previousThinking)) {
+          try { await adapter.configure(s, 'thinking', previousThinking); s.confirmed.thinking = previousThinking; }
+          catch (error) { delete s.confirmed.thinking; s.diagnostic?.(`${name}: thinking level not restored after model switch: ${error.message}`); }
+        } else delete s.confirmed.thinking;
+        return s.model;
+      },
       async setThinkingLevel(s, level) {
         if (!catalog(s).thinkingLevels.some(o => o.id === level)) throw new Error('Native effort unavailable for this model');
         await adapter.configure(s, 'thinking', level); s.confirmed.thinking = level;
@@ -415,13 +449,14 @@ function nativeAcp({ id, name, args, aliases = [], command = argv => nativeComma
         } else await adapter.send(s, '/' + name, hooks);
       },
       async fork(source, context) {
-        if (!kiro || context.message) throw new Error('Native fork boundary unsupported');
-        const checkpoint = await require('./kiro-history').latestKiroCheckpoint(source.cwd, source.nativeSessionId);
+        if (!manifest.capabilities.fork || context.message) throw new Error('Native fork boundary unsupported');
+        // Kiro forks at a message checkpoint; Qoder forks at the session head with the standard params.
+        const checkpoint = kiro ? await require('./kiro-history').latestKiroCheckpoint(source.cwd, source.nativeSessionId) : null;
         const probe = await adapter.open({ thread: { ...source, restore: true }, emit: () => {}, diagnostic: context.diagnostic });
         try {
-          if (!probe.state.agentCapabilities.sessionCapabilities?.fork) throw new Error('Kiro did not advertise session/fork');
-          const result = await probe.request('session/fork', { sessionId: source.nativeSessionId, cwd: source.cwd, _meta: { kiro: { messageId: checkpoint } } });
-          if (!result.sessionId || result.sessionId === source.nativeSessionId) throw new Error('Kiro fork did not return a new native session');
+          if (!probe.state.agentCapabilities.sessionCapabilities?.fork) throw new Error(`${name} did not advertise session/fork`);
+          const result = await probe.request('session/fork', { sessionId: source.nativeSessionId, cwd: source.cwd, ...(kiro ? { _meta: { kiro: { messageId: checkpoint } } } : {}) });
+          if (!result.sessionId || result.sessionId === source.nativeSessionId) throw new Error(`${name} fork did not return a new native session`);
           return { session: await adapter.open({ thread: { ...source, nativeSessionId: result.sessionId, restore: true }, emit: context.emit, diagnostic: context.diagnostic }) };
         } finally { await adapter.close(probe); }
       },
@@ -429,7 +464,7 @@ function nativeAcp({ id, name, args, aliases = [], command = argv => nativeComma
     };
     return adapter;
   }
-  manifest.integrations = { mcp: true };
-  return { manifest, create };
+  manifest.integrations = { mcp: true };
+  return { manifest, create };
 }
 module.exports = { nativeAcp, catalog, project };

package/src/main/adapters/omp.js

@@ -1,6 +1,9 @@
 // OMP（Oh My Pi）Adapter：Pi 的 fork，CLI 与 --mode rpc 协议同源。
-// 实现共享自 Pi 家族工厂（见 pi-family.js）；OMP 侧差异（如有）在此覆盖。
-const { piFamily } = require('./pi-family');
+// 实现共享自 Pi 家族工厂（见 pi-family.js）；OMP 侧差异在此覆盖。
+// 权限模型已分叉：OMP 用 --approval-mode always-ask|write|yolo（无 Pi 的
+// --approve/--no-approve 项目信任旗标），目录与启动旗标见 pi-family.js 的
+// OMP_APPROVAL_MODES（实测 @oh-my-pi/pi-coding-agent 18.1.19 旗标表与设置 schema）。
+const { piFamily, OMP_APPROVAL_MODES, ompPermissionLaunchArgs } = require('./pi-family');
 
 module.exports = piFamily({
   id: 'omp',
@@ -9,6 +12,8 @@ module.exports = piFamily({
   bin: 'omp',
   packageHint: 'npm i -g @oh-my-pi/pi-coding-agent 或 https://omp.sh/install',
   aliases: ['omp', 'oh-my-pi'],
+  permissionModes: OMP_APPROVAL_MODES,
+  permissionLaunchArgs: ompPermissionLaunchArgs,
 });
 module.exports.manifest.integrations = {
   mcp: false,