codelantern-agent-cli 1.0.1 → 1.0.2

package/dist/cli.js

@@ -7,6 +7,7 @@ import {
   ProviderRegistry,
   SkillManager,
   addMcpServer,
+  classifyModel,
   createNewSession,
   deleteSession,
   exportSessionMarkdown,
@@ -14,7 +15,9 @@ import {
   getApiKey,
   getConfigFilePath,
   getLanternHomeDir,
+  getRecommendedCodingModels,
   getSessionsDir,
+  getStoreName,
   listConfiguredKeys,
   listSessions,
   loadAttachments,
@@ -23,13 +26,14 @@ import {
   loadProjectInstructions,
   loadSession,
   maskApiKey,
+  promptMaskedApiKey,
   removeApiKey,
   removeMcpServer,
   saveSession,
   setApiKey,
   setConfigValue,
   toggleMcpServer
-} from "./chunk-PELESOCI.js";
+} from "./chunk-45FEFNMM.js";
 
 // src/cli.ts
 import { Command } from "commander";
@@ -69,6 +73,18 @@ var TerminalPrompt = class {
   constructor() {
     this.history = loadHistory();
   }
+  async askQuestion(query) {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+    return new Promise((resolve) => {
+      rl.question(query, (answer) => {
+        rl.close();
+        resolve(answer.trim());
+      });
+    });
+  }
   async askPrompt(promptPrefix = pc.yellow("lantern> ")) {
     const rl = readline.createInterface({
       input: process.stdin,
@@ -178,12 +194,16 @@ async function handleSlashCommand(input, context) {
     case "/help":
       console.log("\n" + pc3.bold(pc3.yellow("\u{1F3EE} Code Lantern CLI \u2014 Help & Commands")));
       console.log(pc3.dim("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
-      console.log(pc3.bold("Slash Commands:"));
+      console.log(pc3.bold("Slash Commands (Entered inside Lantern session):"));
       console.log(`  ${pc3.cyan("/help")}                 Show this help overview`);
       console.log(`  ${pc3.cyan("/clear")}                Clear the terminal screen`);
       console.log(`  ${pc3.cyan("/status")}               Display session, provider, model, and skill status`);
-      console.log(`  ${pc3.cyan("/provider [name]")}      View or switch active AI provider (gemini, openai, anthropic, openrouter)`);
-      console.log(`  ${pc3.cyan("/model [id]")}           View or switch active model`);
+      console.log(`  ${pc3.cyan("/provider")}             List configured providers and select one interactively`);
+      console.log(`  ${pc3.cyan("/provider <name>")}      Switch current session to provider (gemini, openrouter, openai, anthropic)`);
+      console.log(`  ${pc3.cyan("/provider default <name>")} Set provider as default and switch session`);
+      console.log(`  ${pc3.cyan("/model")}                Discover & browse models for active provider with interactive selection`);
+      console.log(`  ${pc3.cyan("/model <model-id>")}     Switch current session to specified model`);
+      console.log(`  ${pc3.cyan("/model default <id>")}   Set model as default and switch session`);
       console.log(`  ${pc3.cyan("/skills [name]")}        List, enable, or disable active skills`);
       console.log(`  ${pc3.cyan("/timing [on|off]")}      Toggle request timing diagnostics display`);
       console.log(`  ${pc3.cyan("/plan [on|off]")}        Toggle read-only planning mode`);
@@ -222,38 +242,258 @@ async function handleSlashCommand(input, context) {
       return true;
     case "/provider": {
       const registry = new ProviderRegistry();
-      if (arg) {
-        const norm = arg.toLowerCase().trim();
-        if (registry.hasProvider(norm)) {
-          context.setProvider(norm);
-          const p = registry.getProvider(norm);
-          context.setModel(p.defaultModel);
-          console.log(pc3.green(`\u2713 Switched provider to '${p.displayName}' (default model: ${p.defaultModel})`));
+      const trimmedArg = arg.trim();
+      const switchProvider = async (target, isDefault = false) => {
+        const norm = target.toLowerCase().trim();
+        if (!registry.hasProvider(norm)) {
+          console.log(pc3.red(`Provider '${target}' not found. Available: ${registry.listProviders().map((p2) => p2.id).join(", ")}`));
+          return;
+        }
+        const p = registry.getProvider(norm);
+        if (!p.isConfigured()) {
+          console.log("\n" + pc3.yellow(`\u{1F3EE} No API key configured for ${p.displayName} (${norm}).`));
+          console.log(pc3.dim(`Lantern will securely save this key to your ${getStoreName()} so you never have to re-enter it.`));
+          const key = await promptMaskedApiKey(`Enter API key for '${norm}' (or press Enter to cancel)`);
+          if (!key) {
+            console.log(pc3.dim("Provider switch cancelled.\n"));
+            return;
+          }
+          setApiKey(norm, key);
+          console.log(pc3.green(`\u2713 Saved key for '${p.displayName}' to ${getStoreName()} (${maskApiKey(key)})
+`));
+        }
+        console.log(pc3.dim(`Verifying connection to ${p.displayName}...`));
+        const testRes = await p.testConnection();
+        if (!testRes.success) {
+          console.log(pc3.yellow(`\u26A0\uFE0F Connection warning for ${p.displayName}: ${testRes.error || "Network error"}`));
+          console.log(pc3.dim(`  You can test provider connectivity from the shell: lantern providers test ${norm}`));
         } else {
-          console.log(pc3.red(`Provider '${arg}' not found. Available: ${registry.listProviders().map((p) => p.id).join(", ")}`));
+          console.log(pc3.dim(`\u2713 Verified ${p.displayName} connection (${testRes.latencyMs}ms)`));
         }
-      } else {
-        const providers = registry.listProviders();
-        console.log(`
-Current provider: ${pc3.magenta(context.provider)}`);
-        console.log("Available providers:");
-        for (const p of providers) {
-          const active = p.id === context.provider ? pc3.green(" (active)") : "";
-          console.log(`  - ${pc3.bold(p.id)}: ${p.displayName} [${p.isConfigured ? pc3.green("Ready") : pc3.yellow("Needs key")}]${active}`);
+        context.setProvider(norm);
+        context.setModel(p.defaultModel);
+        if (isDefault) {
+          setConfigValue("activeProvider", norm);
+          console.log(pc3.green(`\u2713 Saved '${p.displayName}' as default provider and switched active session.`));
+        } else {
+          console.log(pc3.green(`\u2713 Switched provider to '${p.displayName}' (model: ${p.defaultModel}).`));
+        }
+        if (context.session.turns.length > 0) {
+          console.log(pc3.dim(`  Preserved ${context.session.turns.length} conversation turn(s) for this session.`));
+        }
+      };
+      if (trimmedArg.toLowerCase().startsWith("default ")) {
+        const target = trimmedArg.slice(8).trim();
+        if (!target) {
+          console.log(pc3.yellow("Usage: /provider default <name> (e.g. /provider default openrouter)"));
+          return true;
+        }
+        await switchProvider(target, true);
+        return true;
+      }
+      if (trimmedArg) {
+        await switchProvider(trimmedArg, false);
+        return true;
+      }
+      const providers = registry.listProviders();
+      console.log("\n" + pc3.bold(pc3.yellow("\u{1F3EE} Configured AI Providers")));
+      console.log(pc3.dim("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+      console.log(
+        pc3.bold("#".padEnd(4)) + pc3.bold("Provider".padEnd(16)) + pc3.bold("Status".padEnd(16)) + pc3.bold("Default Model".padEnd(28)) + pc3.bold("Key Source")
+      );
+      console.log(pc3.dim("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+      for (let i = 0; i < providers.length; i++) {
+        const p = providers[i];
+        const num = pc3.dim(`${i + 1}.`.padEnd(4));
+        const activeMarker = p.id === context.provider ? pc3.green(" (active)") : "";
+        const nameCol = (p.id + activeMarker).padEnd(20);
+        const statusCol = p.isConfigured ? pc3.green("\u2713 Ready").padEnd(18) : pc3.yellow("! Needs Key").padEnd(18);
+        const modelCol = pc3.cyan(p.defaultModel).padEnd(30);
+        const keyInfo = getApiKey(p.id);
+        const srcCol = keyInfo.sourceDescription ? pc3.cyan(`[${keyInfo.sourceDescription}]`) : pc3.dim("(missing)");
+        console.log(`${num}${nameCol}${statusCol}${modelCol}${srcCol}`);
+      }
+      console.log(pc3.dim("\nUsage:"));
+      console.log(pc3.dim("  /provider <name>            Switch current session to provider"));
+      console.log(pc3.dim("  /provider default <name>    Set as persistent default and switch session"));
+      if (context.askQuestion) {
+        const answer = await context.askQuestion(
+          pc3.cyan(`
+Select provider [1-${providers.length} or enter name] (Enter to cancel): `)
+        );
+        if (answer) {
+          const num = parseInt(answer, 10);
+          if (!isNaN(num) && num >= 1 && num <= providers.length) {
+            await switchProvider(providers[num - 1].id, false);
+          } else {
+            await switchProvider(answer, false);
+          }
         }
-        console.log(pc3.dim(`Usage: /provider <name> (e.g. /provider openai)`));
       }
       return true;
     }
-    case "/model":
-      if (arg) {
-        context.setModel(arg.trim());
-        console.log(pc3.green(`\u2713 Model changed to: ${arg.trim()}`));
-      } else {
-        console.log(`Current model: ${pc3.cyan(context.model)} (Provider: ${context.provider})`);
-        console.log(pc3.dim(`Usage: /model <model-id> (or run 'lantern models list' to view available models)`));
+    case "/model": {
+      const registry = new ProviderRegistry();
+      const p = registry.getProvider(context.provider);
+      const trimmedArg = arg.trim();
+      const switchModel = (targetModelId, isDefault = false) => {
+        const classification = classifyModel(targetModelId);
+        if (classification.category === "specialized") {
+          console.log("\n" + pc3.red(`\u274C Cannot use specialized ${classification.specializedType} model '${targetModelId}' for interactive coding.`));
+          if (classification.warning) {
+            console.log(pc3.dim(`  ${classification.warning}`));
+          }
+          const recs = getRecommendedCodingModels(context.provider);
+          console.log(pc3.yellow(`
+Compatible coding models for ${p.displayName}:`));
+          for (const rec of recs) {
+            console.log(`  - ${pc3.bold(pc3.cyan(rec))}`);
+          }
+          console.log("");
+          return;
+        }
+        if (classification.category === "chat") {
+          console.log("\n" + pc3.yellow(`\u26A0\uFE0F Warning: Model '${targetModelId}' does not support tool use / function calling.`));
+          console.log(pc3.dim("  Lantern will answer chat questions, but cannot inspect files, edit code, or run shell commands."));
+          const recs = getRecommendedCodingModels(context.provider);
+          console.log(pc3.dim(`  Recommended coding models with tool support: ${recs.join(", ")}
+`));
+        }
+        context.setModel(targetModelId);
+        if (isDefault) {
+          setConfigValue("defaultModel", targetModelId);
+          console.log(pc3.green(`\u2713 Saved model '${targetModelId}' as default and switched active session.`));
+        } else {
+          console.log(pc3.green(`\u2713 Switched model to: ${targetModelId}`));
+        }
+        if (context.session.turns.length > 0) {
+          console.log(pc3.dim(`  Preserved ${context.session.turns.length} conversation turn(s) for this session.`));
+        }
+      };
+      if (trimmedArg.toLowerCase().startsWith("default ")) {
+        const target = trimmedArg.slice(8).trim();
+        if (!target) {
+          console.log(pc3.yellow("Usage: /model default <model-id> (e.g. /model default gemini-3.8-flash)"));
+          return true;
+        }
+        switchModel(target, true);
+        return true;
+      }
+      if (trimmedArg) {
+        switchModel(trimmedArg, false);
+        return true;
+      }
+      if (!p.isConfigured()) {
+        console.log("\n" + pc3.yellow(`\u{1F3EE} No API key configured for ${p.displayName} (${p.id}).`));
+        console.log(pc3.dim(`Lantern will securely save this key to your ${getStoreName()} so you won't need to enter it again.`));
+        const key = await promptMaskedApiKey(`Enter API key for '${p.id}' (or press Enter to cancel)`);
+        if (key) {
+          setApiKey(p.id, key);
+          console.log(pc3.green(`\u2713 Saved key for '${p.displayName}' to ${getStoreName()} (${maskApiKey(key)})
+`));
+        }
+      }
+      console.log(pc3.dim(`
+Discovering available models for ${p.displayName}...`));
+      let models = [];
+      let discoveryError = null;
+      try {
+        models = await p.listModels();
+      } catch (err) {
+        discoveryError = err.message || String(err);
+      }
+      if (models.length === 0) {
+        if (discoveryError) {
+          console.log(pc3.yellow(`\u26A0\uFE0F Model discovery unavailable for ${p.displayName}: ${discoveryError}`));
+        } else {
+          console.log(pc3.yellow(`No models returned by discovery for ${p.displayName}.`));
+        }
+        console.log(pc3.dim(`You can manually enter any model ID supported by ${p.displayName}.`));
+        console.log(`Current model: ${pc3.cyan(context.model)}`);
+        if (context.askQuestion) {
+          const manual = await context.askQuestion(
+            pc3.cyan(`Enter model ID to switch (or press Enter to cancel): `)
+          );
+          if (manual) {
+            switchModel(manual, false);
+          }
+        }
+        return true;
+      }
+      const codingModels = [];
+      const chatOnlyModels = [];
+      const specializedModels = [];
+      for (const m of models) {
+        const c = classifyModel(m.id, m.capabilities, m.description);
+        if (c.category === "coding") {
+          codingModels.push({ info: m, classification: c });
+        } else if (c.category === "chat") {
+          chatOnlyModels.push({ info: m, classification: c });
+        } else {
+          specializedModels.push({ info: m, classification: c });
+        }
+      }
+      console.log("\n" + pc3.bold(pc3.yellow(`\u{1F3EE} Available Models for ${p.displayName}`)));
+      console.log(pc3.dim("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+      console.log(
+        pc3.bold("#".padEnd(4)) + pc3.bold("Model ID".padEnd(36)) + pc3.bold("Tools".padEnd(8)) + pc3.bold("Vision".padEnd(8)) + pc3.bold("Reasoning".padEnd(12)) + pc3.bold("Context Window")
+      );
+      console.log(pc3.dim("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+      const selectableList = [];
+      let index = 1;
+      for (const item of codingModels) {
+        const m = item.info;
+        const isCurrent = m.id === context.model;
+        const marker = isCurrent ? pc3.green(" (active)") : "";
+        const idCol = (m.id + marker).slice(0, 34).padEnd(36);
+        const toolsCol = pc3.green("\u2713").padEnd(8);
+        const visionCol = m.capabilities.images ? pc3.green("\u2713").padEnd(8) : pc3.dim("\u2717").padEnd(8);
+        const reasoningCol = m.capabilities.reasoning ? pc3.magenta("\u2713").padEnd(12) : pc3.dim("\u2717").padEnd(12);
+        const ctxCol = m.contextWindow ? `${(m.contextWindow / 1e3).toFixed(0)}k` : pc3.dim("standard");
+        console.log(`${pc3.dim(`${index}.`.padEnd(4))}${idCol}${toolsCol}${visionCol}${reasoningCol}${ctxCol}`);
+        selectableList.push({ id: m.id, category: "coding" });
+        index++;
+      }
+      if (chatOnlyModels.length > 0) {
+        console.log(pc3.dim("\nChat-Only Models (No tool execution / file editing):"));
+        for (const item of chatOnlyModels.slice(0, 5)) {
+          const m = item.info;
+          const isCurrent = m.id === context.model;
+          const marker = isCurrent ? pc3.green(" (active)") : "";
+          const idCol = (m.id + marker).slice(0, 34).padEnd(36);
+          const toolsCol = pc3.dim("\u2717").padEnd(8);
+          const visionCol = m.capabilities.images ? pc3.green("\u2713").padEnd(8) : pc3.dim("\u2717").padEnd(8);
+          const reasoningCol = m.capabilities.reasoning ? pc3.magenta("\u2713").padEnd(12) : pc3.dim("\u2717").padEnd(12);
+          const ctxCol = m.contextWindow ? `${(m.contextWindow / 1e3).toFixed(0)}k` : pc3.dim("standard");
+          console.log(`${pc3.dim(`${index}.`.padEnd(4))}${idCol}${toolsCol}${visionCol}${reasoningCol}${ctxCol}`);
+          selectableList.push({ id: m.id, category: "chat" });
+          index++;
+        }
+      }
+      if (specializedModels.length > 0) {
+        console.log(pc3.dim("\nSpecialized Models (Embeddings, Batch, Audio, Images - not suitable for coding):"));
+        const samples = specializedModels.slice(0, 6).map((s) => `${s.info.id} [${s.classification.specializedType || "Specialized"}]`).join(", ");
+        console.log(pc3.dim(`  ${samples}${specializedModels.length > 6 ? ` (+${specializedModels.length - 6} more)` : ""}`));
+      }
+      console.log(pc3.dim("\nUsage:"));
+      console.log(pc3.dim("  /model <model-id>           Switch current session to model"));
+      console.log(pc3.dim("  /model default <model-id>   Set as persistent default and switch session"));
+      if (context.askQuestion) {
+        const answer = await context.askQuestion(
+          pc3.cyan(`
+Select model [1-${selectableList.length} or enter model ID] (Enter to keep current): `)
+        );
+        if (answer) {
+          const num = parseInt(answer, 10);
+          if (!isNaN(num) && num >= 1 && num <= selectableList.length) {
+            switchModel(selectableList[num - 1].id, false);
+          } else {
+            switchModel(answer, false);
+          }
+        }
       }
       return true;
+    }
     case "/skills": {
       const manager = new SkillManager();
       const skills = manager.listSkills(context.workspace);
@@ -402,13 +642,27 @@ async function interactiveCommand(options) {
   }
   const attachments = loadAttachments(options.attach);
   printBanner({
-    version: "1.0.1",
+    version: "1.0.2",
     provider,
     model,
     workspace,
     yolo,
     planMode
   });
+  const initialKeyInfo = getApiKey(provider);
+  if (!initialKeyInfo.key && process.stdin.isTTY) {
+    const p = new ProviderRegistry().getProvider(provider);
+    console.log(pc4.yellow(`
+\u{1F3EE} No API key configured for ${p.displayName} (${provider}).`));
+    console.log(pc4.dim(`Lantern will securely store this key in your ${getStoreName()} so you only enter it once.
+`));
+    const entered = await promptMaskedApiKey(`Enter API key for '${provider}'`);
+    if (entered) {
+      setApiKey(provider, entered);
+      console.log(pc4.green(`\u2713 Saved ${p.displayName} API key to ${getStoreName()} (${maskApiKey(entered)})
+`));
+    }
+  }
   if (attachments.length > 0) {
     console.log(pc4.cyan(`\u{1F4CE} Attached ${attachments.length} file(s): ${attachments.map((a) => a.name).join(", ")}
 `));
@@ -428,29 +682,37 @@ async function interactiveCommand(options) {
     setProvider: (p) => {
       provider = p;
       session.provider = p;
+      slashContext.provider = p;
     },
     setModel: (m) => {
       model = m;
       session.model = m;
+      slashContext.model = m;
     },
     setYolo: (y) => {
       yolo = y;
+      slashContext.yolo = y;
     },
     setPlanMode: (p) => {
       planMode = p;
+      slashContext.planMode = p;
     },
     setShowTiming: (t) => {
       showTiming = t;
+      slashContext.showTiming = t;
     },
     setActiveSkills: (skills) => {
       activeSkills = skills;
       session.activeSkills = skills;
-    }
+      slashContext.activeSkills = skills;
+    },
+    askQuestion: (q) => promptUI.askQuestion(q)
   };
   try {
     while (true) {
-      const modeIndicator = planMode ? pc4.blue("[plan] ") : yolo ? pc4.red("[yolo] ") : "";
-      const promptStr = `${pc4.yellow("lantern")} ${modeIndicator}${pc4.dim("\u276F")} `;
+      const provIndicator = pc4.cyan(`(${provider})`);
+      const modeIndicator = planMode ? pc4.blue(" [plan]") : yolo ? pc4.red(" [yolo]") : "";
+      const promptStr = `${pc4.yellow("lantern")} ${provIndicator}${modeIndicator} ${pc4.dim("\u276F")} `;
       const input = await promptUI.askPrompt(promptStr);
       if (input === null || input === "/exit" || input === "/quit") {
         console.log(pc4.dim("\nGoodbye! Session saved: " + session.id));
@@ -536,6 +798,20 @@ async function askCommand(question, options) {
   const attachments = loadAttachments(options.attach);
   const session = createNewSession(workspace, model, `Ask: ${question.slice(0, 40)}`);
   session.provider = provider;
+  const initialKeyInfo = getApiKey(provider);
+  if (!initialKeyInfo.key && process.stdin.isTTY && !jsonOutput) {
+    const p = new ProviderRegistry().getProvider(provider);
+    console.log(pc5.yellow(`
+\u{1F3EE} No API key configured for ${p.displayName} (${provider}).`));
+    console.log(pc5.dim(`Lantern will securely store this key in your ${getStoreName()} so you only enter it once.
+`));
+    const entered = await promptMaskedApiKey(`Enter API key for '${provider}'`);
+    if (entered) {
+      setApiKey(provider, entered);
+      console.log(pc5.green(`\u2713 Saved ${p.displayName} API key to ${getStoreName()} (${maskApiKey(entered)})
+`));
+    }
+  }
   const agent = new LanternAgent();
   await agent.initMcp();
   const abortController = new AbortController();
@@ -614,6 +890,20 @@ async function planCommand(task, options) {
   const attachments = loadAttachments(options.attach);
   const session = createNewSession(workspace, model, `Plan: ${task.slice(0, 40)}`);
   session.provider = provider;
+  const initialKeyInfo = getApiKey(provider);
+  if (!initialKeyInfo.key && process.stdin.isTTY && !jsonOutput) {
+    const p = new ProviderRegistry().getProvider(provider);
+    console.log(pc6.yellow(`
+\u{1F3EE} No API key configured for ${p.displayName} (${provider}).`));
+    console.log(pc6.dim(`Lantern will securely store this key in your ${getStoreName()} so you only enter it once.
+`));
+    const entered = await promptMaskedApiKey(`Enter API key for '${provider}'`);
+    if (entered) {
+      setApiKey(provider, entered);
+      console.log(pc6.green(`\u2713 Saved ${p.displayName} API key to ${getStoreName()} (${maskApiKey(entered)})
+`));
+    }
+  }
   if (!jsonOutput) {
     console.log(pc6.bold(pc6.yellow("\n\u{1F3EE} Code Lantern Plan Mode (Read-Only)")));
     console.log(pc6.dim(`Inspecting workspace with ${provider} (${model})...
@@ -844,13 +1134,14 @@ async function doctorCommand() {
   const keys = listConfiguredKeys();
   console.log(`${pc10.green("\u2713")} Active Provider:        ${pc10.bold(activeProvider.displayName)} (${activeProviderId})`);
   console.log(`${pc10.green("\u2713")} Active Model:           ${config2.defaultModel}`);
+  console.log(`${pc10.green("\u2713")} Credential Storage:     ${getStoreName()}`);
   const activeKeyInfo = keys[activeProviderId];
   if (!activeKeyInfo || !activeKeyInfo.configured) {
     issuesFound++;
     console.log(`${pc10.red("\u2717")} API Key (${activeProviderId}):   Missing!`);
     console.log(pc10.yellow(`  \u2192 To fix: set environment variable or run 'lantern keys set ${activeProviderId}'`));
   } else {
-    const src = activeKeyInfo.source ? `[${activeKeyInfo.source}]` : "";
+    const src = activeKeyInfo.sourceDescription ? `[${activeKeyInfo.sourceDescription}]` : "";
     console.log(`${pc10.green("\u2713")} API Key (${activeProviderId}):   Found (${activeKeyInfo.maskedKey}) ${src}`);
     try {
       const pingRes = await activeProvider.testConnection();
@@ -1051,7 +1342,7 @@ async function providersCommand(action, target, options) {
       const nameCol = pc12.bold(p.name) + activeMarker;
       const statusCol = p.isConfigured ? pc12.green("\u2713 Ready") : pc12.yellow("! Needs Key");
       const keyInfo = getApiKey(p.id);
-      const sourceCol = keyInfo.source ? pc12.cyan(`[${keyInfo.source}]`) : pc12.dim("(missing)");
+      const sourceCol = keyInfo.sourceDescription ? pc12.cyan(`[${keyInfo.sourceDescription}]`) : pc12.dim("(missing)");
       console.log(
         nameCol.padEnd(p.isActive ? 25 : 16) + statusCol.padEnd(25) + p.defaultModel.padEnd(30) + sourceCol
       );
@@ -1102,7 +1393,7 @@ async function providersCommand(action, target, options) {
     }
     const baseUrl = options?.baseUrl || await promptLine("Base URL (e.g. http://localhost:11434/v1): ");
     const defaultModel = options?.model || await promptLine("Default Model ID (e.g. llama3, qwen2.5): ");
-    const apiKey = options?.apiKey || await promptLine("API Key (optional, press Enter to skip): ");
+    const apiKey = options?.apiKey || await promptMaskedApiKey("API Key (optional, press Enter to skip)");
     registry.registerCustomProvider({
       id: name.toLowerCase(),
       name,
@@ -1193,38 +1484,27 @@ Fetching models for ${pc13.cyan(provider.displayName)}...`);
 }
 
 // src/commands/keysCmd.ts
-import readline3 from "readline";
 import pc14 from "picocolors";
-function promptPassword(prompt) {
-  const rl = readline3.createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-  return new Promise((resolve) => {
-    rl.question(prompt, (answer) => {
-      rl.close();
-      resolve(answer.trim());
-    });
-  });
-}
 async function keysCommand(action, provider, key) {
   const subAction = (action || "list").toLowerCase();
   if (subAction === "list") {
     const keys = listConfiguredKeys();
     console.log("\n" + pc14.bold(pc14.yellow("\u{1F3EE} Configured Provider API Keys")));
-    console.log(pc14.dim("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+    console.log(pc14.dim(`Storage: ${getStoreName()}`));
+    console.log(pc14.dim("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
     console.log(
-      pc14.bold("Provider".padEnd(16)) + pc14.bold("Source".padEnd(14)) + pc14.bold("Masked Key")
+      pc14.bold("Provider".padEnd(16)) + pc14.bold("Source".padEnd(28)) + pc14.bold("Masked Key")
     );
-    console.log(pc14.dim("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+    console.log(pc14.dim("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
     for (const [p, info] of Object.entries(keys)) {
-      const srcText = info.source ? pc14.cyan(`[${info.source}]`) : pc14.dim("none");
+      const srcText = info.configured ? info.source === "env" ? pc14.cyan(info.sourceDescription) : pc14.blue(info.sourceDescription) : pc14.dim("none");
       console.log(
-        pc14.bold(p.padEnd(16)) + srcText.padEnd(22) + (info.configured ? pc14.green(info.maskedKey) : pc14.dim("(not configured)"))
+        pc14.bold(p.padEnd(16)) + srcText.padEnd(36) + (info.configured ? pc14.green(info.maskedKey) : pc14.dim("(not configured)"))
       );
     }
-    console.log(pc14.dim("\nTo set key: lantern keys set <provider> [key]"));
-    console.log(pc14.dim("To remove key: lantern keys remove <provider>\n"));
+    console.log(pc14.dim("\nTo set key:    lantern keys set <provider>"));
+    console.log(pc14.dim("To remove key: lantern keys remove <provider>"));
+    console.log(pc14.dim("Note: Keys are securely stored in your native OS credential store and reused automatically.\n"));
     return;
   }
   if (subAction === "set") {
@@ -1232,16 +1512,23 @@ async function keysCommand(action, provider, key) {
       console.error(pc14.red("Error: Missing provider name. Usage: lantern keys set <provider> [key]"));
       process.exit(1);
     }
+    const norm = provider.toLowerCase().trim();
     let apiKey = key;
     if (!apiKey) {
-      apiKey = await promptPassword(`Enter API key for '${provider}': `);
+      apiKey = await promptMaskedApiKey(`Enter API key for '${norm}'`);
     }
     if (!apiKey) {
       console.error(pc14.red("Error: API key cannot be empty."));
       process.exit(1);
     }
-    setApiKey(provider, apiKey);
-    console.log(pc14.green(`\u2713 Successfully saved encrypted API key for '${provider}' (${maskApiKey(apiKey)})`));
+    try {
+      setApiKey(norm, apiKey);
+      console.log(pc14.green(`\u2713 Successfully saved API key for '${norm}' to ${getStoreName()} (${maskApiKey(apiKey)})`));
+      console.log(pc14.dim("  Lantern will automatically reuse this key in future sessions and commands."));
+    } catch (err) {
+      console.error(pc14.red(`Error saving key: ${err.message}`));
+      process.exit(1);
+    }
     return;
   }
   if (subAction === "remove" || subAction === "rm") {
@@ -1249,11 +1536,13 @@ async function keysCommand(action, provider, key) {
       console.error(pc14.red("Error: Missing provider name. Usage: lantern keys remove <provider>"));
       process.exit(1);
     }
-    const removed = removeApiKey(provider);
+    const norm = provider.toLowerCase().trim();
+    const removed = removeApiKey(norm);
     if (removed) {
-      console.log(pc14.green(`\u2713 Removed stored key for '${provider}'`));
+      console.log(pc14.green(`\u2713 Removed stored key for '${norm}' from ${getStoreName()}`));
     } else {
-      console.log(pc14.yellow(`No stored key found for '${provider}'. (If set in environment variables, unset the env var).`));
+      console.log(pc14.yellow(`No stored key found for '${norm}' in ${getStoreName()}.`));
+      console.log(pc14.dim(`(If set via environment variable, unset ${norm.toUpperCase()}_API_KEY).`));
     }
     return;
   }
@@ -1380,7 +1669,7 @@ Add a skill using: lantern skills add <local-folder-or-git-url>`));
 // src/cli.ts
 var program = new Command();
 var config = loadConfig();
-program.name("lantern").description("Code Lantern CLI \u2014 Personal AI coding assistant for the terminal with multi-provider and skills support").version("1.0.1");
+program.name("lantern").description("Code Lantern CLI \u2014 Personal AI coding assistant for the terminal with multi-provider and skills support").version("1.0.2");
 program.option("-p, --provider <provider>", "AI provider to use (gemini, openai, anthropic, openrouter, or custom)", config.activeProvider || "gemini").option("-m, --model <model>", "Model ID to use", config.defaultModel || "gemini-3.8-flash").option("-C, --cwd <path>", "Working directory for Code Lantern agent", process.cwd()).option("-s, --session <id>", "Resume or use a specific session ID").option("-a, --attach <files...>", "Attach one or more files/images/documents to the request").option("--yolo", "Enable YOLO mode (auto-approve file edits and shell commands)", false).option("--json", "Output results formatted as JSON", false).option("--timeout <ms>", "Maximum total request duration in milliseconds (default: 60000)", (val) => parseInt(val, 10)).option("--first-token-timeout <ms>", "Maximum wait time for initial token in milliseconds (default: 30000)", (val) => parseInt(val, 10)).option("--timing", "Display detailed execution and latency timing diagnostics", false).option("--fast", "Enable low-latency streaming mode where supported", false).option("--skill <skills...>", "Activate specific skills by name for this run");
 program.command("ask <question...>").description("Ask a single question or task and stream the answer").action(async (questionParts) => {
   const opts = program.opts();