@peterwangze/claude-trigger-router 1.0.1 → 1.0.3

package/dist/cli.js

@@ -5755,10 +5755,11 @@ function getProviderPreset2(key) {
   };
 }
 function buildMinimalConfig(input2) {
-  const models = input2.providers.map((p) => {
+  const providers = input2.providers;
+  const models = providers.map((p) => {
     const preset = p.preset ? getProviderPreset2(p.preset) : void 0;
     const modelDraft = {
-      id: p.name,
+      id: p.model_id?.trim() || p.name,
       key: p.api_key,
       api_key: p.api_key,
       model: p.models[0] ?? "",
@@ -5881,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();
@@ -6082,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)
     };
   }
@@ -6153,6 +6162,30 @@ function mapConfigErrorsToRepairFields(errors) {
   const fields = getRepairFields(errors);
   return fields.includes("manualReview") ? { mode: "manualReview", fields } : { mode: "repair", fields };
 }
+function mapValidCurrentConfigChoice(choice) {
+  if (choice === "reuse" || choice === "\u76F4\u63A5\u4F7F\u7528\u5F53\u524D\u914D\u7F6E\uFF08\u63A8\u8350\uFF09") {
+    return "reuse";
+  }
+  if (choice === "overwrite" || choice === "\u68C0\u67E5\u5E76\u8C03\u6574\u5F53\u524D\u914D\u7F6E") {
+    return "overwrite";
+  }
+  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");
+}
+function mapLegacyConfigChoice(choice) {
+  if (choice === "migrate" || choice === "\u8FC1\u79FB\u65E7\u914D\u7F6E\uFF08\u63A8\u8350\uFF09") {
+    return "migrate";
+  }
+  if (choice === "skip" || choice === "\u8DF3\u8FC7\u8FC1\u79FB\uFF0C\u624B\u52A8\u65B0\u5EFA") {
+    return "skip";
+  }
+  throw new Error("invalid legacy config action");
+}
 function toCapabilityBoolean(choice) {
   if (choice === "\u652F\u6301") {
     return true;
@@ -6254,25 +6287,45 @@ 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 presetOptions = listProviderPresetKeys("setup");
-  const preset = await io.choose("\u9009\u62E9 provider \u9884\u8BBE", presetOptions);
-  const providerName = await io.input("Provider \u540D\u79F0", preset);
-  const apiBaseUrl = preset === "custom" ? await io.input("API Base URL") : await io.input("API Base URL\uFF08\u7559\u7A7A\u4F7F\u7528\u9884\u8BBE\uFF09", "");
+  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";
+  let apiBaseUrl = "";
+  if (connectMode === "\u4F7F\u7528\u5E38\u89C1\u63A5\u5165\u6A21\u677F") {
+    const presetOptions = listProviderPresetKeys("setup");
+    preset = await io.choose("\u9009\u62E9 provider \u9884\u8BBE", presetOptions);
+    providerName = await io.input("Provider \u540D\u79F0", preset);
+    apiBaseUrl = preset === "custom" ? await io.input("API Base URL") : await io.input("API Base URL\uFF08\u7559\u7A7A\u4F7F\u7528\u9884\u8BBE\uFF09", "");
+  } else {
+    providerName = await io.input("Provider \u540D\u79F0", "provider");
+    apiBaseUrl = await io.input("API Base URL");
+  }
   const apiKey = await io.input("API Key");
-  const model = await io.input("\u9ED8\u8BA4\u6A21\u578B");
+  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: [
       {
         name: providerName,
+        model_id: modelId,
         api_key: apiKey,
         models: [model],
         preset,
         api_base_url: apiBaseUrl
       }
     ],
-    defaultModel: providerName
+    defaultModel: modelId
   });
   if (capabilityMode === "\u914D\u7F6E capability \u63D0\u793A" && draft.Models?.[0]) {
     await promptCapabilityMetadataForDraft(draft, io);
@@ -6350,11 +6403,17 @@ async function runSetupCli(customDeps) {
         return "create";
       }
       if (currentConfig.kind === "valid") {
-        deps.io.info("\u68C0\u6D4B\u5230\u73B0\u6709\u53EF\u7528\u914D\u7F6E\u3002");
+        deps.io.info("\u68C0\u6D4B\u5230\u5F53\u524D claude-trigger-router \u914D\u7F6E\u5DF2\u53EF\u7528\u3002");
         if (currentConfig.warnings.length > 0) {
           deps.io.info(`\u5F53\u524D\u914D\u7F6E\u63D0\u793A\uFF1A${currentConfig.warnings.join("; ")}`);
         }
-        return await deps.io.choose("\u9009\u62E9\u4E0B\u4E00\u6B65", ["reuse", "overwrite", "cancel"]);
+        return mapValidCurrentConfigChoice(
+          await deps.io.choose("\u4F60\u60F3\u76F4\u63A5\u4F7F\u7528\u5B83\uFF0C\u8FD8\u662F\u91CD\u65B0\u8C03\u6574\uFF1F", [
+            "\u76F4\u63A5\u4F7F\u7528\u5F53\u524D\u914D\u7F6E\uFF08\u63A8\u8350\uFF09",
+            "\u68C0\u67E5\u5E76\u8C03\u6574\u5F53\u524D\u914D\u7F6E",
+            "\u653E\u5F03\u5F53\u524D\u914D\u7F6E\uFF0C\u91CD\u65B0\u5F00\u59CB"
+          ])
+        );
       }
       if (currentConfig.kind === "invalid") {
         deps.io.info(`\u5F53\u524D\u914D\u7F6E\u6821\u9A8C\u5931\u8D25\uFF1A${currentConfig.errors.join("; ")}`);
@@ -6368,7 +6427,12 @@ async function runSetupCli(customDeps) {
     },
     chooseLegacyConfigAction: async ({ legacyConfig }) => {
       if (legacyConfig.kind === "found") {
-        return await deps.io.choose("\u68C0\u6D4B\u5230\u65E7 ccr \u914D\u7F6E\uFF0C\u662F\u5426\u8FC1\u79FB\uFF1F", ["migrate", "skip"]);
+        return mapLegacyConfigChoice(
+          await deps.io.choose("\u68C0\u6D4B\u5230\u65E7 claude-code-router \u914D\u7F6E\u3002\u662F\u5426\u8FC1\u79FB\u4E3A\u5F53\u524D\u63A8\u8350\u914D\u7F6E\uFF1F", [
+            "\u8FC1\u79FB\u65E7\u914D\u7F6E\uFF08\u63A8\u8350\uFF09",
+            "\u8DF3\u8FC7\u8FC1\u79FB\uFF0C\u624B\u52A8\u65B0\u5EFA"
+          ])
+        );
       }
       if (legacyConfig.kind === "read_error") {
         deps.io.info(`\u65E7 ccr \u914D\u7F6E\u8BFB\u53D6\u5931\u8D25\uFF1A${legacyConfig.error}`);
@@ -6450,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);
 }
@@ -6499,12 +6571,14 @@ Claude Trigger Router - \u667A\u80FD\u89E6\u53D1\u8DEF\u7531\u5668
 \u7528\u6CD5\uFF1Actr <\u547D\u4EE4> [\u9009\u9879]
 
 \u547D\u4EE4\uFF1A
-  setup       \u9996\u6B21\u4F7F\u7528\u5411\u5BFC\uFF08\u63A8\u8350\u65B0\u624B\uFF09
-  init        \u521D\u59CB\u5316\u914D\u7F6E\u6587\u4EF6\uFF08\u4ECE\u793A\u4F8B\u6A21\u677F\u590D\u5236\uFF09
+  setup       \u68C0\u6D4B\u5E76\u590D\u7528\u5DF2\u6709\u914D\u7F6E\uFF0C\u5FC5\u8981\u65F6\u8FC1\u79FB\u65E7\u914D\u7F6E\u6216\u65B0\u5EFA\u6700\u5C0F\u914D\u7F6E
+  init        \u521D\u59CB\u5316\u6700\u5C0F\u914D\u7F6E\u6A21\u677F
   start       \u542F\u52A8\u8DEF\u7531\u670D\u52A1\uFF08\u9ED8\u8BA4\u524D\u53F0\u8FD0\u884C\uFF09
   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
@@ -6515,8 +6589,10 @@ Claude Trigger Router - \u667A\u80FD\u89E6\u53D1\u8DEF\u7531\u5668
   --force       \u5F3A\u5236\u8986\u76D6\u5DF2\u6709\u914D\u7F6E\uFF08\u914D\u5408 init \u4F7F\u7528\uFF09
 
 \u4F7F\u7528\u793A\u4F8B\uFF1A
-  ctr setup                # \u9996\u6B21\u4F7F\u7528\u5411\u5BFC\uFF08\u63A8\u8350\uFF09
-  ctr init                 # \u521D\u59CB\u5316\u914D\u7F6E\u6587\u4EF6
+  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
@@ -6533,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);
@@ -6562,9 +6690,9 @@ function initConfig2() {
     console.log("");
     console.log("\u4E0B\u4E00\u6B65\uFF1A");
     console.log("  1. \u7F16\u8F91\u914D\u7F6E\u6587\u4EF6\uFF0C\u586B\u5165\u4F60\u7684 API \u5BC6\u94A5");
-    console.log("  2. \u5728 'Providers' \u4E0B\u914D\u7F6E\u4F60\u7684\u6A21\u578B\u63D0\u4F9B\u5546");
-    console.log("  3. \u5C06 'Router.default' \u8BBE\u7F6E\u4E3A\u4F60\u7684\u9ED8\u8BA4\u6A21\u578B");
-    console.log("  4. \u5728 'TriggerRouter.rules' \u4E0B\u81EA\u5B9A\u4E49\u89E6\u53D1\u89C4\u5219");
+    console.log("  2. \u5728 'Models' \u4E0B\u8865\u5168\u4F60\u7684\u6A21\u578B\u63A5\u5165\u4FE1\u606F");
+    console.log("  3. \u5C06 'Router.default' \u8BBE\u7F6E\u4E3A\u9ED8\u8BA4\u6A21\u578B ID");
+    console.log("  4. \u5982\u9700\u9AD8\u7EA7\u8DEF\u7531\uFF0C\u518D\u7EE7\u7EED\u914D\u7F6E\u89C4\u5219\u6216\u667A\u80FD\u8DEF\u7531");
     console.log(`  5. \u8FD0\u884C\uFF1Actr start`);
   } catch (error) {
     console.error("\u274C \u521B\u5EFA\u914D\u7F6E\u6587\u4EF6\u5931\u8D25:", error.message);
@@ -6719,6 +6847,12 @@ async function main() {
     case "status":
       showStatus();
       break;
+    case "version":
+      await printVersion();
+      break;
+    case "upgrade":
+      printUpgradeGuidance();
+      break;
     case "restart":
       restartService();
       break;
@@ -6741,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");
@@ -6753,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);