@harness-mix/cli 0.2.3 → 0.3.0

package/src/main/adapters/claude.js

@@ -13,7 +13,10 @@ const manifest = {
   capabilities: { collaborationTools: true, streaming: true, thinking: true, tools: true, approvals: true, questions: true, models: true, thinkingLevels: true, permissionModes: true, resume: true, fork: true, forkFromMessage: true, compaction: true, usage: true, contextUsage: true, attachments: true },
 };
 
-/** Claude Code 原生权限模式（SDK PermissionMode 全集），与其 TUI/Desktop 一致 */
+/** Claude Code 原生权限模式（SDK PermissionMode 配置值全集），与其 TUI/Desktop 一致。
+ * 实测校准（本机 claude 2.1.220 `--help` 与 code.claude.com/docs/en/permission-modes）：
+ * CLI 旗标选项为 acceptEdits/auto/bypassPermissions/manual/dontAsk/plan，其中 manual 只是
+ * default 的 CLI 别名（SDK/钩子配置值仍为 default），auto/dontAsk 为新增档；此处按 SDK 配置值列出。 */
 const CLAUDE_PERMISSION_MODES = [
   { id: "default", label: "默认（询问）", description: "编辑和其他受保护操作前询问" },
   { id: "plan", label: "规划模式", description: "探索并制定计划；批准计划后退出规划" },
@@ -457,12 +460,17 @@ function create() {
       if (!session?.query) return base;
       try {
         const commands = await session.query.supportedCommands();
-        return [
-          ...base,
-          ...commands.filter((c) => c.name !== 'compact').map((c) => ({
-            id: c.name, label: '/' + c.name, description: c.description ?? '', action: 'insert', text: '/' + c.name + ' ',
-          })),
-        ];
+        const seen = new Set(['compact']); // 与既有 id（含原生 compact）去重
+        const mapped = [];
+        for (const c of commands) {
+          if (!c?.name || seen.has(c.name)) continue;
+          seen.add(c.name);
+          mapped.push({
+            id: c.name, label: '/' + c.name, action: 'insert', text: '/' + c.name + ' ',
+            description: `${c.description ?? ''}${c.argumentHint ? `（参数：${c.argumentHint}）` : ''}`,
+          });
+        }
+        return [...base, ...mapped];
       } catch { return base; }
     },
     async executeCommand(session, id, hooks) {

package/src/main/adapters/codex-app-server.js

@@ -2,6 +2,14 @@ const { JsonlProcess, cliSpawn } = require('../host/jsonl');
 
 const shared = new Map();
 
+// codex 拒绝在缺失的 CODEX_HOME 下启动、或握手被外部因素（杀软扫描/磁盘/版本握手）挂住时，
+// initialize 永不返回。没有这个上限，thread/start 会永久 pending，Desktop 端表现为
+// 新对话"一直在执行"却没有会话产生。测试可用 env 覆盖。
+function handshakeTimeoutMs() {
+  const raw = Number(process.env.HARNESS_MIX_CODEX_HANDSHAKE_TIMEOUT_MS);
+  return Number.isFinite(raw) && raw >= 100 ? raw : 20_000;
+}
+
 /**
  * A single native Codex app-server connection shared by every Codex thread.
  * app-server owns thread/session persistence; this class only routes JSON-RPC
@@ -25,17 +33,27 @@ class CodexAppServer {
       onDiagnostic: (line) => this.#diagnostic(line),
       onExit: (error) => this.#exit(error),
     });
-    this.ready = this.process.request('initialize', {
-      clientInfo: { name: 'harness-mix', title: 'Harness Mix', version: '0.1.0' },
-      capabilities: {
-        experimentalApi: true,
-        requestAttestation: false,
-        mcpServerOpenaiFormElicitation: false,
-      },
-    }).then((result) => {
-      this.process.notify('initialized', {});
-      return result;
-    });
+    let rejectHandshake;
+    const handshakeGuard = new Promise((_unused, reject) => { rejectHandshake = reject; });
+    const handshakeTimer = setTimeout(() => {
+      this.stop();
+      rejectHandshake(new Error(`Codex app-server 未在 ${Math.round(handshakeTimeoutMs() / 1000)} 秒内完成初始化握手，已终止进程`));
+    }, handshakeTimeoutMs());
+    handshakeTimer.unref?.();
+    this.ready = Promise.race([
+      this.process.request('initialize', {
+        clientInfo: { name: 'harness-mix', title: 'Harness Mix', version: '0.1.0' },
+        capabilities: {
+          experimentalApi: true,
+          requestAttestation: false,
+          mcpServerOpenaiFormElicitation: false,
+        },
+      }).then((result) => {
+        this.process.notify('initialized', {});
+        return result;
+      }),
+      handshakeGuard,
+    ]).finally(() => clearTimeout(handshakeTimer));
   }
 
   static async acquire(diagnostic, codexHome) {