claudekit-cli 3.39.3-dev.2 → 3.39.3-dev.3

package/bin/ck.js

@@ -1,12 +1,11 @@
 #!/usr/bin/env node
 
 /**
- * Wrapper script that detects platform and executes the correct binary.
- * Falls back to Node.js execution if binary fails (e.g., Alpine/musl).
- * This is the entry point that NPM symlinks to when installing globally.
+ * CLI entry point — runs dist/index.js via Bun (preferred) or Node.js (fallback).
+ * This is the file NPM symlinks to when installing globally.
  */
 
-import { execSync, spawn, spawnSync } from "node:child_process";
+import { execSync, spawnSync } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -24,7 +23,7 @@ const checkNodeVersion = () => {
 
 	if (major < minMajor || (major === minMajor && minor < minMinor)) {
 		console.error(
-			`❌ Node.js ${MIN_NODE_VERSION.join(".")}+ is required. Current version: ${process.versions.node}`,
+			`[X] Node.js ${MIN_NODE_VERSION.join(".")}+ is required. Current version: ${process.versions.node}`,
 		);
 		console.error("   Please upgrade Node.js: https://nodejs.org/");
 		process.exit(1);
@@ -36,10 +35,6 @@ checkNodeVersion();
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
-// Detect platform and architecture
-const platform = process.platform;
-const arch = process.arch;
-
 /**
  * Extract error message safely with type guard
  */
@@ -49,9 +44,8 @@ const getErrorMessage = (err) => {
 
 /**
  * Check if bun runtime is available on the system.
- * Used to run dist/index.js with bun when no platform binary exists (e.g., dev releases).
  * dist/index.js may contain bun-specific imports (bun:sqlite) that Node.js can't handle.
- * Result is cached to avoid repeated execSync calls across fallback paths.
+ * Result is cached to avoid repeated execSync calls.
  */
 let _bunAvailable = undefined;
 const hasBun = () => {
@@ -78,35 +72,12 @@ const readInstalledPackageVersion = () => {
 	return _installedVersion;
 };
 
-const isExpectedBunOnlyRelease = () => {
+const isDevPrerelease = () => {
 	const version = readInstalledPackageVersion();
 	return typeof version === "string" && /-dev\.\d+$/i.test(version);
 };
 
-const shouldWarnForBunFallback = () => !isExpectedBunOnlyRelease();
-const RUNTIME_FATAL_SIGNALS = new Set(["SIGABRT", "SIGBUS", "SIGILL", "SIGSEGV", "SIGTRAP"]);
-
-const handleRuntimeSignalExit = (signal, sourceLabel) => {
-	if (!signal) return;
-	if (!RUNTIME_FATAL_SIGNALS.has(signal)) {
-		process.kill(process.pid, signal);
-		return;
-	}
-
-	console.error(`❌ ${sourceLabel} crashed with ${signal}`);
-	if (signal === "SIGILL") {
-		console.error(
-			"This usually means the bundled executable requires newer CPU instructions than this machine provides.",
-		);
-		console.error(
-			"On Linux x64, install a release that includes the baseline-compatible binary build.",
-		);
-	} else {
-		console.error("The bundled executable crashed before ClaudeKit could finish starting.");
-	}
-	console.error("If this persists, report it at: https://github.com/mrgoonie/claudekit-cli/issues");
-	process.exit(1);
-};
+const shouldWarnForBunFallback = () => !isDevPrerelease();
 
 /**
  * Run CLI via bun runtime. Preferred over Node.js when dist/index.js contains
@@ -123,7 +94,7 @@ const runWithBun = (showWarning = false) => {
 		throw new Error("Compiled distribution not found. This may indicate a packaging issue.");
 	}
 	if (showWarning) {
-		console.error("⚠️  Native binary not found, using bun runtime");
+		console.error("[i] Using bun runtime");
 	}
 	const result = spawnSync("bun", [distPath, ...process.argv.slice(2)], {
 		stdio: "inherit",
@@ -134,16 +105,14 @@ const runWithBun = (showWarning = false) => {
 		return false;
 	}
 	if (result.signal) {
-		handleRuntimeSignalExit(result.signal, "Bun runtime");
+		process.kill(process.pid, result.signal);
 	}
 	process.exit(result.status || 0);
 };
 
 /**
  * Run CLI via Node.js as last-resort fallback (slower, no bun: protocol support).
- * The imported dist/index.js handles its own process lifecycle via the cac CLI framework.
  * @param {boolean} showWarning - Whether to show fallback warning message
- * @throws {Error} If dist/index.js is missing or fails to load
  */
 const runWithNode = async (showWarning = false) => {
 	const distPath = join(__dirname, "..", "dist", "index.js");
@@ -151,10 +120,8 @@ const runWithNode = async (showWarning = false) => {
 		throw new Error("Compiled distribution not found. This may indicate a packaging issue.");
 	}
 	if (showWarning) {
-		console.error("⚠️  Native binary failed, using Node.js fallback (slower startup)");
+		console.error("[i] Using Node.js runtime (slower startup)");
 	}
-	// The CLI module handles process.exit() internally after command execution
-	// Convert to file:// URL for cross-platform ESM compatibility (Windows paths require this)
 	const distUrl = pathToFileURL(distPath).href;
 	try {
 		await import(distUrl);
@@ -164,117 +131,31 @@ const runWithNode = async (showWarning = false) => {
 };
 
 /**
- * Map platform/arch to binary filename
+ * Main execution — try Bun first, fall back to Node.js
  */
-const getBinaryPath = () => {
-	const binaryMap = {
-		"darwin-arm64": "ck-darwin-arm64",
-		"darwin-x64": "ck-darwin-x64",
-		"linux-x64": "ck-linux-x64",
-		"win32-x64": "ck-win32-x64.exe",
-	};
-
-	const key = `${platform}-${arch}`;
-	const binaryName = binaryMap[key];
-
-	if (!binaryName) {
-		// Unsupported platform - try Node.js fallback
-		return null;
-	}
-
-	return join(__dirname, binaryName);
-};
-
-/**
- * Execute binary with fallback to Node.js on failure.
- * Uses Promise-based approach to avoid race conditions between error and exit events.
- *
- * Note: This Promise intentionally never rejects - all error paths call process.exit()
- * directly since this is a CLI entry point. The Promise is used purely for async flow
- * control and race condition prevention, not for error propagation.
- *
- * @param {string} binaryPath - Path to the platform-specific binary
- * @returns {Promise<void>} Resolves when fallback completes (binary exit calls process.exit directly)
- */
-const runBinary = (binaryPath) => {
-	return new Promise((resolve) => {
-		const child = spawn(binaryPath, process.argv.slice(2), {
-			stdio: "inherit",
-			windowsHide: true,
-		});
-
-		let errorOccurred = false;
-
-		child.on("error", async (err) => {
-			// Binary execution failed (e.g., ENOENT on Alpine/musl due to missing glibc)
-			// Fall back to bun (exits process on success), then Node.js
-			errorOccurred = true;
-			if (hasBun()) {
-				// runWithBun calls process.exit() on success — won't return here
-				runWithBun(true);
-			}
-			try {
-				await runWithNode(true);
-				resolve();
-			} catch (fallbackErr) {
-				const fallbackMsg = getErrorMessage(fallbackErr);
-				console.error(`❌ Binary failed: ${getErrorMessage(err)}`);
-				console.error(`❌ Fallback also failed: ${fallbackMsg}`);
-				if (fallbackMsg.includes("bun:") || fallbackMsg.includes("Received protocol")) {
-					console.error("");
-					console.error("This version of ClaudeKit CLI requires the bun runtime.");
-					console.error("Install bun:  curl -fsSL https://bun.sh/install | bash");
-					console.error("Or switch to stable:  npm install -g claudekit-cli@latest");
-				} else {
-					console.error(
-						"Please report this issue at: https://github.com/mrgoonie/claudekit-cli/issues",
-					);
-				}
-				process.exit(1);
-			}
-		});
-
-		child.on("exit", (code, signal) => {
-			// Don't handle exit if error handler is managing fallback
-			if (errorOccurred) return;
-
-			if (signal) {
-				handleRuntimeSignalExit(signal, "Native binary");
-				return;
-			}
-			// Use exitCode instead of exit() for proper handle cleanup on Windows
-			// This prevents libuv assertion failures on Node.js 23.x/24.x/25.x
-			// See: https://github.com/nodejs/node/issues/56645
-			process.exitCode = code || 0;
-			resolve();
-		});
-	});
-};
+const main = async () => {
+	const showBunWarning = shouldWarnForBunFallback();
 
-/**
- * Handle fallback execution: try bun first (handles bun: imports), then Node.js.
- * @param {string} errorPrefix - Prefix for error message if all fallbacks fail
- * @param {boolean} showIssueLink - Whether to show issue reporting link
- */
-const handleFallback = async (errorPrefix, showIssueLink = false, showBunWarning = true) => {
 	// Prefer bun — dist/index.js may contain bun-specific imports (bun:sqlite)
-	// runWithBun calls process.exit() on success — won't return here
 	if (hasBun()) {
-		runWithBun(showBunWarning);
+		const bunOk = runWithBun(false);
+		if (!bunOk && showBunWarning) {
+			console.error("[i] Bun spawn failed, falling back to Node.js");
+		}
 	}
+
 	// Last resort: Node.js (works for stable builds without bun: imports)
 	try {
-		await runWithNode();
+		await runWithNode(showBunWarning);
 	} catch (err) {
 		const errMsg = getErrorMessage(err);
-		console.error(`❌ ${errorPrefix}: ${errMsg}`);
-		// Detect bun-specific import failures and guide user to install bun
+		console.error(`[X] Failed to run CLI: ${errMsg}`);
 		if (errMsg.includes("bun:") || errMsg.includes("Received protocol")) {
 			console.error("");
 			console.error("This version of ClaudeKit CLI requires the bun runtime.");
 			console.error("Install bun:  curl -fsSL https://bun.sh/install | bash");
 			console.error("Or switch to stable:  npm install -g claudekit-cli@latest");
-		} else if (showIssueLink) {
+		} else {
 			console.error(
 				"Please report this issue at: https://github.com/mrgoonie/claudekit-cli/issues",
 			);
@@ -283,23 +164,4 @@ const handleFallback = async (errorPrefix, showIssueLink = false, showBunWarning
 	}
 };
 
-/**
- * Main execution - determine which path to take
- */
-const main = async () => {
-	const binaryPath = getBinaryPath();
-	const showBunWarning = shouldWarnForBunFallback();
-
-	if (!binaryPath) {
-		// No binary for this platform - use Node.js fallback
-		await handleFallback("Failed to run CLI", false, showBunWarning);
-	} else if (!existsSync(binaryPath)) {
-		// Binary should exist but doesn't - try fallback
-		await handleFallback("Binary not found and fallback failed", true, showBunWarning);
-	} else {
-		// Execute the binary (handles its own fallback on error)
-		await runBinary(binaryPath);
-	}
-};
-
 main();

package/dist/index.js

@@ -57245,7 +57245,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "3.39.3-dev.2",
+    version: "3.39.3-dev.3",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -57261,10 +57261,6 @@ var init_package = __esm(() => {
     },
     files: [
       "bin/ck.js",
-      "bin/ck-linux-x64",
-      "bin/ck-darwin-arm64",
-      "bin/ck-darwin-x64",
-      "bin/ck-win32-x64.exe",
       "dist/index.js",
       "dist/ui/"
     ],
@@ -57274,12 +57270,7 @@ var init_package = __esm(() => {
       "ui:build": "cd src/ui && bun install --silent && bun run build",
       "ui:dev": "cd src/ui && bun run dev",
       build: `bun build src/index.ts --outdir dist --target node --external @octokit/rest && node -e "const fs=require('fs'),f='dist/index.js',c=fs.readFileSync(f,'utf-8');fs.writeFileSync(f,c.replace(/^#!.*\\n\\/\\/ @bun\\n/,''))"`,
-      compile: "bun run ui:build && bun run scripts/compile-binary.ts",
-      "compile:binary": "bun run ui:build && bun run scripts/compile-binary.ts --outfile bin/ck && cp bin/ck /usr/local/bin/ck && echo '✅ Installed globally: /usr/local/bin/ck'",
-      "compile:binaries": "node scripts/build-all-binaries.js",
-      "check-version-sync": "node scripts/check-binary-version-sync.js",
       "verify:package": "node scripts/prepublish-check.js",
-      "build:platform-binaries": "bun run scripts/build-platform-binaries.js",
       test: "bun test",
       "test:integration": "CK_RUN_CLI_INTEGRATION=1 bun test tests/integration/cli.test.ts",
       "test:watch": "bun test --watch",
@@ -59682,65 +59673,8 @@ var init_routes = __esm(() => {
 
 // src/domains/web-server/static-server.ts
 import { existsSync as existsSync40 } from "node:fs";
-import { dirname as dirname18, extname as extname4, join as join50, resolve as resolve13 } from "node:path";
+import { dirname as dirname18, join as join50, resolve as resolve13 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
-function tryServeFromEmbedded(app) {
-  if (typeof globalThis.Bun === "undefined" || !globalThis.Bun.embeddedFiles?.length) {
-    return false;
-  }
-  let prefix = "";
-  for (const blob of globalThis.Bun.embeddedFiles) {
-    const name = blob.name;
-    if (name === "index.html" || name.endsWith("/index.html")) {
-      prefix = name.replace("index.html", "");
-      break;
-    }
-  }
-  const fileMap = new Map;
-  let indexBlob = null;
-  for (const blob of globalThis.Bun.embeddedFiles) {
-    const rawName = blob.name;
-    const name = prefix && rawName.startsWith(prefix) ? rawName.slice(prefix.length) : rawName;
-    fileMap.set(name, blob);
-    if (name === "index.html") {
-      indexBlob = blob;
-    }
-  }
-  if (!indexBlob) {
-    logger.debug("Embedded files found but no index.html — skipping embedded serving");
-    return false;
-  }
-  logger.debug(`Serving UI from ${fileMap.size} embedded files`);
-  app.use(async (req, res, next) => {
-    if (req.path.startsWith("/api/") || req.path === "/ws" || req.path.startsWith("/ws/")) {
-      return next();
-    }
-    const reqPath = req.path.replace(/^\//, "");
-    if (reqPath.includes("..") || reqPath.includes("\x00")) {
-      return next();
-    }
-    const blob = fileMap.get(reqPath);
-    if (blob) {
-      const ext = extname4(reqPath);
-      const contentType = blob.type || MIME_FALLBACK[ext] || "application/octet-stream";
-      res.setHeader("Content-Type", contentType);
-      const cacheControl = ext === ".html" ? "no-cache" : "public, max-age=31536000, immutable";
-      res.setHeader("Cache-Control", cacheControl);
-      res.send(Buffer.from(await blob.arrayBuffer()));
-      return;
-    }
-    const hasExt = req.path.match(/\.(js|css|ico|png|jpg|svg|woff2?)$/);
-    if (!hasExt && indexBlob) {
-      const contentType = indexBlob.type || "text/html";
-      res.setHeader("Content-Type", contentType);
-      res.setHeader("Cache-Control", "no-cache");
-      res.send(Buffer.from(await indexBlob.arrayBuffer()));
-      return;
-    }
-    return next();
-  });
-  return true;
-}
 function addRuntimeUiCandidate(candidates, runtimePath) {
   if (!runtimePath) {
     return;
@@ -59755,7 +59689,6 @@ function addRuntimeUiCandidate(candidates, runtimePath) {
 }
 function resolveUiDistPath() {
   const candidates = new Set;
-  addRuntimeUiCandidate(candidates, process.execPath);
   addRuntimeUiCandidate(candidates, process.argv[1]);
   candidates.add(join50(__dirname3, "ui"));
   candidates.add(join50(process.cwd(), "dist", "ui"));
@@ -59768,9 +59701,6 @@ function resolveUiDistPath() {
   return Array.from(candidates)[0] ?? join50(process.cwd(), "dist", "ui");
 }
 function serveStatic(app) {
-  if (tryServeFromEmbedded(app)) {
-    return;
-  }
   const uiDistPath = resolveUiDistPath();
   if (!existsSync40(uiDistPath)) {
     logger.warning(`UI dist not found at ${uiDistPath}. Run 'bun run ui:build' first.`);
@@ -59808,22 +59738,11 @@ function serveStatic(app) {
   });
   logger.debug(`Serving static files from ${uiDistPath}`);
 }
-var import_express, __dirname3, MIME_FALLBACK;
+var import_express, __dirname3;
 var init_static_server = __esm(() => {
   init_logger();
   import_express = __toESM(require_express2(), 1);
   __dirname3 = dirname18(fileURLToPath2(import.meta.url));
-  MIME_FALLBACK = {
-    ".html": "text/html",
-    ".js": "application/javascript",
-    ".css": "text/css",
-    ".json": "application/json",
-    ".svg": "image/svg+xml",
-    ".png": "image/png",
-    ".ico": "image/x-icon",
-    ".woff2": "font/woff2",
-    ".woff": "font/woff"
-  };
 });
 
 // node_modules/ws/lib/constants.js
@@ -95974,7 +95893,7 @@ import { join as join108 } from "node:path";
 init_logger();
 import { readFile as readFile47, readdir as readdir30, writeFile as writeFile28 } from "node:fs/promises";
 import { platform as platform12 } from "node:os";
-import { extname as extname6, join as join107 } from "node:path";
+import { extname as extname5, join as join107 } from "node:path";
 var IS_WINDOWS2 = platform12() === "win32";
 function getOpenCodeGlobalPath() {
   return "$HOME/.config/opencode/";
@@ -96025,7 +95944,7 @@ function transformOpenCodeContent(content) {
   return { transformed, changes };
 }
 function shouldTransformFile2(filename) {
-  const ext2 = extname6(filename).toLowerCase();
+  const ext2 = extname5(filename).toLowerCase();
   return TRANSFORMABLE_EXTENSIONS2.has(ext2);
 }
 async function transformPathsForGlobalOpenCode(directory, options2 = {}) {
@@ -97606,7 +97525,7 @@ async function transformFolderPaths(extractDir, folders, options2 = {}) {
 init_logger();
 import { readFile as readFile51, readdir as readdir33, writeFile as writeFile32 } from "node:fs/promises";
 import { platform as platform13 } from "node:os";
-import { extname as extname7, join as join115 } from "node:path";
+import { extname as extname6, join as join115 } from "node:path";
 var IS_WINDOWS3 = platform13() === "win32";
 var HOME_PREFIX = IS_WINDOWS3 ? "%USERPROFILE%" : "$HOME";
 function getHomeDirPrefix() {
@@ -97706,7 +97625,7 @@ function transformContent(content) {
   return { transformed, changes };
 }
 function shouldTransformFile3(filename) {
-  const ext2 = extname7(filename).toLowerCase();
+  const ext2 = extname6(filename).toLowerCase();
   const basename16 = filename.split("/").pop() || filename;
   return TRANSFORMABLE_EXTENSIONS3.has(ext2) || ALWAYS_TRANSFORM_FILES.has(basename16);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "claudekit-cli",
-	"version": "3.39.3-dev.2",
+	"version": "3.39.3-dev.3",
 	"description": "CLI tool for bootstrapping and updating ClaudeKit projects",
 	"type": "module",
 	"repository": {
@@ -16,10 +16,6 @@
 	},
 	"files": [
 		"bin/ck.js",
-		"bin/ck-linux-x64",
-		"bin/ck-darwin-arm64",
-		"bin/ck-darwin-x64",
-		"bin/ck-win32-x64.exe",
 		"dist/index.js",
 		"dist/ui/"
 	],
@@ -29,12 +25,7 @@
 		"ui:build": "cd src/ui && bun install --silent && bun run build",
 		"ui:dev": "cd src/ui && bun run dev",
 		"build": "bun build src/index.ts --outdir dist --target node --external @octokit/rest && node -e \"const fs=require('fs'),f='dist/index.js',c=fs.readFileSync(f,'utf-8');fs.writeFileSync(f,c.replace(/^#!.*\\n\\/\\/ @bun\\n/,''))\"",
-		"compile": "bun run ui:build && bun run scripts/compile-binary.ts",
-		"compile:binary": "bun run ui:build && bun run scripts/compile-binary.ts --outfile bin/ck && cp bin/ck /usr/local/bin/ck && echo '✅ Installed globally: /usr/local/bin/ck'",
-		"compile:binaries": "node scripts/build-all-binaries.js",
-		"check-version-sync": "node scripts/check-binary-version-sync.js",
 		"verify:package": "node scripts/prepublish-check.js",
-		"build:platform-binaries": "bun run scripts/build-platform-binaries.js",
 		"test": "bun test",
 		"test:integration": "CK_RUN_CLI_INTEGRATION=1 bun test tests/integration/cli.test.ts",
 		"test:watch": "bun test --watch",