aura-code 0.6.3 → 0.10.1

package/dist/repl/queue.d.ts

@@ -0,0 +1,22 @@
+import type { LLMProvider } from '../providers/types.js';
+import type { ProjectContext } from '../agent/context.js';
+import { createTerminalDisplay } from '../cli/display.js';
+import { PermissionSystem } from '../safety/permissions.js';
+export interface QueueItem {
+    id: string;
+    prompt: string;
+    createdAt: number;
+    status: 'pending' | 'running' | 'done' | 'failed';
+}
+export declare function loadQueue(): QueueItem[];
+export declare function addToQueue(prompt: string): QueueItem;
+export declare function removeFromQueue(index: number): QueueItem | null;
+export declare function clearQueue(): number;
+export interface QueueRunResult {
+    success: boolean;
+    output: string;
+    turns: number;
+    toolCalls: number;
+}
+export declare function runQueueItem(index: number, provider: LLMProvider, ctx: ProjectContext, permissions: PermissionSystem, display: ReturnType<typeof createTerminalDisplay>): Promise<QueueRunResult | null>;
+export declare function formatQueue(items: QueueItem[]): string;

package/dist/repl/queue.js

@@ -0,0 +1,165 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadQueue = loadQueue;
+exports.addToQueue = addToQueue;
+exports.removeFromQueue = removeFromQueue;
+exports.clearQueue = clearQueue;
+exports.runQueueItem = runQueueItem;
+exports.formatQueue = formatQueue;
+/**
+ * :q — Persistent task queue for the REPL.
+ *
+ * Stores tasks in ~/.aura/queue.jsonl (append-only, atomic .tmp+rename on mutations).
+ * Each line is a JSON object with { id, prompt, createdAt, status }.
+ *
+ * Commands (dispatched from cli/index.ts):
+ *   :q add <prompt>   — enqueue a task
+ *   :q list           — show all items with index
+ *   :q run <n>        — execute item n in a fresh agent loop
+ *   :q drop <n>       — remove item n
+ *   :q clear          — wipe the queue (with confirmation)
+ */
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const os = __importStar(require("os"));
+const crypto = __importStar(require("crypto"));
+const chalk_1 = __importDefault(require("chalk"));
+const loop_js_1 = require("../agent/loop.js");
+// ── Storage ─────────────────────────────────────────────────────────────────
+function queuePath() {
+    return path.join(os.homedir(), '.aura', 'queue.jsonl');
+}
+function loadQueue() {
+    const p = queuePath();
+    if (!fs.existsSync(p))
+        return [];
+    const raw = fs.readFileSync(p, 'utf8').trim();
+    if (!raw)
+        return [];
+    return raw.split('\n').map(line => JSON.parse(line));
+}
+function saveQueue(items) {
+    const p = queuePath();
+    const tmp = p + '.tmp';
+    const data = items.map(i => JSON.stringify(i)).join('\n') + '\n';
+    fs.writeFileSync(tmp, data, 'utf8');
+    fs.renameSync(tmp, p);
+}
+function addToQueue(prompt) {
+    const items = loadQueue();
+    const item = {
+        id: crypto.randomUUID().slice(0, 8),
+        prompt,
+        createdAt: Date.now(),
+        status: 'pending',
+    };
+    // Append a single line (atomic enough — .tmp+rename on the whole file is done in saveQueue)
+    items.push(item);
+    saveQueue(items);
+    return item;
+}
+function removeFromQueue(index) {
+    const items = loadQueue();
+    if (index < 0 || index >= items.length)
+        return null;
+    const removed = items.splice(index, 1)[0];
+    saveQueue(items);
+    return removed;
+}
+function clearQueue() {
+    const count = loadQueue().length;
+    saveQueue([]);
+    return count;
+}
+async function runQueueItem(index, provider, ctx, permissions, display) {
+    const items = loadQueue();
+    if (index < 0 || index >= items.length)
+        return null;
+    const item = items[index];
+    item.status = 'running';
+    saveQueue(items);
+    try {
+        // Run a fresh agent loop for this task.
+        const result = await (0, loop_js_1.runAgentLoop)({
+            provider,
+            task: item.prompt,
+            context: ctx,
+            permissions,
+            display,
+            maxTurns: 25,
+        });
+        item.status = result.success ? 'done' : 'failed';
+        saveQueue(items);
+        return {
+            success: result.success,
+            output: result.summary,
+            turns: result.turns ?? 0,
+            toolCalls: result.toolCallCount ?? 0,
+        };
+    }
+    catch (err) {
+        item.status = 'failed';
+        saveQueue(items);
+        return {
+            success: false,
+            output: String(err),
+            turns: 0,
+            toolCalls: 0,
+        };
+    }
+}
+// ── Formatting (for REPL display) ───────────────────────────────────────────
+function formatQueue(items) {
+    if (items.length === 0)
+        return chalk_1.default.hex('#8a7768')('\n  Queue is empty. Use :q add <prompt> to enqueue a task.\n');
+    const lines = items.map((item, i) => {
+        const statusColor = {
+            pending: '#8a7768',
+            running: '#d4903a',
+            done: '#5a9e6e',
+            failed: '#b15439',
+        };
+        const color = statusColor[item.status] || '#8a7768';
+        const statusIcon = item.status === 'done' ? '✓' : item.status === 'running' ? '⟳' : item.status === 'failed' ? '✗' : '·';
+        const created = new Date(item.createdAt).toLocaleTimeString();
+        return `  ${chalk_1.default.hex('#cc785c')(String(i + 1).padEnd(3))} ${chalk_1.default.hex(color)(statusIcon)} ${chalk_1.default.hex('#ede0cc')(item.prompt.slice(0, 80))} ${chalk_1.default.hex('#4e3d30')(created)}`;
+    });
+    return `\n${lines.join('\n')}\n`;
+}
+//# sourceMappingURL=queue.js.map

package/dist/repl/queue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/repl/queue.ts"],"names":[],"mappings":"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"}

package/dist/repl/side-channel.d.ts

@@ -0,0 +1,23 @@
+/**
+ * :btw — Side channel for non-blocking parallel questions.
+ *
+ * Spawns an isolated LLM call (no session history, read-only) to answer
+ * a quick question while the main task keeps running. The answer is
+ * rendered as a simple overlay and never appears in chat history.
+ */
+import type { LLMProvider } from '../providers/types.js';
+import type { ProjectContext } from '../agent/context.js';
+export interface BtwResult {
+    answer: string;
+    tokens: number;
+}
+/**
+ * Run a :btw query in the current provider but with a clean (empty) chat
+ * history — strictly a read-only knowledge question.
+ */
+export declare function runBtwQuery(question: string, provider: LLMProvider, ctx: ProjectContext): Promise<BtwResult>;
+/**
+ * Render a :btw answer as a minimalist overlay box.
+ * Returns an object with the rendered lines + a dismiss instruction.
+ */
+export declare function renderBtwAnswer(answer: string, tokens: number): string;

package/dist/repl/side-channel.js

@@ -0,0 +1,63 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runBtwQuery = runBtwQuery;
+exports.renderBtwAnswer = renderBtwAnswer;
+const chalk_1 = __importDefault(require("chalk"));
+const BTW_SYSTEM_PROMPT = `You are Aura's "by the way" side channel.
+Answer the user's quick question concisely in 2-4 sentences.
+Do NOT use tools. Do NOT write code. Just answer from knowledge.
+If you don't know, say so briefly.`;
+/**
+ * Run a :btw query in the current provider but with a clean (empty) chat
+ * history — strictly a read-only knowledge question.
+ */
+async function runBtwQuery(question, provider, ctx) {
+    const stream = provider.stream(BTW_SYSTEM_PROMPT, [
+        { role: 'user', content: `:btw ${question}` },
+    ], []);
+    let answer = '';
+    let totalTokens = 0;
+    for await (const chunk of stream) {
+        if (chunk.type === 'text') {
+            answer += chunk.text;
+        }
+        else if (chunk.type === 'done') {
+            const usage = chunk.response.usage;
+            if (usage)
+                totalTokens = usage.inputTokens + usage.outputTokens;
+        }
+    }
+    return { answer: answer.trim(), tokens: totalTokens };
+}
+/**
+ * Render a :btw answer as a minimalist overlay box.
+ * Returns an object with the rendered lines + a dismiss instruction.
+ */
+function renderBtwAnswer(answer, tokens) {
+    const maxWidth = 60;
+    const lines = [];
+    for (const word of answer.split(' ')) {
+        const last = lines[lines.length - 1];
+        if (!last || last.length + word.length + 1 > maxWidth) {
+            lines.push(word);
+        }
+        else {
+            lines[lines.length - 1] = last + ' ' + word;
+        }
+    }
+    const top = chalk_1.default.hex('#cc785c')('  ┌' + '─'.repeat(maxWidth + 2) + '┐');
+    const bottom = chalk_1.default.hex('#cc785c')('  └' + '─'.repeat(maxWidth + 2) + '┘');
+    const body = lines.map(l => chalk_1.default.hex('#ede0cc')('  │ ') + l.padEnd(maxWidth) + chalk_1.default.hex('#cc785c')(' │'));
+    return [
+        '',
+        top,
+        ...body,
+        bottom,
+        chalk_1.default.hex('#4e3d30')(`  ⚡ ${tokens} tokens — press ENTER to dismiss`),
+        '',
+    ].join('\n');
+}
+//# sourceMappingURL=side-channel.js.map

package/dist/repl/side-channel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"side-channel.js","sourceRoot":"","sources":["../../src/repl/side-channel.ts"],"names":[],"mappings":";;;;;AAyBA,kCAqBC;AAMD,0CAwBC;AAnED,kDAA0B;AAE1B,MAAM,iBAAiB,GAAG;;;mCAGS,CAAC;AAOpC;;;GAGG;AACI,KAAK,UAAU,WAAW,CAC/B,QAAgB,EAChB,QAAqB,EACrB,GAAmB;IAEnB,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,iBAAiB,EAAE;QAChD,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,QAAQ,EAAE,EAAE;KAC9C,EAAE,EAAE,CAAC,CAAC;IACP,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,WAAW,GAAG,CAAC,CAAC;IAEpB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACjC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC;QACvB,CAAC;aAAM,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACjC,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC;YACnC,IAAI,KAAK;gBAAE,WAAW,GAAG,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC;QAClE,CAAC;IACH,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;AACxD,CAAC;AAED;;;GAGG;AACH,SAAgB,eAAe,CAAC,MAAc,EAAE,MAAc;IAC5D,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACrC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,GAAG,QAAQ,EAAE,CAAC;YACtD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,MAAM,GAAG,GAAM,eAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,eAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;IAC5E,MAAM,IAAI,GAAK,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,eAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,eAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAE9G,OAAO;QACL,EAAE;QACF,GAAG;QACH,GAAG,IAAI;QACP,MAAM;QACN,eAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,MAAM,kCAAkC,CAAC;QACrE,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC"}

package/dist/research/council.d.ts

@@ -24,4 +24,6 @@ export declare function runCouncil(opts: {
     display: Display;
     panelSize?: number;
     panelModel?: string;
+    /** The session's configured routing model id (e.g. "deepseek/deepseek-v4-flash"). */
+    configuredModel?: string;
 }): Promise<CouncilResult>;

package/dist/research/council.js

@@ -187,13 +187,19 @@ ${bodyHtml}
  * passing `undefined` to `createProvider` (which historically produced
  * opaque "400 Not supported model" errors).
  */
-function resolvePanelModel(synthesisProvider, override) {
+function resolvePanelModel(synthesisProvider, override, configuredModel) {
     if (override && override.trim())
         return override.trim();
     const env = process.env.AURA_PANEL_MODEL;
     if (env && env.trim())
         return env.trim();
-    // LLMProvider.model — the configured model id for that provider instance.
+    // The caller's configured routing id (e.g. "deepseek/deepseek-v4-flash").
+    // Preferred over the provider instance's `.model`, which has the provider
+    // prefix stripped ("deepseek-v4-flash") and therefore re-resolves through
+    // the generic OpenAI-compatible provider — the wrong endpoint entirely
+    // (this produced five identical 401s on the first live Ecclesia run).
+    if (configuredModel && configuredModel.trim())
+        return configuredModel.trim();
     const fromProvider = synthesisProvider.model;
     if (fromProvider && fromProvider.trim())
         return fromProvider.trim();
@@ -208,7 +214,7 @@ function resolvePanelModel(synthesisProvider, override) {
 async function runCouncil(opts) {
     const { projectRoot, topic, synthesisProvider, context, permissions, display, } = opts;
     const panelSize = Math.max(1, opts.panelSize ?? DEFAULT_PANEL_SIZE);
-    const panelModel = resolvePanelModel(synthesisProvider, opts.panelModel);
+    const panelModel = resolvePanelModel(synthesisProvider, opts.panelModel, opts.configuredModel);
     const findings = [];
     let agentFailures = 0;
     // Sequential by design — see module doc. Each agent is independent: no
@@ -225,7 +231,26 @@ async function runCouncil(opts) {
                 maxTurns: 6,
                 disableSpawn: true,
             });
-            const text = (res.summary ?? '').trim();
+            let text = (res.summary ?? '').trim();
+            if (!res.success || /^Loop (ended|stalled)/i.test(text)) {
+                // The agent hit its turn cap (or stalled) before a final answer, so
+                // summary is just the loop-end marker. Salvage its last real message
+                // instead — feeding "Loop ended after 6 turns." to the synthesis
+                // makes the model fabricate an entire council from nothing (observed
+                // live: invented "3 of 5 agents" splits and fictional sources).
+                const lastAssistant = [...res.history].reverse().find((m) => m.role === 'assistant' && typeof m.content === 'string' && m.content.trim().length > 0);
+                text = lastAssistant?.content.trim() ?? '';
+            }
+            if (!text) {
+                // Tool-happy models (observed: DeepSeek) spend every turn on tool
+                // calls and never write prose, so there is nothing to salvage.
+                // Convert the research they DID gather into findings with one
+                // tool-less completion over their own history.
+                const wrap = await panelProvider.complete('Your tool budget is exhausted. Using ONLY what you already gathered in this conversation, ' +
+                    'write the findings now in the requested format: 4-8 specific bullet points with sources in ' +
+                    'parentheses, then one line "Stance: <bottom-line take>". Do not call tools. No preamble.', [...res.history, { role: 'user', content: 'Tool budget exhausted — write your findings list and stance NOW.' }], []);
+                text = (wrap.text ?? '').trim();
+            }
             findings.push(text || `(Agent ${seat} returned no findings.)`);
         }
         catch (err) {

package/dist/research/council.js.map

@@ -1 +1 @@
-{"version":3,"file":"council.js","sourceRoot":"","sources":["../../src/research/council.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"council.js","sourceRoot":"","sources":["../../src/research/council.ts"],"names":[],"mappings":"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"}

package/dist/ruby/alternator.d.ts

@@ -1,6 +1,5 @@
-import type { LLMProvider } from '../providers/types.js';
-import type { HistoryMessage } from '../providers/types.js';
-import type { LoopResult } from '../agent/loop.js';
+import type { HistoryMessage, LLMProvider } from '../providers/types.js';
+import { type LoopResult } from '../agent/loop.js';
 import type { ProjectContext } from '../agent/context.js';
 import { PermissionSystem } from '../safety/permissions.js';
 import type { Display } from '../cli/display.js';
@@ -15,39 +14,21 @@ export interface AlternatorOptions {
     /** When set, routing and loop events are surfaced to the user. */
     display?: Display;
     /**
-     * The permission system governing the user's actual session. Pass this
-     * through from the caller so Ruby's attempt respects whatever mode the
-     * user chose (read-only / normal / auto) — without it, this previously
-     * defaulted to a hardcoded 'auto', meaning destructive operations could
-     * get silently approved during the Ruby attempt even in a session the
-     * user explicitly ran in confirmation-required 'normal' mode.
+     * The session's permission system. When omitted, defaults to the safe
+     * 'normal' level — NEVER 'auto': the Ruby attempt must not auto-approve
+     * destructive operations the user's chosen mode would have prompted for.
      */
     permissions?: PermissionSystem;
-    /**
-     * Confirmation callback for destructive operations, passed through to
-     * both the Ruby attempt and the large-model escalation. Pass the same
-     * one the caller already uses (e.g. the REPL's readline-based prompt) —
-     * without it, each inner loop falls back to its own default terminal
-     * confirm(), which can behave inconsistently alongside an already-active
-     * readline interface.
-     */
+    /** Confirmation prompt for needs-confirm tool calls, threaded into the loop. */
     confirmFn?: (message: string) => Promise<boolean>;
-    /**
-     * Prior conversation history to resume from (e.g. the REPL's stay-active
-     * history, or a loaded session). Without this, every Ruby-alternated
-     * turn would silently start fresh, breaking multi-turn conversation
-     * continuation any time alternation activates mid-conversation.
-     */
+    /** Prior conversation history (multi-turn REPL), threaded into the loop. */
     initialHistory?: HistoryMessage[];
 }
 export interface AlternatorRunResult {
-    /**
-     * The full result from whichever path actually produced the final
-     * output — Ruby's if it succeeded without escalation, otherwise the
-     * large model's. Treat this exactly like a normal runAgentLoop() result:
-     * history, costUsd, turns, and toolCallLog are all populated correctly
-     * from whichever path ran, so callers don't need special-case handling.
-     */
+    /** Final user-facing output text (loopResult.summary, or an error note). */
+    result: string;
+    /** The full LoopResult from whichever model handled the task. Never undefined —
+     *  a safe empty result is substituted when every path failed. */
     loopResult: LoopResult;
     episode: Episode;
     usedRuby: boolean;

package/dist/ruby/alternator.js

@@ -7,6 +7,19 @@ const loop_js_1 = require("../agent/loop.js");
 const permissions_js_1 = require("../safety/permissions.js");
 const competence_js_1 = require("./competence.js");
 const episode_capture_js_1 = require("./episode-capture.js");
+/** Inert LoopResult for the both-paths-failed case — run() never throws. */
+function emptyLoopResult(summary) {
+    return {
+        success: false,
+        summary,
+        turns: 0,
+        toolCallCount: 0,
+        usage: { inputTokens: 0, outputTokens: 0, totalTokens: 0 },
+        costUsd: 0,
+        history: [],
+        toolCallLog: [],
+    };
+}
 const RECENT_EPISODE_LIMIT = 50;
 const OLLAMA_PING_MS = 3_000;
 // ─────────────────────────────────────────────────────────────────────────────
@@ -29,6 +42,9 @@ function createNoopDisplay() {
         showPlan: () => { },
         stepStarted: () => { },
         stepCompleted: () => { },
+        contextBar: () => { },
+        contextDashboard: () => { },
+        compactionEvent: () => { },
     };
 }
 // ─────────────────────────────────────────────────────────────────────────────
@@ -101,7 +117,6 @@ class RubyAlternator {
     async run(task) {
         const startMs = Date.now();
         const { rubyConfig, largeModelProvider, projectRoot, context } = this.opts;
-        const confirmFn = this.opts.confirmFn;
         let decision = {
             useRuby: false,
             reason: 'Initializing alternation.',
@@ -110,12 +125,13 @@ class RubyAlternator {
         };
         let rubyAttempted = false;
         let rubySucceeded = false;
-        let rubyLoopResult;
-        let largeModelLoopResult;
+        let rubyOutput;
+        let rubyTokens = 0;
+        let largeModelOutput;
+        let largeModelTokens = 0;
         let usedRuby = false;
-        // Only used to build the error-path fallback LoopResult below; the
-        // success paths read everything from rubyLoopResult/largeModelLoopResult.
-        let errorSummary;
+        let result = '';
+        let finalLoopResult;
         try {
             const recent = await episode_capture_js_1.episodeStore.loadEpisodes(projectRoot, RECENT_EPISODE_LIMIT);
             decision = (0, competence_js_1.assessCompetence)(recent, task, rubyConfig);
@@ -131,20 +147,24 @@ class RubyAlternator {
                     this.display.success(`Trying Ruby (${rubyConfig.modelName})…`);
                     try {
                         const rubyProvider = buildRubyProvider(rubyConfig);
-                        rubyLoopResult = await (0, loop_js_1.runAgentLoop)({
+                        const loopResult = await (0, loop_js_1.runAgentLoop)({
                             provider: rubyProvider,
                             task,
                             context,
                             permissions: this.permissions,
                             display: this.display,
-                            confirmFn,
-                            initialHistory: this.opts.initialHistory,
                             disableSpawn: true,
                             maxTurns: 15,
+                            confirmFn: this.opts.confirmFn,
+                            initialHistory: this.opts.initialHistory,
                         });
-                        if (isNonEmptyResult(rubyLoopResult.summary) && rubyLoopResult.success) {
+                        rubyTokens = loopResult.usage.totalTokens;
+                        rubyOutput = loopResult.summary;
+                        if (isNonEmptyResult(rubyOutput) && loopResult.success) {
                             rubySucceeded = true;
                             usedRuby = true;
+                            result = rubyOutput;
+                            finalLoopResult = loopResult;
                             this.display.success('Ruby handled the task without escalation.');
                         }
                         else {
@@ -153,48 +173,43 @@ class RubyAlternator {
                     }
                     catch (e) {
                         this.display.warning(`Ruby error: ${String(e)} — escalating.`);
+                        rubyOutput = rubyOutput ?? `Error: ${String(e)}`;
                     }
                 }
             }
             if (!usedRuby) {
                 this.display.header('Large model', largeModelProvider.name);
                 try {
-                    largeModelLoopResult = await (0, loop_js_1.runAgentLoop)({
+                    const loopResult = await (0, loop_js_1.runAgentLoop)({
                         provider: largeModelProvider,
                         task,
                         context,
                         permissions: this.permissions,
                         display: this.display,
-                        confirmFn,
-                        initialHistory: this.opts.initialHistory,
                         disableSpawn: true,
+                        confirmFn: this.opts.confirmFn,
+                        initialHistory: this.opts.initialHistory,
                     });
+                    largeModelTokens = loopResult.usage.totalTokens;
+                    largeModelOutput = loopResult.summary;
+                    finalLoopResult = loopResult;
+                    result = isNonEmptyResult(largeModelOutput)
+                        ? largeModelOutput
+                        : loopResult.success
+                            ? '(Task completed with no output)'
+                            : `Large model did not complete: ${loopResult.summary}`;
                 }
                 catch (e) {
-                    errorSummary = `Large model error: ${String(e)}`;
-                    this.display.error(errorSummary);
+                    result = `Large model error: ${String(e)}`;
+                    largeModelOutput = result;
+                    this.display.error(result);
                 }
             }
         }
         catch (e) {
-            errorSummary = `Alternation error: ${String(e)}`;
-            this.display.error(errorSummary);
+            result = `Alternation error: ${String(e)}`;
+            this.display.error(result);
         }
-        // The full result that actually represents this run's output — Ruby's
-        // if it succeeded, otherwise the large model's, otherwise a safe empty
-        // result for the case where something threw before either path ran.
-        const finalLoopResult = usedRuby
-            ? rubyLoopResult
-            : largeModelLoopResult ?? {
-                success: false,
-                summary: errorSummary ?? 'Alternation failed before either model ran.',
-                turns: 0,
-                toolCallCount: 0,
-                usage: { inputTokens: 0, outputTokens: 0, totalTokens: 0 },
-                costUsd: 0,
-                history: [],
-                toolCallLog: [],
-            };
         const episode = {
             id: (0, crypto_1.randomUUID)(),
             timestamp: Date.now(),
@@ -202,13 +217,13 @@ class RubyAlternator {
             projectRoot,
             rubyAttempted,
             rubySucceeded,
-            rubyOutput: rubyLoopResult?.summary,
+            rubyOutput,
             largeModelUsed: usedRuby ? undefined : largeModelProvider.model,
-            largeModelOutput: usedRuby ? undefined : largeModelLoopResult?.summary,
-            reviewerApproved: isNonEmptyResult(finalLoopResult.summary) && finalLoopResult.success,
+            largeModelOutput: usedRuby ? undefined : largeModelOutput,
+            reviewerApproved: isNonEmptyResult(result),
             tokensUsed: {
-                ruby: rubyAttempted ? rubyLoopResult?.usage.totalTokens : undefined,
-                largeModel: usedRuby ? undefined : largeModelLoopResult?.usage.totalTokens,
+                ruby: rubyAttempted ? rubyTokens : undefined,
+                largeModel: usedRuby ? undefined : largeModelTokens,
             },
             durationMs: Date.now() - startMs,
             taskCategory: inferTaskCategory(task),
@@ -228,7 +243,13 @@ class RubyAlternator {
         catch {
             /* best-effort */
         }
-        return { loopResult: finalLoopResult, episode, usedRuby, decision };
+        return {
+            result,
+            loopResult: finalLoopResult ?? emptyLoopResult(result),
+            episode,
+            usedRuby,
+            decision,
+        };
     }
     /**
      * Returns aggregate episode statistics for this alternator's project.