claude-remote 0.4.1 → 0.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-remote",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "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.
@@ -158,11 +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 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;
@@ -208,10 +209,15 @@ 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 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 wsLabel(ws) {
   const clientId = ws && ws._clientInstanceId ? ` client=${ws._clientInstanceId}` : '';
@@ -273,11 +279,18 @@ function setTurnState(phase, { sessionId = currentSessionId, reason = '', force
 }
 
 function attachTtyForwarders() {
-  if (!isTTY || ttyInputForwarderAttached) return;
-
-  ttyInputHandler = (chunk) => {
-    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);
+  };
   ttyResizeHandler = () => {
     if (claudeProc) claudeProc.resize(process.stdout.columns, process.stdout.rows);
   };
@@ -644,10 +657,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 {
@@ -674,6 +683,38 @@ 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);
+  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;
+}
 
 setInterval(() => {
   const now = Date.now();
@@ -1676,33 +1717,23 @@ 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');
@@ -1714,8 +1745,8 @@ function handlePreparedImageUpload({ tmpFile, mediaType, text, logLabel = '', on
             try { fs.unlinkSync(tmpFile); } catch {}
           }
         }, 5000);
-      }, 150);
-    }, 1000);
+      }, 150);
+    }, 1000 + pasteDelayMs);
   } catch (err) {
     log(`Image upload error: ${err.message}`);
     if (onCleanup) onCleanup();