dsh-llm-codebuddy 1.3.1 → 1.3.2

package/README.md

@@ -27,6 +27,8 @@ DSH WebUI 中填写 API Key、获取模型、调整模型参数并使用 CodeBud
 - 已安装 DSH；
 - 已验证 DSH `0.1.0-rc.6`。
 
+安装器已自带 DSH 所需的 `pnpm`，无需全局安装。
+
 > DSH 仍处于预发布阶段。未来版本如果调整插件接口，本插件可能需要同步升级；
 > DSH 普通更新不会覆盖本插件。
 

package/cli.js

@@ -2,12 +2,15 @@
 
 import { copyFileSync, existsSync, mkdtempSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
-import { dirname, join, resolve } from "node:path";
+import { createRequire } from "node:module";
+import { delimiter, dirname, join, resolve } from "node:path";
 import { spawnSync } from "node:child_process";
 import { parseDocument } from "yaml";
 
 const PACKAGE = "dsh-llm-codebuddy";
 const PROVIDER_PATH = ["llm-pi-ai", "providers", "codebuddy-cn"];
+const IGNORED_BUILDS = ["@google/genai", "protobufjs"];
+const require = createRequire(import.meta.url);
 
 function dshHome() {
   return resolve(process.env.DSH_HOME || join(homedir(), ".dsh"));
@@ -20,15 +23,74 @@ function profileHasPlugin(home, profile) {
   return Boolean(json.dependencies?.[PACKAGE] || json.devDependencies?.[PACKAGE]);
 }
 
+function dshEnv() {
+  const pnpmPackageDir = dirname(require.resolve("pnpm"));
+  const pnpmBinDir = join(dirname(pnpmPackageDir), ".bin");
+  const pathKey = Object.keys(process.env).find((key) => key.toLowerCase() === "path") || "PATH";
+  return {
+    ...process.env,
+    [pathKey]: `${pnpmBinDir}${delimiter}${process.env[pathKey] || ""}`,
+    npm_config_ignore_workspace_root_check: "true",
+  };
+}
+
 function runDsh(args) {
   const result = spawnSync(process.platform === "win32" ? "dsh.cmd" : "dsh", args, {
     stdio: "inherit",
     shell: process.platform === "win32",
+    env: dshEnv(),
   });
   if (result.error) throw result.error;
   if (result.status !== 0) throw new Error(`dsh ${args.join(" ")} 执行失败（退出码 ${result.status}）`);
 }
 
+function writeYamlDocument(file, document) {
+  const temporary = join(dirname(file), `.codebuddy-${process.pid}.tmp`);
+  writeFileSync(temporary, String(document), "utf8");
+  renameSync(temporary, file);
+}
+
+function withPnpmBuildPolicy(file, action) {
+  const document = parseDocument(readFileSync(file, "utf8"));
+  if (document.errors.length) throw new Error(`无法解析 ${file}：${document.errors[0].message}`);
+  const changes = [];
+  for (const packageName of IGNORED_BUILDS) {
+    const path = ["allowBuilds", packageName];
+    if (typeof document.getIn(path) !== "boolean") {
+      changes.push({ packageName, existed: document.hasIn(path), value: document.getIn(path) });
+      document.setIn(path, false);
+    }
+  }
+  if (changes.length) writeYamlDocument(file, document);
+  try {
+    return action();
+  } finally {
+    if (changes.length) {
+      const current = parseDocument(readFileSync(file, "utf8"));
+      for (const change of changes) {
+        const path = ["allowBuilds", change.packageName];
+        if (change.existed) current.setIn(path, change.value);
+        else current.deleteIn(path);
+      }
+      if (current.getIn(["allowBuilds"])?.items?.length === 0) current.deleteIn(["allowBuilds"]);
+      writeYamlDocument(file, current);
+    }
+  }
+}
+
+function cleanPnpmWorkspace(file) {
+  if (!existsSync(file)) return;
+  const document = parseDocument(readFileSync(file, "utf8"));
+  if (document.errors.length) throw new Error(`无法解析 ${file}：${document.errors[0].message}`);
+  const entries = document.getIn(["minimumReleaseAgeExclude"])?.items;
+  if (!entries) return;
+  const remaining = entries.map((entry) => entry.value).filter((entry) => !String(entry).startsWith(`${PACKAGE}@`));
+  if (remaining.length === entries.length) return;
+  if (remaining.length) document.setIn(["minimumReleaseAgeExclude"], remaining);
+  else document.deleteIn(["minimumReleaseAgeExclude"]);
+  writeYamlDocument(file, document);
+}
+
 function cleanSettings(file) {
   if (!existsSync(file)) return undefined;
   const source = readFileSync(file, "utf8");
@@ -48,7 +110,9 @@ function cleanSettings(file) {
 
 function install() {
   for (const profile of ["web", "headless"]) {
-    runDsh(["plugin", "--profile", profile, "add", `${PACKAGE}@latest`]);
+    runDsh(["plugin", "--profile", profile, "list", "--depth", "0"]);
+    const workspace = join(dshHome(), "profiles", profile, "pnpm-workspace.yaml");
+    withPnpmBuildPolicy(workspace, () => runDsh(["plugin", "--profile", profile, "add", `${PACKAGE}@latest`]));
   }
   console.log("CodeBuddy Provider 已安装。请重启 DSH 后进行配置。");
 }
@@ -56,7 +120,11 @@ function install() {
 function uninstall(home = dshHome()) {
   const backup = cleanSettings(join(home, "settings.yaml"));
   for (const profile of ["web", "headless"]) {
-    if (profileHasPlugin(home, profile)) runDsh(["plugin", "--profile", profile, "remove", PACKAGE]);
+    const workspace = join(home, "profiles", profile, "pnpm-workspace.yaml");
+    if (profileHasPlugin(home, profile)) {
+      withPnpmBuildPolicy(workspace, () => runDsh(["plugin", "--profile", profile, "remove", PACKAGE]));
+    }
+    cleanPnpmWorkspace(workspace);
   }
   console.log(backup ? `CodeBuddy 配置已清理，备份：${backup}` : "未发现 CodeBuddy Provider 配置。");
   console.log("插件已卸载，API Key 凭据保持不变。请重启 DSH。");
@@ -72,6 +140,27 @@ function selfTest() {
     if (!backup || !existsSync(backup) || result.hasIn(PROVIDER_PATH) || !result.hasIn(["llm-pi-ai", "providers", "opencode-go"])) {
       throw new Error("uninstall settings cleanup self-test failed");
     }
+    const workspace = join(root, "pnpm-workspace.yaml");
+    writeFileSync(workspace, "packages:\n  - .\nallowBuilds:\n  '@google/genai': true\n  protobufjs: pending\n", "utf8");
+    withPnpmBuildPolicy(workspace, () => {
+      const active = parseDocument(readFileSync(workspace, "utf8"));
+      if (active.getIn(["allowBuilds", "@google/genai"]) !== true || active.getIn(["allowBuilds", "protobufjs"]) !== false) {
+        throw new Error("pnpm build policy activation self-test failed");
+      }
+    });
+    const restored = parseDocument(readFileSync(workspace, "utf8"));
+    if (restored.getIn(["allowBuilds", "@google/genai"]) !== true || restored.getIn(["allowBuilds", "protobufjs"]) !== "pending") {
+      throw new Error("pnpm build policy self-test failed");
+    }
+    restored.setIn(["minimumReleaseAgeExclude"], ["other@1.0.0", `${PACKAGE}@1.3.1`]);
+    writeYamlDocument(workspace, restored);
+    cleanPnpmWorkspace(workspace);
+    const cleaned = parseDocument(readFileSync(workspace, "utf8")).getIn(["minimumReleaseAgeExclude"])?.items?.map((entry) => entry.value);
+    if (cleaned?.join(",") !== "other@1.0.0") throw new Error("pnpm workspace cleanup self-test failed");
+    const pathKey = Object.keys(process.env).find((key) => key.toLowerCase() === "path") || "PATH";
+    if (!dshEnv()[pathKey].split(delimiter)[0].endsWith(join("node_modules", ".bin"))) {
+      throw new Error("bundled pnpm PATH self-test failed");
+    }
     console.log("CLI-SELF-TEST-OK");
   } finally {
     rmSync(root, { recursive: true, force: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-llm-codebuddy",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "使用 WorkBuddy API Key 为 DeepSeek Harness 接入 CodeBuddy 模型",
   "author": "Axiaohungry",
   "keywords": [
@@ -49,7 +49,8 @@
     "@deepseek-ai/dsh-llm-pi-ai": "0.1.0-rc.6",
     "@deepseek-ai/dsh-settings": "0.1.0-rc.6",
     "@earendil-works/pi-ai": "0.82.1",
-    "yaml": "2.8.1"
+    "pnpm": "11.19.0",
+    "yaml": "2.9.0"
   },
   "engines": {
     "node": ">=22.19.0"