@dsh-workbench/adapter-probe 1.1.11 → 1.1.13

package/dist/index.d.ts

@@ -9,6 +9,7 @@ export * from './probe-units.js';
 export * from './probe-verdict.js';
 export * from './runtime-seed.js';
 export * from './toolchain.js';
+export * from './toolchain-probe.js';
 export * from './version-range.js';
 export * from './install.js';
 export * from './self-update.js';

package/dist/index.js

@@ -9,6 +9,7 @@ export * from './probe-units.js';
 export * from './probe-verdict.js';
 export * from './runtime-seed.js';
 export * from './toolchain.js';
+export * from './toolchain-probe.js';
 export * from './version-range.js';
 export * from './install.js';
 export * from './self-update.js';

package/dist/preflight-route.js

@@ -3,7 +3,8 @@ import { INSTALL_TIMEOUT_MS, preflightHandler, runShell, tailLines, workbenchRoo
 import { WAKE_BROWSER_ROUTE } from '@dsh-workbench/shared/contract/protocol/preflight-wake';
 import { createDiyPresetProbe } from './diy-preset-health.js';
 import { hostSurface } from './platform.js';
-import { createPreflight, probeDesktopToolchain } from './preflight.js';
+import { createPreflight } from './preflight.js';
+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';

package/dist/preflight.d.ts

@@ -1,7 +1,11 @@
 import type { DshShell, RuntimeCapabilities } from '@dsh-workbench/shared';
 import type { DiyPresetVerdict } from './diy-preset-health.js';
 import { type LocalNpmProvision, type LocalPnpmProvision } from './toolchain.js';
+import type { ToolchainReport } from './toolchain-probe.js';
 import type { DesktopBrowser } from './browser-wake.js';
+export type PreflightFailure = 'permission' | 'network' | 'missing' | 'host' | 'unknown';
+export declare function classifyFailure(text: string): PreflightFailure;
+export type PreflightGuidance = 'install' | 'path' | 'shell' | 'host';
 export type PreflightStepId = 'toolchain' | 'runtime' | 'cli' | 'bridge' | 'diy' | 'warm';
 export type PreflightStepStatus = 'pending' | 'running' | 'ok' | 'warn' | 'failed';
 export interface PreflightStep {
@@ -11,17 +15,6 @@ export interface PreflightStep {
     readonly action?: string;
     readonly command?: string;
 }
-export interface ToolchainReport {
-    readonly ok: boolean;
-    readonly detail: string;
-    readonly nodeMissing: boolean;
-    readonly npmMissing: boolean;
-    readonly pnpmProblem: boolean;
-}
-export type PreflightFailure = 'permission' | 'network' | 'missing' | 'unknown';
-export declare function classifyFailure(text: string): PreflightFailure;
-export type PreflightGuidance = 'install' | 'path' | 'shell';
-export declare function probeDesktopToolchain(shell: DshShell): Promise<ToolchainReport>;
 export type PreflightBridgeIssue = 'daemon' | 'extension' | 'profile' | 'stale' | 'unknown';
 export declare const BRIDGE_ISSUE_ORDER: readonly PreflightBridgeIssue[];
 export declare function readBridgeReport(stdout: string): {
@@ -57,6 +50,7 @@ export interface BridgeVerdict {
     readonly detail: string;
     readonly issues: readonly PreflightBridgeIssue[];
     readonly command?: string | undefined;
+    readonly stalled?: boolean | undefined;
 }
 export declare function canWarm(bridge: {
     ok: boolean;

package/dist/preflight.js

@@ -1,10 +1,10 @@
-import { INSTALL_TIMEOUT_MS, OPENCLI_TIMEOUT_MS, PREFLIGHT_FRESH_MS, WARM_TIMEOUT_MS } from '@dsh-workbench/shared/host';
+import { INSTALL_TIMEOUT_MS, OPENCLI_TIMEOUT_MS, PREFLIGHT_FRESH_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';
 import { DIY_UPGRADE_COMMAND } from './diy-preset-health.js';
 import { opencliInstallCommand } from './install.js';
-import { desktopPnpmPath, LOCAL_NPM_VERSION, LOCAL_PNPM_VERSION, } from './toolchain.js';
+import { LOCAL_NPM_VERSION, LOCAL_PNPM_VERSION } from './toolchain.js';
 import { bridgeFixCommand } from './browser-wake.js';
 export function classifyFailure(text) {
     const lower = text.toLowerCase();
@@ -16,42 +16,6 @@ export function classifyFailure(text) {
         return 'missing';
     return 'unknown';
 }
-async function toolVersion(shell, line) {
-    try {
-        const result = await runShell(shell, line, { timeoutMs: 10_000 });
-        const text = (result.stdout || result.stderr).trim().split('\n')[0] ?? '';
-        return { ok: result.exitCode === 0 && !result.timedOut, text };
-    }
-    catch {
-        return { ok: false, text: '' };
-    }
-}
-export async function probeDesktopToolchain(shell) {
-    const [node, npm, pnpm] = await Promise.all([
-        toolVersion(shell, 'node --version'),
-        toolVersion(shell, 'npm --version'),
-        toolVersion(shell, 'pnpm --version'),
-    ]);
-    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 parts = [
-        nodeMissing ? 'node 不在 PATH（Desktop 自带 Node 的 shim 没生效）' : `node ${node.text}（Desktop 自带）`,
-        npmMissing
-            ? hasBundledPnpm
-                ? 'npm 缺（opencli 安装走 pnpm；插件安装/模块库仍需 npm）'
-                : 'npm 缺（装不了 opencli：bundled pnpm 也没找到）'
-            : `npm ${npm.text}`,
-        pnpmProblem
-            ? pnpm.ok
-                ? `pnpm ${pnpm.text}（工坊按 10 方言）`
-                : 'pnpm 缺（只影响工坊 build/install）'
-            : `pnpm ${pnpm.text}`,
-    ];
-    return { ok: !nodeMissing, detail: parts.join(' · '), nodeMissing, npmMissing, pnpmProblem };
-}
 export const BRIDGE_ISSUE_ORDER = ['profile', 'stale', 'daemon', 'extension', 'unknown'];
 export function readBridgeReport(stdout) {
     const text = String(stdout ?? '');
@@ -115,6 +79,7 @@ export function createPreflight(options) {
         ...(options.desktopBrowser === undefined ? {} : { canWakeBrowser: true }),
     };
     let running = null;
+    let shellStalled = false;
     function set(next) {
         current = { ...current, ...next, at: Date.now() };
         return current;
@@ -122,9 +87,19 @@ export function createPreflight(options) {
     function patchStep(id, patch) {
         return set({ steps: current.steps.map((item) => (item.id === id ? { ...item, ...patch } : item)) });
     }
+    function hostFailure(detail) {
+        return set({ phase: 'failed', error: detail, failure: 'host', guidance: 'host' });
+    }
     async function exec(commandLine, timeoutMs) {
+        if (shellStalled) {
+            return { kind: 'stalled', detail: `前一条命令就没交回结果，这一步没跑：${commandLine}` };
+        }
         try {
             const result = await runShell(shell, commandLine, { timeoutMs });
+            if (result.stalled) {
+                shellStalled = true;
+                return { kind: 'stalled', detail: `没有返回（宿主没把结果交回来）：${commandLine}` };
+            }
             if (result.timedOut) {
                 return { kind: 'error', detail: `超时（${String(timeoutMs)} ms）：${commandLine}` };
             }
@@ -138,13 +113,22 @@ export function createPreflight(options) {
         }
     }
     async function probeVersion() {
-        const result = await exec(`${command} --version`, OPENCLI_TIMEOUT_MS);
-        if (result.kind === 'ok')
-            return { ok: true, missing: false, detail: result.stdout.trim().split('\n')[0] ?? '' };
-        return { ok: false, missing: result.kind === 'nonzero', detail: result.detail };
+        const result = await exec(`${command} --version`, PREFLIGHT_VERSION_TIMEOUT_MS);
+        if (result.kind === 'ok') {
+            return { ok: true, missing: false, detail: result.stdout.trim().split('\n')[0] ?? '', stalled: false };
+        }
+        return {
+            ok: false,
+            missing: result.kind === 'nonzero',
+            detail: result.detail,
+            stalled: result.kind === 'stalled',
+        };
     }
     async function probeBridge() {
         const result = await exec(`${command} doctor`, OPENCLI_TIMEOUT_MS);
+        if (result.kind === 'stalled') {
+            return { ok: false, detail: result.detail, issues: ['unknown'], stalled: true };
+        }
         if (result.kind !== 'ok')
             return { ok: false, detail: result.detail, issues: ['unknown'] };
         const report = readBridgeReport(result.stdout);
@@ -206,6 +190,7 @@ export function createPreflight(options) {
         return { rows: verdict.rows, detail: verdict.detail, command: DIY_UPGRADE_COMMAND };
     }
     async function doRun() {
+        shellStalled = false;
         set({
             phase: 'checking',
             error: undefined,
@@ -227,6 +212,7 @@ export function createPreflight(options) {
                 nodeMissing: true,
                 npmMissing: true,
                 pnpmProblem: true,
+                stalled: false,
             }));
         if (toolchain !== undefined && toolchain.ok && toolchain.npmMissing && options.provisionNpm !== undefined) {
             set({ phase: 'installing' });
@@ -268,12 +254,9 @@ export function createPreflight(options) {
                 action: undefined,
             });
             if (!toolchain.ok) {
-                return set({
-                    phase: 'failed',
-                    error: toolchain.detail,
-                    failure: 'missing',
-                    guidance: 'install',
-                });
+                return toolchain.stalled === true
+                    ? hostFailure(toolchain.detail)
+                    : set({ phase: 'failed', error: toolchain.detail, failure: 'missing', guidance: 'install' });
             }
         }
         if (options.runtimeCheck !== undefined) {
@@ -292,6 +275,10 @@ export function createPreflight(options) {
             if (diyStarted !== undefined)
                 patchStep('diy', { status: 'running' });
             let version = await probeVersion();
+            if (version.stalled) {
+                patchStep('cli', { status: 'failed', detail: version.detail, action: undefined });
+                return hostFailure(version.detail);
+            }
             if (!version.ok && !version.missing) {
                 patchStep('cli', { status: 'failed', detail: version.detail, action: undefined });
                 return set({
@@ -329,6 +316,10 @@ export function createPreflight(options) {
                 }
                 patchStep('cli', { status: 'running', action: `${command} --version` });
                 version = await probeVersion();
+                if (version.stalled) {
+                    patchStep('cli', { status: 'failed', detail: version.detail, action: undefined });
+                    return hostFailure(version.detail);
+                }
                 if (!version.ok) {
                     patchStep('cli', { status: 'failed', detail: version.detail, command: installCommand });
                     return set({
@@ -343,6 +334,10 @@ export function createPreflight(options) {
         }
         patchStep('bridge', { status: 'running', action: `${command} doctor` });
         const bridge = withBridge ? await probeBridge() : { ok: true, detail: '', issues: [] };
+        if (bridge.stalled === true) {
+            patchStep('bridge', { status: 'failed', detail: bridge.detail, action: undefined });
+            return hostFailure(bridge.detail);
+        }
         if (withBridge && options.desktopBrowser !== undefined && bridge.ok) {
             await options.desktopBrowser.observe().catch(() => undefined);
         }

package/dist/toolchain-probe.d.ts

@@ -0,0 +1,10 @@
+import type { DshShell } from '@dsh-workbench/shared';
+export interface ToolchainReport {
+    readonly ok: boolean;
+    readonly detail: string;
+    readonly nodeMissing: boolean;
+    readonly npmMissing: boolean;
+    readonly pnpmProblem: boolean;
+    readonly stalled?: boolean | undefined;
+}
+export declare function probeDesktopToolchain(shell: DshShell): Promise<ToolchainReport>;

package/dist/toolchain-probe.js

@@ -0,0 +1,48 @@
+import { runShell } from '@dsh-workbench/shared/host';
+import { desktopPnpmPath } from './toolchain.js';
+async function toolVersion(shell, line) {
+    try {
+        const result = await runShell(shell, line, { timeoutMs: 10_000 });
+        const text = (result.stdout || result.stderr).trim().split('\n')[0] ?? '';
+        return { ok: result.exitCode === 0 && !result.timedOut, text, stalled: result.stalled };
+    }
+    catch {
+        return { ok: false, text: '', stalled: false };
+    }
+}
+export async function probeDesktopToolchain(shell) {
+    const [node, npm, pnpm] = await Promise.all([
+        toolVersion(shell, 'node --version'),
+        toolVersion(shell, 'npm --version'),
+        toolVersion(shell, 'pnpm --version'),
+    ]);
+    if (node.stalled || npm.stalled || pnpm.stalled) {
+        return {
+            ok: false,
+            detail: '版本探测没有返回：node / npm / pnpm 的命令都没把结果交回来（不是没装）',
+            nodeMissing: false,
+            npmMissing: false,
+            pnpmProblem: false,
+            stalled: true,
+        };
+    }
+    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 parts = [
+        nodeMissing ? 'node 不在 PATH（Desktop 自带 Node 的 shim 没生效）' : `node ${node.text}（Desktop 自带）`,
+        npmMissing
+            ? hasBundledPnpm
+                ? 'npm 缺（opencli 安装走 pnpm；插件安装/模块库仍需 npm）'
+                : 'npm 缺（装不了 opencli：bundled pnpm 也没找到）'
+            : `npm ${npm.text}`,
+        pnpmProblem
+            ? pnpm.ok
+                ? `pnpm ${pnpm.text}（工坊按 10 方言）`
+                : 'pnpm 缺（只影响工坊 build/install）'
+            : `pnpm ${pnpm.text}`,
+    ];
+    return { ok: !nodeMissing, detail: parts.join(' · '), nodeMissing, npmMissing, pnpmProblem };
+}

package/package.json

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