@kikkimo/claude-launcher 2.5.0 → 3.1.0

package/lib/ui/menu.js

@@ -5,8 +5,9 @@
 const readline = require('readline');
 const colors = require('./colors');
 const i18n = require('../i18n');
-const { padStringToWidth } = require('../utils/string-width');
+const { padStringToWidth, getStringWidth } = require('../utils/string-width');
 const stdinManager = require('../utils/stdin-manager');
+const screen = require('./screen');
 
 /**
  * Force cleanup stdin state before displaying any menu
@@ -27,7 +28,7 @@ function forceCleanupBeforeMenu() {
     } catch (error) {
         // Ignore cleanup errors but log for debugging
         if (process.env.DEBUG_STDIN) {
-            console.error('[DEBUG] forceCleanupBeforeMenu error:', error.message);
+            screen.debug('[DEBUG] forceCleanupBeforeMenu error: ' + error.message);
         }
     }
 }
@@ -45,64 +46,78 @@ class Menu {
         // Force cleanup stdin state before any menu display
         forceCleanupBeforeMenu();
 
-        // Use console.clear and console.log for proper screen clearing
-        console.clear();
-        console.log('');
-        console.log(colors.orange + '  ┌──────────────────────────────────────────────────────┐' + colors.reset);
-        console.log(colors.orange + '  │' + colors.white + colors.bright + '                 Claude Code Launcher                 ' + colors.orange + '│' + colors.reset);
-        console.log(colors.orange + '  └──────────────────────────────────────────────────────┘' + colors.reset);
-        console.log('');
-        console.log(colors.gray + '  ' + i18n.tSync('navigation.use_arrows') + colors.reset);
-        console.log('');
+        const lines = [];
+        lines.push('');
+        lines.push(colors.orange + '  ┌──────────────────────────────────────────────────────┐' + colors.reset);
+        lines.push(colors.orange + '  │' + colors.white + colors.bright + '                 Claude Code Launcher                 ' + colors.orange + '│' + colors.reset);
+        lines.push(colors.orange + '  └──────────────────────────────────────────────────────┘' + colors.reset);
+        lines.push('');
+        lines.push(colors.gray + '  ' + i18n.tSync('navigation.use_arrows') + colors.reset);
+        lines.push('');
+        screen.render(lines);
     }
 
     /**
      * Display menu with current selection
-     * @param {boolean} clearScreen - Whether to clear screen before displaying (default: true)
      * @param {string} versionInfo - Optional version info to display between banner and navigation
      * @param {Function|null} hintCallback - Optional sync callback(selectedIndex) returning hint string or null
+     * @param {string} navigationKey - i18n key for navigation hint (default: 'navigation.use_arrows')
      */
-    displayMenu(clearScreen = true, versionInfo = null, hintCallback = null) {
-        // Clear screen and display header + menu together (like old version)
-        if (clearScreen) {
-            console.clear();
-        }
-        console.log('');
-        console.log(colors.orange + '  ┌──────────────────────────────────────────────────────┐' + colors.reset);
-        console.log(colors.orange + '  │' + colors.white + colors.bright + '                 Claude Code Launcher                 ' + colors.orange + '│' + colors.reset);
-        console.log(colors.orange + '  └──────────────────────────────────────────────────────┘' + colors.reset);
-        console.log('');
+    displayMenu(versionInfo = null, hintCallback = null, navigationKey = 'navigation.use_arrows') {
+        this._navigationKey = navigationKey;
+        const isTTY = process.stdin.isTTY;
+        const lines = [];
+        lines.push('');
+        lines.push(colors.orange + '  ┌──────────────────────────────────────────────────────┐' + colors.reset);
+        lines.push(colors.orange + '  │' + colors.white + colors.bright + '                 Claude Code Launcher                 ' + colors.orange + '│' + colors.reset);
+        lines.push(colors.orange + '  └──────────────────────────────────────────────────────┘' + colors.reset);
+        lines.push('');
 
-        // Display version info if provided (between banner and navigation tips, like Claude Code)
         if (versionInfo) {
-            console.log(versionInfo);
-            console.log('');
+            lines.push(versionInfo);
+            lines.push('');
         }
 
-        console.log(colors.gray + '  ' + i18n.tSync('navigation.use_arrows') + colors.reset);
-        console.log('');
+        lines.push(colors.gray + '  ' + i18n.tSync(navigationKey) + colors.reset);
+        lines.push('');
 
-        // Display menu options
         this.menuOptions.forEach((option, index) => {
+            const prefix = isTTY ? '' : (index + 1) + '. ';
             if (index === this.selectedIndex) {
-                // Pad the selected option to ensure complete background coverage
-                const paddedOption = padStringToWidth(option, Math.max(40, option.length + 2));
-                console.log(colors.orange + '  → ' + colors.black + colors.bgAmber + paddedOption + colors.reset);
+                const prefixedOption = prefix + option;
+                const displayWidth = getStringWidth(prefixedOption);
+                const paddedOption = padStringToWidth(prefixedOption, Math.max(40, displayWidth + 2));
+                lines.push(colors.orange + '  → ' + colors.black + colors.bgAmber + paddedOption + colors.reset);
             } else {
-                console.log(colors.gray + '    ' + option + colors.reset);
+                lines.push(colors.gray + '    ' + prefix + option + colors.reset);
             }
         });
 
-        // Render dynamic hint if callback provided
-        if (hintCallback) {
-            const hintText = hintCallback(this.selectedIndex);
-            if (hintText) {
-                console.log('');
-                console.log(colors.green + '  \u2139 ' + hintText + colors.reset);
-            }
+        // Fixed 4-line hint area for stable menu height
+        const hintText = hintCallback ? hintCallback(this.selectedIndex) : null;
+        if (hintText) {
+            const hintLines = hintText.split('\n').slice(0, 4);
+            while (hintLines.length < 4) hintLines.push('');
+            lines.push('');
+            hintLines.forEach((line, i) => {
+                if (line === '') {
+                    lines.push('');
+                } else if (i === 0) {
+                    lines.push(colors.green + '  \u2139  ' + line + colors.reset);
+                } else {
+                    lines.push(colors.gray + '     ' + line + colors.reset);
+                }
+            });
+        } else {
+            lines.push('');
+            lines.push('');
+            lines.push('');
+            lines.push('');
+            lines.push('');
         }
 
-        console.log('');
+        lines.push('');
+        screen.render(lines);
     }
 
     /**
@@ -115,14 +130,14 @@ class Menu {
 
     /**
      * Handle keyboard navigation
-     * @param {boolean} clearScreen - Whether to clear screen on initial display (default: true)
      * @param {string} versionInfo - Optional version info to display
      * @param {Function|null} hintCallback - Optional sync callback(selectedIndex) returning hint string or null
+     * @param {string} navigationKey - i18n key for navigation hint (default: 'navigation.use_arrows')
      */
-    async navigate(clearScreen = true, versionInfo = null, hintCallback = null) {
+    async navigate(versionInfo = null, hintCallback = null, navigationKey = 'navigation.use_arrows') {
         // Guard against empty menu to prevent NaN from modulo operations
         if (!this.menuOptions || this.menuOptions.length === 0) {
-            console.log(colors.yellow + '  Warning: No menu options available' + colors.reset);
+            screen.write(colors.yellow + '  Warning: No menu options available' + colors.reset + '\n');
             return -1; // Return cancel/exit code
         }
 
@@ -130,7 +145,7 @@ class Menu {
         this.hintCallback = hintCallback; // Store for redrawing
 
         return new Promise((resolve, reject) => {
-            this.displayMenu(clearScreen, versionInfo, hintCallback);
+            this.displayMenu(versionInfo, hintCallback, navigationKey);
 
             if (process.stdin.isTTY) {
                 const scope = stdinManager.acquire('raw', {
@@ -183,15 +198,16 @@ class Menu {
                         switch (key) {
                             case '\u001b[A': // Up arrow
                                 this.selectedIndex = (this.selectedIndex - 1 + this.menuOptions.length) % this.menuOptions.length;
-                                this.displayMenu(true, this.versionInfo, this.hintCallback);
+                                this.displayMenu(this.versionInfo, this.hintCallback, this._navigationKey);
                                 break;
 
                             case '\u001b[B': // Down arrow
                                 this.selectedIndex = (this.selectedIndex + 1) % this.menuOptions.length;
-                                this.displayMenu(true, this.versionInfo, this.hintCallback);
+                                this.displayMenu(this.versionInfo, this.hintCallback, this._navigationKey);
                                 break;
 
                             case '\r': // Enter
+                            case ' ':  // Space
                                 safeResolve(this.selectedIndex);
                                 break;
 
@@ -219,7 +235,7 @@ class Menu {
 
                 const rl = lineScope.createReadline();
 
-                console.log(colors.yellow + '  ' + i18n.tSync('navigation.arrow_keys_not_available', this.menuOptions.length) + colors.reset);
+                screen.write(colors.yellow + '  ' + i18n.tSync('navigation.arrow_keys_not_available', this.menuOptions.length) + colors.reset + '\n');
 
                 rl.on('line', (input) => {
                     const choice = parseInt(input.trim());
@@ -232,7 +248,7 @@ class Menu {
                         lineScope.release();
                         resolve(-1);
                     } else {
-                        console.log(colors.red + '  Invalid selection. Please enter 1-' + this.menuOptions.length + '.' + colors.reset);
+                        screen.write(colors.red + '  ' + i18n.tSync('navigation.invalid_selection', this.menuOptions.length) + colors.reset + '\n');
                     }
                 });
             }
@@ -242,7 +258,7 @@ class Menu {
     async selectFromList(title, items, activeIndex = -1) {
         // Guard against empty items list to prevent NaN from modulo operations
         if (!items || items.length === 0) {
-            console.log(colors.yellow + '  Warning: No items available to select' + colors.reset);
+            screen.write(colors.yellow + '  Warning: No items available to select' + colors.reset + '\n');
             return null; // Return null to indicate no selection
         }
 
@@ -251,12 +267,12 @@ class Menu {
         let selectedIndex = activeIndex >= 0 ? activeIndex : 0;
 
         const displayList = () => {
-            console.clear();
-            console.log('');
-            console.log(colors.bright + colors.orange + `[*] ${title}` + colors.reset);
-            console.log('');
-            console.log(colors.gray + '  Use ↑↓ arrow keys to navigate, Enter to select, Esc to cancel' + colors.reset);
-            console.log('');
+            const lines = [];
+            lines.push('');
+            lines.push(colors.bright + colors.orange + `[*] ${title}` + colors.reset);
+            lines.push('');
+            lines.push(colors.gray + '  ' + i18n.tSync('navigation.use_arrows_esc', i18n.tSync('navigation.action.select')) + colors.reset);
+            lines.push('');
 
             items.forEach((item, index) => {
                 const isActive = index === activeIndex;
@@ -265,19 +281,20 @@ class Menu {
 
                 if (index === selectedIndex) {
                     const itemText = `${item.name}${activeIndicator}`;
-                    const paddedItem = padStringToWidth(itemText, Math.max(40, itemText.length + 2));
-                    console.log(colors.orange + prefix + colors.black + colors.bgAmber + paddedItem + colors.reset);
+                    const paddedItem = padStringToWidth(itemText, Math.max(40, getStringWidth(itemText) + 2));
+                    lines.push(colors.orange + prefix + colors.black + colors.bgAmber + paddedItem + colors.reset);
                     if (item.details) {
                         item.details.forEach(detail => {
-                            console.log(colors.gray + '      ' + detail + colors.reset);
+                            lines.push(colors.gray + '      ' + detail + colors.reset);
                         });
                     }
                 } else {
-                    console.log(colors.gray + prefix + `${item.name}${activeIndicator}` + colors.reset);
+                    lines.push(colors.gray + prefix + `${item.name}${activeIndicator}` + colors.reset);
                 }
             });
 
-            console.log('');
+            lines.push('');
+            screen.render(lines);
         };
 
         return new Promise((resolve, reject) => {
@@ -370,7 +387,7 @@ class Menu {
 
                 const rl = lineScope.createReadline();
 
-                console.log(colors.yellow + '  Arrow keys not available. Enter item number (1-' + items.length + ') or q to cancel:' + colors.reset);
+                screen.write(colors.yellow + '  ' + i18n.tSync('navigation.arrow_keys_not_available', items.length) + colors.reset + '\n');
 
                 rl.on('line', (input) => {
                     const choice = parseInt(input.trim());
@@ -383,7 +400,7 @@ class Menu {
                         lineScope.release();
                         resolve(null);
                     } else {
-                        console.log(colors.red + '  Invalid selection. Please enter 1-' + items.length + '.' + colors.reset);
+                        screen.write(colors.red + '  ' + i18n.tSync('navigation.invalid_selection', items.length) + colors.reset + '\n');
                     }
                 });
             }