@dsh-workbench/adapter-probe 1.1.14-beta.0 → 1.1.14-beta.1

package/dist/install.js

@@ -1,10 +1,13 @@
 import { existsSync } from 'node:fs';
 import { isolatedInstallCommand, isolatedPnpmInstallCommand } from '@dsh-workbench/adapter-runtime';
-import { desktopPnpmPath } from './toolchain.js';
+import { desktopPnpmPath, desktopPnpmVersion } from './toolchain.js';
 export function opencliInstallCommand(proc = process, exists = existsSync) {
     const override = process.env.DSH_WB_PNPM?.trim();
     if (override !== undefined && override !== '')
         return isolatedInstallCommand();
     const pnpm = desktopPnpmPath(proc, exists);
-    return pnpm === undefined ? isolatedInstallCommand() : isolatedPnpmInstallCommand(pnpm);
+    const major = Number(desktopPnpmVersion(proc, exists)?.split('.')[0] ?? '0');
+    return pnpm === undefined || (major !== 0 && major < 10)
+        ? isolatedInstallCommand()
+        : isolatedPnpmInstallCommand(pnpm);
 }

package/dist/runtime-seed.js

@@ -5,7 +5,7 @@ import writeFileAtomic from 'write-file-atomic';
 import { chmodSync, closeSync, mkdirSync, openSync, readFileSync, rmSync, } from 'node:fs';
 import { delimiter, dirname, join, sep } from 'node:path';
 import { quoteShellArg, quoteShellArgFor } from '@dsh-workbench/shared/host';
-import { desktopPnpmPath, desktopPnpmVersion, ensureToolchain, localNpmCache, provisionLocalPnpmSync } from './toolchain.js';
+import { desktopPnpmPath, desktopPnpmVersion, ensureToolchain, localNpmCache, localPnpmCommand, provisionLocalPnpmSync, } from './toolchain.js';
 export function opencliBinName(platform = process.platform) {
     return platform === 'win32' ? 'opencli.cmd' : 'opencli';
 }
@@ -126,13 +126,14 @@ export function prependPath(entryDir, env = process.env) {
 }
 export function seedWorkbenchToolchain(root, log) {
     const bundledPnpm = desktopPnpmPath();
-    const bundledVersion = desktopPnpmVersion()?.split('.')[0];
-    if (bundledPnpm !== undefined && bundledVersion === '10') {
+    const bundledMajor = Number(desktopPnpmVersion()?.split('.')[0] ?? '0');
+    const bundledUsable = bundledPnpm !== undefined && bundledMajor >= 10;
+    if (bundledPnpm !== undefined && bundledUsable) {
         process.env.DSH_WB_PNPM = `node ${quoteShellArgFor(bundledPnpm, process.platform)}`;
         log(`pnpm 用 Desktop 自带的：${bundledPnpm}`);
     }
     else if (bundledPnpm !== undefined) {
-        log(`Desktop 自带 pnpm 版本不是 10，优先用 PATH 上的 pnpm`);
+        log(`Desktop 自带 pnpm 版本低于 10，优先用 PATH 上的 pnpm`);
     }
     const toolchain = ensureToolchain({ root, log });
     for (const file of toolchain.files)
@@ -150,12 +151,15 @@ export function seedWorkbenchToolchain(root, log) {
     if (toolchain.pnpmDir !== undefined) {
         if (prependPath(toolchain.pnpmDir))
             log(`PATH 前插 ${toolchain.pnpmDir}`);
+        if (!bundledUsable)
+            process.env.DSH_WB_PNPM = localPnpmCommand(root);
     }
-    else if (toolchain.pathDir !== undefined) {
+    else if (!bundledUsable && toolchain.pathDir !== undefined) {
         const installed = provisionLocalPnpmSync({ root });
         if (installed.ok && installed.binDir !== undefined) {
             if (prependPath(installed.binDir))
                 log(`PATH 前插 ${installed.binDir}`);
+            process.env.DSH_WB_PNPM = localPnpmCommand(root);
             log(`工具链 provision ${installed.detail}`);
         }
         else {

package/dist/toolchain-probe.js

@@ -15,7 +15,7 @@ async function toolVersion(shell, line) {
 export async function probeDesktopToolchain(shell) {
     const bundledPnpm = desktopPnpmPath();
     const bundledMajor = desktopPnpmVersion()?.split('.')[0];
-    const preferBundled = bundledPnpm !== undefined && bundledMajor === '10';
+    const preferBundled = bundledPnpm !== undefined && Number(bundledMajor ?? '0') >= 10;
     const pnpmLine = preferBundled
         ? `node ${quoteShellArg(bundledPnpm ?? '')} --version`
         : 'pnpm --version';
@@ -36,8 +36,8 @@ export async function probeDesktopToolchain(shell) {
     }
     const nodeMissing = !node.ok;
     const npmMissing = !npm.ok;
-    const pnpmMajor = /^v?(\d+)/.exec(pnpm.text)?.[1];
-    const pnpmProblem = !pnpm.ok || pnpmMajor !== '10';
+    const pnpmMajor = Number(/^v?(\d+)/.exec(pnpm.text)?.[1] ?? '0');
+    const pnpmProblem = !pnpm.ok || pnpmMajor < 10;
     const desktop = hostSurface({ proc: process }).deployment === 'desktop';
     const parts = [
         nodeMissing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/adapter-probe",
-  "version": "1.1.14-beta.0",
+  "version": "1.1.14-beta.1",
   "description": "Workbench adapter-probe adapter.",
   "type": "module",
   "exports": {
@@ -16,10 +16,10 @@
     "execa": "^10.2.0",
     "proper-lockfile": "^4.1.2",
     "write-file-atomic": "^8.0.0",
-    "@dsh-workbench/adapter-profile": "1.1.14-beta.0",
-    "@dsh-workbench/adapter-runtime": "1.1.14-beta.0",
-    "@dsh-workbench/adapter-supply": "1.1.14-beta.0",
-    "@dsh-workbench/shared": "1.1.14-beta.0"
+    "@dsh-workbench/adapter-supply": "1.1.14-beta.1",
+    "@dsh-workbench/adapter-runtime": "1.1.14-beta.1",
+    "@dsh-workbench/shared": "1.1.14-beta.1",
+    "@dsh-workbench/adapter-profile": "1.1.14-beta.1"
   },
   "devDependencies": {
     "@types/node": "^24.19.0",