claude-bridge-cli 1.4.0 → 1.5.1

package/bin/cli.js

@@ -41,9 +41,10 @@ function relayHttpBase(wsUrl) {
   return `${proto}//${u.host}`;
 }
 
-async function pairInteractive(relayWsUrl, machine) {
+async function pairInteractive(relayWsUrl, machine, ephemeral) {
   const base = relayHttpBase(relayWsUrl);
   process.stdout.write(`[bridge] Starting pair flow for "${machine}" against ${base}\n`);
+  if (ephemeral) process.stdout.write(`[bridge] Ephemeral mode — bearer will NOT be saved to disk.\n`);
 
   const startResp = await fetch(`${base}/pair-cli/start`, {
     method: "POST",
@@ -87,13 +88,16 @@ async function pairInteractive(relayWsUrl, machine) {
       throw new Error(`pair claim failed (${resp.status}): ${text}`);
     }
     const { bearer, machine: confirmed } = await resp.json();
-    console.log(`[bridge] ✓ Paired as "${confirmed}". Bearer saved to ${authFilePath()}`);
-
-    const auth = readAuthFile();
-    auth.bearers = auth.bearers || {};
-    auth.bearers[base] = auth.bearers[base] || {};
-    auth.bearers[base][confirmed] = bearer;
-    writeAuthFile(auth);
+    if (ephemeral) {
+      console.log(`[bridge] ✓ Paired as "${confirmed}" (in-memory only, nothing written to disk).`);
+    } else {
+      console.log(`[bridge] ✓ Paired as "${confirmed}". Bearer saved to ${authFilePath()}`);
+      const auth = readAuthFile();
+      auth.bearers = auth.bearers || {};
+      auth.bearers[base] = auth.bearers[base] || {};
+      auth.bearers[base][confirmed] = bearer;
+      writeAuthFile(auth);
+    }
     return bearer;
   }
   throw new Error("pair window expired — re-run to start over");
@@ -127,6 +131,9 @@ Relay options (connect to a remote relay server):
   --token <bearer>        Machine bearer (optional — if omitted, the CLI starts
                           a browser-OTP pair flow and caches the bearer at
                           ~/.claude-bridge/auth.json for next time)
+  --ephemeral             Pair on every start, never read/write auth.json.
+                          Forces a fresh browser-OTP each launch — use on
+                          machines you don't want to leave any saved bearer on.
   --cf-id <id>            Cloudflare Access Client ID (optional)
   --cf-secret <secret>    Cloudflare Access Client Secret (optional)
 
@@ -134,6 +141,7 @@ Environment variables:
   All options can be set via env vars with BRIDGE_ prefix:
   BRIDGE_PORT, BRIDGE_HOST, BRIDGE_CWD, BRIDGE_TIMEOUT,
   BRIDGE_RELAY_URL, BRIDGE_MACHINE_NAME, BRIDGE_MACHINE_TOKEN,
+  BRIDGE_EPHEMERAL=1 (force fresh pair every start, no saved bearer),
   BRIDGE_CF_ID, BRIDGE_CF_SECRET
 `;
 
@@ -161,6 +169,7 @@ function main() {
         "relay-url":  { type: "string", default: env("RELAY_URL", "") },
         machine:    { type: "string", default: env("MACHINE_NAME", "") },
         token:      { type: "string", default: env("MACHINE_TOKEN", "") },
+        ephemeral:  { type: "boolean", default: env("EPHEMERAL", "") === "1" },
         "cf-id":    { type: "string", default: env("CF_ID", "") },
         "cf-secret": { type: "string", default: env("CF_SECRET", "") },
       },
@@ -177,6 +186,7 @@ function main() {
         url: values["relay-url"],
         machine: values.machine,
         token: values.token,
+        ephemeral: !!values.ephemeral,
         cfId: values["cf-id"],
         cfSecret: values["cf-secret"],
       } : null,
@@ -238,15 +248,22 @@ async function run(config) {
       console.error("[bridge] ERROR: --machine required when using --relay-url");
       process.exit(1);
     }
-    // Resolve a bearer: --token > saved auth.json > interactive pair flow.
+    // Resolve a bearer:
+    //   --token            → use it directly (never look at auth.json)
+    //   --ephemeral        → always pair fresh, never read or write auth.json
+    //   default            → saved auth.json → fall back to pair flow on miss
     if (!config.relay.token) {
-      const saved = lookupSavedBearer(config.relay.url, config.relay.machine);
+      const saved = config.relay.ephemeral
+        ? null
+        : lookupSavedBearer(config.relay.url, config.relay.machine);
       if (saved) {
         config.relay.token = saved;
         console.log(`[bridge] Using saved bearer from ${authFilePath()}`);
       } else {
         try {
-          config.relay.token = await pairInteractive(config.relay.url, config.relay.machine);
+          config.relay.token = await pairInteractive(
+            config.relay.url, config.relay.machine, config.relay.ephemeral
+          );
         } catch (e) {
           console.error(`[bridge] ERROR: ${e.message}`);
           process.exit(1);

package/lib/bridge.js

@@ -418,11 +418,18 @@ function askClaude(config, { prompt, session_id, images, cwd, plan_mode, allow_t
     const isWin = process.platform === "win32";
     const isCmdShim = isWin && config.claudeBin.endsWith(".cmd");
 
-    // Only fall back to @file syntax for prompts that would exceed Windows
-    // cmd.exe's ~8K arg limit. Direct -p means the JSONL stores the actual
-    // prompt text (so session history shows the real user messages, not
-    // temp-file paths). Threshold is conservative: 6000 chars.
-    const useTempFile = finalPrompt.length > 6000;
+    // Fall back to @file syntax in two cases:
+    //  1) Prompt exceeds Windows cmd.exe's ~8K arg limit (threshold 6000).
+    //  2) Prompt contains a newline AND we're on Windows with a .cmd shim
+    //     — cmd.exe parses arg strings line-by-line and silently truncates
+    //     at the first \n, even with Node.js's proper argv quoting. Without
+    //     this fallback, any multi-line prompt to Claude on Windows lost
+    //     everything after line 1, and the model saw a stub message + the
+    //     header but none of the body. Manifested as "your message got
+    //     cut off" responses for prompts that LOOK short.
+    const useTempFile =
+      finalPrompt.length > 6000 ||
+      (isWin && isCmdShim && /\r|\n/.test(finalPrompt));
     let tmpFile = null;
     if (useTempFile) {
       tmpFile = path.join(os.tmpdir(), `claude-prompt-${Date.now()}-${Math.random().toString(36).slice(2)}.txt`);

package/lib/relay-client.js

@@ -46,6 +46,25 @@ function startRelay(config) {
     });
 
     ws.on("close", (code, reason) => {
+      // 4003 = bearer rejected by the relay (verify_machine_token failed).
+      // The bearer has been rotated or admin-removed; the cached one in
+      // auth.json is useless. Stop the reconnect loop and tell the user
+      // exactly how to recover.
+      if (code === 4003) {
+        const reasonStr = reason && reason.toString ? reason.toString() : "unauthorized";
+        console.error("");
+        console.error(`[relay] Authorization rejected (${code} ${reasonStr}).`);
+        console.error("[relay] The saved bearer no longer matches what the relay expects — it was probably rotated or revoked.");
+        console.error("[relay] Recover by deleting the cached auth and re-pairing:");
+        if (process.platform === "win32") {
+          console.error("    del %USERPROFILE%\\.claude-bridge\\auth.json");
+        } else {
+          console.error("    rm ~/.claude-bridge/auth.json");
+        }
+        console.error(`    claude-bridge-cli start --relay-url ${config.relay.url} --machine ${config.relay.machine}`);
+        console.error("");
+        process.exit(2);
+      }
       console.log(`[relay] Disconnected (${code}). Reconnecting in ${backoff / 1000}s...`);
       setTimeout(connect, backoff);
       backoff = Math.min(60000, backoff * 2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-bridge-cli",
-  "version": "1.4.0",
+  "version": "1.5.1",
   "description": "Use Claude Code from your browser. Runs a local server that connects your browser tools to the Claude CLI.",
   "main": "lib/bridge.js",
   "bin": {