@peterwangze/claude-trigger-router 1.0.2 → 1.0.3

package/README.md

@@ -30,8 +30,8 @@ ctr setup
 `ctr setup` 会：
 
 - 优先检查当前配置是否可直接复用
-- 检测旧版 `~/.ccr/config.yaml` 并优先提供迁移
-- 在需要新建时，先询问默认模型 ID，再收集最少必要接入信息
+- 检测旧版 `~/.ccr/config.yaml` 或 `~/.claude-code-router/config.yaml` 并优先提供迁移
+- 在需要新建时，先确认接入方式与 provider 预设，再带出默认模型和默认模型 ID 供确认
 - 只生成最小可用配置（`Models + Router.default`），高级路由稍后再补
 - 保存配置后启动服务并进入 Claude Code
 
@@ -262,7 +262,7 @@ Models:
 如果你还在使用旧的 `Providers + provider,model` 配置：
 
 - 当前版本仍然兼容旧格式
-- `ctr setup` 会优先尝试迁移旧 `ccr` 配置
+- `ctr setup` 会优先尝试迁移旧 `ccr` / `claude-code-router` 配置
 - 路由字段推荐逐步改成直接引用 `Models[].id`
 
 迁移后的核心变化是：
@@ -279,6 +279,8 @@ Models:
 ```bash
 ctr setup
 ctr init
+ctr version
+ctr upgrade
 ctr start
 ctr start --daemon
 ctr stop

package/dist/cli.js

@@ -5882,7 +5882,7 @@ function decideSetupBranch(input2) {
         ensureNoLegacyAction(legacyConfigAction);
         return { kind: "reuse_current" };
       }
-      if (currentConfigAction === "overwrite") {
+      if (currentConfigAction === "overwrite" || currentConfigAction === "fresh") {
         return ensureLegacyFlow(detection, legacyConfigAction);
       }
       return invalidAction();
@@ -6083,43 +6083,51 @@ function readStructuredConfigFile(filePath) {
   }
   return import_js_yaml.default.load(content);
 }
-async function readCurrentConfig() {
-  const candidates = [CONFIG_FILE, CONFIG_FILE_YML, CONFIG_FILE_JSON];
-  const currentPath = candidates.find((filePath) => (0, import_fs6.existsSync)(filePath));
-  if (!currentPath) {
+async function readLegacyConfig(deps = {}) {
+  const baseHomeDir = deps.homeDir || (0, import_os3.homedir)();
+  const exists = deps.exists || import_fs6.existsSync;
+  const readConfig = deps.readConfig || readStructuredConfigFile;
+  const overridePath = process.env.CTR_SETUP_LEGACY_CONFIG_PATH;
+  const candidatePaths = overridePath ? [overridePath] : [
+    (0, import_path6.join)(baseHomeDir, ".ccr", "config.yaml"),
+    (0, import_path6.join)(baseHomeDir, ".claude-code-router", "config.yaml")
+  ];
+  const legacyPath = candidatePaths.find((filePath) => exists(filePath));
+  if (!legacyPath) {
     return { kind: "missing" };
   }
   try {
     return {
       kind: "found",
-      path: currentPath,
-      format: currentPath.endsWith(".json") ? "json" : currentPath.endsWith(".yml") ? "yml" : "yaml",
-      config: readStructuredConfigFile(currentPath) ?? {}
+      path: legacyPath,
+      config: readConfig(legacyPath)
     };
   } catch (error) {
     return {
-      kind: "parse_error",
-      path: currentPath,
-      format: currentPath.endsWith(".json") ? "json" : currentPath.endsWith(".yml") ? "yml" : "yaml",
+      kind: "read_error",
+      path: legacyPath,
       error: error instanceof Error ? error.message : String(error)
     };
   }
 }
-async function readLegacyConfig() {
-  const legacyPath = process.env.CTR_SETUP_LEGACY_CONFIG_PATH || (0, import_path6.join)((0, import_os3.homedir)(), ".ccr", "config.yaml");
-  if (!(0, import_fs6.existsSync)(legacyPath)) {
+async function readCurrentConfig() {
+  const candidates = [CONFIG_FILE, CONFIG_FILE_YML, CONFIG_FILE_JSON];
+  const currentPath = candidates.find((filePath) => (0, import_fs6.existsSync)(filePath));
+  if (!currentPath) {
     return { kind: "missing" };
   }
   try {
     return {
       kind: "found",
-      path: legacyPath,
-      config: readStructuredConfigFile(legacyPath)
+      path: currentPath,
+      format: currentPath.endsWith(".json") ? "json" : currentPath.endsWith(".yml") ? "yml" : "yaml",
+      config: readStructuredConfigFile(currentPath) ?? {}
     };
   } catch (error) {
     return {
-      kind: "read_error",
-      path: legacyPath,
+      kind: "parse_error",
+      path: currentPath,
+      format: currentPath.endsWith(".json") ? "json" : currentPath.endsWith(".yml") ? "yml" : "yaml",
       error: error instanceof Error ? error.message : String(error)
     };
   }
@@ -6161,7 +6169,10 @@ function mapValidCurrentConfigChoice(choice) {
   if (choice === "overwrite" || choice === "\u68C0\u67E5\u5E76\u8C03\u6574\u5F53\u524D\u914D\u7F6E") {
     return "overwrite";
   }
-  if (choice === "cancel" || choice === "\u653E\u5F03\u5F53\u524D\u914D\u7F6E\uFF0C\u91CD\u65B0\u5F00\u59CB") {
+  if (choice === "fresh" || choice === "\u653E\u5F03\u5F53\u524D\u914D\u7F6E\uFF0C\u91CD\u65B0\u5F00\u59CB") {
+    return "fresh";
+  }
+  if (choice === "cancel") {
     return "cancel";
   }
   throw new Error("invalid current config action");
@@ -6276,8 +6287,15 @@ function toDraftFromConfig(config) {
     }
   };
 }
+function toSuggestedModelId(providerName, model, preset) {
+  const presetDefinition = getProviderPreset(preset);
+  if (presetDefinition?.suggested_id) {
+    return presetDefinition.suggested_id;
+  }
+  const source = model || providerName || "model";
+  return source.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "") || "model";
+}
 async function buildFreshConfig(io) {
-  const modelId = await io.input("\u9ED8\u8BA4\u6A21\u578B ID");
   const connectMode = await io.choose("\u8FD9\u4E2A\u6A21\u578B\u63A5\u5230\u54EA\u91CC\uFF1F", ["\u4F7F\u7528\u5E38\u89C1\u63A5\u5165\u6A21\u677F", "\u624B\u52A8\u586B\u5199\u63A5\u53E3"]);
   let preset = "custom";
   let providerName = "provider";
@@ -6292,7 +6310,9 @@ async function buildFreshConfig(io) {
     apiBaseUrl = await io.input("API Base URL");
   }
   const apiKey = await io.input("API Key");
-  const model = await io.input("\u4E0A\u6E38\u6A21\u578B\u540D");
+  const presetDefinition = getProviderPreset(preset);
+  const model = await io.input("\u4E0A\u6E38\u6A21\u578B\u540D", presetDefinition?.default_model ?? "");
+  const modelId = await io.input("\u9ED8\u8BA4\u6A21\u578B ID", toSuggestedModelId(providerName, model, preset));
   const capabilityMode = await io.choose("\u662F\u5426\u914D\u7F6E capability \u63D0\u793A", ["\u4FDD\u6301\u9ED8\u8BA4", "\u914D\u7F6E capability \u63D0\u793A"]);
   const draft = buildMinimalConfig({
     providers: [
@@ -6494,6 +6514,14 @@ __export(cli_exports, {
   runClaudeCode: () => runClaudeCode
 });
 module.exports = __toCommonJS(cli_exports);
+function getPackageInfo() {
+  const content = (0, import_fs7.readFileSync)(PACKAGE_JSON_PATH, "utf-8");
+  const pkg = JSON.parse(content);
+  return {
+    name: pkg.name ?? "@peterwangze/claude-trigger-router",
+    version: pkg.version ?? "unknown"
+  };
+}
 function getArgs() {
   return process.argv.slice(2);
 }
@@ -6549,6 +6577,8 @@ Claude Trigger Router - \u667A\u80FD\u89E6\u53D1\u8DEF\u7531\u5668
   stop        \u505C\u6B62\u540E\u53F0\u670D\u52A1
   restart     \u91CD\u542F\u540E\u53F0\u670D\u52A1
   status      \u67E5\u770B\u670D\u52A1\u8FD0\u884C\u72B6\u6001\uFF08PID\u3001\u7AEF\u53E3\u3001\u542F\u52A8\u65F6\u95F4\uFF09
+  version     \u67E5\u770B\u5F53\u524D\u5B89\u88C5\u7248\u672C\u4E0E\u5305\u4FE1\u606F
+  upgrade     \u67E5\u770B\u5347\u7EA7\u5230\u6700\u65B0 npm \u7248\u672C\u7684\u6307\u5F15
   code        \u901A\u8FC7\u8DEF\u7531\u5668\u8FD0\u884C Claude Code\uFF08\u9700\u5148\u542F\u52A8\u670D\u52A1\uFF09
   ui          \u6253\u5F00\u7BA1\u7406 API \u8BF4\u660E\u9875\uFF08Web UI \u5F00\u53D1\u4E2D\uFF09
   help        \u663E\u793A\u6B64\u5E2E\u52A9\u4FE1\u606F
@@ -6561,6 +6591,8 @@ Claude Trigger Router - \u667A\u80FD\u89E6\u53D1\u8DEF\u7531\u5668
 \u4F7F\u7528\u793A\u4F8B\uFF1A
   ctr setup                # \u590D\u7528\u5F53\u524D\u914D\u7F6E / \u8FC1\u79FB\u65E7\u914D\u7F6E / \u65B0\u5EFA\u6700\u5C0F\u914D\u7F6E
   ctr init                 # \u521D\u59CB\u5316\u6700\u5C0F\u914D\u7F6E\u6A21\u677F
+  ctr version              # \u67E5\u770B\u5F53\u524D\u5B89\u88C5\u7248\u672C
+  ctr upgrade              # \u67E5\u770B\u5347\u7EA7\u5230\u6700\u65B0\u7248\u672C\u7684\u547D\u4EE4
   ctr start                # \u524D\u53F0\u542F\u52A8\uFF08\u63A8\u8350\u9996\u6B21\u4F7F\u7528\uFF0C\u4FBF\u4E8E\u67E5\u770B\u65E5\u5FD7\uFF09
   ctr start --daemon       # \u540E\u53F0\u542F\u52A8
   ctr status               # \u67E5\u770B\u670D\u52A1\u72B6\u6001
@@ -6577,6 +6609,58 @@ Claude Trigger Router - \u667A\u80FD\u89E6\u53D1\u8DEF\u7531\u5668
 \u66F4\u591A\u4FE1\u606F\uFF1Ahttps://github.com/peterwangze/claude-trigger-router
 `);
 }
+async function getLatestPackageVersion(timeoutMs = 1500) {
+  try {
+    const response = await fetch(PACKAGE_REGISTRY_LATEST_URL, {
+      signal: AbortSignal.timeout(timeoutMs)
+    });
+    if (!response.ok) {
+      return null;
+    }
+    const payload = await response.json();
+    return typeof payload.version === "string" ? payload.version : null;
+  } catch {
+    return null;
+  }
+}
+function isNewerVersion(current, latest) {
+  const currentParts = current.split(".").map((part) => Number.parseInt(part, 10));
+  const latestParts = latest.split(".").map((part) => Number.parseInt(part, 10));
+  const length = Math.max(currentParts.length, latestParts.length);
+  for (let index = 0; index < length; index += 1) {
+    const currentValue = Number.isFinite(currentParts[index]) ? currentParts[index] : 0;
+    const latestValue = Number.isFinite(latestParts[index]) ? latestParts[index] : 0;
+    if (latestValue > currentValue) {
+      return true;
+    }
+    if (latestValue < currentValue) {
+      return false;
+    }
+  }
+  return false;
+}
+async function printVersion() {
+  const pkg = getPackageInfo();
+  const latestVersion = await getLatestPackageVersion();
+  console.log(`Package: ${pkg.name}`);
+  console.log(`Version: ${pkg.version}`);
+  console.log(`Latest: ${latestVersion ?? "unavailable"}`);
+  if (latestVersion && isNewerVersion(pkg.version, latestVersion)) {
+    console.log(`Upgrade: npm install -g ${pkg.name}@latest`);
+  }
+  console.log(`NPM: ${PACKAGE_PAGE_URL}`);
+}
+function printUpgradeGuidance() {
+  const pkg = getPackageInfo();
+  console.log(`\u5F53\u524D\u5B89\u88C5\u7248\u672C\uFF1A${pkg.version}`);
+  console.log(`\u5305\u540D\uFF1A${pkg.name}`);
+  console.log("\u5347\u7EA7\u5230\u6700\u65B0\u7248\u672C\uFF1A");
+  console.log(`  npm install -g ${pkg.name}@latest`);
+  console.log("\u8BF7\u5728\u5F53\u524D ctr \u8FDB\u7A0B\u5916\u6267\u884C\u5347\u7EA7\u547D\u4EE4\uFF0C\u907F\u514D\u81EA\u5347\u7EA7\u65F6\u5360\u7528\u5F53\u524D\u6587\u4EF6\u3002");
+  console.log("\u5982\u679C\u4F60\u6700\u521D\u662F\u901A\u8FC7 GitHub \u6E90\u5B89\u88C5\uFF0C\u8BF7\u7EE7\u7EED\u4F7F\u7528\u539F\u5B89\u88C5\u6765\u6E90\uFF0C\u5F53\u524D\u547D\u4EE4\u4E0D\u4F1A\u81EA\u52A8\u5207\u6362\u6765\u6E90\u3002");
+  console.log("\u5168\u5C40\u5B89\u88C5\u5728\u67D0\u4E9B\u73AF\u5883\u4E0B\u53EF\u80FD\u9700\u8981\u7BA1\u7406\u5458/root \u6743\u9650\u3002");
+  console.log(`NPM: ${PACKAGE_PAGE_URL}`);
+}
 function initConfig2() {
   const force = hasArg("--force");
   const existingConfig = [CONFIG_FILE, CONFIG_FILE_YML, CONFIG_FILE_JSON].find(import_fs7.existsSync);
@@ -6763,6 +6847,12 @@ async function main() {
     case "status":
       showStatus();
       break;
+    case "version":
+      await printVersion();
+      break;
+    case "upgrade":
+      printUpgradeGuidance();
+      break;
     case "restart":
       restartService();
       break;
@@ -6785,7 +6875,7 @@ async function main() {
       process.exit(command ? 1 : 0);
   }
 }
-var import_child_process2, import_path7, import_openurl, import_fs7;
+var import_child_process2, import_path7, import_openurl, import_fs7, PACKAGE_JSON_PATH, PACKAGE_PAGE_URL, PACKAGE_REGISTRY_LATEST_URL;
 var init_cli = __esm({
   "src/cli.ts"() {
     import_child_process2 = require("child_process");
@@ -6797,6 +6887,9 @@ var init_cli = __esm({
     init_constants();
     init_service_health();
     init_setup2();
+    PACKAGE_JSON_PATH = (0, import_path7.join)(__dirname, "..", "package.json");
+    PACKAGE_PAGE_URL = "https://www.npmjs.com/package/@peterwangze/claude-trigger-router";
+    PACKAGE_REGISTRY_LATEST_URL = "https://registry.npmjs.org/@peterwangze%2Fclaude-trigger-router/latest";
     if (process.env.CTR_SKIP_MAIN !== "1") {
       main().catch((error) => {
         console.error("Error:", error);