aura-code 0.6.3 → 0.10.2

package/dist/cli/index.js

@@ -43,17 +43,25 @@ const fs = __importStar(require("fs"));
 const minimist_1 = __importDefault(require("minimist"));
 const chalk_1 = __importDefault(require("chalk"));
 const factory_js_1 = require("../providers/factory.js");
+const live_models_js_1 = require("../providers/live-models.js");
+void (0, live_models_js_1.refreshLiveModels)().catch(() => { }); // fire-and-forget at module load — see comment history for why this isn't awaited
+process.on('unhandledRejection', (reason) => {
+    console.error(chalk_1.default.hex('#b15439')('  \u2717 Unhandled rejection: ' + String(reason)));
+});
 const resilient_factory_js_1 = require("../providers/resilient-factory.js");
 const context_js_1 = require("../agent/context.js");
 const index_js_1 = require("../viz/index.js");
 const loop_js_1 = require("../agent/loop.js");
 const permissions_js_1 = require("../safety/permissions.js");
 const display_js_1 = require("./display.js");
+const tui_js_1 = require("./tui.js");
 const index_js_2 = require("../server/index.js");
 const project_config_js_1 = require("../config/project-config.js");
+const package_json_1 = __importDefault(require("../../package.json"));
 const defaults_js_1 = require("../config/defaults.js");
 const session_store_js_1 = require("../agent/session-store.js");
 const global_config_js_1 = require("../setup/global-config.js");
+const key_store_js_1 = require("../setup/key-store.js");
 const first_run_js_1 = require("../setup/first-run.js");
 const provider_wizard_js_1 = require("../setup/provider-wizard.js");
 const index_js_3 = require("../orchestration/index.js");
@@ -63,21 +71,16 @@ const proposer_js_1 = require("../harness/proposer.js");
 const engine_js_1 = require("../workflows/engine.js");
 const engine_js_2 = require("../architect/engine.js");
 const diamond_js_1 = require("./diamond.js");
-const episode_capture_js_1 = require("../ruby/episode-capture.js");
-const model_selector_js_1 = require("../ruby/model-selector.js");
-const stats_js_1 = require("../ruby/stats.js");
-const alternator_js_1 = require("../ruby/alternator.js");
-const types_js_1 = require("../ruby/types.js");
-const load_env_js_1 = require("../util/load-env.js");
-const factory_js_2 = require("../providers/factory.js");
-// Load API keys from ~/.hermes/.env, ~/.config/aura-code/.env, and project .env
-(0, load_env_js_1.bootstrapAuraEnv)(process.cwd());
+const model_select_js_1 = require("./model-select.js");
+const context_health_js_1 = require("./context-health.js");
+const index_js_5 = require("../doctor/index.js");
+const help_data_js_1 = require("./help-data.js");
 // ─────────────────────────────────────────────────────────────────────────────
 // Parse args
 // ─────────────────────────────────────────────────────────────────────────────
 const argv = (0, minimist_1.default)(process.argv.slice(2), {
     string: ['model', 'm', 'api-key', 'base-url', 'mode', 'cwd', 'rate-limit-rpm', 'rate-limit-tpm', 'max-retries', 'max-verify-retries', 'max-turns', 'fallback', 'resume', 'chat-id', 'profile', 'test-command', 'workflow', 'resume-workflow', 'workflow-name', 'apply-harness', 'blueprint', 'build'],
-    boolean: ['help', 'h', 'version', 'v', 'auto', 'readonly', 'models', 'no-session', 'no-setup', 'reset-setup', 'setup', 'orchestrate', 'plan', 'architect', 'list-sessions', 'new-session', 'verify', 'analyze', 'stats', 'workflows', 'propose-harness', 'blueprints', 'once'],
+    boolean: ['help', 'h', 'version', 'v', 'auto', 'readonly', 'models', 'no-session', 'no-setup', 'reset-setup', 'orchestrate', 'plan', 'architect', 'list-sessions', 'new-session', 'verify', 'analyze', 'workflows', 'propose-harness', 'blueprints', 'moa', 'doctor'],
     alias: { m: 'model', h: 'help', v: 'version' },
     default: {
         model: process.env.AURA_MODEL,
@@ -94,6 +97,9 @@ const cliMaxRetries = num(argv['max-retries']) ?? num(process.env.AURA_MAX_RETRI
 const cliMaxVerifyRetries = num(argv['max-verify-retries']);
 const cliMaxTurns = num(argv['max-turns']);
 const cliVerify = argv.verify === true;
+// Voice output: speak task summaries aloud. Enabled by --speak or AURA_SPEAK=1;
+// toggled at runtime in the REPL with :speak. Mutable so :speak can flip it.
+let speakEnabled = argv.speak === true || process.env.AURA_SPEAK === '1';
 const cliProfile = typeof argv.profile === 'string' ? argv.profile : undefined;
 const cliTestCommand = typeof argv['test-command'] === 'string' ? argv['test-command'] : undefined;
 const cliRpm = num(argv['rate-limit-rpm']) ?? num(process.env.AURA_API_RPM);
@@ -121,21 +127,21 @@ if (argv.models) {
         return acc;
     }, {});
     for (const [provider, models] of Object.entries(byProvider)) {
-        console.log(chalk_1.default.hex('#8a7768')(`  ${provider}`));
+        console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`  ${provider}`));
         for (const m of models) {
-            console.log(`    ${chalk_1.default.hex('#cc785c')(m.id.padEnd(45))} ${chalk_1.default.hex('#4e3d30')(m.speed)}`);
+            console.log(`    ${chalk_1.default.hex('#cc785c')(m.id.padEnd(45))} ${chalk_1.default.hex(diamond_js_1.FAINT_HEX)(m.speed)}`);
         }
     }
-    console.log(chalk_1.default.hex('#4e3d30')('\n  Use --model <id> or set AURA_MODEL env var'));
-    console.log(chalk_1.default.hex('#4e3d30')('  For Ollama: --model ollama/llama3.2'));
-    console.log(chalk_1.default.hex('#4e3d30')('  For OpenRouter: --model openrouter/<provider>/<name>\n'));
+    console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)('\n  Use --model <id> or set AURA_MODEL env var'));
+    console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)('  For Ollama: --model ollama/llama3.2'));
+    console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)('  For OpenRouter: --model openrouter/<provider>/<name>\n'));
     process.exit(0);
 }
 if (argv['list-sessions']) {
     const root = argv.cwd ? path.resolve(argv.cwd) : process.cwd();
     const sessions = session_store_js_1.sessionStore.listSessions(root);
     if (sessions.length === 0) {
-        console.log(chalk_1.default.hex('#8a7768')('\n  No saved sessions for this project.\n'));
+        console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('\n  No saved sessions for this project.\n'));
     }
     else {
         console.log(chalk_1.default.hex('#cc785c').bold('\n  Saved sessions:\n'));
@@ -143,8 +149,8 @@ if (argv['list-sessions']) {
             const updated = new Date(s.updatedAt).toLocaleString();
             const turns = Math.floor(s.history.length / 2);
             console.log(`  ${chalk_1.default.hex('#cc785c')(s.id.padEnd(20))} ` +
-                `${chalk_1.default.hex('#ede0cc')(s.title.slice(0, 45).padEnd(46))} ` +
-                `${chalk_1.default.hex('#4e3d30')(`${turns}t · ${updated}`)}`);
+                `${chalk_1.default.hex(diamond_js_1.TEXT_HEX)(s.title.slice(0, 45).padEnd(46))} ` +
+                `${chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`${turns}t · ${updated}`)}`);
         }
         console.log();
     }
@@ -154,53 +160,39 @@ if (argv.analyze) {
     const report = (0, weakness_miner_js_1.mineWeaknesses)();
     const outPath = (0, weakness_miner_js_1.saveReport)(report);
     console.log(chalk_1.default.hex('#cc785c').bold('\n  Weakness Analysis Report\n'));
-    console.log(chalk_1.default.hex('#8a7768')(`  Sessions analyzed: ${report.sessionsAnalyzed}`));
-    console.log(chalk_1.default.hex('#8a7768')(`  Report saved to: ${outPath}\n`));
+    console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`  Sessions analyzed: ${report.sessionsAnalyzed}`));
+    console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`  Report saved to: ${outPath}\n`));
     if (report.patterns.length === 0) {
         console.log(chalk_1.default.hex('#5a9e6e')('  ✓ No recurring weakness patterns detected. Agent behavior looks healthy.\n'));
     }
     else {
         for (const p of report.patterns) {
             console.log(chalk_1.default.hex('#b15439').bold(`  ✗ ${p.pattern} (${p.frequency} occurrences)`));
-            console.log(chalk_1.default.hex('#8a7768')(`    ${p.description}`));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`    ${p.description}`));
             if (p.occurrences[0]) {
-                console.log(chalk_1.default.hex('#4e3d30')(`    Example task: "${p.occurrences[0].exampleTask.slice(0, 80)}"`));
-                console.log(chalk_1.default.hex('#4e3d30')(`    Example failure: ${p.occurrences[0].exampleFailure.slice(0, 100)}`));
+                console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`    Example task: "${p.occurrences[0].exampleTask.slice(0, 80)}"`));
+                console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`    Example failure: ${p.occurrences[0].exampleFailure.slice(0, 100)}`));
             }
             console.log(chalk_1.default.hex('#cc785c')(`    Suggestion: ${p.promptPatch.slice(0, 120)}...`));
             console.log();
         }
-        console.log(chalk_1.default.hex('#8a7768')(`  ${report.summary}\n`));
+        console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`  ${report.summary}\n`));
     }
     process.exit(0);
 }
-if (argv.stats) {
-    (async () => {
-        const root = argv.cwd ? path.resolve(argv.cwd) : process.cwd();
-        const episodes = await (0, episode_capture_js_1.loadEpisodes)(root);
-        const output = (0, stats_js_1.formatStats)(episodes);
-        // Print each line, highlighting the header
-        for (const line of output.split('\n')) {
-            if (line.trim() === 'Aura Stats') {
-                console.log(chalk_1.default.hex('#cc785c').bold(line));
-            }
-            else if (line.includes(':')) {
-                const colonIdx = line.indexOf(':');
-                const label = line.slice(0, colonIdx + 1);
-                const value = line.slice(colonIdx + 1);
-                console.log(chalk_1.default.hex('#8a7768')(label) + chalk_1.default.hex('#ede0cc')(value));
-            }
-            else {
-                console.log(line);
-            }
-        }
-        process.exit(0);
-    })();
+if (argv.doctor === true) {
+    const cwd = typeof argv.cwd === 'string' ? path.resolve(argv.cwd) : process.cwd();
+    const fix = process.argv.includes('--fix');
+    const offline = process.argv.includes('--offline');
+    (0, index_js_5.runDoctor)({ projectRoot: cwd, fix, offline }).then(report => {
+        console.log((0, index_js_5.formatDoctorReport)(report));
+        process.exit(report.summary.error > 0 ? 1 : 0);
+    }).catch(e => { console.error('Doctor error:', String(e)); process.exit(1); });
 }
 if (argv['propose-harness']) {
     // Ensure a weakness report exists — mine if needed
     if (!fs.existsSync((0, weakness_miner_js_1.reportPath)())) {
-        console.log(chalk_1.default.hex('#8a7768')('\n  No weakness report found — mining sessions first...\n'));
+        console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('\n  No weakness report found — mining sessions first...\n'));
         const report = (0, weakness_miner_js_1.mineWeaknesses)();
         (0, weakness_miner_js_1.saveReport)(report);
     }
@@ -212,13 +204,13 @@ if (argv['propose-harness']) {
         console.log(chalk_1.default.hex('#cc785c').bold('\n  Harness Proposals\n'));
         for (const p of proposals) {
             console.log(chalk_1.default.hex('#cc785c')(`  ${p.id}`));
-            console.log(chalk_1.default.hex('#8a7768')(`    Pattern:  ${p.pattern} (${p.description.slice(0, 60)})`));
-            console.log(chalk_1.default.hex('#8a7768')(`    Section:  ${p.targetSection}`));
-            console.log(chalk_1.default.hex('#4e3d30')(`    Patch:    ${p.patchText.slice(0, 80)}...`));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`    Pattern:  ${p.pattern} (${p.description.slice(0, 60)})`));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`    Section:  ${p.targetSection}`));
+            console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`    Patch:    ${p.patchText.slice(0, 80)}...`));
             console.log();
         }
         console.log(chalk_1.default.hex('#5a9e6e')(`  ${proposals.length} proposal(s) saved to ~/.aura/harness/proposals/`));
-        console.log(chalk_1.default.hex('#8a7768')('  Apply with: ruby --apply-harness <id>\n'));
+        console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('  Apply with: ruby --apply-harness <id>\n'));
     }
     process.exit(0);
 }
@@ -239,7 +231,7 @@ if (argv.workflows) {
     (async () => {
         const workflows = await (0, engine_js_1.listWorkflows)();
         if (workflows.length === 0) {
-            console.log(chalk_1.default.hex('#8a7768')('\n  No saved workflows.\n'));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('\n  No saved workflows.\n'));
         }
         else {
             console.log(chalk_1.default.hex('#cc785c').bold('\n  Saved workflows:\n'));
@@ -249,9 +241,9 @@ if (argv.workflows) {
                 const totalSteps = ws.definition.steps.length;
                 const statusColor = ws.status === 'done' ? '#5a9e6e' : ws.status === 'failed' ? '#b15439' : '#cc785c';
                 console.log(`  ${chalk_1.default.hex('#cc785c')(ws.definition.id.padEnd(24))} ` +
-                    `${chalk_1.default.hex('#ede0cc')(ws.definition.name.slice(0, 36).padEnd(37))} ` +
+                    `${chalk_1.default.hex(diamond_js_1.TEXT_HEX)(ws.definition.name.slice(0, 36).padEnd(37))} ` +
                     `${chalk_1.default.hex(statusColor)(ws.status.padEnd(8))} ` +
-                    `${chalk_1.default.hex('#4e3d30')(`${doneSteps}/${totalSteps} steps · ${created}`)}`);
+                    `${chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`${doneSteps}/${totalSteps} steps · ${created}`)}`);
             }
             console.log();
         }
@@ -263,7 +255,7 @@ if (argv.blueprints) {
     (async () => {
         const bps = await (0, engine_js_2.listBlueprints)();
         if (bps.length === 0) {
-            console.log(chalk_1.default.hex('#8a7768')('\n  No saved blueprints.\n'));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('\n  No saved blueprints.\n'));
         }
         else {
             console.log(chalk_1.default.hex('#cc785c').bold('\n  Saved blueprints:\n'));
@@ -274,8 +266,8 @@ if (argv.blueprints) {
                 const statusColor = bp.status === 'complete' ? '#5a9e6e' : bp.status === 'building' ? '#cc9e5c' : '#cc785c';
                 console.log(`  ${chalk_1.default.hex(statusColor)(bp.status.padEnd(10))} ` +
                     `${chalk_1.default.hex('#cc785c')(bp.id.slice(0, 16).padEnd(18))} ` +
-                    `${chalk_1.default.hex('#ede0cc')(bp.task.slice(0, 40).padEnd(41))} ` +
-                    `${chalk_1.default.hex('#4e3d30')(`${builtCount}/${totalFiles} files · ${created}`)}`);
+                    `${chalk_1.default.hex(diamond_js_1.TEXT_HEX)(bp.task.slice(0, 40).padEnd(41))} ` +
+                    `${chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`${builtCount}/${totalFiles} files · ${created}`)}`);
             }
             console.log();
         }
@@ -292,53 +284,53 @@ if (typeof argv.blueprint === 'string' && argv.blueprint) {
         }
         const statusColor = bp.status === 'complete' ? '#5a9e6e' : bp.status === 'building' ? '#cc9e5c' : '#cc785c';
         console.log(chalk_1.default.hex('#cc785c').bold('\n  Blueprint\n'));
-        console.log(`  ${chalk_1.default.hex('#8a7768')('ID:')}      ${chalk_1.default.hex('#cc785c')(bp.id)}`);
-        console.log(`  ${chalk_1.default.hex('#8a7768')('Task:')}    ${chalk_1.default.hex('#ede0cc')(bp.task)}`);
-        console.log(`  ${chalk_1.default.hex('#8a7768')('Status:')}  ${chalk_1.default.hex(statusColor)(bp.status)}`);
-        console.log(`  ${chalk_1.default.hex('#8a7768')('Steps:')}   ${bp.estimatedSteps}`);
-        console.log(`  ${chalk_1.default.hex('#8a7768')('Created:')} ${new Date(bp.createdAt).toLocaleString()}`);
+        console.log(`  ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('ID:')}      ${chalk_1.default.hex('#cc785c')(bp.id)}`);
+        console.log(`  ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('Task:')}    ${chalk_1.default.hex(diamond_js_1.TEXT_HEX)(bp.task)}`);
+        console.log(`  ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('Status:')}  ${chalk_1.default.hex(statusColor)(bp.status)}`);
+        console.log(`  ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('Steps:')}   ${bp.estimatedSteps}`);
+        console.log(`  ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('Created:')} ${new Date(bp.createdAt).toLocaleString()}`);
         if (bp.builtAt)
-            console.log(`  ${chalk_1.default.hex('#8a7768')('Built:')}   ${new Date(bp.builtAt).toLocaleString()}`);
+            console.log(`  ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('Built:')}   ${new Date(bp.builtAt).toLocaleString()}`);
         if (bp.files.length > 0) {
             console.log(chalk_1.default.hex('#cc785c').bold('\n  Files:\n'));
             for (const f of bp.files) {
-                const fileStatusColor = f.status === 'built' ? '#5a9e6e' : f.status === 'skipped' ? '#8a7768' : '#cc785c';
+                const fileStatusColor = f.status === 'built' ? '#5a9e6e' : f.status === 'skipped' ? '#a68a2a' : '#cc785c';
                 console.log(`    ${chalk_1.default.hex(fileStatusColor)(f.status.padEnd(8))} ${chalk_1.default.hex('#cc785c')(f.path)}`);
-                console.log(`            ${chalk_1.default.hex('#8a7768')(f.purpose)}`);
+                console.log(`            ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(f.purpose)}`);
                 if (f.exports.length > 0) {
-                    console.log(`            ${chalk_1.default.hex('#4e3d30')(`exports: ${f.exports.join(', ')}`)}`);
+                    console.log(`            ${chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`exports: ${f.exports.join(', ')}`)}`);
                 }
                 if (f.interfaces.length > 0) {
-                    console.log(`            ${chalk_1.default.hex('#4e3d30')(`interfaces: ${f.interfaces.join(', ')}`)}`);
+                    console.log(`            ${chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`interfaces: ${f.interfaces.join(', ')}`)}`);
                 }
             }
         }
         if (bp.dataModels.length > 0) {
             console.log(chalk_1.default.hex('#cc785c').bold('\n  Data Models:\n'));
             for (const dm of bp.dataModels) {
-                console.log(`    ${chalk_1.default.hex('#cc785c')(dm.name)} — ${chalk_1.default.hex('#8a7768')(dm.description)}`);
+                console.log(`    ${chalk_1.default.hex('#cc785c')(dm.name)} — ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(dm.description)}`);
                 for (const field of dm.fields) {
-                    console.log(`      ${chalk_1.default.hex('#4e3d30')(field)}`);
+                    console.log(`      ${chalk_1.default.hex(diamond_js_1.FAINT_HEX)(field)}`);
                 }
             }
         }
         if (bp.dependencies.length > 0) {
             console.log(chalk_1.default.hex('#cc785c').bold('\n  Dependencies:\n'));
             for (const dep of bp.dependencies) {
-                console.log(`    ${chalk_1.default.hex('#4e3d30')(dep)}`);
+                console.log(`    ${chalk_1.default.hex(diamond_js_1.FAINT_HEX)(dep)}`);
             }
         }
         if (bp.risks.length > 0) {
             console.log(chalk_1.default.hex('#b15439').bold('\n  Risks:\n'));
             for (const risk of bp.risks) {
-                console.log(`    ${chalk_1.default.hex('#b15439')('⚠')} ${chalk_1.default.hex('#8a7768')(risk)}`);
+                console.log(`    ${chalk_1.default.hex('#b15439')('⚠')} ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(risk)}`);
             }
         }
         if (bp.deviations.length > 0) {
             console.log(chalk_1.default.hex('#cc9e5c').bold('\n  Deviations:\n'));
             for (const dev of bp.deviations) {
                 const time = new Date(dev.recordedAt).toLocaleString();
-                console.log(`    ${chalk_1.default.hex('#cc9e5c')('→')} ${chalk_1.default.hex('#8a7768')(dev.description)} ${chalk_1.default.hex('#4e3d30')(`(${time})`)}`);
+                console.log(`    ${chalk_1.default.hex('#cc9e5c')('→')} ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(dev.description)} ${chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`(${time})`)}`);
             }
         }
         console.log();
@@ -353,7 +345,7 @@ if (argv.help) {
 // When run with no args + a TTY or piped input, fall through to the REPL/wizard.
 // Skip this gate when --reset-setup is set (the wizard should fire even if env
 // vars make needsWizard() return false).
-if (argv._.length === 0 && !argv.interactive && process.stdin.isTTY !== true && !argv['reset-setup']) {
+if (argv._.length === 0 && !argv.interactive && !argv.doctor && process.stdin.isTTY !== true && !argv['reset-setup']) {
     if (!(0, first_run_js_1.needsWizard)({})) {
         printHelp();
         process.exit(0);
@@ -364,21 +356,39 @@ if (argv._.length === 0 && !argv.interactive && process.stdin.isTTY !== true &&
 // ─────────────────────────────────────────────────────────────────────────────
 const cwd = argv.cwd ? path.resolve(argv.cwd) : process.cwd();
 const fileConfig = (0, project_config_js_1.loadProjectConfig)(cwd);
-// Pull global config (saved by the first-run wizard) so the user doesn't have
-// to re-set their provider on every run.
+// No TLS patching needed — the DigiCert root CA used by the MiMo endpoint
+// is already trusted by Node's built-in certificate store.
+// Load persisted API keys (~/.aura/keys.json) into process.env before any
+// provider is built — so keys set once with :apikey survive across sessions
+// and every provider sees them, without depending on shell rc files. Real
+// environment values are never overridden.
+(0, key_store_js_1.loadKeysIntoEnv)();
+// Pull global config (saved by the setup wizard) so the user doesn't have
+// to re-set their provider on every run. provider.json is the fuller record
+// from the same wizard save — it also carries the API key and base URL, so a
+// choice made last session works next session without any env vars.
 const globalCfg = (0, global_config_js_1.loadGlobalConfig)();
-// Effective model = CLI > AURA_MODEL env > global wizard > .aura.json project default
+const savedProvider = (0, provider_wizard_js_1.loadProviderConfig)();
+// Effective model = CLI > AURA_MODEL env > .aura.json > global config > undefined
 const cliModel = typeof argv.model === 'string' ? argv.model : undefined;
-// Tracks whether the user has explicitly chosen a model (--model flag OR :model REPL command).
-// The RubyAlternator must not override an explicit user choice.
-let userSetModel = !!cliModel;
-const effectiveModel = cliModel
-    ?? process.env.AURA_MODEL
-    ?? globalCfg?.defaultModel
-    ?? fileConfig.model;
-// Effective base URL = CLI > .aura.json > global config > undefined
+const effectiveModel = cliModel ?? fileConfig.model ?? globalCfg?.defaultModel
+    ?? savedProvider?.model ?? process.env.AURA_MODEL;
+// The saved provider record only applies when we're actually running the
+// model it was saved with — its baseUrl/apiKey belong to that provider.
+const savedProviderApplies = !!savedProvider && effectiveModel === savedProvider.model;
+// Effective base URL = CLI > .aura.json > global config > undefined.
+// CRITICAL: the global config's baseUrl belongs to the provider the wizard
+// configured — it must NOT be forced onto a DIFFERENT model. Otherwise picking
+// `-m deepseek/...` while the global default is a GLM/Z.ai endpoint sends the
+// DeepSeek key to Z.ai → 401. So only inherit globalCfg.baseUrl when the
+// effective model is actually that global default model (same provider).
 const cliBaseUrl = typeof argv['base-url'] === 'string' ? argv['base-url'] : undefined;
-const effectiveBaseUrl = cliBaseUrl ?? fileConfig.baseUrl ?? globalCfg?.baseUrl;
+const globalBaseUrlApplies = !!globalCfg?.baseUrl &&
+    !!globalCfg?.defaultModel &&
+    effectiveModel === globalCfg.defaultModel;
+const effectiveBaseUrl = cliBaseUrl ?? fileConfig.baseUrl
+    ?? (globalBaseUrlApplies ? globalCfg.baseUrl : undefined)
+    ?? (savedProviderApplies ? savedProvider.baseUrl : undefined);
 const resolved = (0, project_config_js_1.resolveConfig)({ ...fileConfig, model: effectiveModel, baseUrl: effectiveBaseUrl }, {
     model: cliModel,
     baseUrl: cliBaseUrl,
@@ -397,7 +407,11 @@ const permissionLevel = resolved.mode;
 const runtimeConfig = {
     model: resolved.model,
     baseUrl: resolved.baseUrl,
-    apiKey: typeof argv['api-key'] === 'string' ? argv['api-key'] : undefined,
+    // --api-key wins; otherwise the key the wizard saved with this model last
+    // session. Env vars only apply when neither is present (factory fallback).
+    apiKey: typeof argv['api-key'] === 'string'
+        ? argv['api-key']
+        : (savedProviderApplies ? savedProvider.apiKey : undefined),
 };
 // ── Profile: local → Ollama defaults ─────────────────────────────────────────
 if (cliProfile === 'local') {
@@ -407,18 +421,12 @@ if (cliProfile === 'local') {
     }
 }
 function buildProvider(display) {
-    // Use runtimeConfig.model (mutable via :model command) falling back to resolved.model.
-    const model = runtimeConfig.model ?? resolved.model;
-    const transport = (0, factory_js_2.resolveProviderTransport)(model, {
-        baseUrl: runtimeConfig.baseUrl ?? resolved.baseUrl ?? undefined,
-        apiKey: runtimeConfig.apiKey,
-    });
-    // Keep resolved in sync so external reads (e.g. header display) reflect the switch.
-    resolved.model = model;
+    // Caller guarantees resolved.model is set (guarded in main()).
+    const model = resolved.model;
     return (0, resilient_factory_js_1.createResilientProvider)({
         model,
-        apiKey: transport.apiKey,
-        baseUrl: transport.baseUrl,
+        apiKey: runtimeConfig.apiKey,
+        baseUrl: runtimeConfig.baseUrl ?? undefined,
     }, {
         rpm: resolved.rateLimitRpm,
         tpm: resolved.rateLimitTpm,
@@ -430,9 +438,6 @@ function buildProvider(display) {
 // Main
 // ─────────────────────────────────────────────────────────────────────────────
 async function main() {
-    (0, diamond_js_1.renderDiamond)();
-    await new Promise(r => setTimeout(r, 1500));
-    process.stdout.write('\x1b[2J\x1b[H');
     const display = (0, display_js_1.createTerminalDisplay)();
     // ── First-run wizard ───────────────────────────────────────────────────────
     // Skip if: --no-setup flag, --api-key on CLI, env var set, or global config exists.
@@ -452,50 +457,45 @@ async function main() {
     const cliModel = typeof argv.model === 'string' ? argv.model : undefined;
     const skipSetup = argv['no-setup'] === true || argv.help === true || argv.h === true || argv.models === true || argv.version === true || argv.v === true;
     const resetSetup = argv['reset-setup'] === true;
-    const cliSetup = argv['setup'] === true;
     if (resetSetup) {
-        // Wipe global config so the wizard fires unconditionally.
+        // Wipe both saved configs so the wizard fires unconditionally and no
+        // stale provider record (baseUrl/apiKey) survives the reset.
         try {
             fs.unlinkSync((0, global_config_js_1.globalConfigPath)());
         }
         catch { /* not present */ }
-    }
-    // --setup flag: run provider wizard before entering REPL
-    if (cliSetup && !skipSetup) {
-        const cfg = await (0, provider_wizard_js_1.runProviderWizard)();
-        if (cfg) {
-            resolved.model = cfg.model;
-            resolved.baseUrl = cfg.baseUrl;
-            runtimeConfig.model = cfg.model;
-            runtimeConfig.baseUrl = cfg.baseUrl;
-            runtimeConfig.apiKey = cfg.apiKey;
+        try {
+            fs.unlinkSync(path.join(path.dirname((0, global_config_js_1.globalConfigPath)()), 'provider.json'));
         }
+        catch { /* not present */ }
     }
     // When --reset-setup is set, force the wizard to fire (overrides env-var
     // detection — the user explicitly wants to reconfigure).
-    const shouldRunWizard = !skipSetup && !cliSetup && isInteractive && (resetSetup || (0, first_run_js_1.needsWizard)({ cliApiKey, cliModel }));
+    const shouldRunWizard = !skipSetup && isInteractive && (resetSetup || (0, first_run_js_1.needsWizard)({ cliApiKey, cliModel }));
     if (shouldRunWizard) {
         // If stdin is not a TTY and there's nothing piped in, the wizard will
         // hang. Skip with a helpful message instead.
         if (process.stdin.isTTY !== true && !process.stdin.readable) {
             console.error(chalk_1.default.hex('#b15439')('\n  ✗ No interactive input available.'));
-            console.error(chalk_1.default.hex('#8a7768')('  Set an API key env var (e.g. export OPENAI_API_KEY=...)'));
-            console.error(chalk_1.default.hex('#8a7768')('  or pass --api-key <key> --model <id> on the command line,\n'));
+            console.error(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('  Set an API key env var (e.g. export OPENAI_API_KEY=...)'));
+            console.error(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('  or pass --api-key <key> --model <id> on the command line,\n'));
             process.exit(1);
         }
-        const cfg = await (0, first_run_js_1.runFirstRunWizard)();
+        // Full provider wizard: pick provider + model, detect/enter key, and
+        // TEST the connection (URL normalization + response validation) before
+        // saving. The choice is persisted and restored on every later run.
+        const cfg = await (0, provider_wizard_js_1.runProviderWizard)();
         if (!cfg) {
             console.error(chalk_1.default.hex('#b15439')('\n  ✗ Setup cancelled. Set an API key env var (e.g. export OPENAI_API_KEY=...) or run with --api-key.\n'));
             process.exit(1);
         }
-        // Re-resolve with the new global config
-        const fresh = (0, global_config_js_1.loadGlobalConfig)();
-        if (fresh) {
-            resolved.model = fresh.defaultModel;
-            resolved.baseUrl = fresh.baseUrl;
-            runtimeConfig.model = fresh.defaultModel;
-            runtimeConfig.baseUrl = fresh.baseUrl;
-        }
+        // Apply the wizard's choice to this session (it already saved to disk).
+        resolved.model = cfg.model;
+        resolved.baseUrl = cfg.baseUrl || undefined;
+        runtimeConfig.model = cfg.model;
+        runtimeConfig.baseUrl = cfg.baseUrl || undefined;
+        if (cfg.apiKey)
+            runtimeConfig.apiKey = cfg.apiKey;
     }
     let ctx;
     try {
@@ -508,9 +508,9 @@ async function main() {
     // ── Guard: we need a model before we can build a provider ─────────────────
     if (!resolved.model) {
         console.error(chalk_1.default.hex('#b15439')('\n  ✗ No model configured.'));
-        console.error(chalk_1.default.hex('#8a7768')('  Run `aura` with no args in a TTY to launch the setup wizard,'));
-        console.error(chalk_1.default.hex('#8a7768')('  or pass --model <id> --api-key <key> on the command line,'));
-        console.error(chalk_1.default.hex('#8a7768')('  or set the model in .aura.json (`"model": "..."`).'));
+        console.error(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('  Run `aura` with no args in a TTY to launch the setup wizard,'));
+        console.error(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('  or pass --model <id> --api-key <key> on the command line,'));
+        console.error(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('  or set the model in .aura.json (`"model": "..."`).'));
         process.exit(1);
     }
     let provider;
@@ -573,32 +573,20 @@ async function main() {
     }
     // Legacy sessionPath kept for single-task one-shot mode
     const sessionPath = noSession ? undefined : path.join(session_store_js_1.sessionStore.defaultDir(), projectRoot.replace(/[^a-zA-Z0-9_-]/g, '_').slice(0, 80), 'latest.json');
-    // ── ASCII art banner ────────────────────────────────────────────────────────
-    const orange = chalk_1.default.hex('#E8771A');
-    const pink1 = chalk_1.default.hex('#F5715B'); // Smooth transition step
-    const pink2 = chalk_1.default.hex('#FF6B9D');
-    const red1 = chalk_1.default.hex('#E64A69'); // Smooth transition step
-    const red2 = chalk_1.default.hex('#CC2936');
-    if ((process.stdout.columns ?? 80) < 80) {
-        console.log(chalk_1.default.hex('#CC2936').bold('AURA CODE'));
-    }
-    else {
-        console.log('');
-        console.log(orange('  █████╗ ██╗   ██╗██████╗  █████╗      ██████╗ ██████╗ ██████╗ ███████╗'));
-        console.log(pink1(' ██╔══██╗██║   ██║██╔══██╗██╔══██╗    ██╔════╝██╔═══██╗██╔══██╗██╔════╝'));
-        console.log(pink2(' ███████║██║   ██║██████╔╝███████║    ██║     ██║   ██║██║  ██║█████╗  '));
-        console.log(red1(' ██╔══██║██║   ██║██╔══██╗██╔══██║    ██║     ██║   ██║██║  ██║██╔══╝  '));
-        console.log(red2(' ██║  ██║╚██████╔╝██║  ██║██║  ██║    ╚██████╗╚██████╔╝██████╔╝███████╗'));
-        console.log(red2(' ╚═╝  ╚═╝ ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝     ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝'));
-        console.log('');
-        console.log(chalk_1.default.hex('#4e3d30')('  "I don\'t try. I verify."'));
-        console.log('');
-    }
-    console.log('');
-    await new Promise(r => setTimeout(r, 50));
-    display.header(`Aura — ${ctx.name}`, `${provider.name} · ${runtimeConfig.model} · ${ctx.language} · ${permissionLevel} mode` +
-        (fileConfig.model ? ` · .aura.json loaded` : '') +
-        (activeChatId ? ` · chat ${activeChatId}` : ''));
+    // ── Startup banner ──────────────────────────────────────────────────────────
+    (0, diamond_js_1.renderBanner)({
+        version: package_json_1.default.version,
+        title: ctx.name,
+        provider: provider.name,
+        model: runtimeConfig.model,
+        language: ctx.language,
+        mode: permissionLevel,
+        cwd: projectRoot,
+        extras: [
+            ...(fileConfig.model ? ['.aura.json loaded'] : []),
+            ...(activeChatId ? [`chat ${activeChatId}`] : []),
+        ],
+    });
     const cumulative = { turns: 0, toolCalls: 0, inputTokens: 0, outputTokens: 0, costUsd: 0 };
     // ── --build <id>: build from a saved blueprint in dependency order ───────────
     if (typeof argv.build === 'string' && argv.build) {
@@ -608,8 +596,8 @@ async function main() {
             process.exit(1);
         }
         display.header('Architect Builder', `Building from blueprint: ${bp.id}`);
-        console.log(chalk_1.default.hex('#8a7768')(`  Task: ${bp.task}`));
-        console.log(chalk_1.default.hex('#8a7768')(`  Files: ${bp.files.filter(f => f.status === 'planned').length} to build\n`));
+        console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`  Task: ${bp.task}`));
+        console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`  Files: ${bp.files.filter(f => f.status === 'planned').length} to build\n`));
         await (0, engine_js_2.updateBlueprintStatus)(bp.id, 'building');
         // Build files in order — planned files only
         const plannedFiles = bp.files.filter(f => f.status === 'planned');
@@ -668,7 +656,7 @@ async function main() {
         const stepTasks = argv._.map(String);
         if (stepTasks.length === 0) {
             console.error(chalk_1.default.hex('#b15439')('\n  ✗ No step tasks provided.'));
-            console.error(chalk_1.default.hex('#8a7768')('  Usage: ruby --workflow <name> "step 1" "step 2" ...\n'));
+            console.error(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('  Usage: ruby --workflow <name> "step 1" "step 2" ...\n'));
             process.exit(1);
         }
         const steps = stepTasks.map((task, i) => ({
@@ -708,9 +696,9 @@ async function main() {
             console.error(chalk_1.default.hex('#b15439').bold(`\n  ✗ ${finalState.outcome}\n`));
         }
         const totalTokens = finalState.totalTokens ?? 0;
-        console.log(chalk_1.default.hex('#4e3d30')(`  ↳ ${totalTokens.toLocaleString()} tokens · ${finalState.stepStates.length} steps · status: ${finalState.status}`));
+        console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`  ↳ ${totalTokens.toLocaleString()} tokens · ${finalState.stepStates.length} steps · status: ${finalState.status}`));
         if (finalState.status === 'failed') {
-            console.log(chalk_1.default.hex('#8a7768')(`\n  Resume with: ruby --resume-workflow ${finalState.definition.id}\n`));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`\n  Resume with: ruby --resume-workflow ${finalState.definition.id}\n`));
             process.exit(1);
         }
         return;
@@ -753,9 +741,9 @@ async function main() {
             console.error(chalk_1.default.hex('#b15439').bold(`\n  ✗ ${finalState.outcome}\n`));
         }
         const totalTokens = finalState.totalTokens ?? 0;
-        console.log(chalk_1.default.hex('#4e3d30')(`  ↳ ${totalTokens.toLocaleString()} tokens · ${finalState.stepStates.length} steps · status: ${finalState.status}`));
+        console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`  ↳ ${totalTokens.toLocaleString()} tokens · ${finalState.stepStates.length} steps · status: ${finalState.status}`));
         if (finalState.status === 'failed') {
-            console.log(chalk_1.default.hex('#8a7768')(`\n  Resume with: ruby --resume-workflow ${finalState.definition.id}\n`));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`\n  Resume with: ruby --resume-workflow ${finalState.definition.id}\n`));
             process.exit(1);
         }
         return;
@@ -763,77 +751,60 @@ async function main() {
     // ── Single task mode: aura "fix the bug" ──────────────────────────────────────
     if (argv._.length > 0) {
         const task = argv._.join(' ');
-        console.log(chalk_1.default.hex('#8a7768')(`\n  Task: ${chalk_1.default.hex('#ede0cc')(task)}\n`));
-        // --architect: plan-only — decompose and display
+        console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`\n  Task: ${chalk_1.default.hex(diamond_js_1.TEXT_HEX)(task)}\n`));
+        // --architect: plan-only — decompose and display, then exit (no execution)
         if (argv.architect === true) {
             await runArchitectPlan(task, provider, ctx, display);
-            if (argv.once)
-                return;
-            return startRepl();
+            return;
         }
         // --build: full orchestrated build — decompose + execute all specialists
         // When --build <id> is a string, build from a saved blueprint instead
         const doOrchestrate = argv.orchestrate === true || argv.build === true;
         if (doOrchestrate) {
             await runOrchestratedTask(task, provider, ctx, display, doOrchestrate);
-            if (argv.once)
-                return;
-            return startRepl();
+            return;
         }
         try {
             let perception = await (0, index_js_4.loadPerception)(ctx.root);
             if (!perception || (0, index_js_4.isStale)(perception)) {
                 display.agentThinking();
                 perception = await (0, index_js_4.extractPerception)(ctx.root);
-                // Persist so the viz dashboard and context summary stay populated
-                (0, index_js_4.savePerception)(perception).catch(() => { });
-                (0, index_js_4.saveGraphForViz)(perception).catch(() => { });
             }
             const decision = await (0, index_js_3.routeTask)({ provider, context: ctx, task, perception: perception ?? undefined });
             if (decision.shouldDecompose && decision.confidence > 0.8) {
                 await runOrchestratedTask(task, provider, ctx, display, false, perception ?? undefined);
-                if (argv.once)
-                    return;
-                return startRepl();
+                return;
             }
         }
         catch {
             // Router failed — fall through to single agent
         }
-        // ── Competence-based model selection ───────────────────────────────────────
-        // Picks the best-performing model among already-configured, same-family
-        // options based on task similarity to past episodes. Distinct from
-        // RubyAlternator below — this only chooses among models you've already
-        // set up; it never tries a free local model first.
-        // Only when the user has NOT explicitly specified --model or :model
-        if (!userSetModel && !globalCfg?.defaultModel) {
-            try {
-                const availableModelIds = (0, factory_js_1.getAllModels)()
-                    .map(m => m.id)
-                    .filter(id => (0, factory_js_2.isModelConfigured)(id))
-                    .filter(id => (0, factory_js_2.modelProviderFamily)(id) === (0, factory_js_2.modelProviderFamily)(runtimeConfig.model ?? resolved.model));
-                const suggested = await (0, model_selector_js_1.selectModel)(ctx.root, task, availableModelIds);
-                if (suggested && suggested !== runtimeConfig.model) {
-                    console.log(chalk_1.default.hex('#4e3d30')(`  Using ${suggested} (selected by competence history)\n`));
-                    runtimeConfig.model = suggested;
-                    runtimeConfig.baseUrl = undefined;
-                    runtimeConfig.apiKey = undefined;
-                    // Rebuild provider with the suggested model
-                    provider = buildProvider(display);
+        const doVerify = cliVerify || !!fileConfig.verify;
+        // --moa: mixture-of-agents Phase 2 — only pays off for exploratory-shaped
+        // tasks (see docs/MIXTURE_OF_AGENTS.md), so it's gated on both the flag
+        // and the task shape. Other shapes fall through to the single-agent path.
+        if (argv.moa === true) {
+            const { classifyTask } = await Promise.resolve().then(() => __importStar(require('../agent/loop-profile.js')));
+            if (classifyTask(task) === 'exploratory') {
+                const { runMixtureOfAgents } = await Promise.resolve().then(() => __importStar(require('../agent/mixture.js')));
+                const moaResult = await runMixtureOfAgents({ provider, task, context: ctx, display });
+                if (activeChatId && !noSession) {
+                    await session_store_js_1.sessionStore.upsertSession(projectRoot, activeChatId, moaResult.history, activeChatTitle);
                 }
+                if (moaResult.success) {
+                    display.summary(moaResult.summary, moaResult.turns, moaResult.toolCallCount);
+                    printUsageFooter(display, moaResult.usage, moaResult.costUsd);
+                }
+                else {
+                    display.error(moaResult.summary);
+                    process.exit(1);
+                }
+                return;
             }
-            catch {
-                // Competence selection is best-effort; never block the user
-            }
+            display.warning('--moa only applies to exploratory tasks (explain/analyze/investigate…) — running the normal single-agent path.');
         }
-        const doVerify = cliVerify || !!fileConfig.verify;
-        const rubyConfig = { ...types_js_1.DEFAULT_RUBY_CONFIG, ...fileConfig.ruby };
-        const episodeStart = Date.now();
         let result;
-        let alternatorHandledEpisode = false;
         if (doVerify) {
-            // Ruby-alternation doesn't support the verification wrapper yet —
-            // a verified task always runs directly against the selected model.
             const { runWithVerification } = await Promise.resolve().then(() => __importStar(require('../verify/index.js')));
             const maxRetries = cliMaxVerifyRetries ?? fileConfig.maxVerifyRetries ?? defaults_js_1.DEFAULTS.maxVerifyRetries;
             const testCommand = cliTestCommand ?? fileConfig.testCommand;
@@ -854,20 +825,6 @@ async function main() {
             });
             result = wrapperResult.loopResult;
         }
-        else if (rubyConfig.enabled) {
-            const alternator = new alternator_js_1.RubyAlternator({
-                rubyConfig,
-                largeModelProvider: provider,
-                projectRoot: ctx.root,
-                context: ctx,
-                display,
-                permissions,
-                initialHistory: activeChatHistory,
-            });
-            const altResult = await alternator.run(task);
-            result = altResult.loopResult;
-            alternatorHandledEpisode = true; // alternator.run() already saved its own episode
-        }
         else {
             result = await (0, loop_js_1.runAgentLoop)({
                 provider, task, context: ctx, permissions, display,
@@ -880,254 +837,304 @@ async function main() {
                 sessionPath,
             });
         }
-        // Persist episode for Ruby Principle training data — skip when
-        // RubyAlternator already saved its own (richer) episode above, to
-        // avoid double-counting every task in the stats/dashboard.
-        if (!alternatorHandledEpisode) {
-            try {
-                const { randomBytes } = await Promise.resolve().then(() => __importStar(require('crypto')));
-                await (0, episode_capture_js_1.saveEpisode)(ctx.root, {
-                    id: randomBytes(4).toString('hex') + '-' + Date.now().toString(36),
-                    timestamp: Date.now(),
-                    task,
-                    projectRoot: ctx.root,
-                    rubyAttempted: false,
-                    rubySucceeded: false,
-                    largeModelUsed: runtimeConfig.model,
-                    largeModelOutput: result.summary,
-                    reviewerApproved: result.success,
-                    tokensUsed: { largeModel: result.usage.totalTokens },
-                    durationMs: Date.now() - episodeStart,
-                    taskCategory: 'other',
-                });
-            }
-            catch {
-                // Episode recording is best-effort; never block the user
-            }
-        }
-        // Update history so REPL continues the conversation
-        activeChatHistory = result.history;
         if (activeChatId && !noSession) {
             await session_store_js_1.sessionStore.upsertSession(projectRoot, activeChatId, result.history, activeChatTitle);
         }
+        {
+            const { recordEpisode } = await Promise.resolve().then(() => __importStar(require('../dream/episode.js')));
+            recordEpisode(ctx.root, {
+                task,
+                model: provider.model,
+                success: result.success,
+                tokens: (result.usage?.inputTokens ?? 0) + (result.usage?.outputTokens ?? 0),
+                durationMs: 0,
+            });
+        }
         if (result.success) {
             display.summary(result.summary, result.turns, result.toolCallCount);
-            printUsageFooter(display, result.usage, result.costUsd, {
-                model: runtimeConfig.model ?? undefined,
-                cumulativeTokens: result.usage.inputTokens + result.usage.outputTokens,
-                history: result.history,
-            });
+            printUsageFooter(display, result.usage, result.costUsd);
+            if (speakEnabled)
+                await speakSummary(result.summary);
         }
         else {
             display.error(result.summary);
+            process.exit(1);
         }
-        if (argv.once)
-            return;
-        return startRepl();
-    }
-    // ── Interactive REPL mode (no task args) ────────────────────────────────────
-    return startRepl();
-    // ─────────────────────────────────────────────────────────────────────────────
-    // startRepl — interactive readline loop, reused after single-task completion
-    // ─────────────────────────────────────────────────────────────────────────────
-    async function startRepl() {
-        if (activeChatHistory.length > 0) {
-            console.log(chalk_1.default.hex('#8a7768')(`  Continuing session with ${Math.floor(activeChatHistory.length / 2)} prior turns.`));
-        }
-        console.log(chalk_1.default.hex('#8a7768')('  Type a task, or :help for commands. Ctrl+C to exit.\n'));
-        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-        const ask = () => {
-            const idTag = activeChatId ? chalk_1.default.hex('#4e3d30')(` [${activeChatId}]`) : '';
-            rl.question(chalk_1.default.hex('#cc785c')('  ▸ ') + idTag + (idTag ? ' ' : ''), async (line) => {
-                const input = line.trim();
-                if (!input) {
-                    ask();
-                    return;
-                }
-                // Slash / colon commands
-                const replCtx = {
-                    ctx, display,
-                    providerConfig: { model: resolved.model, apiKey: runtimeConfig.apiKey, baseUrl: runtimeConfig.baseUrl ?? undefined },
-                    permissions, cumulative,
-                    chatState: { projectRoot, activeChatId, activeChatHistory, activeChatTitle, noSession },
-                    rl,
-                    rubyEnabled: { ...types_js_1.DEFAULT_RUBY_CONFIG, ...fileConfig.ruby }.enabled,
-                };
-                const cmdResult = await handleReplCommand(input, replCtx);
-                if (cmdResult.handled) {
-                    // Commands may update chat state
-                    if (cmdResult.newChatId !== undefined)
-                        activeChatId = cmdResult.newChatId;
-                    if (cmdResult.newHistory !== undefined)
-                        activeChatHistory = cmdResult.newHistory;
-                    if (cmdResult.newTitle !== undefined)
-                        activeChatTitle = cmdResult.newTitle;
-                    // :ruby on/off persists by mutating the loaded config the gate reads.
-                    if (cmdResult.rubyEnabled !== undefined) {
-                        fileConfig.ruby = { ...fileConfig.ruby, enabled: cmdResult.rubyEnabled };
-                    }
-                    ask();
-                    return;
-                }
-                // Run task — pass current conversation history for stay-active mode
-                // ── Competence-based model selection ───────────────────────────────
-                // Picks the best-performing model among already-configured, same-family
-                // options based on task similarity to past episodes. Distinct from
-                // RubyAlternator below — this only chooses among models you've already
-                // set up; it never tries a free local model first.
-                // Only when the user has NOT set a model explicitly via --model or :model
-                if (!userSetModel && !globalCfg?.defaultModel) {
-                    try {
-                        const availableModelIds = (0, factory_js_1.getAllModels)()
-                            .map(m => m.id)
-                            .filter(id => (0, factory_js_2.isModelConfigured)(id))
-                            .filter(id => (0, factory_js_2.modelProviderFamily)(id) === (0, factory_js_2.modelProviderFamily)(runtimeConfig.model ?? resolved.model));
-                        const suggested = await (0, model_selector_js_1.selectModel)(ctx.root, input, availableModelIds);
-                        if (suggested && suggested !== runtimeConfig.model) {
-                            console.log(chalk_1.default.hex('#4e3d30')(`  Using ${suggested} (selected by competence history)\n`));
-                            runtimeConfig.model = suggested;
-                            runtimeConfig.baseUrl = undefined;
-                            runtimeConfig.apiKey = undefined;
-                        }
-                    }
-                    catch {
-                        // Competence selection is best-effort; never block the user
-                    }
-                }
-                let result;
-                try {
-                    const currentProvider = buildProvider(display);
-                    const replConfirmFn = async (msg) => new Promise(res => {
-                        rl.question(`\n⚠️  ${msg} [y/N] `, a => {
-                            res(a.trim().toLowerCase() === 'y' || a.trim().toLowerCase() === 'yes');
-                        });
-                    });
-                    const doVerify = argv.verify === true || !!fileConfig.verify;
-                    const rubyConfig = { ...types_js_1.DEFAULT_RUBY_CONFIG, ...fileConfig.ruby };
-                    if (doVerify) {
-                        // Ruby-alternation doesn't support the verification wrapper yet —
-                        // a verified task always runs directly against the selected model.
-                        const { runWithVerification } = await Promise.resolve().then(() => __importStar(require('../verify/index.js')));
-                        const maxRetries = cliMaxVerifyRetries ?? fileConfig.maxVerifyRetries ?? defaults_js_1.DEFAULTS.maxVerifyRetries;
-                        const testCommand = cliTestCommand ?? fileConfig.testCommand;
-                        const wrapperResult = await runWithVerification({
-                            loopOpts: {
-                                provider: currentProvider, task: input,
-                                context: ctx, permissions, display,
-                                initialHistory: activeChatHistory,
-                                maxTurns: resolved.maxTurns,
-                                confirmFn: replConfirmFn,
-                                spawnConfig: {
-                                    apiKey: runtimeConfig.apiKey,
-                                    baseUrl: runtimeConfig.baseUrl ?? undefined,
-                                },
-                                sessionPath,
-                            },
-                            config: { enabled: true, maxRetries, testCommand },
-                            projectRoot: ctx.root,
-                            display,
-                        });
-                        result = wrapperResult.loopResult;
-                    }
-                    else if (rubyConfig.enabled) {
-                        const alternator = new alternator_js_1.RubyAlternator({
-                            rubyConfig,
-                            largeModelProvider: currentProvider,
-                            projectRoot: ctx.root,
-                            context: ctx,
-                            display,
-                            permissions,
-                            confirmFn: replConfirmFn,
-                            initialHistory: activeChatHistory,
-                        });
-                        const altResult = await alternator.run(input);
-                        result = altResult.loopResult;
-                    }
-                    else {
-                        result = await (0, loop_js_1.runAgentLoop)({
-                            provider: currentProvider, task: input,
-                            context: ctx, permissions, display,
-                            initialHistory: activeChatHistory,
-                            maxTurns: resolved.maxTurns,
-                            confirmFn: replConfirmFn,
-                            spawnConfig: {
-                                apiKey: runtimeConfig.apiKey,
-                                baseUrl: runtimeConfig.baseUrl ?? undefined,
-                            },
-                            sessionPath,
-                        });
-                    }
-                }
-                catch (err) {
-                    const msg = err instanceof Error ? (err.stack || err.message) : String(err);
-                    console.error(chalk_1.default.hex('#b15439')(`\n  ✗ Unhandled error: ${msg}\n`));
-                    // Suggest :provider on auth errors
-                    if (/\b(401|403|unauthorized|invalid.*api.?key|authentication)\b/i.test(msg)) {
-                        console.error(chalk_1.default.hex('#cc785c')('  💡 Run :provider to reconfigure your API key\n'));
-                    }
-                    ask();
-                    return;
-                }
-                // Update stay-active history
-                activeChatHistory = result.history;
-                // Persist session
-                if (activeChatId && !noSession) {
-                    await session_store_js_1.sessionStore.upsertSession(projectRoot, activeChatId, activeChatHistory, activeChatTitle);
-                }
-                cumulative.turns += result.turns;
-                cumulative.toolCalls += result.toolCallCount;
-                cumulative.inputTokens += result.usage.inputTokens;
-                cumulative.outputTokens += result.usage.outputTokens;
-                cumulative.costUsd += result.costUsd;
-                if (result.success) {
-                    display.summary(result.summary, result.turns, result.toolCallCount);
-                    printUsageFooter(display, result.usage, result.costUsd, {
-                        model: runtimeConfig.model ?? undefined,
-                        cumulativeTokens: cumulative.inputTokens + cumulative.outputTokens,
-                        history: activeChatHistory,
-                    });
-                }
-                else {
-                    display.error(result.summary);
-                }
-                ask();
-            });
+        return;
+    }
+    // ── Interactive REPL mode (TUI — fixed bottom input) ────────────────────────
+    // Enter the alternate screen buffer for the whole interactive session —
+    // see enterAltScreen()'s doc comment in tui.ts for why: redrawing the
+    // header in place on the NORMAL screen (needed so it stays pinned while
+    // reflecting live typing) leaves every intermediate redraw frame
+    // permanently baked into the real terminal's scrollback the moment it
+    // scrolls past the top of the viewport — the live view was always
+    // correct, but scrolling up through history showed it stacked dozens of
+    // times. The alt screen is an isolated buffer with no persistent
+    // scrollback, so this can't happen; leaving it (destroyTui()/Ctrl+C)
+    // restores the terminal exactly as it was, same as quitting vim or less.
+    // The banner was already drawn once above (renderBanner() is shared with
+    // one-shot mode, which does NOT use the alt screen), so it has to be
+    // redrawn here — it rendered to the now-hidden normal screen, not this
+    // fresh alt-screen buffer.
+    (0, tui_js_1.enterAltScreen)();
+    const tuiBannerInfo = {
+        version: package_json_1.default.version,
+        title: ctx.name,
+        provider: provider.name,
+        model: runtimeConfig.model,
+        language: ctx.language,
+        mode: permissionLevel,
+        cwd: projectRoot,
+        extras: [
+            ...(fileConfig.model ? ['.aura.json loaded'] : []),
+            ...(activeChatId ? [`chat ${activeChatId}`] : []),
+        ],
+    };
+    (0, diamond_js_1.renderBanner)(tuiBannerInfo);
+    // The TUI keeps its own copy of the banner rows: when scroll mode hands
+    // the screen back, the live view is rebuilt from scratch, and on the alt
+    // screen there's no scrollback to recover the banner from.
+    (0, tui_js_1.setBannerLines)((0, diamond_js_1.buildBannerLines)(tuiBannerInfo));
+    // Use the TUI display for output
+    const tuiDisplay = (0, tui_js_1.createTuiDisplay)();
+    // Shared context-health tracker: the loop records compaction events and
+    // per-turn snapshots into it; the /context command reads it back. The
+    // system-prompt source starts empty — the loop calls updateSystem() with
+    // the real (task-embedded) prompt each run.
+    const healthTracker = new context_health_js_1.ContextHealthTracker(() => '', () => activeChatHistory, resolved.model ?? 'gpt-4o', resolved.model ?? 'gpt-4o');
+    // ── Right-panel content: "Try" suggestions only ─────────────────────────
+    // The panel deliberately carries no Commands/Skills listings — the
+    // command list lives in :help and doesn't need permanent sidebar space
+    // next to the input.
+    const panelSuggestions = [
+        activeChatHistory.length === 0 ? ':help — see all commands' : ':doctor — scan for issues',
+        ctx.language ? `run: ${ctx.language === 'TypeScript' || ctx.language === 'JavaScript' ? 'npm test' : ':graph'}` : ':viz — memory dashboard',
+    ];
+    (0, tui_js_1.setPanelContent)({ suggestions: panelSuggestions });
+    // Unboxed metadata line under the input box, mirroring the reference's
+    // "Build · <model> · <mode>" line under its own input box.
+    (0, tui_js_1.setStatusLine)([provider.name, runtimeConfig.model, permissionLevel].filter(Boolean).join(' · '));
+    (0, tui_js_1.initTui)();
+    if (activeChatId)
+        (0, tui_js_1.setChatId)(activeChatId);
+    (0, tui_js_1.startInput)();
+    // Route permission confirmations through the TUI's own raw-mode-safe
+    // prompt instead of a plain readline.Interface, which forces stdin out
+    // of raw mode and fights the TUI's own input handler (see tui.ts).
+    (0, permissions_js_1.setConfirmHandler)(tui_js_1.askConfirm);
+    // Must come after initTui() — writeOutput() assumes the "cursor at base
+    // row" invariant initTui() establishes; calling it any earlier corrupts
+    // that baseline.
+    if (activeChatHistory.length > 0) {
+        (0, tui_js_1.writeOutput)(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('  Continuing session with ' + Math.floor(activeChatHistory.length / 2) + ' prior turns.'));
+    }
+    // Buffer for :btw and :stop typed during the agent loop
+    let pendingBtw = null;
+    let abortController = null;
+    (0, tui_js_1.setCallbacks)({
+        onEnter(line) {
+            processLine(line);
+        },
+        onStop() {
+            if (abortController)
+                abortController?.abort();
+        },
+    });
+    let tuiInputHistory = [];
+    async function processLine(input) {
+        const replCtx = {
+            rl: null,
+            ctx, display: tuiDisplay,
+            providerConfig: { model: resolved.model, apiKey: runtimeConfig.apiKey, baseUrl: runtimeConfig.baseUrl ?? undefined },
+            permissions, cumulative,
+            chatState: { projectRoot, activeChatId, activeChatHistory, activeChatTitle, noSession },
+            sessionPath,
+            healthTracker,
         };
-        // Ctrl+C: if a task is running, prompt to force-quit; second Ctrl+C exits.
-        let ctrlC = 0;
-        rl.on('SIGINT', () => {
-            ctrlC++;
-            if (ctrlC === 1) {
-                console.log(chalk_1.default.hex('#cc785c')('\n  ⏳ Press Ctrl+C again to exit (current task will keep running).'));
-                setTimeout(() => { ctrlC = 0; }, 3000);
+        // Check for REPL commands
+        const cmdResult = await handleReplCommand(input, replCtx);
+        if (cmdResult.handled) {
+            if (cmdResult.newChatId !== undefined)
+                activeChatId = cmdResult.newChatId;
+            if (cmdResult.newHistory !== undefined)
+                activeChatHistory = cmdResult.newHistory;
+            if (cmdResult.newTitle !== undefined)
+                activeChatTitle = cmdResult.newTitle;
+            if (activeChatId)
+                (0, tui_js_1.setChatId)(activeChatId);
+            return;
+        }
+        // Run task
+        let result;
+        abortController = new AbortController();
+        const abortSignal = abortController.signal;
+        try {
+            const currentProvider = buildProvider(tuiDisplay);
+            pendingBtw = null;
+            const doVerify = argv.verify === true || !!fileConfig.verify;
+            if (doVerify) {
+                const { runWithVerification } = await Promise.resolve().then(() => __importStar(require('../verify/index.js')));
+                const maxRetries = cliMaxVerifyRetries ?? fileConfig.maxVerifyRetries ?? defaults_js_1.DEFAULTS.maxVerifyRetries;
+                const testCommand = cliTestCommand ?? fileConfig.testCommand;
+                const wrapperResult = await runWithVerification({
+                    loopOpts: {
+                        provider: currentProvider, task: input,
+                        context: ctx, permissions, display: tuiDisplay,
+                        initialHistory: activeChatHistory,
+                        maxTurns: resolved.maxTurns,
+                        abortSignal,
+                        spawnConfig: {
+                            apiKey: runtimeConfig.apiKey,
+                            baseUrl: runtimeConfig.baseUrl ?? undefined,
+                        },
+                        sessionPath,
+                        healthTracker,
+                    },
+                    config: { enabled: true, maxRetries, testCommand },
+                    projectRoot: ctx.root,
+                    display: tuiDisplay,
+                });
+                result = wrapperResult.loopResult;
             }
             else {
-                console.log(chalk_1.default.hex('#4e3d30')('\n  Aura closed.\n'));
-                process.exit(0);
+                result = await (0, loop_js_1.runAgentLoop)({
+                    provider: currentProvider, task: input,
+                    context: ctx, permissions, display: tuiDisplay,
+                    initialHistory: activeChatHistory,
+                    maxTurns: resolved.maxTurns,
+                    spawnConfig: {
+                        apiKey: runtimeConfig.apiKey,
+                        baseUrl: runtimeConfig.baseUrl ?? undefined,
+                    },
+                    sessionPath,
+                    abortSignal,
+                    healthTracker,
+                });
             }
-        });
-        ask();
-        rl.on('close', () => {
-            console.log(chalk_1.default.hex('#4e3d30')('\n  Aura closed.\n'));
-            process.exit(0);
-        });
+        }
+        catch (err) {
+            const msg = err instanceof Error ? (err.stack || err.message) : String(err);
+            (0, tui_js_1.writeOutput)(chalk_1.default.hex('#b15439')('  ✗ Unhandled error: ' + msg));
+            return;
+        }
+        // Check if task was cancelled by user
+        if (abortController?.signal.aborted && !result.success) {
+            (0, tui_js_1.writeOutput)(chalk_1.default.hex('#d4903a')('  ⏹ Task cancelled.'));
+            // Don't record episode for cancelled tasks
+            return;
+        }
+        // Update stay-active history
+        try {
+            activeChatHistory = result.history;
+            // Persist session
+            if (activeChatId && !noSession) {
+                await session_store_js_1.sessionStore.upsertSession(projectRoot, activeChatId, activeChatHistory, activeChatTitle);
+            }
+            {
+                const { recordEpisode } = await Promise.resolve().then(() => __importStar(require('../dream/episode.js')));
+                recordEpisode(ctx.root, {
+                    task: input,
+                    model: runtimeConfig.model ?? resolved.model ?? 'unknown',
+                    success: result.success,
+                    tokens: (result.usage?.inputTokens ?? 0) + (result.usage?.outputTokens ?? 0),
+                    durationMs: 0,
+                });
+            }
+            cumulative.turns += result.turns;
+            cumulative.toolCalls += result.toolCallCount;
+            cumulative.inputTokens += result.usage.inputTokens;
+            cumulative.outputTokens += result.usage.outputTokens;
+            cumulative.costUsd += result.costUsd;
+            if (result.success) {
+                tuiDisplay.summary(result.summary, result.turns, result.toolCallCount);
+                printUsageFooter(tuiDisplay, result.usage, result.costUsd);
+                if (speakEnabled)
+                    await speakSummary(result.summary);
+            }
+            else {
+                tuiDisplay.error(result.summary);
+            }
+            // Process any :btw that was typed during the loop
+            if (pendingBtw) {
+                const q = pendingBtw;
+                pendingBtw = null;
+                abortController = new AbortController();
+                const { runBtwQuery, renderBtwAnswer } = await Promise.resolve().then(() => __importStar(require('../repl/side-channel.js')));
+                (0, tui_js_1.writeOutput)(chalk_1.default.hex(diamond_js_1.FAINT_HEX)('  Side question: "' + q + '"'));
+                const btwResult = await runBtwQuery(q, buildProvider(tuiDisplay), ctx);
+                (0, tui_js_1.writeOutput)(renderBtwAnswer(btwResult.answer, btwResult.tokens));
+            }
+        }
+        catch (err) {
+            const msg = err instanceof Error ? (err.stack || err.message) : String(err);
+            (0, tui_js_1.writeOutput)(chalk_1.default.hex('#b15439')('  \u2717 Unhandled error after task completed: ' + msg));
+        }
     }
+    (0, tui_js_1.writeOutput)(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('  Type a task, or :help for commands.'));
+}
+/**
+ * Best-effort map from a model id to the env-var name its key lives under.
+ * Delegates to the factory helper — custom providers from .aura.json are
+ * covered because registerCustomProviders runs at startup.
+ */
+function envNameForModel(model) {
+    return (0, factory_js_1.apiKeyEnvVarForModel)(model);
 }
 function trySetModel(c, newModel) {
     const prevModel = runtimeConfig.model;
+    const prevResolved = resolved.model;
+    const prevApiKey = runtimeConfig.apiKey;
     const prevBaseUrl = runtimeConfig.baseUrl;
+    const prevResolvedBaseUrl = resolved.baseUrl;
     runtimeConfig.model = newModel;
-    runtimeConfig.baseUrl = undefined;
+    resolved.model = newModel; // buildProvider reads resolved.model — keep in sync
+    const crossing = (0, model_select_js_1.isProviderChange)(prevModel ?? prevResolved, newModel);
+    if (crossing) {
+        // The old provider's key/baseUrl must not follow the model across a
+        // provider boundary — createProvider gives config.apiKey priority over
+        // the per-provider env fallback, so a stale key would be sent to the
+        // NEW provider's endpoint. Clear both so the factory falls through to
+        // the new provider's own getApiKey()/default-endpoint chain.
+        runtimeConfig.apiKey = undefined;
+        runtimeConfig.baseUrl = undefined;
+        resolved.baseUrl = undefined;
+    }
     try {
         const test = buildProvider(c.display);
         c.providerConfig.model = newModel;
-        userSetModel = true; // user explicitly chose — alternator must not override
+        if (crossing) {
+            c.providerConfig.apiKey = undefined;
+            c.providerConfig.baseUrl = undefined;
+        }
         console.log(chalk_1.default.hex('#5a9e6e')(`  ✓ Switched to ${test.name} · ${newModel}`));
+        // Update the TUI status line so the model change is immediately visible.
+        (0, tui_js_1.setStatusLine)([test.name, newModel, permissionLevel].filter(Boolean).join(' · '));
+        // Remember the choice for the next session. The saved baseUrl belongs to
+        // the wizard-configured model — keep it only when switching back to that
+        // model, otherwise the factory's per-provider default applies.
+        try {
+            (0, global_config_js_1.saveGlobalConfig)({
+                provider: globalCfg?.provider ?? test.name,
+                // loadGlobalConfig treats an empty apiKeyEnv as "not configured", so
+                // resolve from the NEW model's provider — never inherit the old
+                // provider's env name across a provider change (a silently wrong
+                // apiKeyEnv on disk pairs the wrong key with the model on the next
+                // startup).
+                apiKeyEnv: (0, model_select_js_1.apiKeyEnvForModelSwitch)(newModel, prevModel ?? prevResolved, globalCfg?.apiKeyEnv),
+                defaultModel: newModel,
+                baseUrl: savedProvider && newModel === savedProvider.model ? savedProvider.baseUrl : undefined,
+            });
+        }
+        catch { /* persistence is best-effort; the switch itself succeeded */ }
         return { ok: true };
     }
     catch (e) {
         runtimeConfig.model = prevModel; // rollback on error
+        resolved.model = prevResolved;
+        runtimeConfig.apiKey = prevApiKey;
         runtimeConfig.baseUrl = prevBaseUrl;
+        resolved.baseUrl = prevResolvedBaseUrl;
         return { ok: false, err: String(e) };
     }
 }
@@ -1136,134 +1143,450 @@ function trySetModel(c, newModel) {
  * lets the user pick by number or type a custom model ID.
  */
 async function showModelSelector(c) {
-    const allModels = (0, factory_js_1.getAllModels)();
-    // Build flat numbered list grouped by provider
-    const entries = [];
-    let currentProvider = '';
-    for (const m of allModels) {
-        if (m.provider !== currentProvider) {
-            currentProvider = m.provider;
-            entries.push({ id: '', label: chalk_1.default.hex('#8a7768').bold(`  ── ${currentProvider} ──`), provider: currentProvider });
-        }
-        entries.push({
-            id: m.id,
-            label: `    ${chalk_1.default.hex('#cc785c')(String(entries.length + 1).padStart(2))}. ${chalk_1.default.hex('#ede0cc')(m.name.padEnd(30))} ${chalk_1.default.hex('#4e3d30')(m.speed)}`,
-            provider: m.provider,
-        });
+    // Same stdin-collision fix as :provider (see handleReplCommand): the TUI's
+    // raw-mode stdin handler competes with any prompt for keystrokes, so stop
+    // TUI input entirely (this also hides the main input box), let a plain
+    // readline own stdin, then restart TUI input once the selector exits.
+    // enterFullscreenPrompt resets the scroll region so the selector's output
+    // isn't crammed into the small scroll area (numbers were invisible because
+    // the bottom block was overwriting them).
+    const wasInputActive = tui_js_1.inputActive;
+    if (wasInputActive) {
+        (0, tui_js_1.stopInput)();
+        (0, tui_js_1.enterFullscreenPrompt)();
     }
-    console.log(chalk_1.default.hex('#cc785c').bold('\n  Model Selector\n'));
-    for (const e of entries) {
-        console.log(e.label);
-    }
-    console.log(chalk_1.default.hex('#4e3d30')(`\n  Current: ${runtimeConfig.model}`));
-    console.log(chalk_1.default.hex('#4e3d30')('  Type a number, model ID, or press Enter to cancel:\n'));
-    return new Promise(resolve => {
-        c.rl.question(chalk_1.default.hex('#cc785c')('  ▸ '), (answer) => {
-            const choice = answer.trim();
-            if (!choice) {
-                console.log(chalk_1.default.hex('#4e3d30')('  Cancelled.\n'));
-                resolve();
-                return;
+    try {
+        // Grouped list where section headers are display-only: they carry no
+        // number, so numbering is gap-free and a header can never be selected.
+        const rows = (0, model_select_js_1.buildModelRows)((0, factory_js_1.getAllModels)());
+        console.log(chalk_1.default.hex('#cc785c').bold('\n  Model Selector\n'));
+        for (const r of rows) {
+            if (r.kind === 'header') {
+                console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX).bold(`  ── ${r.provider} ──`));
             }
-            // Try as a number
-            const num = parseInt(choice, 10);
-            if (!isNaN(num) && num >= 1 && num <= entries.length) {
-                const selected = entries[num - 1];
-                if (selected.id) {
-                    trySetModel(c, selected.id);
-                }
-                else {
-                    console.log(chalk_1.default.hex('#b15439')('  ✗ That\'s a section header, pick a model number.'));
-                }
-                resolve();
+            else {
+                console.log(`    ${chalk_1.default.hex('#cc785c')(String(r.num).padStart(2))}. ${chalk_1.default.hex(diamond_js_1.TEXT_HEX)(r.name.padEnd(30))} ${chalk_1.default.hex(diamond_js_1.FAINT_HEX)(r.speed)}`);
+            }
+        }
+        console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`\n  Current: ${runtimeConfig.model}`));
+        console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)('  Type a number, model ID, or press Enter to cancel:\n'));
+        const answer = await new Promise(resolve => {
+            const promptRl = c.rl;
+            if (!promptRl) {
+                // TUI mode: TUI input is stopped above, so a temporary readline can
+                // own stdin without the two-readers-one-stream conflict.
+                const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+                rl.question(chalk_1.default.hex('#cc785c')('  ▸ '), ans => { rl.close(); resolve(ans); });
                 return;
             }
-            // Treat as a raw model ID
-            trySetModel(c, choice);
-            resolve();
+            promptRl.question(chalk_1.default.hex('#cc785c')('  ▸ '), resolve);
         });
-    });
+        const choice = answer.trim();
+        if (!choice) {
+            console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)('  Cancelled.\n'));
+            return;
+        }
+        // Try as a number — every listed number is a real, selectable model
+        const num = parseInt(choice, 10);
+        if (!isNaN(num) && num >= 1 && num <= (0, model_select_js_1.modelCount)(rows)) {
+            trySetModel(c, (0, model_select_js_1.modelIdForNumber)(rows, num));
+            return;
+        }
+        // Treat as a raw model ID
+        trySetModel(c, choice);
+    }
+    finally {
+        if (wasInputActive) {
+            (0, tui_js_1.exitFullscreenPrompt)();
+            (0, tui_js_1.startInput)();
+        }
+    }
 }
 async function handleReplCommand(input, c) {
     const unhandled = { handled: false };
+    // ── :q — Task queue (with subcommands, keep bare :q as quit) ─────────────
+    if (input.startsWith(':q ')) {
+        const sub = input.slice(3).trimStart();
+        const { addToQueue, loadQueue, removeFromQueue, clearQueue, runQueueItem, formatQueue } = await Promise.resolve().then(() => __importStar(require('../repl/queue.js')));
+        if (sub.startsWith('add ')) {
+            const prompt = sub.slice(4).trim();
+            if (!prompt) {
+                c.display.warning('Usage: :q add <prompt> -- add a task to the queue.');
+                return { handled: true };
+            }
+            const item = addToQueue(prompt);
+            console.log(chalk_1.default.hex('#5a9e6e')(`\n  ✓ Queued #${loadQueue().length}: "${prompt.slice(0, 60)}"\n`));
+            return { handled: true };
+        }
+        if (sub === 'list') {
+            const items = loadQueue();
+            console.log(formatQueue(items));
+            return { handled: true };
+        }
+        if (sub.startsWith('run ')) {
+            const n = parseInt(sub.slice(4).trim(), 10);
+            if (isNaN(n) || n < 1) {
+                c.display.warning('Usage: :q run <number> — run the task at that position (see :q list).');
+                return { handled: true };
+            }
+            const items = loadQueue();
+            if (n > items.length) {
+                c.display.warning(`Queue only has ${items.length} item(s).`);
+                return { handled: true };
+            }
+            c.display.agentThinking();
+            const result = await runQueueItem(n - 1, buildProvider(c.display), c.ctx, c.permissions, c.display);
+            if (!result) {
+                c.display.warning('Could not run that item.');
+                return { handled: true };
+            }
+            c.display.success(`Queue item #${n}: ${result.success ? 'done' : 'failed'}`);
+            if (result.output) {
+                console.log(chalk_1.default.hex(diamond_js_1.TEXT_HEX)(`  ${result.output.slice(0, 240)}`));
+            }
+            console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`  ${result.turns} turn(s) · ${result.toolCalls} tool call(s).\n`));
+            return { handled: true };
+        }
+        if (sub.startsWith('drop ')) {
+            const n = parseInt(sub.slice(5).trim(), 10);
+            if (isNaN(n) || n < 1) {
+                c.display.warning('Usage: :q drop <number> — remove the task at that position.');
+                return { handled: true };
+            }
+            const removed = removeFromQueue(n - 1);
+            if (!removed) {
+                c.display.warning(`No item at position ${n}.`);
+                return { handled: true };
+            }
+            console.log(chalk_1.default.hex('#5a9e6e')(`\n  ✓ Dropped #${n}: "${removed.prompt.slice(0, 60)}"\n`));
+            return { handled: true };
+        }
+        if (sub === 'clear') {
+            const count = loadQueue().length;
+            if (count === 0) {
+                c.display.warning('Queue is already empty.');
+                return { handled: true };
+            }
+            clearQueue();
+            console.log(chalk_1.default.hex('#5a9e6e')(`\n  ✓ Queue cleared (${count} item(s) removed).\n`));
+            return { handled: true };
+        }
+        c.display.warning('Usage: :q add <prompt> | :q list | :q run <n> | :q drop <n> | :q clear');
+        return { handled: true };
+    }
     if (input === ':quit' || input === ':q' || input === '/exit') {
         process.exit(0);
     }
+    if (input === ':speak') {
+        speakEnabled = !speakEnabled;
+        console.log(chalk_1.default.hex(speakEnabled ? '#5a9e6e' : '#a68a2a')(`  🔊 Voice replies ${speakEnabled ? 'ON — Aura will read its answers aloud' : 'OFF'}.\n`));
+        return { handled: true };
+    }
+    // :approve — flip the session into auto-approve (no per-command y/N prompt).
+    //   :approve      → toggle auto ⇄ normal
+    //   :approve all  → auto (approve everything for this session)
+    //   :approve off  → back to normal (confirm destructive commands again)
+    // Dangerous commands are still blocked either way.
+    if (input === ':approve' || input === ':approve all' || input === ':approve off') {
+        const cur = c.permissions.getLevel();
+        let next;
+        if (input === ':approve off')
+            next = 'normal';
+        else if (input === ':approve all')
+            next = 'auto';
+        else
+            next = cur === 'auto' ? 'normal' : 'auto';
+        c.permissions.setLevel(next);
+        if (next === 'auto') {
+            console.log(chalk_1.default.hex('#d4903a')('  ✅ Auto-approve ON — commands run without asking (dangerous ones still blocked). `:approve off` to re-enable prompts.\n'));
+        }
+        else {
+            console.log(chalk_1.default.hex('#5a9e6e')('  🔒 Auto-approve OFF — destructive commands will ask for confirmation again.\n'));
+        }
+        return { handled: true };
+    }
+    if (input === ':dream' || input === ':dream full') {
+        const full = input === ':dream full';
+        const { runDream } = await Promise.resolve().then(() => __importStar(require('../dream/dream.js')));
+        c.display.agentThinking();
+        const res = await runDream({ projectRoot: c.ctx.root, provider: buildProvider(c.display), full });
+        if (res.skipped) {
+            c.display.warning(res.providerError
+                ? `Dream skipped (episodes preserved): ${res.providerError}`
+                : (res.reason ?? 'Nothing to consolidate.'));
+        }
+        else {
+            c.display.success(`Dream written: ${res.path} (${res.episodeCount} episodes${full ? ', full run' : ''})`);
+            if (res.reconciled)
+                c.display.success('Reconciliation also ran (>=3 dreams exist) -> dreams/.reconciled.md');
+        }
+        return { handled: true };
+    }
+    if (input.startsWith(':research ') || input === ':research') {
+        const topic = input.slice(':research '.length).trim();
+        if (!topic) {
+            c.display.warning('Usage: :research <topic> -- runs a multi-step research pass and saves to research/*.md.');
+            return { handled: true };
+        }
+        console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`\n  Researching "${topic}"…\n`));
+        try {
+            const { runResearch } = await Promise.resolve().then(() => __importStar(require('../research/research.js')));
+            const res = await runResearch({
+                projectRoot: c.ctx.root,
+                topic,
+                provider: buildProvider(c.display),
+                context: c.ctx,
+                permissions: c.permissions,
+                display: c.display,
+            });
+            console.log(chalk_1.default.hex('#5a9e6e')(`  ✓ Research written: ${res.path}`));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`  ${res.turns} turn(s) · ${res.toolCalls} tool call(s).\n`));
+        }
+        catch (e) {
+            console.log(chalk_1.default.hex('#b15439')(`  ✗ ${String(e)}\n`));
+        }
+        return { handled: true };
+    }
+    if (input === ':confessions') {
+        const { listConfessions } = await Promise.resolve().then(() => __importStar(require('../agent/confess.js')));
+        const confs = listConfessions();
+        if (confs.length === 0) {
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('\n  No confessions yet. Run :confess after a high-token episode.\n'));
+        }
+        else {
+            console.log(chalk_1.default.hex('#cc785c').bold(`\n  ${confs.length} confession(s):\n`));
+            for (const c of confs) {
+                console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`  ${c.file}`));
+                console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`    ${c.tokens.toLocaleString()} tokens burned → ${c.lesson.slice(0, 100)}`));
+            }
+            console.log('');
+        }
+        return { handled: true };
+    }
+    if (input === ':confess') {
+        const { runConfession, findEpisodeToConfess } = await Promise.resolve().then(() => __importStar(require('../agent/confess.js')));
+        const targetEp = findEpisodeToConfess(c.ctx.root);
+        if (!targetEp) {
+            console.log(chalk_1.default.hex('#cc9e5c')('\n  No anomalous episode found. Confession is fully automatic — the system alone decides what to confess.\n'));
+            return { handled: true };
+        }
+        console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`\n  🙏 Confessing episode ${targetEp.id.slice(0, 8)}… — ${targetEp.task.slice(0, 60)} (${(targetEp.tokens / 1e6).toFixed(1)}M tok)\n`));
+        try {
+            // Use a different model than the one that made the mistake
+            const confessorModel = targetEp.model.startsWith('deepseek') ? 'glm-5.2' : 'deepseek/deepseek-chat';
+            const { createProvider } = await Promise.resolve().then(() => __importStar(require('../providers/factory.js')));
+            const provider = createProvider({ model: confessorModel });
+            const result = await runConfession({
+                projectRoot: c.ctx.root,
+                episodeId: targetEp.id,
+                provider,
+            });
+            console.log(chalk_1.default.hex('#5a9e6e')(`  ✓ Confession written: ${result.path}`));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`  Tokens burned: ${result.tokensBurned.toLocaleString()} | Confession cost: ${result.tokensSpent.toLocaleString()} (${confessorModel})`));
+            console.log(chalk_1.default.hex('#cc9e6c')('  Permanent lesson:'));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_HEX)(`  "${result.lesson}"\n`));
+        }
+        catch (e) {
+            console.log(chalk_1.default.hex('#b15439')(`  ✗ ${String(e)}\n`));
+        }
+        return { handled: true };
+    }
+    if (input === ':rem') {
+        const { getReconciledOrLatest } = await Promise.resolve().then(() => __importStar(require('../dream/dream.js')));
+        const res = getReconciledOrLatest(c.ctx.root);
+        if (!res) {
+            c.display.warning('No dreams yet. Run :dream first.');
+        }
+        else {
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`\n  ${res.isReconciled ? 'Reconciled projection' : 'Latest dream (not yet reconciled)'}:\n`));
+            console.log(res.content);
+        }
+        return { handled: true };
+    }
+    // ── :mine — Baby Ruby experience mining (src/mining/). The base pass is
+    // zero-LLM (pure clustering over episodes/*.json); --refine additionally
+    // runs Papa Ruby, one local-model call per qualifying concept, appending
+    // accepted lessons to training-data/<date>.jsonl.
+    if (input === ':mine' || input === ':mine --refine') {
+        const refine = input.endsWith('--refine');
+        const { mineExperience } = await Promise.resolve().then(() => __importStar(require('../mining/extract.js')));
+        const mined = await mineExperience(c.ctx.root);
+        if (mined.episodeCount === 0) {
+            c.display.warning('No episodes to mine yet — run some tasks first.');
+            return { handled: true };
+        }
+        console.log(chalk_1.default.hex('#cc785c').bold(`\n  Mined ${mined.concepts.length} concept(s) from ${mined.episodeCount} episode(s) (${mined.unclustered} unclustered):\n`));
+        for (const con of mined.concepts.slice(0, 15)) {
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`  ${con.concept}`) + chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`  (${con.category} · ×${con.frequency} · conf ${con.confidence} · depth ${con.depth})`));
+            if (con.keywords.length > 0)
+                console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`    keywords: ${con.keywords.join(', ')}`));
+        }
+        if (mined.concepts.length > 15) {
+            console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`  … and ${mined.concepts.length - 15} more.`));
+        }
+        if (refine) {
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('\n  Refining with the local Ruby model (Papa Ruby)…'));
+            const { refineConcepts } = await Promise.resolve().then(() => __importStar(require('../mining/refine.js')));
+            const res = await refineConcepts({ projectRoot: c.ctx.root, concepts: mined.concepts });
+            if (res.accepted.length > 0) {
+                console.log(chalk_1.default.hex('#5a9e6e')(`  ✓ ${res.accepted.length} training example(s) appended: ${res.outputPath}`));
+                console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`    ${res.rejected} rejected, ${res.skipped} below the confidence/frequency gate.\n`));
+            }
+            else {
+                c.display.warning(`No concepts survived refinement — ${res.rejected} rejected, ${res.skipped} below the confidence/frequency gate.`);
+            }
+        }
+        else if (mined.concepts.length > 0) {
+            console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)('\n  :mine --refine judges these with the local Ruby model and writes training-data/*.jsonl\n'));
+        }
+        return { handled: true };
+    }
+    if (input === ':doctor' || input.startsWith(':doctor')) {
+        const fix = input.includes('--fix');
+        const offline = input.includes('--offline');
+        c.display.agentThinking();
+        const report = await (0, index_js_5.runDoctor)({ projectRoot: c.ctx.root, fix, offline });
+        if (typeof tui_js_1.writeOutput === 'function') {
+            (0, tui_js_1.writeOutput)((0, index_js_5.formatDoctorReport)(report));
+        }
+        else {
+            console.log((0, index_js_5.formatDoctorReport)(report));
+        }
+        return { handled: true };
+    }
+    if (input.startsWith(':machina ') || input === ':machina') {
+        const machinaTask = input.slice(':machina '.length).trim();
+        if (!machinaTask) {
+            c.display.warning('Usage: :machina <task> -- runs the task with self-verification (file/test checks + auto-retry).');
+            return { handled: true };
+        }
+        const { runWithVerification } = await Promise.resolve().then(() => __importStar(require('../verify/index.js')));
+        const maxRetries = cliMaxVerifyRetries ?? fileConfig.maxVerifyRetries ?? defaults_js_1.DEFAULTS.maxVerifyRetries;
+        const testCommand = cliTestCommand ?? fileConfig.testCommand;
+        const wrapperResult = await runWithVerification({
+            loopOpts: {
+                provider: buildProvider(c.display), task: machinaTask,
+                context: c.ctx, permissions: c.permissions, display: c.display,
+                initialHistory: c.chatState.activeChatHistory,
+                maxTurns: resolved.maxTurns,
+                spawnConfig: {
+                    apiKey: c.providerConfig.apiKey,
+                    baseUrl: c.providerConfig.baseUrl,
+                },
+                sessionPath: c.sessionPath,
+            },
+            config: { enabled: true, maxRetries, testCommand },
+            projectRoot: c.ctx.root,
+            display: c.display,
+        });
+        const mResult = wrapperResult.loopResult;
+        if (mResult.success) {
+            c.display.summary(mResult.summary, mResult.turns, mResult.toolCallCount);
+            printUsageFooter(c.display, mResult.usage, mResult.costUsd);
+        }
+        else {
+            c.display.error(mResult.summary);
+        }
+        return { handled: true, newHistory: mResult.history };
+    }
+    if (input.startsWith(':council ') || input === ':council') {
+        const councilTask = input.slice(':council '.length).trim();
+        if (!councilTask) {
+            c.display.warning('Usage: :council <task> -- runs 2-3 read-only domain specialists in parallel, then synthesizes their reports.');
+            return { handled: true };
+        }
+        const { runMixtureOfAgents } = await Promise.resolve().then(() => __importStar(require('../agent/mixture.js')));
+        const councilResult = await runMixtureOfAgents({
+            provider: buildProvider(c.display), task: councilTask, context: c.ctx, display: c.display,
+        });
+        if (councilResult.success) {
+            c.display.summary(councilResult.summary, councilResult.turns, councilResult.toolCallCount);
+            printUsageFooter(c.display, councilResult.usage, councilResult.costUsd);
+        }
+        else {
+            c.display.error(councilResult.summary);
+        }
+        return { handled: true };
+    }
+    // ── :ecclesia — 5-agent independent research council (research/council.ts).
+    // Distinct from :council above (mixture-of-agents over the current task):
+    // the Ecclesia runs N agents that research a topic WITHOUT seeing each
+    // other's findings, then one synthesis call reconciles them into a verdict.
+    if (input.startsWith(':ecclesia ') || input === ':ecclesia') {
+        let topic = input.slice(':ecclesia '.length).trim();
+        if (!topic) {
+            c.display.warning('Usage: :ecclesia <topic> [--panel <model>] [--seats <n>] -- N independent research agents (default 5) + a synthesis verdict, saved to council/*.md|.html.');
+            return { handled: true };
+        }
+        let panelModel;
+        let panelSize;
+        const panelMatch = topic.match(/\s--panel\s+(\S+)/);
+        if (panelMatch) {
+            panelModel = panelMatch[1];
+            topic = topic.replace(panelMatch[0], '').trim();
+        }
+        const seatsMatch = topic.match(/\s--seats\s+(\d+)/);
+        if (seatsMatch) {
+            panelSize = Number(seatsMatch[1]);
+            topic = topic.replace(seatsMatch[0], '').trim();
+        }
+        console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`\n  Convening the Ecclesia on "${topic}"…\n`));
+        try {
+            const { runCouncil } = await Promise.resolve().then(() => __importStar(require('../research/council.js')));
+            const res = await runCouncil({
+                projectRoot: c.ctx.root, topic,
+                synthesisProvider: buildProvider(c.display),
+                context: c.ctx, permissions: c.permissions, display: c.display,
+                panelSize, panelModel,
+                configuredModel: c.providerConfig.model,
+            });
+            console.log(chalk_1.default.hex('#5a9e6e')(`  ✓ Ecclesia verdict written: ${res.path}`));
+            console.log(chalk_1.default.hex('#5a9e6e')(`    HTML: ${res.htmlPath}`));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`  ${res.panelSize} seats on ${res.panelModel}.`));
+            if (res.agentFailures > 0) {
+                c.display.warning(`${res.agentFailures} of ${res.panelSize} panel agent(s) failed — verdict is based on the rest.`);
+            }
+        }
+        catch (e) {
+            console.log(chalk_1.default.hex('#b15439')(`  ✗ ${String(e)}\n`));
+        }
+        return { handled: true };
+    }
+    // ── :btw — Side channel question (read-only, no history) ────────────────
+    if (input.startsWith(':btw ')) {
+        const question = input.slice(5).trim();
+        if (!question) {
+            c.display.warning('Usage: :btw <question> — ask a quick side question without interrupting the current task.');
+            return { handled: true };
+        }
+        const { runBtwQuery, renderBtwAnswer } = await Promise.resolve().then(() => __importStar(require('../repl/side-channel.js')));
+        c.display.agentThinking();
+        const result = await runBtwQuery(question, buildProvider(c.display), c.ctx);
+        console.log(renderBtwAnswer(result.answer, result.tokens));
+        return { handled: true };
+    }
     if (input === ':help' || input === '/help') {
-        console.log(chalk_1.default.hex('#8a7768')([
-            '',
-            '  ── Session ──────────────────────────────────────',
-            '  :id                     Show current chat ID',
-            '  :sessions               List all saved sessions',
-            '  :resume                 Resume the latest session',
-            '  :resume <id>            Resume a specific session by ID',
-            '  :new                    Start a new session (fresh history)',
-            '  :history                Show turn count in current session',
-            '  :clear-history          Wipe conversation history (keep session ID)',
-            '  :save [title]           Rename / save current session',
-            '  :delete <id>            Delete a saved session',
-            '',
-            '  ── Model / API ──────────────────────────────────',
-            '  :provider               Provider setup wizard (configure provider, model, API key)',
-            '  :model                  Interactive model selector',
-            '  :model <id>             Switch to a specific model',
-            '  :models                 List all available models',
-            '  :apikey <key>           Set API key for current session',
-            '',
-            '  ── Workflows ─────────────────────────────────────',
-            '  :workflows              List all saved workflows',
-            '  :workflow               Create & run a multi-step workflow',
-            '    <name> "step1" "step2" ...',
-            '  :resume-workflow <id>   Resume a paused/failed workflow',
-            '',
-            '  ── Context / Stats ──────────────────────────────',
-            '  :context                Show loaded project context',
-            '  :graph                  Show codebase knowledge graph summary',
-            '  :graph refresh          Extract + persist codebase graph',
-            '  :stats                  Show episode-level stats (completion rate, models, tokens)',
-            '  :plans                  List saved execution plans',
-            '  :viz, :dashboard        Generate and open the memory dashboard',
-            '  :dream                  [experimental] Consolidate today\'s episodes into a dated dream (dreams/*.md)',
-            '  :dream full             [experimental] Consolidate ALL episodes, ignoring the last-dream cutoff',
-            '  :rem                    [experimental] List dream files and open the most recent one',
-            '  :research <topic>       Multi-step research pass, saved to research/*.md (inspired by DeerFlow)',
-            '  :council <topic>        Ecclesia — 5 independent agents research the topic, synthesized into one verdict (council/*.md)',
-            '  :ruby [on|off]          Toggle the Ruby Principle (default: off)',
-            '  ⚠ :machina               The Abstract Agent Machine — formal model, verified against this source tree',
-            '  ⚠ :machina --html        Also write the full writeup + diagram to docs/machina.html',
-            '  :design [slug|list|off] Set/list the design system auto-applied to UI builds',
-            '  /stats, /usage, :usage  Show token + cost usage this session',
-            '  /clear, /reset          Reset cumulative usage stats',
-            '',
-            '  ── General ──────────────────────────────────────',
-            '  :approve all            Auto-approve all tool calls (no confirmations)',
-            '  :approve normal         Require confirmation for destructive ops',
-            '  :approve read-only      Block all write operations',
-            '  :quit, :q, /exit        Exit',
-            '',
-            '  ⚠ = extremely high token usage — reads multiple source files and writes a careful long-form result',
-            '',
-        ].join('\n')));
+        console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(help_data_js_1.HELP_TEXT.join('\n')));
         return { handled: true };
     }
     // ── Session commands ─────────────────────────────────────────────────────
     if (input === ':id') {
         const cs = c.chatState;
         if (cs.activeChatId) {
-            console.log(chalk_1.default.hex('#8a7768')(`\n  Chat ID: ${chalk_1.default.hex('#cc785c')(cs.activeChatId)}`));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`\n  Chat ID: ${chalk_1.default.hex('#cc785c')(cs.activeChatId)}`));
             if (cs.activeChatTitle)
-                console.log(chalk_1.default.hex('#8a7768')(`  Title:   ${cs.activeChatTitle}`));
-            console.log(chalk_1.default.hex('#4e3d30')(`  Turns:   ${Math.floor(cs.activeChatHistory.length / 2)}\n`));
+                console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`  Title:   ${cs.activeChatTitle}`));
+            console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`  Turns:   ${Math.floor(cs.activeChatHistory.length / 2)}\n`));
         }
         else {
-            console.log(chalk_1.default.hex('#8a7768')('\n  No active session (--no-session mode).\n'));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('\n  No active session (--no-session mode).\n'));
         }
         return { handled: true };
     }
     if (input === ':sessions') {
         const sessions = session_store_js_1.sessionStore.listSessions(c.chatState.projectRoot);
         if (sessions.length === 0) {
-            console.log(chalk_1.default.hex('#8a7768')('\n  No saved sessions.\n'));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('\n  No saved sessions.\n'));
         }
         else {
             console.log(chalk_1.default.hex('#cc785c').bold('\n  Saved sessions:\n'));
@@ -1272,8 +1595,8 @@ async function handleReplCommand(input, c) {
                 const turns = Math.floor(s.history.length / 2);
                 const marker = s.id === c.chatState.activeChatId ? chalk_1.default.hex('#5a9e6e')(' ← current') : '';
                 console.log(`  ${chalk_1.default.hex('#cc785c')(s.id.padEnd(20))} ` +
-                    `${chalk_1.default.hex('#ede0cc')(s.title.slice(0, 40).padEnd(41))} ` +
-                    `${chalk_1.default.hex('#4e3d30')(`${turns}t · ${updated}`)}${marker}`);
+                    `${chalk_1.default.hex(diamond_js_1.TEXT_HEX)(s.title.slice(0, 40).padEnd(41))} ` +
+                    `${chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`${turns}t · ${updated}`)}${marker}`);
             }
             console.log();
         }
@@ -1282,7 +1605,7 @@ async function handleReplCommand(input, c) {
     if (input === ':resume' || input === ':resume ') {
         const latest = session_store_js_1.sessionStore.findLatestSession(c.chatState.projectRoot);
         if (!latest) {
-            console.log(chalk_1.default.hex('#8a7768')('\n  No saved sessions to resume.\n'));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('\n  No saved sessions to resume.\n'));
             return { handled: true };
         }
         console.log(chalk_1.default.hex('#5a9e6e')(`\n  ↩ Resuming ${latest.id} — "${latest.title}" (${Math.floor(latest.history.length / 2)} turns)\n`));
@@ -1305,7 +1628,7 @@ async function handleReplCommand(input, c) {
     }
     if (input === ':history') {
         const turns = Math.floor(c.chatState.activeChatHistory.length / 2);
-        console.log(chalk_1.default.hex('#8a7768')(`\n  Current session: ${turns} turn${turns !== 1 ? 's' : ''} in history.\n`));
+        console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`\n  Current session: ${turns} turn${turns !== 1 ? 's' : ''} in history.\n`));
         return { handled: true };
     }
     if (input === ':clear-history') {
@@ -1316,7 +1639,7 @@ async function handleReplCommand(input, c) {
         const title = input.startsWith(':save ') ? input.slice(':save '.length).trim() : undefined;
         const cs = c.chatState;
         if (!cs.activeChatId) {
-            console.log(chalk_1.default.hex('#8a7768')('\n  No active session to save (--no-session mode).\n'));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('\n  No active session to save (--no-session mode).\n'));
             return { handled: true };
         }
         const session = await session_store_js_1.sessionStore.upsertSession(cs.projectRoot, cs.activeChatId, cs.activeChatHistory, title ?? cs.activeChatTitle);
@@ -1330,7 +1653,7 @@ async function handleReplCommand(input, c) {
             console.log(chalk_1.default.hex('#5a9e6e')(`\n  ✓ Deleted session ${id}\n`));
             if (id === c.chatState.activeChatId) {
                 const newId = session_store_js_1.sessionStore.generateId();
-                console.log(chalk_1.default.hex('#8a7768')(`  Starting new session: ${newId}\n`));
+                console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`  Starting new session: ${newId}\n`));
                 return { handled: true, newChatId: newId, newHistory: [], newTitle: undefined };
             }
         }
@@ -1341,28 +1664,28 @@ async function handleReplCommand(input, c) {
     }
     // ── Model / API commands ─────────────────────────────────────────────────
     if (input === ':context') {
-        console.log(chalk_1.default.hex('#8a7768')(`\n  Project: ${c.ctx.name} · ${c.ctx.language} · ${c.ctx.framework}`));
-        console.log(chalk_1.default.hex('#4e3d30')(`  Root: ${c.ctx.root}\n`));
+        console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`\n  Project: ${c.ctx.name} · ${c.ctx.language} · ${c.ctx.framework}`));
+        console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`  Root: ${c.ctx.root}\n`));
         return { handled: true };
     }
     if (input === ':graph') {
         const summary = (0, context_js_1.loadGraphSummary)(c.ctx.root);
         if (!summary) {
-            console.log(chalk_1.default.hex('#8a7768')('\n  No graph.json found. Run :graph refresh to extract.\n'));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('\n  No graph.json found. Run :graph refresh to extract.\n'));
         }
         else {
             console.log(chalk_1.default.hex('#cc785c').bold('\n  Codebase Knowledge Graph\n'));
-            console.log(chalk_1.default.hex('#8a7768')(summary));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(summary));
             console.log();
         }
         return { handled: true };
     }
     if (input === ':viz' || input === ':dashboard') {
-        console.log(chalk_1.default.hex('#8a7768')('\n  Generating dashboard…\n'));
+        console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('\n  Generating dashboard…\n'));
         try {
             const outPath = (0, index_js_1.generateDashboard)(c.ctx.root);
             console.log(chalk_1.default.hex('#5a9e6e')(`  ✓ Dashboard written to ${outPath}`));
-            console.log(chalk_1.default.hex('#8a7768')('  Opening in browser…\n'));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('  Opening in browser…\n'));
             (0, index_js_1.openDashboard)(outPath);
         }
         catch (e) {
@@ -1370,185 +1693,11 @@ async function handleReplCommand(input, c) {
         }
         return { handled: true };
     }
-    if (input === ':dream' || input === ':dream full') {
-        const full = input === ':dream full';
-        console.log(chalk_1.default.hex('#8a7768')('\n  Dreaming — consolidating episodes…\n'));
-        try {
-            const { runDream } = await Promise.resolve().then(() => __importStar(require('../dream/dream.js')));
-            const { createResilientProvider } = await Promise.resolve().then(() => __importStar(require('../providers/resilient-factory.js')));
-            const provider = createResilientProvider({ model: c.providerConfig.model, apiKey: c.providerConfig.apiKey, baseUrl: c.providerConfig.baseUrl }, {}, c.display);
-            const res = await runDream({ projectRoot: c.ctx.root, provider, full });
-            if (res.skipped) {
-                console.log(chalk_1.default.hex('#cc9e5c')(`  ⤳ Nothing to dream about — ${res.reason}.\n`));
-            }
-            else {
-                console.log(chalk_1.default.hex('#5a9e6e')(`  ✓ Dream written: ${res.path}`));
-                console.log(chalk_1.default.hex('#8a7768')(`  Consolidated ${res.episodeCount} episode(s).\n`));
-            }
-        }
-        catch (e) {
-            console.log(chalk_1.default.hex('#b15439')(`  ✗ ${String(e)}\n`));
-        }
-        return { handled: true };
-    }
-    if (input.startsWith(':research ')) {
-        const topic = input.slice(':research '.length).trim();
-        if (!topic) {
-            console.log(chalk_1.default.hex('#b15439')('\n  Usage: :research <topic>\n'));
-            return { handled: true };
-        }
-        console.log(chalk_1.default.hex('#8a7768')(`\n  Researching "${topic}"…\n`));
-        try {
-            const { runResearch } = await Promise.resolve().then(() => __importStar(require('../research/research.js')));
-            const { createResilientProvider } = await Promise.resolve().then(() => __importStar(require('../providers/resilient-factory.js')));
-            const provider = createResilientProvider({ model: c.providerConfig.model, apiKey: c.providerConfig.apiKey, baseUrl: c.providerConfig.baseUrl }, {}, c.display);
-            const res = await runResearch({
-                projectRoot: c.ctx.root,
-                topic,
-                provider,
-                context: c.ctx,
-                permissions: c.permissions,
-                display: c.display,
-            });
-            console.log(chalk_1.default.hex('#5a9e6e')(`  ✓ Research written: ${res.path}`));
-            console.log(chalk_1.default.hex('#8a7768')(`  ${res.turns} turn(s) · ${res.toolCalls} tool call(s).\n`));
-        }
-        catch (e) {
-            console.log(chalk_1.default.hex('#b15439')(`  ✗ ${String(e)}\n`));
-        }
-        return { handled: true };
-    }
-    if (input.startsWith(':council ')) {
-        let rest = input.slice(':council '.length).trim();
-        const wantsReader = /(^|\s)--reader(\s|$)/.test(rest);
-        rest = rest.replace(/(^|\s)--reader(\s|$)/g, ' ').trim();
-        const stray = rest.match(/(^|\s)(--\S+)/);
-        if (stray) {
-            console.log(chalk_1.default.hex('#b15439')(`\n  ✗ Unknown flag: ${stray[2]}. Did you mean --reader?\n`));
-            return { handled: true };
-        }
-        const topic = rest;
-        if (!topic) {
-            console.log(chalk_1.default.hex('#b15439')('\n  Usage: :council <topic> [--reader]\n'));
-            return { handled: true };
-        }
-        console.log(chalk_1.default.hex('#8a7768')(`\n  Convening Ecclesia on "${topic}" — 5 independent agents…\n`));
-        try {
-            const { runCouncil } = await Promise.resolve().then(() => __importStar(require('../research/council.js')));
-            const { createResilientProvider } = await Promise.resolve().then(() => __importStar(require('../providers/resilient-factory.js')));
-            const synthesisProvider = createResilientProvider({ model: c.providerConfig.model, apiKey: c.providerConfig.apiKey, baseUrl: c.providerConfig.baseUrl }, {}, c.display);
-            const res = await runCouncil({
-                projectRoot: c.ctx.root,
-                topic,
-                synthesisProvider,
-                context: c.ctx,
-                permissions: c.permissions,
-                display: c.display,
-            });
-            console.log(chalk_1.default.hex('#5a9e6e')(`  ✓ Ecclesia verdict: ${res.path}`));
-            console.log(chalk_1.default.hex('#8a7768')(`  ${res.panelSize} agents` + (res.agentFailures > 0 ? `, ${res.agentFailures} failed` : '') + `.\n`));
-            if (wantsReader) {
-                const { renderReaderFromMarkdown } = await Promise.resolve().then(() => __importStar(require('../viz/reader.js')));
-                const readerPath = renderReaderFromMarkdown(res.path);
-                console.log(chalk_1.default.hex('#5a9e6e')(`  ✓ Reader: ${readerPath}`));
-                console.log(chalk_1.default.hex('#8a7768')('  Opening in browser…\n'));
-                (0, index_js_1.openDashboard)(readerPath);
-            }
-        }
-        catch (e) {
-            console.log(chalk_1.default.hex('#b15439')(`  ✗ ${String(e)}\n`));
-        }
-        return { handled: true };
-    }
-    if (input === ':rem') {
-        const dir = path.join(c.ctx.root, 'dreams');
-        let files = [];
-        try {
-            files = fs.readdirSync(dir).filter(f => f.endsWith('.md') && !f.startsWith('.')).sort().reverse();
-        }
-        catch { /* no dreams dir */ }
-        if (files.length === 0) {
-            console.log(chalk_1.default.hex('#8a7768')('\n  No dreams yet. Run :dream after some work.\n'));
-        }
-        else {
-            console.log(chalk_1.default.hex('#cc785c').bold('\n  Dreams\n'));
-            for (const f of files.slice(0, 20))
-                console.log(chalk_1.default.hex('#ede0cc')(`  ${f}`));
-            // Prefer reconciled view if it exists
-            const reconciledPath = path.join(dir, '.reconciled.md');
-            const hasReconciled = fs.existsSync(reconciledPath);
-            if (hasReconciled) {
-                console.log(chalk_1.default.hex('#5a9e6e')(`\n  ✓ Reconciled memory (${files.length} dreams → projection):\n`));
-                console.log(chalk_1.default.hex('#ede0cc')(fs.readFileSync(reconciledPath, 'utf8')));
-            }
-            else {
-                const latest = path.join(dir, files[0]);
-                console.log(chalk_1.default.hex('#8a7768')(`\n  Most recent: ${latest}\n`));
-                console.log(chalk_1.default.hex('#4e3d30')(fs.readFileSync(latest, 'utf8')));
-                if (files.length >= 3) {
-                    console.log(chalk_1.default.hex('#8a7768')('  💡 Run :dream to trigger memory reconciliation (≥3 dreams).\n'));
-                }
-            }
-        }
-        return { handled: true };
-    }
-    if (input === ':ruby' || input === ':ruby on' || input === ':ruby off') {
-        if (input === ':ruby') {
-            const state = c.rubyEnabled ? chalk_1.default.hex('#5a9e6e')('ON') : chalk_1.default.hex('#b15439')('OFF');
-            console.log(chalk_1.default.hex('#8a7768')(`\n  Ruby Principle is ${state}. Use :ruby on / :ruby off to change.\n`));
-            return { handled: true };
-        }
-        const on = input === ':ruby on';
-        c.rubyEnabled = on;
-        const state = on ? chalk_1.default.hex('#5a9e6e')('ON') : chalk_1.default.hex('#b15439')('OFF');
-        console.log(chalk_1.default.hex('#8a7768')(`\n  Ruby Principle is now ${state} for this session.\n`));
-        return { handled: true, rubyEnabled: on };
-    }
-    if (input === ':machina' || input === ':machina --html' || input === ':machina -html') {
-        const wantsHtml = input !== ':machina';
-        console.log(chalk_1.default.hex('#b15439')('\n  ⚠ :machina reads several source files and writes a careful long-form result — extremely high token usage.\n'));
-        const { runMachina } = await Promise.resolve().then(() => __importStar(require('../machina/index.js')));
-        const res = runMachina({ outputRoot: c.ctx.root, writeHtml: wantsHtml });
-        console.log(res.terminalOutput);
-        if (res.htmlPath) {
-            console.log(chalk_1.default.hex('#5a9e6e')(`  ✓ Written: ${res.htmlPath}\n`));
-        }
-        return { handled: true };
-    }
-    if (input === ':design' || input.startsWith(':design ')) {
-        const { listDesignSlugs } = await Promise.resolve().then(() => __importStar(require('../agent/design.js')));
-        const slugs = listDesignSlugs(c.ctx.root);
-        const arg = input.slice(':design'.length).trim();
-        if (slugs.length === 0) {
-            console.log(chalk_1.default.hex('#b15439')('\n  No design-systems/ folder found in this project.\n'));
-            return { handled: true };
-        }
-        if (arg === '' || arg === 'list') {
-            const current = process.env.AURA_DESIGN || 'terracotta';
-            console.log(chalk_1.default.hex('#cc785c').bold(`\n  Design systems (${slugs.length}) — default: ${current}\n`));
-            console.log(chalk_1.default.hex('#ede0cc')('  ' + slugs.join('  ')));
-            console.log(chalk_1.default.hex('#8a7768')('\n  :design <slug> sets the default · auto-applies on website/UI tasks.\n'));
-            return { handled: true };
-        }
-        if (arg === 'off') {
-            process.env.AURA_DESIGN = '__none__';
-            console.log(chalk_1.default.hex('#8a7768')('\n  Design auto-injection disabled for this session.\n'));
-            return { handled: true };
-        }
-        if (slugs.includes(arg)) {
-            process.env.AURA_DESIGN = arg;
-            console.log(chalk_1.default.hex('#5a9e6e')(`\n  Default design set to "${arg}" for this session.\n`));
-        }
-        else {
-            console.log(chalk_1.default.hex('#b15439')(`\n  Unknown design "${arg}". Run :design to list available slugs.\n`));
-        }
-        return { handled: true };
-    }
     if (input === ':plans') {
         const { planStore } = await Promise.resolve().then(() => __importStar(require('../orchestration/plan-store.js')));
         const plans = await planStore.list();
         if (!plans.length) {
-            console.log(chalk_1.default.hex('#8a7768')('\n  No execution plans found.\n'));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('\n  No execution plans found.\n'));
         }
         else {
             console.log(chalk_1.default.hex('#cc785c').bold('\n  Execution plans:\n'));
@@ -1558,51 +1707,70 @@ async function handleReplCommand(input, c) {
                 const statusColor = p.status === 'done' ? '#5a9e6e' : p.status === 'failed' ? '#b15439' : '#cc9e5c';
                 console.log(`  ${chalk_1.default.hex(statusColor)(p.status.padEnd(8))} ` +
                     `${chalk_1.default.hex('#cc785c')(p.id.slice(0, 12).padEnd(14))} ` +
-                    `${chalk_1.default.hex('#ede0cc')(p.goal.slice(0, 50).padEnd(51))} ` +
-                    `${chalk_1.default.hex('#4e3d30')(`${p.steps.length}s · ${dur} · ${created}`)}`);
+                    `${chalk_1.default.hex(diamond_js_1.TEXT_HEX)(p.goal.slice(0, 50).padEnd(51))} ` +
+                    `${chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`${p.steps.length}s · ${dur} · ${created}`)}`);
             }
             console.log();
         }
         return { handled: true };
     }
     if (input === ':graph refresh') {
-        console.log(chalk_1.default.hex('#8a7768')('\n  Extracting codebase graph...\n'));
+        console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('\n  Refreshing codebase graph...\n'));
+        const { execSync } = await Promise.resolve().then(() => __importStar(require('child_process')));
         try {
-            const perception = await (0, index_js_4.extractPerception)(c.ctx.root);
-            await (0, index_js_4.savePerception)(perception);
-            await (0, index_js_4.saveGraphForViz)(perception);
-            const nodeCount = perception.nodes.length;
-            const edgeCount = perception.edges.length;
-            console.log(chalk_1.default.hex('#5a9e6e')(`  ✓ Extracted ${nodeCount} nodes, ${edgeCount} edges.\n`));
-        }
-        catch (err) {
-            console.log(chalk_1.default.hex('#f85149')(`  ✗ Extraction failed: ${err instanceof Error ? err.message : String(err)}\n`));
+            execSync('python3 -c "' +
+                'import json,os,re,glob; ' +
+                'root=\\\"' + c.ctx.root + '/src\\\"; ' +
+                'print(\\\"Scanning\\\", root)" ', { stdio: 'inherit' });
         }
+        catch { /* ignore */ }
         // Reload context graph
         c.ctx.graphSummary = (0, context_js_1.loadGraphSummary)(c.ctx.root);
         if (c.ctx.graphSummary) {
             console.log(chalk_1.default.hex('#5a9e6e')('  ✓ Graph loaded and injected into context.\n'));
         }
         else {
-            console.log(chalk_1.default.hex('#8a7768')('  No graph.json found after refresh.\n'));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('  No graph.json found after refresh. Run graphify extract first.\n'));
         }
         return { handled: true };
     }
     // ── Provider wizard command ────────────────────────────────────────────────
     if (input === ':provider' || input === '/provider') {
-        const cfg = await (0, provider_wizard_js_1.runProviderWizard)(c.rl);
-        if (cfg) {
-            // Update current session's provider without restart
-            runtimeConfig.model = cfg.model;
-            runtimeConfig.baseUrl = cfg.baseUrl;
-            runtimeConfig.apiKey = cfg.apiKey;
-            c.providerConfig.model = cfg.model;
-            c.providerConfig.baseUrl = cfg.baseUrl;
-            c.providerConfig.apiKey = cfg.apiKey;
-            // Keep resolved in sync
-            resolved.model = cfg.model;
-            resolved.baseUrl = cfg.baseUrl;
-            console.log(chalk_1.default.hex('#5a9e6e')(`  ✓ Now using ${cfg.provider} · ${cfg.model}`));
+        // Fullscreen prompt approach was unreliable — wizard's readline and TUI's
+        // stdin handler collide. Instead, stop TUI input, let readline own stdin
+        // completely, then restart TUI input. enterFullscreenPrompt resets the
+        // scroll region so the wizard's output isn't crammed into the small scroll
+        // area (numbers were invisible because the bottom block was overwriting them).
+        const wasInputActive = tui_js_1.inputActive;
+        if (wasInputActive) {
+            (0, tui_js_1.stopInput)();
+            (0, tui_js_1.enterFullscreenPrompt)();
+        }
+        try {
+            const cfg = await (0, provider_wizard_js_1.runProviderWizard)(undefined, undefined);
+            if (cfg) {
+                runtimeConfig.model = cfg.model;
+                runtimeConfig.baseUrl = cfg.baseUrl;
+                runtimeConfig.apiKey = cfg.apiKey;
+                c.providerConfig.model = cfg.model;
+                c.providerConfig.baseUrl = cfg.baseUrl;
+                c.providerConfig.apiKey = cfg.apiKey;
+                resolved.model = cfg.model;
+                resolved.baseUrl = cfg.baseUrl;
+                (0, tui_js_1.writeOutput)(chalk_1.default.hex('#5a9e6e')(`  ✓ Now using ${cfg.provider} · ${cfg.model}`));
+                // Update the TUI status line so the provider/model change is immediately visible.
+                (0, tui_js_1.setStatusLine)([cfg.provider, cfg.model, permissionLevel].filter(Boolean).join(' · '));
+                if (fileConfig.model && fileConfig.model !== cfg.model) {
+                    (0, tui_js_1.writeOutput)(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`  ⚠ .aura.json pins model "${fileConfig.model}" — next startup in this project will use it.\n` +
+                        `    Remove the "model" field from .aura.json (or set it to ${cfg.model}) to keep this choice.`));
+                }
+            }
+        }
+        finally {
+            if (wasInputActive) {
+                (0, tui_js_1.exitFullscreenPrompt)();
+                (0, tui_js_1.startInput)();
+            }
         }
         return { handled: true };
     }
@@ -1613,9 +1781,9 @@ async function handleReplCommand(input, c) {
             return acc;
         }, {});
         for (const [provider, models] of Object.entries(byProvider)) {
-            console.log(chalk_1.default.hex('#8a7768')(`\n  ${provider}`));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`\n  ${provider}`));
             for (const m of models) {
-                console.log(`    ${chalk_1.default.hex('#cc785c')(m.id.padEnd(45))} ${chalk_1.default.hex('#4e3d30')(m.speed)}`);
+                console.log(`    ${chalk_1.default.hex('#cc785c')(m.id.padEnd(45))} ${chalk_1.default.hex(diamond_js_1.FAINT_HEX)(m.speed)}`);
             }
         }
         console.log();
@@ -1638,7 +1806,22 @@ async function handleReplCommand(input, c) {
         const newKey = input.slice(sep.length).trim();
         runtimeConfig.apiKey = newKey;
         c.providerConfig.apiKey = newKey;
-        console.log(chalk_1.default.hex('#5a9e6e')('  ✓ API key set for current session.'));
+        // Persist it so it survives across sessions (fixes "type the key every
+        // time"). Save under the env-var name for the current provider, and also
+        // set that env var live so getApiKey resolves it this session.
+        const envName = globalCfg?.apiKeyEnv || envNameForModel(resolved.model ?? '');
+        if (envName) {
+            try {
+                const p = (0, key_store_js_1.saveKey)(envName, newKey);
+                console.log(chalk_1.default.hex('#5a9e6e')(`  ✓ API key saved as ${envName} → ${p} (persists across sessions).`));
+            }
+            catch (e) {
+                console.log(chalk_1.default.hex('#5a9e6e')('  ✓ API key set for current session (could not persist: ' + String(e) + ').'));
+            }
+        }
+        else {
+            console.log(chalk_1.default.hex('#5a9e6e')('  ✓ API key set for current session.'));
+        }
         return { handled: true };
     }
     if (input === '/clear' || input === '/reset') {
@@ -1650,42 +1833,10 @@ async function handleReplCommand(input, c) {
         console.log(chalk_1.default.hex('#5a9e6e')('  ✓ Session stats reset'));
         return { handled: true };
     }
-    // ── Permission commands ──────────────────────────────────────────────────
-    if (input.startsWith(':approve ')) {
-        const raw = input.slice(':approve '.length).trim();
-        const mapped = raw === 'all' ? 'auto' : raw;
-        if (mapped !== 'auto' && mapped !== 'normal' && mapped !== 'read-only') {
-            console.log(chalk_1.default.hex('#b15439')('  ✗ Usage: :approve all | :approve normal | :approve read-only'));
-            return { handled: true };
-        }
-        c.permissions.setLevel(mapped);
-        console.log(chalk_1.default.hex('#5a9e6e')(`  ✓ Permission level set to ${mapped}`));
-        return { handled: true };
-    }
-    if (input === ':stats') {
-        // Episode-level stats (same as --stats CLI flag)
-        const episodes = await (0, episode_capture_js_1.loadEpisodes)(c.chatState.projectRoot);
-        const output = (0, stats_js_1.formatStats)(episodes);
-        for (const line of output.split('\n')) {
-            if (line.trim() === 'Aura Stats') {
-                console.log(chalk_1.default.hex('#cc785c').bold(line));
-            }
-            else if (line.includes(':')) {
-                const colonIdx = line.indexOf(':');
-                const label = line.slice(0, colonIdx + 1);
-                const value = line.slice(colonIdx + 1);
-                console.log(chalk_1.default.hex('#8a7768')(label) + chalk_1.default.hex('#ede0cc')(value));
-            }
-            else {
-                console.log(line);
-            }
-        }
-        return { handled: true };
-    }
-    if (input === '/stats' || input === '/usage' || input === ':usage') {
+    if (input === '/stats' || input === '/usage') {
         const u = c.cumulative;
         const total = u.inputTokens + u.outputTokens;
-        console.log(chalk_1.default.hex('#8a7768')([
+        console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)([
             '',
             `  Session usage:`,
             `    Turns:        ${u.turns}`,
@@ -1698,11 +1849,19 @@ async function handleReplCommand(input, c) {
         ].join('\n')));
         return { handled: true };
     }
+    if (input === '/context') {
+        const u = c.cumulative;
+        const h = c.healthTracker.snapshot(u.inputTokens, u.outputTokens);
+        h.turnCount = u.turns;
+        h.toolCallCount = u.toolCalls;
+        c.display.contextDashboard?.(h);
+        return { handled: true };
+    }
     // ── Workflow commands ──────────────────────────────────────────────────────
     if (input === ':workflows') {
         const workflows = await (0, engine_js_1.listWorkflows)();
         if (workflows.length === 0) {
-            console.log(chalk_1.default.hex('#8a7768')('\n  No saved workflows.\n'));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('\n  No saved workflows.\n'));
         }
         else {
             console.log(chalk_1.default.hex('#cc785c').bold('\n  Saved workflows:\n'));
@@ -1712,9 +1871,9 @@ async function handleReplCommand(input, c) {
                 const totalSteps = ws.definition.steps.length;
                 const statusColor = ws.status === 'done' ? '#5a9e6e' : ws.status === 'failed' ? '#b15439' : '#cc785c';
                 console.log(`  ${chalk_1.default.hex('#cc785c')(ws.definition.id.padEnd(24))} ` +
-                    `${chalk_1.default.hex('#ede0cc')(ws.definition.name.slice(0, 36).padEnd(37))} ` +
+                    `${chalk_1.default.hex(diamond_js_1.TEXT_HEX)(ws.definition.name.slice(0, 36).padEnd(37))} ` +
                     `${chalk_1.default.hex(statusColor)(ws.status.padEnd(8))} ` +
-                    `${chalk_1.default.hex('#4e3d30')(`${doneSteps}/${totalSteps} steps · ${created}`)}`);
+                    `${chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`${doneSteps}/${totalSteps} steps · ${created}`)}`);
             }
             console.log();
         }
@@ -1772,7 +1931,7 @@ async function handleReplCommand(input, c) {
         }
         else {
             console.log(chalk_1.default.hex('#b15439').bold(`\n  ✗ ${finalState.outcome}`));
-            console.log(chalk_1.default.hex('#8a7768')(`  Resume with: :resume-workflow ${finalState.definition.id}\n`));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`  Resume with: :resume-workflow ${finalState.definition.id}\n`));
         }
         return { handled: true };
     }
@@ -1810,7 +1969,7 @@ async function handleReplCommand(input, c) {
         }
         else {
             console.log(chalk_1.default.hex('#b15439').bold(`\n  ✗ ${finalState.outcome}`));
-            console.log(chalk_1.default.hex('#8a7768')(`  Resume with: :resume-workflow ${finalState.definition.id}\n`));
+            console.log(chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(`  Resume with: :resume-workflow ${finalState.definition.id}\n`));
         }
         return { handled: true };
     }
@@ -1919,29 +2078,29 @@ async function runArchitectPlan(task, provider, ctx, display) {
     });
     // Display result
     console.log(chalk_1.default.hex('#cc785c').bold('\n  Blueprint\n'));
-    console.log(chalk_1.default.hex('#ede0cc')(`  Task: ${blueprint.task}`));
-    console.log(chalk_1.default.hex('#4e3d30')(`  ID: ${blueprint.id}\n`));
+    console.log(chalk_1.default.hex(diamond_js_1.TEXT_HEX)(`  Task: ${blueprint.task}`));
+    console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`  ID: ${blueprint.id}\n`));
     if (blueprint.files.length > 0) {
         console.log(chalk_1.default.hex('#cc785c').bold('  Files:\n'));
         for (const f of blueprint.files) {
             console.log(`    ${chalk_1.default.hex('#cc785c')(f.path)}`);
-            console.log(`      ${chalk_1.default.hex('#8a7768')(f.purpose)}`);
+            console.log(`      ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(f.purpose)}`);
             if (f.exports.length > 0)
-                console.log(`      ${chalk_1.default.hex('#4e3d30')(`exports: ${f.exports.join(', ')}`)}`);
+                console.log(`      ${chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`exports: ${f.exports.join(', ')}`)}`);
             if (f.interfaces.length > 0)
-                console.log(`      ${chalk_1.default.hex('#4e3d30')(`interfaces: ${f.interfaces.join(', ')}`)}`);
+                console.log(`      ${chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`interfaces: ${f.interfaces.join(', ')}`)}`);
         }
     }
     if (blueprint.dataModels.length > 0) {
         console.log(chalk_1.default.hex('#cc785c').bold('\n  Data Models:\n'));
         for (const dm of blueprint.dataModels) {
-            console.log(`    ${chalk_1.default.hex('#cc785c')(dm.name)} — ${chalk_1.default.hex('#8a7768')(dm.description)}`);
+            console.log(`    ${chalk_1.default.hex('#cc785c')(dm.name)} — ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(dm.description)}`);
         }
     }
     if (blueprint.risks.length > 0) {
         console.log(chalk_1.default.hex('#b15439').bold('\n  Risks:\n'));
         for (const risk of blueprint.risks) {
-            console.log(`    ${chalk_1.default.hex('#b15439')('⚠')} ${chalk_1.default.hex('#8a7768')(risk)}`);
+            console.log(`    ${chalk_1.default.hex('#b15439')('⚠')} ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)(risk)}`);
         }
     }
     console.log(chalk_1.default.hex('#5a9e6e')('\n  Blueprint saved. No files were modified.'));
@@ -1961,16 +2120,20 @@ async function runOrchestratedTask(task, provider, ctx, display, forceOrchestrat
     // If --plan flag, show plan and ask for confirmation
     if (argv.plan === true) {
         display.showPlan?.(plan);
-        // Use a simple readline prompt for confirmation
-        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        // Use a simple readline prompt for confirmation — reuse the REPL's
+        // readline when one is active (second interface double-echoes and
+        // pauses stdin on close).
+        const sharedRl = (0, permissions_js_1.getSharedReadline)();
+        const rl = sharedRl ?? readline.createInterface({ input: process.stdin, output: process.stdout });
         const approved = await new Promise(resolve => {
             rl.question(chalk_1.default.hex('#cc785c')('\n  Run this plan? [y/N] '), answer => {
-                rl.close();
+                if (!sharedRl)
+                    rl.close();
                 resolve(answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes');
             });
         });
         if (!approved) {
-            console.log(chalk_1.default.hex('#4e3d30')('  Plan cancelled.\n'));
+            console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)('  Plan cancelled.\n'));
             process.exit(0);
         }
     }
@@ -1994,51 +2157,49 @@ async function runOrchestratedTask(task, provider, ctx, display, forceOrchestrat
         display.summary(executedPlan.outcome, executedPlan.steps.length, 0);
     }
     const totalTokens = executedPlan.totalTokens ?? 0;
-    console.log(chalk_1.default.hex('#4e3d30')(`  ↳ ${totalTokens.toLocaleString()} tokens · ${executedPlan.steps.length} steps · status: ${executedPlan.status}`));
+    console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`  ↳ ${totalTokens.toLocaleString()} tokens · ${executedPlan.steps.length} steps · status: ${executedPlan.status}`));
 }
-function printUsageFooter(display, usage, costUsd, opts) {
+function printUsageFooter(display, usage, costUsd) {
     const total = usage.inputTokens + usage.outputTokens;
-    console.log(chalk_1.default.hex('#4e3d30')(`  ↳ ${total.toLocaleString()} tokens (${usage.inputTokens.toLocaleString()} in / ${usage.outputTokens.toLocaleString()} out) · est. ${costUsd.toFixed(4)}`));
-    // Context window bar
-    if (opts?.model) {
-        const ctxWin = (0, factory_js_1.getContextWindow)(opts.model);
-        if (ctxWin) {
-            const real = opts.cumulativeTokens ?? 0;
-            let used;
-            let estimated;
-            if (real > 0) {
-                used = real;
-                estimated = false;
-            }
-            else {
-                // Provider didn't report usage — estimate from history character count
-                const histChars = (opts.history ?? []).reduce((n, m) => {
-                    if ('content' in m && typeof m.content === 'string')
-                        return n + m.content.length;
-                    if ('results' in m)
-                        return n + JSON.stringify(m.results).length;
-                    return n;
-                }, 0);
-                used = Math.ceil(histChars / 4);
-                estimated = true;
-            }
-            if (used > 0) {
-                console.log((0, display_js_1.formatContextBar)(used, ctxWin, estimated));
-            }
-        }
+    console.log(chalk_1.default.hex(diamond_js_1.FAINT_HEX)(`  ↳ ${total.toLocaleString()} tokens (${usage.inputTokens.toLocaleString()} in / ${usage.outputTokens.toLocaleString()} out) · est. $${costUsd.toFixed(4)}`));
+}
+/**
+ * Read a task summary aloud (the "Aura talks back" half of the voice loop).
+ * Best-effort: strips code/markdown, caps length so a long report doesn't
+ * monologue, and never throws into the caller (a TTS/network failure must
+ * not break a successful task).
+ */
+async function speakSummary(text) {
+    if (!text || !text.trim())
+        return;
+    // Strip fenced code blocks, inline code, markdown markers, and collapse
+    // whitespace — TTS should read the prose, not backticks and hashes.
+    const spoken = text
+        .replace(/```[\s\S]*?```/g, ' (code omitted) ')
+        .replace(/`[^`]*`/g, '')
+        .replace(/[#*_>|]/g, ' ')
+        .replace(/\s+/g, ' ')
+        .trim()
+        .slice(0, 600);
+    if (!spoken)
+        return;
+    try {
+        const { speakText } = await Promise.resolve().then(() => __importStar(require('../tools/dictate.js')));
+        await speakText(spoken);
     }
+    catch { /* speech is best-effort — never break the task on TTS failure */ }
 }
 function printHelp() {
     console.log(`
-${chalk_1.default.hex('#cc785c').bold('  aura')} ${chalk_1.default.hex('#8a7768')("— Aura Code: model-agnostic AI coding agent")}
+${chalk_1.default.hex('#cc785c').bold('  aura')} ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)("— Aura Code: model-agnostic AI coding agent")}
 
-  ${chalk_1.default.hex('#4e3d30')('Usage:')}
-    aura ${chalk_1.default.hex('#8a7768')('"<task>"')}                           Run a task, then drop into REPL
-    aura ${chalk_1.default.hex('#8a7768')('"<task>" --once')}                    Run a single task and exit
-    aura                                                               Start interactive REPL
-    aura ${chalk_1.default.hex('#8a7768')('--models')}                           List available models
+  ${chalk_1.default.hex(diamond_js_1.FAINT_HEX)('Usage:')}
+    aura ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('"<task>"')}                           Run a single task
+    aura ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('serve')}                              Start the HTTP API server
+    aura ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('--interactive')}                      Start interactive REPL
+    aura ${chalk_1.default.hex(diamond_js_1.TEXT_DIM_HEX)('--models')}                           List available models
 
-  ${chalk_1.default.hex('#4e3d30')('Options:')}
+  ${chalk_1.default.hex(diamond_js_1.FAINT_HEX)('Options:')}
     --model, -m <id>         Model to use (default: from ~/.config/aura-code/config.json)
     --api-key <key>          API key (overrides env var)
     --base-url <url>         Custom API endpoint (for Ollama, proxies, etc.)
@@ -2047,12 +2208,10 @@ ${chalk_1.default.hex('#cc785c').bold('  aura')} ${chalk_1.default.hex('#8a7768'
     --cwd <path>             Working directory (default: current)
     --models                 List all known model IDs
     --no-session             Disable conversation history persistence
-    --once                   Run single task and exit (no REPL after)
     --new-session            Force a fresh session (ignore any prior history)
     --resume [id]            Resume latest session, or a specific session by ID
     --chat-id <id>           Attach to a specific chat ID (creates if missing)
     --list-sessions          List all saved sessions for this project
-    --setup                  Run the provider setup wizard before entering REPL
     --no-setup               Skip the first-run setup wizard
     --reset-setup            Wipe saved config and re-run the setup wizard
     --orchestrate            Force multi-agent orchestration mode
@@ -2064,11 +2223,14 @@ ${chalk_1.default.hex('#cc785c').bold('  aura')} ${chalk_1.default.hex('#8a7768'
     --verify                 Verify output after task; retry up to --max-verify-retries times
     --max-verify-retries <n> Max verification retries (default: 3)
     --test-command <cmd>     Shell command run as part of verification (e.g. "npm test")
-    --max-turns <n>          Max agent loop turns before stopping (default: 150)
+    --max-turns <n>          Max agent loop turns before stopping (default: sized by task shape)
+    --moa                    Mixture of agents: parallel read-only domain perspectives + synthesis (exploratory tasks only)
     --analyze                Mine session history for weakness patterns; save report
-    --stats                  Show episode stats — completion rate, avg duration, top model, tokens
     --propose-harness        Generate system-prompt patches from weakness report
     --apply-harness <id>     Apply a proposal patch; reverts if tests fail
+    --doctor                 Scan Aura itself for issues (build, config, deps, env, git)
+    --doctor --fix           Scan and attempt auto-repairs (rebuild, restore, reinstall)
+    --doctor --offline       Skip the network version check
     --workflow <name> ...    Create and run a sequential workflow with named steps
     --resume-workflow <id>   Resume a paused/failed workflow from last completed step
     --workflows              List all persisted workflows
@@ -2080,7 +2242,7 @@ ${chalk_1.default.hex('#cc785c').bold('  aura')} ${chalk_1.default.hex('#8a7768'
     --fallback <model>       Fallback model if primary exhausts retries (repeatable)
     --verify                 Enable post-task verification with automatic retries
 
-  ${chalk_1.default.hex('#4e3d30')('Resilience:')}
+  ${chalk_1.default.hex(diamond_js_1.FAINT_HEX)('Resilience:')}
     All API calls automatically:
     1. Honour Retry-After / Google's retryDelay on 429s
     2. Back off with exponential + jitter (capped at 60s)
@@ -2088,7 +2250,7 @@ ${chalk_1.default.hex('#cc785c').bold('  aura')} ${chalk_1.default.hex('#8a7768'
     4. Fail over to the next --fallback model if retries exhaust
     5. Pace requests when --rate-limit-rpm / --rate-limit-tpm is set
 
-  ${chalk_1.default.hex('#4e3d30')('Project config (.aura.json):')}
+  ${chalk_1.default.hex(diamond_js_1.FAINT_HEX)('Project config (.aura.json):')}
     {
       "model": "claude-sonnet-4-5-20251001",
       "mode":  "auto",
@@ -2099,8 +2261,8 @@ ${chalk_1.default.hex('#cc785c').bold('  aura')} ${chalk_1.default.hex('#8a7768'
           "apiKeyEnv": "DEEPSEEK_API_KEY",
           "prefixes": ["deepseek/"],
           "models": [
-            { "id": "deepseek/deepseek-v4-flash", "name": "DeepSeek V4 Flash", "speed": "Fast · 1M context" },
-            { "id": "deepseek/deepseek-v4-pro", "name": "DeepSeek V4 Pro", "speed": "Powerful · 1M context" }
+            { "id": "deepseek/deepseek-chat", "name": "DeepSeek Chat", "speed": "Fast" },
+            { "id": "deepseek/deepseek-reasoner", "name": "DeepSeek R1", "speed": "Reasoning" }
           ]
         }
       ],
@@ -2114,19 +2276,21 @@ ${chalk_1.default.hex('#cc785c').bold('  aura')} ${chalk_1.default.hex('#8a7768'
     CLI flags always override .aura.json.
     Custom providers are OpenAI-compatible endpoints.
 
-  ${chalk_1.default.hex('#4e3d30')('Model examples:')}
+  ${chalk_1.default.hex(diamond_js_1.FAINT_HEX)('Model examples:')}
     aura -m claude-opus-4-5-20251001  "refactor auth"
     aura -m gpt-4o                    "add unit tests"
     aura -m gemini-2.5-pro --rate-limit-rpm 20  "explain this codebase"
     aura -m ollama/llama3.2           "local model, no API key needed"
 
-  ${chalk_1.default.hex('#4e3d30')('API keys (set as env vars):')}
+  ${chalk_1.default.hex(diamond_js_1.FAINT_HEX)('API keys (set as env vars):')}
     ANTHROPIC_API_KEY    Claude models
     OPENAI_API_KEY       GPT models
     GOOGLE_API_KEY       Gemini models
     XAI_API_KEY          Grok models
     OPENROUTER_API_KEY   OpenRouter (access to all models)
     XIAOMI_API_KEY       Xiaomi MiMo
+    ZHIPU_API_KEY        Zhipu GLM (Z.ai) — glm-* general endpoint, zhipu-coding/<model> Coding Plan
+    ZHIPU_BASE_URL       Override Zhipu endpoint (default https://api.z.ai/api/paas/v4)
     AURA_MODEL           Default model (overridden by --model)
     AURA_API_RPM         Default request rate limit
     AURA_API_TPM         Default token rate limit (Gemini)
@@ -2134,7 +2298,10 @@ ${chalk_1.default.hex('#cc785c').bold('  aura')} ${chalk_1.default.hex('#8a7768'
     AURA_FALLBACK_MODEL  Comma-separated fallback models
 `);
 }
-if (argv._[0] === 'serve') {
+if (argv.doctor === true) {
+    // --doctor runs async above and exits on completion; don't start main().
+}
+else if (argv._[0] === 'serve') {
     const port = Number(argv.port ?? argv.p ?? 7337);
     (0, index_js_2.startServer)({ port, cwd, model: argv.model, apiKey: argv['api-key'] ?? undefined, baseUrl: argv['base-url'] ?? undefined, open: argv.open !== false }).catch(e => { console.error('Fatal:', String(e)); process.exit(1); });
 }