genbox 1.0.205 → 1.0.207

package/dist/commands/create.js

@@ -605,8 +605,10 @@ exports.createCommand = new commander_1.Command('create')
         // Support both v3 and v4 configs
         const config = loadResult.config;
         const profileResolver = new profile_resolver_1.ProfileResolver(configLoader);
-        // Use username as workspace for URL routing (project name is still used for grouping/backup)
-        const workspace = usernameResult.username;
+        // Use username for name uniqueness check, but keep workspace as project name
+        // The API uses ownerUsername (from user account) for URL generation
+        // Lowercase for consistent URL generation
+        const workspace = (config.project?.name || 'default').toLowerCase();
         // Handle --restore option: fetch backup info by genbox name
         if (options.restore) {
             // Require genbox name for restore
@@ -685,8 +687,9 @@ exports.createCommand = new commander_1.Command('create')
         if (!selectedProfile && !options.yes && config.profiles && Object.keys(config.profiles).length > 0) {
             selectedProfile = await promptForProfile(config.profiles);
         }
-        // Check if name is available in workspace, add incremental suffix if taken
-        const uniqueResult = await (0, genbox_wizard_1.ensureUniqueName)(name, workspace);
+        // Check if name is available for this user, add incremental suffix if taken
+        // Use username for uniqueness (names are unique per user, not per workspace)
+        const uniqueResult = await (0, genbox_wizard_1.ensureUniqueName)(name, usernameResult.username);
         if (uniqueResult.wasModified) {
             console.log(chalk_1.default.yellow(`  Name '${name}' is already in use, using '${uniqueResult.name}' instead`));
             name = uniqueResult.name;
@@ -1431,7 +1434,7 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
         name: resolved.name,
         size: resolved.size,
         publicKey,
-        workspace: resolved.project.name,
+        workspace: resolved.project.name.toLowerCase(),
         services,
         files,
         postDetails,
@@ -1662,7 +1665,7 @@ async function createLegacy(name, options) {
             name,
             size,
             publicKey,
-            workspace: config.project_name || 'default',
+            workspace: (config.project_name || 'default').toLowerCase(),
             services: config.services,
             files: filesBundle,
             postDetails,

package/dist/commands/new.js

@@ -183,7 +183,6 @@ exports.newCommand = new commander_1.Command('new')
             console.log(chalk_1.default.dim('\nCancelled. Set a username first with: gb username set <name>'));
             return;
         }
-        const workspace = usernameResult.username;
         // Size selection
         let size = options.size || preferences.defaultGenboxSize || template.recommendedSize;
         if (!options.yes && !options.size) {
@@ -250,7 +249,8 @@ exports.newCommand = new commander_1.Command('new')
             return;
         }
         // Check if name is available, add incremental suffix if taken
-        const uniqueResult = await (0, genbox_wizard_1.ensureUniqueName)(projectName, workspace);
+        // Use username as namespace for name uniqueness (API uses ownerUsername for URL generation)
+        const uniqueResult = await (0, genbox_wizard_1.ensureUniqueName)(projectName, usernameResult.username);
         if (uniqueResult.wasModified) {
             console.log(chalk_1.default.yellow(`  Name '${projectName}' is already in use, using '${uniqueResult.name}' instead`));
             projectName = uniqueResult.name;
@@ -286,12 +286,15 @@ exports.newCommand = new commander_1.Command('new')
         }
         // Get SSH key
         const publicKey = (0, utils_1.getPublicSshKey)();
+        // Get git config for commits
+        const gitConfig = (0, utils_1.getGitConfig)();
         // Build payload
+        // Note: workspace is 'default' - the API uses ownerUsername (from user account) for URL generation
         const payload = {
             name: projectName,
             size,
             publicKey,
-            workspace,
+            workspace: 'default',
             template: template.name,
             services: {},
             files: [],
@@ -299,6 +302,8 @@ exports.newCommand = new commander_1.Command('new')
             repos: {},
             installClaudeCode,
             installGeminiCli,
+            gitUserName: gitConfig.userName,
+            gitUserEmail: gitConfig.userEmail,
         };
         // If template uses createCommand, set it up
         if (template.createCommand) {

package/dist/commands/provider-command.js

@@ -484,7 +484,7 @@ async function startSessionOnGenbox(provider, genbox) {
     const cliCommand = provider === 'claude'
         ? 'claude --dangerously-skip-permissions'
         : provider === 'gemini'
-            ? 'gemini'
+            ? 'gemini --yolo'
             : 'codex';
     console.log(chalk_1.default.dim(`\nStarting ${provider} on ${targetGenbox.name}...`));
     // Ensure dtach is installed (skip for Docker - already installed during creation)

package/dist/commands/session/index.js

@@ -1247,16 +1247,19 @@ async function attachToCloudSession(session) {
     // Build the remote command
     const socketDir = getRemoteDtachSocketDir();
     const socketPath = `${socketDir}/${session.name}.sock`;
+    // Detect provider from session name
+    const isGemini = session.name.toLowerCase().includes('gemini');
+    const cliCommand = isGemini ? 'gemini --yolo' : 'claude --dangerously-skip-permissions';
     let remoteCmd;
     // Note: We use grep to extract GENBOX_PROJECT_DIR from .bashrc since .bashrc may have early return for non-interactive shells
     const cdToProject = 'eval $(grep GENBOX_PROJECT_DIR ~/.bashrc 2>/dev/null); cd $GENBOX_PROJECT_DIR 2>/dev/null;';
     if (hasDtach) {
         // Use dtach for session persistence
-        remoteCmd = `mkdir -p ${socketDir} && dtach -A ${socketPath} bash -c '${cdToProject} source ~/.nvm/nvm.sh 2>/dev/null; claude --dangerously-skip-permissions'`;
+        remoteCmd = `mkdir -p ${socketDir} && dtach -A ${socketPath} bash -c '${cdToProject} source ~/.nvm/nvm.sh 2>/dev/null; ${cliCommand}'`;
     }
     else {
         // Fallback to direct execution (no persistence)
-        remoteCmd = `bash -c '${cdToProject} source ~/.nvm/nvm.sh 2>/dev/null; claude --dangerously-skip-permissions'`;
+        remoteCmd = `bash -c '${cdToProject} source ~/.nvm/nvm.sh 2>/dev/null; ${cliCommand}'`;
     }
     const sshArgs = [
         '-t',
@@ -1316,19 +1319,23 @@ async function attachToLocalGenboxSession(session) {
         const hasDtach = await ensureDtachInstalled(vmIp, keyPath);
         // Set up SSH multiplexing for faster uploads
         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 = startClipboardWatcher(vmIp, keyPath, 'claude', genboxName);
+        const clipboardInterval = startClipboardWatcher(vmIp, keyPath, provider, genboxName);
         // Build the remote command
         const socketDir = getRemoteDtachSocketDir();
-        const socketPath = `${socketDir}/claude.sock`;
+        const socketPath = `${socketDir}/${provider}.sock`;
         let remoteCmd;
         // Note: We use grep to extract GENBOX_PROJECT_DIR from .bashrc since .bashrc may have early return for non-interactive shells
         const cdToProject = 'eval $(grep GENBOX_PROJECT_DIR ~/.bashrc 2>/dev/null); cd $GENBOX_PROJECT_DIR 2>/dev/null;';
         if (hasDtach) {
-            remoteCmd = `mkdir -p ${socketDir} && dtach -A ${socketPath} bash -c '${cdToProject} source ~/.nvm/nvm.sh 2>/dev/null; claude --dangerously-skip-permissions'`;
+            remoteCmd = `mkdir -p ${socketDir} && dtach -A ${socketPath} bash -c '${cdToProject} source ~/.nvm/nvm.sh 2>/dev/null; ${cliCommand}'`;
         }
         else {
-            remoteCmd = `bash -c '${cdToProject} source ~/.nvm/nvm.sh 2>/dev/null; claude --dangerously-skip-permissions'`;
+            remoteCmd = `bash -c '${cdToProject} source ~/.nvm/nvm.sh 2>/dev/null; ${cliCommand}'`;
         }
         // SSH into VM and attach/create dtach session
         const sshArgs = [
@@ -1353,10 +1360,14 @@ async function attachToLocalGenboxSession(session) {
     else if (session.isolation === 'docker' || session.isolation === 'native') {
         // Docker isolation runs infrastructure in containers but apps natively via PM2
         // Native isolation runs everything natively
-        // In both cases, we run Claude locally in a dtach session in the workdir
+        // In both cases, we run the CLI locally in a dtach session in the workdir
         // Note: Image upload not needed for native/docker as files are already local
         const workdir = genboxSession.workdir || process.cwd();
-        console.log(chalk_1.default.dim(`\nStarting Claude session in ${workdir}...`));
+        // 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';
+        console.log(chalk_1.default.dim(`\nStarting ${provider} session in ${workdir}...`));
         // Check for local dtach
         const dtachStatus = await ensureLocalDtach();
         if (dtachStatus === 'cancel') {
@@ -1364,14 +1375,14 @@ async function attachToLocalGenboxSession(session) {
         }
         const useDtach = dtachStatus === 'available';
         // Build command
-        const sessionName = `claude-${session.name}`;
+        const sessionName = `${provider}-${session.name}`;
         const socketPath = getDtachSocketPath(sessionName);
         let cmd;
         if (useDtach) {
-            cmd = `cd "${workdir}" && dtach -A "${socketPath}" claude --dangerously-skip-permissions`;
+            cmd = `cd "${workdir}" && dtach -A "${socketPath}" ${cliCommand}`;
         }
         else {
-            cmd = `cd "${workdir}" && claude --dangerously-skip-permissions`;
+            cmd = `cd "${workdir}" && ${cliCommand}`;
         }
         const proc = (0, child_process_1.spawn)('bash', ['-c', cmd], { stdio: 'inherit' });
         await new Promise((resolve) => {
@@ -1631,7 +1642,7 @@ async function createNewSessionInGenbox(genbox) {
     const sessionName = `${provider}-${Date.now().toString(36)}`;
     const cliCommand = provider === 'claude'
         ? 'claude --dangerously-skip-permissions'
-        : 'gemini';
+        : 'gemini --yolo';
     console.log(chalk_1.default.dim(`\nCreating ${provider} session in ${genbox.name}...`));
     if (genbox.type === 'local' && genbox._genboxSession) {
         const gs = genbox._genboxSession;
@@ -1886,7 +1897,7 @@ async function createCloudSessionOnGenbox(provider, workdir) {
         // Create dtach session on genbox
         const sessionName = `${provider}-${Date.now().toString(36)}`;
         const keyPath = getPrivateSshKey();
-        const cliCommand = provider === 'claude' ? 'claude --dangerously-skip-permissions' : provider === 'gemini' ? 'gemini' : 'codex';
+        const cliCommand = provider === 'claude' ? 'claude --dangerously-skip-permissions' : provider === 'gemini' ? 'gemini --yolo' : 'codex';
         // Ensure dtach is installed
         await ensureDtachInstalled(genbox.ipAddress, keyPath);
         // Create session in background using nohup with dtach

package/dist/lib/genbox-wizard.js

@@ -748,6 +748,52 @@ async function ensureUniqueName(name, workspace) {
         return { name, wasModified: false };
     }
 }
+/**
+ * Detect if current directory is a git repository and get its remote URL
+ */
+function detectGitRepo() {
+    try {
+        // Check if .git exists
+        if (!fs.existsSync(path.join(process.cwd(), '.git'))) {
+            return null;
+        }
+        // Get the remote origin URL
+        const remoteUrl = (0, child_process_1.execSync)('git remote get-url origin 2>/dev/null', {
+            encoding: 'utf8',
+            cwd: process.cwd(),
+        }).trim();
+        if (!remoteUrl) {
+            return null;
+        }
+        // Get current branch
+        let branch = 'main';
+        try {
+            branch = (0, child_process_1.execSync)('git rev-parse --abbrev-ref HEAD 2>/dev/null', {
+                encoding: 'utf8',
+                cwd: process.cwd(),
+            }).trim();
+        }
+        catch {
+            // Default to main if we can't detect
+        }
+        // Normalize URL: convert SSH URLs to HTTPS format for cloning
+        // git@github.com:user/repo.git -> github.com/user/repo
+        let normalizedUrl = remoteUrl;
+        if (remoteUrl.startsWith('git@')) {
+            normalizedUrl = remoteUrl.replace('git@', '').replace(':', '/');
+        }
+        if (normalizedUrl.startsWith('https://')) {
+            normalizedUrl = normalizedUrl.replace('https://', '');
+        }
+        if (normalizedUrl.endsWith('.git')) {
+            normalizedUrl = normalizedUrl.slice(0, -4);
+        }
+        return { url: normalizedUrl, branch };
+    }
+    catch {
+        return null;
+    }
+}
 /**
  * Create a cloud genbox
  */
@@ -759,9 +805,117 @@ async function createCloudGenbox(name, options = {}) {
         console.log(chalk_1.default.dim('  Run: gb login\n'));
         return { success: false, error: 'Not logged in' };
     }
-    // Build provider-specific payload
+    // Determine workspace and repos from config or current directory
+    let workspace = 'default';
+    let repos = {};
+    // Initialize provider payload early (needed for template selection)
     const providerPayload = {};
     const provider = options.provider || 'claude';
+    // Try to load genbox.yaml for configuration
+    const configLoader = new config_loader_1.ConfigLoader();
+    const loadResult = await configLoader.load();
+    if (loadResult.config) {
+        // Use config from genbox.yaml
+        const config = loadResult.config;
+        workspace = (config.project?.name || 'default').toLowerCase();
+        // Build repos from config
+        if (config.repos) {
+            for (const [repoName, repoConfig] of Object.entries(config.repos)) {
+                repos[repoName] = {
+                    url: repoConfig.url.replace('https://', ''),
+                    path: repoConfig.path || `/home/dev/${repoName}`,
+                    branch: repoConfig.branch || 'main',
+                };
+            }
+        }
+        console.log(chalk_1.default.dim(`  Using configuration from genbox.yaml`));
+    }
+    else {
+        // No genbox.yaml - try to detect current git repo
+        const gitRepo = detectGitRepo();
+        if (gitRepo) {
+            // Use current directory as the repo
+            workspace = path.basename(process.cwd()).toLowerCase();
+            const repoName = workspace;
+            repos[repoName] = {
+                url: gitRepo.url,
+                path: `/home/dev/${repoName}`,
+                branch: gitRepo.branch,
+            };
+            console.log(chalk_1.default.dim(`  Detected git repo: ${gitRepo.url} (branch: ${gitRepo.branch})`));
+        }
+        else {
+            // No config and no git repo - prompt for template selection
+            console.log(chalk_1.default.yellow('\n  No genbox.yaml or git repository found.'));
+            console.log(chalk_1.default.dim('  Would you like to create from a starter 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' };
+            }
+            // Show template selection
+            const templateChoices = templates.map(t => ({
+                name: `${t.icon} ${t.displayName} - ${chalk_1.default.dim(t.description)}`,
+                value: t.name,
+            }));
+            templateChoices.push({
+                name: chalk_1.default.dim('Cancel'),
+                value: '__cancel__',
+            });
+            let selectedTemplateName;
+            try {
+                selectedTemplateName = await (0, select_1.default)({
+                    message: 'Select a starter template:',
+                    choices: templateChoices,
+                    pageSize: 15,
+                });
+            }
+            catch {
+                return { success: false, error: 'Cancelled' };
+            }
+            if (selectedTemplateName === '__cancel__') {
+                return { success: false, error: 'Cancelled' };
+            }
+            const selectedTemplate = templates.find(t => t.name === selectedTemplateName);
+            if (!selectedTemplate) {
+                return { success: false, error: 'Template not found' };
+            }
+            // Set workspace to project name (lowercased)
+            workspace = name.toLowerCase();
+            // Set up template-based creation
+            if (selectedTemplate.createCommand) {
+                // Template uses create command (e.g., create-next-app)
+                providerPayload.template = selectedTemplate.name;
+                providerPayload.templateCreateCommand = selectedTemplate.createCommand.replace(/\{\{name\}\}/g, name);
+                if (selectedTemplate.setupCommands) {
+                    providerPayload.templateSetupCommands = selectedTemplate.setupCommands.map(cmd => cmd.replace(/\{\{name\}\}/g, name));
+                }
+                console.log(chalk_1.default.dim(`  Using template: ${selectedTemplate.displayName}`));
+            }
+            else if (selectedTemplate.repoUrl) {
+                // Template uses repo cloning
+                repos['main'] = {
+                    url: selectedTemplate.repoUrl,
+                    path: `/home/dev/${name}`,
+                    branch: selectedTemplate.branch || 'main',
+                };
+                if (selectedTemplate.setupCommands) {
+                    providerPayload.templateSetupCommands = selectedTemplate.setupCommands.map(cmd => cmd.replace(/\{\{name\}\}/g, name));
+                }
+                console.log(chalk_1.default.dim(`  Using template: ${selectedTemplate.displayName}`));
+            }
+        }
+    }
+    // Set provider-specific options
     if (provider === 'claude') {
         providerPayload.installClaudeCode = true;
     }
@@ -786,16 +940,22 @@ async function createCloudGenbox(name, options = {}) {
         // Codex doesn't need special installation - it's part of OpenAI CLI
         providerPayload.installClaudeCode = true; // Still install Claude as fallback
     }
+    // Get git config for commits
+    const gitConfig = (0, utils_1.getGitConfig)();
     console.log(chalk_1.default.dim(`\nCreating genbox ${name}...`));
     try {
-        // Create genbox
+        // Create genbox with repos
         const response = await (0, api_1.fetchApi)('/genboxes', {
             method: 'POST',
             body: JSON.stringify({
                 name,
                 size: 'small',
                 publicKey,
-                workspace: path.basename(process.cwd()),
+                workspace,
+                repos,
+                useStoredCredentials: true,
+                gitUserName: gitConfig.userName,
+                gitUserEmail: gitConfig.userEmail,
                 ...providerPayload,
                 ...options.payload,
             }),
@@ -1314,7 +1474,7 @@ async function createLocalVmGenbox(name, provider = 'claude', localOptions = {})
     const cliPackage = provider === 'gemini' ? '@google/gemini-cli' : '@anthropic-ai/claude-code';
     const cliCommand = provider === 'gemini' ? 'gemini' : 'claude';
     const helperName = provider === 'gemini' ? 'gem' : 'cld';
-    const helperFlags = provider === 'gemini' ? '--sandbox=false' : '--dangerously-skip-permissions';
+    const helperFlags = provider === 'gemini' ? '--yolo' : '--dangerously-skip-permissions';
     // Get user's SSH public key (before progress starts)
     const publicKey = getPublicSshKey();
     if (!publicKey) {
@@ -2075,7 +2235,6 @@ async function createCloudGenboxFromProject(config, configLoader, options) {
         console.log(chalk_1.default.dim('\nCancelled. Set a username first with: gb username set <name>'));
         return { success: false, error: 'No username set' };
     }
-    const workspace = usernameResult.username;
     console.log('');
     console.log(chalk_1.default.blue('Creating genbox from project...'));
     console.log(chalk_1.default.dim(`Project: ${config.project?.name || 'unknown'}`));
@@ -2113,7 +2272,8 @@ async function createCloudGenboxFromProject(config, configLoader, options) {
         return { success: false, error: 'Cancelled' };
     }
     // Check name availability and add incremental suffix if needed
-    const uniqueResult = await ensureUniqueName(name, workspace);
+    // Use username for uniqueness (names are unique per user)
+    const uniqueResult = await ensureUniqueName(name, usernameResult.username);
     if (uniqueResult.wasModified) {
         console.log(chalk_1.default.yellow(`  Name '${name}' is already in use, using '${uniqueResult.name}' instead`));
         name = uniqueResult.name;
@@ -2217,7 +2377,6 @@ async function createCloudGenboxFromTemplate(options) {
         console.log(chalk_1.default.dim('\nCancelled. Set a username first with: gb username set <name>'));
         return { success: false, error: 'No username set' };
     }
-    const workspace = usernameResult.username;
     console.log('');
     console.log(chalk_1.default.blue('No genbox.yaml found - creating from template...'));
     console.log('');
@@ -2265,7 +2424,8 @@ async function createCloudGenboxFromTemplate(options) {
         return { success: false, error: 'Cancelled' };
     }
     // Check name availability and add incremental suffix if needed
-    const uniqueResult = await ensureUniqueName(name, workspace);
+    // Use username for uniqueness (names are unique per user)
+    const uniqueResult = await ensureUniqueName(name, usernameResult.username);
     if (uniqueResult.wasModified) {
         console.log(chalk_1.default.yellow(`  Name '${name}' is already in use, using '${uniqueResult.name}' instead`));
         name = uniqueResult.name;

package/package.json

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