sproutboat 0.10.0 → 0.10.1

package/CHANGELOG.md

@@ -10,6 +10,23 @@ maintained going forward by the `release` skill.
 
 ## [Unreleased]
 
+## [0.10.1] - 2026-09-11
+### Fixed
+- `npm install sproutboat` / `bunx sproutboat` work again. 0.10.0's launcher
+  hard-required per-platform `@sproutboat/cli-*` packages that are not published
+  yet, so it always failed with "optional package … is missing". The launcher
+  now falls back to running `src/main.ts` with Bun when no platform binary is
+  installed (the v0.9.0 model), and `optionalDependencies` are dropped until the
+  binaries actually ship. 0.10.0 is deprecated on npm.
+- `sproutboat --version` and the deploy banner report the real version instead
+  of a hard-coded `0.9.0` when run from the npm package rather than a
+  `bun build --compile` binary.
+- `sproutboat build` / `deploy` locate `esbuild` via the installed dependency,
+  not just `process.execPath`'s directory, so bundling works on the Bun
+  fallback path.
+- The launcher no longer hangs when it receives `SIGINT` / `SIGTERM` while
+  forwarding a signal to a running platform binary.
+
 ## [0.10.0] - 2026-09-11
 ### Added
 - Per-platform native CLI: `npm install sproutboat` pulls a prebuilt binary for
@@ -341,7 +358,8 @@ its own package.
 - Renamed the package to `sproutboat` (was `@sproutboat/cli`); dropped the
   `sprout` bin alias in favour of a user-defined shell alias.
 
-[Unreleased]: https://github.com/baronunread/sproutboat-cli/compare/v0.10.0...HEAD
+[Unreleased]: https://github.com/baronunread/sproutboat-cli/compare/v0.10.1...HEAD
+[0.10.1]: https://github.com/baronunread/sproutboat-cli/compare/v0.10.0...v0.10.1
 [0.10.0]: https://github.com/baronunread/sproutboat-cli/compare/v0.9.0...v0.10.0
 [0.9.0]: https://github.com/baronunread/sproutboat-cli/compare/v0.8.0...v0.9.0
 [0.8.0]: https://github.com/baronunread/sproutboat-cli/compare/v0.7.0...v0.8.0

package/SURFACE.md

@@ -3,7 +3,7 @@
 > Generated by `src/surface.test.ts` from `src/surface.ts` + the pinned
 > toolchain constants. Do not edit by hand — run `UPDATE_SURFACE=1 bun test`.
 
-**Package:** `sproutboat` 0.9.0 · runs on Bun (use `bunx`, not `npx`)
+**Package:** `sproutboat` 0.10.1 · runs on Bun (use `bunx`, not `npx`)
 
 ## Commands
 

package/bin/sproutboat.cjs

@@ -1,32 +1,50 @@
 #!/usr/bin/env node
-// npm only selects the packaged executable. The CLI itself always runs in Bun.
+// npm selects the packaged executable for this host when it is installed; that
+// is a native single-file binary that needs no Bun. When it is absent (it is
+// not published yet — see issue #134), fall back to running the TypeScript
+// entry point with Bun, which is how the CLI shipped through v0.9.0.
 const { spawn } = require("node:child_process");
-const { resolve } = require("node:path");
+const { join } = require("node:path");
 
 const platform = process.platform === "darwin" ? "darwin" : process.platform === "linux" ? "linux" : null;
 const arch = process.arch === "arm64" ? "arm64" : process.arch === "x64" ? "x64" : null;
-if (!platform || !arch) {
-  console.error(`sproutboat: unsupported platform ${process.platform}/${process.arch}`);
-  process.exit(1);
-}
-const packageName = `@sproutboat/cli-${platform}-${arch}`;
-let executable;
+
+let command;
+let args;
+let viaBun = false;
 try {
-  executable = require.resolve(`${packageName}/bin/sproutboat`);
+  if (!platform || !arch) throw new Error(`unsupported host ${process.platform}/${process.arch}`);
+  command = require.resolve(`@sproutboat/cli-${platform}-${arch}/bin/sproutboat`);
+  args = process.argv.slice(2);
 } catch {
-  console.error(`sproutboat: optional package ${packageName} is missing for ${platform}/${arch}`);
-  console.error("Reinstall sproutboat without --omit=optional, or use a direct release download.");
-  process.exit(1);
+  viaBun = true;
+  // SPROUTBOAT_BUN is an escape hatch for an unusual install; otherwise PATH.
+  command = process.env.SPROUTBOAT_BUN || "bun";
+  args = [join(__dirname, "..", "src", "main.ts"), ...process.argv.slice(2)];
 }
-const child = spawn(resolve(executable), process.argv.slice(2), { stdio: "inherit" });
+
+const child = spawn(command, args, { stdio: "inherit", windowsHide: true });
+
 child.once("error", (error) => {
-  console.error(`sproutboat: could not start bundled executable: ${error.message}`);
+  if (viaBun && error.code === "ENOENT") {
+    console.error("sproutboat: this build needs Bun on PATH. Install it: https://bun.sh");
+  } else {
+    console.error(`sproutboat: could not start: ${error.message}`);
+  }
   process.exit(1);
 });
+
 for (const signal of ["SIGINT", "SIGTERM"]) {
   process.on(signal, () => child.kill(signal));
 }
+
 child.once("exit", (code, signal) => {
-  if (signal) process.kill(process.pid, signal);
-  else process.exit(code ?? 1);
+  if (signal) {
+    // Re-raise so the parent's exit reflects the signal — but drop our own
+    // handler first, or the re-raise re-enters it and the process hangs.
+    process.removeAllListeners(signal);
+    process.kill(process.pid, signal);
+  } else {
+    process.exit(code ?? 1);
+  }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sproutboat",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Wrangler-shaped CLI for Sproutboat. Deploys workers to any control plane via --api-url / SPROUTBOAT_API_URL.",
   "keywords": [
     "cli",
@@ -76,12 +76,6 @@
     "oxlint": "1.81.0",
     "typescript": "7.0.2"
   },
-  "optionalDependencies": {
-    "@sproutboat/cli-darwin-arm64": "0.10.0",
-    "@sproutboat/cli-darwin-x64": "0.10.0",
-    "@sproutboat/cli-linux-arm64": "0.10.0",
-    "@sproutboat/cli-linux-x64": "0.10.0"
-  },
   "engines": {
     "node": ">=18"
   }

package/src/compile.ts

@@ -201,10 +201,21 @@ export async function compileSprout(input: CompileInput): Promise<void> {
   const launcher = resolve(porffor, "runtime/index.js");
   // A host build never shells `zig`, so it has no zigBin to contribute.
   const zigDir = input.zigBin ? `${dirname(input.zigBin)}:` : "";
+  // The per-platform binary ships esbuild next to it; a compiled build finds it
+  // there. Running from the npm package under Bun, `process.execPath` is Bun
+  // itself and `npm i -g` puts no dependency `.bin` on PATH, so resolve the
+  // esbuild dependency directly. `Bun.which` is the last resort.
   const packagedEsbuild = resolve(dirname(process.execPath), "esbuild");
-  const esbuild = existsSync(packagedEsbuild) ? packagedEsbuild : Bun.which("esbuild");
-  if (!esbuild)
-    throw new Error("the packaged esbuild executable is missing; reinstall the Sproutboat platform package");
+  let esbuild: string | null = existsSync(packagedEsbuild) ? packagedEsbuild : null;
+  if (!esbuild) {
+    try {
+      esbuild = Bun.resolveSync("esbuild/bin/esbuild", import.meta.dir);
+    } catch {
+      esbuild = null;
+    }
+  }
+  esbuild ??= Bun.which("esbuild");
+  if (!esbuild) throw new Error("esbuild could not be located; install it or reinstall sproutboat");
   const path = `${zigDir}${dirname(esbuild)}:${process.env.PATH ?? ""}`;
   const command = PACKAGED
     ? [process.execPath, "__porffor", launcher]

package/src/report.ts

@@ -2,10 +2,13 @@ import { gzipSync } from "bun";
 import { resourceRefs, type SproutboatConfig } from "./config";
 import type { ArtifactManifest } from "./manifest";
 import { bold, dim, leaf, sprout } from "./style";
+import pkg from "../package.json" with { type: "json" };
 
-// `bun build --compile` has no package-relative filesystem at runtime. The
-// release build injects this value; source development keeps the package value.
-export const CLI_VERSION = process.env.SPROUTBOAT_CLI_VERSION ?? "0.9.0";
+// `bun build --compile` has no package-relative filesystem at runtime, so the
+// release build injects this via `--define`. Running from source (or the npm
+// package under Bun) falls back to the bundled package.json version — `bun build
+// --compile` inlines the JSON import, so this branch is correct there too.
+export const CLI_VERSION = process.env.SPROUTBOAT_CLI_VERSION ?? pkg.version;
 
 function bytes(n: number): string {
   if (n < 1024) return `${n} B`;