genbox 1.0.177 → 1.0.179

package/dist/api.js

@@ -58,6 +58,7 @@ async function fetchApi(endpoint, options = {}) {
     const token = config_store_1.ConfigStore.getToken();
     const headers = {
         'Content-Type': 'application/json',
+        'Connection': 'close', // Ensure connection closes after request (prevents node from hanging)
         ...options.headers,
     };
     if (token) {
@@ -69,14 +70,25 @@ async function fetchApi(endpoint, options = {}) {
         console.log(chalk_1.default.dim(`[API DEBUG] POST ${endpoint}`));
         console.log(chalk_1.default.dim(`[API DEBUG] repos: ${JSON.stringify(bodyObj.repos, null, 2)}`));
     }
+    // Extract custom timeout, default to 15s for mutations, can be lower for reads
+    const { timeout = 15000, ...fetchOptions } = options;
     let response;
     try {
+        // Add timeout to prevent hanging on network issues
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => controller.abort(), timeout);
         response = await fetch(url, {
-            ...options,
+            ...fetchOptions,
             headers,
+            signal: controller.signal,
         });
+        clearTimeout(timeoutId);
     }
     catch (error) {
+        // Handle timeout
+        if (error.name === 'AbortError') {
+            throw new Error(`Request to Genbox API timed out. Check your internet connection.`);
+        }
         // Handle network-level errors (DNS, connection refused, timeout, etc.)
         if (error.cause?.code === 'ECONNREFUSED') {
             throw new Error(`Cannot connect to Genbox API at ${API_URL}. Is the server running?`);

package/dist/commands/attach.js

@@ -377,30 +377,30 @@ function getPrivateSshKey() {
     }
     throw new Error('No SSH private key found in ~/.ssh/');
 }
-// Tmux configuration for genbox branding and native terminal feel
+// Minimal tmux config - session management only, no extra features
 const TMUX_CONFIG = `
-# Mouse support for scrolling
-set -g mouse on
-
-# Large scrollback history
-set -g history-limit 50000
+# Extended keys (REQUIRED for Shift+Enter in Claude Code)
+set -s extended-keys on
+set -s extended-keys-format csi-u
+set -g extended-keys always
+set -as terminal-features 'xterm*:extkeys'
 
-# No delay for escape key
+# No escape delay (for vim mode)
 set -g escape-time 0
 
-# Status bar styling - yellow genbox branding
+# Mouse scroll: pass to app if in alternate screen (Claude), else copy-mode
+set -g mouse on
+bind -n WheelUpPane if-shell -F "#{alternate_on}" "send-keys -M" "copy-mode -e; send-keys -M"
+bind -n WheelDownPane send-keys -M
+
+# Status bar for Genbox branding and image upload messages
 set -g status on
 set -g status-position bottom
-set -g status-style 'bg=#f59e0b fg=#000000'
-set -g status-left '#[bg=#000000,fg=#f59e0b,bold]  GENBOX #[bg=#f59e0b,fg=#000000] #H '
+set -g status-style 'bg=#2d2d2d fg=#888888'
+set -g status-left '#[fg=#888888,bold] GENBOX #[default] #H '
 set -g status-left-length 30
-set -g status-right '#[fg=#000000] %H:%M '
+set -g status-right '#[fg=#666666] %H:%M '
 set -g status-right-length 20
-
-# Window styling
-set -g window-status-current-style 'bg=#000000,fg=#f59e0b,bold'
-set -g window-status-current-format ' #W '
-set -g window-status-format ' #W '
 `.trim();
 async function listTmuxSessions(ipAddress, keyPath) {
     try {

package/dist/commands/connect.js

@@ -78,7 +78,30 @@ exports.connectCommand = new commander_1.Command('connect')
         if (!target) {
             return;
         }
-        // Handle local genbox - attach to session
+        // Handle local genbox with VM (multipass isolation) - SSH into VM
+        if (isLocal && localSession && localSession.isolation === 'multipass' && localSession.ipAddress) {
+            const keyPath = getPrivateSshKey();
+            // Add SSH config for easy access (addSshConfigEntry adds genbox- prefix)
+            if (!(0, ssh_config_1.hasSshConfigEntry)(localSession.name)) {
+                (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(`  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' });
+            ssh.on('close', (code) => {
+                if (code !== 0) {
+                    console.log(chalk_1.default.dim(`Connection closed with code ${code}`));
+                }
+            });
+            return;
+        }
+        // Handle local genbox without VM - attach to session
         if (isLocal && localSession) {
             console.log(chalk_1.default.dim(`Attaching to local genbox ${chalk_1.default.bold(localSession.name)}...`));
             const manager = (0, local_session_manager_1.getLocalSessionManager)();

package/dist/commands/create.js

@@ -46,6 +46,7 @@ const path = __importStar(require("path"));
 const child_process_1 = require("child_process");
 const config_loader_1 = require("../config-loader");
 const local_session_manager_1 = require("../lib/local-session-manager");
+const local_genbox_provisioner_1 = require("../lib/local-genbox-provisioner");
 const profile_resolver_1 = require("../profile-resolver");
 const api_1 = require("../api");
 const ssh_config_1 = require("../ssh-config");
@@ -329,28 +330,243 @@ async function promptForProfile(profiles) {
 }
 /**
  * Create a local genbox (Docker container or VM)
- * This creates the infrastructure without starting a session
+ * Supports two modes:
+ * 1. Full replica mode (if genbox.yaml exists): Uses same config as cloud
+ * 2. Simple mode: Just container/VM with mounted folder
  */
 async function createLocalGenbox(nameArg, options) {
+    // Check if genbox.yaml exists for full replica mode
+    const configLoader = new config_loader_1.ConfigLoader();
+    const loadResult = await configLoader.load();
+    if (loadResult.config) {
+        // Full replica mode - use genbox.yaml configuration
+        await createLocalGenboxFullReplica(nameArg, options, loadResult.config, configLoader);
+    }
+    else {
+        // Simple mode - no genbox.yaml
+        await createLocalGenboxSimple(nameArg, options);
+    }
+}
+/**
+ * Create a full replica local genbox using genbox.yaml configuration
+ */
+async function createLocalGenboxFullReplica(nameArg, options, config, configLoader) {
+    console.log('');
+    console.log(chalk_1.default.blue('=== Create Local Genbox (Full Replica) ==='));
+    console.log(chalk_1.default.dim('Using genbox.yaml configuration'));
+    console.log('');
+    // Interactive name prompt if not provided
+    let name = nameArg;
+    if (!name && !options.yes) {
+        name = await promptForName(false);
+    }
+    else if (!name && options.yes) {
+        name = (0, random_name_1.generateRandomName)();
+    }
+    // Prompt for profile if available and not specified
+    let selectedProfile = options.profile;
+    if (!selectedProfile && !options.yes && config.profiles && Object.keys(config.profiles).length > 0) {
+        selectedProfile = await promptForProfile(config.profiles);
+    }
+    // Resolve profile and configuration
+    const profileResolver = new profile_resolver_1.ProfileResolver(configLoader);
+    const createOptions = {
+        name: name,
+        profile: selectedProfile,
+        apps: options.apps ? options.apps.split(',').map((a) => a.trim()) : undefined,
+        addApps: options.addApps ? options.addApps.split(',').map((a) => a.trim()) : undefined,
+        api: options.api,
+        db: options.db,
+        dbSource: options.dbSource,
+        size: options.size,
+        branch: options.branch,
+        newBranch: options.newBranch,
+        sourceBranch: options.fromBranch,
+        yes: options.yes,
+    };
+    const resolved = await profileResolver.resolve(config, createOptions);
+    // Check system resources
+    const provisioner = (0, local_genbox_provisioner_1.getLocalGenboxProvisioner)();
+    const requirements = provisioner.calculateRequirements(resolved);
+    const resourceCheck = provisioner.checkResourceAvailability(requirements);
+    // Display configuration
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    console.log(`  ${chalk_1.default.bold('Name:')}        ${name}`);
+    console.log(`  ${chalk_1.default.bold('Project:')}     ${resolved.project.name}`);
+    console.log(`  ${chalk_1.default.bold('Size:')}        ${resolved.size}`);
+    console.log(`  ${chalk_1.default.bold('Apps:')}        ${resolved.apps.map(a => a.name).join(', ') || 'none'}`);
+    // Show repos that will be cloned (like cloud)
+    if (resolved.repos && resolved.repos.length > 0) {
+        console.log(`  ${chalk_1.default.bold('Repos:')}       ${resolved.repos.map(r => r.name).join(', ')}`);
+    }
+    const localInfra = resolved.infrastructure.filter(i => i.mode === 'local');
+    if (localInfra.length > 0) {
+        console.log(`  ${chalk_1.default.bold('Infra:')}       ${localInfra.map(i => i.name).join(', ')}`);
+    }
+    console.log(`  ${chalk_1.default.bold('Database:')}    ${resolved.database.mode}${resolved.database.source ? ` (${resolved.database.source})` : ''}`);
+    console.log(`  ${chalk_1.default.bold('Directory:')}   ${process.cwd()}`);
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    // Show resource warnings
+    if (resourceCheck.warnings.length > 0) {
+        console.log('');
+        console.log(chalk_1.default.yellow('Resource warnings:'));
+        for (const warning of resourceCheck.warnings) {
+            console.log(chalk_1.default.yellow(`  - ${warning}`));
+        }
+    }
+    // Confirm
+    if (!options.yes) {
+        console.log('');
+        const confirm = await prompts.confirm({
+            message: `Create local genbox '${name}'?`,
+            default: true,
+        });
+        if (!confirm) {
+            console.log(chalk_1.default.dim('Cancelled.'));
+            return;
+        }
+    }
+    console.log('');
+    // Load GIT_TOKEN for git clone (like cloud)
+    const envVars = configLoader.loadEnvVars(process.cwd());
+    // Provision
+    const result = await provisioner.provision({
+        name: name,
+        workdir: process.cwd(),
+        resolvedConfig: resolved,
+        isolation: options.vm ? 'multipass' : options.native ? 'native' : 'docker',
+        skipInstall: options.skipInstall,
+        skipApps: false,
+        skipDatabase: false,
+        gitToken: envVars.GIT_TOKEN, // For git clone in VM
+        onProgress: (msg) => console.log(msg),
+    });
+    if (!result.success) {
+        console.error(chalk_1.default.red(`\nFailed: ${result.message}`));
+        return;
+    }
+    const session = result.session;
+    // Display result
+    console.log('');
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    console.log(`  ${chalk_1.default.bold('Name:')}       ${session.name}`);
+    console.log(`  ${chalk_1.default.bold('ID:')}         ${session.id}`);
+    console.log(`  ${chalk_1.default.bold('Size:')}       ${session.size}`);
+    if (session.infrastructure.length > 0) {
+        console.log(`  ${chalk_1.default.bold('Infra:')}      ${session.infrastructure.map(i => `${i.name}:${i.port}`).join(', ')}`);
+    }
+    if (session.apps.length > 0) {
+        const running = session.apps.filter(a => a.status === 'running');
+        console.log(`  ${chalk_1.default.bold('Apps:')}       ${running.length}/${session.apps.length} running`);
+    }
+    if (session.domain) {
+        console.log(`  ${chalk_1.default.bold('Domain:')}     ${chalk_1.default.cyan(session.domain)}`);
+    }
+    if (session.database.seeded) {
+        console.log(`  ${chalk_1.default.bold('Database:')}   ${chalk_1.default.green('seeded')} (${session.database.mode})`);
+    }
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    console.log('');
+    console.log(chalk_1.default.bold('Next steps:'));
+    console.log(`  Status:   ${chalk_1.default.cyan(`gb status ${session.name}`)}`);
+    console.log(`  Destroy:  ${chalk_1.default.cyan(`gb destroy ${session.name}`)}`);
+    if (session.previewUrl) {
+        console.log('');
+        console.log(chalk_1.default.dim(`  Preview:  ${chalk_1.default.cyan(session.previewUrl)}`));
+    }
+    // Show infrastructure URLs
+    if (session.infrastructure.length > 0) {
+        console.log('');
+        console.log(chalk_1.default.bold('Infrastructure:'));
+        for (const infra of session.infrastructure) {
+            console.log(`  ${infra.name}: ${chalk_1.default.dim(infra.url)}`);
+        }
+    }
+    console.log('');
+}
+/**
+ * Create a simple local genbox (no genbox.yaml)
+ * By default creates an isolated session with git worktree
+ */
+async function createLocalGenboxSimple(nameArg, options) {
     const manager = (0, local_session_manager_1.getLocalSessionManager)();
     const provider = options.gemini ? 'gemini' : 'claude';
     const isolation = options.vm ? 'multipass' : options.native ? 'native' : 'docker';
+    const useWorktree = !options.noWorktree && isolation !== 'native';
+    // Interactive name prompt if not provided (same as cloud flow)
+    let name = nameArg;
+    if (!name && !options.yes) {
+        console.log('');
+        console.log(chalk_1.default.blue('=== Create Local Genbox ==='));
+        console.log(chalk_1.default.dim('No genbox.yaml found - using simple mode'));
+        console.log('');
+        name = await promptForName(false);
+    }
+    else if (!name && options.yes) {
+        // Auto-generate name in non-interactive mode
+        name = (0, random_name_1.generateRandomName)();
+    }
+    // Native mode doesn't support worktrees
+    if (options.native && !options.noWorktree) {
+        console.log(chalk_1.default.yellow('Note: Native mode does not support isolated worktrees.'));
+        console.log(chalk_1.default.dim('Use --vm or default Docker mode for isolated development.'));
+        console.log('');
+    }
     console.log('');
-    console.log(chalk_1.default.blue('=== Creating Local Genbox ==='));
-    console.log('');
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    console.log(`  ${chalk_1.default.bold('Name:')}      ${name}`);
     console.log(`  ${chalk_1.default.bold('Type:')}      ${isolation}`);
     console.log(`  ${chalk_1.default.bold('Provider:')}  ${provider}`);
     console.log(`  ${chalk_1.default.bold('Directory:')} ${process.cwd()}`);
+    if (useWorktree && manager.isGitRepo(process.cwd())) {
+        const branchName = options.branch || name;
+        console.log(`  ${chalk_1.default.bold('Isolation:')} Git worktree (branch: ${branchName})`);
+    }
+    else {
+        console.log(`  ${chalk_1.default.bold('Isolation:')} Mounted folder (shared)`);
+    }
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
     console.log('');
-    const spinner = (0, ora_1.default)(`Creating ${isolation} environment...`).start();
     try {
-        const session = await manager.createSession({
-            provider,
-            isolation,
-            workdir: process.cwd(),
-            name: nameArg, // Use provided name if any
-        });
-        spinner.succeed(chalk_1.default.green('Local genbox created!'));
+        let session;
+        if (useWorktree && manager.isGitRepo(process.cwd())) {
+            // Create isolated session with worktree
+            console.log(chalk_1.default.dim('Creating isolated development environment...'));
+            console.log('');
+            session = await manager.createIsolatedSession({
+                provider,
+                isolation: isolation,
+                workdir: process.cwd(),
+                name,
+                branch: options.branch || name,
+                sourceBranch: options.fromBranch,
+                appPort: options.port ? parseInt(options.port, 10) : 3000,
+                appName: options.appName || 'web',
+                installDeps: !options.skipInstall,
+            });
+        }
+        else {
+            // Create simple session (mounted folder, no worktree)
+            if (useWorktree && !manager.isGitRepo(process.cwd())) {
+                console.log(chalk_1.default.yellow('Note: Not a git repository. Using mounted folder instead of worktree.'));
+                console.log(chalk_1.default.dim('Initialize git to enable isolated development with worktrees.'));
+                console.log('');
+            }
+            const spinner = (0, ora_1.default)(`Creating ${isolation} environment...`).start();
+            try {
+                session = await manager.createSession({
+                    provider,
+                    isolation,
+                    workdir: process.cwd(),
+                    name,
+                });
+                spinner.succeed(chalk_1.default.green('Local genbox created!'));
+            }
+            catch (err) {
+                spinner.fail(chalk_1.default.red('Failed to create environment'));
+                throw err;
+            }
+        }
         console.log('');
         console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
         console.log(`  ${chalk_1.default.bold('Name:')}       ${session.name}`);
@@ -358,6 +574,15 @@ async function createLocalGenbox(nameArg, options) {
         console.log(`  ${chalk_1.default.bold('Provider:')}   ${session.provider}`);
         console.log(`  ${chalk_1.default.bold('Isolation:')}  ${session.isolation}`);
         console.log(`  ${chalk_1.default.bold('Status:')}     ${chalk_1.default.green(session.status)}`);
+        if (session.worktreeBranch) {
+            console.log(`  ${chalk_1.default.bold('Branch:')}     ${session.worktreeBranch}`);
+        }
+        if (session.worktreePath) {
+            console.log(`  ${chalk_1.default.bold('Worktree:')}   ${chalk_1.default.dim(session.worktreePath)}`);
+        }
+        if (session.domain) {
+            console.log(`  ${chalk_1.default.bold('Domain:')}     ${chalk_1.default.cyan(session.domain)}`);
+        }
         if (session.containerId) {
             console.log(`  ${chalk_1.default.bold('Container:')}  ${session.containerId.slice(0, 12)}`);
         }
@@ -366,22 +591,38 @@ async function createLocalGenbox(nameArg, options) {
         }
         console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
         console.log('');
+        // Show domain setup hint if using worktree
+        if (session.domain) {
+            console.log(chalk_1.default.yellow('DNS Setup Required:'));
+            console.log(chalk_1.default.dim(`  Add to /etc/hosts: ${chalk_1.default.cyan(`127.0.0.1 ${session.domain}`)}`));
+            console.log(chalk_1.default.dim(`  Or run: ${chalk_1.default.cyan('gb setup-local')} for automatic proxy setup`));
+            console.log('');
+        }
         console.log(chalk_1.default.bold('Next steps:'));
         console.log(`  Attach:   ${chalk_1.default.cyan(`gb session ${session.name}`)}`);
-        console.log(`  List:     ${chalk_1.default.cyan('gb session list')}`);
-        console.log(`  Stop:     ${chalk_1.default.cyan(`gb session stop ${session.name}`)}`);
-        console.log(`  Destroy:  ${chalk_1.default.cyan(`gb session kill ${session.name}`)}`);
+        console.log(`  Connect:  ${chalk_1.default.cyan(`gb connect ${session.name}`)}`);
+        console.log(`  Status:   ${chalk_1.default.cyan(`gb status ${session.name}`)}`);
+        console.log(`  Destroy:  ${chalk_1.default.cyan(`gb destroy ${session.name}`)}`);
+        if (session.domain) {
+            console.log('');
+            console.log(chalk_1.default.dim(`  Preview:  ${chalk_1.default.cyan(`https://${session.domain}`)}`));
+            console.log(chalk_1.default.dim(`            or ${chalk_1.default.cyan(`http://localhost:${session.ports.preview}`)}`));
+        }
         console.log('');
     }
     catch (error) {
-        spinner.fail(chalk_1.default.red(`Failed to create local genbox: ${error.message}`));
+        console.error(chalk_1.default.red(`Failed to create local genbox: ${error.message}`));
         if (error.message.includes('Docker')) {
             console.log('');
             console.log(chalk_1.default.yellow('Tip: Make sure Docker Desktop is running.'));
         }
         if (error.message.includes('multipass')) {
             console.log('');
-            console.log(chalk_1.default.yellow('Tip: Install Multipass from https://multipass.run'));
+            console.log(chalk_1.default.yellow('Tip: Install Multipass from https://canonical.com/multipass/install'));
+        }
+        if (error.message.includes('worktree')) {
+            console.log('');
+            console.log(chalk_1.default.yellow('Tip: Use --no-worktree to mount the folder directly instead.'));
         }
     }
 }
@@ -391,6 +632,10 @@ exports.createCommand = new commander_1.Command('create')
     .option('-l, --local', 'Create local genbox (Docker container or VM)')
     .option('--vm', 'Use Multipass VM for local genbox')
     .option('--native', 'Use native mode (no isolation) for local genbox')
+    .option('--no-worktree', 'Mount existing folder instead of creating git worktree')
+    .option('--skip-install', 'Skip dependency installation for worktree')
+    .option('--port <port>', 'App port for local genbox (default: 3000)')
+    .option('--app-name <name>', 'App name for domain routing (default: web)')
     .option('--claude', 'Use Claude provider (default)')
     .option('--gemini', 'Use Gemini provider')
     .option('-p, --profile <profile>', 'Use a predefined profile')
@@ -401,7 +646,7 @@ exports.createCommand = new commander_1.Command('create')
     .option('--db-source <source>', 'Database source: staging, production')
     .option('--db-dump <path>', 'Use existing mongodump file instead of creating one')
     .option('--db-copy-remote', 'Copy database on the server (requires publicly accessible DB)')
-    .option('-s, --size <size>', 'Server size: small, medium, large, xl')
+    .option('-s, --size <size>', 'Server size: tiny, mini (local only), small, medium, large, xl')
     .option('-b, --branch <branch>', 'Use existing git branch (skips new branch creation)')
     .option('-n, --new-branch <name>', 'Create a new branch with this name (defaults to env name)')
     .option('-f, --from-branch <branch>', 'Source branch to create new branch from (defaults to config default or main)')