dsh-lark-bot 0.19.5 → 0.19.6

package/README.md

@@ -354,9 +354,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`
@@ -358,12 +358,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,
@@ -2765,6 +2764,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 +2900,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 +4158,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 +4234,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"
@@ -18513,6 +18544,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 +18618,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 +18643,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 +18827,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 +18845,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 +19074,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 +19204,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 +20453,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;