codemaxxing 0.4.15 → 0.4.17

package/README.md

@@ -191,10 +191,35 @@ Conversations auto-save to SQLite. Pick up where you left off:
 - `/session delete` — remove a session
 - `/resume` — interactive session picker
 
+### 🔌 MCP Support (Model Context Protocol)
+Connect to external tools via the industry-standard MCP protocol. Databases, GitHub, Slack, browsers — anything with an MCP server.
+- Compatible with `.cursor/mcp.json` and `opencode.json` configs
+- `/mcp` — show connected servers
+- `/mcp add github npx -y @modelcontextprotocol/server-github` — add a server
+- `/mcp tools` — list all available MCP tools
+
+### 🖥️ Zero-Setup Local LLM
+First time with no LLM? Codemaxxing walks you through it:
+1. Detects your hardware (CPU, RAM, GPU)
+2. Recommends coding models that fit your machine
+3. Installs Ollama automatically
+4. Downloads the model with a progress bar
+5. Connects and drops you into coding mode
+
+No googling, no config files, no decisions. Just run `codemaxxing`.
+
+### 🦙 Ollama Management
+Full Ollama control from inside codemaxxing:
+- `/ollama` — status, installed models, GPU usage
+- `/ollama pull` — interactive model picker + download
+- `/ollama delete` — pick and remove models
+- `/ollama start` / `/ollama stop` — server management
+- Exit warning when Ollama is using GPU memory
+
 ### 🔄 Multi-Provider
-Switch models mid-session without restarting:
-- `/model gpt-4o` — switch to a different model
-- `/models` — list available models from your provider
+Switch models mid-session with an interactive picker:
+- `/model` — browse and switch models
+- `/model gpt-4o` — switch directly by name
 - Native Anthropic API support (not just OpenAI-compatible)
 
 ### 🎨 14 Themes
@@ -216,11 +241,15 @@ Type `/` for autocomplete suggestions. Arrow keys to navigate, Tab or Enter to s
 | `/help` | Show all commands |
 | `/connect` | Retry LLM connection |
 | `/login` | Interactive auth setup |
+| `/model` | Browse & switch models (picker) |
 | `/architect` | Toggle architect mode / set model |
 | `/skills` | Browse, install, manage skills |
 | `/lint on/off` | Toggle auto-linting |
-| `/model <name>` | Switch model mid-session |
-| `/models` | List available models |
+| `/mcp` | MCP server status & tools |
+| `/ollama` | Ollama status, models & GPU |
+| `/ollama pull` | Download a model (picker) |
+| `/ollama delete` | Remove a model (picker) |
+| `/ollama start/stop` | Server management |
 | `/theme` | Switch color theme |
 | `/map` | Show repository map |
 | `/sessions` | List past sessions |
@@ -295,14 +324,16 @@ Settings are stored in `~/.codemaxxing/settings.json`:
 
 ## Tools
 
-Codemaxxing gives the model these tools:
+Built-in tools:
 
 - **read_file** — Read file contents (safe)
-- **write_file** — Write/create files (requires approval)
+- **write_file** — Write/create files (requires approval, shows diff)
 - **list_files** — List directory contents (safe)
 - **search_files** — Search for patterns across files (safe)
 - **run_command** — Execute shell commands (requires approval)
 
+Plus any tools from connected MCP servers (databases, APIs, GitHub, etc.)
+
 ## Project Context
 
 Drop a `CODEMAXXING.md` file in your project root to give the model extra context about your codebase, conventions, or instructions. It's automatically included in the system prompt.
@@ -311,8 +342,10 @@ Drop a `CODEMAXXING.md` file in your project root to give the model extra contex
 
 - **Runtime:** Node.js + TypeScript
 - **TUI:** [Ink](https://github.com/vadimdemedes/ink) (React for the terminal)
-- **LLM SDK:** [OpenAI SDK](https://github.com/openai/openai-node) (works with any compatible API)
+- **LLM SDKs:** [OpenAI SDK](https://github.com/openai/openai-node) + [Anthropic SDK](https://github.com/anthropics/anthropic-sdk-typescript)
+- **MCP:** [@modelcontextprotocol/sdk](https://github.com/modelcontextprotocol/typescript-sdk)
 - **Sessions:** [better-sqlite3](https://github.com/WiseLibs/better-sqlite3)
+- **Local LLM:** Ollama integration (auto-install, pull, manage)
 - **Zero cloud dependencies** — everything runs locally
 
 ## Inspired By

package/dist/config.d.ts

@@ -41,6 +41,17 @@ export declare function getConfigPath(): string;
 /**
  * Auto-detect local LLM servers
  */
+export type DetectionResult = {
+    status: "connected";
+    provider: ProviderConfig;
+} | {
+    status: "no-models";
+    serverName: string;
+    baseUrl: string;
+} | {
+    status: "no-server";
+};
+export declare function detectLocalProviderDetailed(): Promise<DetectionResult>;
 export declare function detectLocalProvider(): Promise<ProviderConfig | null>;
 /**
  * List available models from a provider endpoint

package/dist/config.js

@@ -149,9 +149,49 @@ export function applyOverrides(config, args) {
 export function getConfigPath() {
     return CONFIG_FILE;
 }
-/**
- * Auto-detect local LLM servers
- */
+export async function detectLocalProviderDetailed() {
+    const endpoints = [
+        { name: "LM Studio", url: "http://localhost:1234/v1" },
+        { name: "Ollama", url: "http://localhost:11434/v1" },
+        { name: "vLLM", url: "http://localhost:8000/v1" },
+    ];
+    let serverFound = null;
+    for (const endpoint of endpoints) {
+        try {
+            const controller = new AbortController();
+            const timeout = setTimeout(() => controller.abort(), 2000);
+            const res = await fetch(`${endpoint.url}/models`, {
+                signal: controller.signal,
+            });
+            clearTimeout(timeout);
+            if (res.ok) {
+                const data = (await res.json());
+                const models = data.data ?? [];
+                if (models.length === 0) {
+                    // Server is up but no models — remember it but keep looking
+                    if (!serverFound)
+                        serverFound = endpoint;
+                    continue;
+                }
+                return {
+                    status: "connected",
+                    provider: {
+                        baseUrl: endpoint.url,
+                        apiKey: "not-needed",
+                        model: models[0].id,
+                    },
+                };
+            }
+        }
+        catch {
+            // Server not running, try next
+        }
+    }
+    if (serverFound) {
+        return { status: "no-models", serverName: serverFound.name, baseUrl: serverFound.url };
+    }
+    return { status: "no-server" };
+}
 export async function detectLocalProvider() {
     const endpoints = [
         { name: "LM Studio", url: "http://localhost:1234/v1" },
@@ -169,7 +209,11 @@ export async function detectLocalProvider() {
             if (res.ok) {
                 const data = (await res.json());
                 const models = data.data ?? [];
-                const model = models[0]?.id ?? "auto";
+                if (models.length === 0) {
+                    // Server is up but no models available — don't fake a connection
+                    continue;
+                }
+                const model = models[0].id;
                 return {
                     baseUrl: endpoint.url,
                     apiKey: "not-needed",

package/dist/index.js

@@ -5,7 +5,7 @@ import { render, Box, Text, useInput, useApp, useStdout } from "ink";
 import { EventEmitter } from "events";
 import TextInput from "ink-text-input";
 import { CodingAgent } from "./agent.js";
-import { loadConfig, saveConfig, detectLocalProvider, parseCLIArgs, applyOverrides, listModels } from "./config.js";
+import { loadConfig, saveConfig, detectLocalProvider, detectLocalProviderDetailed, parseCLIArgs, applyOverrides, listModels } from "./config.js";
 import { listSessions, getSession, loadMessages, deleteSession } from "./utils/sessions.js";
 import { execSync } from "child_process";
 import { isGitRepo, getBranch, getStatus, getDiff, undoLastCommit } from "./utils/git.js";
@@ -156,6 +156,8 @@ function App() {
     const [ollamaDeletePickerIndex, setOllamaDeletePickerIndex] = useState(0);
     const [ollamaPullPicker, setOllamaPullPicker] = useState(false);
     const [ollamaPullPickerIndex, setOllamaPullPickerIndex] = useState(0);
+    const [modelPicker, setModelPicker] = useState(null);
+    const [modelPickerIndex, setModelPickerIndex] = useState(0);
     const [wizardScreen, setWizardScreen] = useState(null);
     const [wizardIndex, setWizardIndex] = useState(0);
     const [wizardHardware, setWizardHardware] = useState(null);
@@ -218,15 +220,21 @@ function App() {
         if (provider.model === "auto" || (provider.baseUrl === "http://localhost:1234/v1" && !cliArgs.baseUrl)) {
             info.push("Detecting local LLM server...");
             setConnectionInfo([...info]);
-            const detected = await detectLocalProvider();
-            if (detected) {
+            const detection = await detectLocalProviderDetailed();
+            if (detection.status === "connected") {
                 // Keep CLI model override if specified
                 if (cliArgs.model)
-                    detected.model = cliArgs.model;
-                provider = detected;
+                    detection.provider.model = cliArgs.model;
+                provider = detection.provider;
                 info.push(`✔ Connected to ${provider.baseUrl} → ${provider.model}`);
                 setConnectionInfo([...info]);
             }
+            else if (detection.status === "no-models") {
+                info.push(`⚠ ${detection.serverName} is running but has no models. Use /ollama pull to download one.`);
+                setConnectionInfo([...info]);
+                setReady(true);
+                return;
+            }
             else {
                 info.push("✗ No local LLM server found.");
                 setConnectionInfo([...info]);
@@ -901,10 +909,42 @@ function App() {
             }
             return;
         }
-        if (trimmed.startsWith("/model")) {
-            const newModel = trimmed.replace("/model", "").trim();
+        if (trimmed === "/model") {
+            // Show picker of available models
+            addMsg("info", "Fetching available models...");
+            try {
+                const ollamaModels = await listInstalledModelsDetailed();
+                if (ollamaModels.length > 0) {
+                    setModelPicker(ollamaModels.map(m => m.name));
+                    setModelPickerIndex(0);
+                    return;
+                }
+            }
+            catch (err) {
+                // Ollama not available or failed, try provider
+            }
+            // Fallback: try provider's model list
+            if (providerRef.current?.baseUrl && providerRef.current.baseUrl !== "auto") {
+                try {
+                    const providerModels = await listModels(providerRef.current.baseUrl, providerRef.current.apiKey || "");
+                    if (providerModels.length > 0) {
+                        setModelPicker(providerModels);
+                        setModelPickerIndex(0);
+                        return;
+                    }
+                }
+                catch (err) {
+                    // Provider fetch failed
+                }
+            }
+            // No models found anywhere
+            addMsg("error", "No models available. Download one with /ollama pull or configure a provider.");
+            return;
+        }
+        if (trimmed.startsWith("/model ")) {
+            const newModel = trimmed.replace("/model ", "").trim();
             if (!newModel) {
-                addMsg("info", `Current model: ${agent.getModel()}\n  Usage: /model <model-name>`);
+                addMsg("info", `Current model: ${modelName}\n  Usage: /model <model-name>`);
                 return;
             }
             agent.switchModel(newModel);
@@ -1370,6 +1410,33 @@ function App() {
             }
             return;
         }
+        // ── Model picker ──
+        if (modelPicker) {
+            if (key.upArrow) {
+                setModelPickerIndex((prev) => (prev - 1 + modelPicker.length) % modelPicker.length);
+                return;
+            }
+            if (key.downArrow) {
+                setModelPickerIndex((prev) => (prev + 1) % modelPicker.length);
+                return;
+            }
+            if (key.escape) {
+                setModelPicker(null);
+                return;
+            }
+            if (key.return) {
+                const selected = modelPicker[modelPickerIndex];
+                if (selected && agent) {
+                    agent.switchModel(selected);
+                    setModelName(selected);
+                    addMsg("info", `✅ Switched to: ${selected}`);
+                    refreshConnectionBanner();
+                }
+                setModelPicker(null);
+                return;
+            }
+            return;
+        }
         // ── Ollama delete picker ──
         if (ollamaDeletePicker) {
             if (key.upArrow) {
@@ -1960,7 +2027,7 @@ function App() {
             })(), skillsPicker === "remove" && (() => {
                 const installed = listInstalledSkills();
                 return (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.error, paddingX: 1, marginBottom: 0, children: [_jsx(Text, { bold: true, color: theme.colors.error, children: "Remove a skill:" }), installed.map((s, i) => (_jsxs(Text, { children: [i === skillsPickerIndex ? _jsx(Text, { color: theme.colors.suggestion, bold: true, children: "▸ " }) : _jsx(Text, { children: "  " }), _jsxs(Text, { color: i === skillsPickerIndex ? theme.colors.suggestion : theme.colors.muted, children: [s.name, " \u2014 ", s.description] })] }, s.name))), _jsx(Text, { dimColor: true, children: "  ↑↓ navigate · Enter remove · Esc back" })] }));
-            })(), themePicker && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.border, paddingX: 1, marginBottom: 0, children: [_jsx(Text, { bold: true, color: theme.colors.secondary, children: "Choose a theme:" }), listThemes().map((key, i) => (_jsxs(Text, { children: [i === themePickerIndex ? _jsx(Text, { color: theme.colors.suggestion, bold: true, children: "▸ " }) : _jsx(Text, { children: "  " }), _jsx(Text, { color: i === themePickerIndex ? theme.colors.suggestion : theme.colors.primary, bold: true, children: key }), _jsxs(Text, { color: theme.colors.muted, children: [" — ", THEMES[key].description] }), key === theme.name.toLowerCase() ? _jsx(Text, { color: theme.colors.muted, children: " (current)" }) : null] }, key))), _jsx(Text, { dimColor: true, children: "  ↑↓ navigate · Enter select · Esc cancel" })] })), sessionPicker && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.secondary, paddingX: 1, marginBottom: 0, children: [_jsx(Text, { bold: true, color: theme.colors.secondary, children: "Resume a session:" }), sessionPicker.map((s, i) => (_jsxs(Text, { children: [i === sessionPickerIndex ? _jsx(Text, { color: theme.colors.suggestion, bold: true, children: "▸ " }) : _jsx(Text, { children: "  " }), _jsx(Text, { color: i === sessionPickerIndex ? theme.colors.suggestion : theme.colors.muted, children: s.display })] }, s.id))), _jsx(Text, { dimColor: true, children: "  ↑↓ navigate · Enter select · Esc cancel" })] })), deleteSessionPicker && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.error, paddingX: 1, marginBottom: 0, children: [_jsx(Text, { bold: true, color: theme.colors.error, children: "Delete a session:" }), deleteSessionPicker.map((s, i) => (_jsxs(Text, { children: [i === deleteSessionPickerIndex ? _jsx(Text, { color: theme.colors.suggestion, bold: true, children: "▸ " }) : _jsx(Text, { children: "  " }), _jsx(Text, { color: i === deleteSessionPickerIndex ? theme.colors.suggestion : theme.colors.muted, children: s.display })] }, s.id))), _jsx(Text, { dimColor: true, children: "  ↑↓ navigate · Enter select · Esc cancel" })] })), deleteSessionConfirm && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.warning, paddingX: 1, marginBottom: 0, children: [_jsxs(Text, { bold: true, color: theme.colors.warning, children: ["Delete session ", deleteSessionConfirm.id, "?"] }), _jsxs(Text, { color: theme.colors.muted, children: ["  ", deleteSessionConfirm.display] }), _jsxs(Text, { children: [_jsx(Text, { color: theme.colors.error, bold: true, children: " [y]" }), _jsx(Text, { children: "es  " }), _jsx(Text, { color: theme.colors.success, bold: true, children: "[n]" }), _jsx(Text, { children: "o" })] })] })), ollamaDeletePicker && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.border, paddingX: 1, marginBottom: 0, children: [_jsx(Text, { bold: true, color: theme.colors.secondary, children: "Delete which model?" }), _jsx(Text, { children: "" }), ollamaDeletePicker.models.map((m, i) => (_jsxs(Text, { children: ["  ", i === ollamaDeletePickerIndex ? _jsx(Text, { color: theme.colors.primary, bold: true, children: "▸ " }) : "  ", _jsx(Text, { color: i === ollamaDeletePickerIndex ? theme.colors.primary : undefined, children: m.name }), _jsxs(Text, { color: theme.colors.muted, children: [" (", (m.size / (1024 * 1024 * 1024)).toFixed(1), " GB)"] })] }, m.name))), _jsx(Text, { children: "" }), _jsx(Text, { dimColor: true, children: "  ↑↓ navigate · Enter to delete · Esc cancel" })] })), ollamaPullPicker && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.border, paddingX: 1, marginBottom: 0, children: [_jsx(Text, { bold: true, color: theme.colors.secondary, children: "Download which model?" }), _jsx(Text, { children: "" }), [
+            })(), themePicker && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.border, paddingX: 1, marginBottom: 0, children: [_jsx(Text, { bold: true, color: theme.colors.secondary, children: "Choose a theme:" }), listThemes().map((key, i) => (_jsxs(Text, { children: [i === themePickerIndex ? _jsx(Text, { color: theme.colors.suggestion, bold: true, children: "▸ " }) : _jsx(Text, { children: "  " }), _jsx(Text, { color: i === themePickerIndex ? theme.colors.suggestion : theme.colors.primary, bold: true, children: key }), _jsxs(Text, { color: theme.colors.muted, children: [" — ", THEMES[key].description] }), key === theme.name.toLowerCase() ? _jsx(Text, { color: theme.colors.muted, children: " (current)" }) : null] }, key))), _jsx(Text, { dimColor: true, children: "  ↑↓ navigate · Enter select · Esc cancel" })] })), sessionPicker && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.secondary, paddingX: 1, marginBottom: 0, children: [_jsx(Text, { bold: true, color: theme.colors.secondary, children: "Resume a session:" }), sessionPicker.map((s, i) => (_jsxs(Text, { children: [i === sessionPickerIndex ? _jsx(Text, { color: theme.colors.suggestion, bold: true, children: "▸ " }) : _jsx(Text, { children: "  " }), _jsx(Text, { color: i === sessionPickerIndex ? theme.colors.suggestion : theme.colors.muted, children: s.display })] }, s.id))), _jsx(Text, { dimColor: true, children: "  ↑↓ navigate · Enter select · Esc cancel" })] })), deleteSessionPicker && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.error, paddingX: 1, marginBottom: 0, children: [_jsx(Text, { bold: true, color: theme.colors.error, children: "Delete a session:" }), deleteSessionPicker.map((s, i) => (_jsxs(Text, { children: [i === deleteSessionPickerIndex ? _jsx(Text, { color: theme.colors.suggestion, bold: true, children: "▸ " }) : _jsx(Text, { children: "  " }), _jsx(Text, { color: i === deleteSessionPickerIndex ? theme.colors.suggestion : theme.colors.muted, children: s.display })] }, s.id))), _jsx(Text, { dimColor: true, children: "  ↑↓ navigate · Enter select · Esc cancel" })] })), deleteSessionConfirm && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.warning, paddingX: 1, marginBottom: 0, children: [_jsxs(Text, { bold: true, color: theme.colors.warning, children: ["Delete session ", deleteSessionConfirm.id, "?"] }), _jsxs(Text, { color: theme.colors.muted, children: ["  ", deleteSessionConfirm.display] }), _jsxs(Text, { children: [_jsx(Text, { color: theme.colors.error, bold: true, children: " [y]" }), _jsx(Text, { children: "es  " }), _jsx(Text, { color: theme.colors.success, bold: true, children: "[n]" }), _jsx(Text, { children: "o" })] })] })), modelPicker && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.border, paddingX: 1, marginBottom: 0, children: [_jsx(Text, { bold: true, color: theme.colors.secondary, children: "Switch model:" }), _jsx(Text, { children: "" }), modelPicker.map((m, i) => (_jsxs(Text, { children: ["  ", i === modelPickerIndex ? _jsx(Text, { color: theme.colors.primary, bold: true, children: "▸ " }) : "  ", _jsx(Text, { color: i === modelPickerIndex ? theme.colors.primary : undefined, children: m }), m === modelName ? _jsx(Text, { color: theme.colors.success, children: " (active)" }) : null] }, m))), _jsx(Text, { children: "" }), _jsx(Text, { dimColor: true, children: "  ↑↓ navigate · Enter to switch · Esc cancel" })] })), ollamaDeletePicker && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.border, paddingX: 1, marginBottom: 0, children: [_jsx(Text, { bold: true, color: theme.colors.secondary, children: "Delete which model?" }), _jsx(Text, { children: "" }), ollamaDeletePicker.models.map((m, i) => (_jsxs(Text, { children: ["  ", i === ollamaDeletePickerIndex ? _jsx(Text, { color: theme.colors.primary, bold: true, children: "▸ " }) : "  ", _jsx(Text, { color: i === ollamaDeletePickerIndex ? theme.colors.primary : undefined, children: m.name }), _jsxs(Text, { color: theme.colors.muted, children: [" (", (m.size / (1024 * 1024 * 1024)).toFixed(1), " GB)"] })] }, m.name))), _jsx(Text, { children: "" }), _jsx(Text, { dimColor: true, children: "  ↑↓ navigate · Enter to delete · Esc cancel" })] })), ollamaPullPicker && (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: theme.colors.border, paddingX: 1, marginBottom: 0, children: [_jsx(Text, { bold: true, color: theme.colors.secondary, children: "Download which model?" }), _jsx(Text, { children: "" }), [
                         { id: "qwen2.5-coder:7b", name: "Qwen 2.5 Coder 7B", size: "5 GB", desc: "Best balance of speed & quality" },
                         { id: "qwen2.5-coder:14b", name: "Qwen 2.5 Coder 14B", size: "9 GB", desc: "Higher quality, needs 16GB+ RAM" },
                         { id: "qwen2.5-coder:3b", name: "Qwen 2.5 Coder 3B", size: "2 GB", desc: "\u26A0\uFE0F Basic \u2014 may struggle with tool calls" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemaxxing",
-  "version": "0.4.15",
+  "version": "0.4.17",
   "description": "Open-source terminal coding agent. Connect any LLM. Max your code.",
   "main": "dist/index.js",
   "bin": {

package/src/config.ts

@@ -193,6 +193,57 @@ export function getConfigPath(): string {
 /**
  * Auto-detect local LLM servers
  */
+export type DetectionResult =
+  | { status: "connected"; provider: ProviderConfig }
+  | { status: "no-models"; serverName: string; baseUrl: string }
+  | { status: "no-server" };
+
+export async function detectLocalProviderDetailed(): Promise<DetectionResult> {
+  const endpoints = [
+    { name: "LM Studio", url: "http://localhost:1234/v1" },
+    { name: "Ollama", url: "http://localhost:11434/v1" },
+    { name: "vLLM", url: "http://localhost:8000/v1" },
+  ];
+
+  let serverFound: { name: string; url: string } | null = null;
+
+  for (const endpoint of endpoints) {
+    try {
+      const controller = new AbortController();
+      const timeout = setTimeout(() => controller.abort(), 2000);
+      const res = await fetch(`${endpoint.url}/models`, {
+        signal: controller.signal,
+      });
+      clearTimeout(timeout);
+
+      if (res.ok) {
+        const data = (await res.json()) as { data?: Array<{ id: string }> };
+        const models = data.data ?? [];
+        if (models.length === 0) {
+          // Server is up but no models — remember it but keep looking
+          if (!serverFound) serverFound = endpoint;
+          continue;
+        }
+        return {
+          status: "connected",
+          provider: {
+            baseUrl: endpoint.url,
+            apiKey: "not-needed",
+            model: models[0]!.id,
+          },
+        };
+      }
+    } catch {
+      // Server not running, try next
+    }
+  }
+
+  if (serverFound) {
+    return { status: "no-models", serverName: serverFound.name, baseUrl: serverFound.url };
+  }
+  return { status: "no-server" };
+}
+
 export async function detectLocalProvider(): Promise<ProviderConfig | null> {
   const endpoints = [
     { name: "LM Studio", url: "http://localhost:1234/v1" },
@@ -212,7 +263,11 @@ export async function detectLocalProvider(): Promise<ProviderConfig | null> {
       if (res.ok) {
         const data = (await res.json()) as { data?: Array<{ id: string }> };
         const models = data.data ?? [];
-        const model = models[0]?.id ?? "auto";
+        if (models.length === 0) {
+          // Server is up but no models available — don't fake a connection
+          continue;
+        }
+        const model = models[0]!.id;
         return {
           baseUrl: endpoint.url,
           apiKey: "not-needed",

package/src/index.tsx

@@ -5,7 +5,7 @@ import { render, Box, Text, useInput, useApp, useStdout } from "ink";
 import { EventEmitter } from "events";
 import TextInput from "ink-text-input";
 import { CodingAgent } from "./agent.js";
-import { loadConfig, saveConfig, detectLocalProvider, parseCLIArgs, applyOverrides, listModels } from "./config.js";
+import { loadConfig, saveConfig, detectLocalProvider, detectLocalProviderDetailed, parseCLIArgs, applyOverrides, listModels } from "./config.js";
 import { listSessions, getSession, loadMessages, deleteSession } from "./utils/sessions.js";
 import { execSync } from "child_process";
 import { isGitRepo, getBranch, getStatus, getDiff, undoLastCommit } from "./utils/git.js";
@@ -191,6 +191,8 @@ function App() {
   const [ollamaDeletePickerIndex, setOllamaDeletePickerIndex] = useState(0);
   const [ollamaPullPicker, setOllamaPullPicker] = useState(false);
   const [ollamaPullPickerIndex, setOllamaPullPickerIndex] = useState(0);
+  const [modelPicker, setModelPicker] = useState<string[] | null>(null);
+  const [modelPickerIndex, setModelPickerIndex] = useState(0);
 
   // ── Setup Wizard State ──
   type WizardScreen = "connection" | "models" | "install-ollama" | "pulling" | null;
@@ -262,13 +264,18 @@ function App() {
     if (provider.model === "auto" || (provider.baseUrl === "http://localhost:1234/v1" && !cliArgs.baseUrl)) {
       info.push("Detecting local LLM server...");
       setConnectionInfo([...info]);
-      const detected = await detectLocalProvider();
-      if (detected) {
+      const detection = await detectLocalProviderDetailed();
+      if (detection.status === "connected") {
         // Keep CLI model override if specified
-        if (cliArgs.model) detected.model = cliArgs.model;
-        provider = detected;
+        if (cliArgs.model) detection.provider.model = cliArgs.model;
+        provider = detection.provider;
         info.push(`✔ Connected to ${provider.baseUrl} → ${provider.model}`);
         setConnectionInfo([...info]);
+      } else if (detection.status === "no-models") {
+        info.push(`⚠ ${detection.serverName} is running but has no models. Use /ollama pull to download one.`);
+        setConnectionInfo([...info]);
+        setReady(true);
+        return;
       } else {
         info.push("✗ No local LLM server found.");
         setConnectionInfo([...info]);
@@ -939,10 +946,42 @@ function App() {
       }
       return;
     }
-    if (trimmed.startsWith("/model")) {
-      const newModel = trimmed.replace("/model", "").trim();
+    if (trimmed === "/model") {
+      // Show picker of available models
+      addMsg("info", "Fetching available models...");
+      try {
+        const ollamaModels = await listInstalledModelsDetailed();
+        if (ollamaModels.length > 0) {
+          setModelPicker(ollamaModels.map(m => m.name));
+          setModelPickerIndex(0);
+          return;
+        }
+      } catch (err) {
+        // Ollama not available or failed, try provider
+      }
+      
+      // Fallback: try provider's model list
+      if (providerRef.current?.baseUrl && providerRef.current.baseUrl !== "auto") {
+        try {
+          const providerModels = await listModels(providerRef.current.baseUrl, providerRef.current.apiKey || "");
+          if (providerModels.length > 0) {
+            setModelPicker(providerModels);
+            setModelPickerIndex(0);
+            return;
+          }
+        } catch (err) {
+          // Provider fetch failed
+        }
+      }
+      
+      // No models found anywhere
+      addMsg("error", "No models available. Download one with /ollama pull or configure a provider.");
+      return;
+    }
+    if (trimmed.startsWith("/model ")) {
+      const newModel = trimmed.replace("/model ", "").trim();
       if (!newModel) {
-        addMsg("info", `Current model: ${agent.getModel()}\n  Usage: /model <model-name>`);
+        addMsg("info", `Current model: ${modelName}\n  Usage: /model <model-name>`);
         return;
       }
       agent.switchModel(newModel);
@@ -1390,6 +1429,34 @@ function App() {
       return;
     }
 
+    // ── Model picker ──
+    if (modelPicker) {
+      if (key.upArrow) {
+        setModelPickerIndex((prev) => (prev - 1 + modelPicker.length) % modelPicker.length);
+        return;
+      }
+      if (key.downArrow) {
+        setModelPickerIndex((prev) => (prev + 1) % modelPicker.length);
+        return;
+      }
+      if (key.escape) {
+        setModelPicker(null);
+        return;
+      }
+      if (key.return) {
+        const selected = modelPicker[modelPickerIndex];
+        if (selected && agent) {
+          agent.switchModel(selected);
+          setModelName(selected);
+          addMsg("info", `✅ Switched to: ${selected}`);
+          refreshConnectionBanner();
+        }
+        setModelPicker(null);
+        return;
+      }
+      return;
+    }
+
     // ── Ollama delete picker ──
     if (ollamaDeletePicker) {
       if (key.upArrow) {
@@ -2212,6 +2279,23 @@ function App() {
         </Box>
       )}
 
+      {/* ═══ MODEL PICKER ═══ */}
+      {modelPicker && (
+        <Box flexDirection="column" borderStyle="single" borderColor={theme.colors.border} paddingX={1} marginBottom={0}>
+          <Text bold color={theme.colors.secondary}>Switch model:</Text>
+          <Text>{""}</Text>
+          {modelPicker.map((m, i) => (
+            <Text key={m}>
+              {"  "}{i === modelPickerIndex ? <Text color={theme.colors.primary} bold>{"▸ "}</Text> : "  "}
+              <Text color={i === modelPickerIndex ? theme.colors.primary : undefined}>{m}</Text>
+              {m === modelName ? <Text color={theme.colors.success}>{" (active)"}</Text> : null}
+            </Text>
+          ))}
+          <Text>{""}</Text>
+          <Text dimColor>{"  ↑↓ navigate · Enter to switch · Esc cancel"}</Text>
+        </Box>
+      )}
+
       {/* ═══ OLLAMA DELETE PICKER ═══ */}
       {ollamaDeletePicker && (
         <Box flexDirection="column" borderStyle="single" borderColor={theme.colors.border} paddingX={1} marginBottom={0}>