claude-remote 0.4.3 → 0.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-remote",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "Remote control bridge for Claude Code REPL - drive from phone/WebUI",
   "main": "server.js",
   "bin": {

package/server.js

@@ -5,7 +5,7 @@ const os = require('os');
 const pty = require('node-pty');
 const { WebSocketServer, WebSocket } = require('ws');
 const crypto = require('crypto');
-const { execSync, spawn } = require('child_process');
+const { execSync, spawn } = require('child_process');
 
 // --- CLI argument parsing ---
 // Separate bridge args (CWD positional) from claude passthrough flags.
@@ -158,12 +158,12 @@ let CWD = _parsedCwd;
 const CLAUDE_HOME = path.join(os.homedir(), '.claude');
 const CLAUDE_STATE_FILE = path.join(os.homedir(), '.claude.json');
 const PROJECTS_DIR = path.join(CLAUDE_HOME, 'projects');
-const AUTH_HELLO_TIMEOUT_MS = 5000;
-const WS_CLOSE_AUTH_FAILED = 4001;
-const WS_CLOSE_AUTH_TIMEOUT = 4002;
-const WS_CLOSE_REASON_AUTH_FAILED = 'auth_failed';
-const WS_CLOSE_REASON_AUTH_TIMEOUT = 'auth_timeout';
-const DEBUG_TTY_INPUT = process.env.CLAUDE_REMOTE_DEBUG_TTY_INPUT === '1';
+const AUTH_HELLO_TIMEOUT_MS = 5000;
+const WS_CLOSE_AUTH_FAILED = 4001;
+const WS_CLOSE_AUTH_TIMEOUT = 4002;
+const WS_CLOSE_REASON_AUTH_FAILED = 'auth_failed';
+const WS_CLOSE_REASON_AUTH_TIMEOUT = 'auth_timeout';
+const DEBUG_TTY_INPUT = process.env.CLAUDE_REMOTE_DEBUG_TTY_INPUT === '1';
 
 // --- State ---
 let claudeProc = null;
@@ -197,6 +197,7 @@ let turnState = {
 let ttyInputForwarderAttached = false;
 let ttyInputHandler = null;
 let ttyResizeHandler = null;
+let activeLinuxClipboardProc = null;
 
 // --- Permission approval state ---
 let approvalSeq = 0;
@@ -209,15 +210,27 @@ 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);
-}
-
-function formatTtyInputChunk(chunk) {
-  const buf = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-  return `len=${buf.length} hex=${buf.toString('hex')} base64=${buf.toString('base64')} utf8=${JSON.stringify(buf.toString('utf8'))}`;
-}
+function log(msg) {
+  const line = `[${new Date().toISOString()}] ${msg}\n`;
+  fs.appendFileSync(LOG_FILE, line);
+}
+
+function formatTtyInputChunk(chunk) {
+  const buf = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+  return `len=${buf.length} hex=${buf.toString('hex')} base64=${buf.toString('base64')} utf8=${JSON.stringify(buf.toString('utf8'))}`;
+}
+
+function clearActiveLinuxClipboardProc(reason = '') {
+  if (!activeLinuxClipboardProc) return;
+  const { child, tool } = activeLinuxClipboardProc;
+  activeLinuxClipboardProc = null;
+  try {
+    child.kill('SIGTERM');
+    log(`Linux clipboard process terminated (${tool}) reason=${reason || 'cleanup'}`);
+  } catch (err) {
+    log(`Linux clipboard process terminate error (${tool}): ${err.message}`);
+  }
+}
 
 function wsLabel(ws) {
   const clientId = ws && ws._clientInstanceId ? ` client=${ws._clientInstanceId}` : '';
@@ -250,6 +263,7 @@ function getTurnStatePayload() {
     sessionId: turnState.sessionId,
     version: turnState.version,
     updatedAt: turnState.updatedAt,
+    reason: turnState.reason || '',
   };
 }
 
@@ -271,6 +285,7 @@ function setTurnState(phase, { sessionId = currentSessionId, reason = '', force
     sessionId: normalizedSessionId,
     version: ++turnStateVersion,
     updatedAt: Date.now(),
+    reason,
   };
 
   log(`Turn state -> phase=${turnState.phase} session=${turnState.sessionId ?? 'null'} version=${turnState.version}${reason ? ` reason=${reason}` : ''}`);
@@ -278,19 +293,41 @@ function setTurnState(phase, { sessionId = currentSessionId, reason = '', force
   return true;
 }
 
+function emitInterrupt(source) {
+  const interruptEvent = {
+    type: 'interrupt',
+    source,
+    timestamp: Date.now(),
+    uuid: crypto.randomUUID(),
+  };
+  const record = { seq: ++eventSeq, event: interruptEvent };
+  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: interruptEvent });
+  setTurnState('idle', { reason: `${source}_interrupt` });
+}
+
 function attachTtyForwarders() {
-  if (!isTTY || ttyInputForwarderAttached) return;
-
-  ttyInputHandler = (chunk) => {
-    if (DEBUG_TTY_INPUT) {
-      try {
-        log(`TTY input ${formatTtyInputChunk(chunk)}`);
-      } catch (err) {
-        log(`TTY input log error: ${err.message}`);
-      }
-    }
-    if (claudeProc) claudeProc.write(chunk);
-  };
+  if (!isTTY || ttyInputForwarderAttached) return;
+
+  ttyInputHandler = (chunk) => {
+    if (DEBUG_TTY_INPUT) {
+      try {
+        log(`TTY input ${formatTtyInputChunk(chunk)}`);
+      } catch (err) {
+        log(`TTY input log error: ${err.message}`);
+      }
+    }
+    if (claudeProc) claudeProc.write(chunk);
+    // Detect Ctrl+C (0x03) from local terminal and sync state
+    const buf = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+    if (buf.includes(0x03) && turnState.phase === 'running') {
+      log('Terminal Ctrl+C detected — injecting interrupt event');
+      emitInterrupt('terminal');
+    }
+  };
   ttyResizeHandler = () => {
     if (claudeProc) claudeProc.resize(process.stdout.columns, process.stdout.rows);
   };
@@ -644,77 +681,80 @@ function cleanupClientUploads(ws) {
   }
 }
 
-function createTempImageFile(buffer, mediaType, uploadId) {
-  const isLinux = process.platform !== 'win32' && process.platform !== 'darwin';
-  const tmpDir = isLinux
-    ? IMAGE_UPLOAD_DIR
-    : (process.env.CLAUDE_CODE_TMPDIR || os.tmpdir());
+function createTempImageFile(buffer, mediaType, uploadId) {
+  const isLinux = process.platform !== 'win32' && process.platform !== 'darwin';
+  const tmpDir = isLinux
+    ? IMAGE_UPLOAD_DIR
+    : (process.env.CLAUDE_CODE_TMPDIR || os.tmpdir());
   const type = String(mediaType || 'image/png').toLowerCase();
   const ext = type.includes('jpeg') || type.includes('jpg') ? '.jpg' : '.png';
   fs.mkdirSync(tmpDir, { recursive: true });
   const tmpFile = path.join(tmpDir, `bridge_upload_${uploadId}_${Date.now()}${ext}`);
-  fs.writeFileSync(tmpFile, buffer);
-  return tmpFile;
-}
-
-function getLinuxClipboardTool() {
-  if (process.platform === 'win32' || process.platform === 'darwin') return null;
-  try {
-    execSync('command -v xclip >/dev/null 2>&1', {
-      stdio: 'ignore',
-      shell: '/bin/sh',
-      timeout: 2000,
-    });
-    return 'xclip';
-  } catch {}
-  try {
-    execSync('command -v wl-copy >/dev/null 2>&1', {
-      stdio: 'ignore',
-      shell: '/bin/sh',
-      timeout: 2000,
-    });
-    return 'wl-copy';
-  } catch {}
-  return null;
-}
-
-function assertLinuxClipboardAvailable() {
-  const tool = getLinuxClipboardTool();
-  if (tool) return tool;
-  throw new Error('Linux image paste requires xclip or wl-copy on the server. Install one and try again.');
-}
-
-function startLinuxClipboardImage(tmpFile, mediaType) {
-  const type = String(mediaType || 'image/png').toLowerCase();
-  const tool = assertLinuxClipboardAvailable();
-  const imageBuffer = fs.readFileSync(tmpFile);
-  const args = tool === 'xclip'
-    ? ['-selection', 'clipboard', '-t', type, '-i', '-loops', '1']
-    : ['--type', type, '--paste-once'];
-  const child = spawn(tool, args, {
-    detached: true,
-    stdio: ['pipe', 'ignore', 'pipe'],
-  });
-  let stderr = '';
-  child.on('error', (err) => {
-    log(`Linux clipboard process error (${tool}): ${err.message}`);
-  });
-  child.stderr.on('data', (chunk) => {
-    stderr += chunk.toString('utf8');
-    if (stderr.length > 2000) stderr = stderr.slice(-2000);
-  });
-  child.on('exit', (code, signal) => {
-    const extra = stderr.trim() ? ` stderr=${JSON.stringify(stderr.trim())}` : '';
-    log(`Linux clipboard process exited (${tool}) code=${code ?? 'null'} signal=${signal ?? 'null'}${extra}`);
-  });
-  child.stdin.on('error', (err) => {
-    if (err.code !== 'EPIPE') log(`Linux clipboard stdin error (${tool}): ${err.message}`);
-  });
-  child.stdin.end(imageBuffer);
-  child.unref();
-  log(`Linux clipboard process started (${tool}) pid=${child.pid ?? 'null'} type=${type} bytes=${imageBuffer.length}`);
-  return tool;
-}
+  fs.writeFileSync(tmpFile, buffer);
+  return tmpFile;
+}
+
+function getLinuxClipboardTool() {
+  if (process.platform === 'win32' || process.platform === 'darwin') return null;
+  try {
+    execSync('command -v xclip >/dev/null 2>&1', {
+      stdio: 'ignore',
+      shell: '/bin/sh',
+      timeout: 2000,
+    });
+    return 'xclip';
+  } catch {}
+  try {
+    execSync('command -v wl-copy >/dev/null 2>&1', {
+      stdio: 'ignore',
+      shell: '/bin/sh',
+      timeout: 2000,
+    });
+    return 'wl-copy';
+  } catch {}
+  return null;
+}
+
+function assertLinuxClipboardAvailable() {
+  const tool = getLinuxClipboardTool();
+  if (tool) return tool;
+  throw new Error('Linux image paste requires xclip or wl-copy on the server. Install one and try again.');
+}
+
+function startLinuxClipboardImage(tmpFile, mediaType) {
+  const type = String(mediaType || 'image/png').toLowerCase();
+  const tool = assertLinuxClipboardAvailable();
+  const imageBuffer = fs.readFileSync(tmpFile);
+  clearActiveLinuxClipboardProc('replace');
+  const args = tool === 'xclip'
+    ? ['-selection', 'clipboard', '-t', type, '-i']
+    : ['--type', type];
+  const child = spawn(tool, args, {
+    detached: true,
+    stdio: ['pipe', 'ignore', 'pipe'],
+  });
+  activeLinuxClipboardProc = { child, tool };
+  let stderr = '';
+  child.on('error', (err) => {
+    log(`Linux clipboard process error (${tool}): ${err.message}`);
+  });
+  child.stderr.on('data', (chunk) => {
+    stderr += chunk.toString('utf8');
+    if (stderr.length > 2000) stderr = stderr.slice(-2000);
+  });
+  child.on('exit', (code, signal) => {
+    if (activeLinuxClipboardProc && activeLinuxClipboardProc.child === child) activeLinuxClipboardProc = null;
+    const extra = stderr.trim() ? ` stderr=${JSON.stringify(stderr.trim())}` : '';
+    log(`Linux clipboard process exited (${tool}) code=${code ?? 'null'} signal=${signal ?? 'null'}${extra}`);
+  });
+  child.stdin.on('error', (err) => {
+    if (err.code !== 'EPIPE') log(`Linux clipboard stdin error (${tool}): ${err.message}`);
+  });
+  child.stdin.end(imageBuffer);
+  child.unref();
+  log(`Linux clipboard process started (${tool}) pid=${child.pid ?? 'null'} type=${type} bytes=${imageBuffer.length}`);
+  return tool;
+}
 
 setInterval(() => {
   const now = Date.now();
@@ -883,6 +923,14 @@ wss.on('connection', (ws, req) => {
         // Raw terminal keystrokes from xterm.js in WebUI
         if (claudeProc) claudeProc.write(msg.data);
         break;
+      case 'interrupt': {
+        // User pressed stop button in app — send Ctrl+C to PTY
+        if (!claudeProc || turnState.phase !== 'running') break;
+        log(`Interrupt from ${wsLabel(ws)} — sending Ctrl+C to PTY`);
+        claudeProc.write('\x03');
+        emitInterrupt('app');
+        break;
+      }
       case 'expect_clear':
         // Plan mode option 1 triggers /clear inside Claude Code;
         // client notifies us so we can detect the session switch.
@@ -950,25 +998,25 @@ wss.on('connection', (ws, req) => {
         }
         break;
       }
-      case 'image_upload_init': {
-        const uploadId = String(msg.uploadId || '');
-        if (!uploadId) {
-          sendUploadStatus(ws, '', 'error', { message: 'Missing uploadId' });
-          break;
-        }
-        cleanupImageUpload(uploadId);
-        if (process.platform !== 'win32' && process.platform !== 'darwin') {
-          try {
-            const tool = assertLinuxClipboardAvailable();
-            log(`Linux clipboard preflight OK: ${tool}`);
-          } catch (err) {
-            sendUploadStatus(ws, uploadId, 'error', { message: err.message });
-            break;
-          }
-        }
-        pendingImageUploads.set(uploadId, {
-          id: uploadId,
-          owner: ws,
+      case 'image_upload_init': {
+        const uploadId = String(msg.uploadId || '');
+        if (!uploadId) {
+          sendUploadStatus(ws, '', 'error', { message: 'Missing uploadId' });
+          break;
+        }
+        cleanupImageUpload(uploadId);
+        if (process.platform !== 'win32' && process.platform !== 'darwin') {
+          try {
+            const tool = assertLinuxClipboardAvailable();
+            log(`Linux clipboard preflight OK: ${tool}`);
+          } catch (err) {
+            sendUploadStatus(ws, uploadId, 'error', { message: err.message });
+            break;
+          }
+        }
+        pendingImageUploads.set(uploadId, {
+          id: uploadId,
+          owner: ws,
           mediaType: msg.mediaType || 'image/png',
           name: msg.name || 'image',
           totalBytes: Number.isFinite(msg.totalBytes) ? msg.totalBytes : 0,
@@ -1066,15 +1114,15 @@ wss.on('connection', (ws, req) => {
         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),
-          });
+        }
+        try {
+          handlePreparedImageUpload({
+            tmpFile: upload.tmpFile,
+            mediaType: upload.mediaType,
+            text: msg.text || '',
+            logLabel: upload.name || uploadId,
+            onCleanup: () => cleanupImageUpload(uploadId),
+          });
           upload.submitted = true;
           upload.updatedAt = Date.now();
           setTurnState('running', { reason: 'image_submit' });
@@ -1707,7 +1755,7 @@ function handlePreparedImageUpload({ tmpFile, mediaType, text, logLabel = '', on
 
   const isWin = process.platform === 'win32';
   const isMac = process.platform === 'darwin';
-  try {
+  try {
     const stat = fs.statSync(tmpFile);
     log(`Image ready: ${logLabel || path.basename(tmpFile)} (${stat.size} bytes)`);
 
@@ -1716,37 +1764,41 @@ function handlePreparedImageUpload({ tmpFile, mediaType, text, logLabel = '', on
       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 {
-      const tool = startLinuxClipboardImage(tmpFile, mediaType);
-      log(`Linux clipboard armed with ${tool}`);
-    }
+    } else {
+      const tool = startLinuxClipboardImage(tmpFile, mediaType);
+      log(`Linux clipboard armed with ${tool}`);
+    }
     log('Clipboard set with image');
 
-    const pasteDelayMs = isWin || isMac ? 0 : 150;
-    setTimeout(() => {
-      if (!claudeProc) return;
-      if (isWin) claudeProc.write('\x1bv');
-      else claudeProc.write('\x16');
-      log('Sent image paste keypress to PTY');
-    }, pasteDelayMs);
-
-    setTimeout(() => {
-      if (!claudeProc) return;
-      const trimmedText = (text || '').trim();
-      if (trimmedText) claudeProc.write(trimmedText);
+    const pasteDelayMs = isWin || isMac ? 0 : 150;
+    setTimeout(() => {
+      if (!claudeProc) return;
+      if (isWin) claudeProc.write('\x1bv');
+      else claudeProc.write('\x16');
+      log('Sent image paste keypress to PTY');
+    }, pasteDelayMs);
+
+    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)}"` : ''));
 
+        if (!isWin && !isMac) {
+          setTimeout(() => clearActiveLinuxClipboardProc('post-paste'), 1000);
+        }
+
         setTimeout(() => {
           if (onCleanup) onCleanup();
           else {
             try { fs.unlinkSync(tmpFile); } catch {}
           }
         }, 5000);
-      }, 150);
-    }, 1000 + pasteDelayMs);
+      }, 150);
+    }, 1000 + pasteDelayMs);
   } catch (err) {
     log(`Image upload error: ${err.message}`);
     if (onCleanup) onCleanup();
@@ -1757,32 +1809,32 @@ function handlePreparedImageUpload({ tmpFile, mediaType, text, logLabel = '', on
   }
 }
 
-function handleImageUpload(msg) {
-  if (!claudeProc) {
-    log('Image upload ignored: Claude not running');
-    return;
-  }
-  if (!msg.base64) {
-    log('Image upload ignored: no base64 data');
-    return;
-  }
-  let tmpFile = null;
-
-  try {
-    if (process.platform !== 'win32' && process.platform !== 'darwin') {
-      const tool = assertLinuxClipboardAvailable();
-      log(`Linux clipboard preflight OK (legacy upload): ${tool}`);
-    }
-    const buf = Buffer.from(msg.base64, 'base64');
-    tmpFile = createTempImageFile(buf, msg.mediaType, `legacy_${Date.now()}`);
-    log(`Image saved: ${tmpFile} (${buf.length} bytes)`);
-    handlePreparedImageUpload({
-      tmpFile,
-      mediaType: msg.mediaType,
-      text: msg.text || '',
-    });
-    setTurnState('running', { reason: 'legacy_image_upload' });
-  } catch (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;
+  }
+  let tmpFile = null;
+
+  try {
+    if (process.platform !== 'win32' && process.platform !== 'darwin') {
+      const tool = assertLinuxClipboardAvailable();
+      log(`Linux clipboard preflight OK (legacy upload): ${tool}`);
+    }
+    const buf = Buffer.from(msg.base64, 'base64');
+    tmpFile = createTempImageFile(buf, msg.mediaType, `legacy_${Date.now()}`);
+    log(`Image saved: ${tmpFile} (${buf.length} bytes)`);
+    handlePreparedImageUpload({
+      tmpFile,
+      mediaType: msg.mediaType,
+      text: msg.text || '',
+    });
+    setTurnState('running', { reason: 'legacy_image_upload' });
+  } catch (err) {
     log(`Image upload error: ${err.message}`);
     try { fs.unlinkSync(tmpFile); } catch {}
   }