dsh-lark-bot 0.19.5 → 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 中的
@@ -354,9 +356,16 @@ npx dsh-lark-bot@latest upgrade --profile dsh-lark --yes
 - `--no-guardian`：跳过守护升级；
 - **runtime profile 一致性修复**：升级后自动把 `dsh-lark-sdk` / `dsh-lark-acp` 的
   own-package 链接重指到新版本，并当场强制刷新 runtime profile 及被链接主插件中版本陈旧或物理
-  内容损坏的 SDK server / ACP 依赖；
-- **受管服务安全重载**：更新 worker 的临时 callback URL/token 与 npx cache PATH 不会写入持久
-  service env；只有飞书通道、callback server 和 Guardian 心跳均已就绪后才确认更新成功。
+  内容损坏的 SDK server / ACP 依赖；修复目标以 dsh profile 中重新读取并验证的安装包为准，
+  不会链接到临时 npx worker。npm/npx 扁平依赖按 Node 的真实模块解析结果校验；pnpm 安装则先
+  解引用 profile 中的包链接，再从 `.pnpm` 物理包目录解析其依赖，避免误判缺失并强制重装；
+- **托管环境 pnpm 一致性**：执行 `dsh plugin add` 前读取既有 profile 的
+  `node_modules/.modules.yaml`，把其中记录的精确 pnpm 版本同步到 profile `package.json`，避免
+  Corepack 因 source-managed dsh 的工作目录选择另一 pnpm 主版本并触发
+  `ERR_PNPM_UNEXPECTED_STORE`；全新 profile 不会被提前创建 manifest；
+- **受管服务安全重载**：更新 worker 的临时 callback URL/token 与 npx/npm package-bin PATH 不会写入持久
+  service env 或 Guardian unit；Guardian 仅保留 Node 所在目录及稳定的用户/系统 PATH。只有飞书通道、
+  callback server 和 Guardian 心跳均已就绪后才确认更新成功。
 
 无需交互确认时加 `--yes`（非交互环境不带 `--yes` 会安全中止）。其余方式：
 

package/README_EN.md

@@ -94,7 +94,7 @@ question-card buttons. If an existing app was created by an older flow, enable c
 Console → Events & Callbacks → Callback Configuration and publish the app again. Without it, messages still work
 while card clicks never reach the bot.
 
-`setup` automatically: locates your local dsh → pre-approves pnpm's build policy (protobufjs) → runs the standard `dsh plugin --profile dsh-lark add dsh-lark-bot@<version>` (pinned to the running package) → installs the safety-net guardian system service. One command installs everything.
+`setup` automatically: locates your local dsh → pre-approves pnpm's build policy (protobufjs; an existing profile is also pinned to the exact pnpm release recorded by its install metadata, preventing Corepack/store-major conflicts) → runs the standard `dsh plugin --profile dsh-lark add dsh-lark-bot@<version>` (pinned to the running package) → installs the safety-net guardian system service. A fresh profile is still initialized by dsh. One command installs everything.
 
 > **No public IP / domain / server / tunneling required** (Feishu outbound WebSocket long connection); works on Linux / macOS / Windows.
 > With an existing PersonalAgent app you can skip the QR step (see Configuration): `DSH_LARK_APP_ID=cli_xxx DSH_LARK_APP_SECRET=<secret> DSH_LARK_TENANT=feishu dsh --profile dsh-lark`
@@ -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
@@ -358,12 +361,16 @@ npx dsh-lark-bot@latest upgrade --profile dsh-lark --yes
 - `--rollback`: reinstall the version recorded before the last upgrade (`~/.dsh-lark/upgrade-state.json`);
 - `--force`: reinstall the running version when npm is unreachable (offline);
 - `--no-guardian`: skip the guardian upgrade;
-- **Runtime-profile consistency repair**: after upgrading, the own-package links of `dsh-lark-sdk` / `dsh-lark-acp` are re-pointed and stale SDK-server / ACP dependencies are idempotently reinstalled immediately.
+- **Runtime-profile consistency repair**: after `dsh plugin add`, the upgrader re-reads and verifies the exact target installed in the dsh profile, then re-points `dsh-lark-sdk` / `dsh-lark-acp` only to that stable package root—never to the transient npx worker—and refreshes stale SDK-server / ACP dependencies.
+- **npm/npx/pnpm layout support**: npm/npx-flat dependencies use Node's actual module resolution; pnpm package links are resolved to their physical `.pnpm` target before dependency validation, avoiding false corruption reports and unnecessary forced installs.
+- **Corepack-managed dsh compatibility**: before installing into an existing profile, the exact pnpm release from `node_modules/.modules.yaml` is persisted to `package.json#packageManager`, preventing a source-managed dsh working directory from selecting an incompatible pnpm store major.
 
 Pass `--yes` to skip the interactive confirmation (non-interactive runs fail closed without it). Alternatives:
 
 - Plugin: re-run `setup` (or `dsh plugin --profile <name> add dsh-lark-bot`) to pull the latest npm release.
 - Safety-net guardian: installed / upgraded together with `upgrade` / `setup` (idempotent), or standalone via `dsh-lark-bot guardian install`.
+- Managed reloads never persist the update worker's npx/npm package-bin paths into the service environment or
+  Guardian unit. Guardian keeps only the Node directory and stable user/system PATH entries.
 - CLI tool (optional): `npm i -g dsh-lark-bot@latest`; not needed when using `npx`.
 - Restart the profile after upgrading (when not using `--restart`): `dsh --profile dsh-lark`.
 

package/dist/cli.js

@@ -282,8 +282,7 @@ import { join as join7 } from "path";
 function acpProfileRoot(home, profile, env) {
   return join7(resolveDshHome(home, env), "profiles", profile);
 }
-function packageJsonFor2(profile) {
-  const own = ownPackageInfo();
+function packageJsonFor2(profile, own = ownPackageInfo()) {
   return `${JSON.stringify(
     {
       name: `dsh-profile-${profile}`,
@@ -372,12 +371,11 @@ function acpPatchYaml(provider, model) {
     ""
   ].join("\n");
 }
-function isAcpProfileReady(profileRoot) {
-  const own = ownPackageInfo();
+function isAcpProfileReady(profileRoot, own = ownPackageInfo()) {
   return existsSync4(join7(profileRoot, "package.json")) && existsSync4(join7(profileRoot, "cordis.yml")) && existsSync4(join7(profileRoot, "cordis.patch.yml")) && profilePackageMatches(profileRoot, ACP_PACKAGE, ACP_VERSION) && ownPackageLinked2(profileRoot, own);
 }
-function isAcpManagedProfileCurrent(profileRoot, provider, model) {
-  if (!isAcpProfileReady(profileRoot)) return false;
+function isAcpManagedProfileCurrent(profileRoot, provider, model, own = ownPackageInfo()) {
+  if (!isAcpProfileReady(profileRoot, own)) return false;
   try {
     return readFileSync4(join7(profileRoot, "cordis.patch.yml"), "utf8") === acpPatchYaml(provider, model);
   } catch {
@@ -423,10 +421,11 @@ ${tail}`));
 }
 async function ensureAcpProfile(options) {
   const profile = options.profile ?? DEFAULT_ACP_PROFILE;
+  const own = options.ownPackage ?? ownPackageInfo();
   const root = acpProfileRoot(options.home, profile, options.env);
   const provider = options.provider?.trim();
   const model = options.model?.trim();
-  const ready = isAcpProfileReady(root);
+  const ready = isAcpProfileReady(root, own);
   try {
     if (!provider || !model) {
       throw new Error(
@@ -434,14 +433,14 @@ async function ensureAcpProfile(options) {
       );
     }
     await mkdir4(root, { recursive: true });
-    await writeFile4(join7(root, "package.json"), packageJsonFor2(profile), "utf8");
+    await writeFile4(join7(root, "package.json"), packageJsonFor2(profile, own), "utf8");
     await writeFile4(join7(root, "cordis.yml"), "[]\n", "utf8");
     await writeFile4(join7(root, "cordis.patch.yml"), acpPatchYaml(provider, model), "utf8");
     if (!ready) {
       const install = options.install ?? runPnpmInstall2;
       await install(root, { force: true });
     }
-    if (!isAcpProfileReady(root)) {
+    if (!isAcpProfileReady(root, own)) {
       return {
         ok: false,
         created: true,
@@ -1094,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";
@@ -1564,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 });
@@ -1753,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);
@@ -1800,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] : {};
@@ -2765,6 +2837,7 @@ init_bridge_persona();
 init_own_package();
 init_profile_package();
 import { spawn as spawn3 } from "cross-spawn";
+import { createRequire } from "module";
 import { existsSync as existsSync3, realpathSync as realpathSync2 } from "fs";
 import { readFileSync as readFileSync3 } from "fs";
 import { mkdir as mkdir3, writeFile as writeFile3 } from "fs/promises";
@@ -2900,7 +2973,24 @@ function isSdkManagedProfileCurrent(profileRoot, options, own = ownPackageInfo()
   return isSdkProfileReady(profileRoot, own) && readFileIfPresent(join6(profileRoot, "cordis.patch.yml")) === patchYamlFor(options);
 }
 function ownSdkServerDependencyReady(own) {
-  return profilePackageMatches(own.root, SDK_SERVER_PACKAGE, SDK_SERVER_VERSION);
+  try {
+    const physicalOwnRoot = realpathSync2(own.root);
+    const entry = createRequire(join6(physicalOwnRoot, "package.json")).resolve(SDK_SERVER_PACKAGE);
+    let current = dirname5(entry);
+    for (let depth = 0; depth < 8; depth += 1) {
+      try {
+        const parsed = JSON.parse(readFileSync3(join6(current, "package.json"), "utf8"));
+        if (parsed.name === SDK_SERVER_PACKAGE) return parsed.version === SDK_SERVER_VERSION;
+      } catch {
+      }
+      const parent = dirname5(current);
+      if (parent === current) return false;
+      current = parent;
+    }
+    return false;
+  } catch {
+    return false;
+  }
 }
 function findPnpmProjectRoot(start) {
   let current = start;
@@ -4141,6 +4231,20 @@ function systemdUnit(nodeBin, cliEntry, env = {}) {
     ""
   ].join("\n");
 }
+function stableGuardianServicePath(nodeBin, inheritedPath = process.env.PATH) {
+  const entries = [dirname9(nodeBin), ...inheritedPath?.split(delimiter) ?? []];
+  const seen = /* @__PURE__ */ new Set();
+  return entries.filter((entry) => {
+    if (!entry) return false;
+    const normalized = entry.replaceAll("\\", "/");
+    if (normalized.includes("/node_modules/.bin") || /\/_npx(?:\/|$)/.test(normalized) || /\/guardian\/update-worker\/npm-cache(?:\/|$)/.test(normalized)) {
+      return false;
+    }
+    if (seen.has(entry)) return false;
+    seen.add(entry);
+    return true;
+  }).join(delimiter);
+}
 function launchdPlist(nodeBin, cliEntry, label2 = `io.dsh-lark.${GUARDIAN_LABEL}`, logPath = "/tmp/dsh-lark-guardian.log") {
   return [
     '<?xml version="1.0" encoding="UTF-8"?>',
@@ -4203,7 +4307,7 @@ async function installGuardian(options) {
     await writeFile5(
       unitPath,
       systemdUnit(nodeBin, cliEntry, {
-        PATH: [dirname9(nodeBin), process.env.PATH].filter((value) => Boolean(value)).join(delimiter),
+        PATH: stableGuardianServicePath(nodeBin),
         DSH_LARK_GUARDIAN_DISABLED: "0"
       }),
       "utf8"
@@ -8166,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;
           }
@@ -8261,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;
         }
       };
@@ -8369,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, {
@@ -8384,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) {
@@ -11988,6 +12101,7 @@ var ResilientCardStreamController = class {
   closed = false;
   timer;
   inFlight;
+  reanchorInFlight;
   async update(card) {
     if (this.closed || this.failed) return;
     this.latest = card;
@@ -12001,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();
@@ -12072,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);
@@ -12079,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)
@@ -12091,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;
   }
@@ -18093,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 }
             );
@@ -18513,6 +18639,7 @@ import { spawn as spawn8 } from "child_process";
 import { mkdir as mkdir23, readFile as readFile32, writeFile as writeFile9 } from "fs/promises";
 import { homedir as homedir17 } from "os";
 import { join as join28 } from "path";
+import { parse } from "yaml";
 async function runSetup(options = {}) {
   const profile = options.profile ?? "dsh-lark";
   const own = ownPackageInfo();
@@ -18586,6 +18713,7 @@ function runDshPlugin(bin, profile, packageSpec, env = process.env) {
   });
 }
 async function approveBuilds(profileDir) {
+  await preserveInstalledPnpmVersion(profileDir);
   const workspaceFile = join28(profileDir, "pnpm-workspace.yaml");
   let existing = "";
   try {
@@ -18610,6 +18738,32 @@ allowBuilds:
   }
   await writeFile9(workspaceFile, existing, "utf8");
 }
+async function preserveInstalledPnpmVersion(profileDir) {
+  const packageFile = join28(profileDir, "package.json");
+  const modulesFile = join28(profileDir, "node_modules", ".modules.yaml");
+  let packageText;
+  let modulesText;
+  try {
+    [packageText, modulesText] = await Promise.all([
+      readFile32(packageFile, "utf8"),
+      readFile32(modulesFile, "utf8")
+    ]);
+  } catch {
+    return;
+  }
+  try {
+    const profilePackage = JSON.parse(packageText);
+    const modules = parse(modulesText);
+    const packageManager = modules?.packageManager;
+    if (typeof packageManager !== "string" || !/^pnpm@\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/.test(packageManager) || profilePackage.packageManager === packageManager) {
+      return;
+    }
+    profilePackage.packageManager = packageManager;
+    await writeFile9(packageFile, `${JSON.stringify(profilePackage, null, 2)}
+`, "utf8");
+  } catch {
+  }
+}
 
 // src/cli/commands/upgrade.ts
 init_own_package();
@@ -18768,7 +18922,7 @@ function existingAcpRoute(profileRoot) {
   }
 }
 async function repairRuntimeProfiles(options) {
-  const own = ownPackageInfo();
+  const own = options.ownPackage ?? ownPackageInfo();
   const env = options.env ?? process.env;
   const relink = options.relinkFn ?? defaultRelink;
   const managedEnv = { ...env, DSH_HOME: options.dshHome };
@@ -18786,18 +18940,19 @@ async function repairRuntimeProfiles(options) {
     {
       profile: DEFAULT_SDK_PROFILE,
       root: sdkRoot,
-      isReady: isSdkManagedProfileCurrent,
-      ensure: () => ensureSdk({ home: options.dshHome, env: managedEnv })
+      isReady: (root) => isSdkManagedProfileCurrent(root, void 0, own),
+      ensure: () => ensureSdk({ home: options.dshHome, env: managedEnv, ownPackage: own })
     },
     {
       profile: DEFAULT_ACP_PROFILE,
       root: acpRoot,
-      isReady: (root) => isAcpManagedProfileCurrent(root, acpRoute.provider, acpRoute.model),
+      isReady: (root) => isAcpManagedProfileCurrent(root, acpRoute.provider, acpRoute.model, own),
       ensure: () => ensureAcp({
         home: options.dshHome,
         env: managedEnv,
         provider: acpRoute.provider,
-        model: acpRoute.model
+        model: acpRoute.model,
+        ownPackage: own
       })
     }
   ];
@@ -19014,10 +19169,21 @@ ${changeLines.join("\n")}
     await (options.pluginSpawnFn ?? runDshPlugin)(bin, profile, target.spec);
     write(out, `\u2705 \u5305\u672C\u4F53\u5DF2\u66F4\u65B0\u5230 ${target.version}\u3002
 `);
+    const installedTarget = await (options.readInstalledPackageFn ?? readInstalledPackage)(
+      dshHome,
+      profile,
+      own.name
+    );
+    if (!installedTarget || installedTarget.name !== own.name || installedTarget.version !== target.version) {
+      throw new Error(
+        `dsh plugin add completed but ${own.name}@${target.version} is not installed in profile ${profile}`
+      );
+    }
     const repair = options.repairRuntimeFn ?? repairRuntimeProfiles;
     const runtimeStates = await repair({
       dshHome,
       env: process.env,
+      ownPackage: installedTarget,
       provider: env.provider,
       model: env.model
     });
@@ -19133,7 +19299,7 @@ import { join as join32 } from "path";
 import {
   createLarkChannel as createLarkChannel3
 } from "@larksuite/channel";
-import { parse } from "yaml";
+import { parse as parse2 } from "yaml";
 init_dsh_runtime();
 
 // src/guardian/control.ts
@@ -20382,7 +20548,7 @@ function safeScopeForAction(event) {
 function readDshDefaultSelection(home, env) {
   try {
     const file = join32(resolveDshHome(home, env), "settings.yaml");
-    const doc = parse(readFileSync6(file, "utf8"));
+    const doc = parse2(readFileSync6(file, "utf8"));
     const value = doc?.["agent-default-model"];
     if (typeof value === "object" && value !== null && typeof value.provider === "string" && typeof value.model === "string") {
       const selection = value;