@skylandnpm/octopus-proxy 0.1.72 → 0.1.73

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

@@ -11034,6 +11034,24 @@ var UNSUPPORTED = /* @__PURE__ */ new Set([
   "runtime.restart",
   "runtime.logs"
 ]);
+var SESSION_ID = /^ses_[A-Za-z0-9]+$/;
+var PERMISSION_ID = /^per_[A-Za-z0-9]+$/;
+var OpenCodeHttpError = class extends Error {
+  constructor(status, body) {
+    super(`OpenCode ${status}: ${body}`);
+    this.status = status;
+    this.body = body;
+  }
+};
+function isPermissionMetadataError(error) {
+  if (!(error instanceof OpenCodeHttpError) || error.status !== 400) return false;
+  try {
+    const body = JSON.parse(error.body);
+    return body?._tag === "InvalidRequestError" && body.kind === "Body" && typeof body.message === "string" && /^Expected JSON value\s+at \["data"\]\[\d+\]\["metadata"\]\["[^"]+"\]$/.test(body.message);
+  } catch {
+    return false;
+  }
+}
 var OpenCodeAdapter = class {
   constructor(runtime, workspace, uploads, emit) {
     this.runtime = runtime;
@@ -11050,6 +11068,7 @@ var OpenCodeAdapter = class {
   streams = /* @__PURE__ */ new Map();
   terminals = /* @__PURE__ */ new Map();
   terminalOutput = /* @__PURE__ */ new Map();
+  permissionEvents = /* @__PURE__ */ new Map();
   resolving = /* @__PURE__ */ new Set();
   config;
   media;
@@ -11072,7 +11091,7 @@ var OpenCodeAdapter = class {
       }
       throw error;
     });
-    if (!response.ok) throw new Error(`OpenCode ${response.status}: ${(await response.text()).slice(0, 1500)}`);
+    if (!response.ok) throw new OpenCodeHttpError(response.status, (await response.text()).slice(0, 1500));
     if (response.status === 204) return null;
     const text = await response.text();
     return text ? JSON.parse(text) : null;
@@ -11081,7 +11100,7 @@ var OpenCodeAdapter = class {
     return unwrap2(await this.request(project, method, path, body, signal));
   }
   async session(project, id) {
-    if (!/^ses_[A-Za-z0-9]+$/.test(id)) throw new Error("Invalid session id");
+    if (!SESSION_ID.test(id)) throw new Error("Invalid session id");
     const session = await this.data(project, "GET", `/api/session/${encodeURIComponent(id)}`);
     const directory = session?.location?.directory ?? session?.directory;
     if (typeof directory !== "string" || await realpath4(directory) !== await this.workspace.root(project)) throw new Error("Session belongs to another project");
@@ -11099,22 +11118,26 @@ var OpenCodeAdapter = class {
     const op = command.operation, p = command.payload, id = command.sessionId;
     if (op.startsWith("auth.")) return this.authentication(project, op, p);
     const needsSession = op.startsWith("sessions.") && !["sessions.list", "sessions.create"].includes(op);
+    let session;
     if (needsSession) {
       if (!id) throw new Error("Session required");
-      await this.session(project, id);
+      session = await this.session(project, id);
     }
     const base = `/api/session/${encodeURIComponent(id ?? "")}`;
     if (op === "configuration.permissionModes") return { defaultMode: "ask", modes: [
       { 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 (op === "sessions.prompt") return this.prompt(project, id, p, base);
+    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);
       if (op === "sessions.shell") return this.data(project, "POST", `${base}/shell`, { ...p.id ? { id: p.id } : {}, command: p.command });
       return this.data(project, "POST", `${base}/command`, { name: p.name ?? p.command, text: p.text ?? p.arguments ?? "", delivery: "queue", ...Array.isArray(p.files) ? { files: p.files } : {}, ...Array.isArray(p.agents) ? { agents: p.agents } : {}, ...Array.isArray(p.skills) ? { skills: p.skills } : {} });
     }
-    if (op === "permissions.list") return this.permissions(project, id);
+    if (op === "permissions.list") {
+      if (id) await this.session(project, id);
+      return this.permissions(project, id);
+    }
     if (op === "questions.list") return this.forms(project, id);
     if (op === "permissions.reply" || op === "questions.reply" || op === "questions.reject") return this.resolveInteraction(project, id, op, p);
     if (op === "configuration.models") return this.models(project);
@@ -11163,18 +11186,32 @@ var OpenCodeAdapter = class {
     if (op.startsWith("sessions.")) return this.media.normalize(project, normalizeSession(result));
     return result;
   }
-  async prompt(project, session, p, base) {
+  async prompt(project, session, p, base, sessionModel) {
     const text = typeof p.text === "string" ? screenshotPrompt(p.text) : "";
     const files = [];
+    let hasImage = false;
     for (const uploadId of Array.isArray(p.attachments) ? p.attachments : []) {
       const upload = await this.uploads.attachment(project, String(uploadId), session);
       files.push({ uri: pathToFileURL(await this.workspace.path(project, upload.destination)).href, name: upload.name });
+      hasImage ||= upload.mime.startsWith("image/");
     }
     if (!text.trim() && !files.length) throw new Error("Message or attachments required");
-    await this.switchSelection(project, base, p);
-    return this.data(project, "POST", `${base}/prompt`, { text, files, delivery: "queue", ...p.messageID ? { id: p.messageID } : {} });
-  }
-  async switchSelection(project, base, payload) {
+    const model = this.modelSelection(p);
+    if (hasImage) await this.checkImageInput(project, model ?? sessionModel);
+    await this.switchSelection(project, base, p, model);
+    const admitted = await this.data(project, "POST", `${base}/prompt`, { text, files, delivery: "queue", ...p.messageID ? { id: p.messageID } : {} });
+    return typeof admitted?.id === "string" ? { id: admitted.id } : null;
+  }
+  async checkImageInput(project, model) {
+    if (typeof model?.providerID !== "string" || typeof model.id !== "string") return;
+    const catalog = await this.data(project, "GET", "/api/model", void 0, AbortSignal.timeout(2e3)).catch(() => null);
+    const entry = Array.isArray(catalog) ? catalog.find((item) => item.providerID === model.providerID && (item.id ?? item.modelID) === model.id) : void 0;
+    const input = entry?.capabilities?.input;
+    if (Array.isArray(input) && !input.includes("image")) {
+      throw new Error(`OpenCode \u6A21\u578B ${model.providerID}/${model.id} \u4E0D\u652F\u6301\u56FE\u7247\u8F93\u5165\uFF0C\u8BF7\u5207\u6362\u6A21\u578B\u6216\u68C0\u67E5\u8BE5\u6A21\u578B\u7684\u8F93\u5165\u914D\u7F6E\u3002`);
+    }
+  }
+  async switchSelection(project, base, payload, model = this.modelSelection(payload)) {
     if (payload.permissionMode !== void 0) {
       if (!["ask", "full"].includes(String(payload.permissionMode))) throw new Error("Unsupported permission mode");
       const states = await this.data(project, "GET", "/api/session/active");
@@ -11183,6 +11220,9 @@ var OpenCodeAdapter = class {
       await this.data(project, "PATCH", base, { permissions: [{ action: "*", resource: "*", effect: payload.permissionMode === "full" ? "allow" : "ask" }] });
     }
     if (payload.agent) await this.data(project, "POST", `${base}/agent`, { agent: payload.agent });
+    if (model) await this.data(project, "POST", `${base}/model`, { model });
+  }
+  modelSelection(payload) {
     if (!payload.model) return;
     let model;
     if (typeof payload.model === "string") {
@@ -11195,7 +11235,7 @@ var OpenCodeAdapter = class {
     } else throw new Error("Invalid model identifier");
     const level = selectedReasoningLevel(payload, "model.variant");
     if (level) model.variant = level;
-    await this.data(project, "POST", `${base}/model`, { model });
+    return model;
   }
   async models(project) {
     const models = await this.data(project, "GET", "/api/model");
@@ -11214,9 +11254,29 @@ var OpenCodeAdapter = class {
     return redact({ providers: [...providers.values()] });
   }
   async permissions(project, session) {
-    const entries = await this.data(project, "GET", session ? `/api/session/${encodeURIComponent(session)}/permission` : "/api/permission/request");
+    let entries;
+    try {
+      entries = await this.data(project, "GET", session ? `/api/session/${encodeURIComponent(session)}/permission` : "/api/permission/request");
+    } catch (error) {
+      if (!isPermissionMetadataError(error)) throw error;
+      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"] }));
   }
+  trackPermission(project, type, data) {
+    if (typeof data?.sessionID !== "string" || !SESSION_ID.test(data.sessionID)) return;
+    if (type === "permission.asked") {
+      if (typeof data.id !== "string" || !PERMISSION_ID.test(data.id) || typeof data.action !== "string" || !Array.isArray(data.resources) || !data.resources.every((resource) => typeof resource === "string")) return;
+      let pending = this.permissionEvents.get(project);
+      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);
+    } else if (type === "permission.replied") {
+      const pending = this.permissionEvents.get(project);
+      if (pending?.get(data.requestID)?.sessionID === data.sessionID) pending.delete(data.requestID);
+    }
+  }
   async forms(project, session) {
     const entries = await this.data(project, "GET", session ? `/api/session/${encodeURIComponent(session)}/form` : "/api/form");
     return (Array.isArray(entries) ? entries : []).map(formToQuestion);
@@ -11228,15 +11288,18 @@ var OpenCodeAdapter = class {
     if (this.resolving.has(key)) throw new Error("Request is already being resolved by another client");
     this.resolving.add(key);
     try {
-      const pending = kind === "permission" ? await this.permissions(project) : await this.forms(project);
+      if (kind === "permission" && session) await this.session(project, session);
+      const pending = kind === "permission" ? await this.permissions(project, session) : await this.forms(project);
       const item = pending.find((entry) => entry.id === payload.requestId);
       if (!item) throw new Error("Request is no longer pending");
       if (session && session !== item.sessionID) throw new Error("Request belongs to another session");
-      await this.session(project, item.sessionID);
+      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;
-        return this.data(project, "POST", `${base}/reply`, { decision, ...payload.message ? { message: payload.message } : {} });
+        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;
       }
       if (operation === "questions.reject") return this.data(project, "DELETE", base);
       const fields = item.fields;
@@ -11336,7 +11399,10 @@ var OpenCodeAdapter = class {
               const data = block.split("\n").filter((line) => line.startsWith("data:")).map((line) => line.slice(5).trimStart()).join("\n");
               if (data) {
                 const event = JSON.parse(data);
-                if (!event.location?.directory || event.location.directory === root) this.emit(project, event.type === "server.connected" ? "octopus.resync" : event.type, await this.media.normalize(project, event.data ?? {}));
+                if (!event.location?.directory || event.location.directory === root) {
+                  if (event.location?.directory === root) this.trackPermission(project, event.type, event.data);
+                  this.emit(project, event.type === "server.connected" ? "octopus.resync" : event.type, await this.media.normalize(project, event.data ?? {}));
+                }
               }
             }
             if (buffer.length > Math.max(4 * 1024 * 1024, Math.ceil(this.uploads.limits.fileBytes * 4 / 3) + 1024 * 1024)) throw new Error("Event too large");
@@ -11344,6 +11410,7 @@ var OpenCodeAdapter = class {
         } catch {
           if (!controller.signal.aborted) this.emit(project, "octopus.disconnected", {});
         }
+        if (!controller.signal.aborted) this.permissionEvents.delete(project);
         if (!controller.signal.aborted) await new Promise((resolve5) => setTimeout(resolve5, 2e3));
       }
     };
@@ -11352,6 +11419,7 @@ var OpenCodeAdapter = class {
   removeProject(project) {
     this.streams.get(project)?.abort();
     this.streams.delete(project);
+    this.permissionEvents.delete(project);
     for (const [key, terminal] of this.terminals) {
       if (!key.startsWith(`${project}:`)) continue;
       terminal.close();
@@ -11412,6 +11480,7 @@ var OpenCodeAdapter = class {
   }
   close() {
     this.auth.close();
+    this.permissionEvents.clear();
     for (const controller of this.streams.values()) controller.abort();
     for (const terminal of this.terminals.values()) terminal.close();
   }
@@ -11434,7 +11503,13 @@ function normalizeMessage(message) {
   if (message?.model) info.model = { ...message.model, modelID: message.model.id };
   const parts = [];
   if (typeof message?.text === "string" && message.text) parts.push({ type: "text", text: message.text });
-  for (const file of message?.files ?? []) parts.push({ type: "file", filename: file.name, url: file.uri });
+  for (const file of message?.files ?? []) {
+    if (typeof file.data === "string" && /^image\/(?:png|jpeg|gif|webp)$/.test(file.mime)) {
+      parts.push({ type: "image", filename: file.name, mime: file.mime, base64: file.data });
+    } else {
+      parts.push({ type: "file", filename: file.name, mime: file.mime, url: file.uri });
+    }
+  }
   if (message?.type === "shell") parts.push({ type: "tool", tool: "shell", state: { status: message.time?.completed ? "completed" : "running", input: { command: message.command }, output: message.output } });
   if (message?.type === "compaction") {
     info.summary = true;

package/dist/cli.js

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

package/dist/main.js

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

package/package.json

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