protoagent 0.1.2 → 0.1.3

package/dist/App.js

@@ -12,7 +12,8 @@ import { TextInput, Select, PasswordInput } from '@inkjs/ui';
 import BigText from 'ink-big-text';
 import { OpenAI } from 'openai';
 import { readConfig, writeConfig, resolveApiKey } from './config.js';
-import { getProvider, getModelPricing, SUPPORTED_MODELS } from './providers.js';
+import { loadRuntimeConfig } from './runtime-config.js';
+import { getAllProviders, getProvider, getModelPricing, getRequestDefaultParams } from './providers.js';
 import { runAgenticLoop, initializeMessages, } from './agentic-loop.js';
 import { setDangerouslyAcceptAll, setApprovalHandler, clearApprovalHandler } from './tools/index.js';
 import { setLogLevel, LogLevel, initLogFile, logger } from './utils/logger.js';
@@ -143,7 +144,7 @@ function buildClient(config) {
     if (baseURL) {
         clientOptions.baseURL = baseURL;
     }
-    // Custom headers: parse PROTOAGENT_CUSTOM_HEADERS (newline-separated "Key: Value" pairs)
+    // Custom headers: env override takes precedence over provider defaults
     const rawHeaders = process.env.PROTOAGENT_CUSTOM_HEADERS?.trim();
     if (rawHeaders) {
         const defaultHeaders = {};
@@ -160,6 +161,9 @@ function buildClient(config) {
             clientOptions.defaultHeaders = defaultHeaders;
         }
     }
+    else if (provider?.headers && Object.keys(provider.headers).length > 0) {
+        clientOptions.defaultHeaders = provider.headers;
+    }
     return new OpenAI(clientOptions);
 }
 // ─── Sub-components ───
@@ -196,7 +200,7 @@ const InlineSetup = ({ onComplete }) => {
     const [selectedProviderId, setSelectedProviderId] = useState('');
     const [selectedModelId, setSelectedModelId] = useState('');
     const [apiKeyError, setApiKeyError] = useState('');
-    const providerItems = SUPPORTED_MODELS.flatMap((provider) => provider.models.map((model) => ({
+    const providerItems = getAllProviders().flatMap((provider) => provider.models.map((model) => ({
         label: `${provider.name} - ${model.name}`,
         value: `${provider.id}:::${model.id}`,
     })));
@@ -209,15 +213,16 @@ const InlineSetup = ({ onComplete }) => {
                         } }) })] }));
     }
     const provider = getProvider(selectedProviderId);
-    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: "yellow", bold: true, children: "First-time setup" }), _jsxs(Text, { dimColor: true, children: ["Selected: ", provider?.name, " / ", selectedModelId] }), _jsx(Text, { children: "Enter your API key:" }), apiKeyError && _jsx(Text, { color: "red", children: apiKeyError }), _jsx(PasswordInput, { placeholder: `Paste your ${provider?.apiKeyEnvVar || 'API'} key`, onSubmit: (value) => {
-                    if (value.trim().length === 0) {
+    const hasResolvedAuth = Boolean(resolveApiKey({ provider: selectedProviderId, apiKey: undefined }));
+    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: "yellow", bold: true, children: "First-time setup" }), _jsxs(Text, { dimColor: true, children: ["Selected: ", provider?.name, " / ", selectedModelId] }), _jsx(Text, { children: hasResolvedAuth ? 'Optional API key:' : 'Enter your API key:' }), apiKeyError && _jsx(Text, { color: "red", children: apiKeyError }), _jsx(PasswordInput, { placeholder: hasResolvedAuth ? 'Press enter to keep resolved auth' : `Paste your ${provider?.apiKeyEnvVar || 'API'} key`, onSubmit: (value) => {
+                    if (value.trim().length === 0 && !hasResolvedAuth) {
                         setApiKeyError('API key cannot be empty.');
                         return;
                     }
                     const newConfig = {
                         provider: selectedProviderId,
                         model: selectedModelId,
-                        apiKey: value.trim(),
+                        ...(value.trim().length > 0 ? { apiKey: value.trim() } : {}),
                     };
                     writeConfig(newConfig);
                     onComplete(newConfig);
@@ -331,6 +336,7 @@ export const App = ({ dangerouslyAcceptAll = false, logLevel, sessionId, }) => {
                     setPendingApproval({ request: req, resolve });
                 });
             });
+            await loadRuntimeConfig();
             // Load config — if none exists, show inline setup
             const loadedConfig = readConfig();
             if (!loadedConfig) {
@@ -436,6 +442,7 @@ export const App = ({ dangerouslyAcceptAll = false, logLevel, sessionId, }) => {
         assistantMessageRef.current = null;
         try {
             const pricing = getModelPricing(config.provider, config.model);
+            const requestDefaults = getRequestDefaultParams(config.provider, config.model);
             // Create abort controller for this completion
             abortControllerRef.current = new AbortController();
             const updatedMessages = await runAgenticLoop(clientRef.current, config.model, [...completionMessages, userMessage], trimmed, (event) => {
@@ -568,7 +575,12 @@ export const App = ({ dangerouslyAcceptAll = false, logLevel, sessionId, }) => {
                         setThreadErrors((prev) => prev.filter((threadError) => !threadError.transient));
                         break;
                 }
-            }, { pricing: pricing || undefined, abortSignal: abortControllerRef.current.signal, sessionId: session?.id });
+            }, {
+                pricing: pricing || undefined,
+                abortSignal: abortControllerRef.current.signal,
+                sessionId: session?.id,
+                requestDefaults,
+            });
             // Final update to ensure we have the complete message history
             setCompletionMessages(updatedMessages);
             // Update session

package/dist/agentic-loop.js

@@ -219,6 +219,7 @@ export async function runAgenticLoop(client, model, messages, userInput, onEvent
     const pricing = options.pricing;
     const abortSignal = options.abortSignal;
     const sessionId = options.sessionId;
+    const requestDefaults = options.requestDefaults || {};
     // Note: userInput is passed for context/logging but user message should already be in messages array
     // (added by the caller in handleSubmit for immediate UI display)
     const updatedMessages = [...messages];
@@ -243,7 +244,7 @@ export async function runAgenticLoop(client, model, messages, userInput, onEvent
         if (pricing) {
             const contextInfo = getContextInfo(updatedMessages, pricing);
             if (contextInfo.needsCompaction) {
-                const compacted = await compactIfNeeded(client, model, updatedMessages, pricing.contextWindow, contextInfo.currentTokens);
+                const compacted = await compactIfNeeded(client, model, updatedMessages, pricing.contextWindow, contextInfo.currentTokens, requestDefaults, sessionId);
                 // Replace messages in-place
                 updatedMessages.length = 0;
                 updatedMessages.push(...compacted);
@@ -287,6 +288,7 @@ export async function runAgenticLoop(client, model, messages, userInput, onEvent
                 }
             }
             const stream = await client.chat.completions.create({
+                ...requestDefaults,
                 model,
                 messages: updatedMessages,
                 tools: allTools,
@@ -399,7 +401,7 @@ export async function runAgenticLoop(client, model, messages, userInput, onEvent
                         let result;
                         // Handle sub-agent tool specially
                         if (name === 'sub_agent') {
-                            result = await runSubAgent(client, model, args.task, args.max_iterations);
+                            result = await runSubAgent(client, model, args.task, args.max_iterations, requestDefaults);
                         }
                         else {
                             result = await handleToolCall(name, args, { sessionId });

package/dist/components/ConfigDialog.js

@@ -7,12 +7,13 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from 'react';
 import { Box, Text } from 'ink';
 import { PasswordInput, Select } from '@inkjs/ui';
-import { getProvider, SUPPORTED_MODELS } from '../providers.js';
+import { getAllProviders, getProvider } from '../providers.js';
+import { resolveApiKey } from '../config.js';
 export const ConfigDialog = ({ currentConfig, onComplete, onCancel, }) => {
     const [step, setStep] = useState('select_provider');
     const [selectedProviderId, setSelectedProviderId] = useState(currentConfig.provider);
     const [selectedModelId, setSelectedModelId] = useState(currentConfig.model);
-    const providerItems = SUPPORTED_MODELS.flatMap((provider) => provider.models.map((model) => ({
+    const providerItems = getAllProviders().flatMap((provider) => provider.models.map((model) => ({
         label: `${provider.name} - ${model.name}`,
         value: `${provider.id}:::${model.id}`,
     })));
@@ -28,12 +29,13 @@ export const ConfigDialog = ({ currentConfig, onComplete, onCancel, }) => {
     }
     // API key entry step
     const provider = getProvider(selectedProviderId);
-    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, borderStyle: "round", borderColor: "green", paddingX: 1, children: [_jsx(Text, { color: "green", bold: true, children: "Confirm Configuration" }), _jsxs(Text, { dimColor: true, children: ["Provider: ", provider?.name, " / ", selectedModelId] }), _jsx(Text, { children: "Enter your API key (or leave empty to keep current/env var):" }), _jsx(PasswordInput, { placeholder: `Paste your ${provider?.apiKeyEnvVar || 'API'} key`, onSubmit: (value) => {
+    const hasResolvedAuth = Boolean(resolveApiKey({ provider: selectedProviderId, apiKey: undefined }));
+    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, borderStyle: "round", borderColor: "green", paddingX: 1, children: [_jsx(Text, { color: "green", bold: true, children: "Confirm Configuration" }), _jsxs(Text, { dimColor: true, children: ["Provider: ", provider?.name, " / ", selectedModelId] }), _jsx(Text, { children: hasResolvedAuth ? 'Optional API key (leave empty to keep resolved auth):' : 'Enter your API key:' }), _jsx(PasswordInput, { placeholder: `Paste your ${provider?.apiKeyEnvVar || 'API'} key`, onSubmit: (value) => {
                     const finalApiKey = value.trim().length > 0 ? value.trim() : currentConfig.apiKey;
                     const newConfig = {
                         provider: selectedProviderId,
                         model: selectedModelId,
-                        apiKey: finalApiKey,
+                        ...(finalApiKey?.trim() ? { apiKey: finalApiKey.trim() } : {}),
                     };
                     onComplete(newConfig);
                 } })] }));

package/dist/config.js

@@ -5,7 +5,8 @@ import os from 'node:os';
 import { useState, useEffect } from 'react';
 import { Box, Text } from 'ink';
 import { Select, TextInput, PasswordInput } from '@inkjs/ui';
-import { SUPPORTED_MODELS, getProvider } from './providers.js';
+import { loadRuntimeConfig } from './runtime-config.js';
+import { getAllProviders, getProvider } from './providers.js';
 const CONFIG_DIR_MODE = 0o700;
 const CONFIG_FILE_MODE = 0o600;
 function hardenPermissions(targetPath, mode) {
@@ -18,16 +19,35 @@ export function resolveApiKey(config) {
     if (directApiKey) {
         return directApiKey;
     }
+    const provider = getProvider(config.provider);
+    if (provider?.apiKeyEnvVar) {
+        const providerEnvOverride = process.env[provider.apiKeyEnvVar]?.trim();
+        if (providerEnvOverride) {
+            return providerEnvOverride;
+        }
+    }
+    const envOverride = process.env.PROTOAGENT_API_KEY?.trim();
+    if (envOverride) {
+        return envOverride;
+    }
+    const providerApiKey = provider?.apiKey?.trim();
+    if (providerApiKey) {
+        return providerApiKey;
+    }
     // Fallback for Cloudflare Gateway or other custom header setups
     if (process.env.PROTOAGENT_CUSTOM_HEADERS) {
         return 'none';
     }
-    const provider = getProvider(config.provider);
     if (!provider?.apiKeyEnvVar) {
+        if (provider?.headers && Object.keys(provider.headers).length > 0) {
+            return 'none';
+        }
         return null;
     }
-    const envApiKey = process.env[provider.apiKeyEnvVar]?.trim();
-    return envApiKey || null;
+    if (provider?.headers && Object.keys(provider.headers).length > 0) {
+        return 'none';
+    }
+    return null;
 }
 export const getConfigDirectory = () => {
     const homeDir = os.homedir();
@@ -55,8 +75,8 @@ export const readConfig = () => {
             // Handle legacy format: { provider, model, credentials: { KEY: "..." } }
             let apiKey = raw.apiKey;
             if (!apiKey && raw.credentials && typeof raw.credentials === 'object') {
-                const provider = SUPPORTED_MODELS.find((p) => p.id === raw.provider);
-                if (provider) {
+                const provider = getAllProviders().find((p) => p.id === raw.provider);
+                if (provider?.apiKeyEnvVar) {
                     apiKey = raw.credentials[provider.apiKeyEnvVar];
                 }
                 // Fallback: grab the first non-empty value
@@ -93,14 +113,21 @@ export const writeConfig = (config) => {
 };
 export const InitialLoading = ({ setExistingConfig, setStep }) => {
     useEffect(() => {
-        const config = readConfig();
-        if (config) {
-            setExistingConfig(config);
-            setStep(1);
-        }
-        else {
+        loadRuntimeConfig()
+            .then(() => {
+            const config = readConfig();
+            if (config) {
+                setExistingConfig(config);
+                setStep(1);
+            }
+            else {
+                setStep(2);
+            }
+        })
+            .catch((error) => {
+            console.error('Error loading runtime config:', error);
             setStep(2);
-        }
+        });
     }, []);
     return _jsx(Text, { children: "Loading configuration..." });
 };
@@ -118,7 +145,7 @@ export const ResetPrompt = ({ existingConfig, setStep, setConfigWritten }) => {
                 } })] }));
 };
 export const ModelSelection = ({ setSelectedProviderId, setSelectedModelId, setStep, }) => {
-    const items = SUPPORTED_MODELS.flatMap((provider) => provider.models.map((model) => ({
+    const items = getAllProviders().flatMap((provider) => provider.models.map((model) => ({
         label: `${provider.name} - ${model.name}`,
         value: `${provider.id}:::${model.id}`,
     })));
@@ -133,21 +160,22 @@ export const ModelSelection = ({ setSelectedProviderId, setSelectedModelId, setS
 export const ApiKeyInput = ({ selectedProviderId, selectedModelId, setStep, setConfigWritten, }) => {
     const [errorMessage, setErrorMessage] = useState('');
     const provider = getProvider(selectedProviderId);
+    const canUseResolvedAuth = Boolean(resolveApiKey({ provider: selectedProviderId, apiKey: undefined }));
     const handleApiKeySubmit = (value) => {
-        if (value.trim().length === 0) {
+        if (value.trim().length === 0 && !canUseResolvedAuth) {
             setErrorMessage('API key cannot be empty.');
             return;
         }
         const newConfig = {
             provider: selectedProviderId,
             model: selectedModelId,
-            apiKey: value.trim(),
+            ...(value.trim().length > 0 ? { apiKey: value.trim() } : {}),
         };
         writeConfig(newConfig);
         setConfigWritten(true);
         setStep(4);
     };
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: ["Enter API Key for ", provider?.name || selectedProviderId, ":"] }), selectedProviderId === 'cloudflare-gateway' && (_jsx(Text, { dimColor: true, children: "For Cloudflare AI Gateway, enter any placeholder (e.g. 'none'). Auth is handled via PROTOAGENT_CUSTOM_HEADERS." })), errorMessage && _jsx(Text, { color: "red", children: errorMessage }), _jsx(PasswordInput, { placeholder: `Enter your ${provider?.apiKeyEnvVar || 'API'} key`, onSubmit: handleApiKeySubmit })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: [canUseResolvedAuth ? 'Optional API Key' : 'Enter API Key', " for ", provider?.name || selectedProviderId, ":"] }), provider?.headers && Object.keys(provider.headers).length > 0 && (_jsx(Text, { dimColor: true, children: "This provider can authenticate with configured headers or environment variables." })), errorMessage && _jsx(Text, { color: "red", children: errorMessage }), _jsx(PasswordInput, { placeholder: canUseResolvedAuth ? 'Press enter to keep resolved auth' : `Enter your ${provider?.apiKeyEnvVar || 'API'} key`, onSubmit: handleApiKeySubmit })] }));
 };
 export const ConfigResult = ({ configWritten }) => {
     return (_jsxs(Box, { flexDirection: "column", children: [configWritten ? (_jsx(Text, { color: "green", children: "Configuration saved successfully!" })) : (_jsx(Text, { color: "yellow", children: "Configuration not changed." })), _jsx(Text, { children: "You can now run ProtoAgent." })] }));

package/dist/mcp.js

@@ -4,7 +4,7 @@
  * Uses the official @modelcontextprotocol/sdk to connect to MCP servers
  * over both stdio (spawned processes) and HTTP transports.
  *
- * Configuration in `.protoagent/mcp.json`:
+ * Configuration in `protoagent.jsonc` under `mcp.servers`:
  * {
  *   "servers": {
  *     "my-stdio-server": {
@@ -23,11 +23,10 @@
  * Stdio servers are spawned as child processes communicating over stdin/stdout.
  * HTTP servers connect to a running server via HTTP POST/GET with SSE streaming.
  */
-import fs from 'node:fs/promises';
-import path from 'node:path';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { loadRuntimeConfig, getRuntimeConfig } from './runtime-config.js';
 import { logger } from './utils/logger.js';
 import { registerDynamicTool, registerDynamicHandler } from './tools/index.js';
 const connections = new Map();
@@ -38,7 +37,11 @@ async function connectStdioServer(serverName, config) {
     const transport = new StdioClientTransport({
         command: config.command,
         args: config.args || [],
-        env: config.env || {},
+        env: {
+            ...process.env,
+            ...(config.env || {}),
+        },
+        cwd: config.cwd,
     });
     const client = new Client({
         name: 'protoagent',
@@ -57,7 +60,9 @@ async function connectStdioServer(serverName, config) {
  * Create an MCP client connection for an HTTP server.
  */
 async function connectHttpServer(serverName, config) {
-    const transport = new StreamableHTTPClientTransport(new URL(config.url));
+    const transport = new StreamableHTTPClientTransport(new URL(config.url), {
+        requestInit: config.headers ? { headers: config.headers } : undefined,
+    });
     const client = new Client({
         name: 'protoagent',
         version: '0.0.1',
@@ -92,7 +97,7 @@ async function registerMcpTools(conn) {
             registerDynamicHandler(toolName, async (args) => {
                 const result = await conn.client.callTool({
                     name: tool.name,
-                    arguments: args,
+                    arguments: (args && typeof args === 'object' ? args : {}),
                 });
                 // MCP tool results are arrays of content blocks
                 if (Array.isArray(result.content)) {
@@ -117,20 +122,16 @@ async function registerMcpTools(conn) {
  * Registers their tools in the dynamic tool registry.
  */
 export async function initializeMcp() {
-    const configPath = path.join(process.cwd(), '.protoagent', 'mcp.json');
-    let config;
-    try {
-        const content = await fs.readFile(configPath, 'utf8');
-        config = JSON.parse(content);
-    }
-    catch {
-        // No MCP config — that's fine, most projects won't have one
+    await loadRuntimeConfig();
+    const servers = getRuntimeConfig().mcp?.servers || {};
+    if (Object.keys(servers).length === 0)
         return;
-    }
-    if (!config.servers || Object.keys(config.servers).length === 0)
-        return;
-    logger.info(`Loading MCP servers from ${configPath}`);
-    for (const [name, serverConfig] of Object.entries(config.servers)) {
+    logger.info('Loading MCP servers from merged runtime config');
+    for (const [name, serverConfig] of Object.entries(servers)) {
+        if (serverConfig.enabled === false) {
+            logger.debug(`Skipping disabled MCP server: ${name}`);
+            continue;
+        }
         try {
             let conn;
             if (serverConfig.type === 'stdio') {

package/dist/providers.js

@@ -1,37 +1,19 @@
 /**
- * Model and provider definitions.
+ * Provider and model registry.
  *
- * All providers use the OpenAI SDK via compatible endpoints.
- * To add a new provider, add an entry here with its baseURL
- * and API key env var name, and any models it supports.
+ * Built-in providers are declared in source and merged with runtime overrides
+ * from `protoagent.jsonc`.
  */
-export const SUPPORTED_MODELS = [
+import { getRuntimeConfig } from './runtime-config.js';
+export const BUILTIN_PROVIDERS = [
     {
         id: 'openai',
         name: 'OpenAI',
         apiKeyEnvVar: 'OPENAI_API_KEY',
         models: [
-            {
-                id: 'gpt-5.2',
-                name: 'GPT-5.2',
-                contextWindow: 200_000,
-                pricingPerMillionInput: 6.00,
-                pricingPerMillionOutput: 24.00,
-            },
-            {
-                id: 'gpt-5-mini',
-                name: 'GPT-5 Mini',
-                contextWindow: 200_000,
-                pricingPerMillionInput: 0.15,
-                pricingPerMillionOutput: 0.60,
-            },
-            {
-                id: 'gpt-4.1',
-                name: 'GPT-4.1',
-                contextWindow: 128_000,
-                pricingPerMillionInput: 2.50,
-                pricingPerMillionOutput: 10.00,
-            },
+            { id: 'gpt-5.2', name: 'GPT-5.2', contextWindow: 200_000, pricingPerMillionInput: 6.0, pricingPerMillionOutput: 24.0 },
+            { id: 'gpt-5-mini', name: 'GPT-5 Mini', contextWindow: 200_000, pricingPerMillionInput: 0.15, pricingPerMillionOutput: 0.6 },
+            { id: 'gpt-4.1', name: 'GPT-4.1', contextWindow: 128_000, pricingPerMillionInput: 2.5, pricingPerMillionOutput: 10.0 },
         ],
     },
     {
@@ -40,27 +22,9 @@ export const SUPPORTED_MODELS = [
         baseURL: 'https://api.anthropic.com/v1/',
         apiKeyEnvVar: 'ANTHROPIC_API_KEY',
         models: [
-            {
-                id: 'claude-opus-4-6',
-                name: 'Claude Opus 4.6',
-                contextWindow: 200_000,
-                pricingPerMillionInput: 5.00,
-                pricingPerMillionOutput: 25.00,
-            },
-            {
-                id: 'claude-sonnet-4-6',
-                name: 'Claude Sonnet 4.6',
-                contextWindow: 200_000,
-                pricingPerMillionInput: 3.00,
-                pricingPerMillionOutput: 15.00,
-            },
-            {
-                id: 'claude-haiku-4-5',
-                name: 'Claude Haiku 4.5',
-                contextWindow: 200_000,
-                pricingPerMillionInput: 1.00,
-                pricingPerMillionOutput: 5.00,
-            },
+            { id: 'claude-opus-4-6', name: 'Claude Opus 4.6', contextWindow: 200_000, pricingPerMillionInput: 5.0, pricingPerMillionOutput: 25.0 },
+            { id: 'claude-sonnet-4-6', name: 'Claude Sonnet 4.6', contextWindow: 200_000, pricingPerMillionInput: 3.0, pricingPerMillionOutput: 15.0 },
+            { id: 'claude-haiku-4-5', name: 'Claude Haiku 4.5', contextWindow: 200_000, pricingPerMillionInput: 1.0, pricingPerMillionOutput: 5.0 },
         ],
     },
     {
@@ -69,34 +33,10 @@ export const SUPPORTED_MODELS = [
         baseURL: 'https://generativelanguage.googleapis.com/v1beta/openai/',
         apiKeyEnvVar: 'GEMINI_API_KEY',
         models: [
-            {
-                id: 'gemini-3-flash-preview',
-                name: 'Gemini 3 Flash (Preview)',
-                contextWindow: 1_000_000,
-                pricingPerMillionInput: 0.075,
-                pricingPerMillionOutput: 0.30,
-            },
-            {
-                id: 'gemini-3-pro-preview',
-                name: 'Gemini 3 Pro (Preview)',
-                contextWindow: 1_000_000,
-                pricingPerMillionInput: 1.25,
-                pricingPerMillionOutput: 10.00,
-            },
-            {
-                id: 'gemini-2.5-flash',
-                name: 'Gemini 2.5 Flash',
-                contextWindow: 1_000_000,
-                pricingPerMillionInput: 0.075,
-                pricingPerMillionOutput: 0.30,
-            },
-            {
-                id: 'gemini-2.5-pro',
-                name: 'Gemini 2.5 Pro',
-                contextWindow: 1_000_000,
-                pricingPerMillionInput: 1.25,
-                pricingPerMillionOutput: 10.00,
-            },
+            { id: 'gemini-3-flash-preview', name: 'Gemini 3 Flash (Preview)', contextWindow: 1_000_000, pricingPerMillionInput: 0.075, pricingPerMillionOutput: 0.3 },
+            { id: 'gemini-3-pro-preview', name: 'Gemini 3 Pro (Preview)', contextWindow: 1_000_000, pricingPerMillionInput: 1.25, pricingPerMillionOutput: 10.0 },
+            { id: 'gemini-2.5-flash', name: 'Gemini 2.5 Flash', contextWindow: 1_000_000, pricingPerMillionInput: 0.075, pricingPerMillionOutput: 0.3 },
+            { id: 'gemini-2.5-pro', name: 'Gemini 2.5 Pro', contextWindow: 1_000_000, pricingPerMillionInput: 1.25, pricingPerMillionOutput: 10.0 },
         ],
     },
     {
@@ -105,62 +45,63 @@ export const SUPPORTED_MODELS = [
         baseURL: 'https://api.cerebras.ai/v1',
         apiKeyEnvVar: 'CEREBRAS_API_KEY',
         models: [
-            {
-                id: 'llama-4-scout-17b-16e-instruct',
-                name: 'Llama 4 Scout 17B',
-                contextWindow: 128_000,
-                pricingPerMillionInput: 0.00,
-                pricingPerMillionOutput: 0.00,
-            },
-        ],
-    },
-    {
-        id: 'cloudflare-gateway',
-        name: 'Cloudflare AI Gateway',
-        baseURL: undefined, // Overridden by PROTOAGENT_BASE_URL at runtime
-        apiKeyEnvVar: 'PROTOAGENT_API_KEY',
-        models: [
-            {
-                id: 'claude-opus-4-6',
-                name: 'Claude Opus 4.6 (via CF Gateway)',
-                contextWindow: 200_000,
-                pricingPerMillionInput: 5.00,
-                pricingPerMillionOutput: 25.00,
-            },
-            {
-                id: 'claude-sonnet-4-6',
-                name: 'Claude Sonnet 4.6 (via CF Gateway)',
-                contextWindow: 200_000,
-                pricingPerMillionInput: 3.00,
-                pricingPerMillionOutput: 15.00,
-            },
-            {
-                id: 'gpt-4o',
-                name: 'GPT-4o (via CF Gateway)',
-                contextWindow: 128_000,
-                pricingPerMillionInput: 2.50,
-                pricingPerMillionOutput: 10.00,
-            },
-            {
-                id: 'gemini-2.5-flash',
-                name: 'Gemini 2.5 Flash (via CF Gateway)',
-                contextWindow: 1_000_000,
-                pricingPerMillionInput: 0.075,
-                pricingPerMillionOutput: 0.30,
-            },
+            { id: 'llama-4-scout-17b-16e-instruct', name: 'Llama 4 Scout 17B', contextWindow: 128_000, pricingPerMillionInput: 0.0, pricingPerMillionOutput: 0.0 },
         ],
     },
 ];
-/** Find a provider by ID. */
+function sanitizeDefaultParams(defaultParams) {
+    if (!defaultParams || Object.keys(defaultParams).length === 0)
+        return undefined;
+    return defaultParams;
+}
+function toProviderMap(providers) {
+    return new Map(providers.map((provider) => [provider.id, provider]));
+}
+function mergeModelLists(baseModels, overrideModels) {
+    const merged = new Map(baseModels.map((model) => [model.id, model]));
+    for (const [modelId, override] of Object.entries(overrideModels || {})) {
+        const current = merged.get(modelId);
+        merged.set(modelId, {
+            id: modelId,
+            name: override.name ?? current?.name ?? modelId,
+            contextWindow: override.contextWindow ?? current?.contextWindow ?? 0,
+            pricingPerMillionInput: override.inputPricePerMillion ?? current?.pricingPerMillionInput ?? 0,
+            pricingPerMillionOutput: override.outputPricePerMillion ?? current?.pricingPerMillionOutput ?? 0,
+            defaultParams: sanitizeDefaultParams({
+                ...(current?.defaultParams || {}),
+                ...(override.defaultParams || {}),
+            }),
+        });
+    }
+    return Array.from(merged.values());
+}
+export function getAllProviders() {
+    const runtimeProviders = getRuntimeConfig().providers || {};
+    const mergedProviders = toProviderMap(BUILTIN_PROVIDERS);
+    for (const [providerId, providerConfig] of Object.entries(runtimeProviders)) {
+        const current = mergedProviders.get(providerId);
+        mergedProviders.set(providerId, {
+            id: providerId,
+            name: providerConfig.name ?? current?.name ?? providerId,
+            baseURL: providerConfig.baseURL ?? current?.baseURL,
+            apiKey: providerConfig.apiKey ?? current?.apiKey,
+            apiKeyEnvVar: providerConfig.apiKeyEnvVar ?? current?.apiKeyEnvVar,
+            headers: providerConfig.headers ?? current?.headers,
+            defaultParams: sanitizeDefaultParams({
+                ...(current?.defaultParams || {}),
+                ...(providerConfig.defaultParams || {}),
+            }),
+            models: mergeModelLists(current?.models || [], providerConfig.models),
+        });
+    }
+    return Array.from(mergedProviders.values());
+}
 export function getProvider(providerId) {
-    return SUPPORTED_MODELS.find((p) => p.id === providerId);
+    return getAllProviders().find((provider) => provider.id === providerId);
 }
-/** Find a model's details by provider and model ID. */
 export function getModelDetails(providerId, modelId) {
-    const provider = getProvider(providerId);
-    return provider?.models.find((m) => m.id === modelId);
+    return getProvider(providerId)?.models.find((model) => model.id === modelId);
 }
-/** Get model pricing in per-token format (for cost-tracker). */
 export function getModelPricing(providerId, modelId) {
     const details = getModelDetails(providerId, modelId);
     if (!details)
@@ -171,3 +112,11 @@ export function getModelPricing(providerId, modelId) {
         contextWindow: details.contextWindow,
     };
 }
+export function getRequestDefaultParams(providerId, modelId) {
+    const provider = getProvider(providerId);
+    const model = getModelDetails(providerId, modelId);
+    return {
+        ...(provider?.defaultParams || {}),
+        ...(model?.defaultParams || {}),
+    };
+}

package/dist/runtime-config.js

@@ -0,0 +1,175 @@
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { parse, printParseErrorCode } from 'jsonc-parser';
+import { logger } from './utils/logger.js';
+const RESERVED_DEFAULT_PARAM_KEYS = new Set([
+    'model',
+    'messages',
+    'tools',
+    'tool_choice',
+    'stream',
+    'stream_options',
+]);
+const DEFAULT_RUNTIME_CONFIG = {
+    providers: {},
+    mcp: { servers: {} },
+};
+let runtimeConfigCache = null;
+function getRuntimeConfigPaths() {
+    const homeDir = os.homedir();
+    return [
+        path.join(homeDir, '.config', 'protoagent', 'protoagent.jsonc'),
+        path.join(homeDir, '.protoagent', 'protoagent.jsonc'),
+        path.join(process.cwd(), '.protoagent', 'protoagent.jsonc'),
+    ];
+}
+function isPlainObject(value) {
+    return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+}
+function interpolateString(value, sourcePath) {
+    return value.replace(/\$\{([A-Z0-9_]+)\}/gi, (_match, envVar) => {
+        const resolved = process.env[envVar];
+        if (resolved === undefined) {
+            logger.warn(`Missing environment variable ${envVar} while loading ${sourcePath}`);
+            return '';
+        }
+        return resolved;
+    });
+}
+function interpolateValue(value, sourcePath) {
+    if (typeof value === 'string') {
+        return interpolateString(value, sourcePath);
+    }
+    if (Array.isArray(value)) {
+        return value.map((entry) => interpolateValue(entry, sourcePath));
+    }
+    if (isPlainObject(value)) {
+        const next = {};
+        for (const [key, entry] of Object.entries(value)) {
+            const interpolated = interpolateValue(entry, sourcePath);
+            if (key === 'headers' && isPlainObject(interpolated)) {
+                const filtered = Object.fromEntries(Object.entries(interpolated).filter(([, headerValue]) => typeof headerValue !== 'string' || headerValue.length > 0));
+                next[key] = filtered;
+                continue;
+            }
+            next[key] = interpolated;
+        }
+        return next;
+    }
+    return value;
+}
+function sanitizeDefaultParamsInConfig(config) {
+    const nextProviders = Object.fromEntries(Object.entries(config.providers || {}).map(([providerId, provider]) => {
+        const providerDefaultParams = Object.fromEntries(Object.entries(provider.defaultParams || {}).filter(([key]) => {
+            const allowed = !RESERVED_DEFAULT_PARAM_KEYS.has(key);
+            if (!allowed) {
+                logger.warn(`Ignoring reserved provider default param '${key}' for provider ${providerId}`);
+            }
+            return allowed;
+        }));
+        const nextModels = Object.fromEntries(Object.entries(provider.models || {}).map(([modelId, model]) => {
+            const modelDefaultParams = Object.fromEntries(Object.entries(model.defaultParams || {}).filter(([key]) => {
+                const allowed = !RESERVED_DEFAULT_PARAM_KEYS.has(key);
+                if (!allowed) {
+                    logger.warn(`Ignoring reserved model default param '${key}' for model ${providerId}/${modelId}`);
+                }
+                return allowed;
+            }));
+            return [
+                modelId,
+                {
+                    ...model,
+                    ...(Object.keys(modelDefaultParams).length > 0 ? { defaultParams: modelDefaultParams } : {}),
+                },
+            ];
+        }));
+        return [
+            providerId,
+            {
+                ...provider,
+                ...(Object.keys(providerDefaultParams).length > 0 ? { defaultParams: providerDefaultParams } : {}),
+                models: nextModels,
+            },
+        ];
+    }));
+    return {
+        ...config,
+        providers: nextProviders,
+    };
+}
+function mergeRuntimeConfig(base, overlay) {
+    const mergedProviders = {
+        ...(base.providers || {}),
+    };
+    for (const [providerId, providerConfig] of Object.entries(overlay.providers || {})) {
+        const currentProvider = mergedProviders[providerId] || {};
+        mergedProviders[providerId] = {
+            ...currentProvider,
+            ...providerConfig,
+            models: {
+                ...(currentProvider.models || {}),
+                ...(providerConfig.models || {}),
+            },
+        };
+    }
+    const mergedServers = {
+        ...(base.mcp?.servers || {}),
+    };
+    for (const [serverName, serverConfig] of Object.entries(overlay.mcp?.servers || {})) {
+        const currentServer = mergedServers[serverName];
+        mergedServers[serverName] = currentServer && isPlainObject(currentServer)
+            ? { ...currentServer, ...serverConfig }
+            : serverConfig;
+    }
+    return {
+        providers: mergedProviders,
+        mcp: {
+            servers: mergedServers,
+        },
+    };
+}
+async function readRuntimeConfigFile(configPath) {
+    try {
+        const content = await fs.readFile(configPath, 'utf8');
+        const errors = [];
+        const parsed = parse(content, errors, { allowTrailingComma: true, disallowComments: false });
+        if (errors.length > 0) {
+            const details = errors
+                .map((error) => `${printParseErrorCode(error.error)} at offset ${error.offset}`)
+                .join(', ');
+            throw new Error(`Failed to parse ${configPath}: ${details}`);
+        }
+        if (!isPlainObject(parsed)) {
+            throw new Error(`Failed to parse ${configPath}: top-level value must be an object`);
+        }
+        return sanitizeDefaultParamsInConfig(interpolateValue(parsed, configPath));
+    }
+    catch (error) {
+        if (error?.code === 'ENOENT') {
+            return null;
+        }
+        throw error;
+    }
+}
+export async function loadRuntimeConfig(forceReload = false) {
+    if (!forceReload && runtimeConfigCache) {
+        return runtimeConfigCache;
+    }
+    let merged = DEFAULT_RUNTIME_CONFIG;
+    for (const configPath of getRuntimeConfigPaths()) {
+        const fileConfig = await readRuntimeConfigFile(configPath);
+        if (!fileConfig)
+            continue;
+        logger.debug(`Loaded runtime config`, { path: configPath });
+        merged = mergeRuntimeConfig(merged, fileConfig);
+    }
+    runtimeConfigCache = merged;
+    return merged;
+}
+export function getRuntimeConfig() {
+    return runtimeConfigCache || DEFAULT_RUNTIME_CONFIG;
+}
+export function resetRuntimeConfigForTests() {
+    runtimeConfigCache = null;
+}

package/dist/sub-agent.js

@@ -39,7 +39,7 @@ export const subAgentTool = {
  * Run a sub-agent with its own isolated conversation.
  * Returns the sub-agent's final text response.
  */
-export async function runSubAgent(client, model, task, maxIterations = 30) {
+export async function runSubAgent(client, model, task, maxIterations = 30, requestDefaults = {}) {
     const op = logger.startOperation('sub-agent');
     const subAgentSessionId = `sub-agent-${crypto.randomUUID()}`;
     const systemPrompt = await generateSystemPrompt();
@@ -57,6 +57,7 @@ Do NOT ask the user questions — work autonomously with the tools available.`;
     try {
         for (let i = 0; i < maxIterations; i++) {
             const response = await client.chat.completions.create({
+                ...requestDefaults,
                 model,
                 messages,
                 tools: getAllTools(),

package/dist/utils/compactor.js

@@ -8,6 +8,7 @@
  */
 import { estimateConversationTokens } from './cost-tracker.js';
 import { logger } from './logger.js';
+import { getTodosForSession } from '../tools/todo.js';
 const RECENT_MESSAGES_TO_KEEP = 5;
 function isProtectedSkillMessage(message) {
     return message.role === 'tool' && typeof message.content === 'string' && message.content.includes('<skill_content ');
@@ -29,20 +30,20 @@ Be thorough but concise. Do not lose any information that would be needed to con
  * Compact a conversation if it exceeds the context window threshold.
  * Returns the original messages if compaction isn't needed or fails.
  */
-export async function compactIfNeeded(client, model, messages, contextWindow, currentTokens) {
+export async function compactIfNeeded(client, model, messages, contextWindow, currentTokens, requestDefaults = {}, sessionId) {
     const utilisation = (currentTokens / contextWindow) * 100;
     if (utilisation < 90)
         return messages;
     logger.info(`Compacting conversation (${utilisation.toFixed(1)}% of context window used)`);
     try {
-        return await compactConversation(client, model, messages);
+        return await compactConversation(client, model, messages, requestDefaults, sessionId);
     }
     catch (err) {
         logger.error(`Compaction failed, continuing with original messages: ${err}`);
         return messages;
     }
 }
-async function compactConversation(client, model, messages) {
+async function compactConversation(client, model, messages, _requestDefaults, sessionId) {
     // Separate system message, history to compress, and recent messages
     const systemMessage = messages[0];
     const recentMessages = messages.slice(-RECENT_MESSAGES_TO_KEEP);
@@ -54,13 +55,17 @@ async function compactConversation(client, model, messages) {
         return messages;
     }
     // Build compression request
+    const activeTodos = getTodosForSession(sessionId);
+    const todoReminder = activeTodos.length > 0
+        ? `\n\nActive TODOs:\n${activeTodos.map((todo) => `- [${todo.status}] ${todo.content}`).join('\n')}\n\nThe agent must not stop until the TODO list is fully complete. Preserve that instruction in the summary if work remains.`
+        : '';
     const compressionMessages = [
         { role: 'system', content: COMPRESSION_PROMPT },
         {
             role: 'user',
             content: `Here is the conversation history to compress:\n\n${historyToCompress
                 .map((m) => `[${m.role}]: ${m.content || JSON.stringify(m.tool_calls || '')}`)
-                .join('\n\n')}`,
+                .join('\n\n')}${todoReminder}`,
         },
     ];
     const response = await client.chat.completions.create({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "protoagent",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "type": "module",
   "files": [
     "dist",
@@ -30,6 +30,7 @@
     "html-to-text": "^9.0.5",
     "ink": "^6.7.0",
     "ink-big-text": "^2.0.0",
+    "jsonc-parser": "^3.3.1",
     "openai": "^5.23.1",
     "react": "^19.1.1",
     "turndown": "^7.2.2",