muonroi-cli 1.8.0 → 1.8.3

package/dist/src/agent-harness/mock-model.js

@@ -199,13 +199,121 @@ export function toolCallStream(opts) {
  * string payloads here so the rest of the pipeline sees a uniform shape.
  */
 function normalizeStreamChunks(chunks) {
-    return chunks.map((c) => {
-        if (c && c.type === "error") {
-            const raw = c.error;
-            return { ...c, error: buildFixtureError(raw) };
+    const normalized = chunks.map((c) => {
+        if (!c)
+            return c;
+        const part = c;
+        if (part.type === "error") {
+            const raw = part.error;
+            return { ...part, error: buildFixtureError(raw) };
+        }
+        if (part.type === "text-delta") {
+            const delta = part.delta ?? part.textDelta ?? part.text ?? "";
+            const id = part.id ?? "txt-0";
+            return { ...part, id, delta };
+        }
+        if (part.type === "reasoning-delta") {
+            const delta = part.delta ?? part.textDelta ?? part.text ?? "";
+            const id = part.id ?? "reasoning-0";
+            return { ...part, id, delta };
         }
         return c;
     });
+    const result = [];
+    const textIds = new Set();
+    const reasoningIds = new Set();
+    for (const part of normalized) {
+        if (!part)
+            continue;
+        const p = part;
+        if (p.type === "text-delta") {
+            textIds.add(p.id ?? "txt-0");
+        }
+        else if (p.type === "reasoning-delta") {
+            reasoningIds.add(p.id ?? "reasoning-0");
+        }
+    }
+    const seenTextStart = new Set();
+    const seenTextEnd = new Set();
+    const seenReasoningStart = new Set();
+    const seenReasoningEnd = new Set();
+    for (const part of normalized) {
+        if (!part)
+            continue;
+        const p = part;
+        if (p.type === "text-start") {
+            seenTextStart.add(p.id);
+        }
+        else if (p.type === "text-end") {
+            seenTextEnd.add(p.id);
+        }
+        else if (p.type === "reasoning-start") {
+            seenReasoningStart.add(p.id);
+        }
+        else if (p.type === "reasoning-end") {
+            seenReasoningEnd.add(p.id);
+        }
+    }
+    const firstTextDeltaIdx = new Map();
+    const lastTextDeltaIdx = new Map();
+    const firstReasoningDeltaIdx = new Map();
+    const lastReasoningDeltaIdx = new Map();
+    for (let i = 0; i < normalized.length; i++) {
+        const p = normalized[i];
+        if (!p)
+            continue;
+        if (p.type === "text-delta") {
+            const id = p.id ?? "txt-0";
+            if (!firstTextDeltaIdx.has(id))
+                firstTextDeltaIdx.set(id, i);
+            lastTextDeltaIdx.set(id, i);
+        }
+        else if (p.type === "reasoning-delta") {
+            const id = p.id ?? "reasoning-0";
+            if (!firstReasoningDeltaIdx.has(id))
+                firstReasoningDeltaIdx.set(id, i);
+            lastReasoningDeltaIdx.set(id, i);
+        }
+    }
+    for (let i = 0; i < normalized.length; i++) {
+        const p = normalized[i];
+        if (!p) {
+            result.push(p);
+            continue;
+        }
+        if (p.type === "text-delta") {
+            const id = p.id ?? "txt-0";
+            if (firstTextDeltaIdx.get(id) === i && !seenTextStart.has(id)) {
+                result.push({ type: "text-start", id });
+            }
+        }
+        else if (p.type === "reasoning-delta") {
+            const id = p.id ?? "reasoning-0";
+            if (firstReasoningDeltaIdx.get(id) === i && !seenReasoningStart.has(id)) {
+                result.push({ type: "reasoning-start", id });
+            }
+        }
+        if (p.type === "finish") {
+            const usage = p.usage ?? buildUsage(10, 10);
+            result.push({ ...p, usage });
+        }
+        else {
+            result.push(p);
+        }
+        if (p.type === "text-delta") {
+            const id = p.id ?? "txt-0";
+            if (lastTextDeltaIdx.get(id) === i && !seenTextEnd.has(id)) {
+                result.push({ type: "text-end", id });
+            }
+        }
+        else if (p.type === "reasoning-delta") {
+            const id = p.id ?? "reasoning-0";
+            if (lastReasoningDeltaIdx.get(id) === i && !seenReasoningEnd.has(id)) {
+                result.push({ type: "reasoning-end", id });
+            }
+        }
+    }
+    return result;
 }
 /**
  * Turn a fixture `error` payload into the right runtime shape:

package/dist/src/cli/cost-forensics.js

@@ -11,6 +11,7 @@
 import { getProviderCapabilities } from "../providers/capabilities.js";
 import { detectProviderForModel } from "../providers/runtime.js";
 import { getDatabase } from "../storage/db.js";
+import { getSessionChain } from "../storage/index.js";
 import { selectSessionExperience } from "../storage/session-experience-store.js";
 function resolveSessionId(prefix) {
     const rows = getDatabase()
@@ -42,24 +43,26 @@ export function collectCostForensics(sessionId) {
     const session = db.prepare(`SELECT id, model, created_at FROM sessions WHERE id = ?`).get(sessionId);
     if (!session)
         throw new Error(`Session not found: ${sessionId}`);
+    const chain = getSessionChain(sessionId);
+    const placeholders = chain.map(() => "?").join(",");
     const rows = db
         .prepare(`
     SELECT id, source, model, message_seq, input_tokens, output_tokens,
            cache_read_tokens, cache_creation_tokens, cost_micros, created_at,
            provider_options_shape
     FROM usage_events
-    WHERE session_id = ?
+    WHERE session_id IN (${placeholders})
     ORDER BY id ASC
   `)
-        .all(sessionId);
+        .all(...chain);
     const counts = db
         .prepare(`
     SELECT event_type, COUNT(*) AS c
     FROM interaction_logs
-    WHERE session_id = ?
+    WHERE session_id IN (${placeholders})
     GROUP BY event_type
   `)
-        .all(sessionId);
+        .all(...chain);
     const countMap = new Map(counts.map((r) => [r.event_type, r.c]));
     const events = rows.map((r) => ({
         id: r.id,

package/dist/src/flow/compaction/index.d.ts

@@ -11,6 +11,7 @@ export interface CompactionResult {
     tokensBeforeCompress: number;
     tokensAfterCompress: number;
     historyPath: string;
+    summary: string;
 }
 /**
  * Orchestrate two-pass deliberate compaction.

package/dist/src/flow/compaction/index.js

@@ -49,6 +49,9 @@ export async function deliberateCompact(flowDir, messages, systemPrompt, tokenBu
     const historyPath = path.join(historyDir, `${timestamp}.md`);
     const fullSerialized = serializeConversation(messages);
     await atomicWriteText(historyPath, fullSerialized);
+    // Save full JSON history next to the md file for exact expand/restore
+    const jsonPath = path.join(historyDir, `${timestamp}.json`);
+    await atomicWriteText(jsonPath, JSON.stringify(messages, null, 2));
     // Token estimation before
     const tokensBefore = estimateConversationTokens(systemPrompt, messages);
     // Pass 2: Compress
@@ -58,6 +61,7 @@ export async function deliberateCompact(flowDir, messages, systemPrompt, tokenBu
         tokensBeforeCompress: tokensBefore,
         tokensAfterCompress: compressed.tokensAfter,
         historyPath,
+        summary: compressed.summary,
     };
 }
 //# sourceMappingURL=index.js.map

package/dist/src/generated/version.d.ts

@@ -1,2 +1,2 @@
-export declare const PACKAGE_VERSION = "1.8.0";
+export declare const PACKAGE_VERSION = "1.8.3";
 export declare const PACKAGE_DESCRIPTION = "BYOK AI coding agent with multi-model council debate, role-based routing, and auto-compact.";

package/dist/src/generated/version.js

@@ -1,5 +1,5 @@
 // AUTO-GENERATED by scripts/sync-version.cjs. DO NOT EDIT BY HAND.
 // Sourced from package.json at build time so it survives bun --compile bundling.
-export const PACKAGE_VERSION = "1.8.0";
+export const PACKAGE_VERSION = "1.8.3";
 export const PACKAGE_DESCRIPTION = "BYOK AI coding agent with multi-model council debate, role-based routing, and auto-compact.";
 //# sourceMappingURL=version.js.map

package/dist/src/index.js

@@ -51,6 +51,7 @@ process.on("SIGTERM", exitCleanlyOnSigterm);
 let _tuiActive = false;
 export function setTuiActive(active) {
     _tuiActive = active;
+    globalThis.__muonroiTuiActive = active;
 }
 export function appendCrashLog(label, msg) {
     try {
@@ -972,7 +973,8 @@ program
         console.log("Checking for updates...");
         const result = await runUpdate(packageJson.version);
         console.log(result.output);
-        process.exit(result.success ? 0 : 1);
+        process.exitCode = result.success ? 0 : 1;
+        return;
     }
     changeDirectoryOrExit(options.directory);
     // Boot model registry BEFORE any key resolution path runs —
@@ -1159,7 +1161,7 @@ program
     console.log("Checking for updates...");
     const result = await runUpdate(packageJson.version);
     console.log(result.output);
-    process.exit(result.success ? 0 : 1);
+    process.exitCode = result.success ? 0 : 1;
 });
 program
     .command("uninstall")

package/dist/src/lsp/manager.js

@@ -64,8 +64,16 @@ export function createWorkspaceLspManager(cwd, settings, options = {}) {
         return resolved.filter((value) => value !== null);
     }
     async function touchFile(filePath, waitForDiagnostics = true) {
-        const content = await readFile(filePath, "utf8");
-        return syncFile(filePath, content, false, waitForDiagnostics);
+        try {
+            const content = await readFile(filePath, "utf8");
+            return await syncFile(filePath, content, false, waitForDiagnostics);
+        }
+        catch (err) {
+            if (err instanceof Error && err.code === "ENOENT") {
+                return [];
+            }
+            throw err;
+        }
     }
     async function syncFile(filePath, content, save = true, waitForDiagnostics = true, diagnosticsTimeoutMs) {
         const records = await getClientsForFile(filePath);
@@ -104,7 +112,7 @@ export function createWorkspaceLspManager(cwd, settings, options = {}) {
                 output: `No LSP server available for ${path.extname(normalizedPath) || "this file type"}.`,
             };
         }
-        const lspDiagnostics = await touchFile(normalizedPath, true);
+        const lspDiagnostics = input.operation === "workspaceSymbol" ? [] : await touchFile(normalizedPath, true);
         const params = createOperationParams(input, normalizedPath);
         const timeoutMs = settings.requestTimeoutMs;
         const results = (await Promise.all(records.map(async ({ key, client }) => {

package/dist/src/mcp/auto-setup.js

@@ -39,14 +39,6 @@ const DEFAULT_CONFIGS = [
         transport: "http",
         url: "https://docs-mcp.muonroi.com/mcp",
     },
-    {
-        id: "filesystem",
-        label: "Filesystem",
-        enabled: true,
-        transport: "stdio",
-        command: "npx",
-        args: ["-y", "@modelcontextprotocol/server-filesystem", "."],
-    },
     {
         id: "playwright",
         label: "Playwright",

package/dist/src/mcp/self-verify-jobs.d.ts

@@ -21,6 +21,7 @@ export interface StartAgenticOpts {
     goal: string;
     llm: string;
     turns?: number;
+    mockLlmDir?: string;
 }
 export type StartOpts = StartTier1Opts | StartAgenticOpts;
 export interface Job {

package/dist/src/mcp/self-verify-runner.js

@@ -25,7 +25,7 @@ export const defaultRunner = {
     async agentic(opts, log) {
         const { createLLMBrain, runAgenticLoop } = await import("../self-qa/agentic-loop.js");
         const brain = await createLLMBrain({ modelId: opts.llm });
-        return runAgenticLoop({ goal: opts.goal, brain, maxTurns: opts.turns ?? 20, log });
+        return runAgenticLoop({ goal: opts.goal, brain, maxTurns: opts.turns ?? 20, mockLlmDir: opts.mockLlmDir, log });
     },
 };
 let shared = null;

package/dist/src/mcp/setup-guide-text.d.ts

@@ -6,4 +6,4 @@
  * and the muonroi-tools MCP server (src/mcp/tools-server.ts, for external agents).
  * Keeping it here avoids duplicating ~70 lines across the two.
  */
-export declare const SETUP_GUIDE_TEXT = "# muonroi-cli Setup Guide\n\n## Install (zero runtime deps \u2014 recommended)\nLinux / macOS:\n  curl -fsSL https://raw.githubusercontent.com/muonroi/muonroi-cli/master/install.sh | bash\n\nWindows PowerShell:\n  irm https://raw.githubusercontent.com/muonroi/muonroi-cli/master/install.ps1 | iex\n\nBun (requires Bun >= 1.3):\n  bun add -g muonroi-cli\n  # (npm install -g is NOT supported \u2014 TUI engine uses Bun-only ESM features)\n\nThe installers fetch a pre-compiled single binary from GitHub Releases.\n\n## First run\n- Wizard appears automatically.\n- Lists supported providers (DeepSeek + SiliconFlow ready; others via BYOK).\n- Four credential options: paste key, Bitwarden sync (B in /providers), keys export/import (encrypted bundle), or skip for later.\n- Keys land in OS keychain (keytar). Settings written to ~/.muonroi-cli/user-settings.json.\n- Role routing (leader/implement/verify/research) is configured for you.\n\nAfter setup: run `muonroi-cli doctor` to validate.\n\n## Essential commands\n- Interactive TUI: `muonroi-cli` (or `node dist/index.js` after build)\n- Headless one-shot: `muonroi-cli --prompt \"your task\" --max-tool-rounds 8`\n- Health + MCP nudge: `muonroi-cli doctor`\n- Update: `muonroi-cli update` (or set \"autoUpdate\": true in user-settings)\n- Keys move between machines: `muonroi-cli keys export file.json` then import on target\n- Native tools MCP (for external agents): `muonroi-cli tools-mcp` (stdio)\n- Harness driver MCP: `muonroi-cli mcp-driver`\n\n## MCP integration (for Claude Desktop, Cursor, other agents)\nAdd to your MCP client config:\n\n{\n  \"mcpServers\": {\n    \"muonroi-tools\": {\n      \"command\": \"bun\",\n      \"args\": [\"run\", \"/absolute/path/to/muonroi-cli/src/index.ts\", \"tools-mcp\"]\n    }\n  }\n}\n\n(Use absolute path. After `bun run build`: \"node\", \"dist/index.js\", \"tools-mcp\")\n\nThe CLI's OWN inner agent exposes these as NATIVE in-process tools (no MCP self-spawn):\n- setup_guide (this document)\n- ee_query / ee_health / ee_feedback \u2014 Experience Engine semantic recall + compaction checkpoints + feedback for learning\n- usage_forensics <id-prefix> \u2014 per-session cost/token forensics (peak input, cache hits, anomalies)\n- lsp_query \u2014 goToDefinition, findReferences, hover, symbols, call hierarchy etc.\n- selfverify_* \u2014 Tier-1 heuristic + Tier-2 agentic self-QA harness runs (start/poll/result/cancel/list)\n\nFor BB/.NET template recipes and package docs, also connect an external \"muonroi-docs\" MCP server if available (provides docs_search + setup_guide for the templates).\n\n## Development\ngit clone https://github.com/muonroi/muonroi-cli.git\ncd muonroi-cli && bun install\n\nbun run dev                 # run from source (TUI)\nbun run typecheck           # tsc --noEmit\nbun run test                # vitest (unit + headless)\nbunx vitest -c vitest.harness.config.ts run tests/harness/   # TUI E2E (named-pipes on Win, fd3/4 on POSIX)\nbun run build               # or build:binary for standalone exe\n\nSee AGENTS.md (quick ref + rules), CLAUDE.md (harness verification), README.md.\n\n## Verify\nmuonroi-cli doctor\n# Checks runtimes, catalog load, keychain, MCP servers enabled, council research MCP nudge, EE reachability, recent error rate.\n# Any \"warn\" entries tell you exactly what to enable (e.g. tavily for web research in council).\n\nFor BB-aware scaffolding (/ideal on a muonroi-building-block target): ensure dotnet SDK + the three Muonroi.*.Template packages are installed via NuGet; doctor surfaces missing feed/template cases.\n";
+export declare const SETUP_GUIDE_TEXT = "# muonroi-cli Setup Guide\n\n## Install (zero runtime deps \u2014 recommended)\nLinux / macOS:\n  curl -fsSL https://raw.githubusercontent.com/muonroi/muonroi-cli/master/install.sh | bash\n\nWindows PowerShell:\n  irm https://raw.githubusercontent.com/muonroi/muonroi-cli/master/install.ps1 | iex\n\nBun (requires Bun >= 1.3):\n  bun add -g muonroi-cli\n\nNPM (requires Node >= 20):\n  npm install -g muonroi-cli\n\nThe installers fetch a pre-compiled single binary from GitHub Releases.\n\n## First run\n- Wizard appears automatically.\n- Lists supported providers (DeepSeek + SiliconFlow ready; others via BYOK).\n- Four credential options: paste key, Bitwarden sync (B in /providers), keys export/import (encrypted bundle), or skip for later.\n- Keys land in OS keychain (keytar). Settings written to ~/.muonroi-cli/user-settings.json.\n- Role routing (leader/implement/verify/research) is configured for you.\n\nAfter setup: run `muonroi-cli doctor` to validate.\n\n## Essential commands\n- Interactive TUI: `muonroi-cli` (or `node dist/index.js` after build)\n- Headless one-shot: `muonroi-cli --prompt \"your task\" --max-tool-rounds 8`\n- Health + MCP nudge: `muonroi-cli doctor`\n- Update: `muonroi-cli update` (or set \"autoUpdate\": true in user-settings)\n- Keys move between machines: `muonroi-cli keys export file.json` then import on target\n- Native tools MCP (for external agents): `muonroi-cli tools-mcp` (stdio)\n- Harness driver MCP: `muonroi-cli mcp-driver`\n\n## MCP integration (for Claude Desktop, Cursor, other agents)\nAdd to your MCP client config:\n\n{\n  \"mcpServers\": {\n    \"muonroi-tools\": {\n      \"command\": \"bun\",\n      \"args\": [\"run\", \"/absolute/path/to/muonroi-cli/src/index.ts\", \"tools-mcp\"]\n    }\n  }\n}\n\n(Use absolute path. After `bun run build`: \"node\", \"dist/index.js\", \"tools-mcp\")\n\nThe CLI's OWN inner agent exposes these as NATIVE in-process tools (no MCP self-spawn):\n- setup_guide (this document)\n- ee_query / ee_health / ee_feedback \u2014 Experience Engine semantic recall + compaction checkpoints + feedback for learning\n- usage_forensics <id-prefix> \u2014 per-session cost/token forensics (peak input, cache hits, anomalies)\n- lsp_query \u2014 goToDefinition, findReferences, hover, symbols, call hierarchy etc.\n- selfverify_* \u2014 Tier-1 heuristic + Tier-2 agentic self-QA harness runs (start/poll/result/cancel/list)\n\nFor BB/.NET template recipes and package docs, also connect an external \"muonroi-docs\" MCP server if available (provides docs_search + setup_guide for the templates).\n\n## Development\ngit clone https://github.com/muonroi/muonroi-cli.git\ncd muonroi-cli && bun install\n\nbun run dev                 # run from source (TUI)\nbun run typecheck           # tsc --noEmit\nbun run test                # vitest (unit + headless)\nbunx vitest -c vitest.harness.config.ts run tests/harness/   # TUI E2E (named-pipes on Win, fd3/4 on POSIX)\nbun run build               # or build:binary for standalone exe\n\nSee AGENTS.md (quick ref + rules), CLAUDE.md (harness verification), README.md.\n\n## Verify\nmuonroi-cli doctor\n# Checks runtimes, catalog load, keychain, MCP servers enabled, council research MCP nudge, EE reachability, recent error rate.\n# Any \"warn\" entries tell you exactly what to enable (e.g. tavily for web research in council).\n\nFor BB-aware scaffolding (/ideal on a muonroi-building-block target): ensure dotnet SDK + the three Muonroi.*.Template packages are installed via NuGet; doctor surfaces missing feed/template cases.\n";

package/dist/src/mcp/setup-guide-text.js

@@ -17,7 +17,9 @@ Windows PowerShell:
 
 Bun (requires Bun >= 1.3):
   bun add -g muonroi-cli
-  # (npm install -g is NOT supported — TUI engine uses Bun-only ESM features)
+
+NPM (requires Node >= 20):
+  npm install -g muonroi-cli
 
 The installers fetch a pre-compiled single binary from GitHub Releases.
 

package/dist/src/orchestrator/auto-commit.js

@@ -21,6 +21,7 @@
  * cannot inject shell commands.
  */
 import { execFile } from "node:child_process";
+import { logger } from "../utils/logger.js";
 import { resolve } from "node:path";
 import { promisify } from "node:util";
 const pexecFile = promisify(execFile);
@@ -114,7 +115,7 @@ export async function gateStagedPaths(cwd, paths, budgetMs = 9_000) {
             new Promise((r) => setTimeout(() => r(TIMED_OUT), budgetMs)),
         ]);
         if (outcome === TIMED_OUT) {
-            console.error(`[commit-gate] LSP gate exceeded ${budgetMs}ms — allowing commit (fail-open)`);
+            logger.error("orchestrator", `[commit-gate] LSP gate exceeded ${budgetMs}ms — allowing commit (fail-open)`);
             return { ok: true };
         }
         if (errorFiles.length === 0)
@@ -123,7 +124,8 @@ export async function gateStagedPaths(cwd, paths, budgetMs = 9_000) {
         return { ok: false, summary };
     }
     catch (err) {
-        console.error(`[commit-gate] gate failed open: ${err?.message}`, {
+        logger.error("orchestrator", "gate failed open", {
+            error: err,
             stack: err?.stack?.split("\n").slice(0, 3),
         });
         return { ok: true };
@@ -282,7 +284,7 @@ export async function maybeAutoCommitTurn(opts) {
         return { committed: false, reason: "no-agent-changes" };
     const add = await git(cwd, ["add", "--", ...newPaths]);
     if (!add.ok) {
-        console.error(`[auto-commit] git add failed for ${newPaths.length} path(s) in ${cwd}`);
+        logger.error("orchestrator", `[auto-commit] git add failed for ${newPaths.length} path(s) in ${cwd}`);
         return { committed: false, reason: "add-failed" };
     }
     // G1 quality gate: do NOT auto-commit code that fails LSP error checks. The
@@ -290,7 +292,7 @@ export async function maybeAutoCommitTurn(opts) {
     // will see/fix it next turn. Staged paths stay staged (idempotent).
     const gate = await gateStagedPaths(cwd, newPaths);
     if (!gate.ok) {
-        console.error(`[auto-commit] skipped — staged files have LSP errors:\n${gate.summary}`);
+        logger.error("orchestrator", `[auto-commit] skipped — staged files have LSP errors:\n${gate.summary}`);
         return { committed: false, reason: "lsp-errors", detail: gate.summary };
     }
     // Separate -m flags → git inserts the blank line between subject and
@@ -306,7 +308,7 @@ export async function maybeAutoCommitTurn(opts) {
         ...newPaths,
     ]);
     if (!commit.ok) {
-        console.error(`[auto-commit] git commit failed in ${cwd} (a pre-commit/commit-msg hook may have rejected it)`);
+        logger.error("orchestrator", `[auto-commit] git commit failed in ${cwd} (a pre-commit/commit-msg hook may have rejected it)`);
         return { committed: false, reason: "commit-failed" };
     }
     const head = await git(cwd, ["rev-parse", "--short", "HEAD"]);
@@ -330,7 +332,7 @@ export async function commitSpecificPaths(cwd, paths, message) {
         return { committed: false, reason: "not-a-repo" };
     const add = await git(cwd, ["add", "--", ...safe]);
     if (!add.ok) {
-        console.error(`[git_commit] git add failed for ${safe.length} path(s) in ${cwd}`);
+        logger.error("orchestrator", `[git_commit] git add failed for ${safe.length} path(s) in ${cwd}`);
         return { committed: false, reason: "add-failed" };
     }
     // Only commit if these paths actually have staged changes (idempotent across
@@ -351,7 +353,7 @@ export async function commitSpecificPaths(cwd, paths, message) {
         : ["-m", subject, "-m", AUTO_COMMIT_ATTRIBUTION];
     const commit = await git(cwd, ["commit", ...mArgs, "--", ...safe]);
     if (!commit.ok) {
-        console.error(`[git_commit] git commit failed in ${cwd} (a pre-commit/commit-msg hook may have rejected it)`);
+        logger.error("orchestrator", `[git_commit] git commit failed in ${cwd} (a pre-commit/commit-msg hook may have rejected it)`);
         return { committed: false, reason: "commit-failed" };
     }
     const head = await git(cwd, ["rev-parse", "--short", "HEAD"]);

package/dist/src/orchestrator/message-processor.d.ts

@@ -21,6 +21,7 @@ import type { TurnRunnerDepsBase } from "./turn-runner-deps.js";
  * subsequent turns). Method callbacks delegate to Agent private methods.
  */
 export interface MessageProcessorDeps extends TurnRunnerDepsBase {
+    readonly isSubSession?: boolean;
     /** Live messageSeqs array (mutated by push; parallel to messages). */
     readonly messageSeqs: Array<number | null>;
     /** Session bookkeeping. */
@@ -75,6 +76,7 @@ export interface MessageProcessorDeps extends TurnRunnerDepsBase {
     setMessages(messages: ModelMessage[]): void;
     requireProvider(): LegacyProvider;
     emitSubagentStatus(status: SubagentStatus | null): void;
+    consultParentSession?: (question: string) => Promise<string>;
     fireHook(input: unknown, signal?: AbortSignal): Promise<{
         blocked: boolean;
         blockingErrors: Array<{

package/dist/src/orchestrator/message-processor.js

@@ -692,6 +692,10 @@ export class MessageProcessor {
         const _pilResponseTools = getResponseToolSet(pilCtx, deps.providerId);
         const _hasResponseTools = Object.keys(_pilResponseTools).length > 0;
         const systemParts = buildSystemPromptParts(deps.bash.getCwd(), deps.mode, deps.bash.getSandboxMode(), deps.getPlanContext(), subagents, deps.bash.getSandboxSettings(), deps.providerId, deps.getResumeDigest(), { chitchat: isChitchat });
+        // F3c — tool-turn system prompt: same context, but skips native-capabilities
+        // and skills sections (~4K tokens) that the model already saw on the first
+        // call.  The orchestrator switches to this on the 2nd+ streamText invocation.
+        const toolTurnParts = buildSystemPromptParts(deps.bash.getCwd(), deps.mode, deps.bash.getSandboxMode(), deps.getPlanContext(), subagents, deps.bash.getSandboxSettings(), deps.providerId, deps.getResumeDigest(), { chitchat: isChitchat, toolTurn: true });
         if (deps.getResumeDigest())
             deps.setResumeDigest(null);
         // Skip vision/playwright guidance unless the user's message has a URL
@@ -700,6 +704,8 @@ export class MessageProcessor {
         const _browserGuidanceNeeded = /https?:\/\/\S+|\b(screenshot|browser|playwright|chrome|figma|canva|render|webpage|website|url|hyperlink|navigate|click|scrape)\b/i.test(userMessage);
         const playwrightGuidance = isChitchat || !_browserGuidanceNeeded ? "" : getVisionGuidanceForTextOnly(turnModelId);
         const system = applyModelConstraints(applyPilSuffix(`${systemParts.staticPrefix}${playwrightGuidance}${systemParts.dynamicSuffix}`, pilCtx, _hasResponseTools), turnModelId);
+        // Tool-turn system: same template as system but with toolTurn-prefix
+        const toolTurnSystem = applyModelConstraints(applyPilSuffix(`${toolTurnParts.staticPrefix}${playwrightGuidance}${toolTurnParts.dynamicSuffix}`, pilCtx, _hasResponseTools), turnModelId);
         const runtime = resolveModelRuntime(provider, turnModelId);
         const modelInfo = runtime.modelInfo;
         // SAMR: Step-Aware Model Routing — downgrade to fast model for tool-execution
@@ -784,6 +790,7 @@ export class MessageProcessor {
                 taskHash,
                 provider,
                 system,
+                toolTurnSystem,
                 routerStore,
                 attemptedOverflowRecovery,
                 patternLoopForceHalt,

package/dist/src/orchestrator/orchestrator.d.ts

@@ -24,6 +24,7 @@ export declare class Agent {
     /** UI-registered live-queue steer drain; see Agent.setSteerDrain. */
     private steerDrain;
     private maxToolRounds;
+    private hardMaxToolRounds;
     private mode;
     private modelId;
     private maxTokens;
@@ -125,6 +126,7 @@ export declare class Agent {
     getCwd(): string;
     setCwd(dir: string): void;
     getMessages(): ModelMessage[];
+    setMessages(messages: ModelMessage[]): void;
     listSchedules(): Promise<StoredSchedule[]>;
     removeSchedule(id: string): Promise<string>;
     getScheduleDaemonStatus(): Promise<ScheduleDaemonStatus>;
@@ -233,6 +235,7 @@ export declare class Agent {
     private appendMidTurnMessages;
     private appendCompletedTurn;
     private fireHook;
+    private estimateConversationChars;
     processMessage(userMessage: string, observer?: ProcessMessageObserver, images?: Array<{
         path: string;
         mediaType: string;