loom-agent 1.2.16 → 1.2.18

package/bin/loom-bun.js

@@ -4,21 +4,20 @@
 const path = require("path");
 const { spawnSync } = require("child_process");
 
-// Bun discovers bunfig.toml ONLY from its starting cwd. npm's cmd-shim runs
-// this file under bun directly with the USER's cwd, so unless we are already
-// sitting in the package root we must respawn from there — otherwise the
-// Solid JSX preload never loads and the TUI dies on react/jsx-dev-runtime.
-const pkgRoot = path.join(__dirname, "..");
-const underBun = typeof Bun !== "undefined" && !!process.versions.bun;
-const inPkgRoot = path.resolve(process.cwd()) === path.resolve(pkgRoot);
-if (!underBun || !inPkgRoot) {
+// Node-shim path: bun is required for plugins/JSX, so hand off ONCE.
+// We deliberately do NOT respawn when already under bun — respawning hands
+// the console to a child and OpenTUI's terminal-capability handshake
+// (DA1/OSC/DECRQM queries) then gets echoed instead of consumed, leaving a
+// frozen splash. Instead we register the Solid JSX plugin programmatically
+// below, which is exactly what the bunfig preload would have done.
+if (!(typeof Bun !== "undefined" && process.versions.bun)) {
   const result = spawnSync(
     process.platform === "win32" ? "bun.exe" : "bun",
-    ["--conditions=browser", __filename, ...process.argv.slice(2)],
+    [__filename, ...process.argv.slice(2)],
     {
       stdio: "inherit",
-      cwd: pkgRoot,
-      env: { ...process.env, LOOM_START_CWD: process.env.LOOM_START_CWD || process.cwd() },
+      cwd: process.cwd(),
+      env: process.env,
       windowsHide: false,
     }
   );
@@ -28,6 +27,20 @@ if (!underBun || !inPkgRoot) {
   }
   process.exit(result.status == null ? 1 : result.status);
 }
+
+// Running under bun at the USER's cwd. bunfig.toml was therefore NOT loaded
+// (bun only discovers it from its starting cwd), so register its preload
+// chain manually, in the same order, before any app module loads:
+//   1. our crash black-box / console fixes
+//   2. @opentui/solid/preload — the Solid JSX transform plugin
+require(path.join(__dirname, "..", "src", "tui-preload.js"));
+require("@opentui/solid/preload");
+
+// Restore the user's project directory before app modules evaluate.
+if (process.env.LOOM_START_CWD) {
+  try { process.chdir(process.env.LOOM_START_CWD); } catch {}
+}
+
 process.title = "loom-code";
 (async () => {
   try {
@@ -37,4 +50,4 @@ process.title = "loom-code";
     console.error(err && err.message ? err.message : String(err));
     process.exit(1);
   }
-})();
+})();

package/bin/loom-tui.js

@@ -1,30 +1,37 @@
-#!/usr/bin/env bun
-// npm invokes bin targets through Node on Windows, so re-launch under Bun
-// when this file was not started by Bun itself.
-const path = require("path");
-const { spawnSync } = require("child_process");
-
-// Bun discovers bunfig.toml ONLY from its starting cwd (see bin/loom-bun.js).
-const pkgRoot = path.join(__dirname, "..");
-const underBun = typeof Bun !== "undefined" && !!process.versions.bun;
-const inPkgRoot = path.resolve(process.cwd()) === path.resolve(pkgRoot);
-if (!underBun || !inPkgRoot) {
-	const result = spawnSync(
-		process.platform === "win32" ? "bun.exe" : "bun",
-		["--conditions=browser", __filename, ...process.argv.slice(2)],
-		{
-			stdio: "inherit",
-			cwd: pkgRoot,
-			env: { ...process.env, LOOM_START_CWD: process.env.LOOM_START_CWD || process.cwd() },
-			windowsHide: false,
-		}
-	);
-	if (result.error) {
-		console.error("[loom] Bun is required for the TUI. Install it from https://bun.sh/");
-		process.exit(1);
-	}
-	process.exit(result.status == null ? 1 : result.status);
-}
-
-require("../src/tui-preload.js");
-(async () => { await import("../src/tui-open.tsx"); })();
+#!/usr/bin/env bun
+// npm invokes bin targets through Node on Windows, so re-launch under Bun
+// when this file was not started by Bun itself.
+const path = require("path");
+const { spawnSync } = require("child_process");
+
+// Node-shim path only — never respawn when already under bun (see
+// bin/loom-bun.js for why: the console handoff breaks OpenTUI's terminal
+// capability handshake and freezes the splash).
+if (!(typeof Bun !== "undefined" && process.versions.bun)) {
+	const result = spawnSync(
+		process.platform === "win32" ? "bun.exe" : "bun",
+		[__filename, ...process.argv.slice(2)],
+		{
+			stdio: "inherit",
+			cwd: process.cwd(),
+			env: process.env,
+			windowsHide: false,
+		}
+	);
+	if (result.error) {
+		console.error("[loom] Bun is required for the TUI. Install it from https://bun.sh/");
+		process.exit(1);
+	}
+	process.exit(result.status == null ? 1 : result.status);
+}
+
+// Under bun at the user's cwd — bunfig.toml wasn't discovered, so register
+// the preload chain manually (same order as bunfig.toml).
+require(path.join(__dirname, "..", "src", "tui-preload.js"));
+require("@opentui/solid/preload");
+
+if (process.env.LOOM_START_CWD) {
+	try { process.chdir(process.env.LOOM_START_CWD); } catch {}
+}
+
+(async () => { await import("../src/tui-open.tsx"); })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "loom-agent",
-  "version": "1.2.16",
+  "version": "1.2.18",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/toshalkumbhar8979-design/loomcode.git"

package/src/core/cli.js

@@ -579,10 +579,7 @@ if (args.includes('--help') || args.includes('-h')) {
         process.env.LOOM_START_CWD = process.cwd();
         process.env.LOOM_BIN_NAME = "loom";
         process.env.BUN_CONFIG = path.join(pkgRoot, "bunfig.toml");
-        // --conditions=browser pins Solid to its client build (see
-        // bin/loom-tui.js) — without it the SSR build loads and the TUI
-        // renders one static frame then never updates.
-        const tuiArgs = ["--conditions=browser", tuiEntry];
+        const tuiArgs = [tuiEntry];
         if (sessionId) tuiArgs.push('-s', sessionId);
         if (autoMode) tuiArgs.push('--auto');
         const prompt = promptArgs.join(' ');