rlm-cli 0.2.13 → 0.2.15

package/dist/cli.js

@@ -108,14 +108,14 @@ async function fetchUrl(url) {
 // ── Main ────────────────────────────────────────────────────────────────────
 async function main() {
     const args = parseArgs();
-    // Resolve model by scanning all providers
+    // Resolve model by scanning all providers (stop at first match)
     let model;
     const allModelIds = [];
     for (const provider of getProviders()) {
         const providerModels = getModels(provider);
         for (const m of providerModels) {
             allModelIds.push(m.id);
-            if (m.id === args.modelId) {
+            if (!model && m.id === args.modelId) {
                 model = m;
             }
         }

package/dist/interactive.js

@@ -84,6 +84,7 @@ const W = Math.min(process.stdout.columns || 80, 100);
 // ── Session state ───────────────────────────────────────────────────────────
 let currentModelId = DEFAULT_MODEL;
 let currentModel;
+let currentProviderName = "";
 let contextText = "";
 let contextSource = "";
 let queryCount = 0;
@@ -106,8 +107,8 @@ function resolveModel(modelId) {
 const PROVIDER_KEYS = {
     anthropic: "ANTHROPIC_API_KEY",
     openai: "OPENAI_API_KEY",
-    google: "GOOGLE_API_KEY",
-    "google-gemini-cli": "GOOGLE_API_KEY",
+    google: "GEMINI_API_KEY",
+    "google-gemini-cli": "GEMINI_API_KEY",
     "google-vertex": "GOOGLE_VERTEX_API_KEY",
     groq: "GROQ_API_KEY",
     xai: "XAI_API_KEY",
@@ -120,7 +121,7 @@ const PROVIDER_KEYS = {
 const SETUP_PROVIDERS = [
     { name: "Anthropic", label: "Claude", env: "ANTHROPIC_API_KEY", piProvider: "anthropic" },
     { name: "OpenAI", label: "GPT", env: "OPENAI_API_KEY", piProvider: "openai" },
-    { name: "Google", label: "Gemini", env: "GOOGLE_API_KEY", piProvider: "google" },
+    { name: "Google", label: "Gemini", env: "GEMINI_API_KEY", piProvider: "google" },
     { name: "Groq", label: "Groq", env: "GROQ_API_KEY", piProvider: "groq" },
     { name: "xAI", label: "Grok", env: "XAI_API_KEY", piProvider: "xai" },
     { name: "Mistral", label: "Mistral", env: "MISTRAL_API_KEY", piProvider: "mistral" },
@@ -273,7 +274,7 @@ ${c.dim}         Recursive Language Models — arXiv:2512.24601${c.reset}
 }
 // ── Status line ─────────────────────────────────────────────────────────────
 function printStatusLine() {
-    const provider = detectProvider();
+    const provider = currentProviderName || detectProvider();
     const modelShort = currentModelId.length > 35
         ? currentModelId.slice(0, 32) + "..."
         : currentModelId;
@@ -585,7 +586,11 @@ async function runQuery(query) {
     const effectiveContext = contextText || query;
     const isDirectMode = !contextText;
     if (!currentModel) {
-        currentModel = resolveModel(currentModelId);
+        const resolved = resolveModelWithProvider(currentModelId);
+        if (resolved) {
+            currentModel = resolved.model;
+            currentProviderName = resolved.provider;
+        }
     }
     if (!currentModel) {
         console.log(`\n  ${c.red}Model "${currentModelId}" not found.${c.reset}`);
@@ -874,7 +879,11 @@ async function interactive() {
         setupRl.close();
     }
     // Resolve model
-    currentModel = resolveModel(currentModelId);
+    const initialResolved = resolveModelWithProvider(currentModelId);
+    if (initialResolved) {
+        currentModel = initialResolved.model;
+        currentProviderName = initialResolved.provider;
+    }
     if (!currentModel) {
         console.log(`\n  ${c.red}Model "${currentModelId}" not found.${c.reset}`);
         console.log(`  Check ${c.bold}RLM_MODEL${c.reset} in your .env file.\n`);
@@ -1004,6 +1013,7 @@ async function interactive() {
                             }
                             currentModelId = pick;
                             currentModel = resolved.model;
+                            currentProviderName = resolved.provider;
                             console.log(`  ${c.green}✓${c.reset} Switched to ${c.bold}${currentModelId}${c.reset}`);
                             console.log();
                             printStatusLine();
@@ -1064,7 +1074,9 @@ async function interactive() {
                         const defaultModel = getDefaultModelForProvider(chosen.piProvider);
                         if (defaultModel) {
                             currentModelId = defaultModel;
-                            currentModel = resolveModel(currentModelId);
+                            const provResolved = resolveModelWithProvider(currentModelId);
+                            currentModel = provResolved?.model;
+                            currentProviderName = chosen.piProvider;
                             console.log(`  ${c.green}✓${c.reset} Switched to ${c.bold}${chosen.name}${c.reset}`);
                             console.log(`  ${c.green}✓${c.reset} Default model: ${c.bold}${currentModelId}${c.reset}`);
                             console.log();

package/package.json

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