genbox 1.0.200 → 1.0.202

package/dist/commands/create.js

@@ -1157,7 +1157,7 @@ exports.createCommand = new commander_1.Command('create')
             // Wait for genbox to be ready with progress indicator
             const genboxId = genbox._id || genbox.id;
             const waitResult = await (0, genbox_progress_1.waitForGenboxReady)(genboxId, name, {
-                timeout: 180,
+                timeout: 600,
                 showProgress: true,
             });
             if (!waitResult.success) {

package/dist/commands/new.js

@@ -334,7 +334,7 @@ exports.newCommand = new commander_1.Command('new')
             // Wait for genbox to be ready with progress indicator
             const genboxId = genbox._id || genbox.id;
             const waitResult = await (0, genbox_progress_1.waitForGenboxReady)(genboxId, projectName, {
-                timeout: 180,
+                timeout: 600,
                 showProgress: true,
             });
             if (!waitResult.success) {

package/dist/commands/provider-command.js

@@ -368,7 +368,7 @@ async function startGenbox(genbox) {
         });
         // Wait for genbox to be ready with progress indicator
         const waitResult = await (0, genbox_progress_1.waitForGenboxReady)(genbox.id, genbox.name, {
-            timeout: 120,
+            timeout: 600,
             showProgress: true,
         });
         if (!waitResult.success) {
@@ -495,7 +495,16 @@ async function startSessionOnGenbox(provider, genbox) {
     const socketDir = getRemoteDtachSocketDir();
     const socketPath = `${socketDir}/${sessionName}.sock`;
     // Use projectPath from genbox if available, otherwise detect
-    const knownProjectPath = targetGenbox.projectPath || '';
+    // For local Docker/VM, the workspace is mounted at /home/dev/workspace
+    let knownProjectPath = '';
+    if (genbox._isLocal) {
+        // Local genboxes mount workspace at /home/dev/workspace
+        knownProjectPath = '/home/dev/workspace';
+    }
+    else if (targetGenbox.projectPath) {
+        // Cloud genboxes use the path from API
+        knownProjectPath = targetGenbox.projectPath;
+    }
     const startScript = `#!/bin/bash
 # Set terminal environment for color support
 export TERM=xterm-256color

package/dist/lib/genbox-progress.js

@@ -51,7 +51,7 @@ function estimateProgress(elapsedSecs, hasIp) {
  * Wait for a genbox to be ready with real-time progress indicator
  */
 async function waitForGenboxReady(genboxId, name, options = {}) {
-    const { timeout = 180, interval = 2000, showProgress = true, onStatusChange, } = options;
+    const { timeout = 600, interval = 2000, showProgress = true, onStatusChange, } = options;
     const maxAttempts = Math.ceil((timeout * 1000) / interval);
     const startTime = Date.now();
     let lastStatus = '';

package/dist/lib/genbox-wizard.js

@@ -57,6 +57,7 @@ const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const child_process_1 = require("child_process");
+const ora_1 = __importDefault(require("ora"));
 const api_1 = require("../api");
 const genbox_progress_1 = require("./genbox-progress");
 const ssh_keys_1 = require("../utils/ssh-keys");
@@ -64,6 +65,10 @@ const config_store_1 = require("../config-store");
 const unified_session_1 = require("./unified-session");
 const gemini_auth_1 = require("../utils/gemini-auth");
 const claude_auth_1 = require("../utils/claude-auth");
+const config_loader_1 = require("../config-loader");
+const profile_resolver_1 = require("../profile-resolver");
+const utils_1 = require("../utils");
+const random_name_1 = require("../random-name");
 const VM_SIZE_REQUIREMENTS = {
     small: {
         cpus: 2,
@@ -585,23 +590,50 @@ async function promptForLocation(includeDirect = true) {
     }
 }
 /**
- * Prompt for genbox name
+ * Prompt for genbox name with random suggestions
+ * Matches the UX from `gb create` command
  */
 async function promptForName(defaultName) {
     try {
-        const name = await (0, prompts_1.input)({
-            message: 'Genbox name:',
-            default: defaultName || `genbox-${Date.now().toString(36)}`,
-            validate: (v) => {
-                if (!v.trim())
-                    return 'Name is required';
-                if (!/^[a-z0-9][a-z0-9-]*[a-z0-9]$|^[a-z0-9]$/.test(v.trim())) {
-                    return 'Name must be lowercase, start/end with letter or number';
-                }
-                return true;
-            },
+        // Generate 3 random name suggestions
+        const suggestions = (0, random_name_1.generateNameSuggestions)(3);
+        const nameChoice = await (0, select_1.default)({
+            message: 'Environment name:',
+            choices: [
+                {
+                    name: `${suggestions[0]} ${chalk_1.default.dim('(random)')}`,
+                    value: suggestions[0],
+                },
+                {
+                    name: `${suggestions[1]} ${chalk_1.default.dim('(random)')}`,
+                    value: suggestions[1],
+                },
+                {
+                    name: `${suggestions[2]} ${chalk_1.default.dim('(random)')}`,
+                    value: suggestions[2],
+                },
+                {
+                    name: 'Enter custom name...',
+                    value: '__custom__',
+                },
+            ],
         });
-        return name.trim();
+        if (nameChoice === '__custom__') {
+            const customName = await (0, prompts_1.input)({
+                message: 'Enter environment name:',
+                default: defaultName,
+                validate: (value) => {
+                    if (!value.trim())
+                        return 'Name is required';
+                    if (!/^[a-z0-9][a-z0-9-]*[a-z0-9]$|^[a-z0-9]$/.test(value.trim())) {
+                        return 'Name must be lowercase, start/end with letter or number, and contain only letters, numbers, and hyphens';
+                    }
+                    return true;
+                },
+            });
+            return customName.trim();
+        }
+        return nameChoice;
     }
     catch {
         return null;
@@ -691,7 +723,7 @@ async function createCloudGenbox(name, options = {}) {
         }
         // Wait for genbox to be ready with progress indicator
         const waitResult = await (0, genbox_progress_1.waitForGenboxReady)(genbox.id, name, {
-            timeout: 180,
+            timeout: 600,
             showProgress: true,
         });
         if (!waitResult.success) {
@@ -862,7 +894,8 @@ echo 'dev ALL=(ALL) NOPASSWD:ALL' | tee /etc/sudoers.d/dev
 chmod 440 /etc/sudoers.d/dev
 mkdir -p /home/dev/.ssh
 echo '${publicKey}' > /home/dev/.ssh/authorized_keys
-chown -R dev:dev /home/dev/.ssh
+chown -R dev:dev /home/dev/.ssh || true
+chown dev:dev /home/dev || true
 chmod 700 /home/dev/.ssh
 chmod 600 /home/dev/.ssh/authorized_keys
 mkdir -p /run/sshd
@@ -930,6 +963,50 @@ mkdir -p /run/sshd
             console.log(chalk_1.default.red('\nFailed to start SSH in container.'));
             return { success: false, error: 'SSH startup timeout' };
         }
+        // Install Node.js and provider CLI via SSH
+        showProgress('Installing Node.js', 0, 70);
+        const keyPath = (0, ssh_keys_1.getPrivateSshKeyPath)();
+        try {
+            // Determine CLI package based on provider
+            const cliPackage = provider === 'gemini' ? '@google/gemini-cli' : '@anthropic-ai/claude-code';
+            const cliCommand = provider === 'gemini' ? 'gemini' : 'claude';
+            // Install NVM, Node.js, and CLI
+            const installScript = `
+        # Install NVM
+        curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
+        export NVM_DIR="$HOME/.nvm"
+        [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
+
+        # Install Node.js 20
+        nvm install 20
+        nvm use 20
+        nvm alias default 20
+
+        # Add NVM to bashrc for future sessions
+        echo 'export NVM_DIR="$HOME/.nvm"' >> ~/.bashrc
+        echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"' >> ~/.bashrc
+
+        # Install CLI
+        npm install -g ${cliPackage}
+
+        echo "Installed: $(node -v), ${cliCommand}"
+      `;
+            showProgress(`Installing ${cliCommand} CLI`, 0, 85);
+            (0, child_process_1.execFileSync)('ssh', [
+                '-p', String(sshPort),
+                '-i', keyPath,
+                '-o', 'StrictHostKeyChecking=no',
+                '-o', 'UserKnownHostsFile=/dev/null',
+                '-o', 'LogLevel=ERROR',
+                'dev@localhost',
+                installScript,
+            ], { timeout: 300000, stdio: 'pipe' }); // 5 minute timeout
+        }
+        catch (err) {
+            // Non-fatal - CLI can be installed manually
+            console.log(chalk_1.default.yellow(`\n  Warning: Failed to install CLI automatically.`));
+            console.log(chalk_1.default.dim(`  You can install it manually after connecting.`));
+        }
         showProgress('Creating session', 0, 95);
         // Create session record
         const session = await manager.createSession({
@@ -1040,32 +1117,21 @@ async function createLocalVmGenbox(name, provider = 'claude') {
                 console.log(chalk_1.default.green(`✓ Gemini credentials detected (${geminiCreds.source})`));
                 const isJsonCredentials = geminiCreds.credentials.trim().startsWith('{');
                 if (isJsonCredentials) {
-                    // Escape single quotes in the credentials for use in shell heredoc
-                    const escapedCreds = geminiCreds.credentials.replace(/'/g, "'\\''");
+                    // Base64 encode the credentials to avoid YAML parsing issues
+                    const credsBase64 = Buffer.from(geminiCreds.credentials).toString('base64');
+                    const settingsJson = JSON.stringify({
+                        autoAccept: true,
+                        security: { auth: { selectedType: "oauth-personal" }, disableYoloMode: false },
+                        tools: { sandbox: false, autoAccept: true }
+                    });
+                    const settingsBase64 = Buffer.from(settingsJson).toString('base64');
                     credentialsScript = `
-    # Setup Gemini credentials
+    # Setup Gemini credentials (base64 encoded to avoid YAML issues)
     echo "=== Setting up Gemini CLI Authentication ==="
     mkdir -p /home/dev/.gemini
-    cat > /home/dev/.gemini/oauth_creds.json << 'GEMINI_CREDS_EOF'
-${geminiCreds.credentials}
-GEMINI_CREDS_EOF
+    echo "${credsBase64}" | base64 -d > /home/dev/.gemini/oauth_creds.json
     chmod 600 /home/dev/.gemini/oauth_creds.json
-    # Create settings.json for Gemini CLI (YOLO mode)
-    cat > /home/dev/.gemini/settings.json << 'GEMINI_SETTINGS_EOF'
-{
-  "autoAccept": true,
-  "security": {
-    "auth": {
-      "selectedType": "oauth-personal"
-    },
-    "disableYoloMode": false
-  },
-  "tools": {
-    "sandbox": false,
-    "autoAccept": true
-  }
-}
-GEMINI_SETTINGS_EOF
+    echo "${settingsBase64}" | base64 -d > /home/dev/.gemini/settings.json
     chmod 644 /home/dev/.gemini/settings.json
     chown -R dev:dev /home/dev/.gemini
     echo "Gemini CLI authentication configured."
@@ -1096,30 +1162,27 @@ GEMINI_SETTINGS_EOF
                 console.log(chalk_1.default.green(`✓ Claude credentials detected (${claudeCreds.source})`));
                 const isJsonCredentials = claudeCreds.credentials.trim().startsWith('{');
                 if (isJsonCredentials) {
+                    // Base64 encode the credentials to avoid YAML parsing issues
+                    const credsBase64 = Buffer.from(claudeCreds.credentials).toString('base64');
+                    const settingsJson = JSON.stringify({
+                        hasCompletedOnboarding: true,
+                        theme: "dark",
+                        preferredNotifChannel: "terminal"
+                    });
+                    const settingsBase64 = Buffer.from(settingsJson).toString('base64');
+                    const claudeJsonBase64 = Buffer.from(JSON.stringify({
+                        hasCompletedOnboarding: true,
+                        theme: "dark"
+                    })).toString('base64');
                     credentialsScript = `
-    # Setup Claude credentials
+    # Setup Claude credentials (base64 encoded to avoid YAML issues)
     echo "=== Setting up Claude Code Authentication ==="
     mkdir -p /home/dev/.claude
-    cat > /home/dev/.claude/.credentials.json << 'CLAUDE_CREDS_EOF'
-${claudeCreds.credentials}
-CLAUDE_CREDS_EOF
+    echo "${credsBase64}" | base64 -d > /home/dev/.claude/.credentials.json
     chmod 600 /home/dev/.claude/.credentials.json
-    # Create settings to skip onboarding
-    cat > /home/dev/.claude/settings.json << 'CLAUDE_SETTINGS_EOF'
-{
-  "hasCompletedOnboarding": true,
-  "theme": "dark",
-  "preferredNotifChannel": "terminal"
-}
-CLAUDE_SETTINGS_EOF
+    echo "${settingsBase64}" | base64 -d > /home/dev/.claude/settings.json
     chmod 644 /home/dev/.claude/settings.json
-    # Also create ~/.claude.json for Claude Code v2.x
-    cat > /home/dev/.claude.json << 'CLAUDE_JSON_EOF'
-{
-  "hasCompletedOnboarding": true,
-  "theme": "dark"
-}
-CLAUDE_JSON_EOF
+    echo "${claudeJsonBase64}" | base64 -d > /home/dev/.claude.json
     chmod 644 /home/dev/.claude.json
     chown -R dev:dev /home/dev/.claude /home/dev/.claude.json
     echo "Claude Code authentication configured."
@@ -1234,6 +1297,11 @@ ${credentialsScript}`;
             const stageProgress = (elapsed % 30) / 30 * 10;
             updateProgress(currentStage, Math.floor(stageProgress));
         }, 500);
+        // Capture stderr for error messages
+        let vmStderr = '';
+        vmProcess.stderr.on('data', (data) => {
+            vmStderr += data.toString();
+        });
         // Wait for VM creation
         await new Promise((resolve, reject) => {
             vmProcess.on('close', (code) => {
@@ -1242,7 +1310,8 @@ ${credentialsScript}`;
                     resolve();
                 }
                 else {
-                    reject(new Error(`VM creation failed with code ${code}`));
+                    const errorMsg = vmStderr.trim() || `VM creation failed with code ${code}`;
+                    reject(new Error(errorMsg));
                 }
             });
             vmProcess.on('error', (err) => {
@@ -1353,12 +1422,303 @@ ${credentialsScript}`;
         return { success: false, error: error.message };
     }
 }
+/**
+ * Create a local Docker genbox from a project with genbox.yaml
+ */
+async function createLocalDockerFromProject(config, options) {
+    console.log('');
+    console.log(chalk_1.default.blue('Creating Docker genbox from project...'));
+    console.log(chalk_1.default.dim(`Project: ${config.project?.name || 'unknown'}`));
+    console.log('');
+    // Profile selection if available
+    let selectedProfile;
+    if (config.profiles && Object.keys(config.profiles).length > 0 && !options.skipPrompts) {
+        const profileNames = Object.keys(config.profiles);
+        const choices = profileNames.map(name => {
+            const profile = config.profiles[name];
+            const apps = profile.apps ? profile.apps.join(', ') : 'default apps';
+            const description = profile.description || `Apps: ${apps}`;
+            return {
+                name: `${name} - ${chalk_1.default.dim(description)}`,
+                value: name,
+            };
+        });
+        choices.push({
+            name: `${chalk_1.default.cyan('Custom')} - ${chalk_1.default.dim('Use default configuration')}`,
+            value: '__custom__',
+        });
+        selectedProfile = await (0, select_1.default)({
+            message: 'Select a profile:',
+            choices,
+        });
+        if (selectedProfile === '__custom__') {
+            selectedProfile = undefined;
+        }
+    }
+    // Get name
+    const defaultName = options.provider
+        ? `${options.provider}-${Date.now().toString(36)}`
+        : `genbox-${Date.now().toString(36)}`;
+    const name = options.name || await promptForName(defaultName);
+    if (!name) {
+        console.log(chalk_1.default.dim('\nCancelled.'));
+        return { success: false, error: 'Cancelled' };
+    }
+    console.log('');
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    console.log(`  ${chalk_1.default.bold('Project:')}  ${config.project?.name || 'unknown'}`);
+    if (selectedProfile) {
+        console.log(`  ${chalk_1.default.bold('Profile:')}  ${selectedProfile}`);
+    }
+    console.log(`  ${chalk_1.default.bold('Name:')}     ${name}`);
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    console.log('');
+    return await createLocalDockerGenbox(name, options.provider || 'claude');
+}
+/**
+ * Scaffold a project from a starter template
+ * Returns the path to the scaffolded project
+ */
+async function scaffoldTemplate(template, projectName) {
+    const spinner = (0, ora_1.default)('Setting up project from template...').start();
+    try {
+        let createCmd;
+        if (template.createCommand) {
+            // Use the template's create command (e.g., npx create-next-app)
+            createCmd = template.createCommand.replace(/\{\{name\}\}/g, projectName);
+        }
+        else if (template.repoUrl) {
+            // Clone from repository
+            createCmd = `git clone https://${template.repoUrl} ${projectName}`;
+        }
+        else {
+            spinner.fail('Template does not support local creation');
+            return { success: false, error: 'Template does not support local creation' };
+        }
+        spinner.text = `Running: ${createCmd.substring(0, 50)}...`;
+        // Run the create command
+        (0, child_process_1.execSync)(createCmd, {
+            stdio: 'pipe',
+            cwd: process.cwd(),
+            timeout: 300000, // 5 minute timeout
+        });
+        const projectPath = path.join(process.cwd(), projectName);
+        // Run setup commands if any
+        if (template.setupCommands && template.setupCommands.length > 0) {
+            for (const cmd of template.setupCommands) {
+                const setupCmd = cmd.replace(/\{\{name\}\}/g, projectName);
+                spinner.text = `Running: ${setupCmd}`;
+                try {
+                    (0, child_process_1.execSync)(setupCmd, {
+                        stdio: 'pipe',
+                        cwd: projectPath,
+                        timeout: 300000,
+                    });
+                }
+                catch {
+                    // Some setup commands may fail, continue
+                }
+            }
+        }
+        spinner.succeed(chalk_1.default.green(`Project scaffolded: ${projectName}`));
+        return { success: true, projectPath };
+    }
+    catch (error) {
+        spinner.fail(chalk_1.default.red(`Failed to scaffold project: ${error.message}`));
+        if (error.message?.includes('command not found')) {
+            console.log(chalk_1.default.yellow('\nMake sure the required tools are installed:'));
+            if (template.createCommand?.includes('npx')) {
+                console.log(chalk_1.default.dim('  - Node.js and npx'));
+            }
+            if (template.createCommand?.includes('bunx')) {
+                console.log(chalk_1.default.dim('  - Bun (https://bun.sh)'));
+            }
+            if (template.repoUrl) {
+                console.log(chalk_1.default.dim('  - Git'));
+            }
+        }
+        return { success: false, error: error.message };
+    }
+}
+/**
+ * Create a local Docker genbox from a starter template
+ */
+async function createLocalDockerFromTemplate(options) {
+    console.log('');
+    console.log(chalk_1.default.blue('No genbox.yaml found - creating Docker genbox from template...'));
+    console.log('');
+    // Fetch available templates
+    let templates = [];
+    try {
+        templates = await (0, api_1.fetchApi)('/genboxes/starter-templates');
+    }
+    catch (error) {
+        console.log(chalk_1.default.yellow('Could not fetch templates, using default setup.'));
+        // Continue without template selection
+    }
+    // Template selection if templates available
+    let template;
+    if (templates.length > 0 && !options.skipPrompts) {
+        const templateChoices = templates.map(t => ({
+            name: `${t.icon} ${t.displayName} - ${chalk_1.default.dim(t.description)}`,
+            value: t.name,
+        }));
+        const selectedTemplate = await (0, select_1.default)({
+            message: 'Select a template:',
+            choices: templateChoices,
+            pageSize: 15,
+        });
+        template = templates.find(t => t.name === selectedTemplate);
+    }
+    // Get name
+    const defaultName = template
+        ? `my-${template.name}-app`
+        : (options.provider ? `${options.provider}-${Date.now().toString(36)}` : `genbox-${Date.now().toString(36)}`);
+    const name = options.name || await promptForName(defaultName);
+    if (!name) {
+        console.log(chalk_1.default.dim('\nCancelled.'));
+        return { success: false, error: 'Cancelled' };
+    }
+    if (template) {
+        console.log('');
+        console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+        console.log(`  ${chalk_1.default.bold('Template:')}  ${template.icon} ${template.displayName}`);
+        console.log(`  ${chalk_1.default.bold('Name:')}      ${name}`);
+        console.log(`  ${chalk_1.default.bold('Features:')}  ${template.features.join(', ')}`);
+        console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+        console.log('');
+        // Scaffold the project from template
+        const scaffoldResult = await scaffoldTemplate(template, name);
+        if (!scaffoldResult.success) {
+            return { success: false, error: scaffoldResult.error };
+        }
+        // Change to the scaffolded project directory before creating genbox
+        process.chdir(scaffoldResult.projectPath);
+        console.log(chalk_1.default.dim(`Working directory: ${scaffoldResult.projectPath}`));
+    }
+    return await createLocalDockerGenbox(name, options.provider || 'claude');
+}
+/**
+ * Create a local VM genbox from a project with genbox.yaml
+ */
+async function createLocalVmFromProject(config, options) {
+    console.log('');
+    console.log(chalk_1.default.blue('Creating VM genbox from project...'));
+    console.log(chalk_1.default.dim(`Project: ${config.project?.name || 'unknown'}`));
+    console.log('');
+    // Profile selection if available
+    let selectedProfile;
+    if (config.profiles && Object.keys(config.profiles).length > 0 && !options.skipPrompts) {
+        const profileNames = Object.keys(config.profiles);
+        const choices = profileNames.map(name => {
+            const profile = config.profiles[name];
+            const apps = profile.apps ? profile.apps.join(', ') : 'default apps';
+            const description = profile.description || `Apps: ${apps}`;
+            return {
+                name: `${name} - ${chalk_1.default.dim(description)}`,
+                value: name,
+            };
+        });
+        choices.push({
+            name: `${chalk_1.default.cyan('Custom')} - ${chalk_1.default.dim('Use default configuration')}`,
+            value: '__custom__',
+        });
+        selectedProfile = await (0, select_1.default)({
+            message: 'Select a profile:',
+            choices,
+        });
+        if (selectedProfile === '__custom__') {
+            selectedProfile = undefined;
+        }
+    }
+    // Get name
+    const defaultName = options.provider
+        ? `${options.provider}-${Date.now().toString(36)}`
+        : `genbox-${Date.now().toString(36)}`;
+    const name = options.name || await promptForName(defaultName);
+    if (!name) {
+        console.log(chalk_1.default.dim('\nCancelled.'));
+        return { success: false, error: 'Cancelled' };
+    }
+    console.log('');
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    console.log(`  ${chalk_1.default.bold('Project:')}  ${config.project?.name || 'unknown'}`);
+    if (selectedProfile) {
+        console.log(`  ${chalk_1.default.bold('Profile:')}  ${selectedProfile}`);
+    }
+    console.log(`  ${chalk_1.default.bold('Name:')}     ${name}`);
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    console.log('');
+    return await createLocalVmGenbox(name, options.provider || 'claude');
+}
+/**
+ * Create a local VM genbox from a starter template
+ */
+async function createLocalVmFromTemplate(options) {
+    console.log('');
+    console.log(chalk_1.default.blue('No genbox.yaml found - creating VM genbox from template...'));
+    console.log('');
+    // Fetch available templates
+    let templates = [];
+    try {
+        templates = await (0, api_1.fetchApi)('/genboxes/starter-templates');
+    }
+    catch (error) {
+        console.log(chalk_1.default.yellow('Could not fetch templates, using default setup.'));
+        // Continue without template selection
+    }
+    // Template selection if templates available
+    let template;
+    if (templates.length > 0 && !options.skipPrompts) {
+        const templateChoices = templates.map(t => ({
+            name: `${t.icon} ${t.displayName} - ${chalk_1.default.dim(t.description)}`,
+            value: t.name,
+        }));
+        const selectedTemplate = await (0, select_1.default)({
+            message: 'Select a template:',
+            choices: templateChoices,
+            pageSize: 15,
+        });
+        template = templates.find(t => t.name === selectedTemplate);
+    }
+    // Get name
+    const defaultName = template
+        ? `my-${template.name}-app`
+        : (options.provider ? `${options.provider}-${Date.now().toString(36)}` : `genbox-${Date.now().toString(36)}`);
+    const name = options.name || await promptForName(defaultName);
+    if (!name) {
+        console.log(chalk_1.default.dim('\nCancelled.'));
+        return { success: false, error: 'Cancelled' };
+    }
+    if (template) {
+        console.log('');
+        console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+        console.log(`  ${chalk_1.default.bold('Template:')}  ${template.icon} ${template.displayName}`);
+        console.log(`  ${chalk_1.default.bold('Name:')}      ${name}`);
+        console.log(`  ${chalk_1.default.bold('Features:')}  ${template.features.join(', ')}`);
+        console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+        console.log('');
+        // Scaffold the project from template
+        const scaffoldResult = await scaffoldTemplate(template, name);
+        if (!scaffoldResult.success) {
+            return { success: false, error: scaffoldResult.error };
+        }
+        // Change to the scaffolded project directory before creating genbox
+        process.chdir(scaffoldResult.projectPath);
+        console.log(chalk_1.default.dim(`Working directory: ${scaffoldResult.projectPath}`));
+    }
+    return await createLocalVmGenbox(name, options.provider || 'claude');
+}
 /**
  * Run the full creation wizard
  *
  * Used by both `gb create` and provider commands for consistent UX.
  */
 async function runCreateWizard(options = {}) {
+    // Step 0: Check if we're in a genbox project (has genbox.yaml)
+    const configLoader = new config_loader_1.ConfigLoader();
+    const loadResult = await configLoader.load();
+    const hasGenboxYaml = !!loadResult.config;
     // Step 1: Determine location (cloud vs local)
     let location = options.location;
     if (!location && !options.skipPrompts) {
@@ -1383,51 +1743,227 @@ async function runCreateWizard(options = {}) {
     }
     // Step 2b: Handle local docker mode
     if (location === 'local-docker') {
-        // Get name for local genbox
-        const defaultName = options.provider
-            ? `${options.provider}-${Date.now().toString(36)}`
-            : `genbox-${Date.now().toString(36)}`;
-        const name = options.name || await promptForName(defaultName);
-        if (!name) {
-            console.log(chalk_1.default.dim('\nCancelled.'));
-            return { success: false, error: 'Cancelled' };
+        // Check for project or template mode
+        if (hasGenboxYaml) {
+            return await createLocalDockerFromProject(loadResult.config, options);
+        }
+        else {
+            return await createLocalDockerFromTemplate(options);
         }
-        return await createLocalDockerGenbox(name, options.provider || 'claude');
     }
     // Step 2c: Handle local VM (multipass) mode
     if (location === 'local-vm') {
-        // Get name for local genbox
-        const defaultName = options.provider
-            ? `${options.provider}-${Date.now().toString(36)}`
-            : `genbox-${Date.now().toString(36)}`;
-        const name = options.name || await promptForName(defaultName);
-        if (!name) {
-            console.log(chalk_1.default.dim('\nCancelled.'));
-            return { success: false, error: 'Cancelled' };
+        // Check for project or template mode
+        if (hasGenboxYaml) {
+            return await createLocalVmFromProject(loadResult.config, options);
         }
-        return await createLocalVmGenbox(name, options.provider || 'claude');
-    }
-    // Step 3: Cloud mode - get name
-    let name = options.name;
-    if (!name && !options.skipPrompts) {
-        const defaultName = options.provider
-            ? `${options.provider}-${Date.now().toString(36)}`
-            : `genbox-${Date.now().toString(36)}`;
-        const inputName = await promptForName(defaultName);
-        if (!inputName) {
-            console.log(chalk_1.default.dim('\nCancelled.'));
-            return { success: false, error: 'Cancelled' };
+        else {
+            return await createLocalVmFromTemplate(options);
         }
-        name = inputName;
     }
-    // Generate name if skipping prompts
-    name = name || (options.provider
-        ? `${options.provider}-${Date.now().toString(36)}`
-        : `genbox-${Date.now().toString(36)}`);
-    // Step 4: Create cloud genbox
+    // Step 3: Cloud mode - determine project type
+    if (hasGenboxYaml) {
+        // Project mode: use profile selection (like gb create)
+        return await createCloudGenboxFromProject(loadResult.config, configLoader, options);
+    }
+    else {
+        // Template mode: use template selection (like gb new)
+        return await createCloudGenboxFromTemplate(options);
+    }
+}
+/**
+ * Create a cloud genbox from a project with genbox.yaml
+ * Uses profile selection and ProfileResolver similar to `gb create`
+ */
+async function createCloudGenboxFromProject(config, configLoader, options) {
+    console.log('');
+    console.log(chalk_1.default.blue('Creating genbox from project...'));
+    console.log(chalk_1.default.dim(`Project: ${config.project?.name || 'unknown'}`));
+    console.log('');
+    // Profile selection if available
+    let selectedProfile;
+    const profiles = config.profiles || {};
+    if (Object.keys(profiles).length > 0 && !options.skipPrompts) {
+        const profileNames = Object.keys(profiles);
+        const choices = profileNames.map(name => {
+            const profile = profiles[name];
+            const apps = profile.apps ? profile.apps.join(', ') : 'default apps';
+            const description = profile.description || `Apps: ${apps}`;
+            return {
+                name: `${name} - ${chalk_1.default.dim(description)}`,
+                value: name,
+            };
+        });
+        choices.push({
+            name: `${chalk_1.default.cyan('Custom')} - ${chalk_1.default.dim('Use default configuration')}`,
+            value: '__custom__',
+        });
+        selectedProfile = await (0, select_1.default)({
+            message: 'Select a profile:',
+            choices,
+        });
+        if (selectedProfile === '__custom__') {
+            selectedProfile = undefined;
+        }
+    }
+    // Get name
+    const name = options.name || await promptForName();
+    if (!name) {
+        console.log(chalk_1.default.dim('\nCancelled.'));
+        return { success: false, error: 'Cancelled' };
+    }
+    // Use ProfileResolver to resolve full configuration (including repos)
+    const profileResolver = new profile_resolver_1.ProfileResolver(configLoader);
+    const createOptions = {
+        name,
+        profile: selectedProfile,
+        yes: options.skipPrompts,
+    };
+    const resolved = await profileResolver.resolve(config, createOptions);
+    // Display resolved configuration
+    console.log('');
+    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}`);
+    if (selectedProfile) {
+        console.log(`  ${chalk_1.default.bold('Profile:')}  ${selectedProfile}`);
+    }
+    if (resolved.apps.length > 0) {
+        console.log(`  ${chalk_1.default.bold('Apps:')}     ${resolved.apps.map(a => a.name).join(', ')}`);
+    }
+    if (resolved.repos.length > 0) {
+        console.log(`  ${chalk_1.default.bold('Repos:')}    ${resolved.repos.map(r => r.name).join(', ')}`);
+    }
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    console.log('');
+    // Build repos payload
+    const repos = {};
+    for (const repo of resolved.repos) {
+        repos[repo.name] = {
+            url: repo.url,
+            path: repo.path,
+            branch: repo.branch || config.defaults?.branch || 'main',
+        };
+    }
+    // Get git config for commits
+    const gitConfig = (0, utils_1.getGitConfig)();
+    // Load env vars for GIT_TOKEN
+    const envVars = configLoader.loadEnvVars(process.cwd());
+    // Build full payload
+    const payload = {
+        profile: selectedProfile,
+        workspace: resolved.project.name,
+        size: resolved.size,
+        repos,
+        apps: resolved.apps.map(a => a.name),
+        appConfigs: resolved.apps.map(a => ({
+            name: a.name,
+            path: a.path.startsWith('/') ? a.path : `${resolved.repos[0]?.path || '/home/dev'}/${a.path}`,
+            type: a.type,
+            port: a.port,
+            framework: a.framework,
+            runner: a.runner,
+            docker: a.docker,
+            healthcheck: a.healthcheck,
+            dependsOn: a.dependsOn,
+            commands: a.commands,
+        })),
+        infrastructure: resolved.infrastructure.map(i => ({
+            name: i.name,
+            type: i.type,
+            mode: i.mode,
+        })),
+        database: resolved.database,
+        gitToken: envVars.GIT_TOKEN,
+        gitUserName: gitConfig.userName,
+        gitUserEmail: gitConfig.userEmail,
+    };
+    // Add provider-specific CLI installation
+    if (options.provider === 'claude') {
+        payload.installClaudeCode = true;
+    }
+    else if (options.provider === 'gemini') {
+        payload.installGeminiCli = true;
+    }
+    return await createCloudGenbox(name, {
+        detach: options.detach,
+        payload: { ...options.payload, ...payload },
+        provider: options.provider,
+    });
+}
+/**
+ * Create a cloud genbox from a starter template
+ * Uses template selection similar to `gb new`
+ */
+async function createCloudGenboxFromTemplate(options) {
+    console.log('');
+    console.log(chalk_1.default.blue('No genbox.yaml found - creating from template...'));
+    console.log('');
+    // Fetch available templates
+    let templates = [];
+    try {
+        templates = await (0, api_1.fetchApi)('/genboxes/starter-templates');
+    }
+    catch (error) {
+        console.log(chalk_1.default.red('Failed to fetch templates:', error.message));
+        return { success: false, error: 'Failed to fetch templates' };
+    }
+    if (templates.length === 0) {
+        console.log(chalk_1.default.red('No templates available.'));
+        return { success: false, error: 'No templates available' };
+    }
+    // Template selection
+    let template;
+    if (!options.skipPrompts) {
+        const templateChoices = templates.map(t => ({
+            name: `${t.icon} ${t.displayName} - ${chalk_1.default.dim(t.description)}`,
+            value: t.name,
+        }));
+        const selectedTemplate = await (0, select_1.default)({
+            message: 'Select a template:',
+            choices: templateChoices,
+            pageSize: 15,
+        });
+        template = templates.find(t => t.name === selectedTemplate);
+    }
+    else {
+        // Default to nextjs in non-interactive mode
+        template = templates.find(t => t.name === 'nextjs') || templates[0];
+        console.log(chalk_1.default.dim(`Using template: ${template?.displayName}`));
+    }
+    if (!template) {
+        console.log(chalk_1.default.red('No template selected.'));
+        return { success: false, error: 'No template selected' };
+    }
+    // Get name
+    const defaultName = `my-${template.name}-app`;
+    const name = options.name || await promptForName(defaultName);
+    if (!name) {
+        console.log(chalk_1.default.dim('\nCancelled.'));
+        return { success: false, error: 'Cancelled' };
+    }
+    // Build payload with template
+    const payload = {
+        template: template.name,
+    };
+    // Add provider-specific CLI installation
+    if (options.provider === 'claude') {
+        payload.installClaudeCode = true;
+    }
+    else if (options.provider === 'gemini') {
+        payload.installGeminiCli = true;
+    }
+    console.log('');
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    console.log(`  ${chalk_1.default.bold('Template:')}  ${template.icon} ${template.displayName}`);
+    console.log(`  ${chalk_1.default.bold('Name:')}      ${name}`);
+    console.log(`  ${chalk_1.default.bold('Features:')}  ${template.features.join(', ')}`);
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    console.log('');
     return await createCloudGenbox(name, {
         detach: options.detach,
-        payload: options.payload,
+        payload: { ...options.payload, ...payload },
         provider: options.provider,
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genbox",
-  "version": "1.0.200",
+  "version": "1.0.202",
   "description": "Genbox CLI - AI-Powered Development Environments",
   "main": "dist/index.js",
   "bin": {