dsh-lark-bot 0.15.5 → 0.15.7

package/README.md

@@ -163,9 +163,12 @@ dsh-lark-bot guardian install --dsh-profile dsh-lark
   字面密钥不进 settings / 聊天记录。
 - **凭据引用必须关联**：`/key set <引用名> <值>` 只写入凭据文件；provider 要生效还须在其
   `apiKeyEnv` 字段引用同一名字（`/provider add|update ... --api-key-env <引用名>`，或向导中填写）。
+  引用名与 provider ID 相同且 provider 未设 `apiKeyEnv` 时，`/key set` 会自动补关联；
+  已存在的老配置在下次运行时也会自动补齐。
 - **热重载**：桥接在每轮运行前把模型解析为「provider + model」路由并传给 dsh runtime；SDK 适配器
   在路由变化时自动重建 runtime（下一轮生效）。pi-ai 的 Base URL 填根域名（如
-  `https://www.kingapi.xyz`）会自动补全为 `/v1`。
+  `https://www.kingapi.xyz`）会自动补全为 `/v1`。dsh runtime 启动后需几百毫秒才注册
+  pi-ai 路由，桥接会重试握手直到注册完成（避免 “no adapter registered for provider”）。
 
 安全提醒：在飞书会话输入密钥会对可见成员暴露，建议私聊使用或 `--api-key-env` 引用环境变量；bot 不在任何回复中回显密钥值。
 

package/dist/cli.js

@@ -1256,6 +1256,52 @@ function createSdkRun(harness, prompt, options) {
 }
 
 // src/adapters/dsh/sdk-adapter.ts
+var RETRYABLE_INIT_ERROR = /no adapter registered for provider/i;
+var INIT_RETRY_ATTEMPTS = 6;
+var INIT_RETRY_DELAY_MS = 250;
+function sleep(ms) {
+  return new Promise((resolve5) => setTimeout(resolve5, ms));
+}
+function isRetryableInitError(error) {
+  return error instanceof Error && RETRYABLE_INIT_ERROR.test(error.message);
+}
+function withRetryableStart(harness) {
+  const originalStart = harness.start.bind(harness);
+  const internals = harness;
+  let handled = false;
+  harness.start = async () => {
+    if (handled) return originalStart();
+    try {
+      const result = await originalStart();
+      handled = true;
+      return result;
+    } catch (error) {
+      if (!isRetryableInitError(error)) throw error;
+      handled = true;
+      const client = internals.client;
+      if (!client) throw error;
+      client.start();
+      let lastError = error;
+      for (let attempt = 1; attempt <= INIT_RETRY_ATTEMPTS; attempt += 1) {
+        await sleep(INIT_RETRY_DELAY_MS * attempt);
+        try {
+          await client.initialize({
+            cwd: internals.cwd,
+            provider: internals.provider,
+            model: internals.model
+          });
+          internals.initialized = Promise.resolve();
+          return void 0;
+        } catch (retryError) {
+          lastError = retryError;
+          if (!isRetryableInitError(retryError)) throw retryError;
+        }
+      }
+      throw lastError;
+    }
+  };
+  return harness;
+}
 function waitWithTimeout(promise, timeoutMs) {
   return new Promise((resolve5) => {
     const timer = setTimeout(() => resolve5(false), timeoutMs > 0 ? timeoutMs : 5e3);
@@ -1308,21 +1354,35 @@ var SdkDshAdapter = class {
     });
     try {
       client.start();
-      const info = await client.initialize({
-        cwd: process.cwd(),
-        provider: this.provider,
-        model: this.model,
-        ...this.maxTokens === void 0 ? {} : { maxTokens: this.maxTokens }
-      });
-      return {
-        ok: true,
-        error: void 0,
-        version: `${info.serverInfo.name}@${info.serverInfo.version}`
-      };
-    } catch (error) {
+      let lastError;
+      for (let attempt = 1; attempt <= INIT_RETRY_ATTEMPTS; attempt += 1) {
+        try {
+          const info = await client.initialize({
+            cwd: process.cwd(),
+            provider: this.provider,
+            model: this.model,
+            ...this.maxTokens === void 0 ? {} : { maxTokens: this.maxTokens }
+          });
+          return {
+            ok: true,
+            error: void 0,
+            version: `${info.serverInfo.name}@${info.serverInfo.version}`
+          };
+        } catch (error) {
+          lastError = error;
+          if (!isRetryableInitError(error) || attempt === INIT_RETRY_ATTEMPTS) {
+            return {
+              ok: false,
+              error: error instanceof Error ? error.message : String(error),
+              version: void 0
+            };
+          }
+          await sleep(INIT_RETRY_DELAY_MS * attempt);
+        }
+      }
       return {
         ok: false,
-        error: error instanceof Error ? error.message : String(error),
+        error: lastError instanceof Error ? lastError.message : String(lastError),
         version: void 0
       };
     } finally {
@@ -1408,7 +1468,7 @@ var SdkDshAdapter = class {
       }
     }
     const entry = {
-      harness: this.harnessFactory(cwd, route),
+      harness: withRetryableStart(this.harnessFactory(cwd, route)),
       provider: route.provider,
       model: route.model,
       active: 0,
@@ -3890,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]
+            }))
+          }
+        ] : []
       ]
     }
   };
@@ -3933,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}`
             }
           ]
         }
@@ -4495,7 +4570,7 @@ async function readOptional(file) {
     throw error;
   }
 }
-function sleep(ms) {
+function sleep2(ms) {
   return new Promise((resolve5) => setTimeout(resolve5, ms));
 }
 async function withFileLock(filename, operation) {
@@ -4511,7 +4586,7 @@ async function withFileLock(filename, operation) {
       if (Date.now() >= deadline) {
         throw new Error(`dsh config lock timed out at ${lockPath}`);
       }
-      await sleep(80 + Math.random() * 120);
+      await sleep2(80 + Math.random() * 120);
     }
   }
   try {
@@ -4742,6 +4817,25 @@ var DshProviderManager = class {
     }
     return true;
   }
+  /**
+   * Heal the common misconfiguration where a credential was stored under the
+   * provider id (`/key set kingapi …`) but the provider never got an
+   * apiKeyEnv. Links the ref to the matching pi-ai provider once; returns
+   * true when a link was applied. Idempotent and a no-op when the provider
+   * already has a ref or no matching credential exists.
+   */
+  async linkCredentialRefIfMissing(providerId) {
+    const settings = await this.readSettings();
+    const piAi = isMapLike(settings[PIAI_NAMESPACE]) ? settings[PIAI_NAMESPACE] : {};
+    const providers = isMapLike(piAi.providers) ? piAi.providers : {};
+    const section = isMapLike(providers[providerId]) ? providers[providerId] : {};
+    if (typeof section.apiKeyEnv === "string" && section.apiKeyEnv.length > 0) {
+      return false;
+    }
+    if (!await this.hasCredential(providerId)) return false;
+    await this.upsertPiAiProvider({ id: providerId, apiKeyEnv: providerId });
+    return true;
+  }
   async addPiAiModel(providerId, input) {
     validateProviderId(providerId);
     const settings = await this.readSettings();
@@ -5127,9 +5221,24 @@ async function handleKey(args, ctx) {
       await reply(ctx, `\u5199\u5165\u5931\u8D25\uFF1A${error instanceof Error ? error.message : String(error)}`);
       return;
     }
+    const providers = await ctx.dshConfig.listProviders();
+    const target = providers.find(
+      (provider) => provider.id === ref && provider.namespace === PIAI_NAMESPACE && provider.credentialRef === void 0
+    );
+    let autoLinked = false;
+    if (target) {
+      await ctx.dshConfig.upsertPiAiProvider({ id: ref, apiKeyEnv: ref });
+      autoLinked = true;
+    }
     await reply(
       ctx,
-      `\u5DF2\u5199\u5165\u51ED\u636E \`${ref}\` \u5230 \`~/.dsh/.credentials.yaml\`\uFF080600\uFF0C\u503C\u5DF2\u9690\u85CF\uFF09\u3002\u5EFA\u8BAE\u5728\u79C1\u804A\u4E2D\u4F7F\u7528\uFF1B\u7FA4\u804A\u91CC\u7C98\u8D34\u7684\u5BC6\u94A5\u4F1A\u5BF9\u7FA4\u6210\u5458\u53EF\u89C1\u3002`
+      [
+        `\u5DF2\u5199\u5165\u51ED\u636E \`${ref}\` \u5230 \`~/.dsh/.credentials.yaml\`\uFF080600\uFF0C\u503C\u5DF2\u9690\u85CF\uFF09\u3002\u5EFA\u8BAE\u5728\u79C1\u804A\u4E2D\u4F7F\u7528\uFF1B\u7FA4\u804A\u91CC\u7C98\u8D34\u7684\u5BC6\u94A5\u4F1A\u5BF9\u7FA4\u6210\u5458\u53EF\u89C1\u3002`,
+        ...autoLinked ? [
+          "",
+          `\u{1F517} \u5DF2\u81EA\u52A8\u628A provider \`${ref}\` \u7684 apiKeyEnv \u5173\u8054\u5230 \`${ref}\`\uFF08\u4E0B\u4E00\u8BF7\u6C42\u751F\u6548\uFF09\u3002`
+        ] : []
+      ].join("\n")
     );
     return;
   }
@@ -5155,8 +5264,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 };
@@ -5187,22 +5306,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" })
         ])
@@ -5215,13 +5334,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: {
@@ -5234,8 +5354,7 @@ function renderWizardOptionsCard(input) {
           content: [input.question, input.hint ? `
 ${input.hint}` : ""].join("")
         },
-        ...rows,
-        actionRow([cancel])
+        ...rows
       ]
     }
   };
@@ -5254,14 +5373,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 }))
       ]
     }
   };
@@ -5280,7 +5408,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 }))
         ])
@@ -5788,7 +5916,22 @@ var FLOWS = {
       const ref = asString(data.ref);
       const value = asString(data.value);
       await ctx.dshConfig.setCredential(ref, value);
-      return `\u5DF2\u5199\u5165\u51ED\u636E \`${ref}\` \u5230 \`~/.dsh/.credentials.yaml\`\uFF080600\uFF0C\u503C\u5DF2\u9690\u85CF\uFF09\u3002\u5EFA\u8BAE\u5728\u79C1\u804A\u4E2D\u4F7F\u7528\uFF1B\u7FA4\u804A\u91CC\u7C98\u8D34\u7684\u5BC6\u94A5\u4F1A\u5BF9\u7FA4\u6210\u5458\u53EF\u89C1\u3002`;
+      const providers = await ctx.dshConfig.listProviders();
+      const target = providers.find(
+        (provider) => provider.id === ref && provider.namespace === "llm-pi-ai" && provider.credentialRef === void 0
+      );
+      let autoLinked = false;
+      if (target) {
+        await ctx.dshConfig.upsertPiAiProvider({ id: ref, apiKeyEnv: ref });
+        autoLinked = true;
+      }
+      return [
+        `\u5DF2\u5199\u5165\u51ED\u636E \`${ref}\` \u5230 \`~/.dsh/.credentials.yaml\`\uFF080600\uFF0C\u503C\u5DF2\u9690\u85CF\uFF09\u3002\u5EFA\u8BAE\u5728\u79C1\u804A\u4E2D\u4F7F\u7528\uFF1B\u7FA4\u804A\u91CC\u7C98\u8D34\u7684\u5BC6\u94A5\u4F1A\u5BF9\u7FA4\u6210\u5458\u53EF\u89C1\u3002`,
+        ...autoLinked ? [
+          "",
+          `\u{1F517} \u5DF2\u81EA\u52A8\u628A provider \`${ref}\` \u7684 apiKeyEnv \u5173\u8054\u5230 \`${ref}\`\uFF08\u4E0B\u4E00\u8BF7\u6C42\u751F\u6548\uFF09\u3002`
+        ] : []
+      ].join("\n");
     }
   },
   "key-remove": {
@@ -5844,17 +5987,24 @@ async function renderCurrentStep(ctx, state) {
   const options = await stepOptions(step, ctx, state.data);
   if (step.kind === "options" && options) {
     if (ctx.channel.sendCard) {
-      await ctx.channel.sendCard(
-        ctx.chatId,
-        renderWizardOptionsCard({
+      try {
+        await ctx.channel.sendCard(
+          ctx.chatId,
+          renderWizardOptionsCard({
+            flow: flow.id,
+            step: state.step,
+            question: step.question,
+            options,
+            ...step.hint === void 0 ? {} : { hint: step.hint }
+          })
+        );
+        return;
+      } catch (error) {
+        log.warn("wizard", "card-send-failed", {
           flow: flow.id,
-          step: state.step,
-          question: step.question,
-          options,
-          ...step.hint === void 0 ? {} : { hint: step.hint }
-        })
-      );
-      return;
+          error: error instanceof Error ? error.message : String(error)
+        });
+      }
     }
     const labels = options.map((option) => `\`${option.label}\``).join("\u3001");
     await ctx.channel.sendMarkdown(
@@ -5868,17 +6018,25 @@ ${labels}
     return;
   }
   if (ctx.channel.sendCard) {
-    await ctx.channel.sendCard(
-      ctx.chatId,
-      renderWizardTextStepCard({
+    try {
+      await ctx.channel.sendCard(
+        ctx.chatId,
+        renderWizardTextStepCard({
+          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 }
+        })
+      );
+      return;
+    } catch (error) {
+      log.warn("wizard", "card-send-failed", {
         flow: flow.id,
-        step: state.step,
-        question: step.question,
-        ...step.placeholder === void 0 ? {} : { placeholder: step.placeholder },
-        ...step.hint === void 0 ? {} : { hint: step.hint }
-      })
-    );
-    return;
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
   }
   await ctx.channel.sendMarkdown(
     ctx.chatId,
@@ -6019,11 +6177,17 @@ async function showConfigHub(ctx) {
   const defaultSelection = await ctx.dshConfig.defaultModelSelection();
   const currentModel = ctx.models.get(ctx.scope) ?? ctx.defaultModel;
   if (ctx.channel.sendCard) {
-    await ctx.channel.sendCard(
-      ctx.chatId,
-      renderConfigHubCard({ providers, defaultSelection, currentModel })
-    );
-    return;
+    try {
+      await ctx.channel.sendCard(
+        ctx.chatId,
+        renderConfigHubCard({ providers, defaultSelection, currentModel })
+      );
+      return;
+    } catch (error) {
+      log.warn("wizard", "hub-card-send-failed", {
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
   }
   const lines = providers.map((provider) => {
     const models = provider.models.map((model) => model.id).join(", ") || "(\u65E0)";
@@ -6956,9 +7120,17 @@ async function startChannel(deps) {
         defaultModel: deps.defaultModel,
         senderId: msg.senderId
       };
-      const handled = await tryHandleCommand(msg.content, context).catch((error) => {
+      const handled = await tryHandleCommand(msg.content, context).catch(async (error) => {
         log.fail("channel-command", error, { scope });
-        return false;
+        try {
+          await commandChannel.sendMarkdown(
+            msg.chatId,
+            `\u26A0\uFE0F \u547D\u4EE4\u6267\u884C\u5931\u8D25\uFF1A${error instanceof Error ? error.message : String(error)}`,
+            { replyTo: msg.messageId }
+          );
+        } catch {
+        }
+        return true;
       });
       if (!handled) {
         const queued = deps.pending.size(scope);
@@ -8413,6 +8585,9 @@ async function startBridgeEngine(options) {
           );
           return;
         }
+        if (modelRoute && modelRoute.provider !== DEEPSEEK_PROVIDER) {
+          await dshConfig.linkCredentialRefIfMissing(modelRoute.provider).catch(() => void 0);
+        }
         const runInput = {
           scope,
           chatId: first.chatId,