fixo-cli 1.0.4 → 2.0.0

package/dist/ui/prompt.js

@@ -1,3 +1,4 @@
+import { commandRegistry } from './commands/index.js';
 /**
  * Interactive REPL shell for FixO CLI.
  * Provides command handling, file pinning, model selection,
@@ -11,26 +12,17 @@ import * as p from '@clack/prompts';
 import { SingleAgent } from '../agent/single-agent.js';
 import { ConversationManager } from '../agent/conversation.js';
 import { GitManager } from '../git/git-manager.js';
-import { loadImageAsBlock } from './image-attach.js';
-import { saveConfig } from '../config.js';
 import { WorkspaceGuard } from '../workspace-guard.js';
-import { listRuns, showRun, undoRun } from '../runtime/task-session.js';
+import { listRuns, showRun } from '../runtime/task-session.js';
 import { checkPermission } from '../agent/permissions.js';
 import { redactedEnv, redactSecrets } from '../runtime/redaction.js';
-import { appendMemory, doctor, forgetMemory, readMemory } from '../project-memory.js';
 import { buildIndex, explainIndexedTarget, findInIndex } from '../indexer.js';
-import { reviewWorkspace } from '../review.js';
-import { runProjectTests } from '../test-runner.js';
-import { loadPlan, renderPlan, savePlan, classifyComplexityHeuristic } from '../planner.js';
 import { mcpManager, mcpBridgeManager } from '../agent/tool-executor.js';
-import { ProvidersManager, PROVIDER_REGISTRY } from '../agent/providers-manager.js';
+import { ProvidersManager } from '../agent/providers-manager.js';
 import { C, colors } from './colors.js';
 import { COMMANDS_WITH_DESC, printHelp, formatInputPaths } from './render.js';
-import { addItem, loadTodoList, removeItem, renderTodoList, saveTodoList, setItemStatus, summariseTodoList, } from '../context/todo.js';
 import { renderStatusBar } from './render-primitives.js';
-const c = {
-    ...colors,
-};
+const c = colors;
 export async function startREPL(options) {
     const { config, projectConfig, cwd, verbose, resume } = options;
     // ──── Initialize components ────
@@ -107,13 +99,21 @@ export async function startREPL(options) {
     }
     let lastPromptRow = 0;
     let mouseReportingEnabled = false;
-    const stats = {
+    let stats = {
         totalPromptTokens: 0,
         totalCompletionTokens: 0,
         totalToolCalls: 0,
         totalTasks: 0,
         totalDurationMs: 0,
     };
+    let pendingPastes = [];
+    let pasteIdCounter = 1;
+    let isPasting = false;
+    let pasteBuffer = '';
+    /** Builds the inline token string that goes INTO the rl line buffer. */
+    function pasteToken(id, lineCount) {
+        return `[Paste #${id} +${lineCount} lines]`;
+    }
     // The welcome screen (lava logo + command grid) is printed by
     // `src/index.ts` before the REPL starts; the startREPL entry
     // point jumps straight into the prompt loop.
@@ -129,7 +129,8 @@ export async function startREPL(options) {
     }
     catch (error) {
         if (process.env.DEBUG || process.env.VERBOSE || process.argv.includes('--verbose')) {
-            console.warn(`[Debug Warning] Failed to read command history from ${historyFile}: ${error.message || error}`);
+            const msg = error instanceof Error ? error.message : String(error);
+            console.warn(`[Debug Warning] Failed to read command history from ${historyFile}: ${msg}`);
         }
     }
     // ──── Create readline interface ────
@@ -160,9 +161,7 @@ export async function startREPL(options) {
     // existing /mode command semantics intact while still letting
     // the new bar visualise the live mode.
     const buildLavaStatusState = () => {
-        const modeForState = currentMode === 'PLAN' ? 'PLAN' :
-            currentMode === 'BUILD' ? 'BUILD' :
-                'BUILD';
+        const modeForState = currentMode === 'PLAN' ? 'PLAN' : 'BUILD';
         let contextPercent = 0;
         try {
             const used = conversation.getTotalTokens();
@@ -192,7 +191,7 @@ export async function startREPL(options) {
             branch: currentBranch || '(detached HEAD)',
             contextPercent,
             providersCount,
-            transport: 'freellmapi',
+            transport: config.provider_mode === 'direct' ? 'direct' : 'freellmapi',
         };
     };
     const drawLavaStatusBar = () => {
@@ -203,6 +202,10 @@ export async function startREPL(options) {
         // returns.
         renderStatusBar(buildLavaStatusState());
         process.stdout.write('\n');
+        if (pendingPastes.length > 0) {
+            const tokens = pendingPastes.map(p => pasteToken(p.id, p.lines)).join('  ');
+            process.stdout.write(`${c.dim}  ${tokens}${c.reset}\n`);
+        }
     };
     // Surface the result of a live model fetch as a one-line status.
     // Invoked from /providers add and /providers test so the user
@@ -254,6 +257,16 @@ export async function startREPL(options) {
     }
     // Register synchronous exit cleanups
     const exitCleanup = () => {
+        try {
+            if (process.stdout.isTTY) {
+                fs.writeSync(1, '\x1b[?2004l');
+            }
+        }
+        catch (e) {
+            if (process.env.DEBUG || process.env.VERBOSE) {
+                console.warn('[exit] writeSync failed:', e);
+            }
+        }
         try {
             const hist = rl.history;
             if (Array.isArray(hist)) {
@@ -262,7 +275,8 @@ export async function startREPL(options) {
         }
         catch (error) {
             if (process.env.DEBUG || process.env.VERBOSE || process.argv.includes('--verbose')) {
-                console.warn(`[Debug Warning] Failed to write history file on exit: ${error.message || error}`);
+                const msg = error instanceof Error ? error.message : String(error);
+                console.warn(`[Debug Warning] Failed to write history file on exit: ${msg}`);
             }
         }
         disableMouseReportingSync();
@@ -286,39 +300,50 @@ export async function startREPL(options) {
     let sigintCount = 0;
     let lastSigintTime = 0;
     let sigintResetTimer = null;
+    // Dedup guard: prevents double-firing when both `rl` and `process` SIGINT listeners fire.
+    let sigintHandling = false;
     const sigintHandler = () => {
-        if (isTaskRunning && currentRunningAgent) {
-            // A task is running — cancel it instead of exiting
-            currentRunningAgent.abort();
+        if (sigintHandling)
             return;
-        }
-        const now = Date.now();
-        if (now - lastSigintTime > SIGINT_RESET_MS) {
-            // First press (or after reset window)
-            sigintCount = 1;
-            lastSigintTime = now;
-            // Write hint and redraw the prompt
-            const promptStr = `${C.LAVA}›${C.RESET} `;
-            process.stdout.write(`\n${c.yellow}⚠ Press Ctrl+C again to exit${c.reset}\n`);
-            drawLavaStatusBar();
-            process.stdout.write(promptStr);
-            // Auto-reset after the window expires
+        sigintHandling = true;
+        try {
+            if (isTaskRunning && currentRunningAgent) {
+                // A task is running — cancel it instead of exiting
+                currentRunningAgent.abort();
+                return;
+            }
+            const now = Date.now();
+            if (now - lastSigintTime > SIGINT_RESET_MS) {
+                // First press (or after reset window)
+                sigintCount = 1;
+                lastSigintTime = now;
+                // Write hint and redraw the prompt
+                const promptStr = `> `;
+                process.stdout.write(`\n${c.yellow}⚠ Press Ctrl+C again to exit${c.reset}\n`);
+                drawLavaStatusBar();
+                process.stdout.write(`${c.dim}─────────────────────────────────────────────────────────────────${c.reset}\n`);
+                process.stdout.write(promptStr);
+                // Auto-reset after the window expires
+                if (sigintResetTimer)
+                    clearTimeout(sigintResetTimer);
+                sigintResetTimer = setTimeout(() => {
+                    sigintCount = 0;
+                    sigintResetTimer = null;
+                }, SIGINT_RESET_MS);
+                return;
+            }
+            // Second press within the window — exit
             if (sigintResetTimer)
                 clearTimeout(sigintResetTimer);
-            sigintResetTimer = setTimeout(() => {
-                sigintCount = 0;
-                sigintResetTimer = null;
-            }, SIGINT_RESET_MS);
-            return;
+            sigintResetTimer = null;
+            sigintCount = 0;
+            exitCleanup();
+            console.log('\n\n👋 FixO CLI session ended safely. Core engine offline.');
+            process.exit(0);
+        }
+        finally {
+            sigintHandling = false;
         }
-        // Second press within the window — exit
-        if (sigintResetTimer)
-            clearTimeout(sigintResetTimer);
-        sigintResetTimer = null;
-        sigintCount = 0;
-        exitCleanup();
-        console.log('\n\n👋 FixO CLI session ended safely. Core engine offline.');
-        process.exit(0);
     };
     // Listen on both the readline interface (catches Ctrl+C during rl.question())
     // and the process (fallback for non-readline scenarios).
@@ -355,7 +380,6 @@ export async function startREPL(options) {
         enableMouseReporting();
         const currentCursor = rl.cursor;
         let output = '\n';
-        const width = 60;
         const borderTop = `${c.snow}┌────────────────────────────────────────────────────────┐${c.reset}\n`;
         const borderBottom = `${c.snow}└────────────────────────────────────────────────────────┘${c.reset}`;
         output += borderTop;
@@ -468,7 +492,8 @@ export async function startREPL(options) {
             }
             catch (error) {
                 if (process.env.DEBUG || process.env.VERBOSE || process.argv.includes('--verbose')) {
-                    console.warn(`[Debug Warning] Failed to load skills list: ${error.message || error}`);
+                    const msg = error instanceof Error ? error.message : String(error);
+                    console.warn(`[Debug Warning] Failed to load skills list: ${msg}`);
                 }
             }
             const matchingFiles = workspaceFiles.filter(f => f.toLowerCase().includes(q) || path.basename(f).toLowerCase().startsWith(q));
@@ -498,6 +523,7 @@ export async function startREPL(options) {
     readline.emitKeypressEvents(process.stdin);
     if (process.stdin.isTTY) {
         process.stdin.setRawMode(true);
+        process.stdout.write('\x1b[?2004h');
     }
     const keypressHandler = (_char, key) => {
         if (!isPrompting)
@@ -535,6 +561,30 @@ export async function startREPL(options) {
     };
     process.stdin.on('keypress', keypressHandler);
     let mouseBuffer = '';
+    function getPasteTokenAtCursorForBackspace(line, cursor) {
+        const regex = /\[Paste #(\d+) \+\d+ lines\]/g;
+        let match;
+        while ((match = regex.exec(line)) !== null) {
+            const start = match.index;
+            const end = regex.lastIndex;
+            if (cursor > start && cursor <= end) {
+                return { id: parseInt(match[1], 10), start, end };
+            }
+        }
+        return null;
+    }
+    function getPasteTokenAtCursorForDelete(line, cursor) {
+        const regex = /\[Paste #(\d+) \+\d+ lines\]/g;
+        let match;
+        while ((match = regex.exec(line)) !== null) {
+            const start = match.index;
+            const end = regex.lastIndex;
+            if (cursor >= start && cursor < end) {
+                return { id: parseInt(match[1], 10), start, end };
+            }
+        }
+        return null;
+    }
     // Monkey-patch process.stdin.emit to intercept keypress and mouse events
     const originalEmit = process.stdin.emit;
     process.stdin.emit = function (event, ...args) {
@@ -543,6 +593,78 @@ export async function startREPL(options) {
             if (rawData) {
                 let str = mouseBuffer + rawData.toString();
                 mouseBuffer = '';
+                // ── Bracketed Paste Interception ──────────────────────────────
+                // This fires when the terminal supports bracketed paste mode
+                // (\x1b[?2004h is enabled in promptForInput on every render).
+                if (str.includes('\x1b[200~')) {
+                    const parts = str.split('\x1b[200~');
+                    // Any characters before the paste-start marker are real keystrokes
+                    if (parts[0]) {
+                        originalEmit.apply(this, ['data', Buffer.from(parts[0])]);
+                    }
+                    isPasting = true;
+                    pasteBuffer = '';
+                    str = parts.slice(1).join('\x1b[200~');
+                }
+                if (isPasting) {
+                    if (str.includes('\x1b[201~')) {
+                        const parts = str.split('\x1b[201~');
+                        pasteBuffer += parts[0];
+                        isPasting = false;
+                        const rawLines = pasteBuffer.split(/\r\n|\r|\n/);
+                        // Trim a single trailing empty line that terminals often append
+                        if (rawLines.length > 0 && rawLines[rawLines.length - 1] === '') {
+                            rawLines.pop();
+                        }
+                        if (rawLines.length > 1) {
+                            // Multi-line paste → attachment
+                            const id = pasteIdCounter++;
+                            pendingPastes.push({ id, content: pasteBuffer.replace(/\r\n/g, '\n'), lines: rawLines.length });
+                            injectTokenIntoPrompt(pasteToken(id, rawLines.length));
+                        }
+                        else {
+                            // Single line → let it flow into rl normally
+                            rl.write(pasteBuffer);
+                        }
+                        pasteBuffer = '';
+                        str = parts.slice(1).join('\x1b[201~');
+                        if (str.length === 0)
+                            return true;
+                    }
+                    else {
+                        // Still accumulating paste data
+                        pasteBuffer += str;
+                        return true;
+                    }
+                }
+                // ── Heuristic Paste Fallback ──────────────────────────────────
+                // For terminals that strip bracketed paste codes, multi-line
+                // pastes arrive as a single large data chunk containing \n chars.
+                // Humans cannot produce this pattern; only paste events do.
+                //
+                // Guards:
+                //   1. Not already in isPasting mode (handled above).
+                //   2. The chunk is NOT a bare Enter keypress.
+                //   3. At least 3 non-empty lines AND total length > 80 chars.
+                //      (Prevents firing on "2\n" or any short accidental newline.)
+                if (!isPasting && str.includes('\n')) {
+                    const isJustEnter = (str === '\r' || str === '\n' || str === '\r\n');
+                    if (!isJustEnter && str.length > 80) {
+                        const rawLines = str.split(/\r\n|\r|\n/);
+                        // Remove a single trailing empty line
+                        if (rawLines.length > 0 && rawLines[rawLines.length - 1] === '') {
+                            rawLines.pop();
+                        }
+                        const nonEmptyLines = rawLines.filter(l => l.trim().length > 0);
+                        if (nonEmptyLines.length >= 3) {
+                            const id = pasteIdCounter++;
+                            pendingPastes.push({ id, content: str.replace(/\r\n/g, '\n'), lines: rawLines.length });
+                            injectTokenIntoPrompt(pasteToken(id, rawLines.length));
+                            // Swallow the chunk so readline never sees the \n characters
+                            return true;
+                        }
+                    }
+                }
                 // Intercept cursor position response
                 if (str.startsWith('\x1b[') && str.endsWith('R')) {
                     const match = str.match(/\x1b\[(\d+);(\d+)R/);
@@ -634,6 +756,38 @@ export async function startREPL(options) {
         }
         if (event === 'keypress') {
             const [char, key] = args;
+            if (isPrompting && key) {
+                if (key.name === 'backspace') {
+                    const line = rl.line;
+                    const cursor = rl.cursor;
+                    const tokenMatch = getPasteTokenAtCursorForBackspace(line, cursor);
+                    if (tokenMatch) {
+                        const { id, start, end } = tokenMatch;
+                        pendingPastes = pendingPastes.filter(p => p.id !== id);
+                        const newLine = line.slice(0, start) + line.slice(end);
+                        const newCursor = start;
+                        rl.line = newLine;
+                        rl.cursor = newCursor;
+                        rl._refreshLine();
+                        return true;
+                    }
+                }
+                else if (key.name === 'delete') {
+                    const line = rl.line;
+                    const cursor = rl.cursor;
+                    const tokenMatch = getPasteTokenAtCursorForDelete(line, cursor);
+                    if (tokenMatch) {
+                        const { id, start, end } = tokenMatch;
+                        pendingPastes = pendingPastes.filter(p => p.id !== id);
+                        const newLine = line.slice(0, start) + line.slice(end);
+                        const newCursor = start;
+                        rl.line = newLine;
+                        rl.cursor = newCursor;
+                        rl._refreshLine();
+                        return true;
+                    }
+                }
+            }
             // Intercept Escape or Ctrl+C to cancel a running task (when not prompting)
             if (key && key.name === 'escape' && isTaskRunning && currentRunningAgent) {
                 currentRunningAgent.abort();
@@ -657,17 +811,42 @@ export async function startREPL(options) {
                 // legacy dirLabel/branchLabel/modelLabel/modeLabel row
                 // is gone — the new bar carries all of that information.
                 drawLavaStatusBar();
-                process.stdout.write(`${C.LAVA}›${C.RESET} `);
+                process.stdout.write(`${c.dim}─────────────────────────────────────────────────────────────────${c.reset}\n> `);
                 return true; // swallow keypress
             }
         }
         return originalEmit.apply(this, [event, ...args]);
     };
+    /**
+     * Injects `token` into the readline line buffer and redraws the prompt line.
+     * Any text already in rl.line is preserved and appended after the token
+     * with a space separator.
+     *
+     * This produces the Claude Code / Antigravity pattern:
+     *   > [Paste #1 +45 lines] <any pre-paste text the user was typing>
+     */
+    function injectTokenIntoPrompt(token) {
+        // 1. Capture whatever the user had typed before pasting
+        const preTyped = (rl.line ?? '').trimEnd();
+        // 2. Clear the entire current line visually
+        readline.clearLine(process.stdout, 0);
+        readline.cursorTo(process.stdout, 0);
+        // 3. Wipe rl's internal buffer with Ctrl-U so readline tracks zero length
+        rl.write(null, { ctrl: true, name: 'u' });
+        // 4. Write the token (+ pre-typed text if any) back into rl
+        const newLine = preTyped.length > 0 ? `${token} ${preTyped}` : token;
+        rl.write(newLine);
+        // rl.write() both updates rl.line and echoes the characters to stdout,
+        // so the user sees:   > [Paste #1 +45 lines] Refactor th
+        // with the cursor positioned after the last character.
+    }
     // ──── REPL loop ────
     const promptForInput = () => {
         // Restore raw mode and resume streams to recover from any clack/spinner interactions
         if (process.stdin.isTTY) {
             process.stdin.setRawMode(true);
+            // Explicitly re-enable Bracketed Paste Mode just in case a spinner disabled it
+            process.stdout.write('\x1b[?2004h');
         }
         process.stdin.resume();
         rl.resume();
@@ -677,7 +856,8 @@ export async function startREPL(options) {
         // visible in the bar; the prompt itself is the lava `›` glyph.
         drawLavaStatusBar();
         isPrompting = true;
-        rl.question(`${C.LAVA}›${C.RESET} `, async (input) => {
+        const promptPrefix = `\n${C.SNOW4}╭─${C.RESET} 👤 ${C.LAVA}${C.BOLD}User${C.RESET}\n${C.SNOW4}╰─❯${C.RESET} `;
+        rl.question(promptPrefix, async (input) => {
             isPrompting = false;
             disableMouseReporting();
             clearSuggestions();
@@ -702,12 +882,45 @@ export async function startREPL(options) {
                 else if (msg.includes('429')) {
                     console.log(`${c.dim}  → Rate limited. Wait a moment or add more API keys.${c.reset}`);
                 }
+                else if (msg.includes('404') || msg.toLowerCase().includes('model not found')) {
+                    rl.pause();
+                    const fallback = await p.confirm({
+                        message: `Model '${currentModel}' not found or unavailable. Switch to default 'auto' model and retry?`,
+                        initialValue: true,
+                    });
+                    rl.resume();
+                    if (fallback && !p.isCancel(fallback)) {
+                        console.log(`\n${c.dim}Switching to 'auto' and retrying...${c.reset}`);
+                        currentModel = 'auto';
+                        try {
+                            await handleInput(trimmed);
+                        }
+                        catch (retryError) {
+                            console.log(`\n${c.red}✗ Retry failed: ${retryError instanceof Error ? retryError.message : String(retryError)}${c.reset}`);
+                        }
+                    }
+                }
             }
             promptForInput();
         });
     };
     // ──── Input handler ────
-    async function handleInput(input) {
+    async function handleInput(rawInput) {
+        // ── Payload assembly ─────────────────────────────────────────────
+        // Strip paste tokens from the user's typed text so the LLM only
+        // sees the clean question, not "[Paste #1 +45 lines]" literally.
+        const tokenPattern = /\[Paste #\d+ \+\d+ lines\]\s*/g;
+        const cleanRawInput = rawInput.replace(tokenPattern, '').trim();
+        // Build final LLM payload: question first, context blocks after.
+        let input = cleanRawInput;
+        if (pendingPastes.length > 0) {
+            const contextBlocks = pendingPastes
+                .map(p => `<pasted_context id="${p.id}">\n${p.content}\n</pasted_context>`)
+                .join('\n\n');
+            input = cleanRawInput.length > 0
+                ? `${cleanRawInput}\n\n${contextBlocks}`
+                : contextBlocks;
+        }
         // ─── Slash commands ───
         if (input.startsWith('/')) {
             const parts = input.split(/\s+/).filter(Boolean);
@@ -729,1099 +942,150 @@ export async function startREPL(options) {
                 case '/help':
                     printHelp();
                     return;
-                case '/model': {
-                    if (args[0] === 'list') {
-                        // Print full model table grouped by provider
-                        // Uses live-fetched cached models when available, otherwise falls
-                        // back to the static registry list (tagged [unverified]).
-                        console.log(`\n${c.bold}${c.cyan}Available Models by Provider${c.reset}`);
-                        console.log(`${c.dim}${'─'.repeat(60)}${c.reset}`);
-                        for (const def of PROVIDER_REGISTRY) {
-                            const hasKey = ProvidersManager.has(def.name);
-                            const keyStatus = hasKey ? `${c.green}[key ✓]${c.reset}` : `${c.dim}[no key]${c.reset}`;
-                            const cached = ProvidersManager.getCachedModels(def.name);
-                            const modelList = cached?.models?.length ? cached.models : def.models;
-                            const sourceTag = cached?.source === 'live'
-                                ? ''
-                                : ` ${c.dim}[unverified]${c.reset}`;
-                            console.log(`\n  ${c.snow}${c.bold}${def.displayName}${c.reset} ${keyStatus}${sourceTag}`);
-                            for (const model of modelList) {
-                                console.log(`    ${c.cyan}•${c.reset} ${model}`);
-                            }
-                        }
-                        console.log(`\n${c.dim}  Use /providers add <name> to connect a provider with your API key.${c.reset}`);
-                        console.log(`${c.dim}  Or set model directly: /model <model-id>${c.reset}\n`);
+                case '/view': {
+                    const id = parseInt(args[0] ?? '', 10);
+                    if (isNaN(id)) {
+                        console.log(`\n${c.yellow}⚠ Usage: /view <paste-id>${c.reset}`);
+                        promptForInput();
                         return;
                     }
-                    if (args.length === 0) {
-                        // Redesigned interactive model picker grouped by provider
-                        rl.pause();
-                        const pickedProvider = await p.select({
-                            message: `Current model: ${c.cyan}${currentModel}${c.reset} — Select AI Provider:`,
-                            options: [
-                                { value: 'all', label: 'Show all models (flat list)', hint: 'classic view' },
-                                ...PROVIDER_REGISTRY.map(def => ({
-                                    value: def.name,
-                                    label: def.displayName,
-                                    hint: ProvidersManager.has(def.name) ? ' [key ✓]' : ' [no key]'
-                                })),
-                                { value: '__manual__', label: 'Enter model ID manually…', hint: '' },
-                            ],
-                            initialValue: PROVIDER_REGISTRY.find(def => def.models.includes(currentModel))?.name || 'all',
-                        });
-                        rl.resume();
-                        if (p.isCancel(pickedProvider)) {
-                            console.log(`\n${c.dim}Model unchanged: ${c.cyan}${currentModel}${c.reset}`);
-                            return;
-                        }
-                        if (pickedProvider === '__manual__') {
-                            rl.pause();
-                            const manual = await p.text({
-                                message: 'Enter model ID:',
-                                placeholder: 'e.g. gpt-4o, claude-opus-4-5, gemini-2.5-pro',
-                                validate: v => !v.trim() ? 'Model ID is required' : undefined,
-                            });
-                            rl.resume();
-                            if (!p.isCancel(manual) && manual) {
-                                currentModel = manual.trim();
-                                conversation.setContextLimit(currentModel);
-                                console.log(`\n${c.green}✓ Model set to: ${c.bold}${currentModel}${c.reset}`);
-                            }
-                            return;
-                        }
-                        if (pickedProvider === 'all') {
-                            rl.pause();
-                            const allOptions = PROVIDER_REGISTRY.flatMap(def => def.models.map(m => ({
-                                value: m,
-                                label: `${m}`,
-                                hint: def.displayName + (ProvidersManager.has(def.name) ? ' [key ✓]' : ''),
-                            })));
-                            const picked = await p.select({
-                                message: 'Select a model from the flat list:',
-                                options: [
-                                    { value: currentModel, label: `Keep current: ${currentModel}`, hint: 'no change' },
-                                    ...allOptions,
-                                ],
-                                initialValue: currentModel,
-                            });
-                            rl.resume();
-                            if (p.isCancel(picked)) {
-                                console.log(`\n${c.dim}Model unchanged: ${c.cyan}${currentModel}${c.reset}`);
-                                return;
-                            }
-                            currentModel = picked;
-                            // Store hint — find which provider this model belongs to
-                            const owningDef = PROVIDER_REGISTRY.find(d => d.models.includes(currentModel)
-                                || ProvidersManager.getCachedModels(d.name)?.models?.includes(currentModel));
-                            if (owningDef)
-                                ProvidersManager.setModelProviderHint(currentModel, owningDef.name);
-                            conversation.setContextLimit(currentModel);
-                            console.log(`\n${c.green}✓ Model set to: ${c.bold}${currentModel}${c.reset}`);
-                            return;
-                        }
-                        const def = PROVIDER_REGISTRY.find(p => p.name === pickedProvider);
-                        const hasKey = ProvidersManager.has(def.name);
-                        const keyStatus = hasKey ? `${c.green}[key ✓]${c.reset}` : `${c.red}[no key]${c.reset}`;
-                        // Prefer the cached live model list; fall back to the
-                        // registry list (tagged `[unverified]`) when no fresh
-                        // cache exists. Drops the synthetic "(free)" suffix
-                        // since we no longer know that without provider
-                        // metadata.
-                        const cached = ProvidersManager.getCachedModels(def.name);
-                        const modelList = cached?.models?.length ? cached.models : def.models;
-                        const sourceSuffix = cached?.source === 'live'
-                            ? ''
-                            : ` ${c.dim}[unverified]${c.reset}`;
-                        rl.pause();
-                        const picked = await p.select({
-                            message: `Select a model from ${c.bold}${def.displayName}${c.reset} ${keyStatus}${sourceSuffix}:`,
-                            options: modelList.map(m => {
-                                return {
-                                    value: m,
-                                    label: m,
-                                    hint: m === currentModel ? 'currently selected' : ''
-                                };
-                            }),
-                            initialValue: modelList.includes(currentModel) ? currentModel : undefined,
-                        });
-                        rl.resume();
-                        if (p.isCancel(picked)) {
-                            console.log(`\n${c.dim}Model unchanged: ${c.cyan}${currentModel}${c.reset}`);
-                            return;
-                        }
-                        currentModel = picked;
-                        // Store explicit model-provider association so
-                        // resolveDirectConfig can route this model directly
-                        // to this provider (critical for live-fetched models
-                        // that don't appear in the static registry).
-                        ProvidersManager.setModelProviderHint(currentModel, def.name);
-                        conversation.setContextLimit(currentModel);
-                        console.log(`\n${c.green}✓ Model set to: ${c.bold}${currentModel}${c.reset}`);
+                    const paste = pendingPastes.find(p => p.id === id);
+                    if (!paste) {
+                        console.log(`\n${c.yellow}⚠ Paste #${id} not found. Active pastes: ${pendingPastes.length > 0
+                            ? pendingPastes.map(p => `#${p.id}`).join(', ')
+                            : 'none'}${c.reset}`);
+                        promptForInput();
                         return;
                     }
-                    currentModel = args.join(' ');
-                    conversation.setContextLimit(currentModel);
-                    console.log(`\n${c.green}✓ Model set to: ${c.bold}${currentModel}${c.reset}`);
+                    const border = `${c.dim}${'─'.repeat(60)}${c.reset}`;
+                    console.log(`\n${border}`);
+                    console.log(`${c.cyan}Paste #${paste.id} — ${paste.lines} lines${c.reset}`);
+                    console.log(border);
+                    console.log(paste.content);
+                    console.log(border);
+                    promptForInput();
                     return;
                 }
-                case '/select': {
-                    if (args.length === 0) {
-                        if (selectedFiles.length === 0) {
-                            console.log(`\n${c.dim}No files selected. Usage: /select <file-path>${c.reset}`);
-                        }
-                        else {
-                            console.log(`\n${c.dim}Selected files:${c.reset}`);
-                            for (const f of selectedFiles) {
-                                console.log(`  ${c.cyan}${path.basename(f)}${c.reset} ${c.dim}(${f})${c.reset}`);
-                            }
-                        }
+                case '/edit': {
+                    const id = parseInt(args[0] ?? '', 10);
+                    if (isNaN(id)) {
+                        console.log(`\n${c.yellow}⚠ Usage: /edit <paste-id>${c.reset}`);
+                        promptForInput();
                         return;
                     }
-                    let rawPath = args.join(' ');
-                    if ((rawPath.startsWith("'") && rawPath.endsWith("'")) ||
-                        (rawPath.startsWith('"') && rawPath.endsWith('"'))) {
-                        rawPath = rawPath.slice(1, -1);
-                    }
-                    let filePath;
-                    try {
-                        filePath = guard.ensureFile(rawPath);
-                    }
-                    catch (error) {
-                        console.log(`\n${c.red}✗ ${error instanceof Error ? error.message : String(error)}${c.reset}`);
+                    const paste = pendingPastes.find(p => p.id === id);
+                    if (!paste) {
+                        console.log(`\n${c.yellow}⚠ Paste #${id} not found.${c.reset}`);
+                        promptForInput();
                         return;
                     }
-                    if (!fs.existsSync(filePath)) {
-                        console.log(`\n${c.red}✗ File not found: ${rawPath}${c.reset}`);
-                        return;
-                    }
-                    if (!selectedFiles.includes(filePath)) {
-                        selectedFiles.push(filePath);
-                    }
-                    console.log(`\n${c.green}✓ Pinned: ${c.bold}${path.basename(filePath)}${c.reset}`);
-                    return;
-                }
-                case '/unselect':
-                    selectedFiles = [];
-                    console.log(`\n${c.green}✓ All pinned files cleared${c.reset}`);
-                    return;
-                case '/diff':
-                    console.log(`\n${git.getDiff()}`);
-                    return;
-                case '/undo': {
-                    if (args[0]) {
-                        console.log(`\n${undoRun(cwd, args[0])}`);
-                        return;
-                    }
-                    rl.pause();
-                    const confirmed = await p.confirm({
-                        message: 'Are you sure you want to completely discard the last automated agent commit and restore all files?',
-                        initialValue: false,
-                    });
-                    rl.resume();
-                    if (p.isCancel(confirmed) || !confirmed) {
-                        console.log(`\n${c.yellow}  ⚠ Undo cancelled.${c.reset}`);
-                        return;
-                    }
-                    git.undoLastCommit();
-                    return;
-                }
-                case '/clear':
-                    conversation.clear();
-                    pendingAttachments = [];
-                    console.log(`\n${c.green}✓ Conversation cleared${c.reset}`);
-                    return;
-                case '/image': {
-                    // `/image <path>` — queue a local image for the next turn.
-                    // `/image clear` — drop the queue.
-                    // `/image list` — show what's queued.
-                    const sub = args[0];
-                    if (sub === 'clear') {
-                        const n = pendingAttachments.length;
-                        pendingAttachments = [];
-                        console.log(`\n${c.green}✓ Cleared ${n} pending image(s)${c.reset}`);
-                        return;
-                    }
-                    if (sub === 'list') {
-                        if (pendingAttachments.length === 0) {
-                            console.log(`\n${c.dim}No pending images.${c.reset}`);
-                            return;
-                        }
-                        console.log(`\n${c.bold}Pending images (sent on next prompt):${c.reset}`);
-                        for (const [i, block] of pendingAttachments.entries()) {
-                            if (block.type === 'image' && block.source.kind === 'base64') {
-                                const approxBytes = Math.floor((block.source.data.length * 3) / 4);
-                                console.log(`  ${i + 1}. ${block.source.mediaType} (~${approxBytes} bytes)`);
-                            }
-                        }
-                        return;
-                    }
-                    if (!sub) {
-                        console.log(`\n${c.yellow}Usage: /image <path> | /image list | /image clear${c.reset}`);
-                        return;
-                    }
-                    const result = loadImageAsBlock(sub, cwd);
-                    if (!result.ok) {
-                        console.log(`\n${c.red}✗ /image: ${result.error}${c.reset}`);
-                        return;
-                    }
-                    pendingAttachments.push(result.block);
-                    console.log(`\n${c.green}✓ Attached${c.reset} ${c.dim}${result.mediaType}, ${result.bytes} bytes — will be sent with your next prompt${c.reset}`);
-                    return;
-                }
-                case '/mcp': {
-                    const sub = args[0]?.toLowerCase();
-                    if (!sub || sub === 'list') {
-                        const { listAllMcpSources, mergedMcpServers } = await import('../agent/mcp-registry.js');
-                        const view = listAllMcpSources(cwd);
-                        console.log(`\n${c.bold}${c.cyan}MCP Servers${c.reset} ${c.dim}(project-wins precedence: local > project > global)${c.reset}`);
-                        console.log(`${c.dim}${'─'.repeat(60)}${c.reset}`);
-                        const renderSource = (label, s) => {
-                            const names = Object.keys(s.servers);
-                            if (names.length === 0) {
-                                console.log(`  ${c.dim}${label}: (empty)${s.configPath ? ` ${c.dim}${s.configPath}${c.reset}` : ''}`);
-                                return;
-                            }
-                            console.log(`  ${c.bold}${label}${c.reset}${s.configPath ? ` ${c.dim}${s.configPath}${c.reset}` : ''}`);
-                            for (const n of names) {
-                                console.log(`    ${c.cyan}•${c.reset} ${n}`);
-                            }
-                        };
-                        renderSource('global', view.global);
-                        renderSource('project', view.project);
-                        renderSource('local', view.local);
-                        const merged = mergedMcpServers(cwd);
-                        const mergedCount = Object.keys(merged).length;
-                        console.log(`\n${c.dim}merged total: ${mergedCount} server(s)${c.reset}`);
-                        return;
-                    }
-                    if (sub === 'add') {
-                        const name = args[1];
-                        if (!name || args.length < 3) {
-                            console.log(`\n${c.yellow}Usage: /mcp add <name> <command> [args...]${c.reset}`);
-                            return;
-                        }
-                        const cmd = args[2];
-                        const cmdArgs = args.slice(3);
-                        const { addLocalMcpServer } = await import('../agent/mcp-registry.js');
-                        addLocalMcpServer(cwd, name, { command: cmd, args: cmdArgs, type: 'stdio' });
-                        console.log(`\n${c.green}✓ Added local MCP server:${c.reset} ${name} ${c.dim}(command=${cmd} args=${JSON.stringify(cmdArgs)})${c.reset}`);
-                        return;
-                    }
-                    if (sub === 'remove' || sub === 'rm') {
-                        const name = args[1];
-                        if (!name) {
-                            console.log(`\n${c.yellow}Usage: /mcp remove <name>${c.reset}`);
-                            return;
-                        }
-                        const { removeLocalMcpServer } = await import('../agent/mcp-registry.js');
-                        const removed = removeLocalMcpServer(cwd, name);
-                        if (removed) {
-                            console.log(`\n${c.green}✓ Removed local MCP server:${c.reset} ${name}`);
-                        }
-                        else {
-                            console.log(`\n${c.yellow}No local MCP server named ${name}${c.reset}`);
-                        }
-                        return;
-                    }
-                    if (sub === 'test') {
-                        const name = args[1];
-                        if (!name) {
-                            console.log(`\n${c.yellow}Usage: /mcp test <name>${c.reset}`);
-                            return;
-                        }
-                        const { mergedMcpServers } = await import('../agent/mcp-registry.js');
-                        const all = mergedMcpServers(cwd);
-                        const cfg = all[name];
-                        if (!cfg) {
-                            console.log(`\n${c.yellow}No MCP server named ${name} (in any source)${c.reset}`);
-                            return;
-                        }
-                        const hasCommand = typeof cfg.command === 'string';
-                        const hasUrl = typeof cfg.url === 'string';
-                        if (hasCommand || hasUrl) {
-                            console.log(`\n${c.green}✓ ${name}${c.reset} — config looks valid (${hasCommand ? 'stdio' : 'sse'})`);
+                    const tmpFile = path.join(os.tmpdir(), `fixo-paste-${id}-${Date.now()}.txt`);
+                    try {
+                        fs.writeFileSync(tmpFile, paste.content, 'utf-8');
+                        // Release the terminal before handing it to the external editor
+                        if (process.stdin.isTTY)
+                            process.stdin.setRawMode(false);
+                        process.stdout.write('\x1b[?2004l'); // disable bracketed paste while editor is open
+                        const editor = process.env.VISUAL ?? process.env.EDITOR ?? (os.platform() === 'win32' ? 'notepad' : 'nano');
+                        const { spawnSync } = await import('child_process');
+                        spawnSync(editor, [tmpFile], { stdio: 'inherit' });
+                        const edited = fs.readFileSync(tmpFile, 'utf-8');
+                        fs.unlinkSync(tmpFile);
+                        if (edited.trim().length === 0) {
+                            console.log(`\n${c.yellow}⚠ Editor returned empty content — paste #${id} unchanged.${c.reset}`);
                         }
                         else {
-                            console.log(`\n${c.red}✗ ${name}${c.reset} — missing 'command' or 'url'`);
-                        }
-                        return;
-                    }
-                    console.log(`\n${c.yellow}Unknown /mcp subcommand: ${sub}. Use: list | add | remove | test${c.reset}`);
-                    return;
-                }
-                case '/todo': {
-                    const sub = args[0]?.toLowerCase();
-                    if (!sub || sub === 'list' || sub === 'ls') {
-                        const list = loadTodoList(cwd);
-                        const summary = summariseTodoList(list);
-                        console.log('');
-                        console.log(renderTodoList(list));
-                        if (summary.length > 0) {
-                            console.log(`\n${c.dim}(${summary})${c.reset}`);
+                            paste.content = edited;
+                            paste.lines = edited.split(/\r?\n/).filter(l => l.length > 0).length;
+                            console.log(`\n${c.green}✓ Updated Paste #${id} (${paste.lines} lines)${c.reset}`);
                         }
-                        return;
                     }
-                    if (sub === 'add') {
-                        const text = args.slice(1).join(' ').trim();
-                        if (text.length === 0) {
-                            console.log(`\n${c.yellow}Usage: /todo add <text>${c.reset}`);
-                            return;
-                        }
-                        const list = addItem(loadTodoList(cwd), { content: text });
-                        const result = saveTodoList(cwd, list);
-                        if (!result.ok) {
-                            console.log(`\n${c.red}✗ Failed to save todo: ${result.error}${c.reset}`);
-                            return;
-                        }
-                        console.log(`\n${c.green}✓ Added todo:${c.reset} ${text}`);
-                        return;
-                    }
-                    if (sub === 'done' || sub === 'complete' || sub === 'cancel') {
-                        const id = args[1];
-                        if (!id) {
-                            console.log(`\n${c.yellow}Usage: /todo ${sub} <id>${c.reset}`);
-                            return;
-                        }
-                        const status = sub === 'cancel' ? 'cancelled' : 'done';
-                        let list = loadTodoList(cwd);
-                        const exists = list.items.some((it) => it.id === id);
-                        if (!exists) {
-                            console.log(`\n${c.red}✗ No todo with id "${id}"${c.reset}`);
-                            return;
-                        }
-                        list = setItemStatus(list, { id, status });
-                        const result = saveTodoList(cwd, list);
-                        if (!result.ok) {
-                            console.log(`\n${c.red}✗ Failed to save todo: ${result.error}${c.reset}`);
-                            return;
-                        }
-                        console.log(`\n${c.green}✓ Marked ${status}${c.reset}`);
-                        return;
-                    }
-                    if (sub === 'start' || sub === 'progress') {
-                        const id = args[1];
-                        if (!id) {
-                            console.log(`\n${c.yellow}Usage: /todo ${sub} <id>${c.reset}`);
-                            return;
-                        }
-                        let list = loadTodoList(cwd);
-                        const exists = list.items.some((it) => it.id === id);
-                        if (!exists) {
-                            console.log(`\n${c.red}✗ No todo with id "${id}"${c.reset}`);
-                            return;
-                        }
-                        list = setItemStatus(list, { id, status: 'in_progress' });
-                        const result = saveTodoList(cwd, list);
-                        if (!result.ok) {
-                            console.log(`\n${c.red}✗ Failed to save todo: ${result.error}${c.reset}`);
-                            return;
-                        }
-                        console.log(`\n${c.green}✓ Marked in_progress${c.reset}`);
-                        return;
-                    }
-                    if (sub === 'remove' || sub === 'rm' || sub === 'delete') {
-                        const id = args[1];
-                        if (!id) {
-                            console.log(`\n${c.yellow}Usage: /todo remove <id>${c.reset}`);
-                            return;
-                        }
-                        let list = loadTodoList(cwd);
-                        const exists = list.items.some((it) => it.id === id);
-                        if (!exists) {
-                            console.log(`\n${c.red}✗ No todo with id "${id}"${c.reset}`);
-                            return;
-                        }
-                        list = removeItem(list, { id });
-                        const result = saveTodoList(cwd, list);
-                        if (!result.ok) {
-                            console.log(`\n${c.red}✗ Failed to save todo: ${result.error}${c.reset}`);
-                            return;
-                        }
-                        console.log(`\n${c.green}✓ Removed todo${c.reset}`);
-                        return;
-                    }
-                    if (sub === 'clear') {
-                        const list = loadTodoList(cwd);
-                        const kept = list.items.filter((it) => it.status !== 'done' && it.status !== 'cancelled');
-                        const result = saveTodoList(cwd, { ...list, items: kept, updatedAt: Date.now() });
-                        if (!result.ok) {
-                            console.log(`\n${c.red}✗ Failed to save todo: ${result.error}${c.reset}`);
-                            return;
+                    catch (err) {
+                        console.log(`\n${c.red}✗ /edit failed: ${err.message}${c.reset}`);
+                        try {
+                            fs.unlinkSync(tmpFile);
                         }
-                        const cleared = list.items.length - kept.length;
-                        console.log(`\n${c.green}✓ Cleared ${cleared} completed todo(s)${c.reset}`);
-                        return;
+                        catch { /* already gone */ }
                     }
-                    if (sub === 'help' || sub === '-h' || sub === '--help') {
-                        console.log(`\n${c.bold}Usage: /todo <subcommand>${c.reset}`);
-                        console.log(`  list                  List all todo items`);
-                        console.log(`  add <text>            Add a new todo`);
-                        console.log(`  start <id>            Mark a todo as in-progress`);
-                        console.log(`  done <id>             Mark a todo as done`);
-                        console.log(`  cancel <id>           Cancel a todo`);
-                        console.log(`  remove <id>           Remove a todo entirely`);
-                        console.log(`  clear                 Remove all done/cancelled todos`);
-                        return;
+                    finally {
+                        // Reclaim raw mode and bracketed paste before returning to REPL
+                        if (process.stdin.isTTY)
+                            process.stdin.setRawMode(true);
+                        process.stdout.write('\x1b[?2004h');
                     }
-                    console.log(`\n${c.yellow}Unknown /todo subcommand "${sub}". Try /todo help.${c.reset}`);
+                    promptForInput();
                     return;
                 }
-                case '/log':
-                    console.log(`\n${git.getRecentCommits(10)}`);
-                    return;
-                case '/stats':
-                    printStats(stats);
-                    {
-                        const ctxTokens = conversation.getTotalTokens();
-                        const ctxLimit = conversation.getContextLimit();
-                        const ctxPct = Math.round((ctxTokens / ctxLimit) * 100);
-                        const hasSummary = conversation.getSummary() ? ' (compacted)' : '';
-                        console.log(`${c.cyan}${c.bold}📊 Context Window${c.reset}`);
-                        console.log(`${c.dim}${'─'.repeat(40)}${c.reset}`);
-                        console.log(`  History messages:    ${c.bold}${conversation.getMessageCount()}${c.reset}${hasSummary}`);
-                        console.log(`  Context usage:       ${c.bold}${(ctxTokens / 1000).toFixed(0)}k / ${(ctxLimit / 1000).toFixed(0)}k${c.reset} (${ctxPct}%)`);
-                        console.log(`  Turns:               ${c.bold}${conversation.getTurnCount()}${c.reset}`);
-                        console.log('');
+                case '/pastes': {
+                    if (pendingPastes.length === 0) {
+                        console.log(`\n${c.dim}No active paste attachments.${c.reset}`);
                     }
-                    return;
-                case '/runs': {
-                    const runs = listRuns(cwd, 12);
-                    console.log(runs.length
-                        ? `\n${runs.map(run => `${run.id} ${run.status} ${run.task.slice(0, 80)}`).join('\n')}`
-                        : '\n(no FixO runs recorded)');
-                    return;
-                }
-                case '/show-run':
-                    console.log(`\n${showRun(cwd, args[0] ?? '')}`);
-                    return;
-                case '/memory':
-                    console.log(`\n${readMemory(cwd)}`);
-                    return;
-                case '/remember': {
-                    const text = args.join(' ').trim();
-                    if (!text) {
-                        console.log(`\n${c.yellow}Usage: /remember <project fact>${c.reset}`);
-                        return;
-                    }
-                    rl.pause();
-                    const confirmed = await p.confirm({ message: `Add to project memory: ${text}?`, initialValue: false });
-                    rl.resume();
-                    if (!p.isCancel(confirmed) && confirmed) {
-                        appendMemory(cwd, text);
-                        console.log(`\n${c.green}✓ Memory updated${c.reset}`);
-                    }
-                    return;
-                }
-                case '/forget':
-                    rl.pause();
-                    {
-                        const confirmed = await p.confirm({ message: 'Clear FixO project memory?', initialValue: false });
-                        rl.resume();
-                        if (!p.isCancel(confirmed) && confirmed) {
-                            forgetMemory(cwd);
-                            console.log(`\n${c.green}✓ Memory cleared${c.reset}`);
+                    else {
+                        console.log(`\n${c.cyan}Active paste attachments:${c.reset}`);
+                        for (const p of pendingPastes) {
+                            console.log(`  ${c.bold}#${p.id}${c.reset}  ${p.lines} lines  /view ${p.id} · /edit ${p.id}`);
                         }
                     }
-                    return;
-                case '/doctor':
-                    console.log(`\n${doctor(cwd)}`);
-                    return;
-                case '/index': {
-                    const index = await buildIndex(cwd);
-                    workspaceFiles = index.files.map(f => f.path);
-                    console.log(`\n${c.green}✓ Indexed ${index.files.length} files${c.reset}`);
+                    promptForInput();
                     return;
                 }
-                case '/find':
-                    console.log(`\n${await findInIndex(cwd, args.join(' '))}`);
-                    return;
-                case '/explain':
-                    console.log(`\n${await explainIndexedTarget(cwd, args.join(' '))}`);
-                    return;
-                case '/review':
-                    console.log(`\n${reviewWorkspace(cwd)}`);
-                    return;
-                case '/test':
-                    console.log(`\n${runProjectTests(cwd)}`);
-                    return;
-                case '/fix-tests': {
-                    let testResult = runProjectTests(cwd);
-                    if (testResult.includes('Status: 0')) {
-                        console.log(`\n${c.green}✓ All tests are passing!${c.reset}`);
-                        return;
-                    }
-                    let attempt = 1;
-                    const maxAttempts = 3;
-                    const modifiedFiles = [];
-                    while (attempt <= maxAttempts) {
-                        console.log(`\n${c.cyan}🔨 [Auto-Fix] Test failure detected (Attempt ${attempt}/${maxAttempts}). Invoking SingleAgent to repair...${c.reset}`);
-                        console.log(`${c.dim}${testResult}${c.reset}\n`);
-                        const repairTask = `The project tests are failing. Here is the test runner output:\n\n${testResult}\n\nPlease identify the files causing the failure, modify them to fix the issues, verify using the test commands, and ensure they pass.`;
-                        const context = {
-                            task: repairTask,
-                            model: currentModel,
+                default: {
+                    const handler = commandRegistry[cmd];
+                    if (handler) {
+                        const ctx = {
+                            state: {
+                                currentModel,
+                                currentMode,
+                                currentSessionId,
+                                currentSessionLabel,
+                                sessionModifiedFiles,
+                                pendingAttachments,
+                                selectedFiles,
+                                stats,
+                                isTaskRunning,
+                                currentRunningAgent,
+                            },
+                            args,
+                            config,
+                            projectConfig,
                             cwd,
                             verbose,
-                            selectedFiles: [...selectedFiles],
-                            systemPromptOverride: projectConfig?.systemPrompt,
-                            checkCommand: projectConfig?.checkCommand,
-                            policy: projectConfig?.policy ?? config.preferences.policy,
-                            mode: 'BUILD',
-                            yes: true,
+                            conversation,
+                            agent,
+                            git,
+                            guard,
+                            rl,
+                            handleInput,
+                            clearSuggestions,
+                            refreshModelsForProvider,
+                            printStats,
+                            listRuns,
+                            showRun,
+                            buildIndex,
+                            workspaceFiles,
+                            findInIndex,
+                            explainIndexedTarget,
                         };
-                        try {
-                            isTaskRunning = true;
-                            currentRunningAgent = agent;
-                            const result = await agent.runStreaming(context, conversation, rl);
-                            for (const file of result.modifiedFiles) {
-                                if (!modifiedFiles.includes(file)) {
-                                    modifiedFiles.push(file);
-                                }
-                            }
-                        }
-                        catch (err) {
-                            console.log(`\n${c.red}✗ Repair agent failed on attempt ${attempt}: ${err.message || err}${c.reset}`);
-                        }
-                        finally {
-                            isTaskRunning = false;
-                            currentRunningAgent = null;
-                            agent.reset();
-                        }
-                        testResult = runProjectTests(cwd);
-                        if (testResult.includes('Status: 0')) {
-                            console.log(`\n${c.green}✓ All tests passed after repair attempt ${attempt}!${c.reset}`);
-                            break;
-                        }
-                        else {
-                            attempt++;
-                        }
-                    }
-                    if (!testResult.includes('Status: 0')) {
-                        console.log(`\n${c.red}✗ Auto-fix failed after ${maxAttempts} attempts. Remaining failures:${c.reset}`);
-                        console.log(`${c.dim}${testResult}${c.reset}`);
-                    }
-                    else {
-                        // Auto-commit if enabled and changes were made
-                        if (config.preferences.autoCommit &&
-                            (projectConfig?.autoCommit !== false) &&
-                            modifiedFiles.length > 0) {
-                            console.log(`\n${c.green}✓ Auto-committing repaired test files...${c.reset}`);
-                            git.autoCommit('fix-tests: repair test failures', modifiedFiles);
-                        }
-                    }
-                    return;
-                }
-                case '/fix-ci':
-                    console.log(`\n${c.yellow}/fix-ci local mode: paste CI logs into a task or save them to a workspace file, then ask FixO to inspect that file.${c.reset}`);
-                    return;
-                case '/plan':
-                    {
-                        const task = args.join(' ').trim();
-                        if (!task) {
-                            console.log(`\n${c.yellow}Usage: /plan <task>${c.reset}`);
-                            return;
-                        }
-                        const plan = savePlan(cwd, task);
-                        console.log(`\n${renderPlan(plan)}`);
-                    }
-                    return;
-                case '/run-plan': {
-                    const dagFile = path.join(cwd, '.fixo', 'last-dag.json');
-                    if (fs.existsSync(dagFile)) {
-                        try {
-                            const { task, dag } = JSON.parse(fs.readFileSync(dagFile, 'utf-8'));
-                            console.log(`\n${c.cyan}[Saved Plan] Executing saved subtasks DAG for task: ${c.bold}${task}${c.reset}`);
-                            const { AgentPool } = await import('../agent/agent-pool.js');
-                            const pool = new AgentPool(3, projectConfig?.maxAttempts ?? 12);
-                            const context = {
-                                task,
-                                model: currentModel,
-                                cwd,
-                                verbose,
-                                selectedFiles: [...selectedFiles],
-                                systemPromptOverride: projectConfig?.systemPrompt,
-                                checkCommand: projectConfig?.checkCommand,
-                                policy: projectConfig?.policy ?? config.preferences.policy,
-                                mode: currentMode,
-                            };
-                            const success = await pool.execute(context, dag);
-                            if (success) {
-                                console.log(`\n${c.green}✓ Successfully completed complex task via parallel agents.${c.reset}`);
-                            }
-                            else {
-                                console.log(`\n${c.red}✗ Parallel workers failed to complete all subtasks.${c.reset}`);
-                                if (git.isGitRepo()) {
-                                    console.log(`\n${c.yellow}[Agent Pool] Rolling back all uncommitted changes due to run failure...${c.reset}`);
-                                    git.discardUncommittedChanges();
-                                }
-                            }
-                            return;
-                        }
-                        catch (err) {
-                            console.log(`\n${c.red}✗ Failed to run saved DAG: ${err.message}${c.reset}`);
-                        }
-                    }
-                    const plan = loadPlan(cwd);
-                    if (!plan) {
-                        console.log(`\n${c.yellow}No saved plan or DAG. Generate one with /plan <task> or run a complex task in PLAN mode.${c.reset}`);
-                        return;
-                    }
-                    console.log(`\n${c.dim}Executing saved plan task: ${plan.task}${c.reset}`);
-                    await handleInput(plan.task);
-                    return;
-                }
-                case '/mode': {
-                    rl.pause();
-                    const selected = await p.select({
-                        message: 'Select execution mode:',
-                        options: [
-                            { value: 'PLAN', label: 'PLAN Mode (Read-only, dry-run simulation)' },
-                            { value: 'BUILD', label: 'BUILD Mode (Writing & modifying allowed)' },
-                            { value: 'EXPLORE', label: 'EXPLORE Mode (Code exploration & LSP, no modifying)' },
-                            { value: 'SCOUT', label: 'SCOUT Mode (Web search & fetch only)' },
-                        ],
-                        initialValue: currentMode,
-                    });
-                    rl.resume();
-                    if (!p.isCancel(selected) && selected) {
-                        currentMode = selected;
-                        console.log(`\n${c.green}✓ Execution mode set to: ${c.bold}${currentMode}${c.reset}`);
-                    }
-                    else {
-                        console.log(`\n${c.dim}Execution mode remains: ${c.cyan}${currentMode}${c.reset}`);
-                    }
-                    return;
-                }
-                case '/rename': {
-                    // Renames the *active* session. Accepts the rest of the
-                    // input as a free-form label (so spaces don't need quoting).
-                    const rawLabel = args.join(' ').trim();
-                    const { isValidSessionLabel, MAX_LABEL_LENGTH } = await import('../runtime/session-snapshots.js');
-                    const { SessionManager } = await import('../agent/conversation.js');
-                    if (!rawLabel) {
-                        console.log(`\n${c.yellow}Usage: /rename <label>${c.reset}\n` +
-                            `${c.dim}  Labels are 1..${MAX_LABEL_LENGTH} chars: letters, digits, space, dash, underscore, dot.${c.reset}`);
-                        return;
-                    }
-                    if (!isValidSessionLabel(rawLabel)) {
-                        console.log(`\n${c.red}✗ Invalid label.${c.reset} ${c.dim}Allowed: letters, digits, space, dash, underscore, dot — max ${MAX_LABEL_LENGTH} chars.${c.reset}`);
-                        return;
-                    }
-                    // Persist if the session has already been saved at least
-                    // once; otherwise just remember the label in memory until
-                    // the next save fires.
-                    try {
-                        SessionManager.renameSession(currentSessionId, rawLabel);
-                    }
-                    catch {
-                        /* tolerate first-rename-before-save */
-                    }
-                    currentSessionLabel = rawLabel;
-                    console.log(`\n${c.green}✓ Session renamed:${c.reset} ${c.cyan}${rawLabel}${c.reset} ${c.dim}(id: ${currentSessionId})${c.reset}`);
-                    return;
-                }
-                case '/session': {
-                    const sub = args[0];
-                    const { SessionManager } = await import('../agent/conversation.js');
-                    if (sub === 'rename') {
-                        const id = args[1];
-                        const rawLabel = args.slice(2).join(' ').trim();
-                        const { isValidSessionLabel, MAX_LABEL_LENGTH } = await import('../runtime/session-snapshots.js');
-                        if (!id || !rawLabel) {
-                            console.log(`\n${c.yellow}Usage: /session rename <id> <label>${c.reset}`);
-                            return;
-                        }
-                        if (!isValidSessionLabel(rawLabel)) {
-                            console.log(`\n${c.red}✗ Invalid label.${c.reset} ${c.dim}Max ${MAX_LABEL_LENGTH} chars; letters, digits, space, dash, underscore, dot only.${c.reset}`);
-                            return;
-                        }
-                        const ok = SessionManager.renameSession(id, rawLabel);
-                        if (!ok) {
-                            console.log(`\n${c.red}✗ Session not found: ${id}${c.reset}`);
-                            return;
-                        }
-                        if (id === currentSessionId)
-                            currentSessionLabel = rawLabel;
-                        console.log(`\n${c.green}✓ Renamed${c.reset} ${c.dim}${id}${c.reset} → ${c.cyan}${rawLabel}${c.reset}`);
-                        return;
-                    }
-                    if (sub === 'list') {
-                        const list = SessionManager.listSessions();
-                        if (list.length === 0) {
-                            console.log(`\n${c.dim}No saved sessions found.${c.reset}`);
-                        }
-                        else {
-                            console.log(`\n${c.cyan}${c.bold}Saved Sessions:${c.reset}`);
-                            for (const s of list) {
-                                const date = new Date(s.timestamp).toLocaleString();
-                                const labelDisplay = s.label
-                                    ? `${c.cyan}${s.label}${c.reset} ${c.dim}(${s.sessionId.slice(0, 8)})${c.reset}`
-                                    : `${c.cyan}${s.sessionId}${c.reset}`;
-                                console.log(`  ${labelDisplay} - ${c.bold}${s.model}${c.reset} (${s.messageCount} msgs)`);
-                                console.log(`    ${c.dim}Created: ${date} | Tokens: ${s.totalTokens.toLocaleString()}${c.reset}`);
-                                if (s.summary) {
-                                    console.log(`    ${c.dim}Summary: ${s.summary.slice(0, 80)}...${c.reset}`);
-                                }
-                            }
-                        }
-                    }
-                    else if (sub === 'load') {
-                        const uuid = args[1];
-                        if (!uuid) {
-                            console.log(`\n${c.yellow}Usage: /session load <uuid>${c.reset}`);
-                            return;
-                        }
-                        try {
-                            const data = SessionManager.loadSession(uuid);
-                            conversation.clear();
-                            conversation.importHistory(data.history);
-                            conversation.setSummary(data.summary || '');
-                            currentModel = data.model;
-                            conversation.setContextLimit(currentModel);
-                            sessionModifiedFiles = data.modifiedFiles || [];
-                            currentSessionId = data.sessionId;
-                            currentSessionLabel = data.label;
-                            stats.totalPromptTokens = data.tokenUsage?.prompt_tokens || 0;
-                            stats.totalCompletionTokens = data.tokenUsage?.completion_tokens || 0;
-                            console.log(`\n${c.green}✓ Session restored successfully: ${c.bold}${uuid}${c.reset}`);
-                            console.log(`${c.dim}  Model set to: ${c.cyan}${currentModel}${c.reset}`);
-                        }
-                        catch (err) {
-                            console.log(`\n${c.red}✗ Failed to load session: ${err.message}${c.reset}`);
-                        }
-                    }
-                    else if (sub === 'new') {
-                        conversation.clear();
-                        sessionModifiedFiles = [];
-                        stats.totalPromptTokens = 0;
-                        stats.totalCompletionTokens = 0;
-                        stats.totalToolCalls = 0;
-                        stats.totalTasks = 0;
-                        stats.totalDurationMs = 0;
-                        const { randomUUID } = await import('node:crypto');
-                        currentSessionId = randomUUID();
-                        currentSessionLabel = undefined;
-                        SessionManager.saveSession(conversation, currentModel, sessionModifiedFiles, {
-                            prompt_tokens: stats.totalPromptTokens,
-                            completion_tokens: stats.totalCompletionTokens,
-                            total_tokens: stats.totalPromptTokens + stats.totalCompletionTokens,
-                        }, currentSessionId, currentSessionLabel);
-                        try {
-                            const { saveSnapshot } = await import('../runtime/session-snapshots.js');
-                            saveSnapshot({
-                                cwd,
-                                conversation: [],
-                                tokens: 0,
-                                model: currentModel,
-                                mode: currentMode,
-                                selectedFiles: [],
-                                summary: '',
-                                label: undefined,
-                                id: currentSessionId,
-                                fixedInstructions: projectConfig?.systemPrompt,
-                            });
-                        }
-                        catch {
-                            // Ignore snapshot save errors on new session
-                        }
-                        console.log(`\n${c.green}✓ Active conversation memory purged. New session initialized: ${c.bold}${currentSessionId}${c.reset}`);
-                    }
-                    else {
-                        console.log(`\n${c.yellow}Usage: /session [list | load <uuid> | new | rename <id> <label>]${c.reset}`);
-                    }
-                    return;
-                }
-                case '/providers': {
-                    const sub = args[0];
-                    // ── Interactive flow (bare `/providers`): mirrors the
-                    // /model picker shape. The user picks a provider, then
-                    // an action, then enters a masked API key via p.password
-                    // when the action is add/update. The legacy text routes
-                    // below remain unchanged for muscle-memory + scripting.
-                    if (!sub) {
-                        rl.pause();
-                        const pickedProvider = await p.select({
-                            message: 'Select an AI provider:',
-                            options: PROVIDER_REGISTRY.map(def => ({
-                                value: def.name,
-                                label: def.displayName,
-                                hint: ProvidersManager.has(def.name) ? '[key ✓]' : '[no key]',
-                            })),
-                        });
-                        rl.resume();
-                        if (p.isCancel(pickedProvider)) {
-                            console.log(`\n${c.dim}/providers cancelled.${c.reset}`);
-                            return;
-                        }
-                        const def = ProvidersManager.getDefinition(pickedProvider);
-                        if (!def) {
-                            console.log(`\n${c.red}✗ Unknown provider: ${pickedProvider}${c.reset}`);
-                            return;
-                        }
-                        const hasKey = ProvidersManager.has(def.name);
-                        rl.pause();
-                        const action = await p.select({
-                            message: `${def.displayName} — choose an action:`,
-                            options: [
-                                { value: 'add', label: hasKey ? 'Update API key' : 'Add API key' },
-                                { value: 'test', label: 'Test connection', hint: hasKey ? '' : 'requires a key' },
-                                { value: 'remove', label: 'Remove API key', hint: hasKey ? '' : 'no key configured' },
-                                { value: 'cancel', label: 'Cancel' },
-                            ],
-                        });
-                        rl.resume();
-                        if (p.isCancel(action) || action === 'cancel') {
-                            console.log(`\n${c.dim}/providers cancelled.${c.reset}`);
-                            return;
-                        }
-                        if (action === 'add') {
-                            console.log(`${c.dim}  Get your API key at: ${def.docsUrl}${c.reset}`);
-                            rl.pause();
-                            const key = await p.password({
-                                message: `Enter your ${def.displayName} API key:`,
-                                validate: v => !v?.trim() ? 'API key is required' : undefined,
-                            });
-                            rl.resume();
-                            if (p.isCancel(key)) {
-                                console.log(`\n${c.dim}/providers cancelled.${c.reset}`);
-                                return;
-                            }
-                            ProvidersManager.add(def.name, key);
-                            console.log(`\n${c.green}✓ ${def.displayName} API key saved securely to ~/.fixocli/providers.json${c.reset}`);
-                            await refreshModelsForProvider(def.name);
-                            return;
-                        }
-                        if (action === 'remove') {
-                            if (!hasKey) {
-                                console.log(`\n${c.yellow}No key configured for ${def.displayName}.${c.reset}`);
-                                return;
-                            }
-                            rl.pause();
-                            const confirmed = await p.confirm({
-                                message: `Remove API key for ${def.displayName}?`,
-                                initialValue: false,
-                            });
-                            rl.resume();
-                            if (!p.isCancel(confirmed) && confirmed) {
-                                const removed = ProvidersManager.remove(def.name);
-                                console.log(removed
-                                    ? `\n${c.green}✓ Removed API key for ${def.displayName}.${c.reset}`
-                                    : `\n${c.yellow}No key found for provider: ${def.name}${c.reset}`);
-                            }
-                            return;
+                        await handler(ctx);
+                        // Sync state back
+                        currentModel = ctx.state.currentModel;
+                        currentMode = ctx.state.currentMode;
+                        currentSessionId = ctx.state.currentSessionId;
+                        currentSessionLabel = ctx.state.currentSessionLabel;
+                        sessionModifiedFiles = ctx.state.sessionModifiedFiles;
+                        pendingAttachments = ctx.state.pendingAttachments;
+                        selectedFiles = ctx.state.selectedFiles;
+                        stats = ctx.state.stats;
+                        isTaskRunning = ctx.state.isTaskRunning;
+                        currentRunningAgent = ctx.state.currentRunningAgent;
+                        if (ctx.workspaceFiles) {
+                            workspaceFiles = ctx.workspaceFiles;
                         }
-                        if (action === 'test') {
-                            if (!hasKey) {
-                                console.log(`\n${c.yellow}No key configured for ${def.displayName}. Add one first.${c.reset}`);
-                                return;
-                            }
-                            console.log(`\n${c.dim}Testing connection to ${def.displayName} via live /models fetch…${c.reset}`);
-                            await refreshModelsForProvider(def.name);
-                            return;
-                        }
-                        return;
-                    }
-                    if (sub === 'list') {
-                        const list = ProvidersManager.list();
-                        if (list.length === 0) {
-                            console.log(`\n${c.yellow}No providers configured.${c.reset}`);
-                            console.log(`${c.dim}  Use /providers add <name> to connect a provider (e.g. /providers add groq)${c.reset}`);
-                            console.log(`${c.dim}  Available: ${PROVIDER_REGISTRY.map(p => p.name).join(', ')}${c.reset}`);
-                        }
-                        else {
-                            console.log(`\n${c.bold}${c.cyan}Connected Providers${c.reset}`);
-                            console.log(`${c.dim}${'─'.repeat(60)}${c.reset}`);
-                            for (const entry of list) {
-                                const addedDate = new Date(entry.addedAt).toLocaleDateString();
-                                console.log(`  ${c.cyan}${entry.name.padEnd(14)}${c.reset}${c.bold}${entry.displayName.padEnd(22)}${c.reset}${c.dim}${entry.maskedKey}  (added ${addedDate})${c.reset}`);
-                            }
-                            console.log(`\n${c.dim}  Use /providers remove <name> to remove a key.${c.reset}`);
-                            console.log(`${c.dim}  Use /providers test <name> to verify a connection.${c.reset}`);
-                        }
-                        return;
-                    }
-                    if (sub === 'add') {
-                        const name = args[1]?.toLowerCase();
-                        if (!name) {
-                            console.log(`\n${c.yellow}Usage: /providers add <provider-name>${c.reset}`);
-                            console.log(`${c.dim}  Available: ${PROVIDER_REGISTRY.map(p => p.name).join(', ')}${c.reset}`);
-                            return;
-                        }
-                        const def = ProvidersManager.getDefinition(name);
-                        if (!def) {
-                            console.log(`\n${c.red}✗ Unknown provider: ${name}${c.reset}`);
-                            console.log(`${c.dim}  Available: ${PROVIDER_REGISTRY.map(p => p.name).join(', ')}${c.reset}`);
-                            return;
-                        }
-                        console.log(`\n${c.cyan}${c.bold}Connecting to ${def.displayName}${c.reset}`);
-                        console.log(`${c.dim}  Get your API key at: ${def.docsUrl}${c.reset}`);
-                        rl.pause();
-                        const apiKeyInput = await p.text({
-                            message: `Enter your ${def.displayName} API key:`,
-                            placeholder: 'sk-... or gsk_...',
-                            validate: v => !v.trim() ? 'API key is required' : undefined,
-                        });
-                        rl.resume();
-                        if (p.isCancel(apiKeyInput)) {
-                            console.log(`\n${c.dim}Provider add cancelled.${c.reset}`);
-                            return;
-                        }
-                        ProvidersManager.add(name, apiKeyInput);
-                        console.log(`\n${c.green}✓ ${def.displayName} API key saved securely to ~/.fixocli/providers.json${c.reset}`);
-                        console.log(`${c.dim}  FixO will now route ${def.displayName} requests directly (bypassing the SaaS proxy).${c.reset}`);
-                        await refreshModelsForProvider(name);
                         return;
                     }
-                    if (sub === 'remove') {
-                        const name = args[1]?.toLowerCase();
-                        if (!name) {
-                            console.log(`\n${c.yellow}Usage: /providers remove <name>${c.reset}`);
-                            return;
-                        }
-                        rl.pause();
-                        const confirmed = await p.confirm({ message: `Remove API key for ${name}?`, initialValue: false });
-                        rl.resume();
-                        if (!p.isCancel(confirmed) && confirmed) {
-                            const removed = ProvidersManager.remove(name);
-                            console.log(removed
-                                ? `\n${c.green}✓ Removed API key for ${name}.${c.reset}`
-                                : `\n${c.yellow}No key found for provider: ${name}${c.reset}`);
-                        }
-                        return;
-                    }
-                    if (sub === 'test') {
-                        const name = args[1]?.toLowerCase();
-                        if (!name) {
-                            console.log(`\n${c.yellow}Usage: /providers test <name>${c.reset}`);
-                            return;
-                        }
-                        const directConf = ProvidersManager.getDirectConfig(name);
-                        if (!directConf) {
-                            console.log(`\n${c.yellow}No key configured for ${name}. Use /providers add ${name} first.${c.reset}`);
-                            return;
-                        }
-                        console.log(`\n${c.dim}Testing connection to ${directConf.displayName} (${directConf.baseUrl})...${c.reset}`);
-                        try {
-                            const testHeaders = {
-                                'Authorization': `Bearer ${directConf.apiKey}`,
-                            };
-                            if (name === 'zen' || name === 'openrouter') {
-                                testHeaders['HTTP-Referer'] = 'https://opencode.ai/';
-                                testHeaders['X-Title'] = 'opencode';
-                            }
-                            else if (name === 'nvidia') {
-                                testHeaders['HTTP-Referer'] = 'https://opencode.ai/';
-                                testHeaders['X-Title'] = 'opencode';
-                                testHeaders['X-BILLING-INVOKE-ORIGIN'] = 'OpenCode';
-                            }
-                            else if (name === 'cerebras') {
-                                testHeaders['X-Cerebras-3rd-Party-Integration'] = 'opencode';
-                            }
-                            const resp = await fetch(`${directConf.baseUrl}/models`, {
-                                headers: testHeaders,
-                                signal: AbortSignal.timeout(8000),
-                            });
-                            if (resp.ok) {
-                                console.log(`${c.green}✓ Connection to ${directConf.displayName} successful! (HTTP ${resp.status})${c.reset}`);
-                                // Warm the cache so /model picker shows live IDs.
-                                await refreshModelsForProvider(name);
-                            }
-                            else {
-                                const text = await resp.text().catch(() => '');
-                                console.log(`${c.red}✗ ${directConf.displayName} returned HTTP ${resp.status}${text ? ': ' + text.slice(0, 100) : ''}${c.reset}`);
-                            }
-                        }
-                        catch (err) {
-                            console.log(`${c.red}✗ Connection failed: ${err.message}${c.reset}`);
-                        }
-                        return;
-                    }
-                    console.log(`\n${c.yellow}Usage: /providers [list | add <name> | remove <name> | test <name>]${c.reset}`);
-                    console.log(`${c.dim}  Available providers: ${PROVIDER_REGISTRY.map(p => p.name).join(', ')}${c.reset}`);
-                    return;
-                }
-                case '/compact': {
-                    const msgCount = conversation.getMessageCount();
-                    if (msgCount === 0) {
-                        console.log(`\n${c.dim}Nothing to compact — conversation is empty.${c.reset}`);
-                        return;
-                    }
-                    const tokensBefore = conversation.getTotalTokens();
-                    const contextLimit = conversation.getContextLimit();
-                    console.log(`\n${c.cyan}[Compact] Summarising ${msgCount} messages to free context tokens...${c.reset}`);
-                    console.log(`${c.dim}  Current context: ${(tokensBefore / 1000).toFixed(0)}k / ${(contextLimit / 1000).toFixed(0)}k tokens${c.reset}`);
-                    try {
-                        const compacted = await conversation.compact(agent.getClient(), currentModel);
-                        if (compacted) {
-                            const info = conversation.getLastCompactionInfo();
-                            const tokensAfter = conversation.getTotalTokens();
-                            console.log(`${c.green}✓ Compacted: ${info?.messagesBefore ?? msgCount} messages → summary + ${conversation.getMessageCount()} recent messages.${c.reset}`);
-                            console.log(`${c.dim}  Context: ${(tokensBefore / 1000).toFixed(0)}k → ${(tokensAfter / 1000).toFixed(0)}k tokens (~${((info?.tokensFreed ?? 0) / 1000).toFixed(0)}k freed).${c.reset}`);
-                        }
-                        else {
-                            console.log(`${c.dim}Not enough messages to compact (need more than 4 messages).${c.reset}`);
-                        }
-                    }
-                    catch (err) {
-                        console.log(`${c.red}✗ Compact failed: ${err.message}${c.reset}`);
-                    }
-                    return;
-                }
-                case '/snapshot': {
-                    const label = args.join(' ').trim() || `snapshot-${Date.now()}`;
-                    if (!git.isGitRepo()) {
-                        console.log(`\n${c.yellow}⚠ Not a git repository — cannot create snapshot.${c.reset}`);
-                        return;
-                    }
-                    const hash = git.createSnapshot(label);
-                    if (hash) {
-                        console.log(`\n${c.green}✓ Workspace snapshot created: ${c.bold}${hash}${c.reset}${c.dim} (label: ${label})${c.reset}`);
-                        console.log(`${c.dim}  Use /undo or git revert to roll back to this point.${c.reset}`);
-                    }
-                    return;
-                }
-                case '/skills': {
-                    const { skillsManager } = await import('../agent/skills.js');
-                    const list = skillsManager.getSkills();
-                    if (list.length === 0) {
-                        console.log(`\n${c.dim}No skills registered. Register skill profiles by adding SKILL.md under ~/.fixocli/skills/<name>/ or .fixocli/skills/<name>/${c.reset}`);
-                    }
-                    else {
-                        console.log(`\n${c.cyan}${c.bold}Registered Skills:${c.reset}`);
-                        for (const skill of list) {
-                            console.log(`  - ${c.bold}${skill.name}${c.reset}${skill.description ? `: ${skill.description}` : ''} ${c.dim}(${skill.location})${c.reset}`);
-                        }
-                    }
-                    return;
-                }
-                case '/theme':
-                case '/variant': {
-                    const { themeMode, setThemeMode } = await import('./colors.js');
-                    const newMode = themeMode === 'dark' ? 'inverted' : 'dark';
-                    setThemeMode(newMode);
-                    console.log(`\n${c.cyan}✓ Theme set to: ${newMode === 'dark' ? 'Dark Void Minimalist' : 'High-Contrast Inverted'}${c.reset}`);
-                    return;
-                }
-                case '/telemetry': {
-                    const sub = args[0]?.toLowerCase();
-                    if (sub === 'on' || sub === 'enable') {
-                        config.preferences.telemetry = true;
-                        saveConfig(config);
-                        console.log(`\n${c.green}✓ Telemetry enabled${c.reset}`);
-                    }
-                    else if (sub === 'off' || sub === 'disable') {
-                        config.preferences.telemetry = false;
-                        saveConfig(config);
-                        console.log(`\n${c.green}✓ Telemetry disabled${c.reset}`);
-                    }
-                    else {
-                        console.log(`\n${c.dim}Telemetry is currently ${config.preferences.telemetry ? `${c.green}ON${c.reset}${c.dim}` : `${c.red}OFF${c.reset}${c.dim}`}. Usage: /telemetry on|off${c.reset}`);
-                    }
-                    return;
-                }
-                default:
                     console.log(`\n${c.yellow}Unknown command: ${cmd}. Type /help for available commands.${c.reset}`);
                     return;
+                }
             }
         }
         // ─── Shell commands (! prefix) ───
@@ -1862,20 +1126,48 @@ export async function startREPL(options) {
                     console.log(output);
             }
             catch (error) {
-                if (error.stdout)
-                    console.log(error.stdout);
-                if (error.stderr)
-                    console.error(`${c.red}${error.stderr}${c.reset}`);
+                const err = error;
+                if (err.stdout)
+                    console.log(err.stdout);
+                if (err.stderr)
+                    console.error(`${c.red}${err.stderr}${c.reset}`);
             }
             return;
         }
+        // ─── Conversation echo (paste expansion) ──────────────────────────
+        // When the submitted input contains paste attachments, overwrite the
+        // readline-echoed `> [Paste #N +M lines]` line with a proper
+        // conversation block so the user can see what they sent.
+        // Mirrors the Claude Code / Antigravity transcript pattern.
+        if (pendingPastes.length > 0) {
+            // Step 1: reconstruct the original input as it would have looked without folding
+            let unfoldedInput = rawInput;
+            for (const paste of pendingPastes) {
+                const token = `[Paste #${paste.id} +${paste.lines} lines]`;
+                unfoldedInput = unfoldedInput.replace(token, paste.content);
+            }
+            // Step 2: move up ONE line and erase it — this erases the readline-
+            // echoed token line ("> [Paste #2 +4 lines]") that is already on screen.
+            process.stdout.write('\x1b[1A\x1b[2K');
+            // Step 3: print the prompt and the unfolded input
+            const lines = unfoldedInput.split(/\r\n|\r|\n/);
+            if (lines.length > 0) {
+                console.log(`> ${lines[0]}`);
+                for (let i = 1; i < lines.length; i++) {
+                    console.log(lines[i]);
+                }
+            }
+            // Blank line before the agent spinner starts
+            console.log('');
+        }
+        // ─────────────────────────────────────────────────────────────────
         // ─── Agent task ───
         // Format any paths in the input for display
         const displayInput = formatInputPaths(input, cwd);
         if (displayInput !== input) {
             // Re-display with highlighted paths
             process.stdout.write(`\x1b[1A\x1b[2K`); // Move up and clear line
-            console.log(`${C.LAVA}›${C.RESET} ${displayInput}`);
+            console.log(`> ${displayInput}`);
         }
         // Extract any file paths from input for automatic pinning
         const pathsInInput = extractFilePaths(input, cwd);
@@ -1895,105 +1187,34 @@ export async function startREPL(options) {
         // Drain the queue — attachments are one-shot. The agent has its
         // own copy via context above.
         pendingAttachments = [];
-        const classification = classifyComplexityHeuristic(input);
-        let result;
-        const startTime = Date.now();
-        if (classification.complexity === 'complex') {
-            console.log(`\n${c.cyan}[Routing Engine] Complex task detected (${classification.reason}). Routing to Orchestrator...${c.reset}`);
-            try {
-                const { Orchestrator } = await import('../agent/orchestrator.js');
-                const { AgentPool } = await import('../agent/agent-pool.js');
-                console.log(`\n${c.cyan}[Orchestrator] Generating plan for complex task...${c.reset}`);
-                const orchestrator = new Orchestrator(verbose);
-                const dag = await orchestrator.plan(context);
-                // Render planned phases in high contrast box
-                const width = 60;
-                const borderTop = `┌${'─'.repeat(width)}┐`;
-                const borderBottom = `└${'─'.repeat(width)}┘`;
-                console.log(`\n${c.cyan}${borderTop}${c.reset}`);
-                console.log(`${c.cyan}│${c.reset}  ${c.bold}Planned Subtask Phases (Complex Task decomposition):${c.reset}${' '.repeat(width - 52)}${c.cyan}│${c.reset}`);
-                console.log(`${c.cyan}├${'─'.repeat(width)}┤${c.reset}`);
-                for (const sub of dag.subtasks) {
-                    const deps = sub.dependencies.length > 0 ? ` (deps: ${sub.dependencies.join(', ')})` : '';
-                    const lineStr = `  - [${sub.persona.toUpperCase()}] ${sub.title}${deps}`;
-                    const pad = Math.max(0, width - lineStr.length - 4);
-                    console.log(`${c.cyan}│${c.reset}  ${c.bold}${lineStr}${c.reset}${' '.repeat(pad)}  ${c.cyan}│${c.reset}`);
-                }
-                console.log(`${c.cyan}${borderBottom}${c.reset}\n`);
-                // Save the DAG to .fixo/last-dag.json
-                const fixoDir = path.join(cwd, '.fixo');
-                fs.mkdirSync(fixoDir, { recursive: true });
-                fs.writeFileSync(path.join(fixoDir, 'last-dag.json'), JSON.stringify({ task: input, dag }, null, 2), 'utf-8');
-                if (currentMode === 'PLAN') {
-                    console.log(`${c.green}✓ Plan generated and saved successfully.${c.reset}`);
-                    console.log(`${c.dim}  To execute this plan, switch to BUILD mode (type /mode build or hit [TAB]) and run: /run-plan${c.reset}\n`);
-                    return;
-                }
-                const budgetLimit = projectConfig?.maxAttempts ?? 12;
-                const pool = new AgentPool(3, budgetLimit);
-                console.log(`\n${c.cyan}[Agent Pool] Executing DAG of subtasks (concurrency limit: 3, budget: ${budgetLimit} tool calls)...${c.reset}`);
-                const success = await pool.execute(context, dag);
-                const durationMs = Date.now() - startTime;
-                const totalPromptTokens = orchestrator.tokensUsed.prompt_tokens + pool.tokensUsed.prompt_tokens;
-                const totalCompletionTokens = orchestrator.tokensUsed.completion_tokens + pool.tokensUsed.completion_tokens;
-                // Find modified files to report
-                const { getModifiedFiles, getBranchPoint } = await import('../agent/worker-agent.js');
-                const relativeModified = getModifiedFiles(cwd, getBranchPoint(cwd));
-                const modifiedFiles = relativeModified.map(f => path.resolve(cwd, f));
-                if (!success) {
-                    console.log(`\n${c.red}✗ Parallel workers failed to complete all subtasks.${c.reset}`);
-                    if (git.isGitRepo()) {
-                        console.log(`\n${c.yellow}[Agent Pool] Rolling back all uncommitted changes due to run failure...${c.reset}`);
-                        git.discardUncommittedChanges();
-                    }
-                }
-                result = {
-                    success,
-                    response: success
-                        ? 'Successfully completed complex task via parallel agents.'
-                        : 'Failed to complete all complex subtasks.',
-                    modifiedFiles,
-                    tokensUsed: {
-                        prompt_tokens: totalPromptTokens,
-                        completion_tokens: totalCompletionTokens,
-                        total_tokens: totalPromptTokens + totalCompletionTokens
-                    },
-                    toolCallCount: pool.toolCallCount,
-                    durationMs,
-                    model: context.model,
-                };
-            }
-            catch (err) {
-                console.error(`\n${c.red}✗ Orchestrated execution failed: ${err.message || err}${c.reset}`);
-                if (git.isGitRepo()) {
-                    console.log(`\n${c.yellow}[Agent Pool] Rolling back all uncommitted changes due to error...${c.reset}`);
-                    git.discardUncommittedChanges();
-                }
-                const durationMs = Date.now() - startTime;
-                result = {
-                    success: false,
-                    response: `Orchestrated run failed: ${err.message || err}`,
-                    modifiedFiles: [],
-                    tokensUsed: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 },
-                    toolCallCount: 0,
-                    durationMs,
-                    model: context.model,
-                };
-            }
-        }
-        else {
-            console.log(`\n${c.cyan}[Routing Engine] Simple task detected (${classification.reason}). Routing to SingleAgent...${c.reset}`);
-            isTaskRunning = true;
-            currentRunningAgent = agent;
-            try {
-                result = await agent.runStreaming(context, conversation, rl);
-            }
-            finally {
+        // Phase 2.1 — routing decision + execution lives in
+        // task-router.ts so it can be unit-tested independently of the
+        // REPL and reused by future non-TUI entry points (--headless,
+        // web backend, IDE extension). Console output is byte-identical
+        // to the pre-extraction inline path. The rollback inside the
+        // complex path uses git.discardChangesIn() (Phase 0.0 — scoped).
+        const { routeAndExecute } = await import('../agent/task-router.js');
+        const routed = await routeAndExecute(input, context, {
+            agent,
+            conversation,
+            rl,
+            projectConfig,
+            verbose,
+            onSimplePathStart: (a) => {
+                isTaskRunning = true;
+                currentRunningAgent = a;
+            },
+            onSimplePathEnd: () => {
                 isTaskRunning = false;
                 currentRunningAgent = null;
-                agent.reset();
-            }
+            },
+        });
+        if (routed.route === 'plan-mode-deferred') {
+            pendingPastes = [];
+            return;
         }
+        const result = routed.result;
+        pendingPastes = [];
         // Print result summary
         console.log('');
         const modelPart = result.model ? `${result.model} · ` : '';