dsh-lark-bot 0.15.6 → 0.15.8

package/dist/cli.js

@@ -3950,7 +3950,19 @@ function renderApprovalCard(input) {
     body: {
       elements: [
         { tag: "markdown", content: markdown2 },
-        { tag: "action", actions }
+        ...actions.length > 0 ? [
+          {
+            tag: "column_set",
+            flex_mode: "none",
+            horizontal_spacing: "default",
+            columns: actions.map((button2) => ({
+              tag: "column",
+              width: "auto",
+              vertical_align: "center",
+              elements: [button2]
+            }))
+          }
+        ] : []
       ]
     }
   };
@@ -3993,15 +4005,18 @@ function renderQuestionCard(input) {
     body: {
       elements: [
         { tag: "markdown", content: `\u2753 ${input.question}` },
-        formElement(input),
         {
-          tag: "action",
-          actions: [
+          tag: "form",
+          name: `form-${input.id}`,
+          elements: [
+            formElement(input),
             {
               tag: "button",
               text: { tag: "plain_text", content: "\u63D0\u4EA4" },
               type: "primary",
-              value: { cmd: "question-submit", id: input.id }
+              value: { cmd: "question-submit", id: input.id },
+              form_action_type: "submit",
+              name: `btn-submit-${input.id}`
             }
           ]
         }
@@ -4499,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 {
@@ -4705,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) {
@@ -5042,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") {
@@ -5249,8 +5295,18 @@ function button(text, value, type = "default") {
     value
   };
 }
-function actionRow(actions) {
-  return { tag: "action", actions };
+function buttonRow(buttons) {
+  return {
+    tag: "column_set",
+    flex_mode: "none",
+    horizontal_spacing: "default",
+    columns: buttons.map((button2) => ({
+      tag: "column",
+      width: "auto",
+      vertical_align: "center",
+      elements: [button2]
+    }))
+  };
 }
 function wizardValue(flow, step, extra) {
   return { cmd: "wizard", flow, step, ...extra };
@@ -5281,22 +5337,22 @@ function renderConfigHubCard(input) {
             `dsh \u9ED8\u8BA4\u6A21\u578B\uFF1A${defaultLine}`
           ].join("\n")
         },
-        actionRow([
+        buttonRow([
           button("\u2795 \u6DFB\u52A0 Provider", { cmd: "cfg", action: "provider-add" }, "primary"),
           button("\u270F\uFE0F \u4FEE\u6539 Provider", { cmd: "cfg", action: "provider-update" }),
           button("\u{1F5D1} \u5220\u9664 Provider", { cmd: "cfg", action: "provider-remove" }, "danger")
         ]),
-        actionRow([
+        buttonRow([
           button("\u{1F9E0} \u6DFB\u52A0\u6A21\u578B", { cmd: "cfg", action: "model-add" }),
           button("\u274C \u5220\u9664\u6A21\u578B", { cmd: "cfg", action: "model-remove" }, "danger"),
           button("\u{1F3AF} \u5207\u6362\u6A21\u578B", { cmd: "cfg", action: "model-use" })
         ]),
-        actionRow([
+        buttonRow([
           button("\u{1F3E0} \u8BBE\u7F6E\u9ED8\u8BA4\u6A21\u578B", { cmd: "cfg", action: "model-default" }),
           button("\u{1F511} \u8BBE\u7F6E\u51ED\u636E", { cmd: "cfg", action: "key-set" }),
           button("\u{1F513} \u5220\u9664\u51ED\u636E", { cmd: "cfg", action: "key-remove" }, "danger")
         ]),
-        actionRow([
+        buttonRow([
           button("\u{1F504} \u5237\u65B0", { cmd: "cfg", action: "refresh" }),
           button("\u2716\uFE0F \u5173\u95ED", { cmd: "cfg", action: "dismiss" })
         ])
@@ -5309,13 +5365,14 @@ function renderWizardOptionsCard(input) {
   const rows = [];
   for (let index = 0; index < input.options.length; index += 3) {
     rows.push(
-      actionRow(
+      buttonRow(
         input.options.slice(index, index + 3).map(
           (option, offset) => button(option.label, wizardValue(input.flow, input.step, { choose: index + offset }))
         )
       )
     );
   }
+  rows.push(buttonRow([cancel]));
   return {
     schema: "2.0",
     config: {
@@ -5328,8 +5385,7 @@ function renderWizardOptionsCard(input) {
           content: [input.question, input.hint ? `
 ${input.hint}` : ""].join("")
         },
-        ...rows,
-        actionRow([cancel])
+        ...rows
       ]
     }
   };
@@ -5348,14 +5404,23 @@ function renderWizardTextStepCard(input) {
 ${input.hint}` : ""].join("")
         },
         {
-          tag: "input",
-          name: "answer",
-          placeholder: { tag: "plain_text", content: input.placeholder ?? "\u8BF7\u8F93\u5165\u2026" }
+          tag: "form",
+          name: `form-${input.flow}-${input.step}`,
+          elements: [
+            {
+              tag: "input",
+              name: "answer",
+              ...input.required === true ? { required: true } : {},
+              placeholder: { tag: "plain_text", content: input.placeholder ?? "\u8BF7\u8F93\u5165\u2026" }
+            },
+            {
+              ...button("\u63D0\u4EA4", wizardValue(input.flow, input.step, { submit: true }), "primary"),
+              form_action_type: "submit",
+              name: `btn-submit-${input.flow}-${input.step}`
+            }
+          ]
         },
-        actionRow([
-          button("\u63D0\u4EA4", wizardValue(input.flow, input.step, { submit: true }), "primary"),
-          button("\u53D6\u6D88", wizardValue(input.flow, input.step, { cancel: true }))
-        ])
+        button("\u53D6\u6D88", wizardValue(input.flow, input.step, { cancel: true }))
       ]
     }
   };
@@ -5374,7 +5439,7 @@ function renderWizardConfirmStepCard(input) {
 
 ${input.summary}`
         },
-        actionRow([
+        buttonRow([
           button(input.confirmLabel ?? "\u2705 \u786E\u8BA4", wizardValue(input.flow, input.step, { confirm: true }), "primary"),
           button("\u53D6\u6D88", wizardValue(input.flow, input.step, { cancel: true }))
         ])
@@ -5472,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() ?? "")
         },
         {
@@ -5626,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);
           }
@@ -5840,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": {
@@ -5991,6 +6056,7 @@ ${labels}
           flow: flow.id,
           step: state.step,
           question: step.question,
+          ...step.optional === true ? {} : { required: true },
           ...step.placeholder === void 0 ? {} : { placeholder: step.placeholder },
           ...step.hint === void 0 ? {} : { hint: step.hint }
         })
@@ -7083,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) => {
@@ -7200,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 } : {}
   };
 }
 
@@ -8614,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,