claude-remote 0.4.4 → 0.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-remote",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "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;
@@ -185,7 +185,8 @@ let tailRemainder = Buffer.alloc(0);
 let tailCatchingUp = false; // true while reading historical transcript content
 const isTTY = process.stdin.isTTY && process.stdout.isTTY;
 const LEGACY_REPLAY_DELAY_MS = 1500;
-const IMAGE_UPLOAD_TTL_MS = 15 * 60 * 1000;
+const IMAGE_UPLOAD_TTL_MS = 15 * 60 * 1000;
+const LINUX_CLIPBOARD_READY_GRACE_MS = 400;
 const IMAGE_UPLOAD_DIR = path.join(CLAUDE_HOME, 'remote-uploads');
 let turnStateVersion = 0;
 let turnState = {
@@ -198,6 +199,7 @@ let ttyInputForwarderAttached = false;
 let ttyInputHandler = null;
 let ttyResizeHandler = null;
 let activeLinuxClipboardProc = null;
+let linuxImagePasteInFlight = false;
 
 // --- Permission approval state ---
 let approvalSeq = 0;
@@ -210,27 +212,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}`);
-  }
-}
+  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}` : '';
@@ -263,6 +265,7 @@ function getTurnStatePayload() {
     sessionId: turnState.sessionId,
     version: turnState.version,
     updatedAt: turnState.updatedAt,
+    reason: turnState.reason || '',
   };
 }
 
@@ -284,6 +287,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}` : ''}`);
@@ -291,19 +295,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);
   };
@@ -657,79 +683,134 @@ 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 {}
+  fs.writeFileSync(tmpFile, buffer);
+  return tmpFile;
+}
+
+function isLinuxClipboardToolInstalled(tool) {
   try {
-    execSync('command -v wl-copy >/dev/null 2>&1', {
+    execSync(`command -v ${tool} >/dev/null 2>&1`, {
       stdio: 'ignore',
       shell: '/bin/sh',
       timeout: 2000,
     });
-    return 'wl-copy';
-  } catch {}
-  return null;
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function setLinuxImagePasteInFlight(active, reason = '') {
+  linuxImagePasteInFlight = !!active;
+  if (reason) log(`Linux image paste lock=${linuxImagePasteInFlight ? 'on' : 'off'} reason=${reason}`);
+}
+
+function getLinuxClipboardToolCandidates() {
+  if (process.platform === 'win32' || process.platform === 'darwin') return [];
+  const preferred = [];
+  if (process.env.WAYLAND_DISPLAY) preferred.push('wl-copy');
+  if (process.env.DISPLAY) preferred.push('xclip');
+  return preferred;
 }
 
 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.');
+  const candidates = getLinuxClipboardToolCandidates();
+  const available = candidates.filter(isLinuxClipboardToolInstalled);
+  if (available.length > 0) return available;
+  if (!process.env.WAYLAND_DISPLAY && !process.env.DISPLAY) {
+    throw new Error('Linux image paste requires an active graphical session (WAYLAND_DISPLAY or DISPLAY).');
+  }
+  throw new Error('Linux image paste requires wl-copy or xclip on the server. Install a matching clipboard tool and try again.');
 }
 
-function startLinuxClipboardImage(tmpFile, mediaType) {
+function spawnLinuxClipboardTool(tool, imageBuffer, type) {
+  return new Promise((resolve, reject) => {
+    const args = tool === 'xclip'
+      ? ['-selection', 'clipboard', '-t', type, '-i']
+      : ['--type', type];
+    const child = spawn(tool, args, {
+      detached: true,
+      stdio: ['pipe', 'ignore', 'pipe'],
+    });
+    let settled = false;
+    let stderr = '';
+    let readyTimer = null;
+
+    const settleFailure = (message) => {
+      if (settled) return;
+      settled = true;
+      if (readyTimer) clearTimeout(readyTimer);
+      try { child.kill('SIGTERM'); } catch {}
+      reject(new Error(message));
+    };
+
+    const settleSuccess = () => {
+      if (settled) return;
+      settled = true;
+      if (readyTimer) clearTimeout(readyTimer);
+      activeLinuxClipboardProc = { child, tool };
+      child.unref();
+      resolve(tool);
+    };
+
+    child.on('error', (err) => {
+      log(`Linux clipboard process error (${tool}): ${err.message}`);
+      settleFailure(`Linux clipboard tool ${tool} failed: ${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}`);
+      if (!settled) {
+        const detail = stderr.trim() || `exit code ${code ?? 'null'} signal ${signal ?? 'null'}`;
+        settleFailure(`Linux clipboard tool ${tool} exited before paste: ${detail}`);
+      }
+    });
+    child.stdin.on('error', (err) => {
+      if (err.code === 'EPIPE') {
+        settleFailure(`Linux clipboard tool ${tool} closed its input early`);
+        return;
+      }
+      log(`Linux clipboard stdin error (${tool}): ${err.message}`);
+      settleFailure(`Linux clipboard tool ${tool} stdin failed: ${err.message}`);
+    });
+
+    child.stdin.end(imageBuffer);
+    log(`Linux clipboard process started (${tool}) pid=${child.pid ?? 'null'} type=${type} bytes=${imageBuffer.length}`);
+    readyTimer = setTimeout(() => settleSuccess(), LINUX_CLIPBOARD_READY_GRACE_MS);
+  });
+}
+
+async function startLinuxClipboardImage(tmpFile, mediaType) {
   const type = String(mediaType || 'image/png').toLowerCase();
-  const tool = assertLinuxClipboardAvailable();
   const imageBuffer = fs.readFileSync(tmpFile);
+  const availableTools = assertLinuxClipboardAvailable();
   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;
+
+  let lastErr = null;
+  for (const tool of availableTools) {
+    try {
+      return await spawnLinuxClipboardTool(tool, imageBuffer, type);
+    } catch (err) {
+      lastErr = err;
+      log(`Linux clipboard arm failed (${tool}): ${err.message}`);
+    }
+  }
+
+  throw lastErr || new Error('Linux clipboard could not be initialized');
 }
 
 setInterval(() => {
@@ -899,6 +980,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.
@@ -966,25 +1055,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;
-        }
+      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}`);
+            const tools = assertLinuxClipboardAvailable();
+            log(`Linux clipboard preflight OK: ${tools.join(', ')}`);
           } catch (err) {
             sendUploadStatus(ws, uploadId, 'error', { message: err.message });
             break;
           }
         }
-        pendingImageUploads.set(uploadId, {
-          id: uploadId,
-          owner: ws,
+        pendingImageUploads.set(uploadId, {
+          id: uploadId,
+          owner: ws,
           mediaType: msg.mediaType || 'image/png',
           name: msg.name || 'image',
           totalBytes: Number.isFinite(msg.totalBytes) ? msg.totalBytes : 0,
@@ -1082,15 +1171,15 @@ wss.on('connection', (ws, req) => {
         if (!upload || !upload.tmpFile) {
           sendUploadStatus(ws, uploadId, 'error', { message: 'Upload not ready' });
           break;
-        }
+        }
         try {
-          handlePreparedImageUpload({
+          await 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' });
@@ -1717,81 +1806,104 @@ function restartClaude(newCwd) {
 // ============================================================
 //  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';
+async 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';
+  const isLinux = !isWin && !isMac;
+  if (isLinux && linuxImagePasteInFlight) {
+    throw new Error('Another Linux image paste is still in progress. Please wait a moment and try again.');
+  }
   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) {
+    const stat = fs.statSync(tmpFile);
+    log(`Image ready: ${logLabel || path.basename(tmpFile)} (${stat.size} bytes)`);
+    if (isLinux) setLinuxImagePasteInFlight(true, 'prepare_upload');
+
+    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 {
-      const tool = startLinuxClipboardImage(tmpFile, mediaType);
+      const tool = await 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);
+    log('Clipboard set with image');
 
-    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);
+    const pasteDelayMs = isWin || isMac ? 0 : 150;
+    await new Promise((resolve, reject) => {
+      setTimeout(() => {
+        if (!claudeProc) {
+          reject(new Error('Claude stopped before image paste'));
+          return;
         }
+        if (isWin) claudeProc.write('\x1bv');
+        else claudeProc.write('\x16');
+        log('Sent image paste keypress to PTY');
 
         setTimeout(() => {
-          if (onCleanup) onCleanup();
-          else {
-            try { fs.unlinkSync(tmpFile); } catch {}
-          }
-        }, 5000);
-      }, 150);
-    }, 1000 + pasteDelayMs);
-  } catch (err) {
-    log(`Image upload error: ${err.message}`);
-    if (onCleanup) onCleanup();
-    else {
-      try { fs.unlinkSync(tmpFile); } catch {}
-    }
+          if (!claudeProc) {
+            reject(new Error('Claude stopped before image prompt'));
+            return;
+          }
+          const trimmedText = (text || '').trim();
+          if (trimmedText) claudeProc.write(trimmedText);
+
+          setTimeout(() => {
+            if (!claudeProc) {
+              reject(new Error('Claude stopped before image submit'));
+              return;
+            }
+            claudeProc.write('\r');
+            log('Sent Enter after image paste' + (trimmedText ? ` + text: "${trimmedText.substring(0, 60)}"` : ''));
+
+            if (isLinux) {
+              setTimeout(() => clearActiveLinuxClipboardProc('post-paste'), 1000);
+            }
+
+            setTimeout(() => {
+              if (isLinux) setLinuxImagePasteInFlight(false, 'cleanup');
+              if (onCleanup) onCleanup();
+              else {
+                try { fs.unlinkSync(tmpFile); } catch {}
+              }
+            }, 5000);
+            resolve();
+          }, 150);
+        }, 1000);
+      }, pasteDelayMs);
+    });
+  } catch (err) {
+    log(`Image upload error: ${err.message}`);
+    if (isLinux) {
+      clearActiveLinuxClipboardProc('error');
+      setLinuxImagePasteInFlight(false, 'error');
+    }
+    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;
-  }
-  let tmpFile = null;
-
+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 tools = assertLinuxClipboardAvailable();
+      log(`Linux clipboard preflight OK (legacy upload): ${tools.join(', ')}`);
     }
     const buf = Buffer.from(msg.base64, 'base64');
     tmpFile = createTempImageFile(buf, msg.mediaType, `legacy_${Date.now()}`);
@@ -1800,13 +1912,16 @@ function handleImageUpload(msg) {
       tmpFile,
       mediaType: msg.mediaType,
       text: msg.text || '',
+    }).then(() => {
+      setTurnState('running', { reason: 'legacy_image_upload' });
+    }).catch((err) => {
+      log(`Image upload error: ${err.message}`);
     });
-    setTurnState('running', { reason: 'legacy_image_upload' });
   } catch (err) {
-    log(`Image upload error: ${err.message}`);
-    try { fs.unlinkSync(tmpFile); } catch {}
-  }
-}
+    log(`Image upload error: ${err.message}`);
+    try { fs.unlinkSync(tmpFile); } catch {}
+  }
+}
 
 // ============================================================
 //  6. Hook Auto-Setup