@skylandnpm/octopus-proxy 0.1.73 → 0.1.74

package/dist/{chunk-SSY3TLHA.js → chunk-JUUJGAHF.js}

@@ -11070,6 +11070,7 @@ var OpenCodeAdapter = class {
   terminalOutput = /* @__PURE__ */ new Map();
   permissionEvents = /* @__PURE__ */ new Map();
   resolving = /* @__PURE__ */ new Set();
+  approveAll = /* @__PURE__ */ new Set();
   config;
   media;
   async request(project, method, path, body, signal) {
@@ -11128,6 +11129,7 @@ var OpenCodeAdapter = class {
       { id: "ask", label: "\u8BF7\u6C42\u6279\u51C6", description: "\u6BCF\u6B21\u4F7F\u7528\u5DE5\u5177\u524D\u8BF7\u6C42\u6279\u51C6" },
       { id: "full", label: "\u5B8C\u5168\u8BBF\u95EE", description: "\u81EA\u52A8\u5141\u8BB8\u5DE5\u5177\u64CD\u4F5C\uFF1B\u4ECD\u9075\u5B88\u4E3B\u673A\u548C\u5DE5\u5177\u81EA\u8EAB\u7684\u8BBF\u95EE\u9650\u5236" }
     ] };
+    if (id && ["sessions.prompt", "sessions.command", "sessions.shell", "sessions.abort", "sessions.delete"].includes(op)) this.approveAll.delete(`${project}\0${id}`);
     if (op === "sessions.prompt") return this.prompt(project, id, p, base, session?.model);
     if (op === "sessions.command" || op === "sessions.shell") {
       await this.switchSelection(project, base, p);
@@ -11262,7 +11264,7 @@ var OpenCodeAdapter = class {
       entries = [...this.permissionEvents.get(project)?.values() ?? []].filter((entry) => !session || entry.sessionID === session);
       if (!entries.length) throw error;
     }
-    return (Array.isArray(entries) ? entries : []).map((entry) => ({ ...entry, permission: entry.action, patterns: entry.resources ?? [], replies: ["once", "always", "reject"] }));
+    return (Array.isArray(entries) ? entries : []).map((entry) => ({ ...entry, permission: entry.action, patterns: entry.resources ?? [], replies: ["once", "always", "all", "reject"] }));
   }
   trackPermission(project, type, data) {
     if (typeof data?.sessionID !== "string" || !SESSION_ID.test(data.sessionID)) return;
@@ -11272,6 +11274,12 @@ var OpenCodeAdapter = class {
       if (!pending) this.permissionEvents.set(project, pending = /* @__PURE__ */ new Map());
       pending.set(data.id, data);
       if (pending.size > 256) pending.delete(pending.keys().next().value);
+      if (this.approveAll.has(`${project}\0${data.sessionID}`)) {
+        void this.resolveInteraction(project, data.sessionID, "permissions.reply", { requestId: data.id, reply: "once" }).catch(() => {
+        });
+      }
+    } else if (type === "session.idle" || type === "session.status" && data.status?.type === "idle") {
+      this.approveAll.delete(`${project}\0${data.sessionID}`);
     } else if (type === "permission.replied") {
       const pending = this.permissionEvents.get(project);
       if (pending?.get(data.requestID)?.sessionID === data.sessionID) pending.delete(data.requestID);
@@ -11296,7 +11304,14 @@ var OpenCodeAdapter = class {
       if (kind !== "permission" || !session) await this.session(project, item.sessionID);
       const base = `/api/session/${encodeURIComponent(item.sessionID)}/${kind}/${requestId}`;
       if (kind === "permission") {
-        const decision = payload.reply === "deny" ? "reject" : payload.reply;
+        if (payload.reply === "all") {
+          this.approveAll.add(`${project}\0${item.sessionID}`);
+          for (const other of pending) if (other.sessionID === item.sessionID && other.id !== item.id) {
+            await this.data(project, "POST", `/api/session/${encodeURIComponent(item.sessionID)}/permission/${this.identifier(other.id)}/reply`, { decision: "once" });
+            this.permissionEvents.get(project)?.delete(other.id);
+          }
+        }
+        const decision = payload.reply === "all" ? "once" : payload.reply === "deny" ? "reject" : payload.reply;
         const result = await this.data(project, "POST", `${base}/reply`, { decision, ...payload.message ? { message: payload.message } : {} });
         this.permissionEvents.get(project)?.delete(String(payload.requestId));
         return result;
@@ -11420,6 +11435,7 @@ var OpenCodeAdapter = class {
     this.streams.get(project)?.abort();
     this.streams.delete(project);
     this.permissionEvents.delete(project);
+    for (const key of this.approveAll) if (key.startsWith(`${project}\0`)) this.approveAll.delete(key);
     for (const [key, terminal] of this.terminals) {
       if (!key.startsWith(`${project}:`)) continue;
       terminal.close();
@@ -11481,6 +11497,7 @@ var OpenCodeAdapter = class {
   close() {
     this.auth.close();
     this.permissionEvents.clear();
+    this.approveAll.clear();
     for (const controller of this.streams.values()) controller.abort();
     for (const terminal of this.terminals.values()) terminal.close();
   }
@@ -12316,6 +12333,7 @@ var CodexAdapter = class {
   media;
   liveTurns = /* @__PURE__ */ new Map();
   approvals = /* @__PURE__ */ new Map();
+  approveAll = /* @__PURE__ */ new Set();
   inputs = /* @__PURE__ */ new Map();
   activeTurns = /* @__PURE__ */ new Map();
   loadedThreads = /* @__PURE__ */ new Map();
@@ -12356,13 +12374,17 @@ var CodexAdapter = class {
         this.trackNotification(project, method, params);
         if (method === "turn/completed") {
           const detail = params ?? {};
-          if (detail.threadId && this.activeTurns.get(detail.threadId) === detail.turn?.id) this.activeTurns.delete(detail.threadId);
+          if (detail.threadId && this.activeTurns.get(detail.threadId) === detail.turn?.id) {
+            this.activeTurns.delete(detail.threadId);
+            this.approveAll.delete(`${project}\0${detail.threadId}`);
+          }
         }
         this.emit(project, method, params);
       },
       onServerRequest: (id, method, params, respond) => this.onServerRequest(project, id, method, params, respond),
       onClose: () => {
         this.loadedThreads.delete(project);
+        for (const key of this.approveAll) if (key.startsWith(`${project}\0`)) this.approveAll.delete(key);
         for (const key of this.liveTurns.keys()) if (key.startsWith(`${project}\0`)) this.liveTurns.delete(key);
         for (const [key, entry] of this.approvals) if (entry.project === project) this.approvals.delete(key);
         for (const [key, entry] of this.inputs) if (entry.project === project) this.inputs.delete(key);
@@ -12380,7 +12402,12 @@ var CodexAdapter = class {
     const requestId = randomUUID13();
     const threadId = String(detail.threadId ?? "");
     if (["item/permissions/requestApproval", "item/commandExecution/requestApproval", "item/fileChange/requestApproval"].includes(method)) {
-      this.approvals.set(requestId, { project, method, requestId, threadId, detail, respond });
+      const entry = { project, method, requestId, threadId, detail, respond };
+      if (this.approveAll.has(`${project}\0${threadId}`)) {
+        respond(this.approvalResponse(entry, "once"));
+        return;
+      }
+      this.approvals.set(requestId, entry);
       this.emit(project, "permission.request", { requestId, threadId });
       return;
     }
@@ -12611,6 +12638,7 @@ var CodexAdapter = class {
     for (const approval of this.approvals.values()) approval.respond(this.approvalResponse(approval, "reject"));
     for (const input of this.inputs.values()) input.respond({ answers: {} });
     this.approvals.clear();
+    this.approveAll.clear();
     this.inputs.clear();
     this.liveTurns.clear();
   }
@@ -12737,6 +12765,7 @@ var CodexAdapter = class {
       }
       if (lines.length) input.push({ type: "text", text: lines.join("\n") });
       if (!input.length) throw new Error("Message or attachments required");
+      this.approveAll.delete(`${project}\0${id}`);
       const selectedModel = p.model;
       const model = selectedModel?.providerID === "codex" && typeof selectedModel.modelID === "string" ? selectedModel.modelID : void 0;
       const effort = selectedReasoningLevel(p, "effort");
@@ -12746,6 +12775,7 @@ var CodexAdapter = class {
     }
     if (op === "sessions.abort") {
       if (!id) throw new Error("Session required");
+      this.approveAll.delete(`${project}\0${id}`);
       await this.session(project, id);
       let turnId = this.activeTurns.get(id);
       if (!turnId) {
@@ -12770,15 +12800,23 @@ var CodexAdapter = class {
         permission: entry.detail.type ?? (entry.method.includes("fileChange") ? "\u6587\u4EF6\u4FEE\u6539" : entry.detail.permissions ? "\u6269\u5C55\u6743\u9650" : "\u547D\u4EE4\u6267\u884C"),
         patterns: [entry.detail.command ?? entry.detail.commandDraft ?? entry.detail.path ?? entry.detail.grantRoot ?? ""],
         metadata: entry.detail,
-        replies: ["once", "always", "reject"],
-        alwaysLabel: "\u672C\u4F1A\u8BDD\u5141\u8BB8"
+        replies: ["once", "always", "all", "reject"],
+        alwaysLabel: "\u5141\u8BB8\u7C7B\u4F3C\u8BF7\u6C42"
       }));
     }
     if (op === "permissions.reply") {
       const entry = this.approvals.get(String(p.requestId));
       if (!entry || entry.project !== project) throw new Error("Request is no longer pending in this project");
       if (id && id !== entry.threadId) throw new Error("Request belongs to another session");
-      if (!["accept", "allow", "yes", "once", "approve", "true", "always", "reject"].includes(String(p.reply))) throw new Error("Invalid permission reply");
+      if (!["accept", "allow", "yes", "once", "approve", "true", "always", "all", "reject"].includes(String(p.reply))) throw new Error("Invalid permission reply");
+      if (p.reply === "all") {
+        this.approveAll.add(`${project}\0${entry.threadId}`);
+        for (const [key, pending] of this.approvals) if (pending.project === project && pending.threadId === entry.threadId) {
+          this.approvals.delete(key);
+          pending.respond(this.approvalResponse(pending, "once"));
+        }
+        return { ok: true };
+      }
       entry.respond(this.approvalResponse(entry, String(p.reply)));
       this.approvals.delete(String(p.requestId));
       return { ok: true };
@@ -12841,6 +12879,7 @@ var ZcodeAdapter = class {
   auth = new AuthFlows();
   media;
   permissions = /* @__PURE__ */ new Map();
+  approveAll = /* @__PURE__ */ new Set();
   inputs = /* @__PURE__ */ new Map();
   subscribed = /* @__PURE__ */ new Set();
   resuming = /* @__PURE__ */ new Map();
@@ -12855,6 +12894,7 @@ var ZcodeAdapter = class {
       },
       onServerRequest: (id, method, params, respond, respondError) => this.onServerRequest(project, id, method, params, respond, respondError),
       onClose: () => {
+        for (const key of this.approveAll) if (key.startsWith(`${project}\0`)) this.approveAll.delete(key);
         for (const key of this.subscribed) if (key.startsWith(`${project}\0`)) this.subscribed.delete(key);
         for (const [key, entry] of this.permissions) if (entry.project === project) this.permissions.delete(key);
         for (const [key, entry] of this.inputs) if (entry.project === project) this.inputs.delete(key);
@@ -12873,6 +12913,10 @@ var ZcodeAdapter = class {
       return;
     }
     if (method === "interaction/requestPermission" || method === "permission.request") {
+      if (this.approveAll.has(`${project}\0${sessionId}`)) {
+        respond({ decision: "allow" });
+        return;
+      }
       this.permissions.set(requestId, { project, requestId, sessionId, detail, respond });
       this.emit(project, "permission.request", { sessionID: sessionId, requestId });
       return;
@@ -12998,6 +13042,7 @@ var ZcodeAdapter = class {
     for (const entry of this.permissions.values()) entry.respond({ decision: "deny" });
     for (const entry of this.inputs.values()) entry.respond({ action: "decline" });
     this.permissions.clear();
+    this.approveAll.clear();
     this.inputs.clear();
   }
   async dispatch(command) {
@@ -13118,10 +13163,16 @@ var ZcodeAdapter = class {
         const level = selectedReasoningLevel(p, "thoughtLevel");
         await rpc.request("session/setThoughtLevel", { sessionId: id, thoughtLevel: level });
       }
-      return await rpc.request("session/send", { sessionId: id, content: lines.join("\n") });
+      this.approveAll.delete(`${project}\0${id}`);
+      try {
+        return await rpc.request("session/send", { sessionId: id, content: lines.join("\n") });
+      } finally {
+        this.approveAll.delete(`${project}\0${id}`);
+      }
     }
     if (op === "sessions.abort") {
       if (!id) throw new Error("Session required");
+      this.approveAll.delete(`${project}\0${id}`);
       return await rpc.request("session/stop", { sessionId: id });
     }
     if (op === "sessions.delete") {
@@ -13136,15 +13187,23 @@ var ZcodeAdapter = class {
         permission: entry.detail.type ?? entry.detail.toolName ?? "\u64CD\u4F5C\u786E\u8BA4",
         patterns: [entry.detail.command ?? entry.detail.pattern ?? ""],
         metadata: entry.detail,
-        replies: this.alwaysResponse(entry) ? ["once", "always", "reject"] : ["once", "reject"],
-        alwaysLabel: "\u6309\u8BF7\u6C42\u8303\u56F4\u5141\u8BB8"
+        replies: this.alwaysResponse(entry) ? ["once", "always", "all", "reject"] : ["once", "all", "reject"],
+        alwaysLabel: "\u5141\u8BB8\u7C7B\u4F3C\u8BF7\u6C42"
       }));
     }
     if (op === "permissions.reply") {
       const entry = this.permissions.get(String(p.requestId));
       if (!entry || entry.project !== project) throw new Error("Request is no longer pending in this project");
       if (id && id !== entry.sessionId) throw new Error("Request belongs to another session");
-      if (!["accept", "once", "always", "reject"].includes(String(p.reply))) throw new Error("Invalid permission reply");
+      if (!["accept", "once", "always", "all", "reject"].includes(String(p.reply))) throw new Error("Invalid permission reply");
+      if (p.reply === "all") {
+        this.approveAll.add(`${project}\0${entry.sessionId}`);
+        for (const [key, pending] of this.permissions) if (pending.project === project && pending.sessionId === entry.sessionId) {
+          this.permissions.delete(key);
+          pending.respond({ decision: "allow" });
+        }
+        return { ok: true };
+      }
       const always = p.reply === "always" ? this.alwaysResponse(entry) : void 0;
       if (p.reply === "always" && !always) throw new Error("Persistent approval is not offered by this request");
       entry.respond(always ?? { decision: p.reply === "reject" ? "deny" : "allow" });
@@ -13244,6 +13303,7 @@ var PiAdapter = class {
   partials = /* @__PURE__ */ new Map();
   active = /* @__PURE__ */ new Set();
   questions = /* @__PURE__ */ new Map();
+  approveAll = /* @__PURE__ */ new Set();
   mutations = /* @__PURE__ */ new Map();
   deleting = /* @__PURE__ */ new Set();
   reconfiguring = /* @__PURE__ */ new Set();
@@ -13287,7 +13347,10 @@ var PiAdapter = class {
           calls.set(detail.toolCallId, progress);
           this.toolProgress.set(key, calls);
         }
-        if (type === "agent_settled") this.active.delete(key);
+        if (type === "agent_settled") {
+          this.active.delete(key);
+          this.approveAll.delete(key);
+        }
         if (type === "message_update") this.partials.set(key, detail.message);
         if (type === "message_end" || type === "agent_end" || type === "agent_settled") this.partials.delete(key);
         if (type === "extension_ui_request") {
@@ -13298,6 +13361,7 @@ var PiAdapter = class {
         this.emit(project, event, { ...detail, sessionID: id });
       },
       onClose: () => {
+        this.approveAll.delete(this.key(project, id));
         this.partials.delete(this.key(project, id));
         this.active.delete(this.key(project, id));
         this.clearQuestions(project, id);
@@ -13311,6 +13375,10 @@ var PiAdapter = class {
     void this.rpc(project, sessionId).then((rpc) => {
       if (rpc.exited) return;
       const question = { id, project, sessionId, detail, rpc };
+      if (this.isPermission(question) && this.approveAll.has(this.key(project, sessionId))) {
+        rpc.notify("extension_ui_response", { id: detail.id, confirmed: true });
+        return;
+      }
       if (typeof detail.timeout === "number" && detail.timeout > 0) {
         question.timer = setTimeout(() => {
           this.questions.delete(id);
@@ -13339,6 +13407,7 @@ var PiAdapter = class {
       if (!question.rpc.exited) question.rpc.notify("extension_ui_response", { id: question.detail.id, cancelled: true });
     }
     this.questions.clear();
+    this.approveAll.clear();
     this.partials.clear();
     this.active.clear();
     this.toolProgress.clear();
@@ -13440,13 +13509,22 @@ var PiAdapter = class {
         sessionID: q.sessionId,
         permission: "Pi \u5DE5\u5177\u64CD\u4F5C",
         patterns: [q.detail.message ?? ""],
-        replies: ["once", "reject"]
+        replies: ["once", "all", "reject"]
       }));
     }
     if (op === "permissions.reply") {
       const question = this.questions.get(String(p.requestId));
       if (!question || !this.isPermission(question) || question.project !== project || id && id !== question.sessionId) throw new Error("Request is no longer pending in this session");
-      if (p.reply !== "once" && p.reply !== "reject") throw new Error("Invalid permission reply");
+      if (p.reply !== "once" && p.reply !== "all" && p.reply !== "reject") throw new Error("Invalid permission reply");
+      if (p.reply === "all") {
+        this.approveAll.add(this.key(project, question.sessionId));
+        for (const [key, pending] of this.questions) if (pending.project === project && pending.sessionId === question.sessionId && this.isPermission(pending)) {
+          clearTimeout(pending.timer);
+          this.questions.delete(key);
+          pending.rpc.notify("extension_ui_response", { id: pending.detail.id, confirmed: true });
+        }
+        return { ok: true };
+      }
       question.rpc.notify("extension_ui_response", { id: question.detail.id, confirmed: p.reply === "once" });
       clearTimeout(question.timer);
       this.questions.delete(question.id);
@@ -13509,6 +13587,7 @@ var PiAdapter = class {
       return this.media.messages(project, id, this.messages(messages, this.key(project, id)));
     }
     if (op === "sessions.abort") {
+      this.approveAll.delete(this.key(project, id));
       this.clearQuestions(project, id);
       await rpc.request("clear_queue");
       await rpc.request("abort");
@@ -13544,6 +13623,7 @@ var PiAdapter = class {
       const level = selectedReasoningLevel(p, "level");
       if (model && typeof model.providerID === "string" && typeof model.modelID === "string") await rpc.request("set_model", { provider: model.providerID, modelId: model.modelID });
       if (level) await rpc.request("set_thinking_level", { level });
+      this.approveAll.delete(this.key(project, id));
       const result = await rpc.request("prompt", { message: lines.join("\n"), ...images.length ? { images } : {} });
       session.time.updated = Date.now();
       if (session.title === "\u65B0\u4EFB\u52A1" && typeof p.text === "string" && p.text.trim()) session.title = p.text.trim().slice(0, 100);

package/dist/cli.js

@@ -35,7 +35,7 @@ import {
   supportedPlatform,
   systemdUnitPath,
   toolSearchDirs
-} from "./chunk-SSY3TLHA.js";
+} from "./chunk-JUUJGAHF.js";
 import {
   DESKTOP_PERMISSION_GUIDANCE,
   PlatformDesktop,

package/dist/main.js

@@ -2,7 +2,7 @@
 import {
   ConfigError,
   runDaemon
-} from "./chunk-SSY3TLHA.js";
+} from "./chunk-JUUJGAHF.js";
 import "./chunk-OTKNRBZ7.js";
 
 // src/main.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skylandnpm/octopus-proxy",
-  "version": "0.1.73",
+  "version": "0.1.74",
   "type": "module",
   "description": "Octopus host proxy: OpenCode, Codex, ZCode and Pi adapters with service installer CLI",
   "bin": {