dsh-agentone 0.5.9 → 0.5.11

package/lib/index.js

@@ -328,11 +328,17 @@ const BUILTIN_PLUGIN_ALLOW_BUILD = {
   'dsh-im': [],
 };
 
-/** 安装：白名单校验后转发（desktop 受管 pnpm / 官方 CLI；参数数组，无 shell）。 */
+/** 安装：白名单校验后转发（desktop 受管 pnpm / 官方 CLI；参数数组，无 shell）。
+ * pnpm 11 在 profile 存在被忽略的构建脚本时 add 以 ERR_PNPM_IGNORED_BUILDS
+ * 非零退出，但包本身已装上（先装后报）——以落盘为准，装上即成功。 */
 async function installProfilePlugin(config, name, version) {
   assertValidPackage(name, version);
   const target = version ? `${name}@${version}` : name;
-  await runPluginCli(['add', target, ...(BUILTIN_PLUGIN_ALLOW_BUILD[name] || [])]);
+  try {
+    await runPluginCli(['add', target, ...(BUILTIN_PLUGIN_ALLOW_BUILD[name] || [])]);
+  } catch (error) {
+    if ((await installedVersion(pluginProfileDir(config), name)) === null) throw error;
+  }
   return listProfilePlugins(config);
 }
 
@@ -377,7 +383,12 @@ async function upgradeProfilePlugin(config, name) {
   if (latest === current || (current && compareSemver(latest, current) <= 0)) {
     throw new Error(`已是最新版本（v${current ?? latest}）`);
   }
-  await runPluginCli(['add', `${name}@${latest}`, ...(BUILTIN_PLUGIN_ALLOW_BUILD[name] || [])]);
+  try {
+    await runPluginCli(['add', `${name}@${latest}`, ...(BUILTIN_PLUGIN_ALLOW_BUILD[name] || [])]);
+  } catch (error) {
+    // 同 install：ERR_PNPM_IGNORED_BUILDS 非零退出但包已装上，不阻断升级
+    if ((await installedVersion(dir, name)) !== latest) throw error;
+  }
   const after = await installedVersion(dir, name);
   if (after !== latest) {
     // 兑现「插件已升级」提示的前置校验：没升上去就明说，不再假报成功

package/lib/proc.js

@@ -5,10 +5,66 @@
 // （execFile 参数数组、绝不经过 shell）与错误翻译；包名/版本白名单在
 // index.js 的调用侧执行。
 import { execFile } from 'node:child_process';
+import { existsSync, readdirSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join, dirname, delimiter as pathDelimiter } from 'node:path';
 import { promisify } from 'node:util';
 
 const execFileAsync = promisify(execFile);
 
+/** 常见安装目录兑底（环境 PATH 之外的补充）：GUI 启动的 DSH Desktop 继承
+ * launchd 的 PATH（/usr/bin:/bin:…），不含 nvm/homebrew/.local —— 实测
+ * 从 Dock 启动时 pnpm/lark-cli 全部 ENOENT，插件页 latest 查不到、CLI
+ * 全显示未安装。nvm 取最高 node 版本的 bin；结果进程内缓存。 */
+let extraBinDirsCache = null;
+function extraBinDirs() {
+  if (extraBinDirsCache !== null) return extraBinDirsCache;
+  const dirs = [];
+  const home = homedir();
+  try {
+    // nvm 目录名形如 v24.18.0，用 compareSemver 取最高版（compareSemver
+    // 在本文件后文定义，函数提升可用）
+    const versions = readdirSync(join(home, '.nvm/versions/node'))
+      .filter((v) => /^v?\d/.test(v))
+      .sort((a, b) => compareSemver(a.replace(/^v/, ''), b.replace(/^v/, '')));
+    if (versions.length) dirs.push(join(home, '.nvm/versions/node', versions[versions.length - 1], 'bin'));
+  } catch {
+    // 无 nvm（Windows/其他包管理器）：跳过，走后面的通用目录
+  }
+  dirs.push(join(home, '.local/bin'), '/opt/homebrew/bin', '/usr/local/bin');
+  extraBinDirsCache = dirs;
+  return dirs;
+}
+
+/** 命令解析：PATH 里找不到时从兑底目录解析绝对路径（找不到返回原名，
+ * 后续 ENOENT 走既有 missing/降级语义）。所有 execFile 调用统一过这里。 */
+export function resolveCommand(tool) {
+  const pathDirs = String(process.env.PATH || '').split(pathDelimiter).filter(Boolean);
+  const candidates = [];
+  for (const dir of [...pathDirs, ...extraBinDirs()]) {
+    candidates.push(join(dir, tool));
+    if (process.platform === 'win32') candidates.push(join(dir, `${tool}.exe`), join(dir, `${tool}.cmd`));
+  }
+  return candidates.find((p) => existsSync(p)) || tool;
+}
+
+/** 统一的子进程执行：解析命令路径，并把解析到的目录前置进子进程 PATH
+ * （pnpm/lark-cli 等是 `#!/usr/bin/env node` 脚本，宿主 PATH 贫瘠时
+ * 找得到脚本也找不到 node，必须连带注入）。opts.env 只传增量变量。 */
+function execResolved(tool, args, { timeoutMs, cwd, env } = {}) {
+  const resolved = resolveCommand(tool);
+  const childEnv = { ...process.env, ...(env || {}) };
+  if (resolved !== tool) {
+    childEnv.PATH = [dirname(resolved), childEnv.PATH || ''].filter(Boolean).join(pathDelimiter);
+  }
+  return execFileAsync(resolved, args, {
+    timeout: timeoutMs,
+    killSignal: 'SIGKILL',
+    cwd,
+    env: childEnv,
+  });
+}
+
 /** 从 pnpm 冗长输出里提取对用户有意义的错误行。 */
 function firstErrorLines(raw) {
   const lines = String(raw).split('\n').map((line) => line.trim()).filter(Boolean);
@@ -25,13 +81,12 @@ function firstErrorLines(raw) {
  * async 函数；execFile 不经过 shell，参数数组中的每个元素都是独立参数，
  * 不存在拼接解释执行。
  */
-export async function runCliTool(tool, args, { timeoutMs = 300000, cwd } = {}) {
+export async function runCliTool(tool, args, { timeoutMs = 300000, cwd, env } = {}) {
   try {
-    const { stdout, stderr } = await execFileAsync(tool, args, {
-      timeout: timeoutMs,
-      killSignal: 'SIGKILL',
-      env: process.env,
+    const { stdout, stderr } = await execResolved(tool, args, {
+      timeoutMs,
       cwd,
+      env,
     });
     return { stdout, stderr };
   } catch (error) {
@@ -147,10 +202,9 @@ export async function probeCliDetail(tool, { timeoutMs = 15000 } = {}) {
   let stdout;
   let state = 'unauthorized';
   try {
-    ({ stdout } = await execFileAsync(tool, ['auth', 'status'], {
-      timeout: timeoutMs,
-      killSignal: 'SIGKILL',
-      env: tool === 'ccpg-cli' ? { ...process.env, CCPG_FULL_CLI: '1' } : process.env,
+    ({ stdout } = await execResolved(tool, ['auth', 'status'], {
+      timeoutMs,
+      env: tool === 'ccpg-cli' ? { CCPG_FULL_CLI: '1' } : undefined,
     }));
   } catch (error) {
     if (error.code === 'ENOENT') return { state: 'missing', version: null, latest: null };
@@ -160,7 +214,7 @@ export async function probeCliDetail(tool, { timeoutMs = 15000 } = {}) {
   if (larkStyleAuthorized(stdout) || ccpgStyleAuthorized(stdout)) state = 'authorized';
 
   const [version, latest] = await Promise.all([
-    execFileAsync(tool, ['--version'], { timeout: 10_000, killSignal: 'SIGKILL' })
+    execResolved(tool, ['--version'], { timeoutMs: 10_000 })
       .then((r) => parseCliVersion(r.stdout))
       .catch(() => null),
     cliLatestVersion(tool, timeoutMs).catch(() => null),
@@ -171,20 +225,15 @@ export async function probeCliDetail(tool, { timeoutMs = 15000 } = {}) {
 /** 最新版查询：ccpg-cli 官方 check 接口；lark-cli 查 npm 包 dist-tag。 */
 async function cliLatestVersion(tool, timeoutMs) {
   if (tool === 'ccpg-cli') {
-    const { stdout } = await execFileAsync(
-      tool,
-      ['update', '--check', '--json'],
-      { timeout: timeoutMs, killSignal: 'SIGKILL', env: { ...process.env, CCPG_FULL_CLI: '1' } },
-    );
+    const { stdout } = await execResolved(tool, ['update', '--check', '--json'], {
+      timeoutMs,
+      env: { CCPG_FULL_CLI: '1' },
+    });
     const data = JSON.parse(String(stdout).trim());
     return typeof data?.latest_version === 'string' ? data.latest_version : null;
   }
   if (tool === 'lark-cli') {
-    const { stdout } = await execFileAsync(
-      'npm',
-      ['view', '@larksuite/cli', 'version'],
-      { timeout: timeoutMs, killSignal: 'SIGKILL' },
-    );
+    const { stdout } = await execResolved('npm', ['view', '@larksuite/cli', 'version'], { timeoutMs });
     return parseCliVersion(stdout);
   }
   return null;
@@ -198,7 +247,7 @@ async function cliLatestVersion(tool, timeoutMs) {
 export async function upgradeCliTool(tool, { timeoutMs = 300_000 } = {}) {
   const { stdout } = await runCliTool(tool, ['update'], {
     timeoutMs,
-    env: tool === 'ccpg-cli' ? { ...process.env, CCPG_FULL_CLI: '1' } : process.env,
+    env: tool === 'ccpg-cli' ? { CCPG_FULL_CLI: '1' } : undefined,
   });
   const lines = String(stdout).split('\n').map((l) => l.trim()).filter(Boolean);
   return lines.slice(-6).join('\n');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-agentone",
-  "version": "0.5.9",
+  "version": "0.5.11",
   "description": "AgentOne 平台集成插件：飞书登录、平台模型、SkillHub 技能、套餐申请、插件管理、lark-cli / ccpg-cli 探测（请求超时与错误码透传、令牌轮换 single-flight、凭据损坏容错、状态页 UX 增强）",
   "type": "module",
   "main": "lib/index.js",