@harness-mix/cli 0.2.4 → 0.3.0

package/scripts/openclaw-mcp-probe.cjs

@@ -0,0 +1,100 @@
+// OpenClaw 托管 MCP 对账实测探针：
+// 备份 openclaw.json → 推送一个仓库内 stdio MCP 服务器（collaboration-mcp.cjs）→
+// 验证 openclaw mcp list / Gateway tools 面能看到 → 移除 → 断言用户键零变化。
+// 任何一步异常都会用备份还原配置。
+const fs = require("node:fs");
+const path = require("node:path");
+const { execFileSync } = require("node:child_process");
+const { OpenClawGatewayHost } = require("../src/main/adapters/openclaw-gateway");
+const { applyManagedMcpServers, MCP_OWNED_PREFIX } = require("../src/main/adapters/openclaw");
+const { OPENCLAW_CONFIG } = require("../src/main/adapters/openclaw-gateway");
+const { cliSpawn } = require("../src/main/host/jsonl");
+
+const OUT_DIR = path.join(__dirname, "..", "output", "openclaw-mcp-probe");
+const SERVER = path.join(__dirname, "..", "src", "main", "host", "collaboration-mcp.cjs");
+
+const readCfg = () => JSON.parse(fs.readFileSync(OPENCLAW_CONFIG, "utf8"));
+const stripOwned = (servers) => Object.fromEntries(Object.entries(servers ?? {}).filter(([k]) => !k.startsWith(MCP_OWNED_PREFIX)));
+// 键序无关的规范化序列化（CLI 规范化会重排键序）；meta.lastTouched* 是 CLI 自维护簿记，不计入
+const canonical = (value) => {
+  if (Array.isArray(value)) return value.map(canonical);
+  if (value && typeof value === "object") return Object.fromEntries(Object.keys(value).sort().map((k) => [k, canonical(value[k])]));
+  return value;
+};
+const userViewOf = (cfg) => {
+  const { meta, ...rest } = cfg;
+  const mcp = { ...rest.mcp, servers: stripOwned(rest.mcp?.servers) };
+  // CLI 规范化会删除空的 mcp/servers 键；空对象与键缺失视为等价（不含用户内容）
+  if (mcp.servers && Object.keys(mcp.servers).length === 0) delete mcp.servers;
+  if (Object.keys(mcp).length === 0) delete rest.mcp; else rest.mcp = mcp;
+  return rest;
+};
+const userView = (cfg) => JSON.stringify(canonical(userViewOf(cfg)));
+const diffViews = (beforeStr, nowStr) => {
+  const walk = (x, y, p) => {
+    for (const k of new Set([...Object.keys(x || {}), ...Object.keys(y || {})])) {
+      const q = p ? `${p}.${k}` : k;
+      if (JSON.stringify(x?.[k]) !== JSON.stringify(y?.[k])) {
+        if (x?.[k] && y?.[k] && typeof x[k] === "object" && typeof y[k] === "object" && !Array.isArray(x[k]) && !Array.isArray(y[k])) walk(x[k], y[k], q);
+        else console.error(`USERVIEW DIFF: ${q} | ${JSON.stringify(x?.[k])?.slice(0, 90)} -> ${JSON.stringify(y?.[k])?.slice(0, 90)}`);
+      }
+    }
+  };
+  walk(JSON.parse(beforeStr), JSON.parse(nowStr), "");
+};
+const mcpList = () => {
+  const cli = cliSpawn("openclaw", ["mcp", "list", "--json"]);
+  return JSON.parse(execFileSync(cli.command, cli.args, { encoding: "utf8", windowsHide: true, timeout: 20000 }));
+};
+
+(async () => {
+  fs.mkdirSync(OUT_DIR, { recursive: true });
+  const backup = path.join(OUT_DIR, `openclaw.json.backup-${Date.now()}`);
+  fs.copyFileSync(OPENCLAW_CONFIG, backup);
+  console.log("backup ->", backup);
+  const before = userView(readCfg());
+  let ok = false;
+  try {
+    // 1. 推送托管服务器（与适配器 open() 同路径）
+    await applyManagedMcpServers([{ name: "probe", command: process.execPath, args: [SERVER], env: {} }], (line) => console.log(line));
+    const listed = mcpList();
+    console.log("mcp list after push ->", JSON.stringify(Object.keys(listed)));
+    if (!listed[MCP_OWNED_PREFIX + "probe"]) throw new Error("自有键未出现在 mcp list");
+    const viewNow = userView(readCfg());
+    if (viewNow !== before) {
+      diffViews(before, viewNow);
+      throw new Error("用户键视图发生变化（不应发生）");
+    }
+
+    // 2. Gateway 侧确认注册表可读；tools 面尝试 catalog/effective（effective 需要 sessionKey）
+    const host = await OpenClawGatewayHost.acquire(() => {});
+    try {
+      const sessionKey = `harness-mix-mcp-probe-${Date.now()}`;
+      await host.call("sessions.create", { key: sessionKey, label: `Harness Mix MCP probe ${Date.now()}` });
+      const evidence = {};
+      evidence.catalog = await host.call("tools.catalog", {}).catch((e) => ({ error: e.message }));
+      evidence.effective = await host.call("tools.effective", { sessionKey }).catch((e) => ({ error: e.message }));
+      const text = JSON.stringify(evidence);
+      fs.writeFileSync(path.join(OUT_DIR, "tools-evidence.json"), JSON.stringify(evidence, null, 2));
+      const hitCount = (text.match(new RegExp(MCP_OWNED_PREFIX + "probe", "g")) || []).length;
+      console.log("tools evidence saved; owned-server mentions:", hitCount);
+      console.log("effective summary ->", JSON.stringify(evidence.effective).slice(0, 400));
+    } finally { await OpenClawGatewayHost.release(); }
+
+    // 3. 移除托管服务器，断言注册表回到初始用户视图
+    await applyManagedMcpServers([], (line) => console.log(line));
+    const after = mcpList();
+    console.log("mcp list after cleanup ->", JSON.stringify(Object.keys(after)));
+    if (after[MCP_OWNED_PREFIX + "probe"]) throw new Error("自有键未被移除");
+    const finalView = userView(readCfg());
+    if (finalView !== before) { diffViews(before, finalView); throw new Error("清理后用户键视图与初始不一致"); }
+    ok = true;
+    console.log("PROBE OK：推送/注册表可见/清理/用户键零变化 全部通过");
+  } finally {
+    if (!ok) {
+      fs.copyFileSync(backup, OPENCLAW_CONFIG);
+      console.error("已用备份还原 openclaw.json");
+    }
+  }
+  process.exit(ok ? 0 : 1);
+})().catch((e) => { console.error("FAILED:", e.message); process.exit(1); });

package/scripts/openclaw-mcp-tool-probe.cjs

@@ -0,0 +1,55 @@
+// OpenClaw 托管 MCP 端到端实测：推送极简 echo MCP 服务器 → 真实 agent 回合调用其工具 →
+// 捕获 tool 流帧验证 → 清理并断言注册表还原。证据落 output/openclaw-mcp-probe/。
+const fs = require("node:fs");
+const path = require("node:path");
+const { randomUUID } = require("node:crypto");
+const { OpenClawGatewayHost, OPENCLAW_CONFIG } = require("../src/main/adapters/openclaw-gateway");
+const { applyManagedMcpServers, MCP_OWNED_PREFIX } = require("../src/main/adapters/openclaw");
+
+const OUT_DIR = path.join(__dirname, "..", "output", "openclaw-mcp-probe");
+const ECHO_SERVER = path.join(OUT_DIR, "echo-mcp-server.cjs");
+
+(async () => {
+  const backup = path.join(OUT_DIR, `openclaw.json.backup-tool-${Date.now()}`);
+  fs.copyFileSync(OPENCLAW_CONFIG, backup);
+  const frames = [];
+  let ok = false;
+  try {
+    await applyManagedMcpServers([{ name: "probe", command: process.execPath, args: [ECHO_SERVER] }], (l) => console.log(l));
+    const host = await OpenClawGatewayHost.acquire((l) => console.error(l));
+    try {
+      const baseKey = `harness-mix-mcp-tool-probe-${Date.now()}`;
+      const created = await host.call("sessions.create", { key: baseKey, label: `Harness Mix MCP tool probe ${Date.now()}` });
+      const sessionKey = created?.key ?? baseKey;
+      const unwatch = host.onEvent((frame) => {
+        if (frame?.type !== "event" || frame.event !== "agent") return;
+        const p = frame.payload ?? {};
+        if (p.sessionKey && p.sessionKey !== sessionKey) return;
+        frames.push(p);
+        if (p.stream === "tool") console.log(`[tool] ${p.data?.name ?? ""} phase=${p.data?.phase} meta=${p.data?.meta ?? ""}`);
+      });
+      const accepted = await host.call("agent", {
+        message: "请调用 MCP 工具 hm_echo（若名称带前缀也用它），参数 text=HELLO_HM。完成后只回复工具返回的原始文本，不要添加别的内容。",
+        sessionKey, idempotencyKey: randomUUID(), deliver: false,
+      });
+      console.log("agent accepted:", JSON.stringify(accepted));
+      const settled = await host.call("agent.wait", { runId: accepted.runId, timeoutMs: 240_000 }, 250_000);
+      console.log("agent.wait:", JSON.stringify(settled).slice(0, 300));
+      unwatch();
+      const toolCalls = frames.filter((f) => f.stream === "tool");
+      const echoHit = toolCalls.some((f) => String(f.data?.name ?? "").includes("hm_echo") || String(f.data?.meta ?? "").includes("hm_echo"));
+      const assistantText = frames.filter((f) => f.stream === "assistant").map((f) => f.data?.delta ?? f.data?.text ?? "").join("");
+      console.log(`tool frames: ${toolCalls.length}, hm_echo hit: ${echoHit}, assistant: ${assistantText.slice(0, 120)}`);
+      fs.writeFileSync(path.join(OUT_DIR, "tool-call-evidence.json"), JSON.stringify({ capturedAt: new Date().toISOString(), frames, echoHit, assistantText }, null, 2));
+      ok = echoHit || /ECHO:HELLO_HM/.test(assistantText);
+      console.log(ok ? "TOOL PROBE OK：托管 MCP 工具被真实调用" : "TOOL PROBE 未观测到工具调用（模型未配合或 bundle 未加载）");
+    } finally { await OpenClawGatewayHost.release(); }
+  } finally {
+    await applyManagedMcpServers([], () => {});
+    if (!ok) {
+      fs.copyFileSync(backup, OPENCLAW_CONFIG);
+      console.error("已用备份还原 openclaw.json");
+    }
+  }
+  process.exit(ok ? 0 : 1);
+})().catch((e) => { console.error("FAILED:", e); process.exit(1); });

package/scripts/openclaw-thinking-probe.cjs

@@ -0,0 +1,73 @@
+// OpenClaw Gateway 思考流探针：开启 reasoningLevel=stream 后跑一个真实回合，
+// 捕获 agent 广播原始帧（重点 stream:"thinking"），为适配器投影与能力声明提供实测证据。
+// 用法：node scripts/openclaw-thinking-probe.cjs [modelId]
+const fs = require("node:fs");
+const path = require("node:path");
+const { randomUUID } = require("node:crypto");
+const { OpenClawGatewayHost } = require("../src/main/adapters/openclaw-gateway");
+
+const OUT_DIR = path.join(__dirname, "..", "output", "openclaw-thinking-probe");
+
+(async () => {
+  fs.mkdirSync(OUT_DIR, { recursive: true });
+  const host = await OpenClawGatewayHost.acquire((line) => console.error(line));
+  const frames = [];
+  try {
+    const key = `harness-mix-thinking-probe-${Date.now()}`;
+    const created = await host.call("sessions.create", { key, label: `Harness Mix thinking probe ${Date.now()}` });
+    console.log("sessions.create ->", JSON.stringify(created));
+    const sessionKey = created?.key ?? key;
+
+    // 两个独立维度：thinkingLevel 控制推理投入，reasoningLevel=stream 才把思考流广播给客户端
+    let patched = null;
+    try {
+      patched = await host.call("sessions.patch", { key: sessionKey, reasoningLevel: "stream", thinkingLevel: "medium" });
+    } catch (error) {
+      console.error("sessions.patch FAILED:", error.message, "code=", error.code);
+    }
+    console.log("sessions.patch ->", JSON.stringify(patched));
+
+    const modelArg = process.argv[2] || undefined;
+    if (modelArg) console.log("using model override:", modelArg);
+
+    const unwatch = host.onEvent((frame) => {
+      if (frame?.type !== "event" || frame.event !== "agent") return;
+      const p = frame.payload ?? {};
+      if (p.sessionKey && p.sessionKey !== sessionKey) return;
+      frames.push(p);
+      const data = p.data ?? {};
+      const brief = typeof data.delta === "string" ? data.delta : typeof data.text === "string" ? data.text : "";
+      console.log(`[stream=${p.stream}] ${(brief || JSON.stringify(data)).slice(0, 160).replace(/\n/g, "\\n")}`);
+    });
+
+    const accepted = await host.call("agent", {
+      message: "一个三位数，各位数字之和为 18，百位比个位大 3，且它是 4 的倍数。求这个数，并给出推理过程。",
+      sessionKey,
+      idempotencyKey: randomUUID(),
+      deliver: false,
+      thinking: "high",
+      ...(modelArg ? { model: modelArg } : {}),
+    });
+    console.log("agent ->", JSON.stringify(accepted));
+    if (!accepted?.runId) throw new Error("未返回 runId");
+    const settled = await host.call("agent.wait", { runId: accepted.runId, timeoutMs: 240_000 }, 250_000);
+    console.log("agent.wait ->", JSON.stringify(settled));
+    unwatch();
+
+    const described = await host.call("sessions.describe", { key: sessionKey }).catch((e) => ({ error: e.message }));
+    console.log("sessions.describe ->", JSON.stringify(described?.session ?? described));
+
+    const summary = {};
+    for (const f of frames) summary[f.stream] = (summary[f.stream] ?? 0) + 1;
+    const hasThinking = frames.some((f) => f.stream === "thinking" && (f.data?.delta || f.data?.text));
+    console.log("stream summary ->", JSON.stringify(summary), "thinkingVerified=", hasThinking);
+
+    const stamp = new Date().toISOString().replace(/[:.]/g, "-");
+    const outFile = path.join(OUT_DIR, `thinking-frames-${stamp}.json`);
+    fs.writeFileSync(outFile, JSON.stringify({ capturedAt: new Date().toISOString(), key, frames, described: described?.session ?? null, summary, hasThinking }, null, 2));
+    console.log("saved ->", outFile);
+  } finally {
+    await OpenClawGatewayHost.release();
+  }
+  process.exit(0);
+})().catch((e) => { console.error("FAILED:", e); process.exit(1); });

package/scripts/storage-verification-test.cjs

@@ -69,6 +69,17 @@ const { ThreadStore } = require('../src/main/host/thread-store');
     const failed = await gates.run(thread);
     assert.equal(failed.status, 'failed');
     assert.equal(gates.inspect(thread).satisfied, true, 'advisory failures do not block delivery');
+    // advisory()：off 策略的 apply 零配置安全网——跑内建检查，不跑用户命令、
+    // 不写 latestReport、不改线程策略；显式策略下不附加
+    gates.configure(thread, { mode: 'off', commands: [`"${process.execPath}" -e "process.exit(3)"`] });
+    const advisory = await gates.advisory(thread);
+    assert.equal(advisory.mode, 'advisory');
+    assert.deepEqual(advisory.commands, [], 'advisory 不跑用户命令');
+    assert.ok(advisory.checks.some(check => check.id === 'turnCompleted'), '内建检查在列');
+    assert.equal(gates.inspect(thread).policy.mode, 'off', '线程策略保持 off');
+    assert.equal(gates.inspect(thread).report, null, 'advisory 不写 latestReport');
+    gates.configure(thread, { mode: 'advisory' });
+    assert.equal(await gates.advisory(thread), null, '显式策略下不附加安全网');
     assert.throws(() => normalizePolicy({ commands: [{ command: '' }] }), /Invalid verification command/);
     assert.throws(() => normalizePolicy({ commands: [{ command: 'tool --token sk-1234567890abcdef' }] }), /credential-like data/);
     console.log('PASS: schema v2 compact migration, backup, storage metrics and configurable verification gates');

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) {

package/src/main/adapters/codex.js

@@ -119,6 +119,12 @@ function usageView(tokenUsage) {
   };
 }
 
+/** Skill name → UI 契约 id（[A-Za-z0-9._:-]+，≤128）；"Agent Browser" → "agent-browser" */
+function slugifySkillId(name) {
+  if (typeof name !== 'string') return '';
+  return name.trim().toLowerCase().replace(/[^a-z0-9._:-]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 128);
+}
+
 function emitTool(item, session, emit, state = toolState(item)) {
   emit({
     kind: 'tool', toolCallId: item.id, title: toolTitle(item), state,
@@ -362,16 +368,20 @@ function reviewerToWire(reviewer) {
 }
 
 const APP_SERVER_BUSY = /^Agent is already processing(?:\.|$)/i;
+// busy 重试总预算：覆盖同线程 queue-start 的瞬时清槽，也覆盖共享 app-server 上
+// 另一线程的短 turn（部分版本按进程串行 turn）；长 turn 仍会超预算失败并如实报错
+const BUSY_RETRY_BUDGET_MS = 20_000;
 
 async function startTurnAfterNativeSettlement(host, params) {
   // A queue-start can arrive immediately after turn/completed, while app-server is still
   // clearing its active-turn slot. Keep the same logical Core turn and retry only this
   // narrow transient; other errors must remain visible and must never be duplicated.
-  for (let attempt = 0, delay = 25; ; attempt++, delay *= 2) {
+  const deadline = Date.now() + BUSY_RETRY_BUDGET_MS;
+  for (let delay = 25; ; delay = Math.min(delay * 2, 2_000)) {
     try {
       return await host.request('turn/start', params);
     } catch (error) {
-      if (!APP_SERVER_BUSY.test(String(error?.message ?? error)) || attempt >= 5) throw error;
+      if (!APP_SERVER_BUSY.test(String(error?.message ?? error)) || Date.now() + delay > deadline) throw error;
       await new Promise(resolve => setTimeout(resolve, delay));
     }
   }
@@ -528,8 +538,32 @@ function create() {
       } else pending.resolve({ decision });
     },
 
-    listCommands() {
-      return [{ id: 'compact', label: '压缩上下文', description: '由 Codex 原生 app-server 压缩当前 Thread', action: 'execute' }];
+    // 原生 app-server 的 skills/list 即斜杠命令目录（/<skill-name> 触发插入）；
+    // 旧版 app-server 无该 RPC 时回落静态目录。无会话（session==null）不拉起进程。
+    async listCommands(session) {
+      const base = [{ id: 'compact', label: '压缩上下文', description: '由 Codex 原生 app-server 压缩当前 Thread', action: 'execute' }];
+      if (!session) return base;
+      try {
+        const rows = await listAll(session.host, 'skills/list', { cwds: [session.cwd] });
+        const seen = new Set(['compact']);
+        const skills = [];
+        for (const row of rows) {
+          for (const skill of row?.skills ?? []) {
+            if (skill?.enabled === false) continue;
+            const id = slugifySkillId(skill.name);
+            if (!id || seen.has(id)) continue;
+            seen.add(id);
+            skills.push({
+              id,
+              label: '/' + (skill.interface?.displayName || skill.name),
+              description: `${String(skill.shortDescription || skill.description || '').slice(0, 512)}（Codex 技能·${skill.scope || 'user'}）`,
+              action: 'insert',
+              text: '/' + id + ' ',
+            });
+          }
+        }
+        return [...base, ...skills];
+      } catch { return base; }
     },
 
     async executeCommand(session, id, { emit }) {
@@ -653,4 +687,4 @@ manifest.integrations = { mcp: true, skills: {
   project: ['.agents/skills'],
   overrides: { '.codex/skills': { env: 'CODEX_HOME', suffix: 'skills' } },
 } };
-module.exports = { manifest, create, projectNotification, queueRequest, usageView, modelView };
+module.exports = { manifest, create, projectNotification, queueRequest, usageView, modelView, startTurnAfterNativeSettlement };

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,