dsh-lark-bot 0.15.7 → 0.15.8

package/dist/cli.js

@@ -4514,14 +4514,42 @@ function normalizeBaseUrl(url) {
     throw new Error(`baseURL \u4EC5\u652F\u6301 http/https\uFF1A${url}`);
   }
   validateBaseUrl(url);
-  const pathname = parsed.pathname.replace(/\/+$/, "");
-  if (pathname === "" || pathname === "/") {
+  const pathname = stripApiOperationSuffix(parsed.pathname);
+  if (pathname === "") {
     parsed.pathname = "/v1";
   } else {
     parsed.pathname = pathname;
   }
   return parsed.toString();
 }
+function normalizeDeepseekBaseUrl(url) {
+  let parsed;
+  try {
+    parsed = new URL(url);
+  } catch {
+    throw new Error(`baseURL \u4E0D\u662F\u5408\u6CD5 URL\uFF1A${url}`);
+  }
+  if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
+    throw new Error(`baseURL \u4EC5\u652F\u6301 http/https\uFF1A${url}`);
+  }
+  validateBaseUrl(url);
+  const pathname = stripApiOperationSuffix(parsed.pathname);
+  if (pathname === "" || pathname === "/") {
+    return parsed.origin;
+  }
+  parsed.pathname = pathname;
+  return parsed.toString();
+}
+var API_OPERATION_SUFFIXES = ["/chat/completions", "/responses", "/messages"];
+function stripApiOperationSuffix(pathname) {
+  const trimmed = pathname.replace(/\/+$/, "");
+  for (const suffix of API_OPERATION_SUFFIXES) {
+    if (trimmed.endsWith(suffix)) {
+      return trimmed.slice(0, trimmed.length - suffix.length).replace(/\/+$/, "");
+    }
+  }
+  return trimmed;
+}
 function validateBaseUrl(url) {
   let parsed;
   try {
@@ -4720,8 +4748,7 @@ var DshProviderManager = class {
     const current = isMapLike(settings[DEEPSEEK_NAMESPACE]) ? settings[DEEPSEEK_NAMESPACE] : {};
     const section = { ...current };
     if (input.baseURL !== void 0) {
-      validateBaseUrl(input.baseURL);
-      section.baseURL = input.baseURL;
+      section.baseURL = normalizeDeepseekBaseUrl(input.baseURL);
     }
     if (input.apiKeyEnv !== void 0) section.apiKeyEnv = input.apiKeyEnv;
     if (input.apiKey !== void 0) {
@@ -5057,7 +5084,11 @@ async function handleModel(args, ctx) {
     }
     if (!requireAdmin(ctx)) return;
     await ctx.dshConfig.setDefaultModel(id);
-    await reply(ctx, `\u5DF2\u5199\u5165 dsh \u9ED8\u8BA4\u6A21\u578B\uFF08agent-default-model\uFF09\uFF1A\`${id}\`\uFF0C\u65B0\u4F1A\u8BDD\u751F\u6548\u3002`);
+    await ctx.setDefaultModelPreference?.(id);
+    await reply(
+      ctx,
+      `\u5DF2\u5199\u5165 dsh \u9ED8\u8BA4\u6A21\u578B\uFF08agent-default-model\uFF09\uFF1A\`${id}\`\uFF08\u540C\u65F6\u66F4\u65B0 profile \u9ED8\u8BA4\u6A21\u578B\uFF09\uFF0C\u65B0\u4F1A\u8BDD\u751F\u6548\u3002`
+    );
     return;
   }
   if (sub === "add" || sub === "remove") {
@@ -5506,7 +5537,7 @@ var FLOWS = {
           kind: "text",
           question: "Base URL",
           placeholder: "https://www.kingapi.xyz",
-          hint: "\u5F62\u5982 https://gateway.example/v1\uFF1B\u6839\u57DF\u540D\u4F1A\u81EA\u52A8\u8865\u5168 /v1",
+          hint: "\u5F62\u5982 https://gateway.example/v1\uFF1B\u6839\u57DF\u540D\u4F1A\u81EA\u52A8\u8865\u5168 /v1\uFF0C\u8BEF\u586B /chat/completions \u7B49\u5B8C\u6574\u63A5\u53E3\u5730\u5740\u4F1A\u81EA\u52A8\u53BB\u6389\u672B\u5C3E\u8DEF\u5F84",
           parse: (raw) => normalizeBaseUrl(asString(raw)?.trim() ?? "")
         },
         {
@@ -5660,8 +5691,7 @@ var FLOWS = {
             const url = asString(raw)?.trim() ?? "";
             if (!url) throw new Error("Base URL \u4E0D\u80FD\u4E3A\u7A7A");
             if (asString(data.provider) === DEEPSEEK_PROVIDER) {
-              normalizeBaseUrl(url);
-              return url;
+              return normalizeDeepseekBaseUrl(url);
             }
             return normalizeBaseUrl(url);
           }
@@ -5874,7 +5904,8 @@ var FLOWS = {
     summary: (_ctx, data) => Promise.resolve(`\u5C06\u5199\u5165 dsh \u9ED8\u8BA4\u6A21\u578B\uFF1A\`${asString(data.model)}\``),
     execute: async (ctx, data) => {
       await ctx.dshConfig.setDefaultModel(asString(data.model));
-      return `\u5DF2\u5199\u5165 dsh \u9ED8\u8BA4\u6A21\u578B\uFF08agent-default-model\uFF09\uFF1A\`${asString(data.model)}\`\uFF0C\u65B0\u4F1A\u8BDD\u751F\u6548\u3002`;
+      await ctx.setDefaultModelPreference?.(asString(data.model));
+      return `\u5DF2\u5199\u5165 dsh \u9ED8\u8BA4\u6A21\u578B\uFF08agent-default-model\uFF09\uFF1A\`${asString(data.model)}\`\uFF08\u540C\u65F6\u66F4\u65B0 profile \u9ED8\u8BA4\u6A21\u578B\uFF09\uFF0C\u65B0\u4F1A\u8BDD\u751F\u6548\u3002`;
     }
   },
   "key-set": {
@@ -7118,6 +7149,7 @@ async function startChannel(deps) {
         channel: commandChannel,
         defaultWorkspace: deps.defaultWorkspace,
         defaultModel: deps.defaultModel,
+        ...deps.setDefaultModelPreference ? { setDefaultModelPreference: deps.setDefaultModelPreference } : {},
         senderId: msg.senderId
       };
       const handled = await tryHandleCommand(msg.content, context).catch(async (error) => {
@@ -7235,7 +7267,8 @@ function wizardContextFor(event, deps, channel, scope) {
     accessManager: deps.accessManager,
     models: deps.models,
     wizards: deps.wizardStore,
-    defaultModel: deps.defaultModel
+    defaultModel: deps.defaultModel,
+    ...deps.setDefaultModelPreference ? { setDefaultModelPreference: deps.setDefaultModelPreference } : {}
   };
 }
 
@@ -8649,6 +8682,14 @@ async function startBridgeEngine(options) {
     dshConfig,
     defaultRunTimeoutMs: activeProfile.preferences.runTimeoutMs ?? env.runTimeoutMs,
     defaultModel: activeProfile.preferences.model ?? env.model,
+    setDefaultModelPreference: async (model) => {
+      await configStore.saveProfile(profileName, {
+        tenant: activeProfile.tenant,
+        appId: activeProfile.accounts.appId,
+        appSecret: activeProfile.accounts.appSecret,
+        model
+      });
+    },
     accessManager: new AccessManager(configStore, profileName),
     pending,
     defaultWorkspace,