@devang0907/agent-dev 0.1.2 → 0.1.3

package/dist/agent/loop.js

@@ -1,8 +1,31 @@
+import { normalizeToolCalls } from "../providers/openai-compat.js";
 import { streamChat } from "../providers/registry.js";
 import { getToolDefinitions, executeTool } from "./tools/index.js";
+const MAX_TOOL_ROUNDS = 6;
+const MAX_SAME_TOOL_CALLS = 2;
 const DEFAULT_SYSTEM_PROMPT = `You are a helpful coding assistant with access to tools: read, write, edit, and bash.
-Use tools to inspect and modify the codebase. Be concise and accurate.
+When the user asks you to create or modify files, call write or edit once with the full file content, then reply briefly to confirm.
+Do NOT call the same tool repeatedly with the same arguments. One successful write is enough.
 Working directory: ${process.cwd()}`;
+function isToolUseFailedError(message) {
+    return /Failed to call a function|tool_use_failed|failed_generation/i.test(message);
+}
+function hadSuccessfulToolResults(context) {
+    return context.some((m) => m.role === "tool" && m.content.length > 0 && !m.content.startsWith("Error:"));
+}
+function toolSignature(name, args) {
+    return `${name}:${JSON.stringify(args)}`;
+}
+function dedupeToolCalls(toolCalls) {
+    const seen = new Set();
+    return toolCalls.filter((tc) => {
+        const key = `${tc.name}:${tc.arguments}`;
+        if (seen.has(key))
+            return false;
+        seen.add(key);
+        return true;
+    });
+}
 async function collectStream(model, messages, settings, systemPrompt, signal, onEvent) {
     const tools = getToolDefinitions();
     let content = "";
@@ -35,32 +58,53 @@ async function collectStream(model, messages, settings, systemPrompt, signal, on
             return { content, toolCalls: [], error: event.message };
         }
     }
-    const toolCalls = Array.from(toolCallMap.values()).filter((tc) => tc.name);
+    const toolCalls = normalizeToolCalls(Array.from(toolCallMap.values()).filter((tc) => tc.name));
     return { content, toolCalls };
 }
+function finishGracefully(context, content, onEvent) {
+    const msg = content.trim() || "Done — changes saved successfully.";
+    if (!content.trim()) {
+        onEvent({ type: "text_delta", delta: msg });
+    }
+    context.push({ role: "assistant", content: msg });
+    onEvent({ type: "turn_end" });
+}
 export async function runAgentLoop(options) {
     const { model, messages, settings, workdir, systemPrompt = DEFAULT_SYSTEM_PROMPT, signal, onEvent, } = options;
     const context = [...messages];
+    const callCounts = new Map();
+    let toolRound = 0;
     while (true) {
         if (signal?.aborted)
             break;
+        toolRound++;
+        if (toolRound > MAX_TOOL_ROUNDS) {
+            finishGracefully(context, "Done — stopped after too many tool calls.", onEvent);
+            break;
+        }
         onEvent({ type: "message_start", role: "assistant" });
         const { content, toolCalls, error } = await collectStream(model, context, settings, systemPrompt, signal, onEvent);
         if (error) {
+            if (isToolUseFailedError(error) && hadSuccessfulToolResults(context)) {
+                finishGracefully(context, content, onEvent);
+                break;
+            }
             onEvent({ type: "error", message: error });
             break;
         }
+        const uniqueCalls = dedupeToolCalls(toolCalls);
         const assistantMsg = {
             role: "assistant",
             content,
-            toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
+            toolCalls: uniqueCalls.length > 0 ? uniqueCalls : undefined,
         };
         context.push(assistantMsg);
-        if (toolCalls.length === 0) {
+        if (uniqueCalls.length === 0) {
             onEvent({ type: "turn_end" });
             break;
         }
-        for (const tc of toolCalls) {
+        let stopAfterBatch = false;
+        for (const tc of uniqueCalls) {
             onEvent({ type: "tool_call", toolCall: tc });
             let args = {};
             try {
@@ -69,6 +113,16 @@ export async function runAgentLoop(options) {
             catch {
                 args = {};
             }
+            const sig = toolSignature(tc.name, args);
+            const prev = callCounts.get(sig) ?? 0;
+            callCounts.set(sig, prev + 1);
+            if (prev >= MAX_SAME_TOOL_CALLS) {
+                const skip = "Skipped — already executed this action.";
+                onEvent({ type: "tool_result", toolCallId: tc.id, name: tc.name, result: skip });
+                context.push({ role: "tool", content: skip, toolCallId: tc.id, name: tc.name });
+                stopAfterBatch = true;
+                continue;
+            }
             const result = await executeTool(tc.name, args, workdir);
             onEvent({ type: "tool_result", toolCallId: tc.id, name: tc.name, result });
             context.push({
@@ -77,6 +131,13 @@ export async function runAgentLoop(options) {
                 toolCallId: tc.id,
                 name: tc.name,
             });
+            if (!result.startsWith("Error:") && (tc.name === "write" || tc.name === "edit")) {
+                stopAfterBatch = true;
+            }
+        }
+        if (stopAfterBatch) {
+            finishGracefully(context, content, onEvent);
+            break;
         }
     }
     return context.slice(messages.length);

package/dist/agent/tools/read.js

@@ -20,6 +20,7 @@ export const readTool = {
             path: { type: "string", description: "File path relative to project root" },
         },
         required: ["path"],
+        additionalProperties: false,
     },
 };
 export async function executeRead(args, workdir = DEFAULT_WORKDIR) {
@@ -41,6 +42,7 @@ export const writeTool = {
             content: { type: "string", description: "Content to write" },
         },
         required: ["path", "content"],
+        additionalProperties: false,
     },
 };
 export async function executeWrite(args, workdir = DEFAULT_WORKDIR) {
@@ -60,6 +62,7 @@ export const editTool = {
             new_string: { type: "string", description: "Replacement string" },
         },
         required: ["path", "old_string", "new_string"],
+        additionalProperties: false,
     },
 };
 export async function executeEdit(args, workdir = DEFAULT_WORKDIR) {
@@ -85,6 +88,7 @@ export const bashTool = {
             command: { type: "string", description: "Shell command to execute" },
         },
         required: ["command"],
+        additionalProperties: false,
     },
 };
 export async function executeBash(args, workdir = DEFAULT_WORKDIR) {

package/dist/providers/groq.js

@@ -1,4 +1,5 @@
 import OpenAI from "openai";
+import { toOpenAIMessages, toOpenAITools, processOpenAIStream, formatApiError, } from "./openai-compat.js";
 export const PROVIDER_ID = "groq";
 export const DEFAULT_MODEL = "llama-3.3-70b-versatile";
 export const API_KEY_ENV = "GROQ_API_KEY";
@@ -13,51 +14,6 @@ export function getApiKey(settings) {
 export function hasAuth(settings) {
     return !!getApiKey(settings);
 }
-function toOpenAIMessages(ctx) {
-    const msgs = [];
-    if (ctx.systemPrompt) {
-        msgs.push({ role: "system", content: ctx.systemPrompt });
-    }
-    for (const m of ctx.messages) {
-        if (m.role === "user") {
-            msgs.push({ role: "user", content: m.content });
-        }
-        else if (m.role === "assistant") {
-            if (m.toolCalls?.length) {
-                msgs.push({
-                    role: "assistant",
-                    content: m.content || null,
-                    tool_calls: m.toolCalls.map((tc) => ({
-                        id: tc.id,
-                        type: "function",
-                        function: { name: tc.name, arguments: tc.arguments },
-                    })),
-                });
-            }
-            else {
-                msgs.push({ role: "assistant", content: m.content });
-            }
-        }
-        else if (m.role === "tool") {
-            msgs.push({
-                role: "tool",
-                tool_call_id: m.toolCallId,
-                content: m.content,
-            });
-        }
-    }
-    return msgs;
-}
-function toOpenAITools(tools) {
-    return tools.map((t) => ({
-        type: "function",
-        function: {
-            name: t.name,
-            description: t.description,
-            parameters: t.parameters,
-        },
-    }));
-}
 export async function* streamChat(model, ctx, settings) {
     const apiKey = getApiKey(settings);
     if (!apiKey) {
@@ -65,49 +21,19 @@ export async function* streamChat(model, ctx, settings) {
         return;
     }
     const client = new OpenAI({ apiKey, baseURL: BASE_URL });
+    const hasTools = ctx.tools.length > 0;
     try {
         const stream = await client.chat.completions.create({
             model: model.id,
             messages: toOpenAIMessages(ctx),
-            tools: ctx.tools.length > 0 ? toOpenAITools(ctx.tools) : undefined,
+            tools: hasTools ? toOpenAITools(ctx.tools) : undefined,
+            tool_choice: hasTools ? "auto" : undefined,
+            parallel_tool_calls: false,
             stream: true,
         }, { signal: ctx.signal });
-        const toolCalls = new Map();
-        for await (const chunk of stream) {
-            const delta = chunk.choices[0]?.delta;
-            if (!delta)
-                continue;
-            if (delta.content) {
-                yield { type: "text_delta", delta: delta.content };
-            }
-            if (delta.tool_calls) {
-                for (const tc of delta.tool_calls) {
-                    const idx = tc.index;
-                    if (!toolCalls.has(idx)) {
-                        toolCalls.set(idx, { id: tc.id ?? "", name: tc.function?.name ?? "", arguments: "" });
-                    }
-                    const existing = toolCalls.get(idx);
-                    if (tc.id)
-                        existing.id = tc.id;
-                    if (tc.function?.name)
-                        existing.name = tc.function.name;
-                    if (tc.function?.arguments) {
-                        existing.arguments += tc.function.arguments;
-                        yield {
-                            type: "tool_call_delta",
-                            index: idx,
-                            id: existing.id,
-                            name: existing.name,
-                            argumentsDelta: tc.function.arguments,
-                        };
-                    }
-                }
-            }
-        }
-        yield { type: "done" };
+        yield* processOpenAIStream(stream);
     }
     catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        yield { type: "error", message };
+        yield { type: "error", message: formatApiError(err) };
     }
 }

package/dist/providers/openai-compat.d.ts

@@ -0,0 +1,8 @@
+import type OpenAI from "openai";
+import type { ChatContext, StreamEvent, ToolCall } from "./types.js";
+export declare function sanitizeToolParameters(params: Record<string, unknown>): Record<string, unknown>;
+export declare function toOpenAITools(tools: ChatContext["tools"]): OpenAI.Chat.ChatCompletionTool[];
+export declare function normalizeToolCalls(toolCalls: ToolCall[]): ToolCall[];
+export declare function toOpenAIMessages(ctx: ChatContext): OpenAI.Chat.ChatCompletionMessageParam[];
+export declare function processOpenAIStream(stream: AsyncIterable<OpenAI.Chat.Completions.ChatCompletionChunk>): AsyncGenerator<StreamEvent>;
+export declare function formatApiError(err: unknown): string;

package/dist/providers/openai-compat.js

@@ -0,0 +1,117 @@
+export function sanitizeToolParameters(params) {
+    return {
+        ...params,
+        type: "object",
+        additionalProperties: false,
+    };
+}
+export function toOpenAITools(tools) {
+    return tools.map((t) => ({
+        type: "function",
+        function: {
+            name: t.name,
+            description: t.description,
+            parameters: sanitizeToolParameters(t.parameters),
+        },
+    }));
+}
+export function normalizeToolCalls(toolCalls) {
+    return toolCalls.map((tc, i) => ({
+        id: tc.id?.trim() || `call_${Date.now()}_${i}`,
+        name: tc.name,
+        arguments: tc.arguments?.trim() || "{}",
+    }));
+}
+export function toOpenAIMessages(ctx) {
+    const msgs = [];
+    if (ctx.systemPrompt) {
+        msgs.push({ role: "system", content: ctx.systemPrompt });
+    }
+    for (const m of ctx.messages) {
+        if (m.role === "user") {
+            msgs.push({ role: "user", content: m.content });
+        }
+        else if (m.role === "assistant") {
+            if (m.toolCalls?.length) {
+                const toolCalls = normalizeToolCalls(m.toolCalls);
+                msgs.push({
+                    role: "assistant",
+                    content: m.content || null,
+                    tool_calls: toolCalls.map((tc) => ({
+                        id: tc.id,
+                        type: "function",
+                        function: { name: tc.name, arguments: tc.arguments },
+                    })),
+                });
+            }
+            else {
+                msgs.push({ role: "assistant", content: m.content });
+            }
+        }
+        else if (m.role === "tool") {
+            msgs.push({
+                role: "tool",
+                tool_call_id: m.toolCallId,
+                content: m.content,
+                ...(m.name ? { name: m.name } : {}),
+            });
+        }
+    }
+    return msgs;
+}
+export async function* processOpenAIStream(stream) {
+    const toolCalls = new Map();
+    for await (const chunk of stream) {
+        const choice = chunk.choices[0];
+        if (choice?.finish_reason === "tool_calls" || choice?.delta?.tool_calls) {
+            // normal path
+        }
+        const delta = choice?.delta;
+        if (!delta)
+            continue;
+        if (delta.content) {
+            yield { type: "text_delta", delta: delta.content };
+        }
+        if (delta.tool_calls) {
+            for (const tc of delta.tool_calls) {
+                const idx = tc.index ?? 0;
+                if (!toolCalls.has(idx)) {
+                    toolCalls.set(idx, { id: tc.id ?? "", name: tc.function?.name ?? "", arguments: "" });
+                }
+                const existing = toolCalls.get(idx);
+                if (tc.id)
+                    existing.id = tc.id;
+                if (tc.function?.name)
+                    existing.name = tc.function.name;
+                if (tc.function?.arguments) {
+                    existing.arguments += tc.function.arguments;
+                    yield {
+                        type: "tool_call_delta",
+                        index: idx,
+                        id: existing.id,
+                        name: existing.name,
+                        argumentsDelta: tc.function.arguments,
+                    };
+                }
+            }
+        }
+        if (chunk.usage) {
+            yield {
+                type: "done",
+                usage: {
+                    inputTokens: chunk.usage.prompt_tokens,
+                    outputTokens: chunk.usage.completion_tokens,
+                },
+            };
+        }
+    }
+    yield { type: "done" };
+}
+export function formatApiError(err) {
+    const apiErr = err;
+    const failed = apiErr.error?.failed_generation;
+    const msg = apiErr.error?.message ?? apiErr.message ?? "API error";
+    if (failed)
+        return `${msg}\nModel output: ${failed.slice(0, 300)}`;
+    return msg;
+}

package/dist/providers/openrouter-free.js

@@ -1,4 +1,5 @@
 import OpenAI from "openai";
+import { toOpenAIMessages, toOpenAITools, processOpenAIStream, formatApiError, } from "./openai-compat.js";
 export const PROVIDER_ID = "free";
 export const DEFAULT_MODEL = "meta-llama/llama-3.3-70b-instruct:free";
 export const API_KEY_ENV = "OPENROUTER_API_KEY";
@@ -26,51 +27,6 @@ export function getApiKey(settings) {
 export function hasAuth(settings) {
     return !!getApiKey(settings);
 }
-function toOpenAIMessages(ctx) {
-    const msgs = [];
-    if (ctx.systemPrompt) {
-        msgs.push({ role: "system", content: ctx.systemPrompt });
-    }
-    for (const m of ctx.messages) {
-        if (m.role === "user") {
-            msgs.push({ role: "user", content: m.content });
-        }
-        else if (m.role === "assistant") {
-            if (m.toolCalls?.length) {
-                msgs.push({
-                    role: "assistant",
-                    content: m.content || null,
-                    tool_calls: m.toolCalls.map((tc) => ({
-                        id: tc.id,
-                        type: "function",
-                        function: { name: tc.name, arguments: tc.arguments },
-                    })),
-                });
-            }
-            else {
-                msgs.push({ role: "assistant", content: m.content });
-            }
-        }
-        else if (m.role === "tool") {
-            msgs.push({
-                role: "tool",
-                tool_call_id: m.toolCallId,
-                content: m.content,
-            });
-        }
-    }
-    return msgs;
-}
-function toOpenAITools(tools) {
-    return tools.map((t) => ({
-        type: "function",
-        function: {
-            name: t.name,
-            description: t.description,
-            parameters: t.parameters,
-        },
-    }));
-}
 export async function* streamChat(model, ctx, settings) {
     const apiKey = getApiKey(settings);
     if (!apiKey) {
@@ -85,49 +41,19 @@ export async function* streamChat(model, ctx, settings) {
             "X-Title": "agent-dev",
         },
     });
+    const hasTools = ctx.tools.length > 0;
     try {
         const stream = await client.chat.completions.create({
             model: model.id,
             messages: toOpenAIMessages(ctx),
-            tools: ctx.tools.length > 0 ? toOpenAITools(ctx.tools) : undefined,
+            tools: hasTools ? toOpenAITools(ctx.tools) : undefined,
+            tool_choice: hasTools ? "auto" : undefined,
+            parallel_tool_calls: false,
             stream: true,
         }, { signal: ctx.signal });
-        const toolCalls = new Map();
-        for await (const chunk of stream) {
-            const delta = chunk.choices[0]?.delta;
-            if (!delta)
-                continue;
-            if (delta.content) {
-                yield { type: "text_delta", delta: delta.content };
-            }
-            if (delta.tool_calls) {
-                for (const tc of delta.tool_calls) {
-                    const idx = tc.index;
-                    if (!toolCalls.has(idx)) {
-                        toolCalls.set(idx, { id: tc.id ?? "", name: tc.function?.name ?? "", arguments: "" });
-                    }
-                    const existing = toolCalls.get(idx);
-                    if (tc.id)
-                        existing.id = tc.id;
-                    if (tc.function?.name)
-                        existing.name = tc.function.name;
-                    if (tc.function?.arguments) {
-                        existing.arguments += tc.function.arguments;
-                        yield {
-                            type: "tool_call_delta",
-                            index: idx,
-                            id: existing.id,
-                            name: existing.name,
-                            argumentsDelta: tc.function.arguments,
-                        };
-                    }
-                }
-            }
-        }
-        yield { type: "done" };
+        yield* processOpenAIStream(stream);
     }
     catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        yield { type: "error", message };
+        yield { type: "error", message: formatApiError(err) };
     }
 }

package/dist/ui/ApiKeyPrompt.js

@@ -4,7 +4,6 @@ import { Box, Text, useInput } from "ink";
 import { PROVIDER_LABELS } from "../config/models.js";
 import { PROVIDER_ENV_VARS } from "../providers/registry.js";
 import { LeftBorder } from "./LeftBorder.js";
-import { Panel } from "./Panel.js";
 function BlinkingCursor({ theme, visible }) {
     if (!visible)
         return null;
@@ -35,8 +34,8 @@ export function ApiKeyPrompt({ theme, provider, model, onSubmit, onCancel }) {
         if (input && !key.ctrl && !key.meta) {
             setValue((v) => v + input);
         }
-    });
+    }, { isActive: true });
     const envVars = PROVIDER_ENV_VARS[provider];
     const masked = "•".repeat(value.length);
-    return (_jsx(Box, { paddingX: 2, marginTop: 1, children: _jsxs(LeftBorder, { theme: theme, borderColor: theme.borderActive, children: [_jsx(Text, { color: theme.text, bold: true, children: "API key required" }), _jsx(Text, { color: theme.textMuted, children: " Enter save \u00B7 Esc back" }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { color: theme.textMuted, children: ["Provider: ", PROVIDER_LABELS[provider]] }), _jsxs(Text, { color: theme.textMuted, children: ["Model: ", model.name] })] }), _jsx(Box, { marginTop: 1, children: _jsx(Panel, { theme: theme, borderColor: theme.primary, marginBottom: 0, children: _jsx(Box, { flexDirection: "row", children: value.length > 0 ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.text, children: masked }), _jsx(BlinkingCursor, { theme: theme, visible: cursorOn })] })) : (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.textMuted, children: "Paste API key\u2026" }), _jsx(BlinkingCursor, { theme: theme, visible: cursorOn })] })) }) }) }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: theme.textMuted, children: ["Or set env: ", envVars.join(" · ")] }) })] }) }));
+    return (_jsx(Box, { flexDirection: "column", marginX: 2, marginTop: 1, marginBottom: 1, children: _jsxs(LeftBorder, { theme: theme, borderColor: theme.primary, children: [_jsx(Text, { color: theme.text, bold: true, children: "API key required" }), _jsx(Text, { color: theme.textMuted, children: " Enter save \u00B7 Esc cancel" }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { color: theme.textMuted, children: ["Provider: ", PROVIDER_LABELS[provider]] }), _jsxs(Text, { color: theme.textMuted, children: ["Model: ", model.name] })] }), _jsx(Box, { flexDirection: "row", marginTop: 1, borderStyle: "round", borderColor: theme.primary, paddingX: 1, paddingY: 0, children: value.length > 0 ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.text, children: masked }), _jsx(BlinkingCursor, { theme: theme, visible: cursorOn })] })) : (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.textMuted, children: "Paste API key here\u2026" }), _jsx(BlinkingCursor, { theme: theme, visible: cursorOn })] })) }), _jsxs(Box, { marginTop: 1, children: [_jsxs(Text, { color: theme.textMuted, children: ["Or set env: ", envVars.join(" · ")] }), _jsx(Text, { color: theme.textMuted, children: "Saved to ~/.agent-dev/settings.json" })] })] }) }));
 }

package/dist/ui/App.js

@@ -7,10 +7,16 @@ import { Footer } from "./Footer.js";
 import { ModelSelector } from "./ModelSelector.js";
 import { ApiKeyPrompt } from "./ApiKeyPrompt.js";
 import { SettingsView } from "./SettingsView.js";
-import { hasProviderAuth } from "../providers/registry.js";
+import { hasProviderAuth, getDefaultModelForProvider } from "../providers/registry.js";
+import { findModel } from "../config/models.js";
 import { StartupBanner } from "./StartupBanner.js";
 import { getTheme } from "./theme.js";
-import { saveSettings } from "../config/settings.js";
+function modelForProvider(provider, settings) {
+    const current = findModel(settings.defaultProvider, settings.defaultModel);
+    if (current?.provider === provider)
+        return current;
+    return getDefaultModelForProvider(provider);
+}
 export function App({ session, workdir, onQuit }) {
     const { exit } = useApp();
     const [displayMessages, setDisplayMessages] = useState(() => session.getMessages().map((m) => ({
@@ -22,11 +28,43 @@ export function App({ session, workdir, onQuit }) {
     const [overlay, setOverlay] = useState("none");
     const [modelFilter, setModelFilter] = useState();
     const [pendingModel, setPendingModel] = useState(null);
+    const [apiKeyReturnOverlay, setApiKeyReturnOverlay] = useState("none");
     const [settings, setSettings] = useState(session.getSettings());
     const [model, setModel] = useState(session.getModel());
     const [running, setRunning] = useState(false);
     const streamingRef = useRef("");
+    const startupChecked = useRef(false);
     const theme = getTheme();
+    const openApiKeyPrompt = useCallback((target, returnTo = "none") => {
+        setPendingModel(target);
+        setApiKeyReturnOverlay(returnTo);
+        setOverlay("apiKey");
+    }, []);
+    const saveApiKey = useCallback((apiKey) => {
+        if (!pendingModel)
+            return;
+        const updated = {
+            ...settings,
+            apiKeys: { ...settings.apiKeys, [pendingModel.provider]: apiKey },
+        };
+        session.updateSettings(updated);
+        setSettings(updated);
+        session.setModel(pendingModel);
+        setModel(pendingModel);
+        setPendingModel(null);
+        setOverlay(apiKeyReturnOverlay);
+        setApiKeyReturnOverlay("none");
+        setModelFilter(undefined);
+    }, [pendingModel, settings, session, apiKeyReturnOverlay]);
+    useEffect(() => {
+        if (startupChecked.current)
+            return;
+        startupChecked.current = true;
+        const current = session.getModel();
+        if (!hasProviderAuth(current.provider, settings)) {
+            openApiKeyPrompt(current, "none");
+        }
+    }, [session, settings, openApiKeyPrompt]);
     useEffect(() => {
         const handler = (event) => {
             switch (event.type) {
@@ -75,6 +113,9 @@ export function App({ session, workdir, onQuit }) {
                     streamingRef.current = "";
                     setStreamingText("");
                     setRunning(false);
+                    if (/Missing .*API_KEY/i.test(event.message)) {
+                        openApiKeyPrompt(model, "none");
+                    }
                     break;
                 case "model_changed":
                     setModel(event.model);
@@ -85,14 +126,14 @@ export function App({ session, workdir, onQuit }) {
         return () => {
             session.off("event", handler);
         };
-    }, [session]);
+    }, [session, model, openApiKeyPrompt]);
     useInput((_, key) => {
         if (overlay !== "none")
             return;
         if (key.escape && running) {
             session.abort();
         }
-    });
+    }, { isActive: overlay === "none" });
     const handleSubmit = useCallback(async (value) => {
         if (value === "/quit") {
             onQuit();
@@ -117,13 +158,16 @@ export function App({ session, workdir, onQuit }) {
         }
         if (running)
             return;
+        if (!hasProviderAuth(model.provider, settings)) {
+            openApiKeyPrompt(model, "none");
+            return;
+        }
         await session.prompt(value);
-    }, [session, running, onQuit, exit]);
+    }, [session, running, onQuit, exit, model, settings, openApiKeyPrompt]);
     const hasChat = displayMessages.length > 0 || streamingText.length > 0;
     return (_jsxs(Box, { flexDirection: "column", height: "100%", children: [_jsx(Box, { paddingX: 2, marginBottom: 1, children: _jsx(StartupBanner, { theme: theme, compact: hasChat }) }), _jsx(ChatView, { messages: displayMessages, theme: theme, model: model, streamingText: streamingText, running: running }), _jsx(Footer, { workdir: workdir, model: model, theme: theme }), overlay === "none" && (_jsx(Editor, { theme: theme, model: model, disabled: running, running: running, onSubmit: handleSubmit })), overlay === "model" && (_jsx(ModelSelector, { theme: theme, settings: settings, filter: modelFilter, onSelect: (m) => {
                     if (!hasProviderAuth(m.provider, settings)) {
-                        setPendingModel(m);
-                        setOverlay("apiKey");
+                        openApiKeyPrompt(m, "model");
                         return;
                     }
                     session.setModel(m);
@@ -133,24 +177,14 @@ export function App({ session, workdir, onQuit }) {
                 }, onClose: () => {
                     setOverlay("none");
                     setModelFilter(undefined);
-                } })), overlay === "apiKey" && pendingModel && (_jsx(ApiKeyPrompt, { theme: theme, provider: pendingModel.provider, model: pendingModel, onSubmit: (apiKey) => {
-                    const updated = {
-                        ...settings,
-                        apiKeys: { ...settings.apiKeys, [pendingModel.provider]: apiKey },
-                    };
-                    session.updateSettings(updated);
-                    setSettings(updated);
-                    session.setModel(pendingModel);
-                    setModel(pendingModel);
-                    setPendingModel(null);
-                    setOverlay("none");
-                    setModelFilter(undefined);
-                }, onCancel: () => {
+                } })), overlay === "apiKey" && pendingModel && (_jsx(ApiKeyPrompt, { theme: theme, provider: pendingModel.provider, model: pendingModel, onSubmit: saveApiKey, onCancel: () => {
                     setPendingModel(null);
-                    setOverlay("model");
+                    setOverlay(apiKeyReturnOverlay);
+                    setApiKeyReturnOverlay("none");
                 } })), overlay === "settings" && (_jsx(SettingsView, { theme: theme, settings: settings, onUpdate: (s) => {
                     session.updateSettings(s);
                     setSettings(s);
-                    saveSettings(s);
+                }, onSetApiKey: (provider) => {
+                    openApiKeyPrompt(modelForProvider(provider, settings), "settings");
                 }, onClose: () => setOverlay("none") }))] }));
 }

package/dist/ui/Editor.js

@@ -71,7 +71,7 @@ export function Editor({ theme, model, disabled, running, onSubmit }) {
             setValue(newVal);
             updateSuggestions(newVal);
         }
-    });
+    }, { isActive: !disabled });
     const placeholder = "Ask anything…";
     const showCursor = !disabled && cursorOn;
     return (_jsxs(Box, { flexDirection: "column", marginX: 2, children: [suggestions.length > 0 && (_jsx(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.border, paddingX: 1, marginBottom: 1, children: suggestions.map((s) => (_jsxs(Text, { children: [_jsx(Text, { color: theme.primary, children: s.cmd }), _jsxs(Text, { color: theme.textMuted, children: [" \u2014 ", s.desc] })] }, s.cmd))) })), _jsxs(Panel, { theme: theme, borderColor: disabled ? theme.border : theme.primary, marginBottom: 0, children: [_jsx(Box, { flexDirection: "row", children: value.length > 0 ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.text, children: value }), _jsx(BlinkingCursor, { theme: theme, visible: showCursor })] })) : showCursor ? (_jsx(BlinkingCursor, { theme: theme, visible: true })) : (_jsx(Text, { color: theme.textMuted, children: placeholder })) }), _jsxs(Text, { color: theme.textMuted, children: ["agent-dev \u00B7 ", _jsx(Text, { color: theme.text, children: modelRef(model) })] })] }), _jsx(Box, { marginTop: 1, marginBottom: 1, children: running ? (_jsxs(Text, { color: theme.textMuted, children: [_jsx(Text, { color: theme.primary, children: SPINNER_FRAMES[spinIdx] }), " ", "esc interrupt"] })) : (_jsx(Text, { color: theme.textMuted, children: "Tab completes /commands" })) })] }));

package/dist/ui/ModelSelector.js

@@ -30,7 +30,7 @@ export function ModelSelector({ theme, settings, filter, onSelect, onClose }) {
         if (key.return && filtered[safeIndex]) {
             onSelect(filtered[safeIndex]);
         }
-    });
+    }, { isActive: true });
     const providers = ["openai", "groq", "gemini", "free"];
     let lastProvider;
     return (_jsx(Box, { paddingX: 2, marginTop: 1, children: _jsxs(LeftBorder, { theme: theme, borderColor: theme.borderActive, children: [_jsx(Text, { color: theme.text, bold: true, children: "/model" }), _jsx(Text, { color: theme.textMuted, children: " \u2191\u2193 navigate \u00B7 Enter select \u00B7 Esc close" }), _jsx(Text, { color: theme.textMuted, children: " Models without a key will prompt for an API key" }), filter && _jsxs(Text, { color: theme.textMuted, children: [" filter: ", filter] }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [filtered.length === 0 && _jsx(Text, { color: theme.textMuted, children: "No models match" }), filtered.map((m, i) => {

package/dist/ui/SettingsView.d.ts

@@ -1,11 +1,13 @@
 import React from "react";
 import type { ThemeColors } from "./theme.js";
 import type { Settings } from "../config/settings.js";
+import type { ProviderId } from "../providers/types.js";
 interface SettingsViewProps {
     theme: ThemeColors;
     settings: Settings;
     onUpdate: (settings: Settings) => void;
+    onSetApiKey: (provider: ProviderId) => void;
     onClose: () => void;
 }
-export declare function SettingsView({ theme, settings, onUpdate, onClose }: SettingsViewProps): React.JSX.Element;
+export declare function SettingsView({ theme, settings, onUpdate, onSetApiKey, onClose }: SettingsViewProps): React.JSX.Element;
 export {};

package/dist/ui/SettingsView.js

@@ -1,12 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from "react";
 import { Box, Text, useInput } from "ink";
-import { PROVIDER_ENV_VARS } from "../providers/registry.js";
+import { PROVIDER_ENV_VARS, hasProviderAuth } from "../providers/registry.js";
 import { LeftBorder } from "./LeftBorder.js";
 const THINKING_LEVELS = ["off", "minimal", "low", "medium", "high"];
-export function SettingsView({ theme, settings, onUpdate, onClose }) {
+const PROVIDERS = ["openai", "groq", "gemini", "free"];
+export function SettingsView({ theme, settings, onUpdate, onSetApiKey, onClose }) {
+    const items = ["thinkingLevel", ...PROVIDERS];
     const [index, setIndex] = useState(0);
-    const items = ["thinkingLevel", "envKeys"];
     useInput((_, key) => {
         if (key.escape)
             onClose();
@@ -21,12 +22,17 @@ export function SettingsView({ theme, settings, onUpdate, onClose }) {
                 const next = THINKING_LEVELS[(cur + 1) % THINKING_LEVELS.length];
                 onUpdate({ ...settings, thinkingLevel: next });
             }
+            else {
+                onSetApiKey(item);
+            }
         }
-    });
-    const providers = ["openai", "groq", "gemini", "free"];
-    return (_jsx(Box, { paddingX: 2, marginTop: 1, children: _jsxs(LeftBorder, { theme: theme, borderColor: theme.borderActive, children: [_jsx(Text, { color: theme.text, bold: true, children: "/settings" }), _jsx(Text, { color: theme.textMuted, children: " Enter cycle \u00B7 Esc close" }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { color: index === 0 ? theme.primary : theme.text, children: [index === 0 ? "› " : "  ", "Thinking:", " ", _jsx(Text, { bold: true, children: settings.thinkingLevel })] }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: index === 1 ? theme.primary : theme.textMuted, children: [index === 1 ? "› " : "  ", "API keys"] }) }), providers.map((p) => {
+    }, { isActive: true });
+    return (_jsx(Box, { paddingX: 2, marginTop: 1, marginBottom: 1, children: _jsxs(LeftBorder, { theme: theme, borderColor: theme.borderActive, children: [_jsx(Text, { color: theme.text, bold: true, children: "/settings" }), _jsx(Text, { color: theme.textMuted, children: " \u2191\u2193 navigate \u00B7 Enter select \u00B7 Esc close" }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { color: index === 0 ? theme.primary : theme.text, children: [index === 0 ? "› " : "  ", "Thinking:", " ", _jsx(Text, { bold: true, children: settings.thinkingLevel }), index === 0 && _jsx(Text, { color: theme.textMuted, children: " (Enter to cycle)" })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.textMuted, children: "API keys \u2014 Enter to set / update" }) }), PROVIDERS.map((p, i) => {
+                            const idx = i + 1;
                             const vars = PROVIDER_ENV_VARS[p];
-                            const set = vars.some((v) => process.env[v]);
-                            return (_jsxs(Text, { color: set ? theme.success : theme.textMuted, children: ["    ", set ? "✓" : "○", " ", p, ": ", vars.join(" · ")] }, p));
-                        })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.textMuted, children: "OPENAI_API_KEY \u00B7 GROQ_API_KEY \u00B7 GEMINI_API_KEY \u00B7 OPENROUTER_API_KEY" }) })] }) }));
+                            const fromEnv = vars.some((v) => !!process.env[v]);
+                            const fromSettings = !!settings.apiKeys?.[p];
+                            const ok = hasProviderAuth(p, settings);
+                            return (_jsxs(Text, { color: index === idx ? theme.primary : theme.text, children: [index === idx ? "› " : "  ", ok ? "✓" : "○", " ", p, fromEnv && _jsx(Text, { color: theme.textMuted, children: " env" }), fromSettings && _jsx(Text, { color: theme.textMuted, children: " saved" })] }, p));
+                        })] })] }) }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devang0907/agent-dev",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Minimal terminal coding agent",
   "type": "module",
   "license": "MIT",