claude-remote 0.4.2 → 0.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-remote",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "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 } = require('child_process');
+const { execSync, spawn } = require('child_process');
 
 // --- CLI argument parsing ---
 // Separate bridge args (CWD positional) from claude passthrough flags.
@@ -194,9 +194,10 @@ let turnState = {
   version: 0,
   updatedAt: Date.now(),
 };
-let ttyInputForwarderAttached = false;
-let ttyInputHandler = null;
-let ttyResizeHandler = null;
+let ttyInputForwarderAttached = false;
+let ttyInputHandler = null;
+let ttyResizeHandler = null;
+let activeLinuxClipboardProc = null;
 
 // --- Permission approval state ---
 let approvalSeq = 0;
@@ -218,6 +219,18 @@ 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}` : '';
@@ -657,10 +670,6 @@ function createTempImageFile(buffer, mediaType, uploadId) {
   return tmpFile;
 }
 
-function shellQuote(value) {
-  return `'${String(value || '').replace(/'/g, `'\\''`)}'`;
-}
-
 function getLinuxClipboardTool() {
   if (process.platform === 'win32' || process.platform === 'darwin') return null;
   try {
@@ -687,6 +696,41 @@ function assertLinuxClipboardAvailable() {
   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();
@@ -1689,46 +1733,40 @@ function handlePreparedImageUpload({ tmpFile, mediaType, text, logLabel = '', on
     } else if (isMac) {
       execSync(`osascript -e 'set the clipboard to (read POSIX file "${tmpFile}" as 芦class PNGf禄)'`, { timeout: 10000 });
     } else {
-      const type = String(mediaType || 'image/png').toLowerCase();
-      const tool = assertLinuxClipboardAvailable();
-      const quotedPath = shellQuote(tmpFile);
-      const quotedType = shellQuote(type);
-      if (tool === 'xclip') {
-        execSync(`xclip -selection clipboard -t ${quotedType} -i < ${quotedPath}`, {
-          timeout: 10000,
-          shell: '/bin/sh',
-        });
-      } else {
-        execSync(`wl-copy --type ${quotedType} < ${quotedPath}`, {
-          timeout: 10000,
-          shell: '/bin/sh',
-        });
-      }
-      log(`Linux clipboard set with ${tool} (${type})`);
+      const tool = startLinuxClipboardImage(tmpFile, mediaType);
+      log(`Linux clipboard armed with ${tool}`);
     }
     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);
+    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)}"` : ''));
-
-        setTimeout(() => {
-          if (onCleanup) onCleanup();
+        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);
+      }, 150);
+    }, 1000 + pasteDelayMs);
   } catch (err) {
     log(`Image upload error: ${err.message}`);
     if (onCleanup) onCleanup();