forkoff 1.1.3 → 1.1.5

package/dist/index.js

@@ -1098,7 +1098,7 @@ function createProgram() {
             websocket_1.wsClient.on('disconnected', (reason) => {
                 console.log(chalk_1.default.yellow(`\nMobile disconnected: ${reason}`));
                 console.log(chalk_1.default.dim('Waiting for mobile to reconnect...'));
-                tools_1.claudeProcessManager.autoAllowAllPendingPrompts();
+                tools_1.claudeProcessManager.resolveAllPendingPrompts('deny', 'mobile disconnected');
                 tools_1.claudeProcessManager.cleanupAllPermissionState();
                 tools_1.claudeProcessManager.clearAllTakenOver();
             });
@@ -1136,15 +1136,17 @@ function createProgram() {
     // Helper function to wait for pairing via WebSocket event
     async function waitForPairing() {
         return new Promise((resolve) => {
-            websocket_1.wsClient.on('pair_device', (data) => {
-                resolve({ mobileDeviceId: data.mobileDeviceId });
-            });
-            // Handle Ctrl+C
-            process.on('SIGINT', () => {
+            const sigintHandler = () => {
                 console.log(chalk_1.default.yellow('\nPairing cancelled.'));
                 websocket_1.wsClient.disconnect();
                 process.exit(0);
+            };
+            websocket_1.wsClient.once('pair_device', (data) => {
+                process.removeListener('SIGINT', sigintHandler);
+                resolve({ mobileDeviceId: data.mobileDeviceId });
             });
+            // Handle Ctrl+C
+            process.on('SIGINT', sigintHandler);
         });
     }
     // Logs command — list and manage debug log files

package/dist/tools/claude-process.d.ts

@@ -252,10 +252,10 @@ declare class ClaudeProcessManager extends EventEmitter {
      */
     getAllPendingPrompts(): PermissionPromptEvent[];
     /**
-     * Auto-allow all pending permission prompts across all IPC managers.
-     * Called when mobile disconnects so Claude doesn't hang waiting for approval.
+     * Resolve all pending permission prompts with a given decision.
+     * Called when mobile disconnects — defaults to 'deny' since the user can't verify.
      */
-    autoAllowAllPendingPrompts(): void;
+    resolveAllPendingPrompts(decision: 'allow' | 'deny', reason: string): void;
     /**
      * Tear down all permission hooks and IPC managers.
      * Called when mobile disconnects — hooks get re-configured on next Take Over + message.

package/dist/tools/claude-process.js

@@ -318,10 +318,23 @@ class ClaudeProcessManager extends events_1.EventEmitter {
         // If there's an existing process, kill it first (Claude SDK only supports 1 turn per process)
         if (info?.process && info.process.exitCode === null) {
             console.log(`[Claude Process] Killing existing process for new message (SDK limitation: 1 turn per process)`);
-            info.process.kill('SIGTERM');
-            // Wait for process to die
-            await new Promise(resolve => setTimeout(resolve, 200));
+            const oldProc = info.process;
             this.processes.delete(terminalSessionId);
+            oldProc.kill('SIGTERM');
+            // Wait for process to exit: SIGTERM first, escalate to SIGKILL after 1.5s
+            await new Promise(resolve => {
+                const escalate = setTimeout(() => { try {
+                    oldProc.kill('SIGKILL');
+                }
+                catch { } }, 1500);
+                const timeout = setTimeout(() => { clearTimeout(escalate); resolve(); }, 3000);
+                oldProc.once('close', () => { clearTimeout(timeout); clearTimeout(escalate); resolve(); });
+                if (oldProc.exitCode !== null) {
+                    clearTimeout(timeout);
+                    clearTimeout(escalate);
+                    resolve();
+                }
+            });
             info = undefined;
         }
         // Get session info from either current process or closed sessions
@@ -878,19 +891,18 @@ class ClaudeProcessManager extends events_1.EventEmitter {
         return allPrompts;
     }
     /**
-     * Auto-allow all pending permission prompts across all IPC managers.
-     * Called when mobile disconnects so Claude doesn't hang waiting for approval.
+     * Resolve all pending permission prompts with a given decision.
+     * Called when mobile disconnects — defaults to 'deny' since the user can't verify.
      */
-    autoAllowAllPendingPrompts() {
+    resolveAllPendingPrompts(decision, reason) {
         const pending = this.getAllPendingPrompts();
         for (const prompt of pending) {
-            // Find the IPC manager that owns this prompt and respond
             for (const [, ipcManager] of this.permissionIpcManagers) {
-                ipcManager.handleResponse(prompt.promptId, 'allow', 'Auto-allowed: mobile disconnected');
+                ipcManager.handleResponse(prompt.promptId, decision, reason);
             }
         }
         if (pending.length > 0) {
-            console.log(`[Claude Process] Auto-allowed ${pending.length} pending permission prompt(s) on mobile disconnect`);
+            console.log(`[Claude Process] Auto-${decision === 'allow' ? 'allowed' : 'denied'} ${pending.length} pending permission prompt(s): ${reason}`);
         }
     }
     /**

package/dist/websocket.js

@@ -32,6 +32,7 @@ const ALLOWED_ENCRYPTED_EVENTS = new Set([
     'sdk_session_history',
     'claude_abort',
     'usage_stats_request',
+    'session_release',
 ]);
 // Events that carry user data and MUST be encrypted — plaintext fallback is refused.
 // If E2EE is not established, these are queued (not sent in plaintext).
@@ -156,10 +157,11 @@ class WebSocketClient extends events_1.EventEmitter {
     wireUpTransportEvents() {
         if (!this.server)
             return;
-        // When mobile connects, emit connected + start heartbeat + initiate E2EE
+        // When mobile connects, emit connected + send immediate status + start heartbeat + initiate E2EE
         this.server.on('mobile_connected', (data) => {
             console.log(`[WS] Mobile connected: ${data.deviceId?.substring(0, 8)}...`);
             this.emit('connected');
+            this.sendHeartbeat(); // Immediate status update — don't wait for first 30s interval
             this.startHeartbeat();
             // SECURITY: Clear stale E2EE peer state on every mobile connect.
             // Mobile sessions are in-memory only — lost on app restart/reconnect.
@@ -474,10 +476,9 @@ class WebSocketClient extends events_1.EventEmitter {
     }
     /** SECURITY: Check if plaintext inbound events should be dropped (E2EE active with peer) */
     shouldDropPlaintextInbound() {
-        // In cloud relay mode, events arrive via API forwarding — trusted, don't drop
-        if (this.isCloudRelay)
-            return false;
-        // In embedded relay mode, mobile connects directly — drop plaintext when E2EE active
+        // Drop plaintext events when an E2EE session is established with the peer —
+        // legitimate events should arrive as encrypted_message, not plaintext.
+        // Applies to both cloud relay and local modes.
         return !!(this.e2eePeerDeviceId && this.e2eeManager?.hasSessionKey(this.e2eePeerDeviceId));
     }
     disconnect() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forkoff",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "CLI tool to connect Claude Code to the ForkOff mobile app for remote monitoring and approvals",
   "main": "dist/integration.js",
   "types": "dist/integration.d.ts",