@openclaw/codex 2026.9.4 → 2026.9.5

package/dist/{thread-lifecycle-DXl1-I6b.js → .setup/thread-lifecycle-Cik28qWn.mjs}

@@ -1,50 +1,51 @@
-import { a as readCodexPluginInventory, o as resolveOwnedAppApprovalOverrideKeys } from "./plugin-inventory-oL4Na1ZG.js";
-import { l as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced } from "./session-binding-record-Bcvslnhf.js";
-import { f as assertCodexModelBackedReviewerEffectiveConfig, g as readCodexEffectiveConfig, h as CODEX_SESSION_OVERRIDABLE_LAYER_TYPES, n as codexSandboxPolicyForTurn } from "./config-options-CXMq1T-C.js";
-import { S as resolveCodexPluginsPolicy, a as flattenCodexDynamicToolFunctions, c as resolveCodexAppServerLocalHomeDir, o as isJsonObject, s as resolveCodexAppServerHomeDir } from "./protocol-5bh1G-H7.js";
-import { L as resolveCodexToolAbortTerminalReason, _ as assertCodexThreadAcceptsDirectInput, b as assertCodexThreadStartResponse, d as isCodexAppServerRequestTimeoutError, l as isCodexAppServerOverloadError, p as resolveCodexAppServerClientInstanceId, r as getCodexAppServerClientInstanceId, v as assertCodexThreadForkResponse } from "./client-B57KWPQx.js";
-import { i as markStartedCodexManagedThread } from "./managed-thread-store-D1t5jh3G.js";
-import { n as withCodexAppServerThreadMutation, t as isIncognitoSessionKey } from "./incognito-session-uhrBF6wJ.js";
-import { n as isCodexThreadReadMissingError, t as CodexAppServerRpcError } from "./rpc-error-ttN_QjEm.js";
-import { t as projectBoundedCodexThreadHistory } from "./transcript-history-projection-v17wXgdK.js";
-import { c as serializeCodexAppInventoryError, o as CodexAppInventoryCache, s as defaultCodexAppInventoryCache, t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-d0eKxy7b.js";
-import { t as withAbortableTimeout } from "./timeout-BVw8aaM1.js";
-import { n as codexCatalogHomeId } from "./session-catalog-home-id-CwhLdC03.js";
-import { n as readCodexSessionMeta } from "./session-catalog-provenance-D-dIfRAH.js";
-import "./config-oIORaQ5T.js";
-import { r as sanitizeInlineImageDataUrl, t as invalidInlineImageText } from "./image-payload-sanitizer-tupAr-2o.js";
-import { t as assertCodexSessionRuntimeOwnership } from "./binding-connection-D3udKbIE.js";
-import { n as normalizeCodexAppServerBindingModelProvider, t as isCodexAppServerNativeAuthProfile } from "./auth-profile-CwzO4_RG.js";
-import { C as CodexThreadBindingConflictError, D as bindCodexInferenceThread, E as assertCodexInferenceRouteConfig, H as isCodexAppServerClientRuntimeLive, K as readCodexClientSessionMeta, R as consumeCodexAppServerLiveThread, S as CodexAdoptedThreadActiveError, U as isCodexAppServerLiveThreadClaimed, Y as unsubscribeCodexAppServerLiveThread, _ as retainSharedCodexAppServerClientByInstanceId, k as prepareCodexInferenceThreadConfig, n as captureCodexAppServerClientLifetime, q as releaseCodexAppServerLiveThread, w as CodexThreadStartRequestError } from "./shared-client-CscigXXL.js";
-import { a as closeCodexStartupClientBestEffort, d as unsubscribeCodexThreadBestEffort, l as retireUnsafeCodexTurnClientBestEffort, n as CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS, r as CodexAppServerUnsafeSubscriptionError, s as isCodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-DKHzbwt5.js";
-import { t as ensureCodexPluginActivation } from "./plugin-activation-BYQculil.js";
-import { o as resolveCodexSessionBinding, r as hashCodexAppServerBindingFingerprint } from "./session-binding-CI8UuilT.js";
-import { i as refreshCodexThreadPolicy, n as CodexThreadPolicyHandoffError, r as assertCodexSupervisionThreadLineage, t as CodexIncognitoPolicyChangeError } from "./thread-policy-BuEQfE0g.js";
-import { t as resumeCodexAppServerThread } from "./thread-resume-DsDOZpFg.js";
-import { r as retainCodexAppServerBindingSubscription, s as withExclusiveCodexAppServerThread } from "./thread-ownership-BsDRTsyp.js";
-import "./transcript-mirror-C5CKgNy6.js";
+import { a as readCodexPluginInventory, o as resolveOwnedAppApprovalOverrideKeys } from "./plugin-inventory-DUle8DLz.mjs";
+import { n as assertCodexBindingMayBeReplaced, p as sessionBindingIdentity } from "./session-binding-record-TH3xA0zj.mjs";
+import { g as resolveCodexAppServerLocalHomeDir, h as resolveCodexAppServerHomeDir, m as isJsonObject, p as flattenCodexDynamicToolFunctions } from "./config-security-BRQ2mgW9.mjs";
+import { f as resolveCodexPluginsPolicy } from "./config-parsing-CcB9iPoq.mjs";
+import { L as resolveCodexToolAbortTerminalReason, _ as assertCodexThreadAcceptsDirectInput, b as assertCodexThreadStartResponse, d as isCodexAppServerRequestTimeoutError, l as isCodexAppServerOverloadError, p as resolveCodexAppServerClientInstanceId, r as getCodexAppServerClientInstanceId, v as assertCodexThreadForkResponse } from "./client-vXs2929Q.mjs";
+import { d as readCodexEffectiveConfig, n as codexSandboxPolicyForTurn, s as assertCodexModelBackedReviewerEffectiveConfig, u as CODEX_SESSION_OVERRIDABLE_LAYER_TYPES } from "./config-options-BsanJ8QG.mjs";
+import { f as getCurrentSharedClientEntry } from "./auth-cache-key-QirmgiCo.mjs";
+import { i as markStartedCodexManagedThread } from "./managed-thread-store-BMqgThVL.mjs";
+import { n as withCodexAppServerThreadMutation, t as isIncognitoSessionKey } from "./incognito-session-uhrBF6wJ.mjs";
+import { a as isCodexThreadReadMissingError, i as CodexAppServerRpcError, t as withAbortableTimeout } from "./timeout-DZF05XrR.mjs";
+import { t as projectBoundedCodexThreadHistory } from "./transcript-history-projection-DHNBDhCU.mjs";
+import { a as defaultCodexAppInventoryCache, i as CodexAppInventoryCache, o as serializeCodexAppInventoryError, s as codexAppIdentityKey, t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-BOxKP7db.mjs";
+import { a as codexCatalogHomeId, c as readCodexSessionMeta } from "./session-catalog-events-jMcYfQyd.mjs";
+import { t as assertCodexSessionRuntimeOwnership } from "./binding-connection-Bm38niE8.mjs";
+import "./config-CedDWjM-.mjs";
+import { r as sanitizeInlineImageDataUrl, t as invalidInlineImageText } from "./image-payload-sanitizer-tupAr-2o.mjs";
+import { n as normalizeCodexAppServerBindingModelProvider, t as isCodexAppServerNativeAuthProfile } from "./auth-profile-WqZtZfXN.mjs";
+import { C as CodexThreadBindingConflictError, E as nativeHookRelayUnregisterQueue, G as unsubscribeCodexAppServerLiveThread, H as readCodexClientSessionMeta, L as hasCodexAppServerSiblingThreadWork, N as consumeCodexAppServerLiveThread, O as assertCodexInferenceRouteConfig, R as isCodexAppServerClientRuntimeLive, S as CodexAdoptedThreadActiveError, T as CodexThreadStartRequestError, U as releaseCodexAppServerLiveThread, _ as retainSharedCodexAppServerClientByInstanceId, j as prepareCodexInferenceThreadConfig, k as bindCodexInferenceThread, n as captureCodexAppServerClientLifetime, w as CodexThreadClientReplacementError, z as isCodexAppServerLiveThreadClaimed } from "./shared-client-BpTtuLQ5.mjs";
+import { a as closeCodexStartupClientBestEffort, f as unsubscribeCodexThreadBestEffort, h as hasCodexAppServerSiblingRouteWork, l as retireUnsafeCodexTurnClientBestEffort, n as CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS, r as CodexAppServerUnsafeSubscriptionError, s as isCodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-BpYKdTA0.mjs";
+import { t as ensureCodexPluginActivation } from "./plugin-activation-r8nq5Jzp.mjs";
+import { o as resolveCodexSessionBinding, r as hashCodexAppServerBindingFingerprint } from "./session-binding-_0W_fHRr.mjs";
+import { i as refreshCodexThreadPolicy, n as CodexThreadPolicyHandoffError, r as assertCodexSupervisionThreadLineage, t as CodexIncognitoPolicyChangeError } from "./thread-policy-Cjs4B8xf.mjs";
+import { t as resumeCodexAppServerThread } from "./thread-resume-BkNpj9Pz.mjs";
+import { r as retainCodexAppServerBindingSubscription, s as withExclusiveCodexAppServerThread } from "./thread-ownership-skomxnIt.mjs";
+import "./transcript-mirror-D4qp_leP.mjs";
 import { asOptionalRecord, isRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import * as crypto$1 from "node:crypto";
 import crypto, { createHash } from "node:crypto";
+import { isDeepStrictEqual } from "node:util";
 import { resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { addTimerTimeoutGraceMs, finiteSecondsToTimerSafeMilliseconds } from "openclaw/plugin-sdk/number-runtime";
 import path from "node:path";
 import os from "node:os";
 import fs from "node:fs/promises";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
+import { toErrorObject } from "openclaw/plugin-sdk/error-runtime";
 import { sliceUtf16Safe, truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
+import { emitTrustedDiagnosticEvent } from "openclaw/plugin-sdk/diagnostic-runtime";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 import { createStageTimingTracker, formatStageTimings } from "openclaw/plugin-sdk/time-runtime";
 import { isPathInside } from "openclaw/plugin-sdk/file-access-runtime";
 import { resolveAgentDir as resolveAgentDir$1 } from "openclaw/plugin-sdk/agent-runtime";
-import { AgentHarnessPreflightError, SKILL_WORKSHOP_TOOL_NAME, buildCredentialSafetyPrompt, buildDelegationGuidanceSection, buildHarnessVisibleReplyGuidance, buildSkillWorkshopPromptSection, buildTemporalContextText, buildUiPresentationPrompt, embeddedAgentLog, formatErrorMessage, isActiveHarnessContextEngine, isHostScopedAgentToolActive, isOpenClawRuntimeContextCustomMessage, resolveMainSessionDelegationMode } from "openclaw/plugin-sdk/agent-harness-runtime";
-import { isDeepStrictEqual } from "node:util";
-import { emitTrustedDiagnosticEvent } from "openclaw/plugin-sdk/diagnostic-runtime";
+import { AgentHarnessPreflightError, SKILL_WORKSHOP_TOOL_NAME, buildCredentialSafetyPrompt, buildDelegationGuidanceSection, buildHarnessVisibleReplyGuidance, buildSkillWorkshopPromptSection, buildTemporalContextText, buildUiPresentationPrompt, embeddedAgentLog, formatErrorMessage as formatErrorMessage$1, isActiveHarnessContextEngine, isHostScopedAgentToolActive, isOpenClawRuntimeContextCustomMessage, resolveMainSessionDelegationMode } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
 import { IMAGE_BLOCK_TOKENS } from "openclaw/plugin-sdk/agent-core";
 import { resolveRequiredHomeDir, resolveStateDir } from "openclaw/plugin-sdk/state-paths";
 import { buildCodexUserMcpServersThreadConfigPatchForRun } from "openclaw/plugin-sdk/codex-mcp-projection";
-import { registerRetainedNativeHookRelayForBundledRuntime } from "openclaw/plugin-sdk/native-hook-relay-runtime";
+import { registerNativeHookRelayForBundledRuntime } from "openclaw/plugin-sdk/native-hook-relay-runtime";
 import { isDiagnosticFlagEnabled } from "openclaw/plugin-sdk/diagnostic-flags";
 import { listRegisteredPluginAgentPromptGuidance } from "openclaw/plugin-sdk/plugin-runtime";
 import { buildHostnameAllowlistPolicyFromSuffixAllowlist } from "openclaw/plugin-sdk/ssrf-policy";
@@ -106,7 +107,7 @@ function collectCodexPluginOwnedAppIds(inventory) {
 	return Array.from(new Set(inventory.records.flatMap((record) => record.ownedAppIds).filter(Boolean))).toSorted();
 }
 function collectCodexReservedPluginAppIds(params) {
-	const reserved = new Set(params.inventory.records.flatMap((record) => record.appOwnership === "proven" ? record.ownedAppIds : []));
+	const reserved = new Set(params.inventory.records.flatMap((record) => record.appOwnership === "proven" ? record.ownedAppIds : []).map(codexAppIdentityKey));
 	const recordsByConfigKey = new Map(params.inventory.records.map((record) => [record.policy.configKey, record]));
 	const configuredOwnerNames = new Set(params.policy.pluginPolicies.flatMap((policy) => {
 		const record = recordsByConfigKey.get(policy.configKey);
@@ -117,7 +118,7 @@ function collectCodexReservedPluginAppIds(params) {
 			record?.summary.id
 		].filter((name) => Boolean(name)).map(normalizeCodexPluginOwnerName);
 	}));
-	for (const app of params.accountApps) if (app.pluginDisplayNames.some((name) => configuredOwnerNames.has(normalizeCodexPluginOwnerName(name)))) reserved.add(app.id);
+	for (const app of params.accountApps) if (app.pluginDisplayNames.some((name) => configuredOwnerNames.has(normalizeCodexPluginOwnerName(name)))) reserved.add(codexAppIdentityKey(app.id));
 	return reserved;
 }
 function normalizeCodexPluginOwnerName(name) {
@@ -199,8 +200,8 @@ async function readCodexConfigForAppAdmission(params) {
 function resolveCodexExplicitAppEnablement(layersHighestPrecedenceFirst, appId) {
 	for (const layer of layersHighestPrecedenceFirst) {
 		const apps = layer.apps;
-		const app = isJsonObject(apps) ? apps[appId] : void 0;
-		if (isJsonObject(app) && Object.hasOwn(app, "enabled")) return app.enabled === true;
+		const values = isJsonObject(apps) ? Object.entries(apps).filter(([id, app]) => codexAppIdentityKey(id) === codexAppIdentityKey(appId) && isJsonObject(app) && Object.hasOwn(app, "enabled")).map(([, app]) => isJsonObject(app) && app.enabled === true) : [];
+		if (values.length > 0) return values.every(Boolean);
 	}
 }
 function shouldForceRefreshCodexNotReadyPluginApps(params, policy, inventory) {
@@ -213,7 +214,7 @@ function shouldForceRefreshCodexNotReadyPluginApps(params, policy, inventory) {
 * Builds Codex thread config patches that expose only policy-approved apps
 * for native Codex turns.
 */
-const CODEX_PLUGIN_THREAD_CONFIG_INPUT_FINGERPRINT_VERSION = 6;
+const CODEX_PLUGIN_THREAD_CONFIG_INPUT_FINGERPRINT_VERSION = 7;
 const CODEX_PLUGIN_THREAD_CONFIG_FINGERPRINT_VERSION = 2;
 /** Returns true when plugin config exists and thread config may need app patches. */
 function shouldBuildCodexPluginThreadConfig(pluginConfig) {
@@ -419,7 +420,7 @@ async function buildCodexPluginThreadConfig(params) {
 		}
 	}
 	for (const app of unresolvedDisabledPluginOwnership ? [] : accountAppsResult.apps) {
-		if (pluginOwnedAppIds.has(app.id)) continue;
+		if (pluginOwnedAppIds.has(codexAppIdentityKey(app.id))) continue;
 		const admissionConfig = await getAdmissionConfig();
 		if (resolveCodexExplicitAppEnablement(admissionConfig.layers, app.id) === false) continue;
 		const accountApp = toCodexPluginOwnedAccountApp(app);
@@ -638,8 +639,34 @@ const CODEX_TURN_START_TEXT_INPUT_MAX_CHARS = 1 << 20;
 const DEFAULT_CODEX_PROJECTION_RESERVE_TOKENS = 2e4;
 const MIN_PROMPT_BUDGET_RATIO = .5;
 const MIN_PROMPT_BUDGET_TOKENS = 8e3;
+const CODEX_CONTEXT_SENDER_FIELD_MAX_CHARS = 256;
+/**
+* This projection has no access to agent-core's private compaction helper, but
+* must keep the same attribution contract: a stable ID is identity; display
+* labels are optional metadata, never provenance on their own.
+*/
+function formatCodexContextSenderSuffix(message) {
+	if (message.role !== "user") return "";
+	const metadata = Reflect.get(message, "__openclaw");
+	if (!metadata || typeof metadata !== "object") return "";
+	const normalize = (value) => {
+		if (typeof value !== "string") return;
+		const normalized = value.replaceAll("\0", "").trim();
+		return normalized ? truncateUtf16Safe(normalized, CODEX_CONTEXT_SENDER_FIELD_MAX_CHARS) : void 0;
+	};
+	const record = metadata;
+	const id = normalize(record.senderId);
+	if (!id) return "";
+	const name = normalize(record.senderName);
+	const username = normalize(record.senderUsername);
+	return ` sender=${JSON.stringify({
+		id,
+		...name ? { name } : {},
+		...username ? { username } : {}
+	})}`;
+}
 function neutralizeCodexExplicitMentionSigils(text) {
-	return text.replace(/\$(?=[A-Za-z0-9_:-])/gu, "＄").replace(/\[@(?=[A-Za-z0-9_:-]+\]\()/gu, "[＠");
+	return text.replace(/\$(?=[A-Za-z0-9_:-])/gu, "＄").replace(/\[@(?=[A-Za-z0-9_:-]+\]\s*\()/gu, "[＠");
 }
 /** Hidden durable notes are context; transient runtime carriers are current-turn only. */
 function isCodexDurableCustomMessage(message) {
@@ -675,7 +702,11 @@ async function projectContextEngineAssemblyForCodex(params) {
 		...promptContextRange ? { promptContextRange } : {},
 		assembledMessages: params.assembledMessages,
 		prePromptMessageCount: params.originalHistoryMessages.length,
-		...context.images.length ? { images: context.images } : {}
+		...context.imageGroups.length && promptPrefix ? { imageGroups: context.imageGroups.map((group) => ({
+			images: group.images,
+			start: group.start + promptPrefix.length,
+			end: group.end + promptPrefix.length
+		})) } : {}
 	};
 }
 /** Resolves rendered context size from a token budget and reserve. */
@@ -719,32 +750,61 @@ function resolveCodexContinuityProjectionMaxChars(params) {
 }
 /** Fits projected context prompts under Codex app-server turn/start text limits. */
 function fitCodexProjectedContextForTurnStart(params) {
+	const slice = (start, end, budget = end - start) => {
+		const retained = truncateOlderContext(params.promptText.slice(start, end), budget);
+		return {
+			...retained,
+			sourceStart: start + retained.retainedStart,
+			sourceEnd: end
+		};
+	};
+	const finish = (...parts) => {
+		const imageGroups = [];
+		let offset = 0;
+		for (const part of parts) {
+			for (const group of params.imageGroups ?? []) if (group.start >= part.sourceStart && group.end <= part.sourceEnd) {
+				const shift = offset + part.prefixLength - part.sourceStart;
+				imageGroups.push({
+					...group,
+					start: group.start + shift,
+					end: group.end + shift
+				});
+			}
+			offset += part.text.length;
+		}
+		return {
+			promptText: parts.map((part) => part.text).join(""),
+			...imageGroups.length ? { imageGroups } : {}
+		};
+	};
 	const maxChars = typeof params.maxChars === "number" && Number.isFinite(params.maxChars) ? Math.max(0, Math.floor(params.maxChars)) : CODEX_TURN_START_TEXT_INPUT_MAX_CHARS;
-	if (params.promptText.length <= maxChars) return params.promptText;
+	if (params.promptText.length <= maxChars) return finish(slice(0, params.promptText.length));
 	const range = normalizeProjectedContextRange(params.contextRange, params.promptText.length);
 	if (!range) {
 		const preservedRange = normalizeProjectedContextRange(params.preservedRange, params.promptText.length);
-		if (!preservedRange) return params.promptText;
+		if (!preservedRange) return finish(slice(0, params.promptText.length));
 		const preservedText = params.promptText.slice(preservedRange.start, preservedRange.end);
-		if (!preservedText) return truncateOlderContext(params.promptText, maxChars);
-		if (preservedText.length >= maxChars) return truncateOlderContext(preservedText, maxChars);
-		return `${truncateOlderContext(params.promptText.slice(0, preservedRange.start), maxChars - preservedText.length)}${preservedText}`;
+		if (!preservedText) return finish(slice(0, params.promptText.length, maxChars));
+		if (preservedText.length >= maxChars) return finish(slice(preservedRange.start, preservedRange.end, maxChars));
+		return finish(slice(0, preservedRange.start, maxChars - preservedText.length), slice(preservedRange.start, preservedRange.end));
 	}
 	const beforeContext = params.promptText.slice(0, range.start);
-	const context = params.promptText.slice(range.start, range.end);
 	const afterContext = params.promptText.slice(range.end);
 	const requestRange = normalizeProjectedContextRange(params.requestRange, params.promptText.length);
 	if (requestRange && requestRange.start >= range.end && requestRange.end < params.promptText.length) {
 		const request = params.promptText.slice(requestRange.start, requestRange.end);
-		if (request.length >= maxChars) return truncateOlderContext(request, maxChars);
-		const fittedAppendedContext = truncateOlderContext(params.promptText.slice(requestRange.end), maxChars - request.length);
-		const fittedContext = truncateOlderContext(context, maxChars - request.length - fittedAppendedContext.length);
-		return `${truncateOlderContext(beforeContext, maxChars - fittedContext.length - request.length - fittedAppendedContext.length)}${fittedContext}${request}${fittedAppendedContext}`;
+		if (request.length >= maxChars) return finish(slice(requestRange.start, requestRange.end, maxChars));
+		const fittedAppendedContext = slice(requestRange.end, params.promptText.length, maxChars - request.length);
+		const contextBudget = maxChars - request.length - fittedAppendedContext.text.length;
+		const fittedContext = slice(range.start, range.end, contextBudget);
+		const beforeContextBudget = maxChars - fittedContext.text.length - request.length - fittedAppendedContext.text.length;
+		return finish(slice(0, range.start, beforeContextBudget), fittedContext, slice(requestRange.start, requestRange.end), fittedAppendedContext);
 	}
 	const contextBudget = maxChars - beforeContext.length - afterContext.length;
-	if (contextBudget > 0) return `${beforeContext}${truncateOlderContext(context, contextBudget)}${afterContext}`;
-	const afterContextText = truncateOlderContext(afterContext, maxChars);
-	return `${truncateOlderContext(context, maxChars - afterContextText.length)}${afterContextText}`;
+	if (contextBudget > 0) return finish(slice(0, range.start), slice(range.start, range.end, contextBudget), slice(range.end, params.promptText.length));
+	const afterContextText = slice(range.end, params.promptText.length, maxChars);
+	const contextBudgetAfterRequest = maxChars - afterContextText.text.length;
+	return finish(slice(range.start, range.end, contextBudgetAfterRequest), afterContextText);
 }
 function normalizeProjectedContextRange(range, textLength) {
 	if (!range) return;
@@ -765,7 +825,6 @@ function resolveProjectionPromptBudgetTokens(params) {
 }
 async function renderMessagesForCodexContext(messages, options) {
 	const tail = [];
-	const images = [];
 	let retainedImageChars = 0;
 	let totalChars = 0;
 	let retainedChars = 0;
@@ -786,19 +845,38 @@ async function renderMessagesForCodexContext(messages, options) {
 			imageChars > 0 && !imagesFit ? "[Attachment images omitted: context budget exceeded]" : void 0
 		].filter(Boolean).join("\n\n");
 		if (!text && acceptedImageChars === 0) continue;
-		const chunk = `[${message.role}]\n${text}${totalChars > 0 ? "\n\n" : ""}`;
+		const separator = totalChars > 0 ? "\n\n" : "";
+		const chunk = `[${message.role}${formatCodexContextSenderSuffix(message)}]\n${text}${separator}`;
 		totalChars += chunk.length;
 		if (remaining > 0) {
 			const retained = neutralizeCodexExplicitMentionSigils(chunk).slice(-(remaining - acceptedImageChars));
-			tail.push(retained);
+			tail.push({
+				text: retained,
+				separatorLength: separator.length,
+				...imagesFit && files?.images.length && retained.length === chunk.length ? { images: files.images } : {}
+			});
 			retainedChars += retained.length + acceptedImageChars;
 			retainedImageChars += acceptedImageChars;
-			if (imagesFit && files?.images.length) images.unshift(...files.images);
 		}
 	}
+	const ordered = tail.toReversed();
+	const fitted = truncateOlderContext(ordered.map((entry) => entry.text).join(""), options.maxRenderedContextChars - retainedImageChars, totalChars);
+	const imageGroups = [];
+	let offset = 0;
+	for (const entry of ordered) {
+		if (entry.images && offset >= fitted.retainedStart) {
+			const start = offset - fitted.retainedStart + fitted.prefixLength;
+			imageGroups.push({
+				start,
+				end: start + entry.text.length - entry.separatorLength,
+				images: entry.images
+			});
+		}
+		offset += entry.text.length;
+	}
 	return {
-		text: truncateOlderContext(tail.toReversed().join(""), options.maxRenderedContextChars - retainedImageChars, totalChars),
-		images
+		text: fitted.text,
+		imageGroups
 	};
 }
 function renderMessageBody(message, options) {
@@ -873,8 +951,12 @@ function summarizeToolInputShape(value, seen = /* @__PURE__ */ new WeakSet()) {
 	return `[${typeof value}]`;
 }
 function redactPreservedToolValue(key, value, seen = /* @__PURE__ */ new WeakSet()) {
-	if (typeof value === "string") return redactSensitiveFieldValue(key, redactToolPayloadText(value));
-	if (value === null || value === void 0 || typeof value === "number" || typeof value === "boolean") return value;
+	if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+		const text = String(value);
+		const redacted = redactSensitiveFieldValue(key, redactToolPayloadText(text));
+		return redacted === text ? value : redacted;
+	}
+	if (value === null || value === void 0) return value;
 	if (Array.isArray(value)) {
 		if (seen.has(value)) return "[Circular]";
 		seen.add(value);
@@ -912,15 +994,32 @@ function truncateText(text, maxChars) {
 	return `${truncated}\n[truncated ${text.length - truncated.length} chars]`;
 }
 function truncateOlderContext(text, maxChars, totalChars = text.length) {
-	if (totalChars <= maxChars) return text;
-	if (maxChars <= 0) return "";
+	if (totalChars <= maxChars) return {
+		text,
+		retainedStart: 0,
+		prefixLength: 0
+	};
+	if (maxChars <= 0) return {
+		text: "",
+		retainedStart: text.length,
+		prefixLength: 0
+	};
 	const buildMarker = (omittedChars) => `[truncated ${omittedChars} chars from older context]\n`;
 	let marker = buildMarker(totalChars - maxChars);
 	let tailChars = Math.max(0, maxChars - marker.length);
 	marker = buildMarker(totalChars - tailChars);
-	if (marker.length >= maxChars) return marker.slice(0, maxChars);
+	if (marker.length >= maxChars) return {
+		text: marker.slice(0, maxChars),
+		retainedStart: text.length,
+		prefixLength: maxChars
+	};
 	tailChars = maxChars - marker.length;
-	return `${marker}${sliceUtf16Safe(text, -tailChars).trimStart()}`;
+	const tail = sliceUtf16Safe(text, -tailChars).trimStart();
+	return {
+		text: `${marker}${tail}`,
+		retainedStart: text.length - tail.length,
+		prefixLength: marker.length
+	};
 }
 //#endregion
 //#region extensions/codex/src/app-server/thread-context-engine.ts
@@ -1577,30 +1676,6 @@ async function discardUnattestedCodexPluginThread(params) {
 	}
 }
 //#endregion
-//#region extensions/codex/src/app-server/native-hook-relay-state.ts
-const pending = /* @__PURE__ */ new Set();
-/** Owns delayed hook-relay cleanup across runtime scheduling and test teardown. */
-const nativeHookRelayUnregisterQueue = {
-	add(entry) {
-		pending.add(entry);
-	},
-	delete(entry) {
-		return pending.delete(entry);
-	},
-	flush() {
-		while (pending.size > 0) {
-			const entry = pending.values().next().value;
-			if (!entry) return;
-			clearTimeout(entry.timeout);
-			entry.unregister();
-		}
-	},
-	clear() {
-		for (const entry of pending) clearTimeout(entry.timeout);
-		pending.clear();
-	}
-};
-//#endregion
 //#region extensions/codex/src/app-server/native-hook-relay.ts
 /**
 * Bridges Codex native hook callbacks into OpenClaw's native hook relay so
@@ -1666,6 +1741,7 @@ function scheduleCodexNativeHookRelayUnregister(params) {
 		pending = void 0;
 		if (!nativeHookRelayUnregisterQueue.delete(current)) return;
 		params.relay.unregister();
+		nativeHookRelayUnregisterQueue.track(params.relay.drain());
 	};
 	const timeout = setTimeout(unregister, resolveCodexNativeHookRelayUnregisterGraceMs(params.hookTimeoutSec));
 	pending = {
@@ -1708,7 +1784,7 @@ function createCodexNativeHookRelay(params) {
 		for (const pending of pendingDirectChildAdmissions.values()) pending.reject(new Error(reason));
 		pendingDirectChildAdmissions.clear();
 	};
-	const relay = registerRetainedNativeHookRelayForBundledRuntime({
+	const relay = registerNativeHookRelayForBundledRuntime({
 		provider: "codex",
 		relayId: buildCodexNativeHookRelayId({
 			agentId: params.agentId,
@@ -1737,6 +1813,7 @@ function createCodexNativeHookRelay(params) {
 		}),
 		signal: params.signal,
 		runBeforeToolCall: params.hostCapabilities.runBeforeToolCall,
+		approvalHost: params.hostCapabilities,
 		assertActive: () => {
 			params.hostCapabilities.assertActive();
 			params.assertCurrent?.();
@@ -1745,20 +1822,32 @@ function createCodexNativeHookRelay(params) {
 			readClaim: readCodexNativeChildThreadId,
 			shouldRetainAfterForegroundClose: () => successfulYieldRetentionAuthorized && directChildClaims.size > 0,
 			allowPreToolUse: (childThreadId) => directChildClaims.has(childThreadId),
-			awaitForegroundAdmission: (childThreadId) => {
+			awaitForegroundAdmission: (childThreadId, signal) => {
 				if (foregroundClosed) return Promise.reject(/* @__PURE__ */ new Error("native hook relay foreground admission unavailable"));
 				const existingClaim = directChildClaims.get(childThreadId);
 				if (existingClaim) return Promise.resolve(assertClaim(childThreadId, existingClaim));
-				const existingPending = pendingDirectChildAdmissions.get(childThreadId);
-				if (existingPending) return existingPending.promise.then((claim) => assertClaim(childThreadId, claim));
-				if (pendingDirectChildAdmissions.size >= MAX_PENDING_DIRECT_CHILD_ADMISSIONS) return Promise.reject(/* @__PURE__ */ new Error("native hook relay foreground admission capacity reached"));
-				const { promise, resolve, reject } = createDeferred();
-				pendingDirectChildAdmissions.set(childThreadId, {
-					promise,
-					resolve,
-					reject
+				let pending = pendingDirectChildAdmissions.get(childThreadId);
+				if (!pending) {
+					if (pendingDirectChildAdmissions.size >= MAX_PENDING_DIRECT_CHILD_ADMISSIONS) return Promise.reject(/* @__PURE__ */ new Error("native hook relay foreground admission capacity reached"));
+					pending = {
+						...createDeferred(),
+						waiters: 0
+					};
+					pendingDirectChildAdmissions.set(childThreadId, pending);
+				}
+				const admission = pending;
+				admission.waiters++;
+				let onAbort;
+				return new Promise((resolve, reject) => {
+					admission.promise.then(resolve, reject);
+					onAbort = () => reject(toErrorObject(signal?.reason, "native hook relay admission aborted"));
+					signal?.addEventListener("abort", onAbort, { once: true });
+					if (signal?.aborted) onAbort();
+				}).then((claim) => assertClaim(childThreadId, claim)).finally(() => {
+					if (onAbort) signal?.removeEventListener("abort", onAbort);
+					admission.waiters--;
+					if (admission.waiters === 0 && pendingDirectChildAdmissions.get(childThreadId) === admission) pendingDirectChildAdmissions.delete(childThreadId);
 				});
-				return promise.then((claim) => assertClaim(childThreadId, claim));
 			},
 			onDispose: () => {
 				foregroundClosed = true;
@@ -1805,7 +1894,10 @@ function createCodexNativeHookRelay(params) {
 				released = true;
 				if (directChildClaims.get(threadId) !== claim) return;
 				directChildClaims.delete(threadId);
-				if (foregroundClosed && directChildClaims.size === 0) relay.unregister();
+				if (foregroundClosed && directChildClaims.size === 0) {
+					relay.unregister();
+					nativeHookRelayUnregisterQueue.track(relay.drain());
+				}
 			};
 		}
 	};
@@ -2056,6 +2148,7 @@ function resolveCodexAppServerModelProvider(params) {
 //#region extensions/codex/src/app-server/thread-prompt.ts
 function buildDeveloperInstructions(params, options = {}) {
 	const deferredToolNames = /* @__PURE__ */ new Set();
+	let screenToolName;
 	let showWidgetToolName;
 	let dashboardToolName;
 	let portalToolName;
@@ -2074,6 +2167,7 @@ function buildDeveloperInstructions(params, options = {}) {
 			const name = tool.name.trim();
 			const qualifiedName = spec.type === "namespace" ? `${spec.name}.${name}` : name;
 			if (tool.deferLoading === true && name) deferredToolNames.add(name);
+			if (name === "screen") screenToolName ??= qualifiedName;
 			if (name === "show_widget") showWidgetToolName ??= qualifiedName;
 			if (name === "dashboard") dashboardToolName ??= qualifiedName;
 			if (name === "portal") portalToolName ??= qualifiedName;
@@ -2117,6 +2211,7 @@ function buildDeveloperInstructions(params, options = {}) {
 			hasSessionsSend
 		}).join("\n") : void 0,
 		params.disableTools !== true && params.promptMode !== "minimal" && params.promptMode !== "none" ? buildUiPresentationPrompt({
+			screenToolName,
 			showWidgetToolName,
 			dashboardToolName,
 			portalToolName,
@@ -2357,6 +2452,7 @@ function buildThreadStartParams(params, options) {
 		...(options.hostSystemAgentActive ?? isHostScopedAgentToolActive("openclaw")) && isSystemAgentOnlyCodexDynamicToolAllowlist(params.toolsAllow) ? { baseInstructions: "" } : {},
 		personality: CODEX_NATIVE_PERSONALITY_NONE,
 		serviceName: "OpenClaw",
+		threadSource: "openclaw",
 		...resolveCodexThreadEnvironmentSelection(options),
 		dynamicTools: [...options.dynamicTools],
 		experimentalRawEvents: true,
@@ -2998,7 +3094,7 @@ async function prepareCodexThreadLifecyclePreflight(params) {
 		warn: (message) => embeddedAgentLog.warn(message),
 		onServerUnavailable: (serverName, error) => embeddedAgentLog.warn("skipping unavailable MCP OAuth server", {
 			serverName,
-			error: formatErrorMessage(error)
+			error: formatErrorMessage$1(error)
 		})
 	});
 	const nativeSkillIsolation = await lifecycleTiming.measure("native-skill-isolation", () => resolveCodexNativeSkillIsolation({
@@ -3085,8 +3181,14 @@ async function resumeExistingCodexThread(params, context) {
 		disposeConfiguration = configuration.dispose;
 		await context.releaseRetainedThread(configuration.assertCurrent);
 		configuration.assertCurrent();
+		const clientBoundThread = ringZeroClientInstanceId !== void 0 || resumeBinding.ringZeroClientInstanceId !== void 0 || resumeBinding.ringZeroConfigFingerprint !== void 0 || context.ringZeroActive;
+		const sharedEntry = getCurrentSharedClientEntry(params.client);
+		if (configuration.settledSystemError && !clientBoundThread && resumeBinding.connectionScope !== "supervision" && (!sharedEntry || sharedEntry.activeLeases <= 1 && sharedEntry.pendingAcquires === 0) && !hasCodexAppServerSiblingThreadWork(params.client, resumeBinding.threadId) && !hasCodexAppServerSiblingRouteWork(params.client, resumeBinding.threadId)) {
+			await abandonClient();
+			throw new CodexThreadClientReplacementError();
+		}
 		const authProfileId = resumeBinding.connectionScope === "supervision" ? void 0 : params.params.authProfileId ?? resumeBinding.authProfileId;
-		const finalConfigPatch = context.prebuiltFinalConfigPatch ?? params.buildFinalConfigPatch?.({
+		const finalConfigPatch = context.prebuiltFinalConfigPatch ?? await params.buildFinalConfigPatch?.({
 			action: "resume",
 			binding: resumeBinding
 		}) ?? {
@@ -3261,7 +3363,7 @@ async function startFreshCodexThread(params, context) {
 	const clientId = resolveCodexAppServerClientInstanceId(params.client);
 	const { bindingIdentity, startModelSelection, startModelProvider, userMcpServersConfigPatch, dynamicToolsFingerprint, dynamicToolsContainDeferred, webSearchThreadConfigFingerprint, nativeSkillIsolationFingerprint, userMcpServersFingerprint, ringZeroConfigFingerprint, ringZeroClientInstanceId, networkProxyConfigFingerprint, contextEngineBinding, environmentSelectionFingerprint, hostSystemAgentActive, restrictedToolSurface, restrictedToolSurfaceInheritedMcpServerNames, nativeSkillIsolation, lifecycleTiming, normalizeBindingModelProvider, throwIfAborted, prebuiltPluginThreadConfig, preserveExistingBinding, rotatedContextEngineBinding, replacementPredecessor } = context;
 	const pluginThreadConfig = params.pluginThreadConfig?.enabled ? prebuiltPluginThreadConfig ?? await lifecycleTiming.measure("plugin-config-build", () => params.pluginThreadConfig?.build()) : void 0;
-	const finalConfigPatch = params.buildFinalConfigPatch?.({ action: "start" }) ?? {
+	const finalConfigPatch = await params.buildFinalConfigPatch?.({ action: "start" }) ?? {
 		configPatch: params.finalConfigPatch,
 		nativeHookRelayGeneration: params.nativeHookRelayGeneration
 	};
@@ -3496,7 +3598,7 @@ async function tryReuseCodexLiveThread(options) {
 	const incognito = isIncognitoSessionKey(params.params.sessionKey);
 	if (incognito && (binding.preserveNativeModel || binding.connectionScope === "supervision")) {
 		if (binding.clientId === clientId && binding.clientId && ((await options.buildLoadedPluginThreadConfig(binding))?.fingerprint ?? binding.pluginAppsFingerprint) === binding.pluginAppsFingerprint) {
-			params.buildFinalConfigPatch?.({
+			await params.buildFinalConfigPatch?.({
 				action: "resume",
 				binding
 			});
@@ -3532,7 +3634,7 @@ async function tryReuseCodexLiveThread(options) {
 		const pluginThreadConfig = await options.buildLoadedPluginThreadConfig(binding);
 		assertWarmOwner();
 		if (pluginThreadConfig && pluginThreadConfig.fingerprint !== binding.pluginAppsFingerprint) return { kind: "rotate" };
-		const prebuiltFinalConfigPatch = params.buildFinalConfigPatch?.({
+		const prebuiltFinalConfigPatch = await params.buildFinalConfigPatch?.({
 			action: "resume",
 			binding
 		}) ?? {
@@ -3767,7 +3869,8 @@ async function preparePendingCodexThreadResume(params, binding, dynamicToolsFing
 		return {
 			assertConfigured: observation.assertConfigured,
 			assertCurrent,
-			dispose
+			dispose,
+			settledSystemError: observation.settledSystemError
 		};
 	} catch (error) {
 		dispose();
@@ -3776,7 +3879,7 @@ async function preparePendingCodexThreadResume(params, binding, dynamicToolsFing
 }
 /** Observe teardown before release; a successful resume alone can acknowledge ignored overrides. */
 async function prepareCodexThreadResume(params, binding, context) {
-	const assertClient = captureCodexAppServerClientLifetime(params.client, binding.connectionScope === "supervision" ? "connection" : "native-process");
+	const assertClient = captureCodexAppServerClientLifetime(params.client, binding.connectionScope === "supervision" ? "connection" : "thread-configuration");
 	const assertCurrent = () => {
 		params.params.hostCapabilities.assertActive();
 		params.assertCurrent?.();
@@ -3802,11 +3905,13 @@ function isCodexThreadNonRunning(status) {
 }
 function observeCodexThreadConfiguration(params, thread, assertCurrent) {
 	if (!isCodexThreadNonRunning(thread.status)) throw new CodexAdoptedThreadActiveError();
+	const settledSystemError = thread.status.type === "systemError";
 	let unloaded = thread.status.type === "notLoaded";
 	return {
 		dispose: params.client.addNotificationHandler((notification) => {
 			if (notification.method === "thread/status/changed" && isJsonObject(notification.params) && notification.params.threadId === thread.id && isJsonObject(notification.params.status) && notification.params.status.type === "notLoaded") unloaded = true;
 		}),
+		settledSystemError,
 		assertConfigured: () => {
 			assertCurrent();
 			if (!unloaded) throw new Error("Codex did not confirm unloading its previous configuration. The thread is preserved; stop competing native work and reconnect before retrying.");
@@ -4166,7 +4271,7 @@ async function archiveSupervisionArtifact(client, threadId) {
 		await client.request("thread/archive", { threadId }, { timeoutMs: CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS });
 		return true;
 	} catch (error) {
-		const message = formatErrorMessage(error).toLowerCase();
+		const message = formatErrorMessage$1(error).toLowerCase();
 		if (message.includes("no rollout found for thread id") || message.includes("thread not found") || message.includes("already archived")) return true;
 		await unsubscribeCodexThreadBestEffort(client, {
 			threadId,
@@ -4247,7 +4352,7 @@ async function startOrResumeThread(input) {
 			await releaseRetainedThread(binding.threadId);
 			const pendingBinding = binding;
 			const pluginThreadConfig = params.pluginThreadConfig?.enabled ? await lifecycleTiming.measure("plugin-config-build", () => params.pluginThreadConfig?.build()) : void 0;
-			const finalConfigPatch = params.buildFinalConfigPatch?.({ action: "start" }) ?? {
+			const finalConfigPatch = await params.buildFinalConfigPatch?.({ action: "start" }) ?? {
 				configPatch: params.finalConfigPatch,
 				nativeHookRelayGeneration: params.nativeHookRelayGeneration
 			};
@@ -4575,10 +4680,7 @@ const LEGACY_PRO_MODEL_ID_RE = /^gpt-5\.[45]-pro$/u;
 const MODERN_GPT_5_MODEL_ID_RE = /^gpt-5\.(?:[3-9]|[1-9]\d)(?:$|-)/u;
 /** Read reasoning metadata after the Codex app-server route has been selected. */
 function readCodexSupportedReasoningEfforts(compat) {
-	if (!compat || typeof compat !== "object" || Array.isArray(compat)) return;
-	const efforts = compat.supportedReasoningEfforts;
-	if (!Array.isArray(efforts)) return;
-	return efforts.filter((effort) => typeof effort === "string");
+	return compat && "supportedReasoningEfforts" in compat ? compat.supportedReasoningEfforts : void 0;
 }
 function resolveSupportedReasoningEffort(params) {
 	const declared = new Set(params.supportedReasoningEfforts.map((effort) => effort.trim().toLowerCase()));
@@ -4591,23 +4693,40 @@ function resolveCodexAppServerReasoningEffort(params) {
 	if (params.thinkLevel === "ultra") return "ultra";
 	if (params.thinkLevel === "off") return params.supportedReasoningEfforts?.includes("none") ? "none" : null;
 	if (params.thinkLevel === "adaptive") return null;
-	if (params.supportedReasoningEfforts) return resolveSupportedReasoningEffort({
-		requested: params.thinkLevel,
-		supportedReasoningEfforts: params.supportedReasoningEfforts
-	}) ?? null;
 	const modelId = params.modelId.trim().toLowerCase();
-	if (LEGACY_PRO_MODEL_ID_RE.test(modelId)) return resolveSupportedReasoningEffort({
+	const supportedReasoningEfforts = params.supportedReasoningEfforts ?? (LEGACY_PRO_MODEL_ID_RE.test(modelId) ? LEGACY_PRO_REASONING_EFFORTS : void 0);
+	if (supportedReasoningEfforts) return resolveSupportedReasoningEffort({
 		requested: params.thinkLevel,
-		supportedReasoningEfforts: LEGACY_PRO_REASONING_EFFORTS
+		supportedReasoningEfforts
 	}) ?? null;
 	if (params.thinkLevel === "minimal" && MODERN_GPT_5_MODEL_ID_RE.test(modelId)) return "low";
-	if (params.thinkLevel === "minimal" || params.thinkLevel === "low" || params.thinkLevel === "medium" || params.thinkLevel === "high" || params.thinkLevel === "xhigh") return params.thinkLevel;
-	return null;
+	return params.thinkLevel === "max" ? null : params.thinkLevel;
 }
 //#endregion
 //#region extensions/codex/src/app-server/user-input.ts
+function prependHistoryProvenance(input, historyProvenancePrefix) {
+	if (!historyProvenancePrefix) return input;
+	const firstTextIndex = input.findIndex((item) => item.type === "text");
+	if (firstTextIndex === -1) return [{
+		type: "text",
+		text: historyProvenancePrefix,
+		text_elements: []
+	}, ...input];
+	return input.map((item, index) => index === firstTextIndex && item.type === "text" ? {
+		...item,
+		text: `${historyProvenancePrefix}${item.text}`
+	} : item);
+}
 /** Builds ordered Codex user input for both new turns and same-turn steering. */
-function buildCodexUserInput(text, images) {
+function buildCodexUserInput(text, images, contextImageGroups, historyProvenancePrefix) {
+	if (text !== void 0 && contextImageGroups?.length) {
+		let offset = 0;
+		return prependHistoryProvenance([...contextImageGroups.flatMap((group) => {
+			const parts = buildCodexUserInput(text.slice(offset, group.end), group.images);
+			offset = group.end;
+			return parts;
+		}), ...buildCodexUserInput(text.slice(offset), images)], historyProvenancePrefix);
+	}
 	const imageInputs = (images ?? []).map((image) => {
 		const imageUrl = sanitizeInlineImageDataUrl(`data:${image.mimeType};base64,${image.data}`);
 		return imageUrl ? {
@@ -4619,16 +4738,16 @@ function buildCodexUserInput(text, images) {
 			text_elements: []
 		};
 	});
-	return [...text === void 0 ? [] : [{
+	return prependHistoryProvenance([...text === void 0 ? [] : [{
 		type: "text",
 		text,
 		text_elements: []
-	}], ...imageInputs];
+	}], ...imageInputs], historyProvenancePrefix);
 }
 //#endregion
 //#region extensions/codex/src/app-server/turn-params.ts
 const CODEX_CURRENT_SENDER_FIELD_MAX_CHARS = 256;
-function buildCodexCurrentSenderContextValue(params) {
+function readCodexCurrentSender(params) {
 	const metadata = asOptionalRecord(asOptionalRecord(params.userTurnTranscriptRecorder?.message)?.["__openclaw"]);
 	const recorded = [
 		normalizeOptionalString(metadata?.["senderId"]),
@@ -4642,11 +4761,19 @@ function buildCodexCurrentSenderContextValue(params) {
 	];
 	if (!id && !name && !username) return;
 	const bound = (value) => truncateUtf16Safe(value, CODEX_CURRENT_SENDER_FIELD_MAX_CHARS);
-	return JSON.stringify({ sender: {
+	return {
 		...id ? { id: bound(id) } : {},
 		...name ? { name: bound(name) } : {},
 		...username ? { username: bound(username) } : {}
-	} });
+	};
+}
+function buildCodexCurrentSenderContextValue(params) {
+	const sender = readCodexCurrentSender(params);
+	return sender ? JSON.stringify({ sender }) : void 0;
+}
+function buildCodexHistoryProvenancePrefix(params) {
+	const sender = readCodexCurrentSender(params);
+	return sender?.id ? neutralizeCodexExplicitMentionSigils(`[OpenClaw conversation info: sender=${JSON.stringify(sender)}]\n`) : void 0;
 }
 function buildTurnStartParams(params, options) {
 	const modelSelection = options.preserveNativeTurnSettings ? void 0 : resolveCodexAppServerRequestModelSelection({
@@ -4694,7 +4821,8 @@ function buildTurnStartParams(params, options) {
 	};
 	return {
 		threadId: options.threadId,
-		input: [...buildCodexUserInput(options.promptText ?? params.prompt, params.images), ...options.explicitSkillInputs ?? []],
+		...params.trigger ? { turnTrigger: params.trigger } : {},
+		input: [...buildCodexUserInput(options.promptText ?? params.prompt, params.images, options.contextImageGroups, options.historyProvenancePrefix ?? (params.trigger === "user" ? buildCodexHistoryProvenancePrefix(params) : void 0)), ...options.explicitSkillInputs ?? []],
 		...additionalContext ? { additionalContext } : {},
 		cwd: options.cwd,
 		...options.appServer.sessionRoot ? { runtimeWorkspaceRoots: [options.appServer.sessionRoot] } : {},
@@ -4758,7 +4886,7 @@ function buildDefaultCollaborationInstructions() {
 		"",
 		"Use the `request_user_input` tool only when it is listed in the available tools for this turn.",
 		"",
-		"In Default mode, strongly prefer making reasonable assumptions and executing the user's request rather than stopping to ask questions. If you absolutely must ask a question because the answer cannot be discovered from local context and a reasonable assumption would be risky, ask the user directly with a concise plain-text question. Never write a multiple choice question as a textual assistant message."
+		"In Default mode, strongly prefer making reasonable assumptions and executing the user's request rather than stopping to ask questions. When a missing preference, constraint, or clarification warrants a question, use `request_user_input_async` if it is available and continue independent work. Answers arrive as ordinary user messages. A suggested or preselected answer is not consent; wait for explicit approval before dependent actions that require it. If neither question tool is available, ask a concise plain-text question. Never write a multiple choice question as a textual assistant message."
 	].join("\n");
 }
 function buildCronCollaborationInstructions() {
@@ -4773,4 +4901,4 @@ function joinPresentSections(...sections) {
 	return sections.filter((section) => Boolean(section?.trim())).join("\n\n");
 }
 //#endregion
-export { codexDynamicToolsFingerprint as $, readCodexMcpToolConnectorId as A, createCodexNativeHookRelay as B, resolveCodexWebSearchPlan as C, buildCodexPluginThreadConfigInputFingerprint as Ct, resolveCodexAppServerRequestModelSelection as D, refreshCodexPluginAppApprovalPolicy as Dt, resolveCodexAppServerModelProvider as E, mergeCodexThreadConfigs as Et, CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS as F, checkCodexThreadAppAvailability as G, resolveCodexNativeHookRelayEvents as H, assertCodexNativeHookRelayAllowed as I, loadCodexNativeToolCatalog as J, attestCodexRestrictedToolSurfaceMcpServersDisabled as K, buildCodexNativeHookRelayConfig as L, buildCodexProjectDocThreadConfig as M, isCodexAppServerProfilerEnabled as N, resolveCodexAppServerThreadModelSelection as O, shouldBuildCodexPluginThreadConfig as Ot, CODEX_NATIVE_HOOK_RELAY_EVENTS as P, areCodexDynamicToolFingerprintsCompatible as Q, buildCodexNativeHookRelayDisabledConfig as R, buildCodexNativeWebSearchThreadConfig as S, buildCodexPluginThreadConfig as St, CODEX_NATIVE_PERSONALITY_NONE as T, buildDisabledAppsConfigPatch as Tt, resolveCodexNativeHookRelayTtlMs as U, emitCodexNativePreToolUseFailureDiagnostic as V, scheduleCodexNativeHookRelayUnregister as W, applyCodexNativeSkillIsolation as X, parseCodexNativeToolCatalog as Y, resolveCodexNativeSkillIsolation as Z, assertCodexManagedRequirementsDoNotOverrideToolPolicy as _, neutralizeCodexExplicitMentionSigils as _t, buildCodexUserInput as a, isForcedPrivateQaCodexRuntime as at, buildCodexThreadConfiguration as b, resolveCodexContextEngineProjectionReserveTokens as bt, startOrResumeThread as c, normalizeCodexDynamicToolName as ct, buildScheduledCodexAppAuthorityInputFingerprint as d, buildContextEngineBinding as dt, codexLegacyDynamicToolsFingerprint as et, buildScheduledCodexAppServerConnectionIdentity as f, isContextEngineBindingCompatible as ft, resolveScheduledCodexAppCreatorCaptureDecision as g, isCodexDurableCustomMessage as gt, readCurrentCodexScheduledAppPolicy as h, fitCodexProjectedContextForTurnStart as ht, buildTurnStartParams as i, filterCodexDynamicToolsForDisabledNativeSurface as it, readCodexMcpToolUiVisibility as j, resolveCodexBindingModelProviderFallback as k, assertScheduledCodexAppAuthorityRuntime as l, resolveCodexDynamicToolsLoading as lt, intersectCodexPluginThreadConfigWithScheduledAuthority as m, buildCodexContinuityCalibration as mt, buildCodexTemporalAdditionalContext as n, fingerprintUserMcpServersConfigPatch as nt, readCodexSupportedReasoningEfforts as o, isMessageOnlyCodexSourceReply as ot, captureScheduledCodexAppAuthority as p, CodexContextAttachmentError as pt, hasCodexNativeToolCatalog as q, buildTurnCollaborationMode as r, filterCodexDynamicTools as rt, resolveCodexAppServerReasoningEffort as s, isSystemAgentOnlyCodexDynamicToolAllowlist as st, buildCodexParentLocalInstructions as t, fingerprintJsonObject as tt, buildLegacyScheduledCodexAppRecoveryPrompt as u, resolveCodexDynamicToolsLoadingForRuntime as ut, buildCodexRingZeroThreadConfigPatch as v, projectContextEngineAssemblyForCodex as vt, buildDeveloperInstructions as w, buildCodexPluginThreadConfigTimeoutFallback as wt, readCodexInheritedMcpServerNames as x, resolveCodexContinuityProjectionMaxChars as xt, buildCodexRuntimeThreadConfig as y, resolveCodexContextEngineProjectionMaxChars as yt, buildCodexNativeHookRelayId as z };
+export { areCodexDynamicToolFingerprintsCompatible as $, resolveCodexBindingModelProviderFallback as A, shouldBuildCodexPluginThreadConfig as At, buildCodexNativeHookRelayId as B, buildCodexNativeWebSearchThreadConfig as C, resolveCodexContinuityProjectionMaxChars as Ct, resolveCodexAppServerModelProvider as D, buildDisabledAppsConfigPatch as Dt, CODEX_NATIVE_PERSONALITY_NONE as E, buildCodexPluginThreadConfigTimeoutFallback as Et, CODEX_NATIVE_HOOK_RELAY_EVENTS as F, scheduleCodexNativeHookRelayUnregister as G, emitCodexNativePreToolUseFailureDiagnostic as H, CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS as I, hasCodexNativeToolCatalog as J, checkCodexThreadAppAvailability as K, assertCodexNativeHookRelayAllowed as L, readCodexMcpToolUiVisibility as M, buildCodexProjectDocThreadConfig as N, resolveCodexAppServerRequestModelSelection as O, mergeCodexThreadConfigs as Ot, isCodexAppServerProfilerEnabled as P, resolveCodexNativeSkillIsolation as Q, buildCodexNativeHookRelayConfig as R, readCodexInheritedMcpServerNames as S, resolveCodexContextEngineProjectionReserveTokens as St, buildDeveloperInstructions as T, buildCodexPluginThreadConfigInputFingerprint as Tt, resolveCodexNativeHookRelayEvents as U, createCodexNativeHookRelay as V, resolveCodexNativeHookRelayTtlMs as W, parseCodexNativeToolCatalog as X, loadCodexNativeToolCatalog as Y, applyCodexNativeSkillIsolation as Z, resolveScheduledCodexAppCreatorCaptureDecision as _, fitCodexProjectedContextForTurnStart as _t, buildTurnStartParams as a, filterCodexDynamicToolsForDisabledNativeSurface as at, buildCodexRuntimeThreadConfig as b, projectContextEngineAssemblyForCodex as bt, resolveCodexAppServerReasoningEffort as c, isSystemAgentOnlyCodexDynamicToolAllowlist as ct, buildLegacyScheduledCodexAppRecoveryPrompt as d, resolveCodexDynamicToolsLoadingForRuntime as dt, codexDynamicToolsFingerprint as et, buildScheduledCodexAppAuthorityInputFingerprint as f, buildContextEngineBinding as ft, readCurrentCodexScheduledAppPolicy as g, buildCodexContinuityCalibration as gt, intersectCodexPluginThreadConfigWithScheduledAuthority as h, CodexContextAttachmentError as ht, buildTurnCollaborationMode as i, filterCodexDynamicTools as it, readCodexMcpToolConnectorId as j, resolveCodexAppServerThreadModelSelection as k, refreshCodexPluginAppApprovalPolicy as kt, startOrResumeThread as l, normalizeCodexDynamicToolName as lt, captureScheduledCodexAppAuthority as m, CODEX_TURN_START_TEXT_INPUT_MAX_CHARS as mt, buildCodexParentLocalInstructions as n, fingerprintJsonObject as nt, buildCodexUserInput as o, isForcedPrivateQaCodexRuntime as ot, buildScheduledCodexAppServerConnectionIdentity as p, isContextEngineBindingCompatible as pt, attestCodexRestrictedToolSurfaceMcpServersDisabled as q, buildCodexTemporalAdditionalContext as r, fingerprintUserMcpServersConfigPatch as rt, readCodexSupportedReasoningEfforts as s, isMessageOnlyCodexSourceReply as st, buildCodexHistoryProvenancePrefix as t, codexLegacyDynamicToolsFingerprint as tt, assertScheduledCodexAppAuthorityRuntime as u, resolveCodexDynamicToolsLoading as ut, assertCodexManagedRequirementsDoNotOverrideToolPolicy as v, isCodexDurableCustomMessage as vt, resolveCodexWebSearchPlan as w, buildCodexPluginThreadConfig as wt, buildCodexThreadConfiguration as x, resolveCodexContextEngineProjectionMaxChars as xt, buildCodexRingZeroThreadConfigPatch as y, neutralizeCodexExplicitMentionSigils as yt, buildCodexNativeHookRelayDisabledConfig as z };