apex-dev 3.10.21 → 3.10.25

package/dist/index.js

@@ -104,6 +104,7 @@ var require_store = __commonJS((exports, module2) => {
       messages: state.messages.map((m2) => m2.id === id ? { ...m2, ...updates } : m2)
     };
     notify();
+    return id;
   }
   function toggleMessageExpanded(id) {
     state = {
@@ -304,6 +305,90 @@ var require_config = __commonJS((exports, module) => {
   const OpenAI = __require("openai");
   const fs = __require("fs");
   const path = __require("path");
+  const os = __require("os");
+  const CONFIG_PATH = path.join(os.homedir(), ".apex-dev", "config.json");
+  function readSavedApiKeys() {
+    try {
+      if (!fs.existsSync(CONFIG_PATH))
+        return {};
+      const parsed = JSON.parse(fs.readFileSync(CONFIG_PATH, "utf-8"));
+      return parsed && typeof parsed === "object" ? parsed : {};
+    } catch {
+      return {};
+    }
+  }
+  function writeSavedApiKeys(config) {
+    const dir = path.dirname(CONFIG_PATH);
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
+    fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2));
+    fs.chmodSync(CONFIG_PATH, 384);
+  }
+  function getSavedApiKey(providerKey) {
+    const config = readSavedApiKeys();
+    return config[providerKey] || "";
+  }
+  function getProviderLoginState(providerKey) {
+    const provider = PROVIDERS[providerKey];
+    if (!provider)
+      return "empty";
+    if (process.env[provider.envKey])
+      return "logged-in";
+    if (getSavedApiKey(providerKey))
+      return "saved";
+    return "empty";
+  }
+  function updateSavedApiKey(providerKey, apiKey) {
+    const config = readSavedApiKeys();
+    if (apiKey) {
+      config[providerKey] = apiKey;
+    } else {
+      delete config[providerKey];
+    }
+    if (Object.keys(config).length === 0) {
+      try {
+        fs.unlinkSync(CONFIG_PATH);
+      } catch {}
+      return config;
+    }
+    writeSavedApiKeys(config);
+    return config;
+  }
+  function clearSavedApiKey(providerKey) {
+    return updateSavedApiKey(providerKey, "");
+  }
+  function loginProvider(providerKey, apiKey) {
+    updateSavedApiKey(providerKey, apiKey);
+    setProvider(providerKey, apiKey);
+    return { providerKey, apiKey };
+  }
+  function logoutProvider(providerKey) {
+    clearSavedApiKey(providerKey);
+    const provider = PROVIDERS[providerKey];
+    if (provider) {
+      delete process.env[provider.envKey];
+      if (currentProvider === providerKey) {
+        setProvider(providerKey, "");
+      }
+    }
+    const remaining = getFirstSavedProvider();
+    if (remaining) {
+      currentProvider = remaining.providerKey;
+      process.env[remaining.provider.envKey] = remaining.apiKey;
+      setProvider(remaining.providerKey, remaining.apiKey);
+    }
+    return remaining;
+  }
+  function getFirstSavedProvider() {
+    const config = readSavedApiKeys();
+    for (const [providerKey, provider] of Object.entries(PROVIDERS)) {
+      if (config[providerKey]) {
+        return { providerKey, apiKey: config[providerKey], provider };
+      }
+    }
+    return null;
+  }
   const PROVIDERS = {
     fireworks: {
       label: "Fireworks AI",
@@ -412,6 +497,16 @@ var require_config = __commonJS((exports, module) => {
     return "fireworks";
   }
   let currentProvider = detectInitialProvider();
+  try {
+    const hasEnvKey = Object.values(PROVIDERS).some((p) => process.env[p.envKey]);
+    if (!hasEnvKey) {
+      const saved = getFirstSavedProvider();
+      if (saved) {
+        currentProvider = saved.providerKey;
+        process.env[saved.provider.envKey] = saved.apiKey;
+      }
+    }
+  } catch {}
   const currentModels = Object.assign({}, PROVIDERS[currentProvider].models);
   const MAX_TOOL_ITERATIONS = 50;
   const MAX_OUTPUT_LEN = 12000;
@@ -452,7 +547,7 @@ var require_config = __commonJS((exports, module) => {
 
 - **Idiomatic Changes:** When editing, understand the local context (imports, functions/classes) to ensure your changes integrate naturally and idiomatically.
 
-- **Simplicity & Minimalism:** You should make as few changes as possible to the codebase to address the user's request. Only do what the user has asked for and no more. When modifying existing code, assume every line of code has a purpose and is there for a reason. Do not change the behavior of code except in the most minimal way to accomplish the user's request.
+- **Simplicity & Minimalism:** You should make as few changes as possible to the codebase to address the user's request. Only do what the user has asked and no more. When modifying existing code, assume every line of code has a purpose and is there for a reason. Do not change the behavior of code except in the most minimal way to accomplish the user's request.
 
 - **Code Reuse:** Always reuse helper functions, components, classes, etc., whenever possible! Don't reimplement what already exists elsewhere in the codebase.
 
@@ -488,7 +583,7 @@ var require_config = __commonJS((exports, module) => {
 
 Use the spawn_agents tool to spawn specialized agents to help you complete the user's request.
 
-- **Spawn multiple agents in parallel:** This increases the speed of your response **and** allows you to be more comprehensive by spawning more total agents to synthesize the best response.
+- **Spawn multiple agents in parallel:** This increases the speed of your response **and** allows you to be more comprehensive by spawning more total agents to synthesize the best solution.
 
 - **Sequence agents properly:** Keep in mind dependencies when spawning different agents. Don't spawn agents in parallel that depend on each other.
 
@@ -868,25 +963,6 @@ The user asks you to implement a new feature. You respond in multiple steps:
     deepseek: { model: "deepseek/deepseek-chat-v3", temperature: 0.1, maxTokens: 8192 },
     minimax: { model: "minimax/minimax-01", temperature: 0.1, maxTokens: 8192 }
   };
-  const os = __require("os");
-  let savedProvider = null;
-  try {
-    const configPath = path.join(os.homedir(), ".apex-dev", "config.json");
-    if (fs.existsSync(configPath)) {
-      const savedConfig = JSON.parse(fs.readFileSync(configPath, "utf-8"));
-      const hasEnvKey = Object.values(PROVIDERS).some((p) => process.env[p.envKey]);
-      if (!hasEnvKey) {
-        for (const [providerKey, provider] of Object.entries(PROVIDERS)) {
-          if (savedConfig[providerKey]) {
-            currentProvider = providerKey;
-            process.env[provider.envKey] = savedConfig[providerKey];
-            savedProvider = providerKey;
-            break;
-          }
-        }
-      }
-    }
-  } catch (e) {}
   const _initialProvider = PROVIDERS[currentProvider];
   const _initialKey = process.env[_initialProvider.envKey] || "no-key";
   let _internalClient = new OpenAI({
@@ -1015,6 +1091,15 @@ The user asks you to implement a new feature. You respond in multiple steps:
     },
     detectInitialProvider,
     setProvider,
+    readSavedApiKeys,
+    writeSavedApiKeys,
+    getSavedApiKey,
+    getProviderLoginState,
+    updateSavedApiKey,
+    clearSavedApiKey,
+    loginProvider,
+    logoutProvider,
+    getFirstSavedProvider,
     agentConfigs,
     agentModes,
     codeEditorModelVariants,
@@ -3300,7 +3385,7 @@ var require_commands = __commonJS((exports, module2) => {
   var fs2 = __require2("fs");
   var path2 = __require2("path");
   var { execSync } = __require2("child_process");
-  var { PROJECT_ROOT, session, resolvePath } = require_config();
+  var { PROJECT_ROOT, session, resolvePath, logoutProvider, getProviderLoginState } = require_config();
   var { executeTool } = require_toolExecutors();
   var store = require_store();
   async function handleSlashCommand(input) {
@@ -3310,6 +3395,20 @@ var require_commands = __commonJS((exports, module2) => {
       case "/help":
         store.setState({ showHelp: true });
         break;
+      case "/login":
+      case "/provider":
+        store.setState({ showHelp: false, needsConfig: true });
+        break;
+      case "/logout": {
+        const provider = store.getSnapshot().provider;
+        if (getProviderLoginState(provider) === "logged-in") {
+          logoutProvider(provider);
+          store.setState({ showHelp: false, needsConfig: true, apiKey: "" });
+        } else {
+          store.setState({ showHelp: false, needsConfig: true });
+        }
+        break;
+      }
       case "/clear":
         session.conversationHistory = [];
         store.clearMessages();
@@ -3437,13 +3536,15 @@ function Header() {
       setBranch(b2);
     } catch {}
   }, []);
-  const provider = import_store_h.getSnapshot().provider;
+  const snapshot = import_store_h.getSnapshot();
+  const provider = snapshot.provider;
   const providerLabel = import_config.PROVIDERS[provider]?.label || provider;
+  const configReady = !snapshot.needsConfig;
   return /* @__PURE__ */ jsx_runtime.jsxs("box", {
-    style: { flexDirection: "row", paddingLeft: 1, paddingRight: 1 },
+    style: { flexDirection: "row", paddingLeft: 1, paddingRight: 1, paddingTop: 1, paddingBottom: 0 },
     children: [
       /* @__PURE__ */ jsx_runtime.jsx("box", {
-        style: { flexGrow: 1 },
+        style: { flexGrow: 1, flexDirection: "column" },
         children: /* @__PURE__ */ jsx_runtime.jsxs("text", {
           children: [
             /* @__PURE__ */ jsx_runtime.jsx("span", {
@@ -3482,15 +3583,36 @@ function Header() {
           ]
         })
       }),
-      !isNarrow ? /* @__PURE__ */ jsx_runtime.jsxs("text", {
+      !isNarrow ? /* @__PURE__ */ jsx_runtime.jsxs("box", {
+        style: { flexDirection: "column", alignItems: "flex-end" },
         children: [
-          /* @__PURE__ */ jsx_runtime.jsx("span", {
-            fg: import_theme.colors.dim,
-            children: "\xB7  "
+          /* @__PURE__ */ jsx_runtime.jsxs("text", {
+            children: [
+              /* @__PURE__ */ jsx_runtime.jsx("span", {
+                fg: configReady ? import_theme.colors.green : import_theme.colors.yellow,
+                children: configReady ? "\u25CF" : "\u25CB"
+              }),
+              /* @__PURE__ */ jsx_runtime.jsx("span", {
+                fg: import_theme.colors.dim,
+                children: " "
+              }),
+              /* @__PURE__ */ jsx_runtime.jsx("span", {
+                fg: import_theme.colors.muted,
+                children: configReady ? "ready" : "needs setup"
+              })
+            ]
           }),
-          /* @__PURE__ */ jsx_runtime.jsx("span", {
-            fg: import_theme.colors.muted,
-            children: providerLabel
+          /* @__PURE__ */ jsx_runtime.jsxs("text", {
+            children: [
+              /* @__PURE__ */ jsx_runtime.jsx("span", {
+                fg: import_theme.colors.dim,
+                children: "provider "
+              }),
+              /* @__PURE__ */ jsx_runtime.jsx("span", {
+                fg: import_theme.colors.primary,
+                children: providerLabel
+              })
+            ]
           })
         ]
       }) : null
@@ -3513,7 +3635,7 @@ var jsx_runtime3 = __toESM(require_jsx_runtime(), 1);
 function Welcome() {
   const { isNarrow } = useLayout();
   return /* @__PURE__ */ jsx_runtime3.jsxs("box", {
-    style: { flexDirection: "column", paddingLeft: 1, marginTop: 1 },
+    style: { flexDirection: "column", paddingLeft: 1, marginTop: 1, marginBottom: 1 },
     children: [
       /* @__PURE__ */ jsx_runtime3.jsx("text", {
         fg: import_theme3.colors.white,
@@ -3522,8 +3644,13 @@ function Welcome() {
       }),
       /* @__PURE__ */ jsx_runtime3.jsx("text", {
         fg: import_theme3.colors.dim,
-        content: isNarrow ? `Max ${import_config2.MAX_TOOL_ITERATIONS} iterations` : `Tools available \xB7 Max ${import_config2.MAX_TOOL_ITERATIONS} iterations per turn`
-      })
+        content: isNarrow ? `Type a message or /help` : `Apex can read, edit, run commands, and review your code. Use /help to see shortcuts.`
+      }),
+      !isNarrow ? /* @__PURE__ */ jsx_runtime3.jsx("text", {
+        fg: import_theme3.colors.dim,
+        style: { marginTop: 0 },
+        content: `Shortcuts \xB7 /help \xB7 /files \xB7 /diff \xB7 /cost \xB7 /quit \xB7 Max ${import_config2.MAX_TOOL_ITERATIONS} iterations`
+      }) : null
     ]
   });
 }
@@ -4051,16 +4178,18 @@ function InputBar({ disabled, onSubmit }) {
       inputRef.current.value = "";
     onSubmit(trimmed);
   };
-  const hint = isNarrow ? "^C \xB7 /?" : "Ctrl+C exit  \xB7  /help";
+  const hint = isNarrow ? "Ctrl+C \xB7 /" : "Ctrl+C exit \xB7 /help \xB7 /files";
+  const placeholder = disabled ? "setup in progress..." : isNarrow ? "Message or /cmd" : "Ask Apex anything, or use /commands";
   return /* @__PURE__ */ jsx_runtime12.jsx("box", {
-    style: { flexDirection: "column" },
+    style: { flexDirection: "column", paddingLeft: 1, paddingRight: 1, paddingBottom: 1 },
     children: /* @__PURE__ */ jsx_runtime12.jsxs("box", {
       style: {
         flexDirection: "row",
         paddingLeft: 1,
         paddingRight: 1,
         borderStyle: "rounded",
-        borderColor: disabled ? import_theme12.colors.dim : import_theme12.colors.border
+        borderColor: disabled ? import_theme12.colors.dim : import_theme12.colors.border,
+        backgroundColor: disabled ? import_theme12.colors.surface : undefined
       },
       children: [
         /* @__PURE__ */ jsx_runtime12.jsx("text", {
@@ -4071,7 +4200,7 @@ function InputBar({ disabled, onSubmit }) {
         /* @__PURE__ */ jsx_runtime12.jsx("input", {
           ref: inputRef,
           focused: !disabled,
-          placeholder: disabled ? "processing..." : "Type a message or /command",
+          placeholder,
           onSubmit: handleSubmit,
           fg: import_theme12.colors.text,
           style: { flexGrow: 1 }
@@ -4087,10 +4216,13 @@ function InputBar({ disabled, onSubmit }) {
 var import_react_sb = __toESM(require_react(), 1);
 var import_theme13 = __toESM(require_theme(), 1);
 var import_config3 = __toESM(require_config(), 1);
+var import_store3 = __toESM(require_store(), 1);
 var jsx_runtime13 = __toESM(require_jsx_runtime(), 1);
 var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 function StatusBar({ isProcessing }) {
   const { isNarrow } = useLayout();
+  const snapshot = import_config3.session;
+  const state = import_store3.getSnapshot();
   const [tick, setTick] = import_react_sb.useState(0);
   import_react_sb.useEffect(() => {
     const id = setInterval(() => setTick((t) => t + 1), 1000);
@@ -4103,11 +4235,12 @@ function StatusBar({ isProcessing }) {
     const id = setInterval(() => setSpinFrame((f) => (f + 1) % SPINNER_FRAMES.length), 80);
     return () => clearInterval(id);
   }, [isProcessing]);
-  const elapsed = (tick, ((Date.now() - import_config3.session.startTime) / 1000 / 60).toFixed(1));
-  const { totalCost, totalTokens, toolCallCount, turnCount, filesModified } = import_config3.session;
-  const tokStr = totalTokens >= 1000 ? (totalTokens / 1000).toFixed(1) + "k" : String(totalTokens);
+  const elapsed = (tick, ((Date.now() - snapshot.startTime) / 1000 / 60).toFixed(1));
+  const tokStr = snapshot.totalTokens >= 1000 ? (snapshot.totalTokens / 1000).toFixed(1) + "k" : String(snapshot.totalTokens);
+  const configReady = !state.needsConfig;
+  const providerLabel = state.provider ? import_config3.PROVIDERS[state.provider]?.label || state.provider : "unknown";
   return /* @__PURE__ */ jsx_runtime13.jsxs("box", {
-    style: { flexDirection: "row", paddingLeft: isNarrow ? 1 : 2, paddingRight: isNarrow ? 1 : 2 },
+    style: { flexDirection: "row", paddingLeft: isNarrow ? 1 : 2, paddingRight: isNarrow ? 1 : 2, paddingBottom: 1 },
     children: [
       /* @__PURE__ */ jsx_runtime13.jsx("box", {
         style: { flexGrow: 1 },
@@ -4120,19 +4253,15 @@ function StatusBar({ isProcessing }) {
             /* @__PURE__ */ jsx_runtime13.jsx("span", { fg: import_theme13.colors.dim, children: " \xB7 " }),
             /* @__PURE__ */ jsx_runtime13.jsxs("span", {
               fg: import_theme13.colors.dim,
-              children: [turnCount, " turns"]
+              children: [snapshot.turnCount, " turns"]
             }),
             !isNarrow ? /* @__PURE__ */ jsx_runtime13.jsxs(jsx_runtime13.Fragment, {
               children: [
                 /* @__PURE__ */ jsx_runtime13.jsx("span", { fg: import_theme13.colors.dim, children: " \xB7 " }),
                 /* @__PURE__ */ jsx_runtime13.jsxs("span", {
                   fg: import_theme13.colors.dim,
-                  children: [toolCallCount, " tools"]
-                })
-              ]
-            }) : null,
-            !isNarrow ? /* @__PURE__ */ jsx_runtime13.jsxs(jsx_runtime13.Fragment, {
-              children: [
+                  children: [snapshot.toolCallCount, " tools"]
+                }),
                 /* @__PURE__ */ jsx_runtime13.jsx("span", { fg: import_theme13.colors.dim, children: " \xB7 " }),
                 /* @__PURE__ */ jsx_runtime13.jsxs("span", {
                   fg: import_theme13.colors.dim,
@@ -4143,20 +4272,27 @@ function StatusBar({ isProcessing }) {
             /* @__PURE__ */ jsx_runtime13.jsx("span", { fg: import_theme13.colors.dim, children: " \xB7 " }),
             /* @__PURE__ */ jsx_runtime13.jsxs("span", {
               fg: import_theme13.colors.dim,
-              children: ["$", totalCost.toFixed(4)]
-            }),
-            filesModified.size > 0 && !isNarrow ? /* @__PURE__ */ jsx_runtime13.jsxs(jsx_runtime13.Fragment, {
-              children: [
-                /* @__PURE__ */ jsx_runtime13.jsx("span", { fg: import_theme13.colors.dim, children: " \xB7 " }),
-                /* @__PURE__ */ jsx_runtime13.jsxs("span", {
-                  fg: import_theme13.colors.yellow,
-                  children: [filesModified.size, " modified"]
-                })
-              ]
-            }) : null
+              children: ["$", snapshot.totalCost.toFixed(4)]
+            })
           ]
         })
       }),
+      !isNarrow ? /* @__PURE__ */ jsx_runtime13.jsxs("text", {
+        children: [
+          /* @__PURE__ */ jsx_runtime13.jsx("span", {
+            fg: configReady ? import_theme13.colors.green : import_theme13.colors.yellow,
+            children: configReady ? "\u25CF" : "\u25CB"
+          }),
+          /* @__PURE__ */ jsx_runtime13.jsx("span", {
+            fg: import_theme13.colors.dim,
+            children: " "
+          }),
+          /* @__PURE__ */ jsx_runtime13.jsx("span", {
+            fg: import_theme13.colors.muted,
+            children: configReady ? providerLabel : "setup required"
+          })
+        ]
+      }) : null,
       isProcessing ? /* @__PURE__ */ jsx_runtime13.jsxs("text", {
         children: [
           /* @__PURE__ */ jsx_runtime13.jsx("span", {
@@ -4165,11 +4301,11 @@ function StatusBar({ isProcessing }) {
           }),
           /* @__PURE__ */ jsx_runtime13.jsx("span", {
             fg: import_theme13.colors.accent,
-            children: isNarrow ? " ..." : " thinking  "
+            children: isNarrow ? " \u2026" : " thinking"
           }),
           !isNarrow ? /* @__PURE__ */ jsx_runtime13.jsx("span", {
             fg: import_theme13.colors.dim,
-            children: "\u25A0 Esc"
+            children: " \xB7 Esc"
           }) : null
         ]
       }) : null
@@ -4189,6 +4325,11 @@ var COMMANDS = [
   { cmd: "/git <cmd>", desc: "Run a git command" },
   { cmd: "/quit", desc: "Exit" }
 ];
+var QUICK_TIPS = [
+  "Ctrl+C exits the app",
+  "Esc closes overlays and thinking blocks",
+  "On first launch, choose a provider and paste your API key"
+];
 var TOOLS = [
   "Read",
   "Write",
@@ -4264,6 +4405,19 @@ function HelpModal({ onClose, onCommand }) {
           })
         }, cmd))
       }),
+      /* @__PURE__ */ jsx_runtime14.jsx("text", {
+        fg: import_theme14.colors.white,
+        attributes: TextAttributes.BOLD,
+        style: { marginTop: 1 },
+        content: "Quick Tips"
+      }),
+      /* @__PURE__ */ jsx_runtime14.jsx("box", {
+        style: { flexDirection: "column", marginTop: 0 },
+        children: QUICK_TIPS.map((tip) => /* @__PURE__ */ jsx_runtime14.jsx("text", {
+          fg: import_theme14.colors.dim,
+          content: `\u2022 ${tip}`
+        }, tip))
+      }),
       /* @__PURE__ */ jsx_runtime14.jsx("text", {
         fg: import_theme14.colors.white,
         attributes: TextAttributes.BOLD,
@@ -4304,7 +4458,7 @@ var import_useLayout = __toESM(require_useLayout(), 1);
 var jsx_runtime = __toESM(require_jsx_runtime(), 1);
 var PROVIDER_ORDER = ["fireworks", "openai", "openrouter", "groq", "gemini", "together"];
 var PROVIDER_EMOJI = {
-  fireworks: "\uD83C\uDF86",
+  fireworks: "\uD83D\uDD25",
   openai: "\uD83E\uDD16",
   openrouter: "\uD83D\uDD00",
   groq: "\u26A1",
@@ -4320,34 +4474,62 @@ function ProviderSelector() {
   var providers = import_config.PROVIDERS;
   var providerKey = PROVIDER_ORDER[focusedIdx];
   var provider = providers[providerKey];
+  function getStoredKey(key) {
+    return import_config.getSavedApiKey(key);
+  }
+  function loginState(key) {
+    return import_config.getProviderLoginState(key);
+  }
   function isConfigured(key) {
-    var envKey = providers[key].envKey;
-    var hasEnv = Boolean(process.env[envKey]);
-    var hasStored = key === state.provider && Boolean(state.apiKey);
-    return hasEnv || hasStored;
+    return loginState(key) !== "empty";
   }
-  function isDefault(key) {
-    return key === state.provider && Boolean(state.apiKey);
+  function isLoggedIn(key) {
+    return loginState(key) === "logged-in";
   }
-  function handleSelect() {
-    if (isConfigured(providerKey)) {
-      var key = process.env[provider.envKey] || state.apiKey;
-      import_config.setProvider(providerKey, key);
+  function finishLogin(providerKey2, key) {
+    import_config.loginProvider(providerKey2, key);
+    import_store.setState({
+      apiKey: key,
+      provider: providerKey2,
+      needsConfig: false
+    });
+  }
+  function handleLogin() {
+    var key = input.trim();
+    if (!key)
+      return;
+    finishLogin(providerKey, key);
+    setInput("");
+    setStep("select");
+  }
+  function handleLogout() {
+    var remaining = import_config.logoutProvider(providerKey);
+    if (remaining) {
       import_store.setState({
-        apiKey: key,
-        provider: providerKey,
+        apiKey: remaining.apiKey,
+        provider: remaining.providerKey,
         needsConfig: false
       });
     } else {
-      setStep("key");
+      import_store.setState({
+        apiKey: "",
+        provider: providerKey,
+        needsConfig: true
+      });
     }
+    setInput("");
+    setStep("select");
   }
-  function handleSubmitKey() {
-    var key = input.trim();
-    if (!key)
+  function handleSelect() {
+    if (isLoggedIn(providerKey)) {
+      handleLogout();
       return;
-    import_config.setProvider(providerKey, key);
-    import_store.setState({ apiKey: key, provider: providerKey, needsConfig: false });
+    }
+    if (isConfigured(providerKey)) {
+      finishLogin(providerKey, getStoredKey(providerKey));
+      return;
+    }
+    setStep("key");
   }
   var handleKeyPress = function(key) {
     if (step === "select") {
@@ -4361,21 +4543,25 @@ function ProviderSelector() {
         });
       } else if (key.name === "return" || key.name === "enter") {
         handleSelect();
+      } else if (key.name === "l") {
+        if (isLoggedIn(providerKey))
+          handleLogout();
       }
     } else {
       if (key.name === "escape") {
         setStep("select");
         setInput("");
       } else if (key.name === "return" || key.name === "enter") {
-        handleSubmitKey();
+        handleLogin();
       }
     }
   };
+  var selectedState = loginState(providerKey);
   return jsx_runtime.jsx("box", {
     style: {
       flexDirection: "column",
       flexGrow: 1,
-      paddingTop: 3
+      paddingTop: 2
     },
     onKeyDown: handleKeyPress,
     focused: true,
@@ -4386,36 +4572,39 @@ function ProviderSelector() {
           children: jsx_runtime.jsx("text", {
             attributes: TextAttributes.BOLD,
             fg: import_theme.colors.white,
-            children: "\u26A1 Select AI Provider"
+            children: "Choose your AI provider"
           })
         }),
         jsx_runtime.jsx("box", {
           style: { paddingLeft: 4, paddingRight: 4, marginBottom: 1 },
           children: jsx_runtime.jsx("text", {
             fg: import_theme.colors.dim,
-            children: "\u2191\u2193 or j/k to navigate  \xB7  Enter to select  \xB7  Ctrl+C to exit"
+            children: "Use \u2191\u2193 or j/k to navigate. Enter logs in or out depending on the selected provider's state."
           })
         }),
         PROVIDER_ORDER.map(function(key, idx) {
           var focused = idx === focusedIdx;
-          var configured = isConfigured(key);
-          var def = isDefault(key);
-          var statusFg = def ? import_theme.colors.accent : configured ? import_theme.colors.green : import_theme.colors.dim;
-          var statusText = def ? "\u2713 Active" : configured ? "\u2713 Configured" : "\u2717 Not configured";
+          var stateLabel = loginState(key);
+          var statusFg = stateLabel === "logged-in" ? import_theme.colors.green : stateLabel === "saved" ? import_theme.colors.yellow : import_theme.colors.dim;
+          var statusText = stateLabel === "logged-in" ? "Logged in" : stateLabel === "saved" ? "Logged out" : "Needs key";
           return jsx_runtime.jsxs("box", {
             style: {
               flexDirection: "row",
-              paddingLeft: focused ? 4 : 4,
-              paddingRight: 4,
-              paddingTop: 0,
-              paddingBottom: 0
+              paddingLeft: 4,
+              paddingRight: 4
             },
             onMouseEnter: function() {
               setFocusedIdx(idx);
             },
             onMouseDown: function() {
               setFocusedIdx(idx);
-              handleSelect();
+              if (stateLabel === "logged-in") {
+                handleLogout();
+              } else if (stateLabel === "saved") {
+                finishLogin(key, getStoredKey(key));
+              } else {
+                setStep("key");
+              }
             },
             children: [
               jsx_runtime.jsx("text", {
@@ -4443,7 +4632,7 @@ function ProviderSelector() {
           style: { paddingLeft: 4, paddingRight: 4, marginTop: 2 },
           children: jsx_runtime.jsx("text", {
             fg: import_theme.colors.dim,
-            children: "Keys are stored in ~/.apex-dev/config.json or set via environment variables"
+            children: selectedState === "logged-in" ? "Press Enter to log out of the selected provider." : selectedState === "saved" ? "Press Enter to log in with the saved key." : "Press Enter to log in with a new key. Keys are stored in ~/.apex-dev/config.json or can be supplied via environment variables."
           })
         })
       ]
@@ -4488,7 +4677,7 @@ function ProviderSelector() {
               focused: true,
               value: input,
               onChange: setInput,
-              onSubmit: handleSubmitKey,
+              onSubmit: handleLogin,
               placeholder: "Paste your API key here...",
               fg: import_theme.colors.text
             })
@@ -4498,7 +4687,7 @@ function ProviderSelector() {
           style: { paddingLeft: 4, paddingRight: 4 },
           children: jsx_runtime.jsx("text", {
             fg: import_theme.colors.dim,
-            children: "Press Enter to confirm"
+            children: "Press Enter to login"
           })
         })
       ]
@@ -4697,32 +4886,34 @@ function App() {
       });
     }
   }, []);
-  const showConfig = state.needsConfig || process.env.APEX_DEV_NEEDS_CONFIG === "true";
+  const shouldShowSetup = process.env.APEX_DEV_NEEDS_CONFIG === "true" || state.needsConfig;
   return /* @__PURE__ */ jsx_runtime15.jsxs("box", {
     style: { flexDirection: "column", flexGrow: 1 },
     children: [
-      /* @__PURE__ */ jsx_runtime15.jsx(Header, {}),
-      /* @__PURE__ */ jsx_runtime15.jsx(Divider, {}),
-      /* @__PURE__ */ jsx_runtime15.jsx(ChatArea, {
-        messages: state.messages,
-        streamingContent: state.streamingContent,
-        streamingThinking: state.streamingThinking,
-        isProcessing: state.isProcessing
-      }),
-      /* @__PURE__ */ jsx_runtime15.jsx(Divider, {}),
-      /* @__PURE__ */ jsx_runtime15.jsx(StatusBar, {
-        isProcessing: state.isProcessing
-      }),
-      /* @__PURE__ */ jsx_runtime15.jsx(InputBar, {
-        disabled: state.isProcessing || state.showHelp || state.needsConfig,
-        onSubmit: handleInput
-      }),
-      state.showHelp ? /* @__PURE__ */ jsx_runtime15.jsx(HelpModal, {
-        onClose: () => import_store5.setState({ showHelp: false }),
-        onCommand: handleHelpCommand
-      }) : null,
-      showConfig ? /* @__PURE__ */ jsx_runtime15.jsx(globalThis._ApiKeyModal, {}) : null,
-      state.needsConfig ? /* @__PURE__ */ jsx_runtime15.jsx(globalThis._ProviderSelector, {}) : null
+      shouldShowSetup ? /* @__PURE__ */ jsx_runtime15.jsx(globalThis._ProviderSelector, {}) : /* @__PURE__ */ jsx_runtime15.jsxs(jsx_runtime15.Fragment, {
+        children: [
+          /* @__PURE__ */ jsx_runtime15.jsx(Header, {}),
+          /* @__PURE__ */ jsx_runtime15.jsx(Divider, {}),
+          /* @__PURE__ */ jsx_runtime15.jsx(ChatArea, {
+            messages: state.messages,
+            streamingContent: state.streamingContent,
+            streamingThinking: state.streamingThinking,
+            isProcessing: state.isProcessing
+          }),
+          /* @__PURE__ */ jsx_runtime15.jsx(Divider, {}),
+          /* @__PURE__ */ jsx_runtime15.jsx(StatusBar, {
+            isProcessing: state.isProcessing
+          }),
+          /* @__PURE__ */ jsx_runtime15.jsx(InputBar, {
+            disabled: state.isProcessing || state.showHelp || shouldShowSetup,
+            onSubmit: handleInput
+          }),
+          state.showHelp ? /* @__PURE__ */ jsx_runtime15.jsx(HelpModal, {
+            onClose: () => import_store5.setState({ showHelp: false }),
+            onCommand: handleHelpCommand
+          }) : null
+        ]
+      })
     ]
   });
 }