forkoff 1.0.11 → 1.0.13

package/dist/index.js

@@ -37,6 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createProgram = createProgram;
 const commander_1 = require("commander");
 const chalk_1 = __importDefault(require("chalk"));
 const qrcode_terminal_1 = __importDefault(require("qrcode-terminal"));
@@ -52,1006 +53,1117 @@ const startup_1 = require("./startup");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
-const program = new commander_1.Command();
-program
-    .name('forkoff')
-    .description('CLI tool for ForkOff - Connect your AI coding tools to mobile')
-    .version('1.0.0')
-    .option('-q, --quiet', 'Suppress all output (for background operation)');
-program.hook('preAction', () => {
-    if (program.opts().quiet) {
-        (0, logger_1.setQuiet)(true);
-    }
-});
-// Configure API/WS URLs
-program
-    .command('config')
-    .description('Configure ForkOff CLI settings')
-    .option('-a, --api <url>', 'Set API URL')
-    .option('-w, --ws <url>', 'Set WebSocket URL')
-    .option('-n, --name <name>', 'Set device name')
-    .option('--show', 'Show current configuration')
-    .option('--reset', 'Reset all configuration')
-    .action(async (options) => {
-    if (options.reset) {
-        config_1.config.reset();
-        console.log(chalk_1.default.green('Configuration reset successfully'));
-        return;
-    }
-    if (options.api) {
-        config_1.config.apiUrl = options.api;
-        console.log(chalk_1.default.green(`API URL set to: ${options.api}`));
-    }
-    if (options.ws) {
-        config_1.config.wsUrl = options.ws;
-        console.log(chalk_1.default.green(`WebSocket URL set to: ${options.ws}`));
-    }
-    if (options.name) {
-        config_1.config.deviceName = options.name;
-        console.log(chalk_1.default.green(`Device name set to: ${options.name}`));
-    }
-    if (options.show || (!options.api && !options.ws && !options.name && !options.reset)) {
-        console.log(chalk_1.default.bold('\nCurrent Configuration:'));
-        console.log(`  API URL:     ${chalk_1.default.cyan(config_1.config.apiUrl)}`);
-        console.log(`  WebSocket:   ${chalk_1.default.cyan(config_1.config.wsUrl)}`);
-        console.log(`  Device Name: ${chalk_1.default.cyan(config_1.config.deviceName)}`);
-        console.log(`  Device ID:   ${chalk_1.default.cyan(config_1.config.deviceId || 'Not registered')}`);
-        console.log(`  Paired:      ${config_1.config.isPaired ? chalk_1.default.green('Yes') : chalk_1.default.yellow('No')}`);
-        console.log(`  Config Path: ${chalk_1.default.dim(config_1.config.getPath())}`);
-        const startupStatus = config_1.config.startupEnabled === null
-            ? chalk_1.default.dim('Not configured')
-            : config_1.config.startupEnabled ? chalk_1.default.green('Enabled') : chalk_1.default.yellow('Disabled');
-        console.log(`  Startup:     ${startupStatus}`);
-    }
-});
-// Pair device with mobile app
-program
-    .command('pair')
-    .description('Generate pairing code to connect with mobile app')
-    .action(async () => {
-    const spinner = (0, logger_1.createSpinner)('Connecting to ForkOff server...').start();
-    try {
-        // Check server health
-        const isHealthy = await api_1.api.healthCheck();
-        if (!isHealthy) {
-            spinner.fail('Cannot connect to ForkOff server');
-            console.log(chalk_1.default.yellow(`\nMake sure the server is running at ${config_1.config.apiUrl}`));
-            console.log(chalk_1.default.dim('Use "forkoff config --api <url>" to change the server URL'));
+function createProgram() {
+    const program = new commander_1.Command();
+    program
+        .name('forkoff')
+        .description('CLI tool for ForkOff - Connect your AI coding tools to mobile')
+        .version(require('../package.json').version)
+        .option('-q, --quiet', 'Suppress all output (for background operation)');
+    program.hook('preAction', () => {
+        if (program.opts().quiet) {
+            (0, logger_1.setQuiet)(true);
+        }
+    });
+    // Configure API/WS URLs
+    program
+        .command('config')
+        .description('Configure ForkOff CLI settings')
+        .option('-a, --api <url>', 'Set API URL')
+        .option('-w, --ws <url>', 'Set WebSocket URL')
+        .option('-n, --name <name>', 'Set device name')
+        .option('--show', 'Show current configuration')
+        .option('--reset', 'Reset all configuration')
+        .action(async (options) => {
+        if (options.reset) {
+            config_1.config.reset();
+            console.log(chalk_1.default.green('Configuration reset successfully'));
             return;
         }
-        spinner.text = 'Registering device...';
-        // Register device or refresh pairing code
-        let result;
-        if (config_1.config.deviceId) {
-            try {
-                result = await api_1.api.refreshPairingCode(config_1.config.deviceId);
+        if (options.api) {
+            config_1.config.apiUrl = options.api;
+            console.log(chalk_1.default.green(`API URL set to: ${options.api}`));
+        }
+        if (options.ws) {
+            config_1.config.wsUrl = options.ws;
+            console.log(chalk_1.default.green(`WebSocket URL set to: ${options.ws}`));
+        }
+        if (options.name) {
+            config_1.config.deviceName = options.name;
+            console.log(chalk_1.default.green(`Device name set to: ${options.name}`));
+        }
+        if (options.show || (!options.api && !options.ws && !options.name && !options.reset)) {
+            console.log(chalk_1.default.bold('\nCurrent Configuration:'));
+            console.log(`  API URL:     ${chalk_1.default.cyan(config_1.config.apiUrl)}`);
+            console.log(`  WebSocket:   ${chalk_1.default.cyan(config_1.config.wsUrl)}`);
+            console.log(`  Device Name: ${chalk_1.default.cyan(config_1.config.deviceName)}`);
+            console.log(`  Device ID:   ${chalk_1.default.cyan(config_1.config.deviceId || 'Not registered')}`);
+            console.log(`  Paired:      ${config_1.config.isPaired ? chalk_1.default.green('Yes') : chalk_1.default.yellow('No')}`);
+            console.log(`  Config Path: ${chalk_1.default.dim(config_1.config.getPath())}`);
+            const startupStatus = config_1.config.startupEnabled === null
+                ? chalk_1.default.dim('Not configured')
+                : config_1.config.startupEnabled ? chalk_1.default.green('Enabled') : chalk_1.default.yellow('Disabled');
+            console.log(`  Startup:     ${startupStatus}`);
+        }
+    });
+    // Pair device with mobile app
+    program
+        .command('pair')
+        .description('Generate pairing code to connect with mobile app')
+        .action(async () => {
+        const spinner = (0, logger_1.createSpinner)('Connecting to ForkOff server...').start();
+        try {
+            // Check server health
+            const isHealthy = await api_1.api.healthCheck();
+            if (!isHealthy) {
+                spinner.fail('Cannot connect to ForkOff server');
+                console.log(chalk_1.default.yellow(`\nMake sure the server is running at ${config_1.config.apiUrl}`));
+                console.log(chalk_1.default.dim('Use "forkoff config --api <url>" to change the server URL'));
+                return;
             }
-            catch {
-                // Device might not exist anymore, register fresh
+            spinner.text = 'Registering device...';
+            // Register device or refresh pairing code
+            let result;
+            if (config_1.config.deviceId) {
+                try {
+                    result = await api_1.api.refreshPairingCode(config_1.config.deviceId);
+                }
+                catch {
+                    // Device might not exist anymore, register fresh
+                    result = await api_1.api.registerDevice();
+                }
+            }
+            else {
                 result = await api_1.api.registerDevice();
             }
+            // Save device info
+            config_1.config.deviceId = result.device.id;
+            config_1.config.pairingCode = result.pairingCode;
+            spinner.succeed('Device registered successfully!\n');
+            // Display pairing info
+            console.log(chalk_1.default.bold('Scan this QR code with the ForkOff mobile app:\n'));
+            // Generate QR code with pairing URL
+            const pairingUrl = `forkoff://pair/${result.pairingCode}`;
+            qrcode_terminal_1.default.generate(pairingUrl, { small: true }, (code) => {
+                console.log(code);
+            });
+            console.log(chalk_1.default.bold('\nOr enter this code manually:\n'));
+            console.log(chalk_1.default.bgBlue.white.bold(`  ${result.pairingCode}  `));
+            console.log();
+            const expiresAt = new Date(result.expiresAt);
+            console.log(chalk_1.default.dim(`Code expires at: ${expiresAt.toLocaleTimeString()}`));
+            console.log();
+            // Wait for pairing
+            console.log(chalk_1.default.yellow('Waiting for mobile app to scan...'));
+            console.log(chalk_1.default.dim('Press Ctrl+C to cancel\n'));
+            await waitForPairing(result.device.id);
+            // Auto-register startup if not explicitly disabled
+            if (config_1.config.startupEnabled !== false) {
+                try {
+                    await (0, startup_1.enableStartup)();
+                    console.log(chalk_1.default.green('Automatic startup registered. Use "forkoff startup --disable" to opt out.'));
+                }
+                catch {
+                    // Non-critical — don't fail pairing over this
+                }
+            }
+            // Auto-connect after successful pairing
+            await startConnection();
         }
-        else {
-            result = await api_1.api.registerDevice();
+        catch (error) {
+            spinner.fail('Failed to register device');
+            console.error(chalk_1.default.red(error.message || 'Unknown error'));
         }
-        // Save device info
-        config_1.config.deviceId = result.device.id;
-        config_1.config.pairingCode = result.pairingCode;
-        spinner.succeed('Device registered successfully!\n');
-        // Display pairing info
-        console.log(chalk_1.default.bold('Scan this QR code with the ForkOff mobile app:\n'));
-        // Generate QR code with pairing URL
-        const pairingUrl = `forkoff://pair/${result.pairingCode}`;
-        qrcode_terminal_1.default.generate(pairingUrl, { small: true }, (code) => {
-            console.log(code);
-        });
-        console.log(chalk_1.default.bold('\nOr enter this code manually:\n'));
-        console.log(chalk_1.default.bgBlue.white.bold(`  ${result.pairingCode}  `));
-        console.log();
-        const expiresAt = new Date(result.expiresAt);
-        console.log(chalk_1.default.dim(`Code expires at: ${expiresAt.toLocaleTimeString()}`));
-        console.log();
-        // Wait for pairing
-        console.log(chalk_1.default.yellow('Waiting for mobile app to scan...'));
-        console.log(chalk_1.default.dim('Press Ctrl+C to cancel\n'));
-        await waitForPairing(result.device.id);
-        // Auto-register startup if not explicitly disabled
-        if (config_1.config.startupEnabled !== false) {
+    });
+    // Check device status
+    program
+        .command('status')
+        .description('Check device connection status')
+        .action(async () => {
+        if (!config_1.config.deviceId) {
+            console.log(chalk_1.default.yellow('Device not registered. Run "forkoff pair" first.'));
+            return;
+        }
+        const spinner = (0, logger_1.createSpinner)('Checking status...').start();
+        try {
+            const status = await api_1.api.checkPairingStatus(config_1.config.deviceId);
+            spinner.stop();
+            console.log(chalk_1.default.bold('\nDevice Status:'));
+            console.log(`  Device ID:   ${chalk_1.default.cyan(config_1.config.deviceId)}`);
+            console.log(`  Device Name: ${chalk_1.default.cyan(config_1.config.deviceName)}`);
+            console.log(`  Paired:      ${status.isPaired ? chalk_1.default.green('Yes') : chalk_1.default.yellow('No')}`);
+            if (status.isPaired) {
+                config_1.config.userId = status.userId;
+                config_1.config.pairedAt = config_1.config.pairedAt || new Date().toISOString();
+                console.log(`  User ID:     ${chalk_1.default.cyan(status.userId)}`);
+            }
+            if (websocket_1.wsClient.isConnected) {
+                console.log(`  WebSocket:   ${chalk_1.default.green('Connected')}`);
+            }
+            else {
+                console.log(`  WebSocket:   ${chalk_1.default.yellow('Disconnected')}`);
+            }
+        }
+        catch (error) {
+            spinner.fail('Failed to check status');
+            console.error(chalk_1.default.red(error.message || 'Unknown error'));
+        }
+    });
+    // Connect and stay online (for returning users who already paired)
+    program
+        .command('connect')
+        .description('Reconnect to ForkOff (for previously paired devices)')
+        .action(async () => {
+        if (!config_1.config.deviceId) {
+            console.log(chalk_1.default.yellow('Device not registered. Run "forkoff pair" first.'));
+            return;
+        }
+        if (!config_1.config.isPaired) {
+            console.log(chalk_1.default.yellow('Device not paired. Run "forkoff pair" and scan the QR code.'));
+            return;
+        }
+        // Auto-register startup if not explicitly disabled and not already registered
+        if (config_1.config.startupEnabled !== false && !(0, startup_1.isStartupRegistered)()) {
             try {
                 await (0, startup_1.enableStartup)();
                 console.log(chalk_1.default.green('Automatic startup registered. Use "forkoff startup --disable" to opt out.'));
             }
             catch {
-                // Non-critical — don't fail pairing over this
+                // Non-critical
             }
         }
-        // Auto-connect after successful pairing
         await startConnection();
-    }
-    catch (error) {
-        spinner.fail('Failed to register device');
-        console.error(chalk_1.default.red(error.message || 'Unknown error'));
-    }
-});
-// Check device status
-program
-    .command('status')
-    .description('Check device connection status')
-    .action(async () => {
-    if (!config_1.config.deviceId) {
-        console.log(chalk_1.default.yellow('Device not registered. Run "forkoff pair" first.'));
-        return;
-    }
-    const spinner = (0, logger_1.createSpinner)('Checking status...').start();
-    try {
-        const status = await api_1.api.checkPairingStatus(config_1.config.deviceId);
-        spinner.stop();
-        console.log(chalk_1.default.bold('\nDevice Status:'));
-        console.log(`  Device ID:   ${chalk_1.default.cyan(config_1.config.deviceId)}`);
-        console.log(`  Device Name: ${chalk_1.default.cyan(config_1.config.deviceName)}`);
-        console.log(`  Paired:      ${status.isPaired ? chalk_1.default.green('Yes') : chalk_1.default.yellow('No')}`);
-        if (status.isPaired) {
-            config_1.config.userId = status.userId;
-            config_1.config.pairedAt = config_1.config.pairedAt || new Date().toISOString();
-            console.log(`  User ID:     ${chalk_1.default.cyan(status.userId)}`);
+    });
+    // Disconnect/unpair device
+    program
+        .command('disconnect')
+        .description('Disconnect and unpair device')
+        .action(async () => {
+        websocket_1.wsClient.disconnect();
+        // Disable startup registration so it doesn't run on boot after unpair
+        if ((0, startup_1.isStartupRegistered)()) {
+            try {
+                await (0, startup_1.disableStartup)();
+            }
+            catch { }
         }
-        if (websocket_1.wsClient.isConnected) {
-            console.log(`  WebSocket:   ${chalk_1.default.green('Connected')}`);
+        config_1.config.userId = null;
+        config_1.config.pairedAt = null;
+        config_1.config.pairingCode = null;
+        console.log(chalk_1.default.green('Device disconnected and unpaired.'));
+        console.log(chalk_1.default.dim('Run "forkoff pair" to pair again.'));
+    });
+    // Manage startup registration
+    program
+        .command('startup')
+        .description('Manage automatic startup on login')
+        .option('--enable', 'Enable automatic startup')
+        .option('--disable', 'Disable automatic startup')
+        .option('--status', 'Show startup status (default)')
+        .action(async (options) => {
+        if (options.enable) {
+            try {
+                await (0, startup_1.enableStartup)();
+                console.log(chalk_1.default.green('Automatic startup enabled.'));
+                console.log(chalk_1.default.dim(`Binary: ${(0, startup_1.getBinaryPath)()}`));
+                console.log(chalk_1.default.dim('ForkOff will connect automatically when you log in.'));
+            }
+            catch (error) {
+                console.error(chalk_1.default.red(`Failed to enable startup: ${error.message}`));
+            }
+            return;
         }
-        else {
-            console.log(`  WebSocket:   ${chalk_1.default.yellow('Disconnected')}`);
+        if (options.disable) {
+            try {
+                await (0, startup_1.disableStartup)();
+                console.log(chalk_1.default.green('Automatic startup disabled.'));
+                console.log(chalk_1.default.dim('ForkOff will no longer start on login.'));
+            }
+            catch (error) {
+                console.error(chalk_1.default.red(`Failed to disable startup: ${error.message}`));
+            }
+            return;
         }
-    }
-    catch (error) {
-        spinner.fail('Failed to check status');
-        console.error(chalk_1.default.red(error.message || 'Unknown error'));
-    }
-});
-// Connect and stay online (for returning users who already paired)
-program
-    .command('connect')
-    .description('Reconnect to ForkOff (for previously paired devices)')
-    .action(async () => {
-    if (!config_1.config.deviceId) {
-        console.log(chalk_1.default.yellow('Device not registered. Run "forkoff pair" first.'));
-        return;
-    }
-    if (!config_1.config.isPaired) {
-        console.log(chalk_1.default.yellow('Device not paired. Run "forkoff pair" and scan the QR code.'));
-        return;
-    }
-    // Auto-register startup if not explicitly disabled and not already registered
-    if (config_1.config.startupEnabled !== false && !(0, startup_1.isStartupRegistered)()) {
+        // Default: show status
+        const registered = (0, startup_1.isStartupRegistered)();
+        const configState = config_1.config.startupEnabled;
+        console.log(chalk_1.default.bold('\nStartup Status:'));
+        console.log(`  OS Registration: ${registered ? chalk_1.default.green('Registered') : chalk_1.default.yellow('Not registered')}`);
+        console.log(`  Config State:    ${configState === null ? chalk_1.default.dim('Not configured') :
+            configState ? chalk_1.default.green('Enabled') : chalk_1.default.yellow('Disabled')}`);
         try {
-            await (0, startup_1.enableStartup)();
-            console.log(chalk_1.default.green('Automatic startup registered. Use "forkoff startup --disable" to opt out.'));
+            console.log(`  Binary Path:     ${chalk_1.default.dim((0, startup_1.getBinaryPath)())}`);
         }
         catch {
-            // Non-critical
-        }
-    }
-    await startConnection();
-});
-// Disconnect/unpair device
-program
-    .command('disconnect')
-    .description('Disconnect and unpair device')
-    .action(async () => {
-    websocket_1.wsClient.disconnect();
-    config_1.config.userId = null;
-    config_1.config.pairedAt = null;
-    config_1.config.pairingCode = null;
-    console.log(chalk_1.default.green('Device disconnected and unpaired.'));
-    console.log(chalk_1.default.dim('Run "forkoff pair" to pair again.'));
-});
-// Manage startup registration
-program
-    .command('startup')
-    .description('Manage automatic startup on login')
-    .option('--enable', 'Enable automatic startup')
-    .option('--disable', 'Disable automatic startup')
-    .option('--status', 'Show startup status (default)')
-    .action(async (options) => {
-    if (options.enable) {
-        try {
-            await (0, startup_1.enableStartup)();
-            console.log(chalk_1.default.green('Automatic startup enabled.'));
-            console.log(chalk_1.default.dim(`Binary: ${(0, startup_1.getBinaryPath)()}`));
-            console.log(chalk_1.default.dim('ForkOff will connect automatically when you log in.'));
+            console.log(`  Binary Path:     ${chalk_1.default.red('Not found')}`);
         }
-        catch (error) {
-            console.error(chalk_1.default.red(`Failed to enable startup: ${error.message}`));
+        console.log(`  Platform:        ${chalk_1.default.dim(process.platform)}`);
+    });
+    // Detect and manage AI coding tools
+    program
+        .command('tools')
+        .description('Detect and manage AI coding tools')
+        .option('-d, --detect', 'Detect installed AI tools')
+        .option('-i, --install-hooks', 'Install ForkOff hooks for Claude Code')
+        .option('-u, --uninstall-hooks', 'Remove ForkOff hooks from Claude Code')
+        .option('-w, --watch', 'Watch tool status changes')
+        .action(async (options) => {
+        if (options.installHooks) {
+            const spinner = (0, logger_1.createSpinner)('Installing Claude Code hooks...').start();
+            try {
+                if (!tools_1.claudeHooksManager.canConfigure()) {
+                    spinner.fail('Claude Code not found');
+                    console.log(chalk_1.default.yellow('\nClaude Code must be installed to use hooks.'));
+                    console.log(chalk_1.default.dim('Install Claude Code from: https://claude.ai/download'));
+                    return;
+                }
+                await tools_1.claudeHooksManager.installHooks();
+                spinner.succeed('Claude Code hooks installed!');
+                console.log(chalk_1.default.green('\nForkOff will now receive events from Claude Code.'));
+                console.log(chalk_1.default.dim('Run "forkoff connect" to start receiving events.'));
+            }
+            catch (error) {
+                spinner.fail('Failed to install hooks');
+                console.error(chalk_1.default.red(error.message));
+            }
+            return;
         }
-        return;
-    }
-    if (options.disable) {
-        try {
-            await (0, startup_1.disableStartup)();
-            console.log(chalk_1.default.green('Automatic startup disabled.'));
-            console.log(chalk_1.default.dim('ForkOff will no longer start on login.'));
+        if (options.uninstallHooks) {
+            const spinner = (0, logger_1.createSpinner)('Removing Claude Code hooks...').start();
+            try {
+                await tools_1.claudeHooksManager.uninstallHooks();
+                spinner.succeed('Claude Code hooks removed!');
+            }
+            catch (error) {
+                spinner.fail('Failed to remove hooks');
+                console.error(chalk_1.default.red(error.message));
+            }
+            return;
         }
-        catch (error) {
-            console.error(chalk_1.default.red(`Failed to disable startup: ${error.message}`));
+        if (options.watch) {
+            console.log(chalk_1.default.bold('\nWatching for tool status changes...'));
+            console.log(chalk_1.default.dim('Press Ctrl+C to stop\n'));
+            tools_1.toolDetector.watchToolStatus((tools) => {
+                console.log(chalk_1.default.cyan(`[${new Date().toLocaleTimeString()}] Tool status update:`));
+                tools.forEach(tool => {
+                    const statusColor = tool.status === 'running' ? chalk_1.default.green :
+                        tool.status === 'configured' ? chalk_1.default.yellow : chalk_1.default.dim;
+                    console.log(`  ${tool.name}: ${statusColor(tool.status)}`);
+                });
+                console.log();
+            }, 3000);
+            // Keep alive
+            await new Promise(() => { });
+            return;
         }
-        return;
-    }
-    // Default: show status
-    const registered = (0, startup_1.isStartupRegistered)();
-    const configState = config_1.config.startupEnabled;
-    console.log(chalk_1.default.bold('\nStartup Status:'));
-    console.log(`  OS Registration: ${registered ? chalk_1.default.green('Registered') : chalk_1.default.yellow('Not registered')}`);
-    console.log(`  Config State:    ${configState === null ? chalk_1.default.dim('Not configured') :
-        configState ? chalk_1.default.green('Enabled') : chalk_1.default.yellow('Disabled')}`);
-    try {
-        console.log(`  Binary Path:     ${chalk_1.default.dim((0, startup_1.getBinaryPath)())}`);
-    }
-    catch {
-        console.log(`  Binary Path:     ${chalk_1.default.red('Not found')}`);
-    }
-    console.log(`  Platform:        ${chalk_1.default.dim(process.platform)}`);
-});
-// Detect and manage AI coding tools
-program
-    .command('tools')
-    .description('Detect and manage AI coding tools')
-    .option('-d, --detect', 'Detect installed AI tools')
-    .option('-i, --install-hooks', 'Install ForkOff hooks for Claude Code')
-    .option('-u, --uninstall-hooks', 'Remove ForkOff hooks from Claude Code')
-    .option('-w, --watch', 'Watch tool status changes')
-    .action(async (options) => {
-    if (options.installHooks) {
-        const spinner = (0, logger_1.createSpinner)('Installing Claude Code hooks...').start();
+        // Default: detect tools
+        const spinner = (0, logger_1.createSpinner)('Detecting AI coding tools...').start();
         try {
-            if (!tools_1.claudeHooksManager.canConfigure()) {
-                spinner.fail('Claude Code not found');
-                console.log(chalk_1.default.yellow('\nClaude Code must be installed to use hooks.'));
-                console.log(chalk_1.default.dim('Install Claude Code from: https://claude.ai/download'));
-                return;
+            const result = await tools_1.toolDetector.detectAll();
+            spinner.stop();
+            console.log(chalk_1.default.bold('\nDetected AI Coding Tools:\n'));
+            if (result.tools.length === 0) {
+                console.log(chalk_1.default.yellow('  No AI coding tools detected.'));
+                console.log(chalk_1.default.dim('\n  Supported tools:'));
+                console.log(chalk_1.default.dim('    - Claude Code (https://claude.ai/download)'));
+                console.log(chalk_1.default.dim('    - Cursor (https://cursor.sh)'));
+                console.log(chalk_1.default.dim('    - GitHub Copilot (VS Code extension)'));
+                console.log(chalk_1.default.dim('    - Continue.dev (VS Code extension)'));
             }
-            await tools_1.claudeHooksManager.installHooks();
-            spinner.succeed('Claude Code hooks installed!');
-            console.log(chalk_1.default.green('\nForkOff will now receive events from Claude Code.'));
-            console.log(chalk_1.default.dim('Run "forkoff connect" to start receiving events.'));
+            else {
+                result.tools.forEach(tool => {
+                    const statusIcon = tool.status === 'running' ? chalk_1.default.green('●') :
+                        tool.status === 'configured' ? chalk_1.default.yellow('○') :
+                            chalk_1.default.dim('○');
+                    console.log(`  ${statusIcon} ${chalk_1.default.bold(tool.name)}`);
+                    console.log(`    Type:    ${chalk_1.default.cyan(tool.type)}`);
+                    if (tool.version) {
+                        console.log(`    Version: ${chalk_1.default.dim(tool.version)}`);
+                    }
+                    if (tool.path) {
+                        console.log(`    Path:    ${chalk_1.default.dim(tool.path)}`);
+                    }
+                    console.log(`    Status:  ${tool.status === 'running' ? chalk_1.default.green('Running') :
+                        tool.status === 'configured' ? chalk_1.default.yellow('Configured') :
+                            chalk_1.default.dim('Detected')}`);
+                    // Check if hooks are configured for Claude Code
+                    if (tool.type === 'claude-code') {
+                        const hooksConfigured = tools_1.claudeHooksManager.isHookConfigured();
+                        console.log(`    Hooks:   ${hooksConfigured ? chalk_1.default.green('Installed') : chalk_1.default.yellow('Not installed')}`);
+                        if (!hooksConfigured) {
+                            console.log(chalk_1.default.dim('             Run "forkoff tools --install-hooks" to enable'));
+                        }
+                    }
+                    console.log();
+                });
+            }
+            console.log(chalk_1.default.dim(`Platform: ${result.platform}`));
         }
         catch (error) {
-            spinner.fail('Failed to install hooks');
+            spinner.fail('Tool detection failed');
             console.error(chalk_1.default.red(error.message));
         }
-        return;
-    }
-    if (options.uninstallHooks) {
-        const spinner = (0, logger_1.createSpinner)('Removing Claude Code hooks...').start();
+    });
+    // Helper function to start connection and set up event handlers
+    async function startConnection() {
+        const spinner = (0, logger_1.createSpinner)('Connecting to ForkOff...').start();
         try {
-            await tools_1.claudeHooksManager.uninstallHooks();
-            spinner.succeed('Claude Code hooks removed!');
-        }
-        catch (error) {
-            spinner.fail('Failed to remove hooks');
-            console.error(chalk_1.default.red(error.message));
-        }
-        return;
-    }
-    if (options.watch) {
-        console.log(chalk_1.default.bold('\nWatching for tool status changes...'));
-        console.log(chalk_1.default.dim('Press Ctrl+C to stop\n'));
-        tools_1.toolDetector.watchToolStatus((tools) => {
-            console.log(chalk_1.default.cyan(`[${new Date().toLocaleTimeString()}] Tool status update:`));
-            tools.forEach(tool => {
-                const statusColor = tool.status === 'running' ? chalk_1.default.green :
-                    tool.status === 'configured' ? chalk_1.default.yellow : chalk_1.default.dim;
-                console.log(`  ${tool.name}: ${statusColor(tool.status)}`);
-            });
-            console.log();
-        }, 3000);
-        // Keep alive
-        await new Promise(() => { });
-        return;
-    }
-    // Default: detect tools
-    const spinner = (0, logger_1.createSpinner)('Detecting AI coding tools...').start();
-    try {
-        const result = await tools_1.toolDetector.detectAll();
-        spinner.stop();
-        console.log(chalk_1.default.bold('\nDetected AI Coding Tools:\n'));
-        if (result.tools.length === 0) {
-            console.log(chalk_1.default.yellow('  No AI coding tools detected.'));
-            console.log(chalk_1.default.dim('\n  Supported tools:'));
-            console.log(chalk_1.default.dim('    - Claude Code (https://claude.ai/download)'));
-            console.log(chalk_1.default.dim('    - Cursor (https://cursor.sh)'));
-            console.log(chalk_1.default.dim('    - GitHub Copilot (VS Code extension)'));
-            console.log(chalk_1.default.dim('    - Continue.dev (VS Code extension)'));
-        }
-        else {
-            result.tools.forEach(tool => {
-                const statusIcon = tool.status === 'running' ? chalk_1.default.green('●') :
-                    tool.status === 'configured' ? chalk_1.default.yellow('○') :
-                        chalk_1.default.dim('○');
-                console.log(`  ${statusIcon} ${chalk_1.default.bold(tool.name)}`);
-                console.log(`    Type:    ${chalk_1.default.cyan(tool.type)}`);
-                if (tool.version) {
-                    console.log(`    Version: ${chalk_1.default.dim(tool.version)}`);
-                }
-                if (tool.path) {
-                    console.log(`    Path:    ${chalk_1.default.dim(tool.path)}`);
+            await websocket_1.wsClient.connect();
+            tools_1.PermissionIpcManager.cleanupStaleTempFiles();
+            spinner.succeed('Connected to ForkOff!\n');
+            // Detect and report connected tools
+            spinner.start('Detecting AI coding tools...');
+            try {
+                const toolResult = await tools_1.toolDetector.detectAll();
+                if (toolResult.tools.length > 0) {
+                    const toolsToReport = toolResult.tools.map(tool => ({
+                        type: tool.type,
+                        name: tool.name,
+                        version: tool.version || null,
+                    }));
+                    await api_1.api.reportConnectedTools(config_1.config.deviceId, toolsToReport);
+                    spinner.succeed(`Detected ${toolResult.tools.length} AI tool(s): ${toolResult.tools.map(t => t.name).join(', ')}`);
                 }
-                console.log(`    Status:  ${tool.status === 'running' ? chalk_1.default.green('Running') :
-                    tool.status === 'configured' ? chalk_1.default.yellow('Configured') :
-                        chalk_1.default.dim('Detected')}`);
-                // Check if hooks are configured for Claude Code
-                if (tool.type === 'claude-code') {
-                    const hooksConfigured = tools_1.claudeHooksManager.isHookConfigured();
-                    console.log(`    Hooks:   ${hooksConfigured ? chalk_1.default.green('Installed') : chalk_1.default.yellow('Not installed')}`);
-                    if (!hooksConfigured) {
-                        console.log(chalk_1.default.dim('             Run "forkoff tools --install-hooks" to enable'));
-                    }
+                else {
+                    spinner.info('No AI coding tools detected');
                 }
-                console.log();
-            });
-        }
-        console.log(chalk_1.default.dim(`Platform: ${result.platform}`));
-    }
-    catch (error) {
-        spinner.fail('Tool detection failed');
-        console.error(chalk_1.default.red(error.message));
-    }
-});
-// Helper function to start connection and set up event handlers
-async function startConnection() {
-    const spinner = (0, logger_1.createSpinner)('Connecting to ForkOff...').start();
-    try {
-        await websocket_1.wsClient.connect();
-        spinner.succeed('Connected to ForkOff!\n');
-        // Detect and report connected tools
-        spinner.start('Detecting AI coding tools...');
-        try {
-            const toolResult = await tools_1.toolDetector.detectAll();
-            if (toolResult.tools.length > 0) {
-                const toolsToReport = toolResult.tools.map(tool => ({
-                    type: tool.type,
-                    name: tool.name,
-                    version: tool.version || null,
-                }));
-                await api_1.api.reportConnectedTools(config_1.config.deviceId, toolsToReport);
-                spinner.succeed(`Detected ${toolResult.tools.length} AI tool(s): ${toolResult.tools.map(t => t.name).join(', ')}`);
             }
-            else {
-                spinner.info('No AI coding tools detected');
+            catch (toolError) {
+                spinner.warn('Tool detection skipped: ' + (toolError.message || 'unknown error'));
             }
-        }
-        catch (toolError) {
-            spinner.warn('Tool detection skipped: ' + (toolError.message || 'unknown error'));
-        }
-        console.log();
-        console.log(chalk_1.default.green('Device is now online and ready to receive commands.'));
-        console.log(chalk_1.default.dim('Press Ctrl+C to disconnect\n'));
-        // Set up terminal output forwarding
-        terminal_1.terminalManager.on('output', (data) => {
-            websocket_1.wsClient.sendTerminalOutput(data);
-        });
-        terminal_1.terminalManager.on('cwd_changed', (data) => {
-            websocket_1.wsClient.sendTerminalCwd(data);
-        });
-        // When a session is auto-created (command received before terminal_create), send the cwd
-        terminal_1.terminalManager.on('session_created', (data) => {
-            console.log(chalk_1.default.dim(`[Terminal] Session auto-created: ${data.terminalSessionId} at ${data.cwd}`));
-            websocket_1.wsClient.sendTerminalCwd({
-                terminalSessionId: data.terminalSessionId,
-                cwd: data.cwd,
+            console.log();
+            console.log(chalk_1.default.green('Device is now online and ready to receive commands.'));
+            console.log(chalk_1.default.dim('Press Ctrl+C to disconnect\n'));
+            // Set up terminal output forwarding
+            terminal_1.terminalManager.on('output', (data) => {
+                websocket_1.wsClient.sendTerminalOutput(data);
             });
-        });
-        // Set up terminal create handler
-        websocket_1.wsClient.on('terminal_create', (data) => {
-            console.log(chalk_1.default.blue(`[Terminal] Creating session: ${data.terminalSessionId}`));
-            // Resolve the cwd (~ to home directory)
-            let resolvedCwd = data.cwd || process.cwd();
-            if (resolvedCwd === '~' || resolvedCwd.startsWith('~/')) {
-                const homedir = require('os').homedir();
-                resolvedCwd = resolvedCwd === '~' ? homedir : resolvedCwd.replace('~', homedir);
-            }
-            // Create the session
-            const session = terminal_1.terminalManager.createSession(data.terminalSessionId, resolvedCwd);
-            // Send back the resolved cwd
-            websocket_1.wsClient.sendTerminalCwd({
-                terminalSessionId: data.terminalSessionId,
-                cwd: session.cwd,
+            terminal_1.terminalManager.on('cwd_changed', (data) => {
+                websocket_1.wsClient.sendTerminalCwd(data);
             });
-            console.log(chalk_1.default.dim(`[Terminal] Session created with cwd: ${session.cwd}`));
-        });
-        // Set up event handlers
-        websocket_1.wsClient.on('terminal_command', async (data) => {
-            // Check if this is a Claude terminal session
-            if (tools_1.claudeProcessManager.isClaudeSession(data.terminalSessionId)) {
-                // SECURITY: Don't log command content - may contain sensitive data
-                console.log(chalk_1.default.cyan(`[Claude] Input received (${data.command.length} chars)`));
-                await tools_1.claudeProcessManager.sendInput(data.terminalSessionId, data.command);
-                return;
-            }
-            // Regular terminal command
-            // SECURITY: Don't log command content - may contain passwords, API keys, etc.
-            console.log(chalk_1.default.blue(`[Terminal] Executing command (${data.command.length} chars)`));
-            try {
-                const result = await terminal_1.terminalManager.executeCommand(data.terminalSessionId, data.command);
-                console.log(chalk_1.default.dim(`[Terminal] Exit code: ${result.exitCode}`));
-            }
-            catch (error) {
-                console.error(chalk_1.default.red(`[Terminal] Error: ${error.message}`));
-            }
-        });
-        websocket_1.wsClient.on('approval_response', (data) => {
-            console.log(chalk_1.default.blue(`[Approval] ${data.status}: ${data.approvalId}`));
-            approval_1.approvalManager.handleApprovalResponse(data.approvalId, data.status);
-        });
-        // Set up Claude session detection
-        if (tools_1.claudeSessionDetector.isClaudeInstalled()) {
-            console.log(chalk_1.default.cyan('[Claude] Scanning for Claude sessions...'));
-            // Attach event listeners BEFORE starting to watch (so we catch initial events)
-            tools_1.claudeSessionDetector.on('session_detected', (session) => {
-                console.log(chalk_1.default.cyan(`[Claude] New session detected: ${session.directory}`));
-                websocket_1.wsClient.sendClaudeSessionUpdate(session);
+            // When a session is auto-created (command received before terminal_create), send the cwd
+            terminal_1.terminalManager.on('session_created', (data) => {
+                console.log(chalk_1.default.dim(`[Terminal] Session auto-created: ${data.terminalSessionId} at ${data.cwd}`));
+                websocket_1.wsClient.sendTerminalCwd({
+                    terminalSessionId: data.terminalSessionId,
+                    cwd: data.cwd,
+                });
+            });
+            // Set up terminal create handler
+            websocket_1.wsClient.on('terminal_create', (data) => {
+                console.log(chalk_1.default.blue(`[Terminal] Creating session: ${data.terminalSessionId}`));
+                // Resolve the cwd (~ to home directory)
+                let resolvedCwd = data.cwd || process.cwd();
+                if (resolvedCwd === '~' || resolvedCwd.startsWith('~/')) {
+                    const homedir = require('os').homedir();
+                    resolvedCwd = resolvedCwd === '~' ? homedir : resolvedCwd.replace('~', homedir);
+                }
+                // Create the session
+                const session = terminal_1.terminalManager.createSession(data.terminalSessionId, resolvedCwd);
+                // Send back the resolved cwd
+                websocket_1.wsClient.sendTerminalCwd({
+                    terminalSessionId: data.terminalSessionId,
+                    cwd: session.cwd,
+                });
+                console.log(chalk_1.default.dim(`[Terminal] Session created with cwd: ${session.cwd}`));
             });
-            tools_1.claudeSessionDetector.on('session_changed', (session) => {
-                console.log(chalk_1.default.dim(`[Claude] Session updated: ${session.directory} (${session.state})`));
-                websocket_1.wsClient.sendClaudeSessionUpdate(session);
+            // Set up event handlers
+            websocket_1.wsClient.on('terminal_command', async (data) => {
+                // Check if this is a Claude terminal session
+                if (tools_1.claudeProcessManager.isClaudeSession(data.terminalSessionId)) {
+                    // SECURITY: Don't log command content - may contain sensitive data
+                    console.log(chalk_1.default.cyan(`[Claude] Input received (${data.command.length} chars)`));
+                    await tools_1.claudeProcessManager.sendInput(data.terminalSessionId, data.command);
+                    return;
+                }
+                // Regular terminal command
+                // SECURITY: Don't log command content - may contain passwords, API keys, etc.
+                console.log(chalk_1.default.blue(`[Terminal] Executing command (${data.command.length} chars)`));
+                try {
+                    const result = await terminal_1.terminalManager.executeCommand(data.terminalSessionId, data.command);
+                    console.log(chalk_1.default.dim(`[Terminal] Exit code: ${result.exitCode}`));
+                }
+                catch (error) {
+                    console.error(chalk_1.default.red(`[Terminal] Error: ${error.message}`));
+                }
             });
-            tools_1.claudeSessionDetector.on('claude_running_changed', (isRunning) => {
-                console.log(chalk_1.default.cyan(`[Claude] Claude is now ${isRunning ? 'ACTIVE' : 'inactive'}`));
-                websocket_1.wsClient.sendToolStatusUpdate('claude_code', isRunning ? 'active' : 'inactive');
+            websocket_1.wsClient.on('approval_response', (data) => {
+                console.log(chalk_1.default.blue(`[Approval] ${data.status}: ${data.approvalId}`));
+                approval_1.approvalManager.handleApprovalResponse(data.approvalId, data.status);
             });
-            // Scan and report existing sessions
-            const sessions = tools_1.claudeSessionDetector.scanSessions();
-            if (sessions.length > 0) {
-                console.log(chalk_1.default.cyan(`[Claude] Found ${sessions.length} session(s)`));
-                // Update session states based on file modification time before sending
-                const now = Date.now();
-                let hasActiveSession = false;
-                for (const session of sessions) {
-                    const sessionTime = new Date(session.lastUsedAt).getTime();
-                    if (now - sessionTime < 60000) {
-                        session.state = 'active';
-                        session.lastUsedAt = new Date().toISOString(); // Update to NOW for active sessions
-                        hasActiveSession = true;
+            // Set up Claude session detection
+            if (tools_1.claudeSessionDetector.isClaudeInstalled()) {
+                console.log(chalk_1.default.cyan('[Claude] Scanning for Claude sessions...'));
+                // Attach event listeners BEFORE starting to watch (so we catch initial events)
+                tools_1.claudeSessionDetector.on('session_detected', (session) => {
+                    console.log(chalk_1.default.cyan(`[Claude] New session detected: ${session.directory}`));
+                    websocket_1.wsClient.sendClaudeSessionUpdate(session);
+                });
+                tools_1.claudeSessionDetector.on('session_changed', (session) => {
+                    console.log(chalk_1.default.dim(`[Claude] Session updated: ${session.directory} (${session.state})`));
+                    websocket_1.wsClient.sendClaudeSessionUpdate(session);
+                });
+                tools_1.claudeSessionDetector.on('claude_running_changed', (isRunning) => {
+                    console.log(chalk_1.default.cyan(`[Claude] Claude is now ${isRunning ? 'ACTIVE' : 'inactive'}`));
+                    websocket_1.wsClient.sendToolStatusUpdate('claude_code', isRunning ? 'active' : 'inactive');
+                });
+                // Scan and report existing sessions
+                const sessions = tools_1.claudeSessionDetector.scanSessions();
+                if (sessions.length > 0) {
+                    console.log(chalk_1.default.cyan(`[Claude] Found ${sessions.length} session(s)`));
+                    // Update session states based on file modification time before sending
+                    const now = Date.now();
+                    let hasActiveSession = false;
+                    for (const session of sessions) {
+                        const sessionTime = new Date(session.lastUsedAt).getTime();
+                        if (now - sessionTime < 60000) {
+                            session.state = 'active';
+                            hasActiveSession = true;
+                        }
+                    }
+                    websocket_1.wsClient.sendClaudeSessions(sessions);
+                    if (hasActiveSession) {
+                        console.log(chalk_1.default.cyan(`[Claude] Claude is now ACTIVE`));
+                        websocket_1.wsClient.sendToolStatusUpdate('claude_code', 'active');
                     }
+                    // Seed the cache so startWatching doesn't re-emit these sessions
+                    // individually as session_detected events
+                    tools_1.claudeSessionDetector.seedKnownSessions(sessions);
                 }
-                websocket_1.wsClient.sendClaudeSessions(sessions);
-                if (hasActiveSession) {
-                    console.log(chalk_1.default.cyan(`[Claude] Claude is now ACTIVE`));
+                // Start watching for session changes
+                tools_1.claudeSessionDetector.startWatching(5000);
+            }
+            // Log approval events
+            approval_1.approvalManager.on('approved', (approval) => {
+                console.log(chalk_1.default.green(`[Approval] Approved: ${approval.description}`));
+            });
+            approval_1.approvalManager.on('rejected', (approval) => {
+                console.log(chalk_1.default.red(`[Approval] Rejected: ${approval.description}`));
+            });
+            // Handle Claude start session request from mobile
+            websocket_1.wsClient.on('claude_start_session', async (data) => {
+                console.log(chalk_1.default.cyan(`[Claude] Start session request: ${data.directory}`));
+                try {
+                    const result = await tools_1.claudeProcessManager.startSession(data.directory, data.terminalSessionId, data.dangerouslySkipPermissions, data.interactivePermissions);
                     websocket_1.wsClient.sendToolStatusUpdate('claude_code', 'active');
+                    websocket_1.wsClient.sendTerminalCwd({ terminalSessionId: data.terminalSessionId, cwd: result.cwd });
+                    // Notify mobile that the session is ready for input
+                    websocket_1.wsClient.sendClaudeSessionEvent({
+                        sessionKey: data.terminalSessionId,
+                        event: { type: 'ready' },
+                    });
+                    console.log(chalk_1.default.green(`[Claude] Session started: ${data.terminalSessionId}`));
                 }
-            }
-            // Start watching for session changes
-            tools_1.claudeSessionDetector.startWatching(5000);
-        }
-        // Log approval events
-        approval_1.approvalManager.on('approved', (approval) => {
-            console.log(chalk_1.default.green(`[Approval] Approved: ${approval.description}`));
-        });
-        approval_1.approvalManager.on('rejected', (approval) => {
-            console.log(chalk_1.default.red(`[Approval] Rejected: ${approval.description}`));
-        });
-        websocket_1.wsClient.on('git_clone', async (data) => {
-            console.log(chalk_1.default.blue(`[Git] Clone request: ${data.repo.fullName}`));
-            try {
-                const result = await terminal_1.terminalManager.executeCommand(`git-clone-${Date.now()}`, data.command);
-                console.log(chalk_1.default.green(`[Git] Clone completed with exit code: ${result.exitCode}`));
-            }
-            catch (error) {
-                console.error(chalk_1.default.red(`[Git] Clone failed: ${error.message}`));
-            }
-        });
-        // Handle Claude start session request from mobile
-        websocket_1.wsClient.on('claude_start_session', async (data) => {
-            console.log(chalk_1.default.cyan(`[Claude] Start session request: ${data.directory}`));
-            try {
-                const result = await tools_1.claudeProcessManager.startSession(data.directory, data.terminalSessionId, data.dangerouslySkipPermissions);
+                catch (error) {
+                    console.error(chalk_1.default.red(`[Claude] Failed to start: ${error.message}`));
+                }
+            });
+            // Handle Claude resume session request from mobile
+            // NOTE: This is called when mobile opens a session view - we DON'T spawn Claude here
+            // Claude is only spawned when the user actually sends a message (via user_message event)
+            // This prevents duplicate transcript entries from double spawns
+            websocket_1.wsClient.on('claude_resume_session', async (data) => {
+                console.log(chalk_1.default.cyan(`[Claude] Resume session request: ${data.sessionKey} in ${data.directory}`));
+                // Look up the correct directory from our locally scanned sessions
+                // The mobile app may have a cached/stale directory (e.g. with corrupted hyphens)
+                let resolvedDir = data.directory;
+                const knownSession = tools_1.claudeSessionDetector.getSessions().find(s => s.sessionKey === data.sessionKey);
+                if (knownSession && knownSession.directory) {
+                    console.log(chalk_1.default.dim(`[Claude] Using local directory for session: ${knownSession.directory}`));
+                    resolvedDir = knownSession.directory;
+                }
+                if (resolvedDir === '~' || resolvedDir.startsWith('~/')) {
+                    resolvedDir = resolvedDir === '~' ? os.homedir() : resolvedDir.replace('~', os.homedir());
+                }
+                resolvedDir = path.resolve(resolvedDir);
+                // Always register the session — even if it's running in a terminal.
+                // With --resume, we spawn a new process per turn which picks up where the session left off.
+                // If the terminal session holds a file lock, the spawn will fail gracefully.
+                // isRealSession: true if the key matches a locally-known Claude session, false if mobile-generated
+                // (e.g. brainstorm-*, quick actions). Fresh sessions use startAndSendMessage instead of --resume.
+                const isRealSession = !!knownSession;
+                tools_1.claudeProcessManager.registerSession(data.sessionKey, resolvedDir, data.terminalSessionId, data.dangerouslySkipPermissions, data.interactivePermissions, isRealSession);
+                tools_1.claudeProcessManager.markTakenOver(data.terminalSessionId);
                 websocket_1.wsClient.sendToolStatusUpdate('claude_code', 'active');
-                websocket_1.wsClient.sendTerminalCwd({ terminalSessionId: data.terminalSessionId, cwd: result.cwd });
+                websocket_1.wsClient.sendClaudeSessionUpdate({
+                    sessionKey: data.sessionKey,
+                    directory: data.directory,
+                    state: 'active',
+                    lastUsedAt: new Date().toISOString(),
+                });
+                websocket_1.wsClient.sendTerminalCwd({ terminalSessionId: data.terminalSessionId, cwd: resolvedDir });
+                // Sync any pending permission prompts to mobile
+                const pendingPrompts = tools_1.claudeProcessManager.getAllPendingPrompts();
+                if (pendingPrompts.length > 0) {
+                    console.log(chalk_1.default.yellow(`[Claude] Syncing ${pendingPrompts.length} pending permission prompt(s) to mobile`));
+                    websocket_1.wsClient.sendPendingPermissionsSync({
+                        sessionKey: data.sessionKey,
+                        terminalSessionId: data.terminalSessionId,
+                        prompts: pendingPrompts,
+                    });
+                }
                 // Notify mobile that the session is ready for input
                 websocket_1.wsClient.sendClaudeSessionEvent({
-                    sessionKey: data.terminalSessionId,
+                    sessionKey: data.sessionKey,
                     event: { type: 'ready' },
                 });
-                console.log(chalk_1.default.green(`[Claude] Session started: ${data.terminalSessionId}`));
-            }
-            catch (error) {
-                console.error(chalk_1.default.red(`[Claude] Failed to start: ${error.message}`));
-            }
-        });
-        // Handle Claude resume session request from mobile
-        // NOTE: This is called when mobile opens a session view - we DON'T spawn Claude here
-        // Claude is only spawned when the user actually sends a message (via user_message event)
-        // This prevents duplicate transcript entries from double spawns
-        websocket_1.wsClient.on('claude_resume_session', async (data) => {
-            console.log(chalk_1.default.cyan(`[Claude] Resume session request: ${data.sessionKey} in ${data.directory}`));
-            // Look up the correct directory from our locally scanned sessions
-            // The mobile app may have a cached/stale directory (e.g. with corrupted hyphens)
-            let resolvedDir = data.directory;
-            const knownSession = tools_1.claudeSessionDetector.getSessions().find(s => s.sessionKey === data.sessionKey);
-            if (knownSession && knownSession.directory) {
-                console.log(chalk_1.default.dim(`[Claude] Using local directory for session: ${knownSession.directory}`));
-                resolvedDir = knownSession.directory;
-            }
-            if (resolvedDir === '~' || resolvedDir.startsWith('~/')) {
-                resolvedDir = resolvedDir === '~' ? os.homedir() : resolvedDir.replace('~', os.homedir());
-            }
-            resolvedDir = path.resolve(resolvedDir);
-            // Register session info for later use when message is sent (don't spawn yet)
-            tools_1.claudeProcessManager.registerSession(data.sessionKey, resolvedDir, data.terminalSessionId, data.dangerouslySkipPermissions);
-            websocket_1.wsClient.sendToolStatusUpdate('claude_code', 'active');
-            websocket_1.wsClient.sendClaudeSessionUpdate({
-                sessionKey: data.sessionKey,
-                directory: data.directory,
-                state: 'active',
-                lastUsedAt: new Date().toISOString(),
-            });
-            websocket_1.wsClient.sendTerminalCwd({ terminalSessionId: data.terminalSessionId, cwd: resolvedDir });
-            // Notify mobile that the session is ready for input
-            websocket_1.wsClient.sendClaudeSessionEvent({
-                sessionKey: data.sessionKey,
-                event: { type: 'ready' },
+                console.log(chalk_1.default.green(`[Claude] Session ready (will spawn on first message): ${data.sessionKey}`));
             });
-            console.log(chalk_1.default.green(`[Claude] Session ready (will spawn on first message): ${data.sessionKey}`));
-        });
-        // Handle directory listing requests
-        websocket_1.wsClient.on('directory_list', async (data) => {
-            console.log(chalk_1.default.dim(`[Dir] Listing request received`));
-            try {
-                let resolvedPath = data.path;
-                if (resolvedPath === '~' || resolvedPath.startsWith('~/')) {
-                    resolvedPath = resolvedPath === '~' ? os.homedir() : resolvedPath.replace('~', os.homedir());
+            // Handle directory listing requests
+            websocket_1.wsClient.on('directory_list', async (data) => {
+                console.log(chalk_1.default.dim(`[Dir] Listing request received`));
+                try {
+                    let resolvedPath = data.path;
+                    if (resolvedPath === '~' || resolvedPath.startsWith('~/')) {
+                        resolvedPath = resolvedPath === '~' ? os.homedir() : resolvedPath.replace('~', os.homedir());
+                    }
+                    // SECURITY: Normalize and validate path to prevent traversal attacks
+                    resolvedPath = path.resolve(resolvedPath);
+                    const homeDir = os.homedir();
+                    // SECURITY: Only allow access to directories under home directory
+                    // This prevents accessing sensitive system files like /etc/passwd
+                    if (!resolvedPath.startsWith(homeDir)) {
+                        console.warn(chalk_1.default.yellow(`[Dir] Access denied - path outside home directory: ${resolvedPath}`));
+                        websocket_1.wsClient.sendDirectoryListResponse({ requestId: data.requestId, entries: [], currentPath: data.path });
+                        return;
+                    }
+                    const entries = fs.readdirSync(resolvedPath, { withFileTypes: true })
+                        .filter(entry => !entry.name.startsWith('.'))
+                        .map(entry => ({
+                        name: entry.name,
+                        type: entry.isDirectory() ? 'directory' : 'file',
+                        path: path.join(resolvedPath, entry.name),
+                    }))
+                        .sort((a, b) => {
+                        if (a.type !== b.type)
+                            return a.type === 'directory' ? -1 : 1;
+                        return a.name.localeCompare(b.name);
+                    });
+                    websocket_1.wsClient.sendDirectoryListResponse({ requestId: data.requestId, entries, currentPath: resolvedPath });
                 }
-                // SECURITY: Normalize and validate path to prevent traversal attacks
-                resolvedPath = path.resolve(resolvedPath);
-                const homeDir = os.homedir();
-                // SECURITY: Only allow access to directories under home directory
-                // This prevents accessing sensitive system files like /etc/passwd
-                if (!resolvedPath.startsWith(homeDir)) {
-                    console.warn(chalk_1.default.yellow(`[Dir] Access denied - path outside home directory: ${resolvedPath}`));
+                catch (error) {
+                    console.error(chalk_1.default.red(`[Dir] Error: ${error.message}`));
                     websocket_1.wsClient.sendDirectoryListResponse({ requestId: data.requestId, entries: [], currentPath: data.path });
-                    return;
                 }
-                const entries = fs.readdirSync(resolvedPath, { withFileTypes: true })
-                    .filter(entry => !entry.name.startsWith('.'))
-                    .map(entry => ({
-                    name: entry.name,
-                    type: entry.isDirectory() ? 'directory' : 'file',
-                    path: path.join(resolvedPath, entry.name),
-                }))
-                    .sort((a, b) => {
-                    if (a.type !== b.type)
-                        return a.type === 'directory' ? -1 : 1;
-                    return a.name.localeCompare(b.name);
-                });
-                websocket_1.wsClient.sendDirectoryListResponse({ requestId: data.requestId, entries, currentPath: resolvedPath });
-            }
-            catch (error) {
-                console.error(chalk_1.default.red(`[Dir] Error: ${error.message}`));
-                websocket_1.wsClient.sendDirectoryListResponse({ requestId: data.requestId, entries: [], currentPath: data.path });
-            }
-        });
-        // Handle read file requests from mobile (e.g., CLAUDE.md)
-        websocket_1.wsClient.on('read_file', async (data) => {
-            console.log(chalk_1.default.dim(`[File] Read request: ${data.filePath}`));
-            try {
-                // SECURITY: Whitelist of allowed filenames
-                const allowedFiles = ['CLAUDE.md', 'README.md', 'package.json'];
-                const fileName = path.basename(data.filePath);
-                if (!allowedFiles.includes(fileName)) {
-                    console.warn(chalk_1.default.yellow(`[File] Access denied - file not in whitelist: ${fileName}`));
+            });
+            // Handle read file requests from mobile (e.g., CLAUDE.md)
+            websocket_1.wsClient.on('read_file', async (data) => {
+                console.log(chalk_1.default.dim(`[File] Read request: ${data.filePath}`));
+                try {
+                    // SECURITY: Whitelist of allowed filenames
+                    const allowedFiles = ['CLAUDE.md', 'README.md', 'package.json'];
+                    const fileName = path.basename(data.filePath);
+                    if (!allowedFiles.includes(fileName)) {
+                        console.warn(chalk_1.default.yellow(`[File] Access denied - file not in whitelist: ${fileName}`));
+                        websocket_1.wsClient.sendReadFileResponse({
+                            requestId: data.requestId,
+                            exists: false,
+                            fileName,
+                            error: 'File not allowed',
+                        });
+                        return;
+                    }
+                    // Resolve path
+                    let resolvedPath = data.filePath;
+                    if (resolvedPath === '~' || resolvedPath.startsWith('~/')) {
+                        resolvedPath = resolvedPath === '~' ? os.homedir() : resolvedPath.replace('~', os.homedir());
+                    }
+                    resolvedPath = path.resolve(resolvedPath);
+                    // SECURITY: Only allow access under home directory
+                    const homeDir = os.homedir();
+                    if (!resolvedPath.startsWith(homeDir)) {
+                        console.warn(chalk_1.default.yellow(`[File] Access denied - path outside home directory: ${resolvedPath}`));
+                        websocket_1.wsClient.sendReadFileResponse({
+                            requestId: data.requestId,
+                            exists: false,
+                            fileName,
+                            error: 'Path outside home directory',
+                        });
+                        return;
+                    }
+                    // Check if file exists
+                    if (!fs.existsSync(resolvedPath)) {
+                        websocket_1.wsClient.sendReadFileResponse({
+                            requestId: data.requestId,
+                            exists: false,
+                            fileName,
+                        });
+                        return;
+                    }
+                    // SECURITY: Check file size (max 100KB)
+                    const stats = fs.statSync(resolvedPath);
+                    if (stats.size > 100 * 1024) {
+                        websocket_1.wsClient.sendReadFileResponse({
+                            requestId: data.requestId,
+                            exists: true,
+                            fileName,
+                            error: 'File too large (max 100KB)',
+                        });
+                        return;
+                    }
+                    const content = fs.readFileSync(resolvedPath, 'utf-8');
                     websocket_1.wsClient.sendReadFileResponse({
                         requestId: data.requestId,
-                        exists: false,
+                        content,
+                        exists: true,
                         fileName,
-                        error: 'File not allowed',
                     });
-                    return;
-                }
-                // Resolve path
-                let resolvedPath = data.filePath;
-                if (resolvedPath === '~' || resolvedPath.startsWith('~/')) {
-                    resolvedPath = resolvedPath === '~' ? os.homedir() : resolvedPath.replace('~', os.homedir());
                 }
-                resolvedPath = path.resolve(resolvedPath);
-                // SECURITY: Only allow access under home directory
-                const homeDir = os.homedir();
-                if (!resolvedPath.startsWith(homeDir)) {
-                    console.warn(chalk_1.default.yellow(`[File] Access denied - path outside home directory: ${resolvedPath}`));
+                catch (error) {
+                    console.error(chalk_1.default.red(`[File] Error: ${error.message}`));
                     websocket_1.wsClient.sendReadFileResponse({
                         requestId: data.requestId,
                         exists: false,
-                        fileName,
-                        error: 'Path outside home directory',
+                        fileName: path.basename(data.filePath),
+                        error: error.message,
                     });
-                    return;
                 }
-                // Check if file exists
-                if (!fs.existsSync(resolvedPath)) {
-                    websocket_1.wsClient.sendReadFileResponse({
-                        requestId: data.requestId,
-                        exists: false,
-                        fileName,
+            });
+            // Handle transcript fetch requests from mobile
+            websocket_1.wsClient.on('transcript_fetch', async (data) => {
+                console.log(chalk_1.default.dim(`[Transcript] Fetching: ${data.sessionKey}, offset: ${data.offset}, limit: ${data.limit}, reverse: ${data.reverse}`));
+                try {
+                    const result = await transcript_streamer_1.transcriptStreamer.fetchHistory(data.transcriptPath, data.offset || 0, data.limit || 100, data.reverse !== false // Default to true (most recent first)
+                    );
+                    const payload = JSON.stringify(result.entries);
+                    console.log(chalk_1.default.dim(`[Transcript] Sending history: ${result.entries.length} entries, ${result.totalEntries} total, payload ~${(payload.length / 1024).toFixed(0)}KB`));
+                    websocket_1.wsClient.sendTranscriptHistory({
+                        sessionKey: data.sessionKey,
+                        ...result,
+                        offset: data.offset || 0,
+                        requestedBy: data.requestedBy,
                     });
-                    return;
                 }
-                // SECURITY: Check file size (max 100KB)
-                const stats = fs.statSync(resolvedPath);
-                if (stats.size > 100 * 1024) {
-                    websocket_1.wsClient.sendReadFileResponse({
-                        requestId: data.requestId,
-                        exists: true,
-                        fileName,
-                        error: 'File too large (max 100KB)',
-                    });
-                    return;
+                catch (error) {
+                    console.error(chalk_1.default.red(`[Transcript] Error: ${error.message}`));
                 }
-                const content = fs.readFileSync(resolvedPath, 'utf-8');
-                websocket_1.wsClient.sendReadFileResponse({
-                    requestId: data.requestId,
-                    content,
-                    exists: true,
-                    fileName,
-                });
-            }
-            catch (error) {
-                console.error(chalk_1.default.red(`[File] Error: ${error.message}`));
-                websocket_1.wsClient.sendReadFileResponse({
-                    requestId: data.requestId,
-                    exists: false,
-                    fileName: path.basename(data.filePath),
-                    error: error.message,
-                });
-            }
-        });
-        // Handle transcript fetch requests from mobile
-        websocket_1.wsClient.on('transcript_fetch', async (data) => {
-            console.log(chalk_1.default.dim(`[Transcript] Fetching: ${data.sessionKey}, offset: ${data.offset}, limit: ${data.limit}, reverse: ${data.reverse}`));
-            try {
-                const result = await transcript_streamer_1.transcriptStreamer.fetchHistory(data.transcriptPath, data.offset || 0, data.limit || 100, data.reverse !== false // Default to true (most recent first)
-                );
-                websocket_1.wsClient.sendTranscriptHistory({
-                    sessionKey: data.sessionKey,
-                    ...result,
-                    offset: data.offset || 0,
-                });
-            }
-            catch (error) {
-                console.error(chalk_1.default.red(`[Transcript] Error: ${error.message}`));
-            }
-        });
-        // Handle transcript subscribe
-        websocket_1.wsClient.on('transcript_subscribe', (data) => {
-            console.log(chalk_1.default.dim(`[Transcript] Subscribing: ${data.sessionKey}`));
-            transcript_streamer_1.transcriptStreamer.subscribeToUpdates(data.sessionKey, data.transcriptPath);
-        });
-        // Handle transcript unsubscribe
-        websocket_1.wsClient.on('transcript_unsubscribe', (data) => {
-            console.log(chalk_1.default.dim(`[Transcript] Unsubscribing: ${data.sessionKey}`));
-            transcript_streamer_1.transcriptStreamer.unsubscribeFromUpdates(data.sessionKey);
-        });
-        // Handle SDK subscribe start - mobile wants live updates for a session
-        // This is sent by API when mobile uses transcript_subscribe_sdk
-        websocket_1.wsClient.on('transcript_subscribe_sdk_start', async (data) => {
-            console.log(chalk_1.default.cyan(`[Transcript] SDK subscribe start: ${data.sessionKey}`));
-            // Find the transcript file for this session
-            const sessions = tools_1.claudeSessionDetector.scanSessions();
-            const session = sessions.find(s => s.sessionKey === data.sessionKey);
-            if (session?.transcriptPath) {
-                console.log(chalk_1.default.dim(`[Transcript] Starting watch for: ${session.transcriptPath}`));
-                transcript_streamer_1.transcriptStreamer.subscribeToUpdates(data.sessionKey, session.transcriptPath);
-            }
-            else {
-                console.log(chalk_1.default.yellow(`[Transcript] No transcript found for session: ${data.sessionKey}`));
-            }
-        });
-        // Handle claude sessions request - mobile app wants current sessions
-        websocket_1.wsClient.on('claude_sessions_request', () => {
-            console.log(chalk_1.default.cyan(`[Claude] Sessions requested by mobile`));
-            if (tools_1.claudeSessionDetector.isClaudeInstalled()) {
+            });
+            // Handle transcript subscribe
+            websocket_1.wsClient.on('transcript_subscribe', (data) => {
+                console.log(chalk_1.default.dim(`[Transcript] Subscribing: ${data.sessionKey}`));
+                transcript_streamer_1.transcriptStreamer.subscribeToUpdates(data.sessionKey, data.transcriptPath);
+            });
+            // Handle transcript unsubscribe
+            websocket_1.wsClient.on('transcript_unsubscribe', (data) => {
+                console.log(chalk_1.default.dim(`[Transcript] Unsubscribing: ${data.sessionKey}`));
+                transcript_streamer_1.transcriptStreamer.unsubscribeFromUpdates(data.sessionKey);
+            });
+            // Handle SDK subscribe start - mobile wants live updates for a session
+            // This is sent by API when mobile uses transcript_subscribe_sdk
+            websocket_1.wsClient.on('transcript_subscribe_sdk_start', async (data) => {
+                console.log(chalk_1.default.cyan(`[Transcript] SDK subscribe start: ${data.sessionKey}`));
+                // Find the transcript file for this session
                 const sessions = tools_1.claudeSessionDetector.scanSessions();
-                const now = Date.now();
-                let hasActiveSession = false;
-                // Update session states based on file modification time
-                for (const session of sessions) {
-                    const sessionTime = new Date(session.lastUsedAt).getTime();
-                    if (now - sessionTime < 60000) {
-                        session.state = 'active';
-                        session.lastUsedAt = new Date().toISOString(); // Update to NOW for active sessions
-                        hasActiveSession = true;
-                    }
+                const session = sessions.find(s => s.sessionKey === data.sessionKey);
+                if (session?.transcriptPath) {
+                    console.log(chalk_1.default.dim(`[Transcript] Starting watch for: ${session.transcriptPath}`));
+                    transcript_streamer_1.transcriptStreamer.subscribeToUpdates(data.sessionKey, session.transcriptPath);
                 }
-                // Send sessions
-                if (sessions.length > 0) {
-                    websocket_1.wsClient.sendClaudeSessions(sessions);
+                else {
+                    console.log(chalk_1.default.yellow(`[Transcript] No transcript found for session: ${data.sessionKey}`));
                 }
-                // Send tool status
-                websocket_1.wsClient.sendToolStatusUpdate('claude_code', hasActiveSession ? 'active' : 'inactive');
-            }
-        });
-        // Handle RPC requests from the API gateway
-        websocket_1.wsClient.on('rpc_request', async (data) => {
-            console.log(chalk_1.default.cyan(`[RPC] Request: ${data.method}, requestId: ${data.requestId}`));
-            try {
-                if (data.method === 'get_session_history') {
-                    const { claudeSessionId, sessionKey, limit = 400, offset = 0 } = data.params;
-                    console.log(chalk_1.default.dim(`[RPC] get_session_history request received`));
-                    // Find the transcript file
-                    let transcriptPath;
-                    // If claudeSessionId is provided, search for the JSONL file directly
-                    if (claudeSessionId) {
-                        // SECURITY: Validate claudeSessionId to prevent path traversal
-                        // Session IDs should be alphanumeric with hyphens/underscores only
-                        const sessionIdRegex = /^[a-zA-Z0-9_-]+$/;
-                        if (!sessionIdRegex.test(claudeSessionId)) {
-                            console.warn(chalk_1.default.yellow(`[RPC] Invalid claudeSessionId format - rejected`));
-                            websocket_1.wsClient.sendRpcResponse({
-                                requestId: data.requestId,
-                                error: { code: -32602, message: 'Invalid session ID format' }
-                            });
-                            return;
+            });
+            // Handle claude sessions request - mobile app wants current sessions
+            websocket_1.wsClient.on('claude_sessions_request', () => {
+                console.log(chalk_1.default.cyan(`[Claude] Sessions requested by mobile`));
+                if (tools_1.claudeSessionDetector.isClaudeInstalled()) {
+                    const sessions = tools_1.claudeSessionDetector.scanSessions();
+                    const now = Date.now();
+                    let hasActiveSession = false;
+                    // Update session states based on file modification time
+                    for (const session of sessions) {
+                        const sessionTime = new Date(session.lastUsedAt).getTime();
+                        if (now - sessionTime < 60000) {
+                            session.state = 'active';
+                            hasActiveSession = true;
                         }
-                        const claudeProjectsDir = path.join(os.homedir(), '.claude', 'projects');
-                        if (fs.existsSync(claudeProjectsDir)) {
-                            const projectDirs = fs.readdirSync(claudeProjectsDir);
-                            for (const projectDir of projectDirs) {
-                                // SECURITY: Validate projectDir as well to prevent traversal
-                                if (!sessionIdRegex.test(projectDir) && !/^[a-zA-Z0-9_.-]+$/.test(projectDir)) {
-                                    continue;
+                    }
+                    // Send sessions
+                    if (sessions.length > 0) {
+                        websocket_1.wsClient.sendClaudeSessions(sessions);
+                    }
+                    // Send tool status
+                    websocket_1.wsClient.sendToolStatusUpdate('claude_code', hasActiveSession ? 'active' : 'inactive');
+                }
+            });
+            // Handle RPC requests from the API gateway
+            websocket_1.wsClient.on('rpc_request', async (data) => {
+                console.log(chalk_1.default.cyan(`[RPC] Request: ${data.method}, requestId: ${data.requestId}`));
+                try {
+                    if (data.method === 'get_session_history') {
+                        const { claudeSessionId, sessionKey, directory, limit = 400, offset = 0 } = data.params;
+                        console.log(chalk_1.default.dim(`[RPC] get_session_history request received`));
+                        // Find the transcript file
+                        let transcriptPath;
+                        // If claudeSessionId is provided, search for the JSONL file directly
+                        if (claudeSessionId) {
+                            // SECURITY: Validate claudeSessionId to prevent path traversal
+                            // Session IDs should be alphanumeric with hyphens/underscores only
+                            const sessionIdRegex = /^[a-zA-Z0-9_-]+$/;
+                            if (!sessionIdRegex.test(claudeSessionId)) {
+                                console.warn(chalk_1.default.yellow(`[RPC] Invalid claudeSessionId format - rejected`));
+                                websocket_1.wsClient.sendRpcResponse({
+                                    requestId: data.requestId,
+                                    error: { code: -32602, message: 'Invalid session ID format' }
+                                });
+                                return;
+                            }
+                            const claudeProjectsDir = path.join(os.homedir(), '.claude', 'projects');
+                            if (fs.existsSync(claudeProjectsDir)) {
+                                const projectDirs = fs.readdirSync(claudeProjectsDir);
+                                for (const projectDir of projectDirs) {
+                                    // SECURITY: Validate projectDir as well to prevent traversal
+                                    if (!sessionIdRegex.test(projectDir) && !/^[a-zA-Z0-9_.-]+$/.test(projectDir)) {
+                                        continue;
+                                    }
+                                    const potentialPath = path.join(claudeProjectsDir, projectDir, `${claudeSessionId}.jsonl`);
+                                    // SECURITY: Verify the resolved path is still under claudeProjectsDir
+                                    const resolvedPotentialPath = path.resolve(potentialPath);
+                                    if (!resolvedPotentialPath.startsWith(claudeProjectsDir)) {
+                                        continue;
+                                    }
+                                    if (fs.existsSync(potentialPath)) {
+                                        transcriptPath = potentialPath;
+                                        console.log(chalk_1.default.dim(`[RPC] Found JSONL transcript`));
+                                        break;
+                                    }
                                 }
-                                const potentialPath = path.join(claudeProjectsDir, projectDir, `${claudeSessionId}.jsonl`);
-                                // SECURITY: Verify the resolved path is still under claudeProjectsDir
-                                const resolvedPotentialPath = path.resolve(potentialPath);
-                                if (!resolvedPotentialPath.startsWith(claudeProjectsDir)) {
-                                    continue;
+                            }
+                        }
+                        // If not found by claudeSessionId, search all sessions
+                        if (!transcriptPath && tools_1.claudeSessionDetector.isClaudeInstalled()) {
+                            const sessions = tools_1.claudeSessionDetector.scanSessions();
+                            // First try to match by sessionKey
+                            let session = sessions.find(s => s.sessionKey === sessionKey);
+                            // If no match by sessionKey, try to find most recent session for the same directory
+                            if (!session && sessions.length > 0 && directory) {
+                                const normalizedDir = path.resolve(directory);
+                                session = sessions.find(s => path.resolve(s.directory) === normalizedDir);
+                                if (session) {
+                                    console.log(chalk_1.default.dim(`[RPC] Using directory-matched session as fallback: ${session.sessionKey}`));
                                 }
-                                if (fs.existsSync(potentialPath)) {
-                                    transcriptPath = potentialPath;
-                                    console.log(chalk_1.default.dim(`[RPC] Found JSONL transcript`));
-                                    break;
+                                else {
+                                    console.log(chalk_1.default.dim(`[RPC] No session found for directory: ${normalizedDir}`));
                                 }
                             }
+                            if (session?.transcriptPath) {
+                                transcriptPath = session.transcriptPath;
+                                console.log(chalk_1.default.dim(`[RPC] Found transcript path: ${transcriptPath}`));
+                            }
                         }
-                    }
-                    // If not found by claudeSessionId, search all sessions
-                    if (!transcriptPath && tools_1.claudeSessionDetector.isClaudeInstalled()) {
-                        const sessions = tools_1.claudeSessionDetector.scanSessions();
-                        // First try to match by sessionKey
-                        let session = sessions.find(s => s.sessionKey === sessionKey);
-                        // If no match by sessionKey, try to find most recent session for the same directory
-                        if (!session && sessions.length > 0) {
-                            // Just use the most recent session as fallback
-                            session = sessions[0];
-                            console.log(chalk_1.default.dim(`[RPC] Using most recent session as fallback: ${session.sessionKey}`));
+                        if (!transcriptPath || !fs.existsSync(transcriptPath)) {
+                            console.log(chalk_1.default.yellow(`[RPC] No transcript file found for session`));
+                            websocket_1.wsClient.sendRpcResponse({
+                                requestId: data.requestId,
+                                result: { entries: [], totalEntries: 0, hasMore: false }
+                            });
+                            return;
                         }
-                        if (session?.transcriptPath) {
-                            transcriptPath = session.transcriptPath;
-                            console.log(chalk_1.default.dim(`[RPC] Found transcript path: ${transcriptPath}`));
+                        // Read the transcript file
+                        const result = await transcript_streamer_1.transcriptStreamer.fetchHistory(transcriptPath, offset, limit, true);
+                        console.log(chalk_1.default.green(`[RPC] Loaded ${result.entries.length} entries from transcript`));
+                        // IMPORTANT: Start watching this transcript for live updates
+                        // This is needed because SDK mode doesn't send transcript_subscribe
+                        // Use sessionKey from mobile for updates (must match what mobile is listening for)
+                        const updateSessionKey = sessionKey;
+                        if (!updateSessionKey) {
+                            console.log(chalk_1.default.yellow(`[RPC] No sessionKey provided, using claudeSessionId - updates may not route correctly`));
                         }
-                    }
-                    if (!transcriptPath || !fs.existsSync(transcriptPath)) {
-                        console.log(chalk_1.default.yellow(`[RPC] No transcript file found for session`));
+                        const watchKey = updateSessionKey || claudeSessionId || data.requestId;
+                        console.log(chalk_1.default.cyan(`[RPC] Starting file watch for live updates: ${watchKey}`));
+                        transcript_streamer_1.transcriptStreamer.subscribeToUpdates(watchKey, transcriptPath);
                         websocket_1.wsClient.sendRpcResponse({
                             requestId: data.requestId,
-                            result: { entries: [], totalEntries: 0, hasMore: false }
+                            result: {
+                                entries: result.entries,
+                                totalEntries: result.totalEntries,
+                                hasMore: result.hasMore,
+                                sessionKey: watchKey, // Tell mobile which sessionKey to listen for updates
+                            }
                         });
-                        return;
                     }
-                    // Read the transcript file
-                    const result = await transcript_streamer_1.transcriptStreamer.fetchHistory(transcriptPath, offset, limit, true);
-                    console.log(chalk_1.default.green(`[RPC] Loaded ${result.entries.length} entries from transcript`));
-                    // IMPORTANT: Start watching this transcript for live updates
-                    // This is needed because SDK mode doesn't send transcript_subscribe
-                    // Use sessionKey from mobile for updates (must match what mobile is listening for)
-                    const updateSessionKey = sessionKey;
-                    if (!updateSessionKey) {
-                        console.log(chalk_1.default.yellow(`[RPC] No sessionKey provided, using claudeSessionId - updates may not route correctly`));
+                    else {
+                        console.log(chalk_1.default.yellow(`[RPC] Unknown method: ${data.method}`));
+                        websocket_1.wsClient.sendRpcResponse({
+                            requestId: data.requestId,
+                            error: { code: -32601, message: `Method not found: ${data.method}` }
+                        });
                     }
-                    const watchKey = updateSessionKey || claudeSessionId || data.requestId;
-                    console.log(chalk_1.default.cyan(`[RPC] Starting file watch for live updates: ${watchKey}`));
-                    transcript_streamer_1.transcriptStreamer.subscribeToUpdates(watchKey, transcriptPath);
+                }
+                catch (error) {
+                    console.error(chalk_1.default.red(`[RPC] Error handling ${data.method}:`, error.message));
                     websocket_1.wsClient.sendRpcResponse({
                         requestId: data.requestId,
-                        result: {
-                            entries: result.entries,
-                            totalEntries: result.totalEntries,
-                            hasMore: result.hasMore,
-                            sessionKey: watchKey, // Tell mobile which sessionKey to listen for updates
+                        error: { code: -32603, message: error.message || 'Internal error' }
+                    });
+                }
+            });
+            // Forward live transcript updates to WebSocket
+            transcript_streamer_1.transcriptStreamer.on('update', (data) => {
+                console.log(chalk_1.default.green(`[Transcript] Sending update for ${data.sessionKey}: ${data.entry?.type}`));
+                websocket_1.wsClient.sendTranscriptUpdate(data);
+                // Also update session lastUsedAt to keep it fresh
+                // Find the session to get the directory
+                const sessions = tools_1.claudeSessionDetector.getSessions();
+                const session = sessions.find(s => s.sessionKey === data.sessionKey);
+                if (session) {
+                    websocket_1.wsClient.sendClaudeSessionUpdate({
+                        sessionKey: data.sessionKey,
+                        directory: session.directory,
+                        state: 'active',
+                        lastUsedAt: new Date().toISOString(),
+                        transcriptPath: session.transcriptPath,
+                    });
+                }
+            });
+            // Forward Claude process output to WebSocket
+            tools_1.claudeProcessManager.on('output', (data) => {
+                websocket_1.wsClient.sendTerminalOutput(data);
+            });
+            // Forward Claude approval requests to WebSocket (mobile approval)
+            tools_1.claudeProcessManager.on('claude_approval_request', (data) => {
+                console.log(chalk_1.default.yellow(`[Claude] Approval request: ${data.approvalId}`));
+                websocket_1.wsClient.sendClaudeApprovalRequest(data);
+            });
+            // Forward tool activity events to mobile (non-blocking notifications)
+            tools_1.claudeProcessManager.on('tool_activity', (data) => {
+                console.log(chalk_1.default.dim(`[Claude] Tool activity: ${data.toolName} - ${data.inputSummary?.substring(0, 60)}`));
+                websocket_1.wsClient.sendToolActivity(data);
+            });
+            // Forward permission prompts from hook system to mobile (interactive approval)
+            // Only forward if the session is taken over; otherwise auto-allow so Claude doesn't hang
+            tools_1.claudeProcessManager.on('permission_prompt', (data) => {
+                if (!tools_1.claudeProcessManager.isTakenOver(data.terminalSessionId)) {
+                    console.log(chalk_1.default.dim(`[Claude] Permission prompt auto-allowed (watch-only): ${data.toolName} (${data.promptId})`));
+                    tools_1.claudeProcessManager.handlePermissionResponse(data.promptId, 'allow', 'Auto-allowed: session not taken over');
+                    return;
+                }
+                console.log(chalk_1.default.yellow(`[Claude] Permission prompt: ${data.toolName} (${data.promptId})`));
+                websocket_1.wsClient.sendPermissionPrompt(data);
+            });
+            // Handle permission responses from mobile → route back to hook IPC
+            websocket_1.wsClient.on('permission_response', (data) => {
+                console.log(chalk_1.default.green(`[Claude] Permission response: ${data.promptId} -> ${data.decision}`));
+                tools_1.claudeProcessManager.handlePermissionResponse(data.promptId, data.decision, data.reason);
+            });
+            // Handle permission rules sync from mobile — write rules to disk for hook script
+            websocket_1.wsClient.on('permission_rules_sync', (data) => {
+                if (data.rules && Array.isArray(data.rules)) {
+                    console.log(chalk_1.default.cyan(`[Claude] Permission rules sync: ${data.rules.length} rules`));
+                    tools_1.claudeProcessManager.updatePermissionRules(data.rules);
+                }
+            });
+            // Handle mobile disconnect — full reset: clear taken-over, auto-allow pending, tear down hooks
+            websocket_1.wsClient.on('mobile_disconnected', () => {
+                console.log(chalk_1.default.yellow(`[Claude] Mobile disconnected — full permission reset`));
+                tools_1.claudeProcessManager.clearAllTakenOver();
+                tools_1.claudeProcessManager.autoAllowAllPendingPrompts();
+                tools_1.claudeProcessManager.cleanupAllPermissionState();
+            });
+            // Handle Claude approval responses from mobile
+            websocket_1.wsClient.on('claude_approval_response', (data) => {
+                console.log(chalk_1.default.green(`[Claude] Approval response: ${data.approvalId} -> ${data.response}`));
+                tools_1.claudeProcessManager.handleApprovalResponse(data.approvalId, data.response);
+            });
+            // Handle user messages from mobile app (send to Claude session)
+            websocket_1.wsClient.on('user_message', async (data) => {
+                // SECURITY: Don't log message content - may contain sensitive prompts
+                console.log(chalk_1.default.cyan(`[Claude] User message received (${data.message.length} chars)`));
+                // The session should have been registered via claude_resume_session
+                // sendInput will spawn the process if needed using the registered session info
+                const terminalSessionId = data.sessionKey; // Use sessionKey as terminalSessionId
+                if (!terminalSessionId) {
+                    console.log(chalk_1.default.yellow(`[Claude] No sessionKey provided in user_message`));
+                    return;
+                }
+                // Check if this session has been taken over by the mobile user
+                if (!tools_1.claudeProcessManager.isTakenOver(terminalSessionId)) {
+                    // Fresh session from auto-prompt (quick action): start new session with directory
+                    if (data.directory) {
+                        console.log(chalk_1.default.cyan(`[Claude] Starting fresh session for auto-prompt in ${data.directory}`));
+                        const sent = await tools_1.claudeProcessManager.startAndSendMessage(data.directory, terminalSessionId, data.message, data.mode?.permissionMode === 'bypassPermissions', data.interactivePermissions);
+                        if (sent) {
+                            // Notify mobile that session is ready
+                            websocket_1.wsClient.sendClaudeSessionUpdate({
+                                sessionKey: terminalSessionId,
+                                directory: data.directory,
+                                state: 'active',
+                                lastUsedAt: new Date().toISOString(),
+                            });
+                        }
+                        else {
+                            console.log(chalk_1.default.yellow(`[Claude] Failed to start fresh session`));
                         }
+                        return;
+                    }
+                    // Session not taken over — user must press "Take Over" first
+                    console.log(chalk_1.default.yellow(`[Claude] Session not taken over: ${terminalSessionId} — watch-only mode`));
+                    websocket_1.wsClient.sendClaudeSessionEvent({
+                        sessionKey: terminalSessionId,
+                        event: {
+                            type: 'error',
+                            message: 'You must take over this session before sending messages.',
+                        },
                     });
+                    return;
                 }
-                else {
-                    console.log(chalk_1.default.yellow(`[RPC] Unknown method: ${data.method}`));
-                    websocket_1.wsClient.sendRpcResponse({
-                        requestId: data.requestId,
-                        error: { code: -32601, message: `Method not found: ${data.method}` }
+                console.log(chalk_1.default.dim(`[Claude] Sending to session: ${terminalSessionId}`));
+                const sent = await tools_1.claudeProcessManager.sendInput(terminalSessionId, data.message + '\n');
+                if (!sent) {
+                    console.log(chalk_1.default.yellow(`[Claude] Failed to send message - session may need restart`));
+                }
+            });
+            // Handle Claude process end
+            tools_1.claudeProcessManager.on('session_ended', (data) => {
+                console.log(chalk_1.default.dim(`[Claude] Session ended: ${data.terminalSessionId}`));
+                websocket_1.wsClient.sendToolStatusUpdate('claude_code', 'inactive');
+                // Use terminalSessionId as fallback — fresh sessions (startAndSendMessage) may not
+                // have captured the real session_id from SDK output before the process ended.
+                // The mobile references these sessions by terminalSessionId, so the inactive update
+                // must use it to prevent stale "active" sessions.
+                const key = data.sessionKey || data.terminalSessionId;
+                if (key) {
+                    websocket_1.wsClient.sendClaudeSessionUpdate({
+                        sessionKey: key,
+                        directory: data.directory,
+                        state: 'inactive',
+                        lastUsedAt: new Date().toISOString(),
                     });
                 }
-            }
-            catch (error) {
-                console.error(chalk_1.default.red(`[RPC] Error handling ${data.method}:`, error.message));
-                websocket_1.wsClient.sendRpcResponse({
-                    requestId: data.requestId,
-                    error: { code: -32603, message: error.message || 'Internal error' }
+            });
+            // Forward thinking content to mobile
+            tools_1.claudeProcessManager.on('thinking_content', (data) => {
+                if (data.content || !data.partial) {
+                    console.log(chalk_1.default.magenta(`[Claude] Thinking${data.partial ? ' (streaming)' : ' (complete)'}: ${data.content?.substring(0, 50) || '...'}`));
+                }
+                websocket_1.wsClient.sendThinkingContent({
+                    sessionKey: data.sessionKey,
+                    thinkingId: data.thinkingId,
+                    content: data.content,
+                    partial: data.partial,
                 });
-            }
-        });
-        // Forward live transcript updates to WebSocket
-        transcript_streamer_1.transcriptStreamer.on('update', (data) => {
-            console.log(chalk_1.default.green(`[Transcript] Sending update for ${data.sessionKey}: ${data.entry?.type}`));
-            websocket_1.wsClient.sendTranscriptUpdate(data);
-            // Also update session lastUsedAt to keep it fresh
-            // Find the session to get the directory
-            const sessions = tools_1.claudeSessionDetector.getSessions();
-            const session = sessions.find(s => s.sessionKey === data.sessionKey);
-            if (session) {
-                websocket_1.wsClient.sendClaudeSessionUpdate({
+            });
+            // Forward token usage to mobile
+            tools_1.claudeProcessManager.on('token_usage', (data) => {
+                console.log(chalk_1.default.blue(`[Claude] Tokens: ${data.usage.inputTokens} in / ${data.usage.outputTokens} out`));
+                websocket_1.wsClient.sendTokenUsage({
                     sessionKey: data.sessionKey,
-                    directory: session.directory,
-                    state: 'active',
-                    lastUsedAt: new Date().toISOString(),
-                    transcriptPath: session.transcriptPath,
+                    usage: data.usage,
                 });
-            }
-        });
-        // Forward Claude process output to WebSocket
-        tools_1.claudeProcessManager.on('output', (data) => {
-            websocket_1.wsClient.sendTerminalOutput(data);
-        });
-        // Forward Claude approval requests to WebSocket (mobile approval)
-        tools_1.claudeProcessManager.on('claude_approval_request', (data) => {
-            console.log(chalk_1.default.yellow(`[Claude] Approval request: ${data.approvalId}`));
-            websocket_1.wsClient.sendClaudeApprovalRequest(data);
-        });
-        // Forward tool activity events to mobile (non-blocking notifications)
-        tools_1.claudeProcessManager.on('tool_activity', (data) => {
-            console.log(chalk_1.default.dim(`[Claude] Tool activity: ${data.toolName} - ${data.inputSummary?.substring(0, 60)}`));
-            websocket_1.wsClient.sendToolActivity(data);
-        });
-        // Handle Claude approval responses from mobile
-        websocket_1.wsClient.on('claude_approval_response', (data) => {
-            console.log(chalk_1.default.green(`[Claude] Approval response: ${data.approvalId} -> ${data.response}`));
-            tools_1.claudeProcessManager.handleApprovalResponse(data.approvalId, data.response);
-        });
-        // Handle user messages from mobile app (send to Claude session)
-        websocket_1.wsClient.on('user_message', async (data) => {
-            // SECURITY: Don't log message content - may contain sensitive prompts
-            console.log(chalk_1.default.cyan(`[Claude] User message received (${data.message.length} chars)`));
-            // The session should have been registered via claude_resume_session
-            // sendInput will spawn the process if needed using the registered session info
-            const terminalSessionId = data.sessionKey; // Use sessionKey as terminalSessionId
-            if (!terminalSessionId) {
-                console.log(chalk_1.default.yellow(`[Claude] No sessionKey provided in user_message`));
-                return;
-            }
-            // Check if this session is registered (either active or registered for later spawn)
-            if (!tools_1.claudeProcessManager.isClaudeSession(terminalSessionId)) {
-                // Fresh session from auto-prompt (quick action): start new session with directory
-                if (data.directory) {
-                    console.log(chalk_1.default.cyan(`[Claude] Starting fresh session for auto-prompt in ${data.directory}`));
-                    const sent = await tools_1.claudeProcessManager.startAndSendMessage(data.directory, terminalSessionId, data.message);
-                    if (sent) {
-                        // Notify mobile that session is ready
-                        websocket_1.wsClient.sendClaudeSessionUpdate({
-                            sessionKey: terminalSessionId,
-                            directory: data.directory,
-                            state: 'active',
-                            lastUsedAt: new Date().toISOString(),
-                        });
-                    }
-                    else {
-                        console.log(chalk_1.default.yellow(`[Claude] Failed to start fresh session`));
-                    }
-                    return;
+            });
+            // When a fresh session captures a real session_id, update the transcript
+            // file watcher so the mobile gets real-time updates from the correct JSONL file.
+            // This is critical for brainstorm/quick-action sessions where startAndSendMessage
+            // creates a new Claude session with a new transcript file.
+            tools_1.claudeProcessManager.on('session_id_captured', (data) => {
+                const { terminalSessionId, sessionId } = data;
+                console.log(chalk_1.default.green(`[Claude] New session_id captured for ${terminalSessionId}: ${sessionId}`));
+                // Re-scan to pick up the new session's transcript path
+                const sessions = tools_1.claudeSessionDetector.scanSessions();
+                const newSession = sessions.find((s) => s.sessionKey === sessionId);
+                if (newSession?.transcriptPath) {
+                    console.log(chalk_1.default.green(`[Claude] Updating transcript watcher → ${newSession.transcriptPath}`));
+                    transcript_streamer_1.transcriptStreamer.subscribeToUpdates(terminalSessionId, newSession.transcriptPath);
                 }
-                console.log(chalk_1.default.yellow(`[Claude] Session not registered: ${terminalSessionId}`));
-                console.log(chalk_1.default.dim(`[Claude] Hint: Mobile should send claude_resume_session first`));
-                return;
-            }
-            console.log(chalk_1.default.dim(`[Claude] Sending to session: ${terminalSessionId}`));
-            const sent = await tools_1.claudeProcessManager.sendInput(terminalSessionId, data.message + '\n');
-            if (!sent) {
-                console.log(chalk_1.default.yellow(`[Claude] Failed to send message - session may need restart`));
-            }
-        });
-        // Handle Claude process end
-        tools_1.claudeProcessManager.on('session_ended', (data) => {
-            console.log(chalk_1.default.dim(`[Claude] Session ended: ${data.terminalSessionId}`));
-            websocket_1.wsClient.sendToolStatusUpdate('claude_code', 'inactive');
-            if (data.sessionKey) {
-                websocket_1.wsClient.sendClaudeSessionUpdate({
+                else {
+                    console.log(chalk_1.default.yellow(`[Claude] New session transcript not found yet, retrying in 1s...`));
+                    setTimeout(() => {
+                        const retrySessions = tools_1.claudeSessionDetector.scanSessions();
+                        const retrySession = retrySessions.find((s) => s.sessionKey === sessionId);
+                        if (retrySession?.transcriptPath) {
+                            console.log(chalk_1.default.green(`[Claude] Retry: updating transcript watcher → ${retrySession.transcriptPath}`));
+                            transcript_streamer_1.transcriptStreamer.subscribeToUpdates(terminalSessionId, retrySession.transcriptPath);
+                        }
+                        else {
+                            console.log(chalk_1.default.yellow(`[Claude] Retry: still not found for ${sessionId}`));
+                        }
+                    }, 1000);
+                }
+            });
+            // Forward task progress to mobile
+            tools_1.claudeProcessManager.on('task_progress', (data) => {
+                if (data.type === 'list') {
+                    console.log(chalk_1.default.cyan(`[Claude] Task list: ${data.tasks?.length || 0} tasks`));
+                }
+                else {
+                    console.log(chalk_1.default.cyan(`[Claude] Task ${data.type}: ${data.task?.subject || data.task?.id}`));
+                }
+                websocket_1.wsClient.sendTaskProgress({
                     sessionKey: data.sessionKey,
-                    directory: data.directory,
-                    state: 'inactive',
-                    lastUsedAt: new Date().toISOString(),
+                    type: data.type,
+                    task: data.task,
+                    tasks: data.tasks,
                 });
-            }
-        });
-        // Forward thinking content to mobile
-        tools_1.claudeProcessManager.on('thinking_content', (data) => {
-            if (data.content || !data.partial) {
-                console.log(chalk_1.default.magenta(`[Claude] Thinking${data.partial ? ' (streaming)' : ' (complete)'}: ${data.content?.substring(0, 50) || '...'}`));
-            }
-            websocket_1.wsClient.sendThinkingContent({
-                sessionKey: data.sessionKey,
-                thinkingId: data.thinkingId,
-                content: data.content,
-                partial: data.partial,
             });
-        });
-        // Forward token usage to mobile
-        tools_1.claudeProcessManager.on('token_usage', (data) => {
-            console.log(chalk_1.default.blue(`[Claude] Tokens: ${data.usage.inputTokens} in / ${data.usage.outputTokens} out`));
-            websocket_1.wsClient.sendTokenUsage({
-                sessionKey: data.sessionKey,
-                usage: data.usage,
+            websocket_1.wsClient.on('disconnected', (reason) => {
+                console.log(chalk_1.default.yellow(`\nDisconnected: ${reason}`));
+                if (reason !== 'io client disconnect') {
+                    console.log(chalk_1.default.dim('Attempting to reconnect...'));
+                }
             });
-        });
-        // Forward task progress to mobile
-        tools_1.claudeProcessManager.on('task_progress', (data) => {
-            if (data.type === 'list') {
-                console.log(chalk_1.default.cyan(`[Claude] Task list: ${data.tasks?.length || 0} tasks`));
-            }
-            else {
-                console.log(chalk_1.default.cyan(`[Claude] Task ${data.type}: ${data.task?.subject || data.task?.id}`));
-            }
-            websocket_1.wsClient.sendTaskProgress({
-                sessionKey: data.sessionKey,
-                type: data.type,
-                task: data.task,
-                tasks: data.tasks,
+            websocket_1.wsClient.on('error', (error) => {
+                console.error(chalk_1.default.red(`Connection error: ${error.message}`));
             });
-        });
-        websocket_1.wsClient.on('disconnected', (reason) => {
-            console.log(chalk_1.default.yellow(`\nDisconnected: ${reason}`));
-            if (reason !== 'io client disconnect') {
-                console.log(chalk_1.default.dim('Attempting to reconnect...'));
-            }
-        });
-        websocket_1.wsClient.on('error', (error) => {
-            console.error(chalk_1.default.red(`Connection error: ${error.message}`));
-        });
-        // Keep the process running
-        process.on('SIGINT', () => {
-            console.log(chalk_1.default.yellow('\nDisconnecting...'));
-            tools_1.claudeSessionDetector.stopWatching();
-            transcript_streamer_1.transcriptStreamer.cleanup();
-            websocket_1.wsClient.disconnect();
-            process.exit(0);
-        });
-        // Keep alive
-        await new Promise(() => { });
-    }
-    catch (error) {
-        spinner.fail('Failed to connect');
-        console.error(chalk_1.default.red(error.message || 'Unknown error'));
+            // Keep the process running
+            process.on('SIGINT', () => {
+                console.log(chalk_1.default.yellow('\nDisconnecting...'));
+                tools_1.claudeSessionDetector.stopWatching();
+                transcript_streamer_1.transcriptStreamer.cleanup();
+                websocket_1.wsClient.disconnect();
+                process.exit(0);
+            });
+            // Keep alive
+            await new Promise(() => { });
+        }
+        catch (error) {
+            spinner.fail('Failed to connect');
+            console.error(chalk_1.default.red(error.message || 'Unknown error'));
+        }
     }
-}
-// Helper function to wait for pairing
-async function waitForPairing(deviceId) {
-    return new Promise((resolve, reject) => {
-        const checkInterval = setInterval(async () => {
-            try {
-                const status = await api_1.api.checkPairingStatus(deviceId);
-                if (status.isPaired) {
-                    clearInterval(checkInterval);
-                    config_1.config.userId = status.userId;
-                    config_1.config.pairedAt = new Date().toISOString();
-                    console.log(chalk_1.default.green('\n✓ Device paired successfully!'));
-                    console.log(chalk_1.default.dim('\nConnecting to receive commands...\n'));
-                    // Auto-connect after successful pairing
-                    resolve();
+    // Helper function to wait for pairing
+    async function waitForPairing(deviceId) {
+        return new Promise((resolve, reject) => {
+            const checkInterval = setInterval(async () => {
+                try {
+                    const status = await api_1.api.checkPairingStatus(deviceId);
+                    if (status.isPaired) {
+                        clearInterval(checkInterval);
+                        config_1.config.userId = status.userId;
+                        config_1.config.pairedAt = new Date().toISOString();
+                        console.log(chalk_1.default.green('\n✓ Device paired successfully!'));
+                        console.log(chalk_1.default.dim('\nConnecting to receive commands...\n'));
+                        // Auto-connect after successful pairing
+                        resolve();
+                    }
                 }
-            }
-            catch (error) {
-                // Continue waiting
-            }
-        }, 2000);
-        // Handle Ctrl+C
-        process.on('SIGINT', () => {
-            clearInterval(checkInterval);
-            console.log(chalk_1.default.yellow('\nPairing cancelled.'));
-            process.exit(0);
+                catch (error) {
+                    // Continue waiting
+                }
+            }, 2000);
+            // Handle Ctrl+C
+            process.on('SIGINT', () => {
+                clearInterval(checkInterval);
+                console.log(chalk_1.default.yellow('\nPairing cancelled.'));
+                process.exit(0);
+            });
         });
+    }
+    // Help command
+    program
+        .command('help')
+        .description('Show available commands and usage')
+        .action(() => { program.outputHelp(); });
+    // Unknown command handling
+    program.showHelpAfterError('Run "forkoff help" for available commands.');
+    program.on('command:*', (operands) => {
+        console.error(`Unknown command: ${operands[0]}\n`);
+        console.log('Run "forkoff help" for available commands.');
+        process.exitCode = 1;
     });
+    return program;
+}
+// Run the CLI (skip when loaded as a module in tests)
+if (require.main === module) {
+    createProgram().parse();
 }
-// Run the CLI
-program.parse();
 //# sourceMappingURL=index.js.map