@openclaw/codex 2026.5.10-beta.2 → 2026.5.10-beta.4

package/dist/{run-attempt-CefRS5_d.js → run-attempt-DZvighJE.js}

@@ -1,560 +1,28 @@
-import { l as resolveCodexPluginsPolicy, o as readCodexPluginConfig, s as resolveCodexAppServerRuntimeOptions, u as withMcpElicitationsApprovalPolicy } from "./config-CT01BBDc.js";
-import { i as readCodexDynamicToolCallParams, r as assertCodexTurnStartResponse, s as readCodexTurn } from "./protocol-validators-CeCyJaWj.js";
+import { l as resolveCodexPluginsPolicy, o as readCodexPluginConfig, s as resolveCodexAppServerRuntimeOptions, u as withMcpElicitationsApprovalPolicy } from "./config-C7xdbzrp.js";
+import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-CSY0BFBo.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
-import { i as isCodexAppServerConnectionClosedError, r as isCodexAppServerApprovalRequest } from "./client-CTzy3Y6M.js";
-import { d as formatCodexUsageLimitErrorMessage, i as formatCodexDisplayText } from "./request-DC1Dz3iZ.js";
-import { a as refreshCodexAppServerAuthTokens, c as resolveCodexAppServerAuthProfileIdForAgent, l as resolveCodexAppServerEnvApiKeyCacheKey, o as resolveCodexAppServerAuthAccountCacheKey, s as resolveCodexAppServerAuthProfileId, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerHomeDir } from "./shared-client-p-TvEiNL.js";
-import { i as readCodexAppServerBinding } from "./session-binding-B44KIZM2.js";
-import { i as defaultCodexAppInventoryCache, r as buildCodexAppInventoryCacheKey } from "./plugin-activation-CweAZa7r.js";
-import { a as buildTurnStartParams, c as buildCodexPluginThreadConfig, d as createCodexDynamicToolBridge, f as filterCodexDynamicTools, l as buildCodexPluginThreadConfigInputFingerprint, n as buildDeveloperInstructions, o as codexDynamicToolsFingerprint, p as normalizeCodexDynamicToolName, s as startOrResumeThread, t as areCodexDynamicToolFingerprintsCompatible, u as shouldBuildCodexPluginThreadConfig } from "./thread-lifecycle-CGc-O_5d.js";
-import { n as defaultCodexAppServerClientFactory } from "./client-factory-BJL_efz4.js";
-import { n as rememberCodexRateLimits, r as ensureCodexComputerUse, t as readRecentCodexRateLimits } from "./rate-limit-cache-DbZvmrAD.js";
+import { i as isCodexAppServerConnectionClosedError, r as isCodexAppServerApprovalRequest } from "./client-CpksBQ9l.js";
+import { n as CODEX_CONTROL_METHODS } from "./request-BCAfJvSg.js";
+import { d as resolveCodexUsageLimitResetAtMs, f as shouldRefreshCodexRateLimitsForUsageLimitMessage, r as formatCodexDisplayText, u as formatCodexUsageLimitErrorMessage } from "./command-formatters-Ttwc_kgX.js";
+import { c as resolveCodexAppServerAuthProfileId, d as resolveCodexAppServerHomeDir, l as resolveCodexAppServerAuthProfileIdForAgent, o as refreshCodexAppServerAuthTokens, s as resolveCodexAppServerAuthAccountCacheKey, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerEnvApiKeyCacheKey } from "./shared-client-K13b0L1X.js";
+import { i as readCodexAppServerBinding } from "./session-binding-UFKjHkKJ.js";
+import { i as defaultCodexAppInventoryCache, r as buildCodexAppInventoryCacheKey } from "./plugin-activation-C0soz2YD.js";
+import { d as buildCodexPluginThreadConfig, f as buildCodexPluginThreadConfigInputFingerprint, g as normalizeCodexDynamicToolName, h as filterCodexDynamicTools, m as createCodexDynamicToolBridge, o as buildTurnStartParams, p as shouldBuildCodexPluginThreadConfig, r as buildDeveloperInstructions, s as codexDynamicToolsFingerprint, t as areCodexDynamicToolFingerprintsCompatible, u as startOrResumeThread } from "./thread-lifecycle-i42nWiSS.js";
+import { n as defaultCodexAppServerClientFactory } from "./client-factory-D2P0KD6r.js";
+import { n as handleCodexAppServerElicitationRequest, r as handleCodexAppServerApprovalRequest, t as filterToolsForVisionInputs } from "./vision-tools-Bo0P6gwM.js";
+import { t as ensureCodexComputerUse } from "./computer-use-CVLaKaW3.js";
+import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-dvhq-4pi.js";
 import { createHash } from "node:crypto";
 import nodeFs from "node:fs";
-import { TOOL_PROGRESS_OUTPUT_MAX_CHARS, acquireSessionWriteLock, appendSessionTranscriptMessage, assembleHarnessContextEngine, bootstrapHarnessContextEngine, buildEmbeddedAttemptToolRunContext, buildHarnessContextEngineRuntimeContext, buildHarnessContextEngineRuntimeContextFromUsage, callGatewayTool, classifyAgentHarnessTerminalOutcome, clearActiveEmbeddedRun, embeddedAgentLog, emitAgentEvent, emitSessionTranscriptUpdate, finalizeHarnessContextEngineTurn, formatApprovalDisplayPath, formatErrorMessage, formatToolAggregate, formatToolProgressOutput, inferToolMetaFromArgs, isActiveHarnessContextEngine, isSubagentSessionKey, normalizeAgentRuntimeTools, normalizeUsage, registerNativeHookRelay, resolveAgentHarnessBeforePromptBuildResult, resolveAttemptSpawnWorkspaceDir, resolveBootstrapContextForRun, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds, resolveSessionWriteLockAcquireTimeoutMs, resolveUserPath, runAgentCleanupStep, runAgentHarnessAfterCompactionHook, runAgentHarnessAgentEndHook, runAgentHarnessBeforeCompactionHook, runAgentHarnessBeforeMessageWriteHook, runAgentHarnessLlmInputHook, runAgentHarnessLlmOutputHook, runHarnessContextEngineMaintenance, setActiveEmbeddedRun, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { TOOL_PROGRESS_OUTPUT_MAX_CHARS, acquireSessionWriteLock, appendSessionTranscriptMessage, assembleHarnessContextEngine, bootstrapHarnessContextEngine, buildEmbeddedAttemptToolRunContext, buildHarnessContextEngineRuntimeContext, buildHarnessContextEngineRuntimeContextFromUsage, classifyAgentHarnessTerminalOutcome, clearActiveEmbeddedRun, embeddedAgentLog, emitAgentEvent, emitSessionTranscriptUpdate, finalizeHarnessContextEngineTurn, formatErrorMessage, formatToolAggregate, formatToolProgressOutput, inferToolMetaFromArgs, isActiveHarnessContextEngine, isSubagentSessionKey, normalizeAgentRuntimeTools, normalizeUsage, registerNativeHookRelay, resolveAgentHarnessBeforePromptBuildResult, resolveAttemptSpawnWorkspaceDir, resolveBootstrapContextForRun, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds, resolveSessionWriteLockAcquireTimeoutMs, resolveUserPath, runAgentCleanupStep, runAgentHarnessAfterCompactionHook, runAgentHarnessAfterToolCallHook, runAgentHarnessAgentEndHook, runAgentHarnessBeforeCompactionHook, runAgentHarnessBeforeMessageWriteHook, runAgentHarnessLlmInputHook, runAgentHarnessLlmOutputHook, runHarnessContextEngineMaintenance, setActiveEmbeddedRun, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
 import fs from "node:fs/promises";
 import path from "node:path";
-import { resolveAgentDir } from "openclaw/plugin-sdk/agent-runtime";
+import { markAuthProfileBlockedUntil, resolveAgentDir as resolveAgentDir$1 } from "openclaw/plugin-sdk/agent-runtime";
 import { appendRegularFile, pathExists } from "openclaw/plugin-sdk/security-runtime";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { emitTrustedDiagnosticEvent } from "openclaw/plugin-sdk/diagnostic-runtime";
-import { buildSessionContext, migrateSessionEntries, parseSessionEntries } from "@mariozechner/pi-coding-agent";
-import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugin-sdk/text-runtime";
-//#region extensions/codex/src/app-server/plugin-approval-roundtrip.ts
-const DEFAULT_CODEX_APPROVAL_TIMEOUT_MS = 12e4;
-const MAX_PLUGIN_APPROVAL_TITLE_LENGTH = 80;
-const MAX_PLUGIN_APPROVAL_DESCRIPTION_LENGTH = 256;
-async function requestPluginApproval(params) {
-	const timeoutMs = DEFAULT_CODEX_APPROVAL_TIMEOUT_MS;
-	return callGatewayTool("plugin.approval.request", { timeoutMs: timeoutMs + 1e4 }, {
-		pluginId: "openclaw-codex-app-server",
-		title: truncateForGateway(params.title, MAX_PLUGIN_APPROVAL_TITLE_LENGTH),
-		description: truncateForGateway(params.description, MAX_PLUGIN_APPROVAL_DESCRIPTION_LENGTH),
-		severity: params.severity,
-		toolName: params.toolName,
-		toolCallId: params.toolCallId,
-		agentId: params.paramsForRun.agentId,
-		sessionKey: params.paramsForRun.sessionKey,
-		turnSourceChannel: params.paramsForRun.messageChannel ?? params.paramsForRun.messageProvider,
-		turnSourceTo: params.paramsForRun.currentChannelId,
-		turnSourceAccountId: params.paramsForRun.agentAccountId,
-		turnSourceThreadId: params.paramsForRun.currentThreadTs,
-		timeoutMs,
-		twoPhase: true
-	}, { expectFinal: false });
-}
-function approvalRequestExplicitlyUnavailable(result) {
-	if (result === null || result === void 0 || typeof result !== "object") return false;
-	let descriptor;
-	try {
-		descriptor = Object.getOwnPropertyDescriptor(result, "decision");
-	} catch {
-		return false;
-	}
-	return descriptor !== void 0 && "value" in descriptor && descriptor.value === null;
-}
-async function waitForPluginApprovalDecision(params) {
-	const waitPromise = callGatewayTool("plugin.approval.waitDecision", { timeoutMs: DEFAULT_CODEX_APPROVAL_TIMEOUT_MS + 1e4 }, { id: params.approvalId });
-	if (!params.signal) return (await waitPromise)?.decision;
-	let onAbort;
-	const abortPromise = new Promise((_, reject) => {
-		if (params.signal.aborted) {
-			reject(params.signal.reason);
-			return;
-		}
-		onAbort = () => reject(params.signal.reason);
-		params.signal.addEventListener("abort", onAbort, { once: true });
-	});
-	try {
-		return (await Promise.race([waitPromise, abortPromise]))?.decision;
-	} finally {
-		if (onAbort) params.signal.removeEventListener("abort", onAbort);
-	}
-}
-function mapExecDecisionToOutcome(decision) {
-	if (decision === "allow-once") return "approved-once";
-	if (decision === "allow-always") return "approved-session";
-	if (decision === null || decision === void 0) return "unavailable";
-	return "denied";
-}
-function truncateForGateway(value, maxLength) {
-	return value.length <= maxLength ? value : `${value.slice(0, Math.max(0, maxLength - 3))}...`;
-}
-//#endregion
-//#region extensions/codex/src/app-server/approval-bridge.ts
-const PERMISSION_DESCRIPTION_MAX_LENGTH = 700;
-const PERMISSION_SAMPLE_LIMIT = 2;
-const PERMISSION_VALUE_MAX_LENGTH = 48;
-const COMMAND_PREVIEW_WITH_DETAILS_MAX_LENGTH = 80;
-const APPROVAL_PREVIEW_SCAN_MAX_LENGTH = 4096;
-const APPROVAL_PREVIEW_OMITTED = "[preview truncated or unsafe content omitted]";
-const ANSI_OSC_SEQUENCE_RE$1 = new RegExp(String.raw`(?:\u001b]|\u009d)[^\u001b\u009c\u0007]*(?:\u0007|\u001b\\|\u009c)`, "g");
-const ANSI_CONTROL_SEQUENCE_RE$1 = new RegExp(String.raw`(?:\u001b\[[0-?]*[ -/]*[@-~]|\u009b[0-?]*[ -/]*[@-~]|\u001b[@-Z\\-_])`, "g");
-const CONTROL_CHARACTER_RE$1 = new RegExp(String.raw`[\u0000-\u001f\u007f-\u009f]+`, "g");
-const INVISIBLE_FORMATTING_CONTROL_RE$1 = new RegExp(String.raw`[\u00ad\u034f\u061c\u200b-\u200f\u202a-\u202e\u2060-\u206f\ufeff\ufe00-\ufe0f\u{e0100}-\u{e01ef}]`, "gu");
-const DANGLING_TERMINAL_SEQUENCE_SUFFIX_RE$1 = new RegExp(String.raw`(?:\u001b\][^\u001b\u009c\u0007]*|\u009d[^\u001b\u009c\u0007]*|\u001b\[[0-?]*[ -/]*|\u009b[0-?]*[ -/]*|\u001b)$`);
-async function handleCodexAppServerApprovalRequest(params) {
-	const requestParams = isJsonObject(params.requestParams) ? params.requestParams : void 0;
-	if (!matchesCurrentTurn(requestParams, params.threadId, params.turnId)) return;
-	if (!isSupportedAppServerApprovalMethod(params.method)) return unsupportedApprovalResponse();
-	const context = buildApprovalContext({
-		method: params.method,
-		requestParams,
-		paramsForRun: params.paramsForRun
-	});
-	try {
-		const requestResult = await requestPluginApproval({
-			paramsForRun: params.paramsForRun,
-			title: context.title,
-			description: context.description,
-			severity: context.severity,
-			toolName: context.toolName,
-			toolCallId: context.itemId
-		});
-		const approvalId = requestResult?.id;
-		if (!approvalId) {
-			emitApprovalEvent(params.paramsForRun, {
-				phase: "resolved",
-				kind: context.kind,
-				status: "unavailable",
-				title: context.title,
-				...context.eventDetails,
-				...approvalEventScope(params.method, "denied"),
-				message: "Codex app-server approval route unavailable."
-			});
-			return buildApprovalResponse(params.method, context.requestParams, "denied");
-		}
-		emitApprovalEvent(params.paramsForRun, {
-			phase: "requested",
-			kind: context.kind,
-			status: "pending",
-			title: context.title,
-			approvalId,
-			approvalSlug: approvalId,
-			...context.eventDetails,
-			message: "Codex app-server approval requested."
-		});
-		const outcome = mapExecDecisionToOutcome(approvalRequestExplicitlyUnavailable(requestResult) ? null : await waitForPluginApprovalDecision({
-			approvalId,
-			signal: params.signal
-		}));
-		emitApprovalEvent(params.paramsForRun, {
-			phase: "resolved",
-			kind: context.kind,
-			status: outcome === "denied" ? "denied" : outcome === "unavailable" ? "unavailable" : outcome === "cancelled" ? "failed" : "approved",
-			title: context.title,
-			approvalId,
-			approvalSlug: approvalId,
-			...context.eventDetails,
-			...approvalEventScope(params.method, outcome),
-			message: approvalResolutionMessage(outcome)
-		});
-		return buildApprovalResponse(params.method, context.requestParams, outcome);
-	} catch (error) {
-		const cancelled = params.signal?.aborted === true;
-		emitApprovalEvent(params.paramsForRun, {
-			phase: "resolved",
-			kind: context.kind,
-			status: cancelled ? "failed" : "unavailable",
-			title: context.title,
-			...context.eventDetails,
-			...approvalEventScope(params.method, cancelled ? "cancelled" : "denied"),
-			message: cancelled ? "Codex app-server approval cancelled because the run stopped." : `Codex app-server approval route failed: ${formatCodexDisplayText(formatErrorMessage$1(error))}`
-		});
-		return buildApprovalResponse(params.method, context.requestParams, cancelled ? "cancelled" : "denied");
-	}
-}
-function buildApprovalResponse(method, requestParams, outcome) {
-	if (method === "item/commandExecution/requestApproval") return { decision: commandApprovalDecision(requestParams, outcome) };
-	if (method === "item/fileChange/requestApproval") return { decision: fileChangeApprovalDecision(outcome) };
-	if (method === "item/permissions/requestApproval") {
-		if (outcome === "approved-session" || outcome === "approved-once") return {
-			permissions: requestedPermissions(requestParams),
-			scope: outcome === "approved-session" ? "session" : "turn"
-		};
-		return {
-			permissions: {},
-			scope: "turn"
-		};
-	}
-	return unsupportedApprovalResponse();
-}
-function matchesCurrentTurn(requestParams, threadId, turnId) {
-	if (!requestParams) return false;
-	const requestThreadId = readString$4(requestParams, "threadId") ?? readString$4(requestParams, "conversationId");
-	const requestTurnId = readString$4(requestParams, "turnId");
-	return requestThreadId === threadId && requestTurnId === turnId;
-}
-function buildApprovalContext(params) {
-	const itemId = readString$4(params.requestParams, "itemId") ?? readString$4(params.requestParams, "callId") ?? readString$4(params.requestParams, "approvalId");
-	const commandDetailLines = params.method === "item/commandExecution/requestApproval" ? describeCommandApprovalDetails(params.requestParams) : [];
-	const commandPreview = sanitizeApprovalPreview(readDisplayCommandPreview(params.requestParams), commandDetailLines.length > 0 ? COMMAND_PREVIEW_WITH_DETAILS_MAX_LENGTH : 180);
-	const reasonPreview = sanitizeApprovalPreview(readStringPreview(params.requestParams, "reason"), 180);
-	const command = commandPreview.text;
-	const reason = reasonPreview.text;
-	const kind = approvalKindForMethod(params.method);
-	const permissionLines = params.method === "item/permissions/requestApproval" ? describeRequestedPermissions(params.requestParams) : [];
-	const title = kind === "exec" ? "Codex app-server command approval" : params.method === "item/permissions/requestApproval" ? "Codex app-server permission approval" : kind === "plugin" ? "Codex app-server file approval" : "Codex app-server approval";
-	const subject = permissionLines[0] ?? (command ? `Command: ${formatApprovalPreviewSubject(command, commandPreview.omitted)}` : commandPreview.omitted ? `Command: ${APPROVAL_PREVIEW_OMITTED}` : reason ? `Reason: ${formatApprovalPreviewSubject(reason, reasonPreview.omitted)}` : reasonPreview.omitted ? `Reason: ${APPROVAL_PREVIEW_OMITTED}` : `Request method: ${params.method}`);
-	return {
-		kind,
-		title,
-		description: permissionLines.length > 0 ? joinDescriptionLinesWithinLimit(permissionLines, PERMISSION_DESCRIPTION_MAX_LENGTH) : [
-			subject,
-			...commandDetailLines,
-			params.paramsForRun.sessionKey && `Session: ${params.paramsForRun.sessionKey}`
-		].filter(Boolean).join("\n"),
-		severity: kind === "exec" ? "warning" : "info",
-		toolName: kind === "exec" ? "codex_command_approval" : params.method === "item/permissions/requestApproval" ? "codex_permission_approval" : "codex_file_approval",
-		itemId,
-		requestParams: params.requestParams,
-		eventDetails: {
-			...itemId ? { itemId } : {},
-			...command ? { command } : {},
-			...commandPreview.omitted ? { commandPreviewOmitted: true } : {},
-			...reason ? { reason } : {},
-			...reasonPreview.omitted ? { reasonPreviewOmitted: true } : {}
-		}
-	};
-}
-function commandApprovalDecision(requestParams, outcome) {
-	if (outcome === "cancelled") return commandRejectionDecision(requestParams, "cancel");
-	if (outcome === "denied" || outcome === "unavailable") return commandRejectionDecision(requestParams, "decline");
-	if (outcome === "approved-session") {
-		if (hasAvailableDecision(requestParams, "acceptForSession")) return "acceptForSession";
-		const amendmentDecision = findAvailableCommandAmendmentDecision(requestParams);
-		if (amendmentDecision) return amendmentDecision;
-	}
-	return hasAvailableDecision(requestParams, "accept") ? "accept" : commandRejectionDecision(requestParams, "decline");
-}
-function fileChangeApprovalDecision(outcome) {
-	if (outcome === "cancelled") return "cancel";
-	if (outcome === "denied" || outcome === "unavailable") return "decline";
-	return outcome === "approved-session" ? "acceptForSession" : "accept";
-}
-function requestedPermissions(requestParams) {
-	const permissions = isJsonObject(requestParams?.permissions) ? requestParams.permissions : {};
-	const granted = {};
-	if (isJsonObject(permissions.network)) granted.network = permissions.network;
-	if (isJsonObject(permissions.fileSystem)) granted.fileSystem = permissions.fileSystem;
-	return granted;
-}
-function unsupportedApprovalResponse() {
-	return {
-		decision: "decline",
-		reason: "OpenClaw codex app-server bridge does not grant native approvals yet."
-	};
-}
-function describeRequestedPermissions(requestParams) {
-	return describePermissionProfile(requestedPermissions(requestParams), "Permissions");
-}
-function describeCommandApprovalDetails(requestParams) {
-	const lines = [];
-	const additionalPermissions = isJsonObject(requestParams?.additionalPermissions) ? requestParams.additionalPermissions : void 0;
-	if (additionalPermissions) lines.push(...describePermissionProfile(additionalPermissions, "Additional permissions"));
-	const execpolicySummary = summarizeStringArray(requestParams?.proposedExecpolicyAmendment, "Proposed exec policy", sanitizePermissionScalar);
-	if (execpolicySummary) lines.push(execpolicySummary);
-	const networkAmendmentSummary = summarizeNetworkPolicyAmendments(requestParams?.proposedNetworkPolicyAmendments);
-	if (networkAmendmentSummary) lines.push(networkAmendmentSummary);
-	return lines;
-}
-function describePermissionProfile(permissions, label) {
-	const lines = [];
-	const kinds = [];
-	const risks = /* @__PURE__ */ new Set();
-	if (isJsonObject(permissions.network)) kinds.push("network");
-	if (isJsonObject(permissions.fileSystem)) kinds.push("fileSystem");
-	if (kinds.length > 0) lines.push(`${label}: ${kinds.join(", ")}`);
-	let networkSummary;
-	if (isJsonObject(permissions.network)) {
-		const summaries = [summarizeNetworkEnabledPermission(permissions.network, risks), summarizePermissionRecord(permissions.network, risks, [{
-			key: "allowHosts",
-			label: "allowHosts",
-			sanitize: sanitizePermissionHostValue,
-			risksFor: permissionHostRisks
-		}])].filter((summary) => Boolean(summary));
-		networkSummary = summaries.length > 0 ? summaries.join("; ") : void 0;
-	}
-	let fileSystemSummary;
-	if (isJsonObject(permissions.fileSystem)) {
-		const summaries = [summarizePermissionRecord(permissions.fileSystem, risks, [
-			{
-				key: "read",
-				label: "read",
-				sanitize: sanitizePermissionPathValue,
-				risksFor: permissionPathRisks
-			},
-			{
-				key: "write",
-				label: "write",
-				sanitize: sanitizePermissionPathValue,
-				risksFor: permissionPathRisks
-			},
-			{
-				key: "roots",
-				label: "roots",
-				sanitize: sanitizePermissionPathValue,
-				risksFor: permissionPathRisks
-			},
-			{
-				key: "readPaths",
-				label: "readPaths",
-				sanitize: sanitizePermissionPathValue,
-				risksFor: permissionPathRisks
-			},
-			{
-				key: "writePaths",
-				label: "writePaths",
-				sanitize: sanitizePermissionPathValue,
-				risksFor: permissionPathRisks
-			}
-		]), summarizeFileSystemEntries(permissions.fileSystem, risks)].filter((summary) => Boolean(summary));
-		fileSystemSummary = summaries.length > 0 ? summaries.join("; ") : void 0;
-	}
-	if (risks.size > 0) lines.push(`High-risk targets: ${[...risks].join(", ")}`);
-	if (networkSummary) lines.push(`Network ${networkSummary}`);
-	if (fileSystemSummary) lines.push(`File system ${fileSystemSummary}`);
-	return lines;
-}
-function summarizeNetworkEnabledPermission(permission, risks) {
-	const enabled = permission.enabled;
-	if (typeof enabled !== "boolean") return;
-	if (enabled) risks.add("network access");
-	return `enabled: ${enabled}`;
-}
-function summarizeFileSystemEntries(permission, risks) {
-	const entries = permission.entries;
-	if (!Array.isArray(entries)) return;
-	const samples = [];
-	let count = 0;
-	for (const entry of entries) {
-		const item = isJsonObject(entry) ? entry : void 0;
-		const path = typeof item?.path === "string" ? item.path.trim() : "";
-		const access = typeof item?.access === "string" ? item.access.trim() : "";
-		if (!path || !access) continue;
-		count += 1;
-		if (access !== "none") for (const risk of permissionPathRisks(path)) risks.add(risk);
-		if (samples.length < PERMISSION_SAMPLE_LIMIT) samples.push(`${sanitizePermissionScalar(access)} ${sanitizePermissionPathValue(path)}`);
-	}
-	if (count === 0) return;
-	const remaining = count - samples.length;
-	const remainderSuffix = remaining > 0 ? ` (+${remaining} more)` : "";
-	return `entries: ${samples.join(", ")}${remainderSuffix}`;
-}
-function summarizePermissionRecord(permission, risks, descriptors) {
-	const details = [];
-	for (const descriptor of descriptors) {
-		const summary = summarizePermissionArray(permission, descriptor, risks);
-		if (summary) details.push(summary);
-	}
-	return details.length > 0 ? details.join("; ") : void 0;
-}
-function summarizePermissionArray(record, descriptor, risks) {
-	const values = readStringArray(record, descriptor.key);
-	if (values.length === 0) return;
-	for (const value of values) for (const risk of descriptor.risksFor(value)) risks.add(risk);
-	const sampleValues = values.slice(0, PERMISSION_SAMPLE_LIMIT).map(descriptor.sanitize).filter(Boolean);
-	if (sampleValues.length === 0) return `${descriptor.label}: ${values.length}`;
-	const remaining = values.length - sampleValues.length;
-	const remainderSuffix = remaining > 0 ? ` (+${remaining} more)` : "";
-	return `${descriptor.label}: ${sampleValues.join(", ")}${remainderSuffix}`;
-}
-function summarizeStringArray(value, label, sanitize) {
-	if (!Array.isArray(value)) return;
-	const values = value.filter((entry) => typeof entry === "string").map((entry) => sanitize(entry)).filter(Boolean);
-	if (values.length === 0) return;
-	const samples = values.slice(0, PERMISSION_SAMPLE_LIMIT);
-	const remaining = values.length - samples.length;
-	const remainderSuffix = remaining > 0 ? ` (+${remaining} more)` : "";
-	return `${label}: ${samples.join(", ")}${remainderSuffix}`;
-}
-function summarizeNetworkPolicyAmendments(value) {
-	if (!Array.isArray(value)) return;
-	const samples = [];
-	let count = 0;
-	for (const entry of value) {
-		const amendment = isJsonObject(entry) ? entry : void 0;
-		const host = typeof amendment?.host === "string" ? amendment.host : "";
-		const action = typeof amendment?.action === "string" ? amendment.action : "";
-		if (!host || !action) continue;
-		count += 1;
-		if (samples.length < PERMISSION_SAMPLE_LIMIT) samples.push(`${sanitizePermissionScalar(action)} ${sanitizePermissionHostValue(host)}`);
-	}
-	if (count === 0) return;
-	const remaining = count - samples.length;
-	const remainderSuffix = remaining > 0 ? ` (+${remaining} more)` : "";
-	return `Proposed network policy: ${samples.join(", ")}${remainderSuffix}`;
-}
-function readStringArray(record, key) {
-	const value = record[key];
-	return Array.isArray(value) ? value.map((entry) => typeof entry === "string" ? entry.trim() : "").filter(Boolean) : [];
-}
-function sanitizePermissionHostValue(value) {
-	const withoutScheme = sanitizePermissionScalar(value).toLowerCase().replace(/^[a-z][a-z0-9+.-]*:\/\//, "");
-	const authority = withoutScheme.split(/[/?#]/, 1)[0] ?? withoutScheme;
-	return truncate(authority.includes("@") ? authority.slice(authority.lastIndexOf("@") + 1) : authority, PERMISSION_VALUE_MAX_LENGTH);
-}
-function sanitizePermissionPathValue(value) {
-	return truncate(formatApprovalDisplayPath(sanitizePermissionScalar(value)), PERMISSION_VALUE_MAX_LENGTH);
-}
-function sanitizePermissionScalar(value) {
-	return sanitizeVisibleScalar(value);
-}
-function permissionHostRisks(value) {
-	const normalized = value.trim().toLowerCase();
-	const risks = [];
-	if (normalized.includes("*")) {
-		risks.push("wildcard hosts");
-		if (isPrivateNetworkHostPattern(normalized)) risks.push("private-network wildcards");
-	}
-	return risks;
-}
-function permissionPathRisks(value) {
-	const normalized = sanitizePermissionScalar(value);
-	const risks = [];
-	if (normalized === "/" || normalized === "\\" || /^[A-Za-z]:[\\/]*$/.test(normalized)) risks.push("filesystem root");
-	return risks;
-}
-function isPrivateNetworkHostPattern(value) {
-	const wildcardStripped = value.toLowerCase().replace(/^\*\./, "");
-	if (wildcardStripped === "localhost" || wildcardStripped === "local" || wildcardStripped === "internal" || wildcardStripped === "lan" || wildcardStripped === "home" || wildcardStripped === "corp" || wildcardStripped === "private" || wildcardStripped.endsWith(".local") || wildcardStripped.endsWith(".internal") || wildcardStripped.endsWith(".lan") || wildcardStripped.endsWith(".home") || wildcardStripped.endsWith(".corp") || wildcardStripped.endsWith(".private")) return true;
-	if (wildcardStripped.startsWith("10.") || wildcardStripped.startsWith("127.") || wildcardStripped.startsWith("192.168.") || wildcardStripped.startsWith("169.254.")) return true;
-	return /^172\.(1[6-9]|2\d|3[0-1])\./.test(wildcardStripped);
-}
-function hasAvailableDecision(requestParams, decision) {
-	const available = requestParams?.availableDecisions;
-	if (!Array.isArray(available)) return true;
-	return available.includes(decision);
-}
-function findAvailableCommandAmendmentDecision(requestParams) {
-	const available = requestParams?.availableDecisions;
-	if (!Array.isArray(available)) return;
-	return available.find((entry) => isJsonObject(entry) && (isJsonObject(entry.acceptWithExecpolicyAmendment) || isJsonObject(entry.applyNetworkPolicyAmendment)));
-}
-function commandRejectionDecision(requestParams, preferred) {
-	const available = requestParams?.availableDecisions;
-	if (!Array.isArray(available)) return preferred;
-	if (available.includes(preferred)) return preferred;
-	const alternate = preferred === "decline" ? "cancel" : "decline";
-	if (available.includes(alternate)) return alternate;
-	return preferred;
-}
-function approvalResolutionMessage(outcome) {
-	if (outcome === "approved-session") return "Codex app-server approval granted for the session.";
-	if (outcome === "approved-once") return "Codex app-server approval granted for this turn.";
-	if (outcome === "cancelled") return "Codex app-server approval cancelled.";
-	if (outcome === "unavailable") return "Codex app-server approval unavailable.";
-	return "Codex app-server approval denied.";
-}
-function approvalScopeForOutcome(outcome) {
-	return outcome === "approved-session" ? "session" : "turn";
-}
-function approvalEventScope(method, outcome) {
-	return method === "item/permissions/requestApproval" ? { scope: approvalScopeForOutcome(outcome) } : {};
-}
-function approvalKindForMethod(method) {
-	if (method.includes("commandExecution") || method.includes("execCommand")) return "exec";
-	if (method.includes("fileChange") || method.includes("Patch") || method.includes("permissions")) return "plugin";
-	return "unknown";
-}
-function isSupportedAppServerApprovalMethod(method) {
-	return method === "item/commandExecution/requestApproval" || method === "item/fileChange/requestApproval" || method === "item/permissions/requestApproval";
-}
-function emitApprovalEvent(params, data) {
-	params.onAgentEvent?.({
-		stream: "approval",
-		data
-	});
-}
-function readDisplayCommandPreview(record) {
-	const actionCommand = readCommandActionsPreview(record);
-	if (actionCommand) return actionCommand;
-	return readCommandPreview(record);
-}
-function readCommandActionsPreview(record) {
-	const actions = record?.commandActions;
-	if (!Array.isArray(actions)) return;
-	let source;
-	for (const action of actions) {
-		const command = isJsonObject(action) ? readString$4(action, "command") : void 0;
-		if (!command) continue;
-		source = appendPreviewPart(source, command, " && ");
-		if (source.clipped) break;
-	}
-	return source;
-}
-function readCommandPreview(record) {
-	const command = record?.command;
-	if (typeof command === "string") return previewSource(command);
-	if (!Array.isArray(command)) return;
-	let source;
-	for (const part of command) {
-		if (typeof part !== "string") return;
-		source = appendPreviewPart(source, part, " ");
-		if (source.clipped) break;
-	}
-	return source;
-}
-function readStringPreview(record, key) {
-	const value = readString$4(record, key);
-	return value === void 0 ? void 0 : previewSource(value);
-}
-function readString$4(record, key) {
-	const value = record?.[key];
-	return typeof value === "string" ? value : void 0;
-}
-function truncate(value, maxLength) {
-	return value.length <= maxLength ? value : `${value.slice(0, Math.max(0, maxLength - 3))}...`;
-}
-function previewSource(value) {
-	return {
-		value: value.slice(0, APPROVAL_PREVIEW_SCAN_MAX_LENGTH),
-		clipped: value.length > APPROVAL_PREVIEW_SCAN_MAX_LENGTH
-	};
-}
-function appendPreviewPart(source, part, separator) {
-	const value = `${source?.value ? `${source.value}${separator}` : ""}${part}`;
-	const clipped = source?.clipped === true || value.length > APPROVAL_PREVIEW_SCAN_MAX_LENGTH;
-	return {
-		value: value.slice(0, APPROVAL_PREVIEW_SCAN_MAX_LENGTH),
-		clipped
-	};
-}
-function sanitizeApprovalPreview(source, maxLength) {
-	if (!source || !source.value) return { omitted: false };
-	const sanitized = sanitizeVisibleScalar(source.value.replace(DANGLING_TERMINAL_SEQUENCE_SUFFIX_RE$1, ""));
-	if (!sanitized) return { omitted: true };
-	return {
-		text: formatCodexDisplayText(truncate(sanitized, maxLength)),
-		omitted: source.clipped
-	};
-}
-function sanitizeVisibleScalar(value) {
-	return value.replace(ANSI_OSC_SEQUENCE_RE$1, "").replace(ANSI_CONTROL_SEQUENCE_RE$1, "").replace(INVISIBLE_FORMATTING_CONTROL_RE$1, " ").replace(CONTROL_CHARACTER_RE$1, " ").replace(/\s+/g, " ").trim();
-}
-function formatApprovalPreviewSubject(text, omitted) {
-	return omitted ? `${text} ${APPROVAL_PREVIEW_OMITTED}` : text;
-}
-function joinDescriptionLinesWithinLimit(lines, maxLength) {
-	let description = "";
-	for (const line of lines) {
-		const prefix = description ? "\n" : "";
-		const next = `${description}${prefix}${line}`;
-		if (next.length <= maxLength) {
-			description = next;
-			continue;
-		}
-		const remaining = maxLength - description.length - prefix.length;
-		if (remaining < 3) break;
-		description += `${prefix}${truncate(line, remaining)}`;
-		break;
-	}
-	return description;
-}
-function formatErrorMessage$1(error) {
-	return error instanceof Error ? error.message : String(error);
-}
-//#endregion
+import { buildSessionContext, migrateSessionEntries, parseSessionEntries } from "@earendil-works/pi-coding-agent";
+import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
 //#region extensions/codex/src/app-server/context-engine-projection.ts
 const CONTEXT_HEADER = "OpenClaw assembled context for this turn:";
 const CONTEXT_OPEN = "<conversation_context>";
@@ -632,469 +100,6 @@ function truncateText(text, maxChars) {
 	return text.length > maxChars ? `${text.slice(0, maxChars)}\n[truncated ${text.length - maxChars} chars]` : text;
 }
 //#endregion
-//#region extensions/codex/src/app-server/elicitation-bridge.ts
-const MCP_TOOL_APPROVAL_KIND = "mcp_tool_call";
-const MCP_TOOL_APPROVAL_KIND_KEY = "codex_approval_kind";
-const MCP_TOOL_APPROVAL_CONNECTOR_NAME_KEY = "connector_name";
-const MCP_TOOL_APPROVAL_TOOL_TITLE_KEY = "tool_title";
-const MCP_TOOL_APPROVAL_TOOL_DESCRIPTION_KEY = "tool_description";
-const MCP_TOOL_APPROVAL_TOOL_PARAMS_DISPLAY_KEY = "tool_params_display";
-const PLUGIN_APP_ID_META_KEYS = [
-	"app_id",
-	"appId",
-	"codex_app_id",
-	"codexAppId"
-];
-const PLUGIN_NAME_META_KEYS = [
-	"plugin_name",
-	"pluginName",
-	"codex_plugin_name",
-	"codexPluginName"
-];
-const PLUGIN_CONFIG_KEY_META_KEYS = [
-	"config_key",
-	"configKey",
-	"codex_config_key"
-];
-const PLUGIN_MARKETPLACE_NAME_META_KEYS = [
-	"marketplace_name",
-	"marketplaceName",
-	"codex_marketplace_name",
-	"codexMarketplaceName"
-];
-const MAX_DISPLAY_PARAM_ENTRIES = 8;
-const MAX_DISPLAY_PARAM_VALUE_LENGTH = 120;
-const MAX_DISPLAY_VALUE_ARRAY_ITEMS = 8;
-const MAX_DISPLAY_VALUE_OBJECT_KEYS = 8;
-const MAX_DISPLAY_VALUE_DEPTH = 3;
-const DISPLAY_TEXT_SCAN_MAX_LENGTH = 4096;
-const ANSI_OSC_SEQUENCE_RE = new RegExp(String.raw`(?:\u001b]|\u009d)[^\u001b\u009c\u0007]*(?:\u0007|\u001b\\|\u009c)`, "g");
-const ANSI_CONTROL_SEQUENCE_RE = new RegExp(String.raw`(?:\u001b\[[0-?]*[ -/]*[@-~]|\u009b[0-?]*[ -/]*[@-~]|\u001b[@-Z\\-_])`, "g");
-const CONTROL_CHARACTER_RE = new RegExp(String.raw`[\u0000-\u001f\u007f-\u009f]+`, "g");
-const INVISIBLE_FORMATTING_CONTROL_RE = new RegExp(String.raw`[\u00ad\u034f\u061c\u200b-\u200f\u202a-\u202e\u2060-\u206f\ufeff\ufe00-\ufe0f\u{e0100}-\u{e01ef}]`, "gu");
-const DANGLING_TERMINAL_SEQUENCE_SUFFIX_RE = new RegExp(String.raw`(?:\u001b\][^\u001b\u009c\u0007]*|\u009d[^\u001b\u009c\u0007]*|\u001b\[[0-?]*[ -/]*|\u009b[0-?]*[ -/]*|\u001b)$`);
-async function handleCodexAppServerElicitationRequest(params) {
-	const requestParams = isJsonObject(params.requestParams) ? params.requestParams : void 0;
-	if (!requestParams) return;
-	if (!matchesCurrentThread(requestParams, params.threadId)) return;
-	if (turnIdMismatches(requestParams, params.turnId)) return;
-	const pluginResolution = resolvePluginElicitation({
-		requestParams,
-		pluginAppPolicyContext: params.pluginAppPolicyContext
-	});
-	if (pluginResolution.kind !== "not_plugin") {
-		if (pluginResolution.kind === "decline") {
-			logPluginElicitationDecline(pluginResolution.reason, requestParams);
-			return declineElicitationResponse();
-		}
-		if (!hasExactTurnId(requestParams, params.turnId)) {
-			logPluginElicitationDecline("missing_active_turn", requestParams);
-			return declineElicitationResponse();
-		}
-		return buildPluginPolicyElicitationResponse(pluginResolution.entry, requestParams);
-	}
-	const approvalPrompt = readBridgeableApprovalElicitation(requestParams);
-	if (!approvalPrompt) return;
-	const outcome = await requestPluginApprovalOutcome({
-		paramsForRun: params.paramsForRun,
-		title: approvalPrompt.title,
-		description: approvalPrompt.description,
-		signal: params.signal
-	});
-	return buildElicitationResponse(approvalPrompt.requestedSchema, approvalPrompt.meta, outcome);
-}
-function matchesCurrentThread(requestParams, threadId) {
-	if (!requestParams) return false;
-	return readString$3(requestParams, "threadId") === threadId;
-}
-function turnIdMismatches(requestParams, turnId) {
-	const rawTurnId = requestParams?.turnId;
-	return rawTurnId !== null && rawTurnId !== void 0 && rawTurnId !== turnId;
-}
-function hasExactTurnId(requestParams, turnId) {
-	return requestParams?.turnId === turnId;
-}
-function resolvePluginElicitation(params) {
-	const requestParams = params.requestParams;
-	if (!requestParams) return { kind: "not_plugin" };
-	const meta = isJsonObject(requestParams._meta) ? requestParams._meta : {};
-	const context = params.pluginAppPolicyContext;
-	const entries = context ? Object.values(context.apps) : [];
-	const appId = readFirstString(meta, PLUGIN_APP_ID_META_KEYS) ?? readFirstString(requestParams, PLUGIN_APP_ID_META_KEYS);
-	if (appId) {
-		if (!context) return {
-			kind: "decline",
-			reason: "missing_policy_context"
-		};
-		const entry = context.apps[appId];
-		return uniquePluginMatch(entry ? [entry] : [], "app_id");
-	}
-	const serverName = readString$3(requestParams, "serverName");
-	if (serverName && context) {
-		const matches = entries.filter((entry) => entry.mcpServerNames.includes(serverName));
-		if (matches.length > 0) return uniquePluginMatch(matches, "server_name");
-	}
-	const metadataResolution = resolvePluginStableMetadataMatch({
-		meta,
-		requestParams,
-		entries,
-		context
-	});
-	if (metadataResolution.kind !== "not_plugin") return metadataResolution;
-	if (context && hasDisplayNameOnlyPluginMatch(meta, entries)) return {
-		kind: "decline",
-		reason: "display_name_only"
-	};
-	return { kind: "not_plugin" };
-}
-function resolvePluginStableMetadataMatch(params) {
-	const pluginName = readFirstString(params.meta, PLUGIN_NAME_META_KEYS) ?? readFirstString(params.requestParams, PLUGIN_NAME_META_KEYS);
-	const configKey = readFirstString(params.meta, PLUGIN_CONFIG_KEY_META_KEYS) ?? readFirstString(params.requestParams, PLUGIN_CONFIG_KEY_META_KEYS);
-	const marketplaceName = readFirstString(params.meta, PLUGIN_MARKETPLACE_NAME_META_KEYS) ?? readFirstString(params.requestParams, PLUGIN_MARKETPLACE_NAME_META_KEYS);
-	if (!pluginName && !configKey) return { kind: "not_plugin" };
-	if (!params.context) return {
-		kind: "decline",
-		reason: "missing_policy_context"
-	};
-	return uniquePluginMatch(params.entries.filter((entry) => {
-		if (marketplaceName && entry.marketplaceName !== marketplaceName) return false;
-		if (pluginName && entry.pluginName !== pluginName) return false;
-		if (configKey && entry.configKey !== configKey) return false;
-		return true;
-	}), "metadata");
-}
-function uniquePluginMatch(matches, source) {
-	if (matches.length === 1 && matches[0]) return {
-		kind: "matched",
-		entry: matches[0]
-	};
-	return {
-		kind: "decline",
-		reason: matches.length === 0 ? `${source}_not_enabled` : `${source}_ambiguous`
-	};
-}
-function hasDisplayNameOnlyPluginMatch(meta, entries) {
-	const connectorName = readString$3(meta, MCP_TOOL_APPROVAL_CONNECTOR_NAME_KEY);
-	if (!connectorName) return false;
-	const normalized = normalizePluginIdentityText(connectorName);
-	return entries.some((entry) => normalizePluginIdentityText(entry.pluginName) === normalized || normalizePluginIdentityText(entry.configKey) === normalized);
-}
-function normalizePluginIdentityText(value) {
-	return value.toLowerCase().replace(/[^a-z0-9]+/g, "");
-}
-function buildPluginPolicyElicitationResponse(entry, requestParams) {
-	if (!entry.allowDestructiveActions) {
-		logPluginElicitationDecline("destructive_actions_disabled", requestParams);
-		return declineElicitationResponse();
-	}
-	if (readString$3(requestParams, "mode") !== "form" || !isJsonObject(requestParams.requestedSchema)) {
-		logPluginElicitationDecline("unsupported_schema", requestParams);
-		return declineElicitationResponse();
-	}
-	const meta = isJsonObject(requestParams._meta) ? requestParams._meta : {};
-	const response = buildElicitationResponse(requestParams.requestedSchema, meta, "approved-once");
-	if (isJsonObject(response) && response.action === "accept") return response;
-	logPluginElicitationDecline("unmappable_schema", requestParams);
-	return declineElicitationResponse();
-}
-function declineElicitationResponse() {
-	return {
-		action: "decline",
-		content: null,
-		_meta: null
-	};
-}
-function logPluginElicitationDecline(reason, requestParams) {
-	embeddedAgentLog.debug("codex plugin elicitation declined", {
-		reason,
-		serverName: readString$3(requestParams, "serverName"),
-		mode: readString$3(requestParams, "mode")
-	});
-}
-function readBridgeableApprovalElicitation(requestParams) {
-	if (!requestParams || readString$3(requestParams, "mode") !== "form" || !isJsonObject(requestParams._meta) || requestParams._meta[MCP_TOOL_APPROVAL_KIND_KEY] !== MCP_TOOL_APPROVAL_KIND || !isJsonObject(requestParams.requestedSchema)) return;
-	const requestedSchema = requestParams.requestedSchema;
-	if (readString$3(requestedSchema, "type") !== "object" || !isJsonObject(requestedSchema.properties)) return;
-	const title = sanitizeDisplayText(readString$3(requestParams, "message") ?? "") || "Codex MCP tool approval";
-	return {
-		title,
-		description: buildApprovalDescription({
-			title,
-			meta: requestParams._meta,
-			requestedSchema,
-			serverName: sanitizeOptionalDisplayText(readString$3(requestParams, "serverName"))
-		}),
-		requestedSchema,
-		meta: requestParams._meta
-	};
-}
-function buildApprovalDescription(params) {
-	const connectorName = sanitizeOptionalDisplayText(readString$3(params.meta, MCP_TOOL_APPROVAL_CONNECTOR_NAME_KEY));
-	const toolTitle = sanitizeOptionalDisplayText(readString$3(params.meta, MCP_TOOL_APPROVAL_TOOL_TITLE_KEY));
-	const toolDescription = sanitizeOptionalDisplayText(readString$3(params.meta, MCP_TOOL_APPROVAL_TOOL_DESCRIPTION_KEY));
-	const summaryLines = [
-		connectorName && `App: ${connectorName}`,
-		toolTitle && `Tool: ${toolTitle}`,
-		params.serverName && `MCP server: ${params.serverName}`,
-		toolDescription
-	].filter((line) => Boolean(line));
-	const paramLines = readDisplayParamLines(params.meta);
-	const propertyLines = readPropertyDescriptionLines(params.requestedSchema);
-	return [
-		params.title,
-		summaryLines.join("\n"),
-		paramLines.length > 0 ? ["Parameters:", ...paramLines].join("\n") : "",
-		propertyLines.length > 0 ? ["Fields:", ...propertyLines].join("\n") : ""
-	].filter(Boolean).join("\n\n");
-}
-function readPropertyDescriptionLines(requestedSchema) {
-	const properties = isJsonObject(requestedSchema.properties) ? requestedSchema.properties : {};
-	return Object.entries(properties).map(([name, value]) => {
-		const schema = isJsonObject(value) ? value : void 0;
-		if (!schema) return;
-		const propTitle = sanitizeDisplayText(readString$3(schema, "title") ?? "") || sanitizeDisplayText(name) || "field";
-		const description = sanitizeOptionalDisplayText(readString$3(schema, "description"));
-		return description ? `- ${propTitle}: ${description}` : `- ${propTitle}`;
-	}).filter((line) => Boolean(line));
-}
-function readDisplayParamLines(meta) {
-	const displayParams = meta[MCP_TOOL_APPROVAL_TOOL_PARAMS_DISPLAY_KEY];
-	if (!Array.isArray(displayParams)) return [];
-	const lines = displayParams.slice(0, MAX_DISPLAY_PARAM_ENTRIES).map((entry) => {
-		const param = isJsonObject(entry) ? entry : void 0;
-		if (!param) return;
-		const name = sanitizeOptionalDisplayText(readString$3(param, "display_name")) ?? sanitizeOptionalDisplayText(readString$3(param, "name"));
-		if (!name) return;
-		return `- ${name}: ${formatDisplayParamValue(param.value)}`;
-	}).filter((line) => Boolean(line));
-	const remaining = displayParams.length - MAX_DISPLAY_PARAM_ENTRIES;
-	return remaining > 0 ? [...lines, `- Additional parameters: ${remaining} more`] : lines;
-}
-function formatDisplayParamValue(value) {
-	return truncateDisplayText(sanitizeDisplayText(typeof value === "string" ? value : formatDisplayJsonValue(value ?? null)), MAX_DISPLAY_PARAM_VALUE_LENGTH);
-}
-function formatDisplayJsonValue(value, depth = MAX_DISPLAY_VALUE_DEPTH) {
-	if (value === null) return "null";
-	if (typeof value === "string") return JSON.stringify(truncateDisplayText(sanitizeDisplayText(value), 80));
-	if (typeof value === "number" || typeof value === "boolean") return String(value);
-	if (Array.isArray(value)) {
-		if (depth <= 0) return "[truncated]";
-		const parts = [];
-		const limit = Math.min(value.length, MAX_DISPLAY_VALUE_ARRAY_ITEMS);
-		for (let i = 0; i < limit; i += 1) parts.push(formatDisplayJsonValue(value[i] ?? null, depth - 1));
-		if (value.length > MAX_DISPLAY_VALUE_ARRAY_ITEMS) parts.push("...");
-		return `[${parts.join(",")}]`;
-	}
-	if (typeof value === "object") {
-		if (depth <= 0) return "{truncated}";
-		const parts = [];
-		let count = 0;
-		let truncated = false;
-		for (const key in value) {
-			if (!Object.prototype.hasOwnProperty.call(value, key)) continue;
-			if (count >= MAX_DISPLAY_VALUE_OBJECT_KEYS) {
-				truncated = true;
-				break;
-			}
-			const safeKey = truncateDisplayText(sanitizeDisplayText(key), 80);
-			parts.push(`${JSON.stringify(safeKey)}:${formatDisplayJsonValue(value[key] ?? null, depth - 1)}`);
-			count += 1;
-		}
-		if (truncated) parts.push("...");
-		return `{${parts.join(",")}}`;
-	}
-	return "null";
-}
-function sanitizeOptionalDisplayText(value) {
-	return (value === void 0 ? "" : sanitizeDisplayText(value)) || void 0;
-}
-function sanitizeDisplayText(value) {
-	const scanned = value.slice(0, DISPLAY_TEXT_SCAN_MAX_LENGTH);
-	const clipped = value.length > DISPLAY_TEXT_SCAN_MAX_LENGTH;
-	const sanitized = scanned.replace(ANSI_OSC_SEQUENCE_RE, "").replace(ANSI_CONTROL_SEQUENCE_RE, "").replace(DANGLING_TERMINAL_SEQUENCE_SUFFIX_RE, "").replace(INVISIBLE_FORMATTING_CONTROL_RE, " ").replace(CONTROL_CHARACTER_RE, " ").replace(/\s+/g, " ").trim();
-	const escaped = sanitized ? formatCodexDisplayText(sanitized) : "";
-	return clipped && escaped ? `${escaped}...` : escaped;
-}
-function truncateDisplayText(value, maxLength) {
-	return value.length <= maxLength ? value : `${value.slice(0, Math.max(0, maxLength - 3))}...`;
-}
-async function requestPluginApprovalOutcome(params) {
-	try {
-		const requestResult = await requestPluginApproval({
-			paramsForRun: params.paramsForRun,
-			title: params.title,
-			description: params.description,
-			severity: "warning",
-			toolName: "codex_mcp_tool_approval"
-		});
-		const approvalId = requestResult?.id;
-		if (!approvalId) return "unavailable";
-		return mapExecDecisionToOutcome(approvalRequestExplicitlyUnavailable(requestResult) ? null : await waitForPluginApprovalDecision({
-			approvalId,
-			signal: params.signal
-		}));
-	} catch {
-		return params.signal?.aborted ? "cancelled" : "denied";
-	}
-}
-function buildElicitationResponse(requestedSchema, meta, outcome) {
-	if (outcome === "cancelled") return {
-		action: "cancel",
-		content: null,
-		_meta: null
-	};
-	if (outcome === "denied" || outcome === "unavailable") return {
-		action: "decline",
-		content: null,
-		_meta: null
-	};
-	const content = buildAcceptedContent(requestedSchema, meta, outcome);
-	if (!content) {
-		if (hasNoSchemaProperties(requestedSchema)) return {
-			action: "accept",
-			content: null,
-			_meta: buildAcceptedMeta(meta, outcome)
-		};
-		embeddedAgentLog.warn("codex MCP approval elicitation approved without a mappable response", {
-			approvalKind: meta[MCP_TOOL_APPROVAL_KIND_KEY],
-			fields: Object.keys(requestedSchema.properties ?? {}),
-			outcome
-		});
-		return {
-			action: "decline",
-			content: null,
-			_meta: null
-		};
-	}
-	return {
-		action: "accept",
-		content,
-		_meta: buildAcceptedMeta(meta, outcome)
-	};
-}
-function buildAcceptedContent(requestedSchema, meta, outcome) {
-	const properties = isJsonObject(requestedSchema.properties) ? requestedSchema.properties : void 0;
-	if (!properties) return;
-	const required = Array.isArray(requestedSchema.required) ? new Set(requestedSchema.required.filter((entry) => typeof entry === "string")) : /* @__PURE__ */ new Set();
-	const content = {};
-	let sawApprovalField = false;
-	for (const [name, value] of Object.entries(properties)) {
-		const schema = isJsonObject(value) ? value : void 0;
-		if (!schema) continue;
-		const property = {
-			name,
-			schema,
-			required: required.has(name)
-		};
-		const next = readApprovalFieldValue(property, outcome) ?? readPersistFieldValue(property, meta, outcome) ?? readFallbackFieldValue(property, outcome);
-		if (next === void 0) {
-			if (isApprovalField(property)) sawApprovalField = true;
-			if (property.required) return;
-			continue;
-		}
-		if (isApprovalField(property)) sawApprovalField = true;
-		content[name] = next;
-	}
-	return sawApprovalField ? content : void 0;
-}
-function readApprovalFieldValue(property, outcome) {
-	if (!isApprovalField(property)) return;
-	if (readString$3(property.schema, "type") === "boolean") return true;
-	const options = readEnumOptions(property.schema);
-	if (options.length === 0) return;
-	const sessionChoice = options.find((option) => isSessionApprovalOption(option));
-	const acceptChoice = options.find((option) => isPositiveApprovalOption(option));
-	if (outcome === "approved-session") return sessionChoice?.value ?? acceptChoice?.value;
-	return acceptChoice?.value ?? sessionChoice?.value;
-}
-function readPersistFieldValue(property, meta, outcome) {
-	if (!isPersistField(property) || outcome !== "approved-session") return;
-	const persistHints = readPersistHints(meta);
-	const options = readEnumOptions(property.schema);
-	if (options.length === 0) return;
-	const preferred = choosePersistHint(persistHints);
-	if (preferred) return options.find((option) => option.value === preferred || option.label === preferred)?.value;
-}
-function readDefaultValue(schema) {
-	return schema.default;
-}
-function readFallbackFieldValue(property, outcome) {
-	if (outcome === "approved-once" && isPersistField(property)) return;
-	return readDefaultValue(property.schema);
-}
-function isApprovalField(property) {
-	const haystack = propertyText(property).toLowerCase();
-	return /\b(approve|approval|allow|accept|decision)\b/.test(haystack);
-}
-function isPersistField(property) {
-	const haystack = propertyText(property).toLowerCase();
-	return /\b(persist|session|always|scope)\b/.test(haystack);
-}
-function propertyText(property) {
-	return [
-		property.name,
-		readString$3(property.schema, "title"),
-		readString$3(property.schema, "description")
-	].filter(Boolean).join(" ");
-}
-function readPersistHints(meta) {
-	const raw = meta.persist;
-	if (typeof raw === "string") return [raw];
-	if (Array.isArray(raw)) return raw.filter((entry) => typeof entry === "string");
-	return ["session", "always"];
-}
-function buildAcceptedMeta(meta, outcome) {
-	if (outcome !== "approved-session") return null;
-	const persist = choosePersistHint(readPersistHints(meta));
-	return persist ? { persist } : null;
-}
-function choosePersistHint(persistHints) {
-	if (persistHints.includes("always")) return "always";
-	if (persistHints.includes("session")) return "session";
-}
-function hasNoSchemaProperties(requestedSchema) {
-	const properties = isJsonObject(requestedSchema.properties) ? requestedSchema.properties : {};
-	return Object.keys(properties).length === 0;
-}
-function readEnumOptions(schema) {
-	if (Array.isArray(schema.enum)) {
-		const values = schema.enum.filter((entry) => typeof entry === "string");
-		const labels = Array.isArray(schema.enumNames) ? schema.enumNames.filter((entry) => typeof entry === "string") : [];
-		return values.map((value, index) => ({
-			value,
-			label: labels[index] ?? value
-		}));
-	}
-	if (Array.isArray(schema.oneOf)) return schema.oneOf.map((entry) => {
-		const option = isJsonObject(entry) ? entry : void 0;
-		const value = readString$3(option, "const");
-		if (!value) return;
-		return {
-			value,
-			label: readString$3(option, "title") ?? value
-		};
-	}).filter((entry) => Boolean(entry));
-	return [];
-}
-function isPositiveApprovalOption(option) {
-	const haystack = `${option.value} ${option.label}`.toLowerCase();
-	return /\b(allow|approve|accept|yes|continue|proceed|true)\b/.test(haystack);
-}
-function isSessionApprovalOption(option) {
-	const haystack = `${option.value} ${option.label}`.toLowerCase();
-	return /\b(session|always|persistent)\b/.test(haystack) && /\b(allow|approve|accept)\b/.test(haystack);
-}
-function readString$3(record, key) {
-	const value = record?.[key];
-	return typeof value === "string" && value.trim() ? value : void 0;
-}
-function readFirstString(record, keys) {
-	for (const key of keys) {
-		const value = readString$3(record, key);
-		if (value) return value;
-	}
-}
-//#endregion
 //#region extensions/codex/src/app-server/session-history.ts
 function isMissingFileError(error) {
 	return Boolean(error && typeof error === "object" && "code" in error && error.code === "ENOENT");
@@ -1282,10 +287,11 @@ const CODEX_PROMPT_TOTAL_INPUT_KEYS = [
 const MAX_TOOL_OUTPUT_DELTA_MESSAGES_PER_ITEM = 20;
 const TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS = 12e3;
 var CodexAppServerEventProjector = class {
-	constructor(params, threadId, turnId) {
+	constructor(params, threadId, turnId, options = {}) {
 		this.params = params;
 		this.threadId = threadId;
 		this.turnId = turnId;
+		this.options = options;
 		this.assistantTextByItem = /* @__PURE__ */ new Map();
 		this.assistantItemOrder = [];
 		this.reasoningTextByItem = /* @__PURE__ */ new Map();
@@ -1301,6 +307,9 @@ var CodexAppServerEventProjector = class {
 		this.toolTranscriptMessages = [];
 		this.toolTranscriptCallIds = /* @__PURE__ */ new Set();
 		this.toolTranscriptResultIds = /* @__PURE__ */ new Set();
+		this.nativeGeneratedMediaUrls = /* @__PURE__ */ new Set();
+		this.diagnosticToolStartedAtByItem = /* @__PURE__ */ new Map();
+		this.afterToolCallObservedItemIds = /* @__PURE__ */ new Set();
 		this.assistantStarted = false;
 		this.reasoningStarted = false;
 		this.reasoningEnded = false;
@@ -1418,7 +427,7 @@ var CodexAppServerEventProjector = class {
 			messagingToolSentMediaUrls: toolTelemetry.messagingToolSentMediaUrls,
 			messagingToolSentTargets: toolTelemetry.messagingToolSentTargets,
 			heartbeatToolResponse: toolTelemetry.heartbeatToolResponse,
-			toolMediaUrls: toolTelemetry.toolMediaUrls,
+			toolMediaUrls: this.buildToolMediaUrls(toolTelemetry),
 			toolAudioAsVoice: toolTelemetry.toolAudioAsVoice,
 			successfulCronAdds: toolTelemetry.successfulCronAdds,
 			cloudCodeAssistFormatError: false,
@@ -1457,6 +466,9 @@ var CodexAppServerEventProjector = class {
 		this.promptError = "codex app-server attempt timed out";
 		this.promptErrorSource = "prompt";
 	}
+	markAborted() {
+		this.aborted = true;
+	}
 	isCompacting() {
 		return this.activeCompactionItemIds.size > 0;
 	}
@@ -1565,6 +577,7 @@ var CodexAppServerEventProjector = class {
 			this.rememberAssistantItem(item.id);
 			this.assistantTextByItem.set(item.id, item.text);
 		}
+		this.recordNativeGeneratedMedia(item);
 		if (item?.type === "plan" && typeof item.text === "string" && item.text) {
 			this.planTextByItem.set(item.id, item.text);
 			this.emitPlanUpdate({
@@ -1694,6 +707,7 @@ var CodexAppServerEventProjector = class {
 				this.rememberAssistantItem(item.id);
 				this.assistantTextByItem.set(item.id, item.text);
 			}
+			this.recordNativeGeneratedMedia(item);
 			if (item.type === "plan" && typeof item.text === "string" && item.text) {
 				this.planTextByItem.set(item.id, item.text);
 				this.emitPlanUpdate({
@@ -1704,6 +718,7 @@ var CodexAppServerEventProjector = class {
 			this.recordToolMeta(item);
 			this.recordNativeToolTranscriptCall(item);
 			this.recordNativeToolTranscriptResult(item);
+			this.emitAfterToolCallObservation(item);
 			this.emitToolResultSummary(item);
 			this.emitToolResultOutput(item);
 		}
@@ -1752,6 +767,16 @@ var CodexAppServerEventProjector = class {
 		this.rememberAssistantItem(itemId);
 		this.assistantTextByItem.set(itemId, text);
 	}
+	recordNativeGeneratedMedia(item) {
+		if (item?.type !== "imageGeneration") return;
+		const savedPath = readItemString(item, "savedPath")?.trim();
+		if (savedPath) this.nativeGeneratedMediaUrls.add(savedPath);
+	}
+	buildToolMediaUrls(toolTelemetry) {
+		const mediaUrls = new Set(toolTelemetry.toolMediaUrls?.map((url) => url.trim()).filter(Boolean) ?? []);
+		if ((toolTelemetry.messagingToolSentMediaUrls?.length ?? 0) === 0) for (const mediaUrl of this.nativeGeneratedMediaUrls) mediaUrls.add(mediaUrl);
+		return mediaUrls.size > 0 ? [...mediaUrls] : toolTelemetry.toolMediaUrls;
+	}
 	async maybeEndReasoning() {
 		if (!this.reasoningStarted || this.reasoningEnded) return;
 		this.reasoningEnded = true;
@@ -1799,6 +824,12 @@ var CodexAppServerEventProjector = class {
 		const meta = itemMeta(item, this.toolProgressDetailMode());
 		const args = params.phase === "start" ? itemToolArgs(item) : void 0;
 		const status = params.phase === "result" ? itemStatus(item) : "running";
+		this.emitDiagnosticToolExecutionEvent({
+			phase: params.phase,
+			item,
+			name,
+			status
+		});
 		this.emitAgentEvent({
 			stream: "tool",
 			data: {
@@ -1815,6 +846,74 @@ var CodexAppServerEventProjector = class {
 				} : {}
 			}
 		});
+		if (params.phase === "result") this.emitAfterToolCallObservation(item);
+	}
+	emitDiagnosticToolExecutionEvent(params) {
+		const base = {
+			runId: this.params.runId,
+			sessionId: this.params.sessionId,
+			sessionKey: this.params.sessionKey,
+			toolName: params.name,
+			toolCallId: params.item.id
+		};
+		if (params.phase === "start") {
+			this.diagnosticToolStartedAtByItem.set(params.item.id, Date.now());
+			emitTrustedDiagnosticEvent({
+				type: "tool.execution.started",
+				...base
+			});
+			return;
+		}
+		const startedAt = this.diagnosticToolStartedAtByItem.get(params.item.id);
+		this.diagnosticToolStartedAtByItem.delete(params.item.id);
+		const durationMs = (typeof params.item.durationMs === "number" ? params.item.durationMs : void 0) ?? (startedAt === void 0 ? 0 : Math.max(0, Date.now() - startedAt));
+		const terminalEvent = params.status === "blocked" ? {
+			type: "tool.execution.blocked",
+			reason: "codex_native_tool_blocked",
+			deniedReason: "codex_native_tool_blocked"
+		} : params.status === "failed" ? {
+			type: "tool.execution.error",
+			durationMs,
+			errorCategory: "codex_native_tool_error"
+		} : {
+			type: "tool.execution.completed",
+			durationMs
+		};
+		emitTrustedDiagnosticEvent({
+			...base,
+			...terminalEvent
+		});
+	}
+	emitAfterToolCallObservation(item) {
+		if (!this.shouldEmitAfterToolCallObservation(item)) return;
+		const name = itemName(item);
+		if (!name) return;
+		const status = itemStatus(item);
+		if (status === "running") return;
+		this.afterToolCallObservedItemIds.add(item.id);
+		const result = itemToolResult(item).result;
+		const error = itemToolError(item, status);
+		const startedAt = typeof item.durationMs === "number" ? Date.now() - Math.max(0, item.durationMs) : void 0;
+		const hookParams = {
+			toolName: name,
+			toolCallId: item.id,
+			runId: this.params.runId,
+			agentId: this.params.agentId,
+			sessionId: this.params.sessionId,
+			sessionKey: this.params.sessionKey,
+			startArgs: itemToolArgs(item) ?? {},
+			...result !== void 0 ? { result } : {},
+			...error ? { error } : {},
+			...startedAt !== void 0 ? { startedAt } : {}
+		};
+		setImmediate(() => {
+			runAgentHarnessAfterToolCallHook(hookParams);
+		});
+	}
+	shouldEmitAfterToolCallObservation(item) {
+		if (!shouldSynthesizeToolProgressForItem(item) || this.afterToolCallObservedItemIds.has(item.id)) return false;
+		if (this.options.nativePostToolUseRelayEnabled && isNativePostToolUseRelayItem(item)) return false;
+		return true;
 	}
 	emitToolResultSummary(item) {
 		if (!item || !this.params.onToolResult || !this.shouldEmitToolResult()) return;
@@ -1986,13 +1085,15 @@ var CodexAppServerEventProjector = class {
 		};
 	}
 	createToolCallMessage(params) {
+		const args = normalizeToolTranscriptArguments(params.arguments);
 		return {
 			role: "assistant",
 			content: [{
 				type: "toolCall",
 				id: params.id,
 				name: params.name,
-				arguments: normalizeToolTranscriptArguments(params.arguments)
+				arguments: args,
+				input: args
 			}],
 			api: this.params.model.api ?? "openai-codex-responses",
 			provider: this.params.provider,
@@ -2011,6 +1112,9 @@ var CodexAppServerEventProjector = class {
 			isError: params.isError,
 			content: [{
 				type: "toolResult",
+				id: params.id,
+				name: params.name,
+				toolName: params.name,
 				toolCallId: params.id,
 				toolUseId: params.id,
 				tool_use_id: params.id,
@@ -2193,6 +1297,14 @@ function shouldSynthesizeToolProgressForItem(item) {
 		default: return false;
 	}
 }
+function isNativePostToolUseRelayItem(item) {
+	switch (item.type) {
+		case "commandExecution":
+		case "fileChange":
+		case "mcpToolCall": return true;
+		default: return false;
+	}
+}
 function shouldSuppressChannelProgressForItem(item) {
 	if (shouldSynthesizeToolProgressForItem(item)) return true;
 	return item.type === "dynamicToolCall";
@@ -2202,6 +1314,7 @@ function itemToolArgs(item) {
 		command: item.command,
 		...typeof item.cwd === "string" ? { cwd: item.cwd } : {}
 	});
+	if (item.type === "fileChange") return sanitizeCodexAgentEventRecord({ changes: itemFileChanges(item) });
 	if (item.type === "webSearch" && typeof item.query === "string") return sanitizeCodexAgentEventRecord({ query: item.query });
 	if (item.type === "mcpToolCall") return sanitizeCodexToolArguments(item.arguments);
 }
@@ -2213,10 +1326,7 @@ function itemToolResult(item) {
 	}) };
 	if (item.type === "fileChange") return { result: sanitizeCodexAgentEventRecord({
 		status: item.status,
-		changes: item.changes.map((change) => ({
-			path: change.path,
-			kind: change.kind
-		}))
+		changes: itemFileChanges(item)
 	}) };
 	if (item.type === "mcpToolCall") return { result: sanitizeCodexAgentEventRecord({
 		status: item.status,
@@ -2227,6 +1337,17 @@ function itemToolResult(item) {
 	if (item.type === "webSearch") return { result: sanitizeCodexAgentEventRecord({ status: "completed" }) };
 	return {};
 }
+function itemFileChanges(item) {
+	return Array.isArray(item.changes) ? item.changes.map((change) => ({
+		path: change.path,
+		kind: change.kind
+	})) : [];
+}
+function itemToolError(item, status) {
+	if (status === "blocked") return "codex native tool blocked";
+	if (status !== "failed") return;
+	return itemOutputText(item) ?? "codex native tool failed";
+}
 function itemMeta(item, detailMode = "explain") {
 	if (item.type === "commandExecution" && typeof item.command === "string") return inferToolMetaFromArgs("exec", {
 		command: item.command,
@@ -2733,18 +1854,14 @@ function readRequestId(record) {
 	return typeof value === "string" || typeof value === "number" ? value : void 0;
 }
 //#endregion
-//#region extensions/codex/src/app-server/vision-tools.ts
-function filterToolsForVisionInputs(tools, params) {
-	if (!params.modelHasVision || !params.hasInboundImages) return tools;
-	return tools.filter((tool) => tool.name !== "image");
-}
-//#endregion
 //#region extensions/codex/src/app-server/run-attempt.ts
 const CODEX_DYNAMIC_TOOL_TIMEOUT_MS = 3e4;
 const CODEX_DYNAMIC_TOOL_MAX_TIMEOUT_MS = 6e5;
 const CODEX_DYNAMIC_IMAGE_TOOL_TIMEOUT_MS = 6e4;
 const CODEX_APP_SERVER_STARTUP_CONNECTION_CLOSE_MAX_ATTEMPTS = 3;
 const CODEX_APP_SERVER_STARTUP_TIMEOUT_FLOOR_MS = 100;
+const CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS = 5e3;
+const CODEX_USAGE_LIMIT_RATE_LIMIT_REFRESH_TIMEOUT_MS = 5e3;
 const CODEX_TURN_COMPLETION_IDLE_TIMEOUT_MS = 6e4;
 const CODEX_TURN_TERMINAL_IDLE_TIMEOUT_MS = 30 * 6e4;
 const CODEX_NATIVE_HOOK_RELAY_MIN_TTL_MS = 30 * 6e4;
@@ -2964,7 +2081,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		config: params.config,
 		agentId: params.agentId
 	});
-	const agentDir = params.agentDir ?? resolveAgentDir(params.config ?? {}, sessionAgentId);
+	const agentDir = params.agentDir ?? resolveAgentDir$1(params.config ?? {}, sessionAgentId);
 	const startupBinding = await readCodexAppServerBinding(params.sessionFile);
 	const startupAuthProfileCandidate = params.runtimePlan?.auth.forwardedAuthProfileId ?? params.authProfileId ?? startupBinding?.authProfileId;
 	const startupAuthProfileId = params.authProfileStore ? resolveCodexAppServerAuthProfileId({
@@ -3047,13 +2164,14 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		historyMessages = await readMirroredSessionHistoryMessages(params.sessionFile) ?? historyMessages;
 	}
 	const baseDeveloperInstructions = buildDeveloperInstructions(params);
-	const workspaceBootstrapInstructions = await buildCodexWorkspaceBootstrapInstructions({
+	const workspaceBootstrapContext = await buildCodexWorkspaceBootstrapContext({
 		params,
 		resolvedWorkspace,
 		effectiveWorkspace,
 		sessionKey: sandboxSessionKey,
 		sessionAgentId
 	});
+	const workspaceBootstrapInstructions = workspaceBootstrapContext.instructions;
 	let promptText = params.prompt;
 	let developerInstructions = joinPresentSections(baseDeveloperInstructions, workspaceBootstrapInstructions);
 	let prePromptMessageCount = historyMessages.length;
@@ -3095,12 +2213,21 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		promptText = projection.promptText;
 		prePromptMessageCount = projection.prePromptMessageCount;
 	}
+	promptText = prependCurrentTurnContext(promptText, params.currentTurnContext);
 	const promptBuild = await resolveAgentHarnessBeforePromptBuildResult({
 		prompt: promptText,
 		developerInstructions,
 		messages: historyMessages,
 		ctx: hookContext
 	});
+	const systemPromptReport = buildCodexSystemPromptReport({
+		attempt: params,
+		sessionKey: sandboxSessionKey,
+		workspaceDir: effectiveWorkspace,
+		developerInstructions: promptBuild.developerInstructions,
+		workspaceBootstrapContext,
+		tools: toolBridge.specs
+	});
 	const trajectoryRecorder = createCodexTrajectoryRecorder({
 		attempt: params,
 		cwd: effectiveWorkspace,
@@ -3419,6 +2546,36 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		});
 		lifecycleTerminalEmitted = true;
 	};
+	const executionPhaseKeys = /* @__PURE__ */ new Set();
+	const emitExecutionPhaseOnce = (key, info) => {
+		if (executionPhaseKeys.has(key)) return;
+		executionPhaseKeys.add(key);
+		params.onExecutionPhase?.({
+			provider: params.provider,
+			model: params.modelId,
+			backend: "codex-app-server",
+			...info
+		});
+	};
+	const reportCodexExecutionNotification = (notification) => {
+		if (notification.method === "turn/started") {
+			emitExecutionPhaseOnce("turn_accepted", { phase: "turn_accepted" });
+			return;
+		}
+		if (notification.method === "item/agentMessage/delta") {
+			emitExecutionPhaseOnce("assistant_output_started", { phase: "assistant_output_started" });
+			return;
+		}
+		if (notification.method !== "item/started") return;
+		const item = readCodexNotificationItem(notification.params);
+		const tool = item ? codexExecutionToolName(item) : void 0;
+		if (!item || !tool) return;
+		emitExecutionPhaseOnce(`tool:${item.id}`, {
+			phase: "tool_execution_started",
+			tool,
+			itemId: item.id
+		});
+	};
 	const handleNotification = async (notification) => {
 		userInputBridge?.handleNotification(notification);
 		if (!projector || !turnId) {
@@ -3426,11 +2583,16 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			return;
 		}
 		const isCurrentTurnNotification = isTurnNotification(notification.params, thread.threadId, turnId);
-		if (isCurrentTurnNotification) touchTurnCompletionActivity(`notification:${notification.method}`, { details: describeNotificationActivity(notification) });
+		if (isCurrentTurnNotification) {
+			touchTurnCompletionActivity(`notification:${notification.method}`, { details: describeNotificationActivity(notification) });
+			reportCodexExecutionNotification(notification);
+		}
 		if (isCurrentTurnNotification && notification.method === "error") if (isRetryableErrorNotification(notification.params)) disarmTurnCompletionIdleWatch();
 		else armTurnCompletionIdleWatch({ pinnedByTerminalError: true });
 		else if (turnCompletionIdleWatchArmed && !turnCompletionIdleWatchPinnedByTerminalError && notification.method !== "turn/completed" && isCurrentTurnNotification) disarmTurnCompletionIdleWatch();
 		const isTurnCompletion = notification.method === "turn/completed" && isCurrentTurnNotification;
+		const isTurnAbortMarker = isCurrentTurnNotification && isCodexTurnAbortMarkerNotification(notification, { currentPromptText: promptBuild.prompt });
+		const isTurnTerminal = isTurnCompletion || isTurnAbortMarker;
 		try {
 			await projector.handleNotification(notification);
 		} catch (error) {
@@ -3439,7 +2601,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				error
 			});
 		} finally {
-			if (isTurnCompletion) {
+			if (isTurnTerminal) {
+				if (isTurnAbortMarker) projector.markAborted();
 				if (!timedOut && !runAbortController.signal.aborted) await steeringQueue?.flushPending();
 				completed = true;
 				clearTurnCompletionIdleTimer();
@@ -3512,6 +2675,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				tool: call.tool,
 				arguments: call.arguments
 			});
+			emitExecutionPhaseOnce(`tool:${call.callId}`, {
+				phase: "tool_execution_started",
+				tool: call.tool,
+				toolCallId: call.callId
+			});
 			const toolMeta = inferCodexDynamicToolMeta(call, resolveCodexToolProgressDetailMode(params.toolProgressDetail));
 			const toolArgs = sanitizeCodexToolArguments(call.arguments);
 			emitCodexAppServerEvent(params, {
@@ -3586,10 +2754,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	};
 	const turnStartFailureMessages = [...historyMessages, {
 		role: "user",
-		content: [{
-			type: "text",
-			text: promptBuild.prompt
-		}]
+		content: promptBuild.prompt,
+		timestamp: Date.now()
 	}];
 	let turn;
 	try {
@@ -3614,8 +2780,14 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			signal: runAbortController.signal
 		}));
 	} catch (error) {
-		const usageLimitError = formatCodexTurnStartUsageLimitError(error, pendingNotifications);
-		const turnStartErrorMessage = usageLimitError ?? formatErrorMessage(error);
+		const usageLimitError = await formatCodexTurnStartUsageLimitError({
+			client,
+			error,
+			pendingNotifications,
+			timeoutMs: appServer.requestTimeoutMs,
+			signal: runAbortController.signal
+		});
+		const turnStartErrorMessage = usageLimitError?.message ?? formatErrorMessage(error);
 		emitCodexAppServerEvent(params, {
 			stream: "codex_app_server.lifecycle",
 			data: {
@@ -3665,11 +2837,24 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			}
 		});
 		params.abortSignal?.removeEventListener("abort", abortFromUpstream);
-		if (usageLimitError) throw new Error(usageLimitError, { cause: error });
+		if (usageLimitError) {
+			await markCodexAuthProfileBlockedFromRateLimits({
+				params,
+				authProfileId: startupAuthProfileId,
+				rateLimits: usageLimitError.rateLimitsForProfile
+			});
+			return buildCodexTurnStartFailureResult({
+				params,
+				message: usageLimitError.message,
+				messagesSnapshot: turnStartFailureMessages,
+				systemPromptReport
+			});
+		}
 		throw error;
 	}
 	turnId = turn.turn.id;
 	const activeTurnId = turn.turn.id;
+	emitExecutionPhaseOnce("turn_accepted", { phase: "turn_accepted" });
 	userInputBridge = createCodexUserInputBridge({
 		paramsForRun: params,
 		threadId: thread.threadId,
@@ -3682,7 +2867,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		prompt: promptBuild.prompt,
 		imagesCount: params.images?.length ?? 0
 	});
-	projector = new CodexAppServerEventProjector(params, thread.threadId, activeTurnId);
+	projector = new CodexAppServerEventProjector(params, thread.threadId, activeTurnId, { nativePostToolUseRelayEnabled: nativeHookRelay?.allowedEvents.includes("post_tool_use") === true });
 	emitLifecycleStart();
 	const activeProjector = projector;
 	for (const notification of pendingNotifications.splice(0)) await enqueueNotification(notification);
@@ -3719,9 +2904,16 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		runAbortController.abort("timeout");
 	}, Math.max(100, params.timeoutMs));
 	const abortListener = () => {
+		const shouldRetireClient = timedOut;
 		interruptCodexTurnBestEffort(client, {
 			threadId: thread.threadId,
-			turnId: activeTurnId
+			turnId: activeTurnId,
+			timeoutMs: shouldRetireClient ? CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS : void 0
+		});
+		if (shouldRetireClient) retireCodexAppServerClientAfterTimedOutTurn(client, {
+			threadId: thread.threadId,
+			turnId: activeTurnId,
+			reason: String(runAbortController.signal.reason ?? "timeout")
 		});
 		resolveCompletion?.();
 	};
@@ -3731,7 +2923,18 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		await completion;
 		const result = activeProjector.buildResult(toolBridge.telemetry, { yieldDetected });
 		const finalAborted = result.aborted || runAbortController.signal.aborted;
-		const finalPromptError = turnCompletionIdleTimedOut ? turnCompletionIdleTimeoutMessage : timedOut ? "codex app-server attempt timed out" : result.promptError;
+		let finalPromptError = turnCompletionIdleTimedOut ? turnCompletionIdleTimeoutMessage : timedOut ? "codex app-server attempt timed out" : result.promptError;
+		const finalPromptErrorMessage = typeof finalPromptError === "string" ? finalPromptError : finalPromptError ? formatErrorMessage(finalPromptError) : void 0;
+		if (shouldRefreshCodexRateLimitsForUsageLimitMessage(finalPromptErrorMessage)) finalPromptError = await refreshCodexUsageLimitErrorMessage({
+			client,
+			source: {
+				message: finalPromptErrorMessage,
+				codexErrorInfo: "usageLimitExceeded",
+				rateLimits: readRecentCodexRateLimits()
+			},
+			timeoutMs: appServer.requestTimeoutMs,
+			signal: runAbortController.signal
+		});
 		const finalPromptErrorSource = timedOut ? "prompt" : result.promptErrorSource;
 		recordCodexTrajectoryCompletion(trajectoryRecorder, {
 			attempt: params,
@@ -3825,7 +3028,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			timedOut,
 			aborted: finalAborted,
 			promptError: finalPromptError,
-			promptErrorSource: finalPromptErrorSource
+			promptErrorSource: finalPromptErrorSource,
+			systemPromptReport
 		};
 	} finally {
 		emitLifecycleTerminal({
@@ -3862,6 +3066,60 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		clearActiveEmbeddedRun(params.sessionId, handle, params.sessionKey);
 	}
 }
+async function markCodexAuthProfileBlockedFromRateLimits(params) {
+	const authProfileId = params.authProfileId?.trim();
+	if (!authProfileId || !params.params.authProfileStore) return;
+	const blockedUntil = resolveCodexUsageLimitResetAtMs(params.rateLimits);
+	if (!blockedUntil) return;
+	try {
+		await markAuthProfileBlockedUntil({
+			store: params.params.authProfileStore,
+			profileId: authProfileId,
+			blockedUntil,
+			source: "codex_rate_limits",
+			agentDir: params.params.agentDir,
+			runId: params.params.runId,
+			modelId: params.params.modelId
+		});
+	} catch (error) {
+		embeddedAgentLog.debug("failed to mark Codex auth profile blocked from app-server limits", {
+			authProfileId,
+			error: formatErrorMessage(error)
+		});
+	}
+}
+function buildCodexTurnStartFailureResult(params) {
+	return {
+		aborted: false,
+		externalAbort: false,
+		timedOut: false,
+		idleTimedOut: false,
+		timedOutDuringCompaction: false,
+		timedOutDuringToolExecution: false,
+		promptError: params.message,
+		promptErrorSource: "prompt",
+		sessionIdUsed: params.params.sessionId,
+		messagesSnapshot: params.messagesSnapshot,
+		assistantTexts: [],
+		toolMetas: [],
+		lastAssistant: void 0,
+		didSendViaMessagingTool: false,
+		messagingToolSentTexts: [],
+		messagingToolSentMediaUrls: [],
+		messagingToolSentTargets: [],
+		cloudCodeAssistFormatError: false,
+		replayMetadata: {
+			hadPotentialSideEffects: false,
+			replaySafe: true
+		},
+		itemLifecycle: {
+			startedCount: 0,
+			completedCount: 0,
+			activeCount: 0
+		},
+		systemPromptReport: params.systemPromptReport
+	};
+}
 async function handleDynamicToolCallWithTimeout(params) {
 	if (params.signal.aborted) return failedDynamicToolResponse("OpenClaw dynamic tool call aborted before execution.");
 	const controller = new AbortController();
@@ -3989,8 +3247,31 @@ function buildCodexNativeHookRelayId(params) {
 	return `codex-${hash.digest("hex").slice(0, 40)}`;
 }
 function interruptCodexTurnBestEffort(client, params) {
-	Promise.resolve().then(() => client.request("turn/interrupt", params)).catch((error) => {
+	const requestOptions = params.timeoutMs && Number.isFinite(params.timeoutMs) && params.timeoutMs > 0 ? { timeoutMs: params.timeoutMs } : void 0;
+	const requestParams = {
+		threadId: params.threadId,
+		turnId: params.turnId
+	};
+	try {
+		const interrupt = requestOptions ? client.request("turn/interrupt", requestParams, requestOptions) : client.request("turn/interrupt", requestParams);
+		Promise.resolve(interrupt).catch((error) => {
+			embeddedAgentLog.debug("codex app-server turn interrupt failed during abort", { error });
+		});
+	} catch (error) {
 		embeddedAgentLog.debug("codex app-server turn interrupt failed during abort", { error });
+	}
+}
+function retireCodexAppServerClientAfterTimedOutTurn(client, params) {
+	const clearedSharedClient = clearSharedCodexAppServerClientIfCurrent(client);
+	if (!clearedSharedClient) {
+		const close = client.close;
+		if (typeof close === "function") close.call(client);
+	}
+	embeddedAgentLog.warn("codex app-server client retired after timed-out turn", {
+		threadId: params.threadId,
+		turnId: params.turnId,
+		reason: params.reason,
+		clearedSharedClient
 	});
 }
 function resolveOpenClawCodingToolsSessionKeys(params, sandboxSessionKey) {
@@ -4003,7 +3284,7 @@ async function buildDynamicTools(input) {
 	const { params } = input;
 	if (params.disableTools || !supportsModelTools(params.model)) return [];
 	const modelHasVision = params.model.input?.includes("image") ?? false;
-	const agentDir = params.agentDir ?? resolveAgentDir(params.config ?? {}, input.sessionAgentId);
+	const agentDir = params.agentDir ?? resolveAgentDir$1(params.config ?? {}, input.sessionAgentId);
 	const createOpenClawCodingTools = openClawCodingToolsFactoryForTests ?? (await import("openclaw/plugin-sdk/agent-harness")).createOpenClawCodingTools;
 	const sessionKeys = resolveOpenClawCodingToolsSessionKeys(params, input.sandboxSessionKey);
 	const filteredTools = filterCodexDynamicToolsForAllowlist(filterToolsForVisionInputs(filterCodexDynamicTools(createOpenClawCodingTools({
@@ -4142,14 +3423,76 @@ function resolveCodexTurnTerminalIdleTimeoutMs(value) {
 function readDynamicToolCallParams(value) {
 	return readCodexDynamicToolCallParams(value);
 }
-function formatCodexTurnStartUsageLimitError(error, pendingNotifications) {
+async function formatCodexTurnStartUsageLimitError(params) {
+	return refreshCodexUsageLimitError({
+		client: params.client,
+		source: readCodexTurnStartUsageLimitErrorSource(params.error, params.pendingNotifications),
+		timeoutMs: params.timeoutMs,
+		signal: params.signal
+	});
+}
+async function refreshCodexUsageLimitErrorMessage(params) {
+	return (await refreshCodexUsageLimitError({
+		client: params.client,
+		source: params.source,
+		timeoutMs: params.timeoutMs,
+		signal: params.signal
+	}))?.message;
+}
+async function refreshCodexUsageLimitError(params) {
+	const initialMessage = formatCodexUsageLimitErrorMessage(params.source);
+	if (!shouldRefreshCodexRateLimitsForUsageLimitMessage(initialMessage)) return initialMessage ? {
+		message: initialMessage,
+		...params.source.rateLimitsTrustedForProfile ? { rateLimitsForProfile: params.source.rateLimits } : {}
+	} : void 0;
+	const rateLimits = await readCodexRateLimitsFromAppServerForUsageLimitError({
+		client: params.client,
+		timeoutMs: params.timeoutMs,
+		signal: params.signal
+	});
+	if (!rateLimits) return initialMessage ? {
+		message: initialMessage,
+		...params.source.rateLimitsTrustedForProfile ? { rateLimitsForProfile: params.source.rateLimits } : {}
+	} : void 0;
+	const message = formatCodexUsageLimitErrorMessage({
+		message: params.source.message,
+		codexErrorInfo: params.source.codexErrorInfo,
+		rateLimits
+	}) ?? initialMessage;
+	return message ? {
+		message,
+		rateLimitsForProfile: rateLimits
+	} : void 0;
+}
+async function readCodexRateLimitsFromAppServerForUsageLimitError(params) {
+	if (params.signal?.aborted) return;
+	try {
+		const rateLimits = await params.client.request(CODEX_CONTROL_METHODS.rateLimits, void 0, {
+			timeoutMs: resolveCodexUsageLimitRateLimitRefreshTimeoutMs(params.timeoutMs),
+			signal: params.signal
+		});
+		rememberCodexRateLimits(rateLimits);
+		return rateLimits;
+	} catch (error) {
+		embeddedAgentLog.debug("codex app-server rate-limit refresh failed after usage-limit error", { error: formatErrorMessage(error) });
+		return;
+	}
+}
+function resolveCodexUsageLimitRateLimitRefreshTimeoutMs(timeoutMs) {
+	if (timeoutMs === void 0 || !Number.isFinite(timeoutMs) || timeoutMs <= 0) return CODEX_USAGE_LIMIT_RATE_LIMIT_REFRESH_TIMEOUT_MS;
+	return Math.max(100, Math.min(timeoutMs, CODEX_USAGE_LIMIT_RATE_LIMIT_REFRESH_TIMEOUT_MS));
+}
+function readCodexTurnStartUsageLimitErrorSource(error, pendingNotifications) {
 	const notificationError = readLatestCodexErrorNotification(pendingNotifications);
+	const notificationRateLimits = readLatestRateLimitNotificationPayload(pendingNotifications);
 	const errorPayload = readCodexErrorPayload(error);
-	return formatCodexUsageLimitErrorMessage({
+	const rateLimits = notificationRateLimits ?? errorPayload.rateLimits ?? readRecentCodexRateLimits();
+	return {
 		message: notificationError?.message ?? errorPayload.message ?? formatErrorMessage(error),
 		codexErrorInfo: notificationError?.codexErrorInfo ?? errorPayload.codexErrorInfo,
-		rateLimits: readLatestRateLimitNotificationPayload(pendingNotifications) ?? errorPayload.rateLimits ?? readRecentCodexRateLimits()
-	});
+		rateLimits,
+		rateLimitsTrustedForProfile: notificationRateLimits !== void 0 || errorPayload.rateLimits !== void 0
+	};
 }
 function readLatestRateLimitNotificationPayload(notifications) {
 	for (let index = notifications.length - 1; index >= 0; index -= 1) {
@@ -4178,10 +3521,12 @@ function readCodexErrorPayload(error) {
 	const data = error.data;
 	if (!isJsonObject(data)) return { message };
 	const nestedError = isJsonObject(data.error) ? data.error : data;
+	const rateLimits = nestedError.rateLimits ?? data.rateLimits;
+	if (rateLimits !== void 0) rememberCodexRateLimits(rateLimits);
 	return {
 		message: readString(nestedError, "message") ?? message,
 		codexErrorInfo: nestedError.codexErrorInfo,
-		rateLimits: nestedError.rateLimits ?? data.rateLimits
+		rateLimits
 	};
 }
 function describeNotificationActivity(notification) {
@@ -4225,6 +3570,35 @@ function readNestedTurnId(record) {
 	const turn = record.turn;
 	return isJsonObject(turn) ? readString(turn, "id") : void 0;
 }
+const CODEX_TURN_ABORT_MARKER_START = "<turn_aborted>";
+const CODEX_TURN_ABORT_MARKER_END = "</turn_aborted>";
+const CODEX_INTERRUPTED_USER_GUIDANCE = "The user interrupted the previous turn on purpose. Any running unified exec processes may still be running in the background. If any tools/commands were aborted, they may have partially executed.";
+const CODEX_INTERRUPTED_DEVELOPER_GUIDANCE = "The previous turn was interrupted on purpose. Any running unified exec processes may still be running in the background. If any tools/commands were aborted, they may have partially executed.";
+function isCodexTurnAbortMarkerNotification(notification, options = {}) {
+	if (notification.method !== "rawResponseItem/completed" || !isJsonObject(notification.params)) return false;
+	const item = notification.params.item;
+	const role = isJsonObject(item) ? readString(item, "role") : void 0;
+	if (!isJsonObject(item) || role !== "user" && role !== "developer") return false;
+	const text = extractRawResponseItemText(item).trim();
+	if (role === "user" && text === options.currentPromptText?.trim()) return false;
+	const markerBody = readCodexTurnAbortMarkerBody(text);
+	return markerBody === CODEX_INTERRUPTED_USER_GUIDANCE || markerBody === CODEX_INTERRUPTED_DEVELOPER_GUIDANCE;
+}
+function readCodexTurnAbortMarkerBody(text) {
+	if (!text.startsWith(CODEX_TURN_ABORT_MARKER_START) || !text.endsWith(CODEX_TURN_ABORT_MARKER_END)) return;
+	return text.slice(14, -15).trim();
+}
+function extractRawResponseItemText(item) {
+	const content = item.content;
+	if (!Array.isArray(content)) return "";
+	return content.flatMap((entry) => {
+		if (!isJsonObject(entry)) return [];
+		const type = readString(entry, "type");
+		if (type !== "input_text" && type !== "text") return [];
+		const text = readString(entry, "text");
+		return text ? [text] : [];
+	}).join("");
+}
 function readString(record, key) {
 	const value = record[key];
 	return typeof value === "string" ? value : void 0;
@@ -4238,9 +3612,9 @@ async function readMirroredSessionHistoryMessages(sessionFile) {
 	if (!messages) embeddedAgentLog.warn("failed to read mirrored session history for codex harness hooks", { sessionFile });
 	return messages;
 }
-async function buildCodexWorkspaceBootstrapInstructions(params) {
+async function buildCodexWorkspaceBootstrapContext(params) {
 	try {
-		const { contextFiles } = await resolveBootstrapContextForRun({
+		const bootstrapContext = await resolveBootstrapContextForRun({
 			workspaceDir: params.resolvedWorkspace,
 			config: params.params.config,
 			sessionKey: params.sessionKey,
@@ -4250,16 +3624,118 @@ async function buildCodexWorkspaceBootstrapInstructions(params) {
 			contextMode: params.params.bootstrapContextMode,
 			runKind: params.params.bootstrapContextRunKind
 		});
-		return renderCodexWorkspaceBootstrapInstructions(contextFiles.map((file) => remapCodexContextFilePath({
+		const contextFiles = bootstrapContext.contextFiles.map((file) => remapCodexContextFilePath({
 			file,
 			sourceWorkspaceDir: params.resolvedWorkspace,
 			targetWorkspaceDir: params.effectiveWorkspace
-		})));
+		}));
+		return {
+			...bootstrapContext,
+			contextFiles,
+			instructions: renderCodexWorkspaceBootstrapInstructions(contextFiles)
+		};
 	} catch (error) {
 		embeddedAgentLog.warn("failed to load codex workspace bootstrap instructions", { error });
-		return;
+		return {
+			bootstrapFiles: [],
+			contextFiles: []
+		};
 	}
 }
+function buildCodexSystemPromptReport(params) {
+	const toolEntries = params.tools.map(buildCodexToolReportEntry);
+	const schemaChars = toolEntries.reduce((sum, tool) => sum + tool.schemaChars, 0);
+	const projectContextChars = params.workspaceBootstrapContext.instructions?.length ?? 0;
+	const bootstrapMaxChars = readPositiveNumber(params.attempt.config?.agents?.defaults?.bootstrapMaxChars);
+	const bootstrapTotalMaxChars = readPositiveNumber(params.attempt.config?.agents?.defaults?.bootstrapTotalMaxChars);
+	return {
+		source: "run",
+		generatedAt: Date.now(),
+		sessionId: params.attempt.sessionId,
+		sessionKey: params.sessionKey,
+		provider: params.attempt.provider,
+		model: params.attempt.modelId,
+		workspaceDir: params.workspaceDir,
+		...bootstrapMaxChars ? { bootstrapMaxChars } : {},
+		...bootstrapTotalMaxChars ? { bootstrapTotalMaxChars } : {},
+		systemPrompt: {
+			chars: params.developerInstructions.length,
+			projectContextChars,
+			nonProjectContextChars: Math.max(0, params.developerInstructions.length - projectContextChars)
+		},
+		injectedWorkspaceFiles: buildCodexBootstrapInjectionStats({
+			bootstrapFiles: params.workspaceBootstrapContext.bootstrapFiles,
+			injectedFiles: params.workspaceBootstrapContext.contextFiles
+		}),
+		skills: {
+			promptChars: 0,
+			entries: []
+		},
+		tools: {
+			listChars: 0,
+			schemaChars,
+			entries: toolEntries
+		}
+	};
+}
+function buildCodexToolReportEntry(tool) {
+	const summary = tool.description.trim();
+	if (tool.deferLoading === true) return {
+		name: tool.name,
+		summaryChars: summary.length,
+		schemaChars: 0,
+		propertiesCount: null
+	};
+	return {
+		name: tool.name,
+		summaryChars: summary.length,
+		...buildCodexToolSchemaStats(tool.inputSchema)
+	};
+}
+function buildCodexToolSchemaStats(schema) {
+	const schemaChars = (() => {
+		try {
+			return JSON.stringify(schema).length;
+		} catch {
+			return 0;
+		}
+	})();
+	const properties = isJsonObject(schema) && isJsonObject(schema.properties) ? schema.properties : null;
+	return {
+		schemaChars,
+		propertiesCount: properties ? Object.keys(properties).length : null
+	};
+}
+function buildCodexBootstrapInjectionStats(params) {
+	const injectedByPath = /* @__PURE__ */ new Map();
+	const injectedByBaseName = /* @__PURE__ */ new Map();
+	for (const file of params.injectedFiles) {
+		const pathValue = readNonEmptyString(file.path);
+		if (!pathValue) continue;
+		if (!injectedByPath.has(pathValue)) injectedByPath.set(pathValue, file.content);
+		const baseName = path.posix.basename(pathValue.replaceAll("\\", "/"));
+		if (!injectedByBaseName.has(baseName)) injectedByBaseName.set(baseName, file.content);
+	}
+	return params.bootstrapFiles.map((file) => {
+		const pathValue = readNonEmptyString(file.path) ?? file.name;
+		const rawChars = file.missing ? 0 : (file.content ?? "").trimEnd().length;
+		const injectedChars = (injectedByPath.get(pathValue) ?? injectedByPath.get(file.name) ?? injectedByBaseName.get(file.name))?.length ?? 0;
+		return {
+			name: file.name,
+			path: pathValue,
+			missing: file.missing,
+			rawChars,
+			injectedChars,
+			truncated: !file.missing && injectedChars < rawChars
+		};
+	});
+}
+function readPositiveNumber(value) {
+	return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : void 0;
+}
+function readNonEmptyString(value) {
+	return typeof value === "string" && value.trim().length > 0 ? value : void 0;
+}
 function renderCodexWorkspaceBootstrapInstructions(contextFiles) {
 	const files = contextFiles.filter((file) => {
 		const baseName = getCodexContextFileBasename(file.path);
@@ -4274,7 +3750,7 @@ function renderCodexWorkspaceBootstrapInstructions(contextFiles) {
 		"",
 		"The following project context files have been loaded:"
 	];
-	if (hasSoulFile) lines.push("If SOUL.md is present, embody its persona and tone. Avoid stiff, generic replies; follow its guidance unless higher-priority instructions override it.");
+	if (hasSoulFile) lines.push("SOUL.md: persona/tone. Follow it unless higher-priority instructions override.");
 	lines.push("");
 	for (const file of files) lines.push(`## ${file.path}`, "", file.content, "");
 	return lines.join("\n").trim();
@@ -4321,9 +3797,28 @@ async function mirrorTranscriptBestEffort(params) {
 function isNonEmptyString(value) {
 	return typeof value === "string" && value.length > 0;
 }
+function readCodexNotificationItem(params) {
+	if (!isJsonObject(params) || !isJsonObject(params.item)) return;
+	const item = params.item;
+	return typeof item.id === "string" && typeof item.type === "string" ? item : void 0;
+}
+function codexExecutionToolName(item) {
+	if (item.type === "dynamicToolCall" && typeof item.tool === "string") return item.tool;
+	if (item.type === "mcpToolCall" && typeof item.tool === "string") {
+		const server = typeof item.server === "string" && item.server ? item.server : void 0;
+		return server ? `${server}.${item.tool}` : item.tool;
+	}
+	if (item.type === "commandExecution") return "bash";
+	if (item.type === "fileChange") return "apply_patch";
+	if (item.type === "webSearch") return "web_search";
+}
 function joinPresentSections(...sections) {
 	return sections.filter((section) => Boolean(section?.trim())).join("\n\n");
 }
+function prependCurrentTurnContext(prompt, context) {
+	const text = context?.text.trim();
+	return text ? [text, prompt].filter(Boolean).join("\n\n") : prompt;
+}
 function handleApprovalRequest(params) {
 	return handleCodexAppServerApprovalRequest({
 		method: params.method,