minivibe 0.2.10 → 0.2.11

package/agent/agent.js

@@ -76,6 +76,40 @@ function log(msg, color = colors.reset) {
   console.log(`${colors.dim}[${timestamp}]${colors.reset} ${color}${msg}${colors.reset}`);
 }
 
+/**
+ * Clean CLI output for logging - removes ANSI codes, TUI elements, and collapses whitespace
+ */
+function cleanCliOutput(data) {
+  let output = data.toString();
+
+  // Strip all ANSI escape sequences (comprehensive pattern)
+  // Includes: CSI sequences, OSC sequences, DCS sequences, and simple escapes
+  output = output.replace(/\x1b\[[?]?[0-9;]*[a-zA-Z]/g, '');  // CSI with optional ?
+  output = output.replace(/\x1b\][^\x07]*\x07/g, '');          // OSC sequences
+  output = output.replace(/\x1b[PX^_].*?\x1b\\/g, '');         // DCS/PM/APC sequences
+  output = output.replace(/\x1b[()][AB012]/g, '');             // Character set selection
+  output = output.replace(/\x1b[78DEHM]/g, '');                // Other simple escapes
+
+  // Strip other control characters except newline and tab
+  output = output.replace(/[\x00-\x08\x0b-\x1f\x7f]/g, '');
+
+  // Filter out TUI status bar elements (Claude's UI)
+  output = output.replace(/[─│┌┐└┘├┤┬┴┼]+/g, '');             // Box drawing chars
+  output = output.replace(/[✻◐◑◒◓⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏]/g, '');        // Spinner chars
+  output = output.replace(/\?\s*for shortcuts.*toggle\)/gi, ''); // Status bar text
+  output = output.replace(/Thinking\s+(on|off)\s*\(tab to toggle\)/gi, '');
+  output = output.replace(/\(esc to interrupt\)/gi, '');
+  output = output.replace(/Envisioning…/g, '');
+
+  // Collapse multiple spaces/newlines
+  output = output.replace(/[ \t]+/g, ' ');
+  output = output.replace(/\n{2,}/g, '\n');
+
+  // Trim and return (return empty string if only whitespace remains)
+  output = output.trim();
+  return output.length > 0 ? output : '';
+}
+
 // ====================
 // Configuration Management
 // ====================
@@ -188,6 +222,7 @@ let agentId = null;
 let hostName = os.hostname();
 let reconnectTimer = null;
 let heartbeatTimer = null;
+let e2eEnabled = false;  // E2E DISABLED - WSS provides transport encryption (use --e2e to enable)
 
 // Track running sessions: sessionId -> { process, path, name, localWs }
 const runningSessions = new Map();
@@ -759,6 +794,7 @@ function handleMessage(msg) {
     case 'agent_registered':
       log(`Agent registered: ${msg.agentId}`, colors.green);
       log(`Host: ${hostName}`, colors.dim);
+      log(`E2E encryption: ${e2eEnabled ? 'enabled' : 'disabled'}`, colors.dim);
       log('Waiting for commands...', colors.cyan);
       break;
 
@@ -790,6 +826,22 @@ function handleMessage(msg) {
       log(`Bridge error: ${msg.message}`, colors.red);
       // Relay errors to local client if applicable
       relayToLocalClient(msg);
+
+      // Check for auth-related errors and try to refresh token
+      const errorLower = (msg.message || '').toLowerCase();
+      if (errorLower.includes('token') || errorLower.includes('auth') || errorLower.includes('unauthorized')) {
+        log('Attempting token refresh...', colors.yellow);
+        (async () => {
+          const newToken = await refreshIdToken();
+          if (newToken) {
+            authToken = newToken;
+            log('Token refreshed, re-authenticating...', colors.green);
+            send({ type: 'authenticate', token: newToken });
+          } else {
+            log('Token refresh failed. Please re-login: vibe-agent login', colors.red);
+          }
+        })();
+      }
       break;
 
     // Messages to relay to local vibe-cli clients
@@ -808,6 +860,14 @@ function handleMessage(msg) {
       relayToLocalClient(msg);
       break;
 
+    case 'send_message':
+      // Mobile sent a message - relay to local vibe-cli
+      log(`📱 Relaying send_message to local client: "${(msg.content || '').toString().slice(0, 50)}..."`, colors.cyan);
+      if (!relayToLocalClient(msg)) {
+        log(`⚠️  Failed to relay send_message - no local client for session ${msg.sessionId?.slice(0, 8)}`, colors.yellow);
+      }
+      break;
+
     default:
       // Try to relay unknown messages to local client
       if (msg.sessionId) {
@@ -898,6 +958,11 @@ function handleStartSession(msg) {
   // Build args - use --agent to connect via local server
   const args = ['--agent', `ws://localhost:${LOCAL_SERVER_PORT}`];
 
+  // Pass E2E flag if enabled (needed to decrypt messages from iOS)
+  if (e2eEnabled) {
+    args.push('--e2e');
+  }
+
   if (name) {
     args.push('--name', name);
   }
@@ -945,15 +1010,15 @@ function handleStartSession(msg) {
     });
 
     proc.stdout.on('data', (data) => {
-      // Log output for debugging
-      const output = data.toString().trim();
+      // Log output for debugging (cleaned to remove ANSI codes and excess newlines)
+      const output = cleanCliOutput(data);
       if (output) {
         log(`[${newSessionId.slice(0, 8)}] ${output}`, colors.dim);
       }
     });
 
     proc.stderr.on('data', (data) => {
-      const output = data.toString().trim();
+      const output = cleanCliOutput(data);
       if (output) {
         log(`[${newSessionId.slice(0, 8)}] ${output}`, colors.yellow);
       }
@@ -1069,6 +1134,11 @@ function handleResumeSession(msg) {
   // Build args with --resume - use --agent to connect via local server
   const args = ['--agent', `ws://localhost:${LOCAL_SERVER_PORT}`, '--resume', sessionId];
 
+  // Pass E2E flag if enabled (needed to decrypt messages from iOS)
+  if (e2eEnabled) {
+    args.push('--e2e');
+  }
+
   // Try to get session info from history if path not provided
   let effectivePath = projectPath;
   let effectiveName = name;
@@ -1134,14 +1204,14 @@ function handleResumeSession(msg) {
     });
 
     proc.stdout.on('data', (data) => {
-      const output = data.toString().trim();
+      const output = cleanCliOutput(data);
       if (output) {
         log(`[${sessionId.slice(0, 8)}] ${output}`, colors.dim);
       }
     });
 
     proc.stderr.on('data', (data) => {
-      const output = data.toString().trim();
+      const output = cleanCliOutput(data);
       if (output) {
         log(`[${sessionId.slice(0, 8)}] ${output}`, colors.yellow);
       }
@@ -1374,11 +1444,13 @@ ${colors.bold}Options:${colors.reset}
   --name <name>     Set host display name
   --bridge <url>    Override bridge URL (default: wss://ws.minivibeapp.com)
   --token <token>   Use specific Firebase token
+  --e2e             Enable E2E encryption (disabled by default, WSS provides transport encryption)
 
 ${colors.bold}Examples:${colors.reset}
   vibe-agent login          Sign in (one-time setup)
-  vibe-agent                Start agent
+  vibe-agent                Start agent (E2E disabled, uses WSS transport encryption)
   vibe-agent --name "EC2"   Start with custom name
+  vibe-agent --e2e          Enable E2E encryption
 `);
 }
 
@@ -1405,7 +1477,8 @@ function parseArgs() {
     logout: false,
     name: null,
     status: false,
-    help: false
+    help: false,
+    e2e: false  // --e2e flag to enable E2E (E2E is OFF by default)
   };
 
   for (let i = 0; i < args.length; i++) {
@@ -1433,6 +1506,9 @@ function parseArgs() {
       case '-h':
         options.help = true;
         break;
+      case '--e2e':
+        options.e2e = true;
+        break;
     }
   }
 
@@ -1457,6 +1533,8 @@ async function main() {
   bridgeUrl = options.bridge || config.bridgeUrl || DEFAULT_BRIDGE_URL;
   hostName = options.name || config.hostName || os.hostname();
   agentId = config.agentId || null;  // Load persisted agentId
+  // E2E is OFF by default (WSS provides transport encryption), enable with --e2e flag or config.e2e
+  e2eEnabled = options.e2e || config.e2e || false;
 
   if (options.token) {
     authToken = options.token;
@@ -1473,6 +1551,9 @@ async function main() {
   if (options.name) {
     config.hostName = hostName;
   }
+  if (options.e2e) {
+    config.e2e = true;  // Persist --e2e setting
+  }
   saveConfig(config);
 
   // Status check

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minivibe",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": "CLI wrapper for Claude Code with mobile remote control via MiniVibe iOS app",
   "author": "MiniVibe <hello@minivibeapp.com>",
   "homepage": "https://github.com/minivibeapp/minivibe",

package/vibe.js

@@ -680,6 +680,12 @@ let lastCapturedPrompt = null;       // Last permission prompt captured from CLI
 const mobileMessageHashes = new Set();  // Track messages from mobile to avoid duplicate echo
 const MAX_MOBILE_MESSAGES = 100;     // Limit Set size
 
+// Buffer for encrypted messages received before key exchange completes
+// These will be processed after key exchange succeeds
+const e2ePendingMessages = [];
+const MAX_E2E_PENDING_MESSAGES = 10;
+const E2E_PENDING_TIMEOUT_MS = 30000;  // Discard buffered messages older than 30s
+
 // In-session slash command support
 let inputBuffer = '';  // Buffer for detecting slash commands
 const SLASH_COMMANDS = ['/name', '/upload', '/download', '/files', '/status', '/info', '/help'];
@@ -990,6 +996,39 @@ function handleBridgeMessage(msg) {
       }
       logStderr('[E2E] Encryption established!', colors.green);
       e2ePending = false;
+
+      // Process any buffered messages that were waiting for key exchange
+      if (e2ePendingMessages.length > 0) {
+        logStderr(`[E2E] Processing ${e2ePendingMessages.length} buffered message(s)...`, colors.cyan);
+        const now = Date.now();
+        let failedCount = 0;
+        while (e2ePendingMessages.length > 0) {
+          const pending = e2ePendingMessages.shift();
+          // Skip messages older than timeout
+          if (now - pending.timestamp > E2E_PENDING_TIMEOUT_MS) {
+            logStderr('[E2E] Discarding stale buffered message', colors.dim);
+            continue;
+          }
+          // Retry decryption with fresh keys
+          try {
+            const decrypted = e2e.decryptContent(pending.msg);
+            logStderr('[E2E] Successfully decrypted buffered message', colors.green);
+            handleBridgeMessage(decrypted);
+          } catch (err) {
+            // Decryption still failed - message was encrypted with old keys
+            failedCount++;
+            logStderr(`[E2E] Buffered message encrypted with old keys - cannot decrypt`, colors.yellow);
+          }
+        }
+        // Warn user about failed messages - they need to re-send from iOS
+        if (failedCount > 0) {
+          logStderr(``, colors.yellow);
+          logStderr(`⚠️  ${failedCount} message(s) could not be decrypted`, colors.yellow);
+          logStderr(`   These were encrypted before CLI received your new keys.`, colors.dim);
+          logStderr(`   Please re-send from iOS.`, colors.dim);
+          logStderr(``, colors.yellow);
+        }
+      }
     }
     return;
   }
@@ -1118,11 +1157,40 @@ function handleBridgeMessage(msg) {
     case 'send_message':
       // Mobile sent a message - forward to Claude
       // Track it so we don't echo it back (bridge already echoed to iOS)
+      {
+        const contentPreview = typeof msg.content === 'string'
+          ? msg.content.slice(0, 100)
+          : (msg.content ? JSON.stringify(msg.content).slice(0, 100) : '(empty)');
+        log(`📱 Received send_message from ${msg.source || 'unknown'}: "${contentPreview}..."`, colors.cyan);
+      }
       if (msg.content) {
         // Check if decryption failed (content is still an encrypted object)
         if (typeof msg.content === 'object' && msg.content.e2e) {
+          // If E2E is enabled but key exchange hasn't completed yet, buffer the message
+          if (e2eEnabled && !e2e.isReady()) {
+            if (e2ePendingMessages.length < MAX_E2E_PENDING_MESSAGES) {
+              logStderr('[E2E] Key exchange not complete - buffering encrypted message...', colors.cyan);
+              e2ePendingMessages.push({ msg: { ...msg }, timestamp: Date.now() });
+              // Notify iOS that message is pending
+              sendToBridge({
+                type: 'message_pending',
+                sessionId: effectiveSessionId,
+                reason: 'Waiting for E2E key exchange to complete'
+              });
+            } else {
+              logStderr('[E2E] Buffer full - discarding encrypted message', colors.yellow);
+            }
+            break;
+          }
+          // Key exchange completed but still can't decrypt - keys are out of sync
           logStderr('⚠️  Failed to decrypt message from mobile - E2E keys may be out of sync', colors.yellow);
           logStderr('   Try resetting E2E on both CLI (delete ~/.vibe/e2e-keys.json) and iOS', colors.dim);
+          // Send error back to iOS so user knows message failed
+          sendToBridge({
+            type: 'error',
+            sessionId: effectiveSessionId,
+            message: 'E2E encryption mismatch - CLI cannot decrypt message. Disable E2E on iOS or restart CLI with --e2e flag.'
+          });
           break;
         }
 
@@ -1141,7 +1209,18 @@ function handleBridgeMessage(msg) {
           mobileMessageHashes.delete(first);
         }
         mobileMessageHashes.add(hash);
-        sendToClaude(contentStr, msg.source || 'mobile');
+        log(`📤 Sending to Claude: "${contentStr.slice(0, 100)}..."`, colors.dim);
+        if (!sendToClaude(contentStr, msg.source || 'mobile')) {
+          log('⚠️  Failed to send message to Claude (not running?)', colors.yellow);
+          // Notify bridge of failure
+          sendToBridge({
+            type: 'error',
+            sessionId: effectiveSessionId,
+            message: 'Claude is not running - message not delivered'
+          });
+        }
+      } else {
+        log('⚠️  send_message received with no content', colors.yellow);
       }
       break;
 
@@ -2142,8 +2221,12 @@ function startClaude() {
       process.exit(1);
     }
 
-    // Always use FD 4 for terminal output mirroring (needed for proper PTY handling)
-    const stdioConfig = ['pipe', 'inherit', 'inherit', 'pipe', 'pipe'];
+    // FD 4 is for terminal output mirroring (needed for proper PTY handling)
+    // In agent mode, don't inherit stdout/stderr - Claude's TUI would flood agent console
+    // Terminal output is forwarded via FD 4 anyway
+    const stdioConfig = agentUrl
+      ? ['pipe', 'ignore', 'ignore', 'pipe', 'pipe']
+      : ['pipe', 'inherit', 'inherit', 'pipe', 'pipe'];
 
     claudeProcess = spawn('node', [nodeWrapperPath, claudePath, ...claudeArgs], {
       cwd: process.cwd(),
@@ -2167,8 +2250,11 @@ function startClaude() {
       process.exit(1);
     }
 
-    // Always use FD 4 for terminal output mirroring (needed for proper PTY handling)
-    const stdioConfig = ['pipe', 'inherit', 'inherit', 'pipe', 'pipe'];
+    // FD 4 is for terminal output mirroring (needed for proper PTY handling)
+    // In agent mode, don't inherit stdout/stderr - Claude's TUI would flood agent console
+    const stdioConfig = agentUrl
+      ? ['pipe', 'ignore', 'ignore', 'pipe', 'pipe']
+      : ['pipe', 'inherit', 'inherit', 'pipe', 'pipe'];
 
     claudeProcess = spawn('python3', ['-u', pythonWrapperPath, claudePath, ...claudeArgs], {
       cwd: process.cwd(),