claude-remote 0.1.2 → 0.1.4

package/server.js

@@ -1,21 +1,116 @@
-const http = require('http');
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-const pty = require('node-pty');
-const { WebSocketServer, WebSocket } = require('ws');
-const { execSync } = require('child_process');
-
-// --- Config ---
-const PORT = parseInt(process.env.PORT || '3100', 10);
-const CWD = process.argv[2] || process.cwd();
-const CLAUDE_HOME = path.join(os.homedir(), '.claude');
-const PROJECTS_DIR = path.join(CLAUDE_HOME, 'projects');
-
-// --- State ---
-let claudeProc = null;
-let transcriptPath = null;
-let currentSessionId = null;
+const http = require('http');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const pty = require('node-pty');
+const { WebSocketServer, WebSocket } = require('ws');
+const { execSync } = require('child_process');
+
+// --- CLI argument parsing ---
+// Separate bridge args (CWD positional) from claude passthrough flags.
+// Usage: claude-remote [cwd] [--claude-flags...]
+// Example: claude-remote --resume xxx
+//          claude-remote /path/to/project --resume xxx -c
+const BLOCKED_FLAGS = new Set([
+  '--print', '-p',                   // non-interactive mode, breaks PTY bridge
+  '--output-format',                 // requires --print
+  '--input-format',                  // requires --print
+  '--include-partial-messages',      // requires --print
+  '--json-schema',                   // requires --print
+  '--no-session-persistence',        // requires --print
+  '--max-budget-usd',               // requires --print
+  '--max-turns',                     // requires --print
+  '--fallback-model',               // requires --print
+  '--permission-prompt-tool',        // conflicts with bridge approval hooks
+  '--version', '-v',                 // exits immediately
+  '--help', '-h',                    // exits immediately
+  '--init-only',                     // exits immediately
+  '--maintenance',                   // exits immediately
+]);
+
+// Flags that consume the next argument as a value
+const FLAGS_WITH_VALUE = new Set([
+  '--resume', '-r', '--session-id', '--from-pr', '--model',
+  '--system-prompt', '--system-prompt-file',
+  '--append-system-prompt', '--append-system-prompt-file',
+  '--permission-mode', '--add-dir', '--worktree', '-w',
+  '--mcp-config', '--settings', '--setting-sources',
+  '--agent', '--agents', '--teammate-mode',
+  '--allowedTools', '--disallowedTools', '--tools',
+  '--betas', '--debug', '--plugin-dir',
+  // blocked but still need to consume their values when filtering
+  '--output-format', '--input-format', '--json-schema',
+  '--max-budget-usd', '--max-turns', '--fallback-model',
+  '--permission-prompt-tool',
+]);
+
+function parseCliArgs(argv) {
+  const rawArgs = argv.slice(2);
+  let cwd = null;
+  const claudeArgs = [];
+  const blocked = [];
+
+  let i = 0;
+  while (i < rawArgs.length) {
+    const arg = rawArgs[i];
+
+    if (arg === '--') {
+      // Everything after -- is passed to claude
+      claudeArgs.push(...rawArgs.slice(i + 1));
+      break;
+    }
+
+    if (!arg.startsWith('-')) {
+      // Positional arg → treat first one as CWD (backward compatible)
+      if (!cwd) {
+        cwd = arg;
+      } else {
+        claudeArgs.push(arg);
+      }
+      i++;
+      continue;
+    }
+
+    // Handle --flag=value syntax
+    const eqIdx = arg.indexOf('=');
+    const flagName = eqIdx > 0 ? arg.substring(0, eqIdx) : arg;
+
+    if (BLOCKED_FLAGS.has(flagName)) {
+      blocked.push(flagName);
+      if (eqIdx > 0) {
+        // --flag=value, already consumed
+      } else if (FLAGS_WITH_VALUE.has(flagName) && i + 1 < rawArgs.length) {
+        i++; // skip the value too
+      }
+      i++;
+      continue;
+    }
+
+    // Pass through to claude
+    claudeArgs.push(arg);
+    // If this flag takes a value and it's not in --flag=value form, grab next arg
+    if (eqIdx < 0 && FLAGS_WITH_VALUE.has(flagName) && i + 1 < rawArgs.length && !rawArgs[i + 1].startsWith('-')) {
+      i++;
+      claudeArgs.push(rawArgs[i]);
+    }
+    i++;
+  }
+
+  return { cwd: cwd || process.cwd(), claudeArgs, blocked };
+}
+
+const { cwd: _parsedCwd, claudeArgs: CLAUDE_EXTRA_ARGS, blocked: _blockedArgs } = parseCliArgs(process.argv);
+
+// --- Config ---
+const PORT = parseInt(process.env.PORT || '3100', 10);
+const CWD = _parsedCwd;
+const CLAUDE_HOME = path.join(os.homedir(), '.claude');
+const PROJECTS_DIR = path.join(CLAUDE_HOME, 'projects');
+
+// --- State ---
+let claudeProc = null;
+let transcriptPath = null;
+let currentSessionId = null;
 let transcriptOffset = 0;
 let eventBuffer = [];
 let eventSeq = 0;
@@ -26,21 +121,21 @@ let switchWatcher = null;
 let expectingSwitch = false;
 let expectingSwitchTimer = null;
 let tailRemainder = Buffer.alloc(0);
-const isTTY = process.stdin.isTTY && process.stdout.isTTY;
-const LEGACY_REPLAY_DELAY_MS = 1500;
-const IMAGE_UPLOAD_TTL_MS = 15 * 60 * 1000;
-
-// --- Permission approval state ---
-let approvalSeq = 0;
-const pendingApprovals = new Map();  // id → { res, timer }
-const pendingImageUploads = new Map();
-let approvalMode = 'default';  // 'default' | 'partial' | 'all'
-const ALWAYS_AUTO_ALLOW = new Set(['TaskCreate', 'TaskUpdate']);
-const PARTIAL_AUTO_ALLOW = new Set(['Read', 'Glob', 'Grep', 'Write', 'Edit']);
-
-// --- Logging → file only (never pollute the terminal) ---
-const LOG_FILE = path.join(os.homedir(), '.claude', 'bridge.log');
-fs.writeFileSync(LOG_FILE, `--- Bridge started ${new Date().toISOString()} ---\n`);
+const isTTY = process.stdin.isTTY && process.stdout.isTTY;
+const LEGACY_REPLAY_DELAY_MS = 1500;
+const IMAGE_UPLOAD_TTL_MS = 15 * 60 * 1000;
+
+// --- Permission approval state ---
+let approvalSeq = 0;
+const pendingApprovals = new Map();  // id → { res, timer }
+const pendingImageUploads = new Map();
+let approvalMode = 'default';  // 'default' | 'partial' | 'all'
+const ALWAYS_AUTO_ALLOW = new Set(['TaskCreate', 'TaskUpdate']);
+const PARTIAL_AUTO_ALLOW = new Set(['Read', 'Glob', 'Grep', 'Write', 'Edit']);
+
+// --- Logging → file only (never pollute the terminal) ---
+const LOG_FILE = path.join(os.homedir(), '.claude', 'bridge.log');
+fs.writeFileSync(LOG_FILE, `--- Bridge started ${new Date().toISOString()} ---\n`);
 function log(msg) {
   const line = `[${new Date().toISOString()}] ${msg}\n`;
   fs.appendFileSync(LOG_FILE, line);
@@ -106,7 +201,9 @@ function maybeAttachHookSession(data, source) {
     return;
   }
 
-  if (currentSessionId && currentSessionId !== target.sessionId && !expectingSwitch) {
+  // session-start is authoritative — always allow it to switch sessions.
+  // pre-tool-use is opportunistic — only accept if expecting a switch.
+  if (currentSessionId && currentSessionId !== target.sessionId && !expectingSwitch && source !== 'session-start') {
     log(`Ignored hook session from ${source}: ${target.sessionId} (current=${currentSessionId})`);
     return;
   }
@@ -114,89 +211,89 @@ function maybeAttachHookSession(data, source) {
   log(`Hook session attached from ${source}: ${target.sessionId}`);
   attachTranscript({ full: target.full }, 0);
 }
-
-// ============================================================
-//  1. Static file server
-// ============================================================
-const MIME = {
-  '.html': 'text/html; charset=utf-8',
-  '.js': 'text/javascript; charset=utf-8',
-  '.css': 'text/css; charset=utf-8',
-  '.json': 'application/json',
-  '.png': 'image/png',
-  '.svg': 'image/svg+xml',
-};
-
-const server = http.createServer((req, res) => {
-  const url = req.url.split('?')[0];
-
-  // --- API: Hook approval endpoint ---
-  if (req.method === 'POST' && url === '/hook/pre-tool-use') {
-    let body = '';
-    req.on('data', chunk => (body += chunk));
-    req.on('end', () => {
-      let data;
-      try { data = JSON.parse(body); } catch {
-        res.writeHead(400, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ decision: 'ask' }));
-        return;
-      }
-
+
+// ============================================================
+//  1. Static file server
+// ============================================================
+const MIME = {
+  '.html': 'text/html; charset=utf-8',
+  '.js': 'text/javascript; charset=utf-8',
+  '.css': 'text/css; charset=utf-8',
+  '.json': 'application/json',
+  '.png': 'image/png',
+  '.svg': 'image/svg+xml',
+};
+
+const server = http.createServer((req, res) => {
+  const url = req.url.split('?')[0];
+
+  // --- API: Hook approval endpoint ---
+  if (req.method === 'POST' && url === '/hook/pre-tool-use') {
+    let body = '';
+    req.on('data', chunk => (body += chunk));
+    req.on('end', () => {
+      let data;
+      try { data = JSON.parse(body); } catch {
+        res.writeHead(400, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ decision: 'ask' }));
+        return;
+      }
+
       maybeAttachHookSession(data, 'pre-tool-use');
 
       if (ALWAYS_AUTO_ALLOW.has(data.tool_name)) {
-        res.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ decision: 'allow' }));
-        log(`Permission auto-allowed (always): ${data.tool_name}`);
-        return;
-      }
-
-      // Auto-approve based on approvalMode setting
-      if (approvalMode === 'all') {
-        res.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ decision: 'allow' }));
-        log(`Permission auto-allowed (mode=all): ${data.tool_name}`);
-        return;
-      }
-      if (approvalMode === 'partial' && PARTIAL_AUTO_ALLOW.has(data.tool_name)) {
-        res.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ decision: 'allow' }));
-        log(`Permission auto-allowed (mode=partial): ${data.tool_name}`);
-        return;
-      }
-
-      // No WebUI clients → fall back to terminal prompt
-      const clients = [...wss.clients].filter(c => c.readyState === WebSocket.OPEN);
-      if (clients.length === 0) {
-        res.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ decision: 'ask' }));
-        return;
-      }
-
-      const id = String(++approvalSeq);
-      log(`Permission #${id}: ${data.tool_name} → ${clients.length} WebUI client(s)`);
-
-      broadcast({
-        type: 'permission_request',
-        id,
-        toolName: data.tool_name,
-        toolInput: data.tool_input,
-        permissionMode: data.permission_mode,
-      });
-
-      // Hold HTTP response open until WebUI user decides or timeout
-      const timer = setTimeout(() => {
-        pendingApprovals.delete(id);
-        res.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ decision: 'ask' }));
-        log(`Permission #${id}: timeout → ask`);
-      }, 90000);
-
-      pendingApprovals.set(id, { res, timer });
-    });
-    return;
-  }
-
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ decision: 'allow' }));
+        log(`Permission auto-allowed (always): ${data.tool_name}`);
+        return;
+      }
+
+      // Auto-approve based on approvalMode setting
+      if (approvalMode === 'all') {
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ decision: 'allow' }));
+        log(`Permission auto-allowed (mode=all): ${data.tool_name}`);
+        return;
+      }
+      if (approvalMode === 'partial' && PARTIAL_AUTO_ALLOW.has(data.tool_name)) {
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ decision: 'allow' }));
+        log(`Permission auto-allowed (mode=partial): ${data.tool_name}`);
+        return;
+      }
+
+      // No WebUI clients → fall back to terminal prompt
+      const clients = [...wss.clients].filter(c => c.readyState === WebSocket.OPEN);
+      if (clients.length === 0) {
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ decision: 'ask' }));
+        return;
+      }
+
+      const id = String(++approvalSeq);
+      log(`Permission #${id}: ${data.tool_name} → ${clients.length} WebUI client(s)`);
+
+      broadcast({
+        type: 'permission_request',
+        id,
+        toolName: data.tool_name,
+        toolInput: data.tool_input,
+        permissionMode: data.permission_mode,
+      });
+
+      // Hold HTTP response open until WebUI user decides or timeout
+      const timer = setTimeout(() => {
+        pendingApprovals.delete(id);
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ decision: 'ask' }));
+        log(`Permission #${id}: timeout → ask`);
+      }, 90000);
+
+      pendingApprovals.set(id, { res, timer });
+    });
+    return;
+  }
+
   // --- API: Session start hook endpoint ---
   if (req.method === 'POST' && url === '/hook/session-start') {
     let body = '';
@@ -212,40 +309,40 @@ const server = http.createServer((req, res) => {
   }
 
   // --- API: Stop hook endpoint ---
-  if (req.method === 'POST' && url === '/hook/stop') {
-    let body = '';
-    req.on('data', chunk => (body += chunk));
-    req.on('end', () => {
-      log('/hook/stop received — broadcasting turn_complete');
+  if (req.method === 'POST' && url === '/hook/stop') {
+    let body = '';
+    req.on('data', chunk => (body += chunk));
+    req.on('end', () => {
+      log('/hook/stop received — broadcasting turn_complete');
       try {
         maybeAttachHookSession(JSON.parse(body), 'stop');
       } catch {}
       broadcast({ type: 'turn_complete' });
-      res.writeHead(200, { 'Content-Type': 'application/json' });
-      res.end('{}');
-    });
-    return;
-  }
-
-  // --- Static files ---
-  const filePath = path.join(__dirname, 'web', url === '/' ? 'index.html' : url);
-  const ext = path.extname(filePath);
-  fs.readFile(filePath, (err, data) => {
-    if (err) {
-      res.writeHead(404);
-      res.end('Not found');
-      return;
-    }
-    res.writeHead(200, { 'Content-Type': MIME[ext] || 'application/octet-stream' });
-    res.end(data);
-  });
-});
-
-// ============================================================
-//  2. WebSocket server
-// ============================================================
-const wss = new WebSocketServer({ server });
-
+      res.writeHead(200, { 'Content-Type': 'application/json' });
+      res.end('{}');
+    });
+    return;
+  }
+
+  // --- Static files ---
+  const filePath = path.join(__dirname, 'web', url === '/' ? 'index.html' : url);
+  const ext = path.extname(filePath);
+  fs.readFile(filePath, (err, data) => {
+    if (err) {
+      res.writeHead(404);
+      res.end('Not found');
+      return;
+    }
+    res.writeHead(200, { 'Content-Type': MIME[ext] || 'application/octet-stream' });
+    res.end(data);
+  });
+});
+
+// ============================================================
+//  2. WebSocket server
+// ============================================================
+const wss = new WebSocketServer({ server });
+
 function broadcast(msg) {
   const raw = JSON.stringify(msg);
   const recipients = [];
@@ -259,11 +356,11 @@ function broadcast(msg) {
     log(`Broadcast ${msg.type} -> ${recipients.length} client(s)${recipients.length ? ` [${recipients.join(', ')}]` : ''}`);
   }
 }
-
-function latestEventSeq() {
-  return eventBuffer.length > 0 ? eventBuffer[eventBuffer.length - 1].seq : 0;
-}
-
+
+function latestEventSeq() {
+  return eventBuffer.length > 0 ? eventBuffer[eventBuffer.length - 1].seq : 0;
+}
+
 function sendReplay(ws, lastSeq = null) {
   const normalizedLastSeq = Number.isInteger(lastSeq) && lastSeq >= 0 ? lastSeq : null;
   const replayFrom = normalizedLastSeq == null ? 0 : normalizedLastSeq;
@@ -272,15 +369,15 @@ function sendReplay(ws, lastSeq = null) {
     : eventBuffer;
 
   log(`Replay start -> ${wsLabel(ws)} from=${replayFrom} count=${records.length} currentSession=${currentSessionId ?? 'null'}`);
-
-  for (const record of records) {
-    ws.send(JSON.stringify({
-      type: 'log_event',
-      seq: record.seq,
-      event: record.event,
-    }));
-  }
-
+
+  for (const record of records) {
+    ws.send(JSON.stringify({
+      type: 'log_event',
+      seq: record.seq,
+      event: record.event,
+    }));
+  }
+
   sendWs(ws, {
     type: 'replay_done',
     sessionId: currentSessionId,
@@ -288,50 +385,50 @@ function sendReplay(ws, lastSeq = null) {
     resumed: normalizedLastSeq != null,
   }, 'sendReplay');
 }
-
-function sendUploadStatus(ws, uploadId, status, extra = {}) {
-  if (!ws || ws.readyState !== WebSocket.OPEN) return;
-  ws.send(JSON.stringify({
-    type: 'image_upload_status',
-    uploadId,
-    status,
-    ...extra,
-  }));
-}
-
-function cleanupImageUpload(uploadId) {
-  const upload = pendingImageUploads.get(uploadId);
-  if (!upload) return;
-  if (upload.tmpFile) {
-    try { fs.unlinkSync(upload.tmpFile); } catch {}
-  }
-  pendingImageUploads.delete(uploadId);
-}
-
-function cleanupClientUploads(ws) {
-  for (const [uploadId, upload] of pendingImageUploads) {
-    if (upload.owner === ws) cleanupImageUpload(uploadId);
-  }
-}
-
-function createTempImageFile(buffer, mediaType, uploadId) {
-  const tmpDir = process.env.CLAUDE_CODE_TMPDIR || os.tmpdir();
-  const type = String(mediaType || 'image/png').toLowerCase();
-  const ext = type.includes('jpeg') || type.includes('jpg') ? '.jpg' : '.png';
-  const tmpFile = path.join(tmpDir, `bridge_upload_${uploadId}_${Date.now()}${ext}`);
-  fs.writeFileSync(tmpFile, buffer);
-  return tmpFile;
-}
-
-setInterval(() => {
-  const now = Date.now();
-  for (const [uploadId, upload] of pendingImageUploads) {
-    if ((upload.updatedAt || 0) < (now - IMAGE_UPLOAD_TTL_MS)) {
-      cleanupImageUpload(uploadId);
-    }
-  }
-}, 60 * 1000).unref();
-
+
+function sendUploadStatus(ws, uploadId, status, extra = {}) {
+  if (!ws || ws.readyState !== WebSocket.OPEN) return;
+  ws.send(JSON.stringify({
+    type: 'image_upload_status',
+    uploadId,
+    status,
+    ...extra,
+  }));
+}
+
+function cleanupImageUpload(uploadId) {
+  const upload = pendingImageUploads.get(uploadId);
+  if (!upload) return;
+  if (upload.tmpFile) {
+    try { fs.unlinkSync(upload.tmpFile); } catch {}
+  }
+  pendingImageUploads.delete(uploadId);
+}
+
+function cleanupClientUploads(ws) {
+  for (const [uploadId, upload] of pendingImageUploads) {
+    if (upload.owner === ws) cleanupImageUpload(uploadId);
+  }
+}
+
+function createTempImageFile(buffer, mediaType, uploadId) {
+  const tmpDir = process.env.CLAUDE_CODE_TMPDIR || os.tmpdir();
+  const type = String(mediaType || 'image/png').toLowerCase();
+  const ext = type.includes('jpeg') || type.includes('jpg') ? '.jpg' : '.png';
+  const tmpFile = path.join(tmpDir, `bridge_upload_${uploadId}_${Date.now()}${ext}`);
+  fs.writeFileSync(tmpFile, buffer);
+  return tmpFile;
+}
+
+setInterval(() => {
+  const now = Date.now();
+  for (const [uploadId, upload] of pendingImageUploads) {
+    if ((upload.updatedAt || 0) < (now - IMAGE_UPLOAD_TTL_MS)) {
+      cleanupImageUpload(uploadId);
+    }
+  }
+}, 60 * 1000).unref();
+
 wss.on('connection', (ws, req) => {
   ws._bridgeId = ++nextWsId;
   ws._clientInstanceId = '';
@@ -354,20 +451,20 @@ wss.on('connection', (ws, req) => {
       lastSeq: latestEventSeq(),
     }, 'initial');
   }
-
-  // New clients should explicitly request a resume window. Keep a delayed
-  // full replay fallback so older clients still work.
-  ws._resumeHandled = false;
-  ws._legacyReplayTimer = setTimeout(() => {
-    if (ws.readyState !== WebSocket.OPEN || ws._resumeHandled) return;
-    ws._resumeHandled = true;
-    sendReplay(ws, null);
-  }, LEGACY_REPLAY_DELAY_MS);
-
-  ws.on('message', (raw) => {
-    let msg;
-    try { msg = JSON.parse(raw); } catch { return; }
-
+
+  // New clients should explicitly request a resume window. Keep a delayed
+  // full replay fallback so older clients still work.
+  ws._resumeHandled = false;
+  ws._legacyReplayTimer = setTimeout(() => {
+    if (ws.readyState !== WebSocket.OPEN || ws._resumeHandled) return;
+    ws._resumeHandled = true;
+    sendReplay(ws, null);
+  }, LEGACY_REPLAY_DELAY_MS);
+
+  ws.on('message', (raw) => {
+    let msg;
+    try { msg = JSON.parse(raw); } catch { return; }
+
     switch (msg.type) {
       case 'hello':
         ws._clientInstanceId = String(msg.clientInstanceId || ws._clientInstanceId || '');
@@ -382,21 +479,21 @@ wss.on('connection', (ws, req) => {
         if (ws._legacyReplayTimer) {
           clearTimeout(ws._legacyReplayTimer);
           ws._legacyReplayTimer = null;
-        }
-
-        if (!currentSessionId) {
-          ws.send(JSON.stringify({
-            type: 'replay_done',
-            sessionId: null,
-            lastSeq: 0,
-            resumed: false,
-          }));
-          break;
-        }
-
-        const clientServerLastSeq = Number.isInteger(msg.serverLastSeq) && msg.serverLastSeq >= 0
-          ? msg.serverLastSeq
-          : null;
+        }
+
+        if (!currentSessionId) {
+          ws.send(JSON.stringify({
+            type: 'replay_done',
+            sessionId: null,
+            lastSeq: 0,
+            resumed: false,
+          }));
+          break;
+        }
+
+        const clientServerLastSeq = Number.isInteger(msg.serverLastSeq) && msg.serverLastSeq >= 0
+          ? msg.serverLastSeq
+          : null;
         const canResume = (
           msg.sessionId &&
           msg.sessionId === currentSessionId &&
@@ -411,201 +508,201 @@ wss.on('connection', (ws, req) => {
         sendReplay(ws, canResume ? msg.lastSeq : null);
         break;
       }
-      case 'input':
-        // Raw terminal keystrokes from xterm.js in WebUI
-        if (claudeProc) claudeProc.write(msg.data);
-        break;
-      case 'expect_clear':
-        // Plan mode option 1 triggers /clear inside Claude Code;
-        // client notifies us so we can detect the session switch.
-        markExpectingSwitch();
-        break;
-      case 'chat':
-        // Chat message from WebUI → write to PTY as user input
-        // Must send text first, then Enter after a delay so Claude's
-        // TUI (Ink) has time to process the typed characters
-        if (claudeProc) {
-          const text = msg.text;
-          log(`Chat input → PTY: "${text.substring(0, 80)}"`);
-          if (/^\/clear\s*$/i.test(text.trim())) {
-            markExpectingSwitch();
-          }
-          broadcast({ type: 'working_started' });
-          claudeProc.write(text);
-          setTimeout(() => {
-            if (claudeProc) claudeProc.write('\r');
-          }, 150);
-        }
-        break;
-      case 'resize':
-        // Only resize if no local TTY is controlling size
-        if (claudeProc && msg.cols && msg.rows && !isTTY) {
-          claudeProc.resize(msg.cols, msg.rows);
-        }
-        break;
-      case 'permission_response': {
-        const approval = pendingApprovals.get(msg.id);
-        if (approval) {
-          clearTimeout(approval.timer);
-          pendingApprovals.delete(msg.id);
-          approval.res.writeHead(200, { 'Content-Type': 'application/json' });
-          approval.res.end(JSON.stringify({
-            decision: msg.decision,
-            reason: msg.reason || '',
-          }));
-          log(`Permission #${msg.id}: ${msg.decision}`);
-        }
-        break;
-      }
-      case 'set_approval_mode': {
-        const valid = ['default', 'partial', 'all'];
-        if (valid.includes(msg.mode)) {
-          approvalMode = msg.mode;
-          log(`Approval mode changed to: ${approvalMode}`);
-          // If switching to 'all' or 'partial', auto-resolve queued permissions
-          if (approvalMode === 'all') {
-            for (const [id, approval] of pendingApprovals) {
-              clearTimeout(approval.timer);
-              approval.res.writeHead(200, { 'Content-Type': 'application/json' });
-              approval.res.end(JSON.stringify({ decision: 'allow' }));
-              log(`Permission #${id}: auto-allowed (mode switched to all)`);
-            }
-            pendingApprovals.clear();
-            broadcast({ type: 'clear_permissions' });
-          }
-        }
-        break;
-      }
-      case 'image_upload_init': {
-        const uploadId = String(msg.uploadId || '');
-        if (!uploadId) {
-          sendUploadStatus(ws, '', 'error', { message: 'Missing uploadId' });
-          break;
-        }
-        cleanupImageUpload(uploadId);
-        pendingImageUploads.set(uploadId, {
-          id: uploadId,
-          owner: ws,
-          mediaType: msg.mediaType || 'image/png',
-          name: msg.name || 'image',
-          totalBytes: Number.isFinite(msg.totalBytes) ? msg.totalBytes : 0,
-          totalChunks: Number.isFinite(msg.totalChunks) ? msg.totalChunks : 0,
-          nextChunkIndex: 0,
-          receivedBytes: 0,
-          chunks: [],
-          tmpFile: null,
-          updatedAt: Date.now(),
-        });
-        sendUploadStatus(ws, uploadId, 'ready_for_chunks', { receivedBytes: 0, totalBytes: msg.totalBytes || 0 });
-        break;
-      }
-      case 'image_upload_chunk': {
-        const uploadId = String(msg.uploadId || '');
-        const upload = pendingImageUploads.get(uploadId);
-        if (!upload) {
-          sendUploadStatus(ws, uploadId, 'error', { message: 'Upload session not found' });
-          break;
-        }
-        if (upload.owner !== ws) {
-          sendUploadStatus(ws, uploadId, 'error', { message: 'Upload owner mismatch' });
-          break;
-        }
-        if (msg.index !== upload.nextChunkIndex) {
-          sendUploadStatus(ws, uploadId, 'error', {
-            message: `Unexpected chunk index ${msg.index}, expected ${upload.nextChunkIndex}`,
-          });
-          break;
-        }
-        if (!msg.base64) {
-          sendUploadStatus(ws, uploadId, 'error', { message: 'Missing chunk payload' });
-          break;
-        }
-
-        try {
-          const chunk = Buffer.from(msg.base64, 'base64');
-          upload.chunks.push(chunk);
-          upload.receivedBytes += chunk.length;
-          upload.nextChunkIndex += 1;
-          upload.updatedAt = Date.now();
-          sendUploadStatus(ws, uploadId, 'uploading', {
-            chunkIndex: msg.index,
-            receivedBytes: upload.receivedBytes,
-            totalBytes: upload.totalBytes,
-          });
-        } catch (err) {
-          sendUploadStatus(ws, uploadId, 'error', { message: err.message });
-        }
-        break;
-      }
-      case 'image_upload_complete': {
-        const uploadId = String(msg.uploadId || '');
-        const upload = pendingImageUploads.get(uploadId);
-        if (!upload) {
-          sendUploadStatus(ws, uploadId, 'error', { message: 'Upload session not found' });
-          break;
-        }
-        if (upload.owner !== ws) {
-          sendUploadStatus(ws, uploadId, 'error', { message: 'Upload owner mismatch' });
-          break;
-        }
-        if (upload.nextChunkIndex !== upload.totalChunks) {
-          sendUploadStatus(ws, uploadId, 'error', {
-            message: `Upload incomplete (${upload.nextChunkIndex}/${upload.totalChunks})`,
-          });
-          break;
-        }
-
-        try {
-          const buffer = Buffer.concat(upload.chunks);
-          upload.tmpFile = createTempImageFile(buffer, upload.mediaType, uploadId);
-          upload.chunks = [];
-          upload.updatedAt = Date.now();
-          log(`Image pre-upload complete: ${upload.tmpFile} (${buffer.length} bytes)`);
-          sendUploadStatus(ws, uploadId, 'uploaded', {
-            receivedBytes: upload.receivedBytes,
-            totalBytes: upload.totalBytes,
-          });
-        } catch (err) {
-          sendUploadStatus(ws, uploadId, 'error', { message: err.message });
-          cleanupImageUpload(uploadId);
-        }
-        break;
-      }
-      case 'image_upload_abort': {
-        const uploadId = String(msg.uploadId || '');
-        if (uploadId) cleanupImageUpload(uploadId);
-        sendUploadStatus(ws, uploadId, 'aborted');
-        break;
-      }
-      case 'image_submit': {
-        const uploadId = String(msg.uploadId || '');
-        const upload = pendingImageUploads.get(uploadId);
-        if (!upload || !upload.tmpFile) {
-          sendUploadStatus(ws, uploadId, 'error', { message: 'Upload not ready' });
-          break;
-        }
-        try {
-          handlePreparedImageUpload({
-            tmpFile: upload.tmpFile,
-            mediaType: upload.mediaType,
-            text: msg.text || '',
-            logLabel: upload.name || uploadId,
-            onCleanup: () => cleanupImageUpload(uploadId),
-          });
-          sendUploadStatus(ws, uploadId, 'submitted');
-        } catch (err) {
-          sendUploadStatus(ws, uploadId, 'error', { message: err.message });
-          cleanupImageUpload(uploadId);
-        }
-        break;
-      }
-      case 'image_upload': {
-        handleImageUpload(msg);
-        break;
-      }
-    }
-  });
-
+      case 'input':
+        // Raw terminal keystrokes from xterm.js in WebUI
+        if (claudeProc) claudeProc.write(msg.data);
+        break;
+      case 'expect_clear':
+        // Plan mode option 1 triggers /clear inside Claude Code;
+        // client notifies us so we can detect the session switch.
+        markExpectingSwitch();
+        break;
+      case 'chat':
+        // Chat message from WebUI → write to PTY as user input
+        // Must send text first, then Enter after a delay so Claude's
+        // TUI (Ink) has time to process the typed characters
+        if (claudeProc) {
+          const text = msg.text;
+          log(`Chat input → PTY: "${text.substring(0, 80)}"`);
+          if (/^\/clear\s*$/i.test(text.trim())) {
+            markExpectingSwitch();
+          }
+          broadcast({ type: 'working_started' });
+          claudeProc.write(text);
+          setTimeout(() => {
+            if (claudeProc) claudeProc.write('\r');
+          }, 150);
+        }
+        break;
+      case 'resize':
+        // Only resize if no local TTY is controlling size
+        if (claudeProc && msg.cols && msg.rows && !isTTY) {
+          claudeProc.resize(msg.cols, msg.rows);
+        }
+        break;
+      case 'permission_response': {
+        const approval = pendingApprovals.get(msg.id);
+        if (approval) {
+          clearTimeout(approval.timer);
+          pendingApprovals.delete(msg.id);
+          approval.res.writeHead(200, { 'Content-Type': 'application/json' });
+          approval.res.end(JSON.stringify({
+            decision: msg.decision,
+            reason: msg.reason || '',
+          }));
+          log(`Permission #${msg.id}: ${msg.decision}`);
+        }
+        break;
+      }
+      case 'set_approval_mode': {
+        const valid = ['default', 'partial', 'all'];
+        if (valid.includes(msg.mode)) {
+          approvalMode = msg.mode;
+          log(`Approval mode changed to: ${approvalMode}`);
+          // If switching to 'all' or 'partial', auto-resolve queued permissions
+          if (approvalMode === 'all') {
+            for (const [id, approval] of pendingApprovals) {
+              clearTimeout(approval.timer);
+              approval.res.writeHead(200, { 'Content-Type': 'application/json' });
+              approval.res.end(JSON.stringify({ decision: 'allow' }));
+              log(`Permission #${id}: auto-allowed (mode switched to all)`);
+            }
+            pendingApprovals.clear();
+            broadcast({ type: 'clear_permissions' });
+          }
+        }
+        break;
+      }
+      case 'image_upload_init': {
+        const uploadId = String(msg.uploadId || '');
+        if (!uploadId) {
+          sendUploadStatus(ws, '', 'error', { message: 'Missing uploadId' });
+          break;
+        }
+        cleanupImageUpload(uploadId);
+        pendingImageUploads.set(uploadId, {
+          id: uploadId,
+          owner: ws,
+          mediaType: msg.mediaType || 'image/png',
+          name: msg.name || 'image',
+          totalBytes: Number.isFinite(msg.totalBytes) ? msg.totalBytes : 0,
+          totalChunks: Number.isFinite(msg.totalChunks) ? msg.totalChunks : 0,
+          nextChunkIndex: 0,
+          receivedBytes: 0,
+          chunks: [],
+          tmpFile: null,
+          updatedAt: Date.now(),
+        });
+        sendUploadStatus(ws, uploadId, 'ready_for_chunks', { receivedBytes: 0, totalBytes: msg.totalBytes || 0 });
+        break;
+      }
+      case 'image_upload_chunk': {
+        const uploadId = String(msg.uploadId || '');
+        const upload = pendingImageUploads.get(uploadId);
+        if (!upload) {
+          sendUploadStatus(ws, uploadId, 'error', { message: 'Upload session not found' });
+          break;
+        }
+        if (upload.owner !== ws) {
+          sendUploadStatus(ws, uploadId, 'error', { message: 'Upload owner mismatch' });
+          break;
+        }
+        if (msg.index !== upload.nextChunkIndex) {
+          sendUploadStatus(ws, uploadId, 'error', {
+            message: `Unexpected chunk index ${msg.index}, expected ${upload.nextChunkIndex}`,
+          });
+          break;
+        }
+        if (!msg.base64) {
+          sendUploadStatus(ws, uploadId, 'error', { message: 'Missing chunk payload' });
+          break;
+        }
+
+        try {
+          const chunk = Buffer.from(msg.base64, 'base64');
+          upload.chunks.push(chunk);
+          upload.receivedBytes += chunk.length;
+          upload.nextChunkIndex += 1;
+          upload.updatedAt = Date.now();
+          sendUploadStatus(ws, uploadId, 'uploading', {
+            chunkIndex: msg.index,
+            receivedBytes: upload.receivedBytes,
+            totalBytes: upload.totalBytes,
+          });
+        } catch (err) {
+          sendUploadStatus(ws, uploadId, 'error', { message: err.message });
+        }
+        break;
+      }
+      case 'image_upload_complete': {
+        const uploadId = String(msg.uploadId || '');
+        const upload = pendingImageUploads.get(uploadId);
+        if (!upload) {
+          sendUploadStatus(ws, uploadId, 'error', { message: 'Upload session not found' });
+          break;
+        }
+        if (upload.owner !== ws) {
+          sendUploadStatus(ws, uploadId, 'error', { message: 'Upload owner mismatch' });
+          break;
+        }
+        if (upload.nextChunkIndex !== upload.totalChunks) {
+          sendUploadStatus(ws, uploadId, 'error', {
+            message: `Upload incomplete (${upload.nextChunkIndex}/${upload.totalChunks})`,
+          });
+          break;
+        }
+
+        try {
+          const buffer = Buffer.concat(upload.chunks);
+          upload.tmpFile = createTempImageFile(buffer, upload.mediaType, uploadId);
+          upload.chunks = [];
+          upload.updatedAt = Date.now();
+          log(`Image pre-upload complete: ${upload.tmpFile} (${buffer.length} bytes)`);
+          sendUploadStatus(ws, uploadId, 'uploaded', {
+            receivedBytes: upload.receivedBytes,
+            totalBytes: upload.totalBytes,
+          });
+        } catch (err) {
+          sendUploadStatus(ws, uploadId, 'error', { message: err.message });
+          cleanupImageUpload(uploadId);
+        }
+        break;
+      }
+      case 'image_upload_abort': {
+        const uploadId = String(msg.uploadId || '');
+        if (uploadId) cleanupImageUpload(uploadId);
+        sendUploadStatus(ws, uploadId, 'aborted');
+        break;
+      }
+      case 'image_submit': {
+        const uploadId = String(msg.uploadId || '');
+        const upload = pendingImageUploads.get(uploadId);
+        if (!upload || !upload.tmpFile) {
+          sendUploadStatus(ws, uploadId, 'error', { message: 'Upload not ready' });
+          break;
+        }
+        try {
+          handlePreparedImageUpload({
+            tmpFile: upload.tmpFile,
+            mediaType: upload.mediaType,
+            text: msg.text || '',
+            logLabel: upload.name || uploadId,
+            onCleanup: () => cleanupImageUpload(uploadId),
+          });
+          sendUploadStatus(ws, uploadId, 'submitted');
+        } catch (err) {
+          sendUploadStatus(ws, uploadId, 'error', { message: err.message });
+          cleanupImageUpload(uploadId);
+        }
+        break;
+      }
+      case 'image_upload': {
+        handleImageUpload(msg);
+        break;
+      }
+    }
+  });
+
   ws.on('close', () => {
     if (ws._legacyReplayTimer) {
       clearTimeout(ws._legacyReplayTimer);
@@ -614,361 +711,364 @@ wss.on('connection', (ws, req) => {
     log(`WS closed: ${wsLabel(ws)}`);
     cleanupClientUploads(ws);
   });
-});
-
-// ============================================================
-//  4. PTY Manager — local terminal passthrough
-// ============================================================
+});
+
+// ============================================================
+//  4. PTY Manager — local terminal passthrough
+// ============================================================
 function spawnClaude() {
   const isWin = process.platform === 'win32';
-  const shell = isWin ? 'powershell.exe' : (process.env.SHELL || '/bin/bash');
-  const args = isWin
-    ? ['-NoLogo', '-NoProfile', '-Command', 'claude']
-    : ['-c', 'claude'];
-
-  // Use local terminal size if available, otherwise default
-  const cols = isTTY ? process.stdout.columns : 120;
-  const rows = isTTY ? process.stdout.rows : 40;
-
-  claudeProc = pty.spawn(shell, args, {
-    name: 'xterm-256color',
-    cols,
-    rows,
-    cwd: CWD,
-    env: { ...process.env, FORCE_COLOR: '1', BRIDGE_PORT: String(PORT) },
-  });
-
-  log(`Claude spawned (pid ${claudeProc.pid}) — ${cols}x${rows}`);
-  broadcast({ type: 'status', status: 'running', pid: claudeProc.pid });
-
-  // === PTY output → local terminal + WebSocket + mode detection ===
-  claudeProc.onData((data) => {
-    if (isTTY) process.stdout.write(data);   // show in the terminal you ran the bridge from
-    broadcast({ type: 'pty_output', data });  // push to WebUI
-  });
-
-  // === Local terminal input → PTY ===
-  if (isTTY) {
-    process.stdin.setRawMode(true);
-    process.stdin.resume();
-    process.stdin.on('data', (chunk) => {
-      if (claudeProc) claudeProc.write(chunk);
-    });
-
-    // Resize PTY when local terminal resizes
-    process.stdout.on('resize', () => {
-      if (claudeProc) {
-        claudeProc.resize(process.stdout.columns, process.stdout.rows);
-      }
-    });
-  }
-
-  // === PTY exit → cleanup ===
-  claudeProc.onExit(({ exitCode, signal }) => {
-    log(`Claude exited (code=${exitCode}, signal=${signal})`);
-    broadcast({ type: 'pty_exit', exitCode, signal });
-    claudeProc = null;
-
-    // Restore terminal and exit bridge
-    if (isTTY) {
-      process.stdin.setRawMode(false);
-      process.stdin.pause();
-    }
-    stopTailing();
-    log('Bridge shutting down.');
-    setTimeout(() => process.exit(exitCode || 0), 300);
-  });
-}
-
-// ============================================================
-//  4. Transcript Discovery & Tailing
-// ============================================================
-function getProjectSlug(cwd) {
-  return cwd.replace(/[^a-zA-Z0-9]/g, '-');
-}
-
-function hasConversationEvent(evt) {
-  if (!evt || typeof evt !== 'object') return false;
-  if (evt.type === 'user' || evt.type === 'assistant') return true;
-  const role = evt.message && typeof evt.message === 'object' ? evt.message.role : null;
-  return role === 'user' || role === 'assistant';
-}
-
-function fileLooksLikeTranscript(filePath) {
-  try {
-    const stat = fs.statSync(filePath);
-    if (stat.size <= 0) return false;
-
-    const readSize = Math.min(stat.size, 64 * 1024);
-    const fd = fs.openSync(filePath, 'r');
-    const buf = Buffer.alloc(readSize);
-    fs.readSync(fd, buf, 0, readSize, stat.size - readSize);
-    fs.closeSync(fd);
-
-    const lines = buf.toString('utf8').split('\n').filter(Boolean);
-    for (const line of lines) {
-      try {
-        const evt = JSON.parse(line);
-        if (hasConversationEvent(evt)) return true;
-      } catch {
-        // ignore malformed lines at file tail
-      }
-    }
-  } catch {}
-  return false;
-}
-
-function attachTranscript(target, startOffset = 0) {
-  transcriptPath = target.full;
-  currentSessionId = path.basename(transcriptPath, '.jsonl');
-  transcriptOffset = Math.max(0, startOffset);
-  tailRemainder = Buffer.alloc(0);
-  eventBuffer = [];
-  eventSeq = 0;
-
-  log(`Transcript attached: ${currentSessionId} (offset=${transcriptOffset})`);
-  broadcast({
-    type: 'transcript_ready',
-    transcript: transcriptPath,
-    sessionId: currentSessionId,
-    lastSeq: 0,
-  });
+  const shell = isWin ? 'powershell.exe' : (process.env.SHELL || '/bin/bash');
+  const claudeCmd = CLAUDE_EXTRA_ARGS.length > 0
+    ? `claude ${CLAUDE_EXTRA_ARGS.join(' ')}`
+    : 'claude';
+  const args = isWin
+    ? ['-NoLogo', '-NoProfile', '-Command', claudeCmd]
+    : ['-c', claudeCmd];
+
+  // Use local terminal size if available, otherwise default
+  const cols = isTTY ? process.stdout.columns : 120;
+  const rows = isTTY ? process.stdout.rows : 40;
+
+  claudeProc = pty.spawn(shell, args, {
+    name: 'xterm-256color',
+    cols,
+    rows,
+    cwd: CWD,
+    env: { ...process.env, FORCE_COLOR: '1', BRIDGE_PORT: String(PORT) },
+  });
+
+  log(`Claude spawned (pid ${claudeProc.pid}) — ${cols}x${rows} cmd="${claudeCmd}"`);
+  broadcast({ type: 'status', status: 'running', pid: claudeProc.pid });
+
+  // === PTY output → local terminal + WebSocket + mode detection ===
+  claudeProc.onData((data) => {
+    if (isTTY) process.stdout.write(data);   // show in the terminal you ran the bridge from
+    broadcast({ type: 'pty_output', data });  // push to WebUI
+  });
+
+  // === Local terminal input → PTY ===
+  if (isTTY) {
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+    process.stdin.on('data', (chunk) => {
+      if (claudeProc) claudeProc.write(chunk);
+    });
+
+    // Resize PTY when local terminal resizes
+    process.stdout.on('resize', () => {
+      if (claudeProc) {
+        claudeProc.resize(process.stdout.columns, process.stdout.rows);
+      }
+    });
+  }
+
+  // === PTY exit → cleanup ===
+  claudeProc.onExit(({ exitCode, signal }) => {
+    log(`Claude exited (code=${exitCode}, signal=${signal})`);
+    broadcast({ type: 'pty_exit', exitCode, signal });
+    claudeProc = null;
+
+    // Restore terminal and exit bridge
+    if (isTTY) {
+      process.stdin.setRawMode(false);
+      process.stdin.pause();
+    }
+    stopTailing();
+    log('Bridge shutting down.');
+    setTimeout(() => process.exit(exitCode || 0), 300);
+  });
+}
+
+// ============================================================
+//  4. Transcript Discovery & Tailing
+// ============================================================
+function getProjectSlug(cwd) {
+  return cwd.replace(/[^a-zA-Z0-9]/g, '-');
+}
+
+function hasConversationEvent(evt) {
+  if (!evt || typeof evt !== 'object') return false;
+  if (evt.type === 'user' || evt.type === 'assistant') return true;
+  const role = evt.message && typeof evt.message === 'object' ? evt.message.role : null;
+  return role === 'user' || role === 'assistant';
+}
+
+function fileLooksLikeTranscript(filePath) {
+  try {
+    const stat = fs.statSync(filePath);
+    if (stat.size <= 0) return false;
+
+    const readSize = Math.min(stat.size, 64 * 1024);
+    const fd = fs.openSync(filePath, 'r');
+    const buf = Buffer.alloc(readSize);
+    fs.readSync(fd, buf, 0, readSize, stat.size - readSize);
+    fs.closeSync(fd);
+
+    const lines = buf.toString('utf8').split('\n').filter(Boolean);
+    for (const line of lines) {
+      try {
+        const evt = JSON.parse(line);
+        if (hasConversationEvent(evt)) return true;
+      } catch {
+        // ignore malformed lines at file tail
+      }
+    }
+  } catch {}
+  return false;
+}
+
+function attachTranscript(target, startOffset = 0) {
+  transcriptPath = target.full;
+  currentSessionId = path.basename(transcriptPath, '.jsonl');
+  transcriptOffset = Math.max(0, startOffset);
+  tailRemainder = Buffer.alloc(0);
+  eventBuffer = [];
+  eventSeq = 0;
+
+  log(`Transcript attached: ${currentSessionId} (offset=${transcriptOffset})`);
+  broadcast({
+    type: 'transcript_ready',
+    transcript: transcriptPath,
+    sessionId: currentSessionId,
+    lastSeq: 0,
+  });
   startTailing();
   startSwitchWatcher();
 }
-
-function markExpectingSwitch() {
-  expectingSwitch = true;
-  if (expectingSwitchTimer) clearTimeout(expectingSwitchTimer);
-  expectingSwitchTimer = setTimeout(() => {
-    expectingSwitch = false;
-    expectingSwitchTimer = null;
-    log('Expecting-switch flag expired (no new transcript found)');
-  }, 15000);
-  log('Expecting session switch (/clear detected)');
-}
-
-function startSwitchWatcher() {
-  if (switchWatcher) { clearInterval(switchWatcher); switchWatcher = null; }
-  const slug = getProjectSlug(CWD);
-  const projectDir = path.join(PROJECTS_DIR, slug);
-
-  switchWatcher = setInterval(() => {
-    if (!transcriptPath || !expectingSwitch || !fs.existsSync(projectDir)) return;
-    try {
-      const currentBasename = path.basename(transcriptPath);
-      const candidates = fs.readdirSync(projectDir)
-        .filter(f => f.endsWith('.jsonl') && f !== currentBasename)
-        .map(f => {
-          const full = path.join(projectDir, f);
-          const stat = fs.statSync(full);
-          return { name: f, full, mtime: stat.mtimeMs, size: stat.size };
-        })
-        .filter(t => t.mtime > fs.statSync(transcriptPath).mtimeMs)
-        .sort((a, b) => b.mtime - a.mtime);
-
-      const newer = candidates.find(t => fileLooksLikeTranscript(t.full));
-      if (newer) {
-        log(`Session switch detected → ${path.basename(newer.full, '.jsonl')}`);
-        expectingSwitch = false;
-        if (expectingSwitchTimer) { clearTimeout(expectingSwitchTimer); expectingSwitchTimer = null; }
-        if (tailTimer) { clearInterval(tailTimer); tailTimer = null; }
-        if (switchWatcher) { clearInterval(switchWatcher); switchWatcher = null; }
-        attachTranscript(newer, 0);
-      }
-    } catch {}
-  }, 500);
-}
-
-function startTailing() {
-  tailRemainder = Buffer.alloc(0);
-  tailTimer = setInterval(() => {
-    if (!transcriptPath) return;
-    try {
-      const stat = fs.statSync(transcriptPath);
-      if (stat.size <= transcriptOffset) return;
-
-      const fd = fs.openSync(transcriptPath, 'r');
-      const buf = Buffer.alloc(stat.size - transcriptOffset);
-      fs.readSync(fd, buf, 0, buf.length, transcriptOffset);
-      fs.closeSync(fd);
-      transcriptOffset = stat.size;
-
-      const data = tailRemainder.length > 0 ? Buffer.concat([tailRemainder, buf]) : buf;
-      let start = 0;
-      for (let i = 0; i < data.length; i++) {
-        if (data[i] !== 0x0A) continue; // '\n'
-        const line = data.slice(start, i).toString('utf8').trim();
-        start = i + 1;
-        if (!line) continue;
-        try {
-          const event = JSON.parse(line);
-          // Detect /clear from JSONL events (covers terminal direct input)
-          if (event.type === 'user' || (event.message && event.message.role === 'user')) {
-            broadcast({ type: 'working_started' });
-            const content = event.message && event.message.content;
-            if (typeof content === 'string' && /^\/clear\s*$/i.test(content.trim())) {
-              markExpectingSwitch();
-            }
-          }
-          const record = { seq: ++eventSeq, event };
-          eventBuffer.push(record);
-          if (eventBuffer.length > EVENT_BUFFER_MAX) {
-            eventBuffer = eventBuffer.slice(-Math.round(EVENT_BUFFER_MAX * 0.8));
-          }
-          broadcast({ type: 'log_event', seq: record.seq, event });
-        } catch {
-          // skip malformed lines
-        }
-      }
-      tailRemainder = data.slice(start);
-    } catch {
-      // file might be temporarily locked
-    }
-  }, 300);
-}
-
+
+function markExpectingSwitch() {
+  expectingSwitch = true;
+  if (expectingSwitchTimer) clearTimeout(expectingSwitchTimer);
+  expectingSwitchTimer = setTimeout(() => {
+    expectingSwitch = false;
+    expectingSwitchTimer = null;
+    log('Expecting-switch flag expired (no new transcript found)');
+  }, 15000);
+  log('Expecting session switch (/clear detected)');
+}
+
+function startSwitchWatcher() {
+  if (switchWatcher) { clearInterval(switchWatcher); switchWatcher = null; }
+  const slug = getProjectSlug(CWD);
+  const projectDir = path.join(PROJECTS_DIR, slug);
+
+  switchWatcher = setInterval(() => {
+    if (!transcriptPath || !expectingSwitch || !fs.existsSync(projectDir)) return;
+    try {
+      const currentBasename = path.basename(transcriptPath);
+      const candidates = fs.readdirSync(projectDir)
+        .filter(f => f.endsWith('.jsonl') && f !== currentBasename)
+        .map(f => {
+          const full = path.join(projectDir, f);
+          const stat = fs.statSync(full);
+          return { name: f, full, mtime: stat.mtimeMs, size: stat.size };
+        })
+        .filter(t => t.mtime > fs.statSync(transcriptPath).mtimeMs)
+        .sort((a, b) => b.mtime - a.mtime);
+
+      const newer = candidates.find(t => fileLooksLikeTranscript(t.full));
+      if (newer) {
+        log(`Session switch detected → ${path.basename(newer.full, '.jsonl')}`);
+        expectingSwitch = false;
+        if (expectingSwitchTimer) { clearTimeout(expectingSwitchTimer); expectingSwitchTimer = null; }
+        if (tailTimer) { clearInterval(tailTimer); tailTimer = null; }
+        if (switchWatcher) { clearInterval(switchWatcher); switchWatcher = null; }
+        attachTranscript(newer, 0);
+      }
+    } catch {}
+  }, 500);
+}
+
+function startTailing() {
+  tailRemainder = Buffer.alloc(0);
+  tailTimer = setInterval(() => {
+    if (!transcriptPath) return;
+    try {
+      const stat = fs.statSync(transcriptPath);
+      if (stat.size <= transcriptOffset) return;
+
+      const fd = fs.openSync(transcriptPath, 'r');
+      const buf = Buffer.alloc(stat.size - transcriptOffset);
+      fs.readSync(fd, buf, 0, buf.length, transcriptOffset);
+      fs.closeSync(fd);
+      transcriptOffset = stat.size;
+
+      const data = tailRemainder.length > 0 ? Buffer.concat([tailRemainder, buf]) : buf;
+      let start = 0;
+      for (let i = 0; i < data.length; i++) {
+        if (data[i] !== 0x0A) continue; // '\n'
+        const line = data.slice(start, i).toString('utf8').trim();
+        start = i + 1;
+        if (!line) continue;
+        try {
+          const event = JSON.parse(line);
+          // Detect /clear from JSONL events (covers terminal direct input)
+          if (event.type === 'user' || (event.message && event.message.role === 'user')) {
+            broadcast({ type: 'working_started' });
+            const content = event.message && event.message.content;
+            if (typeof content === 'string' && /^\/clear\s*$/i.test(content.trim())) {
+              markExpectingSwitch();
+            }
+          }
+          const record = { seq: ++eventSeq, event };
+          eventBuffer.push(record);
+          if (eventBuffer.length > EVENT_BUFFER_MAX) {
+            eventBuffer = eventBuffer.slice(-Math.round(EVENT_BUFFER_MAX * 0.8));
+          }
+          broadcast({ type: 'log_event', seq: record.seq, event });
+        } catch {
+          // skip malformed lines
+        }
+      }
+      tailRemainder = data.slice(start);
+    } catch {
+      // file might be temporarily locked
+    }
+  }, 300);
+}
+
 function stopTailing() {
   if (tailTimer) { clearInterval(tailTimer); tailTimer = null; }
   if (switchWatcher) { clearInterval(switchWatcher); switchWatcher = null; }
   if (expectingSwitchTimer) { clearTimeout(expectingSwitchTimer); expectingSwitchTimer = null; }
   expectingSwitch = false;
-  tailRemainder = Buffer.alloc(0);
-}
-
-// ============================================================
-//  5. Image Upload → Clipboard Injection
-// ============================================================
-function handlePreparedImageUpload({ tmpFile, mediaType, text, logLabel = '', onCleanup = null }) {
-  if (!claudeProc) throw new Error('Claude not running');
-  if (!tmpFile || !fs.existsSync(tmpFile)) throw new Error('Prepared image file missing');
-
-  const isWin = process.platform === 'win32';
-  const isMac = process.platform === 'darwin';
-
-  try {
-    const stat = fs.statSync(tmpFile);
-    log(`Image ready: ${logLabel || path.basename(tmpFile)} (${stat.size} bytes)`);
-
-    if (isWin) {
-      const psCmd = `Add-Type -AssemblyName System.Drawing; Add-Type -AssemblyName System.Windows.Forms; $img = [System.Drawing.Image]::FromFile('${tmpFile.replace(/'/g, "''")}'); [System.Windows.Forms.Clipboard]::SetImage($img); $img.Dispose()`;
-      execSync(`powershell -NoProfile -STA -Command "${psCmd}"`, { timeout: 10000 });
-    } else if (isMac) {
-      execSync(`osascript -e 'set the clipboard to (read POSIX file "${tmpFile}" as 芦class PNGf禄)'`, { timeout: 10000 });
-    } else {
-      try {
-        execSync(`xclip -selection clipboard -t image/png -i < "${tmpFile}"`, { timeout: 10000, shell: true });
-      } catch {
-        execSync(`wl-copy --type image/png < "${tmpFile}"`, { timeout: 10000, shell: true });
-      }
-    }
-    log('Clipboard set with image');
-
-    if (isWin) claudeProc.write('\x1bv');
-    else claudeProc.write('\x16');
-    log('Sent image paste keypress to PTY');
-
-    setTimeout(() => {
-      if (!claudeProc) return;
-      const trimmedText = (text || '').trim();
-      if (trimmedText) claudeProc.write(trimmedText);
-
-      setTimeout(() => {
-        if (claudeProc) claudeProc.write('\r');
-        log('Sent Enter after image paste' + (trimmedText ? ` + text: "${trimmedText.substring(0, 60)}"` : ''));
-
-        setTimeout(() => {
-          if (onCleanup) onCleanup();
-          else {
-            try { fs.unlinkSync(tmpFile); } catch {}
-          }
-        }, 5000);
-      }, 150);
-    }, 1000);
-  } catch (err) {
-    log(`Image upload error: ${err.message}`);
-    if (onCleanup) onCleanup();
-    else {
-      try { fs.unlinkSync(tmpFile); } catch {}
-    }
-    throw err;
-  }
-}
-
-function handleImageUpload(msg) {
-  if (!claudeProc) {
-    log('Image upload ignored: Claude not running');
-    return;
-  }
-  if (!msg.base64) {
-    log('Image upload ignored: no base64 data');
-    return;
-  }
-
-  const buf = Buffer.from(msg.base64, 'base64');
-  const tmpFile = createTempImageFile(buf, msg.mediaType, `legacy_${Date.now()}`);
-
-  try {
-    log(`Image saved: ${tmpFile} (${buf.length} bytes)`);
-    handlePreparedImageUpload({
-      tmpFile,
-      mediaType: msg.mediaType,
-      text: msg.text || '',
-    });
-  } catch (err) {
-    log(`Image upload error: ${err.message}`);
-    try { fs.unlinkSync(tmpFile); } catch {}
-  }
-}
-
-// ============================================================
-//  6. Hook Auto-Setup
-
-// ============================================================
-function setupHooks() {
-  const claudeDir = path.join(CWD, '.claude');
-  if (!fs.existsSync(claudeDir)) fs.mkdirSync(claudeDir, { recursive: true });
-
-  const settingsPath = path.join(claudeDir, 'settings.local.json');
-  let settings = {};
-  try { settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8')); } catch {}
-
-  const hookScript = path.resolve(__dirname, 'hooks', 'bridge-approval.js').replace(/\\/g, '/');
-  const hookCmd = `node "${hookScript}"`;
-
-  // Merge bridge hook into PreToolUse (preserve user's other hooks)
-  const existing = settings.hooks?.PreToolUse || [];
-  const bridgeIdx = existing.findIndex(e =>
-    e.hooks?.some(h => h.command?.includes('bridge-approval'))
-  );
-  const bridgeEntry = {
-    matcher: '',
-    hooks: [{ type: 'command', command: hookCmd, timeout: 120 }],
-  };
-
-  if (bridgeIdx >= 0) {
-    existing[bridgeIdx] = bridgeEntry;
-  } else {
-    existing.push(bridgeEntry);
-  }
-
-  settings.hooks = settings.hooks || {};
-  settings.hooks.PreToolUse = existing;
-
-  // Merge bridge hook into Stop (notify WebUI when Claude's turn ends)
-  const stopScript = path.resolve(__dirname, 'hooks', 'bridge-stop.js').replace(/\\/g, '/');
-  const stopCmd = `node "${stopScript}"`;
-  const existingStop = settings.hooks.Stop || [];
-  const stopBridgeIdx = existingStop.findIndex(e =>
-    e.hooks?.some(h => h.command?.includes('bridge-stop'))
-  );
-  const stopEntry = {
-    hooks: [{ type: 'command', command: stopCmd, timeout: 10 }],
-  };
-  if (stopBridgeIdx >= 0) {
-    existingStop[stopBridgeIdx] = stopEntry;
-  } else {
-    existingStop.push(stopEntry);
+  tailRemainder = Buffer.alloc(0);
+}
+
+// ============================================================
+//  5. Image Upload → Clipboard Injection
+// ============================================================
+function handlePreparedImageUpload({ tmpFile, mediaType, text, logLabel = '', onCleanup = null }) {
+  if (!claudeProc) throw new Error('Claude not running');
+  if (!tmpFile || !fs.existsSync(tmpFile)) throw new Error('Prepared image file missing');
+
+  const isWin = process.platform === 'win32';
+  const isMac = process.platform === 'darwin';
+
+  try {
+    const stat = fs.statSync(tmpFile);
+    log(`Image ready: ${logLabel || path.basename(tmpFile)} (${stat.size} bytes)`);
+
+    if (isWin) {
+      const psCmd = `Add-Type -AssemblyName System.Drawing; Add-Type -AssemblyName System.Windows.Forms; $img = [System.Drawing.Image]::FromFile('${tmpFile.replace(/'/g, "''")}'); [System.Windows.Forms.Clipboard]::SetImage($img); $img.Dispose()`;
+      execSync(`powershell -NoProfile -STA -Command "${psCmd}"`, { timeout: 10000 });
+    } else if (isMac) {
+      execSync(`osascript -e 'set the clipboard to (read POSIX file "${tmpFile}" as 芦class PNGf禄)'`, { timeout: 10000 });
+    } else {
+      try {
+        execSync(`xclip -selection clipboard -t image/png -i < "${tmpFile}"`, { timeout: 10000, shell: true });
+      } catch {
+        execSync(`wl-copy --type image/png < "${tmpFile}"`, { timeout: 10000, shell: true });
+      }
+    }
+    log('Clipboard set with image');
+
+    if (isWin) claudeProc.write('\x1bv');
+    else claudeProc.write('\x16');
+    log('Sent image paste keypress to PTY');
+
+    setTimeout(() => {
+      if (!claudeProc) return;
+      const trimmedText = (text || '').trim();
+      if (trimmedText) claudeProc.write(trimmedText);
+
+      setTimeout(() => {
+        if (claudeProc) claudeProc.write('\r');
+        log('Sent Enter after image paste' + (trimmedText ? ` + text: "${trimmedText.substring(0, 60)}"` : ''));
+
+        setTimeout(() => {
+          if (onCleanup) onCleanup();
+          else {
+            try { fs.unlinkSync(tmpFile); } catch {}
+          }
+        }, 5000);
+      }, 150);
+    }, 1000);
+  } catch (err) {
+    log(`Image upload error: ${err.message}`);
+    if (onCleanup) onCleanup();
+    else {
+      try { fs.unlinkSync(tmpFile); } catch {}
+    }
+    throw err;
+  }
+}
+
+function handleImageUpload(msg) {
+  if (!claudeProc) {
+    log('Image upload ignored: Claude not running');
+    return;
+  }
+  if (!msg.base64) {
+    log('Image upload ignored: no base64 data');
+    return;
+  }
+
+  const buf = Buffer.from(msg.base64, 'base64');
+  const tmpFile = createTempImageFile(buf, msg.mediaType, `legacy_${Date.now()}`);
+
+  try {
+    log(`Image saved: ${tmpFile} (${buf.length} bytes)`);
+    handlePreparedImageUpload({
+      tmpFile,
+      mediaType: msg.mediaType,
+      text: msg.text || '',
+    });
+  } catch (err) {
+    log(`Image upload error: ${err.message}`);
+    try { fs.unlinkSync(tmpFile); } catch {}
+  }
+}
+
+// ============================================================
+//  6. Hook Auto-Setup
+
+// ============================================================
+function setupHooks() {
+  const claudeDir = path.join(CWD, '.claude');
+  if (!fs.existsSync(claudeDir)) fs.mkdirSync(claudeDir, { recursive: true });
+
+  const settingsPath = path.join(claudeDir, 'settings.local.json');
+  let settings = {};
+  try { settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8')); } catch {}
+
+  const hookScript = path.resolve(__dirname, 'hooks', 'bridge-approval.js').replace(/\\/g, '/');
+  const hookCmd = `node "${hookScript}"`;
+
+  // Merge bridge hook into PreToolUse (preserve user's other hooks)
+  const existing = settings.hooks?.PreToolUse || [];
+  const bridgeIdx = existing.findIndex(e =>
+    e.hooks?.some(h => h.command?.includes('bridge-approval'))
+  );
+  const bridgeEntry = {
+    matcher: '',
+    hooks: [{ type: 'command', command: hookCmd, timeout: 120 }],
+  };
+
+  if (bridgeIdx >= 0) {
+    existing[bridgeIdx] = bridgeEntry;
+  } else {
+    existing.push(bridgeEntry);
+  }
+
+  settings.hooks = settings.hooks || {};
+  settings.hooks.PreToolUse = existing;
+
+  // Merge bridge hook into Stop (notify WebUI when Claude's turn ends)
+  const stopScript = path.resolve(__dirname, 'hooks', 'bridge-stop.js').replace(/\\/g, '/');
+  const stopCmd = `node "${stopScript}"`;
+  const existingStop = settings.hooks.Stop || [];
+  const stopBridgeIdx = existingStop.findIndex(e =>
+    e.hooks?.some(h => h.command?.includes('bridge-stop'))
+  );
+  const stopEntry = {
+    hooks: [{ type: 'command', command: stopCmd, timeout: 10 }],
+  };
+  if (stopBridgeIdx >= 0) {
+    existingStop[stopBridgeIdx] = stopEntry;
+  } else {
+    existingStop.push(stopEntry);
   }
   settings.hooks.Stop = existingStop;
 
@@ -991,37 +1091,45 @@ function setupHooks() {
   fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
   log(`Hooks configured: ${settingsPath}`);
 }
-
-// ============================================================
-//  7. Startup
-// ============================================================
-server.listen(PORT, '0.0.0.0', () => {
-  const ifaces = os.networkInterfaces();
-  let lanIp = 'localhost';
-  for (const name of Object.keys(ifaces)) {
-    for (const iface of ifaces[name]) {
-      if (iface.family === 'IPv4' && !iface.internal) {
-        lanIp = iface.address;
-        break;
-      }
-    }
-  }
-  const local = `http://localhost:${PORT}`;
-  const lan = `http://${lanIp}:${PORT}`;
-
-  // Print banner to stdout BEFORE PTY takes over
-  process.stdout.write(`
-  Claude Remote Control Bridge
-  ─────────────────────────────
-  Local:  ${local}
-  LAN:    ${lan}
-  CWD:    ${CWD}
-  Log:    ${LOG_FILE}
-
-  Phone:  ${lan}
-  ─────────────────────────────
-
-`);
+
+// ============================================================
+//  7. Startup
+// ============================================================
+server.listen(PORT, '0.0.0.0', () => {
+  const ifaces = os.networkInterfaces();
+  let lanIp = 'localhost';
+  for (const name of Object.keys(ifaces)) {
+    for (const iface of ifaces[name]) {
+      if (iface.family === 'IPv4' && !iface.internal) {
+        lanIp = iface.address;
+        break;
+      }
+    }
+  }
+  const local = `http://localhost:${PORT}`;
+  const lan = `http://${lanIp}:${PORT}`;
+
+  // Print banner to stdout BEFORE PTY takes over
+  let banner = `
+  Claude Remote Control Bridge
+  ─────────────────────────────
+  Local:  ${local}
+  LAN:    ${lan}
+  CWD:    ${CWD}
+  Log:    ${LOG_FILE}
+`;
+  if (CLAUDE_EXTRA_ARGS.length > 0) {
+    banner += `  Args:   claude ${CLAUDE_EXTRA_ARGS.join(' ')}\n`;
+  }
+  if (_blockedArgs.length > 0) {
+    banner += `  Blocked: ${_blockedArgs.join(', ')} (incompatible with bridge)\n`;
+  }
+  banner += `
+  Phone:  ${lan}
+  ─────────────────────────────
+
+`;
+  process.stdout.write(banner);
   setupHooks();
   spawnClaude();
 });