genbox 1.0.194 → 1.0.196

package/dist/commands/connect.js

@@ -42,7 +42,6 @@ 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 local_session_manager_1 = require("../lib/local-session-manager");
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
@@ -101,11 +100,23 @@ exports.connectCommand = new commander_1.Command('connect')
             });
             return;
         }
-        // Handle local genbox without VM - attach to session
+        // Handle local genbox without VM - attach to session (native mode)
         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)();
-            await manager.attachToSession(localSession);
+            // For native sessions, attach via dtach
+            const socketPath = path.join(os.homedir(), '.genbox', 'sockets', `${localSession.name}.sock`);
+            if (fs.existsSync(socketPath)) {
+                const dtach = (0, child_process_1.spawn)('dtach', ['-a', socketPath], { stdio: 'inherit' });
+                dtach.on('close', (code) => {
+                    if (code !== 0) {
+                        console.log(chalk_1.default.dim(`Session detached with code ${code}`));
+                    }
+                });
+            }
+            else {
+                console.error(chalk_1.default.yellow(`Session socket not found: ${socketPath}`));
+                console.log(chalk_1.default.dim(`The session may have ended. Use 'gb session' to start a new one.`));
+            }
             return;
         }
         if (!target.ipAddress) {

package/dist/commands/create.js

@@ -45,8 +45,8 @@ const fs = __importStar(require("fs"));
 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 unified_session_1 = require("../lib/unified-session");
 const profile_resolver_1 = require("../profile-resolver");
 const api_1 = require("../api");
 const ssh_config_1 = require("../ssh-config");
@@ -486,19 +486,30 @@ async function createLocalGenboxFullReplica(nameArg, options, config, configLoad
 }
 /**
  * Create a simple local genbox (no genbox.yaml)
- * By default creates an isolated session with git worktree
+ * Now simplified to use UnifiedSessionManager for native sessions
+ * For docker/multipass, users should use 'gb local' command
  */
 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';
+    // For docker/multipass isolation, redirect to 'gb local' command
+    if (isolation !== 'native') {
+        console.log('');
+        console.log(chalk_1.default.yellow('Docker and Multipass isolation requires the full genbox setup.'));
+        console.log('');
+        console.log(chalk_1.default.dim('For isolated container/VM environments, use:'));
+        console.log(chalk_1.default.cyan(`  gb local ${nameArg || ''}`));
+        console.log('');
+        console.log(chalk_1.default.dim('For a simple native session (no container), use:'));
+        console.log(chalk_1.default.cyan(`  gb create --local --native ${nameArg || ''}`));
+        console.log('');
+        return;
+    }
     // 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(chalk_1.default.blue('=== Create Local Native Session ==='));
         console.log('');
         name = await promptForName(false);
     }
@@ -506,108 +517,39 @@ async function createLocalGenboxSimple(nameArg, options) {
         // 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.dim('───────────────────────────────────────────────'));
     console.log(`  ${chalk_1.default.bold('Name:')}      ${name}`);
-    console.log(`  ${chalk_1.default.bold('Type:')}      ${isolation}`);
+    console.log(`  ${chalk_1.default.bold('Type:')}      native`);
     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('');
     try {
-        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;
-            }
-        }
+        const manager = (0, unified_session_1.getUnifiedSessionManager)();
+        const spinner = (0, ora_1.default)('Creating native session...').start();
+        const session = await manager.createSession({
+            type: 'native',
+            provider: provider,
+            name,
+            projectPath: process.cwd(),
+            syncEnabled: false,
+        });
+        spinner.succeed(chalk_1.default.green('Native session created!'));
         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('Provider:')}   ${session.provider}`);
-        console.log(`  ${chalk_1.default.bold('Isolation:')}  ${session.isolation}`);
+        console.log(`  ${chalk_1.default.bold('Type:')}       ${session.type}`);
         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)}`);
-        }
-        if (session.vmName) {
-            console.log(`  ${chalk_1.default.bold('VM:')}         ${session.vmName}`);
-        }
         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(`  Start:    ${chalk_1.default.cyan(`gb ${session.provider} ${session.name}`)}`);
         console.log(`  Attach:   ${chalk_1.default.cyan(`gb session ${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(`  Status:   ${chalk_1.default.cyan(`gb session list`)}`);
         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) {

package/dist/commands/destroy.js

@@ -46,7 +46,7 @@ const ora_1 = __importDefault(require("ora"));
 const api_1 = require("../api");
 const genbox_selector_1 = require("../genbox-selector");
 const ssh_config_1 = require("../ssh-config");
-const local_session_manager_1 = require("../lib/local-session-manager");
+const unified_session_1 = require("../lib/unified-session");
 const local_genbox_provisioner_1 = require("../lib/local-genbox-provisioner");
 /**
  * Format genbox for display in selection list
@@ -403,8 +403,8 @@ async function destroyLocalGenbox(session, options) {
     }
     const spinner = (0, ora_1.default)(`Destroying local genbox ${session.name}...`).start();
     try {
-        const manager = (0, local_session_manager_1.getLocalSessionManager)();
-        await manager.destroySession(session.id);
+        const manager = (0, unified_session_1.getUnifiedSessionManager)();
+        await manager.deleteSession(session.id);
         spinner.succeed(chalk_1.default.green(`Local genbox '${session.name}' destroyed successfully.`));
     }
     catch (error) {

package/dist/commands/provider-command.js

@@ -59,6 +59,7 @@ const prompts_1 = require("@inquirer/prompts");
 const config_store_1 = require("../config-store");
 const api_1 = require("../api");
 const ssh_keys_1 = require("../utils/ssh-keys");
+const unified_session_1 = require("../lib/unified-session");
 const child_process_1 = require("child_process");
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
@@ -417,11 +418,19 @@ async function startDirectSession(provider) {
     }
     const useDtach = dtachStatus === 'available';
     ensureLocalSocketDir();
-    const sessionName = `${provider}-${Date.now().toString(36)}`;
+    // Register session with UnifiedSessionManager (local-first, no API sync by default)
+    const sessionManager = (0, unified_session_1.getUnifiedSessionManager)();
+    const session = await sessionManager.createSession({
+        type: 'native',
+        provider: provider,
+        projectPath: process.cwd(),
+        syncEnabled: false, // Local-first: no API sync by default
+    });
+    const sessionName = session.name;
     const cliCommand = provider === 'claude'
         ? 'claude --dangerously-skip-permissions'
         : provider === 'gemini'
-            ? 'gemini'
+            ? 'gemini --yolo'
             : 'codex';
     console.log(chalk_1.default.dim(`\nStarting ${provider} session...`));
     if (useDtach) {
@@ -431,6 +440,13 @@ async function startDirectSession(provider) {
         console.log(chalk_1.default.dim('Note: Session will end when you exit (no persistence)\n'));
     }
     const socketPath = path.join(getDtachSocketDir(), `${sessionName}.sock`);
+    // Update socket name in session record
+    await sessionManager.updateSession(session.id, {
+        infrastructure: {
+            dtachSocketName: sessionName,
+            dtachSocketPath: socketPath,
+        },
+    });
     let cmd;
     if (useDtach) {
         cmd = `dtach -A "${socketPath}" bash -c '${cliCommand}'`;
@@ -438,6 +454,8 @@ async function startDirectSession(provider) {
     else {
         cmd = cliCommand;
     }
+    // Mark session as running
+    await sessionManager.markRunning(session.id);
     const proc = (0, child_process_1.spawn)('bash', ['-c', cmd], { stdio: 'inherit' });
     await new Promise((resolve) => {
         proc.on('close', () => {
@@ -447,6 +465,8 @@ async function startDirectSession(provider) {
             }
             else {
                 console.log(chalk_1.default.dim('\nSession ended.'));
+                // Mark session as stopped if not using dtach or socket doesn't exist
+                sessionManager.markStopped(session.id);
             }
             resolve();
         });

package/dist/commands/session/index.js

@@ -53,10 +53,9 @@ exports.sessionCommand = void 0;
 const commander_1 = require("commander");
 const chalk_1 = __importDefault(require("chalk"));
 const select_1 = __importDefault(require("@inquirer/select"));
-const local_session_manager_1 = require("../../lib/local-session-manager");
+const unified_session_1 = require("../../lib/unified-session");
 const local_orchestrator_1 = require("../../lib/local-orchestrator");
 const local_genbox_provisioner_1 = require("../../lib/local-genbox-provisioner");
-const native_session_manager_1 = require("../../lib/native-session-manager");
 const hooks_configurator_1 = require("../../lib/hooks-configurator");
 const api_1 = require("../../api");
 const genbox_selector_1 = require("../../genbox-selector");
@@ -1385,31 +1384,15 @@ async function attachToLocalGenboxSession(session) {
  * Create new local session interactively
  */
 async function createNewLocalSession() {
-    const manager = (0, local_session_manager_1.getLocalSessionManager)();
-    // Get provider
-    let provider;
-    try {
-        provider = await (0, select_1.default)({
-            message: 'Which AI provider?',
-            choices: [
-                { name: 'Claude (Anthropic)', value: 'claude' },
-                { name: 'Gemini (Google)', value: 'gemini' },
-            ],
-        });
-    }
-    catch {
-        console.log(chalk_1.default.dim('\nCancelled.'));
-        return;
-    }
-    // Get isolation
+    // Redirect to the native session flow (or show guidance for docker/multipass)
     let isolation;
     try {
         isolation = await (0, select_1.default)({
             message: 'Isolation level?',
             choices: [
+                { name: 'Native (no isolation)', value: 'native' },
                 { name: 'Docker (fast, lightweight)', value: 'docker' },
                 { name: 'VM (full isolation)', value: 'multipass' },
-                { name: 'Native (no isolation)', value: 'native' },
             ],
         });
     }
@@ -1417,20 +1400,17 @@ async function createNewLocalSession() {
         console.log(chalk_1.default.dim('\nCancelled.'));
         return;
     }
-    console.log(chalk_1.default.dim(`\nCreating ${isolation} session with ${provider}...`));
-    try {
-        const session = await manager.createSession({
-            provider,
-            isolation,
-            workdir: process.cwd(),
-        });
-        console.log(chalk_1.default.green(`\nSession created: ${session.name}`));
-        console.log(chalk_1.default.dim('\nAttaching to session...\n'));
-        await manager.attachToSession(session);
-        console.log(chalk_1.default.dim('\nDetached from session.'));
+    if (isolation === 'native') {
+        // Use the native session flow with UnifiedSessionManager
+        await createNativeSession();
     }
-    catch (error) {
-        console.error(chalk_1.default.red(`\nError: ${error.message}`));
+    else {
+        // Docker/multipass sessions require gb local or gb session start
+        console.log(chalk_1.default.yellow(`\n${isolation} sessions require additional setup.`));
+        console.log(chalk_1.default.dim('\nFor quick start, use native mode:'));
+        console.log(chalk_1.default.cyan('  gb session start --native'));
+        console.log(chalk_1.default.dim('\nOr create a local genbox:'));
+        console.log(chalk_1.default.cyan('  gb local'));
     }
 }
 /**
@@ -1445,7 +1425,7 @@ async function createNewCloudSession() {
  * Attach to specific session by name
  */
 async function attachToSessionByName(name, options) {
-    const manager = (0, local_session_manager_1.getLocalSessionManager)();
+    const sessionManager = (0, unified_session_1.getUnifiedSessionManager)();
     // Check local genbox sessions FIRST (from LocalGenboxProvisioner)
     // These have more complete info and better attachment handling
     const genboxSessions = getLocalGenboxSessions();
@@ -1454,13 +1434,23 @@ async function attachToSessionByName(name, options) {
         await attachToLocalGenboxSession(genboxSession);
         return;
     }
-    // Check simple local sessions (older-style sessions)
-    const localSession = await manager.getSessionByName(name);
-    if (localSession) {
-        console.log(chalk_1.default.dim(`\nAttaching to local session ${name}...\n`));
-        await manager.attachToSession(localSession);
-        console.log(chalk_1.default.dim('\nDetached from session.'));
-        return;
+    // Check native sessions (via UnifiedSessionManager)
+    const unifiedSession = sessionManager.getSessionByName(name);
+    if (unifiedSession && unifiedSession.type === 'native') {
+        // Attach using dtach
+        const socketPath = getDtachSocketPath(unifiedSession.name);
+        if (isDtachSocketAlive(socketPath)) {
+            console.log(chalk_1.default.dim(`\nAttaching to session ${name}...`));
+            console.log(chalk_1.default.dim('Tip: Detach with Ctrl+\\\n'));
+            const proc = (0, child_process_1.spawn)('dtach', ['-a', socketPath], { stdio: 'inherit' });
+            await new Promise(resolve => proc.on('close', () => resolve()));
+            console.log(chalk_1.default.dim('\nDetached from session.'));
+            return;
+        }
+        else {
+            console.log(chalk_1.default.yellow(`Session ${name} is not running.`));
+            return;
+        }
     }
     // Check cloud sessions
     const cloudSessions = await getCloudSessions(options.all || false);
@@ -1727,7 +1717,7 @@ async function createNewSessionInGenbox(genbox) {
  * With tracking enabled via genbox-agent hooks
  */
 async function createNativeSession(options) {
-    const nativeManager = (0, native_session_manager_1.getNativeSessionManager)();
+    const sessionManager = (0, unified_session_1.getUnifiedSessionManager)();
     const hooksConfigurator = (0, hooks_configurator_1.getHooksConfigurator)();
     // Select AI provider first
     let provider;
@@ -1763,30 +1753,19 @@ async function createNativeSession(options) {
             console.log(chalk_1.default.dim('Session will run without tracking.'));
         }
     }
-    // Create session record
-    const session = await nativeManager.createSession({
+    // Create session record with UnifiedSessionManager (local-first, no API sync by default)
+    const session = await sessionManager.createSession({
+        type: 'native',
         provider,
         projectPath: process.cwd(),
-        noTracking: options?.noTracking,
+        syncEnabled: false, // Local-first: no API sync by default
     });
     console.log(chalk_1.default.dim(`Session created: ${session.name}`));
-    // Build environment variables for the session
-    const sessionEnv = nativeManager.getSessionEnv(session);
-    const envExports = Object.entries(sessionEnv)
-        .map(([key, value]) => `export ${key}="${value}"`)
-        .join('; ');
     // CLI command with skip permissions flag
     const cliCommand = provider === 'claude'
         ? 'claude --dangerously-skip-permissions'
-        : 'gemini';
-    // Show status
-    if (session.apiSessionId) {
-        console.log(chalk_1.default.green(`Tracking enabled (session: ${session.apiSessionId})`));
-        console.log(chalk_1.default.dim(`View in dashboard: ${process.env.GENBOX_DASHBOARD_URL || 'https://dashboard.genbox.dev'}/sessions/${session.apiSessionId}`));
-    }
-    else {
-        console.log(chalk_1.default.yellow('Running without tracking (not logged in or API unavailable)'));
-    }
+        : 'gemini --yolo';
+    // Local-first: no API tracking status to show
     console.log(chalk_1.default.dim('\nStarting session...'));
     if (useDtach) {
         console.log(chalk_1.default.dim('Tip: Detach with Ctrl+\\\n'));
@@ -1795,15 +1774,15 @@ async function createNativeSession(options) {
         console.log(chalk_1.default.dim('Note: Session will end when you exit (no persistence)\n'));
     }
     // Mark session as running
-    nativeManager.markRunning(session.id);
+    await sessionManager.markRunning(session.id);
     // Build the command
     const socketPath = getDtachSocketPath(session.name);
     let cmd;
     if (useDtach) {
-        cmd = `dtach -A "${socketPath}" bash -c '${envExports}; ${cliCommand}'`;
+        cmd = `dtach -A "${socketPath}" bash -c '${cliCommand}'`;
     }
     else {
-        cmd = `bash -c '${envExports}; ${cliCommand}'`;
+        cmd = cliCommand;
     }
     const proc = (0, child_process_1.spawn)('bash', ['-c', cmd], { stdio: 'inherit' });
     await new Promise((resolve) => {
@@ -1816,12 +1795,12 @@ async function createNativeSession(options) {
                     console.log(chalk_1.default.dim(`Reattach with: ${chalk_1.default.cyan(`gb session ${session.name}`)}`));
                 }
                 else {
-                    nativeManager.markStopped(session.id);
+                    sessionManager.markStopped(session.id);
                     console.log(chalk_1.default.dim('\nSession ended.'));
                 }
             }
             else {
-                nativeManager.markStopped(session.id);
+                sessionManager.markStopped(session.id);
                 console.log(chalk_1.default.dim('\nSession ended.'));
             }
             resolve();
@@ -1841,46 +1820,31 @@ function isDtachSessionRunning(sessionName) {
     }
 }
 /**
- * Send initial prompt to a session
+ * Send initial prompt to a session (not implemented for unified sessions)
  */
-async function sendInitialPrompt(session, prompt) {
-    const manager = (0, local_session_manager_1.getLocalSessionManager)();
-    // Wait for CLI to be ready
-    await new Promise(resolve => setTimeout(resolve, 2000));
-    try {
-        await manager.sendPromptToSession(session, prompt);
-        console.log(chalk_1.default.dim(`Sent initial prompt: "${prompt.slice(0, 50)}${prompt.length > 50 ? '...' : ''}"`));
-    }
-    catch (error) {
-        console.log(chalk_1.default.yellow(`Warning: Could not send initial prompt: ${error.message}`));
-    }
+async function sendInitialPrompt(_session, prompt) {
+    // Note: Sending prompts to running sessions requires terminal integration
+    // This is a placeholder for future implementation
+    console.log(chalk_1.default.dim(`Initial prompt provided: "${prompt.slice(0, 50)}${prompt.length > 50 ? '...' : ''}"`));
+    console.log(chalk_1.default.yellow('Note: Auto-sending prompts to sessions is not yet supported.'));
 }
 /**
  * Quick local session shortcut
  */
 async function quickLocalSession(options) {
-    const manager = (0, local_session_manager_1.getLocalSessionManager)();
     const provider = options.gemini ? 'gemini' : 'claude';
     const isolation = options.vm ? 'multipass' : options.native ? 'native' : 'docker';
-    console.log(chalk_1.default.dim(`\nCreating ${isolation} session with ${provider}...`));
-    try {
-        const session = await manager.createSession({
-            provider,
-            isolation,
-            workdir: process.cwd(),
-        });
-        console.log(chalk_1.default.green(`\nSession created: ${session.name}`));
-        // Send initial prompt if provided
-        if (options.prompt) {
-            await sendInitialPrompt(session, options.prompt);
-        }
-        console.log(chalk_1.default.dim('\nAttaching to session...\n'));
-        await manager.attachToSession(session);
-        console.log(chalk_1.default.dim('\nDetached from session.'));
-    }
-    catch (error) {
-        console.error(chalk_1.default.red(`\nError: ${error.message}`));
+    // For native sessions, use the unified session flow
+    if (isolation === 'native') {
+        await createNativeSession({ prompt: options.prompt });
+        return;
     }
+    // For docker/multipass, show guidance
+    console.log(chalk_1.default.yellow(`\n${isolation} sessions require additional setup.`));
+    console.log(chalk_1.default.dim('\nFor quick start, use native mode:'));
+    console.log(chalk_1.default.cyan(`  gb session start --native --${provider}`));
+    console.log(chalk_1.default.dim('\nOr create a local genbox:'));
+    console.log(chalk_1.default.cyan('  gb local'));
 }
 /**
  * Create a cloud session on an existing genbox
@@ -2075,9 +2039,24 @@ async function handleMultiSession(options, providerArgs) {
             }
             // Attach to selected session
             if (selectedSession.location === 'local') {
-                const manager = (0, local_session_manager_1.getLocalSessionManager)();
-                console.log(chalk_1.default.dim(`\nAttaching to ${selectedSession.session.name}...\n`));
-                await manager.attachToSession(selectedSession.session);
+                const localSession = selectedSession.session;
+                console.log(chalk_1.default.dim(`\nAttaching to ${localSession.name}...\n`));
+                // For native sessions, use dtach directly
+                if (localSession.isolation === 'native') {
+                    const socketPath = getDtachSocketPath(localSession.name);
+                    if (isDtachSocketAlive(socketPath)) {
+                        console.log(chalk_1.default.dim('Tip: Detach with Ctrl+\\\n'));
+                        const proc = (0, child_process_1.spawn)('dtach', ['-a', socketPath], { stdio: 'inherit' });
+                        await new Promise(resolve => proc.on('close', () => resolve()));
+                    }
+                    else {
+                        console.log(chalk_1.default.yellow('Session is not running.'));
+                    }
+                }
+                else {
+                    // For docker/multipass, redirect to gb local
+                    console.log(chalk_1.default.yellow('Use `gb local attach` for docker/multipass sessions.'));
+                }
                 console.log(chalk_1.default.dim('\nDetached from session.'));
             }
             else {