codelantern-agent-cli 1.0.0 → 1.0.2

package/dist/cli.js

@@ -1,27 +1,39 @@
 #!/usr/bin/env node
 import {
   ALLOWED_CONFIG_KEYS,
+  CancelledError,
+  LanternAgent,
   McpManager,
-  OrbitAgent,
+  ProviderRegistry,
+  SkillManager,
   addMcpServer,
+  classifyModel,
   createNewSession,
   deleteSession,
   exportSessionMarkdown,
   formatErrorMessage,
+  getApiKey,
   getConfigFilePath,
   getLanternHomeDir,
+  getRecommendedCodingModels,
   getSessionsDir,
+  getStoreName,
+  listConfiguredKeys,
   listSessions,
   loadAttachments,
   loadConfig,
   loadMcpConfig,
   loadProjectInstructions,
   loadSession,
+  maskApiKey,
+  promptMaskedApiKey,
+  removeApiKey,
   removeMcpServer,
   saveSession,
+  setApiKey,
   setConfigValue,
   toggleMcpServer
-} from "./chunk-Y3PEOLTZ.js";
+} from "./chunk-45FEFNMM.js";
 
 // src/cli.ts
 import { Command } from "commander";
@@ -61,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,
@@ -144,12 +168,13 @@ function printBanner(options) {
  | |   / _ \\ / _\` |/ _ \\ | |   / _\` | '_ \\ | __/ _ \\ '__| '_ \\ 
  | |__| (_) | (_| |  __/ | |__| (_| | | | || ||  __/ |  | | | |
   \\____\\___/ \\__,_|\\___| |_____\\__,_|_| |_(_)__\\___|_|  |_| |_|
-   \u{1F3EE} Personal AI Coding Assistant for Terminal (Gemini)
+   \u{1F3EE} Personal AI Coding Assistant for Terminal (Multi-Provider)
 `;
   console.log(pc2.yellow(logo));
   console.log(pc2.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 providerDisplay = options.provider ? `${pc2.bold("Provider:")} ${pc2.magenta(options.provider)}  ` : "";
   console.log(`${pc2.bold("Product:")}    Code Lantern CLI (${pc2.cyan("lantern")})  ${pc2.bold("Version:")} ${options.version}`);
-  console.log(`${pc2.bold("Default Model:")} ${pc2.green(options.model)}`);
+  console.log(`${providerDisplay}${pc2.bold("Model:")} ${pc2.green(options.model)}`);
   console.log(`${pc2.bold("Workspace:")}  ${pc2.blue(options.workspace)}`);
   const modeBadge = options.planMode ? pc2.bgBlue(pc2.white(" PLAN MODE (Read-only) ")) : options.yolo ? pc2.bgRed(pc2.white(" YOLO MODE (Auto-approve) ")) : pc2.bgGreen(pc2.black(" SAFE MODE (Approval Prompts) "));
   console.log(`${pc2.bold("Status:")}     ${modeBadge}`);
@@ -169,11 +194,18 @@ 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 current session, workspace, and model status`);
-      console.log(`  ${pc3.cyan("/model [name]")}         View or change current Gemini model`);
+      console.log(`  ${pc3.cyan("/status")}               Display session, provider, model, and skill status`);
+      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`);
       console.log(`  ${pc3.cyan("/yolo [on|off]")}        Toggle YOLO auto-approval mode`);
       console.log(`  ${pc3.cyan("/sessions")}             List saved local sessions`);
@@ -181,25 +213,12 @@ async function handleSlashCommand(input, context) {
       console.log(`  ${pc3.cyan("/export [md|json]")}     Export current conversation transcript`);
       console.log(`  ${pc3.cyan("/exit")} or ${pc3.cyan("/quit")}        Exit Code Lantern CLI`);
       console.log("");
-      console.log(pc3.bold("Available Agent Tools:"));
-      console.log(`  ${pc3.yellow("read_file")}           Read file contents with line ranges`);
-      console.log(`  ${pc3.yellow("write_file")}          Create new files (requires approval in safe mode)`);
-      console.log(`  ${pc3.yellow("edit_file")}           Apply targeted patch with diff preview`);
-      console.log(`  ${pc3.yellow("list_directory")}      Inspect directories honoring .gitignore`);
-      console.log(`  ${pc3.yellow("file_search")}         Find files matching glob/pattern`);
-      console.log(`  ${pc3.yellow("grep_search")}         Search code patterns across files`);
-      console.log(`  ${pc3.yellow("project_tree")}        Generate ASCII project tree`);
-      console.log(`  ${pc3.yellow("run_command")}         Run shell commands (requires approval)`);
-      console.log(`  ${pc3.yellow("git_status")}          Inspect Git status`);
-      console.log(`  ${pc3.yellow("git_diff")}            Inspect Git working tree / staged diffs`);
-      console.log(`  ${pc3.yellow("web_search")}          Search documentation / error references`);
-      console.log("");
       console.log(pc3.bold("Keyboard Shortcuts:"));
       console.log(`  ${pc3.dim("Enter")}                  Submit prompt`);
       console.log(`  ${pc3.dim("\\ + Enter")}              Continue prompt on next line (multiline)`);
       console.log(`  ${pc3.dim('""" ... """')}            Multiline prompt block`);
       console.log(`  ${pc3.dim("Up/Down Arrows")}         Navigate prompt history`);
-      console.log(`  ${pc3.dim("Ctrl+C")}                 Cancel current line / double-tap to exit`);
+      console.log(`  ${pc3.dim("Ctrl+C")}                 Cancel active request / double-tap to exit`);
       console.log(`  ${pc3.dim("Ctrl+D")}                 Exit session`);
       console.log("");
       return true;
@@ -209,22 +228,318 @@ async function handleSlashCommand(input, context) {
     case "/status":
       console.log("\n" + pc3.bold(pc3.yellow("\u{1F3EE} Code Lantern Status")));
       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("Session ID:")}    ${pc3.cyan(context.session.id)}`);
-      console.log(`${pc3.bold("Workspace:")}     ${pc3.blue(context.workspace)}`);
-      console.log(`${pc3.bold("Active Model:")}  ${pc3.green(context.model)}`);
-      console.log(`${pc3.bold("Turns:")}         ${context.session.turns.length}`);
-      console.log(`${pc3.bold("Total Tokens:")}  ${context.session.totalUsage.totalTokens.toLocaleString()}`);
-      console.log(`${pc3.bold("YOLO Mode:")}     ${context.yolo ? pc3.red("ON (Auto-approve)") : pc3.green("OFF (Prompt approval)")}`);
-      console.log(`${pc3.bold("Plan Mode:")}     ${context.planMode ? pc3.blue("ON (Read-only)") : pc3.dim("OFF (Full execution)")}`);
+      console.log(`${pc3.bold("Session ID:")}       ${pc3.cyan(context.session.id)}`);
+      console.log(`${pc3.bold("Workspace:")}        ${pc3.blue(context.workspace)}`);
+      console.log(`${pc3.bold("Active Provider:")}  ${pc3.magenta(context.provider)}`);
+      console.log(`${pc3.bold("Active Model:")}     ${pc3.green(context.model)}`);
+      console.log(`${pc3.bold("Active Skills:")}    ${context.activeSkills.length > 0 ? pc3.yellow(context.activeSkills.join(", ")) : pc3.dim("none")}`);
+      console.log(`${pc3.bold("Turns:")}            ${context.session.turns.length}`);
+      console.log(`${pc3.bold("Total Tokens:")}     ${context.session.totalUsage.totalTokens.toLocaleString()}`);
+      console.log(`${pc3.bold("Timing Logs:")}      ${context.showTiming ? pc3.green("ON") : pc3.dim("OFF")}`);
+      console.log(`${pc3.bold("YOLO Mode:")}        ${context.yolo ? pc3.red("ON (Auto-approve)") : pc3.green("OFF (Prompt approval)")}`);
+      console.log(`${pc3.bold("Plan Mode:")}        ${context.planMode ? pc3.blue("ON (Read-only)") : pc3.dim("OFF (Full execution)")}`);
       console.log("");
       return true;
-    case "/model":
+    case "/provider": {
+      const registry = new ProviderRegistry();
+      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.dim(`\u2713 Verified ${p.displayName} connection (${testRes.latencyMs}ms)`));
+        }
+        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);
+          }
+        }
+      }
+      return true;
+    }
+    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);
       if (arg) {
-        context.setModel(arg.trim());
-        console.log(pc3.green(`\u2713 Model changed to: ${arg.trim()}`));
+        const target = arg.trim();
+        const skill = manager.getSkill(target, context.workspace);
+        if (skill) {
+          const isCurrentlyActive = context.activeSkills.includes(skill.name);
+          if (isCurrentlyActive) {
+            context.setActiveSkills(context.activeSkills.filter((s) => s !== skill.name));
+            console.log(pc3.yellow(`\u2713 Deactivated skill '${skill.name}' for this session.`));
+          } else {
+            context.setActiveSkills([...context.activeSkills, skill.name]);
+            console.log(pc3.green(`\u2713 Activated skill '${skill.name}' for this session.`));
+          }
+        } else {
+          console.log(pc3.red(`Skill '${target}' not found.`));
+        }
       } else {
-        console.log(`Current model: ${pc3.cyan(context.model)}`);
-        console.log(pc3.dim(`Usage: /model <model-id> (e.g. /model gemini-3.8-flash)`));
+        console.log("\n" + pc3.bold(pc3.yellow("\u{1F3EE} Code Lantern Skills:")));
+        if (skills.length === 0) {
+          console.log(pc3.dim("  (No skills currently installed. Add one with: lantern skills add <path>)"));
+        } else {
+          for (const s of skills) {
+            const isSessionActive = context.activeSkills.includes(s.name);
+            const status = isSessionActive ? pc3.green("\u25CF ACTIVE") : s.enabled ? pc3.cyan("\u25CB default") : pc3.dim("\u25CB inactive");
+            console.log(`  ${status} ${pc3.bold(s.name)} - ${pc3.dim(s.description.slice(0, 50))}`);
+          }
+        }
+        console.log(pc3.dim(`
+Toggle skill for session: /skills <name>
+`));
+      }
+      return true;
+    }
+    case "/timing":
+      if (arg === "off") {
+        context.setShowTiming(false);
+        console.log(pc3.yellow("\u2713 Timing diagnostics disabled."));
+      } else if (arg === "on") {
+        context.setShowTiming(true);
+        console.log(pc3.green("\u2713 Timing diagnostics enabled."));
+      } else {
+        const next = !context.showTiming;
+        context.setShowTiming(next);
+        console.log(next ? pc3.green("\u2713 Timing diagnostics enabled.") : pc3.yellow("\u2713 Timing diagnostics disabled."));
       }
       return true;
     case "/plan":
@@ -302,9 +617,13 @@ async function handleSlashCommand(input, context) {
 async function interactiveCommand(options) {
   const config2 = loadConfig();
   const workspace = options.cwd || process.cwd();
+  let provider = options.provider || config2.activeProvider || "gemini";
   let model = options.model || config2.defaultModel || "gemini-3.8-flash";
   let yolo = Boolean(options.yolo ?? config2.yolo);
   let planMode = Boolean(options.plan);
+  let showTiming = Boolean(options.timing ?? config2.showTiming);
+  let lowLatency = Boolean(options.fast ?? config2.lowLatency);
+  let activeSkills = options.skill || config2.activeSkills || [];
   let session;
   if (options.session) {
     const loaded = loadSession(options.session);
@@ -313,46 +632,87 @@ async function interactiveCommand(options) {
       process.exit(1);
     }
     session = loaded;
+    if (session.provider) provider = session.provider;
+    if (session.model) model = session.model;
+    if (session.activeSkills) activeSkills = session.activeSkills;
     console.log(pc4.green(`\u2713 Resumed session: ${session.id} (${session.turns.length} turns)`));
   } else {
     session = createNewSession(workspace, model);
+    session.provider = provider;
   }
   const attachments = loadAttachments(options.attach);
   printBanner({
-    version: "1.0.0",
+    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(", ")}
 `));
   }
-  const agent = new OrbitAgent();
+  const agent = new LanternAgent();
   await agent.initMcp();
   const promptUI = new TerminalPrompt();
   const slashContext = {
     session,
+    provider,
     model,
     workspace,
     yolo,
     planMode,
+    showTiming,
+    activeSkills,
+    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));
@@ -370,25 +730,52 @@ async function interactiveCommand(options) {
         }
         continue;
       }
+      const abortController = new AbortController();
+      const onSigInt = () => {
+        abortController.abort(new CancelledError("Request cancelled by user (Ctrl+C)."));
+      };
+      process.on("SIGINT", onSigInt);
       const context = {
         workspace,
+        provider,
         model,
         yolo,
         planMode,
         jsonOutput: false,
         maxSteps: config2.maxSteps || 25,
-        attachments
+        timeoutMs: options.timeout || config2.timeoutMs || 6e4,
+        firstTokenTimeoutMs: options.firstTokenTimeout || config2.firstTokenTimeoutMs || 3e4,
+        showTiming,
+        lowLatency,
+        activeSkills,
+        attachments,
+        signal: abortController.signal
       };
       try {
         console.log("");
         const result = await agent.runTurn(session, trimmed, context, attachments);
+        const parts = [];
         if (result.usage.totalTokens > 0) {
+          parts.push(`Tokens: ${result.usage.totalTokens.toLocaleString()}`);
+        }
+        if (showTiming && result.timing) {
+          const ttft = result.timing.ttftMs ? `TTFT: ${result.timing.ttftMs}ms` : "";
+          const total = `Total: ${(result.timing.totalMs / 1e3).toFixed(2)}s`;
+          parts.push(`[${[provider, model, ttft, total].filter(Boolean).join(" | ")}]`);
+        }
+        if (parts.length > 0) {
           console.log(pc4.dim(`
-[Tokens: ${result.usage.totalTokens.toLocaleString()} | Total turns: ${session.turns.length}]`));
+[${parts.join(" | ")}]`));
         }
         console.log("");
       } catch (err) {
-        console.error("\n" + formatErrorMessage(err) + "\n");
+        if (err instanceof CancelledError || abortController.signal.aborted) {
+          console.log(pc4.yellow("\n[Cancelled by user]"));
+        } else {
+          console.error("\n" + formatErrorMessage(err) + "\n");
+        }
+      } finally {
+        process.removeListener("SIGINT", onSigInt);
       }
     }
   } finally {
@@ -400,48 +787,93 @@ async function interactiveCommand(options) {
 // src/commands/ask.ts
 import pc5 from "picocolors";
 async function askCommand(question, options) {
+  const config2 = loadConfig();
   const workspace = options.cwd || process.cwd();
-  const model = options.model || "gemini-3.8-flash";
-  const yolo = Boolean(options.yolo);
+  const provider = options.provider || config2.activeProvider || "gemini";
+  const model = options.model || config2.defaultModel || "gemini-3.8-flash";
+  const yolo = Boolean(options.yolo ?? config2.yolo);
   const jsonOutput = Boolean(options.json);
+  const showTiming = Boolean(options.timing ?? config2.showTiming);
+  const lowLatency = Boolean(options.fast ?? config2.lowLatency);
   const attachments = loadAttachments(options.attach);
   const session = createNewSession(workspace, model, `Ask: ${question.slice(0, 40)}`);
-  const agent = new OrbitAgent();
+  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();
+  const onSigInt = () => {
+    abortController.abort(new CancelledError("Request cancelled by user (Ctrl+C)."));
+  };
+  process.on("SIGINT", onSigInt);
   const context = {
     workspace,
+    provider,
     model,
     yolo,
     planMode: false,
     jsonOutput,
-    maxSteps: options.maxSteps || 25,
-    attachments
+    maxSteps: options.maxSteps || config2.maxSteps || 25,
+    timeoutMs: options.timeout || config2.timeoutMs || 6e4,
+    firstTokenTimeoutMs: options.firstTokenTimeout || config2.firstTokenTimeoutMs || 3e4,
+    showTiming,
+    lowLatency,
+    activeSkills: options.skill || config2.activeSkills || [],
+    attachments,
+    signal: abortController.signal
   };
   try {
     const result = await agent.runTurn(session, question, context, attachments);
     if (jsonOutput) {
       console.log(JSON.stringify({
         sessionId: session.id,
+        provider,
         model,
         question,
         reply: result.reply,
         toolCount: result.toolCount,
-        usage: result.usage
+        usage: result.usage,
+        timing: result.timing
       }, null, 2));
     } else {
+      const parts = [];
       if (result.usage.totalTokens > 0) {
+        parts.push(`Tokens: ${result.usage.totalTokens.toLocaleString()}`);
+      }
+      if (showTiming && result.timing) {
+        const ttft = result.timing.ttftMs ? `TTFT: ${result.timing.ttftMs}ms` : "";
+        const total = `Total: ${(result.timing.totalMs / 1e3).toFixed(2)}s`;
+        parts.push(`[${[provider, model, ttft, total].filter(Boolean).join(" | ")}]`);
+      }
+      if (parts.length > 0) {
         console.log(pc5.dim(`
-[Tokens: ${result.usage.totalTokens} | Tools executed: ${result.toolCount}]`));
+[${parts.join(" | ")}]`));
       }
     }
   } catch (err) {
     if (jsonOutput) {
       console.error(JSON.stringify({ error: err.message }));
+    } else if (err instanceof CancelledError || abortController.signal.aborted) {
+      console.log(pc5.yellow("\n[Cancelled by user]"));
     } else {
       console.error(formatErrorMessage(err));
     }
     process.exit(1);
   } finally {
+    process.removeListener("SIGINT", onSigInt);
     await agent.shutdown();
   }
 }
@@ -449,25 +881,56 @@ async function askCommand(question, options) {
 // src/commands/plan.ts
 import pc6 from "picocolors";
 async function planCommand(task, options) {
+  const config2 = loadConfig();
   const workspace = options.cwd || process.cwd();
-  const model = options.model || "gemini-3.8-flash";
+  const provider = options.provider || config2.activeProvider || "gemini";
+  const model = options.model || config2.defaultModel || "gemini-3.8-flash";
   const jsonOutput = Boolean(options.json);
+  const showTiming = Boolean(options.timing ?? config2.showTiming);
   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 and formulating step-by-step implementation plan...\n"));
+    console.log(pc6.dim(`Inspecting workspace with ${provider} (${model})...
+`));
   }
-  const agent = new OrbitAgent();
+  const agent = new LanternAgent();
   await agent.initMcp();
+  const abortController = new AbortController();
+  const onSigInt = () => {
+    abortController.abort(new CancelledError("Plan cancelled by user (Ctrl+C)."));
+  };
+  process.on("SIGINT", onSigInt);
   const context = {
     workspace,
+    provider,
     model,
     yolo: false,
     planMode: true,
     jsonOutput,
-    maxSteps: options.maxSteps || 25,
-    attachments
+    maxSteps: options.maxSteps || config2.maxSteps || 25,
+    timeoutMs: options.timeout || config2.timeoutMs || 6e4,
+    firstTokenTimeoutMs: options.firstTokenTimeout || config2.firstTokenTimeoutMs || 3e4,
+    showTiming,
+    lowLatency: false,
+    activeSkills: options.skill || config2.activeSkills || [],
+    attachments,
+    signal: abortController.signal
   };
   const planPrompt = `Please inspect the codebase as needed and generate a detailed, structured, read-only implementation plan for the following task:
 
@@ -477,23 +940,31 @@ ${task}`;
     if (jsonOutput) {
       console.log(JSON.stringify({
         sessionId: session.id,
+        provider,
         model,
         task,
         plan: result.reply,
-        usage: result.usage
+        usage: result.usage,
+        timing: result.timing
       }, null, 2));
     } else {
       console.log(pc6.dim(`
 [Plan complete. Session ID: ${session.id}]`));
+      if (showTiming && result.timing) {
+        console.log(pc6.dim(`[Total Plan Time: ${(result.timing.totalMs / 1e3).toFixed(2)}s]`));
+      }
     }
   } catch (err) {
     if (jsonOutput) {
       console.error(JSON.stringify({ error: err.message }));
+    } else if (err instanceof CancelledError || abortController.signal.aborted) {
+      console.log(pc6.yellow("\n[Plan cancelled by user]"));
     } else {
       console.error(formatErrorMessage(err));
     }
     process.exit(1);
   } finally {
+    process.removeListener("SIGINT", onSigInt);
     await agent.shutdown();
   }
 }
@@ -641,11 +1112,13 @@ import fs2 from "fs";
 import path2 from "path";
 import { execSync } from "child_process";
 import pc10 from "picocolors";
-import { GoogleGenAI } from "@google/genai";
 async function doctorCommand() {
   console.log("\n" + pc10.bold(pc10.yellow("\u{1F3EE} Code Lantern Doctor \u2014 Diagnostics")));
   console.log(pc10.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"));
   let issuesFound = 0;
+  const config2 = loadConfig();
+  const registry = new ProviderRegistry();
+  const skillManager = new SkillManager();
   const platformName = process.platform === "darwin" ? `macOS (${process.arch === "arm64" ? "Apple Silicon" : "Intel"})` : process.platform === "win32" ? `Windows (${process.arch})` : `${process.platform} (${process.arch})`;
   console.log(`${pc10.green("\u2713")} Platform / OS:          ${platformName}`);
   const nodeVer = process.version;
@@ -656,28 +1129,38 @@ async function doctorCommand() {
     issuesFound++;
     console.log(`${pc10.red("\u2717")} Node.js Runtime:        ${nodeVer} (Node 18+ required)`);
   }
-  const apiKey = process.env.GEMINI_API_KEY;
-  if (!apiKey || apiKey.trim().length === 0) {
+  const activeProviderId = config2.activeProvider || "gemini";
+  const activeProvider = registry.getProvider(activeProviderId);
+  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")} GEMINI_API_KEY:         Missing!`);
-    console.log(pc10.yellow('  \u2192 To fix: export GEMINI_API_KEY="your-api-key" from https://aistudio.google.com/app/apikey'));
+    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 masked = apiKey.length > 8 ? `${apiKey.slice(0, 4)}...${apiKey.slice(-4)}` : "configured";
-    console.log(`${pc10.green("\u2713")} GEMINI_API_KEY:         Found (${masked})`);
+    const src = activeKeyInfo.sourceDescription ? `[${activeKeyInfo.sourceDescription}]` : "";
+    console.log(`${pc10.green("\u2713")} API Key (${activeProviderId}):   Found (${activeKeyInfo.maskedKey}) ${src}`);
     try {
-      const ai = new GoogleGenAI({ apiKey: apiKey.trim() });
-      const testModel = "gemini-3.8-flash";
-      await ai.models.countTokens({
-        model: testModel,
-        contents: "test"
-      });
-      console.log(`${pc10.green("\u2713")} Gemini API Auth:        Verified (contacted '${testModel}')`);
+      const pingRes = await activeProvider.testConnection();
+      if (pingRes.success) {
+        console.log(`${pc10.green("\u2713")} Provider Auth & Ping:   Verified (${pingRes.latencyMs}ms latency)`);
+      } else {
+        issuesFound++;
+        console.log(`${pc10.red("\u2717")} Provider Auth & Ping:   Failed: ${pingRes.error}`);
+      }
     } catch (err) {
       issuesFound++;
-      console.log(`${pc10.red("\u2717")} Gemini API Auth:        Failed to contact API: ${err.message}`);
-      console.log(pc10.yellow("  \u2192 Verify your API key at https://aistudio.google.com/app/apikey"));
+      console.log(`${pc10.red("\u2717")} Provider Auth & Ping:   Error: ${err.message}`);
     }
   }
+  const otherConfigured = Object.entries(keys).filter(([p, k]) => p !== activeProviderId && k.configured);
+  if (otherConfigured.length > 0) {
+    const others = otherConfigured.map(([p]) => p).join(", ");
+    console.log(`${pc10.cyan("\u2139")} Additional Providers:   Configured (${others})`);
+  }
   try {
     const gitVer = execSync("git --version", { stdio: "pipe" }).toString().trim();
     console.log(`${pc10.green("\u2713")} Git CLI:                Available (${gitVer})`);
@@ -686,30 +1169,32 @@ async function doctorCommand() {
   }
   try {
     const configFile = getConfigFilePath();
-    const config2 = loadConfig();
-    console.log(`${pc10.green("\u2713")} Config File:            ${configFile} (Model: ${config2.defaultModel})`);
+    console.log(`${pc10.green("\u2713")} Config File:            ${configFile} (Timeout: ${config2.timeoutMs}ms, TTFT: ${config2.firstTokenTimeoutMs}ms)`);
   } catch (err) {
     issuesFound++;
-    console.log(`${pc10.red("\u2717")} Config File:            Invalid config: ${err.message}`);
+    console.log(`${pc10.red("\u2717")} Config File:            Invalid: ${err.message}`);
   }
   try {
     const sessionsDir = getSessionsDir();
-    const count = fs2.readdirSync(sessionsDir).filter((f) => f.endsWith(".json")).length;
+    const count = fs2.existsSync(sessionsDir) ? fs2.readdirSync(sessionsDir).filter((f) => f.endsWith(".json")).length : 0;
     console.log(`${pc10.green("\u2713")} Session Storage:        ${sessionsDir} (${count} stored session(s))`);
   } catch (err) {
     issuesFound++;
-    console.log(`${pc10.red("\u2717")} Session Storage:        Failed to access: ${err.message}`);
+    console.log(`${pc10.red("\u2717")} Session Storage:        Failed: ${err.message}`);
+  }
+  const installedSkills = skillManager.listSkills();
+  if (installedSkills.length > 0) {
+    const activeCount = installedSkills.filter((s) => s.enabled).length;
+    console.log(`${pc10.green("\u2713")} Skills:                 ${installedSkills.length} installed (${activeCount} active default)`);
+  } else {
+    console.log(`${pc10.cyan("\u2139")} Skills:                 None installed (add with: lantern skills add <path>)`);
   }
   const mcpServers = loadMcpConfig();
   const serverCount = Object.keys(mcpServers).length;
   if (serverCount === 0) {
-    console.log(`${pc10.cyan("\u2139")} MCP Configuration:      No external MCP servers configured (optional)`);
+    console.log(`${pc10.cyan("\u2139")} MCP Servers:            No external MCP servers configured (optional)`);
   } else {
-    console.log(`${pc10.green("\u2713")} MCP Configuration:      ${serverCount} server(s) configured`);
-    for (const [name, s] of Object.entries(mcpServers)) {
-      const status = s.disabled ? pc10.dim("(disabled)") : pc10.green("(enabled)");
-      console.log(`    \u2022 ${name}: ${s.command} ${(s.args || []).join(" ")} ${status}`);
-    }
+    console.log(`${pc10.green("\u2713")} MCP Servers:            ${serverCount} server(s) configured`);
   }
   const cwd = process.cwd();
   const instructions = loadProjectInstructions(cwd);
@@ -826,39 +1311,411 @@ async function mcpCommand(action, serverName, command, args = []) {
   process.exit(1);
 }
 
+// src/commands/providersCmd.ts
+import pc12 from "picocolors";
+import readline2 from "readline";
+function promptLine(query, hide = false) {
+  const rl = readline2.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  return new Promise((resolve) => {
+    rl.question(query, (answer) => {
+      rl.close();
+      resolve(answer.trim());
+    });
+  });
+}
+async function providersCommand(action, target, options) {
+  const registry = new ProviderRegistry();
+  const subAction = (action || "list").toLowerCase();
+  if (subAction === "list") {
+    const providers = registry.listProviders();
+    console.log("\n" + pc12.bold(pc12.yellow("\u{1F3EE} Configured AI Providers")));
+    console.log(pc12.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(
+      pc12.bold("Provider".padEnd(16)) + pc12.bold("Status".padEnd(16)) + pc12.bold("Default Model".padEnd(30)) + pc12.bold("Key Source")
+    );
+    console.log(pc12.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 of providers) {
+      const activeMarker = p.isActive ? pc12.green(" (active)") : "";
+      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.sourceDescription ? pc12.cyan(`[${keyInfo.sourceDescription}]`) : pc12.dim("(missing)");
+      console.log(
+        nameCol.padEnd(p.isActive ? 25 : 16) + statusCol.padEnd(25) + p.defaultModel.padEnd(30) + sourceCol
+      );
+    }
+    console.log(pc12.dim("\nTo set default: lantern providers set-default <name>"));
+    console.log(pc12.dim("To test connection: lantern providers test [name]"));
+    console.log(pc12.dim("To add custom provider: lantern providers add <name>\n"));
+    return;
+  }
+  if (subAction === "set-default" || subAction === "use") {
+    if (!target) {
+      console.error(pc12.red("Error: Missing provider name. Usage: lantern providers set-default <name>"));
+      process.exit(1);
+    }
+    const norm = target.toLowerCase();
+    if (!registry.hasProvider(norm)) {
+      console.error(pc12.red(`Error: Provider '${target}' is not registered.`));
+      process.exit(1);
+    }
+    setConfigValue("activeProvider", norm);
+    const p = registry.getProvider(norm);
+    setConfigValue("defaultModel", p.defaultModel);
+    console.log(pc12.green(`\u2713 Set active provider to '${p.displayName}' (default model: ${p.defaultModel})`));
+    return;
+  }
+  if (subAction === "test") {
+    const targetProvider = target || loadConfig().activeProvider || "gemini";
+    const p = registry.getProvider(targetProvider);
+    console.log(`Testing connection to ${pc12.cyan(p.displayName)}...`);
+    const result = await p.testConnection();
+    if (result.success) {
+      console.log(pc12.green(`\u2713 Connection verified! Latency: ${result.latencyMs}ms`));
+      if (result.modelsCount !== void 0) {
+        console.log(pc12.dim(`  Available models discovered: ${result.modelsCount}`));
+      }
+    } else {
+      console.log(pc12.red(`\u2717 Connection failed: ${result.error}`));
+      console.log(pc12.yellow(`  Check your credentials with 'lantern keys list'`));
+      process.exit(1);
+    }
+    return;
+  }
+  if (subAction === "add") {
+    const name = target || await promptLine("Provider ID / Name: ");
+    if (!name) {
+      console.error(pc12.red("Error: Provider name is required."));
+      process.exit(1);
+    }
+    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 promptMaskedApiKey("API Key (optional, press Enter to skip)");
+    registry.registerCustomProvider({
+      id: name.toLowerCase(),
+      name,
+      type: "custom",
+      baseUrl,
+      defaultModel: defaultModel || "default"
+    });
+    if (apiKey) {
+      setApiKey(name.toLowerCase(), apiKey);
+    }
+    console.log(pc12.green(`\u2713 Registered custom OpenAI-compatible provider '${name}'`));
+    return;
+  }
+  if (subAction === "remove" || subAction === "rm") {
+    if (!target) {
+      console.error(pc12.red("Error: Missing provider name. Usage: lantern providers remove <name>"));
+      process.exit(1);
+    }
+    const removed = registry.removeCustomProvider(target);
+    if (removed) {
+      console.log(pc12.green(`\u2713 Removed provider '${target}'`));
+    } else {
+      console.log(pc12.red(`Cannot remove built-in provider '${target}'. Only custom providers can be removed.`));
+      process.exit(1);
+    }
+    return;
+  }
+  console.error(pc12.red(`Unknown action '${action}'. Available: list, set-default, test, add, remove`));
+  process.exit(1);
+}
+
+// src/commands/modelsCmd.ts
+import pc13 from "picocolors";
+async function modelsCommand(action, modelId, options) {
+  const registry = new ProviderRegistry();
+  const config2 = loadConfig();
+  const subAction = (action || "list").toLowerCase();
+  const providerId = options?.provider || config2.activeProvider || "gemini";
+  const provider = registry.getProvider(providerId);
+  if (subAction === "list") {
+    if (!options?.json) {
+      console.log(`
+Fetching models for ${pc13.cyan(provider.displayName)}...`);
+    }
+    const models = await provider.listModels(Boolean(options?.refresh));
+    if (options?.json) {
+      console.log(JSON.stringify(models, null, 2));
+      return;
+    }
+    console.log("\n" + pc13.bold(pc13.yellow(`\u{1F3EE} Available Models for ${provider.displayName}`)));
+    console.log(pc13.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(
+      pc13.bold("Model ID".padEnd(36)) + pc13.bold("Tools".padEnd(8)) + pc13.bold("Vision".padEnd(8)) + pc13.bold("Reasoning".padEnd(12)) + pc13.bold("Context Window")
+    );
+    console.log(pc13.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 currentModel = config2.defaultModel;
+    for (const m of models) {
+      const isCurrent = m.id === currentModel;
+      const marker = isCurrent ? pc13.green(" (active)") : "";
+      const idCol = (m.id + marker).slice(0, 34);
+      const toolsCol = m.capabilities.tools ? pc13.green("\u2713") : pc13.dim("\u2717");
+      const visionCol = m.capabilities.images ? pc13.green("\u2713") : pc13.dim("\u2717");
+      const reasoningCol = m.capabilities.reasoning ? pc13.magenta("\u2713") : pc13.dim("\u2717");
+      const ctxCol = m.contextWindow ? `${(m.contextWindow / 1e3).toFixed(0)}k` : pc13.dim("standard");
+      console.log(
+        idCol.padEnd(isCurrent ? 45 : 36) + toolsCol.padEnd(16) + visionCol.padEnd(16) + reasoningCol.padEnd(20) + ctxCol
+      );
+    }
+    console.log(pc13.dim("\nTo set active model: lantern model set <model-id>"));
+    console.log(pc13.dim(`Example: lantern model set ${models[0]?.id || "gemini-3.8-flash"}
+`));
+    return;
+  }
+  if (subAction === "set") {
+    if (!modelId) {
+      console.error(pc13.red("Error: Missing model ID. Usage: lantern model set <model-id> [--provider <provider>]"));
+      process.exit(1);
+    }
+    if (options?.provider) {
+      setConfigValue("activeProvider", options.provider.toLowerCase());
+    }
+    setConfigValue("defaultModel", modelId.trim());
+    console.log(pc13.green(`\u2713 Set active model to '${modelId.trim()}' (provider: ${provider.displayName})`));
+    return;
+  }
+  console.error(pc13.red(`Unknown action '${action}'. Available: list, set`));
+  process.exit(1);
+}
+
+// src/commands/keysCmd.ts
+import pc14 from "picocolors";
+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(`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(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\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.configured ? info.source === "env" ? pc14.cyan(info.sourceDescription) : pc14.blue(info.sourceDescription) : pc14.dim("none");
+      console.log(
+        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>"));
+    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") {
+    if (!provider) {
+      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 promptMaskedApiKey(`Enter API key for '${norm}'`);
+    }
+    if (!apiKey) {
+      console.error(pc14.red("Error: API key cannot be empty."));
+      process.exit(1);
+    }
+    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") {
+    if (!provider) {
+      console.error(pc14.red("Error: Missing provider name. Usage: lantern keys remove <provider>"));
+      process.exit(1);
+    }
+    const norm = provider.toLowerCase().trim();
+    const removed = removeApiKey(norm);
+    if (removed) {
+      console.log(pc14.green(`\u2713 Removed stored key for '${norm}' from ${getStoreName()}`));
+    } else {
+      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;
+  }
+  console.error(pc14.red(`Unknown action '${action}'. Available: list, set, remove`));
+  process.exit(1);
+}
+
+// src/commands/skillsCmd.ts
+import pc15 from "picocolors";
+async function skillsCommand(action, target) {
+  const manager = new SkillManager();
+  const subAction = (action || "list").toLowerCase();
+  if (subAction === "list") {
+    const skills = manager.listSkills();
+    console.log("\n" + pc15.bold(pc15.yellow("\u{1F3EE} Installed Code Lantern Skills")));
+    console.log(pc15.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(
+      pc15.bold("Skill Name".padEnd(24)) + pc15.bold("Source".padEnd(12)) + pc15.bold("Status".padEnd(14)) + pc15.bold("Description")
+    );
+    console.log(pc15.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"));
+    if (skills.length === 0) {
+      console.log(pc15.dim("No skills currently installed."));
+      console.log(pc15.dim(`
+Add a skill using: lantern skills add <local-folder-or-git-url>`));
+      console.log(pc15.dim(`User skills folder: ${manager.getUserSkillsDir()}
+`));
+      return;
+    }
+    for (const s of skills) {
+      const statusText = s.enabled ? pc15.green("\u2713 Active") : pc15.dim("Disabled");
+      const sourceText = s.source === "project" ? pc15.cyan("[project]") : pc15.blue("[user]");
+      console.log(
+        pc15.bold(s.name.padEnd(24)) + sourceText.padEnd(20) + statusText.padEnd(22) + pc15.dim(s.description.slice(0, 40))
+      );
+    }
+    console.log(pc15.dim("\nTo inspect: lantern skills show <name>"));
+    console.log(pc15.dim("To enable:  lantern skills enable <name>"));
+    console.log(pc15.dim("To disable: lantern skills disable <name>"));
+    console.log(pc15.dim("To add:     lantern skills add <folder-path-or-git-url>\n"));
+    return;
+  }
+  if (subAction === "show") {
+    if (!target) {
+      console.error(pc15.red("Error: Missing skill name. Usage: lantern skills show <name>"));
+      process.exit(1);
+    }
+    const skill = manager.getSkill(target);
+    if (!skill) {
+      console.error(pc15.red(`Error: Skill '${target}' not found.`));
+      process.exit(1);
+    }
+    console.log("\n" + pc15.bold(pc15.yellow(`\u{1F3EE} Skill: ${skill.name}`)));
+    console.log(pc15.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(`${pc15.bold("Source:")}      ${skill.source}`);
+    console.log(`${pc15.bold("Path:")}        ${skill.path}`);
+    console.log(`${pc15.bold("Status:")}      ${skill.enabled ? pc15.green("Enabled") : pc15.dim("Disabled")}`);
+    console.log(`${pc15.bold("Description:")} ${skill.description}`);
+    if (skill.references && skill.references.length > 0) {
+      console.log(`${pc15.bold("References:")}  ${skill.references.length} reference file(s) available`);
+    }
+    console.log(pc15.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("\n" + pc15.cyan("Instructions Content:"));
+    console.log(skill.content.slice(0, 1e3) + (skill.content.length > 1e3 ? "\n... (truncated)" : ""));
+    console.log("");
+    return;
+  }
+  if (subAction === "enable") {
+    if (!target) {
+      console.error(pc15.red("Error: Missing skill name. Usage: lantern skills enable <name>"));
+      process.exit(1);
+    }
+    const skill = manager.getSkill(target);
+    if (!skill) {
+      console.error(pc15.red(`Error: Skill '${target}' not found.`));
+      process.exit(1);
+    }
+    manager.enableSkill(skill.name);
+    console.log(pc15.green(`\u2713 Enabled skill '${skill.name}'`));
+    return;
+  }
+  if (subAction === "disable") {
+    if (!target) {
+      console.error(pc15.red("Error: Missing skill name. Usage: lantern skills disable <name>"));
+      process.exit(1);
+    }
+    manager.disableSkill(target);
+    console.log(pc15.yellow(`\u2713 Disabled skill '${target}'`));
+    return;
+  }
+  if (subAction === "add") {
+    if (!target) {
+      console.error(pc15.red("Error: Missing path or repository URL. Usage: lantern skills add <path-or-git-url>"));
+      process.exit(1);
+    }
+    console.log(`Adding skill from '${target}'...`);
+    const isGit = target.startsWith("http://") || target.startsWith("https://") || target.startsWith("git@");
+    const result = isGit ? manager.addSkillFromGit(target) : manager.addSkillFromPath(target);
+    if (result.success) {
+      console.log(pc15.green(`\u2713 Successfully added and enabled skill '${result.skillName}'`));
+    } else {
+      console.error(pc15.red(`\u2717 Failed to add skill: ${result.error}`));
+      process.exit(1);
+    }
+    return;
+  }
+  if (subAction === "remove" || subAction === "rm") {
+    if (!target) {
+      console.error(pc15.red("Error: Missing skill name. Usage: lantern skills remove <name>"));
+      process.exit(1);
+    }
+    const removed = manager.removeSkill(target);
+    if (removed) {
+      console.log(pc15.green(`\u2713 Removed skill '${target}'`));
+    } else {
+      console.error(pc15.red(`\u2717 Skill '${target}' not found or could not be removed.`));
+      process.exit(1);
+    }
+    return;
+  }
+  console.error(pc15.red(`Unknown action '${action}'. Available: list, show, add, enable, disable, remove`));
+  process.exit(1);
+}
+
 // 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 powered by Google Gemini").version("1.0.0");
-program.option("-m, --model <model>", "Gemini 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);
+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();
   const question = questionParts.join(" ");
   await askCommand(question, {
+    provider: opts.provider,
     model: opts.model,
     cwd: opts.cwd,
     attach: opts.attach,
     yolo: opts.yolo,
-    json: opts.json
+    json: opts.json,
+    timeout: opts.timeout,
+    firstTokenTimeout: opts.firstTokenTimeout,
+    timing: opts.timing,
+    fast: opts.fast,
+    skill: opts.skill
   });
 });
 program.command("plan <task...>").description("Inspect the codebase and produce a read-only implementation plan").action(async (taskParts) => {
   const opts = program.opts();
   const task = taskParts.join(" ");
   await planCommand(task, {
+    provider: opts.provider,
     model: opts.model,
     cwd: opts.cwd,
     attach: opts.attach,
-    json: opts.json
+    json: opts.json,
+    timeout: opts.timeout,
+    firstTokenTimeout: opts.firstTokenTimeout,
+    timing: opts.timing,
+    skill: opts.skill
   });
 });
 program.command("resume [sessionId]").description("Continue a saved conversation session").action(async (sessionId) => {
   const opts = program.opts();
   await resumeCommand(sessionId, {
+    provider: opts.provider,
     model: opts.model,
     cwd: opts.cwd,
     attach: opts.attach,
-    yolo: opts.yolo
+    yolo: opts.yolo,
+    timeout: opts.timeout,
+    firstTokenTimeout: opts.firstTokenTimeout,
+    timing: opts.timing,
+    fast: opts.fast,
+    skill: opts.skill
   });
 });
 program.command("sessions").description("List, delete, or export saved local sessions").option("-d, --delete <id>", "Delete session by ID").option("-e, --export <id>", "Export session transcript by ID").action(async (cmdOpts) => {
@@ -872,13 +1729,29 @@ program.command("sessions").description("List, delete, or export saved local ses
 program.command("config [action] [key] [value]").description("View or update configuration (list, get, set, path)").action(async (action, key, value) => {
   await configCommand(action, key, value);
 });
-program.command("doctor").description("Diagnose API key, configuration, environment, and MCP server health").action(async () => {
+program.command("doctor").description("Diagnose API keys, configuration, environment, and MCP server health").action(async () => {
   await doctorCommand();
 });
 program.command("mcp [action] [serverName] [command] [args...]").description("Manage configured MCP servers (list, add, remove, enable, disable, test)").allowUnknownOption().action(async (action, serverName, cmd, ...rest) => {
   const rawArgs = rest.flat().filter((a) => typeof a === "string");
   await mcpCommand(action, serverName, cmd, rawArgs);
 });
+program.command("providers [action] [target]").description("Manage AI providers (list, set-default, test, add, remove)").option("--base-url <url>", "Base URL for custom OpenAI-compatible provider").option("--api-key <key>", "API key for provider").option("--model <model>", "Default model ID for provider").action(async (action, target, cmdOpts) => {
+  await providersCommand(action, target, cmdOpts);
+});
+program.command("models [action] [modelId]").alias("model").description("List available models or switch the active model").option("-p, --provider <provider>", "Provider to inspect models for").option("-r, --refresh", "Bypass cache and query live model list", false).option("--json", "Output models list as JSON", false).action(async (action, modelId, cmdOpts) => {
+  const globalOpts = program.opts();
+  const provider = cmdOpts?.provider || globalOpts.provider;
+  const json = Boolean(cmdOpts?.json || globalOpts.json);
+  const refresh = Boolean(cmdOpts?.refresh);
+  await modelsCommand(action, modelId, { provider, refresh, json });
+});
+program.command("keys [action] [provider] [key]").description("Securely manage API keys with local AES-256-GCM encryption (list, set, remove)").action(async (action, provider, key) => {
+  await keysCommand(action, provider, key);
+});
+program.command("skills [action] [target]").description("Manage portable skills in SKILL.md format (list, show, add, enable, disable, remove)").action(async (action, target) => {
+  await skillsCommand(action, target);
+});
 program.action(async () => {
   const opts = program.opts();
   if (!process.stdin.isTTY) {
@@ -890,21 +1763,33 @@ program.action(async () => {
     const trimmedPiped = pipedData.trim();
     if (trimmedPiped) {
       await askCommand(trimmedPiped, {
+        provider: opts.provider,
         model: opts.model,
         cwd: opts.cwd,
         attach: opts.attach,
         yolo: opts.yolo,
-        json: opts.json
+        json: opts.json,
+        timeout: opts.timeout,
+        firstTokenTimeout: opts.firstTokenTimeout,
+        timing: opts.timing,
+        fast: opts.fast,
+        skill: opts.skill
       });
       return;
     }
   }
   await interactiveCommand({
+    provider: opts.provider,
     model: opts.model,
     cwd: opts.cwd,
     session: opts.session,
     attach: opts.attach,
-    yolo: opts.yolo
+    yolo: opts.yolo,
+    timeout: opts.timeout,
+    firstTokenTimeout: opts.firstTokenTimeout,
+    timing: opts.timing,
+    fast: opts.fast,
+    skill: opts.skill
   });
 });
 program.parseAsync(process.argv).catch((err) => {