@skylandnpm/octopus-proxy 0.1.40 → 0.1.42

package/README.md

@@ -116,6 +116,10 @@ npm run publish
 
 ## 编码工具账号与 OpenCode 服务
 
+Claw 机器人设置可通过已解锁的端到端会话查询和切换当前机器人连接的 Proxy 智能体。`runtime.models` 接收 `{ "kind": "codex" }`（也支持 `opencode`、`zcode`、`pi`），临时查询所选工具原生模型目录，不修改当前 `tool`。`runtime.switchTool` 使用相同参数，先启动新工具并验证原生连接，成功后以 0600 权限原子保存配置，再关闭旧工具的 Proxy 管理进程；外部 OpenCode 服务继续由主机管理。
+
+各工具的命令、OpenCode 地址和服务密码保存在配置文件的 `toolProfiles` 中，切回时恢复。首次选择工具会在此 Proxy 主机探测命令；自定义安装位置可预先设置 `toolProfiles.<kind>`，格式与 `tool` 相同，且其中 `kind` 必须匹配。智能体未安装、启动或连接失败时保留当前工具和配置。已打开工作区会通过 `octopus.resync` 更新能力、会话和模型。
+
 OpenCode 2.0.19 使用 external HTTP 模式。`tool.command` 应为 `/Users/luhuili/.opencode/bin/opencode`，`tool.baseUrl` 明确指向回环服务，`tool.password` 必填并由 onboard 自动生成。Proxy 可拉起未监听的服务，也可连接以同一密码预先启动的服务；若配置端口已被密码不同的服务占用，Proxy 会在随机回环端口启动自己的实例并在后续重启时复用，避免接管或停止未知进程。启动日志保存在 `stateDirectory/opencode-serve.log`。如需只连接自行管理的服务，可设置 `autoStart: false`。旧顶层配置、managed 模式和 v1 API 不再兼容；Proxy 不停止或重启已有 OpenCode 服务。
 
 Claw 的“编码工具账号”窗口支持 Codex API Key/设备码、ZCode 原生 Z.AI OAuth、OpenCode 原生 API Key/OAuth。凭据由编码工具保存，模型列表从原生接口读取。详细行为与验证边界见 [编码工具账号](../../docs/tool-authentication.md)。

package/dist/{chunk-OXA2S7UY.js → chunk-HB3ETNMW.js}

@@ -402,11 +402,11 @@ var require_codegen = __commonJS({
         const rhs = this.rhs === void 0 ? "" : ` = ${this.rhs}`;
         return `${varKind} ${this.name}${rhs};` + _n;
       }
-      optimizeNames(names, constants6) {
+      optimizeNames(names, constants7) {
         if (!names[this.name.str])
           return;
         if (this.rhs)
-          this.rhs = optimizeExpr(this.rhs, names, constants6);
+          this.rhs = optimizeExpr(this.rhs, names, constants7);
         return this;
       }
       get names() {
@@ -423,10 +423,10 @@ var require_codegen = __commonJS({
       render({ _n }) {
         return `${this.lhs} = ${this.rhs};` + _n;
       }
-      optimizeNames(names, constants6) {
+      optimizeNames(names, constants7) {
         if (this.lhs instanceof code_1.Name && !names[this.lhs.str] && !this.sideEffects)
           return;
-        this.rhs = optimizeExpr(this.rhs, names, constants6);
+        this.rhs = optimizeExpr(this.rhs, names, constants7);
         return this;
       }
       get names() {
@@ -487,8 +487,8 @@ var require_codegen = __commonJS({
       optimizeNodes() {
         return `${this.code}` ? this : void 0;
       }
-      optimizeNames(names, constants6) {
-        this.code = optimizeExpr(this.code, names, constants6);
+      optimizeNames(names, constants7) {
+        this.code = optimizeExpr(this.code, names, constants7);
         return this;
       }
       get names() {
@@ -517,12 +517,12 @@ var require_codegen = __commonJS({
         }
         return nodes.length > 0 ? this : void 0;
       }
-      optimizeNames(names, constants6) {
+      optimizeNames(names, constants7) {
         const { nodes } = this;
         let i = nodes.length;
         while (i--) {
           const n = nodes[i];
-          if (n.optimizeNames(names, constants6))
+          if (n.optimizeNames(names, constants7))
             continue;
           subtractNames(names, n.names);
           nodes.splice(i, 1);
@@ -575,12 +575,12 @@ var require_codegen = __commonJS({
           return void 0;
         return this;
       }
-      optimizeNames(names, constants6) {
+      optimizeNames(names, constants7) {
         var _a;
-        this.else = (_a = this.else) === null || _a === void 0 ? void 0 : _a.optimizeNames(names, constants6);
-        if (!(super.optimizeNames(names, constants6) || this.else))
+        this.else = (_a = this.else) === null || _a === void 0 ? void 0 : _a.optimizeNames(names, constants7);
+        if (!(super.optimizeNames(names, constants7) || this.else))
           return;
-        this.condition = optimizeExpr(this.condition, names, constants6);
+        this.condition = optimizeExpr(this.condition, names, constants7);
         return this;
       }
       get names() {
@@ -603,10 +603,10 @@ var require_codegen = __commonJS({
       render(opts) {
         return `for(${this.iteration})` + super.render(opts);
       }
-      optimizeNames(names, constants6) {
-        if (!super.optimizeNames(names, constants6))
+      optimizeNames(names, constants7) {
+        if (!super.optimizeNames(names, constants7))
           return;
-        this.iteration = optimizeExpr(this.iteration, names, constants6);
+        this.iteration = optimizeExpr(this.iteration, names, constants7);
         return this;
       }
       get names() {
@@ -642,10 +642,10 @@ var require_codegen = __commonJS({
       render(opts) {
         return `for(${this.varKind} ${this.name} ${this.loop} ${this.iterable})` + super.render(opts);
       }
-      optimizeNames(names, constants6) {
-        if (!super.optimizeNames(names, constants6))
+      optimizeNames(names, constants7) {
+        if (!super.optimizeNames(names, constants7))
           return;
-        this.iterable = optimizeExpr(this.iterable, names, constants6);
+        this.iterable = optimizeExpr(this.iterable, names, constants7);
         return this;
       }
       get names() {
@@ -687,11 +687,11 @@ var require_codegen = __commonJS({
         (_b = this.finally) === null || _b === void 0 ? void 0 : _b.optimizeNodes();
         return this;
       }
-      optimizeNames(names, constants6) {
+      optimizeNames(names, constants7) {
         var _a, _b;
-        super.optimizeNames(names, constants6);
-        (_a = this.catch) === null || _a === void 0 ? void 0 : _a.optimizeNames(names, constants6);
-        (_b = this.finally) === null || _b === void 0 ? void 0 : _b.optimizeNames(names, constants6);
+        super.optimizeNames(names, constants7);
+        (_a = this.catch) === null || _a === void 0 ? void 0 : _a.optimizeNames(names, constants7);
+        (_b = this.finally) === null || _b === void 0 ? void 0 : _b.optimizeNames(names, constants7);
         return this;
       }
       get names() {
@@ -992,7 +992,7 @@ var require_codegen = __commonJS({
     function addExprNames(names, from) {
       return from instanceof code_1._CodeOrName ? addNames(names, from.names) : names;
     }
-    function optimizeExpr(expr, names, constants6) {
+    function optimizeExpr(expr, names, constants7) {
       if (expr instanceof code_1.Name)
         return replaceName(expr);
       if (!canOptimize(expr))
@@ -1007,14 +1007,14 @@ var require_codegen = __commonJS({
         return items;
       }, []));
       function replaceName(n) {
-        const c = constants6[n.str];
+        const c = constants7[n.str];
         if (c === void 0 || names[n.str] !== 1)
           return n;
         delete names[n.str];
         return c;
       }
       function canOptimize(e) {
-        return e instanceof code_1._Code && e._items.some((c) => c instanceof code_1.Name && names[c.str] === 1 && constants6[c.str] !== void 0);
+        return e instanceof code_1._Code && e._items.some((c) => c instanceof code_1.Name && names[c.str] === 1 && constants7[c.str] !== void 0);
       }
     }
     function subtractNames(names, from) {
@@ -11715,7 +11715,7 @@ async function ensureHostIdentity(stateDirectory) {
 
 // src/daemon.ts
 import { mkdir as mkdir11 } from "node:fs/promises";
-import { join as join14 } from "node:path";
+import { join as join15 } from "node:path";
 
 // src/workspace-diff.ts
 import { execFile as execFile2 } from "node:child_process";
@@ -11987,9 +11987,9 @@ var Uploads = class {
     this.directory = directory;
   }
   pending = /* @__PURE__ */ new Map();
-  serial(id, run4) {
+  serial(id, run5) {
     const work = (this.pending.get(id) ?? Promise.resolve()).catch(() => {
-    }).then(run4);
+    }).then(run5);
     this.pending.set(id, work);
     const clear = () => {
       if (this.pending.get(id) === work) this.pending.delete(id);
@@ -12197,6 +12197,8 @@ var Operations = [
   "auth.cancel",
   "runtime.status",
   "runtime.snapshot",
+  "runtime.models",
+  "runtime.switchTool",
   "runtime.start",
   "runtime.stop",
   "runtime.restart",
@@ -12467,12 +12469,12 @@ var PlatformScreenLock = class {
       if (signal.aborted) throw new ScreenLockError("\u8FDE\u63A5\u5DF2\u5173\u95ED\uFF0C\u5C4F\u5E55\u89E3\u9501\u5DF2\u53D6\u6D88\u3002");
     };
     check();
-    if (!password || Buffer.byteLength(password) > 1024 || /[\x00-\x1f\x7f]/.test(password)) throw new ScreenLockError("\u4E3B\u673A\u5BC6\u7801\u683C\u5F0F\u65E0\u6548\u3002");
-    if (Date.now() < this.blockedUntil) throw new ScreenLockError("\u5BC6\u7801\u9A8C\u8BC1\u5931\u8D25\u6B21\u6570\u8FC7\u591A\uFF0C\u8BF7\u7B49\u5F85 30 \u79D2\u540E\u91CD\u8BD5\u3002");
     const status = await this.status();
     check();
     if (!status.locked) return status;
     if (!status.canUnlock) throw new ScreenLockError(status.message ?? "\u4E3B\u673A\u4E0D\u652F\u6301\u5C4F\u5E55\u89E3\u9501\u3002");
+    if (!password || Buffer.byteLength(password) > 1024 || /[\x00-\x1f\x7f]/.test(password)) throw new ScreenLockError("\u4E3B\u673A\u5BC6\u7801\u683C\u5F0F\u65E0\u6548\u3002");
+    if (Date.now() < this.blockedUntil) throw new ScreenLockError("\u5BC6\u7801\u9A8C\u8BC1\u5931\u8D25\u6B21\u6570\u8FC7\u591A\uFF0C\u8BF7\u7B49\u5F85 30 \u79D2\u540E\u91CD\u8BD5\u3002");
     let valid;
     try {
       valid = await this.authenticate(this.stateDirectory, this.account.username, password);
@@ -12489,6 +12491,10 @@ var PlatformScreenLock = class {
     }
     this.failures = 0;
     if (this.system === "darwin") {
+      const current = await this.status();
+      check();
+      if (!current.locked) return current;
+      if (!current.canUnlock) throw new ScreenLockError(current.message ?? "\u4E3B\u673A\u4E0D\u652F\u6301\u5C4F\u5E55\u89E3\u9501\u3002");
       const helper = await this.macHelper();
       check();
       const bytes = Buffer.from(password, "utf8"), input = Buffer.alloc(bytes.length + 2);
@@ -12507,7 +12513,8 @@ var PlatformScreenLock = class {
     }
     const session = await this.linuxSession(signal);
     check();
-    if (session.locked) await this.execute("loginctl", ["--no-ask-password", "unlock-session", session.id], void 0, signal);
+    if (!session.locked) return { ...status, locked: false };
+    await this.execute("loginctl", ["--no-ask-password", "unlock-session", session.id], void 0, signal);
     for (let i = 0; i < 20; i++) {
       check();
       const current = await this.linuxSession(signal);
@@ -12533,7 +12540,7 @@ var Journal = class {
       if (active.hash !== hash) return Promise.resolve(this.failure(command, "Request id reused"));
       return active.result;
     }
-    const run4 = async () => {
+    const run5 = async () => {
       const path = join6(this.directory, `${command.id}.json`);
       const readOnly = command.operation.startsWith("desktop.") || isReadOperation(command.operation) || isAuthentication(command.operation);
       if (!readOnly) {
@@ -12555,8 +12562,8 @@ var Journal = class {
       return response;
     };
     const key = this.queueKey(command);
-    const result = key === void 0 ? run4() : (this.queues.get(key) ?? Promise.resolve()).catch(() => {
-    }).then(run4);
+    const result = key === void 0 ? run5() : (this.queues.get(key) ?? Promise.resolve()).catch(() => {
+    }).then(run5);
     if (key !== void 0) {
       this.queues.set(key, result);
       result.finally(() => {
@@ -12664,9 +12671,9 @@ var Artifacts = class {
     this.emit = emit;
   }
   pending = /* @__PURE__ */ new Map();
-  serial(project, run4) {
+  serial(project, run5) {
     const result = (this.pending.get(project) ?? Promise.resolve()).catch(() => {
-    }).then(run4);
+    }).then(run5);
     this.pending.set(project, result);
     return result;
   }
@@ -15068,7 +15075,7 @@ var OpenCodeAdapter = class {
         });
       }
     };
-    const run4 = async () => {
+    const run5 = async () => {
       if (method.type === "key") {
         if (typeof input.key !== "string" || !input.key.trim()) throw new Error("API Key required");
         await this.request(project, "POST", `/api/integration/${this.identifier(integration.id)}/connect/key`, { key: input.key, ...method.label ? { label: method.label } : {}, ...Object.keys(input).length > 1 ? { answer: input } : {} }, controller.signal);
@@ -15086,7 +15093,7 @@ var OpenCodeAdapter = class {
         };
       } else await wait();
     };
-    void run4().catch(() => this.auth.update(project, flow.flowId, { status: "failed", message: "OpenCode \u8BA4\u8BC1\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u8BA4\u8BC1\u4FE1\u606F\u4E0E\u4F9B\u5E94\u5546\u914D\u7F6E\u540E\u91CD\u8BD5" }));
+    void run5().catch(() => this.auth.update(project, flow.flowId, { status: "failed", message: "OpenCode \u8BA4\u8BC1\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u8BA4\u8BC1\u4FE1\u606F\u4E0E\u4F9B\u5E94\u5546\u914D\u7F6E\u540E\u91CD\u8BD5" }));
     return { ...flow };
   }
   subscribe(project) {
@@ -15901,6 +15908,8 @@ import { join as join11 } from "node:path";
 var DAEMON_OPERATIONS = [
   "runtime.status",
   "runtime.snapshot",
+  "runtime.models",
+  "runtime.switchTool",
   "runtime.start",
   "runtime.stop",
   "runtime.restart",
@@ -17765,23 +17774,228 @@ var DesktopManager = class {
   }
 };
 
+// src/tool-selection.ts
+import { randomBytes as randomBytes2, randomUUID as randomUUID18 } from "node:crypto";
+import { access as access3, constants as constants6, readFile as readFile10 } from "node:fs/promises";
+import { platform as platform5 } from "node:os";
+import { isDeepStrictEqual } from "node:util";
+
+// src/node-resolution.ts
+import { realpath as realpath7, stat as stat12 } from "node:fs/promises";
+import { execFile as execFile7 } from "node:child_process";
+import { promisify as promisify7 } from "node:util";
+import { join as join14 } from "node:path";
+import { homedir as homedir2, platform as platform4 } from "node:os";
+var run4 = promisify7(execFile7);
+var VERSION_MANAGED_SEGMENTS = /* @__PURE__ */ new Set([".nvm", "nvm", ".volta", "volta", ".fnm", "fnm", ".asdf", "asdf", ".mise", "mise"]);
+var execProbe = async (path) => {
+  try {
+    await run4(path, ["--version"], { timeout: 5e3 });
+    return true;
+  } catch {
+    return false;
+  }
+};
+function isVersionManagedPath(path) {
+  return path.split("/").some((segment) => VERSION_MANAGED_SEGMENTS.has(segment));
+}
+function nodeCandidates() {
+  return platform4() === "darwin" ? ["/opt/homebrew/bin/node", "/opt/homebrew/opt/node/bin/node", "/usr/local/bin/node", "/usr/bin/node"] : ["/usr/local/bin/node", "/usr/bin/node", "/snap/bin/node"];
+}
+async function resolveNodePath(options = {}) {
+  const probe = options.probe ?? execProbe;
+  if (options.pinned) {
+    if (!await probe(options.pinned)) throw new Error(`--node-path ${options.pinned} is not a working node executable`);
+    return { nodePath: options.pinned, source: "pinned" };
+  }
+  let exec = options.execPath ?? process.execPath;
+  try {
+    exec = await realpath7(exec);
+  } catch {
+  }
+  if (!isVersionManagedPath(exec) && await probe(exec)) return { nodePath: exec, source: "exec" };
+  for (const candidate of nodeCandidates()) if (!isVersionManagedPath(candidate) && await probe(candidate)) return { nodePath: candidate, source: "candidate" };
+  if (await probe(exec)) return { nodePath: exec, source: "exec", warning: `only a version-manager node was found (${exec}); install node with the system package manager or pass --node-path, otherwise the service breaks when that node is upgraded` };
+  return { nodePath: null, source: "exec" };
+}
+function toolSearchDirs(kind) {
+  const dirs = [...describeTool(kind).searchDirs, join14(homedir2(), ".local", "bin"), join14(homedir2(), ".opencode", "bin"), join14(homedir2(), ".codex", "bin")];
+  return [...new Set(dirs)];
+}
+async function resolveCommandOnPath(name, extraDirs = []) {
+  const dirs = [...(process.env.PATH ?? "").split(":"), ...extraDirs].filter(Boolean);
+  for (const dir of new Set(dirs)) {
+    const full = join14(dir, name);
+    try {
+      const info = await stat12(full);
+      if (info.isFile() && info.mode & 73) return full;
+    } catch {
+    }
+  }
+  return null;
+}
+
+// src/tool-selection.ts
+var selectionSchema = z.object({ kind: z.enum(TOOL_KINDS) }).strict();
+var ToolSelection = class {
+  constructor(configPath, config, create) {
+    this.configPath = configPath;
+    this.config = config;
+    this.create = create;
+    this.current = create({ ...config, tool: { ...config.tool } });
+  }
+  current;
+  pending = Promise.resolve();
+  closed = false;
+  discovered = /* @__PURE__ */ new Map();
+  exclusive(work) {
+    const result = this.pending.catch(() => {
+    }).then(() => {
+      if (this.closed) throw new Error("Proxy \u5DF2\u505C\u6B62");
+      return work();
+    });
+    this.pending = result;
+    return result;
+  }
+  models(payload, projectId) {
+    const { kind } = selectionSchema.parse(payload);
+    return this.exclusive(async () => {
+      if (kind === this.current.runtime.kind) {
+        return { ...await buildProxySnapshot(this.config, this.current.runtime, this.current.adapter, projectId), activeTool: kind };
+      }
+      const raw = await this.readCurrent();
+      const tool = await this.toolConfig(kind, raw);
+      const candidateConfig = { ...this.config, tool };
+      candidateConfig.projects = [this.config.projects.find((project) => project.id === projectId) ?? this.config.projects[0]];
+      const candidate = this.create(candidateConfig);
+      try {
+        await candidate.runtime.init();
+        return { ...await buildProxySnapshot(candidateConfig, candidate.runtime, candidate.adapter, projectId), activeTool: this.current.runtime.kind };
+      } finally {
+        await this.release(candidate);
+      }
+    });
+  }
+  switchTool(payload) {
+    const { kind } = selectionSchema.parse(payload);
+    return this.exclusive(async () => {
+      if (kind === this.current.runtime.kind) return this.current.runtime.status();
+      const raw = await this.readCurrent();
+      const tool = await this.toolConfig(kind, raw);
+      const candidate = this.create({ ...this.config, tool });
+      let committed = false;
+      try {
+        await candidate.runtime.init();
+        const status = await candidate.runtime.status();
+        if (!status.healthy) throw new Error(status.error ?? `${describeTool(kind).label} \u670D\u52A1\u672A\u5C31\u7EEA`);
+        if (candidate.adapter.supportedOperations().includes("configuration.models")) {
+          await candidate.adapter.dispatch(this.modelCommand(candidate.runtime.config.projects[0].id));
+        }
+        const latest = await this.readCurrent();
+        if (this.closed) throw new Error("Proxy \u5DF2\u505C\u6B62");
+        await atomicJson(this.configPath, {
+          ...latest,
+          tool,
+          toolProfiles: { ...this.profiles(latest), [this.config.tool.kind]: this.config.tool, [kind]: tool }
+        });
+        const previous = this.current;
+        this.current = candidate;
+        this.config.tool = tool;
+        committed = true;
+        await this.release(previous);
+        return candidate.runtime.status();
+      } finally {
+        if (!committed) await this.release(candidate);
+      }
+    });
+  }
+  modelCommand(projectId) {
+    return { type: "command", id: randomUUID18(), botId: this.config.botId, operation: "configuration.models", projectId, payload: {} };
+  }
+  profiles(raw) {
+    return raw.toolProfiles && typeof raw.toolProfiles === "object" && !Array.isArray(raw.toolProfiles) ? raw.toolProfiles : {};
+  }
+  async toolConfig(kind, raw) {
+    const saved = this.profiles(raw)[kind];
+    if (saved) {
+      const tool2 = ToolSchema.parse(saved);
+      if (tool2.kind !== kind) throw new Error("Proxy \u667A\u80FD\u4F53\u914D\u7F6E\u4E0E\u7C7B\u578B\u4E0D\u4E00\u81F4");
+      return { ...tool2, command: expandHome(tool2.command || describeTool(kind).defaultCommand), autoStart: true };
+    }
+    const discovered = this.discovered.get(kind);
+    if (discovered) return discovered;
+    let command = await resolveCommandOnPath(kind, toolSearchDirs(kind));
+    if (!command && platform5() === "darwin") {
+      const candidates = kind === "codex" ? [
+        "/Applications/ChatGPT.app/Contents/Resources/codex-cli/CodexCLI.app/Contents/MacOS/codex",
+        "/Applications/ChatGPT.app/Contents/Resources/codex"
+      ] : kind === "zcode" ? ["/Applications/ZCode.app/Contents/Resources/glm/zcode.cjs"] : [];
+      for (const path of candidates) {
+        if (await access3(path, constants6.X_OK).then(() => true, () => false)) {
+          command = path;
+          break;
+        }
+      }
+    }
+    if (!command) throw new Error(`${describeTool(kind).label} \u672A\u5B89\u88C5\u6216\u547D\u4EE4\u4E0D\u53EF\u6267\u884C\uFF1B\u8BF7\u5728\u6B64 Proxy \u4E3B\u673A\u914D\u7F6E toolProfiles.${kind}.command \u540E\u91CD\u8BD5`);
+    const tool = ToolSchema.parse({
+      kind,
+      command,
+      autoStart: true,
+      ...kind === "opencode" ? { baseUrl: "http://127.0.0.1:4096", password: randomBytes2(32).toString("base64url") } : {}
+    });
+    this.discovered.set(kind, tool);
+    return tool;
+  }
+  async readCurrent() {
+    const disk = await loadConfig(this.configPath);
+    if (!isDeepStrictEqual(JSON.parse(JSON.stringify(disk.tool)), JSON.parse(JSON.stringify(this.config.tool))) || !isDeepStrictEqual(disk.projects, this.config.projects) || disk.botId !== this.config.botId || disk.secretKey !== this.config.secretKey) {
+      throw new Error("Proxy \u914D\u7F6E\u5DF2\u5728\u4E3B\u673A\u4E0A\u88AB\u4FEE\u6539\uFF1B\u8BF7\u91CD\u542F Proxy \u540E\u518D\u5207\u6362\u667A\u80FD\u4F53");
+    }
+    return JSON.parse(await readFile10(this.configPath, "utf8"));
+  }
+  async release(instance) {
+    instance.adapter.close();
+    instance.runtime.detach();
+    if (instance.runtime.kind !== "opencode") await instance.runtime.stop().catch(() => {
+    });
+  }
+  close() {
+    this.closed = true;
+    void this.release(this.current);
+  }
+};
+
 // src/daemon.ts
 async function runDaemon(configPath, authenticate = verifyHostPassword) {
   const config = await loadConfig(configPath);
   await mkdir11(config.stateDirectory, { recursive: true, mode: 448 });
-  const workspace = new Workspace(config.projects), runtime = createRuntime(config), uploads = new Uploads(workspace, join14(config.stateDirectory, "uploads")), journal = new Journal(join14(config.stateDirectory, "journal"));
+  const workspace = new Workspace(config.projects), uploads = new Uploads(workspace, join15(config.stateDirectory, "uploads")), journal = new Journal(join15(config.stateDirectory, "journal"));
   let secureChat;
   function emit(projectId, event, data) {
     secureChat?.publish(projectId, event, data);
   }
   const terminals = new TerminalManager(workspace, (owner, project, event, data) => secureChat?.sendTo(owner, project, event, data));
   const desktop = new DesktopManager(new PlatformDesktop(config.stateDirectory), new PlatformScreenLock(config.stateDirectory));
-  const adapter = createAdapter(runtime, workspace, uploads, emit), artifacts = new Artifacts(workspace, join14(config.stateDirectory, "artifacts"), emit);
-  const projectRegistry = new ProjectRegistry(configPath, config, runtime, adapter);
+  const tools = new ToolSelection(configPath, config, (toolConfig) => {
+    const runtime = createRuntime(toolConfig);
+    const adapter = createAdapter(runtime, workspace, uploads, (project, event, data) => {
+      if (tools.current.runtime === runtime) emit(project, event, data);
+    });
+    return { runtime, adapter };
+  });
+  const artifacts = new Artifacts(workspace, join15(config.stateDirectory, "artifacts"), emit);
   async function dispatch(c, secureSessionId) {
     if (c.operation.startsWith("desktop.")) return desktop.dispatch(c, secureSessionId);
     if (c.operation.startsWith("terminal.")) return terminals.dispatch(c, secureSessionId);
     const p = c.payload;
+    if (c.operation === "runtime.models") return tools.models(p, c.projectId);
+    if (c.operation === "runtime.switchTool") {
+      const result2 = await tools.switchTool(p);
+      emit("", "octopus.resync", { toolChanged: true });
+      return result2;
+    }
+    const { runtime, adapter } = tools.current;
     if (c.operation === "runtime.status") return { ...await runtime.status(), capabilities: adapter.supportedOperations() };
     if (c.operation === "runtime.snapshot") return buildProxySnapshot(config, runtime, adapter, c.projectId);
     if (c.operation === "runtime.logs") return runtime.logs();
@@ -17790,17 +18004,17 @@ async function runDaemon(configPath, authenticate = verifyHostPassword) {
     if (c.operation === "runtime.restart") return runtime.restart();
     if (c.operation === "workspace.projects") return publicProjects(config);
     if (c.operation === "workspace.projects.add") {
-      const result2 = await projectRegistry.add(p);
+      const result2 = await tools.exclusive(() => new ProjectRegistry(configPath, config, tools.current.runtime, tools.current.adapter).add(p));
       emit(String(p.id), "octopus.resync", {});
       return result2;
     }
     if (c.operation === "workspace.projects.update") {
-      const result2 = await projectRegistry.update(p);
+      const result2 = await tools.exclusive(() => new ProjectRegistry(configPath, config, tools.current.runtime, tools.current.adapter).update(p));
       emit(String(p.id), "octopus.resync", {});
       return result2;
     }
     if (c.operation === "workspace.projects.remove") {
-      const result2 = await projectRegistry.remove(p);
+      const result2 = await tools.exclusive(() => new ProjectRegistry(configPath, config, tools.current.runtime, tools.current.adapter).remove(p));
       emit(String(p.id), "octopus.resync", {});
       return result2;
     }
@@ -17842,7 +18056,7 @@ async function runDaemon(configPath, authenticate = verifyHostPassword) {
     terminals.closeOwned(owner);
     desktop.closeOwned(owner);
   }, authenticate);
-  await runtime.init().catch((error) => console.error(`${runtime.kind} startup:`, error.message));
+  await tools.current.runtime.init().catch((error) => console.error(`${tools.current.runtime.kind} startup:`, error.message));
   secureChat.start();
   const scan = setInterval(async () => {
     for (const p of config.projects) await artifacts.scan(p.id).catch(() => {
@@ -17859,8 +18073,7 @@ async function runDaemon(configPath, authenticate = verifyHostPassword) {
     secureChat?.stop();
     terminals.close();
     desktop.close();
-    runtime.detach();
-    adapter.close();
+    tools.close();
   }
   function onSignal() {
     stop();
@@ -17900,5 +18113,9 @@ export {
   DESKTOP_PERMISSION_GUIDANCE,
   requestDesktopPermission,
   checkDesktop,
+  isVersionManagedPath,
+  resolveNodePath,
+  toolSearchDirs,
+  resolveCommandOnPath,
   runDaemon
 };

package/dist/cli.js

@@ -19,93 +19,42 @@ import {
   ensureHostIdentity,
   expandHome,
   isMacOS,
+  isVersionManagedPath,
   launchdLogPath,
   launchdPlistPath,
   loadConfig,
   proxyVersion,
   requestDesktopPermission,
+  resolveCommandOnPath,
   resolveConfigPath,
+  resolveNodePath,
   runDaemon,
   supportedPlatform,
-  systemdUnitPath
-} from "./chunk-OXA2S7UY.js";
+  systemdUnitPath,
+  toolSearchDirs
+} from "./chunk-HB3ETNMW.js";
 
 // src/cli.ts
 import { spawn as spawn2 } from "node:child_process";
 import { access as access4 } from "node:fs/promises";
 
 // src/doctor.ts
-import { access as access2, chmod, constants, mkdir as mkdir3, stat as stat2 } from "node:fs/promises";
-import { isAbsolute as isAbsolute2, join as join2 } from "node:path";
-import { execFile as execFile4 } from "node:child_process";
-import { promisify as promisify4 } from "node:util";
+import { access as access2, chmod, constants, mkdir as mkdir3, stat } from "node:fs/promises";
+import { isAbsolute as isAbsolute2, join } from "node:path";
+import { execFile as execFile3 } from "node:child_process";
+import { promisify as promisify3 } from "node:util";
 
 // src/service.ts
 import { readFile, access } from "node:fs/promises";
 import { dirname as dirname3, isAbsolute, resolve } from "node:path";
 
-// src/node-resolution.ts
-import { realpath, stat } from "node:fs/promises";
-import { execFile } from "node:child_process";
-import { promisify } from "node:util";
-import { join } from "node:path";
-import { homedir, platform } from "node:os";
-var run = promisify(execFile);
-var VERSION_MANAGED_SEGMENTS = /* @__PURE__ */ new Set([".nvm", "nvm", ".volta", "volta", ".fnm", "fnm", ".asdf", "asdf", ".mise", "mise"]);
-var execProbe = async (path) => {
-  try {
-    await run(path, ["--version"], { timeout: 5e3 });
-    return true;
-  } catch {
-    return false;
-  }
-};
-function isVersionManagedPath(path) {
-  return path.split("/").some((segment) => VERSION_MANAGED_SEGMENTS.has(segment));
-}
-function nodeCandidates() {
-  return platform() === "darwin" ? ["/opt/homebrew/bin/node", "/opt/homebrew/opt/node/bin/node", "/usr/local/bin/node", "/usr/bin/node"] : ["/usr/local/bin/node", "/usr/bin/node", "/snap/bin/node"];
-}
-async function resolveNodePath(options = {}) {
-  const probe = options.probe ?? execProbe;
-  if (options.pinned) {
-    if (!await probe(options.pinned)) throw new Error(`--node-path ${options.pinned} is not a working node executable`);
-    return { nodePath: options.pinned, source: "pinned" };
-  }
-  let exec = options.execPath ?? process.execPath;
-  try {
-    exec = await realpath(exec);
-  } catch {
-  }
-  if (!isVersionManagedPath(exec) && await probe(exec)) return { nodePath: exec, source: "exec" };
-  for (const candidate of nodeCandidates()) if (!isVersionManagedPath(candidate) && await probe(candidate)) return { nodePath: candidate, source: "candidate" };
-  if (await probe(exec)) return { nodePath: exec, source: "exec", warning: `only a version-manager node was found (${exec}); install node with the system package manager or pass --node-path, otherwise the service breaks when that node is upgraded` };
-  return { nodePath: null, source: "exec" };
-}
-function toolSearchDirs(kind) {
-  const dirs = [...describeTool(kind).searchDirs, join(homedir(), ".local", "bin"), join(homedir(), ".opencode", "bin"), join(homedir(), ".codex", "bin")];
-  return [...new Set(dirs)];
-}
-async function resolveCommandOnPath(name, extraDirs = []) {
-  const dirs = [...(process.env.PATH ?? "").split(":"), ...extraDirs].filter(Boolean);
-  for (const dir of new Set(dirs)) {
-    const full = join(dir, name);
-    try {
-      const info = await stat(full);
-      if (info.isFile() && info.mode & 73) return full;
-    } catch {
-    }
-  }
-  return null;
-}
-
 // src/launchd.ts
 import { mkdir, rm, writeFile } from "node:fs/promises";
 import { dirname } from "node:path";
-import { execFile as execFile2 } from "node:child_process";
-import { promisify as promisify2 } from "node:util";
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
 import { userInfo } from "node:os";
-var run2 = promisify2(execFile2);
+var run = promisify(execFile);
 var guiDomain = () => `gui/${userInfo().uid}`;
 function xml(value) {
   return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
@@ -138,22 +87,22 @@ async function ignoreMissing(action) {
   }
 }
 async function launchdLoad() {
-  await ignoreMissing(() => run2("launchctl", ["bootout", `${guiDomain()}/${SERVICE_LABEL}`]));
-  await run2("launchctl", ["bootstrap", guiDomain(), launchdPlistPath()]);
+  await ignoreMissing(() => run("launchctl", ["bootout", `${guiDomain()}/${SERVICE_LABEL}`]));
+  await run("launchctl", ["bootstrap", guiDomain(), launchdPlistPath()]);
 }
 async function launchdStart() {
-  await ignoreMissing(() => run2("launchctl", ["bootstrap", guiDomain(), launchdPlistPath()]));
-  await run2("launchctl", ["kickstart", `${guiDomain()}/${SERVICE_LABEL}`]);
+  await ignoreMissing(() => run("launchctl", ["bootstrap", guiDomain(), launchdPlistPath()]));
+  await run("launchctl", ["kickstart", `${guiDomain()}/${SERVICE_LABEL}`]);
 }
 async function launchdStop() {
-  await ignoreMissing(() => run2("launchctl", ["bootout", `${guiDomain()}/${SERVICE_LABEL}`]));
+  await ignoreMissing(() => run("launchctl", ["bootout", `${guiDomain()}/${SERVICE_LABEL}`]));
 }
 async function launchdRestart() {
   const target = `${guiDomain()}/${SERVICE_LABEL}`;
   if ((await launchdStatus()).loaded) {
-    await run2("launchctl", ["kickstart", "-k", target]);
+    await run("launchctl", ["kickstart", "-k", target]);
   } else {
-    await run2("launchctl", ["bootstrap", guiDomain(), launchdPlistPath()]);
+    await run("launchctl", ["bootstrap", guiDomain(), launchdPlistPath()]);
   }
 }
 async function launchdUninstall() {
@@ -162,7 +111,7 @@ async function launchdUninstall() {
 }
 async function launchdStatus() {
   try {
-    const { stdout: stdout3 } = await run2("launchctl", ["print", `${guiDomain()}/${SERVICE_LABEL}`]);
+    const { stdout: stdout3 } = await run("launchctl", ["print", `${guiDomain()}/${SERVICE_LABEL}`]);
     const running = /state = running/.test(stdout3);
     const pid = Number(/pid = (\d+)/.exec(stdout3)?.[1]);
     return { loaded: true, running, pid: Number.isFinite(pid) && pid > 0 ? pid : void 0 };
@@ -174,9 +123,9 @@ async function launchdStatus() {
 // src/systemd.ts
 import { mkdir as mkdir2, rm as rm2, writeFile as writeFile2 } from "node:fs/promises";
 import { dirname as dirname2 } from "node:path";
-import { execFile as execFile3 } from "node:child_process";
-import { promisify as promisify3 } from "node:util";
-var run3 = promisify3(execFile3);
+import { execFile as execFile2 } from "node:child_process";
+import { promisify as promisify2 } from "node:util";
+var run2 = promisify2(execFile2);
 function quoteSystemdArg(value) {
   const escaped = value.replaceAll("%", "%%").replaceAll('"', '\\"');
   return /[\s"\\]/.test(value) ? `"${escaped}"` : escaped;
@@ -213,7 +162,7 @@ async function writeUnitFile(text) {
 }
 async function systemctl(args) {
   try {
-    const { stdout: stdout3 } = await run3("systemctl", ["--user", ...args]);
+    const { stdout: stdout3 } = await run2("systemctl", ["--user", ...args]);
     return stdout3;
   } catch (error) {
     const stderr = error instanceof Error ? error.stderr ?? error.message : String(error);
@@ -339,14 +288,14 @@ function logLocationHint() {
 
 // src/doctor.ts
 import { randomUUID } from "node:crypto";
-var run4 = promisify4(execFile4);
+var run3 = promisify3(execFile3);
 async function runDoctor(opts) {
   const results = [];
   const record = (name, status, detail) => results.push({ name, status, detail });
   results.push(await checkTerminalSupport(opts.fix));
   let config;
   try {
-    const info = await stat2(opts.configPath).catch((error) => {
+    const info = await stat(opts.configPath).catch((error) => {
       if (error.code === "ENOENT") throw new Error(`\u914D\u7F6E\u6587\u4EF6\u4E0D\u5B58\u5728\uFF1A${opts.configPath}\uFF1B\u5148\u8FD0\u884C octopus-proxy onboard`);
       throw error;
     });
@@ -379,7 +328,7 @@ async function runDoctor(opts) {
       record(checkName, "fail", `${command2} \u4E0D\u5B58\u5728\u6216\u4E0D\u53EF\u6267\u884C`);
     } else {
       try {
-        const { stdout: stdout3 } = await run4(command2, [...descriptor.versionArgs], { timeout: 15e3 });
+        const { stdout: stdout3 } = await run3(command2, [...descriptor.versionArgs], { timeout: 15e3 });
         const version = stdout3.trim().split("\n")[0].trim();
         if (version === descriptor.baseline) record(checkName, "ok", `${command2}\uFF08${version}\uFF09`);
         else if (descriptor.versionPolicy === "exact") record(checkName, "warn", `${command2} \u7248\u672C\u4E3A ${version}\uFF0C\u5DF2\u9A8C\u8BC1\u57FA\u7EBF\u662F ${descriptor.baseline}\uFF08\u8BF7\u786E\u8BA4\u5916\u90E8\u670D\u52A1 API \u517C\u5BB9\uFF09`);
@@ -396,7 +345,7 @@ async function runDoctor(opts) {
   if (config) {
     const probeConfig = { ...config, tool: { ...config.tool, autoStart: false } };
     const runtime = createRuntime(probeConfig), workspace = new Workspace(config.projects);
-    const adapter = createAdapter(runtime, workspace, new Uploads(workspace, join2(config.stateDirectory, "uploads")), () => {
+    const adapter = createAdapter(runtime, workspace, new Uploads(workspace, join(config.stateDirectory, "uploads")), () => {
     });
     try {
       await runtime.init();
@@ -455,11 +404,11 @@ async function runDoctor(opts) {
 import { createInterface } from "node:readline/promises";
 import { randomBytes } from "node:crypto";
 import { stdin, stdout } from "node:process";
-import { access as access3, constants as constants2, mkdir as mkdir4, stat as stat3 } from "node:fs/promises";
-import { execFile as execFile5 } from "node:child_process";
-import { platform as platform2 } from "node:os";
-import { isAbsolute as isAbsolute3, join as join3 } from "node:path";
-import { promisify as promisify5 } from "node:util";
+import { access as access3, constants as constants2, mkdir as mkdir4, stat as stat2 } from "node:fs/promises";
+import { execFile as execFile4 } from "node:child_process";
+import { platform } from "node:os";
+import { isAbsolute as isAbsolute3, join as join2 } from "node:path";
+import { promisify as promisify4 } from "node:util";
 var DEFAULT_HUB_URL = "https://octopus.wuyehao.com";
 async function ask(rl, question, options = {}) {
   for (; ; ) {
@@ -488,7 +437,7 @@ var validUrl = (value) => {
 var validId = (value) => !value ? "\u9879\u76EE ID \u4E0D\u80FD\u4E3A\u7A7A" : /^[a-zA-Z0-9_-]+$/.test(value) ? void 0 : "\u4EC5\u9650\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u4E0B\u5212\u7EBF\u548C\u8FDE\u5B57\u7B26";
 var validateProjectId = (value, previousProjects) => validId(value) ?? (previousProjects.some((project) => project.id === value) ? `\u9879\u76EE ID\u300C${value}\u300D\u5DF2\u5B58\u5728\uFF0C\u8BF7\u8F93\u5165\u5176\u4ED6 ID` : void 0);
 var validBotId = (value) => /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(value) ? void 0 : "\u8BF7\u8F93\u5165\u673A\u5668\u4EBA UUID";
-var run5 = promisify5(execFile5);
+var run4 = promisify4(execFile4);
 var MACOS_TOOL_EXAMPLES = {
   opencode: "/Users/luhuili/.opencode/bin/opencode",
   codex: "/Applications/ChatGPT.app/Contents/Resources/codex",
@@ -499,20 +448,20 @@ async function validateToolCommand(value, kind) {
   const command2 = expandHome(value);
   if (!isAbsolute3(command2)) return "\u670D\u52A1\u73AF\u5883\u9700\u8981\u7EDD\u5BF9\u8DEF\u5F84";
   try {
-    if (!(await stat3(command2)).isFile()) return "\u547D\u4EE4\u8DEF\u5F84\u5FC5\u987B\u6307\u5411\u53EF\u6267\u884C\u6587\u4EF6";
+    if (!(await stat2(command2)).isFile()) return "\u547D\u4EE4\u8DEF\u5F84\u5FC5\u987B\u6307\u5411\u53EF\u6267\u884C\u6587\u4EF6";
     await access3(command2, constants2.X_OK);
   } catch {
     return `\u547D\u4EE4\u4E0D\u5B58\u5728\u6216\u4E0D\u53EF\u6267\u884C\uFF1A${command2}`;
   }
   try {
-    await run5(command2, [...describeTool(kind).versionArgs], { timeout: 1e4 });
+    await run4(command2, [...describeTool(kind).versionArgs], { timeout: 1e4 });
   } catch {
     return `${describeTool(kind).label} \u7248\u672C\u68C0\u67E5\u5931\u8D25\uFF0C\u8BF7\u786E\u8BA4\u547D\u4EE4\u8DEF\u5F84\uFF1A${command2}`;
   }
   return void 0;
 }
 async function runOnboard(opts) {
-  const configExists = await stat3(opts.configPath).then(() => true, (error) => {
+  const configExists = await stat2(opts.configPath).then(() => true, (error) => {
     if (error.code === "ENOENT") return false;
     throw error;
   });
@@ -536,7 +485,7 @@ async function runOnboard(opts) {
     if (toolKind !== previousToolKind) toolCommand = toolKind === existing?.tool.kind ? existing.tool.command : "";
     const descriptor = describeTool(toolKind);
     const found = await resolveCommandOnPath(toolKind, toolSearchDirs(toolKind));
-    const example = platform2() === "darwin" ? MACOS_TOOL_EXAMPLES[toolKind] : void 0;
+    const example = platform() === "darwin" ? MACOS_TOOL_EXAMPLES[toolKind] : void 0;
     if (toolKind === "opencode") {
       toolCommand = expandHome(await ask(rl, "OpenCode \u547D\u4EE4\uFF08Claw \u8FDC\u7A0B\u542F\u52A8\u65F6\u4F7F\u7528\uFF09", { default: toolCommand || found || example, validate: (value) => validateToolCommand(value, toolKind) }));
       console.log("  Proxy \u53EF\u4ECE Claw \u8FDC\u7A0B\u542F\u52A8 OpenCode\uFF1B\u5DF2\u6709\u670D\u52A1\u4F1A\u76F4\u63A5\u8FDE\u63A5\u3002");
@@ -561,7 +510,7 @@ async function runOnboard(opts) {
           console.log("  \u5FC5\u987B\u662F\u7EDD\u5BF9\u8DEF\u5F84");
           continue;
         }
-        if (!await stat3(project.directory).then(() => true, () => false)) {
+        if (!await stat2(project.directory).then(() => true, () => false)) {
           console.log("  \u76EE\u5F55\u4E0D\u5B58\u5728");
           continue;
         }
@@ -580,7 +529,7 @@ async function runOnboard(opts) {
           console.log("  \u5FC5\u987B\u662F\u7EDD\u5BF9\u8DEF\u5F84");
           continue;
         }
-        if (!await stat3(directory).then(() => true, () => false)) {
+        if (!await stat2(directory).then(() => true, () => false)) {
           console.log("  \u76EE\u5F55\u4E0D\u5B58\u5728");
           continue;
         }
@@ -647,8 +596,8 @@ async function runOnboard(opts) {
   stateDirectory = expandHome(stateDirectory);
   await mkdir4(stateDirectory, { recursive: true, mode: 448 });
   try {
-    if (platform2() === "darwin") {
-      console.log(`\u622A\u5C4F\u8F85\u52A9\u7A0B\u5E8F\u8DEF\u5F84\uFF1A${join3(stateDirectory, "octopus-desktop-capture")}\uFF08\u6587\u4EF6\u540D\u4E0D\u4E00\u5B9A\u662F\u7CFB\u7EDF\u6388\u6743\u540D\u79F0\uFF09`);
+    if (platform() === "darwin") {
+      console.log(`\u622A\u5C4F\u8F85\u52A9\u7A0B\u5E8F\u8DEF\u5F84\uFF1A${join2(stateDirectory, "octopus-desktop-capture")}\uFF08\u6587\u4EF6\u540D\u4E0D\u4E00\u5B9A\u662F\u7CFB\u7EDF\u6388\u6743\u540D\u79F0\uFF09`);
       console.log("\u6B63\u5728\u68C0\u67E5\u5C4F\u5E55\u5F55\u5236\u6743\u9650\uFF1B\u5982\u51FA\u73B0\u7CFB\u7EDF\u6388\u6743\u63D0\u793A\uFF0C\u8BF7\u6309\u5F39\u7A97\u4E2D\u7684\u5B9E\u9645\u7A0B\u5E8F\u540D\u79F0\u6388\u6743\uFF0C\u53EF\u80FD\u663E\u793A Terminal\u3001iTerm\u3001\u7F16\u8F91\u5668\u6216 node\u3002");
     }
     const permission = await requestDesktopPermission(stateDirectory);
@@ -722,18 +671,18 @@ async function manageProjects(configPath2, remove) {
 }
 
 // src/update.ts
-import { execFile as execFile6, spawn } from "node:child_process";
-import { readFile as readFile3, realpath as realpath2 } from "node:fs/promises";
-import { join as join4 } from "node:path";
+import { execFile as execFile5, spawn } from "node:child_process";
+import { readFile as readFile3, realpath } from "node:fs/promises";
+import { join as join3 } from "node:path";
 import { stdin as stdin2, stdout as stdout2 } from "node:process";
 import { createInterface as createInterface2 } from "node:readline/promises";
 import { setTimeout as delay } from "node:timers/promises";
 import { fileURLToPath } from "node:url";
-import { promisify as promisify6 } from "node:util";
+import { promisify as promisify5 } from "node:util";
 var PACKAGE = "@skylandnpm/octopus-proxy";
 var REGISTRY = "https://registry.npmjs.org";
 var packageDirectory = fileURLToPath(new URL("../", import.meta.url));
-var run6 = promisify6(execFile6);
+var run5 = promisify5(execFile5);
 function parseVersion(version) {
   const match = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-([\da-zA-Z-]+(?:\.[\da-zA-Z-]+)*))?(?:\+[\da-zA-Z-]+(?:\.[\da-zA-Z-]+)*)?$/.exec(version);
   if (!match) throw new Error(`\u65E0\u6548\u7684\u7248\u672C\u53F7\uFF1A${version}`);
@@ -762,7 +711,7 @@ function message(error) {
 }
 async function npmOutput(args) {
   try {
-    const { stdout: stdout3 } = await run6("npm", args, { timeout: 3e4, maxBuffer: 1024 * 1024 });
+    const { stdout: stdout3 } = await run5("npm", args, { timeout: 3e4, maxBuffer: 1024 * 1024 });
     return stdout3.trim();
   } catch (error) {
     throw new Error(`npm ${args[0]} \u5931\u8D25\uFF1A${message(error)}`);
@@ -812,9 +761,9 @@ async function runUpdate() {
     return;
   }
   const prefix = await npmOutput(["prefix", "--global"]);
-  const target = join4(prefix, "lib", "node_modules", PACKAGE);
-  const installedDirectory = await realpath2(target).catch(() => null);
-  if (installedDirectory !== await realpath2(packageDirectory)) {
+  const target = join3(prefix, "lib", "node_modules", PACKAGE);
+  const installedDirectory = await realpath(target).catch(() => null);
+  if (installedDirectory !== await realpath(packageDirectory)) {
     throw new Error("\u5F53\u524D\u547D\u4EE4\u4E0D\u5C5E\u4E8E npm \u7684\u5168\u5C40\u5B89\u88C5\u76EE\u5F55\uFF1B\u8BF7\u786E\u8BA4 npm \u4E0E octopus-proxy \u4F7F\u7528\u540C\u4E00\u5957 Node.js \u73AF\u5883\uFF0C\u5E76\u4ECE\u5168\u5C40\u5B89\u88C5\u8FD0\u884C update");
   }
   const state = await serviceStatus();
@@ -826,7 +775,7 @@ async function runUpdate() {
     }
     console.log(`\u6B63\u5728\u5B89\u88C5 ${PACKAGE}@${latest}\u2026`);
     await installVersion(latest, prefix);
-    const installed = JSON.parse(await readFile3(join4(target, "package.json"), "utf8"));
+    const installed = JSON.parse(await readFile3(join3(target, "package.json"), "utf8"));
     if (installed.version !== latest) throw new Error(`\u5B89\u88C5\u7248\u672C\u6821\u9A8C\u5931\u8D25\uFF1A\u671F\u671B ${latest}\uFF0C\u5B9E\u9645 ${installed.version ?? "\u672A\u77E5"}`);
   } catch (error) {
     let recovery = "";

package/dist/main.js

@@ -2,7 +2,7 @@
 import {
   ConfigError,
   runDaemon
-} from "./chunk-OXA2S7UY.js";
+} from "./chunk-HB3ETNMW.js";
 
 // src/main.ts
 runDaemon(process.env.OCTOPUS_PROXY_CONFIG ?? "proxy.json").catch((error) => {

package/native/desktop-macos.m

@@ -29,6 +29,39 @@ static NSDictionary *displayInfo(CGDirectDisplayID displayId) {
            @"width": @(CGDisplayPixelsWide(displayId)), @"height": @(CGDisplayPixelsHigh(displayId))};
 }
 
+static BOOL saveImage(CGImageRef image, NSString *path) {
+  if (!image) return NO;
+  CGImageDestinationRef destination = CGImageDestinationCreateWithURL((__bridge CFURLRef)[NSURL fileURLWithPath:path], CFSTR("public.png"), 1, NULL);
+  if (!destination) return NO;
+  CGImageDestinationAddImage(destination, image, NULL);
+  BOOL saved = CGImageDestinationFinalize(destination);
+  CFRelease(destination);
+  return saved;
+}
+
+static void finishImage(BOOL saved) {
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (finished) return;
+    if (saved) { resultCode = 0; finished = YES; }
+    else fail(@"无法保存桌面 PNG 截图，请检查 Proxy 状态目录。" );
+  });
+}
+
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000
+static void captureImage(SCContentFilter *filter, SCStreamConfiguration *configuration, NSString *path) API_AVAILABLE(macos(14.0));
+static void captureImage(SCContentFilter *filter, SCStreamConfiguration *configuration, NSString *path) {
+  // A stream may start successfully without delivering frames while the screen
+  // is locked. The screenshot API completes a single capture without that wait.
+  [SCScreenshotManager captureImageWithFilter:filter configuration:configuration completionHandler:^(CGImageRef image, NSError *error) {
+    if (error || !image) {
+      dispatch_async(dispatch_get_main_queue(), ^{ if (!finished) fail(permissionMessage()); });
+      return;
+    }
+    finishImage(saveImage(image, path));
+  }];
+}
+#endif
+
 @interface DesktopFrame : NSObject <SCStreamOutput, SCStreamDelegate>
 @property(nonatomic, strong) SCStream *stream;
 @property(nonatomic, copy) NSString *path;
@@ -49,23 +82,11 @@ static NSDictionary *displayInfo(CGDirectDisplayID displayId) {
   self.received = YES;
   CGImageRef image = NULL;
   OSStatus conversion = VTCreateCGImageFromCVPixelBuffer(pixel, NULL, &image);
-  BOOL saved = NO;
-  if (conversion == noErr && image) {
-    CGImageDestinationRef destination = CGImageDestinationCreateWithURL((__bridge CFURLRef)[NSURL fileURLWithPath:self.path], CFSTR("public.png"), 1, NULL);
-    if (destination) {
-      CGImageDestinationAddImage(destination, image, NULL);
-      saved = CGImageDestinationFinalize(destination);
-      CFRelease(destination);
-    }
-    CGImageRelease(image);
-  }
-  [stream stopCaptureWithCompletionHandler:^(NSError *error) {
-    dispatch_async(dispatch_get_main_queue(), ^{
-      if (finished) return;
-      if (saved) { resultCode = 0; finished = YES; }
-      else fail(@"无法保存桌面 PNG 截图，请检查 Proxy 状态目录。" );
-    });
-  }];
+  BOOL saved = conversion == noErr && saveImage(image, self.path);
+  if (image) CGImageRelease(image);
+  // Stopping a stream is cleanup; a saved PNG must not depend on its callback.
+  [stream stopCaptureWithCompletionHandler:nil];
+  finishImage(saved);
 }
 @end
 
@@ -121,6 +142,12 @@ int main(int argc, const char *argv[]) {
         configuration.showsCursor = YES;
         configuration.queueDepth = 3;
         configuration.minimumFrameInterval = CMTimeMake(1, 30);
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000
+        if (@available(macOS 14.0, *)) {
+          captureImage(filter, configuration, frame.path);
+          return;
+        }
+#endif
         frame.stream = [[SCStream alloc] initWithFilter:filter configuration:configuration delegate:frame];
         NSError *outputError = nil;
         if (![frame.stream addStreamOutput:frame type:SCStreamOutputTypeScreen sampleHandlerQueue:dispatch_queue_create("octopus.desktop.frame", DISPATCH_QUEUE_SERIAL) error:&outputError]) {

package/native/screen-unlock-macos.m

@@ -63,25 +63,22 @@ static BOOL key(CGKeyCode code, CGEventFlags flags, const UniChar *text, size_t
   if (!down || !up) { if (down) CFRelease(down); if (up) CFRelease(up); return NO; }
   CGEventSetFlags(down, flags); CGEventSetFlags(up, flags);
   if (text) { CGEventKeyboardSetUnicodeString(down, length, text); CGEventKeyboardSetUnicodeString(up, length, text); }
-  CGEventPost(kCGHIDEventTap, down); CGEventPost(kCGHIDEventTap, up);
+  CGEventPost(kCGHIDEventTap, down);
+  usleep(50000);
+  CGEventPost(kCGHIDEventTap, up);
   CFRelease(down); CFRelease(up);
-  usleep(20000);
+  usleep(50000);
   return YES;
 }
 
-// The locked console owns keyboard input. Space reveals the password prompt,
-// and Backspace removes that Space if the field was already visible. Do not
-// depend on loginwindow exposing an Accessibility tree (some versions do not).
+// Space reveals and focuses the locked console's password prompt. Allow the
+// transition to finish before typing; no Accessibility discovery is required.
 static BOOL wakePasswordPrompt(void) {
-  const CGKeyCode keys[] = {56, 49, 51};
-  const useconds_t settle[] = {1000000, 500000, 200000};
-  for (int i = 0; i < 3; i++) {
-    BOOL locked = NO;
-    if (!lockState(&locked)) return NO;
-    if (!locked) return YES;
-    if (!key(keys[i], 0, NULL, 0)) return NO;
-    usleep(settle[i]);
-  }
+  BOOL locked = NO;
+  if (!lockState(&locked)) return NO;
+  if (!locked) return YES;
+  if (!key(49, 0, NULL, 0)) return NO;
+  usleep(1000000);
   return YES;
 }
 
@@ -92,7 +89,7 @@ static BOOL lockedKey(CGKeyCode code, CGEventFlags flags, const UniChar *text, s
 
 static void printDiagnostics(BOOL locked) {
   // Read-only; no wake, focus, field contents, screenshots, or input events.
-  printf("{\"locked\":%s,\"canUnlock\":%s,\"loginwindowFound\":%s,\"inputMethod\":\"space-backspace\"}",
+  printf("{\"locked\":%s,\"canUnlock\":%s,\"loginwindowFound\":%s,\"inputMethod\":\"space-password\"}",
     locked ? "true" : "false", AXIsProcessTrusted() && CGPreflightPostEventAccess() ? "true" : "false",
     loginWindowPID() ? "true" : "false");
 }
@@ -118,8 +115,6 @@ int main(int argc, const char *argv[]) {
     if (!lockState(&locked)) return fail("session");
     // Saver dismissal, Touch ID or a manual unlock may finish during wake.
     if (!locked) { printStatus(NO); return 0; }
-    if (!lockedKey(0, kCGEventFlagMaskCommand, NULL, 0) ||
-        !lockedKey(51, 0, NULL, 0)) return fail("changed");
     UniChar characters[1024] = {0};
     NSUInteger length = password.length;
     if (length > 1024) return fail("password");

package/package.json

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