genbox 1.0.207 → 1.0.209

package/dist/commands/connect.js

@@ -42,6 +42,7 @@ const chalk_1 = __importDefault(require("chalk"));
 const api_1 = require("../api");
 const genbox_selector_1 = require("../genbox-selector");
 const ssh_config_1 = require("../ssh-config");
+const ssh_proxy_1 = require("../utils/ssh-proxy");
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
@@ -85,14 +86,14 @@ exports.connectCommand = new commander_1.Command('connect')
                 (0, ssh_config_1.addSshConfigEntry)({ name: localSession.name, ipAddress: localSession.ipAddress });
             }
             console.log(chalk_1.default.dim(`Connecting to local VM ${chalk_1.default.bold(localSession.name)} (${localSession.ipAddress})...`));
+            console.log(chalk_1.default.dim(`  Image auto-upload: ${chalk_1.default.green('enabled')} - Paste local image paths, they'll be uploaded automatically`));
             console.log(chalk_1.default.dim(`  You can also use: ssh genbox-${localSession.name}`));
-            const sshArgs = [
-                '-i', keyPath,
-                '-o', 'StrictHostKeyChecking=no',
-                '-o', 'UserKnownHostsFile=/dev/null',
-                `dev@${localSession.ipAddress}`
-            ];
-            const ssh = (0, child_process_1.spawn)('ssh', sshArgs, { stdio: 'inherit' });
+            // Use SSH proxy with input interception for automatic image uploads
+            const ssh = (0, ssh_proxy_1.createSshProxy)({
+                ipAddress: localSession.ipAddress,
+                keyPath,
+                genboxName: localSession.name,
+            });
             ssh.on('close', (code) => {
                 if (code !== 0) {
                     console.log(chalk_1.default.dim(`Connection closed with code ${code}`));
@@ -129,15 +130,14 @@ exports.connectCommand = new commander_1.Command('connect')
         }
         // 3. Get Key
         const keyPath = getPrivateSshKey();
-        // 4. Connect
+        // 4. Connect via SSH proxy with input interception for automatic image uploads
         console.log(chalk_1.default.dim(`Connecting to ${chalk_1.default.bold(target.name)} (${target.ipAddress})...`));
-        const sshArgs = [
-            '-i', keyPath,
-            '-o', 'StrictHostKeyChecking=no',
-            '-o', 'UserKnownHostsFile=/dev/null',
-            `dev@${target.ipAddress}`
-        ];
-        const ssh = (0, child_process_1.spawn)('ssh', sshArgs, { stdio: 'inherit' });
+        console.log(chalk_1.default.dim(`  Image auto-upload: ${chalk_1.default.green('enabled')} - Paste local image paths, they'll be uploaded automatically`));
+        const ssh = (0, ssh_proxy_1.createSshProxy)({
+            ipAddress: target.ipAddress,
+            keyPath,
+            genboxName: target.name,
+        });
         ssh.on('close', (code) => {
             if (code !== 0) {
                 console.log(chalk_1.default.dim(`Connection closed with code ${code}`));

package/dist/commands/provider-command.js

@@ -58,9 +58,11 @@ const select_1 = __importDefault(require("@inquirer/select"));
 const prompts_1 = require("@inquirer/prompts");
 const api_1 = require("../api");
 const ssh_keys_1 = require("../utils/ssh-keys");
+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"));
@@ -441,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 = [];
@@ -481,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'
@@ -587,19 +592,23 @@ exec ${cliCommand}
     // Wait for session to start
     await new Promise(resolve => setTimeout(resolve, 1000));
     console.log(chalk_1.default.green(`Session created: ${sessionName}`));
+    console.log(chalk_1.default.dim(`Image auto-upload: ${chalk_1.default.green('enabled')} - Paste local image paths, they'll be uploaded automatically`));
     console.log(chalk_1.default.dim('Tip: Detach with Ctrl+\\\n'));
-    // Attach to session
-    const sshArgs = [
-        '-t',
-        ...sshPortArgs,
-        '-i', keyPath,
-        '-o', 'StrictHostKeyChecking=no',
-        '-o', 'UserKnownHostsFile=/dev/null',
-        '-o', 'LogLevel=ERROR',
-        sshTarget,
-        `dtach -a ${socketPath}`,
-    ];
-    const proc = (0, child_process_1.spawn)('ssh', sshArgs, { stdio: 'inherit' });
+    // Attach to session using SSH proxy with image path interception
+    // Extract IP address from sshTarget (format: dev@IP or dev@localhost)
+    const attachIpAddress = sshTarget.split('@')[1];
+    // Get port from sshPortArgs if it's a Docker container
+    const sshPort = sshPortArgs.length >= 2 ? parseInt(sshPortArgs[1], 10) : undefined;
+    const proc = (0, ssh_proxy_1.attachWithProxy)({
+        ipAddress: attachIpAddress === 'localhost' ? '127.0.0.1' : attachIpAddress,
+        keyPath,
+        genboxName: targetGenbox.name,
+        socketPath,
+        user: 'dev',
+        port: sshPort,
+        verbose: true,
+        initialPrompt, // Inject prompt after connection
+    });
     await new Promise(resolve => proc.on('close', () => resolve()));
     console.log(chalk_1.default.dim('\nDetached from session.'));
     console.log(chalk_1.default.dim(`Reattach with: ${chalk_1.default.cyan(`gb ${provider} --attach ${sessionName}`)}`));
@@ -618,22 +627,20 @@ async function attachToSession(session) {
         console.log(chalk_1.default.dim('\nDetached from session.'));
     }
     else {
-        // Cloud genbox session
+        // Cloud genbox session - use SSH proxy with image path interception
         const keyPath = requireSshKey();
         const remoteSocketDir = getRemoteDtachSocketDir();
         const socketPath = `${remoteSocketDir}/${session.name}.sock`;
         console.log(chalk_1.default.dim(`\nAttaching to ${session.name} on ${session.genboxName}...`));
+        console.log(chalk_1.default.dim(`Image auto-upload: ${chalk_1.default.green('enabled')} - Paste local image paths, they'll be uploaded automatically`));
         console.log(chalk_1.default.dim('Tip: Detach with Ctrl+\\\n'));
-        const sshArgs = [
-            '-t',
-            '-i', keyPath,
-            '-o', 'StrictHostKeyChecking=no',
-            '-o', 'UserKnownHostsFile=/dev/null',
-            '-o', 'LogLevel=ERROR',
-            `dev@${session.ipAddress}`,
-            `dtach -a ${socketPath}`,
-        ];
-        const proc = (0, child_process_1.spawn)('ssh', sshArgs, { stdio: 'inherit' });
+        const proc = (0, ssh_proxy_1.attachWithProxy)({
+            ipAddress: session.ipAddress,
+            keyPath,
+            genboxName: session.genboxName,
+            socketPath,
+            user: 'dev',
+        });
         await new Promise(resolve => proc.on('close', () => resolve()));
         console.log(chalk_1.default.dim('\nDetached from session.'));
     }
@@ -675,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') {
@@ -693,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'
@@ -722,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)) {
@@ -892,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
  */
@@ -1194,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
@@ -1207,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();