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

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

@@ -474,7 +474,10 @@ function formatCodexRateLimitDetails(value) {
 }
 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)) {
@@ -484,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-CXxykxjq.js → command-handlers-CbJPJwK_.js}

@@ -2,9 +2,9 @@ import { i as isCodexFastServiceTier, s as resolveCodexAppServerRuntimeOptions }
 import { n as listCodexAppServerModels, t as listAllCodexAppServerModels } from "./models-GCYf5s8J.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.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-DRJaVHhN.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-CiexDHeV.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";

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

@@ -2,65 +2,99 @@ 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 { t as defaultCodexAppServerClientFactory } from "./client-factory-Be6RD28K.js";
-import { embeddedAgentLog, formatErrorMessage, isActiveHarnessContextEngine, runHarnessContextEngineMaintenance } from "openclaw/plugin-sdk/agent-harness-runtime";
+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;
+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 });
@@ -111,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,
@@ -120,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 = () => {};

package/dist/harness.js

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

package/dist/index.js

@@ -3,9 +3,9 @@ import { o as readCodexPluginConfig, s as resolveCodexAppServerRuntimeOptions, t
 import { buildCodexMediaUnderstandingProvider } from "./media-understanding-provider.js";
 import { buildCodexProvider } from "./provider.js";
 import { i as describeControlFailure, n as buildCodexPluginAppCacheKey, t as requestCodexAppServerJson } from "./request-CKYiRqsN.js";
-import { r as formatCodexDisplayText } from "./command-formatters-DRJaVHhN.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-CiexDHeV.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";
@@ -38,7 +38,7 @@ async function handleCodexCommand(ctx, options = {}) {
 	}
 }
 async function loadDefaultCodexSubcommandHandler() {
-	const { handleCodexSubcommand } = await import("./command-handlers-CXxykxjq.js");
+	const { handleCodexSubcommand } = await import("./command-handlers-CbJPJwK_.js");
 	return handleCodexSubcommand;
 }
 //#endregion

package/dist/{node-cli-sessions-CiexDHeV.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 { r as CODEX_CONTROL_METHODS } from "./request-CKYiRqsN.js";
-import { r as formatCodexDisplayText } from "./command-formatters-DRJaVHhN.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/{run-attempt-DG9NQab2.js → run-attempt-frGYsF9Y.js}

@@ -3,18 +3,18 @@ import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCod
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
 import { i as isCodexAppServerConnectionClosedError, r as isCodexAppServerApprovalRequest } from "./client-CoctX13d.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-DRJaVHhN.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-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-DrbViNpf.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-CzTdigBu.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";
@@ -347,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
@@ -596,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);
@@ -1703,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}`] = [{
@@ -1721,7 +1752,7 @@ function buildCodexNativeHookRelayConfig(params) {
 }
 function buildCodexNativeHookRelayDisabledConfig() {
 	return {
-		"features.codex_hooks": false,
+		"features.hooks": false,
 		"hooks.PreToolUse": [],
 		"hooks.PostToolUse": [],
 		"hooks.PermissionRequest": [],
@@ -2394,6 +2425,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		...hookContextWindowFields
 	};
 	if (activeContextEngine) {
+		const activeContextEnginePluginId = resolveContextEngineOwnerPluginId(activeContextEngine);
 		await bootstrapHarnessContextEngine({
 			hadSessionFile,
 			contextEngine: activeContextEngine,
@@ -2404,6 +2436,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				attempt: runtimeParams,
 				workspaceDir: effectiveWorkspace,
 				agentDir,
+				activeAgentId: sessionAgentId,
+				contextEnginePluginId: activeContextEnginePluginId,
 				tokenBudget: params.contextTokenBudget
 			}),
 			runMaintenance: runHarnessContextEngineMaintenance,
@@ -2557,6 +2591,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 					const threadLifecycleParams = {
 						client: startupClient,
 						params: runtimeParams,
+						agentId: sessionAgentId,
 						cwd: effectiveWorkspace,
 						dynamicTools: toolBridge.specs,
 						appServer: pluginAppServer,
@@ -2916,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 });
@@ -2923,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 {
@@ -3089,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,
@@ -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
@@ -3650,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: {
@@ -3721,8 +3759,15 @@ 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
 	}), includeForcedMessageToolAllow(params.toolsAllow, params));
 	return normalizeAgentRuntimeTools({

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

@@ -2,11 +2,11 @@ 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-DRJaVHhN.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-DrbViNpf.js";
-import { n as handleCodexAppServerElicitationRequest, r as handleCodexAppServerApprovalRequest, t as filterToolsForVisionInputs } from "./vision-tools-CzTdigBu.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

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-DrbViNpf.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-DrbViNpf.js → thread-lifecycle-BzY-GLGu.js}

@@ -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",
@@ -705,7 +709,7 @@ 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,

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

@@ -1,5 +1,5 @@
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
-import { r as formatCodexDisplayText } from "./command-formatters-DRJaVHhN.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.2",
+  "version": "2026.5.16-beta.1",
   "description": "OpenClaw Codex harness and model provider plugin",
   "repository": {
     "type": "git",
@@ -27,10 +27,10 @@
       "minHostVersion": ">=2026.5.1-beta.1"
     },
     "compat": {
-      "pluginApi": ">=2026.5.14-beta.2"
+      "pluginApi": ">=2026.5.16-beta.1"
     },
     "build": {
-      "openclawVersion": "2026.5.14-beta.2"
+      "openclawVersion": "2026.5.16-beta.1"
     },
     "release": {
       "publishToClawHub": true,
@@ -45,7 +45,7 @@
     "openclaw.plugin.json"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.5.14-beta.2"
+    "openclaw": ">=2026.5.16-beta.1"
   },
   "peerDependenciesMeta": {
     "openclaw": {