@blockrun/runcode 2.5.2 → 2.5.4

package/dist/agent/commands.js

@@ -12,6 +12,8 @@ import { execSync } from 'node:child_process';
 import { BLOCKRUN_DIR, VERSION } from '../config.js';
 import { estimateHistoryTokens, getAnchoredTokenCount, getContextWindow, resetTokenAnchor } from './tokens.js';
 import { forceCompact } from './compact.js';
+import { getStatsSummary } from '../stats/tracker.js';
+import { resolveModel } from '../ui/model-picker.js';
 import { listSessions, loadSessionHistory, } from '../session/storage.js';
 // ─── Git helpers ──────────────────────────────────────────────────────────
 function gitExec(cmd, cwd, timeout = 5000, maxBuffer) {
@@ -28,7 +30,12 @@ function gitCmd(ctx, cmd, timeout, maxBuffer) {
         return gitExec(cmd, ctx.config.workingDir || process.cwd(), timeout, maxBuffer);
     }
     catch (e) {
-        ctx.onEvent({ kind: 'text_delta', text: `Git error: ${e.message?.split('\n')[0] || 'unknown'}\n` });
+        // Prefer stderr (actual git error message) over the noisy "Command failed: ..." header
+        const errObj = e;
+        const stderr = errObj.stderr ? String(errObj.stderr).trim() : '';
+        // Take only the first meaningful line (git sometimes dumps full usage on errors)
+        const firstLine = (stderr || errObj.message || 'unknown').split('\n')[0].trim();
+        ctx.onEvent({ kind: 'text_delta', text: `Git: ${firstLine}\n` });
         return null;
     }
 }
@@ -41,34 +48,51 @@ const DIRECT_COMMANDS = {
     '/stash': (ctx) => {
         const r = gitCmd(ctx, 'git stash push -m "runcode auto-stash"', 10000);
         if (r !== null)
-            ctx.onEvent({ kind: 'text_delta', text: r || 'No changes to stash.\n' });
+            ctx.onEvent({ kind: 'text_delta', text: r ? `${r}\n` : 'No changes to stash.\n' });
         emitDone(ctx);
     },
     '/unstash': (ctx) => {
         const r = gitCmd(ctx, 'git stash pop', 10000);
         if (r !== null)
-            ctx.onEvent({ kind: 'text_delta', text: r || 'Stash applied.\n' });
+            ctx.onEvent({ kind: 'text_delta', text: r ? `${r}\n` : 'Stash applied.\n' });
         emitDone(ctx);
     },
     '/log': (ctx) => {
         const r = gitCmd(ctx, 'git log --oneline -15 --no-color');
-        ctx.onEvent({ kind: 'text_delta', text: r ? `\`\`\`\n${r}\n\`\`\`\n` : 'No commits or not a git repo.\n' });
+        if (r !== null)
+            ctx.onEvent({ kind: 'text_delta', text: r ? `\`\`\`\n${r}\n\`\`\`\n` : 'No commits yet.\n' });
         emitDone(ctx);
     },
     '/status': (ctx) => {
         const r = gitCmd(ctx, 'git status --short --branch');
-        ctx.onEvent({ kind: 'text_delta', text: r ? `\`\`\`\n${r}\n\`\`\`\n` : 'Not a git repo.\n' });
+        if (r !== null)
+            ctx.onEvent({ kind: 'text_delta', text: r ? `\`\`\`\n${r}\n\`\`\`\n` : 'Working tree clean.\n' });
         emitDone(ctx);
     },
     '/diff': (ctx) => {
-        const r = gitCmd(ctx, 'git diff --stat && echo "---" && git diff', 10000, 512 * 1024);
-        ctx.onEvent({ kind: 'text_delta', text: r ? `\`\`\`diff\n${r}\n\`\`\`\n` : 'No changes.\n' });
+        // git diff with stat header then full diff
+        const stat = gitCmd(ctx, 'git diff --stat --no-color');
+        if (stat === null) {
+            emitDone(ctx);
+            return;
+        }
+        const full = gitCmd(ctx, 'git diff --no-color');
+        if (full === null) {
+            emitDone(ctx);
+            return;
+        }
+        if (!stat && !full) {
+            ctx.onEvent({ kind: 'text_delta', text: 'No unstaged changes.\n' });
+        }
+        else {
+            ctx.onEvent({ kind: 'text_delta', text: `\`\`\`diff\n${[stat, full].filter(Boolean).join('\n---\n')}\n\`\`\`\n` });
+        }
         emitDone(ctx);
     },
     '/undo': (ctx) => {
         const r = gitCmd(ctx, 'git reset --soft HEAD~1');
         if (r !== null)
-            ctx.onEvent({ kind: 'text_delta', text: 'Last commit undone. Changes preserved in staging.\n' });
+            ctx.onEvent({ kind: 'text_delta', text: `Last commit undone. Changes preserved in staging.\n` });
         emitDone(ctx);
     },
     '/tokens': (ctx) => {
@@ -256,6 +280,65 @@ const DIRECT_COMMANDS = {
         }
         emitDone(ctx);
     },
+    '/cost': async (ctx) => {
+        const { stats, saved } = getStatsSummary();
+        ctx.onEvent({ kind: 'text_delta', text: `**Session Cost**\n` +
+                `  Requests: ${stats.totalRequests}\n` +
+                `  Cost:     $${stats.totalCostUsd.toFixed(4)} USDC\n` +
+                `  Saved:    $${saved.toFixed(2)} vs Claude Opus\n` +
+                `  Tokens:   ${stats.totalInputTokens.toLocaleString()} in / ${stats.totalOutputTokens.toLocaleString()} out\n`
+        });
+        emitDone(ctx);
+    },
+    '/wallet': async (ctx) => {
+        const chain = (await import('../config.js')).loadChain();
+        try {
+            let address;
+            let balance;
+            const fetchTimeout = (ms) => new Promise((_, rej) => setTimeout(() => rej(new Error('timeout')), ms));
+            if (chain === 'solana') {
+                const { getOrCreateSolanaWallet, setupAgentSolanaWallet } = await import('@blockrun/llm');
+                const w = await getOrCreateSolanaWallet();
+                address = w.address;
+                try {
+                    const client = await setupAgentSolanaWallet({ silent: true });
+                    const bal = await Promise.race([client.getBalance(), fetchTimeout(5000)]);
+                    balance = `$${bal.toFixed(2)} USDC`;
+                }
+                catch {
+                    balance = '(unavailable)';
+                }
+            }
+            else {
+                const { getOrCreateWallet, setupAgentWallet } = await import('@blockrun/llm');
+                const w = getOrCreateWallet();
+                address = w.address;
+                try {
+                    const client = setupAgentWallet({ silent: true });
+                    const bal = await Promise.race([client.getBalance(), fetchTimeout(5000)]);
+                    balance = `$${bal.toFixed(2)} USDC`;
+                }
+                catch {
+                    balance = '(unavailable)';
+                }
+            }
+            ctx.onEvent({ kind: 'text_delta', text: `**Wallet**\n` +
+                    `  Chain:   ${chain}\n` +
+                    `  Address: ${address}\n` +
+                    `  Balance: ${balance}\n`
+            });
+        }
+        catch (err) {
+            ctx.onEvent({ kind: 'text_delta', text: `Wallet error: ${err.message}\n` });
+        }
+        emitDone(ctx);
+    },
+    '/clear': (ctx) => {
+        ctx.history.length = 0;
+        resetTokenAnchor();
+        ctx.onEvent({ kind: 'text_delta', text: 'Conversation history cleared.\n' });
+        emitDone(ctx);
+    },
     '/compact': async (ctx) => {
         const beforeTokens = estimateHistoryTokens(ctx.history);
         const { history: compacted, compacted: didCompact } = await forceCompact(ctx.history, ctx.config.model, ctx.client, ctx.config.debug);
@@ -263,12 +346,16 @@ const DIRECT_COMMANDS = {
             ctx.history.length = 0;
             ctx.history.push(...compacted);
             resetTokenAnchor();
+            const afterTokens = estimateHistoryTokens(ctx.history);
+            const saved = beforeTokens - afterTokens;
+            const pct = Math.round((saved / beforeTokens) * 100);
+            ctx.onEvent({ kind: 'text_delta', text: `Compacted: ~${beforeTokens.toLocaleString()} → ~${afterTokens.toLocaleString()} tokens (saved ${pct}%)\n`
+            });
+        }
+        else {
+            ctx.onEvent({ kind: 'text_delta', text: `Nothing to compact — history is already minimal (${beforeTokens.toLocaleString()} tokens, ${ctx.history.length} messages).\n`
+            });
         }
-        const afterTokens = estimateHistoryTokens(ctx.history);
-        ctx.onEvent({ kind: 'text_delta', text: didCompact
-                ? `Compacted: ~${beforeTokens.toLocaleString()} → ~${afterTokens.toLocaleString()} tokens\n`
-                : `History too short to compact (${beforeTokens.toLocaleString()} tokens, ${ctx.history.length} messages).\n`
-        });
         emitDone(ctx);
     },
 };
@@ -320,12 +407,28 @@ export async function handleSlashCommand(input, ctx) {
         await DIRECT_COMMANDS[input](ctx);
         return { handled: true };
     }
+    // /model — show current model or switch with /model <name>
+    if (input === '/model' || input.startsWith('/model ')) {
+        if (input === '/model') {
+            ctx.onEvent({ kind: 'text_delta', text: `Current model: **${ctx.config.model}**\n` +
+                    `Switch with: \`/model <name>\` (e.g. \`/model sonnet\`, \`/model free\`, \`/model gemini\`)\n`
+            });
+        }
+        else {
+            const newModel = resolveModel(input.slice(7).trim());
+            ctx.config.model = newModel;
+            ctx.onEvent({ kind: 'text_delta', text: `Model → **${newModel}**\n` });
+        }
+        emitDone(ctx);
+        return { handled: true };
+    }
     // /branch has both no-arg and with-arg forms
     if (input === '/branch' || input.startsWith('/branch ')) {
         const cwd = ctx.config.workingDir || process.cwd();
         if (input === '/branch') {
             const r = gitCmd(ctx, 'git branch -v --no-color');
-            ctx.onEvent({ kind: 'text_delta', text: r ? `\`\`\`\n${r}\n\`\`\`\n` : 'Not a git repo.\n' });
+            if (r !== null)
+                ctx.onEvent({ kind: 'text_delta', text: r ? `\`\`\`\n${r}\n\`\`\`\n` : 'No branches yet.\n' });
         }
         else {
             const branchName = input.slice(8).trim();

package/dist/agent/compact.js

@@ -38,8 +38,16 @@ export async function autoCompactIfNeeded(history, model, client, debug) {
     if (debug) {
         console.error(`[runcode] Auto-compacting: ~${currentTokens} tokens, threshold=${threshold}`);
     }
+    const beforeTokens = estimateHistoryTokens(history);
     try {
         const compacted = await compactHistory(history, model, client, debug);
+        const afterTokens = estimateHistoryTokens(compacted);
+        if (afterTokens >= beforeTokens) {
+            if (debug) {
+                console.error(`[runcode] Auto-compaction grew history (${beforeTokens} → ${afterTokens}) — skipping`);
+            }
+            return { history, compacted: false };
+        }
         return { history: compacted, compacted: true };
     }
     catch (err) {
@@ -58,8 +66,17 @@ export async function forceCompact(history, model, client, debug) {
     if (history.length <= 4) {
         return { history, compacted: false };
     }
+    const beforeTokens = estimateHistoryTokens(history);
     try {
         const compacted = await compactHistory(history, model, client, debug);
+        const afterTokens = estimateHistoryTokens(compacted);
+        // Only accept compaction if it actually reduces tokens
+        if (afterTokens >= beforeTokens) {
+            if (debug) {
+                console.error(`[runcode] Compaction produced larger history (${beforeTokens} → ${afterTokens}) — reverting`);
+            }
+            return { history, compacted: false };
+        }
         return { history: compacted, compacted: true };
     }
     catch (err) {

package/dist/agent/loop.d.ts

@@ -4,11 +4,6 @@
  * Original implementation with different architecture from any reference codebase.
  */
 import type { AgentConfig, Dialogue, StreamEvent } from './types.js';
-/**
- * Run the agent loop.
- * Yields StreamEvents for the UI to render. Returns when the conversation ends.
- */
-export declare function runAgent(config: AgentConfig, initialPrompt: string): AsyncGenerator<StreamEvent, void>;
 /**
  * Run a multi-turn interactive session.
  * Each user message triggers a full agent loop.

package/dist/agent/loop.js

@@ -14,182 +14,6 @@ import { optimizeHistory, CAPPED_MAX_TOKENS, ESCALATED_MAX_TOKENS, getMaxOutputT
 import { recordUsage } from '../stats/tracker.js';
 import { estimateCost } from '../pricing.js';
 import { createSessionId, appendToSession, updateSessionMeta, pruneOldSessions, } from '../session/storage.js';
-// ─── Main Entry Point ──────────────────────────────────────────────────────
-/**
- * Run the agent loop.
- * Yields StreamEvents for the UI to render. Returns when the conversation ends.
- */
-export async function* runAgent(config, initialPrompt) {
-    const client = new ModelClient({
-        apiUrl: config.apiUrl,
-        chain: config.chain,
-        debug: config.debug,
-    });
-    const capabilityMap = new Map();
-    for (const cap of config.capabilities) {
-        capabilityMap.set(cap.spec.name, cap);
-    }
-    const toolDefs = config.capabilities.map((c) => c.spec);
-    const maxTurns = config.maxTurns ?? 100;
-    const workDir = config.workingDir ?? process.cwd();
-    const state = {
-        history: [
-            { role: 'user', content: initialPrompt },
-        ],
-        turnIndex: 0,
-        abort: new AbortController(),
-    };
-    // ─── Reasoning-Action Cycle ────────────────────────────────────────────
-    while (state.turnIndex < maxTurns) {
-        state.turnIndex++;
-        // 1. Call model
-        const { content: responseParts, usage } = await callModel(client, config, state, toolDefs);
-        // Emit usage
-        yield {
-            kind: 'usage',
-            inputTokens: usage.inputTokens,
-            outputTokens: usage.outputTokens,
-            model: config.model,
-        };
-        // 2. Classify response parts
-        const textParts = [];
-        const invocations = [];
-        for (const part of responseParts) {
-            if (part.type === 'text') {
-                textParts.push(part.text);
-                yield { kind: 'text_delta', text: part.text };
-            }
-            else if (part.type === 'tool_use') {
-                invocations.push(part);
-            }
-            else if (part.type === 'thinking') {
-                yield { kind: 'thinking_delta', text: part.thinking };
-            }
-        }
-        // 3. Append assistant response to history
-        state.history.push({
-            role: 'assistant',
-            content: responseParts,
-        });
-        // 4. If no capability invocations, the agent is done
-        if (invocations.length === 0) {
-            yield { kind: 'turn_done', reason: 'completed' };
-            return;
-        }
-        // 5. Execute capabilities
-        const outcomes = await executeCapabilities(invocations, capabilityMap, workDir, state.abort, (evt) => { config.onEvent?.(evt); });
-        // Emit capability results
-        for (const [invocation, result] of outcomes) {
-            yield {
-                kind: 'capability_done',
-                id: invocation.id,
-                result,
-            };
-        }
-        // 6. Append capability outcomes as user message
-        const outcomeContent = outcomes.map(([invocation, result]) => ({
-            type: 'tool_result',
-            tool_use_id: invocation.id,
-            content: result.output,
-            is_error: result.isError,
-        }));
-        state.history.push({
-            role: 'user',
-            content: outcomeContent,
-        });
-        // Continue to next cycle...
-    }
-    yield { kind: 'turn_done', reason: 'max_turns' };
-}
-// ─── Model Call ────────────────────────────────────────────────────────────
-async function callModel(client, config, state, tools) {
-    const systemPrompt = config.systemInstructions.join('\n\n');
-    return client.complete({
-        model: config.model,
-        messages: state.history,
-        system: systemPrompt,
-        tools,
-        max_tokens: 16384,
-        stream: true,
-    }, state.abort.signal);
-}
-// ─── Capability Execution ──────────────────────────────────────────────────
-async function executeCapabilities(invocations, handlers, workDir, abort, emitEvent, permissions) {
-    // Partition into concurrent-safe and sequential
-    const concurrent = [];
-    const sequential = [];
-    for (const inv of invocations) {
-        const handler = handlers.get(inv.name);
-        if (handler?.concurrent) {
-            concurrent.push(inv);
-        }
-        else {
-            sequential.push(inv);
-        }
-    }
-    const results = [];
-    const scope = {
-        workingDir: workDir,
-        abortSignal: abort.signal,
-    };
-    // Run concurrent capabilities in parallel
-    if (concurrent.length > 0) {
-        const batch = concurrent.map(async (inv) => {
-            const result = await checkAndRun(inv, handlers, scope, permissions, emitEvent);
-            return [inv, result];
-        });
-        const batchResults = await Promise.all(batch);
-        results.push(...batchResults);
-    }
-    // Run sequential capabilities one at a time
-    for (const inv of sequential) {
-        const result = await checkAndRun(inv, handlers, scope, permissions, emitEvent);
-        results.push([inv, result]);
-    }
-    return results;
-}
-async function checkAndRun(invocation, handlers, scope, permissions, emitEvent) {
-    // Permission check
-    if (permissions) {
-        const decision = await permissions.check(invocation.name, invocation.input);
-        if (decision.behavior === 'deny') {
-            return {
-                output: `Permission denied for ${invocation.name}: ${decision.reason || 'denied by policy'}`,
-                isError: true,
-            };
-        }
-        if (decision.behavior === 'ask') {
-            const allowed = await permissions.promptUser(invocation.name, invocation.input);
-            if (!allowed) {
-                return {
-                    output: `User denied permission for ${invocation.name}`,
-                    isError: true,
-                };
-            }
-        }
-    }
-    emitEvent({ kind: 'capability_start', id: invocation.id, name: invocation.name });
-    return runSingleCapability(invocation, handlers, scope);
-}
-async function runSingleCapability(invocation, handlers, scope) {
-    const handler = handlers.get(invocation.name);
-    if (!handler) {
-        return {
-            output: `Unknown capability: ${invocation.name}`,
-            isError: true,
-        };
-    }
-    try {
-        return await handler.execute(invocation.input, scope);
-    }
-    catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        return {
-            output: `Error executing ${invocation.name}: ${message}`,
-            isError: true,
-        };
-    }
-}
 // ─── Interactive Session ───────────────────────────────────────────────────
 /**
  * Run a multi-turn interactive session.
@@ -211,6 +35,7 @@ export async function interactiveSession(config, getUserInput, onEvent, onAbortR
     const workDir = config.workingDir ?? process.cwd();
     const permissions = new PermissionManager(config.permissionMode ?? 'default');
     const history = [];
+    let lastUserInput = ''; // For /retry
     // Session persistence
     const sessionId = createSessionId();
     let turnCount = 0;
@@ -224,14 +49,26 @@ export async function interactiveSession(config, getUserInput, onEvent, onAbortR
             continue; // Empty input → re-prompt
         // ── Slash command dispatch ──
         if (input.startsWith('/')) {
-            const cmdResult = await handleSlashCommand(input, {
-                history, config, client, sessionId, onEvent,
-            });
-            if (cmdResult.handled)
-                continue;
-            if (cmdResult.rewritten)
-                input = cmdResult.rewritten;
+            // /retry re-sends the last user message
+            if (input === '/retry') {
+                if (!lastUserInput) {
+                    onEvent({ kind: 'text_delta', text: 'No previous message to retry.\n' });
+                    onEvent({ kind: 'turn_done', reason: 'completed' });
+                    continue;
+                }
+                input = lastUserInput;
+            }
+            else {
+                const cmdResult = await handleSlashCommand(input, {
+                    history, config, client, sessionId, onEvent,
+                });
+                if (cmdResult.handled)
+                    continue;
+                if (cmdResult.rewritten)
+                    input = cmdResult.rewritten;
+            }
         }
+        lastUserInput = input;
         history.push({ role: 'user', content: input });
         appendToSession(sessionId, { role: 'user', content: input });
         turnCount++;

package/dist/tools/askuser.js

@@ -9,6 +9,14 @@ async function execute(input, _ctx) {
     if (!question) {
         return { output: 'Error: question is required', isError: true };
     }
+    // In non-TTY (piped/scripted) mode, creating a new readline would conflict with
+    // the TerminalUI's existing readline. Return a hint for the model to proceed.
+    if (!process.stdin.isTTY) {
+        return {
+            output: `[Non-interactive mode] Cannot prompt user. Proceed with a reasonable assumption. Question was: ${question}`,
+            isError: false,
+        };
+    }
     console.error('');
     console.error(chalk.yellow('  ╭─ Question ────────────────────────────'));
     console.error(chalk.yellow(`  │ ${question}`));
@@ -21,7 +29,7 @@ async function execute(input, _ctx) {
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stderr,
-        terminal: process.stdin.isTTY ?? false,
+        terminal: true,
     });
     return new Promise((resolve) => {
         let answered = false;
@@ -32,7 +40,7 @@ async function execute(input, _ctx) {
         });
         rl.on('close', () => {
             if (!answered)
-                resolve({ output: 'User did not respond (EOF/piped input).', isError: true });
+                resolve({ output: 'User closed input without responding.', isError: false });
         });
     });
 }

package/dist/ui/app.js

@@ -171,8 +171,10 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
                     setStreamText('');
                     setTools(new Map());
                     setTurnTokens({ input: 0, output: 0 });
-                    setStatusMsg('Conversation cleared');
-                    setTimeout(() => setStatusMsg(''), 3000);
+                    setWaiting(true);
+                    setReady(false);
+                    // Pass through to agent loop to clear the actual conversation history
+                    onSubmit('/clear');
                     return;
                 case '/retry':
                     if (!lastPrompt) {
@@ -293,9 +295,9 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
                 }), _jsx(Text, { children: " " })] }));
     }
     // ── Normal Mode ──
-    return (_jsxs(Box, { flexDirection: "column", children: [statusMsg && (_jsx(Box, { marginLeft: 2, children: _jsx(Text, { color: "green", children: statusMsg }) })), showHelp && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, marginTop: 1, marginBottom: 1, children: [_jsx(Text, { bold: true, children: "Commands" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/model" }), " [name]  Switch model (picker if no name)"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/wallet" }), "        Show wallet address & balance"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/cost" }), "          Session cost & savings"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/retry" }), "         Retry the last prompt"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/compact" }), "       Compress conversation history"] }), _jsx(Text, { dimColor: true, children: "  \u2500\u2500 Coding \u2500\u2500" }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/test" }), "          Run tests"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/fix" }), "           Fix last error"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/review" }), "        Code review"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/explain" }), " file  Explain code"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/search" }), " query  Search codebase"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/refactor" }), " desc Refactor code"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/scaffold" }), " desc Generate boilerplate"] }), _jsx(Text, { dimColor: true, children: "  \u2500\u2500 Git \u2500\u2500" }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/commit" }), "        Commit changes"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/push" }), "          Push to remote"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/pr" }), "            Create pull request"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/status" }), "        Git status"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/diff" }), "          Git diff"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/log" }), "           Git log"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/branch" }), " [name] Branches"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/stash" }), "         Stash changes"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/undo" }), "          Undo last commit"] }), _jsx(Text, { dimColor: true, children: "  \u2500\u2500 Analysis \u2500\u2500" }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/security" }), "      Security audit"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/lint" }), "          Quality check"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/optimize" }), "      Performance check"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/todo" }), "          Find TODOs"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/deps" }), "          Dependencies"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/clean" }), "         Dead code removal"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/context" }), "       Session info (model, tokens, mode)"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/plan" }), "          Enter plan mode (read-only tools)"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/execute" }), "       Exit plan mode (enable all tools)"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/sessions" }), "      List saved sessions"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/resume" }), " id     Resume a saved session"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/clear" }), "         Clear conversation display"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/doctor" }), "        Diagnose setup issues"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/help" }), "          This help"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/exit" }), "          Quit"] }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "  Shortcuts: sonnet, opus, gpt, gemini, deepseek, flash, free, r1, o4, nano, mini, haiku" })] })), showWallet && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, marginTop: 1, marginBottom: 1, children: [_jsx(Text, { bold: true, children: "Wallet" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: ["  Chain:   ", _jsx(Text, { color: "magenta", children: chain })] }), _jsxs(Text, { children: ["  Address: ", _jsx(Text, { color: "cyan", children: walletAddress })] }), _jsxs(Text, { children: ["  Balance: ", _jsx(Text, { color: "green", children: balance })] })] })), Array.from(tools.values()).map((tool, i) => (_jsx(Box, { marginLeft: 1, children: tool.done ? (tool.error
+    return (_jsxs(Box, { flexDirection: "column", children: [statusMsg && (_jsx(Box, { marginLeft: 2, children: _jsx(Text, { color: "green", children: statusMsg }) })), showHelp && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, marginTop: 1, marginBottom: 1, children: [_jsx(Text, { bold: true, children: "Commands" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/model" }), " [name]  Switch model (picker if no name)"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/wallet" }), "        Show wallet address & balance"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/cost" }), "          Session cost & savings"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/retry" }), "         Retry the last prompt"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/compact" }), "       Compress conversation history"] }), _jsx(Text, { dimColor: true, children: "  \u2500\u2500 Coding \u2500\u2500" }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/test" }), "          Run tests"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/fix" }), "           Fix last error"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/review" }), "        Code review"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/explain" }), " file  Explain code"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/search" }), " query  Search codebase"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/refactor" }), " desc Refactor code"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/scaffold" }), " desc Generate boilerplate"] }), _jsx(Text, { dimColor: true, children: "  \u2500\u2500 Git \u2500\u2500" }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/commit" }), "        Commit changes"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/push" }), "          Push to remote"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/pr" }), "            Create pull request"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/status" }), "        Git status"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/diff" }), "          Git diff"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/log" }), "           Git log"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/branch" }), " [name] Branches"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/stash" }), "         Stash changes"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/undo" }), "          Undo last commit"] }), _jsx(Text, { dimColor: true, children: "  \u2500\u2500 Analysis \u2500\u2500" }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/security" }), "      Security audit"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/lint" }), "          Quality check"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/optimize" }), "      Performance check"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/todo" }), "          Find TODOs"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/deps" }), "          Dependencies"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/clean" }), "         Dead code removal"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/context" }), "       Session info (model, tokens, mode)"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/plan" }), "          Enter plan mode (read-only tools)"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/execute" }), "       Exit plan mode (enable all tools)"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/sessions" }), "      List saved sessions"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/resume" }), " id     Resume a saved session"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/clear" }), "         Clear conversation display"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/doctor" }), "        Diagnose setup issues"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/help" }), "          This help"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/exit" }), "          Quit"] }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "  Shortcuts: sonnet, opus, gpt, gemini, deepseek, flash, free, r1, o4, nano, mini, haiku" })] })), showWallet && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, marginTop: 1, marginBottom: 1, children: [_jsx(Text, { bold: true, children: "Wallet" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: ["  Chain:   ", _jsx(Text, { color: "magenta", children: chain })] }), _jsxs(Text, { children: ["  Address: ", _jsx(Text, { color: "cyan", children: walletAddress })] }), _jsxs(Text, { children: ["  Balance: ", _jsx(Text, { color: "green", children: balance })] })] })), Array.from(tools.entries()).map(([id, tool]) => (_jsx(Box, { marginLeft: 1, children: tool.done ? (tool.error
                     ? _jsxs(Text, { color: "red", children: ["  \u2717 ", tool.name, " ", _jsxs(Text, { dimColor: true, children: [tool.elapsed, "ms"] })] })
-                    : _jsxs(Text, { color: "green", children: ["  \u2713 ", tool.name, " ", _jsxs(Text, { dimColor: true, children: [tool.elapsed, "ms \u2014 ", tool.preview.slice(0, 200), tool.preview.length > 200 ? '...' : ''] })] })) : (_jsxs(Text, { color: "cyan", children: ["  ", _jsx(Spinner, { type: "dots" }), " ", tool.name, "... ", _jsx(Text, { dimColor: true, children: (() => { const s = Math.round((Date.now() - tool.startTime) / 1000); return s > 0 ? `${s}s` : ''; })() })] })) }, i))), thinking && (_jsxs(Box, { flexDirection: "column", marginLeft: 1, children: [_jsxs(Text, { color: "magenta", children: ["  ", _jsx(Spinner, { type: "dots" }), " thinking..."] }), thinkingText && (_jsxs(Text, { dimColor: true, wrap: "truncate-end", children: ["  ", thinkingText.split('\n').pop()?.slice(0, 80)] }))] })), waiting && !thinking && tools.size === 0 && (_jsx(Box, { marginLeft: 1, children: _jsxs(Text, { color: "yellow", children: ["  ", _jsx(Spinner, { type: "dots" }), " ", _jsx(Text, { dimColor: true, children: currentModel })] }) })), streamText && (_jsx(Box, { marginTop: 0, marginBottom: 0, children: _jsx(Text, { children: streamText }) })), ready && (turnTokens.input > 0 || turnTokens.output > 0) && streamText && (_jsx(Box, { marginLeft: 1, marginTop: 0, children: _jsxs(Text, { dimColor: true, children: [turnTokens.input.toLocaleString(), " in / ", turnTokens.output.toLocaleString(), " out", totalCost > 0 ? `  ·  $${totalCost.toFixed(4)} session` : ''] }) })), ready && (_jsx(InputBox, { input: input, setInput: setInput, onSubmit: handleSubmit, model: currentModel, balance: balance, focused: mode === 'input' }))] }));
+                    : _jsxs(Text, { color: "green", children: ["  \u2713 ", tool.name, " ", _jsxs(Text, { dimColor: true, children: [tool.elapsed, "ms \u2014 ", tool.preview.slice(0, 200), tool.preview.length > 200 ? '...' : ''] })] })) : (_jsxs(Text, { color: "cyan", children: ["  ", _jsx(Spinner, { type: "dots" }), " ", tool.name, "... ", _jsx(Text, { dimColor: true, children: (() => { const s = Math.round((Date.now() - tool.startTime) / 1000); return s > 0 ? `${s}s` : ''; })() })] })) }, id))), thinking && (_jsxs(Box, { flexDirection: "column", marginLeft: 1, children: [_jsxs(Text, { color: "magenta", children: ["  ", _jsx(Spinner, { type: "dots" }), " thinking..."] }), thinkingText && (_jsxs(Text, { dimColor: true, wrap: "truncate-end", children: ["  ", thinkingText.split('\n').pop()?.slice(0, 80)] }))] })), waiting && !thinking && tools.size === 0 && (_jsx(Box, { marginLeft: 1, children: _jsxs(Text, { color: "yellow", children: ["  ", _jsx(Spinner, { type: "dots" }), " ", _jsx(Text, { dimColor: true, children: currentModel })] }) })), streamText && (_jsx(Box, { marginTop: 0, marginBottom: 0, children: _jsx(Text, { children: streamText }) })), ready && (turnTokens.input > 0 || turnTokens.output > 0) && streamText && (_jsx(Box, { marginLeft: 1, marginTop: 0, children: _jsxs(Text, { dimColor: true, children: [turnTokens.input.toLocaleString(), " in / ", turnTokens.output.toLocaleString(), " out", totalCost > 0 ? `  ·  $${totalCost.toFixed(4)} session` : ''] }) })), ready && (_jsx(InputBox, { input: input, setInput: setInput, onSubmit: handleSubmit, model: currentModel, balance: balance, focused: mode === 'input' }))] }));
 }
 export function launchInkUI(opts) {
     let resolveInput = null;

package/dist/ui/terminal.d.ts

@@ -9,6 +9,7 @@ export declare class TerminalUI {
     private activeCapabilities;
     private totalInputTokens;
     private totalOutputTokens;
+    private sessionModel;
     private mdRenderer;
     private lineQueue;
     private lineWaiters;

package/dist/ui/terminal.js

@@ -5,6 +5,7 @@
  */
 import readline from 'node:readline';
 import chalk from 'chalk';
+import { estimateCost } from '../pricing.js';
 // ─── Spinner ───────────────────────────────────────────────────────────────
 const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 class Spinner {
@@ -130,6 +131,7 @@ export class TerminalUI {
     activeCapabilities = new Map();
     totalInputTokens = 0;
     totalOutputTokens = 0;
+    sessionModel = '';
     mdRenderer = new MarkdownRenderer();
     // Line queue for piped (non-TTY) input — buffers all stdin lines eagerly
     lineQueue = [];
@@ -154,7 +156,9 @@ export class TerminalUI {
         });
         rl.on('close', () => {
             this.stdinEOF = true;
-            this.lineQueue = []; // Don't deliver buffered lines after EOF — signal exit cleanly
+            // Keep lineQueue intact — buffered lines should still drain before signaling EOF.
+            // If there are active waiters, queue is already empty (nextLine checks queue first),
+            // so it's safe to resolve them with null now.
             for (const waiter of this.lineWaiters)
                 waiter(null);
             this.lineWaiters = [];
@@ -267,6 +271,8 @@ export class TerminalUI {
             case 'usage':
                 this.totalInputTokens += event.inputTokens;
                 this.totalOutputTokens += event.outputTokens;
+                if (event.model)
+                    this.sessionModel = event.model;
                 break;
             case 'turn_done': {
                 this.spinner.stop();
@@ -293,9 +299,14 @@ export class TerminalUI {
         const cmd = parts[0].toLowerCase();
         switch (cmd) {
             case '/cost':
-            case '/usage':
-                console.error(chalk.dim(`\n  Tokens: ${this.totalInputTokens.toLocaleString()} in / ${this.totalOutputTokens.toLocaleString()} out\n`));
+            case '/usage': {
+                const cost = this.sessionModel
+                    ? estimateCost(this.sessionModel, this.totalInputTokens, this.totalOutputTokens)
+                    : 0;
+                const costStr = cost > 0 ? `  ·  $${cost.toFixed(4)} USDC` : '';
+                console.error(chalk.dim(`\n  Tokens: ${this.totalInputTokens.toLocaleString()} in / ${this.totalOutputTokens.toLocaleString()} out${costStr}\n`));
                 return true;
+            }
             default:
                 // All other slash commands pass through to the agent loop (commands.ts handles them)
                 return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blockrun/runcode",
-  "version": "2.5.2",
+  "version": "2.5.4",
   "description": "RunCode — AI coding agent powered by 41+ models. Pay per use with USDC.",
   "type": "module",
   "bin": {