@kikkimo/claude-launcher 2.0.0 → 2.1.0

package/lib/i18n/locales/it.js

@@ -335,11 +335,27 @@ module.exports = {
         press_key_return: "Premi un tasto qualsiasi per tornare al menu principale...",
         environment_variables: "Variabili d'ambiente:",
         using_third_party_api: "Uso Configurazione API di Terze Parti",
+        provider_optimizations_applied: "Ottimizzazioni del fornitore applicate",
+        extended_timeout_format: "Timeout esteso: {0}s ({1} minuti)",
+        extended_timeout_format_singular: "Timeout esteso: {0}s ({1} minuto)",
+        non_essential_traffic_disabled: "Traffico non essenziale disabilitato",
+        custom_env_var: "{0}={1}",
+        // Deprecated - kept for backward compatibility
         deepseek_optimizations: "Ottimizzazioni DeepSeek abilitate:",
         extended_timeout: "Timeout esteso (600s)",
         non_essential_disabled: "Traffico non essenziale disabilitato"
     },
 
+    // Note del fornitore
+    provider: {
+        note_prefix: "Nota",
+        notes: {
+            deepseek: "Richiede timeout esteso per attività di ragionamento complesse",
+            zhipu: "Richiede timeout esteso per risposte grandi",
+            zai: "Richiede timeout esteso per risposte grandi"
+        }
+    },
+
     // Additional UI messages
     ui: {
         general: {

package/lib/i18n/locales/ja.js

@@ -335,10 +335,25 @@ module.exports = {
         press_key_return: "任意のキーを押してメインメニューに戻る...",
         environment_variables: "環境変数：",
         using_third_party_api: "サードパーティAPI設定を使用",
+        provider_optimizations_applied: "プロバイダー最適化が適用されました",
+        extended_timeout_format: "拡張タイムアウト：{0}秒（{1}分）",
+        extended_timeout_format_singular: "拡張タイムアウト：{0}秒（{1}分）",
+        non_essential_traffic_disabled: "必須でないトラフィックが無効",
+        custom_env_var: "{0}={1}",
+        // Deprecated - kept for backward compatibility
         deepseek_optimizations: "DeepSeek最適化が有効：",
         extended_timeout: "拡張タイムアウト (600秒)",
-        non_essential_disabled: "必須でないトラフィックが無効",
-        press_key_return: "任意のキーを押してメインメニューに戻る..."
+        non_essential_disabled: "必須でないトラフィックが無効"
+    },
+
+    // プロバイダーノート
+    provider: {
+        note_prefix: "注意",
+        notes: {
+            deepseek: "複雑な推論タスクには拡張タイムアウトが必要です",
+            zhipu: "大規模な応答には拡張タイムアウトが必要です",
+            zai: "大規模な応答には拡張タイムアウトが必要です"
+        }
     },
 
     // 追加UIメッセージ

package/lib/i18n/locales/ko.js

@@ -335,10 +335,25 @@ module.exports = {
         press_key_return: "아무 키나 눌러 메인 메뉴로 돌아가기...",
         environment_variables: "환경 변수:",
         using_third_party_api: "서드파티 API 설정 사용",
+        provider_optimizations_applied: "공급자 최적화 적용됨",
+        extended_timeout_format: "확장 타임아웃: {0}초 ({1}분)",
+        extended_timeout_format_singular: "확장 타임아웃: {0}초 ({1}분)",
+        non_essential_traffic_disabled: "필수가 아닌 트래픽 비활성화",
+        custom_env_var: "{0}={1}",
+        // Deprecated - kept for backward compatibility
         deepseek_optimizations: "DeepSeek 최적화 활성화:",
         extended_timeout: "확장 타임아웃 (600초)",
-        non_essential_disabled: "필수가 아닌 트래픽 비활성화",
-        press_key_return: "아무 키나 눌러 메인 메뉴로 돌아가기..."
+        non_essential_disabled: "필수가 아닌 트래픽 비활성화"
+    },
+
+    // 프로바이더 노트
+    provider: {
+        note_prefix: "참고",
+        notes: {
+            deepseek: "복잡한 추론 작업에는 확장 타임아웃이 필요합니다",
+            zhipu: "대용량 응답에는 확장 타임아웃이 필요합니다",
+            zai: "대용량 응답에는 확장 타임아웃이 필요합니다"
+        }
     },
 
     // 추가 UI 메시지

package/lib/i18n/locales/pt.js

@@ -335,11 +335,27 @@ module.exports = {
         press_key_return: "Pressione qualquer tecla para voltar ao menu principal...",
         environment_variables: "Variáveis de ambiente:",
         using_third_party_api: "Usando Configuração de API de Terceiros",
+        provider_optimizations_applied: "Otimizações do provedor aplicadas",
+        extended_timeout_format: "Timeout estendido: {0}s ({1} minutos)",
+        extended_timeout_format_singular: "Timeout estendido: {0}s ({1} minuto)",
+        non_essential_traffic_disabled: "Tráfego não essencial desabilitado",
+        custom_env_var: "{0}={1}",
+        // Deprecated - kept for backward compatibility
         deepseek_optimizations: "Otimizações DeepSeek habilitadas:",
         extended_timeout: "Timeout estendido (600s)",
         non_essential_disabled: "Tráfego não essencial desabilitado"
     },
 
+    // Notas do provedor
+    provider: {
+        note_prefix: "Nota",
+        notes: {
+            deepseek: "Requer timeout estendido para tarefas de raciocínio complexas",
+            zhipu: "Requer timeout estendido para respostas grandes",
+            zai: "Requer timeout estendido para respostas grandes"
+        }
+    },
+
     // Additional UI messages
     ui: {
         general: {

package/lib/i18n/locales/ru.js

@@ -335,11 +335,27 @@ module.exports = {
         press_key_return: "Нажмите любую клавишу для возврата в главное меню...",
         environment_variables: "Переменные окружения:",
         using_third_party_api: "Использование конфигурации стороннего API",
+        provider_optimizations_applied: "Применены оптимизации провайдера",
+        extended_timeout_format: "Расширенный тайм-аут: {0}с ({1} минут)",
+        extended_timeout_format_singular: "Расширенный тайм-аут: {0}с ({1} минута)",
+        non_essential_traffic_disabled: "Несущественный трафик отключен",
+        custom_env_var: "{0}={1}",
+        // Deprecated - kept for backward compatibility
         deepseek_optimizations: "Включены оптимизации DeepSeek:",
         extended_timeout: "Расширенный тайм-аут (600s)",
         non_essential_disabled: "Несущественный трафик отключен"
     },
 
+    // Заметки провайдера
+    provider: {
+        note_prefix: "Примечание",
+        notes: {
+            deepseek: "Требуется расширенный тайм-аут для сложных задач рассуждения",
+            zhipu: "Требуется расширенный тайм-аут для больших ответов",
+            zai: "Требуется расширенный тайм-аут для больших ответов"
+        }
+    },
+
     // Additional UI messages
     ui: {
         general: {

package/lib/i18n/locales/zh-TW.js

@@ -335,10 +335,25 @@ module.exports = {
         press_key_return: "按任意鍵返回主選單...",
         environment_variables: "環境變數：",
         using_third_party_api: "使用第三方API設定",
+        provider_optimizations_applied: "提供商最佳化已啟用",
+        extended_timeout_format: "延長逾時時間：{0}秒（{1}分鐘）",
+        extended_timeout_format_singular: "延長逾時時間：{0}秒（{1}分鐘）",
+        non_essential_traffic_disabled: "非必要流量已停用",
+        custom_env_var: "{0}={1}",
+        // Deprecated - kept for backward compatibility
         deepseek_optimizations: "DeepSeek 最佳化已啟用：",
         extended_timeout: "延長逾時時間 (600秒)",
-        non_essential_disabled: "非必要流量已停用",
-        press_key_return: "按任意鍵返回主選單..."
+        non_essential_disabled: "非必要流量已停用"
+    },
+
+    // 提供商備註
+    provider: {
+        note_prefix: "注意",
+        notes: {
+            deepseek: "複雜推理任務需要延長逾時時間",
+            zhipu: "大型回應需要延長逾時時間",
+            zai: "大型回應需要延長逾時時間"
+        }
     },
 
     // 額外UI訊息

package/lib/i18n/locales/zh.js

@@ -335,10 +335,25 @@ module.exports = {
         press_key_return: "按任意键返回主菜单...",
         environment_variables: "环境变量：",
         using_third_party_api: "使用第三方API配置",
+        provider_optimizations_applied: "提供商优化已启用",
+        extended_timeout_format: "扩展超时时间：{0}秒（{1}分钟）",
+        extended_timeout_format_singular: "扩展超时时间：{0}秒（{1}分钟）",
+        non_essential_traffic_disabled: "非必要流量已禁用",
+        custom_env_var: "{0}={1}",
+        // Deprecated - kept for backward compatibility
         deepseek_optimizations: "DeepSeek 优化已启用：",
         extended_timeout: "扩展超时时间 (600秒)",
-        non_essential_disabled: "非必要流量已禁用",
-        press_key_return: "按任意键返回主菜单..."
+        non_essential_disabled: "非必要流量已禁用"
+    },
+
+    // Provider notes
+    provider: {
+        note_prefix: "注意",
+        notes: {
+            deepseek: "复杂推理任务需要扩展超时时间",
+            zhipu: "大型响应需要扩展超时时间",
+            zai: "大型响应需要扩展超时时间"
+        }
     },
 
     // 额外UI消息

package/lib/launcher.js

@@ -5,28 +5,33 @@
 const { spawn } = require('child_process');
 const colors = require('./ui/colors');
 const i18n = require('./i18n');
+const { getProvider } = require('./presets/providers');
+const stdinManager = require('./utils/stdin-manager');
 
 /**
  * Launch Claude Code with specified environment variables
  */
 function launchClaude(command, envVars = {}, disableAuthTokens = false) {
+    // Disable Ctrl+C monitoring before launching Claude Code
+    // This allows Ctrl+C to be handled exclusively by Claude Code process
+    stdinManager.disableCtrlC();
+
     console.log('');
-    console.log(colors.yellow + '🚀 ' + i18n.tSync('launch.starting') + colors.reset);
+    console.log(colors.yellow + '[*] ' + i18n.tSync('launch.starting') + colors.reset);
     console.log(colors.gray + i18n.tSync('launch.command', command) + colors.reset);
 
     if (Object.keys(envVars).length > 0) {
         console.log(colors.gray + i18n.tSync('launch.environment_variables') + colors.reset);
+        // Mask sensitive environment variables based on key name patterns
+        const secretKeyRe = /(token|key|secret|pass|auth|credential)/i;
         for (const [key, value] of Object.entries(envVars)) {
-            if (key.includes('TOKEN') || key.includes('KEY')) {
-                console.log(colors.gray + `  ${key}=***` + colors.reset);
-            } else {
-                console.log(colors.gray + `  ${key}=${value}` + colors.reset);
-            }
+            const masked = secretKeyRe.test(key) ? '***' : String(value);
+            console.log(colors.gray + '  ' + key + '=' + masked + colors.reset);
         }
     }
 
     console.log('');
-    console.log(colors.green + '✓ ' + i18n.tSync('launch.run_in_terminal') + colors.reset);
+    console.log(colors.green + '[>] ' + i18n.tSync('launch.run_in_terminal') + colors.reset);
     console.log(colors.gray + '  ' + i18n.tSync('launch.launcher_exit') + colors.reset);
     console.log('');
 
@@ -44,20 +49,103 @@ function launchClaude(command, envVars = {}, disableAuthTokens = false) {
     const args = command.split(' ');
     const cmd = args.shift();
 
+    let consoleRelinquished = false;
+    const relinquishConsoleToChild = () => {
+        if (consoleRelinquished) return;
+        consoleRelinquished = true;
+        // Do the minimal changes: switch to cooked mode and detach current scope, but do not pause stdin nor swallow signals
+        try {
+            if (process.stdin.isTTY) {
+                process.stdin.setRawMode(false);
+            }
+        } catch (_) {}
+
+        // Detach only current scope listeners to avoid affecting other modules
+        if (stdinManager.activeScope && typeof stdinManager.activeScope.detach === 'function') {
+            stdinManager.activeScope.detach();
+        }
+
+        // Suspend stdin manager so no new listeners are attached while Claude is running
+        if (typeof stdinManager.suspend === 'function') {
+            stdinManager.suspend();
+        }
+    };
+
+    const restoreConsoleForLauncher = () => {
+        if (!consoleRelinquished) return;
+        consoleRelinquished = false;
+        if (typeof stdinManager.resume === 'function') {
+            stdinManager.resume();
+        }
+        stdinManager.enableCtrlC();
+    };
+
+    const handleLaunchFailure = (message, opts = {}) => {
+        if (opts.afterHandover) {
+            restoreConsoleForLauncher();
+        } else {
+            stdinManager.enableCtrlC();
+        }
+
+        console.log(colors.red + '[x] ' + message + colors.reset);
+        console.log(colors.gray + i18n.tSync('ui.general.press_key_return_menu') + colors.reset);
+
+        if (process.stdin.isTTY) {
+            try {
+                process.stdin.setRawMode(true);
+                process.stdin.resume();
+            } catch (_) {
+                // Ignore setup failures
+            }
+
+            // Set timeout to prevent infinite hanging
+            const timeoutId = setTimeout(() => {
+                try {
+                    process.stdin.setRawMode(false);
+                } catch (_) {
+                    // Ignore cleanup failures
+                }
+                process.exit(1);
+            }, 60000); // 60 second timeout
+
+            process.stdin.once('data', () => {
+                clearTimeout(timeoutId);
+                try {
+                    process.stdin.setRawMode(false);
+                } catch (_) {
+                    // Ignore cleanup failures
+                }
+                // Exit after user acknowledges the error
+                process.exit(1);
+            });
+        } else {
+            // For non-TTY environments, exit immediately
+            process.exit(1);
+        }
+    };
+
     try {
         // Clean up terminal state before launching Claude
         if (process.stdin.isTTY) {
-            process.stdin.setRawMode(false);
-            process.stdin.pause();
+            try {
+                process.stdin.setRawMode(false);
+                process.stdin.pause();
+            } catch (_) {
+                // Ignore cleanup failures
+            }
         }
 
-        // Remove all event listeners to avoid conflicts
-        process.stdin.removeAllListeners('data');
-        process.stdin.removeAllListeners('keypress');
-        process.removeAllListeners('SIGINT');
-        process.removeAllListeners('SIGTERM');
-
-        // Launch Claude in current terminal, let it inherit everything
+        // Note: stdin listener management is handled by relinquishConsoleToChild()
+        // using stdinManager.activeScope.detach() and stdinManager.suspend().
+        // This ensures only the current scope's listeners are detached while
+        // preserving any listeners from other modules.
+        //
+        // Note: Do NOT remove global SIGINT/SIGTERM handlers here.
+        // The existing handlers already check stdinManager.isSuspended() and
+        // will properly ignore signals during child process execution.
+        // Removing all handlers would break other modules and degrade reliability.
+
+        // Launch Claude in current terminal, inherit stdio
         const child = spawn(cmd, args, {
             stdio: 'inherit',
             env: env,
@@ -65,25 +153,19 @@ function launchClaude(command, envVars = {}, disableAuthTokens = false) {
             shell: true
         });
 
-        // Don't exit immediately, wait for Claude to exit then exit launcher
+        relinquishConsoleToChild();
+
         child.on('close', (code) => {
+            restoreConsoleForLauncher();
             process.exit(code || 0);
         });
 
         child.on('error', (error) => {
-            console.log(colors.red + '❌ Error running Claude: ' + error.message + colors.reset);
-            process.exit(1);
+            handleLaunchFailure('Error running Claude: ' + error.message, { afterHandover: true });
         });
 
     } catch (error) {
-        console.log(colors.red + '❌ Error launching Claude Code: ' + error.message + colors.reset);
-        console.log(colors.gray + i18n.tSync('ui.general.press_key_return_menu') + colors.reset);
-        process.stdin.setRawMode(true);
-        process.stdin.resume();
-        process.stdin.once('data', () => {
-            process.stdin.setRawMode(false);
-            // Note: Caller should handle menu display
-        });
+        handleLaunchFailure('Error launching Claude Code: ' + error.message);
     }
 }
 
@@ -123,21 +205,18 @@ function getProviderEnvVars(api) {
         ANTHROPIC_SMALL_FAST_MODEL: api.smallFastModel || api.model
     };
 
-    // Add provider-specific environment variables
-    switch (api.provider) {
-        case 'deepseek':
-            return {
-                ...baseEnvVars,
-                API_TIMEOUT_MS: '600000',
-                CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: '1'
-            };
+    // Get provider configuration and merge provider-specific environment variables
+    const providerConfig = getProvider(api.provider);
 
-        case 'moonshot':
-        case 'anthropic':
-        case 'custom':
-        default:
-            return baseEnvVars;
+    if (providerConfig && providerConfig.envVars) {
+        // Merge base env vars with provider-specific env vars
+        return {
+            ...baseEnvVars,
+            ...providerConfig.envVars
+        };
     }
+
+    return baseEnvVars;
 }
 
 /**
@@ -152,16 +231,43 @@ function launchClaudeWithApi(api, skipPermissions = false) {
 
     console.log('');
     console.log(colors.bright + colors.orange + '🔗 ' + i18n.tSync('launch.using_third_party_api') + colors.reset);
-    console.log(colors.gray + `  Provider: ${api.provider || 'Custom'}` + colors.reset);
+
+    // Get provider configuration for display
+    const providerConfig = getProvider(api.provider);
+    const providerName = providerConfig ? providerConfig.name : (api.provider || 'Custom');
+
+    console.log(colors.gray + `  Provider: ${providerName}` + colors.reset);
     console.log(colors.gray + `  API: ${api.name}` + colors.reset);
     console.log(colors.gray + `  Base URL: ${api.baseUrl}` + colors.reset);
     console.log(colors.gray + `  Model: ${api.model}` + colors.reset);
 
-    // Show provider-specific optimizations
-    if (api.provider === 'deepseek') {
-        console.log(colors.yellow + '  ⚡ ' + i18n.tSync('launch.deepseek_optimizations') + colors.reset);
-        console.log(colors.gray + '    • ' + i18n.tSync('launch.extended_timeout') + colors.reset);
-        console.log(colors.gray + '    • ' + i18n.tSync('launch.non_essential_disabled') + colors.reset);
+    // Show provider-specific optimizations if envVars are defined
+    if (providerConfig && providerConfig.envVars && Object.keys(providerConfig.envVars).length > 0) {
+        console.log(colors.yellow + '  ⚡ ' + i18n.tSync('launch.provider_optimizations_applied') + colors.reset);
+
+        // Display specific optimizations based on envVars
+        const msRaw = providerConfig.envVars.API_TIMEOUT_MS;
+        const ms = Number(msRaw);
+        if (Number.isFinite(ms) && ms > 0) {
+            const timeoutSec = Math.floor(ms / 1000);
+            const timeoutMin = Math.floor(timeoutSec / 60);
+            // Use singular or plural form based on timeoutMin value
+            const key = timeoutMin === 1 ? 'launch.extended_timeout_format_singular' : 'launch.extended_timeout_format';
+            console.log(colors.gray + '    • ' + i18n.tSync(key, timeoutSec, timeoutMin) + colors.reset);
+        }
+
+        if (providerConfig.envVars.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC) {
+            console.log(colors.gray + '    • ' + i18n.tSync('launch.non_essential_traffic_disabled') + colors.reset);
+        }
+
+        // Display any other custom env vars (excluding the ones already shown)
+        // Apply same masking logic as in launchClaude to protect sensitive values
+        const secretKeyRe = /(token|key|secret|pass|auth|credential)/i;
+        for (const [key, value] of Object.entries(providerConfig.envVars)) {
+            if (key === 'API_TIMEOUT_MS' || key === 'CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC') continue;
+            const masked = secretKeyRe.test(key) ? '***' : String(value);
+            console.log(colors.gray + '    • ' + i18n.tSync('launch.custom_env_var', key, masked) + colors.reset);
+        }
     }
 
     console.log('');
@@ -250,4 +356,4 @@ module.exports = {
     launchClaudeWithApi,
     getProviderEnvVars,
     testApiConnection
-};
+};

package/lib/presets/providers.js

@@ -31,7 +31,12 @@ const providers = {
         authTokenFormat: 'sk-...',
         description: 'Moonshot AI - Provides Anthropic-compatible API',
         requiresToken: true,
-        compatibility: 'anthropic-compatible'
+        compatibility: 'anthropic-compatible',
+        envVars: {
+            API_TIMEOUT_MS: '3000000',
+            CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: '1'
+        },
+        note: 'Requires extended timeout for large responses'
     },
     deepseek: {
         name: 'DeepSeek (DeepSeek V3/V3.1)',
@@ -42,7 +47,46 @@ const providers = {
         authTokenFormat: 'sk-...',
         description: 'DeepSeek AI - Anthropic-compatible endpoint',
         requiresToken: true,
-        compatibility: 'anthropic-compatible'
+        compatibility: 'anthropic-compatible',
+        envVars: {
+            API_TIMEOUT_MS: '600000',
+            CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: '1'
+        },
+        note: 'Requires extended timeout for complex reasoning tasks'
+    },
+    zhipu: {
+        name: 'ZhiPu AI (GLM-4.5/4.6) - 智谱清言',
+        baseUrl: 'https://open.bigmodel.cn/api/anthropic',
+        models: [
+            'glm-4.5',
+            'glm-4.6'
+        ],
+        authTokenFormat: 'sk-...',
+        description: 'ZhiPu AI (智谱清言) - Anthropic-compatible API for mainland China',
+        requiresToken: true,
+        compatibility: 'anthropic-compatible',
+        envVars: {
+            API_TIMEOUT_MS: '3000000',
+            CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: '1'
+        },
+        note: 'Requires extended timeout for large responses'
+    },
+    zai: {
+        name: 'Z.ai (GLM-4.5/4.6) - ZhiPu Global',
+        baseUrl: 'https://api.z.ai/api/anthropic',
+        models: [
+            'glm-4.5',
+            'glm-4.6'
+        ],
+        authTokenFormat: 'sk-...',
+        description: 'Z.ai (ZhiPu AI Global) - Anthropic-compatible API for international users',
+        requiresToken: true,
+        compatibility: 'anthropic-compatible',
+        envVars: {
+            API_TIMEOUT_MS: '3000000',
+            CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: '1'
+        },
+        note: 'Requires extended timeout for large responses'
     },
     custom: {
         name: 'Custom Anthropic-Compatible API',