protoagent 0.1.9 → 0.1.11

package/README.md

@@ -61,7 +61,6 @@ protoagent init --project --force
 ## Interactive Commands
 
 - `/help` — Show available slash commands
-- `/clear` — Start a fresh conversation in a new session
 - `/collapse` — Collapse long system and tool output
 - `/expand` — Expand collapsed messages
 - `/quit` or `/exit` — Save and exit

package/dist/App.js

@@ -43,8 +43,7 @@ Here's how the terminal UI is laid out (showcasing all options at once for demon
 ├─────────────────────────────────────────┤
 │  tokens: 1234↓ 56↑ | ctx: 12% | $0.02   │  static-ish, updates after each turn
 ├─────────────────────────────────────────┤
-│  /clear — Clear conversation...         │  dynamic, shown when typing /
-│  /quit  — Exit ProtoAgent               │
+│  /quit  — Exit ProtoAgent               │  dynamic, shown when typing /
 ├─────────────────────────────────────────┤
 │  ⠹ Running read_file...                 │  dynamic, shown while loading
 ├─────────────────────────────────────────┤
@@ -59,17 +58,17 @@ Here's how the terminal UI is laid out (showcasing all options at once for demon
 import { useState, useEffect, useCallback, useRef } from 'react';
 import { Box, Text, Static, useApp, useInput, useStdout } from 'ink';
 import { LeftBar } from './components/LeftBar.js';
-import { TextInput, Select, PasswordInput } from '@inkjs/ui';
+import { TextInput, Select } from '@inkjs/ui';
 import { OpenAI } from 'openai';
-import { readConfig, writeConfig, resolveApiKey } from './config.js';
-import { loadRuntimeConfig } from './runtime-config.js';
-import { getAllProviders, getProvider, getModelPricing, getRequestDefaultParams } from './providers.js';
+import { readConfig, writeConfig, writeInitConfig, resolveApiKey, TargetSelection, ModelSelection, ApiKeyInput } from './config.js';
+import { loadRuntimeConfig, getActiveRuntimeConfigPath } from './runtime-config.js';
+import { getProvider, getModelPricing, getRequestDefaultParams } from './providers.js';
 import { runAgenticLoop, initializeMessages, } from './agentic-loop.js';
-import { setDangerouslyAcceptAll, setApprovalHandler, clearApprovalHandler } from './tools/index.js';
+import { setDangerouslySkipPermissions, setApprovalHandler, clearApprovalHandler } from './tools/index.js';
 import { setLogLevel, LogLevel, initLogFile, logger } from './utils/logger.js';
 import { createSession, ensureSystemPromptAtTop, saveSession, loadSession, generateTitle, } from './sessions.js';
 import { clearTodos, getTodosForSession, setTodosForSession } from './tools/todo.js';
-import { initializeMcp, closeMcp } from './mcp.js';
+import { initializeMcp, closeMcp, getConnectedMcpServers } from './mcp.js';
 import { generateSystemPrompt } from './system-prompt.js';
 // ─── Scrollback helpers ───
 // These functions append text to the permanent scrollback buffer via the
@@ -84,16 +83,25 @@ function printBanner(addStatic) {
         '',
     ].join('\n'));
 }
-function printRuntimeHeader(addStatic, config, session, logFilePath, dangerouslyAcceptAll) {
+function printRuntimeHeader(addStatic, config, session, dangerouslySkipPermissions) {
     const provider = getProvider(config.provider);
     let line = `Model: ${provider?.name || config.provider} / ${config.model}`;
-    if (dangerouslyAcceptAll)
+    if (dangerouslySkipPermissions)
         line += ' (auto-approve all)';
     if (session)
-        line += ` | Session: ${session.id.slice(0, 8)}`;
-    let text = `${line}\n`;
+        line += ` | Session: ${session.id}`;
+    let text = `\x1b[2m${line}\x1b[0m\n`;
+    const logFilePath = logger.getLogFilePath();
     if (logFilePath) {
-        text += `Debug logs: ${logFilePath}\n`;
+        text += `\x1b[2mDebug logs: ${logFilePath}\x1b[0m\n`;
+    }
+    const configPath = getActiveRuntimeConfigPath();
+    if (configPath) {
+        text += `\x1b[2mConfig file: ${configPath}\x1b[0m\n`;
+    }
+    const mcpServers = getConnectedMcpServers();
+    if (mcpServers.length > 0) {
+        text += `\x1b[2mMCPs: ${mcpServers.join(', ')}\x1b[0m\n`;
     }
     text += '\n';
     addStatic(text);
@@ -119,6 +127,63 @@ function printMessageToScrollback(addStatic, role, text) {
     }
     addStatic(`${normalized}\n\n`);
 }
+/**
+ * Format a sub-agent tool call into a human-readable activity string.
+ * Shows what the sub-agent is actually doing, e.g. "Sub-agent reading file package.json"
+ */
+function formatSubAgentActivity(tool, args) {
+    if (!args || typeof args !== 'object') {
+        return `Sub-agent running ${tool}...`;
+    }
+    const argEntries = Object.entries(args);
+    if (argEntries.length === 0) {
+        return `Sub-agent running ${tool}...`;
+    }
+    // Extract the most meaningful argument based on the tool
+    let detail = '';
+    const firstValue = argEntries[0]?.[1];
+    switch (tool) {
+        case 'read_file':
+            detail = typeof args.file_path === 'string' ? args.file_path : '';
+            break;
+        case 'write_file':
+            detail = typeof args.file_path === 'string' ? args.file_path : '';
+            break;
+        case 'edit_file':
+            detail = typeof args.file_path === 'string' ? args.file_path : '';
+            break;
+        case 'list_directory':
+            detail = typeof args.directory_path === 'string' ? args.directory_path : '(current)';
+            break;
+        case 'search_files':
+            detail = typeof args.search_term === 'string' ? `"${args.search_term}"` : '';
+            break;
+        case 'bash':
+            detail = typeof args.command === 'string'
+                ? args.command.split(/\s+/).slice(0, 3).join(' ') + (args.command.split(/\s+/).length > 3 ? '...' : '')
+                : '';
+            break;
+        case 'todo_write':
+            detail = Array.isArray(args.todos) ? `${args.todos.length} task(s)` : '';
+            break;
+        case 'webfetch':
+            detail = typeof args.url === 'string' ? new URL(args.url).hostname : '';
+            break;
+        case 'sub_agent':
+            // Nested sub-agent
+            detail = 'nested task...';
+            break;
+        default:
+            // Use the first argument value as fallback
+            detail = typeof firstValue === 'string'
+                ? firstValue.length > 30 ? firstValue.slice(0, 30) + '...' : firstValue
+                : '';
+    }
+    if (detail) {
+        return `Sub-agent ${tool.replace(/_/g, ' ')}: ${detail}`;
+    }
+    return `Sub-agent running ${tool}...`;
+}
 function replayMessagesToScrollback(addStatic, messages) {
     for (const message of messages) {
         const msgAny = message;
@@ -154,7 +219,6 @@ function clipToRows(text, terminalRows) {
 }
 // ─── Available slash commands ───
 const SLASH_COMMANDS = [
-    { name: '/clear', description: 'Clear conversation and start fresh' },
     { name: '/help', description: 'Show all available commands' },
     { name: '/quit', description: 'Exit ProtoAgent' },
     { name: '/exit', description: 'Alias for /quit' },
@@ -162,7 +226,6 @@ const SLASH_COMMANDS = [
 const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 const HELP_TEXT = [
     'Commands:',
-    '  /clear  - Clear conversation and start fresh',
     '  /help   - Show this help',
     '  /quit   - Exit ProtoAgent',
     '  /exit   - Alias for /quit',
@@ -234,44 +297,37 @@ const ApprovalPrompt = ({ request, onRespond }) => {
 const UsageDisplay = ({ usage, totalCost }) => {
     if (!usage && totalCost === 0)
         return null;
-    return (_jsxs(Box, { marginTop: 1, children: [usage && (_jsxs(Box, { children: [_jsxs(Box, { backgroundColor: "#064e3b", paddingX: 1, children: [_jsx(Text, { color: "black", children: "tokens: " }), _jsxs(Text, { color: "black", bold: true, children: [usage.inputTokens, "\u2193 ", usage.outputTokens, "\u2191"] })] }), _jsxs(Box, { backgroundColor: "#065f46", paddingX: 1, children: [_jsx(Text, { color: "black", children: "ctx: " }), _jsxs(Text, { color: "black", bold: true, children: [usage.contextPercent.toFixed(0), "%"] })] })] })), totalCost > 0 && (_jsxs(Box, { backgroundColor: "#064e3b", paddingX: 1, children: [_jsx(Text, { color: "black", children: "cost: " }), _jsxs(Text, { color: "black", bold: true, children: ["$", totalCost.toFixed(4)] })] }))] }));
+    return (_jsxs(Box, { marginTop: 1, children: [usage && (_jsxs(Box, { children: [_jsxs(Box, { backgroundColor: "#064e3b", paddingX: 1, children: [_jsx(Text, { color: "white", children: "tokens: " }), _jsxs(Text, { color: "white", bold: true, children: [usage.inputTokens, "\u2193 ", usage.outputTokens, "\u2191"] })] }), _jsxs(Box, { backgroundColor: "#065f46", paddingX: 1, children: [_jsx(Text, { color: "white", children: "ctx: " }), _jsxs(Text, { color: "white", bold: true, children: [usage.contextPercent.toFixed(0), "%"] })] })] })), totalCost > 0 && (_jsxs(Box, { backgroundColor: "#064e3b", paddingX: 1, children: [_jsx(Text, { color: "black", children: "cost: " }), _jsxs(Text, { color: "black", bold: true, children: ["$", totalCost.toFixed(4)] })] }))] }));
 };
 /** Inline setup wizard — shown when no config exists. */
 const InlineSetup = ({ onComplete }) => {
-    const [setupStep, setSetupStep] = useState('provider');
+    const [setupStep, setSetupStep] = useState('target');
+    const [target, setTarget] = useState('project');
     const [selectedProviderId, setSelectedProviderId] = useState('');
     const [selectedModelId, setSelectedModelId] = useState('');
-    const [apiKeyError, setApiKeyError] = useState('');
-    const providerItems = getAllProviders().flatMap((provider) => provider.models.map((model) => ({
-        label: `${provider.name} - ${model.name}`,
-        value: `${provider.id}:::${model.id}`,
-    })));
+    const handleModelSelect = (providerId, modelId) => {
+        setSelectedProviderId(providerId);
+        setSelectedModelId(modelId);
+        setSetupStep('api_key');
+    };
+    const handleConfigComplete = (config) => {
+        writeInitConfig(target);
+        writeConfig(config, target);
+        onComplete(config);
+    };
+    if (setupStep === 'target') {
+        return (_jsx(Box, { marginTop: 1, children: _jsx(TargetSelection, { title: "First-time setup", subtitle: "Create a ProtoAgent runtime config:", onSelect: (value) => {
+                    setTarget(value);
+                    setSetupStep('provider');
+                } }) }));
+    }
     if (setupStep === 'provider') {
-        return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: "yellow", bold: true, children: "First-time setup" }), _jsx(Text, { dimColor: true, children: "Select a provider and model:" }), _jsx(Box, { marginTop: 1, children: _jsx(Select, { options: providerItems.map((item) => ({ value: item.value, label: item.label })), onChange: (value) => {
-                            const [providerId, modelId] = value.split(':::');
-                            setSelectedProviderId(providerId);
-                            setSelectedModelId(modelId);
-                            setSetupStep('api_key');
-                        } }) })] }));
+        return (_jsx(Box, { marginTop: 1, children: _jsx(ModelSelection, { setSelectedProviderId: setSelectedProviderId, setSelectedModelId: setSelectedModelId, onSelect: handleModelSelect, title: "First-time setup" }) }));
     }
-    const provider = getProvider(selectedProviderId);
-    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,
-                        ...(value.trim().length > 0 ? { apiKey: value.trim() } : {}),
-                    };
-                    writeConfig(newConfig, 'project');
-                    onComplete(newConfig);
-                } })] }));
+    return (_jsx(Box, { marginTop: 1, children: _jsx(ApiKeyInput, { selectedProviderId: selectedProviderId, selectedModelId: selectedModelId, target: target, title: "First-time setup", showProviderHeaders: false, onComplete: handleConfigComplete }) }));
 };
 // ─── Main App ───
-export const App = ({ dangerouslyAcceptAll = false, logLevel, sessionId, }) => {
+export const App = ({ dangerouslySkipPermissions = false, logLevel, sessionId, }) => {
     const { exit } = useApp();
     const { stdout } = useStdout();
     const terminalRows = stdout?.rows ?? 24;
@@ -309,7 +365,6 @@ export const App = ({ dangerouslyAcceptAll = false, logLevel, sessionId, }) => {
     const [threadErrors, setThreadErrors] = useState([]);
     const [initialized, setInitialized] = useState(false);
     const [needsSetup, setNeedsSetup] = useState(false);
-    const [logFilePath, setLogFilePath] = useState(null);
     // Input reset key — incremented on submit to force TextInput remount and clear
     const [inputResetKey, setInputResetKey] = useState(0);
     // Approval state
@@ -331,7 +386,6 @@ export const App = ({ dangerouslyAcceptAll = false, logLevel, sessionId, }) => {
     const abortControllerRef = useRef(null);
     const didPrintIntroRef = useRef(false);
     const printedThreadErrorIdsRef = useRef(new Set());
-    const printedLogPathRef = useRef(null);
     // ─── Post-config initialization (reused after inline setup) ───
     const initializeWithConfig = useCallback(async (loadedConfig) => {
         setConfig(loadedConfig);
@@ -350,7 +404,7 @@ export const App = ({ dangerouslyAcceptAll = false, logLevel, sessionId, }) => {
                 setCompletionMessages(loadedSession.completionMessages);
                 if (!didPrintIntroRef.current) {
                     printBanner(addStatic);
-                    printRuntimeHeader(addStatic, loadedConfig, loadedSession, logFilePath, dangerouslyAcceptAll);
+                    printRuntimeHeader(addStatic, loadedConfig, loadedSession, dangerouslySkipPermissions);
                     replayMessagesToScrollback(addStatic, loadedSession.completionMessages);
                     didPrintIntroRef.current = true;
                 }
@@ -369,13 +423,13 @@ export const App = ({ dangerouslyAcceptAll = false, logLevel, sessionId, }) => {
             setSession(newSession);
             if (!didPrintIntroRef.current) {
                 printBanner(addStatic);
-                printRuntimeHeader(addStatic, loadedConfig, newSession, logFilePath, dangerouslyAcceptAll);
+                printRuntimeHeader(addStatic, loadedConfig, newSession, dangerouslySkipPermissions);
                 didPrintIntroRef.current = true;
             }
         }
         setNeedsSetup(false);
         setInitialized(true);
-    }, [dangerouslyAcceptAll, logFilePath, sessionId, addStatic]);
+    }, [dangerouslySkipPermissions, sessionId, addStatic]);
     // ─── Initialization ───
     useEffect(() => {
         if (!loading) {
@@ -392,13 +446,6 @@ export const App = ({ dangerouslyAcceptAll = false, logLevel, sessionId, }) => {
             addStatic(`\x1b[31mError: ${error}\x1b[0m\n\n`);
         }
     }, [error, addStatic]);
-    useEffect(() => {
-        if (!didPrintIntroRef.current || !logFilePath || printedLogPathRef.current === logFilePath) {
-            return;
-        }
-        printedLogPathRef.current = logFilePath;
-        addStatic(`Debug logs: ${logFilePath}\n\n`);
-    }, [logFilePath, addStatic]);
     useEffect(() => {
         for (const threadError of threadErrors) {
             if (threadError.transient || printedThreadErrorIdsRef.current.has(threadError.id)) {
@@ -415,15 +462,14 @@ export const App = ({ dangerouslyAcceptAll = false, logLevel, sessionId, }) => {
                 const level = LogLevel[logLevel.toUpperCase()];
                 if (level !== undefined) {
                     setLogLevel(level);
-                    const logPath = initLogFile();
-                    setLogFilePath(logPath);
+                    initLogFile();
                     logger.info(`ProtoAgent started with log level: ${logLevel}`);
-                    logger.info(`Log file: ${logPath}`);
+                    logger.info(`Log file: ${logger.getLogFilePath()}`);
                 }
             }
             // Set global approval mode
-            if (dangerouslyAcceptAll) {
-                setDangerouslyAcceptAll(true);
+            if (dangerouslySkipPermissions) {
+                setDangerouslySkipPermissions(true);
             }
             // Register interactive approval handler
             setApprovalHandler(async (req) => {
@@ -477,23 +523,6 @@ export const App = ({ dangerouslyAcceptAll = false, logLevel, sessionId, }) => {
                     setError(`Failed to save session before exit: ${err.message}`);
                 }
                 return true;
-            case '/clear':
-                // Re-initialize messages with just the system prompt
-                initializeMessages().then((msgs) => {
-                    setCompletionMessages(msgs);
-                    setHelpMessage(null);
-                    setLastUsage(null);
-                    setTotalCost(0);
-                    setThreadErrors([]);
-                    if (session) {
-                        const newSession = createSession(config.model, config.provider);
-                        clearTodos(session.id);
-                        clearTodos(newSession.id);
-                        newSession.completionMessages = msgs;
-                        setSession(newSession);
-                    }
-                });
-                return true;
             case '/expand':
             case '/collapse':
                 // expand/collapse removed — transcript lives in scrollback
@@ -566,14 +595,18 @@ export const App = ({ dangerouslyAcceptAll = false, logLevel, sessionId, }) => {
                     }
                     case 'sub_agent_iteration':
                         if (event.subAgentTool) {
-                            const { tool, status } = event.subAgentTool;
+                            const { tool, status, args } = event.subAgentTool;
                             if (status === 'running') {
-                                setActiveTool(`sub_agent → ${tool}`);
+                                setActiveTool(formatSubAgentActivity(tool, args));
                             }
                             else {
                                 setActiveTool(null);
                             }
                         }
+                        // Handle sub-agent usage update
+                        if (event.subAgentUsage) {
+                            setTotalCost((prev) => prev + event.subAgentUsage.cost);
+                        }
                         break;
                     case 'tool_call':
                         if (event.toolCall) {
@@ -770,7 +803,7 @@ export const App = ({ dangerouslyAcceptAll = false, logLevel, sessionId, }) => {
                     initializeWithConfig(newConfig).catch((err) => {
                         setError(`Initialization failed: ${err.message}`);
                     });
-                } })), isStreaming && (_jsxs(Text, { wrap: "wrap", children: [clipToRows(streamingText, terminalRows), _jsx(Text, { dimColor: true, children: "\u258D" })] })), threadErrors.filter((threadError) => threadError.transient).map((threadError) => (_jsx(LeftBar, { color: "red", marginBottom: 1, children: _jsxs(Text, { color: "red", children: ["Error: ", threadError.message] }) }, `thread-error-${threadError.id}`))), pendingApproval && (_jsx(ApprovalPrompt, { request: pendingApproval.request, onRespond: (response) => {
+                } })), isStreaming && (_jsxs(Text, { wrap: "wrap", children: [clipToRows(streamingText, terminalRows), _jsx(Text, { dimColor: true, children: "\u258D" })] })), threadErrors.filter((threadError) => threadError.transient).map((threadError) => (_jsx(LeftBar, { color: "gray", marginBottom: 1, children: _jsx(Text, { color: "gray", children: threadError.message }) }, `thread-error-${threadError.id}`))), pendingApproval && (_jsx(ApprovalPrompt, { request: pendingApproval.request, onRespond: (response) => {
                     pendingApproval.resolve(response);
                     setPendingApproval(null);
                 } })), initialized && !pendingApproval && loading && !isStreaming && (_jsx(Box, { children: _jsxs(Text, { color: "green", bold: true, children: [SPINNER_FRAMES[spinnerFrame], ' ', activeTool ? `Running ${activeTool}...` : 'Working...'] }) })), initialized && !pendingApproval && inputText.startsWith('/') && (_jsx(CommandFilter, { inputText: inputText })), _jsx(UsageDisplay, { usage: lastUsage ?? null, totalCost: totalCost }), initialized && !pendingApproval && (_jsx(Box, { children: _jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 2, flexShrink: 0, children: _jsx(Text, { color: "green", bold: true, children: '>' }) }), _jsx(Box, { flexGrow: 1, minWidth: 10, children: _jsx(TextInput, { defaultValue: inputText, onChange: setInputText, placeholder: "Type your message... (/help for commands)", onSubmit: handleSubmit }, inputResetKey) })] }) })), quittingSession && (_jsxs(Box, { flexDirection: "column", marginTop: 1, paddingX: 1, marginBottom: 1, children: [_jsx(Text, { dimColor: true, children: "Session saved. Resume with:" }), _jsxs(Text, { color: "green", children: ["protoagent --session ", quittingSession.id] })] }))] }));