approval-box 0.1.10 → 0.1.11

package/dist/cli.mjs

@@ -11757,7 +11757,7 @@ var require_dist = __commonJS({
 var import_qrcode = __toESM(require_lib(), 1);
 import { cpSync, existsSync as existsSync7, mkdirSync as mkdirSync5, rmSync as rmSync3 } from "node:fs";
 import { hostname } from "node:os";
-import { join as join7 } from "node:path";
+import { join as join8 } from "node:path";
 import { createInterface } from "node:readline/promises";
 
 // src/api.ts
@@ -11948,11 +11948,23 @@ function daemonStatus() {
     return { running: false };
   }
 }
+function versionOfEntry(entry) {
+  const match = /[\\/]runtime[\\/](\d+)\.(\d+)\.(\d+)[\\/]/.exec(entry);
+  return match ? [Number(match[1]), Number(match[2]), Number(match[3])] : null;
+}
+function shouldReplaceDaemon(runningEntry, myEntry) {
+  if (runningEntry === myEntry) return false;
+  const running = runningEntry ? versionOfEntry(runningEntry) : null;
+  const mine = versionOfEntry(myEntry);
+  if (!running || !mine) return true;
+  for (let i = 0; i < 3; i++) if (running[i] !== mine[i]) return running[i] < mine[i];
+  return true;
+}
 function ensureDaemon() {
   try {
     if (!readConfig()?.token) return;
     const status2 = daemonStatus();
-    if (status2.running && status2.entry === runtimeEntry("cli")) return;
+    if (status2.running && !shouldReplaceDaemon(status2.entry, runtimeEntry("cli"))) return;
     if (status2.running && status2.pid) {
       try {
         process.kill(status2.pid);
@@ -11969,6 +11981,11 @@ function ensureDaemon() {
 }
 var sleep = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
 async function runDaemon() {
+  for (let i = 0; i < 50; i++) {
+    const other = daemonStatus();
+    if (!other.running || other.pid === process.pid) break;
+    await sleep(200);
+  }
   const status2 = daemonStatus();
   if (status2.running && status2.pid !== process.pid) return;
   writeJsonFile(lockFile(), { pid: process.pid, entry: runtimeEntry("cli"), started_at: (/* @__PURE__ */ new Date()).toISOString() });
@@ -12071,8 +12088,16 @@ async function runDaemon() {
   }
   const controller = new AbortController();
   let stopping = false;
+  const releaseLock = () => {
+    try {
+      const lock = JSON.parse(readFileSync3(lockFile(), "utf8"));
+      if (lock.pid === process.pid) rmSync2(lockFile(), { force: true });
+    } catch {
+    }
+  };
   const stop = () => {
     stopping = true;
+    releaseLock();
     controller.abort();
   };
   process.on("SIGTERM", stop);
@@ -12110,11 +12135,7 @@ async function runDaemon() {
       }
     }
   }
-  try {
-    const lock = JSON.parse(readFileSync3(lockFile(), "utf8"));
-    if (lock.pid === process.pid) rmSync2(lockFile(), { force: true });
-  } catch {
-  }
+  releaseLock();
   process.exit(0);
 }
 
@@ -12122,12 +12143,12 @@ async function runDaemon() {
 import { execFileSync } from "node:child_process";
 import { copyFileSync, existsSync as existsSync5, readFileSync as readFileSync5, realpathSync } from "node:fs";
 import { homedir as homedir2 } from "node:os";
-import { delimiter, dirname as dirname4, join as join5 } from "node:path";
+import { delimiter, dirname as dirname4, join as join6 } from "node:path";
 
 // src/instructions.ts
-import { existsSync as existsSync4, lstatSync, mkdirSync as mkdirSync4, readFileSync as readFileSync4, readlinkSync, writeFileSync as writeFileSync3 } from "node:fs";
+import { existsSync as existsSync4, lstatSync, mkdirSync as mkdirSync4, readFileSync as readFileSync4, readdirSync as readdirSync2, readlinkSync, writeFileSync as writeFileSync3 } from "node:fs";
 import { homedir } from "node:os";
-import { dirname as dirname3, resolve } from "node:path";
+import { dirname as dirname3, join as join5, 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 -->";
@@ -12149,6 +12170,19 @@ function hasInstructions(file) {
   }
   return false;
 }
+function hasInstructionsInDir(dir) {
+  try {
+    return readdirSync2(dir).some((name) => {
+      try {
+        return SAME_MEANING.test(readFileSync4(join5(dir, name), "utf8"));
+      } catch {
+        return false;
+      }
+    });
+  } catch {
+    return false;
+  }
+}
 function managedElsewhere(file) {
   try {
     return lstatSync(file).isSymbolicLink() ? readlinkSync(file) : null;
@@ -12176,27 +12210,27 @@ 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(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");
+var claudeDir = () => process.env.CLAUDE_CONFIG_DIR ?? join6(homedir2(), ".claude");
+var claudeJson = () => process.env.CLAUDE_CONFIG_DIR ? join6(process.env.CLAUDE_CONFIG_DIR, ".claude.json") : join6(homedir2(), ".claude.json");
+var cursorDir = () => process.env.CURSOR_HOME ?? join6(homedir2(), ".cursor");
+var codexHome = () => process.env.CODEX_HOME ?? join6(homedir2(), ".codex");
+var grokDir = () => process.env.GROK_HOME ?? join6(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()];
-  if (target === "codex") return [join5(codexHome(), "config.toml"), join5(codexHome(), "hooks.json")];
-  return [join5(grokDir(), "config.toml")];
+  if (target === "claude") return [claudeJson(), join6(claudeDir(), "settings.json")];
+  if (target === "cursor") return [join6(cursorDir(), "mcp.json"), join6(cursorDir(), "hooks.json"), cursorCliConfig()];
+  if (target === "codex") return [join6(codexHome(), "config.toml"), join6(codexHome(), "hooks.json")];
+  return [join6(grokDir(), "config.toml")];
 }
 function instructionsFileOf(target) {
-  if (target === "claude") return join5(claudeDir(), "CLAUDE.md");
-  if (target === "codex") return join5(codexHome(), "AGENTS.md");
-  if (target === "grok") return join5(grokDir(), "AGENTS.md");
+  if (target === "claude") return join6(claudeDir(), "CLAUDE.md");
+  if (target === "codex") return join6(codexHome(), "AGENTS.md");
+  if (target === "grok") return join6(grokDir(), "AGENTS.md");
   return null;
 }
 function onPath(command2) {
   const names = process.platform === "win32" ? [`${command2}.exe`, `${command2}.cmd`, command2] : [command2];
   for (const dir of (process.env.PATH ?? "").split(delimiter)) {
-    for (const name of names) if (dir && existsSync5(join5(dir, name))) return join5(dir, name);
+    for (const name of names) if (dir && existsSync5(join6(dir, name))) return join6(dir, name);
   }
   return null;
 }
@@ -12214,7 +12248,7 @@ function stableNode() {
   }
 }
 var CURSOR_TOOLS = ["list_my_decisions", "request_decision", "amend_decision", "cancel_decision", "get_decision", "get_attachment", "setup_test", "confirm_setup_test"];
-var cursorCliConfig = () => join5(cursorDir(), "cli-config.json");
+var cursorCliConfig = () => join6(cursorDir(), "cli-config.json");
 function setCursorPermissions(enable) {
   const file = cursorCliConfig();
   if (!existsSync5(file) && !enable) return;
@@ -12228,7 +12262,7 @@ function setCursorPermissions(enable) {
 }
 var CURSOR_CONTEXT = "cursor-context";
 function setCursorContext(enable) {
-  const file = join5(cursorDir(), "hooks.json");
+  const file = join6(cursorDir(), "hooks.json");
   if (!existsSync5(file) && !enable) return;
   const target = existsSync5(file) ? realpathSync(file) : file;
   backupOnce(target);
@@ -12241,7 +12275,7 @@ function setCursorContext(enable) {
   else delete hooks.sessionStart;
   writeJsonFile(target, { version: 1, ...current, hooks });
 }
-var cursorContextRegistered = () => JSON.stringify(readJson(join5(cursorDir(), "hooks.json")).hooks ?? {}).includes(` ${CURSOR_CONTEXT}"`);
+var cursorContextRegistered = () => JSON.stringify(readJson(join6(cursorDir(), "hooks.json")).hooks ?? {}).includes(` ${CURSOR_CONTEXT}"`);
 var registration = () => ({ command: stableNode(), args: [runtimeEntry("cli"), "mcp"] });
 function readJson(file) {
   if (!existsSync5(file)) return {};
@@ -12280,18 +12314,18 @@ async function registerTools(target, options) {
   try {
     if (target === "claude") {
       setMcpJson(claudeJson(), { type: "stdio", ...registration() });
-      mergeClaudeParentHooks(PROFILE, join5(claudeDir(), "settings.json"), hook("claude"));
+      mergeClaudeParentHooks(PROFILE, join6(claudeDir(), "settings.json"), hook("claude"));
       return { target, status: "registered" };
     }
     if (target === "cursor") {
-      setMcpJson(join5(cursorDir(), "mcp.json"), registration());
-      mergeCursorParentHooks(PROFILE, join5(cursorDir(), "hooks.json"), hook("cursor"));
+      setMcpJson(join6(cursorDir(), "mcp.json"), registration());
+      mergeCursorParentHooks(PROFILE, join6(cursorDir(), "hooks.json"), hook("cursor"));
       setCursorPermissions(true);
       setCursorContext(!!options.instructions);
       return { target, status: "registered" };
     }
     if (target === "codex") {
-      const config = join5(codexHome(), "config.toml");
+      const config = join6(codexHome(), "config.toml");
       backupOnce(config);
       await withCodexConfig(async (request) => {
         await request("config/batchWrite", { filePath: config, edits: [{ keyPath: `mcp_servers.${MCP_SERVER}`, value: { ...registration(), env_vars: ["CODEX_HOME"] }, mergeStrategy: "replace" }] });
@@ -12307,7 +12341,7 @@ async function registerTools(target, options) {
     }
     const grok = onPath("grok");
     if (!grok) throw new Error("grok \u30B3\u30DE\u30F3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093");
-    backupOnce(join5(grokDir(), "config.toml"));
+    backupOnce(join6(grokDir(), "config.toml"));
     const reg = registration();
     execFileSync(grok, ["mcp", "add", MCP_SERVER, "--scope", "user", reg.command, "--", ...reg.args], { stdio: "pipe" });
     return { target, status: "registered" };
@@ -12321,16 +12355,16 @@ async function unregister(target) {
     if (file) removeInstructions(file);
     if (target === "claude") {
       if (existsSync5(claudeJson())) setMcpJson(claudeJson(), null);
-      removeClaudeParentHooks(PROFILE, join5(claudeDir(), "settings.json"));
+      removeClaudeParentHooks(PROFILE, join6(claudeDir(), "settings.json"));
     } else if (target === "cursor") {
-      if (existsSync5(join5(cursorDir(), "mcp.json"))) setMcpJson(join5(cursorDir(), "mcp.json"), null);
-      removeCursorParentHooks(PROFILE, join5(cursorDir(), "hooks.json"));
+      if (existsSync5(join6(cursorDir(), "mcp.json"))) setMcpJson(join6(cursorDir(), "mcp.json"), null);
+      removeCursorParentHooks(PROFILE, join6(cursorDir(), "hooks.json"));
       setCursorPermissions(false);
       setCursorContext(false);
     } else if (target === "codex") {
-      if (existsSync5(join5(codexHome(), "config.toml"))) {
+      if (existsSync5(join6(codexHome(), "config.toml"))) {
         await withCodexConfig(async (request) => {
-          await request("config/batchWrite", { filePath: join5(codexHome(), "config.toml"), edits: [{ keyPath: `mcp_servers.${MCP_SERVER}`, value: null, mergeStrategy: "replace" }] });
+          await request("config/batchWrite", { filePath: join6(codexHome(), "config.toml"), edits: [{ keyPath: `mcp_servers.${MCP_SERVER}`, value: null, mergeStrategy: "replace" }] });
         });
       }
       try {
@@ -12348,26 +12382,27 @@ async function unregister(target) {
 }
 function registered(target) {
   const file = instructionsFileOf(target);
-  return { ...registeredTools(target), instructions: file ? hasInstructions(file) : target === "cursor" ? cursorContextRegistered() : null };
+  const instructions = target === "cursor" ? cursorContextRegistered() || hasInstructions(join6(cursorDir(), "AGENTS.md")) || hasInstructionsInDir(join6(cursorDir(), "rules")) : file ? hasInstructions(file) || target === "grok" && hasInstructionsInDir(join6(grokDir(), "rules")) : null;
+  return { ...registeredTools(target), instructions };
 }
 function registeredTools(target) {
   const entryOf = (value) => (value?.args ?? [])[0];
   if (target === "claude") {
     const entry = readJson(claudeJson()).mcpServers?.[MCP_SERVER];
-    const settings = JSON.stringify(readJson(join5(claudeDir(), "settings.json")));
+    const settings = JSON.stringify(readJson(join6(claudeDir(), "settings.json")));
     const e = entryOf(entry);
     return { mcp: !!entry, hooks: settings.includes(PROFILE.hooks.claude), ...e ? { entry: e } : {} };
   }
   if (target === "cursor") {
-    const entry = readJson(join5(cursorDir(), "mcp.json")).mcpServers?.[MCP_SERVER];
+    const entry = readJson(join6(cursorDir(), "mcp.json")).mcpServers?.[MCP_SERVER];
     const e = entryOf(entry);
-    return { mcp: !!entry, hooks: cursorParentHooksRegistered(PROFILE, readJson(join5(cursorDir(), "hooks.json"))), ...e ? { entry: e } : {} };
+    return { mcp: !!entry, hooks: cursorParentHooksRegistered(PROFILE, readJson(join6(cursorDir(), "hooks.json"))), ...e ? { entry: e } : {} };
   }
   if (target === "codex") {
-    const toml2 = existsSync5(join5(codexHome(), "config.toml")) ? readFileSync5(join5(codexHome(), "config.toml"), "utf8") : "";
+    const toml2 = existsSync5(join6(codexHome(), "config.toml")) ? readFileSync5(join6(codexHome(), "config.toml"), "utf8") : "";
     return { mcp: toml2.includes(`[mcp_servers.${MCP_SERVER}]`), hooks: null };
   }
-  const toml = existsSync5(join5(grokDir(), "config.toml")) ? readFileSync5(join5(grokDir(), "config.toml"), "utf8") : "";
+  const toml = existsSync5(join6(grokDir(), "config.toml")) ? readFileSync5(join6(grokDir(), "config.toml"), "utf8") : "";
   return { mcp: toml.includes(MCP_SERVER), hooks: null };
 }
 
@@ -15732,10 +15767,10 @@ var StdioServerTransport = class {
 
 // src/mcp.ts
 import { existsSync as existsSync6, readFileSync as readFileSync6 } from "node:fs";
-import { basename as basename2, join as join6 } from "node:path";
+import { basename as basename2, join as join7 } from "node:path";
 
 // src/version.ts
-var VERSION = true ? "0.1.10" : "0.0.0-dev";
+var VERSION = true ? "0.1.11" : "0.0.0-dev";
 function osName() {
   return process.platform === "darwin" ? "macos" : process.platform === "win32" ? "windows" : process.platform;
 }
@@ -15837,7 +15872,7 @@ var TOOLS = [
 ];
 var VIEWABLE_IMAGES = ["image/jpeg", "image/png", "image/gif", "image/webp"];
 var MAX_INLINE_IMAGE = 5 * 1024 * 1024;
-var parentsFile = () => join6(stateRoot(), "parents.json");
+var parentsFile = () => join7(stateRoot(), "parents.json");
 var processChannels = /* @__PURE__ */ new Map();
 var lastChannel;
 function savedParents() {
@@ -16096,13 +16131,13 @@ async function ask(question) {
   }
 }
 function installRuntime() {
-  const target = join7(home(), "runtime", VERSION);
+  const target = join8(home(), "runtime", VERSION);
   if (runtimeDir() !== target) {
     rmSync3(target, { recursive: true, force: true });
     mkdirSync5(target, { recursive: true });
     cpSync(runtimeDir(), target, { recursive: true });
   }
-  return join7(target, "cli.mjs");
+  return join8(target, "cli.mjs");
 }
 function selectedTargets() {
   const only = option("only");
@@ -16248,7 +16283,7 @@ async function uninstall() {
       out(`  \u30B5\u30FC\u30D0\u30FC: \u63A5\u7D9A\u306E\u89E3\u9664\u306B\u5931\u6557\u3057\u307E\u3057\u305F\uFF08\u30A2\u30D7\u30EA\u306E\u300C\u63A5\u7D9A\u300D\u304B\u3089\u5916\u3057\u3066\u304F\u3060\u3055\u3044\uFF09: ${error.message}`);
     }
   }
-  rmSync3(join7(home(), "config.json"), { force: true });
+  rmSync3(join8(home(), "config.json"), { force: true });
   out("\nApproval Box\u3092\u5916\u3057\u307E\u3057\u305F\u3002npm install -g \u3067\u5165\u308C\u305F\u5834\u5408\u306F\u3001npm uninstall -g approval-box \u3067\u672C\u4F53\u3082\u6D88\u305B\u307E\u3059\u3002");
 }
 async function status() {

package/package.json

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