genbox 1.0.208 → 1.0.209

package/dist/commands/provider-command.js

@@ -62,6 +62,7 @@ const ssh_proxy_1 = require("../utils/ssh-proxy");
 const unified_session_1 = require("../lib/unified-session");
 const genbox_progress_1 = require("../lib/genbox-progress");
 const genbox_wizard_1 = require("../lib/genbox-wizard");
+const interactive_prompt_1 = require("../utils/interactive-prompt");
 const child_process_1 = require("child_process");
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
@@ -442,7 +443,8 @@ async function startLocalMultipass(genbox) {
 /**
  * Create and attach to a session on a genbox
  */
-async function startSessionOnGenbox(provider, genbox) {
+async function startSessionOnGenbox(provider, genbox, options = {}) {
+    const { initialPrompt } = options;
     let targetGenbox = genbox;
     let sshTarget;
     let sshPortArgs = [];
@@ -482,6 +484,8 @@ async function startSessionOnGenbox(provider, genbox) {
     }
     const keyPath = requireSshKey();
     const sessionName = `${provider}-${Date.now().toString(36)}`;
+    // Always start CLI without prompt - we'll inject it after attaching
+    // This keeps the session interactive instead of one-shot mode
     const cliCommand = provider === 'claude'
         ? 'claude --dangerously-skip-permissions'
         : provider === 'gemini'
@@ -602,7 +606,8 @@ exec ${cliCommand}
         socketPath,
         user: 'dev',
         port: sshPort,
-        verbose: true, // Debug mode
+        verbose: true,
+        initialPrompt, // Inject prompt after connection
     });
     await new Promise(resolve => proc.on('close', () => resolve()));
     console.log(chalk_1.default.dim('\nDetached from session.'));
@@ -677,7 +682,8 @@ async function killSession(session) {
 /**
  * Start a direct (no isolation) session
  */
-async function startDirectSession(provider) {
+async function startDirectSession(provider, options = {}) {
+    const { initialPrompt } = options;
     // Check for dtach
     const dtachStatus = await ensureLocalDtach();
     if (dtachStatus === 'cancel') {
@@ -695,6 +701,7 @@ async function startDirectSession(provider) {
         syncEnabled: false, // Local-first: no API sync by default
     });
     const sessionName = session.name;
+    // Always start CLI without prompt - inject after connection
     const cliCommand = provider === 'claude'
         ? 'claude --dangerously-skip-permissions'
         : provider === 'gemini'
@@ -724,7 +731,39 @@ async function startDirectSession(provider) {
     }
     // Mark session as running
     await sessionManager.markRunning(session.id);
-    const proc = (0, child_process_1.spawn)('bash', ['-c', cmd], { stdio: 'inherit' });
+    // For direct mode, we need to pipe stdin to inject the prompt
+    const proc = (0, child_process_1.spawn)('bash', ['-c', cmd], {
+        stdio: initialPrompt ? ['pipe', 'inherit', 'inherit'] : 'inherit',
+    });
+    // Inject initial prompt after CLI is ready
+    if (initialPrompt && proc.stdin) {
+        setTimeout(() => {
+            if (proc.stdin && !proc.killed) {
+                // Send prompt character by character with slower typing
+                const chars = initialPrompt.split('');
+                let i = 0;
+                const typeChar = () => {
+                    if (i < chars.length && proc.stdin && !proc.killed) {
+                        proc.stdin.write(chars[i]);
+                        i++;
+                        setTimeout(typeChar, 15); // 15ms between chars (slower, more reliable)
+                    }
+                    else if (proc.stdin && !proc.killed) {
+                        // All chars sent, press Enter, then pipe user input
+                        setTimeout(() => {
+                            proc.stdin?.write('\r');
+                            // Continue piping user input after prompt is sent
+                            setTimeout(() => {
+                                process.stdin.pipe(proc.stdin);
+                                process.stdin.resume();
+                            }, 200);
+                        }, 100);
+                    }
+                };
+                typeChar();
+            }
+        }, 3000); // 3 second delay for local sessions
+    }
     await new Promise((resolve) => {
         proc.on('close', () => {
             if (useDtach && fs.existsSync(socketPath)) {
@@ -894,6 +933,179 @@ async function runInteractiveFlow(provider) {
             break;
     }
 }
+/**
+ * Interactive prompt mode flow (-p flag)
+ *
+ * This flow:
+ * 1. Collects multiline prompt (inline or via $EDITOR with -e)
+ * 2. Collects image paths (optional)
+ * 3. Shows target selection (genbox vs direct)
+ * 4. Uploads images to genbox if needed (waits for genbox to be ready)
+ * 5. Starts session with the composed prompt
+ */
+async function runPromptModeFlow(provider, options = {}) {
+    const { useEditor = false } = options;
+    console.log(chalk_1.default.bold(`\n${provider.charAt(0).toUpperCase() + provider.slice(1)} - Interactive Prompt Mode`));
+    if (useEditor) {
+        console.log(chalk_1.default.dim('Compose your prompt in $EDITOR with optional images\n'));
+    }
+    else {
+        console.log(chalk_1.default.dim('Compose your prompt with optional images\n'));
+    }
+    // Step 1: Collect prompt and images
+    const collected = await (0, interactive_prompt_1.collectPromptWithImages)({ useEditor });
+    if (!collected) {
+        console.log(chalk_1.default.dim('\nCancelled.'));
+        return;
+    }
+    const { text, images } = collected;
+    // Show what was collected
+    console.log(chalk_1.default.dim(`\nPrompt: ${text.substring(0, 50)}${text.length > 50 ? '...' : ''}`));
+    if (images.length > 0) {
+        console.log(chalk_1.default.dim(`Images: ${images.length} file(s)`));
+    }
+    // Step 2: Select target (simplified menu since we have a specific prompt)
+    console.log(chalk_1.default.dim('\nFetching genboxes...'));
+    const genboxes = await getGenboxes(true);
+    const targetChoices = [];
+    // Running genboxes first (can upload immediately)
+    const runningGenboxes = genboxes.filter(g => g.status === 'running' && g.ipAddress);
+    const stoppedGenboxes = genboxes.filter(g => g.status === 'stopped');
+    if (runningGenboxes.length > 0) {
+        for (const g of runningGenboxes) {
+            const localLabel = g._isLocal ? chalk_1.default.yellow(' (local)') : '';
+            targetChoices.push({
+                name: `${chalk_1.default.green('●')} ${g.name}${localLabel} ${chalk_1.default.dim('- ready, can upload immediately')}`,
+                value: { type: 'genbox', genbox: g },
+            });
+        }
+    }
+    if (stoppedGenboxes.length > 0) {
+        for (const g of stoppedGenboxes) {
+            const localLabel = g._isLocal ? chalk_1.default.yellow(' (local)') : '';
+            targetChoices.push({
+                name: `${chalk_1.default.yellow('○')} ${g.name}${localLabel} ${chalk_1.default.dim('- will start, then upload')}`,
+                value: { type: 'genbox', genbox: g },
+            });
+        }
+    }
+    // Create new option
+    targetChoices.push({
+        name: chalk_1.default.dim('─────────────────────────────────────'),
+        value: { type: 'cancel' },
+        disabled: true,
+    });
+    targetChoices.push({
+        name: chalk_1.default.green('+') + ' Create new Genbox ' + chalk_1.default.dim('(will upload after creation)'),
+        value: { type: 'create-genbox' },
+    });
+    // Direct option (no upload needed)
+    if (images.length > 0) {
+        targetChoices.push({
+            name: chalk_1.default.dim('  Run directly (images stay local)'),
+            value: { type: 'direct' },
+        });
+    }
+    else {
+        targetChoices.push({
+            name: chalk_1.default.dim('  Run directly on this machine'),
+            value: { type: 'direct' },
+        });
+    }
+    targetChoices.push({
+        name: chalk_1.default.dim('  Cancel'),
+        value: { type: 'cancel' },
+    });
+    let targetAction;
+    try {
+        targetAction = await (0, select_1.default)({
+            message: 'Where should this run?',
+            choices: targetChoices.filter(c => !c.disabled),
+        });
+    }
+    catch {
+        console.log(chalk_1.default.dim('\nCancelled.'));
+        return;
+    }
+    // Step 3: Handle based on target
+    switch (targetAction.type) {
+        case 'genbox': {
+            const genbox = targetAction.genbox;
+            let finalPrompt;
+            if (images.length > 0) {
+                // Upload images to genbox (waits for ready if needed)
+                const uploadResult = await (0, interactive_prompt_1.uploadImagesToGenbox)(images, genbox, {
+                    showProgress: true,
+                    waitForReady: true,
+                });
+                if (uploadResult.errors.length > 0 && uploadResult.remotePaths.length === 0) {
+                    console.log(chalk_1.default.yellow('\nWarning: Could not upload images. Proceeding with prompt only.'));
+                    finalPrompt = text;
+                }
+                else {
+                    if (uploadResult.errors.length > 0) {
+                        console.log(chalk_1.default.yellow(`\nWarning: ${uploadResult.errors.length} image(s) failed to upload.`));
+                    }
+                    finalPrompt = (0, interactive_prompt_1.buildPromptWithImages)(text, uploadResult.remotePaths, { isRemote: true });
+                }
+            }
+            else {
+                finalPrompt = text;
+            }
+            // Start session with prompt
+            await startSessionOnGenbox(provider, genbox, { initialPrompt: finalPrompt });
+            break;
+        }
+        case 'create-genbox': {
+            // Use wizard to create genbox
+            const result = await (0, genbox_wizard_1.runCreateWizard)({
+                provider,
+                includeDirect: false,
+            });
+            if (!result.success || !result.genbox) {
+                console.log(chalk_1.default.dim('\nGenbox creation cancelled or failed.'));
+                return;
+            }
+            const genbox = result.genbox;
+            let finalPrompt;
+            if (images.length > 0) {
+                // Upload images to newly created genbox
+                const uploadResult = await (0, interactive_prompt_1.uploadImagesToGenbox)(images, genbox, {
+                    showProgress: true,
+                    waitForReady: true, // Wizard already waits, but just in case
+                });
+                if (uploadResult.remotePaths.length > 0) {
+                    finalPrompt = (0, interactive_prompt_1.buildPromptWithImages)(text, uploadResult.remotePaths, { isRemote: true });
+                }
+                else {
+                    console.log(chalk_1.default.yellow('\nWarning: Could not upload images. Proceeding with prompt only.'));
+                    finalPrompt = text;
+                }
+            }
+            else {
+                finalPrompt = text;
+            }
+            await startSessionOnGenbox(provider, genbox, { initialPrompt: finalPrompt });
+            break;
+        }
+        case 'direct': {
+            const proceed = await showDirectModeWarning();
+            if (!proceed) {
+                console.log(chalk_1.default.dim('\nCancelled.'));
+                return;
+            }
+            // Direct mode: use local paths
+            const finalPrompt = images.length > 0
+                ? (0, interactive_prompt_1.buildPromptWithImages)(text, images, { isRemote: false })
+                : text;
+            await startDirectSession(provider, { initialPrompt: finalPrompt });
+            break;
+        }
+        case 'cancel':
+            console.log(chalk_1.default.dim('\nCancelled.'));
+            break;
+    }
+}
 /**
  * Create list subcommand for a provider
  */
@@ -1196,9 +1408,13 @@ function createProviderCommand(provider) {
         .option('--on <genbox>', 'Use specific genbox')
         .option('--direct', 'Run directly on this machine (no isolation)')
         .option('-y, --yes', 'Skip confirmations')
+        .option('-p, --prompt-mode', 'Interactive prompt mode: compose prompt with optional images')
+        .option('-e, --editor', 'Use $EDITOR for prompt input (with -p)')
         .addHelpText('after', `
 Examples:
   gb ${provider}                        Interactive mode
+  gb ${provider} -p                     Prompt mode: inline multiline input
+  gb ${provider} -p -e                  Prompt mode: open $EDITOR for input
   gb ${provider} list                   List all ${provider} sessions
   gb ${provider} attach [session]       Attach to a session
   gb ${provider} stop [session]         Stop a session
@@ -1209,6 +1425,11 @@ Examples:
 `)
         .action(async (options) => {
         try {
+            // -p / --prompt-mode: Interactive prompt with optional images
+            if (options.promptMode) {
+                await runPromptModeFlow(provider, { useEditor: options.editor });
+                return;
+            }
             // --on: Use specific genbox
             if (options.on) {
                 const genboxes = await getGenboxes();

package/dist/commands/session/index.js

@@ -58,7 +58,6 @@ const local_orchestrator_1 = require("../../lib/local-orchestrator");
 const local_genbox_provisioner_1 = require("../../lib/local-genbox-provisioner");
 const hooks_configurator_1 = require("../../lib/hooks-configurator");
 const api_1 = require("../../api");
-const genbox_selector_1 = require("../../genbox-selector");
 const prompts_1 = require("@inquirer/prompts");
 const list_1 = require("./list");
 const start_1 = require("./start");
@@ -70,7 +69,7 @@ const child_process_1 = require("child_process");
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
-const image_upload_1 = require("../../utils/image-upload");
+const ssh_proxy_1 = require("../../utils/ssh-proxy");
 /**
  * Check if a command is available
  */
@@ -706,16 +705,9 @@ async function getAllGenboxesWithSessions(options) {
     }
     // Get cloud genboxes
     try {
-        // Fetch all genboxes and filter by project name (same approach as gb list)
+        // Fetch all genboxes (same approach as gb claude/gemini - no project filtering)
         const response = await (0, api_1.fetchApi)('/genboxes');
-        let genboxes = response || [];
-        // Filter by project name unless --all is specified
-        if (!options.all) {
-            const projectName = (0, genbox_selector_1.getProjectContext)();
-            if (projectName) {
-                genboxes = genboxes.filter(g => g.project === projectName || g.workspace === projectName);
-            }
-        }
+        const genboxes = response || [];
         for (const genbox of genboxes) {
             if (genbox.status !== 'running' || !genbox.ipAddress) {
                 continue;
@@ -884,19 +876,9 @@ async function attachToCloudSession(session) {
     const genboxName = session.genboxName || session.name;
     console.log(chalk_1.default.dim(`\nAttaching to ${session.name} on ${genboxName}...`));
     console.log(chalk_1.default.dim('Tip: Detach with Ctrl+\\'));
-    console.log('');
-    console.log(chalk_1.default.yellow('Image Upload Active') + chalk_1.default.dim(' - Cmd+C image file, auto-uploads, Cmd+V'));
-    console.log(chalk_1.default.dim('Setting up connection...\n'));
+    console.log(chalk_1.default.dim(`Image auto-upload: ${chalk_1.default.green('enabled')} - Paste local image paths, they'll be uploaded automatically\n`));
     // Ensure dtach is installed on remote
     const hasDtach = await ensureDtachInstalled(session.ipAddress, keyPath);
-    // Set up SSH multiplexing for faster uploads
-    (0, image_upload_1.setupSshMultiplexing)(session.ipAddress, keyPath);
-    // Start clipboard watcher
-    const clipboardInterval = (0, image_upload_1.startClipboardWatcher)({
-        ipAddress: session.ipAddress,
-        keyPath,
-        genboxName,
-    });
     // Build the remote command
     const socketDir = getRemoteDtachSocketDir();
     const socketPath = `${socketDir}/${session.name}.sock`;
@@ -914,19 +896,15 @@ async function attachToCloudSession(session) {
         // Fallback to direct execution (no persistence)
         remoteCmd = `bash -c '${cdToProject} source ~/.nvm/nvm.sh 2>/dev/null; ${cliCommand}'`;
     }
-    const sshArgs = [
-        '-t',
-        '-i', keyPath,
-        '-o', 'StrictHostKeyChecking=no',
-        '-o', 'UserKnownHostsFile=/dev/null',
-        `dev@${session.ipAddress}`,
-        remoteCmd
-    ];
-    const proc = (0, child_process_1.spawn)('ssh', sshArgs, { stdio: 'inherit' });
+    // Use SSH proxy with image interception
+    const proc = (0, ssh_proxy_1.createSshProxy)({
+        ipAddress: session.ipAddress,
+        keyPath,
+        genboxName,
+        command: remoteCmd,
+    });
     await new Promise((resolve) => {
         proc.on('close', (code) => {
-            // Stop clipboard watcher
-            clearInterval(clipboardInterval);
             if (code === 0) {
                 console.log(chalk_1.default.dim('\nDetached from session.'));
             }
@@ -965,23 +943,13 @@ async function attachToLocalGenboxSession(session) {
         }
         const keyPath = getPrivateSshKey();
         const genboxName = session.name;
-        console.log('');
-        console.log(chalk_1.default.yellow('Image Upload Active') + chalk_1.default.dim(' - Cmd+C image file, auto-uploads, Cmd+V'));
-        console.log(chalk_1.default.dim('Setting up connection...\n'));
+        console.log(chalk_1.default.dim(`Image auto-upload: ${chalk_1.default.green('enabled')} - Paste local image paths, they'll be uploaded automatically\n`));
         // Ensure dtach is installed on remote
         const hasDtach = await ensureDtachInstalled(vmIp, keyPath);
-        // Set up SSH multiplexing for faster uploads
-        (0, image_upload_1.setupSshMultiplexing)(vmIp, keyPath);
         // Detect provider from session name
         const isGemini = session.name.toLowerCase().includes('gemini');
         const provider = isGemini ? 'gemini' : 'claude';
         const cliCommand = isGemini ? 'gemini --yolo' : 'claude --dangerously-skip-permissions';
-        // Start clipboard watcher
-        const clipboardInterval = (0, image_upload_1.startClipboardWatcher)({
-            ipAddress: vmIp,
-            keyPath,
-            genboxName,
-        });
         // Build the remote command
         const socketDir = getRemoteDtachSocketDir();
         const socketPath = `${socketDir}/${provider}.sock`;
@@ -994,21 +962,15 @@ async function attachToLocalGenboxSession(session) {
         else {
             remoteCmd = `bash -c '${cdToProject} source ~/.nvm/nvm.sh 2>/dev/null; ${cliCommand}'`;
         }
-        // SSH into VM and attach/create dtach session
-        const sshArgs = [
-            '-t',
-            '-i', keyPath,
-            '-o', 'StrictHostKeyChecking=no',
-            '-o', 'UserKnownHostsFile=/dev/null',
-            '-o', 'LogLevel=ERROR',
-            `dev@${vmIp}`,
-            remoteCmd
-        ];
-        const proc = (0, child_process_1.spawn)('ssh', sshArgs, { stdio: 'inherit' });
+        // Use SSH proxy with image interception
+        const proc = (0, ssh_proxy_1.createSshProxy)({
+            ipAddress: vmIp,
+            keyPath,
+            genboxName,
+            command: remoteCmd,
+        });
         await new Promise((resolve) => {
             proc.on('close', () => {
-                // Stop clipboard watcher
-                clearInterval(clipboardInterval);
                 console.log(chalk_1.default.dim('\nDetached from session.'));
                 resolve();
             });
@@ -1220,68 +1182,37 @@ async function attachToGenboxSession(genbox, sessionName) {
                 return;
             }
             const keyPath = getPrivateSshKey();
-            console.log('');
-            console.log(chalk_1.default.yellow('Image Upload Active') + chalk_1.default.dim(' - Cmd+C image file, auto-uploads, Cmd+V'));
-            console.log(chalk_1.default.dim('Setting up connection...\n'));
+            console.log(chalk_1.default.dim(`Image auto-upload: ${chalk_1.default.green('enabled')} - Paste local image paths, they'll be uploaded automatically\n`));
             // Ensure dtach is installed
             await ensureDtachInstalled(vmIp, keyPath);
-            // Set up SSH multiplexing for faster uploads
-            (0, image_upload_1.setupSshMultiplexing)(vmIp, keyPath);
-            // Start clipboard watcher
-            const clipboardInterval = (0, image_upload_1.startClipboardWatcher)({
+            const socketDir = getRemoteDtachSocketDir();
+            const socketPath = `${socketDir}/${sessionName}.sock`;
+            // Use SSH proxy with image interception for dtach attach
+            const proc = (0, ssh_proxy_1.attachWithProxy)({
                 ipAddress: vmIp,
                 keyPath,
                 genboxName: genbox.name,
+                socketPath,
             });
-            const socketDir = getRemoteDtachSocketDir();
-            const socketPath = `${socketDir}/${sessionName}.sock`;
-            const sshArgs = [
-                '-t',
-                '-i', keyPath,
-                '-o', 'StrictHostKeyChecking=no',
-                '-o', 'UserKnownHostsFile=/dev/null',
-                '-o', 'LogLevel=ERROR',
-                `dev@${vmIp}`,
-                `dtach -a ${socketPath}`
-            ];
-            const proc = (0, child_process_1.spawn)('ssh', sshArgs, { stdio: 'inherit' });
-            await new Promise(resolve => proc.on('close', () => {
-                clearInterval(clipboardInterval);
-                resolve();
-            }));
+            await new Promise(resolve => proc.on('close', () => resolve()));
             console.log(chalk_1.default.dim('\nDetached from session.'));
         }
     }
     else if (genbox.type === 'cloud' && genbox.ipAddress) {
         const keyPath = getPrivateSshKey();
-        console.log('');
-        console.log(chalk_1.default.yellow('Image Upload Active') + chalk_1.default.dim(' - Cmd+C image file, auto-uploads, Cmd+V'));
-        console.log(chalk_1.default.dim('Setting up connection...\n'));
+        console.log(chalk_1.default.dim(`Image auto-upload: ${chalk_1.default.green('enabled')} - Paste local image paths, they'll be uploaded automatically\n`));
         // Ensure dtach is installed
         await ensureDtachInstalled(genbox.ipAddress, keyPath);
-        // Set up SSH multiplexing for faster uploads
-        (0, image_upload_1.setupSshMultiplexing)(genbox.ipAddress, keyPath);
-        // Start clipboard watcher
-        const clipboardInterval = (0, image_upload_1.startClipboardWatcher)({
+        const socketDir = getRemoteDtachSocketDir();
+        const socketPath = `${socketDir}/${sessionName}.sock`;
+        // Use SSH proxy with image interception for dtach attach
+        const proc = (0, ssh_proxy_1.attachWithProxy)({
             ipAddress: genbox.ipAddress,
             keyPath,
             genboxName: genbox.name,
+            socketPath,
         });
-        const socketDir = getRemoteDtachSocketDir();
-        const socketPath = `${socketDir}/${sessionName}.sock`;
-        const sshArgs = [
-            '-t',
-            '-i', keyPath,
-            '-o', 'StrictHostKeyChecking=no',
-            '-o', 'UserKnownHostsFile=/dev/null',
-            `dev@${genbox.ipAddress}`,
-            `dtach -a ${socketPath}`
-        ];
-        const proc = (0, child_process_1.spawn)('ssh', sshArgs, { stdio: 'inherit' });
-        await new Promise(resolve => proc.on('close', () => {
-            clearInterval(clipboardInterval);
-            resolve();
-        }));
+        await new Promise(resolve => proc.on('close', () => resolve()));
         console.log(chalk_1.default.dim('\nDetached from session.'));
     }
 }
@@ -1333,36 +1264,20 @@ async function createNewSessionInGenbox(genbox) {
             console.log(chalk_1.default.green(`Session created: ${sessionName}`));
             console.log(chalk_1.default.dim('\nAttaching to session...'));
             console.log(chalk_1.default.dim('Tip: Detach with Ctrl+\\'));
-            console.log('');
-            console.log(chalk_1.default.yellow('Image Upload Active') + chalk_1.default.dim(' - Cmd+C image file, auto-uploads, Cmd+V'));
-            console.log(chalk_1.default.dim('Setting up connection...\n'));
-            // Set up SSH multiplexing for faster uploads
-            (0, image_upload_1.setupSshMultiplexing)(vmIp, keyPath);
-            // Start clipboard watcher
-            const clipboardInterval = (0, image_upload_1.startClipboardWatcher)({
-                ipAddress: vmIp,
-                keyPath,
-                genboxName: genbox.name,
-            });
-            // Create and attach to dtach session
+            console.log(chalk_1.default.dim(`Image auto-upload: ${chalk_1.default.green('enabled')} - Paste local image paths, they'll be uploaded automatically\n`));
+            // Create and attach to dtach session with image interception
             // Note: We use grep to extract GENBOX_PROJECT_DIR from .bashrc since .bashrc may have early return for non-interactive shells
             const socketDir = getRemoteDtachSocketDir();
             const socketPath = `${socketDir}/${sessionName}.sock`;
             const cdToProjectCmd = 'eval $(grep GENBOX_PROJECT_DIR ~/.bashrc 2>/dev/null); cd $GENBOX_PROJECT_DIR 2>/dev/null;';
-            const sshArgs = [
-                '-t',
-                '-i', keyPath,
-                '-o', 'StrictHostKeyChecking=no',
-                '-o', 'UserKnownHostsFile=/dev/null',
-                '-o', 'LogLevel=ERROR',
-                `dev@${vmIp}`,
-                `mkdir -p ${socketDir} && dtach -A ${socketPath} bash -c '${cdToProjectCmd} source ~/.nvm/nvm.sh 2>/dev/null; ${cliCommand}'`
-            ];
-            const proc = (0, child_process_1.spawn)('ssh', sshArgs, { stdio: 'inherit' });
-            await new Promise(resolve => proc.on('close', () => {
-                clearInterval(clipboardInterval);
-                resolve();
-            }));
+            const remoteCmd = `mkdir -p ${socketDir} && dtach -A ${socketPath} bash -c '${cdToProjectCmd} source ~/.nvm/nvm.sh 2>/dev/null; ${cliCommand}'`;
+            const proc = (0, ssh_proxy_1.createSshProxy)({
+                ipAddress: vmIp,
+                keyPath,
+                genboxName: genbox.name,
+                command: remoteCmd,
+            });
+            await new Promise(resolve => proc.on('close', () => resolve()));
             console.log(chalk_1.default.dim('\nDetached from session.'));
         }
     }
@@ -1373,35 +1288,20 @@ async function createNewSessionInGenbox(genbox) {
         console.log(chalk_1.default.green(`Session created: ${sessionName}`));
         console.log(chalk_1.default.dim('\nAttaching to session...'));
         console.log(chalk_1.default.dim('Tip: Detach with Ctrl+\\'));
-        console.log('');
-        console.log(chalk_1.default.yellow('Image Upload Active') + chalk_1.default.dim(' - Cmd+C image file, auto-uploads, Cmd+V'));
-        console.log(chalk_1.default.dim('Setting up connection...\n'));
-        // Set up SSH multiplexing for faster uploads
-        (0, image_upload_1.setupSshMultiplexing)(genbox.ipAddress, keyPath);
-        // Start clipboard watcher
-        const clipboardInterval = (0, image_upload_1.startClipboardWatcher)({
-            ipAddress: genbox.ipAddress,
-            keyPath,
-            genboxName: genbox.name,
-        });
-        // Create and attach to dtach session
+        console.log(chalk_1.default.dim(`Image auto-upload: ${chalk_1.default.green('enabled')} - Paste local image paths, they'll be uploaded automatically\n`));
+        // Create and attach to dtach session with image interception
         // Note: We use grep to extract GENBOX_PROJECT_DIR from .bashrc since .bashrc may have early return for non-interactive shells
         const socketDir = getRemoteDtachSocketDir();
         const socketPath = `${socketDir}/${sessionName}.sock`;
         const cdToProjectCmd = 'eval $(grep GENBOX_PROJECT_DIR ~/.bashrc 2>/dev/null); cd $GENBOX_PROJECT_DIR 2>/dev/null;';
-        const sshArgs = [
-            '-t',
-            '-i', keyPath,
-            '-o', 'StrictHostKeyChecking=no',
-            '-o', 'UserKnownHostsFile=/dev/null',
-            `dev@${genbox.ipAddress}`,
-            `mkdir -p ${socketDir} && dtach -A ${socketPath} bash -c '${cdToProjectCmd} source ~/.nvm/nvm.sh 2>/dev/null; ${cliCommand}'`
-        ];
-        const proc = (0, child_process_1.spawn)('ssh', sshArgs, { stdio: 'inherit' });
-        await new Promise(resolve => proc.on('close', () => {
-            clearInterval(clipboardInterval);
-            resolve();
-        }));
+        const remoteCmd = `mkdir -p ${socketDir} && dtach -A ${socketPath} bash -c '${cdToProjectCmd} source ~/.nvm/nvm.sh 2>/dev/null; ${cliCommand}'`;
+        const proc = (0, ssh_proxy_1.createSshProxy)({
+            ipAddress: genbox.ipAddress,
+            keyPath,
+            genboxName: genbox.name,
+            command: remoteCmd,
+        });
+        await new Promise(resolve => proc.on('close', () => resolve()));
         console.log(chalk_1.default.dim('\nDetached from session.'));
     }
 }