Add --no-web terminal mode and fix bypass permissions stream handling

- Add --no-web CLI option for terminal-only mode (no browser)
- Implement terminal attach with proper PTY size handling and resize support
- Fix bypass permissions setup to consume stream data (prevents hanging)
- Use settings.local.json with correct format for bypass mode config

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: jlaustill

src/cli.ts

@@ -125,6 +125,7 @@ program
     "Start with 'claude' or 'bash' shell",
     /^(claude|bash)$/i,
   )
+  .option("--no-web", "Disable web UI (use terminal attach)")
   .action(async (options) => {
     console.log(chalk.blue("🚀 Starting new Claude Sandbox container..."));
 
@@ -136,6 +137,7 @@ program
     config.targetBranch = options.branch;
     config.remoteBranch = options.remoteBranch;
     config.prNumber = options.pr;
+    config.useWebUI = options.web !== false;
     if (options.shell) {
       config.defaultShell = options.shell.toLowerCase();
     }

src/container.ts

@@ -851,18 +851,7 @@ exec claude --dangerously-skip-permissions' > /start-claude.sh && \\
     try {
       console.log(chalk.blue("• Configuring bypass permissions mode..."));
 
-      // Create or update settings.json to enable bypass permissions mode
-      // This skips the "By proceeding, you accept all responsibility" confirmation prompt
-      const settingsContent = JSON.stringify(
-        {
-          permissions: {
-            defaultMode: "bypassPermissions",
-          },
-        },
-        null,
-        2,
-      );
-
+      // The settings need to have defaultMode at the root level per Claude Code docs
       const setupExec = await container.exec({
         Cmd: [
           "/bin/bash",
@@ -871,26 +860,34 @@ exec claude --dangerously-skip-permissions' > /start-claude.sh && \\
           # Ensure .claude directory exists
           mkdir -p /home/claude/.claude &&
 
-          # Check if settings.json exists
-          if [ -f /home/claude/.claude/settings.json ]; then
-            # Merge with existing settings using jq if available, otherwise replace
+          # Update settings.local.json to set bypass permissions mode
+          # Using settings.local.json as it takes precedence for user preferences
+          SETTINGS_FILE="/home/claude/.claude/settings.local.json"
+
+          if [ -f "$SETTINGS_FILE" ]; then
+            # File exists - try to merge with jq, fallback to simple approach
             if command -v jq &> /dev/null; then
-              # Use jq to merge settings, preserving existing values
-              jq '.permissions.defaultMode = "bypassPermissions"' /home/claude/.claude/settings.json > /tmp/settings.json.tmp &&
-              mv /tmp/settings.json.tmp /home/claude/.claude/settings.json
+              jq '. + {"defaultMode": "bypassPermissions"}' "$SETTINGS_FILE" > /tmp/settings.tmp && mv /tmp/settings.tmp "$SETTINGS_FILE"
             else
-              # No jq, just overwrite (existing settings will be lost)
-              echo '${settingsContent}' > /home/claude/.claude/settings.json
+              # No jq - use python if available
+              python3 -c "
+import json
+with open('$SETTINGS_FILE', 'r') as f:
+    data = json.load(f)
+data['defaultMode'] = 'bypassPermissions'
+with open('$SETTINGS_FILE', 'w') as f:
+    json.dump(data, f, indent=2)
+" 2>/dev/null || echo '{"defaultMode": "bypassPermissions"}' > "$SETTINGS_FILE"
             fi
           else
             # Create new settings file
-            echo '${settingsContent}' > /home/claude/.claude/settings.json
+            echo '{"defaultMode": "bypassPermissions"}' > "$SETTINGS_FILE"
           fi &&
 
           # Fix permissions
           chown -R claude:claude /home/claude/.claude &&
           chmod 700 /home/claude/.claude &&
-          chmod 600 /home/claude/.claude/settings.json
+          chmod 600 "$SETTINGS_FILE"
           `,
         ],
         AttachStdout: true,
@@ -899,8 +896,9 @@ exec claude --dangerously-skip-permissions' > /start-claude.sh && \\
 
       const stream = await setupExec.start({});
 
-      // Wait for completion
+      // Wait for completion (must consume stream data for it to end)
       await new Promise<void>((resolve, reject) => {
+        stream.on("data", () => {}); // Consume data to allow stream to end
         stream.on("end", resolve);
         stream.on("error", reject);
       });

src/index.ts

@@ -156,25 +156,33 @@ export class ClaudeSandbox {
       await this.gitMonitor.start(branchName);
       console.log(chalk.blue("✓ Git monitoring started"));
 
-      // Always launch web UI
-      this.webServer = new WebUIServer(this.docker);
+      // Launch web UI or attach to terminal directly
+      if (this.config.useWebUI !== false) {
+        this.webServer = new WebUIServer(this.docker);
 
-      // Pass repo info to web server
-      this.webServer.setRepoInfo(process.cwd(), branchName);
+        // Pass repo info to web server
+        this.webServer.setRepoInfo(process.cwd(), branchName);
 
-      const webUrl = await this.webServer.start();
+        const webUrl = await this.webServer.start();
 
-      // Open browser to the web UI with container ID
-      const fullUrl = `${webUrl}?container=${containerId}`;
-      await this.webServer.openInBrowser(fullUrl);
+        // Open browser to the web UI with container ID
+        const fullUrl = `${webUrl}?container=${containerId}`;
+        await this.webServer.openInBrowser(fullUrl);
 
-      console.log(chalk.green(`\n✓ Web UI available at: ${fullUrl}`));
-      console.log(
-        chalk.yellow("Keep this terminal open to maintain the session"),
-      );
+        console.log(chalk.green(`\n✓ Web UI available at: ${fullUrl}`));
+        console.log(
+          chalk.yellow("Keep this terminal open to maintain the session"),
+        );
 
-      // Keep the process running
-      await new Promise(() => {}); // This will keep the process alive
+        // Keep the process running
+        await new Promise(() => {}); // This will keep the process alive
+      } else {
+        // Terminal mode - attach directly to container
+        console.log(chalk.green("\n✓ Attaching to container terminal..."));
+        console.log(chalk.yellow("Press Ctrl+P, Ctrl+Q to detach\n"));
+
+        await this.attachToContainer(containerId);
+      }
     } catch (error) {
       console.error(chalk.red("Error:"), error);
       throw error;
@@ -267,6 +275,77 @@ export class ClaudeSandbox {
       await this.webServer.stop();
     }
   }
+
+  private async attachToContainer(containerId: string): Promise<void> {
+    const container = this.docker.getContainer(containerId);
+
+    // Get current terminal size
+    const getTerminalSize = () => ({
+      h: process.stdout.rows || 24,
+      w: process.stdout.columns || 80,
+    });
+
+    const termSize = getTerminalSize();
+
+    // Execute the startup script in an interactive session
+    const dockerExec = await container.exec({
+      Cmd: ["/bin/bash", "-l", "-c", "/home/claude/start-session.sh"],
+      AttachStdin: true,
+      AttachStdout: true,
+      AttachStderr: true,
+      Tty: true,
+    });
+
+    const stream = await dockerExec.start({
+      hijack: true,
+      stdin: true,
+      Tty: true,
+    });
+
+    // Set initial terminal size
+    await dockerExec.resize(termSize);
+
+    // Handle terminal resize events
+    const resizeHandler = async () => {
+      try {
+        await dockerExec.resize(getTerminalSize());
+      } catch {
+        // Ignore resize errors (exec might have ended)
+      }
+    };
+    process.stdout.on("resize", resizeHandler);
+
+    // Set up raw mode for proper terminal handling
+    if (process.stdin.isTTY) {
+      process.stdin.setRawMode(true);
+    }
+    process.stdin.resume();
+
+    // Pipe streams
+    process.stdin.pipe(stream);
+    stream.pipe(process.stdout);
+
+    // Handle stream end
+    stream.on("end", async () => {
+      process.stdout.off("resize", resizeHandler);
+      if (process.stdin.isTTY) {
+        process.stdin.setRawMode(false);
+      }
+      process.stdin.pause();
+      await this.cleanup();
+      process.exit(0);
+    });
+
+    // Handle Ctrl+C gracefully
+    process.on("SIGINT", async () => {
+      process.stdout.off("resize", resizeHandler);
+      if (process.stdin.isTTY) {
+        process.stdin.setRawMode(false);
+      }
+      await this.cleanup();
+      process.exit(0);
+    });
+  }
 }
 
 export * from "./types";

src/types.ts

@@ -26,6 +26,7 @@ export interface SandboxConfig {
   remoteBranch?: string;
   prNumber?: string;
   dockerSocketPath?: string;
+  useWebUI?: boolean;
 }
 
 export interface Credentials {