@skylandnpm/octopus-proxy 0.1.58 → 0.1.60

package/dist/{chunk-AOBRAQCJ.js → chunk-VW545PK2.js}

@@ -11270,6 +11270,37 @@ function zcodeEnvironment(command) {
   return env;
 }
 
+// src/tools/zcode-standalone.ts
+import { basename as basename4 } from "node:path";
+function standaloneZcodeSource(source) {
+  const bootstrap = /\br\(([$\w]+),"runZCodeProtocolAgent"\)/.exec(source)?.[1];
+  const registry = /\br\(([$\w]+),"startProcessProviderRegistryRuntime"\)/.exec(source)?.[1];
+  if (!bootstrap || !registry) throw new Error("Unsupported ZCode bundle: native account bootstrap is unavailable");
+  const start = source.indexOf(`async function ${bootstrap}(`);
+  const end = source.indexOf(`r(${bootstrap},"runZCodeProtocolAgent")`, start);
+  if (start < 0 || end < start) throw new Error("Unsupported ZCode protocol bootstrap");
+  let body = source.slice(start, end);
+  const escapedRegistry = registry.replace(/[$]/g, "\\$&");
+  const registryCall = new RegExp(`\\b${escapedRegistry}\\(([$\\w]+)\\)`, "g");
+  const nativePorts = /([$\w]+)\.runtime\.registryService,\1\.configuredDefaultModelSelection\),/g;
+  if ([...body.matchAll(registryCall)].length !== 1 || [...body.matchAll(nativePorts)].length !== 1) {
+    throw new Error("Unsupported ZCode account bootstrap; native compatibility check failed");
+  }
+  body = body.replace(registryCall, `${registry}($1,{standalone:{}})`).replace(nativePorts, "$&providerRuntimeHeadersPort:$1.providerRuntimeHeadersPort,");
+  return source.slice(0, start) + body + source.slice(end);
+}
+function zcodeServerLaunch(command, args) {
+  if (basename4(command) !== "zcode.cjs") return { command, args: [...args] };
+  const shim = `const fs=require('node:fs'),Module=require('node:module'),path=require('node:path');
+const filename=process.argv[1];
+try {
+  const source=(${standaloneZcodeSource.toString()})(fs.readFileSync(filename,'utf8'));
+  const entry=new Module(filename);entry.filename=filename;entry.paths=Module._nodeModulePaths(path.dirname(filename));
+  entry._compile(source,filename);
+} catch(error) { console.error(error.message);process.exitCode=1; }`;
+  return { command: process.execPath, args: ["-e", shim, command, ...args] };
+}
+
 // src/tools/stdio-runtime.ts
 import { spawn as spawn3, execFile as execFile4 } from "node:child_process";
 import { promisify as promisify4 } from "node:util";
@@ -11642,8 +11673,9 @@ ${bytes.toString("utf8")}`);
       await mkdir7(this.config.stateDirectory, { recursive: true, mode: 448 });
       const log = await open6(logPath, "a", 384);
       let child;
+      const launch = this.kind === "zcode" ? zcodeServerLaunch(this.config.tool.command, this.descriptor.serverArgs) : { command: this.config.tool.command, args: [...this.descriptor.serverArgs] };
       try {
-        child = spawn3(this.config.tool.command, [...this.descriptor.serverArgs], { cwd: directory, env: this.kind === "zcode" ? zcodeEnvironment(this.config.tool.command) : { ...process.env }, stdio: ["pipe", "pipe", log.fd] });
+        child = spawn3(launch.command, launch.args, { cwd: directory, env: this.kind === "zcode" ? zcodeEnvironment(this.config.tool.command) : { ...process.env }, stdio: ["pipe", "pipe", log.fd] });
       } catch (error) {
         await log.close();
         throw error;
@@ -12297,6 +12329,7 @@ var ZcodeAdapter = class {
   permissions = /* @__PURE__ */ new Map();
   inputs = /* @__PURE__ */ new Map();
   subscribed = /* @__PURE__ */ new Set();
+  resuming = /* @__PURE__ */ new Map();
   supportedOperations() {
     return OPERATIONS2;
   }
@@ -12381,6 +12414,13 @@ var ZcodeAdapter = class {
     const turns = /* @__PURE__ */ new Map();
     let current;
     for (const row of rows) {
+      if (row.info && ["user", "assistant"].includes(String(row.info.role)) && Array.isArray(row.parts)) {
+        const semantics = row.info.semantics;
+        if (semantics?.uiVisibility === "hidden" || semantics?.uiVisibility !== "visible" && row.info.visibility === "model-only") continue;
+        messages.push({ info: { ...row.info }, parts: row.parts });
+        current = void 0;
+        continue;
+      }
       const data = row.data ?? row;
       if (data.kind === "turnHeader") {
         turns.set(String(row.turnId ?? data.turnId ?? ""), data);
@@ -12409,7 +12449,27 @@ var ZcodeAdapter = class {
   async session(project, id) {
     if (!describeTool("zcode").sessionPattern.test(id)) throw new Error("Invalid session id");
     const rpc = await this.rpc(project);
-    const result = await rpc.request("session/read", { sessionId: id });
+    let result;
+    try {
+      result = await rpc.request("session/read", { sessionId: id });
+    } catch (error) {
+      if (!(error instanceof Error) || !/^Session is not active:/i.test(error.message)) throw error;
+      const key = `${project}\0${id}`;
+      let pending = this.resuming.get(key);
+      if (!pending) {
+        pending = (async () => {
+          const list = await rpc.request("session/list", { workspace: await this.workspaceRef(project), sessionIds: [id] });
+          if (!list.sessions?.some((session) => session.sessionId === id)) throw new Error("Session not found in this project");
+          return rpc.request("session/resume", { sessionId: id });
+        })();
+        this.resuming.set(key, pending);
+      }
+      try {
+        result = await pending;
+      } finally {
+        if (this.resuming.get(key) === pending) this.resuming.delete(key);
+      }
+    }
     const sessionInfo = result.session;
     if (!sessionInfo) throw new Error("Session not found");
     const directory = sessionInfo.workspace?.workspacePath;
@@ -12438,7 +12498,7 @@ var ZcodeAdapter = class {
       const snapshot = await rpc.request("session/create", { workspace: await this.workspaceRef(project), persistence: "deferred", titleGenerationEnabled: false, toolAllowlist: [] });
       try {
         const model = snapshot.settings.model;
-        if (op === "auth.status") return { status: model.available.length ? "authenticated" : "unauthenticated", message: model.available.length ? "ZCode \u5DF2\u914D\u7F6E\u53EF\u7528\u6A21\u578B\uFF08\u51ED\u636E\u6709\u6548\u6027\u7531\u5DE5\u5177\u5728\u8C03\u7528\u65F6\u68C0\u67E5\uFF09" : "ZCode \u672A\u914D\u7F6E\u53EF\u7528\u6A21\u578B", methods: [{ id: "zai", label: "Z.AI \u6D4F\u89C8\u5668\u767B\u5F55" }] };
+        if (op === "auth.status") return { status: model.available.length ? "authenticated" : "unauthenticated", message: model.available.length ? "ZCode \u5DF2\u914D\u7F6E\u53EF\u7528\u6A21\u578B\uFF08\u51ED\u636E\u6709\u6548\u6027\u7531\u5DE5\u5177\u5728\u8C03\u7528\u65F6\u68C0\u67E5\uFF09" : "ZCode \u672A\u914D\u7F6E\u53EF\u7528\u6A21\u578B", methods: [{ id: "zai", label: "Z.AI \u6D4F\u89C8\u5668\u767B\u5F55" }, { id: "bigmodel", label: "\u667A\u8C31 BigModel \u6D4F\u89C8\u5668\u767B\u5F55" }] };
         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) };
@@ -12451,20 +12511,21 @@ var ZcodeAdapter = class {
       }
     }
     if (op === "auth.login") {
-      if (p.method !== "zai") throw new Error("\u4E0D\u652F\u6301\u7684 ZCode \u767B\u5F55\u65B9\u5F0F");
+      if (p.method !== "zai" && p.method !== "bigmodel") throw new Error("\u4E0D\u652F\u6301\u7684 ZCode \u767B\u5F55\u65B9\u5F0F");
+      const provider = p.method;
       let child;
       const flow = this.auth.create(project, () => {
         child?.kill("SIGTERM");
       });
-      child = spawn4(this.runtime.config.tool.command, ["login", "--no-browser", "--json"], { cwd: await this.workspace.root(project), env: zcodeEnvironment(this.runtime.config.tool.command), stdio: ["ignore", "pipe", "pipe"] });
+      child = spawn4(this.runtime.config.tool.command, ["login", provider, "--no-browser", "--json"], { cwd: await this.workspace.root(project), env: zcodeEnvironment(this.runtime.config.tool.command), stdio: ["ignore", "pipe", "pipe"] });
       let output = "", diagnostic = "";
       child.stdout?.on("data", (data) => {
         output = (output + data.toString()).slice(-65536);
       });
       child.stderr?.on("data", (data) => {
         diagnostic = (diagnostic + data.toString()).slice(-8192);
-        const match = /Open this URL to sign in:\s*(https?:\/\/[^\s]+)/.exec(diagnostic);
-        if (match) this.auth.update(project, flow.flowId, { url: match[1], message: "\u5728\u6D4F\u89C8\u5668\u5B8C\u6210 Z.AI \u6388\u6743\uFF0CZCode \u5C06\u81EA\u884C\u4FDD\u5B58\u8BA4\u8BC1\u4FE1\u606F" });
+        const match = /(?:Open this URL to sign in|Fallback URL):\s*(https?:\/\/[^\s]+)/.exec(diagnostic);
+        if (match) this.auth.update(project, flow.flowId, { url: match[1], message: `\u5728\u6D4F\u89C8\u5668\u5B8C\u6210 ${provider === "bigmodel" ? "\u667A\u8C31 BigModel" : "Z.AI"} \u6388\u6743\uFF0CZCode \u5C06\u81EA\u884C\u4FDD\u5B58\u8BA4\u8BC1\u4FE1\u606F` });
       });
       child.once("error", () => this.auth.update(project, flow.flowId, { status: "failed", message: "\u65E0\u6CD5\u542F\u52A8 ZCode \u539F\u751F\u767B\u5F55" }));
       child.once("exit", (code) => {

package/dist/cli.js

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

package/dist/main.js

@@ -2,7 +2,7 @@
 import {
   ConfigError,
   runDaemon
-} from "./chunk-AOBRAQCJ.js";
+} from "./chunk-VW545PK2.js";
 import "./chunk-GS3Q6EU5.js";
 
 // src/main.ts

package/package.json

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