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

package/dist/bridge-report.d.ts

@@ -0,0 +1,7 @@
+export type PreflightBridgeIssue = 'daemon' | 'extension' | 'profile' | 'stale' | 'unknown';
+export declare const BRIDGE_ISSUE_ORDER: readonly PreflightBridgeIssue[];
+export declare function readBridgeReport(stdout: string): {
+    readonly ok: boolean;
+    readonly issues: readonly PreflightBridgeIssue[];
+    readonly detail: string;
+};

package/dist/bridge-report.js

@@ -0,0 +1,32 @@
+import { tailLines } from '@dsh-workbench/shared/host';
+export const BRIDGE_ISSUE_ORDER = ['profile', 'stale', 'daemon', 'extension', 'unknown'];
+export function readBridgeReport(stdout) {
+    const text = String(stdout ?? '');
+    const ok = /^\[OK\] Daemon:/m.test(text) && /^\[OK\] Extension:/m.test(text) && /^\[OK\] Connectivity:/m.test(text);
+    if (ok) {
+        const good = text.split('\n').find((line) => line.trim() === 'Everything looks good!');
+        return { ok: true, issues: [], detail: good?.trim() ?? tailLines(text, 1) };
+    }
+    const found = new Set();
+    if (!/^\[OK\] Daemon:/m.test(text))
+        found.add('daemon');
+    if (!/^\[OK\] Extension:/m.test(text))
+        found.add('extension');
+    if (/Multiple Chrome profiles are connected/i.test(text))
+        found.add('profile');
+    if (/Default browser profile is stale|Selected browser profile is not connected/i.test(text)) {
+        found.add('stale');
+    }
+    if (found.has('profile') || found.has('stale'))
+        found.delete('extension');
+    if (found.size === 0)
+        found.add('unknown');
+    return { ok: false, issues: BRIDGE_ISSUE_ORDER.filter((issue) => found.has(issue)), detail: issuesSection(text) };
+}
+function issuesSection(text) {
+    const lines = text.split('\n');
+    const start = lines.findIndex((line) => /^Issues:/.test(line.trim()));
+    if (start < 0)
+        return tailLines(text, 6);
+    return lines.slice(start).join('\n').trim();
+}

package/dist/install.js

@@ -1,7 +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/preflight-route.js

@@ -8,7 +8,7 @@ import { probeDesktopToolchain } from './toolchain-probe.js';
 import { createDesktopBrowser } from './browser-wake.js';
 import { profileDirOf } from '@dsh-workbench/adapter-supply';
 import { prependPath, runtimeSeedRootOf } from './runtime-seed.js';
-import { localNpmCache, provisionLocalNpm, provisionLocalPnpm } from './toolchain.js';
+import { localPnpmCommand, provisionLocalPnpm } from './toolchain.js';
 function desktopBrowserOf(input) {
     const dir = profileDirOf(input.ctx);
     const surface = hostSurface({ profile: dir === null ? undefined : basename(dir) });
@@ -30,8 +30,6 @@ export function registerPreflight(input) {
             shell: input.shell,
             command,
         });
-    const profileDir = profileDirOf(input.ctx);
-    const surface = hostSurface({ profile: profileDir === null ? undefined : basename(profileDir) });
     const preflight = createPreflight({
         shell: input.shell,
         command,
@@ -42,51 +40,29 @@ export function registerPreflight(input) {
         ...(input.runtimeCheck === undefined ? {} : { runtimeCheck: input.runtimeCheck }),
         ...(input.runtimeLabel === undefined ? {} : { runtimeLabel: input.runtimeLabel }),
         probeDiy: createDiyPresetProbe(input.ctx),
-        ...(surface.deployment === 'desktop'
-            ? {
-                probeToolchain: () => probeDesktopToolchain(input.shell),
-                provisionNpm: async () => {
-                    const root = runtimeSeedRootOf(input.ctx);
-                    if (root === null)
-                        return { ok: false, detail: '找不到工作台根' };
-                    const result = await provisionLocalNpm({
-                        root,
-                        run: async (command) => {
-                            const ran = await runShell(input.shell, command, { timeoutMs: INSTALL_TIMEOUT_MS });
-                            return {
-                                ok: ran.exitCode === 0 && !ran.timedOut,
-                                detail: tailLines(ran.stderr || ran.stdout, 3),
-                            };
-                        },
-                    });
-                    if (result.ok && result.binDir !== undefined) {
-                        prependPath(result.binDir);
-                        if (process.env.npm_config_cache === undefined) {
-                            process.env.npm_config_cache = localNpmCache(root);
-                        }
-                    }
-                    return result;
-                },
-                provisionPnpm: async () => {
-                    const root = runtimeSeedRootOf(input.ctx);
-                    if (root === null)
-                        return { ok: false, detail: '找不到工作台根' };
-                    const result = await provisionLocalPnpm({
-                        root,
-                        run: async (command) => {
-                            const ran = await runShell(input.shell, command, { timeoutMs: INSTALL_TIMEOUT_MS });
-                            return {
-                                ok: ran.exitCode === 0 && !ran.timedOut,
-                                detail: tailLines(ran.stderr || ran.stdout, 3),
-                            };
-                        },
-                    });
-                    if (result.ok && result.binDir !== undefined)
-                        prependPath(result.binDir);
-                    return result;
+        probeToolchain: () => probeDesktopToolchain(input.shell),
+        provisionPnpm: async () => {
+            const root = runtimeSeedRootOf(input.ctx);
+            if (root === null)
+                return { ok: false, detail: '找不到工作台根' };
+            const result = await provisionLocalPnpm({
+                root,
+                pnpm: process.env.DSH_WB_PNPM?.trim() || 'pnpm',
+                npm: 'npm',
+                run: async (command) => {
+                    const ran = await runShell(input.shell, command, { timeoutMs: INSTALL_TIMEOUT_MS });
+                    return {
+                        ok: ran.exitCode === 0 && !ran.timedOut,
+                        detail: tailLines(ran.stderr || ran.stdout, 3),
+                    };
                 },
+            });
+            if (result.ok && result.binDir !== undefined) {
+                prependPath(result.binDir);
+                process.env.DSH_WB_PNPM = localPnpmCommand(root);
             }
-            : {}),
+            return result;
+        },
         ...(desktopBrowser === undefined ? {} : { desktopBrowser }),
     });
     input.routes.preflight = preflightHandler(preflight);

package/dist/preflight.d.ts

@@ -14,14 +14,11 @@ export interface PreflightStep {
     readonly detail?: string;
     readonly action?: string;
     readonly command?: string;
+    readonly log?: readonly string[];
 }
-export type PreflightBridgeIssue = 'daemon' | 'extension' | 'profile' | 'stale' | 'unknown';
-export declare const BRIDGE_ISSUE_ORDER: readonly PreflightBridgeIssue[];
-export declare function readBridgeReport(stdout: string): {
-    readonly ok: boolean;
-    readonly issues: readonly PreflightBridgeIssue[];
-    readonly detail: string;
-};
+import { type PreflightBridgeIssue } from './bridge-report.js';
+export { BRIDGE_ISSUE_ORDER, readBridgeReport } from './bridge-report.js';
+export type { PreflightBridgeIssue } from './bridge-report.js';
 export interface PreflightDiyGap {
     readonly rows: readonly string[];
     readonly detail: string;
@@ -37,6 +34,7 @@ export interface PreflightSnapshot {
     readonly bridgeIssues?: readonly PreflightBridgeIssue[];
     readonly diyGap?: PreflightDiyGap;
     readonly canWakeBrowser?: boolean;
+    readonly log?: readonly string[];
 }
 export interface Preflight {
     run(options?: {

package/dist/preflight.js

@@ -4,7 +4,7 @@ import { opencliCommandLine } from '@dsh-workbench/adapter-runtime';
 import { runShell } from '@dsh-workbench/shared/host';
 import { DIY_UPGRADE_COMMAND } from './diy-preset-health.js';
 import { opencliInstallCommand } from './install.js';
-import { LOCAL_NPM_VERSION, LOCAL_PNPM_VERSION } from './toolchain.js';
+import { LOCAL_PNPM_VERSION } from './toolchain.js';
 import { bridgeFixCommand } from './browser-wake.js';
 export function classifyFailure(text) {
     const lower = text.toLowerCase();
@@ -16,37 +16,8 @@ export function classifyFailure(text) {
         return 'missing';
     return 'unknown';
 }
-export const BRIDGE_ISSUE_ORDER = ['profile', 'stale', 'daemon', 'extension', 'unknown'];
-export function readBridgeReport(stdout) {
-    const text = String(stdout ?? '');
-    const ok = /^\[OK\] Daemon:/m.test(text) && /^\[OK\] Extension:/m.test(text) && /^\[OK\] Connectivity:/m.test(text);
-    if (ok) {
-        const good = text.split('\n').find((line) => line.trim() === 'Everything looks good!');
-        return { ok: true, issues: [], detail: good?.trim() ?? tailLines(text, 1) };
-    }
-    const found = new Set();
-    if (!/^\[OK\] Daemon:/m.test(text))
-        found.add('daemon');
-    if (!/^\[OK\] Extension:/m.test(text))
-        found.add('extension');
-    if (/Multiple Chrome profiles are connected/i.test(text))
-        found.add('profile');
-    if (/Default browser profile is stale|Selected browser profile is not connected/i.test(text)) {
-        found.add('stale');
-    }
-    if (found.has('profile') || found.has('stale'))
-        found.delete('extension');
-    if (found.size === 0)
-        found.add('unknown');
-    return { ok: false, issues: BRIDGE_ISSUE_ORDER.filter((issue) => found.has(issue)), detail: issuesSection(text) };
-}
-function issuesSection(text) {
-    const lines = text.split('\n');
-    const start = lines.findIndex((line) => /^Issues:/.test(line.trim()));
-    if (start < 0)
-        return tailLines(text, 6);
-    return lines.slice(start).join('\n').trim();
-}
+import { readBridgeReport } from './bridge-report.js';
+export { BRIDGE_ISSUE_ORDER, readBridgeReport } from './bridge-report.js';
 export function opencliInstallCommandDefault() {
     return opencliInstallCommand();
 }
@@ -72,16 +43,37 @@ export function createPreflight(options) {
         ...(options.probeDiy === undefined ? [] : [step('diy')]),
         ...(warmReads().length === 0 ? [] : [step('warm')]),
     ];
+    let logLines = [];
+    const stepLogs = new Map();
+    function appendLog(stepId, text) {
+        const stepLines = stepLogs.get(stepId) ?? [];
+        for (const line of String(text).split('\n')) {
+            if (line.trim() === '')
+                continue;
+            const clipped = line.length > 400 ? `${line.slice(0, 400)}…` : line;
+            stepLines.push(clipped);
+            logLines.push(clipped);
+        }
+        if (stepLines.length > 200)
+            stepLines.splice(0, stepLines.length - 200);
+        if (logLines.length > 200)
+            logLines = logLines.slice(-200);
+        stepLogs.set(stepId, stepLines);
+        set({
+            steps: current.steps.map((item) => item.id === stepId ? { ...item, log: [...stepLines] } : item),
+        });
+    }
     let current = {
         phase: 'idle',
         steps: steps(),
         at: Date.now(),
+        log: [],
         ...(options.desktopBrowser === undefined ? {} : { canWakeBrowser: true }),
     };
     let running = null;
     let shellStalled = false;
     function set(next) {
-        current = { ...current, ...next, at: Date.now() };
+        current = { ...current, ...next, log: [...logLines], at: Date.now() };
         return current;
     }
     function patchStep(id, patch) {
@@ -90,30 +82,37 @@ export function createPreflight(options) {
     function hostFailure(detail) {
         return set({ phase: 'failed', error: detail, failure: 'host', guidance: 'host' });
     }
-    async function exec(commandLine, timeoutMs) {
+    async function exec(stepId, commandLine, timeoutMs) {
         if (shellStalled) {
             return { kind: 'stalled', detail: `前一条命令就没交回结果，这一步没跑：${commandLine}` };
         }
+        appendLog(stepId, `> ${commandLine}`);
         try {
             const result = await runShell(shell, commandLine, { timeoutMs });
             if (result.stalled) {
                 shellStalled = true;
+                appendLog(stepId, `没返回：${commandLine}`);
                 return { kind: 'stalled', detail: `没有返回（宿主没把结果交回来）：${commandLine}` };
             }
             if (result.timedOut) {
+                appendLog(stepId, `超时（${String(timeoutMs)} ms）：${commandLine}`);
                 return { kind: 'error', detail: `超时（${String(timeoutMs)} ms）：${commandLine}` };
             }
+            const output = result.stdout || result.stderr;
+            if (output.trim() !== '')
+                appendLog(stepId, tailLines(output, 12));
             if (result.exitCode !== 0) {
                 return { kind: 'nonzero', detail: tailLines(result.stderr || result.stdout, 4) };
             }
             return { kind: 'ok', stdout: result.stdout };
         }
         catch (error) {
+            appendLog(stepId, String(error));
             return { kind: 'error', detail: String(error) };
         }
     }
     async function probeVersion() {
-        const result = await exec(`${command} --version`, PREFLIGHT_VERSION_TIMEOUT_MS);
+        const result = await exec('cli', `${command} --version`, PREFLIGHT_VERSION_TIMEOUT_MS);
         if (result.kind === 'ok') {
             return { ok: true, missing: false, detail: result.stdout.trim().split('\n')[0] ?? '', stalled: false };
         }
@@ -125,7 +124,7 @@ export function createPreflight(options) {
         };
     }
     async function probeBridge() {
-        const result = await exec(`${command} doctor`, OPENCLI_TIMEOUT_MS);
+        const result = await exec('bridge', `${command} doctor`, OPENCLI_TIMEOUT_MS);
         if (result.kind === 'stalled') {
             return { ok: false, detail: result.detail, issues: ['unknown'], stalled: true };
         }
@@ -137,9 +136,14 @@ export function createPreflight(options) {
         return { ...report, command: bridgeFixCommand(command, report.issues) };
     }
     async function installOpencli() {
-        if (options.install !== undefined)
-            return options.install();
-        const result = await exec(installCommand, INSTALL_TIMEOUT_MS);
+        if (options.install !== undefined) {
+            appendLog('cli', '> 安装 opencli');
+            const installed = await options.install();
+            if (installed.detail.trim() !== '')
+                appendLog('cli', installed.detail);
+            return installed;
+        }
+        const result = await exec('cli', installCommand, INSTALL_TIMEOUT_MS);
         if (result.kind !== 'ok')
             return { ok: false, detail: result.detail };
         return { ok: true, detail: tailLines(result.stdout, 1) };
@@ -154,9 +158,9 @@ export function createPreflight(options) {
         }
         patchStep('warm', {
             status: 'running',
-            action: `${command} <套件自己声明的那条读命令> --site-session persistent -f json`,
+            action: '预热浏览器站点',
         });
-        const results = await Promise.all(reads.map((read) => exec(opencliCommandLine(command, read), WARM_TIMEOUT_MS)));
+        const results = await Promise.all(reads.map((read) => exec('warm', opencliCommandLine(command, read), WARM_TIMEOUT_MS)));
         const failed = reads.filter((_, index) => results[index]?.kind !== 'ok');
         patchStep('warm', {
             status: failed.length === 0 ? 'ok' : 'warn',
@@ -191,6 +195,8 @@ export function createPreflight(options) {
     }
     async function doRun() {
         shellStalled = false;
+        logLines = [];
+        stepLogs.clear();
         set({
             phase: 'checking',
             error: undefined,
@@ -214,29 +220,18 @@ export function createPreflight(options) {
                 pnpmProblem: true,
                 stalled: false,
             }));
-        if (toolchain !== undefined && toolchain.ok && toolchain.npmMissing && options.provisionNpm !== undefined) {
-            set({ phase: 'installing' });
-            patchStep('toolchain', { status: 'running', action: `装本地 npm@${LOCAL_NPM_VERSION}` });
-            const provisioned = await options.provisionNpm().catch((error) => ({
-                ok: false,
-                detail: String(error),
-            }));
-            if (provisioned.ok) {
-                const reprobed = await options.probeToolchain?.();
-                if (reprobed !== undefined)
-                    toolchain = reprobed;
-            }
-            else {
-                toolchain = { ...toolchain, detail: `${toolchain.detail}；本地 npm 没装成：${provisioned.detail}` };
-            }
-        }
+        if (toolchain !== undefined && toolchain.detail.trim() !== '')
+            appendLog('toolchain', toolchain.detail);
         if (toolchain !== undefined && toolchain.ok && toolchain.pnpmProblem && options.provisionPnpm !== undefined) {
             set({ phase: 'installing' });
             patchStep('toolchain', { status: 'running', action: `装本地 pnpm@${LOCAL_PNPM_VERSION}` });
+            appendLog('toolchain', '> 安装本地 pnpm');
             const provisioned = await options.provisionPnpm().catch((error) => ({
                 ok: false,
                 detail: String(error),
             }));
+            if (provisioned.detail.trim() !== '')
+                appendLog('toolchain', provisioned.detail);
             if (provisioned.ok) {
                 const reprobed = await options.probeToolchain?.();
                 if (reprobed !== undefined)
@@ -249,29 +244,32 @@ export function createPreflight(options) {
         if (toolchain !== undefined) {
             set({ phase: 'checking' });
             patchStep('toolchain', {
-                status: toolchain.ok ? (toolchain.npmMissing || toolchain.pnpmProblem ? 'warn' : 'ok') : 'failed',
+                status: toolchain.ok && !toolchain.pnpmProblem ? 'ok' : 'failed',
                 detail: toolchain.detail,
                 action: undefined,
             });
-            if (!toolchain.ok) {
+            if (!toolchain.ok || toolchain.pnpmProblem) {
                 return toolchain.stalled === true
                     ? hostFailure(toolchain.detail)
                     : set({ phase: 'failed', error: toolchain.detail, failure: 'missing', guidance: 'install' });
             }
         }
         if (options.runtimeCheck !== undefined) {
+            appendLog('runtime', '> 检查运行环境');
             patchStep('runtime', { status: 'running' });
             const verdict = await options.runtimeCheck().catch((error) => ({
                 ok: false,
                 detail: error instanceof Error ? error.message : String(error),
             }));
+            if (verdict.detail.trim() !== '')
+                appendLog('runtime', verdict.detail);
             patchStep('runtime', { status: verdict.ok ? 'ok' : 'failed', detail: verdict.detail, action: undefined });
             if (!verdict.ok)
                 return set({ phase: 'failed', error: verdict.detail, failure: 'missing', guidance: 'install' });
         }
         const diyStarted = options.probeDiy?.();
         if (withConsole) {
-            patchStep('cli', { status: 'running', action: `${command} --version` });
+            patchStep('cli', { status: 'running', action: '检查 opencli 版本' });
             if (diyStarted !== undefined)
                 patchStep('diy', { status: 'running' });
             let version = await probeVersion();
@@ -299,7 +297,7 @@ export function createPreflight(options) {
                     });
                 }
                 set({ phase: 'installing' });
-                patchStep('cli', { status: 'running', action: installCommand, command: installCommand });
+                patchStep('cli', { status: 'running', action: '安装 opencli', command: installCommand });
                 const installed = await installOpencli();
                 if (!installed.ok) {
                     patchStep('cli', {
@@ -314,7 +312,7 @@ export function createPreflight(options) {
                         guidance: 'install',
                     });
                 }
-                patchStep('cli', { status: 'running', action: `${command} --version` });
+                patchStep('cli', { status: 'running', action: '检查 opencli 版本' });
                 version = await probeVersion();
                 if (version.stalled) {
                     patchStep('cli', { status: 'failed', detail: version.detail, action: undefined });
@@ -332,7 +330,7 @@ export function createPreflight(options) {
             }
             patchStep('cli', { status: 'ok', detail: version.detail, action: undefined });
         }
-        patchStep('bridge', { status: 'running', action: `${command} doctor` });
+        patchStep('bridge', { status: 'running', action: '检查浏览器通道' });
         const bridge = withBridge ? await probeBridge() : { ok: true, detail: '', issues: [] };
         if (bridge.stalled === true) {
             patchStep('bridge', { status: 'failed', detail: bridge.detail, action: undefined });

package/dist/runtime-seed.js

@@ -4,8 +4,8 @@ import { createRequire } from 'node:module';
 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 } from '@dsh-workbench/shared/host';
-import { ensureToolchain, localNpmCache, provisionLocalPnpmSync } from './toolchain.js';
+import { quoteShellArg, quoteShellArgFor } from '@dsh-workbench/shared/host';
+import { desktopPnpmPath, desktopPnpmVersion, ensureToolchain, localNpmCache, localPnpmCommand, provisionLocalPnpmSync, } from './toolchain.js';
 export function opencliBinName(platform = process.platform) {
     return platform === 'win32' ? 'opencli.cmd' : 'opencli';
 }
@@ -125,6 +125,16 @@ export function prependPath(entryDir, env = process.env) {
     return true;
 }
 export function seedWorkbenchToolchain(root, log) {
+    const bundledPnpm = desktopPnpmPath();
+    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`);
+    }
     const toolchain = ensureToolchain({ root, log });
     for (const file of toolchain.files)
         log(`工具链写下 ${file}`);
@@ -141,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

@@ -1,5 +1,7 @@
 import { runShell } from '@dsh-workbench/shared/host';
-import { desktopPnpmPath } from './toolchain.js';
+import { quoteShellArg } from '@dsh-workbench/shared/host';
+import { desktopPnpmPath, desktopPnpmVersion } from './toolchain.js';
+import { hostSurface } from './platform.js';
 async function toolVersion(shell, line) {
     try {
         const result = await runShell(shell, line, { timeoutMs: 10_000 });
@@ -11,10 +13,16 @@ async function toolVersion(shell, line) {
     }
 }
 export async function probeDesktopToolchain(shell) {
+    const bundledPnpm = desktopPnpmPath();
+    const bundledMajor = desktopPnpmVersion()?.split('.')[0];
+    const preferBundled = bundledPnpm !== undefined && Number(bundledMajor ?? '0') >= 10;
+    const pnpmLine = preferBundled
+        ? `node ${quoteShellArg(bundledPnpm ?? '')} --version`
+        : 'pnpm --version';
     const [node, npm, pnpm] = await Promise.all([
         toolVersion(shell, 'node --version'),
         toolVersion(shell, 'npm --version'),
-        toolVersion(shell, 'pnpm --version'),
+        toolVersion(shell, pnpmLine),
     ]);
     if (node.stalled || npm.stalled || pnpm.stalled) {
         return {
@@ -28,21 +36,25 @@ export async function probeDesktopToolchain(shell) {
     }
     const nodeMissing = !node.ok;
     const npmMissing = !npm.ok;
-    const hasBundledPnpm = desktopPnpmPath() !== undefined;
-    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 ? 'node 不在 PATH（Desktop 自带 Node 的 shim 没生效）' : `node ${node.text}（Desktop 自带）`,
-        npmMissing
-            ? hasBundledPnpm
-                ? 'npm 缺（opencli 安装走 pnpm；插件安装/模块库仍需 npm）'
-                : 'npm 缺（装不了 opencli：bundled pnpm 也没找到）'
-            : `npm ${npm.text}`,
+        nodeMissing
+            ? desktop
+                ? 'node 不在 PATH（Desktop 自带 Node 的 shim 没生效）'
+                : 'node 不在 PATH'
+            : desktop
+                ? `node ${node.text}（Desktop 自带）`
+                : `node ${node.text}`,
+        npmMissing ? 'npm 缺（已改用 pnpm）' : `npm ${npm.text}`,
         pnpmProblem
             ? pnpm.ok
                 ? `pnpm ${pnpm.text}（工坊按 10 方言）`
-                : 'pnpm 缺（只影响工坊 build/install）'
-            : `pnpm ${pnpm.text}`,
+                : 'pnpm 缺（装不了 opencli/插件/模块库）'
+            : preferBundled
+                ? `pnpm ${pnpm.text}（Desktop 自带）`
+                : `pnpm ${pnpm.text}`,
     ];
     return { ok: !nodeMissing, detail: parts.join(' · '), nodeMissing, npmMissing, pnpmProblem };
 }

package/dist/toolchain.d.ts

@@ -14,6 +14,7 @@ export interface PnpmProcess {
     readonly resourcesPath?: string | undefined;
 }
 export declare function desktopPnpmPath(proc?: PnpmProcess, exists?: (path: string) => boolean): string | undefined;
+export declare function desktopPnpmVersion(proc?: PnpmProcess, exists?: (path: string) => boolean): string | undefined;
 export interface ToolchainOptions {
     readonly root: string;
     readonly proc?: ToolchainProcess | undefined;
@@ -68,6 +69,8 @@ export declare function provisionLocalPnpm(options: {
     readonly platform?: NodeJS.Platform | undefined;
     readonly proc?: PnpmProcess | undefined;
     readonly exists?: ((path: string) => boolean) | undefined;
+    readonly pnpm?: string | undefined;
+    readonly npm?: string | undefined;
 }): Promise<LocalPnpmProvision>;
 export declare function provisionLocalPnpmSync(options: {
     readonly root: string;

package/dist/toolchain.js

@@ -14,6 +14,23 @@ export function desktopPnpmPath(proc = process, exists = existsSync) {
     const path = join(resources, 'runtime', 'primary-runtime', 'dependencies', 'pnpm', 'bin', 'pnpm.cjs');
     return exists(path) ? path : undefined;
 }
+export function desktopPnpmVersion(proc = process, exists = existsSync) {
+    if (hostSurface({ proc }).deployment !== 'desktop')
+        return undefined;
+    const resources = proc.resourcesPath;
+    if (resources === undefined || resources === '')
+        return undefined;
+    const manifest = join(resources, 'runtime', 'primary-runtime', 'dependencies', 'pnpm', 'package.json');
+    if (!exists(manifest))
+        return undefined;
+    try {
+        const parsed = JSON.parse(readFileSync(manifest, 'utf8'));
+        return typeof parsed.version === 'string' ? parsed.version : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 export const LOCAL_NPM_VERSION = [10, 9, 4].join('.');
 export const LOCAL_PNPM_VERSION = [10, 32, 1].join('.');
 export function localNpmRoot(root) {
@@ -75,27 +92,43 @@ export function localPnpmInstallCommand(root, proc = process, exists = existsSyn
         `pnpm@${LOCAL_PNPM_VERSION} --store-dir ${quoteShellArgFor(join(root, 'pnpm-store'), platform)}`);
 }
 export async function provisionLocalPnpm(options) {
-    const command = localPnpmInstallCommand(options.root, options.proc ?? process, options.exists ?? existsSync);
-    if (command === undefined)
-        return { ok: false, detail: '找不到 Desktop 自带 pnpm，装不了本地 pnpm 10' };
+    const platform = options.platform ?? process.platform;
+    const bootstrap = options.pnpm?.trim();
+    const pnpmCommand = bootstrap === undefined || bootstrap === ''
+        ? localPnpmInstallCommand(options.root, options.proc ?? process, options.exists ?? existsSync)
+        : `${bootstrap} add --dir ${quoteShellArgFor(localPnpmRoot(options.root), platform)} pnpm@${LOCAL_PNPM_VERSION} --store-dir ${quoteShellArgFor(join(options.root, 'pnpm-store'), platform)}`;
+    const npm = options.npm?.trim();
+    const npmCommand = npm === undefined || npm === ''
+        ? undefined
+        : `${npm} install --prefix ${quoteShellArgFor(localPnpmRoot(options.root), platform)} pnpm@${LOCAL_PNPM_VERSION} --cache ${quoteShellArgFor(join(options.root, 'npm-cache'), platform)} --no-audit --no-fund`;
+    const commands = [pnpmCommand, npmCommand].filter((item) => item !== undefined);
+    if (commands.length === 0)
+        return { ok: false, detail: '找不到可用的 pnpm 或 npm，装不了本地 pnpm 10' };
     try {
         mkdirSync(localPnpmRoot(options.root), { recursive: true });
     }
     catch (error) {
         return { ok: false, detail: `建不了 ${localPnpmRoot(options.root)}：${String(error)}` };
     }
-    const result = await options.run(command);
-    if (!result.ok)
-        return { ok: false, detail: result.detail };
-    const platform = options.platform ?? process.platform;
-    const installed = options.installed?.() ?? existsSync(localPnpmCommand(options.root, platform));
-    if (!installed)
-        return { ok: false, detail: 'pnpm 跑完但本地 pnpm 10 不在' };
-    return {
-        ok: true,
-        binDir: localPnpmBin(options.root),
-        detail: `pnpm@${LOCAL_PNPM_VERSION} 装到 ${localPnpmRoot(options.root)}`,
-    };
+    let detail = '';
+    for (const command of commands) {
+        const result = await options.run(command);
+        if (result.ok) {
+            const installed = options.installed?.() ?? existsSync(localPnpmCommand(options.root, platform));
+            if (installed) {
+                return {
+                    ok: true,
+                    binDir: localPnpmBin(options.root),
+                    detail: `pnpm@${LOCAL_PNPM_VERSION} 装到 ${localPnpmRoot(options.root)}`,
+                };
+            }
+            detail = 'pnpm 跑完但本地 pnpm 10 不在';
+        }
+        else {
+            detail = result.detail;
+        }
+    }
+    return { ok: false, detail };
 }
 export function provisionLocalPnpmSync(options) {
     const command = localPnpmInstallCommand(options.root, options.proc ?? process, options.exists ?? existsSync);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/adapter-probe",
-  "version": "1.1.13",
+  "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/shared": "1.1.13",
-    "@dsh-workbench/adapter-runtime": "1.1.13",
-    "@dsh-workbench/adapter-profile": "1.1.13",
-    "@dsh-workbench/adapter-supply": "1.1.13"
+    "@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",