@openclaw/codex 2026.5.14-beta.1 → 2026.5.16-beta.1

package/dist/client-factory-Be6RD28K.js

@@ -0,0 +1,9 @@
+//#region extensions/codex/src/app-server/client-factory.ts
+const defaultCodexAppServerClientFactory = (startOptions, authProfileId, agentDir, config) => import("./shared-client-BwUqd3lh.js").then((n) => n.a).then(({ getSharedCodexAppServerClient }) => getSharedCodexAppServerClient({
+	startOptions,
+	authProfileId,
+	agentDir,
+	config
+}));
+//#endregion
+export { defaultCodexAppServerClientFactory as t };

package/dist/{command-formatters-CJH9-hFT.js → command-formatters-BRW7_Nu7.js}

@@ -26,9 +26,13 @@ function shouldRefreshCodexRateLimitsForUsageLimitMessage(message) {
 	return Boolean(text?.includes("You've reached your Codex subscription usage limit.") && !text.includes("Next reset "));
 }
 function summarizeCodexRateLimits(value, nowMs = Date.now()) {
-	const snapshots = collectCodexRateLimitSnapshots(value);
+	const snapshots = collectCodexRateLimitSnapshots(value).filter(snapshotHasDisplayableData);
 	if (snapshots.length === 0) return;
-	return snapshots.slice(0, 4).map((snapshot) => summarizeRateLimitSnapshot(snapshot, nowMs)).join("; ");
+	const summaries = snapshots.slice(0, 4).map((snapshot) => summarizeRateLimitSnapshot(snapshot, nowMs)).filter((summary) => summary !== void 0);
+	return summaries.length > 0 ? summaries.join("; ") : void 0;
+}
+function hasCodexRateLimitSnapshots(value) {
+	return collectCodexRateLimitSnapshots(value).length > 0;
 }
 function summarizeCodexAccountRateLimits(value, nowMs = Date.now()) {
 	const summary = summarizeCodexAccountUsage(value, nowMs);
@@ -40,7 +44,7 @@ function resolveCodexUsageLimitResetAtMs(value, nowMs = Date.now()) {
 	return selectBlockingRateLimitReset(value, nowMs)?.resetsAtMs;
 }
 function summarizeCodexAccountUsage(value, nowMs = Date.now()) {
-	const snapshots = collectCodexRateLimitSnapshots(value);
+	const snapshots = collectCodexRateLimitSnapshots(value).filter(snapshotHasDisplayableData);
 	if (snapshots.length === 0) return;
 	const usageSnapshot = snapshots.find(isCodexLimitSnapshot) ?? snapshots[0];
 	const blockedSnapshots = snapshots.filter(snapshotHasLimitBlock);
@@ -86,7 +90,8 @@ function summarizeRateLimitSnapshot(snapshot, nowMs) {
 	});
 	const reachedType = readString$1(snapshot, "rateLimitReachedType") ?? readString$1(snapshot, "rate_limit_reached_type");
 	const suffix = reachedType ? ` (${formatReachedType(reachedType)})` : "";
-	return `${label}: ${windows.join(" · ") || "available"}${suffix}`;
+	if (windows.length > 0) return `${label}: ${windows.join(" · ")}${suffix}`;
+	if (reachedType) return `${label}: ${formatReachedType(reachedType)}`;
 }
 function collectCodexRateLimitSnapshots(value) {
 	const snapshots = [];
@@ -143,6 +148,10 @@ function readRateLimitWindow(snapshot, key) {
 		...readOptionalNumberField(window, "windowDurationMins", "window_duration_mins", "windowMinutes", "window_minutes")
 	};
 }
+function snapshotHasDisplayableData(snapshot) {
+	if (readString$1(snapshot, "rateLimitReachedType") ?? readString$1(snapshot, "rate_limit_reached_type")) return true;
+	return readWindowEntries(snapshot).some((entry) => entry.window.usedPercent !== void 0 || entry.window.resetsAtMs > 0);
+}
 function readOptionalNumberField(record, ...keys) {
 	const value = keys.map((key) => readNumber(record, key)).find((entry) => entry !== void 0);
 	if (value === void 0) return {};
@@ -454,16 +463,21 @@ function summarizeArrayLike(value) {
 	return `${entries.length}`;
 }
 function formatCodexRateLimitSummary(value) {
-	return formatCodexDisplayText(summarizeCodexRateLimits(value) ?? summarizeRateLimits(value));
+	const summary = summarizeCodexRateLimits(value);
+	if (summary) return formatCodexDisplayText(summary);
+	return formatCodexDisplayText(hasCodexRateLimitSnapshots(value) ? "none returned" : summarizeRateLimits(value));
 }
 function formatCodexRateLimitDetails(value) {
 	const lines = summarizeCodexAccountRateLimits(value);
-	if (!lines) return formatCodexDisplayText(summarizeRateLimits(value));
+	if (!lines) return formatCodexDisplayText(hasCodexRateLimitSnapshots(value) ? "none returned" : summarizeRateLimits(value));
 	return lines.map(formatCodexDisplayText).join("\n");
 }
 function summarizeRateLimits(value) {
 	const entries = extractArray(value);
-	if (entries.length > 0) return `${entries.length}`;
+	if (entries.length > 0) {
+		const count = entries.filter(isMeaningfulRateLimitSnapshot).length;
+		return count > 0 ? `${count}` : "none returned";
+	}
 	if (!isJsonObject(value)) return "none returned";
 	const keyed = value.rateLimitsByLimitId;
 	if (isJsonObject(keyed)) {
@@ -473,7 +487,12 @@ function summarizeRateLimits(value) {
 	return isMeaningfulRateLimitSnapshot(value.rateLimits) ? "1" : "none returned";
 }
 function isMeaningfulRateLimitSnapshot(value) {
-	return isJsonObject(value) && Object.values(value).some((entry) => entry != null);
+	if (!isJsonObject(value)) return false;
+	if (readString(value, "rateLimitReachedType") ?? readString(value, "rate_limit_reached_type")) return true;
+	return ["primary", "secondary"].some((key) => {
+		const window = value[key];
+		return isJsonObject(window) && Object.values(window).some((entry) => entry != null);
+	});
 }
 function extractArray(value) {
 	if (Array.isArray(value)) return value;

package/dist/{command-handlers-DIXo49aO.js → command-handlers-CbJPJwK_.js}

@@ -1,12 +1,12 @@
 import { i as isCodexFastServiceTier, s as resolveCodexAppServerRuntimeOptions } from "./config-0rd3LnKg.js";
 import { n as listCodexAppServerModels, t as listAllCodexAppServerModels } from "./models-GCYf5s8J.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
-import { n as CODEX_CONTROL_METHODS, r as describeControlFailure, t as requestCodexAppServerJson } from "./request-BxAP1uyw.js";
-import { a as formatComputerUseStatus, c as formatThreads, i as formatCodexStatus, l as readString$1, n as formatAccount, o as formatList, p as summarizeCodexAccountUsage, r as formatCodexDisplayText, s as formatModels, t as buildHelp } from "./command-formatters-CJH9-hFT.js";
+import { i as describeControlFailure, r as CODEX_CONTROL_METHODS, t as requestCodexAppServerJson } from "./request-CKYiRqsN.js";
+import { a as formatComputerUseStatus, c as formatThreads, i as formatCodexStatus, l as readString$1, n as formatAccount, o as formatList, p as summarizeCodexAccountUsage, r as formatCodexDisplayText, s as formatModels, t as buildHelp } from "./command-formatters-BRW7_Nu7.js";
 import { i as readCodexAppServerBinding, o as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-CMTXuyoz.js";
-import { _ as steerCodexConversationTurn, b as readCodexConversationBindingData, d as parseCodexFastModeArg, f as parseCodexPermissionsModeArg, g as setCodexConversationPermissions, h as setCodexConversationModel, l as startCodexConversationThread, m as setCodexConversationFastMode, p as readCodexConversationActiveTurn, r as formatCodexCliSessions, u as formatPermissionsMode, v as stopCodexConversationTurn, x as resolveCodexDefaultWorkspaceDir, y as createCodexCliNodeConversationBindingData } from "./node-cli-sessions-CV5Kmdwt.js";
-import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-DFdLwPQa.js";
-import { n as rememberCodexRateLimits } from "./rate-limit-cache-BFi-50LG.js";
+import { _ as steerCodexConversationTurn, b as readCodexConversationBindingData, d as parseCodexFastModeArg, f as parseCodexPermissionsModeArg, g as setCodexConversationPermissions, h as setCodexConversationModel, l as startCodexConversationThread, m as setCodexConversationFastMode, p as readCodexConversationActiveTurn, r as formatCodexCliSessions, u as formatPermissionsMode, v as stopCodexConversationTurn, x as resolveCodexDefaultWorkspaceDir, y as createCodexCliNodeConversationBindingData } from "./node-cli-sessions-xstpFJmx.js";
+import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-DsJxRRtm.js";
+import { n as rememberCodexRateLimits } from "./rate-limit-cache-dvhq-4pi.js";
 import crypto from "node:crypto";
 import { ensureAuthProfileStore, findNormalizedProviderValue, resolveAuthProfileEligibility, resolveAuthProfileOrder, resolveDefaultAgentDir, resolveProfileUnusableUntilForDisplay } from "openclaw/plugin-sdk/agent-runtime";
 //#region extensions/codex/src/command-account.ts

package/dist/{compact-Ck9ckRkJ.js → compact-CKWfgifa.js}

@@ -1,67 +1,100 @@
 import { s as resolveCodexAppServerRuntimeOptions } from "./config-0rd3LnKg.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
 import { i as readCodexAppServerBinding } from "./session-binding-CMTXuyoz.js";
-import { n as defaultCodexAppServerClientFactory, t as createCodexAppServerClientFactoryTestHooks } from "./client-factory-BB5hgnWH.js";
-import { embeddedAgentLog, formatErrorMessage, isActiveHarnessContextEngine, runHarnessContextEngineMaintenance } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { t as defaultCodexAppServerClientFactory } from "./client-factory-Be6RD28K.js";
+import { embeddedAgentLog, formatErrorMessage, isActiveHarnessContextEngine, resolveContextEngineOwnerPluginId, runHarnessContextEngineMaintenance } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/compact.ts
 const DEFAULT_CODEX_COMPACTION_WAIT_TIMEOUT_MS = 300 * 1e3;
-let clientFactory = defaultCodexAppServerClientFactory;
+const warnedIgnoredCompactionOverrides = /* @__PURE__ */ new Set();
 async function maybeCompactCodexAppServerSession(params, options = {}) {
 	const activeContextEngine = isActiveHarnessContextEngine(params.contextEngine) ? params.contextEngine : void 0;
-	if (activeContextEngine?.info.ownsCompaction) {
-		let primary;
-		let primaryError;
-		try {
-			primary = await activeContextEngine.compact({
-				sessionId: params.sessionId,
-				sessionKey: params.sessionKey,
-				sessionFile: params.sessionFile,
-				tokenBudget: params.contextTokenBudget,
-				currentTokenCount: params.currentTokenCount,
-				compactionTarget: params.trigger === "manual" ? "threshold" : "budget",
-				customInstructions: params.customInstructions,
-				force: params.trigger === "manual",
-				runtimeContext: params.contextEngineRuntimeContext
-			});
-		} catch (error) {
-			primaryError = formatErrorMessage(error);
-			embeddedAgentLog.warn("context engine compaction failed; attempting Codex native compaction", {
-				sessionId: params.sessionId,
-				engineId: activeContextEngine.info.id,
-				error: primaryError
-			});
-		}
-		if (primary?.ok && primary.compacted) try {
-			await runHarnessContextEngineMaintenance({
-				contextEngine: activeContextEngine,
-				sessionId: params.sessionId,
-				sessionKey: params.sessionKey,
-				sessionFile: params.sessionFile,
-				reason: "compaction",
-				runtimeContext: params.contextEngineRuntimeContext,
-				config: params.config
-			});
-		} catch (error) {
-			embeddedAgentLog.warn("context engine compaction maintenance failed; continuing Codex native compaction", {
-				sessionId: params.sessionId,
-				engineId: activeContextEngine.info.id,
-				error: formatErrorMessage(error)
-			});
-		}
-		const nativeResult = await compactCodexNativeThread(params, options);
-		if (!primary) return buildContextEngineCompactionFailureResult({
-			primaryError,
-			nativeResult,
-			currentTokenCount: params.currentTokenCount
+	warnIfIgnoringOpenClawCompactionOverrides(params);
+	const nativeResult = await compactCodexNativeThread(params, options);
+	if (activeContextEngine && nativeResult?.ok && nativeResult.compacted) try {
+		await runHarnessContextEngineMaintenance({
+			contextEngine: activeContextEngine,
+			sessionId: params.sessionId,
+			sessionKey: params.sessionKey,
+			sessionFile: params.sessionFile,
+			reason: "compaction",
+			runtimeContext: params.contextEngineRuntimeContext,
+			config: params.config
+		});
+	} catch (error) {
+		embeddedAgentLog.warn("context engine compaction maintenance failed after Codex compaction", {
+			sessionId: params.sessionId,
+			engineId: activeContextEngine.info.id,
+			error: formatErrorMessage(error)
 		});
-		return {
-			ok: primary.ok,
-			compacted: primary.compacted,
-			reason: primary.reason,
-			result: buildContextEnginePrimaryResult(primary, nativeResult, params.currentTokenCount)
-		};
 	}
-	return await compactCodexNativeThread(params, options);
+	return nativeResult;
+}
+function warnIfIgnoringOpenClawCompactionOverrides(params) {
+	const ignoredConfig = readIgnoredCompactionOverridePaths(params, isActiveHarnessContextEngine(params.contextEngine) ? params.contextEngine : void 0);
+	if (ignoredConfig.length === 0) return;
+	const warningKey = ignoredConfig.join("\0");
+	if (warnedIgnoredCompactionOverrides.has(warningKey)) return;
+	warnedIgnoredCompactionOverrides.add(warningKey);
+	embeddedAgentLog.warn("ignoring OpenClaw compaction overrides for Codex app-server compaction; Codex uses native server-side compaction", {
+		sessionId: params.sessionId,
+		sessionKey: params.sessionKey,
+		ignoredConfig
+	});
+}
+function readIgnoredCompactionOverridePaths(params, activeContextEngine) {
+	const ignored = /* @__PURE__ */ new Set();
+	const configuredContextEngine = readStringPath(params.config, [
+		"plugins",
+		"slots",
+		"contextEngine"
+	]);
+	const runtimeContextEnginePlugin = typeof params.contextEngineRuntimeContext?.contextEnginePluginId === "string" ? params.contextEngineRuntimeContext.contextEnginePluginId.trim() : "";
+	const activeContextEnginePlugin = resolveContextEngineOwnerPluginId(activeContextEngine);
+	for (const entry of readCompactionOverrideEntries(params)) {
+		const localProvider = typeof entry.record.provider === "string" ? entry.record.provider.trim() : "";
+		const inheritedProvider = !localProvider && typeof entry.inheritedRecord?.provider === "string" ? entry.inheritedRecord.provider.trim() : "";
+		const provider = localProvider || inheritedProvider;
+		const providerPath = localProvider ? `${entry.path}.compaction.provider` : inheritedProvider && entry.inheritedPath ? `${entry.inheritedPath}.compaction.provider` : void 0;
+		if (provider.toLowerCase() === "lossless-claw" && (activeContextEnginePlugin === "lossless-claw" || runtimeContextEnginePlugin.toLowerCase() === "lossless-claw" || configuredContextEngine?.toLowerCase() === "lossless-claw")) continue;
+		if (typeof entry.record.model === "string" && entry.record.model.trim()) ignored.add(`${entry.path}.compaction.model`);
+		if (providerPath) ignored.add(providerPath);
+	}
+	return [...ignored];
+}
+function readCompactionOverrideEntries(params) {
+	const entries = [];
+	const defaultCompaction = readRecord(readRecord(params.config?.agents)?.defaults)?.compaction;
+	const defaultRecord = readRecord(defaultCompaction);
+	if (defaultRecord) entries.push({
+		path: "agents.defaults",
+		record: defaultRecord
+	});
+	const agentId = readAgentIdFromSessionKey(params.sessionKey ?? params.sandboxSessionKey);
+	if (!agentId) return entries;
+	const agentCompaction = readRecord((Array.isArray(params.config?.agents?.list) ? params.config.agents.list : []).find((agent) => {
+		return (typeof agent?.id === "string" ? agent.id.trim().toLowerCase() : "") === agentId;
+	}))?.compaction;
+	const agentRecord = readRecord(agentCompaction);
+	if (agentRecord) entries.push({
+		path: `agents.list.${agentId}`,
+		record: agentRecord,
+		inheritedRecord: defaultRecord,
+		inheritedPath: "agents.defaults"
+	});
+	return entries;
+}
+function readAgentIdFromSessionKey(sessionKey) {
+	const parts = sessionKey?.trim().toLowerCase().split(":").filter(Boolean) ?? [];
+	if (parts.length < 3 || parts[0] !== "agent") return;
+	return parts[1]?.trim() || void 0;
+}
+function readRecord(value) {
+	return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function readStringPath(value, path) {
+	let current = value;
+	for (const segment of path) current = readRecord(current)?.[segment];
+	return typeof current === "string" && current.trim() ? current.trim() : void 0;
 }
 async function compactCodexNativeThread(params, options = {}) {
 	const appServer = resolveCodexAppServerRuntimeOptions({ pluginConfig: options.pluginConfig });
@@ -77,7 +110,7 @@ async function compactCodexNativeThread(params, options = {}) {
 		compacted: false,
 		reason: "auth profile mismatch for session binding"
 	};
-	const client = await clientFactory(appServer.start, requestedAuthProfileId ?? binding.authProfileId, params.agentDir, params.config);
+	const client = await (options.clientFactory ?? defaultCodexAppServerClientFactory)(appServer.start, requestedAuthProfileId ?? binding.authProfileId, params.agentDir, params.config);
 	const waiter = createCodexNativeCompactionWaiter(client, binding.threadId);
 	let completion;
 	try {
@@ -112,7 +145,6 @@ async function compactCodexNativeThread(params, options = {}) {
 			tokensBefore: params.currentTokenCount ?? 0,
 			details: {
 				backend: "codex-app-server",
-				ownsCompaction: params.contextEngine?.info?.ownsCompaction === true,
 				threadId: binding.threadId,
 				signal: completion.signal,
 				turnId: completion.turnId,
@@ -121,60 +153,6 @@ async function compactCodexNativeThread(params, options = {}) {
 		}
 	};
 }
-function mergeCompactionDetails(primaryDetails, nativeResult, contextEngineCompaction) {
-	const codexNativeCompaction = nativeResult ? nativeResult.ok && nativeResult.compacted ? {
-		ok: true,
-		compacted: true,
-		details: nativeResult.result?.details
-	} : {
-		ok: false,
-		compacted: false,
-		reason: nativeResult.reason
-	} : void 0;
-	const extraDetails = {
-		...codexNativeCompaction ? { codexNativeCompaction } : {},
-		...contextEngineCompaction ? { contextEngineCompaction } : {}
-	};
-	if (primaryDetails && typeof primaryDetails === "object" && !Array.isArray(primaryDetails)) return {
-		...primaryDetails,
-		...extraDetails
-	};
-	return Object.keys(extraDetails).length > 0 ? extraDetails : primaryDetails;
-}
-function buildContextEnginePrimaryResult(primary, nativeResult, currentTokenCount) {
-	if (primary.result) return {
-		summary: primary.result.summary ?? "",
-		firstKeptEntryId: primary.result.firstKeptEntryId ?? "",
-		tokensBefore: primary.result.tokensBefore,
-		tokensAfter: primary.result.tokensAfter,
-		details: mergeCompactionDetails(primary.result.details, nativeResult)
-	};
-	const details = mergeCompactionDetails(void 0, nativeResult);
-	return details ? {
-		summary: "",
-		firstKeptEntryId: "",
-		tokensBefore: nativeResult?.result?.tokensBefore ?? currentTokenCount ?? 0,
-		details
-	} : void 0;
-}
-function buildContextEngineCompactionFailureResult(params) {
-	const reason = params.primaryError ? `context engine compaction failed: ${params.primaryError}` : "context engine compaction failed";
-	return {
-		ok: false,
-		compacted: params.nativeResult?.compacted ?? false,
-		reason,
-		result: {
-			summary: params.nativeResult?.result?.summary ?? "",
-			firstKeptEntryId: params.nativeResult?.result?.firstKeptEntryId ?? "",
-			tokensBefore: params.nativeResult?.result?.tokensBefore ?? params.currentTokenCount ?? 0,
-			tokensAfter: params.nativeResult?.result?.tokensAfter,
-			details: mergeCompactionDetails(params.nativeResult?.result?.details, params.nativeResult, {
-				ok: false,
-				reason
-			})
-		}
-	};
-}
 function createCodexNativeCompactionWaiter(client, threadId) {
 	let settled = false;
 	let removeHandler = () => {};
@@ -253,8 +231,5 @@ function formatCompactionError(error) {
 	if (error instanceof Error) return error.message;
 	return String(error);
 }
-createCodexAppServerClientFactoryTestHooks((factory) => {
-	clientFactory = factory;
-});
 //#endregion
 export { maybeCompactCodexAppServerSession };

package/dist/{computer-use-DFdLwPQa.js → computer-use-DsJxRRtm.js}

@@ -1,5 +1,5 @@
 import { c as resolveCodexComputerUseConfig, s as resolveCodexAppServerRuntimeOptions } from "./config-0rd3LnKg.js";
-import { r as describeControlFailure, t as requestCodexAppServerJson } from "./request-BxAP1uyw.js";
+import { i as describeControlFailure, t as requestCodexAppServerJson } from "./request-CKYiRqsN.js";
 import { existsSync } from "node:fs";
 //#region extensions/codex/src/app-server/computer-use.ts
 var CodexComputerUseSetupError = class extends Error {

package/dist/harness.js

@@ -18,15 +18,15 @@ function createCodexAppServerAgentHarness(options) {
 			};
 		},
 		runAttempt: async (params) => {
-			const { runCodexAppServerAttempt } = await import("./run-attempt-CN9AS7qv.js");
+			const { runCodexAppServerAttempt } = await import("./run-attempt-frGYsF9Y.js");
 			return runCodexAppServerAttempt(params, { pluginConfig: options?.pluginConfig });
 		},
 		runSideQuestion: async (params) => {
-			const { runCodexAppServerSideQuestion } = await import("./side-question-BsBqLpar.js");
+			const { runCodexAppServerSideQuestion } = await import("./side-question-CDcvaIKA.js");
 			return runCodexAppServerSideQuestion(params, { pluginConfig: options?.pluginConfig });
 		},
 		compact: async (params) => {
-			const { maybeCompactCodexAppServerSession } = await import("./compact-Ck9ckRkJ.js");
+			const { maybeCompactCodexAppServerSession } = await import("./compact-CKWfgifa.js");
 			return maybeCompactCodexAppServerSession(params, { pluginConfig: options?.pluginConfig });
 		},
 		reset: async (params) => {

package/dist/index.js

@@ -2,12 +2,11 @@ import { createCodexAppServerAgentHarness } from "./harness.js";
 import { o as readCodexPluginConfig, s as resolveCodexAppServerRuntimeOptions, t as CODEX_PLUGINS_MARKETPLACE_NAME } from "./config-0rd3LnKg.js";
 import { buildCodexMediaUnderstandingProvider } from "./media-understanding-provider.js";
 import { buildCodexProvider } from "./provider.js";
-import { r as describeControlFailure, t as requestCodexAppServerJson } from "./request-BxAP1uyw.js";
-import { r as formatCodexDisplayText } from "./command-formatters-CJH9-hFT.js";
+import { i as describeControlFailure, n as buildCodexPluginAppCacheKey, t as requestCodexAppServerJson } from "./request-CKYiRqsN.js";
+import { r as formatCodexDisplayText } from "./command-formatters-BRW7_Nu7.js";
 import { c as resolveCodexAppServerAuthAccountCacheKey, d as resolveCodexAppServerEnvApiKeyCacheKey, i as getSharedCodexAppServerClient, t as clearSharedCodexAppServerClientAndWait, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-BwUqd3lh.js";
-import { a as resolveCodexCliSessionForBindingOnNode, c as handleCodexConversationInboundClaim, i as listCodexCliSessionsOnNode, n as createCodexCliSessionNodeInvokePolicies, o as resumeCodexCliSessionOnNode, s as handleCodexConversationBindingResolved, t as createCodexCliSessionNodeHostCommands } from "./node-cli-sessions-CV5Kmdwt.js";
-import { a as defaultCodexAppInventoryCache, n as pluginReadParams, t as ensureCodexPluginActivation } from "./plugin-activation-PXGqUjwY.js";
-import { t as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-DBlqE0gO.js";
+import { a as resolveCodexCliSessionForBindingOnNode, c as handleCodexConversationInboundClaim, i as listCodexCliSessionsOnNode, n as createCodexCliSessionNodeInvokePolicies, o as resumeCodexCliSessionOnNode, s as handleCodexConversationBindingResolved, t as createCodexCliSessionNodeHostCommands } from "./node-cli-sessions-xstpFJmx.js";
+import { a as defaultCodexAppInventoryCache, n as pluginReadParams, t as ensureCodexPluginActivation } from "./plugin-activation-aQOmRQwA.js";
 import { resolveLivePluginConfigObject } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
 import os from "node:os";
@@ -39,7 +38,7 @@ async function handleCodexCommand(ctx, options = {}) {
 	}
 }
 async function loadDefaultCodexSubcommandHandler() {
-	const { handleCodexSubcommand } = await import("./command-handlers-DIXo49aO.js");
+	const { handleCodexSubcommand } = await import("./command-handlers-CbJPJwK_.js");
 	return handleCodexSubcommand;
 }
 //#endregion
@@ -725,11 +724,8 @@ async function buildCodexMigrationPlan(ctx) {
 	}));
 	const warnings = [
 		...items.some((item) => item.status === "conflict") ? ["Conflicts were found. Re-run with --overwrite to replace conflicting migration targets after item-level backups."] : [],
-		...source.plugins.some((plugin) => plugin.migratable) ? ["Codex source-installed openai-curated plugins are planned for native activation; cached plugin bundles remain manual-review only."] : [],
-		...source.plugins.some((plugin) => plugin.migratable && plugin.apps && plugin.apps.length > 0) && !shouldVerifyPluginApps(ctx) ? ["Codex app-backed plugins were planned without source app accessibility verification. Re-run with --verify-plugin-apps to force a fresh source app/list check before planning native plugin activation."] : [],
 		...source.pluginDiscoveryError ? [`Codex app-server plugin inventory discovery failed: ${source.pluginDiscoveryError}. Cached plugin bundles, if any, are advisory only.`] : [],
-		...source.plugins.some((plugin) => plugin.migrationBlock?.code === "codex_subscription_required") ? [codexPluginMigrationSubscriptionWarning()] : [],
-		...source.archivePaths.length > 0 ? ["Codex config and hook files are archive-only. They are preserved in the migration report, not loaded into OpenClaw automatically."] : []
+		...source.plugins.some((plugin) => plugin.migrationBlock?.code === "codex_subscription_required") ? [codexPluginMigrationSubscriptionWarning()] : []
 	];
 	return {
 		providerId: "codex",

package/dist/{node-cli-sessions-CV5Kmdwt.js → node-cli-sessions-xstpFJmx.js}

@@ -1,7 +1,7 @@
 import { i as isCodexFastServiceTier, r as codexSandboxPolicyForTurn, s as resolveCodexAppServerRuntimeOptions } from "./config-0rd3LnKg.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
-import { n as CODEX_CONTROL_METHODS } from "./request-BxAP1uyw.js";
-import { r as formatCodexDisplayText } from "./command-formatters-CJH9-hFT.js";
+import { r as CODEX_CONTROL_METHODS } from "./request-CKYiRqsN.js";
+import { r as formatCodexDisplayText } from "./command-formatters-BRW7_Nu7.js";
 import { i as getSharedCodexAppServerClient, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-BwUqd3lh.js";
 import { i as readCodexAppServerBinding, n as isCodexAppServerNativeAuthProfile, o as writeCodexAppServerBinding, r as normalizeCodexAppServerBindingModelProvider, t as clearCodexAppServerBinding } from "./session-binding-CMTXuyoz.js";
 import os from "node:os";

package/dist/{plugin-activation-PXGqUjwY.js → plugin-activation-aQOmRQwA.js}

@@ -313,8 +313,12 @@ function marketplaceRef(marketplace) {
 //#region extensions/codex/src/app-server/plugin-activation.ts
 async function ensureCodexPluginActivation(params) {
 	if (params.identity.marketplaceName !== "openai-curated") return activationFailure(params.identity, "marketplace_missing", { message: "Only " + CODEX_PLUGINS_MARKETPLACE_NAME + " plugins can be activated." });
-	const resolved = findOpenAiCuratedPluginSummary(await params.request("plugin/list", { cwds: [] }), params.identity.pluginName);
-	if (!resolved) return activationFailure(params.identity, "plugin_missing", { message: `${params.identity.pluginName} was not found in ${CODEX_PLUGINS_MARKETPLACE_NAME}.` });
+	const listed = await params.request("plugin/list", { cwds: [] });
+	const resolved = findOpenAiCuratedPluginSummary(listed, params.identity.pluginName);
+	if (!resolved) {
+		if (!listed.marketplaces.some((marketplace) => marketplace.name === "openai-curated")) return activationFailure(params.identity, "marketplace_missing", { message: `Codex marketplace ${CODEX_PLUGINS_MARKETPLACE_NAME} was not found.` });
+		return activationFailure(params.identity, "plugin_missing", { message: `${params.identity.pluginName} was not found in ${CODEX_PLUGINS_MARKETPLACE_NAME}.` });
+	}
 	if (resolved.summary.installed && resolved.summary.enabled && !params.installEvenIfActive) return {
 		identity: params.identity,
 		ok: true,

package/dist/{plugin-app-cache-key-DBlqE0gO.js → request-CKYiRqsN.js}

@@ -1,6 +1,27 @@
-import { f as resolveCodexAppServerHomeDir } from "./shared-client-BwUqd3lh.js";
-import { i as buildCodexAppInventoryCacheKey } from "./plugin-activation-PXGqUjwY.js";
+import { n as CodexAppServerRpcError } from "./client-CoctX13d.js";
+import { f as resolveCodexAppServerHomeDir, i as getSharedCodexAppServerClient, o as withTimeout, r as createIsolatedCodexAppServerClient } from "./shared-client-BwUqd3lh.js";
+import { i as buildCodexAppInventoryCacheKey } from "./plugin-activation-aQOmRQwA.js";
 import { createHash } from "node:crypto";
+//#region extensions/codex/src/app-server/capabilities.ts
+const CODEX_CONTROL_METHODS = {
+	account: "account/read",
+	compact: "thread/compact/start",
+	feedback: "feedback/upload",
+	listMcpServers: "mcpServerStatus/list",
+	listSkills: "skills/list",
+	listThreads: "thread/list",
+	rateLimits: "account/rateLimits/read",
+	resumeThread: "thread/resume",
+	review: "review/start"
+};
+function describeControlFailure(error) {
+	if (isUnsupportedControlError(error)) return "unsupported by this Codex app-server";
+	return error instanceof Error ? error.message : String(error);
+}
+function isUnsupportedControlError(error) {
+	return error instanceof CodexAppServerRpcError && error.code === -32601;
+}
+//#endregion
 //#region extensions/codex/src/app-server/plugin-app-cache-key.ts
 function buildCodexPluginAppCacheKey(params) {
 	return buildCodexAppInventoryCacheKey({
@@ -43,4 +64,26 @@ function fingerprintCodexPluginAppCacheCredentials(startOptions) {
 	return `sha256:${hash.digest("hex")}`;
 }
 //#endregion
-export { buildCodexPluginAppCacheKey as t };
+//#region extensions/codex/src/app-server/request.ts
+async function requestCodexAppServerJson(params) {
+	const timeoutMs = params.timeoutMs ?? 6e4;
+	return await withTimeout((async () => {
+		const client = await (params.isolated ? createIsolatedCodexAppServerClient : getSharedCodexAppServerClient)({
+			startOptions: params.startOptions,
+			timeoutMs,
+			authProfileId: params.authProfileId,
+			agentDir: params.agentDir,
+			config: params.config
+		});
+		try {
+			return await client.request(params.method, params.requestParams, { timeoutMs });
+		} finally {
+			if (params.isolated) await client.closeAndWait({
+				exitTimeoutMs: 2e3,
+				forceKillDelayMs: 250
+			});
+		}
+	})(), timeoutMs, `codex app-server ${params.method} timed out`);
+}
+//#endregion
+export { describeControlFailure as i, buildCodexPluginAppCacheKey as n, CODEX_CONTROL_METHODS as r, requestCodexAppServerJson as t };

package/dist/{run-attempt-CN9AS7qv.js → run-attempt-frGYsF9Y.js}

@@ -2,25 +2,23 @@ import { l as resolveCodexPluginsPolicy, o as readCodexPluginConfig, s as resolv
 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-CoctX13d.js";
-import { n as CODEX_CONTROL_METHODS } from "./request-BxAP1uyw.js";
-import { d as resolveCodexUsageLimitResetAtMs, f as shouldRefreshCodexRateLimitsForUsageLimitMessage, r as formatCodexDisplayText, u as formatCodexUsageLimitErrorMessage } from "./command-formatters-CJH9-hFT.js";
+import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-CKYiRqsN.js";
+import { d as resolveCodexUsageLimitResetAtMs, f as shouldRefreshCodexRateLimitsForUsageLimitMessage, r as formatCodexDisplayText, u as formatCodexUsageLimitErrorMessage } from "./command-formatters-BRW7_Nu7.js";
 import { c as resolveCodexAppServerAuthAccountCacheKey, d as resolveCodexAppServerEnvApiKeyCacheKey, l as resolveCodexAppServerAuthProfileId, n as clearSharedCodexAppServerClientIfCurrent, s as refreshCodexAppServerAuthTokens, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-BwUqd3lh.js";
 import { i as readCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-CMTXuyoz.js";
-import { a as defaultCodexAppInventoryCache } from "./plugin-activation-PXGqUjwY.js";
-import { t as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-DBlqE0gO.js";
-import { _ as resolveCodexContextEngineProjectionReserveTokens, b as normalizeCodexDynamicToolName, d as buildCodexPluginThreadConfig, f as buildCodexPluginThreadConfigInputFingerprint, g as resolveCodexContextEngineProjectionMaxChars, h as projectContextEngineAssemblyForCodex, m as shouldBuildCodexPluginThreadConfig, o as buildTurnStartParams, p as mergeCodexThreadConfigs, r as buildDeveloperInstructions, s as codexDynamicToolsFingerprint, t as areCodexDynamicToolFingerprintsCompatible, u as startOrResumeThread, v as createCodexDynamicToolBridge, y as filterCodexDynamicTools } from "./thread-lifecycle-B_oezv_0.js";
-import { n as defaultCodexAppServerClientFactory } from "./client-factory-BB5hgnWH.js";
-import { n as handleCodexAppServerElicitationRequest, r as handleCodexAppServerApprovalRequest, t as filterToolsForVisionInputs } from "./vision-tools-cbM0WkCZ.js";
-import { t as ensureCodexComputerUse } from "./computer-use-DFdLwPQa.js";
-import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-BFi-50LG.js";
+import { a as defaultCodexAppInventoryCache } from "./plugin-activation-aQOmRQwA.js";
+import { _ as resolveCodexContextEngineProjectionReserveTokens, b as normalizeCodexDynamicToolName, d as buildCodexPluginThreadConfig, f as buildCodexPluginThreadConfigInputFingerprint, g as resolveCodexContextEngineProjectionMaxChars, h as projectContextEngineAssemblyForCodex, m as shouldBuildCodexPluginThreadConfig, o as buildTurnStartParams, p as mergeCodexThreadConfigs, r as buildDeveloperInstructions, s as codexDynamicToolsFingerprint, t as areCodexDynamicToolFingerprintsCompatible, u as startOrResumeThread, v as createCodexDynamicToolBridge, y as filterCodexDynamicTools } from "./thread-lifecycle-BzY-GLGu.js";
+import { t as defaultCodexAppServerClientFactory } from "./client-factory-Be6RD28K.js";
+import { n as handleCodexAppServerElicitationRequest, r as handleCodexAppServerApprovalRequest, t as filterToolsForVisionInputs } from "./vision-tools-CyhFwJIY.js";
+import { t as ensureCodexComputerUse } from "./computer-use-DsJxRRtm.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, classifyAgentHarnessTerminalOutcome, clearActiveEmbeddedRun, embeddedAgentLog, emitAgentEvent, emitSessionTranscriptUpdate, finalizeHarnessContextEngineTurn, formatErrorMessage, formatToolAggregate, formatToolProgressOutput, inferToolMetaFromArgs, isActiveHarnessContextEngine, isSubagentSessionKey, loadCodexBundleMcpThreadConfig, 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 { TOOL_PROGRESS_OUTPUT_MAX_CHARS, acquireSessionWriteLock, appendSessionTranscriptMessage, assembleHarnessContextEngine, bootstrapHarnessContextEngine, buildEmbeddedAttemptToolRunContext, buildHarnessContextEngineRuntimeContext, buildHarnessContextEngineRuntimeContextFromUsage, classifyAgentHarnessTerminalOutcome, clearActiveEmbeddedRun, embeddedAgentLog, emitAgentEvent, emitSessionTranscriptUpdate, finalizeHarnessContextEngineTurn, formatErrorMessage, formatToolAggregate, formatToolProgressOutput, inferToolMetaFromArgs, isActiveHarnessContextEngine, isSubagentSessionKey, loadCodexBundleMcpThreadConfig, normalizeAgentRuntimeTools, normalizeUsage, registerNativeHookRelay, resolveAgentHarnessBeforePromptBuildResult, resolveAttemptSpawnWorkspaceDir, resolveBootstrapContextForRun, resolveContextEngineOwnerPluginId, 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 { 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 { createRunningTaskRun, finalizeTaskRunByRunId, recordTaskRunProgressByRunId } from "openclaw/plugin-sdk/codex-native-task-runtime";
 import { buildSessionContext, migrateSessionEntries, parseSessionEntries } from "@earendil-works/pi-coding-agent";
@@ -349,6 +347,41 @@ function inferCodexDynamicToolMeta(call, detailMode) {
 //#endregion
 //#region extensions/codex/src/app-server/transcript-mirror.ts
 const MIRROR_IDENTITY_META_KEY = "mirrorIdentity";
+function normalizeOptionalString(value) {
+	const normalized = value?.trim();
+	return normalized ? normalized : void 0;
+}
+function buildSenderLabel(params) {
+	const label = params.senderName ?? params.senderUsername ?? params.senderE164 ?? params.senderId;
+	if (!label) return;
+	if (!params.senderId || label.includes(params.senderId)) return label;
+	return `${label} (${params.senderId})`;
+}
+function buildCodexUserPromptMessage(params) {
+	const senderId = normalizeOptionalString(params.senderId);
+	const senderName = normalizeOptionalString(params.senderName);
+	const senderUsername = normalizeOptionalString(params.senderUsername);
+	const senderE164 = normalizeOptionalString(params.senderE164);
+	const senderLabel = buildSenderLabel({
+		senderId,
+		senderName,
+		senderUsername,
+		senderE164
+	});
+	const sourceChannel = normalizeOptionalString(params.inputProvenance?.sourceChannel ?? params.messageChannel ?? params.messageProvider);
+	return {
+		role: "user",
+		content: params.prompt,
+		timestamp: Date.now(),
+		...params.inputProvenance ? { provenance: params.inputProvenance } : {},
+		...sourceChannel ? { sourceChannel } : {},
+		...senderId ? { senderId } : {},
+		...senderName ? { senderName } : {},
+		...senderUsername ? { senderUsername } : {},
+		...senderE164 ? { senderE164 } : {},
+		...senderLabel ? { senderLabel } : {}
+	};
+}
 /**
 * Tag a message with a stable logical identity for mirror dedupe. Callers
 * should use a value that is invariant for the same logical message across
@@ -598,11 +631,7 @@ var CodexAppServerEventProjector = class {
 		const planText = collectTextValues(this.planTextByItem).join("\n\n");
 		const lastAssistant = assistantTexts.length > 0 ? this.createAssistantMessage(assistantTexts.join("\n\n")) : void 0;
 		const turnId = this.turnId;
-		const messagesSnapshot = [attachCodexMirrorIdentity({
-			role: "user",
-			content: this.params.prompt,
-			timestamp: Date.now()
-		}, `${turnId}:prompt`)];
+		const messagesSnapshot = [attachCodexMirrorIdentity(buildCodexUserPromptMessage(this.params), `${turnId}:prompt`)];
 		if (reasoningText) messagesSnapshot.push(attachCodexMirrorIdentity(this.createAssistantMirrorMessage("Codex reasoning", reasoningText), `${turnId}:reasoning`));
 		if (planText) messagesSnapshot.push(attachCodexMirrorIdentity(this.createAssistantMirrorMessage("Codex plan", planText), `${turnId}:plan`));
 		messagesSnapshot.push(...this.toolTranscriptMessages);
@@ -1705,7 +1734,7 @@ const CODEX_HOOK_EVENT_BY_NATIVE_EVENT = {
 };
 function buildCodexNativeHookRelayConfig(params) {
 	const events = params.events?.length ? params.events : CODEX_NATIVE_HOOK_RELAY_EVENTS;
-	const config = { "features.codex_hooks": true };
+	const config = { "features.hooks": true };
 	for (const event of events) {
 		const codexEvent = CODEX_HOOK_EVENT_BY_NATIVE_EVENT[event];
 		config[`hooks.${codexEvent}`] = [{
@@ -1723,7 +1752,7 @@ function buildCodexNativeHookRelayConfig(params) {
 }
 function buildCodexNativeHookRelayDisabledConfig() {
 	return {
-		"features.codex_hooks": false,
+		"features.hooks": false,
 		"hooks.PreToolUse": [],
 		"hooks.PostToolUse": [],
 		"hooks.PermissionRequest": [],
@@ -2132,12 +2161,7 @@ const CODEX_BOOTSTRAP_CONTEXT_ORDER = new Map([
 	["memory.md", 60],
 	["heartbeat.md", 70]
 ]);
-const testClientFactoryStorage = new AsyncLocalStorage();
-const clientFactory = defaultCodexAppServerClientFactory;
 let openClawCodingToolsFactoryForTests;
-function resolveCodexAppServerClientFactory() {
-	return testClientFactoryStorage.getStore() ?? clientFactory;
-}
 function emitCodexAppServerEvent(params, event) {
 	try {
 		emitAgentEvent({
@@ -2293,7 +2317,7 @@ function restrictCodexAppServerSandboxForOpenClawSandbox(appServer, sandbox) {
 }
 async function runCodexAppServerAttempt(params, options = {}) {
 	const attemptStartedAt = Date.now();
-	const attemptClientFactory = resolveCodexAppServerClientFactory();
+	const attemptClientFactory = options.clientFactory ?? defaultCodexAppServerClientFactory;
 	const pluginConfig = readCodexPluginConfig(options.pluginConfig);
 	const configuredAppServer = resolveCodexAppServerRuntimeOptions({ pluginConfig });
 	const resolvedWorkspace = resolveUserPath(params.workspaceDir);
@@ -2384,6 +2408,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	});
 	const hadSessionFile = await pathExists(params.sessionFile);
 	let historyMessages = await readMirroredSessionHistoryMessages(params.sessionFile) ?? [];
+	const hookContextWindowFields = {
+		...params.contextWindowInfo?.tokens ? { contextTokenBudget: params.contextWindowInfo.tokens } : params.contextTokenBudget ? { contextTokenBudget: params.contextTokenBudget } : {},
+		...params.contextWindowInfo?.source ? { contextWindowSource: params.contextWindowInfo.source } : {},
+		...params.contextWindowInfo?.referenceTokens ? { contextWindowReferenceTokens: params.contextWindowInfo.referenceTokens } : {}
+	};
 	const hookContext = {
 		runId: params.runId,
 		agentId: sessionAgentId,
@@ -2392,9 +2421,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		workspaceDir: params.workspaceDir,
 		messageProvider: params.messageProvider ?? void 0,
 		trigger: params.trigger,
-		channelId: params.messageChannel ?? params.messageProvider ?? void 0
+		channelId: params.messageChannel ?? params.messageProvider ?? void 0,
+		...hookContextWindowFields
 	};
 	if (activeContextEngine) {
+		const activeContextEnginePluginId = resolveContextEngineOwnerPluginId(activeContextEngine);
 		await bootstrapHarnessContextEngine({
 			hadSessionFile,
 			contextEngine: activeContextEngine,
@@ -2405,6 +2436,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				attempt: runtimeParams,
 				workspaceDir: effectiveWorkspace,
 				agentDir,
+				activeAgentId: sessionAgentId,
+				contextEnginePluginId: activeContextEnginePluginId,
 				tokenBudget: params.contextTokenBudget
 			}),
 			runMaintenance: runHarnessContextEngineMaintenance,
@@ -2558,6 +2591,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 					const threadLifecycleParams = {
 						client: startupClient,
 						params: runtimeParams,
+						agentId: sessionAgentId,
 						cwd: effectiveWorkspace,
 						dynamicTools: toolBridge.specs,
 						appServer: pluginAppServer,
@@ -2917,6 +2951,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		}
 		if (isCurrentTurnNotification) updateActiveTurnItemIds(notification, activeTurnItemIds);
 		const unblockedAssistantCompletionRelease = isCurrentTurnNotification && turnAssistantCompletionIdleWatchArmed && notification.method === "item/completed" && activeTurnItemIds.size === 0;
+		const trackedDynamicToolCompletion = isTrackedOpenClawDynamicToolCompletionNotification(notification, activeOpenClawDynamicToolCallIds);
+		const shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem = isCurrentTurnNotification && notification.method === "item/completed" && activeTurnItemIds.size === 0 && !trackedDynamicToolCompletion && !isCompletedAssistantNotification(notification);
 		if (isCurrentTurnNotification && notification.method === "error") {
 			if (isRetryableErrorNotification(notification.params)) disarmTurnCompletionIdleWatch();
 			else armTurnCompletionIdleWatch({ pinnedByTerminalError: true });
@@ -2924,8 +2960,9 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		} else if (isTurnCompletion) disarmTurnAssistantCompletionIdleWatch();
 		else if (isCurrentTurnNotification && isCompletedAssistantNotification(notification)) armTurnAssistantCompletionIdleWatch(describeNotificationActivity(notification));
 		else if (unblockedAssistantCompletionRelease) armTurnAssistantCompletionIdleWatch(describeNotificationActivity(notification));
+		else if (shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem) armTurnCompletionIdleWatch();
 		else if (isCurrentTurnNotification && shouldDisarmAssistantCompletionIdleWatch(notification)) disarmTurnAssistantCompletionIdleWatch();
-		if (turnCompletionIdleWatchArmed && !turnCompletionIdleWatchPinnedByTerminalError && notification.method !== "turn/completed" && isCurrentTurnNotification && !isTrackedOpenClawDynamicToolCompletionNotification(notification, activeOpenClawDynamicToolCallIds)) disarmTurnCompletionIdleWatch();
+		if (turnCompletionIdleWatchArmed && !turnCompletionIdleWatchPinnedByTerminalError && notification.method !== "turn/completed" && isCurrentTurnNotification && !trackedDynamicToolCompletion && !shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem) disarmTurnCompletionIdleWatch();
 		const isTurnAbortMarker = isCurrentTurnNotification && isCodexTurnAbortMarkerNotification(notification, { currentPromptText: promptBuild.prompt });
 		const isTurnTerminal = isTurnCompletion || isTurnAbortMarker;
 		try {
@@ -3090,11 +3127,10 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		historyMessages,
 		imagesCount: params.images?.length ?? 0
 	};
-	const turnStartFailureMessages = [...historyMessages, {
-		role: "user",
-		content: promptBuild.prompt,
-		timestamp: Date.now()
-	}];
+	const turnStartFailureMessages = [...historyMessages, buildCodexUserPromptMessage({
+		...params,
+		prompt: promptBuild.prompt
+	})];
 	let turn;
 	const startCodexTurn = async () => assertCodexTurnStartResponse(await client.request("turn/start", buildTurnStartParams(params, {
 		threadId: thread.threadId,
@@ -3174,6 +3210,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 					sessionId: params.sessionId,
 					provider: params.provider,
 					model: params.modelId,
+					...hookContextWindowFields,
 					resolvedRef: params.runtimePlan?.observability.resolvedRef ?? `${params.provider}/${params.modelId}`,
 					...params.runtimePlan?.observability.harnessId ? { harnessId: params.runtimePlan.observability.harnessId } : {},
 					assistantTexts: []
@@ -3237,6 +3274,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	projector = new CodexAppServerEventProjector(params, thread.threadId, activeTurnId, { nativePostToolUseRelayEnabled: nativeHookRelay?.allowedEvents.includes("post_tool_use") === true });
 	emitLifecycleStart();
 	const activeProjector = projector;
+	turnTerminalIdleWatchArmed = true;
+	touchTurnCompletionActivity("turn:start", { arm: true });
 	for (const notification of pendingNotifications.splice(0)) await enqueueNotification(notification);
 	if (!completed && isTerminalTurnStatus(turn.turn.status)) await enqueueNotification({
 		method: "turn/completed",
@@ -3263,8 +3302,6 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		abort: () => runAbortController.abort("aborted")
 	};
 	setActiveEmbeddedRun(params.sessionId, handle, params.sessionKey);
-	turnTerminalIdleWatchArmed = true;
-	touchTurnCompletionActivity("turn:start");
 	const timeout = setTimeout(() => {
 		timedOut = true;
 		projector?.markTimedOut();
@@ -3342,6 +3379,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			...finalAborted ? { aborted: true } : {}
 		});
 		if (activeContextEngine) {
+			const activeContextEnginePluginId = resolveContextEngineOwnerPluginId(activeContextEngine);
 			const finalMessages = await readMirroredSessionHistoryMessages(params.sessionFile) ?? historyMessages.concat(result.messagesSnapshot);
 			await finalizeHarnessContextEngineTurn({
 				contextEngine: activeContextEngine,
@@ -3358,6 +3396,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 					attempt: runtimeParams,
 					workspaceDir: effectiveWorkspace,
 					agentDir,
+					activeAgentId: sessionAgentId,
+					contextEnginePluginId: activeContextEnginePluginId,
 					tokenBudget: params.contextTokenBudget,
 					lastCallUsage: result.attemptUsage,
 					promptCache: result.promptCache
@@ -3373,6 +3413,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				sessionId: params.sessionId,
 				provider: params.provider,
 				model: params.modelId,
+				...hookContextWindowFields,
 				resolvedRef: params.runtimePlan?.observability.resolvedRef ?? `${params.provider}/${params.modelId}`,
 				...params.runtimePlan?.observability.harnessId ? { harnessId: params.runtimePlan.observability.harnessId } : {},
 				assistantTexts: result.assistantTexts,
@@ -3649,14 +3690,12 @@ function resolveOpenClawCodingToolsSessionKeys(params, sandboxSessionKey) {
 		runSessionKey: params.sessionKey && params.sessionKey !== sandboxSessionKey ? params.sessionKey : void 0
 	};
 }
-async function buildDynamicTools(input) {
+function buildOpenClawCodingToolsOptions(input) {
 	const { params } = input;
-	if (params.disableTools || !supportsModelTools(params.model)) return [];
 	const modelHasVision = params.model.input?.includes("image") ?? false;
 	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({
+	return {
 		agentId: input.sessionAgentId,
 		...buildEmbeddedAttemptToolRunContext(params),
 		exec: {
@@ -3720,10 +3759,17 @@ async function buildDynamicTools(input) {
 			});
 			input.runAbortController.abort("sessions_yield");
 		}
-	}), input.pluginConfig), {
-		modelHasVision,
+	};
+}
+async function buildDynamicTools(input) {
+	const { params } = input;
+	if (params.disableTools || !supportsModelTools(params.model)) return [];
+	const createOpenClawCodingTools = openClawCodingToolsFactoryForTests ?? (await import("openclaw/plugin-sdk/agent-harness")).createOpenClawCodingTools;
+	const toolOptions = buildOpenClawCodingToolsOptions(input);
+	const filteredTools = filterCodexDynamicToolsForAllowlist(filterToolsForVisionInputs(filterCodexDynamicTools(createOpenClawCodingTools(toolOptions), input.pluginConfig), {
+		modelHasVision: toolOptions.modelHasVision ?? false,
 		hasInboundImages: (params.images?.length ?? 0) > 0
-	}), params.toolsAllow);
+	}), includeForcedMessageToolAllow(params.toolsAllow, params));
 	return normalizeAgentRuntimeTools({
 		runtimePlan: params.runtimePlan,
 		tools: filteredTools,
@@ -3736,6 +3782,12 @@ async function buildDynamicTools(input) {
 		model: params.model
 	});
 }
+function includeForcedMessageToolAllow(toolsAllow, params) {
+	if (!shouldForceMessageTool(params)) return toolsAllow;
+	if (toolsAllow === void 0) return toolsAllow;
+	if (toolsAllow.length === 0) return ["message"];
+	return new Set(toolsAllow.map((name) => normalizeCodexDynamicToolName(name))).has("message") ? toolsAllow : [...toolsAllow, "message"];
+}
 function filterCodexDynamicToolsForAllowlist(tools, toolsAllow) {
 	if (!toolsAllow || toolsAllow.length === 0) return tools;
 	const allowSet = new Set(toolsAllow.map((name) => normalizeCodexDynamicToolName(name)).filter(Boolean));

package/dist/{side-question-BsBqLpar.js → side-question-CDcvaIKA.js}

@@ -2,12 +2,12 @@ import { o as readCodexPluginConfig, s as resolveCodexAppServerRuntimeOptions }
 import { a as readCodexDynamicToolCallParams, i as assertCodexTurnStartResponse, l as readCodexTurnCompletedNotification, t as assertCodexThreadForkResponse } from "./protocol-validators-CSY0BFBo.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
 import { r as isCodexAppServerApprovalRequest } from "./client-CoctX13d.js";
-import { u as formatCodexUsageLimitErrorMessage } from "./command-formatters-CJH9-hFT.js";
+import { u as formatCodexUsageLimitErrorMessage } from "./command-formatters-BRW7_Nu7.js";
 import { i as getSharedCodexAppServerClient, s as refreshCodexAppServerAuthTokens } from "./shared-client-BwUqd3lh.js";
 import { i as readCodexAppServerBinding } from "./session-binding-CMTXuyoz.js";
-import { c as resolveCodexAppServerModelProvider, l as resolveReasoningEffort, n as buildCodexRuntimeThreadConfig, v as createCodexDynamicToolBridge, y as filterCodexDynamicTools } from "./thread-lifecycle-B_oezv_0.js";
-import { n as handleCodexAppServerElicitationRequest, r as handleCodexAppServerApprovalRequest, t as filterToolsForVisionInputs } from "./vision-tools-cbM0WkCZ.js";
-import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-BFi-50LG.js";
+import { c as resolveCodexAppServerModelProvider, l as resolveReasoningEffort, n as buildCodexRuntimeThreadConfig, v as createCodexDynamicToolBridge, y as filterCodexDynamicTools } from "./thread-lifecycle-BzY-GLGu.js";
+import { n as handleCodexAppServerElicitationRequest, r as handleCodexAppServerApprovalRequest, t as filterToolsForVisionInputs } from "./vision-tools-CyhFwJIY.js";
+import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-dvhq-4pi.js";
 import { embeddedAgentLog, formatErrorMessage, resolveAgentDir, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/side-question.ts
 const CODEX_SIDE_DYNAMIC_TOOL_TIMEOUT_MS = 3e4;

package/dist/test-api.js

@@ -1,5 +1,5 @@
 import { s as resolveCodexAppServerRuntimeOptions } from "./config-0rd3LnKg.js";
-import { a as buildThreadStartParams, i as buildThreadResumeParams, o as buildTurnStartParams, r as buildDeveloperInstructions, v as createCodexDynamicToolBridge, y as filterCodexDynamicTools } from "./thread-lifecycle-B_oezv_0.js";
+import { a as buildThreadStartParams, i as buildThreadResumeParams, o as buildTurnStartParams, r as buildDeveloperInstructions, v as createCodexDynamicToolBridge, y as filterCodexDynamicTools } from "./thread-lifecycle-BzY-GLGu.js";
 //#region extensions/codex/test-api.ts
 function resolveCodexPromptSnapshotAppServerOptions(pluginConfig) {
 	return resolveCodexAppServerRuntimeOptions({

package/dist/{thread-lifecycle-B_oezv_0.js → thread-lifecycle-BzY-GLGu.js}

@@ -5,7 +5,7 @@ import { CODEX_GPT5_HEARTBEAT_PROMPT_OVERLAY, renderCodexPromptOverlay } from ".
 import { isModernCodexModel } from "./provider.js";
 import { i as isCodexAppServerConnectionClosedError } from "./client-CoctX13d.js";
 import { i as readCodexAppServerBinding, n as isCodexAppServerNativeAuthProfile, o as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-CMTXuyoz.js";
-import { a as defaultCodexAppInventoryCache, r as readCodexPluginInventory, t as ensureCodexPluginActivation } from "./plugin-activation-PXGqUjwY.js";
+import { a as defaultCodexAppInventoryCache, r as readCodexPluginInventory, t as ensureCodexPluginActivation } from "./plugin-activation-aQOmRQwA.js";
 import crypto from "node:crypto";
 import { HEARTBEAT_RESPONSE_TOOL_NAME, createAgentToolResultMiddlewareRunner, createCodexAppServerToolResultExtensionRunner, embeddedAgentLog, extractToolResultMediaArtifact, filterToolResultMediaUrls, isActiveHarnessContextEngine, isMessagingTool, isMessagingToolSendAction, isToolWrappedWithBeforeToolCallHook, normalizeHeartbeatToolResponse, runAgentHarnessAfterToolCallHook, wrapToolWithBeforeToolCallHook } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { buildCodexUserMcpServersThreadConfigPatch } from "openclaw/plugin-sdk/codex-mcp-projection";
@@ -17,7 +17,11 @@ const CODEX_APP_SERVER_OWNED_DYNAMIC_TOOL_EXCLUDES = [
 	"apply_patch",
 	"exec",
 	"process",
-	"update_plan"
+	"update_plan",
+	"tool_search_code",
+	"tool_search",
+	"tool_describe",
+	"tool_call"
 ];
 const DYNAMIC_TOOL_NAME_ALIASES = {
 	bash: "exec",
@@ -297,14 +301,33 @@ function readFirstString(record, keys) {
 }
 function collectMediaUrls(record) {
 	const urls = [];
+	const pushMediaUrl = (value) => {
+		if (typeof value === "string" && value.trim()) urls.push(value.trim());
+	};
+	const pushAttachment = (value) => {
+		if (!value || typeof value !== "object" || Array.isArray(value)) return;
+		const attachment = value;
+		for (const key of [
+			"media",
+			"mediaUrl",
+			"path",
+			"filePath",
+			"fileUrl",
+			"url"
+		]) pushMediaUrl(attachment[key]);
+	};
 	for (const key of [
+		"media",
 		"mediaUrl",
 		"media_url",
+		"path",
+		"filePath",
+		"fileUrl",
 		"imageUrl",
 		"image_url"
 	]) {
 		const value = record[key];
-		if (typeof value === "string" && value.trim()) urls.push(value.trim());
+		pushMediaUrl(value);
 	}
 	for (const key of [
 		"mediaUrls",
@@ -314,8 +337,10 @@ function collectMediaUrls(record) {
 	]) {
 		const value = record[key];
 		if (!Array.isArray(value)) continue;
-		for (const entry of value) if (typeof entry === "string" && entry.trim()) urls.push(entry.trim());
+		for (const entry of value) pushMediaUrl(entry);
 	}
+	const attachments = record.attachments;
+	if (Array.isArray(attachments)) for (const attachment of attachments) pushAttachment(attachment);
 	return urls;
 }
 function isCronAddAction(args) {
@@ -680,10 +705,11 @@ const CODEX_CODE_MODE_THREAD_CONFIG = {
 	"features.code_mode": true,
 	"features.code_mode_only": true
 };
+const CODEX_LIGHTWEIGHT_CONTEXT_THREAD_CONFIG = { project_doc_max_bytes: 0 };
 async function startOrResumeThread(params) {
 	const dynamicToolsFingerprint = fingerprintDynamicTools(params.dynamicTools);
 	const contextEngineBinding = buildContextEngineBinding(params.params);
-	const userMcpServersConfigPatch = buildCodexUserMcpServersThreadConfigPatch(params.params.config);
+	const userMcpServersConfigPatch = buildCodexUserMcpServersThreadConfigPatch(params.params.config, { agentId: params.agentId ?? params.params.agentId });
 	const userMcpServersFingerprint = fingerprintUserMcpServersConfigPatch(userMcpServersConfigPatch);
 	let binding = await readCodexAppServerBinding(params.params.sessionFile, {
 		authProfileStore: params.params.authProfileStore,
@@ -939,7 +965,7 @@ function buildThreadStartParams(params, options) {
 		sandbox: options.appServer.sandbox,
 		...options.appServer.serviceTier ? { serviceTier: options.appServer.serviceTier } : {},
 		serviceName: "OpenClaw",
-		config: buildCodexRuntimeThreadConfig(options.config),
+		config: buildCodexRuntimeThreadConfigForRun(params, options.config),
 		developerInstructions: options.developerInstructions ?? buildDeveloperInstructions(params),
 		dynamicTools: options.dynamicTools,
 		experimentalRawEvents: true,
@@ -962,7 +988,7 @@ function buildThreadResumeParams(params, options) {
 		approvalsReviewer: options.appServer.approvalsReviewer,
 		sandbox: options.appServer.sandbox,
 		...options.appServer.serviceTier ? { serviceTier: options.appServer.serviceTier } : {},
-		config: buildCodexRuntimeThreadConfig(options.config),
+		config: buildCodexRuntimeThreadConfigForRun(params, options.config),
 		developerInstructions: options.developerInstructions ?? buildDeveloperInstructions(params),
 		persistExtendedHistory: true
 	};
@@ -970,6 +996,14 @@ function buildThreadResumeParams(params, options) {
 function buildCodexRuntimeThreadConfig(config) {
 	return mergeCodexThreadConfigs(config, CODEX_CODE_MODE_THREAD_CONFIG) ?? { ...CODEX_CODE_MODE_THREAD_CONFIG };
 }
+function buildCodexRuntimeThreadConfigForRun(params, config) {
+	const runtimeConfig = buildCodexRuntimeThreadConfig(config);
+	if (params.bootstrapContextMode !== "lightweight") return runtimeConfig;
+	return mergeCodexThreadConfigs(runtimeConfig, CODEX_LIGHTWEIGHT_CONTEXT_THREAD_CONFIG) ?? {
+		...runtimeConfig,
+		...CODEX_LIGHTWEIGHT_CONTEXT_THREAD_CONFIG
+	};
+}
 function buildTurnStartParams(params, options) {
 	return {
 		threadId: options.threadId,

package/dist/{vision-tools-cbM0WkCZ.js → vision-tools-CyhFwJIY.js}

@@ -1,5 +1,5 @@
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
-import { r as formatCodexDisplayText } from "./command-formatters-CJH9-hFT.js";
+import { r as formatCodexDisplayText } from "./command-formatters-BRW7_Nu7.js";
 import { callGatewayTool, embeddedAgentLog, formatApprovalDisplayPath } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/plugin-approval-roundtrip.ts
 const DEFAULT_CODEX_APPROVAL_TIMEOUT_MS = 12e4;

package/openclaw.plugin.json

@@ -333,7 +333,7 @@
     },
     "appServer.turnCompletionIdleTimeoutMs": {
       "label": "Turn Completion Idle Timeout",
-      "help": "Maximum quiet time after a turn-scoped Codex app-server request before OpenClaw interrupts the turn while waiting for turn/completed.",
+      "help": "Maximum quiet time after Codex accepts a turn or after a turn-scoped app-server request before OpenClaw interrupts the turn while waiting for turn/completed.",
       "advanced": true
     },
     "appServer.approvalPolicy": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/codex",
-  "version": "2026.5.14-beta.1",
+  "version": "2026.5.16-beta.1",
   "description": "OpenClaw Codex harness and model provider plugin",
   "repository": {
     "type": "git",
@@ -11,7 +11,7 @@
     "@earendil-works/pi-coding-agent": "0.74.0",
     "@openai/codex": "0.130.0",
     "ajv": "8.20.0",
-    "ws": "8.20.0",
+    "ws": "8.20.1",
     "zod": "4.4.3"
   },
   "devDependencies": {
@@ -27,10 +27,10 @@
       "minHostVersion": ">=2026.5.1-beta.1"
     },
     "compat": {
-      "pluginApi": ">=2026.5.14-beta.1"
+      "pluginApi": ">=2026.5.16-beta.1"
     },
     "build": {
-      "openclawVersion": "2026.5.14-beta.1"
+      "openclawVersion": "2026.5.16-beta.1"
     },
     "release": {
       "publishToClawHub": true,
@@ -45,7 +45,7 @@
     "openclaw.plugin.json"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.5.14-beta.1"
+    "openclaw": ">=2026.5.16-beta.1"
   },
   "peerDependenciesMeta": {
     "openclaw": {

package/dist/client-factory-BB5hgnWH.js

@@ -1,19 +0,0 @@
-//#region extensions/codex/src/app-server/client-factory.ts
-const defaultCodexAppServerClientFactory = (startOptions, authProfileId, agentDir, config) => import("./shared-client-BwUqd3lh.js").then((n) => n.a).then(({ getSharedCodexAppServerClient }) => getSharedCodexAppServerClient({
-	startOptions,
-	authProfileId,
-	agentDir,
-	config
-}));
-function createCodexAppServerClientFactoryTestHooks(setFactory) {
-	return {
-		setCodexAppServerClientFactoryForTests(factory) {
-			setFactory(factory);
-		},
-		resetCodexAppServerClientFactoryForTests() {
-			setFactory(defaultCodexAppServerClientFactory);
-		}
-	};
-}
-//#endregion
-export { defaultCodexAppServerClientFactory as n, createCodexAppServerClientFactoryTestHooks as t };

package/dist/request-BxAP1uyw.js

@@ -1,45 +0,0 @@
-import { n as CodexAppServerRpcError } from "./client-CoctX13d.js";
-import { i as getSharedCodexAppServerClient, o as withTimeout, r as createIsolatedCodexAppServerClient } from "./shared-client-BwUqd3lh.js";
-//#region extensions/codex/src/app-server/capabilities.ts
-const CODEX_CONTROL_METHODS = {
-	account: "account/read",
-	compact: "thread/compact/start",
-	feedback: "feedback/upload",
-	listMcpServers: "mcpServerStatus/list",
-	listSkills: "skills/list",
-	listThreads: "thread/list",
-	rateLimits: "account/rateLimits/read",
-	resumeThread: "thread/resume",
-	review: "review/start"
-};
-function describeControlFailure(error) {
-	if (isUnsupportedControlError(error)) return "unsupported by this Codex app-server";
-	return error instanceof Error ? error.message : String(error);
-}
-function isUnsupportedControlError(error) {
-	return error instanceof CodexAppServerRpcError && error.code === -32601;
-}
-//#endregion
-//#region extensions/codex/src/app-server/request.ts
-async function requestCodexAppServerJson(params) {
-	const timeoutMs = params.timeoutMs ?? 6e4;
-	return await withTimeout((async () => {
-		const client = await (params.isolated ? createIsolatedCodexAppServerClient : getSharedCodexAppServerClient)({
-			startOptions: params.startOptions,
-			timeoutMs,
-			authProfileId: params.authProfileId,
-			agentDir: params.agentDir,
-			config: params.config
-		});
-		try {
-			return await client.request(params.method, params.requestParams, { timeoutMs });
-		} finally {
-			if (params.isolated) await client.closeAndWait({
-				exitTimeoutMs: 2e3,
-				forceKillDelayMs: 250
-			});
-		}
-	})(), timeoutMs, `codex app-server ${params.method} timed out`);
-}
-//#endregion
-export { CODEX_CONTROL_METHODS as n, describeControlFailure as r, requestCodexAppServerJson as t };