@blockrun/franklin 3.5.0 → 3.6.1

package/README.md

@@ -121,31 +121,20 @@ Franklin is **chat-first**. You do not wire a DAG, configure six API keys, or co
 
 Live data from CoinGecko. RSI, MACD, Bollinger, and volatility computed locally. No API key needed.
 
-### 🎯 Social growth
+### 🎨 Image generation
 
 ```text
-> find X posts complaining about AI rate limits
+> generate a logo for my AI startup — minimalist, dark background
 
-  ✓ SearchX  "AI rate limits"
-
-  Found 8 candidates:
-  1. "Claude keeps throttling me in the middle of shipping..." — @buildermax (2h)
-  2. "I need an agent that can switch models automatically." — @indiedev (5h)
-  ...
-
-> write a reply to #2 — mention Franklin uses a wallet instead of subscriptions
-
-  Draft:
-  "That was my pain too. Franklin routes across 55+ models,
-   pays per action from a USDC wallet, and doesn't trap you
-   inside a monthly seat. Better economics, better uptime."
+  ✓ ImageGen  "minimalist AI startup logo, dark background..."
+  Saved: generated-logo-1713052800.png (1024x1024)
+```
 
-> looks good, post it
+Generates images via DALL-E / GPT Image directly from the CLI. Paid from your wallet — no OpenAI API key needed.
 
-  ✓ PostToX  Reply posted to x.com/indiedev/status/...
-```
+### 🎯 Social growth (with setup)
 
-Search X, generate contextual replies, and post with confirmation. Uses Playwright for browser automation, so there is no X API key, no OAuth maze, and no $100/month developer account.
+After running `franklin social setup && franklin social login x`, Franklin can search X, draft replies, and post with your confirmation — no X API key or developer account needed.
 
 ### 🔎 Research, code, anything with a budget
 
@@ -286,8 +275,8 @@ Franklin can decide what is worth paying for, route the call, sign the micropaym
 **📈 Trading signals**
 Ask "what's BTC looking like?" — Franklin fetches live price data, computes RSI/MACD/Bollinger/volatility, and synthesizes a signal.
 
-**🎯 Social growth**
-Ask "find X posts about my category" — Franklin searches X, drafts replies, and posts with your confirmation.
+**🎨 AI image generation**
+Ask "generate a logo" — Franklin calls DALL-E / GPT Image, saves the result locally, paid from your wallet.
 
 **🧠 55+ models via one wallet**
 Anthropic, OpenAI, Google, xAI, DeepSeek, GLM, Kimi, Minimax, NVIDIA free tier. One wallet, one interface, automatic fallback.

package/dist/agent/streaming-executor.js

@@ -174,6 +174,38 @@ export class StreamingExecutor {
             }
             : this.scope;
         try {
+            // Runtime input validation: check required fields and types
+            const schema = handler.spec.input_schema;
+            if (schema?.required) {
+                for (const field of schema.required) {
+                    if (invocation.input[field] === undefined || invocation.input[field] === null) {
+                        const desc = schema.properties?.[field]?.description || '';
+                        return {
+                            output: `Error: missing required parameter "${field}" for ${handler.spec.name}. ${desc}`,
+                            isError: true,
+                        };
+                    }
+                }
+            }
+            // Type coercion for common model mistakes (string↔number, string↔boolean)
+            if (schema?.properties) {
+                for (const [key, value] of Object.entries(invocation.input)) {
+                    if (value == null)
+                        continue;
+                    const prop = schema.properties[key];
+                    if (!prop?.type)
+                        continue;
+                    if (prop.type === 'number' && typeof value === 'string' && !isNaN(Number(value))) {
+                        invocation.input[key] = Number(value);
+                    }
+                    else if (prop.type === 'boolean' && typeof value === 'string') {
+                        if (value === 'true')
+                            invocation.input[key] = true;
+                        else if (value === 'false')
+                            invocation.input[key] = false;
+                    }
+                }
+            }
             let result = await handler.execute(invocation.input, progressScope);
             this.guard?.afterExecute(invocation, result);
             // Persist large results to disk with preview (inspired by Claude Code toolResultStorage)

package/dist/agent/types.d.ts

@@ -51,6 +51,15 @@ export interface CapabilityHandler {
 export interface CapabilityResult {
     output: string;
     isError?: boolean;
+    /** Structured diff for Edit tool — enables colored diff display in UI. */
+    diff?: {
+        file: string;
+        oldLines: string[];
+        newLines: string[];
+        count: number;
+    };
+    /** Full tool output for expandable display — separate from truncated preview. */
+    fullOutput?: string;
 }
 export interface ExecutionScope {
     workingDir: string;

package/dist/commands/start.js

@@ -74,10 +74,9 @@ export async function startCommand(options) {
     // After the user's first session, the tip fades and they go straight to the prompt.
     console.log('');
     console.log(chalk.dim('  Try something only Franklin can do:'));
-    console.log(chalk.dim('    ') + chalk.hex('#FFD700')('"what\'s BTC looking like today?"') + chalk.dim('  ← market signal'));
-    console.log(chalk.dim('    ') + chalk.hex('#10B981')('"find X posts about ai agent"') + chalk.dim('  ← social growth'));
-    console.log(chalk.dim('    ') + chalk.hex('#60A5FA')('"generate a hero image for my app"') + chalk.dim('  ← image gen'));
-    console.log(chalk.dim('  Or just code — 55+ models, no API keys.'));
+    console.log(chalk.dim('    ') + chalk.hex('#FFD700')('"what\'s BTC looking like today?"') + chalk.dim('  ← live market data'));
+    console.log(chalk.dim('    ') + chalk.hex('#60A5FA')('"generate a logo for my startup"') + chalk.dim('  ← AI image gen'));
+    console.log(chalk.dim('  Code with 55+ models. No API keys. Pay per use.'));
     console.log('');
     // Balance fetcher — used at startup and after each turn
     const fetchBalance = async () => {

package/dist/tools/edit.js

@@ -3,7 +3,7 @@
  */
 import fs from 'node:fs';
 import path from 'node:path';
-import { partiallyReadFiles, fileReadTracker } from './read.js';
+import { partiallyReadFiles, fileReadTracker, invalidateFileCache } from './read.js';
 /**
  * Normalize curly/smart quotes to straight quotes.
  * Claude Code does this to handle API-sanitized strings and editor paste artifacts.
@@ -143,8 +143,9 @@ async function execute(input, ctx) {
             updated = content.slice(0, firstIdx) + newStr + content.slice(firstIdx + effectiveOldStr.length);
         }
         fs.writeFileSync(resolved, updated, 'utf-8');
-        // File has been modified — remove from partial-read tracking so next read is fresh
+        // File has been modified — invalidate caches so next read is fresh
         partiallyReadFiles.delete(resolved);
+        invalidateFileCache(resolved);
         // Update read tracker mtime so subsequent edits don't trigger stale-write detection
         const newStat = fs.statSync(resolved);
         fileReadTracker.set(resolved, { mtimeMs: newStat.mtimeMs, readAt: Date.now() });
@@ -172,6 +173,7 @@ async function execute(input, ctx) {
         }
         return {
             output: `Updated ${resolved} — ${matchCount} replacement${matchCount > 1 ? 's' : ''} made.${diffPreview}${partialWarning}`,
+            diff: { file: resolved, oldLines, newLines, count: matchCount },
         };
     }
     catch (err) {

package/dist/tools/imagegen.js

@@ -14,7 +14,7 @@ async function execute(input, ctx) {
     const chain = loadChain();
     const apiUrl = API_URLS[chain];
     const endpoint = `${apiUrl}/v1/images/generations`;
-    const imageModel = model || 'dall-e-3';
+    const imageModel = model || 'openai/gpt-image-1';
     const imageSize = size || '1024x1024';
     // Default output path
     const outPath = output_path
@@ -162,7 +162,7 @@ export const imageGenCapability = {
                 prompt: { type: 'string', description: 'Text description of the image to generate' },
                 output_path: { type: 'string', description: 'Where to save the image. Default: generated-<timestamp>.png in working directory' },
                 size: { type: 'string', description: 'Image size: 1024x1024, 1792x1024, or 1024x1792. Default: 1024x1024' },
-                model: { type: 'string', description: 'Image model to use. Default: dall-e-3' },
+                model: { type: 'string', description: 'Image model to use. Default: openai/gpt-image-1' },
             },
             required: ['prompt'],
         },

package/dist/tools/read.d.ts

@@ -22,4 +22,6 @@ export declare const fileReadTracker: Map<string, {
     mtimeMs: number;
     readAt: number;
 }>;
+/** Invalidate the content cache for a file (call after Edit/Write modifies it). */
+export declare function invalidateFileCache(resolvedPath: string): void;
 export declare const readCapability: CapabilityHandler;

package/dist/tools/read.js

@@ -16,6 +16,24 @@ export const partiallyReadFiles = new Map();
  * Exported so edit.ts and write.ts can check.
  */
 export const fileReadTracker = new Map();
+/**
+ * File state cache — avoids re-reading unchanged files across turns.
+ * Stores mtime + line count for each file. If the model requests a Read
+ * and the file hasn't changed (same mtime), return a short stub instead
+ * of the full content. This saves thousands of tokens on repeated reads.
+ *
+ * Cache is invalidated when:
+ * - File mtime changes (edited externally or by Edit/Write tool)
+ * - Different offset/limit is requested (user wants a different section)
+ */
+const fileContentCache = new Map();
+function cacheKey(resolved, offset, limit) {
+    return `${offset ?? 0}:${limit ?? 2000}`;
+}
+/** Invalidate the content cache for a file (call after Edit/Write modifies it). */
+export function invalidateFileCache(resolvedPath) {
+    fileContentCache.delete(resolvedPath);
+}
 async function execute(input, ctx) {
     const { file_path: filePath, offset, limit } = input;
     if (!filePath) {
@@ -24,6 +42,14 @@ async function execute(input, ctx) {
     const resolved = path.isAbsolute(filePath) ? filePath : path.resolve(ctx.workingDir, filePath);
     try {
         const stat = fs.statSync(resolved);
+        // File state cache: if file hasn't changed and same range requested, return stub
+        const range = cacheKey(resolved, offset, limit);
+        const cached = fileContentCache.get(resolved);
+        if (cached && cached.mtimeMs === stat.mtimeMs && cached.readRange === range) {
+            return {
+                output: `File unchanged since last read (${cached.lineCount} lines). Content is already in your context — do not re-read it.`,
+            };
+        }
         if (stat.isDirectory()) {
             // Helpfully list directory contents instead of just erroring
             const entries = fs.readdirSync(resolved, { withFileTypes: true });
@@ -65,6 +91,8 @@ async function execute(input, ctx) {
         }
         // Record this read for read-before-edit/write enforcement
         fileReadTracker.set(resolved, { mtimeMs: stat.mtimeMs, readAt: Date.now() });
+        // Update file state cache (for cross-turn dedup)
+        fileContentCache.set(resolved, { mtimeMs: stat.mtimeMs, lineCount: allLines.length, readRange: range });
         // Format with line numbers (cat -n style)
         const numbered = slice.map((line, i) => `${startLine + i + 1}\t${line}`);
         let result = numbered.join('\n');

package/dist/tools/write.js

@@ -4,7 +4,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
-import { partiallyReadFiles, fileReadTracker } from './read.js';
+import { partiallyReadFiles, fileReadTracker, invalidateFileCache } from './read.js';
 function withTrailingSep(value) {
     return value.endsWith(path.sep) ? value : value + path.sep;
 }
@@ -93,6 +93,7 @@ async function execute(input, ctx) {
         fs.mkdirSync(parentDir, { recursive: true });
         fs.writeFileSync(resolved, content, 'utf-8');
         partiallyReadFiles.delete(resolved);
+        invalidateFileCache(resolved);
         // Update read tracker so subsequent edits don't trigger stale detection
         const newStat = fs.statSync(resolved);
         fileReadTracker.set(resolved, { mtimeMs: newStat.mtimeMs, readAt: Date.now() });

package/dist/ui/app.js

@@ -8,12 +8,13 @@ import { useState, useEffect, useCallback, useRef } from 'react';
 import { render, Static, Box, Text, useApp, useInput, useStdout } from 'ink';
 import Spinner from 'ink-spinner';
 import TextInput from 'ink-text-input';
+import VimInput from './vim-input.js';
 import { renderMarkdown } from './markdown.js';
 import { resolveModel, PICKER_CATEGORIES, PICKER_MODELS_FLAT, } from './model-picker.js';
 import { estimateCost } from '../pricing.js';
 import { formatTokens, shortModelName } from '../stats/format.js';
 // ─── Full-width input box ──────────────────────────────────────────────────
-function InputBox({ input, setInput, onSubmit, model, balance, sessionCost, queued, queuedCount, focused, busy, contextPct }) {
+function InputBox({ input, setInput, onSubmit, model, balance, sessionCost, queued, queuedCount, focused, busy, contextPct, vimMode, onVimModeChange }) {
     const { stdout } = useStdout();
     const cols = stdout?.columns ?? 80;
     const innerWidth = Math.min(Math.max(30, cols - 4), cols - 2);
@@ -22,7 +23,13 @@ function InputBox({ input, setInput, onSubmit, model, balance, sessionCost, queu
             ? `⏎ ${queuedCount ?? 1} queued: ${queued.slice(0, 40)}`
             : 'Working...')
         : 'Type a message...';
-    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { dimColor: true, children: '╭' + '─'.repeat(cols - 2) + '╮' }), _jsxs(Box, { children: [_jsx(Text, { dimColor: true, children: "\u2502 " }), busy && !input ? _jsxs(Text, { color: "yellow", children: [_jsx(Spinner, { type: "dots" }), " "] }) : null, _jsx(Box, { width: busy && !input ? innerWidth - 4 : innerWidth, children: _jsx(TextInput, { value: input, onChange: setInput, onSubmit: onSubmit, placeholder: placeholder, focus: focused !== false }) }), _jsxs(Text, { dimColor: true, children: [' '.repeat(Math.max(0, cols - innerWidth - 4)), "\u2502"] })] }), _jsx(Text, { dimColor: true, children: '╰' + '─'.repeat(cols - 2) + '╯' }), _jsx(Box, { marginLeft: 1, children: _jsxs(Text, { dimColor: true, children: [busy ? _jsx(Text, { color: "yellow", children: _jsx(Spinner, { type: "dots" }) }) : null, busy ? ' ' : '', model, "  \u00B7  ", balance, sessionCost > 0.00001 ? _jsxs(Text, { color: "yellow", children: ["  -$", sessionCost.toFixed(4)] }) : '', contextPct !== undefined && contextPct > 0 ? (_jsxs(Text, { color: contextPct > 85 ? 'red' : contextPct > 70 ? 'yellow' : undefined, children: ['  ·  ctx ', contextPct, '%'] })) : null, (queuedCount ?? 0) > 0 ? _jsxs(Text, { color: "cyan", children: ["  \u00B7  ", queuedCount, " queued"] }) : null, '  ·  esc'] }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { dimColor: true, children: '╭' + '─'.repeat(cols - 2) + '╮' }), _jsxs(Box, { children: [_jsx(Text, { dimColor: true, children: "\u2502 " }), busy && !input ? _jsxs(Text, { color: "yellow", children: [_jsx(Spinner, { type: "dots" }), " "] }) : null, _jsx(Box, { width: busy && !input ? innerWidth - 4 : innerWidth, children: vimMode ? (_jsx(VimInput, { value: input, onChange: setInput, onSubmit: onSubmit, placeholder: placeholder, focus: focused !== false, showMode: true, onModeChange: onVimModeChange })) : (_jsx(TextInput, { value: input, onChange: setInput, onSubmit: onSubmit, placeholder: placeholder, focus: focused !== false })) }), _jsxs(Text, { dimColor: true, children: [' '.repeat(Math.max(0, cols - innerWidth - 4)), "\u2502"] })] }), _jsx(Text, { dimColor: true, children: '╰' + '─'.repeat(cols - 2) + '╯' }), _jsx(Box, { marginLeft: 1, children: _jsxs(Text, { dimColor: true, children: [busy ? _jsx(Text, { color: "yellow", children: _jsx(Spinner, { type: "dots" }) }) : null, busy ? ' ' : '', shortModelName(model), "  \u00B7  ", balance, sessionCost > 0.00001 ? _jsxs(Text, { color: "yellow", children: ["  -$", sessionCost.toFixed(4)] }) : '', contextPct !== undefined && contextPct > 0 ? (() => {
+                            // Visual context bar: ▓▓▓▓▓▓░░░░ 75%
+                            const filled = Math.round(contextPct / 10);
+                            const empty = 10 - filled;
+                            const barColor = contextPct > 85 ? 'red' : contextPct > 70 ? 'yellow' : 'green';
+                            return (_jsxs(Text, { children: ['  ', _jsx(Text, { color: barColor, children: '▓'.repeat(filled) }), _jsx(Text, { dimColor: true, children: '░'.repeat(empty) }), _jsxs(Text, { color: barColor, children: [' ', contextPct, "%"] })] }));
+                        })() : null, (queuedCount ?? 0) > 0 ? _jsxs(Text, { color: "cyan", children: ["  \u00B7  ", queuedCount, " queued"] }) : null, '  ·  esc'] }) })] }));
 }
 function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain, startWithPicker, onSubmit, onModelChange, onAbort, onExit, }) {
     const { exit } = useApp();
@@ -33,6 +40,8 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
     const [tools, setTools] = useState(new Map());
     // Completed tool results committed to Static (permanent scrollback — no re-render artifacts)
     const [completedTools, setCompletedTools] = useState([]);
+    // Last completed tool — shown in dynamic area so it can be expanded/collapsed with Tab
+    const [expandableTool, setExpandableTool] = useState(null);
     // Full responses committed to Static immediately — goes into terminal scrollback like Claude Code
     const [committedResponses, setCommittedResponses] = useState([]);
     // Short preview of latest response shown in dynamic area (last ~5 lines, cleared on next turn)
@@ -48,6 +57,8 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
     const [totalCost, setTotalCost] = useState(0);
     const [showHelp, setShowHelp] = useState(false);
     const [showWallet, setShowWallet] = useState(false);
+    const [vimEnabled, setVimEnabled] = useState(false);
+    const [currentVimMode, setCurrentVimMode] = useState('insert');
     const [balance, setBalance] = useState(walletBalance);
     // Parse the fetched balance to a number so we can compute live balance = fetchedBalance - sessionCost.
     // costAtLastFetch tracks totalCost when balance was last fetched, to avoid double-subtracting.
@@ -154,7 +165,10 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
             return;
         }
         // Esc to quit (only when input is empty and in input mode)
+        // In Vim mode: Esc goes to normal mode (handled by VimInput), only quit on Esc in normal mode with empty input
         if (key.escape && mode === 'input' && ready && !input) {
+            if (vimEnabled && currentVimMode === 'insert')
+                return; // Let VimInput handle Esc → normal
             onExit();
             exit();
             return;
@@ -179,6 +193,12 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
             setReady(true);
         }
     }, { isActive: isPickerOrEsc });
+    // Tab key: toggle expand/collapse on the last completed tool
+    useInput((_ch, key) => {
+        if (key.tab && expandableTool) {
+            setExpandableTool(prev => prev ? { ...prev, expanded: !prev.expanded } : null);
+        }
+    }, { isActive: mode === 'input' && !permissionRequest && !askUserRequest });
     // Input history: Up/Down arrow when in ready input mode
     useInput((_ch, key) => {
         if (key.upArrow && inputHistory.length > 0) {
@@ -256,6 +276,10 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
                     setShowHelp(true);
                     setShowWallet(false);
                     return;
+                case '/vim':
+                    setVimEnabled(prev => !prev);
+                    showStatus(vimEnabled ? 'Vim mode OFF' : 'Vim mode ON — Esc for normal, i for insert', 'success', 3000);
+                    return;
                 case '/clear':
                     setStreamText('');
                     setTools(new Map());
@@ -316,6 +340,12 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
         setThinking(false);
         setThinkingText('');
         setTools(new Map());
+        // Flush expandable tool to Static before clearing
+        setExpandableTool(prev => {
+            if (prev)
+                setCompletedTools(prev2 => [...prev2, { ...prev, expanded: false }]);
+            return null;
+        });
         setCompletedTools([]);
         setReady(false);
         setWaiting(true);
@@ -382,6 +412,9 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
                                 done: false, error: false,
                                 preview: event.preview || '',
                                 liveOutput: '',
+                                liveLines: [],
+                                fullOutput: '',
+                                expanded: false,
                                 elapsed: 0,
                             });
                             return next;
@@ -393,7 +426,13 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
                             if (!t || t.done)
                                 return prev;
                             const next = new Map(prev);
-                            next.set(event.id, { ...t, liveOutput: event.text });
+                            // Accumulate output lines for multi-line display (keep last 5)
+                            const newLines = [...t.liveLines];
+                            const incoming = event.text.split('\n').filter(Boolean);
+                            newLines.push(...incoming);
+                            while (newLines.length > 5)
+                                newLines.shift();
+                            next.set(event.id, { ...t, liveOutput: event.text, liveLines: newLines });
                             return next;
                         });
                         break;
@@ -413,10 +452,19 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
                                     error: !!event.result.isError,
                                     preview: resultPreview,
                                     liveOutput: '',
+                                    liveLines: [],
+                                    fullOutput: event.result.output || '',
+                                    diff: event.result.diff,
+                                    expanded: false,
                                     elapsed: Date.now() - t.startTime,
                                 };
-                                // Move to Static (permanent scrollback) — prevents re-render artifacts
-                                setCompletedTools(prev2 => [...prev2, completed]);
+                                // Move previous expandable tool to Static, set new one as expandable
+                                setExpandableTool(prevExpTool => {
+                                    if (prevExpTool) {
+                                        setCompletedTools(prev2 => [...prev2, { ...prevExpTool, expanded: false }]);
+                                    }
+                                    return completed;
+                                });
                                 next.delete(event.id);
                             }
                             return next;
@@ -444,6 +492,12 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
                         break;
                     }
                     case 'turn_done': {
+                        // Flush expandable tool to Static before committing response
+                        setExpandableTool(prev => {
+                            if (prev)
+                                setCompletedTools(prev2 => [...prev2, { ...prev, expanded: false }]);
+                            return null;
+                        });
                         const text = streamTextRef.current;
                         if (text.trim()) {
                             commitResponse(text, turnTokensRef.current, turnCostRef.current);
@@ -502,17 +556,39 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
     // opens/closes. The picker is rendered inline below scrollback, and the
     // InputBox is hidden while it's active.
     const inPicker = mode === 'model-picker';
-    return (_jsxs(Box, { flexDirection: "column", children: [statusMsg && (_jsx(Box, { marginLeft: 2, children: _jsx(Text, { color: statusTone === 'error' ? 'red' : statusTone === 'warning' ? 'yellow' : '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: "/session-search" }), " q  Search past sessions"] }), _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 history"] }), _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 })] })] })), _jsx(Static, { items: completedTools, children: (tool) => (_jsx(Box, { marginLeft: 1, children: tool.error
-                        ? _jsxs(Text, { color: "red", children: ["  \u2717 ", tool.name, " ", _jsxs(Text, { dimColor: true, children: [tool.elapsed, "ms", tool.preview ? ` — ${tool.preview}` : ''] })] })
-                        : _jsxs(Text, { color: "green", children: ["  \u2713 ", tool.name, " ", _jsxs(Text, { dimColor: true, children: [tool.elapsed, "ms", tool.preview ? ` — ${tool.preview}` : ''] })] }) }, tool.key)) }), _jsx(Static, { items: committedResponses, children: (r) => (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { wrap: "wrap", children: renderMarkdown(r.text) }), (r.tokens.input > 0 || r.tokens.output > 0) && (_jsx(Box, { marginLeft: 1, children: _jsxs(Text, { dimColor: true, children: [r.tier && _jsxs(Text, { color: "cyan", children: [r.tier, " "] }), r.model ? shortModelName(r.model) : '', r.model ? '  ·  ' : '', r.tokens.calls > 0 && r.tokens.input === 0
-                                        ? `${r.tokens.calls} calls`
-                                        : `${formatTokens(r.tokens.input)} in / ${formatTokens(r.tokens.output)} out`, r.cost > 0 ? `  ·  $${r.cost.toFixed(4)}` : '', r.savings !== undefined && r.savings > 0 ? _jsxs(Text, { color: "green", children: ["  saved ", Math.round(r.savings * 100), "%"] }) : ''] }) }))] }, r.key)) }), permissionRequest && (_jsxs(Box, { flexDirection: "column", marginTop: 1, marginLeft: 1, children: [_jsx(Text, { color: "yellow", children: "  \u256D\u2500 Permission required \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" }), _jsxs(Text, { color: "yellow", children: ["  \u2502 ", _jsx(Text, { bold: true, children: permissionRequest.toolName })] }), permissionRequest.description.split('\n').map((line, i) => (_jsxs(Text, { dimColor: true, children: ["  \u2502 ", line] }, i))), _jsx(Text, { color: "yellow", children: "  \u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" }), _jsx(Box, { marginLeft: 3, children: _jsxs(Text, { children: [_jsx(Text, { bold: true, color: "green", children: "[y]" }), _jsx(Text, { dimColor: true, children: " yes  " }), _jsx(Text, { bold: true, color: "cyan", children: "[a]" }), _jsx(Text, { dimColor: true, children: " always  " }), _jsx(Text, { bold: true, color: "red", children: "[n]" }), _jsx(Text, { dimColor: true, children: " no" })] }) })] })), askUserRequest && (_jsxs(Box, { flexDirection: "column", marginTop: 1, marginLeft: 1, children: [_jsx(Text, { color: "cyan", children: "  \u256D\u2500 Question \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" }), _jsxs(Text, { color: "cyan", children: ["  \u2502 ", _jsx(Text, { bold: true, children: askUserRequest.question })] }), askUserRequest.options && askUserRequest.options.length > 0 && (askUserRequest.options.map((opt, i) => (_jsxs(Text, { dimColor: true, children: ["  \u2502 ", i + 1, ". ", opt] }, i)))), _jsx(Text, { color: "cyan", children: "  \u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" }), _jsxs(Box, { marginLeft: 3, children: [_jsx(Text, { bold: true, children: "answer> " }), _jsx(TextInput, { value: askUserInput, onChange: setAskUserInput, onSubmit: (val) => {
+    return (_jsxs(Box, { flexDirection: "column", children: [statusMsg && (_jsx(Box, { marginLeft: 2, children: _jsx(Text, { color: statusTone === 'error' ? 'red' : statusTone === 'warning' ? 'yellow' : '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: "/session-search" }), " q  Search past sessions"] }), _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 history"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/doctor" }), "        Diagnose setup issues"] }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", children: "/vim" }), "           Toggle Vim input mode"] }), _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 })] })] })), _jsx(Static, { items: completedTools, children: (tool) => {
+                    const elapsedFmt = tool.elapsed >= 1000
+                        ? `${(tool.elapsed / 1000).toFixed(1)}s`
+                        : `${tool.elapsed}ms`;
+                    return (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Text, { children: [tool.error
+                                        ? _jsx(Text, { color: "red", children: "\u2717" })
+                                        : _jsx(Text, { color: "green", children: "\u2713" }), ' ', _jsx(Text, { bold: true, children: tool.name }), tool.preview ? _jsxs(Text, { dimColor: true, children: ["(", tool.preview.slice(0, 80), ")"] }) : null, _jsxs(Text, { dimColor: true, children: [" ", elapsedFmt] })] }), tool.diff && !tool.error && tool.diff.oldLines.length <= 8 && tool.diff.newLines.length <= 8 && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [tool.diff.oldLines.map((line, i) => (_jsxs(Text, { color: "red", wrap: "truncate-end", children: ['⎿  ', "- ", line.slice(0, 120)] }, `old-${i}`))), tool.diff.newLines.map((line, i) => (_jsxs(Text, { color: "green", wrap: "truncate-end", children: ['⎿  ', "+ ", line.slice(0, 120)] }, `new-${i}`)))] })), tool.diff && !tool.error && (tool.diff.oldLines.length > 8 || tool.diff.newLines.length > 8) && (_jsx(Box, { marginLeft: 2, children: _jsxs(Text, { dimColor: true, children: ['⎿  ', tool.diff.oldLines.length, " lines \u2192 ", tool.diff.newLines.length, " lines"] }) })), tool.error && tool.fullOutput && (_jsx(Box, { flexDirection: "column", marginLeft: 2, children: tool.fullOutput.split('\n').filter(Boolean).slice(0, 3).map((line, i) => (_jsxs(Text, { color: "red", wrap: "truncate-end", children: ['⎿  ', line.slice(0, 120)] }, i))) }))] }, tool.key));
+                } }), _jsx(Static, { items: committedResponses, children: (r) => {
+                    const isUserMsg = r.key.startsWith('user-');
+                    return (_jsxs(Box, { flexDirection: "column", children: [!isUserMsg && (r.tokens.input > 0 || r.tokens.output > 0) && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: '─'.repeat(60) }) })), _jsx(Text, { wrap: "wrap", children: renderMarkdown(r.text) }), (r.tokens.input > 0 || r.tokens.output > 0) && (_jsx(Box, { marginLeft: 1, marginBottom: 1, children: _jsxs(Text, { dimColor: true, children: [r.tier && _jsxs(Text, { color: "cyan", children: ["[", r.tier, "] "] }), r.model ? shortModelName(r.model) : '', r.model ? '  ·  ' : '', r.tokens.calls > 0 && r.tokens.input === 0
+                                            ? `${r.tokens.calls} calls`
+                                            : `${formatTokens(r.tokens.input)} in / ${formatTokens(r.tokens.output)} out`, r.cost > 0 ? `  ·  $${r.cost.toFixed(4)}` : '', r.savings !== undefined && r.savings > 0 ? _jsxs(Text, { color: "green", children: ["  saved ", Math.round(r.savings * 100), "%"] }) : ''] }) }))] }, r.key));
+                } }), permissionRequest && (_jsxs(Box, { flexDirection: "column", marginTop: 1, marginLeft: 1, children: [_jsx(Text, { color: "yellow", children: "  \u256D\u2500 Permission required \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" }), _jsxs(Text, { color: "yellow", children: ["  \u2502 ", _jsx(Text, { bold: true, children: permissionRequest.toolName })] }), permissionRequest.description.split('\n').map((line, i) => (_jsxs(Text, { dimColor: true, children: ["  \u2502 ", line] }, i))), _jsx(Text, { color: "yellow", children: "  \u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" }), _jsx(Box, { marginLeft: 3, children: _jsxs(Text, { children: [_jsx(Text, { bold: true, color: "green", children: "[y]" }), _jsx(Text, { dimColor: true, children: " yes  " }), _jsx(Text, { bold: true, color: "cyan", children: "[a]" }), _jsx(Text, { dimColor: true, children: " always  " }), _jsx(Text, { bold: true, color: "red", children: "[n]" }), _jsx(Text, { dimColor: true, children: " no" })] }) })] })), askUserRequest && (_jsxs(Box, { flexDirection: "column", marginTop: 1, marginLeft: 1, children: [_jsx(Text, { color: "cyan", children: "  \u256D\u2500 Question \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" }), _jsxs(Text, { color: "cyan", children: ["  \u2502 ", _jsx(Text, { bold: true, children: askUserRequest.question })] }), askUserRequest.options && askUserRequest.options.length > 0 && (askUserRequest.options.map((opt, i) => (_jsxs(Text, { dimColor: true, children: ["  \u2502 ", i + 1, ". ", opt] }, i)))), _jsx(Text, { color: "cyan", children: "  \u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" }), _jsxs(Box, { marginLeft: 3, children: [_jsx(Text, { bold: true, children: "answer> " }), _jsx(TextInput, { value: askUserInput, onChange: setAskUserInput, onSubmit: (val) => {
                                     const answer = val.trim() || '(no response)';
                                     const r = askUserRequest.resolve;
                                     setAskUserRequest(null);
                                     setAskUserInput('');
                                     r(answer);
-                                }, focus: true })] })] })), Array.from(tools.entries()).map(([id, tool]) => (_jsxs(Box, { flexDirection: "column", marginLeft: 1, children: [_jsxs(Text, { color: "cyan", children: ['  ', _jsx(Spinner, { type: "dots" }), ' ', tool.name, tool.preview ? _jsxs(Text, { dimColor: true, children: [": ", tool.preview.slice(0, 60)] }) : null, _jsx(Text, { dimColor: true, children: (() => { const s = Math.round((Date.now() - tool.startTime) / 1000); return s > 0 ? ` ${s}s` : ''; })() })] }), tool.liveOutput ? (_jsxs(Text, { color: "yellow", children: ['    ', tool.liveOutput.slice(0, 100)] })) : null] }, id))), thinking && (_jsxs(Box, { flexDirection: "column", marginLeft: 1, children: [_jsxs(Text, { color: "magenta", children: ["  ", _jsx(Spinner, { type: "dots" }), " thinking", completedTools.length > 0 ? _jsxs(Text, { dimColor: true, children: [' ', "(step ", completedTools.length + 1, ")"] }) : null] }), thinkingText && (_jsxs(Text, { dimColor: true, wrap: "truncate-end", children: ['    ', thinkingText.split('\n').pop()?.slice(0, 100)] }))] })), waiting && !thinking && tools.size === 0 && (_jsx(Box, { marginLeft: 1, children: _jsxs(Text, { color: "yellow", children: ["  ", _jsx(Spinner, { type: "dots" }), " ", _jsxs(Text, { dimColor: true, children: [currentModel, completedTools.length > 0 ? ` · step ${completedTools.length + 1}` : ''] })] }) })), streamText && (_jsx(Box, { marginTop: 0, marginBottom: 0, children: _jsx(Text, { wrap: "wrap", children: renderMarkdown(streamText) }) })), responsePreview && !streamText && (_jsx(Box, { flexDirection: "column", marginBottom: 0, children: _jsx(Text, { wrap: "wrap", children: renderMarkdown(responsePreview) }) })), inPicker && (() => {
+                                }, focus: true })] })] })), expandableTool && (() => {
+                const tool = expandableTool;
+                const elapsedFmt = tool.elapsed >= 1000
+                    ? `${(tool.elapsed / 1000).toFixed(1)}s`
+                    : `${tool.elapsed}ms`;
+                const hasExpandableContent = !!(tool.diff || (tool.fullOutput && tool.fullOutput.split('\n').length > 1));
+                return (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Text, { children: [tool.error ? _jsx(Text, { color: "red", children: "\u2717" }) : _jsx(Text, { color: "green", children: "\u2713" }), ' ', _jsx(Text, { bold: true, children: tool.name }), tool.preview ? _jsxs(Text, { dimColor: true, children: ["(", tool.preview.slice(0, 80), ")"] }) : null, _jsxs(Text, { dimColor: true, children: [" ", elapsedFmt] }), hasExpandableContent && (_jsxs(Text, { dimColor: true, children: [" ", tool.expanded ? '(tab to collapse)' : '(tab to expand)'] }))] }), !tool.expanded && tool.diff && !tool.error && tool.diff.oldLines.length <= 8 && tool.diff.newLines.length <= 8 && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [tool.diff.oldLines.map((line, i) => (_jsxs(Text, { color: "red", wrap: "truncate-end", children: ['⎿  ', "- ", line.slice(0, 120)] }, `old-${i}`))), tool.diff.newLines.map((line, i) => (_jsxs(Text, { color: "green", wrap: "truncate-end", children: ['⎿  ', "+ ", line.slice(0, 120)] }, `new-${i}`)))] })), tool.expanded && tool.fullOutput && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [tool.fullOutput.split('\n').slice(0, 30).map((line, i) => (_jsxs(Text, { dimColor: true, wrap: "truncate-end", children: ['⎿  ', line.slice(0, 120)] }, i))), tool.fullOutput.split('\n').length > 30 && (_jsxs(Text, { dimColor: true, children: ['⎿  ', "... ", tool.fullOutput.split('\n').length - 30, " more lines"] }))] })), tool.error && !tool.expanded && tool.fullOutput && (_jsx(Box, { flexDirection: "column", marginLeft: 2, children: tool.fullOutput.split('\n').filter(Boolean).slice(0, 3).map((line, i) => (_jsxs(Text, { color: "red", wrap: "truncate-end", children: ['⎿  ', line.slice(0, 120)] }, i))) }))] }));
+            })(), Array.from(tools.entries()).map(([id, tool]) => {
+                const elapsed = Math.round((Date.now() - tool.startTime) / 1000);
+                const elapsedStr = elapsed > 0 ? ` ${elapsed}s` : '';
+                return (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), ' ', _jsx(Text, { bold: true, color: "cyan", children: tool.name }), tool.preview ? _jsxs(Text, { dimColor: true, children: ["(", tool.preview.slice(0, 70), ")"] }) : null, _jsx(Text, { dimColor: true, children: elapsedStr })] }), tool.liveLines.length > 0 && (_jsx(Box, { flexDirection: "column", marginLeft: 2, children: tool.liveLines.map((line, i) => (_jsxs(Text, { dimColor: true, wrap: "truncate-end", children: ['⎿  ', line.slice(0, 120)] }, i))) }))] }, id));
+            }), thinking && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Text, { color: "magenta", children: [_jsx(Spinner, { type: "dots" }), ' ', _jsx(Text, { bold: true, children: "thinking" }), completedTools.length > 0 ? _jsxs(Text, { dimColor: true, children: [' ', "\u00B7 step ", completedTools.length + 1] }) : null] }), thinkingText && (() => {
+                        const lines = thinkingText.split('\n').filter(Boolean).slice(-3);
+                        return (_jsx(Box, { flexDirection: "column", marginLeft: 2, children: lines.map((line, i) => (_jsxs(Text, { dimColor: true, wrap: "truncate-end", children: ['⎿  ', line.slice(0, 120)] }, i))) }));
+                    })()] })), waiting && !thinking && tools.size === 0 && (_jsx(Box, { marginLeft: 2, children: _jsxs(Text, { color: "yellow", children: [_jsx(Spinner, { type: "dots" }), ' ', _jsxs(Text, { dimColor: true, children: [shortModelName(currentModel), completedTools.length > 0 ? ` · step ${completedTools.length + 1}` : ''] })] }) })), streamText && (_jsx(Box, { marginTop: 0, marginBottom: 0, children: _jsx(Text, { wrap: "wrap", children: renderMarkdown(streamText) }) })), responsePreview && !streamText && (_jsx(Box, { flexDirection: "column", marginBottom: 0, children: _jsx(Text, { wrap: "wrap", children: renderMarkdown(responsePreview) }) })), inPicker && (() => {
                 let flatIdx = 0;
                 return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Box, { marginLeft: 2, children: [_jsx(Text, { bold: true, children: "Select a model " }), _jsx(Text, { dimColor: true, children: "(\u2191\u2193 navigate, Enter select, Esc cancel)" })] }), PICKER_CATEGORIES.map((cat) => (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Box, { marginLeft: 2, children: _jsxs(Text, { dimColor: true, children: ["\u2500\u2500 ", cat.category, " \u2500\u2500"] }) }), cat.models.map((m) => {
                                     const myIdx = flatIdx++;
@@ -521,7 +597,7 @@ function RunCodeApp({ initialModel, workDir, walletAddress, walletBalance, chain
                                     const isHighlight = m.highlight === true;
                                     return (_jsxs(Box, { marginLeft: 2, children: [_jsxs(Text, { inverse: isSelected, color: isSelected ? 'cyan' : isHighlight ? 'yellow' : undefined, bold: isSelected || isHighlight, children: [' ', m.label.padEnd(26), ' '] }), _jsxs(Text, { dimColor: true, children: [" ", m.shortcut.padEnd(14)] }), _jsx(Text, { color: m.price === 'FREE' ? 'green' : isHighlight ? 'yellow' : undefined, dimColor: !isHighlight && m.price !== 'FREE', children: m.price }), isCurrent && _jsx(Text, { color: "green", children: " \u2190" })] }, m.id));
                                 })] }, cat.category))), _jsx(Box, { marginTop: 1, marginLeft: 2, children: _jsx(Text, { dimColor: true, children: "Your conversation stays above \u2014 picking a model keeps all history intact." }) })] }));
-            })(), !inPicker && (_jsx(InputBox, { input: (permissionRequest || askUserRequest) ? '' : input, setInput: (permissionRequest || askUserRequest) ? () => { } : setInput, onSubmit: (permissionRequest || askUserRequest) ? () => { } : handleSubmit, model: currentModel, balance: liveBalance, sessionCost: totalCost, queued: queuedInputs[0] || undefined, queuedCount: queuedInputs.length, focused: !permissionRequest && !askUserRequest, busy: !askUserRequest && (waiting || thinking || tools.size > 0), contextPct: contextPct }))] }));
+            })(), !inPicker && (_jsx(InputBox, { input: (permissionRequest || askUserRequest) ? '' : input, setInput: (permissionRequest || askUserRequest) ? () => { } : setInput, onSubmit: (permissionRequest || askUserRequest) ? () => { } : handleSubmit, model: currentModel, balance: liveBalance, sessionCost: totalCost, queued: queuedInputs[0] || undefined, queuedCount: queuedInputs.length, focused: !permissionRequest && !askUserRequest, busy: !askUserRequest && (waiting || thinking || tools.size > 0), contextPct: contextPct, vimMode: vimEnabled, onVimModeChange: setCurrentVimMode }))] }));
 }
 export function launchInkUI(opts) {
     let resolveInput = null;

package/dist/ui/markdown.d.ts

@@ -2,6 +2,12 @@
  * Markdown renderer for terminal output.
  * Converts markdown to ANSI-formatted text using chalk.
  * Shared between Ink UI and basic terminal UI.
+ *
+ * Features beyond basic markdown:
+ * - Language labels on code blocks (```ts → TS)
+ * - Numbered list support
+ * - Nested blockquotes
+ * - Task lists (- [x] done, - [ ] todo)
  */
 /**
  * Render a complete markdown string to ANSI-colored terminal output.

package/dist/ui/markdown.js

@@ -2,8 +2,30 @@
  * Markdown renderer for terminal output.
  * Converts markdown to ANSI-formatted text using chalk.
  * Shared between Ink UI and basic terminal UI.
+ *
+ * Features beyond basic markdown:
+ * - Language labels on code blocks (```ts → TS)
+ * - Numbered list support
+ * - Nested blockquotes
+ * - Task lists (- [x] done, - [ ] todo)
  */
 import chalk from 'chalk';
+/** Short language label for code block headers. */
+const LANG_LABELS = {
+    ts: 'TypeScript', typescript: 'TypeScript',
+    js: 'JavaScript', javascript: 'JavaScript',
+    py: 'Python', python: 'Python',
+    rs: 'Rust', rust: 'Rust',
+    go: 'Go', golang: 'Go',
+    sh: 'Shell', bash: 'Shell', zsh: 'Shell', shell: 'Shell',
+    json: 'JSON', yaml: 'YAML', yml: 'YAML', toml: 'TOML',
+    sql: 'SQL', html: 'HTML', css: 'CSS', xml: 'XML',
+    md: 'Markdown', markdown: 'Markdown',
+    diff: 'Diff', dockerfile: 'Dockerfile',
+    c: 'C', cpp: 'C++', java: 'Java', rb: 'Ruby', ruby: 'Ruby',
+    swift: 'Swift', kt: 'Kotlin', kotlin: 'Kotlin',
+    tsx: 'TSX', jsx: 'JSX',
+};
 /**
  * Render a complete markdown string to ANSI-colored terminal output.
  */
@@ -11,14 +33,41 @@ export function renderMarkdown(text) {
     const lines = text.split('\n');
     const out = [];
     let inCodeBlock = false;
+    let codeBlockLang = '';
     for (const line of lines) {
         // Code block toggle
         if (line.startsWith('```')) {
+            if (!inCodeBlock) {
+                // Opening — extract language
+                const lang = line.slice(3).trim().split(/\s/)[0].toLowerCase();
+                codeBlockLang = lang;
+                const label = LANG_LABELS[lang] || (lang ? lang.toUpperCase() : '');
+                out.push(chalk.dim('```') + (label ? chalk.dim.italic(` ${label}`) : ''));
+            }
+            else {
+                // Closing
+                out.push(chalk.dim('```'));
+                codeBlockLang = '';
+            }
             inCodeBlock = !inCodeBlock;
-            out.push(chalk.dim(line));
             continue;
         }
         if (inCodeBlock) {
+            // Diff-style highlighting inside code blocks
+            if (codeBlockLang === 'diff') {
+                if (line.startsWith('+')) {
+                    out.push(chalk.green(line));
+                    continue;
+                }
+                if (line.startsWith('-')) {
+                    out.push(chalk.red(line));
+                    continue;
+                }
+                if (line.startsWith('@@')) {
+                    out.push(chalk.cyan(line));
+                    continue;
+                }
+            }
             out.push(chalk.cyan(line));
             continue;
         }
@@ -40,9 +89,21 @@ export function renderMarkdown(text) {
             out.push(chalk.dim('─'.repeat(40)));
             continue;
         }
-        // Blockquotes
-        if (line.startsWith('> ')) {
-            out.push(chalk.dim('│ ') + chalk.italic(renderInline(line.slice(2))));
+        // Blockquotes (support nesting: >> , >>> )
+        const bqMatch = line.match(/^((?:>\s*)+)(.*)/);
+        if (bqMatch) {
+            const depth = (bqMatch[1].match(/>/g) || []).length;
+            const prefix = chalk.dim('│ '.repeat(depth));
+            out.push(prefix + chalk.italic(renderInline(bqMatch[2].trim())));
+            continue;
+        }
+        // Task lists: - [x] done, - [ ] todo
+        const taskMatch = line.match(/^(\s*)[-*] \[([ xX])\] (.*)/);
+        if (taskMatch) {
+            const indent = taskMatch[1];
+            const checked = taskMatch[2] !== ' ';
+            const label = taskMatch[3];
+            out.push(indent + (checked ? chalk.green('✓') : chalk.dim('○')) + ' ' + renderInline(label));
             continue;
         }
         // Bullet points
@@ -50,6 +111,12 @@ export function renderMarkdown(text) {
             out.push(line.replace(/^(\s*)[-*] /, '$1• ').replace(/^(\s*• )(.*)/, (_, prefix, rest) => prefix + renderInline(rest)));
             continue;
         }
+        // Numbered lists: 1. , 2. , etc.
+        const numMatch = line.match(/^(\s*)(\d+)\. (.*)/);
+        if (numMatch) {
+            out.push(numMatch[1] + chalk.dim(numMatch[2] + '.') + ' ' + renderInline(numMatch[3]));
+            continue;
+        }
         // Table rows — render with dim separators
         if (line.includes('|') && line.trim().startsWith('|')) {
             // Separator row (|---|---|)
@@ -57,7 +124,7 @@ export function renderMarkdown(text) {
                 out.push(chalk.dim(line));
                 continue;
             }
-            // Data row — bold headers in first row, dim pipes
+            // Data row — dim pipes
             const cells = line.split('|').map(c => c.trim()).filter(Boolean);
             const formatted = cells.map(c => renderInline(c)).join(chalk.dim(' │ '));
             out.push(chalk.dim('│ ') + formatted + chalk.dim(' │'));
@@ -69,7 +136,7 @@ export function renderMarkdown(text) {
     return out.join('\n');
 }
 /**
- * Render inline markdown formatting (bold, italic, code, links).
+ * Render inline markdown formatting (bold, italic, code, links, strikethrough).
  */
 function renderInline(text) {
     return text

package/dist/ui/terminal.js

@@ -74,12 +74,29 @@ class MarkdownRenderer {
             }
             else {
                 this.inCodeBlock = true;
-                this.codeBlockLang = line.slice(3).trim();
-                return chalk.dim('```' + this.codeBlockLang);
+                const lang = line.slice(3).trim().split(/\s/)[0].toLowerCase();
+                this.codeBlockLang = lang;
+                const LANG_LABELS = {
+                    ts: 'TypeScript', typescript: 'TypeScript', js: 'JavaScript', javascript: 'JavaScript',
+                    py: 'Python', python: 'Python', rs: 'Rust', rust: 'Rust', go: 'Go',
+                    sh: 'Shell', bash: 'Shell', zsh: 'Shell', json: 'JSON', yaml: 'YAML',
+                    sql: 'SQL', html: 'HTML', css: 'CSS', diff: 'Diff',
+                    tsx: 'TSX', jsx: 'JSX',
+                };
+                const label = LANG_LABELS[lang] || (lang ? lang.toUpperCase() : '');
+                return chalk.dim('```') + (label ? chalk.dim.italic(` ${label}`) : '');
             }
         }
-        // Inside code block — render dim
+        // Inside code block — diff highlighting + cyan
         if (this.inCodeBlock) {
+            if (this.codeBlockLang === 'diff') {
+                if (line.startsWith('+'))
+                    return chalk.green(line);
+                if (line.startsWith('-'))
+                    return chalk.red(line);
+                if (line.startsWith('@@'))
+                    return chalk.cyan(line);
+            }
             return chalk.cyan(line);
         }
         // Headers
@@ -232,38 +249,38 @@ export class TerminalUI {
                 const capName = cap?.name || 'unknown';
                 const elapsed = cap ? Date.now() - cap.startTime : 0;
                 this.activeCapabilities.delete(event.id);
-                const timeStr = elapsed > 100 ? chalk.dim(` ${elapsed}ms`) : '';
+                const elapsedFmt = elapsed >= 1000
+                    ? `${(elapsed / 1000).toFixed(1)}s`
+                    : `${elapsed}ms`;
+                const timeStr = elapsed > 100 ? chalk.dim(` ${elapsedFmt}`) : '';
                 if (event.result.isError) {
-                    console.error(chalk.red(`  ✗ ${capName}`) +
-                        timeStr +
-                        chalk.red(`: ${truncateOutput(event.result.output, 200)}`));
+                    console.error(chalk.red(`  ✗ `) + chalk.bold(capName) +
+                        timeStr);
+                    // Show error preview lines
+                    const errLines = event.result.output.split('\n').filter(Boolean).slice(0, 3);
+                    for (const line of errLines) {
+                        console.error(chalk.red(`    ⎿  ${line.slice(0, 120)}`));
+                    }
                 }
                 else {
-                    // Show diff-like output for Edit tool
                     const output = event.result.output;
-                    if (capName === 'Edit' && output.includes('replacement')) {
-                        console.error(chalk.green(`  ✓ ${capName}`) + timeStr + chalk.dim(` — ${output}`));
-                    }
-                    else if (capName === 'Write') {
-                        console.error(chalk.green(`  ✓ ${capName}`) + timeStr + chalk.dim(` — ${output}`));
-                    }
-                    else if (capName === 'Bash') {
-                        // Show command output preview
-                        const preview = truncateOutput(output, 120);
-                        console.error(chalk.green(`  ✓ ${capName}`) + timeStr);
-                        if (preview && preview !== '(no output)') {
-                            const lines = output.split('\n').slice(0, 5);
-                            for (const line of lines) {
-                                console.error(chalk.dim(`    │ ${line.slice(0, 100)}`));
-                            }
-                            if (output.split('\n').length > 5) {
-                                console.error(chalk.dim(`    │ ... (${output.split('\n').length - 5} more lines)`));
-                            }
+                    const icon = chalk.green('✓');
+                    console.error(`  ${icon} ${chalk.bold(capName)}${timeStr}`);
+                    if (capName === 'Bash') {
+                        // Show last 5 lines of command output
+                        const outLines = output.split('\n').filter(Boolean);
+                        const show = outLines.slice(-5);
+                        for (const line of show) {
+                            console.error(chalk.dim(`    ⎿  ${line.slice(0, 120)}`));
+                        }
+                        if (outLines.length > 5) {
+                            console.error(chalk.dim(`    ⎿  ... ${outLines.length - 5} more lines`));
                         }
                     }
-                    else {
+                    else if (output.trim()) {
+                        // Other tools: show first line as preview
                         const preview = truncateOutput(output, 120);
-                        console.error(chalk.green(`  ✓ ${capName}`) + timeStr + chalk.dim(` — ${preview}`));
+                        console.error(chalk.dim(`    ⎿  ${preview}`));
                     }
                 }
                 break;

package/dist/ui/vim-input.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Vim-style text input for Franklin's Ink UI.
+ * Supports normal/insert mode, motions, operators, counts.
+ *
+ * Normal mode: h/l/w/b/e/0/$ for movement, i/a/A/I to enter insert, x/dd/dw/D for delete
+ * Insert mode: standard text entry, Esc to return to normal mode
+ */
+export type VimMode = 'insert' | 'normal';
+interface VimInputProps {
+    value: string;
+    onChange: (value: string) => void;
+    onSubmit: (value: string) => void;
+    placeholder?: string;
+    focus?: boolean;
+    showMode?: boolean;
+    onModeChange?: (mode: VimMode) => void;
+}
+export default function VimInput({ value, onChange, onSubmit, placeholder, focus, showMode, onModeChange, }: VimInputProps): import("react/jsx-runtime").JSX.Element;
+export {};

package/dist/ui/vim-input.js

@@ -0,0 +1,439 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * Vim-style text input for Franklin's Ink UI.
+ * Supports normal/insert mode, motions, operators, counts.
+ *
+ * Normal mode: h/l/w/b/e/0/$ for movement, i/a/A/I to enter insert, x/dd/dw/D for delete
+ * Insert mode: standard text entry, Esc to return to normal mode
+ */
+import { useState, useCallback, useRef } from 'react';
+import { Box, Text, useInput } from 'ink';
+/**
+ * Find the start of the next word (Vim 'w' motion).
+ */
+function nextWord(text, pos) {
+    let i = pos;
+    // Skip current word chars
+    while (i < text.length && /\w/.test(text[i]))
+        i++;
+    // Skip non-word non-space
+    while (i < text.length && /[^\w\s]/.test(text[i]))
+        i++;
+    // Skip whitespace
+    while (i < text.length && /\s/.test(text[i]))
+        i++;
+    return Math.min(i, text.length);
+}
+/**
+ * Find the start of the previous word (Vim 'b' motion).
+ */
+function prevWord(text, pos) {
+    let i = pos - 1;
+    // Skip whitespace backwards
+    while (i > 0 && /\s/.test(text[i]))
+        i--;
+    // Skip non-word non-space backwards
+    if (i > 0 && /[^\w\s]/.test(text[i])) {
+        while (i > 0 && /[^\w\s]/.test(text[i - 1]))
+            i--;
+        return i;
+    }
+    // Skip word chars backwards
+    while (i > 0 && /\w/.test(text[i - 1]))
+        i--;
+    return Math.max(0, i);
+}
+/**
+ * Find the end of the current word (Vim 'e' motion).
+ */
+function endWord(text, pos) {
+    let i = pos + 1;
+    // Skip whitespace
+    while (i < text.length && /\s/.test(text[i]))
+        i++;
+    // Move to end of word
+    while (i < text.length - 1 && /\w/.test(text[i + 1]))
+        i++;
+    return Math.min(i, text.length - 1);
+}
+export default function VimInput({ value, onChange, onSubmit, placeholder = '', focus = true, showMode = true, onModeChange, }) {
+    const [mode, setMode] = useState('insert');
+    const [cursor, setCursor] = useState(value.length);
+    const [cmdBuf, setCmdBuf] = useState(''); // accumulated command buffer (for counts + operators)
+    const [yankBuf, setYankBuf] = useState(''); // internal clipboard
+    const [undoStack, setUndoStack] = useState([]); // simple undo
+    const lastValueRef = useRef(value);
+    // Keep cursor in bounds when value changes externally
+    const clampedCursor = Math.min(cursor, mode === 'normal' ? Math.max(0, value.length - 1) : value.length);
+    const switchMode = useCallback((newMode) => {
+        setMode(newMode);
+        setCmdBuf('');
+        onModeChange?.(newMode);
+    }, [onModeChange]);
+    const saveUndo = useCallback(() => {
+        setUndoStack(prev => [...prev.slice(-20), value]);
+    }, [value]);
+    const updateValue = useCallback((newVal, newCursor) => {
+        onChange(newVal);
+        setCursor(Math.max(0, Math.min(newCursor, mode === 'normal' ? Math.max(0, newVal.length - 1) : newVal.length)));
+        lastValueRef.current = newVal;
+    }, [onChange, mode]);
+    useInput((input, key) => {
+        if (!focus)
+            return;
+        // Submit on Enter in any mode
+        if (key.return) {
+            if (mode === 'normal')
+                switchMode('insert');
+            onSubmit(value);
+            return;
+        }
+        // ── INSERT MODE ──
+        if (mode === 'insert') {
+            // Escape → normal mode
+            if (key.escape) {
+                const newCursor = Math.max(0, clampedCursor - 1);
+                setCursor(newCursor);
+                switchMode('normal');
+                return;
+            }
+            // Backspace
+            if (key.backspace) {
+                if (clampedCursor > 0) {
+                    saveUndo();
+                    updateValue(value.slice(0, clampedCursor - 1) + value.slice(clampedCursor), clampedCursor - 1);
+                }
+                return;
+            }
+            // Delete
+            if (key.delete) {
+                if (clampedCursor < value.length) {
+                    saveUndo();
+                    updateValue(value.slice(0, clampedCursor) + value.slice(clampedCursor + 1), clampedCursor);
+                }
+                return;
+            }
+            // Arrow keys in insert mode
+            if (key.leftArrow) {
+                setCursor(Math.max(0, clampedCursor - 1));
+                return;
+            }
+            if (key.rightArrow) {
+                setCursor(Math.min(value.length, clampedCursor + 1));
+                return;
+            }
+            if (key.upArrow || key.downArrow)
+                return; // let parent handle history
+            // Ctrl+A: beginning of line
+            if (key.ctrl && input === 'a') {
+                setCursor(0);
+                return;
+            }
+            // Ctrl+E: end of line
+            if (key.ctrl && input === 'e') {
+                setCursor(value.length);
+                return;
+            }
+            // Ctrl+W: delete word backward
+            if (key.ctrl && input === 'w') {
+                const wp = prevWord(value, clampedCursor);
+                saveUndo();
+                updateValue(value.slice(0, wp) + value.slice(clampedCursor), wp);
+                return;
+            }
+            // Ctrl+U: delete to beginning
+            if (key.ctrl && input === 'u') {
+                saveUndo();
+                setYankBuf(value.slice(0, clampedCursor));
+                updateValue(value.slice(clampedCursor), 0);
+                return;
+            }
+            // Ctrl+K: delete to end
+            if (key.ctrl && input === 'k') {
+                saveUndo();
+                setYankBuf(value.slice(clampedCursor));
+                updateValue(value.slice(0, clampedCursor), clampedCursor);
+                return;
+            }
+            // Skip control chars and tab
+            if (key.ctrl || key.meta || key.tab)
+                return;
+            // Regular character input
+            if (input) {
+                saveUndo();
+                updateValue(value.slice(0, clampedCursor) + input + value.slice(clampedCursor), clampedCursor + input.length);
+            }
+            return;
+        }
+        // ── NORMAL MODE ──
+        if (key.escape) {
+            setCmdBuf('');
+            return;
+        }
+        // Arrow keys work in normal mode too
+        if (key.leftArrow) {
+            setCursor(Math.max(0, clampedCursor - 1));
+            return;
+        }
+        if (key.rightArrow) {
+            setCursor(Math.min(Math.max(0, value.length - 1), clampedCursor + 1));
+            return;
+        }
+        if (key.upArrow || key.downArrow)
+            return; // let parent handle
+        // Backspace in normal mode = left
+        if (key.backspace) {
+            setCursor(Math.max(0, clampedCursor - 1));
+            return;
+        }
+        // Build command buffer
+        const fullCmd = cmdBuf + input;
+        // Parse count prefix
+        const countMatch = fullCmd.match(/^(\d+)(.*)/);
+        const count = countMatch ? parseInt(countMatch[1]) : 1;
+        const cmd = countMatch ? countMatch[2] : fullCmd;
+        // ── Mode switches ──
+        if (cmd === 'i') {
+            switchMode('insert');
+            return;
+        }
+        if (cmd === 'a') {
+            setCursor(Math.min(value.length, clampedCursor + 1));
+            switchMode('insert');
+            return;
+        }
+        if (cmd === 'I') {
+            setCursor(0);
+            switchMode('insert');
+            return;
+        }
+        if (cmd === 'A') {
+            setCursor(value.length);
+            switchMode('insert');
+            return;
+        }
+        if (cmd === 's') { // substitute: delete char and enter insert
+            saveUndo();
+            updateValue(value.slice(0, clampedCursor) + value.slice(clampedCursor + 1), clampedCursor);
+            switchMode('insert');
+            return;
+        }
+        if (cmd === 'S' || cmd === 'cc') { // substitute line
+            saveUndo();
+            setYankBuf(value);
+            updateValue('', 0);
+            switchMode('insert');
+            return;
+        }
+        // ── Navigation ──
+        if (cmd === 'h') {
+            setCursor(Math.max(0, clampedCursor - count));
+            setCmdBuf('');
+            return;
+        }
+        if (cmd === 'l') {
+            setCursor(Math.min(Math.max(0, value.length - 1), clampedCursor + count));
+            setCmdBuf('');
+            return;
+        }
+        if (cmd === 'w') {
+            let pos = clampedCursor;
+            for (let n = 0; n < count; n++)
+                pos = nextWord(value, pos);
+            setCursor(Math.min(pos, Math.max(0, value.length - 1)));
+            setCmdBuf('');
+            return;
+        }
+        if (cmd === 'b') {
+            let pos = clampedCursor;
+            for (let n = 0; n < count; n++)
+                pos = prevWord(value, pos);
+            setCursor(pos);
+            setCmdBuf('');
+            return;
+        }
+        if (cmd === 'e') {
+            let pos = clampedCursor;
+            for (let n = 0; n < count; n++)
+                pos = endWord(value, pos);
+            setCursor(Math.min(pos, Math.max(0, value.length - 1)));
+            setCmdBuf('');
+            return;
+        }
+        if (cmd === '0') {
+            // Only if not building a count (e.g., "10w" — "0" is part of count)
+            if (!countMatch || countMatch[2] === '0') {
+                setCursor(0);
+                setCmdBuf('');
+                return;
+            }
+        }
+        if (cmd === '$') {
+            setCursor(Math.max(0, value.length - 1));
+            setCmdBuf('');
+            return;
+        }
+        if (cmd === '^') {
+            const firstNonSpace = value.search(/\S/);
+            setCursor(firstNonSpace >= 0 ? firstNonSpace : 0);
+            setCmdBuf('');
+            return;
+        }
+        // ── Editing ──
+        if (cmd === 'x') {
+            if (value.length > 0) {
+                saveUndo();
+                const deleted = value.slice(clampedCursor, clampedCursor + count);
+                setYankBuf(deleted);
+                const newVal = value.slice(0, clampedCursor) + value.slice(clampedCursor + count);
+                updateValue(newVal, Math.min(clampedCursor, Math.max(0, newVal.length - 1)));
+            }
+            setCmdBuf('');
+            return;
+        }
+        if (cmd === 'X') {
+            if (clampedCursor > 0) {
+                saveUndo();
+                const start = Math.max(0, clampedCursor - count);
+                setYankBuf(value.slice(start, clampedCursor));
+                updateValue(value.slice(0, start) + value.slice(clampedCursor), start);
+            }
+            setCmdBuf('');
+            return;
+        }
+        if (cmd === 'dd') {
+            saveUndo();
+            setYankBuf(value);
+            updateValue('', 0);
+            setCmdBuf('');
+            return;
+        }
+        if (cmd === 'D') {
+            saveUndo();
+            setYankBuf(value.slice(clampedCursor));
+            updateValue(value.slice(0, clampedCursor), Math.max(0, clampedCursor - 1));
+            setCmdBuf('');
+            return;
+        }
+        if (cmd === 'C') { // change to end of line
+            saveUndo();
+            setYankBuf(value.slice(clampedCursor));
+            updateValue(value.slice(0, clampedCursor), clampedCursor);
+            switchMode('insert');
+            return;
+        }
+        if (cmd === 'dw') {
+            saveUndo();
+            let pos = clampedCursor;
+            for (let n = 0; n < count; n++)
+                pos = nextWord(value, pos);
+            setYankBuf(value.slice(clampedCursor, pos));
+            updateValue(value.slice(0, clampedCursor) + value.slice(pos), clampedCursor);
+            setCmdBuf('');
+            return;
+        }
+        if (cmd === 'db') {
+            saveUndo();
+            let pos = clampedCursor;
+            for (let n = 0; n < count; n++)
+                pos = prevWord(value, pos);
+            setYankBuf(value.slice(pos, clampedCursor));
+            updateValue(value.slice(0, pos) + value.slice(clampedCursor), pos);
+            setCmdBuf('');
+            return;
+        }
+        if (cmd === 'cw') { // change word
+            saveUndo();
+            let pos = clampedCursor;
+            for (let n = 0; n < count; n++)
+                pos = nextWord(value, pos);
+            setYankBuf(value.slice(clampedCursor, pos));
+            updateValue(value.slice(0, clampedCursor) + value.slice(pos), clampedCursor);
+            switchMode('insert');
+            return;
+        }
+        if (cmd === 'cb') { // change back
+            saveUndo();
+            let pos = clampedCursor;
+            for (let n = 0; n < count; n++)
+                pos = prevWord(value, pos);
+            setYankBuf(value.slice(pos, clampedCursor));
+            updateValue(value.slice(0, pos) + value.slice(clampedCursor), pos);
+            switchMode('insert');
+            return;
+        }
+        // ── Yank & Paste ──
+        if (cmd === 'yy') {
+            setYankBuf(value);
+            setCmdBuf('');
+            return;
+        }
+        if (cmd === 'yw') {
+            const pos = nextWord(value, clampedCursor);
+            setYankBuf(value.slice(clampedCursor, pos));
+            setCmdBuf('');
+            return;
+        }
+        if (cmd === 'p') {
+            if (yankBuf) {
+                saveUndo();
+                const insertAt = Math.min(clampedCursor + 1, value.length);
+                updateValue(value.slice(0, insertAt) + yankBuf + value.slice(insertAt), insertAt + yankBuf.length - 1);
+            }
+            setCmdBuf('');
+            return;
+        }
+        if (cmd === 'P') {
+            if (yankBuf) {
+                saveUndo();
+                updateValue(value.slice(0, clampedCursor) + yankBuf + value.slice(clampedCursor), clampedCursor + yankBuf.length - 1);
+            }
+            setCmdBuf('');
+            return;
+        }
+        // ── Undo ──
+        if (cmd === 'u') {
+            if (undoStack.length > 0) {
+                const prev = undoStack[undoStack.length - 1];
+                setUndoStack(s => s.slice(0, -1));
+                onChange(prev);
+                setCursor(Math.min(clampedCursor, Math.max(0, prev.length - 1)));
+                lastValueRef.current = prev;
+            }
+            setCmdBuf('');
+            return;
+        }
+        // ── Accumulate partial commands ──
+        // Valid prefixes for multi-key commands
+        if (/^\d+$/.test(fullCmd)) {
+            setCmdBuf(fullCmd);
+            return;
+        } // count accumulating
+        if (fullCmd === 'd' || fullCmd === 'c' || fullCmd === 'y') {
+            setCmdBuf(fullCmd);
+            return;
+        } // operator pending
+        if (/^\d+[dcy]$/.test(fullCmd)) {
+            setCmdBuf(fullCmd);
+            return;
+        } // count + operator
+        // Unknown command — reset
+        setCmdBuf('');
+    }, { isActive: focus });
+    // ── Render ──
+    const displayValue = value || (mode === 'insert' ? placeholder : '');
+    const isEmpty = !value;
+    // Build the displayed text with cursor
+    let rendered;
+    if (isEmpty && mode === 'insert') {
+        rendered = (_jsx(Text, { dimColor: true, children: placeholder }));
+    }
+    else {
+        // Split text around cursor for highlighting
+        const before = displayValue.slice(0, clampedCursor);
+        const atCursor = displayValue[clampedCursor] || ' ';
+        const after = displayValue.slice(clampedCursor + 1);
+        rendered = (_jsxs(Text, { children: [before, _jsx(Text, { inverse: focus, bold: mode === 'normal', children: atCursor }), after] }));
+    }
+    return (_jsxs(Box, { children: [showMode && mode === 'normal' && (_jsx(Text, { color: "yellow", bold: true, children: "[N] " })), rendered, cmdBuf && mode === 'normal' && (_jsxs(Text, { dimColor: true, children: [" ", cmdBuf] }))] }));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blockrun/franklin",
-  "version": "3.5.0",
+  "version": "3.6.1",
   "description": "Franklin — The AI agent with a wallet. Spends USDC autonomously to get real work done. Pay per action, no subscriptions.",
   "type": "module",
   "exports": {