@kikkimo/claude-launcher 2.5.0 → 3.1.0

package/lib/auth/password-input.js

@@ -5,6 +5,7 @@
 
 const readline = require('readline');
 const stdinManager = require('../utils/stdin-manager');
+const screen = require('../ui/screen');
 
 /**
  * Get password input with proper masking (no plaintext display)
@@ -18,7 +19,7 @@ function getPasswordInput(prompt) {
         let cleanedUp = false;
 
         // Display prompt - this is necessary for password input
-        process.stdout.write(prompt);
+        screen.write(prompt);
 
         if (!process.stdin.isTTY) {
             // Non-TTY environment fallback - use scope's createReadline
@@ -52,11 +53,14 @@ function getPasswordInput(prompt) {
             return;
         }
 
+        screen.showCursor();
+
         const cleanup = () => {
             if (cleanedUp) return;
             cleanedUp = true;
 
             try {
+                screen.hideCursor();
                 scope.removeAllListeners('data');
                 scope.release();
             } catch (error) {
@@ -85,7 +89,7 @@ function getPasswordInput(prompt) {
                 case '\r': // Enter (CR)
                 case '\n': // Line Feed (LF)
                 case '\r\n': // CRLF
-                    process.stdout.write('\n');
+                    screen.write('\n');
                     cleanup();
                     resolve(password);
                     return;
@@ -95,7 +99,7 @@ function getPasswordInput(prompt) {
                     if (password.length > 0) {
                         password = password.slice(0, -1);
                         // Clear the last asterisk
-                        process.stdout.write('\b \b');
+                        screen.write('\b \b');
                     }
                     return;
 
@@ -114,7 +118,7 @@ function getPasswordInput(prompt) {
                         // Filter out control characters (only accept ASCII printable)
                         if (charCode >= 32 && charCode < 127) {
                             password += char;
-                            process.stdout.write('*');
+                            screen.write('*');
                         }
                     }
                     return;

package/lib/auth/password-validator.js

@@ -6,7 +6,9 @@
 const { getPasswordInput } = require('./password-input');
 const colors = require('../ui/colors');
 const { validatePasswordStrength, getPasswordRequirements, generatePasswordExample } = require('./password-strength');
+const { waitForKey } = require('../ui/prompts');
 const i18n = require('../i18n');
+const screen = require('../ui/screen');
 
 /**
  * Force cleanup stdin state to prevent navigation issues
@@ -43,36 +45,70 @@ function getTranslatedStrength(strength) {
 }
 
 /**
- * Verify user password for export/import operations
- * @param {Object} apiManager - The API manager instance
- * @param {string} operation - The operation being performed (for error messages)
- * @returns {Promise<boolean>} - True if password is verified, false otherwise
+ * Unified password guard for protected operations
+ * Mode A (delete/edit): clears screen, shows header, prompts password
+ * Mode B (export/import): no clear, no header, just prompts password
+ * @param {Object} apiManager - ApiManager instance
+ * @param {string} operation - 'delete' | 'edit' | 'export' | 'import'
+ * @returns {Promise<boolean>} true if authorized, false if denied/cancelled
  */
-async function verifyExportPassword(apiManager, operation = 'operation') {
+async function passwordGuard(apiManager, operation) {
+    const hasPassword = apiManager.hasExportPassword();
+
+    // Mode A: delete/edit — no password means allow freely
+    if ((operation === 'delete' || operation === 'edit') && !hasPassword) {
+        return true;
+    }
+
+    // Mode B: export/import — no password means block (defense-in-depth)
+    if ((operation === 'export' || operation === 'import') && !hasPassword) {
+        return false;
+    }
+
+    // Mode A: clear screen and show header
+    if (operation === 'delete' || operation === 'edit') {
+        const headerKey = `password.guard.${operation}.header`;
+        screen.render([
+            '',
+            colors.bright + colors.orange + i18n.tSync(headerKey) + colors.reset,
+            '',
+        ]);
+    }
+
     try {
         const password = await getPasswordInput(i18n.tSync('messages.prompts.enter_password'));
 
+        // Empty password check
         if (!password) {
             forceStdinCleanup();
-            console.log(colors.red + i18n.tSync('errors.password.empty') + colors.reset);
+            screen.write(colors.red + i18n.tSync('errors.password.empty') + colors.reset + '\n');
+            await waitForKey(i18n.tSync('ui.general.press_any_key_continue'));
             return false;
         }
 
+        // Verify password
         if (!apiManager.verifyExportPassword(password)) {
             forceStdinCleanup();
-            console.log(colors.red + '❌ ' + i18n.tSync('errors.password.verification_failed') + colors.reset);
-            console.log(colors.gray + i18n.tSync('errors.general.operation_failed', operation) + colors.reset);
+            screen.write(colors.red + '❌ ' + i18n.tSync('errors.password.verification_failed') + colors.reset + '\n');
+            await waitForKey(i18n.tSync('ui.general.press_any_key_continue'));
             return false;
         }
 
         return true;
     } catch (error) {
         forceStdinCleanup();
-        if (error.message.includes('cancelled')) {
-            console.log(colors.yellow + '\n' + i18n.tSync('errors.general.cancelled_by_user').replace('{0}', operation) + colors.reset);
-        } else {
-            console.log(colors.red + `❌ Password verification error: ${error.message}` + colors.reset);
+        if (error.message === 'Password input cancelled') {
+            // Esc — silent return
+            return false;
+        }
+        if (error.message.includes('Ctrl+C')) {
+            // Delegate to stdinManager double-tap exit
+            const stdinManager = require('../utils/stdin-manager');
+            stdinManager.handleCtrlC();
+            return false;
         }
+        // Unexpected error — treat as failure
+        screen.write(colors.red + `❌ ${error.message}` + colors.reset + '\n');
         return false;
     }
 }
@@ -88,13 +124,13 @@ async function verifyCurrentPassword(apiManager) {
 
         if (!currentPassword) {
             forceStdinCleanup();
-            console.log(colors.red + i18n.tSync('errors.password.empty') + colors.reset);
+            screen.write(colors.red + i18n.tSync('errors.password.empty') + colors.reset + '\n');
             return false;
         }
 
         if (!apiManager.verifyExportPassword(currentPassword)) {
             forceStdinCleanup();
-            console.log(colors.red + '❌ ' + i18n.tSync('errors.password.current_incorrect') + colors.reset);
+            screen.write(colors.red + '❌ ' + i18n.tSync('errors.password.current_incorrect') + colors.reset + '\n');
             return false;
         }
 
@@ -102,9 +138,9 @@ async function verifyCurrentPassword(apiManager) {
     } catch (error) {
         forceStdinCleanup();
         if (error.message.includes('cancelled')) {
-            console.log(colors.yellow + '\n' + i18n.tSync('errors.password.verification_cancelled') + colors.reset);
+            screen.write(colors.yellow + '\n' + i18n.tSync('errors.password.verification_cancelled') + colors.reset + '\n');
         } else {
-            console.log(colors.red + `❌ Password verification error: ${error.message}` + colors.reset);
+            screen.write(colors.red + `❌ Password verification error: ${error.message}` + colors.reset + '\n');
         }
         return false;
     }
@@ -118,24 +154,23 @@ async function verifyCurrentPassword(apiManager) {
  */
 async function setupNewPassword(apiManager, isFirstTime = false) {
     try {
-        console.log('');
-        console.log(colors.cyan + (isFirstTime ? i18n.tSync('password.setup.title') : i18n.tSync('password.setup.change_title')) + colors.reset);
-        console.log('');
+        const titleLine = colors.cyan + (isFirstTime ? i18n.tSync('password.setup.title') : i18n.tSync('password.setup.change_title')) + colors.reset;
+        const requirements = getPasswordRequirements();
 
+        const headerLines = ['', titleLine, ''];
         if (!isFirstTime) {
-            console.log(colors.yellow + '⚠️  ' + i18n.tSync('password.setup.warning') + colors.reset);
-            console.log('');
+            headerLines.push(colors.yellow + '⚠️  ' + i18n.tSync('password.setup.warning') + colors.reset);
+            headerLines.push('');
         }
-
-        // Display password requirements
-        console.log(colors.cyan + i18n.tSync('ui.general.password_requirements_title') + colors.reset);
-        const requirements = getPasswordRequirements();
+        headerLines.push(colors.cyan + i18n.tSync('ui.general.password_requirements_title') + colors.reset);
         requirements.forEach(req => {
-            console.log(colors.gray + '  ' + req + colors.reset);
+            headerLines.push(colors.gray + '  ' + req + colors.reset);
         });
-        console.log('');
-        console.log(colors.gray + i18n.tSync('ui.general.example_strong_password', generatePasswordExample()) + colors.reset);
-        console.log('');
+        headerLines.push('');
+        headerLines.push(colors.gray + i18n.tSync('ui.general.example_strong_password', generatePasswordExample()) + colors.reset);
+        headerLines.push('');
+
+        screen.render(headerLines);
 
         let attempts = 0;
         const maxAttempts = 3;
@@ -149,9 +184,9 @@ async function setupNewPassword(apiManager, isFirstTime = false) {
 
             if (!newPassword) {
                 forceStdinCleanup();
-                console.log(colors.red + i18n.tSync('errors.password.empty') + colors.reset);
+                screen.write(colors.red + i18n.tSync('errors.password.empty') + colors.reset + '\n');
                 if (attempts < maxAttempts) {
-                    console.log('');
+                    screen.write('\n');
                     continue;
                 } else {
                     return false;
@@ -162,27 +197,27 @@ async function setupNewPassword(apiManager, isFirstTime = false) {
             const validation = validatePasswordStrength(newPassword);
 
             if (!validation.valid) {
-                console.log(colors.red + '❌ ' + i18n.tSync('errors.password.requirements_not_met') + colors.reset);
+                screen.write(colors.red + '❌ ' + i18n.tSync('errors.password.requirements_not_met') + colors.reset + '\n');
                 validation.errors.forEach(error => {
-                    console.log(colors.red + '  • ' + error + colors.reset);
+                    screen.write(colors.red + '  • ' + error + colors.reset + '\n');
                 });
 
                 if (validation.suggestions.length > 0) {
-                    console.log(colors.yellow + '💡 ' + i18n.tSync('ui.general.suggestions') + colors.reset);
+                    screen.write(colors.yellow + '💡 ' + i18n.tSync('ui.general.suggestions') + colors.reset + '\n');
                     validation.suggestions.forEach(suggestion => {
-                        console.log(colors.yellow + '  • ' + suggestion + colors.reset);
+                        screen.write(colors.yellow + '  • ' + suggestion + colors.reset + '\n');
                     });
                 }
                 // If password is invalid, force display strength as "Weak" regardless of technical score
                 const strengthKey = validation.valid ? validation.strength : 'Weak';
                 const translatedStrength = getTranslatedStrength(strengthKey);
-                console.log(colors.gray + i18n.tSync('ui.general.current_password_strength', translatedStrength) + colors.reset);
+                screen.write(colors.gray + i18n.tSync('ui.general.current_password_strength', translatedStrength) + colors.reset + '\n');
 
                 if (attempts < maxAttempts) {
-                    console.log('');
+                    screen.write('\n');
                     continue;
                 } else {
-                    console.log(colors.red + i18n.tSync('ui.general.max_attempts_password_failed') + colors.reset);
+                    screen.write(colors.red + i18n.tSync('ui.general.max_attempts_password_failed') + colors.reset + '\n');
                     return false;
                 }
             }
@@ -192,9 +227,9 @@ async function setupNewPassword(apiManager, isFirstTime = false) {
 
             if (newPassword !== confirmPassword) {
                 forceStdinCleanup();
-                console.log(colors.red + i18n.tSync('ui.general.passwords_mismatch') + colors.reset);
+                screen.write(colors.red + i18n.tSync('ui.general.passwords_mismatch') + colors.reset + '\n');
                 if (attempts < maxAttempts) {
-                    console.log('');
+                    screen.write('\n');
                     continue;
                 } else {
                     return false;
@@ -203,8 +238,8 @@ async function setupNewPassword(apiManager, isFirstTime = false) {
 
             // Success - set the password
             apiManager.setExportPassword(newPassword);
-            console.log('');
-            console.log(colors.green + '✓ ' + i18n.tSync('password.setup.password_success', getTranslatedStrength(validation.strength)) + colors.reset);
+            screen.write('\n');
+            screen.write(colors.green + '✓ ' + i18n.tSync('password.setup.password_success', getTranslatedStrength(validation.strength)) + colors.reset + '\n');
             return true;
         }
 
@@ -213,9 +248,9 @@ async function setupNewPassword(apiManager, isFirstTime = false) {
     } catch (error) {
         forceStdinCleanup();
         if (error.message.includes('cancelled')) {
-            console.log(colors.yellow + '\n' + i18n.tSync('errors.password.setup_cancelled') + colors.reset);
+            screen.write(colors.yellow + '\n' + i18n.tSync('errors.password.setup_cancelled') + colors.reset + '\n');
         } else {
-            console.log(colors.red + `❌ Failed to set password: ${error.message}` + colors.reset);
+            screen.write(colors.red + `❌ Failed to set password: ${error.message}` + colors.reset + '\n');
         }
         return false;
     }
@@ -234,21 +269,21 @@ async function changePassword(apiManager) {
             return false;
         }
 
-        console.log(colors.green + i18n.tSync('errors.password.current_password_verified') + colors.reset);
-        console.log('');
+        screen.write(colors.green + i18n.tSync('errors.password.current_password_verified') + colors.reset + '\n');
+        screen.write('\n');
 
         // Set new password
         return await setupNewPassword(apiManager, false);
 
     } catch (error) {
         forceStdinCleanup();
-        console.log(colors.red + `❌ Password change failed: ${error.message}` + colors.reset);
+        screen.write(colors.red + `❌ Password change failed: ${error.message}` + colors.reset + '\n');
         return false;
     }
 }
 
 module.exports = {
-    verifyExportPassword,
+    passwordGuard,
     verifyCurrentPassword,
     setupNewPassword,
     changePassword

package/lib/i18n/index.js

@@ -5,6 +5,7 @@
 
 const LanguageManager = require('./language-manager');
 const MessageFormatter = require('./formatter');
+const screen = require('../ui/screen');
 
 class I18n {
     constructor() {
@@ -34,14 +35,14 @@ class I18n {
             for (const k of keys) {
                 value = value?.[k];
                 if (value === undefined) {
-                    console.warn(`Translation key not found: ${key}`);
+                    screen.debug(`Translation key not found: ${key}`);
                     return key; // Return key as fallback
                 }
             }
 
             // If value is not a string, return the key as fallback
             if (typeof value !== 'string') {
-                console.warn(`Translation value is not a string for key: ${key}`);
+                screen.debug(`Translation value is not a string for key: ${key}`);
                 return key;
             }
 
@@ -56,7 +57,7 @@ class I18n {
 
             return result;
         } catch (error) {
-            console.warn(`Translation error for key ${key}:`, error.message);
+            screen.debug(`Translation error for key ${key}: ` + error.message);
             return key; // Return key as fallback
         }
     }

package/lib/i18n/language-manager.js

@@ -6,6 +6,7 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const screen = require('../ui/screen');
 
 class LanguageManager {
     constructor() {
@@ -83,7 +84,7 @@ class LanguageManager {
             this.languageCache.set(this.currentLanguage, languagePack);
             return languagePack;
         } catch (error) {
-            console.warn(`Failed to load language pack for ${this.currentLanguage}, falling back to English. Error: ${error.message}`);
+            screen.debug(`Failed to load language pack for ${this.currentLanguage}, falling back to English. Error: ${error.message}`);
 
             // Fallback to English
             if (this.currentLanguage !== 'en') {
@@ -118,7 +119,7 @@ class LanguageManager {
 
             fs.writeFileSync(this.configFile, JSON.stringify(config, null, 2));
         } catch (error) {
-            console.warn('Failed to save language preference:', error.message);
+            screen.debug('Failed to save language preference: ' + error.message);
         }
     }
 
@@ -134,7 +135,7 @@ class LanguageManager {
                 }
             }
         } catch (error) {
-            console.warn('Failed to load language preference, using default (English)');
+            screen.debug('Failed to load language preference, using default (English)');
         }
     }