approval-box 0.1.19 → 0.1.21

package/README.md

@@ -50,3 +50,7 @@ Requires Node.js 20 or later. License: MIT.
 
 この機能はコネクタ0.1.13以降と対応サーバーを使います。会話を開き直しても、
 再開を指定するまでは元の会話が配送先です。答えは `get_decision` でも取得できます。
+
+### 申請に画像を添える
+
+`request_decision` に `image_paths: ["/absolute/path/screenshot.png"]` を指定すると、AIの画像を本文下に添えて申請します。10件、単体20MiB、合計50MiBまで。全画像を上げてから申請と通知を確定します。最初の確認の札を付けた出し直しでも同じ画像パスを渡してください。`amend_decision.changes.image_paths` は全置換、空配列で削除です。回答添付とは別の欄です。リモートMCPは `upload_request_image` のIDを `request_attachment_ids` に渡します。

package/dist/cli.mjs

@@ -1336,11 +1336,11 @@ var require_dijkstra = __commonJS({
         var predecessors = {};
         var costs = {};
         costs[s] = 0;
-        var open = dijkstra.PriorityQueue.make();
-        open.push(s, 0);
+        var open2 = dijkstra.PriorityQueue.make();
+        open2.push(s, 0);
         var closest, u, v, cost_of_s_to_u, adjacent_nodes, cost_of_e, cost_of_s_to_u_plus_cost_of_e, cost_of_s_to_v, first_visit;
-        while (!open.empty()) {
-          closest = open.pop();
+        while (!open2.empty()) {
+          closest = open2.pop();
           u = closest.value;
           cost_of_s_to_u = closest.cost;
           adjacent_nodes = graph[u] || {};
@@ -1352,7 +1352,7 @@ var require_dijkstra = __commonJS({
               first_visit = typeof costs[v] === "undefined";
               if (first_visit || cost_of_s_to_v > cost_of_s_to_u_plus_cost_of_e) {
                 costs[v] = cost_of_s_to_u_plus_cost_of_e;
-                open.push(v, cost_of_s_to_u_plus_cost_of_e);
+                open2.push(v, cost_of_s_to_u_plus_cost_of_e);
                 predecessors[v] = u;
               }
             }
@@ -11761,7 +11761,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 join9 } from "node:path";
+import { join as join10 } from "node:path";
 import { createInterface } from "node:readline/promises";
 
 // src/api.ts
@@ -11814,6 +11814,17 @@ var Api = class {
     }
     return json;
   }
+  /** 申請前画像をバイナリで上げる。 */
+  async uploadRequestImage(data, name, contentType) {
+    const response = await fetch(this.url(`/request-images?name=${encodeURIComponent(name)}`), {
+      method: "POST",
+      headers: { authorization: `Bearer ${this.token}`, "content-type": contentType },
+      body: new Uint8Array(data)
+    });
+    const json = await response.json();
+    if (!response.ok) throw new ServerError(response.status, json.error?.code ?? "internal", json.error?.message ?? `HTTP ${response.status}`, json);
+    return json;
+  }
   /** ファイルを取る（添付）。誤りはJSONの本文から読む。 */
   async download(path) {
     let response;
@@ -12192,8 +12203,8 @@ async function runDaemon() {
       await sync();
       try {
         const { items } = await api.call("GET", "/decisions");
-        const open = items.some((d) => d.status === "pending" || d.status === "held");
-        if (open || Object.keys(journal).length) idleSince = Date.now();
+        const open2 = items.some((d) => d.status === "pending" || d.status === "held");
+        if (open2 || Object.keys(journal).length) idleSince = Date.now();
         else if (Date.now() - idleSince > IDLE_EXIT_MS) stop();
       } catch {
         idleSince = Date.now();
@@ -15825,11 +15836,67 @@ var StdioServerTransport = class {
 };
 
 // src/mcp.ts
-import { existsSync as existsSync6, readFileSync as readFileSync6 } from "node:fs";
-import { basename as basename2, join as join8 } from "node:path";
+import { existsSync as existsSync6, readFileSync as readFileSync7 } from "node:fs";
+import { basename as basename3, join as join9 } from "node:path";
+
+// src/request-images.ts
+import { open } from "node:fs/promises";
+import { basename as basename2 } from "node:path";
+var MAX_FILE = 20 * 1024 * 1024;
+var MAX_TOTAL = 50 * 1024 * 1024;
+function imageType(b) {
+  if (b.subarray(0, 8).equals(Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]))) return "image/png";
+  if (b.length >= 3 && b[0] === 255 && b[1] === 216 && b[2] === 255) return "image/jpeg";
+  if (b.subarray(0, 4).toString() === "GIF8") return "image/gif";
+  if (b.subarray(0, 4).toString() === "RIFF" && b.subarray(8, 12).toString() === "WEBP") return "image/webp";
+  if (b.subarray(4, 8).toString() === "ftyp" && ["heic", "heix", "hevc", "hevx", "heim", "heis", "mif1", "msf1", "heif"].includes(b.subarray(8, 12).toString())) return "image/heic";
+  throw new Error("\u7533\u8ACB\u306B\u4ED8\u3051\u3089\u308C\u308B\u306E\u306FJPEG\u30FBPNG\u30FBGIF\u30FBWebP\u30FBHEIC\u753B\u50CF\u3067\u3059\u3002");
+}
+async function uploadImagePaths(api, paths) {
+  if (!Array.isArray(paths) || paths.length > 10 || paths.some((p) => typeof p !== "string" || !p.trim())) throw new Error("image_paths\u306F10\u4EF6\u307E\u3067\u306E\u753B\u50CF\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9\u914D\u5217\u3067\u3059\u3002");
+  const images = [];
+  let total = 0;
+  for (const path of paths) {
+    const file = await open(path, "r");
+    try {
+      const stat = await file.stat();
+      if (!stat.isFile() || !stat.size || stat.size > MAX_FILE) throw new Error(`${basename2(path)}: \u7A7A\u3067\u306A\u3044\u901A\u5E38\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\uFF0820MiB\u307E\u3067\uFF09\u3002`);
+      total += stat.size;
+      if (total > MAX_TOTAL) throw new Error("\u7533\u8ACB\u753B\u50CF\u306F\u5408\u8A0850MiB\u307E\u3067\u3067\u3059\u3002");
+      const data = Buffer.alloc(stat.size + 1);
+      let n = 0;
+      while (n < data.length) {
+        const r = await file.read(data, n, data.length - n, n);
+        if (!r.bytesRead) break;
+        n += r.bytesRead;
+      }
+      if (n !== stat.size) throw new Error(`${basename2(path)}: \u8AAD\u307F\u53D6\u308A\u4E2D\u306B\u753B\u50CF\u304C\u5909\u308F\u308A\u307E\u3057\u305F\u3002`);
+      const bytes = data.subarray(0, n);
+      images.push({ name: basename2(path), data: bytes, type: imageType(bytes) });
+    } finally {
+      await file.close();
+    }
+  }
+  const ids = [];
+  for (const image of images) ids.push((await api.uploadRequestImage(image.data, image.name, image.type)).id);
+  return ids;
+}
+
+// src/claude-channel.ts
+import { readFileSync as readFileSync6 } from "node:fs";
+import { join as join8 } from "node:path";
+function claudeChannelIsCurrent(profile, channelId, parent) {
+  try {
+    const bound = readChannel(profile, channelId).claude;
+    const now = JSON.parse(readFileSync6(join8(parent.hook_root, parent.request_id, "request.json"), "utf8"));
+    return !!bound && bound.session_id === parent.session_id && bound.parent_pid === now.parent_pid && bound.parent_started_identity === now.parent_started_identity;
+  } catch {
+    return false;
+  }
+}
 
 // src/version.ts
-var VERSION = true ? "0.1.19" : "0.0.0-dev";
+var VERSION = true ? "0.1.21" : "0.0.0-dev";
 function osName() {
   return process.platform === "darwin" ? "macos" : process.platform === "win32" ? "windows" : process.platform;
 }
@@ -15872,6 +15939,8 @@ var TOOLS = [
         deadline: { type: "string", description: "\u671F\u9650\uFF08ISO 8601\uFF09" },
         session_label: { type: "string", description: "\u3069\u306E\u4F5C\u696D\u306E\u8A71\u304B\uFF08\u4F8B: \u30EA\u30DD\u30B8\u30C8\u30EA\u540D / \u4F5C\u696D\u540D\uFF09\u3002\u7701\u7565\u3059\u308B\u3068\u4F5C\u696D\u30D5\u30A9\u30EB\u30C0\u540D" },
         distinct_reason: { type: "string", description: "\u540C\u3058\u4EF6\u540D\u306E\u672A\u6C7A\u304C\u3042\u308B\u306E\u306B\u5225\u4EF6\u3068\u3057\u3066\u51FA\u3059\u6642\u3060\u3051\u3001\u305D\u306E\u7406\u7531" },
+        image_paths: { type: "array", items: { type: "string" }, maxItems: 10, description: "\u7533\u8ACB\u306B\u6DFB\u3048\u308B\u30ED\u30FC\u30AB\u30EB\u753B\u50CF\u30D1\u30B9\u300210\u4EF6/\u5358\u4F5320MiB/\u5408\u8A0850MiB\u307E\u3067\u3002\u30D1\u30B9\u81EA\u4F53\u306F\u4EBA\u3078\u9001\u3089\u306A\u3044" },
+        request_attachment_ids: { type: "array", items: { type: "string" }, maxItems: 10 },
         check_token: { type: "string", description: "1\u56DE\u76EE\u306E request_decision \u3067\u8FD4\u3063\u305F\u78BA\u8A8D\u306E\u672D\u3002\u4E00\u89A7\u3092\u78BA\u304B\u3081\u3001\u76F4\u3059\u30FB\u53D6\u308A\u4E0B\u3052\u308B\u7533\u8ACB\u304C\u7121\u3044\u3068\u5224\u65AD\u3057\u305F\u6642\u306B\u4ED8\u3051\u308B" }
       },
       required: ["title", "options"],
@@ -15890,6 +15959,8 @@ var TOOLS = [
         changes: {
           type: "object",
           properties: {
+            image_paths: { type: "array", items: { type: "string" }, maxItems: 10 },
+            request_attachment_ids: { type: "array", items: { type: "string" }, maxItems: 10 },
             title: { type: "string" },
             context: { type: "string" },
             options: { type: "array", items: optionSchema, minItems: 2, maxItems: 6 },
@@ -15937,12 +16008,12 @@ var TOOLS = [
 ];
 var VIEWABLE_IMAGES = ["image/jpeg", "image/png", "image/gif", "image/webp"];
 var MAX_INLINE_IMAGE = 5 * 1024 * 1024;
-var parentsFile = () => join8(stateRoot(), "parents.json");
+var parentsFile = () => join9(stateRoot(), "parents.json");
 var processChannels = /* @__PURE__ */ new Map();
 var lastChannel;
 function savedParents() {
   try {
-    return existsSync6(parentsFile()) ? JSON.parse(readFileSync6(parentsFile(), "utf8")) : {};
+    return existsSync6(parentsFile()) ? JSON.parse(readFileSync7(parentsFile(), "utf8")) : {};
   } catch {
     return {};
   }
@@ -15979,7 +16050,7 @@ async function channelFor(harness, clientName, meta) {
     if (!parent) throw new Error("Claude Code\u306Ehook\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002npx approval-box setup \u3092\u3084\u308A\u76F4\u3057\u3001Claude Code\u3092\u518D\u8D77\u52D5\u3057\u3066\u304F\u3060\u3055\u3044\u3002");
     const key2 = `claude:${parent.session_id}`;
     const existing2 = reuse(key2, true);
-    if (existing2) return existing2;
+    if (existing2 && claudeChannelIsCurrent(PROFILE, existing2, parent)) return existing2;
     const channel2 = openChannel(PROFILE, parent);
     remember(key2, channel2.channel_id, true);
     return channel2.channel_id;
@@ -16046,10 +16117,14 @@ ${JSON.stringify({ items })}`, { items });
       if (name === "request_decision") {
         const channelId = await channelFor(harness, clientName, request.params._meta);
         lastChannel = channelId;
+        const { image_paths, ...rest } = args;
+        if (image_paths !== void 0 && rest.request_attachment_ids !== void 0) throw new Error("image_paths\u3068request_attachment_ids\u306F\u7247\u65B9\u3060\u3051\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002");
+        const request_attachment_ids = image_paths !== void 0 ? await uploadImagePaths(api, image_paths) : rest.request_attachment_ids;
         const body = {
-          ...args,
+          ...rest,
+          ...request_attachment_ids !== void 0 ? { request_attachment_ids } : {},
           client: CLIENT_OF[harness],
-          session_label: args.session_label || `${basename2(process.cwd())} (${CLIENT_OF[harness]})`,
+          session_label: args.session_label || `${basename3(process.cwd())} (${CLIENT_OF[harness]})`,
           route: { channel_id: channelId, harness }
         };
         try {
@@ -16088,6 +16163,10 @@ ${JSON.stringify({ error: "duplicate_suspected", existing })}`, { error: "duplic
       }
       if (name === "amend_decision") {
         const { decision_id, ...rest } = args;
+        const { image_paths, ...changes } = rest.changes ?? {};
+        if (image_paths !== void 0 && changes.request_attachment_ids !== void 0) throw new Error("image_paths\u3068request_attachment_ids\u306F\u7247\u65B9\u3060\u3051\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002");
+        if (image_paths !== void 0) changes.request_attachment_ids = await uploadImagePaths(api, image_paths);
+        rest.changes = changes;
         const channelId = await channelFor(harness, clientName, request.params._meta);
         const decision = await api.call("POST", `/decisions/${encodeURIComponent(String(decision_id))}/amend`, { ...rest, route: { channel_id: channelId, harness } });
         lastChannel = channelId;
@@ -16122,7 +16201,7 @@ ${JSON.stringify(decision)}`, decision);
       if (name === "get_attachment") {
         const decisionId = String(args.decision_id);
         const decision = await api.call("GET", `/decisions/${encodeURIComponent(decisionId)}`);
-        const list = decision.answer?.attachments ?? [];
+        const list = [...decision.request_attachments ?? [], ...decision.answer?.attachments ?? []];
         const index = list.findIndex((a) => a.id === args.attachment_id);
         if (index < 0) return text(`Approval Box: ${decisionId} \u306E\u7B54\u3048\u306B\u3001\u305D\u306E\u6DFB\u4ED8\u306F\u3042\u308A\u307E\u305B\u3093\u3002get_decision \u306E answer.attachments \u3092\u78BA\u304B\u3081\u3066\u304F\u3060\u3055\u3044\u3002`, { error: "not_found" }, true);
         const meta = list[index];
@@ -16130,7 +16209,7 @@ ${JSON.stringify(decision)}`, decision);
         const head = `${decisionId} \u306E\u6DFB\u4ED8 ${index + 1}: ${meta.name}\uFF08${meta.content_type}\u3001${meta.size}\u30D0\u30A4\u30C8\uFF09\u3092\u4FDD\u5B58\u3057\u307E\u3057\u305F: ${path}`;
         const structured = { decision_id: decisionId, attachment: meta, path };
         if (VIEWABLE_IMAGES.includes(meta.content_type) && meta.size <= MAX_INLINE_IMAGE) {
-          return { content: [{ type: "text", text: head }, { type: "image", data: readFileSync6(path).toString("base64"), mimeType: meta.content_type }], structuredContent: structured };
+          return { content: [{ type: "text", text: head }, { type: "image", data: readFileSync7(path).toString("base64"), mimeType: meta.content_type }], structuredContent: structured };
         }
         return text(head, structured);
       }
@@ -16140,7 +16219,7 @@ ${JSON.stringify(decision)}`, decision);
         const decision = await api.call("POST", "/setup-test", {
           client: CLIENT_OF[harness],
           os: osName(),
-          session_label: `\u63A5\u7D9A\u30C6\u30B9\u30C8 ${basename2(process.cwd())} (${CLIENT_OF[harness]})`,
+          session_label: `\u63A5\u7D9A\u30C6\u30B9\u30C8 ${basename3(process.cwd())} (${CLIENT_OF[harness]})`,
           route: { channel_id: channelId, harness }
         });
         const message = `\u63A5\u7D9A\u30C6\u30B9\u30C8\u306E\u7533\u8ACB\u3092\u9001\u308A\u307E\u3057\u305F\uFF08${decision.decision_id}\uFF09\u3002\u5229\u7528\u8005\u306B\u30A2\u30D7\u30EA\u304BWeb\u7248\u3067\u7B54\u3048\u308B\u3088\u3046\u4F1D\u3048\u3066\u304F\u3060\u3055\u3044\u3002\u7B54\u3048\u304C\u3053\u306E\u4F1A\u8A71\u3078\u5C4A\u3044\u305F\u3089\u3001\u305D\u3053\u306B\u66F8\u304B\u308C\u305F\u78BA\u8A8D\u30B3\u30FC\u30C9\u3067 confirm_setup_test \u3092\u547C\u3093\u3067\u304F\u3060\u3055\u3044\u3002`;
@@ -16196,13 +16275,13 @@ async function ask(question) {
   }
 }
 function installRuntime() {
-  const target = join9(home(), "runtime", VERSION);
+  const target = join10(home(), "runtime", VERSION);
   if (runtimeDir() !== target) {
     rmSync3(target, { recursive: true, force: true });
     mkdirSync5(target, { recursive: true });
     cpSync(runtimeDir(), target, { recursive: true });
   }
-  return join9(target, "cli.mjs");
+  return join10(target, "cli.mjs");
 }
 function selectedTargets() {
   const only = option("only");
@@ -16347,7 +16426,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(join9(home(), "config.json"), { force: true });
+  rmSync3(join10(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.19",
+  "version": "0.1.21",
   "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",