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

package/dist/toolchain.js

@@ -1,36 +1,11 @@
-import { execaSync } from 'execa';
 import lockfile from 'proper-lockfile';
-import writeFileAtomic from 'write-file-atomic';
-import { chmodSync, existsSync, mkdirSync, readFileSync, rmSync } from 'node:fs';
+import { existsSync, mkdirSync, readFileSync, rmSync } from 'node:fs';
 import { join } from 'node:path';
-import { quoteShellArg, quoteShellArgFor } from '@dsh-workbench/shared/host';
+import { quoteShellArg, quoteShellArgFor, writeTextFile } from '@dsh-workbench/shared/host';
+import { bootstrapEnv, runBootstrapCommand } from './bootstrap-run.js';
 import { hostSurface } from './platform.js';
-export function desktopPnpmPath(proc = process, exists = existsSync) {
-    if (hostSurface({ proc }).deployment !== 'desktop')
-        return undefined;
-    const resources = proc.resourcesPath;
-    if (resources === undefined || resources === '')
-        return undefined;
-    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;
-    }
-}
+import { desktopPnpmPath } from './desktop-runtime.js';
+export { desktopBundledBins, desktopNodeExecutable, desktopPnpmPath, desktopPnpmVersion, desktopResourcesDir, desktopRuntimeEnv, desktopRuntimeEnvPath } from './desktop-runtime.js';
 export const LOCAL_NPM_VERSION = [10, 9, 4].join('.');
 export const LOCAL_PNPM_VERSION = [10, 32, 1].join('.');
 export function localNpmRoot(root) {
@@ -91,6 +66,17 @@ export function localPnpmInstallCommand(root, proc = process, exists = existsSyn
     return (`node ${quoteShellArgFor(pnpm, platform)} add --dir ${quoteShellArgFor(localPnpmRoot(root), platform)} ` +
         `pnpm@${LOCAL_PNPM_VERSION} --store-dir ${quoteShellArgFor(join(root, 'pnpm-store'), platform)}`);
 }
+const LOCAL_PNPM_PROVISION_TIMEOUT_MS = 180_000;
+function hostProvisionRun(root, seam) {
+    return async (command) => {
+        const result = await runBootstrapCommand(command, {
+            timeoutMs: LOCAL_PNPM_PROVISION_TIMEOUT_MS,
+            seam,
+            env: bootstrapEnv({ opencliRoot: join(root, 'opencli') }),
+        });
+        return { ok: result.ok, detail: result.detail };
+    };
+}
 export async function provisionLocalPnpm(options) {
     const platform = options.platform ?? process.platform;
     const bootstrap = options.pnpm?.trim();
@@ -111,8 +97,9 @@ export async function provisionLocalPnpm(options) {
         return { ok: false, detail: `建不了 ${localPnpmRoot(options.root)}：${String(error)}` };
     }
     let detail = '';
+    const run = options.run ?? hostProvisionRun(options.root, options.seam);
     for (const command of commands) {
-        const result = await options.run(command);
+        const result = await run(command);
         if (result.ok) {
             const installed = options.installed?.() ?? existsSync(localPnpmCommand(options.root, platform));
             if (installed) {
@@ -130,36 +117,6 @@ export async function provisionLocalPnpm(options) {
     }
     return { ok: false, detail };
 }
-export function provisionLocalPnpmSync(options) {
-    const command = localPnpmInstallCommand(options.root, options.proc ?? process, options.exists ?? existsSync);
-    if (command === undefined)
-        return { ok: false, detail: '找不到 Desktop 自带 pnpm，装不了本地 pnpm 10' };
-    try {
-        mkdirSync(localPnpmRoot(options.root), { recursive: true });
-    }
-    catch (error) {
-        return { ok: false, detail: `建不了 ${localPnpmRoot(options.root)}：${String(error)}` };
-    }
-    try {
-        const run = options.run ??
-            ((line) => {
-                execaSync(line, { stdio: 'ignore', timeout: 180_000, env: process.env, shell: true });
-            });
-        run(command);
-    }
-    catch (error) {
-        return { ok: false, detail: String(error) };
-    }
-    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)}`,
-    };
-}
 function readText(file) {
     try {
         return readFileSync(file, 'utf8');
@@ -207,8 +164,7 @@ export function ensureToolchain(options) {
         release = lockfile.lockSync(pathDir, { realpath: false });
         if (readText(file) !== shim) {
             rmSync(file, { force: true });
-            writeFileAtomic.sync(file, shim, 'utf8');
-            chmodSync(file, 0o755);
+            writeTextFile(file, shim, { mode: 0o755 });
             files.push(file);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/adapter-probe",
-  "version": "1.1.14-beta.1",
+  "version": "1.1.14",
   "description": "Workbench adapter-probe adapter.",
   "type": "module",
   "exports": {
@@ -13,18 +13,15 @@
     "dist"
   ],
   "dependencies": {
-    "execa": "^10.2.0",
     "proper-lockfile": "^4.1.2",
-    "write-file-atomic": "^8.0.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"
+    "@dsh-workbench/adapter-profile": "1.1.14",
+    "@dsh-workbench/shared": "1.1.14",
+    "@dsh-workbench/adapter-runtime": "1.1.14",
+    "@dsh-workbench/adapter-supply": "1.1.14"
   },
   "devDependencies": {
     "@types/node": "^24.19.0",
     "@types/proper-lockfile": "^4.1.4",
-    "@types/write-file-atomic": "^4.0.3",
     "vitest": "^5.0.2",
     "dayjs": "^1.11.23",
     "@vitest/coverage-v8": "^5.0.2"