@skylandnpm/octopus-proxy 0.1.0 → 0.1.2

package/README.md

@@ -7,10 +7,13 @@ Octopus Proxy 是运行在 macOS 或 Linux 主机上的 Octopus 代理，提供
 ```sh
 npm install -g @skylandnpm/octopus-proxy@latest --registry https://registry.npmjs.org
 octopus-proxy help
+octopus-proxy version
 octopus-proxy onboard
 ```
 
-无交互环境可使用 `octopus-proxy onboard --non-interactive`；完整选项见 `octopus-proxy help`。安装服务后可运行 `octopus-proxy status` 和 `octopus-proxy doctor` 检查状态。
+向导默认使用 `https://octopus.wuyehao.com` 作为 Hub 地址；按需可输入其他地址，或用 `--hub-url` 指定。再次运行向导时会读取现有配置，直接回车即可保留各项设置；机器人 Secret 只提示已配置，不在终端显示原值。macOS 上选择编码工具时，向导优先显示已配置或探测到的命令路径，否则给出该工具的 macOS 路径示例；回车后会检查文件可执行性并运行版本命令，失败时要求重新输入。无交互环境可使用 `octopus-proxy onboard --non-interactive`，未提供 `--hub-url` 时也使用该默认地址；完整选项见 `octopus-proxy help`。安装服务后可运行 `octopus-proxy status` 和 `octopus-proxy doctor` 检查状态。
+
+Claw 打开机器人工作区时会通过 Hub 向 Proxy 发送只读 `runtime.snapshot` 命令。响应包含当前运行状态、Hub 和工具设置、授权项目路径，以及工具可提供的模型信息；机器人 Secret、工具密码和提供商凭据不会返回。工作区的“Proxy 信息”按钮可查看这些内容。
 
 ## Pi agent
 
@@ -42,11 +45,12 @@ octopus-proxy onboard --tool pi
 
 ## 发布
 
-与 `apps/octopus-taskhub/cli` 相同，发布命令会先构建，再递增补丁版本，最后发布到公开 npm registry。先提交工作区改动并登录有权发布 `@skylandnpm` 包的 npm 账号：
+在 `apps/octopus-proxy` 目录执行 `npm publish` 即可。发布前会检查公开 npm registry：如果当前版本已发布，自动递增补丁版本；如果当前版本尚未发布，则保留该版本。随后编译并发布。版本更新只修改本地 `package.json`，不会自动创建 Git 提交或标签。先登录有权发布 `@skylandnpm` 包的 npm 账号：
 
 ```sh
 npm adduser --registry https://registry.npmjs.org
-pnpm --filter @skylandnpm/octopus-proxy run build:patch:publish
+cd apps/octopus-proxy
+npm publish
 ```
 
-发布前可用 `pnpm --filter @skylandnpm/octopus-proxy build` 检查构建；进入 `apps/octopus-proxy` 后运行 `npm pack --dry-run` 检查包内容。
+预览包内容可运行 `pnpm build && npm pack --dry-run`。`npm publish --dry-run` 也会编译且不会修改版本号或上传，但当前版本已发布时仍会报版本冲突。

package/dist/{chunk-TIHWE4WN.js → chunk-3TRTDBUO.js}

@@ -11658,12 +11658,13 @@ async function loadConfig(path) {
 import WebSocket2 from "ws";
 import { mkdir as mkdir5 } from "node:fs/promises";
 import { join as join9 } from "node:path";
-import { randomUUID as randomUUID10 } from "node:crypto";
+import { randomUUID as randomUUID11 } from "node:crypto";
 
 // ../../packages/protocol/src/index.ts
 var PROTOCOL_VERSION = "1.0";
 var Operations = [
   "runtime.status",
+  "runtime.snapshot",
   "runtime.start",
   "runtime.stop",
   "runtime.restart",
@@ -11737,7 +11738,7 @@ var CommandSchema = z.object({
   sessionId: z.string().optional(),
   payload: z.record(z.unknown()).default({})
 }).strict();
-var isReadOperation = (operation) => /\.(status|list|get|messages|diff|todos|children|logs|projects|read|search|history|models|agents|commands|providers|mcp)$/.test(operation);
+var isReadOperation = (operation) => /\.(status|snapshot|list|get|messages|diff|todos|children|logs|projects|read|search|history|models|agents|commands|providers|mcp)$/.test(operation);
 
 // src/workspace-diff.ts
 import { execFile } from "node:child_process";
@@ -12253,29 +12254,29 @@ var Artifacts = class {
         }
         if (!/\.(md|txt)$/i.test(entry.name)) continue;
         seen.add(entry.path);
-        const record = index[entry.path] ?? { path: entry.path, revisions: [] };
+        const record2 = index[entry.path] ?? { path: entry.path, revisions: [] };
         if (entry.size > 2 * 1024 * 1024) {
           const notice = "\u5F53\u524D\u6587\u4EF6\u8D85\u8FC7 2 MiB\uFF0C\u672A\u4FDD\u5B58\u65B0\u7684\u4FEE\u8BA2\u5FEB\u7167\uFF1B\u5DF2\u6709\u5386\u53F2\u4ECD\u53EF\u67E5\u770B\u3002";
-          if (record.snapshotNotice !== notice) {
-            record.snapshotNotice = notice;
-            index[entry.path] = record;
+          if (record2.snapshotNotice !== notice) {
+            record2.snapshotNotice = notice;
+            index[entry.path] = record2;
             changed = true;
           }
           continue;
         }
-        const data = await readFile3(await this.workspace.path(project, entry.path)), hash = createHash4("sha256").update(data).digest("hex"), previous = record.revisions.at(-1);
-        if (record.snapshotNotice) {
-          delete record.snapshotNotice;
+        const data = await readFile3(await this.workspace.path(project, entry.path)), hash = createHash4("sha256").update(data).digest("hex"), previous = record2.revisions.at(-1);
+        if (record2.snapshotNotice) {
+          delete record2.snapshotNotice;
           changed = true;
         }
         if (previous?.hash !== hash || previous.deleted) {
           const dir = join4(this.directory, project, "blobs");
           await mkdir3(dir, { recursive: true, mode: 448 });
           await writeFile2(join4(dir, hash), data, { mode: 384 });
-          record.revisions.push({ hash, timestamp: (/* @__PURE__ */ new Date()).toISOString() });
+          record2.revisions.push({ hash, timestamp: (/* @__PURE__ */ new Date()).toISOString() });
           changed = true;
         }
-        index[entry.path] = record;
+        index[entry.path] = record2;
       }
     };
     for (const dir of this.workspace.project(project).specDirectories) {
@@ -12388,8 +12389,85 @@ var EventStream = class {
   }
 };
 
+// src/proxy-snapshot.ts
+import { randomUUID as randomUUID4 } from "node:crypto";
+function record(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
+}
+function publicModels(value) {
+  const result = [];
+  const providers = record(value).providers;
+  if (!Array.isArray(providers)) return result;
+  for (const providerValue of providers) {
+    const provider = record(providerValue);
+    if (typeof provider.id !== "string") continue;
+    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 });
+      if (result.length >= 500) return result;
+    }
+  }
+  return result;
+}
+async function buildProxySnapshot(config, runtime, adapter, requestedProjectId) {
+  const capabilities = adapter.supportedOperations();
+  const status = record(await runtime.status());
+  const projects = config.projects.map(({ id, name, directory, specDirectories }) => ({ id, name, directory, specDirectories }));
+  const projectId = projects.find((project) => project.id === requestedProjectId)?.id ?? projects[0]?.id;
+  const models = [];
+  let modelCatalogStatus = capabilities.includes("configuration.models") ? "unavailable" : "unsupported";
+  if (status.healthy === true && projectId && capabilities.includes("configuration.models")) {
+    try {
+      const command = { type: "command", id: randomUUID4(), botId: config.botId, operation: "configuration.models", projectId, payload: {} };
+      models.push(...publicModels(await adapter.dispatch(command)));
+      modelCatalogStatus = "available";
+    } catch {
+      modelCatalogStatus = "unavailable";
+    }
+  }
+  let recentModel;
+  if (status.healthy === true && projectId && modelCatalogStatus === "unsupported" && capabilities.includes("sessions.list")) {
+    try {
+      const command = { type: "command", id: randomUUID4(), botId: config.botId, operation: "sessions.list", projectId, payload: {} };
+      const sessions = await adapter.dispatch(command);
+      if (Array.isArray(sessions)) {
+        const withModel = sessions.map(record).filter((session) => {
+          const model = record(session.model);
+          return typeof model.providerId === "string" && typeof model.modelId === "string";
+        }).sort((left, right) => {
+          const leftTime = record(left.time).updated, rightTime = record(right.time).updated;
+          return (typeof rightTime === "number" ? rightTime : 0) - (typeof leftTime === "number" ? leftTime : 0);
+        })[0];
+        if (withModel) {
+          const model = record(withModel.model);
+          recentModel = { providerId: model.providerId, modelId: model.modelId };
+        }
+      }
+    } catch {
+    }
+  }
+  return {
+    runtime: { ...status, capabilities },
+    config: {
+      hubUrl: config.hubUrl,
+      botId: config.botId,
+      stateDirectory: config.stateDirectory,
+      tool: {
+        kind: config.tool.kind,
+        command: config.tool.command,
+        mode: config.tool.mode,
+        autoStart: config.tool.autoStart,
+        ...config.tool.kind === "opencode" ? { baseUrl: config.tool.baseUrl } : {}
+      }
+    },
+    projects,
+    modelCatalog: { projectId, status: modelCatalogStatus, models, ...recentModel ? { recentModel } : {} }
+  };
+}
+
 // src/media.ts
-import { createHash as createHash5, randomUUID as randomUUID4 } from "node:crypto";
+import { createHash as createHash5, randomUUID as randomUUID5 } from "node:crypto";
 import { constants as constants3 } from "node:fs";
 import { open as open3, unlink as unlink3, realpath as realpath3 } from "node:fs/promises";
 import { basename as basename3, isAbsolute as isAbsolute3, relative as relative3, resolve as resolve3, sep as sep2 } from "node:path";
@@ -12606,7 +12684,7 @@ var RemoteMedia = class {
     if (bytes.length === 0 || bytes.length > this.imageLimit()) throw new Error("Image is empty or exceeds size limit");
     const extension = { "image/png": "png", "image/jpeg": "jpg", "image/gif": "gif", "image/webp": "webp", "application/pdf": "pdf" }[mime] ?? "bin";
     const directory = await this.workspace.attachmentDirectory(project, "media", sha256), path = directory + "/asset." + extension;
-    const temp = await this.workspace.path(project, directory + "/.octopus-media-" + randomUUID4(), true);
+    const temp = await this.workspace.path(project, directory + "/.octopus-media-" + randomUUID5(), true);
     const file = await open3(temp, constants3.O_WRONLY | constants3.O_CREAT | constants3.O_EXCL | constants3.O_NOFOLLOW, 384);
     try {
       await file.writeFile(bytes);
@@ -14024,7 +14102,7 @@ function applyEdits(text, edits) {
 
 // src/project-config.ts
 import { readFile as readFile4, writeFile as writeFile3, unlink as unlink4 } from "node:fs/promises";
-import { createHash as createHash6, randomUUID as randomUUID5 } from "node:crypto";
+import { createHash as createHash6, randomUUID as randomUUID6 } from "node:crypto";
 var ProjectConfig = class {
   constructor(workspace, request) {
     this.workspace = workspace;
@@ -14075,7 +14153,7 @@ var ProjectConfig = class {
     if (!this.validator(parse2(updated))) throw new Error("Merged OpenCode configuration is invalid: " + JSON.stringify(this.validator.errors));
     if (exists) await this.workspace.write(project, name, updated, createHash6("sha256").update(original).digest("hex"));
     else {
-      const temporary = await this.workspace.path(project, `.octopus-config-${randomUUID5()}.tmp`, true);
+      const temporary = await this.workspace.path(project, `.octopus-config-${randomUUID6()}.tmp`, true);
       try {
         await writeFile3(temporary, updated, { mode: 384, flag: "wx" });
         await this.workspace.publish(project, temporary, name);
@@ -14538,7 +14616,7 @@ import { open as open5 } from "node:fs/promises";
 import { join as join6 } from "node:path";
 
 // src/tools/line-rpc.ts
-import { randomUUID as randomUUID6 } from "node:crypto";
+import { randomUUID as randomUUID7 } from "node:crypto";
 import { crc32 } from "node:zlib";
 import { StringDecoder } from "node:string_decoder";
 function interrupted(message) {
@@ -14677,37 +14755,37 @@ var LineRpc = class {
       return;
     }
     if (this.protocol === "pi") {
-      const record2 = message;
-      if (record2.type === "response") {
-        const waiter = this.pending.get(String(record2.id));
+      const record3 = message;
+      if (record3.type === "response") {
+        const waiter = this.pending.get(String(record3.id));
         if (waiter) {
           clearTimeout(waiter.timer);
-          this.pending.delete(String(record2.id));
-          if (record2.success === true) waiter.resolve(record2.data);
-          else waiter.reject(new Error(record2.error ?? "Pi RPC command failed"));
+          this.pending.delete(String(record3.id));
+          if (record3.success === true) waiter.resolve(record3.data);
+          else waiter.reject(new Error(record3.error ?? "Pi RPC command failed"));
         }
-      } else if (typeof record2.type === "string") this.handlers.onNotification?.(record2.type, message);
+      } else if (typeof record3.type === "string") this.handlers.onNotification?.(record3.type, message);
       return;
     }
-    const record = message;
-    if (record.id !== void 0 && typeof record.method !== "string") {
-      const waiter = this.pending.get(String(record.id));
+    const record2 = message;
+    if (record2.id !== void 0 && typeof record2.method !== "string") {
+      const waiter = this.pending.get(String(record2.id));
       if (waiter) {
         clearTimeout(waiter.timer);
-        this.pending.delete(String(record.id));
-        if (record.error) waiter.reject(new Error(record.error.message ?? `App server error ${record.error.code ?? ""}`));
-        else waiter.resolve(record.result);
+        this.pending.delete(String(record2.id));
+        if (record2.error) waiter.reject(new Error(record2.error.message ?? `App server error ${record2.error.code ?? ""}`));
+        else waiter.resolve(record2.result);
       }
       return;
     }
-    if (typeof record.method === "string" && record.id !== void 0) {
-      const respond = (result) => this.respond(record.id, result);
-      const respondError = (code, messageText) => this.respondError(record.id, code, messageText);
-      this.handlers.onServerRequest?.(record.id, record.method, message.params, respond, respondError);
+    if (typeof record2.method === "string" && record2.id !== void 0) {
+      const respond = (result) => this.respond(record2.id, result);
+      const respondError = (code, messageText) => this.respondError(record2.id, code, messageText);
+      this.handlers.onServerRequest?.(record2.id, record2.method, message.params, respond, respondError);
       return;
     }
-    if (typeof record.method === "string") {
-      this.handlers.onNotification?.(record.method, message.params);
+    if (typeof record2.method === "string") {
+      this.handlers.onNotification?.(record2.method, message.params);
       return;
     }
   }
@@ -14723,7 +14801,7 @@ var LineRpc = class {
   }
 };
 function wrapEnvelope(frame) {
-  return { wireVersion: 3, kind: "complete", deliveryKind: "desktop-continuous", logicalFrameId: randomUUID6(), logicalFrameOrdinal: 1, topic: "outbound", subscriptionId: "outbound", frame };
+  return { wireVersion: 3, kind: "complete", deliveryKind: "desktop-continuous", logicalFrameId: randomUUID7(), logicalFrameOrdinal: 1, topic: "outbound", subscriptionId: "outbound", frame };
 }
 
 // src/tools/stdio-runtime.ts
@@ -14900,6 +14978,7 @@ import { join as join7 } from "node:path";
 // src/adapter.ts
 var DAEMON_OPERATIONS = [
   "runtime.status",
+  "runtime.snapshot",
   "runtime.start",
   "runtime.stop",
   "runtime.restart",
@@ -14925,7 +15004,7 @@ function unsupportedOperation(kind, operation) {
 }
 
 // src/tools/codex.ts
-import { randomUUID as randomUUID7 } from "node:crypto";
+import { randomUUID as randomUUID8 } from "node:crypto";
 var OPERATIONS = [
   ...DAEMON_OPERATIONS,
   "sessions.list",
@@ -14989,7 +15068,7 @@ var CodexAdapter = class {
   }
   onServerRequest(project, id, method, params, respond) {
     const detail = params ?? {};
-    const requestId = randomUUID7();
+    const requestId = randomUUID8();
     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 });
@@ -15318,7 +15397,7 @@ var CodexAdapter = class {
 };
 
 // src/tools/zcode.ts
-import { randomUUID as randomUUID8 } from "node:crypto";
+import { randomUUID as randomUUID9 } from "node:crypto";
 import { realpath as realpath5 } from "node:fs/promises";
 var OPERATIONS2 = [
   ...DAEMON_OPERATIONS,
@@ -15370,7 +15449,7 @@ var ZcodeAdapter = class {
   }
   onServerRequest(project, id, method, params, respond, respondError) {
     const detail = params ?? {};
-    const requestId = randomUUID8();
+    const requestId = randomUUID9();
     const sessionId = String(detail.sessionId ?? "");
     if (method === "session/requestRuntimePreferences") {
       respond({ nativeSearchEnhancementsEnabled: false });
@@ -15393,7 +15472,15 @@ var ZcodeAdapter = class {
     return { workspaceKey: root, workspacePath: root };
   }
   sessionProjection(session) {
-    return { id: session.sessionId, title: session.title ?? "", directory: session.workspace?.workspacePath, time: { created: session.createdAt, updated: session.updatedAt }, status: session.status };
+    const model = session.model;
+    return {
+      id: session.sessionId,
+      title: session.title ?? "",
+      directory: session.workspace?.workspacePath,
+      time: { created: session.createdAt, updated: session.updatedAt },
+      status: session.status,
+      ...typeof model?.providerId === "string" && typeof model.modelId === "string" ? { model: { providerId: model.providerId, modelId: model.modelId } } : {}
+    };
   }
   rowToPart(row) {
     const data = row.data ?? row;
@@ -15587,7 +15674,7 @@ var ZcodeAdapter = class {
 };
 
 // src/tools/pi.ts
-import { randomUUID as randomUUID9 } from "node:crypto";
+import { randomUUID as randomUUID10 } from "node:crypto";
 import { readFile as readFile5, readdir as readdir3, rm } from "node:fs/promises";
 import { dirname as dirname4 } from "node:path";
 var OPERATIONS3 = [
@@ -15681,7 +15768,7 @@ var PiAdapter = class {
   }
   onQuestion(project, sessionId, detail) {
     if (!["select", "confirm", "input", "editor"].includes(String(detail.method))) return;
-    const id = randomUUID9();
+    const id = randomUUID10();
     void this.rpc(project, sessionId).then((rpc) => {
       if (rpc.exited) return;
       const question = { id, project, sessionId, detail, rpc };
@@ -15781,7 +15868,7 @@ var PiAdapter = class {
       return sessions.sort((a, b) => b.time.updated - a.time.updated);
     }
     if (op === "sessions.create") {
-      const session2 = { id: randomUUID9(), title: typeof p.title === "string" && p.title.trim() ? p.title : "\u65B0\u4EFB\u52A1", directory: await this.workspace.root(project), time: { created: Date.now(), updated: Date.now() } };
+      const session2 = { id: randomUUID10(), title: typeof p.title === "string" && p.title.trim() ? p.title : "\u65B0\u4EFB\u52A1", directory: await this.workspace.root(project), time: { created: Date.now(), updated: Date.now() } };
       try {
         const rpc2 = await this.rpc(project, session2.id);
         await rpc2.request("set_session_name", { name: session2.title });
@@ -16057,7 +16144,7 @@ async function runDaemon(configPath) {
   const config = await loadConfig(configPath);
   await mkdir5(config.stateDirectory, { recursive: true, mode: 448 });
   const workspace = new Workspace(config.projects), runtime = createRuntime(config), uploads = new Uploads(workspace, join9(config.stateDirectory, "uploads")), journal = new Journal(join9(config.stateDirectory, "journal"));
-  const epoch = randomUUID10();
+  const epoch = randomUUID11();
   let stopping = false, botId = "";
   const sockets = /* @__PURE__ */ new Set();
   const events = new EventStream(epoch, () => {
@@ -16070,6 +16157,7 @@ async function runDaemon(configPath) {
   async function dispatch(c) {
     const p = c.payload;
     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();
     if (c.operation === "runtime.start") return runtime.start();
     if (c.operation === "runtime.stop") return runtime.stop();

package/dist/cli.js

@@ -17,11 +17,12 @@ import {
   runDaemon,
   supportedPlatform,
   systemdUnitPath
-} from "./chunk-TIHWE4WN.js";
+} from "./chunk-3TRTDBUO.js";
 
 // src/cli.ts
 import { spawn } from "node:child_process";
-import { access as access3 } from "node:fs/promises";
+import { readFileSync } from "node:fs";
+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";
@@ -423,14 +424,18 @@ async function runDoctor(opts) {
 // src/onboard.ts
 import { createInterface } from "node:readline/promises";
 import { stdin, stdout } from "node:process";
-import { mkdir as mkdir4, stat as stat3 } from "node:fs/promises";
+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 } from "node:path";
+import { promisify as promisify5 } from "node:util";
+var DEFAULT_HUB_URL = "https://octopus.wuyehao.com";
 async function ask(rl, question, options = {}) {
   for (; ; ) {
-    const suffix = options.default !== void 0 ? `\uFF08\u9ED8\u8BA4 ${options.default}\uFF09` : "";
+    const suffix = options.default !== void 0 && options.showDefault !== false ? `\uFF08\u9ED8\u8BA4 ${options.defaultDisplay ?? options.default}\uFF09` : "";
     const answer = (await rl.question(`${question}${suffix}: `)).trim();
     const value = answer || options.default || "";
-    const problem = options.validate?.(value);
+    const problem = await options.validate?.(value);
     if (problem) {
       console.log(`  ${problem}`);
       continue;
@@ -451,24 +456,76 @@ var validUrl = (value) => {
 };
 var validId = (value) => /^[a-zA-Z0-9_-]+$/.test(value) ? void 0 : "\u4EC5\u9650\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u4E0B\u5212\u7EBF\u548C\u8FDE\u5B57\u7B26";
 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 MACOS_TOOL_EXAMPLES = {
+  opencode: "/opt/homebrew/bin/opencode",
+  codex: "/Applications/ChatGPT.app/Contents/Resources/codex",
+  zcode: "/Applications/ZCode.app/Contents/Resources/glm/zcode.cjs",
+  pi: "/opt/homebrew/bin/pi"
+};
+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";
+    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 });
+  } 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) {
-  let hubUrl = opts.hubUrl ?? "", botId = opts.botId ?? "", secretKey = opts.secretKey ?? "", stateDirectory = opts.stateDirectory ?? defaultStateDirectory(), toolCommand = opts.toolCommand ?? "", toolKind = opts.toolKind ?? "opencode", mode = "managed";
-  let projects = opts.projects.map((project) => ({ ...project, directory: expandHome(project.directory) }));
+  const configExists = await stat3(opts.configPath).then(() => true, (error) => {
+    if (error.code === "ENOENT") return false;
+    throw error;
+  });
+  const existing = opts.interactive && configExists ? await loadConfig(opts.configPath) : void 0;
+  let hubUrl = opts.hubUrl || existing?.hubUrl || DEFAULT_HUB_URL, botId = opts.botId ?? existing?.botId ?? "", secretKey = opts.secretKey ?? existing?.secretKey ?? "", stateDirectory = opts.stateDirectory ?? existing?.stateDirectory ?? defaultStateDirectory();
+  let toolKind = opts.toolKind ?? existing?.tool.kind ?? "opencode";
+  let toolCommand = opts.toolCommand ?? (toolKind === existing?.tool.kind ? existing.tool.command : "");
+  let mode = toolKind === existing?.tool.kind ? existing.tool.mode : "managed";
+  let projects = [...existing?.projects ?? [], ...opts.projects].map((project) => ({ ...project, directory: expandHome(project.directory) }));
   if (opts.interactive) {
     const rl = createInterface({ input: stdin, output: stdout });
     console.log("Octopus Proxy \u521D\u59CB\u5316\u5411\u5BFC");
     console.log(`\u914D\u7F6E\u5C06\u5199\u5165 ${opts.configPath}\uFF1B\u6587\u4EF6\u5305\u542B\u673A\u5668\u4EBA Secret\uFF0C\u4F1A\u4EE5 0600 \u6743\u9650\u4FDD\u5B58\u3002
 `);
-    hubUrl = await ask(rl, "Hub \u5730\u5740", { default: hubUrl || void 0, validate: validUrl });
-    botId = await ask(rl, "\u673A\u5668\u4EBA ID\uFF08\u5728 Claw \u6216 Taskhub \u4E2D\u521B\u5EFA\u5E76\u590D\u5236\uFF09", { validate: validBotId });
-    secretKey = await ask(rl, "\u673A\u5668\u4EBA Secret\uFF08\u5728 Claw \u6216 Taskhub \u521B\u5EFA\uFF1B\u8F93\u5165\u4F1A\u56DE\u663E\u5728\u7EC8\u7AEF\uFF09", { validate: (value) => value.length >= 20 ? void 0 : "\u8BF7\u8F93\u5165\u5B8C\u6574\u7684\u673A\u5668\u4EBA Secret" });
+    hubUrl = await ask(rl, `Hub \u5730\u5740\uFF08${hubUrl} , \u56DE\u8F66\u76F4\u63A5\u786E\u8BA4\uFF09`, { default: hubUrl, showDefault: false, validate: validUrl });
+    botId = await ask(rl, "\u673A\u5668\u4EBA ID\uFF08\u5728 Claw \u6216 Taskhub \u4E2D\u521B\u5EFA\u5E76\u590D\u5236\uFF09", { default: botId || void 0, validate: validBotId });
+    secretKey = await ask(rl, "\u673A\u5668\u4EBA Secret\uFF08\u5728 Claw \u6216 Taskhub \u521B\u5EFA\uFF1B\u8F93\u5165\u4F1A\u56DE\u663E\u5728\u7EC8\u7AEF\uFF09", { default: secretKey || void 0, defaultDisplay: existing?.secretKey ? "\u5DF2\u914D\u7F6E\uFF0C\u56DE\u8F66\u4FDD\u7559" : "\u5DF2\u63D0\u4F9B\uFF0C\u56DE\u8F66\u4F7F\u7528", validate: (value) => value.length >= 20 ? void 0 : "\u8BF7\u8F93\u5165\u5B8C\u6574\u7684\u673A\u5668\u4EBA Secret" });
     stateDirectory = expandHome(await ask(rl, "\u72B6\u6001\u76EE\u5F55", { default: stateDirectory, validate: (value) => isAbsolute3(expandHome(value)) ? void 0 : "\u5FC5\u987B\u662F\u7EDD\u5BF9\u8DEF\u5F84" }));
+    const previousToolKind = toolKind;
     toolKind = await ask(rl, `\u7F16\u7801\u5DE5\u5177\uFF08${TOOL_KINDS.join("/")}\uFF09`, { default: toolKind, validate: (value) => TOOL_KINDS.includes(value) ? void 0 : `\u8F93\u5165 ${TOOL_KINDS.join(" \u6216 ")}` });
+    if (toolKind !== previousToolKind) toolCommand = toolKind === existing?.tool.kind ? existing.tool.command : "";
     const descriptor = describeTool(toolKind);
     const found = await resolveCommandOnPath(toolKind, toolSearchDirs(toolKind));
-    toolCommand = await ask(rl, found ? `${descriptor.label} \u547D\u4EE4\uFF08\u63A2\u6D4B\u5230 ${found}\uFF09` : `${descriptor.label} \u547D\u4EE4\uFF08\u672A\u5728 PATH \u4E2D\u63A2\u6D4B\u5230\uFF0C\u8BF7\u8F93\u5165\u7EDD\u5BF9\u8DEF\u5F84\uFF09`, { default: found ?? void 0, validate: (value) => isAbsolute3(expandHome(value)) ? void 0 : "\u670D\u52A1\u73AF\u5883\u9700\u8981\u7EDD\u5BF9\u8DEF\u5F84" });
-    if (toolKind === "opencode") mode = await ask(rl, "OpenCode \u6A21\u5F0F\uFF08managed=\u7531\u4EE3\u7406\u6258\u7BA1\u542F\u52A8\uFF0Cexternal=\u4EC5\u8FDE\u63A5\u5DF2\u6709\u670D\u52A1\uFF09", { default: "managed", validate: (value) => value === "managed" || value === "external" ? void 0 : "\u8F93\u5165 managed \u6216 external" });
-    console.log("\n\u5F55\u5165\u6388\u6743\u9879\u76EE\uFF08\u540D\u79F0\u7559\u7A7A\u7ED3\u675F\uFF09\uFF1A");
+    const example = platform2() === "darwin" ? MACOS_TOOL_EXAMPLES[toolKind] : void 0;
+    toolCommand = expandHome(await ask(rl, found ? `${descriptor.label} \u547D\u4EE4\uFF08\u63A2\u6D4B\u5230 ${found}\uFF1B\u56DE\u8F66\u4F1A\u9A8C\u8BC1\uFF09` : `${descriptor.label} \u547D\u4EE4\uFF08\u56DE\u8F66\u4F1A\u9A8C\u8BC1\u8DEF\u5F84\uFF09`, { default: toolCommand || found || example, validate: (value) => validateToolCommand(value, toolKind) }));
+    console.log(`  \u5DF2\u786E\u8BA4 ${descriptor.label} \u547D\u4EE4\u53EF\u6267\u884C\uFF1A${toolCommand}`);
+    if (toolKind === "opencode") mode = await ask(rl, "OpenCode \u6A21\u5F0F\uFF08managed=\u7531\u4EE3\u7406\u6258\u7BA1\u542F\u52A8\uFF0Cexternal=\u4EC5\u8FDE\u63A5\u5DF2\u6709\u670D\u52A1\uFF09", { default: mode, validate: (value) => value === "managed" || value === "external" ? void 0 : "\u8F93\u5165 managed \u6216 external" });
+    if (projects.length) console.log("\n\u5DF2\u6709\u6388\u6743\u9879\u76EE\uFF08\u76F4\u63A5\u56DE\u8F66\u4FDD\u7559\u5404\u9879\uFF09\uFF1A");
+    for (const project of projects) {
+      project.name = await ask(rl, "  \u9879\u76EE\u540D\u79F0", { default: project.name });
+      for (; ; ) {
+        project.directory = expandHome(await ask(rl, `  \u300C${project.name}\u300D\u76EE\u5F55\uFF08\u7EDD\u5BF9\u8DEF\u5F84\uFF09`, { default: project.directory }));
+        if (!isAbsolute3(project.directory)) {
+          console.log("  \u5FC5\u987B\u662F\u7EDD\u5BF9\u8DEF\u5F84");
+          continue;
+        }
+        if (!await stat3(project.directory).then(() => true, () => false)) {
+          console.log("  \u76EE\u5F55\u4E0D\u5B58\u5728");
+          continue;
+        }
+        break;
+      }
+      project.id = await ask(rl, "  \u9879\u76EE ID", { default: project.id ?? slug(project.name), validate: validId });
+    }
+    console.log("\n\u6DFB\u52A0\u6388\u6743\u9879\u76EE\uFF08\u540D\u79F0\u7559\u7A7A\u7ED3\u675F\uFF09\uFF1A");
     for (; ; ) {
       const name = (await rl.question("  \u9879\u76EE\u540D\u79F0: ")).trim();
       if (!name) break;
@@ -493,7 +550,6 @@ async function runOnboard(opts) {
     console.log("");
   } else {
     const missing = [];
-    if (!hubUrl) missing.push("--hub-url");
     if (!botId) missing.push("--bot-id");
     if (!secretKey) missing.push("--secret-key");
     if (!projects.length) missing.push("--project");
@@ -509,12 +565,12 @@ async function runOnboard(opts) {
     toolCommand = toolCommand ? expandHome(toolCommand) : await resolveCommandOnPath(toolKind, toolSearchDirs(toolKind)) ?? descriptor.defaultCommand;
     if (!isAbsolute3(toolCommand)) console.log(`\u63D0\u793A\uFF1A\u672A\u5728 PATH \u4E2D\u63A2\u6D4B\u5230 ${descriptor.label}\uFF0C\u914D\u7F6E\u4FDD\u7559\u547D\u4EE4\u540D\u300C${toolCommand}\u300D\uFF1B\u670D\u52A1\u73AF\u5883\u5EFA\u8BAE\u7EDD\u5BF9\u8DEF\u5F84\uFF08\u53EF\u7528 --tool-command \u6307\u5B9A\uFF09`);
   }
-  if (await stat3(opts.configPath).then(() => true, () => false)) {
+  if (configExists) {
     if (opts.interactive) {
       const rl = createInterface({ input: stdin, output: stdout });
-      const answer = (await rl.question(`\u914D\u7F6E ${opts.configPath} \u5DF2\u5B58\u5728\uFF0C\u8986\u76D6\uFF1F(y/N): `)).trim();
+      const answer = (await rl.question(`\u4FDD\u5B58\u5230\u73B0\u6709\u914D\u7F6E ${opts.configPath}\uFF1F(Y/n): `)).trim();
       rl.close();
-      if (!/^y(es)?$/i.test(answer)) {
+      if (/^(n|no)$/i.test(answer)) {
         console.log("\u5DF2\u53D6\u6D88\uFF0C\u672A\u5199\u5165\u4EFB\u4F55\u5185\u5BB9\u3002");
         return;
       }
@@ -528,8 +584,8 @@ async function runOnboard(opts) {
     secretKey,
     stateDirectory,
     ...loopbackHttp ? { allowInsecureLocalhost: true } : {},
-    projects: projects.map((project) => ({ id: project.id, name: project.name, directory: project.directory, specDirectories: ["specs", "docs"] })),
-    tool: { kind: toolKind, command: toolCommand || describeTool(toolKind).defaultCommand, ...toolKind === "opencode" ? { baseUrl: "http://127.0.0.1:4096", mode } : {}, autoStart: true }
+    projects: projects.map((project) => ({ id: project.id, name: project.name, directory: project.directory, specDirectories: project.specDirectories ?? ["specs", "docs"] })),
+    tool: { kind: toolKind, command: toolCommand || describeTool(toolKind).defaultCommand, ...toolKind === "opencode" ? { baseUrl: toolKind === existing?.tool.kind ? existing.tool.baseUrl : "http://127.0.0.1:4096", mode } : {}, ...toolKind === existing?.tool.kind && existing.tool.password ? { password: existing.tool.password } : {}, autoStart: toolKind === existing?.tool.kind ? existing.tool.autoStart : true }
   });
   await loadConfig(opts.configPath);
   console.log(`\u5DF2\u5199\u5165\u914D\u7F6E\uFF1A${opts.configPath}\uFF080600\uFF09`);
@@ -573,14 +629,15 @@ var USAGE = `octopus-proxy \u2014 Octopus \u4E3B\u673A\u4EE3\u7406
   doctor      \u68C0\u67E5\u914D\u7F6E\u3001OpenCode\u3001node \u4E0E\u670D\u52A1\u5065\u5EB7\uFF08--fix \u81EA\u52A8\u4FEE\u590D\uFF09
   run         \u524D\u53F0\u8FD0\u884C\u4EE3\u7406\uFF08\u8C03\u8BD5\u7528\uFF0CCtrl+C \u9000\u51FA\uFF09
   logs        \u67E5\u770B\u670D\u52A1\u65E5\u5FD7\uFF08-f \u6301\u7EED\u8DDF\u968F\uFF09
+  version     \u663E\u793A\u7248\u672C\u53F7
   help        \u663E\u793A\u672C\u5E2E\u52A9
 
 \u901A\u7528\u9009\u9879:
   --config <path>      \u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84\uFF08\u9ED8\u8BA4 $OCTOPUS_PROXY_CONFIG \u6216 ~/.config/octopus/proxy.json\uFF09
 
 onboard \u9009\u9879:
-  --non-interactive        \u975E\u4EA4\u4E92\u6A21\u5F0F\uFF1B\u9700\u63D0\u4F9B Hub \u5730\u5740\u3001\u673A\u5668\u4EBA ID\u3001Secret \u548C\u9879\u76EE
-  --hub-url <url>          Hub \u5730\u5740\uFF08https\uFF09
+  --non-interactive        \u975E\u4EA4\u4E92\u6A21\u5F0F\uFF1B\u9700\u63D0\u4F9B\u673A\u5668\u4EBA ID\u3001Secret \u548C\u9879\u76EE
+  --hub-url <url>          Hub \u5730\u5740\uFF08\u9ED8\u8BA4 https://octopus.wuyehao.com\uFF09
   --bot-id <uuid>          Claw \u6216 Taskhub \u4E2D\u521B\u5EFA\u7684\u673A\u5668\u4EBA ID
   --secret-key <key>       \u673A\u5668\u4EBA Secret\uFF08\u5728 Claw \u6216 Taskhub \u521B\u5EFA\uFF09
   --state-dir <path>       \u72B6\u6001\u76EE\u5F55\uFF08\u9ED8\u8BA4 ~/.local/state/octopus\uFF09
@@ -608,6 +665,10 @@ function parse(argv) {
       flags2["--help"] = "true";
       continue;
     }
+    if (arg === "-v" || arg === "--version") {
+      flags2["--version"] = "true";
+      continue;
+    }
     if (arg === "-f") {
       flags2["--follow"] = "true";
       continue;
@@ -633,7 +694,7 @@ function parse(argv) {
 }
 async function showLogs(follow) {
   const child = isMacOS() ? spawn("tail", ["-n", "200", ...follow ? ["-F"] : [], launchdLogPath()], { stdio: "inherit" }) : spawn("journalctl", ["--user", "-u", SYSTEMD_UNIT, "-n", "200", ...follow ? ["-f"] : ["--no-pager"]], { stdio: "inherit" });
-  if (isMacOS() && !await access3(launchdLogPath()).then(() => true, () => false)) {
+  if (isMacOS() && !await access4(launchdLogPath()).then(() => true, () => false)) {
     console.error(`\u65E5\u5FD7\u6587\u4EF6\u5C1A\u672A\u751F\u6210\uFF1A${launchdLogPath()}`);
     process.exit(1);
   }
@@ -646,6 +707,11 @@ async function showLogs(follow) {
   process.exit(code);
 }
 var { command, flags, projectArgs } = parse(process.argv.slice(2));
+if (command === "version" || flags["--version"]) {
+  const packageJson = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8"));
+  console.log(packageJson.version);
+  process.exit(0);
+}
 if (!command || command === "help" || flags["--help"]) {
   console.log(USAGE);
   process.exit(command || flags["--help"] ? 0 : 1);

package/dist/main.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skylandnpm/octopus-proxy",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "type": "module",
   "description": "Octopus host proxy: OpenCode, Codex, ZCode and Pi adapters with service installer CLI",
   "bin": {
@@ -15,7 +15,8 @@
   },
   "scripts": {
     "build": "tsc --noEmit && tsup",
-    "build:patch:publish": "pnpm build && npm version patch && npm publish",
+    "prepublishOnly": "node scripts/prepare-publish.mjs",
+    "build:patch:publish": "npm publish",
     "typecheck": "tsc --noEmit",
     "dev": "tsx src/main.ts",
     "cli": "tsx src/cli.ts",