@peterwangze/claude-trigger-router 1.0.1 → 1.0.2

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] ?? "",
@@ -6153,6 +6154,27 @@ 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 === "cancel" || choice === "\u653E\u5F03\u5F53\u524D\u914D\u7F6E\uFF0C\u91CD\u65B0\u5F00\u59CB") {
+    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;
@@ -6255,24 +6277,35 @@ function toDraftFromConfig(config) {
   };
 }
 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 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";
+  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 model = await io.input("\u4E0A\u6E38\u6A21\u578B\u540D");
   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 +6383,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 +6407,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}`);
@@ -6499,8 +6543,8 @@ 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
@@ -6515,8 +6559,8 @@ 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 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
@@ -6562,9 +6606,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);