dsh-lark-bot 0.19.6 → 0.19.7

package/README.md

@@ -162,7 +162,9 @@ Markdown、toast 与旧客户端降级路径同时显示中英文。agent 最终
 
 飞书消息中的图片会按文件内容识别 PNG/JPEG/WebP/GIF 并补全安全扩展名；默认 SDK 会经 dsh
 附件存储校验后发送原生 image block，而不是把路径当作图片。无法读取或模型不支持视觉时会明确
-失败，agent 被要求不得用工作区内其他图片替代。文本类文件会读取内容并注入任务上下文。
+失败，agent 被要求不得用工作区内其他图片替代。选中的 `deepseek-official` 视觉模型会在每轮运行前
+幂等补入 dsh runtime 实际消费的模型目录并声明 `text,image`，避免展示目录已识别视觉能力但 rc.8
+runtime 仍按 text-only 拒绝。文本类文件会读取内容并注入任务上下文。
 `/model` 卡片会把 dsh 默认模型并入可切换目录（即使 provider 的显式列表尚未包含它），
 并用去除公共前缀后的短标签、每行最多两个按钮适配移动端。provider 名称、模型、输入模态和
 推理档位从 models.dev 运行时目录发现（15 分钟内存缓存）；网络失败时只使用 dsh settings 中的

package/README_EN.md

@@ -165,7 +165,10 @@ to the cloud LLM.
 Feishu images are detected by content as PNG/JPEG/WebP/GIF and receive a safe extension. The default
 SDK validates them through dsh's attachment store and sends native image blocks instead of path text.
 Unreadable or unsupported images fail explicitly, and the agent is instructed never to substitute another
-workspace image. Text files are read and injected into the task context.
+workspace image. Before each run, the selected `deepseek-official` vision model is idempotently added to the
+model catalogue consumed by the dsh runtime with `text,image` modalities. This prevents rc.8 from treating the
+model as text-only even when the display catalogue already recognizes its vision capability. Text files are read
+and injected into the task context.
 The `/model` card merges the dsh default into its switchable catalogue even when a provider's explicit
 list omits it, and uses compact distinguishing labels with at most two buttons per mobile row. Provider
 names, models, input modalities, and reasoning-effort options are discovered from the models.dev runtime

package/dist/cli.js

@@ -1093,7 +1093,7 @@ import { homedir as homedir3 } from "os";
 import { mkdir as mkdir2, readFile, rm, writeFile as writeFile2 } from "fs/promises";
 import { homedir } from "os";
 import { dirname as dirname3, join as join3 } from "path";
-import { Document, parseDocument } from "yaml";
+import { Document, isMap, isSeq, parseDocument } from "yaml";
 
 // src/platform/atomic-write.ts
 import { randomBytes } from "crypto";
@@ -1563,6 +1563,22 @@ function patchNode(document, path, current, next) {
   }
   if (!deepEqualJson(current, next)) document.setIn([...path], next);
 }
+function patchRuntimeModelModalities(document, modelId, modalities) {
+  const modelsPath = [DEEPSEEK_NAMESPACE, "models"];
+  const modelsNode = document.getIn(modelsPath, true);
+  if (!isSeq(modelsNode)) {
+    document.setIn(modelsPath, [{ id: modelId, inputModalities: modalities }]);
+    return;
+  }
+  const modelIndex = modelsNode.items.findIndex(
+    (item) => isMap(item) && item.get("id") === modelId
+  );
+  if (modelIndex === -1) {
+    modelsNode.add({ id: modelId, inputModalities: modalities });
+    return;
+  }
+  document.setIn([...modelsPath, modelIndex, "inputModalities"], modalities);
+}
 function parseYamlMap(text, filename) {
   if (text === void 0 || text.trim().length === 0) return {};
   const document = parseDocument(text, { prettyErrors: true });
@@ -1752,6 +1768,12 @@ var DshProviderManager = class {
     if (!provider) return void 0;
     return { provider: provider.id, model: selection };
   }
+  /** Resolve a model route and make its managed runtime catalog ready. */
+  async resolveRuntimeModelRoute(selection) {
+    const route = await this.resolveModelRoute(selection);
+    if (route !== void 0) await this.ensureRuntimeModelModalities(route);
+    return route;
+  }
   async setDefaultModel(model) {
     if (!model.trim()) throw new Error("\u9ED8\u8BA4\u6A21\u578B\u4E0D\u80FD\u4E3A\u7A7A");
     const route = await this.resolveModelRoute(model);
@@ -1799,6 +1821,57 @@ var DshProviderManager = class {
       models: [...models, modelRecord(input)]
     });
   }
+  /**
+   * Ensure the selected DeepSeek vision model is present in the catalog that
+   * the managed SDK/ACP runtime actually consumes. The upstream DeepSeek
+   * adapter treats an unlisted model as text-only even when its id identifies
+   * a vision endpoint, so read-time normalization alone is insufficient.
+   * Returns true only when settings were changed.
+   */
+  async ensureRuntimeModelModalities(route) {
+    if (route.provider !== DEEPSEEK_PROVIDER || !isVisionModelId(route.model)) return false;
+    await mkdir2(dirname3(this.settingsFile), { recursive: true });
+    let changed = false;
+    await withFileLock(this.settingsFile, async () => {
+      const text = await readOptional(this.settingsFile);
+      const root = parseYamlMap(text, this.settingsFile);
+      const current = isMapLike(root[DEEPSEEK_NAMESPACE]) ? root[DEEPSEEK_NAMESPACE] : {};
+      const models = rawModels(current.models);
+      const index = models.findIndex((model) => model.id === route.model);
+      const existing = index === -1 ? void 0 : models[index];
+      const configured = Array.isArray(existing?.inputModalities) ? existing.inputModalities.filter(
+        (modality) => modality === "text" || modality === "image"
+      ) : void 0;
+      const modalities = normalizeVisionModelInputModalities(
+        route.model,
+        configured,
+        false
+      );
+      if (existing !== void 0 && deepEqualJson(existing.inputModalities, modalities)) return;
+      const nextModel = { ...existing ?? { id: route.model }, inputModalities: modalities };
+      const section = {
+        ...current,
+        models: index === -1 ? [...models, nextModel] : models.map((model, modelIndex) => modelIndex === index ? nextModel : model)
+      };
+      if (text === void 0 || text.trim().length === 0) {
+        await writeFileAtomic(
+          this.settingsFile,
+          new Document({ [DEEPSEEK_NAMESPACE]: section }).toString(),
+          {}
+        );
+        changed = true;
+        return;
+      }
+      const document = parseDocument(text);
+      if (document.errors.length > 0) {
+        throw new Error(`invalid dsh settings at ${this.settingsFile}`);
+      }
+      patchRuntimeModelModalities(document, route.model, modalities);
+      await writeFileAtomic(this.settingsFile, document.toString(), {});
+      changed = true;
+    });
+    return changed;
+  }
   async removeDeepseekModel(id) {
     const settings = await this.readSettings();
     const current = isMapLike(settings[DEEPSEEK_NAMESPACE]) ? settings[DEEPSEEK_NAMESPACE] : {};
@@ -8197,7 +8270,7 @@ async function runAttempt(input, cwd, workspaceCwd, sessionId, resuming, replyOp
       const consume = async () => {
         for await (const event of run.events) {
           if (timedOut) return;
-          if (resuming && !sawActivity && event.type === "error" && event.terminationReason === "failed") {
+          if (resuming && !sawActivity && event.type === "error" && event.terminationReason === "failed" && classifySessionError(event.message) !== void 0) {
             await showResumeRecovery(event.message);
             return;
           }
@@ -8292,10 +8365,19 @@ async function runAttempt(input, cwd, workspaceCwd, sessionId, resuming, replyOp
         try {
           await consume();
         } catch (error) {
-          if (resuming && !sawActivity) {
+          if (resuming && !sawActivity && classifySessionError(errorMessage(error)) !== void 0) {
             await showResumeRecovery(error);
             return;
           }
+          if (state.terminal === "running") {
+            state = applyEvent(state, {
+              type: "error",
+              message: errorMessage(error),
+              terminationReason: "failed"
+            }, stopRequested);
+            state = { ...state, lastActivityMs: Date.now() };
+            await safeUpdate();
+          }
           throw error;
         }
       };
@@ -8400,7 +8482,7 @@ async function runAttempt(input, cwd, workspaceCwd, sessionId, resuming, replyOp
     if (resumeFailure !== void 0) {
       throw new Error(resumeFailure);
     }
-    if (resuming && state.terminal === "error" && !sawActivity) {
+    if (resuming && state.terminal === "error" && !sawActivity && classifySessionError(state.errorMsg ?? "") !== void 0) {
       throw new Error(state.errorMsg ?? "native session resume failed");
     }
     input.sessions.recordExchange(input.scope, workspaceCwd, input.messages, assistantOutput, {
@@ -8415,14 +8497,14 @@ async function runAttempt(input, cwd, workspaceCwd, sessionId, resuming, replyOp
       } : {}
     });
   } catch (error) {
-    state = markInterrupted(state);
-    if (resuming && !sawActivity) {
+    const runErrorText = errorMessage(error);
+    const healKind = classifySessionError(runErrorText);
+    if (resuming && !sawActivity && healKind !== void 0) {
       log.warn("run-flow", "resume-attempt-failed", { scope: input.scope, runId });
       throw error;
     }
+    if (state.terminal === "running") state = markInterrupted(state);
     log.fail("run-flow", error, { scope: input.scope, runId });
-    const runErrorText = errorMessage(error);
-    const healKind = classifySessionError(runErrorText);
     if (healKind !== void 0) {
       const brokenSessionId = input.sessions.getRaw(input.scope, workspaceCwd)?.sessionId;
       if (brokenSessionId !== void 0) {
@@ -12019,6 +12101,7 @@ var ResilientCardStreamController = class {
   closed = false;
   timer;
   inFlight;
+  reanchorInFlight;
   async update(card) {
     if (this.closed || this.failed) return;
     this.latest = card;
@@ -12032,10 +12115,11 @@ var ResilientCardStreamController = class {
       this.timer = void 0;
     }
     if (this.inFlight !== void 0) await this.inFlight;
+    if (this.reanchorInFlight !== void 0) await this.reanchorInFlight;
     if (!this.failed && this.dirty) await this.flush();
   }
   schedule() {
-    if (this.timer !== void 0 || this.inFlight !== void 0 || this.failed) return;
+    if (this.timer !== void 0 || this.inFlight !== void 0 || this.reanchorInFlight !== void 0 || this.failed) return;
     this.timer = setTimeout(() => {
       this.timer = void 0;
       this.startFlush();
@@ -12103,6 +12187,17 @@ var ResilientCardStreamController = class {
    */
   async reanchor() {
     if (this.closed || this.failed) return this.messageId;
+    if (this.reanchorInFlight !== void 0) return this.reanchorInFlight;
+    const task = this.performReanchor();
+    this.reanchorInFlight = task;
+    try {
+      return await task;
+    } finally {
+      if (this.reanchorInFlight === task) this.reanchorInFlight = void 0;
+      if (!this.closed && this.dirty && !this.failed) this.schedule();
+    }
+  }
+  async performReanchor() {
     if (this.inFlight !== void 0) await this.inFlight;
     if (this.timer !== void 0) {
       clearTimeout(this.timer);
@@ -12110,9 +12205,11 @@ var ResilientCardStreamController = class {
     }
     const card = this.latest;
     if (card === void 0) return this.messageId;
+    this.dirty = false;
     try {
       await this.channel.recallMessage(this.messageId);
     } catch (error) {
+      this.dirty = true;
       log.warn("lark-card-stream", "reanchor-recall-failed", {
         messageId: this.messageId,
         error: error instanceof Error ? error.message : String(error)
@@ -12122,8 +12219,6 @@ var ResilientCardStreamController = class {
     const sent = await this.channel.send(this.chatId, { card }, {});
     if (!sent.messageId) throw new Error("Feishu card re-anchor returned no message_id");
     this.messageId = sent.messageId;
-    this.latest = card;
-    this.dirty = false;
     this.failed = false;
     return this.messageId;
   }
@@ -18124,13 +18219,13 @@ async function startBridgeEngine(options) {
         let modelRoute2;
         if (resolvedModel) {
           try {
-            modelRoute2 = await dshConfig.resolveModelRoute(resolvedModel);
+            modelRoute2 = await dshConfig.resolveRuntimeModelRoute(resolvedModel);
           } catch (error) {
             await streaming.sendMarkdown(
               first.chatId,
               bilingualMarkdown(
-                `\u26A0\uFE0F \u8BFB\u53D6 dsh \u914D\u7F6E\u5931\u8D25\uFF0C\u65E0\u6CD5\u89E3\u6790\u6A21\u578B \`${resolvedModel}\` \u7684 provider \u8DEF\u7531\uFF1A${error instanceof Error ? error.message : String(error)}`,
-                `\u26A0\uFE0F Failed to read dsh configuration, so the provider route for model \`${resolvedModel}\` could not be resolved: ${error instanceof Error ? error.message : String(error)}`
+                `\u26A0\uFE0F \u8BFB\u53D6\u6216\u51C6\u5907 dsh \u8FD0\u884C\u65F6\u914D\u7F6E\u5931\u8D25\uFF0C\u65E0\u6CD5\u89E3\u6790\u6A21\u578B \`${resolvedModel}\` \u7684 provider \u8DEF\u7531\uFF1A${error instanceof Error ? error.message : String(error)}`,
+                `\u26A0\uFE0F Failed to read or prepare dsh runtime configuration, so the provider route for model \`${resolvedModel}\` could not be resolved: ${error instanceof Error ? error.message : String(error)}`
               ),
               { replyTo: first.messageId }
             );