genbox 1.0.168 → 1.0.170

package/dist/commands/attach.js

@@ -50,8 +50,9 @@ const confirm_1 = __importDefault(require("@inquirer/confirm"));
 // Image extensions we handle for auto-upload
 const IMAGE_EXTENSIONS = ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.bmp', '.svg', '.ico', '.heic', '.tiff'];
 function getClipboard() {
+    const platform = os.platform();
     try {
-        if (os.platform() === 'darwin') {
+        if (platform === 'darwin') {
             // First, try to get file path if a file was copied (Cmd+C on a file in Finder)
             try {
                 const filePath = (0, child_process_1.execSync)(`osascript -e 'POSIX path of (the clipboard as «class furl»)' 2>/dev/null`, { encoding: 'utf-8' }).trim();
@@ -65,7 +66,8 @@ function getClipboard() {
             // Fall back to text clipboard
             return (0, child_process_1.execSync)('pbpaste 2>/dev/null', { encoding: 'utf-8' }).trim();
         }
-        else if (os.platform() === 'linux') {
+        else if (platform === 'linux') {
+            // Linux: Try xclip first, then xsel
             try {
                 return (0, child_process_1.execSync)('xclip -selection clipboard -o 2>/dev/null', { encoding: 'utf-8' }).trim();
             }
@@ -73,6 +75,20 @@ function getClipboard() {
                 return (0, child_process_1.execSync)('xsel --clipboard --output 2>/dev/null', { encoding: 'utf-8' }).trim();
             }
         }
+        else if (platform === 'win32') {
+            // Windows: Use PowerShell to get clipboard
+            try {
+                // Try to get file path first
+                const filePath = (0, child_process_1.execSync)('powershell -command "Get-Clipboard -Format FileDropList | Select-Object -First 1 -ExpandProperty FullName"', { encoding: 'utf-8', timeout: 2000 }).trim();
+                if (filePath && filePath.length > 0) {
+                    return filePath;
+                }
+            }
+            catch {
+                // No file, try text
+            }
+            return (0, child_process_1.execSync)('powershell -command "Get-Clipboard"', { encoding: 'utf-8', timeout: 2000 }).trim();
+        }
     }
     catch {
         return '';
@@ -80,14 +96,16 @@ function getClipboard() {
     return '';
 }
 function setClipboard(text) {
+    const platform = os.platform();
     try {
-        if (os.platform() === 'darwin') {
+        if (platform === 'darwin') {
             // Use osascript to set clipboard - this properly overwrites file references
             const escaped = text.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
             (0, child_process_1.execSync)(`osascript -e 'set the clipboard to "${escaped}"'`, { encoding: 'utf-8' });
             return true;
         }
-        else if (os.platform() === 'linux') {
+        else if (platform === 'linux') {
+            // Linux: Try xclip first, then xsel
             try {
                 (0, child_process_1.execSync)(`printf '%s' "${text.replace(/"/g, '\\"')}" | xclip -selection clipboard`, { encoding: 'utf-8' });
                 return true;
@@ -97,6 +115,12 @@ function setClipboard(text) {
                 return true;
             }
         }
+        else if (platform === 'win32') {
+            // Windows: Use PowerShell to set clipboard
+            const escaped = text.replace(/"/g, '`"').replace(/\$/g, '`$');
+            (0, child_process_1.execSync)(`powershell -command "Set-Clipboard -Value '${escaped}'"`, { encoding: 'utf-8', timeout: 2000 });
+            return true;
+        }
     }
     catch {
         return false;
@@ -118,13 +142,22 @@ function stripAnsi(text) {
 function extractLocalImagePath(text) {
     // Strip ANSI codes and clean path
     const cleaned = cleanPath(stripAnsi(text));
-    // Patterns for local paths
-    const patterns = [
+    const platform = os.platform();
+    // Patterns for local paths (Unix-style)
+    const unixPatterns = [
         /\/var\/folders\/[^\n\r\t]+/,
         /\/private\/var\/folders\/[^\n\r\t]+/,
         /\/tmp\/[^\n\r\t]+/,
         /\/Users\/[^\n\r\t]+/,
+        /\/home\/(?!dev)[^\n\r\t]+/, // /home but not /home/dev (which is remote)
     ];
+    // Patterns for Windows paths
+    const windowsPatterns = [
+        /[A-Z]:\\Users\\[^\n\r\t]+/i,
+        /[A-Z]:\\Temp\\[^\n\r\t]+/i,
+        /[A-Z]:\\Windows\\Temp\\[^\n\r\t]+/i,
+    ];
+    const patterns = platform === 'win32' ? windowsPatterns : unixPatterns;
     for (const pattern of patterns) {
         const match = cleaned.match(pattern);
         if (match) {
@@ -209,41 +242,66 @@ function uploadFileSync(localPath, ipAddress, keyPath) {
 }
 // Check if our terminal window is currently in foreground
 function isTerminalInForeground(genboxName) {
-    if (os.platform() !== 'darwin') {
-        return true; // Can't detect on other platforms, assume yes
-    }
+    const platform = os.platform();
     try {
-        // Get frontmost app and window title
-        const script = `
-      tell application "System Events"
-        set frontApp to first application process whose frontmost is true
-        set frontAppName to name of frontApp
-        try
-          tell frontApp
-            set windowTitle to name of window 1
-          end tell
-        on error
-          set windowTitle to ""
-        end try
-        return frontAppName & "|" & windowTitle
-      end tell
-    `;
-        const result = (0, child_process_1.execSync)(`osascript -e '${script}'`, { encoding: 'utf-8', timeout: 1000 }).trim();
-        const [appName, windowTitle] = result.split('|');
-        // Check if it's a terminal app
-        const terminalApps = ['iTerm2', 'Terminal', 'Hyper', 'Alacritty', 'kitty', 'Warp'];
-        if (!terminalApps.some(t => appName.includes(t))) {
-            return false; // Not a terminal in foreground
+        if (platform === 'darwin') {
+            // macOS: Use AppleScript to get frontmost app and window title
+            const script = `
+        tell application "System Events"
+          set frontApp to first application process whose frontmost is true
+          set frontAppName to name of frontApp
+          try
+            tell frontApp
+              set windowTitle to name of window 1
+            end tell
+          on error
+            set windowTitle to ""
+          end try
+          return frontAppName & "|" & windowTitle
+        end tell
+      `;
+            const result = (0, child_process_1.execSync)(`osascript -e '${script}'`, { encoding: 'utf-8', timeout: 1000 }).trim();
+            const [appName, windowTitle] = result.split('|');
+            // Check if it's a terminal app
+            const terminalApps = ['iTerm2', 'Terminal', 'Hyper', 'Alacritty', 'kitty', 'Warp'];
+            if (!terminalApps.some(t => appName.includes(t))) {
+                return false;
+            }
+            // Check if window title contains our genbox name
+            return windowTitle?.toLowerCase().includes(genboxName.toLowerCase()) ||
+                windowTitle?.includes(`@${genboxName}`) ||
+                windowTitle?.includes('dev@');
         }
-        // Check if window title contains our genbox name
-        if (windowTitle && windowTitle.toLowerCase().includes(genboxName.toLowerCase())) {
-            return true;
+        else if (platform === 'linux') {
+            // Linux: Use xdotool to get active window title
+            try {
+                const windowTitle = (0, child_process_1.execSync)('xdotool getactivewindow getwindowname 2>/dev/null', {
+                    encoding: 'utf-8',
+                    timeout: 1000
+                }).trim();
+                return windowTitle.toLowerCase().includes(genboxName.toLowerCase()) ||
+                    windowTitle.includes(`@${genboxName}`) ||
+                    windowTitle.includes('dev@');
+            }
+            catch {
+                // xdotool not installed, allow anyway
+                return true;
+            }
         }
-        // Also check for common patterns like "dev@genbox-name" or "genbox-name"
-        if (windowTitle && (windowTitle.includes(`@${genboxName}`) || windowTitle.includes(`dev@`))) {
-            return true;
+        else if (platform === 'win32') {
+            // Windows: Use PowerShell to get active window title
+            try {
+                const windowTitle = (0, child_process_1.execSync)('powershell -command "(Get-Process | Where-Object {$_.MainWindowHandle -eq (Add-Type -MemberDefinition \'[DllImport(\\"user32.dll\\")]public static extern IntPtr GetForegroundWindow();\' -Name Win32 -Namespace Native -PassThru)::GetForegroundWindow()}).MainWindowTitle"', { encoding: 'utf-8', timeout: 2000 }).trim();
+                return windowTitle.toLowerCase().includes(genboxName.toLowerCase()) ||
+                    windowTitle.includes(`@${genboxName}`) ||
+                    windowTitle.includes('dev@');
+            }
+            catch {
+                // PowerShell failed, allow anyway
+                return true;
+            }
         }
-        return false;
+        return true; // Unknown platform, allow
     }
     catch {
         return true; // On error, assume yes to not break functionality
@@ -252,14 +310,14 @@ function isTerminalInForeground(genboxName) {
 // Show message in tmux status bar with styling
 function showTmuxMessage(ipAddress, keyPath, sessionName, message, style = 'success') {
     const controlPath = getControlPath(ipAddress);
-    // Style configurations
+    // Style configurations (tmux colors work on any platform since it runs on remote Linux)
     const styles = {
-        uploading: 'bg=colour214,fg=black,bold', // Orange/yellow for uploading
-        success: 'bg=colour34,fg=white,bold', // Nice green for success
+        uploading: 'bg=colour220,fg=black,bold', // Yellow for uploading
+        success: 'bg=colour40,fg=black,bold', // Bright green for success
         error: 'bg=colour196,fg=white,bold', // Red for error
-        warning: 'bg=colour208,fg=black,bold', // Orange for warning
+        warning: 'bg=colour214,fg=black,bold', // Orange for warning
     };
-    const duration = style === 'uploading' ? 30000 : 4000; // Long duration for uploading (will be replaced)
+    const duration = style === 'uploading' ? 30000 : 5000; // Long duration for uploading (will be replaced)
     const msgStyle = styles[style];
     try {
         // Set message style and display message
@@ -576,10 +634,10 @@ async function attachToSession(ipAddress, keyPath, sessionName, genboxName) {
             }
             // Try to extract a local image path
             const extractResult = extractLocalImagePath(currentClipboard);
-            // If file path was detected but file doesn't exist (e.g., macOS temp file was cleaned up)
+            // If file path was detected but file doesn't exist (e.g., temp file was cleaned up)
             if (extractResult.notFound) {
                 const fileName = path.basename(extractResult.notFound);
-                showTmuxMessage(ipAddress, keyPath, sessionName, '⚠ File not found: ' + fileName.substring(0, 30), 'warning');
+                showTmuxMessage(ipAddress, keyPath, sessionName, 'FILE NOT FOUND: ' + fileName.substring(0, 40), 'warning');
                 return;
             }
             if (!extractResult.path) {
@@ -590,8 +648,8 @@ async function attachToSession(ipAddress, keyPath, sessionName, genboxName) {
             if (uploadedPaths.has(localPath)) {
                 return;
             }
-            // Show uploading message in tmux (orange background, stays until replaced)
-            showTmuxMessage(ipAddress, keyPath, sessionName, '📤 Uploading image...', 'uploading');
+            // Show processing message in tmux (yellow background, stays until replaced)
+            showTmuxMessage(ipAddress, keyPath, sessionName, 'PROCESSING IMAGE - please wait...', 'uploading');
             // Upload the file (this happens in background, might cause brief pause)
             const result = uploadFileSync(localPath, ipAddress, keyPath);
             if (result.success) {
@@ -600,11 +658,12 @@ async function attachToSession(ipAddress, keyPath, sessionName, genboxName) {
                 // Replace clipboard with remote path
                 setClipboard(result.remotePath);
                 // Show success in tmux (green background, replaces uploading message immediately)
-                showTmuxMessage(ipAddress, keyPath, sessionName, '✓ Image ready! Cmd+V to paste', 'success');
+                const pasteKey = os.platform() === 'darwin' ? 'Cmd+V' : 'Ctrl+V';
+                showTmuxMessage(ipAddress, keyPath, sessionName, `READY - Press ${pasteKey} to paste image path`, 'success');
             }
             else {
                 // Show failure in tmux (red background)
-                showTmuxMessage(ipAddress, keyPath, sessionName, '✗ Upload failed: ' + (result.error || 'unknown'), 'error');
+                showTmuxMessage(ipAddress, keyPath, sessionName, 'UPLOAD FAILED: ' + (result.error || 'unknown'), 'error');
             }
         }
         catch {

package/package.json

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