approval-box 0.1.16 → 0.1.19

package/dist/cli.mjs

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { createRequire as __kbCreateRequire } from 'node:module'; const require = __kbCreateRequire(import.meta.url);
 import {
+  CodexDeliveryError,
   HOOK_FILES,
   MCP_SERVER,
   PROFILE,
@@ -18,6 +19,7 @@ import {
   claudeHookRoot,
   claudeParentFromRequest,
   claudeParentHooksRegistered,
+  codexDeliveryStateViaAiterm,
   codexParentFromRequest,
   configureCodexSteer,
   cursorHookRoot,
@@ -47,14 +49,14 @@ import {
   setupNodeExecutable,
   stateRoot,
   string,
+  submitCodexParentAnswerViaAiterm,
   union,
   unknown,
-  verifyCodexParent,
   verifyCursorParent,
   waitProcessCommandLine,
   withCodexReceiver,
   withdrawFromChannel
-} from "./chunks/chunk-GH2JG56Y.mjs";
+} from "./chunks/chunk-OVDAILMZ.mjs";
 
 // ../../node_modules/qrcode/lib/can-promise.js
 var require_can_promise = __commonJS({
@@ -11882,7 +11884,8 @@ function windowsDaemonLaunchScript(executable, entry, cwd, environment) {
 function launchDaemon(executable, entry, cwd) {
   if (process.platform === "win32") {
     const script = windowsDaemonLaunchScript(executable, entry, cwd, { ...process.env, APPROVAL_BOX_HOME: resolve(home()) });
-    const result = spawnSync("powershell.exe", ["-NoProfile", "-NonInteractive", "-EncodedCommand", Buffer.from(script, "utf16le").toString("base64")], { cwd, windowsHide: true, encoding: "utf8", timeout: 15e3 });
+    const result = spawnSync("pwsh.exe", ["-NoProfile", "-NonInteractive", "-EncodedCommand", Buffer.from(script, "utf16le").toString("base64")], { cwd, windowsHide: true, encoding: "utf8", timeout: 15e3 });
+    if (result.error?.code === "ENOENT") throw new Error("PowerShell 7\uFF08pwsh.exe\uFF09\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u6A19\u6E96PATH\u306BPowerShell 7\u3092\u5C0E\u5165\u3057\u3066\u304F\u3060\u3055\u3044\u3002");
     if (result.error || result.status !== 0 || !/^\s*\d+\s*$/.test(result.stdout ?? "")) throw new Error(`Windows\u306E\u5E38\u99D0\u8D77\u52D5\u306B\u5931\u6557\u3057\u307E\u3057\u305F\uFF08${result.error?.message ?? `exit ${result.status}`}\uFF09`);
     return;
   }
@@ -11894,6 +11897,26 @@ function launchDaemon(executable, entry, cwd) {
   }
 }
 
+// src/channel-delivery.ts
+var provider = {
+  submit: (parent, id, text2) => submitCodexParentAnswerViaAiterm(parent, id, text2),
+  state: (parent, id) => codexDeliveryStateViaAiterm(parent, id)
+};
+async function sendChannelAnswer(channelId, deliveryId, text2, codex = provider) {
+  if (channelClosed(PROFILE, channelId)) throw Object.assign(new Error("\u7533\u8ACB\u3092\u51FA\u3057\u305FAI\u306E\u4F1A\u8A71\u304C\u7D42\u308F\u3063\u3066\u3044\u307E\u3059"), { closed: true });
+  const channel = readChannel(PROFILE, channelId);
+  if (channel.kind !== "codex") return sendToChannel(PROFILE, channelId, deliveryId, text2);
+  if (!channel.codex) throw new CodexDeliveryError("CODEX_PARENT_ID_UNAVAILABLE", "channel\u306B\u5143\u306ECodex\u4F1A\u8A71\u304C\u3042\u308A\u307E\u305B\u3093");
+  const result = await codex.submit(channel.codex, deliveryId, text2);
+  return { state: "submitted", queued_submission_id: result.queued_submission_id };
+}
+async function channelAnswerState(channelId, deliveryId, codex = provider) {
+  const channel = readChannel(PROFILE, channelId);
+  if (channel.kind !== "codex") return channelDeliveryState(PROFILE, channelId, deliveryId);
+  if (!channel.codex) throw new CodexDeliveryError("CODEX_PARENT_ID_UNAVAILABLE", "channel\u306B\u5143\u306ECodex\u4F1A\u8A71\u304C\u3042\u308A\u307E\u305B\u3093");
+  return codex.state(channel.codex, deliveryId);
+}
+
 // src/daemon.ts
 import { existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync as readFileSync3, rmSync as rmSync2 } from "node:fs";
 import { join as join5 } from "node:path";
@@ -12022,7 +12045,7 @@ async function runDaemon() {
 `);
   for (const [id, entry] of Object.entries(journal)) {
     if (entry.state !== "sending") continue;
-    const current = safeState(entry);
+    const current = await safeState(entry);
     if (current === "queued" || current === "emitted" || current === "sending") entry.state = "queued";
     else Object.assign(entry, { state: "report", result: "unknown", detail: "\u9001\u4FE1\u306E\u9014\u4E2D\u3067\u914D\u9001\u30C7\u30FC\u30E2\u30F3\u304C\u6B62\u307E\u308A\u307E\u3057\u305F" });
     journal[id] = entry;
@@ -12051,8 +12074,7 @@ async function runDaemon() {
     save();
     const entry = journal[item.decision_id];
     try {
-      if (channelClosed(PROFILE, item.route.channel_id)) throw Object.assign(new Error("\u7533\u8ACB\u3092\u51FA\u3057\u305FAI\u306E\u4F1A\u8A71\u304C\u7D42\u308F\u3063\u3066\u3044\u307E\u3059"), { closed: true });
-      const result = await sendToChannel(PROFILE, item.route.channel_id, item.delivery_id, text2);
+      const result = await sendChannelAnswer(item.route.channel_id, item.delivery_id, text2);
       if (result.state === "submitted") Object.assign(entry, { state: "report", result: "delivered" });
       else entry.state = "queued";
     } catch (error) {
@@ -12063,9 +12085,9 @@ async function runDaemon() {
     log(`\u914D\u9001 ${item.decision_id} \u2192 ${entry.state}${entry.result ? `/${entry.result}` : ""}`);
     if (entry.state === "report") await report(item.decision_id);
   }
-  function safeState(entry) {
+  async function safeState(entry) {
     try {
-      return channelDeliveryState(PROFILE, entry.channel_id, entry.delivery_id);
+      return await channelAnswerState(entry.channel_id, entry.delivery_id);
     } catch {
       return null;
     }
@@ -12077,7 +12099,7 @@ async function runDaemon() {
         continue;
       }
       if (entry.state !== "queued") continue;
-      const current = safeState(entry);
+      const current = await safeState(entry);
       if (current === "emitted") Object.assign(entry, { state: "report", result: "delivered" });
       else if (current === "unknown") Object.assign(entry, { state: "report", result: "unknown", detail: "\u53D7\u3051\u53E3\u306E\u51FA\u529B\u3092\u78BA\u304B\u3081\u3089\u308C\u307E\u305B\u3093\u3067\u3057\u305F" });
       else if (current === null || current === "withdrawn") Object.assign(entry, { state: "report", result: "failed", detail: "\u914D\u9001\u306E\u8A18\u9332\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093" });
@@ -12111,7 +12133,7 @@ async function runDaemon() {
               save();
               log(`\u914D\u9001 ${id} \u2192 ${withdrawn ? "withdrawn" : "resolved"}`);
             } else {
-              Object.assign(entry, safeState(entry) === "emitted" ? { state: "report", result: "delivered" } : { state: "report", result: "unknown", detail: "\u914D\u9001\u5148\u306E\u5909\u66F4\u524D\u306B\u53D7\u3051\u53E3\u304C\u672C\u6587\u3092\u53D6\u5F97\u3057\u307E\u3057\u305F\u3002\u518D\u9001\u3057\u307E\u305B\u3093" });
+              Object.assign(entry, await safeState(entry) === "emitted" ? { state: "report", result: "delivered" } : { state: "report", result: "unknown", detail: "\u914D\u9001\u5148\u306E\u5909\u66F4\u524D\u306B\u53D7\u3051\u53E3\u304C\u672C\u6587\u3092\u53D6\u5F97\u3057\u307E\u3057\u305F\u3002\u518D\u9001\u3057\u307E\u305B\u3093" });
               save();
               await report(id);
               waiting.delete(id);
@@ -12373,14 +12395,8 @@ async function registerTools(target, options) {
       await withCodexConfig(async (request) => {
         await request("config/batchWrite", { filePath: config, edits: [{ keyPath: `mcp_servers.${MCP_SERVER}`, value: { ...registration(), env_vars: ["CODEX_HOME"] }, mergeStrategy: "replace" }] });
       });
-      let steerStatus;
-      try {
-        const result = await configureCodexSteer(PROFILE, "enable", { hook: runtimeEntry("codex"), codex_home: codexHome(), node: stableNode() });
-        steerStatus = result.status + (result.reason_code ? `:${result.reason_code}` : "");
-      } catch (error) {
-        steerStatus = `failed:${error.code ?? error.message}`;
-      }
-      return { target, status: "registered", steer: steerStatus };
+      await configureCodexSteer(PROFILE, "disable", { hook: runtimeEntry("codex"), codex_home: codexHome() });
+      return { target, status: "registered", note: "Codex\u306E\u56DE\u7B54\u914D\u9001\u306FAiterm\u306E\u5171\u901ASteer\u3092\u4F7F\u3044\u307E\u3059\u3002\u65E7\u7248\u306E\u5C02\u7528\u914D\u9001hook\u306F\u767B\u9332\u3057\u307E\u305B\u3093\u3002" };
     }
     const grok = onPath("grok");
     if (!grok) throw new Error("grok \u30B3\u30DE\u30F3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093");
@@ -15813,7 +15829,7 @@ import { existsSync as existsSync6, readFileSync as readFileSync6 } from "node:f
 import { basename as basename2, join as join8 } from "node:path";
 
 // src/version.ts
-var VERSION = true ? "0.1.16" : "0.0.0-dev";
+var VERSION = true ? "0.1.19" : "0.0.0-dev";
 function osName() {
   return process.platform === "darwin" ? "macos" : process.platform === "win32" ? "windows" : process.platform;
 }
@@ -15947,7 +15963,6 @@ function remember(key, channelId, persistent) {
     writeJsonFile(parentsFile(), all);
   } else processChannels.set(key, channelId);
 }
-var verifiedCodexThreads = /* @__PURE__ */ new Set();
 async function channelFor(harness, clientName, meta) {
   if (harness === "codex") {
     const parent = codexParentFromRequest(clientName, meta);
@@ -15955,10 +15970,6 @@ async function channelFor(harness, clientName, meta) {
     const key2 = `codex:${parent.codex_home}:${parent.thread_id}`;
     const existing2 = reuse(key2, true);
     if (existing2) return existing2;
-    if (!verifiedCodexThreads.has(key2)) {
-      await verifyCodexParent(PROFILE, parent);
-      verifiedCodexThreads.add(key2);
-    }
     const channel2 = openChannel(PROFILE, parent);
     remember(key2, channel2.channel_id, true);
     return channel2.channel_id;
@@ -16176,12 +16187,6 @@ var FAILED_HINT = {
   notify: "\u30A2\u30D7\u30EA\u306E\u901A\u77E5\u304C\u5C4A\u3044\u3066\u3044\u307E\u305B\u3093\u3002\u30A2\u30D7\u30EA\u306E\u901A\u77E5\u306E\u8A31\u53EF\u3092\u78BA\u304B\u3081\u3066\u304F\u3060\u3055\u3044\u3002",
   delivery: "\u7B54\u3048\u304CAI\u3078\u5C4A\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002npx approval-box doctor \u3067\u539F\u56E0\u3092\u78BA\u304B\u3081\u3066\u304F\u3060\u3055\u3044\u3002"
 };
-var STEER_LABEL = {
-  ready: "\u4F5C\u696D\u4E2D\u306E\u5272\u308A\u8FBC\u307F\u3082\u4F7F\u3048\u307E\u3059",
-  restart_required: "\u4F5C\u696D\u4E2D\u306E\u5272\u308A\u8FBC\u307F\u306F\u3001\u958B\u3044\u3066\u3044\u308BCodex\u3092\u3059\u3079\u3066\u9589\u3058\u3066\u958B\u304D\u76F4\u3059\u3068\u4F7F\u3048\u307E\u3059\u3002\u305D\u308C\u307E\u3067\u306F\u4F5C\u696D\u306E\u533A\u5207\u308A\u3067\u5C4A\u304D\u307E\u3059",
-  disabled: "\u4F5C\u696D\u4E2D\u306E\u5272\u308A\u8FBC\u307F\u306F\u4F7F\u3044\u307E\u305B\u3093\u3002\u7B54\u3048\u306F\u4F5C\u696D\u306E\u533A\u5207\u308A\u3067\u5C4A\u304D\u307E\u3059",
-  failed: "\u4F5C\u696D\u4E2D\u306E\u5272\u308A\u8FBC\u307F\u3092\u6709\u52B9\u306B\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u7B54\u3048\u306F\u4F5C\u696D\u306E\u533A\u5207\u308A\u3067\u5C4A\u304D\u307E\u3059\uFF08npx approval-box doctor \u3067\u539F\u56E0\u3092\u78BA\u304B\u3081\u3089\u308C\u307E\u3059\uFF09"
-};
 async function ask(question) {
   const rl = createInterface({ input: process.stdin, output: process.stdout });
   try {
@@ -16267,7 +16272,7 @@ async function setup() {
   for (const target of targets) out(`  ${LABEL[target]}: ${filesOf(target).join(", ")}`);
   out("");
   if (targets.includes("claude")) out("\u30FBClaude Code \u306E Stop hook \u306F\u3001\u3059\u3079\u3066\u306E\u4F1A\u8A71\u3067\u30BF\u30FC\u30F3\u304C\u7D42\u308F\u308B\u305F\u3073\u306B node \u30921\u56DE\u8D77\u52D5\u3057\u307E\u3059\uFF08Approval Box\u306E\u7533\u8ACB\u304C\u7121\u3051\u308C\u3070\u3059\u3050\u7D42\u308F\u308A\u307E\u3059\uFF09\u3002");
-  if (targets.includes("codex")) out("\u30FBCodex \u306F\u3001\u4F5C\u696D\u4E2D\u306B\u7B54\u3048\u3092\u5272\u308A\u8FBC\u307E\u305B\u308B\u305F\u3081 hook \u3082\u767B\u9332\u3057\u307E\u3059\u3002\u767B\u9332\u5F8C\u306B Codex \u306E\u518D\u8D77\u52D5\u304C\u8981\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002");
+  if (targets.includes("codex")) out("\u30FBCodex \u306E\u7B54\u3048\u306F Aiterm \u306E Steer \u3067\u5143\u306E\u4F1A\u8A71\u3078\u8FD4\u3057\u307E\u3059\u3002\u65E7\u7248\u306EApproval Box\u5C02\u7528\u914D\u9001hook\u306F\u64A4\u53BB\u3057\u307E\u3059\u3002");
   if (targets.includes("cursor") || targets.includes("grok")) out("\u30FBCursor\uFF08\u6B62\u307E\u3063\u3066\u3044\u308B\u6642\uFF09\u3068 Grok \u306F\u3001\u7533\u8ACB\u306E\u6642\u306BAI\u304C\u80CC\u666F\u3067\u53D7\u4FE1\u3092\u8D77\u52D5\u3057\u307E\u3059\u3002");
   out(`\u30FB\u66F8\u304D\u63DB\u3048\u308B\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u300C${".approval-box-backup"}\u300D\u3092\u4ED8\u3051\u3066\u63A7\u3048\u307E\u3059\u3002\u5143\u306B\u623B\u3059\u306B\u306F npx approval-box uninstall\u3002
 `);
@@ -16311,8 +16316,7 @@ async function registerTargets() {
   let failed = false;
   for (const target of targets) {
     const result = await register(target, { instructions: flag("instructions") });
-    const extra = result.steer ? `\uFF08${STEER_LABEL[result.steer.split(":")[0] ?? ""] ?? `\u4F5C\u696D\u4E2D\u306E\u5272\u308A\u8FBC\u307F: ${result.steer}`}\uFF09` : "";
-    out(`  ${LABEL[target]}: ${result.status === "registered" ? "\u767B\u9332\u3057\u307E\u3057\u305F" : `\u5931\u6557 \u2014 ${result.detail}`}${extra}`);
+    out(`  ${LABEL[target]}: ${result.status === "registered" ? "\u767B\u9332\u3057\u307E\u3057\u305F" : `\u5931\u6557 \u2014 ${result.detail}`}`);
     if (result.note) out(`    \u30FB${result.note}`);
     if (result.status === "failed") failed = true;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "approval-box",
-  "version": "0.1.16",
+  "version": "0.1.19",
   "description": "Approval Box connector: lets Claude Code, Codex, Cursor and Grok ask you for a decision, and steers your answer back into the same session.",
   "license": "MIT",
   "homepage": "https://approval-box.kitepon.dev",
@@ -32,7 +32,7 @@
     "@modelcontextprotocol/sdk": "^1.31.0",
     "@types/node": "^25.9.1",
     "@types/qrcode": "^1.5.5",
-    "aiterm-steer-delivery": "^0.2.0",
+    "aiterm-steer-delivery": "0.3.0",
     "esbuild": "^0.28.2",
     "qrcode": "^1.5.4",
     "typescript": "^6.0.3",

package/dist/approval-box-codex-hook.mjs

@@ -1,8 +0,0 @@
-import { createRequire as __kbCreateRequire } from 'node:module'; const require = __kbCreateRequire(import.meta.url);
-import {
-  PROFILE,
-  runCodexHookMain
-} from "./chunks/chunk-GH2JG56Y.mjs";
-
-// src/hooks/codex.ts
-await runCodexHookMain(PROFILE, process.argv[2]);