waygraph 0.12.21 → 0.12.22

package/bin/waygraph

@@ -1,13 +1,48 @@
-#!/bin/sh
-# Two cwd/symlink pitfalls this resolves, both real, both hit in practice:
-#  - `--import tsx/esm` is a bare specifier - Node resolves it as if from an
-#    unnamed module at the CALLER's cwd, not this script's install
-#    directory, so it broke when invoked from anywhere else.
-#  - `npm link` makes this script reachable via a SYMLINK (e.g.
-#    ~/.nvm/.../bin/waygraph) - `dirname "$0"` alone follows argv[0], not the
-#    symlink target, so it resolved to the nvm bin dir instead of this
-#    package. `readlink -f` follows the symlink to the real file first.
-SOURCE="$(readlink -f "$0")"
-DIR="$(cd "$(dirname "$SOURCE")/.." && pwd)"
-TSX_ESM="$(cd "$DIR" && node -e "console.log(require.resolve('tsx/esm'))")"
-exec node --import "$TSX_ESM" "$DIR/dist/cli.js" "$@"
+#!/usr/bin/env node
+/**
+ * Cross-platform CLI launcher.
+ *
+ * Why Node (not #!/bin/sh + readlink -f):
+ *   - macOS BSD `readlink` has no `-f` (GNU) -> "illegal option -- f" / broken bin
+ *   - Windows npm expects a Node shebang for `.cmd` shims
+ *
+ * Still registers `tsx/esm` before `dist/cli.js` so consumer `.block.ts` /
+ * `.flow.ts` dynamic imports resolve the same as the old shell wrapper.
+ */
+import { spawn } from "node:child_process";
+import { createRequire } from "node:module";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const pkgRoot = join(dirname(fileURLToPath(import.meta.url)), "..");
+const require = createRequire(join(pkgRoot, "package.json"));
+let tsxEsm;
+try {
+  tsxEsm = require.resolve("tsx/esm");
+} catch (err) {
+  console.error(
+    "waygraph: cannot resolve dependency \"tsx\" (required to load .ts Blocks).\n" +
+      "  Reinstall: npm install waygraph\n" +
+      `  Detail: ${err instanceof Error ? err.message : String(err)}`,
+  );
+  process.exit(1);
+}
+
+const cli = join(pkgRoot, "dist", "cli.js");
+const child = spawn(
+  process.execPath,
+  ["--import", tsxEsm, cli, ...process.argv.slice(2)],
+  { stdio: "inherit", env: process.env, windowsHide: true },
+);
+
+child.on("error", (err) => {
+  console.error(`waygraph: failed to start CLI: ${err.message}`);
+  process.exit(1);
+});
+child.on("exit", (code, signal) => {
+  if (signal) {
+    process.kill(process.pid, signal);
+    return;
+  }
+  process.exit(code ?? 1);
+});

package/dist/auto-explore-run.js

@@ -468,22 +468,16 @@ function printCliMenu(menu, library) {
     console.log("  [q] quit");
     console.log("");
 }
-async function cliPick(menu) {
-    const rl = createInterface({ input, output });
-    try {
-        while (true) {
-            const ans = (await rl.question("Choose: ")).trim().toLowerCase();
-            if (ans === "q" || ans === "quit")
-                return { type: "quit" };
-            const n = Number(ans);
-            if (Number.isInteger(n) && n >= 1 && n <= menu.flat.length) {
-                return { type: "pick", index: n - 1 };
-            }
-            console.log("Enter a number from the list, or q to quit.");
+async function cliPick(menu, rl) {
+    while (true) {
+        const ans = (await rl.question("Choose: ")).trim().toLowerCase();
+        if (ans === "q" || ans === "quit")
+            return { type: "quit" };
+        const n = Number(ans);
+        if (Number.isInteger(n) && n >= 1 && n <= menu.flat.length) {
+            return { type: "pick", index: n - 1 };
         }
-    }
-    finally {
-        rl.close();
+        console.log("Enter a number from the list, or q to quit.");
     }
 }
 /**
@@ -544,6 +538,7 @@ export async function runAutoExplore(projectDir, options = {}) {
         wiredPage = target;
     }
     let here = null;
+    const cliRl = cli ? createInterface({ input, output }) : null;
     try {
         for (;;) {
             page = await ensureLivePage(context, page, startUrl);
@@ -572,9 +567,9 @@ export async function runAutoExplore(projectDir, options = {}) {
                     break;
             }
             let pick;
-            if (cli) {
+            if (cli && cliRl) {
                 printCliMenu(menu, library.byName);
-                pick = await cliPick(menu);
+                pick = await cliPick(menu, cliRl);
             }
             else {
                 pick = await headfulPick(page, menu, library.byName, mem, () => pickWait.promise);
@@ -614,6 +609,7 @@ export async function runAutoExplore(projectDir, options = {}) {
         }
     }
     finally {
+        cliRl?.close();
         await context.close();
         await browser.close();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waygraph",
-  "version": "0.12.21",
+  "version": "0.12.22",
   "type": "module",
   "description": "A typed graph of reusable Blocks for driving a browser through E2E flows.",
   "license": "MIT",