From ae86d10f40c3cda16b8222ba4751b4e21adf495b Mon Sep 17 00:00:00 2001
From: garrytan <garrytan@gmail.com>
Date: Sat, 3 Oct 2026 21:25:46 +0000
Subject: [PATCH] D0: pass the Bun child flags after 'run' so wrappers that
 rewrite 'bun run' argv keep working

bun run --no-env-file --config=/dev/null <script> has the same effect
(verified on Bun 1.4.0) and keeps argv[1] === 'run', which the
publication-lock fixture's preload injection relies on. The sidebar-tabs
source guard now expects the flags in the terminal-agent spawn.
---
 browse/src/cli.ts                    | 2 +-
 browse/src/terminal-agent-control.ts | 2 +-
 browse/test/sidebar-tabs.test.ts     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/browse/src/cli.ts b/browse/src/cli.ts
index 5e7c0d0e7..0bc17876e 100644
--- a/browse/src/cli.ts
+++ b/browse/src/cli.ts
@@ -667,7 +667,7 @@ async function startServer(extraEnv?: Record<string, string>): Promise<ServerSta
     // (PPID=1, STAT=Ss) and survives the spawning shell's exit. Mirrors
     // the Windows path's rationale — same root cause, different OS API.
     const daemonLogFd = openDaemonLogSink();
-    const child = nodeSpawn('bun', [...BUN_CHILD_FLAGS, 'run', server.script], {
+    const child = nodeSpawn('bun', ['run', ...BUN_CHILD_FLAGS, server.script], {
       detached: true,
       windowsHide: true,
       stdio: ['ignore', daemonLogFd, daemonLogFd],
diff --git a/browse/src/terminal-agent-control.ts b/browse/src/terminal-agent-control.ts
index d64818a37..c07974910 100644
--- a/browse/src/terminal-agent-control.ts
+++ b/browse/src/terminal-agent-control.ts
@@ -204,7 +204,7 @@ export function spawnTerminalAgent(opts: {
     writeAgentRecord(stateDir, reservation);
     let proc: any;
     try {
-      proc = (Bun as any).spawn(['bun', ...BUN_CHILD_FLAGS, 'run', script, `--agent-gen=${gen}`], {
+      proc = (Bun as any).spawn(['bun', 'run', ...BUN_CHILD_FLAGS, script, `--agent-gen=${gen}`], {
         cwd: opts.cwd || process.cwd(),
         env: {
           ...process.env,
diff --git a/browse/test/sidebar-tabs.test.ts b/browse/test/sidebar-tabs.test.ts
index a7d2fc93f..40e4edbd7 100644
--- a/browse/test/sidebar-tabs.test.ts
+++ b/browse/test/sidebar-tabs.test.ts
@@ -233,7 +233,7 @@ describe('cli.ts: sidebar-agent is no longer spawned', () => {
       'utf-8',
     );
     expect(CONTROL_SRC).toContain('terminal-agent.ts');
-    expect(CONTROL_SRC).toMatch(/\.spawn\(\['bun',\s*'run',\s*script,\s*`--agent-gen=\$\{gen\}`\]/);
+    expect(CONTROL_SRC).toMatch(/\.spawn\(\['bun',\s*'run',\s*\.\.\.BUN_CHILD_FLAGS,\s*script,\s*`--agent-gen=\$\{gen\}`\]/);
     expect(CONTROL_SRC).toContain('BROWSE_OWNER_PID: String(opts.ownerPid)');
   });
 });