yepanywhere 0.6.0 → 0.6.2

package/dist/sdk/providers/codex.js

@@ -6,18 +6,20 @@
  */
 import { execFile, spawn } from "node:child_process";
 import { homedir } from "node:os";
-import { promisify } from "node:util";
-import { HELPER_SIDE_MODEL_CHEAPEST, } from "../../../bundled/@yep-anywhere/shared/dist/index.js";
+import { CODEX_TOOL_CORRELATION_FIELD, createCodexToolCorrelation, } from "../../../bundled/@yep-anywhere/shared/dist/index.js";
 import { isCodexCorrelationDebugEnabled, logCodexCorrelationDebug, summarizeCodexNormalizedMessage, } from "../../codex/correlationDebugLogger.js";
-import { canonicalizeCodexToolName, isCodexBackgroundProcessOutput, isCodexInterruptedToolOutput, normalizeCodexCommandActionInvocation, normalizeCodexCommandExecutionOutput, normalizeCodexToolInvocation, normalizeCodexToolOutputWithContext, parseCodexToolArguments, } from "../../codex/normalization.js";
+import { canonicalizeCodexToolName, isCodexBackgroundProcessOutput, isCodexInterruptedToolOutput, normalizeCodexCommandExecutionOutput, normalizeCodexCustomToolInvocation, normalizeCodexToolInvocation, normalizeCodexToolOutputWithContext, parseCodexToolArguments, } from "../../codex/normalization.js";
 import { getLogger } from "../../logging/logger.js";
-import { findCodexCliPath } from "../cli-detection.js";
+import { findCodexCliPath, getCodexCliVersion } from "../cli-detection.js";
 import { logSDKMessage } from "../messageLogger.js";
 import { MessageQueue } from "../messageQueue.js";
 import { createAgentctlSessionEnvBridge } from "./agentctl-session-env.js";
+import { getFallbackCodexModelsForCliVersion, normalizeCodexModelList, normalizeSemver, } from "./codex-model-catalog.js";
+import { asCodexAgentMessageDeltaNotification, asCodexCommandExecutionOutputDeltaNotification, asCodexErrorNotification, asCodexFileChangeOutputDeltaNotification, asCodexItemCompletedNotification, asCodexItemStartedNotification, asCodexPlanDeltaNotification, asCodexRawResponseItemCompletedNotification, asCodexReasoningSummaryTextDeltaNotification, asCodexThreadTokenUsageUpdatedNotification, asCodexTurnCompletedNotification, isCodexLiveDeltaNotificationMethod, isCodexLiveDeltaSuppressionEnabled, } from "./codex-notification-guards.js";
+import { captureCodexSummaryTextFromNotification, captureCodexSummaryTextFromTurnItems, cleanCodexRecapText, cleanCodexSummaryText, CODEX_RECAP_TIMEOUT_MS, CODEX_SUMMARY_TIMEOUT_MS, createCodexForkSummaryPrompt, createCodexForkSummaryThreadResumeParams, createCodexRecapPrompt, joinCodexSummaryText, resolveCodexRecapHelperModel, } from "./codex-summary-helpers.js";
 import { CODEX_BUILTIN_COMMANDS } from "./staticSlashCommands.js";
 const log = getLogger().child({ component: "codex-provider" });
-const execFileAsync = promisify(execFile);
+const CODEX_DESKTOP_BROWSER_SKILL_NAME = "browser:control-in-app-browser";
 function logSdkCorrelationDebug(sessionId, message, metadata = {}) {
     if (!isCodexCorrelationDebugEnabled())
         return;
@@ -56,31 +58,8 @@ const MODEL_LIST_TIMEOUT_MS = 8000;
 const APP_SERVER_INIT_REQUEST_ID = 1;
 const APP_SERVER_MODEL_LIST_REQUEST_ID = 2;
 const APP_SERVER_SHUTDOWN_GRACE_MS = 1500;
-const CODEX_CLI_GPT55_MIN_VERSION = "0.124.0";
 const CODEX_FAILURE_TRACE_LIMIT = 12;
 const CODEX_FAILURE_PREVIEW_CHARS = 240;
-const CODEX_RECAP_TIMEOUT_MS = 20_000;
-const CODEX_SUMMARY_TIMEOUT_MS = 60_000;
-const CODEX_RECAP_MAX_TOTAL_CHARS = 6000;
-const CODEX_RECAP_CHEAPEST_MODEL_PREFERENCES = [
-    "gpt-5.4-mini",
-    "gpt-5.1-codex-mini",
-    "gpt-5.3-codex-spark",
-];
-const CODEX_DISABLE_LIVE_DELTAS_ENV = "YEP_CODEX_DISABLE_LIVE_DELTAS";
-const CODEX_LIVE_DELTA_NOTIFICATION_METHODS = new Set([
-    "item/agentMessage/delta",
-    "item/plan/delta",
-    "item/reasoning/summaryTextDelta",
-    "item/commandExecution/outputDelta",
-    "item/fileChange/outputDelta",
-]);
-function isCodexLiveDeltaSuppressionEnabled() {
-    return process.env[CODEX_DISABLE_LIVE_DELTAS_ENV] === "true";
-}
-function isCodexLiveDeltaNotificationMethod(method) {
-    return CODEX_LIVE_DELTA_NOTIFICATION_METHODS.has(method);
-}
 const CODEX_THINKING_OFF_MIN_REASONING_EFFORT_PREFIXES = [
     "gpt-5.3-codex-spark",
 ];
@@ -104,162 +83,6 @@ const CODEX_POLICY_OVERRIDES = {
 const DECLARE_CODEX_ORIGINATOR = false;
 const DECLARED_CODEX_ORIGINATOR = "Codex Desktop";
 const YEP_ANYWHERE_ORIGINATOR = "yep-anywhere";
-const PREFERRED_MODEL_ORDER = [
-    "gpt-5.5",
-    "gpt-5.4",
-    "gpt-5.4-mini",
-    "gpt-5.3-codex",
-    "gpt-5.3-codex-spark",
-    "gpt-5.2-codex",
-    "gpt-5.1-codex-max",
-    "gpt-5.2",
-    "gpt-5.1-codex-mini",
-];
-const FALLBACK_CODEX_MODELS = [
-    {
-        id: "gpt-5.5",
-        name: "GPT-5.5",
-        description: "Frontier model for complex coding, research, and real-world work.",
-        defaultReasoningEffort: "medium",
-        supportedReasoningEfforts: [
-            {
-                reasoningEffort: "low",
-                description: "Fast responses with lighter reasoning",
-            },
-            {
-                reasoningEffort: "medium",
-                description: "Balances speed and reasoning depth for everyday tasks",
-            },
-            {
-                reasoningEffort: "high",
-                description: "Greater reasoning depth for complex problems",
-            },
-            {
-                reasoningEffort: "xhigh",
-                description: "Extra high reasoning depth for complex problems",
-            },
-        ],
-        inputModalities: ["text", "image"],
-        supportsPersonality: true,
-        serviceTiers: [
-            {
-                id: "priority",
-                name: "Fast",
-                description: "1.5x speed, increased usage",
-            },
-        ],
-    },
-    {
-        id: "gpt-5.4",
-        name: "GPT-5.4",
-        description: "Strong model for everyday coding.",
-        isDefault: true,
-        defaultReasoningEffort: "medium",
-        supportedReasoningEfforts: [
-            {
-                reasoningEffort: "low",
-                description: "Fast responses with lighter reasoning",
-            },
-            {
-                reasoningEffort: "medium",
-                description: "Balances speed and reasoning depth for everyday tasks",
-            },
-            {
-                reasoningEffort: "high",
-                description: "Greater reasoning depth for complex problems",
-            },
-            {
-                reasoningEffort: "xhigh",
-                description: "Extra high reasoning depth for complex problems",
-            },
-        ],
-        inputModalities: ["text", "image"],
-        supportsPersonality: true,
-        serviceTiers: [
-            {
-                id: "priority",
-                name: "Fast",
-                description: "1.5x speed, increased usage",
-            },
-        ],
-    },
-    {
-        id: "gpt-5.4-mini",
-        name: "GPT-5.4-Mini",
-        description: "Small, fast, and cost-efficient model for simpler coding tasks.",
-        defaultReasoningEffort: "medium",
-        supportedReasoningEfforts: [
-            {
-                reasoningEffort: "low",
-                description: "Fast responses with lighter reasoning",
-            },
-            {
-                reasoningEffort: "medium",
-                description: "Balances speed and reasoning depth for everyday tasks",
-            },
-            {
-                reasoningEffort: "high",
-                description: "Greater reasoning depth for complex problems",
-            },
-            {
-                reasoningEffort: "xhigh",
-                description: "Extra high reasoning depth for complex problems",
-            },
-        ],
-        inputModalities: ["text", "image"],
-        supportsPersonality: true,
-    },
-    { id: "gpt-5.3-codex", name: "GPT-5.3-Codex" },
-    { id: "gpt-5.3-codex-spark", name: "GPT-5.3-Codex-Spark" },
-    { id: "gpt-5.2", name: "GPT-5.2" },
-];
-const LEGACY_FALLBACK_CODEX_MODELS = [
-    { id: "gpt-5.3-codex", name: "GPT-5.3-Codex" },
-    { id: "gpt-5.2-codex", name: "GPT-5.2-Codex" },
-    { id: "gpt-5.1-codex-max", name: "GPT-5.1-Codex-Max" },
-    { id: "gpt-5.2", name: "GPT-5.2" },
-    { id: "gpt-5.1-codex-mini", name: "GPT-5.1-Codex-Mini" },
-];
-function normalizeSemver(raw) {
-    if (!raw)
-        return null;
-    const match = raw.match(/(\d+)\.(\d+)\.(\d+)(?:-([\w.]+))?/);
-    if (!match)
-        return null;
-    const [, major, minor, patch, pre] = match;
-    return pre
-        ? `${major}.${minor}.${patch}-${pre}`
-        : `${major}.${minor}.${patch}`;
-}
-function compareSemver(a, b) {
-    const parsedA = splitSemver(a);
-    const parsedB = splitSemver(b);
-    for (let i = 0; i < 3; i++) {
-        const partA = parsedA.parts[i] ?? 0;
-        const partB = parsedB.parts[i] ?? 0;
-        if (partA !== partB)
-            return partA < partB ? -1 : 1;
-    }
-    if (parsedA.pre === null && parsedB.pre === null)
-        return 0;
-    if (parsedA.pre === null)
-        return 1;
-    if (parsedB.pre === null)
-        return -1;
-    return parsedA.pre < parsedB.pre ? -1 : parsedA.pre > parsedB.pre ? 1 : 0;
-}
-function splitSemver(version) {
-    const dashIndex = version.indexOf("-");
-    const core = dashIndex === -1 ? version : version.slice(0, dashIndex);
-    const pre = dashIndex === -1 ? null : version.slice(dashIndex + 1);
-    return {
-        parts: core.split(".").map((part) => {
-            const parsed = Number.parseInt(part, 10);
-            return Number.isFinite(parsed) ? parsed : 0;
-        }),
-        pre,
-    };
-}
 async function terminateChildProcess(child, graceMs = APP_SERVER_SHUTDOWN_GRACE_MS) {
     if (!child?.pid || child.killed || child.exitCode !== null) {
         return;
@@ -390,6 +213,9 @@ class CodexAppServerClient {
         this.env = env;
         this.shouldSuppressNotification = shouldSuppressNotification;
     }
+    get isClosed() {
+        return this.closed;
+    }
     setServerRequestHandler(handler) {
         this.onServerRequest = handler;
     }
@@ -598,6 +424,7 @@ class CodexAppServerClient {
             params: {
                 error: { message: error.message },
                 willRetry: false,
+                codexProcessExit: true,
             },
         });
         this.notifications.close(error);
@@ -724,7 +551,7 @@ export class CodexProvider {
     async getModelsFromAppServer() {
         try {
             const appServerModels = await this.requestAppServerModelList();
-            return this.normalizeModelList(appServerModels);
+            return normalizeCodexModelList(appServerModels);
         }
         catch (error) {
             log.debug({ error }, "Failed to query Codex app-server model list, using fallback models");
@@ -839,153 +666,20 @@ export class CodexProvider {
             })}\n`);
         });
     }
-    normalizeModelList(models) {
-        const orderLookup = new Map(PREFERRED_MODEL_ORDER.map((id, idx) => [id, idx]));
-        const deduped = new Map();
-        for (const [serverIndex, model] of models.entries()) {
-            if (model.hidden === true)
-                continue;
-            const modelId = (model.model || model.id || "").trim();
-            if (!modelId)
-                continue;
-            deduped.set(modelId, {
-                model: {
-                    id: modelId,
-                    name: this.formatModelName(model.displayName || modelId),
-                    description: model.description,
-                    ...(model.isDefault === true ? { isDefault: true } : {}),
-                    ...this.normalizeModelReasoningMetadata(model),
-                    ...(Array.isArray(model.inputModalities)
-                        ? { inputModalities: model.inputModalities }
-                        : {}),
-                    ...(typeof model.supportsPersonality === "boolean"
-                        ? { supportsPersonality: model.supportsPersonality }
-                        : {}),
-                    ...this.normalizeModelServiceTierMetadata(model),
-                },
-                serverIndex,
-            });
-            const upgradeId = model.upgrade?.trim() ||
-                (typeof model.upgradeInfo?.model === "string"
-                    ? model.upgradeInfo.model.trim()
-                    : "");
-            if (upgradeId && !deduped.has(upgradeId)) {
-                deduped.set(upgradeId, {
-                    model: {
-                        id: upgradeId,
-                        name: this.formatModelName(upgradeId),
-                    },
-                    serverIndex,
-                });
-            }
-        }
-        return [...deduped.values()]
-            .map((entry, index) => ({
-            model: entry.model,
-            index,
-            rank: this.getModelSortRank(entry.model, entry.serverIndex, orderLookup),
-        }))
-            .sort((a, b) => a.rank - b.rank || a.index - b.index)
-            .map((entry) => entry.model);
-    }
-    normalizeModelReasoningMetadata(model) {
-        const metadata = {};
-        if (typeof model.defaultReasoningEffort === "string") {
-            metadata.defaultReasoningEffort = model.defaultReasoningEffort;
-        }
-        if (Array.isArray(model.supportedReasoningEfforts)) {
-            const efforts = model.supportedReasoningEfforts
-                .map((effort) => {
-                if (typeof effort.reasoningEffort !== "string")
-                    return null;
-                return {
-                    reasoningEffort: effort.reasoningEffort,
-                    ...(typeof effort.description === "string"
-                        ? { description: effort.description }
-                        : {}),
-                };
-            })
-                .filter((effort) => effort !== null);
-            if (efforts.length > 0) {
-                metadata.supportedReasoningEfforts = efforts;
-            }
-        }
-        return metadata;
-    }
-    normalizeModelServiceTierMetadata(model) {
-        if (!Array.isArray(model.serviceTiers)) {
-            return {};
-        }
-        const serviceTiers = model.serviceTiers
-            .map((tier) => {
-            const id = typeof tier.id === "string" ? tier.id.trim() : "";
-            const name = typeof tier.name === "string" ? tier.name.trim() : "";
-            if (!id || !name)
-                return null;
-            return {
-                id,
-                name,
-                ...(typeof tier.description === "string"
-                    ? { description: tier.description }
-                    : {}),
-            };
-        })
-            .filter((tier) => tier !== null);
-        return serviceTiers.length > 0 ? { serviceTiers } : {};
-    }
-    getModelSortRank(model, serverIndex, orderLookup) {
-        if (model.id === "gpt-5.5") {
-            return 0;
-        }
-        if (model.isDefault) {
-            return 1;
-        }
-        const preferredRank = orderLookup.get(model.id);
-        if (preferredRank !== undefined) {
-            return 2 + preferredRank;
-        }
-        return 2 + PREFERRED_MODEL_ORDER.length + serverIndex;
-    }
     async getFallbackCodexModels() {
         const version = await this.getInstalledCodexCliVersion();
-        if (version && compareSemver(version, CODEX_CLI_GPT55_MIN_VERSION) < 0) {
-            return LEGACY_FALLBACK_CODEX_MODELS;
-        }
-        return FALLBACK_CODEX_MODELS;
+        return getFallbackCodexModelsForCliVersion(version);
     }
     async getInstalledCodexCliVersion() {
         try {
             const codexCommand = await this.resolveCodexCommand();
-            const { stdout } = await execFileAsync(codexCommand, ["--version"], {
-                encoding: "utf-8",
-                timeout: 3000,
-            });
-            return normalizeSemver(stdout);
+            const version = await getCodexCliVersion(codexCommand);
+            return normalizeSemver(version);
         }
         catch {
             return null;
         }
     }
-    formatModelName(value) {
-        return value
-            .trim()
-            .split("-")
-            .map((part) => {
-            const lower = part.toLowerCase();
-            if (lower === "gpt")
-                return "GPT";
-            if (lower === "codex")
-                return "Codex";
-            if (lower === "mini")
-                return "Mini";
-            if (lower === "max")
-                return "Max";
-            if (lower.length === 0)
-                return "";
-            return lower.charAt(0).toUpperCase() + lower.slice(1);
-        })
-            .join("-");
-    }
     mapEffortToReasoningEffort(effort, thinking, model) {
         if (thinking?.type === "disabled") {
             const normalizedModel = model?.trim().toLowerCase();
@@ -1436,10 +1130,13 @@ export class CodexProvider {
                     turnResult.turn.error?.message) {
                     yield {
                         type: "error",
+                        uuid: `codex-error-${turnResult.turn.id}`,
                         session_id: sessionId,
                         error: turnResult.turn.error.message,
                         codexErrorInfo: turnResult.turn.error.codexErrorInfo ?? null,
                         codexAdditionalDetails: turnResult.turn.error.additionalDetails ?? null,
+                        codexWillRetry: false,
+                        codexTurnId: turnResult.turn.id,
                         codexFailureTrace: this.snapshotCodexFailureTrace(failureTrace),
                         codexFailureSummary: this.formatCodexFailureTrace(failureTrace),
                         codexRequestId: this.extractOpenAIRequestId(turnResult.turn.error, turnResult.turn.error.additionalDetails, turnResult.turn.error.message),
@@ -1455,8 +1152,16 @@ export class CodexProvider {
             const codexFailureTrace = this.snapshotCodexFailureTrace(failureTrace);
             log.error({ error, codexFailureTrace }, "Error in codex app-server session");
             if (!signal.aborted) {
+                const isProcessFailure = appServer.isClosed;
                 yield {
                     type: "error",
+                    ...(isProcessFailure
+                        ? {
+                            uuid: `codex-error-${sessionId || "unknown"}-process-exit`,
+                            codexWillRetry: false,
+                            codexErrorScope: "app_server_process",
+                        }
+                        : {}),
                     session_id: sessionId,
                     error: error instanceof Error ? error.message : String(error),
                     codexFailureTrace,
@@ -1491,18 +1196,24 @@ export class CodexProvider {
     }
     isTurnTerminalNotification(notification, turnId) {
         if (notification.method === "turn/completed") {
-            const params = this.asTurnCompletedNotification(notification.params);
+            const params = asCodexTurnCompletedNotification(notification.params);
             return params?.turn.id === turnId;
         }
         if (notification.method === "error") {
-            const params = this.asErrorNotification(notification.params);
-            return params?.turnId === turnId && !params.willRetry;
+            const params = asCodexErrorNotification(notification.params);
+            if (params) {
+                return params.turnId === turnId && !params.willRetry;
+            }
+            const rawParams = notification.params && typeof notification.params === "object"
+                ? notification.params
+                : null;
+            return (rawParams?.codexProcessExit === true && rawParams.willRetry === false);
         }
         return false;
     }
     updateBackgroundProcessTracking(notification, runtimeState) {
         if (notification.method === "rawResponseItem/completed") {
-            const params = this.asRawResponseItemCompletedNotification(notification.params);
+            const params = asCodexRawResponseItemCompletedNotification(notification.params);
             const item = params?.item && typeof params.item === "object"
                 ? params.item
                 : null;
@@ -1530,7 +1241,7 @@ export class CodexProvider {
             return;
         }
         if (notification.method === "item/completed") {
-            const params = this.asItemCompletedNotification(notification.params);
+            const params = asCodexItemCompletedNotification(notification.params);
             if (!params)
                 return;
             const normalized = this.normalizeThreadItem(params.item);
@@ -1541,7 +1252,7 @@ export class CodexProvider {
             return;
         }
         if (notification.method === "item/started") {
-            const params = this.asItemStartedNotification(notification.params);
+            const params = asCodexItemStartedNotification(notification.params);
             if (!params)
                 return;
             const normalized = this.normalizeThreadItem(params.item);
@@ -1605,7 +1316,7 @@ export class CodexProvider {
             threadId: options.sessionId,
             cwd: options.cwd,
             ...this.buildThreadPermissionParams(policy),
-            config: null,
+            config: this.buildThreadConfigOverrides({}),
         };
         if (experimentalApiEnabled) {
             params.excludeTurns = true;
@@ -1673,11 +1384,25 @@ export class CodexProvider {
         };
     }
     buildThreadConfigOverrides(options) {
+        // The OpenAI browser plugin controls a desktop-owned browser backend that
+        // YA's Codex app-server host does not provide. Suppress the unavailable
+        // skill at thread scope so Codex follows YA's Playwright fallback instead
+        // of advertising a browser that fails during backend discovery.
+        const config = {
+            skills: {
+                config: [
+                    {
+                        name: CODEX_DESKTOP_BROWSER_SKILL_NAME,
+                        enabled: false,
+                    },
+                ],
+            },
+        };
         const reasoningEffort = this.mapEffortToReasoningEffort(options.effort, options.thinking, options.model);
-        if (!reasoningEffort) {
-            return null;
+        if (reasoningEffort) {
+            config.model_reasoning_effort = reasoningEffort;
         }
-        return { model_reasoning_effort: reasoningEffort };
+        return config;
     }
     createTurnStartParams(threadId, userPrompt, options, turnPolicy = null) {
         return {
@@ -1712,8 +1437,8 @@ export class CodexProvider {
         }
     }
     async generateSideSessionRecap(recentAssistantText, requestedModel) {
-        const userPrompt = this.createRecapPrompt(recentAssistantText);
-        const model = await this.resolveRecapHelperModel(requestedModel);
+        const userPrompt = createCodexRecapPrompt(recentAssistantText);
+        const model = await resolveCodexRecapHelperModel(requestedModel, () => this.getAvailableModels());
         const codexCommand = await this.resolveCodexCommand();
         const abortController = new AbortController();
         let timedOut = false;
@@ -1745,18 +1470,19 @@ export class CodexProvider {
                 summary: "auto",
             });
             const textByItemId = new Map();
-            this.captureRecapTextFromTurnItems(turnResult.turn.items, textByItemId);
+            const normalizeThreadItem = this.normalizeThreadItem.bind(this);
+            captureCodexSummaryTextFromTurnItems(turnResult.turn.items, textByItemId, normalizeThreadItem);
             if (turnResult.turn.status === "failed") {
                 throw new Error(turnResult.turn.error?.message ?? "Codex recap generation failed");
             }
             let turnComplete = turnResult.turn.status !== "inProgress";
             while (!turnComplete && !abortController.signal.aborted) {
                 const notification = await appServer.nextNotification(abortController.signal);
-                this.captureRecapTextFromNotification(notification, textByItemId);
+                captureCodexSummaryTextFromNotification(notification, textByItemId, normalizeThreadItem);
                 if (notification.method !== "turn/completed") {
                     continue;
                 }
-                const completed = this.asTurnCompletedNotification(notification.params);
+                const completed = asCodexTurnCompletedNotification(notification.params);
                 if (completed?.turn.status === "failed") {
                     throw new Error(completed.turn.error?.message ?? "Codex recap generation failed");
                 }
@@ -1765,10 +1491,7 @@ export class CodexProvider {
             if (abortController.signal.aborted) {
                 throw new Error("Timed out generating Codex recap");
             }
-            const cleaned = [...textByItemId.values()]
-                .join("\n")
-                .replace(/\s*\(disable recaps in \/config\)\s*$/u, "")
-                .trim();
+            const cleaned = cleanCodexRecapText(joinCodexSummaryText(textByItemId));
             if (!cleaned) {
                 throw new Error("Recap generation returned empty text");
             }
@@ -1786,46 +1509,8 @@ export class CodexProvider {
             await appServer.close();
         }
     }
-    createRecapPrompt(recentAssistantText) {
-        const trimmed = recentAssistantText
-            .map((text) => text.trim())
-            .filter((text) => text.length > 0);
-        if (trimmed.length === 0) {
-            throw new Error("No recent assistant text to summarize");
-        }
-        let total = 0;
-        const tail = [];
-        for (let i = trimmed.length - 1; i >= 0; i--) {
-            const entry = trimmed[i] ?? "";
-            if (total + entry.length > CODEX_RECAP_MAX_TOTAL_CHARS) {
-                break;
-            }
-            tail.unshift(entry);
-            total += entry.length;
-        }
-        if (tail.length === 0) {
-            const last = trimmed[trimmed.length - 1] ?? "";
-            tail.push(last.slice(-CODEX_RECAP_MAX_TOTAL_CHARS));
-        }
-        const transcript = tail
-            .map((text, index) => `--- Assistant turn ${index + 1} ---\n${text}`)
-            .join("\n\n");
-        return [
-            "The user stepped away and is coming back. Recap in under 40 words,",
-            "1-2 plain sentences, no markdown. Lead with the overall thrust of what",
-            "the assistant did or is doing; mention any pending next action.",
-            "Do not greet, do not ask a question, do not add a sign-off.",
-            "",
-            "Recent assistant output:",
-            transcript,
-        ].join("\n");
-    }
     async generateForkBackedSummary(request) {
-        const userPrompt = request.purpose === "session-retitle"
-            ? this.createSessionRetitlePrompt(request)
-            : request.purpose === "recap"
-                ? this.createForkedRecapPrompt()
-                : this.createForkAfterSummaryPrompt(request);
+        const userPrompt = createCodexForkSummaryPrompt(request);
         const codexCommand = await this.resolveCodexCommand();
         const appServer = new CodexAppServerClient(codexCommand, request.cwd, this.getCodexEnv());
         const abortController = new AbortController();
@@ -1856,7 +1541,7 @@ export class CodexProvider {
             await appServer.connect();
             const experimentalApiEnabled = await this.initializeAppServer(appServer);
             appServer.notify("initialized");
-            const threadResult = await appServer.request("thread/resume", this.createForkSummaryThreadResumeParams(request, experimentalApiEnabled));
+            const threadResult = await appServer.request("thread/resume", createCodexForkSummaryThreadResumeParams(request, experimentalApiEnabled));
             const threadId = threadResult.thread.id || request.generatorSessionId;
             const turnResult = await appServer.request("turn/start", {
                 threadId,
@@ -1866,7 +1551,8 @@ export class CodexProvider {
                 approvalPolicy: "untrusted",
             });
             const textByItemId = new Map();
-            this.captureRecapTextFromTurnItems(turnResult.turn.items, textByItemId);
+            const normalizeThreadItem = this.normalizeThreadItem.bind(this);
+            captureCodexSummaryTextFromTurnItems(turnResult.turn.items, textByItemId, normalizeThreadItem);
             if (turnResult.turn.status === "failed") {
                 throw new Error(turnResult.turn.error?.message ?? "Codex summary generation failed");
             }
@@ -1874,13 +1560,13 @@ export class CodexProvider {
             let turnComplete = turnResult.turn.status !== "inProgress";
             while (!turnComplete && !abortController.signal.aborted) {
                 const notification = await appServer.nextNotification(abortController.signal);
-                this.captureRecapTextFromNotification(notification, textByItemId);
+                captureCodexSummaryTextFromNotification(notification, textByItemId, normalizeThreadItem);
                 if (notification.method === "turn/completed") {
-                    const completed = this.asTurnCompletedNotification(notification.params);
+                    const completed = asCodexTurnCompletedNotification(notification.params);
                     if (completed?.turn.id !== turnId) {
                         continue;
                     }
-                    this.captureRecapTextFromTurnItems(completed.turn.items, textByItemId);
+                    captureCodexSummaryTextFromTurnItems(completed.turn.items, textByItemId, normalizeThreadItem);
                     if (completed.turn.status === "failed") {
                         throw new Error(completed.turn.error?.message ??
                             "Codex summary generation failed");
@@ -1889,7 +1575,7 @@ export class CodexProvider {
                     continue;
                 }
                 if (notification.method === "error") {
-                    const error = this.asErrorNotification(notification.params);
+                    const error = asCodexErrorNotification(notification.params);
                     if (error?.turnId === turnId && !error.willRetry) {
                         throw new Error(error.error.message ?? "Codex summary generation failed");
                     }
@@ -1901,7 +1587,7 @@ export class CodexProvider {
                 }
                 throw new Error("Timed out generating Codex summary");
             }
-            const cleaned = [...textByItemId.values()].join("\n").trim();
+            const cleaned = cleanCodexSummaryText(joinCodexSummaryText(textByItemId));
             if (!cleaned) {
                 throw new Error("Summary generation returned empty text");
             }
@@ -1923,84 +1609,6 @@ export class CodexProvider {
             await appServer.close();
         }
     }
-    createForkSummaryThreadResumeParams(request, experimentalApiEnabled = false) {
-        const params = {
-            threadId: request.generatorSessionId,
-            model: null,
-            cwd: request.cwd,
-            approvalPolicy: "untrusted",
-            sandbox: "read-only",
-            config: null,
-            developerInstructions: request.purpose === "session-retitle"
-                ? "You are a title helper. Reply with the session title only, no preamble. Do not call tools."
-                : request.purpose === "recap"
-                    ? "You are a recap helper. Reply with the recap text only, no preamble. Do not call tools."
-                    : "You are a handoff summary helper. Reply with the summary text only, no preamble. Do not call tools.",
-        };
-        if (experimentalApiEnabled) {
-            params.excludeTurns = true;
-        }
-        return params;
-    }
-    createForkAfterSummaryPrompt(request) {
-        const instructions = request.instructions?.trim();
-        const boundaryContext = request.afterTurnContext?.trim();
-        return [
-            "The first non-empty line must be a concise title of at most 120 characters, with no trailing period.",
-            "Write it as: Title: <title>",
-            "Then leave one blank line before the handoff summary.",
-            "",
-            "Summarize the useful state after the retained fork boundary for a peer-agent handoff.",
-            `The target fork retains the conversation through completed-turn message id ${request.afterTurnMessageId}.`,
-            boundaryContext
-                ? `The retained boundary is the completed turn ending with this excerpt:\n${boundaryContext}`
-                : undefined,
-            "The target fork already includes the original request and the assistant/tool work through that selected completed turn.",
-            "Do not repeat setup, instruction loading, initial repository orientation, or investigation already present in that retained prefix.",
-            "Preserve decisions, constraints, current state, changed files, verification evidence, open risks, and the next useful action.",
-            "Do not continue the task. Write text that can be submitted as the next user turn in the target fork.",
-            instructions ? "" : undefined,
-            instructions ? "Additional user instructions:" : undefined,
-            instructions || undefined,
-        ]
-            .filter((part) => part !== undefined)
-            .join("\n");
-    }
-    createForkedRecapPrompt() {
-        return [
-            "The user stepped away and is coming back.",
-            "Recap the current session state in under 40 words, 1-2 plain sentences, no markdown.",
-            "Lead with what the assistant did or is doing; mention any pending next action.",
-            "Do not greet, do not ask a question, do not add a sign-off.",
-        ].join("\n");
-    }
-    createSessionRetitlePrompt(request) {
-        const lengthTarget = request.lengthTarget ?? 80;
-        const currentTitle = request.currentTitle?.trim();
-        return [
-            "What is a good new title for this session?",
-            "",
-            `Target length: under ${lengthTarget} characters.`,
-            currentTitle ? `Current title: ${currentTitle}` : undefined,
-            "Prefer a concrete task/result phrase over a generic chat title.",
-            "Return only the title. Do not quote it. Do not add a trailing period.",
-        ]
-            .filter((part) => part !== undefined)
-            .join("\n");
-    }
-    async resolveRecapHelperModel(requestedModel) {
-        if (!requestedModel || requestedModel !== HELPER_SIDE_MODEL_CHEAPEST) {
-            return requestedModel ?? null;
-        }
-        const models = await this.getAvailableModels();
-        for (const preferred of CODEX_RECAP_CHEAPEST_MODEL_PREFERENCES) {
-            if (models.some((model) => model.id === preferred)) {
-                return preferred;
-            }
-        }
-        return (models.find((model) => model.id.toLowerCase().includes("mini"))?.id ??
-            null);
-    }
     handleRecapServerRequest(request) {
         return this.handleNonTurnServerRequest(request, "recap helper");
     }
@@ -2029,63 +1637,6 @@ export class CodexProvider {
                 return Promise.resolve({});
         }
     }
-    captureRecapTextFromTurnItems(items, textByItemId) {
-        for (const item of items) {
-            const normalized = this.normalizeThreadItem(item);
-            if (normalized?.type === "agent_message" && normalized.text.trim()) {
-                textByItemId.set(normalized.id, normalized.text);
-            }
-        }
-    }
-    captureRecapTextFromNotification(notification, textByItemId) {
-        if (notification.method === "item/agentMessage/delta") {
-            const params = this.asAgentMessageDeltaNotification(notification.params);
-            if (!params?.delta)
-                return;
-            textByItemId.set(params.itemId, `${textByItemId.get(params.itemId) ?? ""}${params.delta}`);
-            return;
-        }
-        if (notification.method === "item/completed") {
-            const params = this.asItemCompletedNotification(notification.params);
-            if (!params || textByItemId.has(params.item.id))
-                return;
-            const normalized = this.normalizeThreadItem(params.item);
-            if (normalized?.type === "agent_message" && normalized.text.trim()) {
-                textByItemId.set(normalized.id, normalized.text);
-            }
-            return;
-        }
-        if (notification.method !== "rawResponseItem/completed") {
-            return;
-        }
-        const params = this.asRawResponseItemCompletedNotification(notification.params);
-        const text = this.extractRawResponseMessageText(params?.item);
-        if (params && text) {
-            textByItemId.set(`raw-${params.turnId}-${textByItemId.size}`, text);
-        }
-    }
-    extractRawResponseMessageText(item) {
-        if (!item || typeof item !== "object")
-            return null;
-        const record = item;
-        if (record.type !== "message" || record.role !== "assistant") {
-            return null;
-        }
-        if (!Array.isArray(record.content)) {
-            return null;
-        }
-        const parts = record.content
-            .map((contentItem) => {
-            if (!contentItem || typeof contentItem !== "object")
-                return "";
-            const contentRecord = contentItem;
-            return contentRecord.type === "output_text"
-                ? (this.getOptionalString(contentRecord.text) ?? "")
-                : "";
-        })
-            .filter((text) => text.length > 0);
-        return parts.length > 0 ? parts.join("\n") : null;
-    }
     createSessionConfigAckMessage(sessionId, model, requestedModel, reasoningEffort, requestedReasoningEffort) {
         const parts = [];
         const normalizedModel = typeof model === "string" ? model.trim() : "";
@@ -2184,8 +1735,8 @@ export class CodexProvider {
             case "item/started":
             case "item/completed": {
                 const params = notification.method === "item/started"
-                    ? this.asItemStartedNotification(notification.params)
-                    : this.asItemCompletedNotification(notification.params);
+                    ? asCodexItemStartedNotification(notification.params)
+                    : asCodexItemCompletedNotification(notification.params);
                 const item = params?.item && typeof params.item === "object"
                     ? params.item
                     : null;
@@ -2224,7 +1775,7 @@ export class CodexProvider {
                 });
             }
             case "rawResponseItem/completed": {
-                const params = this.asRawResponseItemCompletedNotification(notification.params);
+                const params = asCodexRawResponseItemCompletedNotification(notification.params);
                 const item = params?.item && typeof params.item === "object"
                     ? params.item
                     : null;
@@ -2250,7 +1801,7 @@ export class CodexProvider {
                 });
             }
             case "turn/completed": {
-                const params = this.asTurnCompletedNotification(notification.params);
+                const params = asCodexTurnCompletedNotification(notification.params);
                 return base({
                     sourceEvent: notification.method,
                     turnId: params?.turn.id,
@@ -2263,15 +1814,22 @@ export class CodexProvider {
                 });
             }
             case "error": {
-                const params = this.asErrorNotification(notification.params);
+                const params = asCodexErrorNotification(notification.params);
                 const fallbackError = this.extractErrorRecord(notification.params);
+                const rawParams = notification.params && typeof notification.params === "object"
+                    ? notification.params
+                    : null;
+                const willRetry = params?.willRetry ??
+                    (typeof rawParams?.willRetry === "boolean"
+                        ? rawParams.willRetry
+                        : false);
                 const errorMessage = params?.error.message ??
                     this.getOptionalString(fallbackError?.message) ??
                     "Codex turn failed";
                 return base({
                     sourceEvent: notification.method,
                     turnId: params?.turnId,
-                    phase: params?.willRetry ? "retrying" : "terminal",
+                    phase: willRetry ? "retrying" : "terminal",
                     errorMessage,
                     codexErrorInfo: params?.error.codexErrorInfo ??
                         fallbackError?.codexErrorInfo ??
@@ -2422,7 +1980,7 @@ export class CodexProvider {
         return `${trimmed.slice(0, CODEX_FAILURE_PREVIEW_CHARS)}...`;
     }
     extractTurnUsage(params) {
-        const notification = this.asThreadTokenUsageUpdatedNotification(params);
+        const notification = asCodexThreadTokenUsageUpdatedNotification(params);
         if (!notification)
             return null;
         return {
@@ -2679,7 +2237,7 @@ export class CodexProvider {
                 return [message];
             }
             case "turn/completed": {
-                const params = this.asTurnCompletedNotification(notification.params);
+                const params = asCodexTurnCompletedNotification(notification.params);
                 const turnId = params?.turn.id ?? null;
                 const turnStatus = params?.turn.status;
                 const usage = turnId ? usageByTurnId.get(turnId) : undefined;
@@ -2756,20 +2314,37 @@ export class CodexProvider {
                 return messages;
             }
             case "error": {
-                const params = this.asErrorNotification(notification.params);
-                const errorMessage = params?.error.message;
+                const params = asCodexErrorNotification(notification.params);
+                const rawParams = notification.params && typeof notification.params === "object"
+                    ? notification.params
+                    : null;
+                const fallbackError = this.extractErrorRecord(notification.params);
+                const errorMessage = params?.error.message ??
+                    this.getOptionalString(fallbackError?.message);
+                const willRetry = params?.willRetry ??
+                    (typeof rawParams?.willRetry === "boolean"
+                        ? rawParams.willRetry
+                        : false);
+                const isProcessExit = rawParams?.codexProcessExit === true;
                 const message = (typeof errorMessage === "string" && errorMessage) ||
-                    (typeof notification.params?.message ===
-                        "string"
-                        ? notification.params.message
+                    (typeof rawParams?.message === "string"
+                        ? rawParams.message
                         : "Codex turn failed");
                 const errorEvent = {
                     type: "error",
+                    uuid: params?.turnId
+                        ? `codex-error-${params.turnId}`
+                        : `codex-error-${sessionId}-${Date.now()}`,
                     session_id: sessionId,
                     error: message,
-                    codexErrorInfo: params?.error.codexErrorInfo ?? null,
-                    codexAdditionalDetails: params?.error.additionalDetails ?? null,
-                    codexWillRetry: params?.willRetry ?? false,
+                    codexErrorInfo: params?.error.codexErrorInfo ??
+                        fallbackError?.codexErrorInfo ??
+                        null,
+                    codexAdditionalDetails: params?.error.additionalDetails ??
+                        this.getOptionalString(fallbackError?.additionalDetails) ??
+                        null,
+                    codexWillRetry: willRetry,
+                    codexErrorScope: isProcessExit ? "app_server_process" : "turn",
                     codexThreadId: params?.threadId,
                     codexTurnId: params?.turnId,
                     codexRequestId: this.extractOpenAIRequestId(notification.params, params?.error, message),
@@ -2784,8 +2359,8 @@ export class CodexProvider {
             case "item/started":
             case "item/completed": {
                 const params = notification.method === "item/started"
-                    ? this.asItemStartedNotification(notification.params)
-                    : this.asItemCompletedNotification(notification.params);
+                    ? asCodexItemStartedNotification(notification.params)
+                    : asCodexItemCompletedNotification(notification.params);
                 if (!params)
                     return [];
                 const normalized = this.normalizeThreadItem(params.item);
@@ -2805,7 +2380,7 @@ export class CodexProvider {
                 return messages;
             }
             case "item/agentMessage/delta": {
-                const params = this.asAgentMessageDeltaNotification(notification.params);
+                const params = asCodexAgentMessageDeltaNotification(notification.params);
                 if (!params?.delta)
                     return [];
                 return [
@@ -2813,7 +2388,7 @@ export class CodexProvider {
                 ];
             }
             case "item/plan/delta": {
-                const params = this.asPlanDeltaNotification(notification.params);
+                const params = asCodexPlanDeltaNotification(notification.params);
                 if (!params?.delta)
                     return [];
                 return [
@@ -2821,7 +2396,7 @@ export class CodexProvider {
                 ];
             }
             case "item/reasoning/summaryTextDelta": {
-                const params = this.asReasoningSummaryTextDeltaNotification(notification.params);
+                const params = asCodexReasoningSummaryTextDeltaNotification(notification.params);
                 if (!params?.delta)
                     return [];
                 return [
@@ -2829,7 +2404,7 @@ export class CodexProvider {
                 ];
             }
             case "item/commandExecution/outputDelta": {
-                const params = this.asCommandExecutionOutputDeltaNotification(notification.params);
+                const params = asCodexCommandExecutionOutputDeltaNotification(notification.params);
                 if (!params?.delta)
                     return [];
                 return [
@@ -2837,7 +2412,7 @@ export class CodexProvider {
                 ];
             }
             case "item/fileChange/outputDelta": {
-                const params = this.asFileChangeOutputDeltaNotification(notification.params);
+                const params = asCodexFileChangeOutputDeltaNotification(notification.params);
                 if (!params?.delta)
                     return [];
                 return [
@@ -2845,7 +2420,7 @@ export class CodexProvider {
                 ];
             }
             case "rawResponseItem/completed": {
-                const params = this.asRawResponseItemCompletedNotification(notification.params);
+                const params = asCodexRawResponseItemCompletedNotification(notification.params);
                 if (!params)
                     return [];
                 return this.convertRawResponseItemToSDKMessages(params, sessionId, liveEventState);
@@ -2885,6 +2460,7 @@ export class CodexProvider {
                     : Array.isArray(itemRecord.command_actions)
                         ? itemRecord.command_actions
                         : undefined) ?? undefined;
+                const cwd = this.getOptionalString(itemRecord.cwd);
                 return {
                     id,
                     type: "command_execution",
@@ -2895,7 +2471,11 @@ export class CodexProvider {
                     exit_code: this.getOptionalNumber(itemRecord.exit_code) ??
                         this.getOptionalNumber(itemRecord.exitCode) ??
                         undefined,
+                    durationMs: this.getOptionalNumber(itemRecord.duration_ms) ??
+                        this.getOptionalNumber(itemRecord.durationMs) ??
+                        undefined,
                     status: this.normalizeStatus(itemRecord.status),
+                    ...(cwd ? { cwd } : {}),
                     ...(commandActions ? { commandActions } : {}),
                 };
             }
@@ -3072,52 +2652,6 @@ export class CodexProvider {
             return "unknown";
         return status.replace(/[A-Z]/g, (m) => `_${m.toLowerCase()}`);
     }
-    asTurnCompletedNotification(params) {
-        if (!params || typeof params !== "object")
-            return null;
-        const record = params;
-        if (typeof record.threadId !== "string" ||
-            !record.turn ||
-            typeof record.turn !== "object" ||
-            typeof record.turn.id !== "string") {
-            return null;
-        }
-        return params;
-    }
-    asErrorNotification(params) {
-        if (!params || typeof params !== "object")
-            return null;
-        const record = params;
-        if (typeof record.threadId !== "string" ||
-            typeof record.turnId !== "string" ||
-            typeof record.willRetry !== "boolean" ||
-            !record.error ||
-            typeof record.error !== "object" ||
-            typeof record.error.message !== "string") {
-            return null;
-        }
-        return params;
-    }
-    asThreadTokenUsageUpdatedNotification(params) {
-        if (!params || typeof params !== "object")
-            return null;
-        const record = params;
-        const tokenUsage = record.tokenUsage && typeof record.tokenUsage === "object"
-            ? record.tokenUsage
-            : null;
-        const last = tokenUsage?.last && typeof tokenUsage.last === "object"
-            ? tokenUsage.last
-            : null;
-        if (typeof record.threadId !== "string" ||
-            typeof record.turnId !== "string" ||
-            !last ||
-            typeof last.inputTokens !== "number" ||
-            typeof last.outputTokens !== "number" ||
-            typeof last.cachedInputTokens !== "number") {
-            return null;
-        }
-        return params;
-    }
     asCommandExecutionRequestApprovalParams(params) {
         if (!params || typeof params !== "object")
             return null;
@@ -3166,116 +2700,17 @@ export class CodexProvider {
         }
         return params;
     }
-    asItemStartedNotification(params) {
-        if (!params || typeof params !== "object")
-            return null;
-        const record = params;
-        if (typeof record.threadId !== "string" ||
-            typeof record.turnId !== "string" ||
-            !record.item ||
-            typeof record.item !== "object") {
-            return null;
-        }
-        return params;
-    }
-    asItemCompletedNotification(params) {
-        if (!params || typeof params !== "object")
-            return null;
-        const record = params;
-        if (typeof record.threadId !== "string" ||
-            typeof record.turnId !== "string" ||
-            !record.item ||
-            typeof record.item !== "object") {
-            return null;
-        }
-        return params;
-    }
-    asAgentMessageDeltaNotification(params) {
-        if (!params || typeof params !== "object")
-            return null;
-        const record = params;
-        if (typeof record.threadId !== "string" ||
-            typeof record.turnId !== "string" ||
-            typeof record.itemId !== "string" ||
-            typeof record.delta !== "string") {
-            return null;
-        }
-        return params;
-    }
-    asPlanDeltaNotification(params) {
-        if (!params || typeof params !== "object")
-            return null;
-        const record = params;
-        if (typeof record.threadId !== "string" ||
-            typeof record.turnId !== "string" ||
-            typeof record.itemId !== "string" ||
-            typeof record.delta !== "string") {
-            return null;
-        }
-        return params;
-    }
-    asReasoningSummaryTextDeltaNotification(params) {
-        if (!params || typeof params !== "object")
-            return null;
-        const record = params;
-        if (typeof record.threadId !== "string" ||
-            typeof record.turnId !== "string" ||
-            typeof record.itemId !== "string" ||
-            typeof record.delta !== "string" ||
-            typeof record.summaryIndex !== "number") {
-            return null;
-        }
-        return params;
-    }
-    asCommandExecutionOutputDeltaNotification(params) {
-        if (!params || typeof params !== "object")
-            return null;
-        const record = params;
-        if (typeof record.threadId !== "string" ||
-            typeof record.turnId !== "string" ||
-            typeof record.itemId !== "string" ||
-            typeof record.delta !== "string") {
-            return null;
-        }
-        return params;
-    }
-    asFileChangeOutputDeltaNotification(params) {
-        if (!params || typeof params !== "object")
-            return null;
-        const record = params;
-        if (typeof record.threadId !== "string" ||
-            typeof record.turnId !== "string" ||
-            typeof record.itemId !== "string" ||
-            typeof record.delta !== "string") {
-            return null;
-        }
-        return params;
-    }
-    asRawResponseItemCompletedNotification(params) {
-        if (!params || typeof params !== "object")
-            return null;
-        const record = params;
-        if (typeof record.threadId !== "string" ||
-            typeof record.turnId !== "string" ||
-            !record.item ||
-            typeof record.item !== "object" ||
-            typeof record.item.type !== "string") {
-            return null;
-        }
-        return params;
-    }
     buildItemEventKey(turnId, itemId) {
         return `${turnId}:${itemId}`;
     }
     buildItemMessageUuid(turnId, itemId) {
         return `${itemId}-${turnId}`;
     }
-    // Tool items carry Codex's globally-unique call_id as their thread item id,
-    // and the durable rollout persists the same call_id on the matching response
-    // item. Key the rendered uuid on call_id alone (no turn scoping — call_id is
-    // already unique) so the streamed message and its durable backfill row share
-    // a uuid and dedup by id instead of the content+timestamp backstop. See
-    // topics/stream-durable-id-dedup.md (Codex tool calls).
+    // Native tool thread items carry Codex's globally-unique call_id as item.id,
+    // so this uuid aligns directly with the durable response item. A code-mode
+    // commandExecution instead carries an inner exec-* id while rollout stores
+    // the outer call_* id; the client reconciles that scoped exception via
+    // _codexToolCorrelation. See topics/stream-durable-id-dedup.md.
     buildItemToolUuid(callId) {
         return callId;
     }
@@ -3373,6 +2808,11 @@ export class CodexProvider {
             session_id: sessionId,
             uuid: this.buildItemResultUuid(itemId),
             _isStreaming: true,
+            ...(sourceEvent === "command_output_delta"
+                ? {
+                    [CODEX_TOOL_CORRELATION_FIELD]: createCodexToolCorrelation("command_execution", turnId, itemId),
+                }
+                : {}),
             message: {
                 role: "user",
                 content: [
@@ -3433,6 +2873,9 @@ export class CodexProvider {
                                 id: callId,
                                 name: normalizedInvocation.toolName,
                                 input: normalizedInvocation.input,
+                                ...(normalizedInvocation.displayActions
+                                    ? { _displayActions: normalizedInvocation.displayActions }
+                                    : {}),
                             },
                         ],
                     },
@@ -3493,7 +2936,7 @@ export class CodexProvider {
                 const input = this.getOptionalString(item.input);
                 if (!callId || !rawToolName)
                     return [];
-                const normalizedInvocation = normalizeCodexToolInvocation(canonicalizeCodexToolName(rawToolName), parseCodexToolArguments(input ?? undefined));
+                const normalizedInvocation = normalizeCodexCustomToolInvocation(rawToolName, input ?? "");
                 liveEventState.toolCallContexts.set(callId, {
                     toolName: normalizedInvocation.toolName,
                     input: normalizedInvocation.input,
@@ -3505,6 +2948,7 @@ export class CodexProvider {
                     type: "assistant",
                     session_id: sessionId,
                     uuid: this.buildItemToolUuid(callId),
+                    [CODEX_TOOL_CORRELATION_FIELD]: createCodexToolCorrelation("custom_tool_call", params.turnId, callId),
                     message: {
                         role: "assistant",
                         content: [
@@ -3513,6 +2957,9 @@ export class CodexProvider {
                                 id: callId,
                                 name: normalizedInvocation.toolName,
                                 input: normalizedInvocation.input,
+                                ...(normalizedInvocation.displayActions
+                                    ? { _displayActions: normalizedInvocation.displayActions }
+                                    : {}),
                             },
                         ],
                     },
@@ -3549,6 +2996,7 @@ export class CodexProvider {
                     type: "user",
                     session_id: sessionId,
                     uuid: this.buildItemResultUuid(callId),
+                    [CODEX_TOOL_CORRELATION_FIELD]: createCodexToolCorrelation("custom_tool_call", params.turnId, callId),
                     message: {
                         role: "user",
                         content: [toolResult],
@@ -3594,9 +3042,10 @@ export class CodexProvider {
     convertItemToSDKMessages(item, sessionId, turnId, sourceEvent) {
         const isComplete = sourceEvent === "item/completed";
         const observedAt = new Date().toISOString();
-        // Tool items key the uuid on call_id (item.id) so stream and durable rows
-        // dedup by id; message/reasoning items use a counter id (item-N) with no
-        // durable equivalent, so they stay turn-scoped and rely on the backstop.
+        // Native tool items key the uuid on call_id (item.id). Code-mode
+        // commandExecution items temporarily key on exec-* and carry correlation
+        // metadata for adoption of the outer durable call_* id client-side.
+        // Message/reasoning counters have no durable equivalent and stay scoped.
         const uuid = this.isToolBackedThreadItem(item)
             ? this.buildItemToolUuid(item.id)
             : `${item.id}-${turnId}`;
@@ -3646,10 +3095,13 @@ export class CodexProvider {
             }
             case "command_execution": {
                 const messages = [];
-                const normalizedInvocation = normalizeCodexCommandActionInvocation(item.command, item.commandActions) ??
-                    normalizeCodexToolInvocation("Bash", {
-                        command: item.command,
-                    });
+                const correlationStartedAt = item.durationMs !== undefined
+                    ? new Date(Date.parse(observedAt) - Math.max(0, item.durationMs)).toISOString()
+                    : observedAt;
+                const normalizedInvocation = normalizeCodexToolInvocation("Bash", {
+                    command: item.command,
+                    ...(item.cwd ? { cwd: item.cwd } : {}),
+                });
                 const toolContext = {
                     toolName: normalizedInvocation.toolName,
                     input: normalizedInvocation.input,
@@ -3661,6 +3113,7 @@ export class CodexProvider {
                     type: "assistant",
                     session_id: sessionId,
                     uuid,
+                    [CODEX_TOOL_CORRELATION_FIELD]: createCodexToolCorrelation("command_execution", turnId, item.id, correlationStartedAt),
                     message: {
                         role: "assistant",
                         content: [
@@ -3669,6 +3122,9 @@ export class CodexProvider {
                                 id: item.id,
                                 name: normalizedInvocation.toolName,
                                 input: normalizedInvocation.input,
+                                ...(normalizedInvocation.displayActions
+                                    ? { _displayActions: normalizedInvocation.displayActions }
+                                    : {}),
                             },
                         ],
                     },
@@ -3702,6 +3158,7 @@ export class CodexProvider {
                         type: "user",
                         session_id: sessionId,
                         uuid: `${uuid}-result`,
+                        [CODEX_TOOL_CORRELATION_FIELD]: createCodexToolCorrelation("command_execution", turnId, item.id, correlationStartedAt),
                         message: {
                             role: "user",
                             content: [toolResultBlock],