@skylandnpm/octopus-proxy 0.1.1 → 0.1.3

package/README.md

@@ -7,6 +7,7 @@ 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
 ```
 
@@ -44,11 +45,12 @@ octopus-proxy onboard --tool pi
 
 ## 发布
 
-与 `apps/octopus-taskhub/cli` 相同，发布命令会先构建，再递增补丁版本，最后发布到公开 npm registry。先提交工作区改动并登录有权发布 `@skylandnpm` 包的 npm 账号：
+在 `apps/octopus-proxy` 目录执行 `npm run publish`：先递增 `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 run publish
 ```
 
-发布前可用 `pnpm --filter @skylandnpm/octopus-proxy build` 检查构建；进入 `apps/octopus-proxy` 后运行 `npm pack --dry-run` 检查包内容。
+预览包内容可运行 `pnpm build && npm pack --dry-run`。直接运行 `npm publish` 会提示使用 `npm run publish`，以防绕过版本递增和编译。

package/dist/cli.js

@@ -21,6 +21,7 @@ import {
 
 // src/cli.ts
 import { spawn } from "node:child_process";
+import { readFileSync } from "node:fs";
 import { access as access4 } from "node:fs/promises";
 
 // src/doctor.ts
@@ -431,7 +432,7 @@ 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.defaultDisplay ?? 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 = await options.validate?.(value);
@@ -494,7 +495,7 @@ async function runOnboard(opts) {
     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 });
+    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" }));
@@ -628,6 +629,7 @@ 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:
@@ -663,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;
@@ -701,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skylandnpm/octopus-proxy",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "type": "module",
   "description": "Octopus host proxy: OpenCode, Codex, ZCode and Pi adapters with service installer CLI",
   "bin": {
@@ -15,12 +15,15 @@
   },
   "scripts": {
     "build": "tsc --noEmit && tsup",
-    "build:patch:publish": "pnpm build && npm version patch && npm publish",
+    "prepublishOnly": "node -e \"console.error('请使用 npm run publish'); process.exit(1)\"",
+    "publish": "npm version patch --no-git-tag-version && pnpm build && npm publish --ignore-scripts",
+    "release": "npm run publish",
+    "build:patch:publish": "npm run publish",
     "typecheck": "tsc --noEmit",
     "dev": "tsx src/main.ts",
     "cli": "tsx src/cli.ts",
     "test": "vitest run",
-    "help": "echo \"Run 'npm adduser --registry https://registry.npmjs.org' before 'npm run build:patch:publish'\""
+    "help": "echo \"Run 'npm adduser --registry https://registry.npmjs.org' before 'npm run publish'\""
   },
   "dependencies": {
     "ws": "8.18.0"