genbox 1.0.141 → 1.0.142

package/dist/commands/attach.js

@@ -45,6 +45,7 @@ const child_process_1 = require("child_process");
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
+const inquirer_1 = __importDefault(require("inquirer"));
 function getPrivateSshKey() {
     const home = os.homedir();
     const potentialKeys = [
@@ -85,13 +86,40 @@ set -g window-status-format ' #W '
 `.trim();
 async function listTmuxSessions(ipAddress, keyPath) {
     try {
-        const result = (0, child_process_1.execSync)(`ssh -i "${keyPath}" -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dev@${ipAddress} "tmux list-sessions -F '#{session_name}'" 2>/dev/null`, { encoding: 'utf-8' });
-        return result.trim().split('\n').filter(s => s.length > 0);
+        const result = (0, child_process_1.execSync)(`ssh -i "${keyPath}" -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dev@${ipAddress} "tmux list-sessions -F '#{session_name}|#{session_windows}|#{session_created}|#{session_attached}'" 2>/dev/null`, { encoding: 'utf-8' });
+        return result.trim().split('\n').filter(s => s.length > 0).map(line => {
+            const [name, windows, created, attached] = line.split('|');
+            return {
+                name,
+                windows: parseInt(windows) || 1,
+                created: new Date(parseInt(created) * 1000).toLocaleTimeString(),
+                attached: attached === '1',
+            };
+        });
     }
     catch {
         return [];
     }
 }
+async function selectSession(sessions) {
+    const choices = sessions.map(s => ({
+        name: `${s.name}${s.attached ? chalk_1.default.green(' (attached)') : ''} ${chalk_1.default.dim(`- ${s.windows} window(s), started ${s.created}`)}`,
+        value: s.name,
+    }));
+    choices.push({
+        name: chalk_1.default.dim('Cancel'),
+        value: '__cancel__',
+    });
+    const { session } = await inquirer_1.default.prompt([
+        {
+            type: 'list',
+            name: 'session',
+            message: 'Select a session to attach:',
+            choices,
+        },
+    ]);
+    return session === '__cancel__' ? null : session;
+}
 async function ensureTmuxConfig(ipAddress, keyPath) {
     const configPath = '/home/dev/.tmux.conf';
     const marker = '# GENBOX_BRANDED_CONFIG';
@@ -116,12 +144,11 @@ GENBOX_TMUX_EOF`, { encoding: 'utf-8' });
 exports.attachCommand = new commander_1.Command('attach')
     .description('Attach to an active Claude/AI session in a Genbox')
     .argument('[name]', 'Name of the Genbox (optional - will prompt if not provided)')
-    .option('-s, --session <session>', 'Tmux session name to attach to')
+    .option('-s, --session <session>', 'Tmux session name to attach to directly')
     .option('-a, --all', 'Select from all genboxes (not just current project)')
-    .option('-l, --list', 'List available sessions without attaching')
     .action(async (name, options) => {
     try {
-        // 1. Select Genbox
+        // 1. Select Genbox (interactive if no name provided)
         const { genbox: target, cancelled } = await (0, genbox_selector_1.selectGenbox)(name, {
             all: options.all,
             selectMessage: 'Select a genbox to attach to:',
@@ -140,45 +167,48 @@ exports.attachCommand = new commander_1.Command('attach')
         // 2. Get SSH key
         const keyPath = getPrivateSshKey();
         // 3. List available tmux sessions
+        console.log(chalk_1.default.dim(`Checking sessions on ${target.name}...`));
         const sessions = await listTmuxSessions(target.ipAddress, keyPath);
         if (sessions.length === 0) {
-            console.log(chalk_1.default.yellow('No active sessions found.'));
-            console.log(chalk_1.default.dim('Start a new Claude session with: gb run-prompt <genbox>'));
-            return;
-        }
-        if (options.list) {
-            console.log(chalk_1.default.bold(`\nActive sessions in ${target.name}:\n`));
-            for (const session of sessions) {
-                console.log(`  ${chalk_1.default.cyan('•')} ${session}`);
-            }
-            console.log('');
-            console.log(chalk_1.default.dim(`Attach with: gb attach ${target.name} -s <session>`));
+            console.log(chalk_1.default.yellow('\nNo active sessions found.'));
+            console.log(chalk_1.default.dim('Start a new Claude session with: gb run-prompt ' + target.name));
             return;
         }
         // 4. Determine which session to attach to
         let sessionName = options.session;
         if (!sessionName) {
-            // Default to claude-session if it exists, otherwise first session
-            if (sessions.includes('claude-session')) {
-                sessionName = 'claude-session';
+            if (sessions.length === 1) {
+                // Only one session - attach directly
+                sessionName = sessions[0].name;
+                console.log(chalk_1.default.dim(`Found session: ${sessionName}`));
             }
             else {
-                sessionName = sessions[0];
+                // Multiple sessions - show interactive picker
+                console.log('');
+                sessionName = await selectSession(sessions);
+                if (!sessionName) {
+                    console.log(chalk_1.default.dim('Cancelled.'));
+                    return;
+                }
             }
         }
-        if (!sessions.includes(sessionName)) {
-            console.error(chalk_1.default.red(`Session '${sessionName}' not found.`));
-            console.log(chalk_1.default.dim('Available sessions:'));
-            for (const s of sessions) {
-                console.log(`  ${chalk_1.default.cyan('•')} ${s}`);
+        else {
+            // Validate the provided session name
+            const sessionNames = sessions.map(s => s.name);
+            if (!sessionNames.includes(sessionName)) {
+                console.error(chalk_1.default.red(`\nSession '${sessionName}' not found.`));
+                console.log(chalk_1.default.dim('Available sessions:'));
+                for (const s of sessions) {
+                    console.log(`  ${chalk_1.default.cyan('•')} ${s.name}`);
+                }
+                return;
             }
-            return;
         }
         // 5. Ensure tmux is configured with branding
         console.log(chalk_1.default.dim(`Setting up terminal...`));
         await ensureTmuxConfig(target.ipAddress, keyPath);
         // 6. Attach to session
-        console.log(chalk_1.default.dim(`Attaching to ${chalk_1.default.bold(sessionName)} on ${chalk_1.default.bold(target.name)}...`));
+        console.log(chalk_1.default.dim(`\nAttaching to ${chalk_1.default.bold(sessionName)} on ${chalk_1.default.bold(target.name)}...`));
         console.log(chalk_1.default.dim('Tip: Scroll with mouse wheel, detach with Ctrl+b d\n'));
         const sshArgs = [
             '-t', // Force pseudo-terminal allocation

package/package.json

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