approval-box 0.1.9 → 0.1.10

package/README.md

@@ -14,8 +14,8 @@ npx -y approval-box@latest setup
 
 1. `setup` finds the agents on this machine and registers Approval Box (MCP server and hooks). It shows the files it will change and keeps a backup (`*.approval-box-backup`) before writing.
    PCにあるAIを見つけて登録します。書き換えるファイルを先に見せ、控えを残してから書き換えます。
-   It also offers to add one short paragraph to each agent's global instructions (`~/.claude/CLAUDE.md`, `$CODEX_HOME/AGENTS.md`, `~/.grok/AGENTS.md`) so the agent also files decisions, approvals and actions with `request_decision`. Cursor does not read a global file, so setup passes the same text through a `sessionStart` hook in `~/.cursor/hooks.json`. Skip with `--no-instructions`.
-   AIが毎回読む全体の指示に「判断・承認・操作が要る時は request_decision でも申請する」という一節を足すかを聞きます。Cursor はファイルから読まないので、会話の始まりのhook（`~/.cursor/hooks.json` の sessionStart）で渡します。足さない時は `--no-instructions`。
+   It also offers to add one short paragraph to each agent's global instructions (`~/.claude/CLAUDE.md`, `$CODEX_HOME/AGENTS.md`, `~/.grok/AGENTS.md`) so the agent also files decisions, approvals and actions with `request_decision`. Cursor does not read a global file, so setup passes the same text through a `sessionStart` hook in `~/.cursor/hooks.json`. If an instructions file is a symlink (for example, generated by a dotfiles repo), setup leaves it alone and asks you to add the paragraph to the source instead. Skip with `--no-instructions`.
+   AIが毎回読む全体の指示に「判断・承認・操作が要る時は request_decision でも申請する」という一節を足すかを聞きます。Cursor はファイルから読まないので、会話の始まりのhook（`~/.cursor/hooks.json` の sessionStart）で渡します。指示ファイルが別の所への参照（symlink、dotfilesの生成物など）の時は書かず、管理元の規範に足すよう案内します。足さない時は `--no-instructions`。
 2. Scan the QR code or enter the code in “Add device” in the app or web.
    画面のQRコードかコードを、アプリかWeb版の「端末を追加」で読み取ります。
 3. Tell your agent: `Approval Boxのsetup_testを実行して` (or “run Approval Box setup_test”). Answer the test request; when the answer reaches the agent, you are ready.

package/dist/cli.mjs

@@ -4435,10 +4435,10 @@ var require_browser = __commonJS({
           text2 = canvas;
           canvas = void 0;
         }
-        return new Promise(function(resolve, reject) {
+        return new Promise(function(resolve2, reject) {
           try {
             const data = QRCode2.create(text2, opts);
-            resolve(renderFunc(data, canvas, opts));
+            resolve2(renderFunc(data, canvas, opts));
           } catch (e) {
             reject(e);
           }
@@ -4519,11 +4519,11 @@ var require_server = __commonJS({
     }
     function render(renderFunc, text2, params) {
       if (!params.cb) {
-        return new Promise(function(resolve, reject) {
+        return new Promise(function(resolve2, reject) {
           try {
             const data = QRCode2.create(text2, params.opts);
             return renderFunc(data, params.opts, function(err, data2) {
-              return err ? reject(err) : resolve(data2);
+              return err ? reject(err) : resolve2(data2);
             });
           } catch (e) {
             reject(e);
@@ -7538,7 +7538,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve.call(this, root, ref);
+      let _sch = resolve2.call(this, root, ref);
       if (_sch === void 0) {
         const schema = (_a = root.localRefs) === null || _a === void 0 ? void 0 : _a[ref];
         const { schemaId } = this.opts;
@@ -7565,7 +7565,7 @@ var require_compile = __commonJS({
     function sameSchemaEnv(s1, s2) {
       return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
     }
-    function resolve(root, ref) {
+    function resolve2(root, ref) {
       let sch;
       while (typeof (sch = this.refs[ref]) == "string")
         ref = sch;
@@ -8395,7 +8395,7 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve(baseURI, relativeURI, options) {
+    function resolve2(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
       const {
         parsed: baseParsed,
@@ -8764,7 +8764,7 @@ var require_fast_uri = __commonJS({
     var fastUri = {
       SCHEMES,
       normalize,
-      resolve,
+      resolve: resolve2,
       resolveComponent,
       equal,
       serialize,
@@ -11967,7 +11967,7 @@ function ensureDaemon() {
 `);
   }
 }
-var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var sleep = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
 async function runDaemon() {
   const status2 = daemonStatus();
   if (status2.running && status2.pid !== process.pid) return;
@@ -12121,12 +12121,13 @@ async function runDaemon() {
 // src/harness.ts
 import { execFileSync } from "node:child_process";
 import { copyFileSync, existsSync as existsSync5, readFileSync as readFileSync5, realpathSync } from "node:fs";
-import { homedir } from "node:os";
+import { homedir as homedir2 } from "node:os";
 import { delimiter, dirname as dirname4, join as join5 } from "node:path";
 
 // src/instructions.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync4, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "node:fs";
-import { dirname as dirname3 } from "node:path";
+import { existsSync as existsSync4, lstatSync, mkdirSync as mkdirSync4, readFileSync as readFileSync4, readlinkSync, writeFileSync as writeFileSync3 } from "node:fs";
+import { homedir } from "node:os";
+import { dirname as dirname3, resolve } from "node:path";
 var INSTRUCTION_TEXT = "\u30E6\u30FC\u30B6\u30FC\u306E\u5224\u65AD\u30FB\u627F\u8A8D\u30FB\u64CD\u4F5C\u304C\u5FC5\u8981\u306A\u3068\u304D\u306F\u3001\u6C7A\u88C1\u30B7\u30B9\u30C6\u30E0\u3067\u3042\u308B Approval Box \u306E request_decision \u3067\u3082\u7533\u8ACB\u3059\u308B\u3002\u3053\u308C\u3092\u4F7F\u3048\u3070\u30E6\u30FC\u30B6\u30FC\u304C\u7533\u8ACB\u306B\u6C17\u3065\u304D\u3084\u3059\u3044\u306E\u3067\u3001\u5F37\u304F\u63A8\u5968\u3059\u308B\u3002";
 var START = "<!-- approval-box:start -->";
 var END = "<!-- approval-box:end -->";
@@ -12137,18 +12138,35 @@ ${INSTRUCTION_TEXT}
 ${END}
 `;
 var PATTERN = new RegExp(`\\n*${START}[\\s\\S]*?${END}\\n?`, "g");
+var SAME_MEANING = /Approval Box\s*の\s*`?request_decision`?\s*でも申請/;
 function hasInstructions(file) {
-  return existsSync4(file) && readFileSync4(file, "utf8").includes(START);
+  if (!existsSync4(file)) return false;
+  const text2 = readFileSync4(file, "utf8");
+  if (text2.includes(START) || SAME_MEANING.test(text2)) return true;
+  for (const [, ref] of text2.matchAll(/^@(\S+)\s*$/gm)) {
+    const target = ref.startsWith("~/") ? resolve(homedir(), ref.slice(2)) : resolve(dirname3(file), ref);
+    if (existsSync4(target) && SAME_MEANING.test(readFileSync4(target, "utf8"))) return true;
+  }
+  return false;
+}
+function managedElsewhere(file) {
+  try {
+    return lstatSync(file).isSymbolicLink() ? readlinkSync(file) : null;
+  } catch {
+    return null;
+  }
 }
 function writeInstructions(file) {
+  if (managedElsewhere(file)) return "managed_elsewhere";
   const current = existsSync4(file) ? readFileSync4(file, "utf8").replace(PATTERN, "\n").trimEnd() : "";
   mkdirSync4(dirname3(file), { recursive: true, mode: 448 });
   writeFileSync3(file, current ? `${current}
 
 ${BLOCK}` : BLOCK);
+  return "written";
 }
 function removeInstructions(file) {
-  if (!hasInstructions(file)) return;
+  if (!existsSync4(file) || !readFileSync4(file, "utf8").includes(START)) return;
   const rest = readFileSync4(file, "utf8").replace(PATTERN, "\n").trimEnd();
   writeFileSync3(file, rest ? `${rest}
 ` : "");
@@ -12158,11 +12176,11 @@ function removeInstructions(file) {
 var HARNESSES = ["claude", "codex", "cursor", "grok"];
 var LABEL = { claude: "Claude Code", codex: "Codex", cursor: "Cursor", grok: "Grok" };
 var CLIENT = { claude: "claude-code", codex: "codex", cursor: "cursor", grok: "grok" };
-var claudeDir = () => process.env.CLAUDE_CONFIG_DIR ?? join5(homedir(), ".claude");
-var claudeJson = () => process.env.CLAUDE_CONFIG_DIR ? join5(process.env.CLAUDE_CONFIG_DIR, ".claude.json") : join5(homedir(), ".claude.json");
-var cursorDir = () => process.env.CURSOR_HOME ?? join5(homedir(), ".cursor");
-var codexHome = () => process.env.CODEX_HOME ?? join5(homedir(), ".codex");
-var grokDir = () => process.env.GROK_HOME ?? join5(homedir(), ".grok");
+var claudeDir = () => process.env.CLAUDE_CONFIG_DIR ?? join5(homedir2(), ".claude");
+var claudeJson = () => process.env.CLAUDE_CONFIG_DIR ? join5(process.env.CLAUDE_CONFIG_DIR, ".claude.json") : join5(homedir2(), ".claude.json");
+var cursorDir = () => process.env.CURSOR_HOME ?? join5(homedir2(), ".cursor");
+var codexHome = () => process.env.CODEX_HOME ?? join5(homedir2(), ".codex");
+var grokDir = () => process.env.GROK_HOME ?? join5(homedir2(), ".grok");
 function filesOf(target) {
   if (target === "claude") return [claudeJson(), join5(claudeDir(), "settings.json")];
   if (target === "cursor") return [join5(cursorDir(), "mcp.json"), join5(cursorDir(), "hooks.json"), cursorCliConfig()];
@@ -12246,13 +12264,18 @@ async function withCodexConfig(fn) {
 }
 async function register(target, options = {}) {
   const file = instructionsFileOf(target);
+  let note;
   if (options.instructions && file) {
     try {
-      writeInstructions(file);
+      if (writeInstructions(file) === "managed_elsewhere") note = `\u5168\u4F53\u306E\u6307\u793A\uFF08${file} \u2192 ${managedElsewhere(file)}\uFF09\u306F\u5225\u306E\u6240\u3067\u7BA1\u7406\u3055\u308C\u3066\u3044\u308B\u306E\u3067\u66F8\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u7BA1\u7406\u5143\u306E\u898F\u7BC4\u306B\u4E00\u7BC0\u3092\u8DB3\u3057\u3066\u304F\u3060\u3055\u3044`;
     } catch (error) {
       return { target, status: "failed", detail: `${file}: ${error.message}` };
     }
   }
+  const result = await registerTools(target, options);
+  return note && result.status === "registered" ? { ...result, note } : result;
+}
+async function registerTools(target, options) {
   const hook = (kind) => ({ command: stableNode(), script: runtimeEntry(kind) });
   try {
     if (target === "claude") {
@@ -14459,7 +14482,7 @@ var Protocol = class {
           return;
         }
         const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3;
-        await new Promise((resolve) => setTimeout(resolve, pollInterval));
+        await new Promise((resolve2) => setTimeout(resolve2, pollInterval));
         options?.signal?.throwIfAborted();
       }
     } catch (error) {
@@ -14476,7 +14499,7 @@ var Protocol = class {
    */
   request(request, resultSchema, options) {
     const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       const earlyReject = (error) => {
         reject(error);
       };
@@ -14554,7 +14577,7 @@ var Protocol = class {
           if (!parseResult.success) {
             reject(parseResult.error);
           } else {
-            resolve(parseResult.data);
+            resolve2(parseResult.data);
           }
         } catch (error) {
           reject(error);
@@ -14815,12 +14838,12 @@ var Protocol = class {
       }
     } catch {
     }
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       if (signal.aborted) {
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
         return;
       }
-      const timeoutId = setTimeout(resolve, interval);
+      const timeoutId = setTimeout(resolve2, interval);
       signal.addEventListener("abort", () => {
         clearTimeout(timeoutId);
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
@@ -15696,12 +15719,12 @@ var StdioServerTransport = class {
     this.onclose?.();
   }
   send(message) {
-    return new Promise((resolve) => {
+    return new Promise((resolve2) => {
       const json = serializeMessage(message);
       if (this._stdout.write(json)) {
-        resolve();
+        resolve2();
       } else {
-        this._stdout.once("drain", resolve);
+        this._stdout.once("drain", resolve2);
       }
     });
   }
@@ -15712,7 +15735,7 @@ import { existsSync as existsSync6, readFileSync as readFileSync6 } from "node:f
 import { basename as basename2, join as join6 } from "node:path";
 
 // src/version.ts
-var VERSION = true ? "0.1.9" : "0.0.0-dev";
+var VERSION = true ? "0.1.10" : "0.0.0-dev";
 function osName() {
   return process.platform === "darwin" ? "macos" : process.platform === "win32" ? "windows" : process.platform;
 }
@@ -16110,7 +16133,7 @@ async function pair(server, targets) {
     if (result.status === "claimed" && result.token) return { token: result.token, connection_id: result.connection_id };
     if (result.status === "rejected") throw new Error("\u30A2\u30D7\u30EA\u3067\u300C\u5FC3\u5F53\u305F\u308A\u304C\u306A\u3044\u300D\u304C\u62BC\u3055\u308C\u307E\u3057\u305F\u3002\u3082\u3046\u4E00\u5EA6 npx approval-box setup \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002");
     if (result.status === "expired" || result.status === "delivered") throw new Error("\u30DA\u30A2\u30EA\u30F3\u30B0\u306E\u671F\u9650\u304C\u5207\u308C\u307E\u3057\u305F\u3002\u3082\u3046\u4E00\u5EA6 npx approval-box setup \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002");
-    await new Promise((resolve) => setTimeout(resolve, 2e3));
+    await new Promise((resolve2) => setTimeout(resolve2, 2e3));
   }
 }
 async function waitForChecks(api, clients) {
@@ -16134,7 +16157,7 @@ async function waitForChecks(api, clients) {
       out("\n\u3059\u3079\u3066\u306EAI\u3067\u78BA\u8A8D\u304C\u6E08\u307F\u307E\u3057\u305F\u3002Approval Box\u3092\u4F7F\u3048\u307E\u3059\u3002");
       return;
     }
-    await new Promise((resolve) => setTimeout(resolve, 3e3));
+    await new Promise((resolve2) => setTimeout(resolve2, 3e3));
   }
 }
 async function setup() {
@@ -16161,7 +16184,8 @@ async function setup() {
   out(`  \u300C${INSTRUCTION_TEXT}\u300D`);
   for (const target of targets) {
     const file = instructionsFileOf(target);
-    out(`  ${LABEL[target]}: ${file ?? "\u4F1A\u8A71\u306E\u59CB\u307E\u308A\u306Ehook\uFF08hooks.json \u306E sessionStart\uFF09\u3067\u6E21\u3057\u307E\u3059"}`);
+    const link = file ? managedElsewhere(file) : null;
+    out(`  ${LABEL[target]}: ${!file ? "\u4F1A\u8A71\u306E\u59CB\u307E\u308A\u306Ehook\uFF08hooks.json \u306E sessionStart\uFF09\u3067\u6E21\u3057\u307E\u3059" : link ? `${file} \u306F ${link} \u3078\u306E\u53C2\u7167\u3067\u3001\u5225\u306E\u6240\u3067\u7BA1\u7406\u3055\u308C\u3066\u3044\u308B\u306E\u3067\u66F8\u304D\u307E\u305B\u3093\uFF08\u7BA1\u7406\u5143\u306E\u898F\u7BC4\u306B\u4E00\u7BC0\u3092\u8DB3\u3057\u3066\u304F\u3060\u3055\u3044\uFF09` : file}`);
   }
   const instructions = !flag("no-instructions") && (flag("yes") || !/^n(o)?$/i.test(await ask("\u8DB3\u3057\u307E\u3059\u304B\uFF1F [Y/n] ")));
   const cli = installRuntime();
@@ -16194,6 +16218,7 @@ async function registerTargets() {
     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}`);
+    if (result.note) out(`    \u30FB${result.note}`);
     if (result.status === "failed") failed = true;
   }
   ensureDaemon();
@@ -16268,7 +16293,11 @@ async function doctor() {
     if (!r.mcp) problems.push(`${LABEL[target]}: MCP\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093 \u2192 npx approval-box setup --only ${target}`);
     if (r.hooks === false) problems.push(`${LABEL[target]}: hook\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093 \u2192 npx approval-box setup --only ${target}`);
     if (r.entry && !existsSync7(r.entry)) problems.push(`${LABEL[target]}: \u767B\u9332\u5148\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093\uFF08${r.entry}\uFF09\u3002node \u3084Approval Box\u3092\u5165\u308C\u76F4\u3057\u305F\u6642\u306B\u8D77\u304D\u307E\u3059 \u2192 npx approval-box setup`);
-    if (r.mcp && r.instructions === false) hints.push(`${LABEL[target]}: \u5168\u4F53\u306E\u6307\u793A\u306BApproval Box\u306E\u4E00\u7BC0\u304C\u3042\u308A\u307E\u305B\u3093\u3002AI\u304C\u7533\u8ACB\u3092\u51FA\u3055\u306A\u3044\u6642\u306F \u2192 npx approval-box setup --only ${target}`);
+    if (r.mcp && r.instructions === false) {
+      const file = instructionsFileOf(target);
+      const link = file ? managedElsewhere(file) : null;
+      hints.push(link ? `${LABEL[target]}: \u5168\u4F53\u306E\u6307\u793A\uFF08${file} \u2192 ${link}\uFF09\u306BApproval Box\u306E\u4E00\u7BC0\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u5225\u306E\u6240\u3067\u7BA1\u7406\u3055\u308C\u3066\u3044\u308B\u306E\u3067\u3001\u7BA1\u7406\u5143\u306E\u898F\u7BC4\u306B\u300C${INSTRUCTION_TEXT}\u300D\u3092\u8DB3\u3057\u3066\u304F\u3060\u3055\u3044` : `${LABEL[target]}: \u5168\u4F53\u306E\u6307\u793A\u306BApproval Box\u306E\u4E00\u7BC0\u304C\u3042\u308A\u307E\u305B\u3093\u3002AI\u304C\u7533\u8ACB\u3092\u51FA\u3055\u306A\u3044\u6642\u306F \u2192 npx approval-box setup --only ${target}`);
+    }
   }
   for (const hint of hints) out(`\u30FB${hint}`);
   if (!problems.length) out("\u554F\u984C\u306F\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u5C4A\u304B\u306A\u3044\u6642\u306F\u3001AI\u306B\u300CApproval Box\u306Esetup_test\u3092\u5B9F\u884C\u3057\u3066\u300D\u3068\u8A00\u3063\u3066\u3001\u3069\u3053\u3067\u6B62\u307E\u308B\u304B\u3092\u78BA\u304B\u3081\u3066\u304F\u3060\u3055\u3044\u3002");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "approval-box",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "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",