@skylandnpm/octopus-proxy 0.1.54 → 0.1.57

package/dist/{chunk-NJNANA6A.js → chunk-YFY544PH.js}

@@ -8830,6 +8830,33 @@ var SecureChat = class {
 import { randomUUID as randomUUID8 } from "node:crypto";
 import { execFile as execFile3 } from "node:child_process";
 import { promisify as promisify3 } from "node:util";
+
+// src/reasoning.ts
+function reasoningLevels(value) {
+  if (!Array.isArray(value)) return [];
+  return [...new Set(value.flatMap((entry) => {
+    const level = typeof entry === "string" ? entry : entry && typeof entry === "object" ? entry.value ?? entry.reasoningEffort ?? entry.id : void 0;
+    return typeof level === "string" && level.trim() ? [level.trim()] : [];
+  }))];
+}
+function defaultReasoningLevel(levels) {
+  if (levels.includes("medium")) return "medium";
+  const order = ["none", "off", "nothink", "minimal", "low", "medium", "high", "xhigh", "max", "ultra"];
+  const active = levels.filter((level) => !["none", "off", "nothink"].includes(level));
+  const choices = (active.length ? active : levels).slice().sort((a, b) => {
+    const left = order.indexOf(a), right = order.indexOf(b);
+    return left < 0 || right < 0 ? 0 : left - right;
+  });
+  return choices[Math.floor((choices.length - 1) / 2)];
+}
+function selectedReasoningLevel(payload, parameter) {
+  if (typeof payload.reasoningLevel !== "string" || !payload.reasoningLevel) return void 0;
+  if (payload.reasoningParameter !== void 0 && payload.reasoningParameter !== parameter)
+    throw new Error(`Reasoning parameter must be ${parameter} for this tool; refresh the model configuration`);
+  return payload.reasoningLevel;
+}
+
+// src/proxy-snapshot.ts
 var execute2 = promisify3(execFile3);
 function record(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
@@ -8844,7 +8871,8 @@ function publicModels(value) {
     for (const modelValue of Object.values(record(provider.models))) {
       const model = record(modelValue);
       if (typeof model.id !== "string") continue;
-      result.push({ id: `${provider.id}/${model.id}`, name: typeof model.name === "string" ? model.name : model.id, isDefault: model.isDefault === true });
+      const levels = reasoningLevels(model.reasoningLevels);
+      result.push({ id: `${provider.id}/${model.id}`, name: typeof model.name === "string" ? model.name : model.id, isDefault: model.isDefault === true, ...Array.isArray(model.reasoningLevels) ? { reasoningLevels: levels } : {}, ...typeof model.reasoningParameter === "string" ? { reasoningParameter: model.reasoningParameter } : {} });
       if (result.length >= 500) return result;
     }
   }
@@ -10764,6 +10792,8 @@ var OpenCodeAdapter = class {
       const input = payload.model;
       model = { providerID: input.providerID, id: input.modelID ?? input.id, ...input.variant ? { variant: input.variant } : {} };
     } 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 });
   }
   async models(project) {
@@ -10777,7 +10807,7 @@ var OpenCodeAdapter = class {
       const modelId = model.id ?? model.modelID;
       if (typeof model.providerID !== "string" || typeof modelId !== "string") continue;
       const provider = providers.get(model.providerID) ?? { id: model.providerID, models: {} };
-      provider.models[modelId] = { ...model, id: modelId, isDefault: configured ? configured === `${model.providerID}/${modelId}` : model.isDefault === true };
+      provider.models[modelId] = { ...model, id: modelId, reasoningParameter: "model.variant", reasoningLevels: reasoningLevels(model.variants), isDefault: configured ? configured === `${model.providerID}/${modelId}` : model.isDefault === true };
       providers.set(model.providerID, provider);
     }
     return redact({ providers: [...providers.values()] });
@@ -12103,7 +12133,7 @@ var CodexAdapter = class {
       const config = await rpc.request("config/read", { cwd: await this.workspace.root(project), includeLayers: false }).catch(() => void 0);
       const configured = typeof config?.config?.model === "string" ? config.config.model.trim() : void 0;
       if (configured && !models.some((entry) => (entry.model ?? entry.id) === configured)) models.push({ id: configured, model: configured, displayName: configured });
-      return { providers: [{ id: "codex", models: Object.fromEntries(models.map((entry) => [entry.model ?? entry.id, { id: entry.model ?? entry.id, name: entry.displayName ?? entry.id, isDefault: configured ? (entry.model ?? entry.id) === configured : entry.isDefault === true }])) }] };
+      return { providers: [{ id: "codex", models: Object.fromEntries(models.map((entry) => [entry.model ?? entry.id, { id: entry.model ?? entry.id, name: entry.displayName ?? entry.id, ...entry.supportedReasoningEfforts ? { reasoningParameter: "effort", reasoningLevels: reasoningLevels(entry.supportedReasoningEfforts) } : {}, isDefault: configured ? (entry.model ?? entry.id) === configured : entry.isDefault === true }])) }] };
     }
     if (op === "sessions.list") {
       const index = await this.index(project);
@@ -12164,7 +12194,8 @@ var CodexAdapter = class {
       if (!input.length) throw new Error("Message or attachments required");
       const selectedModel = p.model;
       const model = selectedModel?.providerID === "codex" && typeof selectedModel.modelID === "string" ? selectedModel.modelID : void 0;
-      const result = await rpc.request("turn/start", { threadId: id, input, ...model ? { model } : {} });
+      const effort = selectedReasoningLevel(p, "effort");
+      const result = await rpc.request("turn/start", { threadId: id, input, ...model ? { model } : {}, ...effort ? { effort } : {} });
       this.activeTurns.set(id, result.turn.id);
       return result;
     }
@@ -12411,7 +12442,7 @@ var ZcodeAdapter = class {
         const providers = /* @__PURE__ */ new Map();
         for (const entry of model.available) {
           const provider = providers.get(entry.ref.providerId) ?? { id: entry.ref.providerId, name: entry.providerLabel, models: /* @__PURE__ */ Object.create(null) };
-          provider.models[entry.ref.modelId] = { id: entry.ref.modelId, name: entry.label, isDefault: entry.ref.providerId === model.current?.providerId && entry.ref.modelId === model.current?.modelId };
+          provider.models[entry.ref.modelId] = { id: entry.ref.modelId, name: entry.label, reasoningParameter: "model.options.reasoningLevel", reasoningLevels: reasoningLevels(entry.reasoning?.levels), isDefault: entry.ref.providerId === model.current?.providerId && entry.ref.modelId === model.current?.modelId };
           providers.set(provider.id, provider);
         }
         return { providers: [...providers.values()] };
@@ -12487,7 +12518,18 @@ var ZcodeAdapter = class {
       }
       if (!lines.length) throw new Error("Message or attachments required");
       const selected = p.model;
-      if (selected?.providerID && selected.modelID) await rpc.request("session/setModel", { sessionId: id, model: { providerId: selected.providerID, modelId: selected.modelID } });
+      if (selected?.providerID && selected.modelID) {
+        let level = selectedReasoningLevel(p, "model.options.reasoningLevel");
+        if (!level) {
+          const snapshot = await rpc.request("session/read", { sessionId: id });
+          const entry = snapshot.settings?.model.available.find((entry2) => entry2.ref.providerId === selected.providerID && entry2.ref.modelId === selected.modelID);
+          level = defaultReasoningLevel(reasoningLevels(entry?.reasoning?.levels));
+        }
+        await rpc.request("session/setModel", { sessionId: id, model: { providerId: selected.providerID, modelId: selected.modelID, ...level ? { options: { reasoningLevel: level } } : {} } });
+      } else if (typeof p.reasoningLevel === "string" && p.reasoningLevel) {
+        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") });
     }
     if (op === "sessions.abort") {
@@ -12749,7 +12791,8 @@ var PiAdapter = class {
       const providers = /* @__PURE__ */ new Map();
       for (const model of models) {
         const provider = providers.get(model.provider) ?? { id: model.provider, models: /* @__PURE__ */ Object.create(null) };
-        provider.models[model.id] = { id: model.id, name: model.name ?? model.id, isDefault: state?.model?.provider === model.provider && state.model.id === model.id };
+        const levels = model.reasoning ? ["off", "minimal", "low", "medium", "high", ...["xhigh", "max"].filter((level) => model.thinkingLevelMap?.[level] != null)].filter((level) => model.thinkingLevelMap?.[level] !== null) : [];
+        provider.models[model.id] = { id: model.id, name: model.name ?? model.id, reasoningParameter: "level", reasoningLevels: reasoningLevels(levels), isDefault: state?.model?.provider === model.provider && state.model.id === model.id };
         providers.set(model.provider, provider);
       }
       return { providers: [...providers.values()] };
@@ -12850,7 +12893,9 @@ var PiAdapter = class {
       }
       if (!lines.length && !images.length) throw new Error("Message or attachments required");
       const model = p.model;
+      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 });
       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

@@ -34,7 +34,7 @@ import {
   supportedPlatform,
   systemdUnitPath,
   toolSearchDirs
-} from "./chunk-NJNANA6A.js";
+} from "./chunk-YFY544PH.js";
 import {
   DESKTOP_PERMISSION_GUIDANCE,
   PlatformDesktop,

package/dist/main.js

@@ -2,7 +2,7 @@
 import {
   ConfigError,
   runDaemon
-} from "./chunk-NJNANA6A.js";
+} from "./chunk-YFY544PH.js";
 import "./chunk-XIJKEY4L.js";
 
 // src/main.ts

package/native/desktop-macos.m

@@ -138,8 +138,16 @@ int main(int argc, const char *argv[]) {
         if (!display) { dispatch_async(dispatch_get_main_queue(), ^{ fail(@"所选显示器已断开，请刷新显示器列表后重试。" ); }); return; }
         SCContentFilter *filter = [[SCContentFilter alloc] initWithDisplay:display excludingWindows:@[]];
         SCStreamConfiguration *configuration = [SCStreamConfiguration new];
-        configuration.width = CGDisplayPixelsWide(display.displayID);
-        configuration.height = CGDisplayPixelsHigh(display.displayID);
+        if (@available(macOS 14.0, *)) {
+          configuration.width = CGDisplayPixelsWide(display.displayID);
+          configuration.height = CGDisplayPixelsHigh(display.displayID);
+        } else {
+          // On macOS 13, re-entering Quartz display queries from the
+          // SCShareableContent callback can block indefinitely. The returned
+          // SCDisplay already contains the dimensions needed for capture.
+          configuration.width = display.width;
+          configuration.height = display.height;
+        }
         configuration.pixelFormat = kCVPixelFormatType_32BGRA;
         configuration.showsCursor = YES;
         configuration.queueDepth = 3;

package/native/remote-macos.m

@@ -271,6 +271,14 @@ int main(int argc,const char *argv[]) {
         emit(@{@"capture":@(CGPreflightScreenCaptureAccess()),@"input":@((BOOL)(AXIsProcessTrusted() && CGPreflightPostEventAccess())),@"session":@(sessionPresent()),@"locked":@(screenLocked()),@"lockCapture":@(lockCapture)}); return 0;
       }
       if(argc!=6 || strcmp(argv[1],"serve")!=0 || !inputOK() || !CGPreflightScreenCaptureAccess()) return 1;
+      if (@available(macOS 14.0, *)) {
+        // Keep the current display initialization on modern macOS.
+      } else {
+        // Initialize AppKit's display connection on the main thread first.
+        // Otherwise Quartz display queries can hang on macOS 13 before the
+        // capture stream is even created. This does not request permissions.
+        (void)NSScreen.screens;
+      }
       displayID=(CGDirectDisplayID)strtoul(argv[2],NULL,10);
       int w=atoi(argv[3]),h=atoi(argv[4]),fps=atoi(argv[5]);
       if(!CGDisplayIsOnline(displayID) || w<2 || h<2 || w>3840 || h>2160 || w%2 || h%2 || fps<1 || fps>30) return 1;

package/package.json

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