rlm-cli 0.2.5 → 0.2.6

package/dist/interactive.js

@@ -157,13 +157,37 @@ function getDefaultModelForProvider(provider) {
     const models = getModels(provider);
     return models.length > 0 ? models[0].id : undefined;
 }
-/** Prompt user for a provider's API key if not already set. Returns true if key is available. */
+/** Wrap rl.question with ESC-to-cancel. Returns user input or null on ESC/empty. */
+function questionWithEsc(rlInstance, promptText) {
+    return new Promise((resolve) => {
+        let escaped = false;
+        const onKeypress = (_str, key) => {
+            if (key?.name === "escape" && !escaped) {
+                escaped = true;
+                stdin.removeListener("keypress", onKeypress);
+                // Clear the prompt line visually
+                process.stdout.write("\r\x1b[2K");
+                // Programmatically submit empty to close the pending question
+                rlInstance.write("\n");
+            }
+        };
+        stdin.on("keypress", onKeypress);
+        rlInstance.question(promptText, (answer) => {
+            stdin.removeListener("keypress", onKeypress);
+            resolve(escaped ? null : answer.trim() || null);
+        });
+    });
+}
+/** Prompt user for a provider's API key if not already set.
+ *  Returns true (got key), false (empty input), or null (ESC pressed). */
 async function promptForProviderKey(rlInstance, providerInfo) {
     if (process.env[providerInfo.env])
         return true;
-    const key = await new Promise((resolve) => rlInstance.question(`  ${c.cyan}${providerInfo.env}:${c.reset} `, (a) => resolve(a.trim())));
+    const key = await questionWithEsc(rlInstance, `  ${c.cyan}${providerInfo.env}:${c.reset} `);
+    if (key === null)
+        return null; // ESC
     if (!key)
-        return false;
+        return false; // empty
     process.env[providerInfo.env] = key;
     // Save to shell profile
     const shellRc = process.env.SHELL?.includes("zsh") ? "~/.zshrc" : "~/.bashrc";
@@ -708,34 +732,48 @@ async function interactive() {
     if (!hasAnyApiKey()) {
         printBanner();
         console.log(`  ${c.red}No API key found.${c.reset}\n`);
-        console.log(`  ${c.bold}Select your provider:${c.reset}\n`);
-        for (let i = 0; i < SETUP_PROVIDERS.length; i++) {
-            console.log(`  ${c.dim}${i + 1}${c.reset}  ${SETUP_PROVIDERS[i].name} ${c.dim}(${SETUP_PROVIDERS[i].label})${c.reset}`);
-        }
-        console.log();
         const setupRl = readline.createInterface({ input: stdin, output: stdout, terminal: true });
-        const ask = (prompt) => new Promise((resolve) => setupRl.question(prompt, (a) => resolve(a.trim())));
-        const choice = await ask(`  ${c.cyan}Provider [1-${SETUP_PROVIDERS.length}]:${c.reset} `);
-        const idx = parseInt(choice, 10) - 1;
-        if (isNaN(idx) || idx < 0 || idx >= SETUP_PROVIDERS.length) {
-            console.log(`\n  ${c.dim}Invalid choice. Exiting.${c.reset}\n`);
-            setupRl.close();
-            process.exit(0);
+        let setupDone = false;
+        while (!setupDone) {
+            console.log(`  ${c.bold}Select your provider:${c.reset}\n`);
+            for (let i = 0; i < SETUP_PROVIDERS.length; i++) {
+                console.log(`  ${c.dim}${i + 1}${c.reset}  ${SETUP_PROVIDERS[i].name} ${c.dim}(${SETUP_PROVIDERS[i].label})${c.reset}`);
+            }
+            console.log();
+            const choice = await questionWithEsc(setupRl, `  ${c.cyan}Provider [1-${SETUP_PROVIDERS.length}]:${c.reset} `);
+            if (choice === null) {
+                // ESC at provider selection → exit
+                console.log(`\n  ${c.dim}Exiting.${c.reset}\n`);
+                setupRl.close();
+                process.exit(0);
+            }
+            const idx = parseInt(choice, 10) - 1;
+            if (isNaN(idx) || idx < 0 || idx >= SETUP_PROVIDERS.length) {
+                console.log(`\n  ${c.dim}Invalid choice.${c.reset}\n`);
+                continue;
+            }
+            const provider = SETUP_PROVIDERS[idx];
+            const gotKey = await promptForProviderKey(setupRl, provider);
+            if (gotKey === null) {
+                // ESC at key entry → back to provider selection
+                console.log();
+                continue;
+            }
+            if (!gotKey) {
+                console.log(`\n  ${c.dim}No key provided. Exiting.${c.reset}\n`);
+                setupRl.close();
+                process.exit(0);
+            }
+            // Auto-select default model for chosen provider
+            const defaultModel = getDefaultModelForProvider(provider.piProvider);
+            if (defaultModel) {
+                currentModelId = defaultModel;
+                console.log(`  ${c.green}✓${c.reset} Default model: ${c.bold}${currentModelId}${c.reset}`);
+            }
+            console.log();
+            setupDone = true;
         }
-        const provider = SETUP_PROVIDERS[idx];
-        const gotKey = await promptForProviderKey(setupRl, provider);
         setupRl.close();
-        if (!gotKey) {
-            console.log(`\n  ${c.dim}No key provided. Exiting.${c.reset}\n`);
-            process.exit(0);
-        }
-        // Auto-select default model for chosen provider
-        const defaultModel = getDefaultModelForProvider(provider.piProvider);
-        if (defaultModel) {
-            currentModelId = defaultModel;
-            console.log(`  ${c.green}✓${c.reset} Default model: ${c.bold}${currentModelId}${c.reset}`);
-        }
-        console.log();
     }
     // Resolve model
     currentModel = resolveModel(currentModelId);
@@ -901,14 +939,17 @@ async function interactive() {
                         const p = SETUP_PROVIDERS[i];
                         const isCurrent = p.piProvider === curProvider;
                         const dot = isCurrent ? `${c.green}●${c.reset}` : ` `;
-                        const hasKey = process.env[p.env] ? `${c.green}✓${c.reset}` : ` `;
+                        // Only show ✓ for non-current providers that have a key
+                        const hasKey = !isCurrent && process.env[p.env] ? `${c.green}✓${c.reset}` : ` `;
                         const label = isCurrent
                             ? `${c.cyan}${p.name}${c.reset} ${c.dim}(${p.label})${c.reset}`
                             : `${p.name} ${c.dim}(${p.label})${c.reset}`;
                         console.log(`  ${c.dim}${i + 1}${c.reset} ${dot}${hasKey} ${label}`);
                     }
                     console.log();
-                    const provChoice = await new Promise((resolve) => rl.question(`  ${c.cyan}Provider [1-${SETUP_PROVIDERS.length}]:${c.reset} `, (a) => resolve(a.trim())));
+                    const provChoice = await questionWithEsc(rl, `  ${c.cyan}Provider [1-${SETUP_PROVIDERS.length}]:${c.reset} ${c.dim}(ESC to cancel)${c.reset} `);
+                    if (provChoice === null)
+                        break; // ESC
                     const idx = parseInt(provChoice, 10) - 1;
                     if (isNaN(idx) || idx < 0 || idx >= SETUP_PROVIDERS.length) {
                         console.log(`  ${c.dim}Cancelled.${c.reset}`);
@@ -917,7 +958,7 @@ async function interactive() {
                     const chosen = SETUP_PROVIDERS[idx];
                     const gotKey = await promptForProviderKey(rl, chosen);
                     if (!gotKey) {
-                        console.log(`  ${c.dim}Cancelled.${c.reset}`);
+                        // null (ESC) or false (empty) → cancel
                         break;
                     }
                     // Auto-select first model from new provider

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rlm-cli",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Standalone CLI for Recursive Language Models (RLMs) — implements Algorithm 1 from arXiv:2512.24601",
   "type": "module",
   "bin": {