muonroi-cli 1.8.4 → 1.8.5

package/dist/src/index.js

@@ -163,7 +163,7 @@ async function hasOAuthForModel(modelId) {
  * Supported splash providers — mirrors SPLASH_PROVIDERS in ui/app.tsx.
  * The wizard only surfaces these; other providers still work programmatically.
  */
-const WIZARD_PROVIDERS = ["deepseek", "siliconflow"];
+const WIZARD_PROVIDERS = ["deepseek", "zai", "opencode-go", "xai"];
 async function firstRunWizard(currentModel) {
     let rl;
     try {
@@ -335,7 +335,7 @@ async function firstRunWizard(currentModel) {
         return null;
     }
 }
-async function startInteractive(apiKey, baseURL, model, maxToolRounds, batchApi, session, initialMessage, permissionMode = "safe", injectHalt = false) {
+async function startInteractive(apiKey, baseURL, model, maxToolRounds, batchApi, session, initialMessage, permissionMode = "safe", injectHalt = false, injectHaltSprint = false) {
     // ── Plan 00-07 boot order ──────────────────────────────────────────────────
     // 1. redactor.installGlobalPatches() — already at top of file (line 6).
     // 2. loadConfig + loadUsage (validates storage paths, logs usage cap state).
@@ -416,6 +416,14 @@ async function startInteractive(apiKey, baseURL, model, maxToolRounds, batchApi,
     const { relaunchWithSession } = await import("./ui/utils/relaunch.js");
     const renderer = await createCliRenderer({
         exitOnCtrlC: false,
+        // OpenTUI defaults openConsoleOnError:true — its process-level
+        // unhandledRejection/uncaughtException handler then calls console.show(),
+        // which focuses the debug console overlay and captures ALL keypresses.
+        // The overlay's keybindings have no hide/close action, so a stray rejection
+        // (e.g. a provider dropping a streaming socket) traps the user in a console
+        // they cannot dismiss. We surface errors in-band instead — keep it off.
+        // Toggle it deliberately with F12 (wired below).
+        openConsoleOnError: false,
         // We manage SIGINT ourselves (orchestrator abort → agent cleanup → renderer destroy).
         // Prevent OpenTUI from registering its own SIGINT/SIGTERM handler which would
         // call renderer.destroy() prematurely and race with our orderly shutdown.
@@ -426,10 +434,29 @@ async function startInteractive(apiKey, baseURL, model, maxToolRounds, batchApi,
             alternateKeys: true,
         },
     });
+    // Agent-mode: hand the renderer to the harness so it can snapshot the ACTUAL
+    // rendered cell grid (colors + attributes) via VisualFrame, not just the
+    // semantic tree. No-op outside agent-mode (runtime undefined).
+    {
+        const agentRt = globalThis.__muonroiAgentRuntime;
+        agentRt?.attachRenderer?.(renderer);
+    }
     // The TUI now owns the terminal — route fatal-handler behaviour away from
     // process.exit(1) (see the unhandledRejection handler above). Cleared in
     // restoreTerminalSync() the moment we begin tearing the terminal back down.
     setTuiActive(true);
+    // Deliberate debug-console toggle. With openConsoleOnError:false the overlay
+    // never auto-pops, so F12 is the ONLY way in — and, crucially, back out:
+    // console.toggle() hides it when it is visible+focused, so it can never trap.
+    try {
+        renderer.keyInput?.on("keypress", (key) => {
+            if (key?.name === "f12")
+                renderer.console.toggle();
+        });
+    }
+    catch {
+        /* keyInput/console are best-effort dev affordances — never block boot */
+    }
     /**
      * Restore terminal to main-screen mode before the process exits.
      *
@@ -616,6 +643,7 @@ async function startInteractive(apiKey, baseURL, model, maxToolRounds, batchApi,
             maxToolRounds,
             version: packageJson.version,
             injectHalt,
+            injectHaltSprint,
         },
         initialMessage,
         onExit,
@@ -852,6 +880,7 @@ program
     .option("--agent-fake-clock", "Use deterministic frame-counter clock")
     .option("--mock-llm <dir>", "Use fixture-based mock LLM from <dir> instead of real provider (E2E testing)")
     .option("--inject-halt", "TEST SEAM: render a synthetic halt recovery card after boot (harness E2E only)")
+    .option("--inject-halt-sprint", "TEST SEAM: render a synthetic sprint-failed recovery card after boot (harness E2E only)")
     .action(async (message, options) => {
     // Agent-mode: start the sidechannel runtime BEFORE any TUI or model work.
     // The runtime is exposed on globalThis so the renderer wiring (Task 1.6c)
@@ -978,11 +1007,10 @@ program
     }
     changeDirectoryOrExit(options.directory);
     // Boot model registry BEFORE any key resolution path runs —
-    // detectProviderForModel consults the catalog's alias map to route e.g.
-    // "deepseek-v4-flash" to provider "siliconflow". With an empty registry
-    // it falls back to a prefix match ("deepseek") and the CLI loads the
-    // wrong provider's key. Affects both runBackgroundDelegation and the
-    // main interactive/headless path below.
+    // detectProviderForModel consults the catalog's alias map to route model
+    // ids to the correct provider. With an empty registry it falls back to a
+    // prefix match and the CLI may load the wrong provider's key. Affects both
+    // runBackgroundDelegation and the main interactive/headless path below.
     let catalogLoadFailed = false;
     await loadCatalog().catch(() => {
         catalogLoadFailed = true;
@@ -1049,10 +1077,15 @@ program
     // so each request doesn't re-probe.
     const { detectEEClientMode, describeMode } = await import("./ee/client-mode.js");
     detectEEClientMode()
-        .then((info) => {
+        .then(async (info) => {
         if (process.env.MUONROI_EE_DEBUG === "1") {
             console.error(`[muonroi-cli] ${describeMode(info)}`);
         }
+        // WhoAmI thin-client fallback: once the mode is cached, derive the working-style
+        // profile from the behavioral brain and prime the sync cache so the PIL picks it
+        // up from the next turn. Fire-and-forget, fail-open — never blocks boot.
+        const { warmWhoAmIFromBrain } = await import("./ee/bridge.js");
+        await warmWhoAmIFromBrain();
     })
         .catch(() => { });
     // Patch zod-to-json-schema for Zod v4 compat (fixes tool calls for DeepSeek etc.)
@@ -1130,7 +1163,7 @@ program
         return;
     }
     const initialMessage = message.length > 0 ? message.join(" ") : undefined;
-    await startInteractive(config.apiKey, config.baseURL, config.model, config.maxToolRounds, options.batchApi === true, options.session, initialMessage, options.permission, options.injectHalt === true);
+    await startInteractive(config.apiKey, config.baseURL, config.model, config.maxToolRounds, options.batchApi === true, options.session, initialMessage, options.permission, options.injectHalt === true, options.injectHaltSprint === true);
 });
 program
     .command("models")
@@ -1254,7 +1287,7 @@ keys
 });
 keys
     .command("login <provider>")
-    .description("Log in to a provider via OAuth subscription (supported: openai, google/agy, xai). 'google'/'agy' now uses agy client creds.")
+    .description("Log in to a provider via OAuth subscription (supported: openai, xai).")
     .action(async (provider) => {
     const { runKeysLogin } = await import("./cli/keys.js");
     await runKeysLogin(provider);
@@ -1391,7 +1424,7 @@ usage
 const mcp = program.command("mcp").description("Manage MCP server configuration");
 mcp
     .command("setup-research")
-    .description("Configure web research MCP servers (context7, fetch, tavily)")
+    .description("Configure web research (native fetch_url + web_search; optional MCPs for context7/muonroi-docs)")
     .action(async () => {
     const rl = createInterface({ input: process.stdin, output: process.stderr });
     const ask = (q) => new Promise((resolve) => rl.question(q, (a) => resolve(a)));

package/dist/src/maintain/pr-builder.js

@@ -186,9 +186,13 @@ async function squashSinceMarker(cwd, markerSha, title) {
     }
 }
 // ─── PR body prompt ───────────────────────────────────────────────────────────
-const PR_BODY_SYSTEM = "You are a developer writing a GitHub pull request body. " +
-    "Output ONLY the markdown body — no preamble, no code fences wrapping the whole output. " +
-    "Follow the template exactly. Be concise.";
+const PR_BODY_SYSTEM = "You are a senior engineer writing the description for your own pull request. " +
+    "Write for a busy reviewer: they should understand what this PR does, why it exists, and how to verify it " +
+    "within thirty seconds of reading — before they open a single file. " +
+    "Write in plain, confident prose. Prefer specific claims ('caps retry backoff at 30s') over vague ones " +
+    "('improves retry handling'). Never restate filenames or diffs mechanically — explain intent and effect. " +
+    "Do not pad, do not apologize, and do not invent changes that are not evidenced by the task data or diff. " +
+    "Output ONLY the finished markdown body — no preamble, no commentary, and no code fence wrapping the whole output.";
 function buildPrBodyPrompt(task, diff, intel, result, filesOutsideRadius) {
     const diffSnippet = diff.length > 8192 ? `${diff.slice(0, 8192)}\n...[diff truncated to 8KB]` : diff;
     const descriptionSummary = task.description.length > 600 ? `${task.description.slice(0, 597)}…` : task.description;
@@ -199,29 +203,35 @@ function buildPrBodyPrompt(task, diff, intel, result, filesOutsideRadius) {
         ? `\n## Review Concerns\n${result.reviewConcerns.map((c) => `- ${c}`).join("\n")}`
         : "";
     return [
-        "Generate a PR body for the following maintenance task.",
-        "Use the template below. Replace each placeholder with real content.",
+        "Write the pull request body for the maintenance task below.",
+        "Use exactly the section structure described here, in this order. Render real content for every section — no placeholders, no angle brackets in the output.",
         "Output ONLY the rendered markdown body — nothing else.",
         "",
-        "## Template",
+        "## Structure",
         "---",
         "## Summary",
-        "<copy task description verbatim — trim to 3-5 sentences>",
+        "Two to four sentences a reviewer can read in isolation: what problem this PR solves, why it matters now, and the shape of the fix. Ground it in the task description, but rewrite it as prose — do not paste the task text verbatim.",
         "",
         "## What changed",
-        "<bullet list inferred from diff hunks — focus on user-visible behavior, not file mechanics>",
+        "Three to six bullets describing observable behavior changes, ordered most-significant first. Each bullet states an effect ('X now does Y', 'Z no longer happens when W'), not a file operation. Infer these from the diff hunks; mention a file path only when it clarifies scope. If the diff is trivially small, two bullets are fine — do not pad.",
         "",
         "## Test plan",
-        "<bullet list from acceptance_criteria + regression tests run>",
+        "One bullet per acceptance criterion, phrased as a verifiable check the reviewer could repeat. Then list the regression tests that were run. If something was NOT verified, say so plainly rather than omitting it.",
         outsideSection ? "## Files outside declared impact radius" : "",
-        outsideSection ? "<list filesOutsideRadius>" : "",
+        outsideSection
+            ? "List each file from the task data below, and for each add a short honest note on why it was touched (or 'reason unclear from diff' if you cannot tell). These files deserve extra reviewer scrutiny — do not downplay them."
+            : "",
         concernsSection ? "## Review Concerns" : "",
-        concernsSection ? "<list reviewConcerns — these are non-blocking, for reviewer awareness>" : "",
+        concernsSection
+            ? "List each concern from the task data verbatim, one bullet each. These are non-blocking flags for reviewer awareness — preserve their meaning, do not soften or editorialize."
+            : "",
         "## Related",
-        "- Impact radius: <first 5 entries from impactRadius>",
-        "- Regression tests run: <first 5 entries from regressionTests>",
+        "- Impact radius: the first 5 entries from the impact radius in the task data",
+        "- Regression tests run: the first 5 entries from the regression tests in the task data",
         "---",
         "",
+        "Rules: British understatement over marketing tone. No emoji. No headers beyond those specified. Keep the whole body under ~350 words unless the concerns/outside-radius sections force it longer.",
+        "",
         "## Task data",
         `Kind: ${task.kind}`,
         `Title: ${task.title}`,

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

@@ -27,6 +27,27 @@ function removeDeprecatedToolsMcp(servers) {
     console.error("[mcp:auto-setup] removed deprecated self-spawned muonroi-tools server — its tools are now native in-process builtins");
     return true;
 }
+/**
+ * Remove deprecated external MCP servers that are no longer seeded by default.
+ *
+ * - memory: superseded by native Experience Engine (ee_query + ee_write)
+ * - playwright: heavy browser automation; native research tools (fetch_url/web_search) cover most needs. Can be added manually.
+ * - figma: requires API key + specific workflow; removed from defaults. Can be added manually if needed.
+ */
+function removeDeprecatedExternalMcps(servers) {
+    const idsToRemove = new Set(["memory", "playwright", "figma"]);
+    let removed = false;
+    for (let i = servers.length - 1; i >= 0; i--) {
+        if (idsToRemove.has(servers[i].id)) {
+            servers.splice(i, 1);
+            removed = true;
+        }
+    }
+    if (removed) {
+        console.error("[mcp:auto-setup] removed deprecated external MCPs (memory/playwright/figma). Use native EE for memory; fetch_url + web_search for research. Add playwright/figma manually only if full integration required.");
+    }
+    return removed;
+}
 const DEFAULT_CONFIGS = [
     {
         // Authoritative source for the Muonroi ecosystem (BB/.NET template recipes,
@@ -39,31 +60,6 @@ const DEFAULT_CONFIGS = [
         transport: "http",
         url: "https://docs-mcp.muonroi.com/mcp",
     },
-    {
-        id: "playwright",
-        label: "Playwright",
-        enabled: true,
-        transport: "stdio",
-        command: "npx",
-        args: ["-y", "@playwright/mcp"],
-    },
-    {
-        id: "memory",
-        label: "Memory",
-        enabled: false,
-        transport: "stdio",
-        command: "npx",
-        args: ["-y", "@modelcontextprotocol/server-memory"],
-    },
-    {
-        id: "figma",
-        label: "Figma",
-        enabled: false,
-        transport: "stdio",
-        command: "npx",
-        args: ["-y", "figma-developer-mcp", "--stdio"],
-        env: { FIGMA_API_KEY: "" },
-    },
     {
         id: "context7",
         label: "Context7 (Library Docs)",
@@ -71,21 +67,24 @@ const DEFAULT_CONFIGS = [
         transport: "http",
         url: "https://mcp.context7.com/mcp",
     },
+    // fetch and tavily are now provided as *native* builtins (fetch_url / web_search).
+    // The external MCP versions are kept in the catalog for users who explicitly want them,
+    // but are no longer enabled by default for the inner agent.
     {
         id: "fetch",
-        label: "Fetch (URL → markdown)",
-        enabled: true,
+        label: "Fetch (URL → markdown) [MCP legacy]",
+        enabled: false,
         transport: "stdio",
-        command: "npx",
-        args: ["-y", "mcp-fetch-server"],
+        command: "bun",
+        args: ["x", "-y", "mcp-fetch-server"],
     },
     {
         id: "tavily",
-        label: "Tavily Web Search",
+        label: "Tavily Web Search [MCP legacy]",
         enabled: false,
         transport: "stdio",
-        command: "npx",
-        args: ["-y", "tavily-mcp"],
+        command: "bun",
+        args: ["x", "-y", "tavily-mcp"],
         env: { TAVILY_API_KEY: "" },
     },
 ];
@@ -108,10 +107,36 @@ function migrateServers(servers) {
     }
     return changed;
 }
+/**
+ * Migrate any legacy "npx" stdio entries (from older default seeds or manual config)
+ * to "bun x" form. npx shims frequently produce immediate "Connection closed"
+ * under Bun on Windows; bun x gives clean stdio pipes. Idempotent.
+ */
+function migrateNpxToBunx(servers) {
+    let changed = false;
+    for (const server of servers) {
+        if (server.transport === "stdio" && server.command === "npx") {
+            server.command = "bun";
+            const rest = (server.args ?? []).filter((a) => a !== "-y");
+            server.args = ["x", "-y", ...rest];
+            changed = true;
+        }
+    }
+    if (changed) {
+        console.error("[mcp:auto-setup] migrated legacy npx-based MCP servers to bun x (fixes Connection closed on Bun/Windows)");
+    }
+    return changed;
+}
 export function ensureDefaultMcpServers() {
     try {
         const existing = loadMcpServers();
         let dirty = migrateServers(existing);
+        // Upgrade legacy npx runners (most important fix for "Connection closed" during warm-up).
+        if (migrateNpxToBunx(existing))
+            dirty = true;
+        // Remove deprecated external MCPs (memory/playwright/figma) — replaced by native or manual opt-in.
+        if (removeDeprecatedExternalMcps(existing))
+            dirty = true;
         // muonroi-tools is no longer self-spawned by the CLI — its capabilities
         // (ee_query/ee_feedback/ee_health/usage_forensics/lsp_query/setup_guide/
         // selfverify_*) are NATIVE in-process builtins now (src/tools/native-tools.ts).

package/dist/src/mcp/client-pool.js

@@ -237,7 +237,7 @@ export async function acquireMcpTools(servers, opts) {
  * evicted by getOrConnect so a real turn retries.
  */
 export async function warmMcpClients(servers, syncAndLog = false) {
-    const validServers = servers.filter(s => s.enabled && validateMcpServerConfig(s).ok);
+    const validServers = servers.filter((s) => s.enabled && validateMcpServerConfig(s).ok);
     if (syncAndLog && validServers.length > 0) {
         console.log(`[MCP] Warming up ${validServers.length} server(s)...`);
     }

package/dist/src/mcp/ee-tools.js

@@ -140,6 +140,7 @@ export function registerEETools(server, deps = {}) {
                 id: clearedId,
                 verdict: result.verdict,
                 ...(result.reason ? { reason: result.reason } : {}),
+                ...(result.queued ? { queued: true } : {}),
                 pendingRemaining: ledger.pendingCount(),
             });
         }

package/dist/src/mcp/research-onboarding.js

@@ -53,10 +53,10 @@ async function promptForKeyWithRetry(io) {
     return null;
 }
 export async function runResearchOnboarding(io) {
-    io.log("\nWeb research is available via MCP servers:\n");
-    io.log("  - context7 - version-pinned library docs (free, no key)\n");
-    io.log("  - fetch - URL to markdown extraction (free, no key)\n");
-    io.log("  - tavily - LLM-tuned web search (free tier 1k/mo, needs API key)\n");
+    io.log("\nWeb research tools (native builtins):\n");
+    io.log("  - fetch_url — fetch any public URL and return clean markdown/text (always available)\n");
+    io.log("  - web_search — Tavily-powered web search (free tier, needs API key)\n");
+    io.log("  - context7 / muonroi-docs — still available via MCP (library + ecosystem docs)\n");
     io.log("\nTip: if you keep keys in Bitwarden, run `muonroi-cli mcp import-bw tavily` instead.\n\n");
     const yn = (await io.askYesNo("Enable Tavily web search now? [Y/n]: ")).trim().toLowerCase();
     let tavilyEnabled = false;
@@ -85,9 +85,10 @@ export async function runResearchMigrationPrompt(io) {
     if (settings.webResearchPrompted === true) {
         return { shown: false, tavilyEnabled: false };
     }
-    io.log("\nNew: web research is available.\n");
-    io.log("  - context7 (library docs) and fetch (URL extraction) - already enabled.\n");
-    io.log("  - Tavily web search needs a free API key (tavily.com).\n\n");
+    io.log("\nNew: web research tools are available natively.\n");
+    io.log("  - fetch_url (URL → markdown) is always available.\n");
+    io.log("  - web_search (Tavily) needs a free API key (tavily.com).\n");
+    io.log("  - context7 + muonroi-docs remain as optional MCP for specialized docs.\n\n");
     const choice = (await io.askChoice("Set up Tavily now? [Y/n/never]: ")).trim().toLowerCase();
     let tavilyEnabled = false;
     if (choice === "y" || choice === "yes" || choice === "") {

package/dist/src/mcp/runtime.js

@@ -65,11 +65,34 @@ function stripMcpInputSchema(tool) {
         inputSchema: jsonSchema(LAZY_MCP_INPUT_SCHEMA),
     };
 }
+function getMcpStdioRunner() {
+    // Prefer Bun's runner because:
+    // - The CLI is launched via `bun run`
+    // - npx .cmd shims have been observed to cause immediate "Connection closed"
+    //   (MCPClientError) for StdioClientTransport on Windows + Bun (see probe results).
+    // - bun x resolves + spawns package bins with clean stdio pipes.
+    return { command: "bun", prefixArgs: ["x", "-y"] };
+}
+/**
+ * Upgrade legacy "npx" (or npm exec) invocations recorded in user settings
+ * to the bun-based runner. This heals persisted configs from before the fix
+ * without requiring the user to re-run setup.
+ */
+function normalizeStdioCommand(command, args) {
+    const a = args ?? [];
+    if (command === "npx" || (command === "npm" && a[0] === "exec")) {
+        const r = getMcpStdioRunner();
+        const pkgArgs = a.filter((x) => x !== "-y");
+        return { command: r.command, args: [...r.prefixArgs, ...pkgArgs] };
+    }
+    return { command, args: a };
+}
 function toTransport(server, authProvider) {
     if (server.transport === "stdio") {
+        const { command, args } = normalizeStdioCommand(server.command ?? "", server.args);
         return new StdioClientTransport({
-            command: server.command ?? "",
-            args: server.args,
+            command,
+            args,
             env: server.env ? { ...getDefaultEnvironment(), ...server.env } : undefined,
             cwd: server.cwd,
             stderr: "pipe",
@@ -111,6 +134,15 @@ export async function connectOneServer(rawServer, opts) {
     // Hydrate env vars from the OS keychain before spawning — e.g. inject
     // TAVILY_API_KEY for the tavily MCP if stored via the research-onboarding wizard.
     const server = await hydrateServerEnv(rawServer);
+    // Fast-fail for servers that require keys but have none. Prevents "Connection closed"
+    // with zero actionable info. The server binary may start and list tools, but first
+    // use would fail — better to give clear guidance at warmup time.
+    if (server.id === "tavily") {
+        const key = server.env?.TAVILY_API_KEY;
+        if (!key || key.length < 16) {
+            throw new Error("Tavily is enabled but TAVILY_API_KEY is missing. Run `muonroi-cli mcp setup-research` or `muonroi-cli mcp key tavily`, or disable the server in /mcp config.");
+        }
+    }
     let authProvider;
     let cleanup;
     if (server.transport !== "stdio" && opts?.onOAuthRequired) {

package/dist/src/models/catalog-client.d.ts

@@ -7,6 +7,68 @@ export declare function getCatalogUrl(): string;
  * and a 401 from a key-protected catalog simply triggers the static fallback.
  */
 export declare function getCatalogHeaders(): Record<string, string>;
+/** One peak window within a provider's local timezone (end_hour exclusive). */
+export interface CatalogPeakHourWindow {
+    start_hour: number;
+    end_hour: number;
+}
+/** Peak-hour rule for a provider — sourced from vendor docs via catalog API. */
+export interface CatalogProviderPeakHour {
+    source_url: string;
+    source_verified_at?: string;
+    timezone: string;
+    /** Single window — used when `windows` is absent (e.g. Z.ai 14–18). */
+    start_hour?: number;
+    end_hour?: number;
+    /** Multiple peak windows (e.g. DeepSeek official: 09–12 and 14–18 UTC+8). */
+    windows?: CatalogPeakHourWindow[];
+    sensitive_model_ids: string[];
+    fallback_model_id: string;
+    switch_fallback_providers?: string[];
+    peak_quota_multiplier?: number;
+    off_peak_quota_multiplier?: number;
+    policy_basis?: "official" | "heuristic";
+    policy_note?: string;
+}
+export interface CatalogProviderPolicy {
+    peak_hour?: CatalogProviderPeakHour;
+}
+/** Default council debate slot — one role mapped to a provider + model. */
+export interface CatalogCouncilParticipant {
+    role: "implement" | "verify" | "research";
+    provider: string;
+    tier?: "fast" | "balanced" | "premium";
+    model_id?: string;
+}
+export interface CatalogCouncilRouting {
+    /** Default true — spread implement/verify/research across providers when user has no roleModels. */
+    prefer_multi_provider?: boolean;
+    participants?: CatalogCouncilParticipant[];
+}
+/** One vision-backend slot for the text-only model proxy layer. */
+export interface CatalogVisionProxySlot {
+    provider: string;
+    model_id: string;
+}
+export interface CatalogVisionProxyRouting {
+    default?: CatalogVisionProxySlot;
+    ocr?: CatalogVisionProxySlot;
+    design?: CatalogVisionProxySlot;
+    fallback_chain?: CatalogVisionProxySlot[];
+}
+export interface CatalogRouting {
+    switch_provider_order?: string[];
+    council?: CatalogCouncilRouting;
+    vision_proxy?: CatalogVisionProxyRouting;
+}
+export interface CatalogDocument {
+    version: string;
+    updated_at: string;
+    description?: string;
+    models: CatalogModel[];
+    routing?: CatalogRouting;
+    provider_policies?: Record<string, CatalogProviderPolicy>;
+}
 export interface CatalogModel {
     id: string;
     name: string;
@@ -21,16 +83,39 @@ export interface CatalogModel {
     reasoning: boolean;
     thinking_type?: string | null;
     supports_effort?: boolean;
+    /** Provider pins temperature to this exact value (e.g. Moonshot/Kimi = 1). */
+    fixed_temperature?: number | null;
     description: string;
     aliases?: string[];
     default_reasoning_effort?: string | null;
     supports_vision?: boolean;
+    /** When false, model is selectable via -m but skipped by tier routing. */
+    tier_routing?: boolean;
+    /** Additional tiers for automatic routing (primary tier remains `tier`). */
+    routing_tiers?: string[];
+    roles?: string[];
+    /**
+     * Part E — model has NATIVE online web research (its own web_search / browsing
+     * / Live Search), not just codebase read. Source of truth for whether the
+     * council research phase can trust this model for online facts. Per-model
+     * (audited), NOT per-provider. Absent → treated as false (safe: forces the
+     * add-in fallback + a degraded-confidence log). Never inferred from provider.
+     */
+    native_web_research?: boolean;
+    /**
+     * Optional mechanism hint for HOW native web research is activated:
+     * "live-search" (xAI) | "web-tool" | "browsing" (OpenAI Responses web_search)
+     * | null. Advisory only — `native_web_research` is the gate.
+     */
+    web_research_kind?: string | null;
 }
 /**
  * Best-effort validation for the REMOTE catalog: a transient bad response must
  * never break the CLI, so an invalid payload returns null and the caller falls
  * through to the trusted bundled catalog.
  */
+export declare function safeValidateCatalogDocument(raw: unknown): CatalogDocument | null;
+/** @deprecated Use safeValidateCatalogDocument — kept for callers that only need models. */
 export declare function safeValidateCatalog(raw: unknown): CatalogModel[] | null;
 /**
  * Strict validation for a STATIC (bundled) catalog that is present on disk: a
@@ -38,6 +123,8 @@ export declare function safeValidateCatalog(raw: unknown): CatalogModel[] | null
  * throw loudly with the validation issues rather than silently skipping it
  * (which would mask the defect as a confusing "cannot find catalog" later).
  */
+export declare function validateStaticCatalogDocument(raw: unknown, source: string): CatalogDocument;
 export declare function validateStaticCatalog(raw: unknown, source: string): CatalogModel[];
+export declare function fetchCatalogDocument(): Promise<CatalogDocument>;
 export declare function fetchCatalog(): Promise<CatalogModel[]>;
 export declare function catalogModelToModelInfo(m: CatalogModel): ModelInfo;