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

package/dist/bootstrap-run.d.ts

@@ -0,0 +1,32 @@
+import type { ShellKind } from '@dsh-workbench/shared/host';
+export interface BootstrapEnvOptions {
+    readonly opencliRoot?: string | undefined;
+    readonly realHome?: string | undefined;
+    readonly parent?: NodeJS.ProcessEnv | undefined;
+    readonly shellKind?: ShellKind | undefined;
+}
+export interface BootstrapSpawnOptions {
+    readonly env: Readonly<Record<string, string>>;
+    readonly timeout: number;
+    readonly reject: false;
+    readonly stripFinalNewline: false;
+}
+export interface BootstrapSpawnResult {
+    readonly exitCode: number | null;
+    readonly timedOut?: boolean | undefined;
+    readonly stdout: string;
+    readonly stderr: string;
+}
+export type BootstrapSpawn = (file: string, args: readonly string[], options: BootstrapSpawnOptions) => Promise<BootstrapSpawnResult>;
+export interface BootstrapRunOptions {
+    readonly timeoutMs: number;
+    readonly env?: Readonly<Record<string, string>> | undefined;
+    readonly shellKind?: ShellKind | undefined;
+    readonly spawn?: BootstrapSpawn | undefined;
+}
+export interface BootstrapRunResult {
+    readonly ok: boolean;
+    readonly detail: string;
+}
+export declare function bootstrapEnv(options?: BootstrapEnvOptions): Record<string, string>;
+export declare function runBootstrapCommand(line: string, options: BootstrapRunOptions): Promise<BootstrapRunResult>;

package/dist/bootstrap-run.js

@@ -0,0 +1,76 @@
+import { existsSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import { execa } from 'execa';
+import { isolatedRoot } from '@dsh-workbench/adapter-runtime';
+import { tailLines } from '@dsh-workbench/shared/host';
+import { currentShellKind } from './platform.js';
+export function bootstrapEnv(options = {}) {
+    const shellKind = options.shellKind ?? currentShellKind();
+    const opencliRoot = options.opencliRoot ?? isolatedRoot();
+    const realHome = options.realHome ?? homedir();
+    const parent = options.parent ?? process.env;
+    const env = {};
+    for (const [key, value] of Object.entries(parent)) {
+        if (typeof value === 'string')
+            env[key] = value;
+    }
+    const home = join(opencliRoot, 'home');
+    env['HOME'] = home;
+    if (shellKind === 'pwsh')
+        env['USERPROFILE'] = home;
+    const userConfig = join(realHome, '.npmrc');
+    if (existsSync(userConfig))
+        env['NPM_CONFIG_USERCONFIG'] = userConfig;
+    const cache = join(opencliRoot, 'npm-cache');
+    env['npm_config_cache'] = cache;
+    env['NPM_CONFIG_CACHE'] = cache;
+    env['NO_COLOR'] = '1';
+    env['TERM'] = 'dumb';
+    return env;
+}
+function shellOf(line, shellKind) {
+    return shellKind === 'pwsh'
+        ? { file: 'pwsh', args: ['-NoProfile', '-NonInteractive', '-Command', line] }
+        : { file: 'bash', args: ['-c', line] };
+}
+const defaultSpawn = async (file, args, options) => {
+    const result = await execa(file, [...args], {
+        env: { ...options.env },
+        timeout: options.timeout,
+        reject: options.reject,
+        stripFinalNewline: options.stripFinalNewline,
+    });
+    return {
+        exitCode: result.exitCode ?? null,
+        timedOut: result.timedOut === true,
+        stdout: result.stdout,
+        stderr: result.stderr,
+    };
+};
+export async function runBootstrapCommand(line, options) {
+    const shellKind = options.shellKind ?? currentShellKind();
+    const spawn = options.spawn ?? defaultSpawn;
+    const env = { ...bootstrapEnv({ shellKind }), ...(options.env ?? {}) };
+    const command = shellOf(line, shellKind);
+    try {
+        const result = await spawn(command.file, command.args, {
+            env,
+            timeout: options.timeoutMs,
+            reject: false,
+            stripFinalNewline: false,
+        });
+        if (result.timedOut === true)
+            return { ok: false, detail: `超时（${String(options.timeoutMs)} ms）：${line}` };
+        if (result.exitCode === 0)
+            return { ok: true, detail: tailLines(result.stdout, 1) };
+        const detail = tailLines(result.stderr || result.stdout, 4);
+        return {
+            ok: false,
+            detail: detail === '' ? `没跑通（退出码 ${String(result.exitCode)}）：${line}` : detail,
+        };
+    }
+    catch (error) {
+        return { ok: false, detail: `${String(error)}：${line}` };
+    }
+}

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+export * from './bootstrap-run.js';
 export * from './browser-wake.js';
 export * from './diy-preset-health.js';
 export * from './platform.js';

package/dist/index.js

@@ -1,3 +1,4 @@
+export * from './bootstrap-run.js';
 export * from './browser-wake.js';
 export * from './diy-preset-health.js';
 export * from './platform.js';

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/platform.d.ts

@@ -1,3 +1,5 @@
+import type { ShellKind } from '@dsh-workbench/shared/host';
 import type { HostOs } from '@dsh-workbench/shared/contract/protocol/platform';
-export { hostOsOf, hostSurface, profileNameOf, type HostSurfaceInput } from '@dsh-workbench/shared/host';
+export { hostOsOf, hostSurface, profileNameOf, shellKindOf, type HostSurfaceInput } from '@dsh-workbench/shared/host';
 export declare function currentHostOs(): HostOs;
+export declare function currentShellKind(): ShellKind;

package/dist/platform.js

@@ -1,5 +1,8 @@
-import { hostOsOf } from '@dsh-workbench/shared/host';
-export { hostOsOf, hostSurface, profileNameOf } from '@dsh-workbench/shared/host';
+import { hostOsOf, shellKindOf } from '@dsh-workbench/shared/host';
+export { hostOsOf, hostSurface, profileNameOf, shellKindOf } from '@dsh-workbench/shared/host';
 export function currentHostOs() {
     return hostOsOf(process.platform);
 }
+export function currentShellKind() {
+    return shellKindOf(process.platform);
+}

package/dist/preflight-route.js

@@ -1,7 +1,9 @@
 import { basename, join } from 'node:path';
-import { INSTALL_TIMEOUT_MS, preflightHandler, runShell, tailLines, workbenchRoot } from '@dsh-workbench/shared/host';
+import { PREFLIGHT_INSTALL_TIMEOUT_MS, preflightHandler, workbenchRoot } from '@dsh-workbench/shared/host';
 import { WAKE_BROWSER_ROUTE } from '@dsh-workbench/shared/contract/protocol/preflight-wake';
+import { runBootstrapCommand } from './bootstrap-run.js';
 import { createDiyPresetProbe } from './diy-preset-health.js';
+import { opencliInstallCommand } from './install.js';
 import { hostSurface } from './platform.js';
 import { createPreflight } from './preflight.js';
 import { probeDesktopToolchain } from './toolchain-probe.js';
@@ -23,7 +25,10 @@ function desktopBrowserOf(input) {
 }
 export function registerPreflight(input) {
     const command = input.runtimeCommands['opencli'] ?? Object.values(input.runtimeCommands)[0] ?? 'opencli';
-    const installCommand = process.env.DSH_WORKBENCH_OPENCLI_INSTALL;
+    const configuredInstall = process.env.DSH_WORKBENCH_OPENCLI_INSTALL;
+    const installCommand = configuredInstall === undefined || configuredInstall === ''
+        ? opencliInstallCommand()
+        : configuredInstall;
     const desktopBrowser = input.desktopBrowser ??
         desktopBrowserOf({
             ctx: input.ctx,
@@ -33,7 +38,8 @@ export function registerPreflight(input) {
     const preflight = createPreflight({
         shell: input.shell,
         command,
-        ...(installCommand === undefined || installCommand === '' ? {} : { installCommand }),
+        installCommand,
+        install: () => runBootstrapCommand(installCommand, { timeoutMs: PREFLIGHT_INSTALL_TIMEOUT_MS }),
         logger: input.ctx.logger,
         warmReads: input.warmReads,
         ...(input.runtimeCapabilities === undefined ? {} : { capabilities: input.runtimeCapabilities }),
@@ -49,13 +55,7 @@ export function registerPreflight(input) {
                 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),
-                    };
-                },
+                run: (command) => runBootstrapCommand(command, { timeoutMs: PREFLIGHT_INSTALL_TIMEOUT_MS }),
             });
             if (result.ok && result.binDir !== undefined) {
                 prependPath(result.binDir);

package/dist/preflight.js

@@ -1,4 +1,4 @@
-import { INSTALL_TIMEOUT_MS, OPENCLI_TIMEOUT_MS, PREFLIGHT_FRESH_MS, PREFLIGHT_VERSION_TIMEOUT_MS, WARM_TIMEOUT_MS, } from '@dsh-workbench/shared/host';
+import { PREFLIGHT_DOCTOR_TIMEOUT_MS, PREFLIGHT_FRESH_MS, PREFLIGHT_INSTALL_TIMEOUT_MS, PREFLIGHT_VERSION_TIMEOUT_MS, WARM_TIMEOUT_MS, } from '@dsh-workbench/shared/host';
 import { tailLines } from '@dsh-workbench/shared/host';
 import { opencliCommandLine } from '@dsh-workbench/adapter-runtime';
 import { runShell } from '@dsh-workbench/shared/host';
@@ -124,7 +124,7 @@ export function createPreflight(options) {
         };
     }
     async function probeBridge() {
-        const result = await exec('bridge', `${command} doctor`, OPENCLI_TIMEOUT_MS);
+        const result = await exec('bridge', `${command} doctor`, PREFLIGHT_DOCTOR_TIMEOUT_MS);
         if (result.kind === 'stalled') {
             return { ok: false, detail: result.detail, issues: ['unknown'], stalled: true };
         }
@@ -143,7 +143,7 @@ export function createPreflight(options) {
                 appendLog('cli', installed.detail);
             return installed;
         }
-        const result = await exec('cli', installCommand, INSTALL_TIMEOUT_MS);
+        const result = await exec('cli', installCommand, PREFLIGHT_INSTALL_TIMEOUT_MS);
         if (result.kind !== 'ok')
             return { ok: false, detail: result.detail };
         return { ok: true, detail: tailLines(result.stdout, 1) };

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/dist/toolchain.js

@@ -4,6 +4,7 @@ import writeFileAtomic from 'write-file-atomic';
 import { chmodSync, existsSync, mkdirSync, readFileSync, rmSync } from 'node:fs';
 import { join } from 'node:path';
 import { quoteShellArg, quoteShellArgFor } from '@dsh-workbench/shared/host';
+import { bootstrapEnv } from './bootstrap-run.js';
 import { hostSurface } from './platform.js';
 export function desktopPnpmPath(proc = process, exists = existsSync) {
     if (hostSurface({ proc }).deployment !== 'desktop')
@@ -143,7 +144,12 @@ export function provisionLocalPnpmSync(options) {
     try {
         const run = options.run ??
             ((line) => {
-                execaSync(line, { stdio: 'ignore', timeout: 180_000, env: process.env, shell: true });
+                execaSync(line, {
+                    stdio: 'ignore',
+                    timeout: 180_000,
+                    env: bootstrapEnv({ opencliRoot: join(options.root, 'opencli') }),
+                    shell: true,
+                });
             });
         run(command);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/adapter-probe",
-  "version": "1.1.14-beta.0",
+  "version": "1.1.14-beta.2",
   "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-runtime": "1.1.14-beta.2",
+    "@dsh-workbench/shared": "1.1.14-beta.2",
+    "@dsh-workbench/adapter-profile": "1.1.14-beta.2",
+    "@dsh-workbench/adapter-supply": "1.1.14-beta.2"
   },
   "devDependencies": {
     "@types/node": "^24.19.0",