@gkorepanov/ccodex 0.4.16 → 0.4.18

package/agents/codex-wrapper.md

@@ -0,0 +1,40 @@
+---
+name: codex-wrapper
+description: Interactive wrapper around OpenAI Codex. Use when the caller wants to delegate work to Codex, discuss a task with Codex, continue an existing Codex thread, ask Codex to implement/review/debug/research something, or use Codex as a general-purpose subagent.
+tools: mcp__codex__*
+mcpServers:
+  - codex:
+      type: stdio
+      command: codex
+      args: ["mcp-server"]
+model: sonnet
+effort: low
+permissionMode: bypassPermissions
+---
+
+You are codex-wrapper.
+
+Codex is a full general-purpose subagent. Your job is to communicate with Codex interactively through the Codex MCP server and report the useful results back to the caller.
+
+Core behavior:
+- For a new Codex conversation, call the `codex` MCP tool.
+- For follow-ups, call `codex-reply` with the existing `threadId`.
+- Always use `danger-full-access` for Codex sandbox/access mode.
+- Keep the Codex conversation stateful. Preserve and reuse `threadId` whenever continuing the same task.
+- Pass the caller's context to Codex as fully as possible, preferably word-for-word.
+- Do not summarize, reinterpret, or compress the caller's task before sending it to Codex.
+- If the caller asks you to continue a prior Codex discussion and gives a `threadId`, use `codex-reply`.
+
+Interaction loop:
+- Talk to Codex for as many turns as needed (e.g. when codex asks permission or stopped mid task, ask it to continue)
+- But do not apply your own judgement if codex is stuck. Report to the caller and wait for next requests from caller.
+
+Reporting:
+- Report Codex's result to the caller clearly and fully.
+- Include the active `threadId` in your final response.
+- Preserve important Codex claims, objections, commands, file paths, and proposed changes.
+- Distinguish what Codex said from your own coordination notes when that matters.
+
+Codex model to use:
+- `gpt-5.6-sol` with `high` reasoning unless asked otherwise by caller.
+- Reasoning effort is set via the `config` parameter of the `codex` MCP tool: `config: {"model_reasoning_effort": "high"}`. Supported values: `minimal`/`low`/`medium`/`high`/`xhigh`/`max`.

package/config/compatibility.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "productVersion": "0.4.16",
+  "productVersion": "0.4.18",
   "node": ">=22.13 <27",
   "codexCli": "0.146.0",
   "codexGitRevision": "be449751a978f02e5bbba886999662956c7f38f5",

package/dist/claude/inputMapper.js

@@ -9,6 +9,7 @@ const mediaTypes = {
     ".png": "image/png",
     ".webp": "image/webp",
 };
+const dataImageUrl = /^data:(image\/[a-z+.-]+);base64,([\s\S]*)$/i;
 async function allowedImagePath(path, context) {
     const candidate = await realpath(isAbsolute(path) ? path : resolve(context.cwd, path));
     const sandbox = context.sandboxPolicy && typeof context.sandboxPolicy === "object" && "type" in context.sandboxPolicy
@@ -43,6 +44,14 @@ export async function mapUserInput(input, uuid, context) {
             throw invalidParams("Codex skills are not available in Claude threads.");
         }
         else if (item.type === "image") {
+            const inline = dataImageUrl.exec(item.url);
+            if (inline) {
+                const mediaType = inline[1].toLocaleLowerCase();
+                if (!Object.values(mediaTypes).includes(mediaType))
+                    throw invalidParams(`Unsupported Claude image type '${mediaType}'.`);
+                content.push({ type: "image", source: { type: "base64", media_type: mediaType, data: inline[2].replace(/\s+/g, "") } });
+                continue;
+            }
             const url = new URL(item.url);
             if (url.protocol !== "https:" && url.protocol !== "http:")
                 throw invalidParams(`Unsupported Claude image URL scheme '${url.protocol}'.`);

package/dist/claude/inputMapper.js.map

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

package/dist/claude/session/codexRollout.d.ts

@@ -0,0 +1,26 @@
+export declare const CODEX_MCP_TOOLS: Set<string>;
+export declare const CODEX_MCP_PROMPT_LABEL = "\u25C6 CCodex \u2502 Codex MCP prompt";
+export declare const CODEX_MCP_MESSAGE_LABEL = "\u25C6 CCodex \u2502 Codex MCP message";
+export declare const CODEX_MCP_REASONING_LABEL = "\u25C6 CCodex \u2502 Codex MCP reasoning";
+export type CodexRolloutEvent = {
+    readonly kind: "message";
+    readonly text: string;
+} | {
+    readonly kind: "reasoning";
+    readonly text: string;
+} | {
+    readonly kind: "turnComplete";
+};
+/** Locates the rollout journal for a codex MCP call; injectable for tests. */
+export interface CodexRolloutLocator {
+    /** Journal of an existing codex thread (codex-reply), by thread id. */
+    byThreadId(threadId: string): string | undefined;
+    /** Journal of a fresh MCP-sourced codex session started at or after `notBeforeMs`, excluding `claimed` paths. */
+    freshMcpSession(notBeforeMs: number, claimed: ReadonlySet<string>): string | undefined;
+}
+export declare function defaultCodexRolloutLocator(sessionsDir?: string): CodexRolloutLocator;
+/** Consumes complete journal lines from `buffer` + `chunk`, returning mapped events and the unparsed tail. */
+export declare function parseRolloutChunk(buffer: string, chunk: string): {
+    rest: string;
+    events: CodexRolloutEvent[];
+};

package/dist/claude/session/codexRollout.js

@@ -0,0 +1,139 @@
+import { closeSync, openSync, readSync, readdirSync, statSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+export const CODEX_MCP_TOOLS = new Set(["mcp__codex__codex", "mcp__codex__codex-reply"]);
+export const CODEX_MCP_PROMPT_LABEL = "◆ CCodex │ Codex MCP prompt";
+export const CODEX_MCP_MESSAGE_LABEL = "◆ CCodex │ Codex MCP message";
+export const CODEX_MCP_REASONING_LABEL = "◆ CCodex │ Codex MCP reasoning";
+function codexSessionsDir() {
+    return join(process.env.CODEX_HOME ?? join(homedir(), ".codex"), "sessions");
+}
+function dayDirsNewestFirst(root, limit) {
+    const numericDesc = (values) => values.filter((value) => /^\d+$/.test(value)).sort((a, b) => Number(b) - Number(a));
+    const days = [];
+    let entries;
+    try {
+        entries = readdirSync(root);
+    }
+    catch {
+        return [];
+    }
+    for (const year of numericDesc(entries)) {
+        for (const month of numericDesc(readdirSync(join(root, year)))) {
+            for (const day of numericDesc(readdirSync(join(root, year, month)))) {
+                days.push(join(root, year, month, day));
+                if (days.length >= limit)
+                    return days;
+            }
+        }
+    }
+    return days;
+}
+function sessionMeta(path) {
+    // The session_meta line embeds the full codex base instructions, so it can be
+    // tens of kilobytes long — read a bounded head and require a complete line.
+    let head;
+    try {
+        const buffer = Buffer.alloc(262_144);
+        const fd = openSync(path, "r");
+        try {
+            head = buffer.subarray(0, readSync(fd, buffer, 0, buffer.length, 0)).toString("utf8");
+        }
+        finally {
+            closeSync(fd);
+        }
+    }
+    catch {
+        return undefined;
+    }
+    const end = head.indexOf("\n");
+    if (end === -1)
+        return undefined;
+    const line = head.slice(0, end);
+    try {
+        const parsed = JSON.parse(line);
+        if (parsed.type !== "session_meta")
+            return undefined;
+        const timestamp = parsed.payload?.timestamp ? Date.parse(parsed.payload.timestamp) : Number.NaN;
+        return {
+            ...(parsed.payload?.source === undefined ? {} : { source: parsed.payload.source }),
+            ...(Number.isNaN(timestamp) ? {} : { timestampMs: timestamp }),
+        };
+    }
+    catch {
+        return undefined;
+    }
+}
+export function defaultCodexRolloutLocator(sessionsDir = codexSessionsDir()) {
+    return {
+        byThreadId(threadId) {
+            const suffix = `-${threadId}.jsonl`;
+            for (const day of dayDirsNewestFirst(sessionsDir, 366)) {
+                for (const entry of readdirSync(day)) {
+                    if (entry.endsWith(suffix))
+                        return join(day, entry);
+                }
+            }
+            return undefined;
+        },
+        freshMcpSession(notBeforeMs, claimed) {
+            const candidates = [];
+            for (const day of dayDirsNewestFirst(sessionsDir, 2)) {
+                for (const entry of readdirSync(day)) {
+                    if (!entry.endsWith(".jsonl"))
+                        continue;
+                    const path = join(day, entry);
+                    if (claimed.has(path))
+                        continue;
+                    try {
+                        if (statSync(path).mtimeMs < notBeforeMs - 5_000)
+                            continue;
+                    }
+                    catch {
+                        continue;
+                    }
+                    const meta = sessionMeta(path);
+                    if (meta?.source !== "mcp")
+                        continue;
+                    if (meta.timestampMs === undefined || meta.timestampMs < notBeforeMs - 5_000)
+                        continue;
+                    candidates.push({ path, timestampMs: meta.timestampMs });
+                }
+            }
+            return candidates.sort((a, b) => a.timestampMs - b.timestampMs)[0]?.path;
+        },
+    };
+}
+/** Consumes complete journal lines from `buffer` + `chunk`, returning mapped events and the unparsed tail. */
+export function parseRolloutChunk(buffer, chunk) {
+    const combined = buffer + chunk;
+    const boundary = combined.lastIndexOf("\n");
+    if (boundary === -1)
+        return { rest: combined, events: [] };
+    const events = [];
+    for (const line of combined.slice(0, boundary).split("\n")) {
+        if (!line.trim())
+            continue;
+        let parsed;
+        try {
+            parsed = JSON.parse(line);
+        }
+        catch {
+            continue;
+        }
+        if (parsed.type !== "event_msg")
+            continue;
+        const payload = parsed.payload;
+        if (payload?.type === "agent_message" && typeof payload.message === "string" && payload.message) {
+            events.push({ kind: "message", text: payload.message });
+        }
+        else if (payload?.type === "agent_reasoning" && typeof payload.text === "string" && payload.text) {
+            events.push({ kind: "reasoning", text: payload.text });
+        }
+        else if (payload?.type === "task_complete") {
+            events.push({ kind: "turnComplete" });
+        }
+    }
+    return { rest: combined.slice(boundary + 1), events };
+}
+//# sourceMappingURL=codexRollout.js.map

package/dist/claude/session/codexRollout.js.map

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

package/dist/claude/session/commands.d.ts

@@ -110,6 +110,9 @@ export type MainStreamFact = {
 } | {
     readonly kind: "instantAgent";
     readonly text: string;
+} | {
+    readonly kind: "instantReasoning";
+    readonly text: string;
 } | {
     readonly kind: "settle";
     readonly phase: "commentary" | "final_answer";
@@ -727,6 +730,12 @@ export type ClaudeSessionCommand = {
     readonly type: "captureToolFileAfter";
     readonly runtimeGeneration: number;
     readonly providerId: string;
+} | {
+    readonly type: "codexMcpCallBegin";
+    readonly runtimeGeneration: number;
+    readonly providerId: string;
+    readonly ownerProviderId?: string;
+    readonly input: Record<string, unknown>;
 } | {
     readonly type: "hook";
     readonly runtimeGeneration: number;

package/dist/claude/session/session.d.ts

@@ -6,6 +6,7 @@ import type { ClaudeOutputAdapter } from "./outputAdapter.js";
 import { type ClaudeSessionRepository } from "./repository.js";
 import { ShellRunner } from "./shellRunner.js";
 import { type BackgroundOutputReader } from "./backgroundOutput.js";
+import { type CodexRolloutLocator } from "./codexRollout.js";
 import type { TurnStartParams } from "../../codex/generated/v2/TurnStartParams.js";
 import type { TurnSteerParams } from "../../codex/generated/v2/TurnSteerParams.js";
 import type { ThreadBackgroundTerminal } from "../../codex/generated/v2/ThreadBackgroundTerminal.js";
@@ -47,6 +48,7 @@ export declare class ClaudeSession implements ClaudeSessionHandle<ClaudeSessionC
     private readonly shellRunner;
     private readonly backgroundOutputReader;
     private readonly runtimeDependencies?;
+    private readonly codexRolloutLocator;
     private readonly mailbox;
     private readonly consumer;
     private runtimeLineage;
@@ -63,6 +65,8 @@ export declare class ClaudeSession implements ClaudeSessionHandle<ClaudeSessionC
     private runtimeGeneration;
     private readonly scopes;
     private readonly tasks;
+    private readonly codexMcpTailers;
+    private readonly codexRolloutClaims;
     private compaction;
     private automaticCompaction;
     private readonly compactionActions;
@@ -93,7 +97,7 @@ export declare class ClaudeSession implements ClaudeSessionHandle<ClaudeSessionC
     private hookDisplayOrder;
     private adminOperation;
     private shell;
-    constructor(threadId: string, repository: ClaudeSessionRepository, output: ClaudeOutputAdapter, capacity?: number, metrics?: MetricsRegistry, onLifecycle?: (update: SessionLifecycleUpdate) => void, onChildCreated?: (threadId: string) => void, onChildRemoved?: (threadId: string) => void, shellRunner?: ShellRunner, backgroundOutputReader?: BackgroundOutputReader, runtimeDependencies?: ClaudeSessionRuntimeDependencies | undefined);
+    constructor(threadId: string, repository: ClaudeSessionRepository, output: ClaudeOutputAdapter, capacity?: number, metrics?: MetricsRegistry, onLifecycle?: (update: SessionLifecycleUpdate) => void, onChildCreated?: (threadId: string) => void, onChildRemoved?: (threadId: string) => void, shellRunner?: ShellRunner, backgroundOutputReader?: BackgroundOutputReader, runtimeDependencies?: ClaudeSessionRuntimeDependencies | undefined, codexRolloutLocator?: CodexRolloutLocator);
     submit<Result>(command: ClaudeSessionCommand): Promise<Result>;
     private submitLineage;
     private submitRuntimeEffect;
@@ -262,6 +266,11 @@ export declare class ClaudeSession implements ClaudeSessionHandle<ClaudeSessionC
     private findTool;
     private toolOwner;
     private captureToolFileBefore;
+    private codexMcpCallBegin;
+    private ensureCodexRolloutTailer;
+    private drainCodexRollout;
+    private finishCodexRolloutTailer;
+    private stopCodexRolloutTailer;
     private captureToolFileAfter;
     private acceptHook;
     private syncInteractionStatus;

package/dist/claude/session/session.js

@@ -17,7 +17,9 @@ import { bindGoalTurn, consumeGoalContinuation, dispatchGoal, finishGoalTurn, go
 import { ShellRunner } from "./shellRunner.js";
 import { diffFile, snapshotFile } from "../fileSnapshots.js";
 import { appendHookProgress, completeHookRun, startHookRun } from "../hookMapper.js";
+import { stat } from "node:fs/promises";
 import { readBackgroundOutput } from "./backgroundOutput.js";
+import { CODEX_MCP_MESSAGE_LABEL, CODEX_MCP_PROMPT_LABEL, CODEX_MCP_REASONING_LABEL, CODEX_MCP_TOOLS, defaultCodexRolloutLocator, parseRolloutChunk, } from "./codexRollout.js";
 import { createGoalMcpServer } from "../goalTools.js";
 import { mapUserInput } from "../inputMapper.js";
 import { bashCommandActions } from "../commandActions.js";
@@ -118,6 +120,7 @@ export class ClaudeSession {
     shellRunner;
     backgroundOutputReader;
     runtimeDependencies;
+    codexRolloutLocator;
     mailbox;
     consumer;
     runtimeLineage = { state: "absent" };
@@ -134,6 +137,8 @@ export class ClaudeSession {
     runtimeGeneration;
     scopes = new Map();
     tasks = new Map();
+    codexMcpTailers = new Map();
+    codexRolloutClaims = new Set();
     compaction;
     automaticCompaction;
     compactionActions = [];
@@ -164,7 +169,7 @@ export class ClaudeSession {
     hookDisplayOrder = 0;
     adminOperation;
     shell;
-    constructor(threadId, repository, output, capacity, metrics = new MetricsRegistry(), onLifecycle = () => undefined, onChildCreated = () => undefined, onChildRemoved = () => undefined, shellRunner = new ShellRunner(), backgroundOutputReader = readBackgroundOutput, runtimeDependencies) {
+    constructor(threadId, repository, output, capacity, metrics = new MetricsRegistry(), onLifecycle = () => undefined, onChildCreated = () => undefined, onChildRemoved = () => undefined, shellRunner = new ShellRunner(), backgroundOutputReader = readBackgroundOutput, runtimeDependencies, codexRolloutLocator = defaultCodexRolloutLocator()) {
         this.threadId = threadId;
         this.repository = repository;
         this.output = output;
@@ -175,6 +180,7 @@ export class ClaudeSession {
         this.shellRunner = shellRunner;
         this.backgroundOutputReader = backgroundOutputReader;
         this.runtimeDependencies = runtimeDependencies;
+        this.codexRolloutLocator = codexRolloutLocator;
         this.mailbox = new ClaudeMailbox(capacity);
         this.consumer = this.run();
     }
@@ -2089,6 +2095,15 @@ export class ClaudeSession {
                 toolName: input.tool_name,
                 input: toolInput,
             });
+            if (CODEX_MCP_TOOLS.has(input.tool_name)) {
+                await this.submitProviderProjection(runtimeGeneration, {
+                    type: "codexMcpCallBegin",
+                    runtimeGeneration,
+                    providerId: toolUseId,
+                    ...(input.agent_id ? { ownerProviderId: input.agent_id } : {}),
+                    input: toolInput,
+                });
+            }
         }
         if (policy.decision === "defer" || policy.decision === "ask")
             return { continue: true };
@@ -2284,6 +2299,9 @@ export class ClaudeSession {
         const backgroundId = backgroundTaskId(message);
         const itemIds = [];
         for (const result of toolResults(message)) {
+            if (this.codexMcpTailers.has(result.toolUseId)) {
+                await this.finishCodexRolloutTailer(result.toolUseId);
+            }
             const outputFile = backgroundOutputFile(result.output);
             const projected = backgroundId
                 ? await this.applyProviderMainStream(projection, runtimeGeneration, {
@@ -4248,6 +4266,8 @@ export class ClaudeSession {
                 }
             case "captureToolFileBefore":
                 return this.captureToolFileBefore(command);
+            case "codexMcpCallBegin":
+                return this.codexMcpCallBegin(command);
             case "captureToolFileAfter":
                 return this.captureToolFileAfter(command.runtimeGeneration, command.providerId);
             case "hook":
@@ -5995,6 +6015,131 @@ export class ClaudeSession {
         tool.fileSnapshot = snapshot;
         return true;
     }
+    codexMcpCallBegin(command) {
+        if (command.runtimeGeneration !== this.runtimeGeneration || this.interruptFence || this.dropLateFacts)
+            return false;
+        let owner = this.toolOwner(command.providerId);
+        if (!owner && command.ownerProviderId) {
+            owner = this.toolOwner(command.ownerProviderId);
+            const task = [...this.tasks.values()].find((candidate) => taskUsesProvider(candidate, command.ownerProviderId) || candidate.taskId === command.ownerProviderId);
+            if (task?.childThreadId)
+                owner = this.scopes.get(task.childThreadId);
+        }
+        owner ??= this.scopes.get(this.threadId);
+        if (!owner)
+            return false;
+        const prompt = typeof command.input.prompt === "string" ? command.input.prompt : "";
+        if (prompt) {
+            this.projectMainStream(owner.ownerThreadId, {
+                kind: "instantAgent",
+                text: `${CODEX_MCP_PROMPT_LABEL}\n\n${prompt}`,
+            }, nullSource);
+        }
+        this.ensureCodexRolloutTailer(command.providerId, owner.ownerThreadId, typeof command.input.threadId === "string" ? command.input.threadId : undefined);
+        return true;
+    }
+    ensureCodexRolloutTailer(providerId, ownerThreadId, codexThreadId) {
+        if (this.codexMcpTailers.has(providerId))
+            return;
+        const runtimeGeneration = this.runtimeGeneration;
+        if (runtimeGeneration === undefined)
+            return;
+        const tailer = {
+            runtimeGeneration, ownerThreadId, codexThreadId,
+            notBeforeMs: Date.now(), offset: 0, buffer: "",
+            decoder: new TextDecoder(),
+            timer: setInterval(() => { void this.drainCodexRollout(providerId).catch(() => undefined); }, 250),
+            stopped: false, sawTurnComplete: false,
+        };
+        tailer.timer.unref();
+        this.codexMcpTailers.set(providerId, tailer);
+        void this.drainCodexRollout(providerId).catch(() => undefined);
+    }
+    async drainCodexRollout(providerId, final = false) {
+        const tailer = this.codexMcpTailers.get(providerId);
+        if (!tailer || tailer.stopped)
+            return;
+        if (tailer.reading) {
+            const reading = tailer.reading;
+            await reading;
+            if (tailer.reading === reading)
+                tailer.reading = undefined;
+            if (final)
+                await this.drainCodexRollout(providerId, true);
+            return;
+        }
+        const reading = (async () => {
+            if (!tailer.file) {
+                if (tailer.codexThreadId) {
+                    // Continuation of an existing codex thread: the journal already holds
+                    // prior turns, so start from its current end.
+                    const file = this.codexRolloutLocator.byThreadId(tailer.codexThreadId);
+                    if (!file)
+                        return;
+                    tailer.offset = await stat(file).then((info) => info.size, () => 0);
+                    tailer.file = file;
+                }
+                else {
+                    const file = this.codexRolloutLocator.freshMcpSession(tailer.notBeforeMs, this.codexRolloutClaims);
+                    if (!file)
+                        return;
+                    tailer.file = file;
+                }
+                this.codexRolloutClaims.add(tailer.file);
+            }
+            tailer.offset = await this.backgroundOutputReader(tailer.file, tailer.offset, async (bytes) => {
+                if (tailer.stopped)
+                    return;
+                const { rest, events } = parseRolloutChunk(tailer.buffer, tailer.decoder.decode(bytes, { stream: true }));
+                tailer.buffer = rest;
+                for (const event of events) {
+                    if (event.kind === "turnComplete") {
+                        tailer.sawTurnComplete = true;
+                        continue;
+                    }
+                    await this.submit({
+                        type: "mainStream",
+                        runtimeGeneration: tailer.runtimeGeneration,
+                        ownerThreadId: tailer.ownerThreadId,
+                        source: { providerEventId: null, providerEventType: "codex_rollout" },
+                        fact: event.kind === "message"
+                            ? { kind: "instantAgent", text: `${CODEX_MCP_MESSAGE_LABEL}\n\n${event.text}` }
+                            : { kind: "instantReasoning", text: `${CODEX_MCP_REASONING_LABEL}\n\n${event.text}` },
+                    });
+                }
+            });
+        })();
+        tailer.reading = reading;
+        try {
+            await reading;
+        }
+        finally {
+            if (tailer.reading === reading)
+                tailer.reading = undefined;
+        }
+    }
+    async finishCodexRolloutTailer(providerId) {
+        const tailer = this.codexMcpTailers.get(providerId);
+        if (!tailer)
+            return;
+        for (let attempt = 0; attempt < 3 && !tailer.stopped; attempt += 1) {
+            await this.drainCodexRollout(providerId, true).catch(() => undefined);
+            if (tailer.sawTurnComplete)
+                break;
+            await new Promise((resolve) => setTimeout(resolve, 250));
+        }
+        this.stopCodexRolloutTailer(providerId);
+    }
+    stopCodexRolloutTailer(providerId) {
+        const tailer = this.codexMcpTailers.get(providerId);
+        if (!tailer)
+            return;
+        tailer.stopped = true;
+        clearInterval(tailer.timer);
+        if (tailer.file)
+            this.codexRolloutClaims.delete(tailer.file);
+        this.codexMcpTailers.delete(providerId);
+    }
     async captureToolFileAfter(runtimeGeneration, providerId) {
         if (runtimeGeneration !== this.runtimeGeneration || this.interruptFence || this.dropLateFacts)
             return false;
@@ -6299,6 +6444,19 @@ export class ClaudeSession {
                 itemIds = [item.id];
                 break;
             }
+            case "instantReasoning": {
+                const item = { type: "reasoning", id: uuidv7(), summary: [fact.text], content: [] };
+                turn.items.push(item);
+                this.publishTurn(turn, "item/started", {
+                    item, threadId: state.ownerThreadId, turnId: turn.id, startedAtMs: Date.now(),
+                }, source);
+                this.publishTurn(turn, "item/reasoning/summaryTextDelta", {
+                    threadId: state.ownerThreadId, turnId: turn.id, itemId: item.id, delta: fact.text, summaryIndex: 0,
+                }, source);
+                this.completeStreamItem(turn, state, item.id, source);
+                itemIds = [item.id];
+                break;
+            }
             case "settle":
                 this.settleAgentMessages(turn, state, fact.phase, source);
                 break;
@@ -6431,8 +6589,10 @@ export class ClaudeSession {
             if (itemIds.has(id))
                 state.blockItems.delete(index);
         for (const [id, candidate] of state.tools)
-            if (itemIds.has(candidate.itemId))
+            if (itemIds.has(candidate.itemId)) {
                 state.tools.delete(id);
+                this.stopCodexRolloutTailer(id);
+            }
         for (const [id, task] of this.tasks)
             if (itemIds.has(task.itemId)) {
                 this.stopBackgroundTailer(task);
@@ -6535,6 +6695,8 @@ export class ClaudeSession {
     disposeRuntimeOperations() {
         for (const task of this.tasks.values())
             this.stopBackgroundTailer(task);
+        for (const providerId of [...this.codexMcpTailers.keys()])
+            this.stopCodexRolloutTailer(providerId);
         for (const state of this.scopes.values()) {
             for (const tool of state.tools.values())
                 delete tool.fileSnapshot;