@beryl-so/cli 0.34.2 → 0.34.3

package/dist/local-run.js

@@ -1,11 +1,9 @@
 import { spawn } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
-import { bundledRunnerCli, installHint, PLAYWRIGHT_INSTALL_COMMANDS, } from "./playwright-install.js";
-// We invoke @playwright/test as an external rather than bundling it — the CLI's zero-runtime-dep
-// rule. In a node_modules install `playwright` is on PATH; otherwise fall back to `npx playwright`,
-// exactly as the cloud runner does. The install commands come from playwright-install.ts so the
-// hint text and the actual installer never drift apart.
+import { installHint, PLAYWRIGHT_INSTALL_COMMANDS, resolvePlaywrightRunner, } from "./playwright-install.js";
+// @playwright/test is invoked as an external, never bundled — the CLI's zero-runtime-dep rule.
+// The install commands come from playwright-install.ts so hint and installer never drift apart.
 export const PLAYWRIGHT_INSTALL_HINT = "Local Playwright not found. Install it in this project, then re-run:\n" +
     `  ${PLAYWRIGHT_INSTALL_COMMANDS}`;
 // Isolate the run from any playwright.config.ts in the customer's repo: a stray `testMatch`
@@ -51,20 +49,20 @@ function runProcess(command, args, cwd, env) {
         child.on("close", (code) => resolve({ code, stdout, stderr }));
     });
 }
-// The repo's own runner first; else the one bundled with the CLI; `npx playwright` is the
-// last resort for a CLI install that somehow lost its dependencies.
-function playwrightBase(cwd) {
-    const binName = process.platform === "win32" ? "playwright.cmd" : "playwright";
-    const local = path.join(cwd, "node_modules", ".bin", binName);
-    if (fs.existsSync(local))
-        return { command: local, args: ["test"], label: "playwright test" };
-    const bundled = bundledRunnerCli();
-    if (bundled) {
+// Resolved from the run dir — the exact place the spec imports from — so the process we
+// spawn and the module the spec loads are the same copy. `npx playwright` is the last
+// resort for a CLI install that somehow lost its dependencies.
+export function playwrightBase(runDir) {
+    const runner = resolvePlaywrightRunner(runDir);
+    if (runner?.source === "project") {
+        return { command: process.execPath, args: [runner.cli, "test"], label: "playwright test" };
+    }
+    if (runner) {
         return {
             command: process.execPath,
-            args: [bundled, "test"],
+            args: [runner.cli, "test"],
             label: "playwright test (bundled with the CLI)",
-            nodePath: path.resolve(path.dirname(bundled), "..", ".."),
+            nodePath: path.resolve(path.dirname(runner.cli), "..", ".."),
         };
     }
     const npx = process.platform === "win32" ? "npx.cmd" : "npx";
@@ -260,7 +258,7 @@ export async function runSpecLocally(opts) {
     fs.writeFileSync(configPath, ISOLATING_CONFIG(runDir, artifactsDir));
     const reportPath = path.join(runDir, "report.json");
     const cleanup = () => fs.rmSync(runDir, { recursive: true, force: true });
-    const { command, args: base, label, nodePath } = playwrightBase(cwd);
+    const { command, args: base, label, nodePath } = playwrightBase(runDir);
     const args = [...base, `--config=${configPath}`, "--reporter=json"];
     opts.onProgress?.(`Running ${label} on ${opts.testName}…`);
     await opts.setup?.(runDir);

package/dist/playwright-install.js

@@ -17,16 +17,32 @@ const projectRequire = (cwd) => createRequire(path.join(cwd, "package.json"));
 // A repo's own @playwright/test still wins when present (its version, its browser revision).
 const cliRequire = createRequire(import.meta.url);
 // cli.js is the package's bin, not an export, so it is located via package.json.
+function runnerAt(pkgPath, source) {
+    const { version } = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+    return { cli: path.join(path.dirname(pkgPath), "cli.js"), version, source };
+}
+function projectRunner(dir) {
+    try {
+        return runnerAt(projectRequire(dir).resolve("@playwright/test/package.json"), "project");
+    }
+    catch {
+        return undefined;
+    }
+}
 function bundledRunner() {
     try {
-        const pkgPath = cliRequire.resolve("@playwright/test/package.json");
-        const { version } = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
-        return { cli: path.join(path.dirname(pkgPath), "cli.js"), version };
+        return runnerAt(cliRequire.resolve("@playwright/test/package.json"), "bundled");
     }
     catch {
         return undefined;
     }
 }
+// The single answer to "which @playwright/test": what `import "@playwright/test"` from `dir`
+// resolves to (any ancestor's node_modules), else the bundled copy. Runner and spec must load
+// the same one or Playwright refuses to run ("did not expect test.use() to be called here").
+export function resolvePlaywrightRunner(dir) {
+    return projectRunner(dir) ?? bundledRunner();
+}
 export const bundledRunnerCli = () => bundledRunner()?.cli;
 // By hand, the browser must be fetched for the runner that will launch it: the repo's own
 // (`npx playwright` resolves it) or, in a bare repo, the CLI's pinned version. An unpinned
@@ -46,15 +62,7 @@ function bundledCoreDir() {
         return undefined;
     }
 }
-export function hasPlaywrightTest(cwd) {
-    try {
-        projectRequire(cwd).resolve("@playwright/test");
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
+export const hasPlaywrightTest = (cwd) => projectRunner(cwd) !== undefined;
 // A local run launches chromium headless, which Playwright serves from a separate
 // `chromium_headless_shell` build (`playwright install chromium` fetches both). That is the
 // only engine a run ever launches, so it is the only one we install or check for.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beryl-so/cli",
-  "version": "0.34.2",
+  "version": "0.34.3",
   "description": "Beryl on the command line — projects, runs, the exploring agent, and an MCP server over the same commands.",
   "license": "MIT",
   "type": "module",