genbox 1.0.164 → 1.0.165

package/dist/commands/attach.js

@@ -153,18 +153,48 @@ function extractLocalImagePath(text) {
     }
     return { path: null };
 }
+// SSH ControlMaster for faster subsequent connections
+function getControlPath(ipAddress) {
+    return `/tmp/genbox-ssh-${ipAddress}`;
+}
+function setupSshMultiplexing(ipAddress, keyPath) {
+    const controlPath = getControlPath(ipAddress);
+    // Check if master connection already exists
+    const checkResult = (0, child_process_1.spawnSync)('ssh', [
+        '-O', 'check',
+        '-o', `ControlPath=${controlPath}`,
+        `dev@${ipAddress}`
+    ], { stdio: 'ignore' });
+    if (checkResult.status === 0) {
+        return; // Already connected
+    }
+    // Start master connection in background
+    (0, child_process_1.spawn)('ssh', [
+        '-i', keyPath,
+        '-o', 'StrictHostKeyChecking=no',
+        '-o', 'UserKnownHostsFile=/dev/null',
+        '-o', 'ControlMaster=yes',
+        '-o', `ControlPath=${controlPath}`,
+        '-o', 'ControlPersist=10m',
+        '-fN', // Background, no command
+        `dev@${ipAddress}`
+    ], { stdio: 'ignore', detached: true });
+}
 function uploadFileSync(localPath, ipAddress, keyPath) {
     const fileName = path.basename(localPath);
     const timestamp = Date.now();
     const remotePath = `/home/dev/uploads/${timestamp}-${fileName}`;
+    const controlPath = getControlPath(ipAddress);
     try {
-        // Ensure uploads directory exists
-        (0, child_process_1.execSync)(`ssh -i "${keyPath}" -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dev@${ipAddress} "mkdir -p /home/dev/uploads" 2>/dev/null`, { encoding: 'utf-8', timeout: 10000 });
-        // Upload file
+        // Ensure uploads directory exists (uses multiplexed connection if available)
+        (0, child_process_1.execSync)(`ssh -i "${keyPath}" -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ControlPath=${controlPath} dev@${ipAddress} "mkdir -p /home/dev/uploads" 2>/dev/null`, { encoding: 'utf-8', timeout: 10000 });
+        // Upload file with compression and multiplexing
         const result = (0, child_process_1.spawnSync)('scp', [
             '-i', keyPath,
             '-o', 'StrictHostKeyChecking=no',
             '-o', 'UserKnownHostsFile=/dev/null',
+            '-o', `ControlPath=${controlPath}`,
+            '-C', // Enable compression
             localPath,
             `dev@${ipAddress}:${remotePath}`
         ], { timeout: 60000 });
@@ -177,6 +207,17 @@ function uploadFileSync(localPath, ipAddress, keyPath) {
         return { success: false, remotePath: '', error: error.message };
     }
 }
+// Show message in tmux status bar
+function showTmuxMessage(ipAddress, keyPath, sessionName, message) {
+    const controlPath = getControlPath(ipAddress);
+    try {
+        // Send message to tmux session's status bar
+        (0, child_process_1.execSync)(`ssh -i "${keyPath}" -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ControlPath=${controlPath} dev@${ipAddress} "tmux display-message -t ${sessionName} -d 3000 '${message.replace(/'/g, "\\'")}'" 2>/dev/null`, { encoding: 'utf-8', timeout: 5000 });
+    }
+    catch {
+        // Fallback to macOS notification if tmux message fails
+    }
+}
 function getPrivateSshKey() {
     const home = os.homedir();
     const potentialKeys = [
@@ -450,8 +491,10 @@ async function attachToSession(ipAddress, keyPath, sessionName, genboxName) {
     console.log(chalk_1.default.dim(`\nAttaching to ${chalk_1.default.bold(sessionName)} on ${chalk_1.default.bold(genboxName)}...`));
     console.log(chalk_1.default.dim('Detach: Ctrl+b d'));
     console.log('');
-    console.log(chalk_1.default.yellow('📋 Image Upload Active') + chalk_1.default.dim(' - Drag image → select path → Cmd+C → wait for ✓ → Cmd+V'));
-    console.log(chalk_1.default.dim('   Watching clipboard for local image paths...\n'));
+    console.log(chalk_1.default.yellow('📋 Image Upload Active') + chalk_1.default.dim(' - Cmd+C image file → wait for tmux message → Cmd+V'));
+    console.log(chalk_1.default.dim('   Setting up fast upload connection...\n'));
+    // Set up SSH multiplexing for faster uploads
+    setupSshMultiplexing(ipAddress, keyPath);
     const sshArgs = [
         '-t',
         '-i', keyPath,
@@ -480,13 +523,7 @@ async function attachToSession(ipAddress, keyPath, sessionName, genboxName) {
             // If file path was detected but file doesn't exist (e.g., macOS temp file was cleaned up)
             if (extractResult.notFound) {
                 const fileName = path.basename(extractResult.notFound);
-                // Use macOS notification since tmux obscures stderr
-                if (os.platform() === 'darwin') {
-                    try {
-                        (0, child_process_1.execSync)(`osascript -e 'display notification "File not found: ${fileName.replace(/'/g, "\\'")}" with title "Genbox" sound name "Basso"'`, { stdio: 'ignore' });
-                    }
-                    catch { }
-                }
+                showTmuxMessage(ipAddress, keyPath, sessionName, '⚠ File not found: ' + fileName.substring(0, 30));
                 return;
             }
             if (!extractResult.path) {
@@ -497,13 +534,8 @@ async function attachToSession(ipAddress, keyPath, sessionName, genboxName) {
             if (uploadedPaths.has(localPath)) {
                 return;
             }
-            // Show uploading notification
-            if (os.platform() === 'darwin') {
-                try {
-                    (0, child_process_1.execSync)(`osascript -e 'display notification "Uploading to genbox..." with title "📤 Image Detected"'`, { stdio: 'ignore' });
-                }
-                catch { }
-            }
+            // Show uploading message in tmux
+            showTmuxMessage(ipAddress, keyPath, sessionName, '📤 Uploading image... please wait');
             // Upload the file (this happens in background, might cause brief pause)
             const result = uploadFileSync(localPath, ipAddress, keyPath);
             if (result.success) {
@@ -511,22 +543,12 @@ async function attachToSession(ipAddress, keyPath, sessionName, genboxName) {
                 uploadedPaths.add(result.remotePath); // Also track remote path to avoid re-detection
                 // Replace clipboard with remote path
                 setClipboard(result.remotePath);
-                // Use macOS notification since tmux obscures stderr
-                if (os.platform() === 'darwin') {
-                    try {
-                        (0, child_process_1.execSync)(`osascript -e 'display notification "Copied to clipboard! Cmd+V to paste." with title "✓ Uploaded" sound name "Glass"'`, { stdio: 'ignore' });
-                    }
-                    catch { }
-                }
+                // Show success in tmux
+                showTmuxMessage(ipAddress, keyPath, sessionName, '✓ Image ready! Press Cmd+V to paste');
             }
             else {
-                // Notification for failure
-                if (os.platform() === 'darwin') {
-                    try {
-                        (0, child_process_1.execSync)(`osascript -e 'display notification "Upload failed: ${(result.error || 'unknown').replace(/'/g, "\\'")}" with title "Genbox" sound name "Basso"'`, { stdio: 'ignore' });
-                    }
-                    catch { }
-                }
+                // Show failure in tmux
+                showTmuxMessage(ipAddress, keyPath, sessionName, '✗ Upload failed: ' + (result.error || 'unknown'));
             }
         }
         catch {

package/package.json

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