@openclaw/codex 2026.9.2 → 2026.9.3

package/dist/{thread-lifecycle-DPK30jad.js → thread-lifecycle-D1pzRwHB.js}

@@ -1,486 +1,51 @@
-import { h as CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME, m as CODEX_PLUGINS_MARKETPLACE_NAME } from "./config-utils-C57JiJrU.js";
-import { l as sessionBindingIdentity } from "./session-binding-record-CyaXZvTe.js";
-import { B as isJsonObject, C as CODEX_SESSION_OVERRIDABLE_LAYER_TYPES, M as resolveCodexAppServerHomeDir, N as resolveCodexAppServerLocalHomeDir, k as resolveCodexPluginsPolicy, n as codexSandboxPolicyForTurn, p as assertCodexModelBackedReviewerEffectiveConfig, w as readCodexEffectiveConfig, z as flattenCodexDynamicToolFunctions } from "./config-CyapYSji.js";
-import { At as readCodexClientSessionMeta, Dt as isCodexAppServerClientRuntimeLive, E as CodexThreadStartRequestError, H as isCodexAppServerOverloadError, I as getCodexAppServerClientInstanceId, J as isCodexThreadReadMissingError, K as resolveCodexAppServerClientInstanceId, Nt as unsubscribeCodexAppServerLiveThread, Ot as isCodexAppServerLiveThreadClaimed, Pt as withAbortableTimeout, Q as assertCodexThreadAcceptsDirectInput, T as CodexThreadBindingConflictError, W as isCodexAppServerRequestTimeoutError, Xt as readCodexSessionMeta, _ as retainSharedCodexAppServerClientByInstanceId, et as assertCodexThreadForkResponse, jt as releaseCodexAppServerLiveThread, n as captureCodexAppServerClientLifetime, nt as assertCodexThreadStartResponse, q as CodexAppServerRpcError, w as CodexAdoptedThreadActiveError, wt as consumeCodexAppServerLiveThread, yt as resolveCodexToolAbortTerminalReason } from "./shared-client-CKhX2kFt.js";
-import { a as isCodexAppServerNativeAuthProfile, i as hashCodexAppServerBindingFingerprint, l as resolveCodexSessionBinding, n as assertCodexBindingMayBeReplaced, o as normalizeCodexAppServerBindingModelProvider } from "./session-binding-4Ki04sW-.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-Bp1ZOnk2.js";
-import { c as defaultCodexAppInventoryCache, l as serializeCodexAppInventoryError, n as buildCodexAppServerConnectionFingerprint, s as CodexAppInventoryCache, t as resumeCodexAppServerThread } from "./thread-resume-BLgqkUc1.js";
-import { c as withExclusiveCodexAppServerThread, l as isIncognitoSessionKey, o as withCodexAppServerThreadMutation, r as retainCodexAppServerBindingSubscription } from "./thread-ownership-CbucAmmp.js";
-import { a as assertCodexSessionRuntimeOwnership, i as refreshCodexThreadPolicy, n as CodexThreadPolicyHandoffError, r as assertCodexSupervisionThreadLineage, t as CodexIncognitoPolicyChangeError } from "./thread-policy-CTalhWFy.js";
-import { d as codexCatalogHomeId, s as projectBoundedCodexThreadHistory } from "./transcript-mirror-_njEB84z.js";
+import { l as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced } from "./session-binding-record-CaZjYwNS.js";
+import { f as assertCodexModelBackedReviewerEffectiveConfig, g as readCodexEffectiveConfig, h as CODEX_SESSION_OVERRIDABLE_LAYER_TYPES, n as codexSandboxPolicyForTurn } from "./config-options-jnIFvwxD.js";
+import { S as resolveCodexPluginsPolicy, a as flattenCodexDynamicToolFunctions, c as resolveCodexAppServerLocalHomeDir, o as isJsonObject, s as resolveCodexAppServerHomeDir } from "./protocol-CAAcVIKF.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-BEKu4yDx.js";
+import { i as markStartedCodexManagedThread } from "./managed-thread-store-D1t5jh3G.js";
+import { n as withCodexAppServerThreadMutation, t as isIncognitoSessionKey } from "./incognito-session-uhrBF6wJ.js";
+import { i as isCodexThreadReadMissingError, n as readCodexSessionMeta, r as CodexAppServerRpcError } from "./session-catalog-provenance-DkJHo735.js";
+import { n as codexCatalogHomeId, r as projectBoundedCodexThreadHistory } from "./session-catalog-home-id-D7-aLiNt.js";
+import { c as serializeCodexAppInventoryError, o as CodexAppInventoryCache, s as defaultCodexAppInventoryCache, t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-CdSQzWyX.js";
+import { t as withAbortableTimeout } from "./timeout-BVw8aaM1.js";
+import "./config-JDfTI4VI.js";
 import { r as sanitizeInlineImageDataUrl, t as invalidInlineImageText } from "./image-payload-sanitizer-tupAr-2o.js";
+import { t as assertCodexSessionRuntimeOwnership } from "./binding-connection-QqgcPCgk.js";
+import { n as normalizeCodexAppServerBindingModelProvider, t as isCodexAppServerNativeAuthProfile } from "./auth-profile-CwzO4_RG.js";
+import { C as CodexThreadBindingConflictError, G as unsubscribeCodexAppServerLiveThread, H as readCodexClientSessionMeta, P as consumeCodexAppServerLiveThread, R as isCodexAppServerClientRuntimeLive, S as CodexAdoptedThreadActiveError, U as releaseCodexAppServerLiveThread, _ as retainSharedCodexAppServerClientByInstanceId, n as captureCodexAppServerClientLifetime, w as CodexThreadStartRequestError, z as isCodexAppServerLiveThreadClaimed } from "./shared-client-CVhez2Uo.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-D6cR54TV.js";
+import { a as readCodexPluginInventory, o as resolveOwnedAppApprovalOverrideKeys } from "./plugin-inventory-CoRCzWW4.js";
+import { t as ensureCodexPluginActivation } from "./plugin-activation-BQK-f5sV.js";
+import { o as resolveCodexSessionBinding, r as hashCodexAppServerBindingFingerprint } from "./session-binding-CKSepwIC.js";
+import { i as refreshCodexThreadPolicy, n as CodexThreadPolicyHandoffError, r as assertCodexSupervisionThreadLineage, t as CodexIncognitoPolicyChangeError } from "./thread-policy-D8kI7yAO.js";
+import { t as resumeCodexAppServerThread } from "./thread-resume-T5cveyxA.js";
+import { r as retainCodexAppServerBindingSubscription, s as withExclusiveCodexAppServerThread } from "./thread-ownership-D6oASVRu.js";
+import "./transcript-mirror-t5TOccct.js";
 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 { resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
-import { z } from "zod";
 import { addTimerTimeoutGraceMs, finiteSecondsToTimerSafeMilliseconds } from "openclaw/plugin-sdk/number-runtime";
-import fs from "node:fs/promises";
 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 { sliceUtf16Safe, truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
-import { AgentHarnessPreflightError, SKILL_WORKSHOP_TOOL_NAME, buildCredentialSafetyPrompt, buildDelegationGuidanceSection, buildHarnessVisibleReplyGuidance, buildSkillWorkshopPromptSection, buildTemporalContextText, embeddedAgentLog, formatErrorMessage, isActiveHarnessContextEngine, isHostScopedAgentToolActive, resolveMainSessionDelegationMode } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { createStageTimingTracker, formatStageTimings } from "openclaw/plugin-sdk/time-runtime";
 import { isPathInside } from "openclaw/plugin-sdk/file-access-runtime";
-import os from "node:os";
 import { isDeepStrictEqual } from "node:util";
-import { resolveAgentDir as resolveAgentDir$2 } from "openclaw/plugin-sdk/agent-runtime";
-import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
-import { sliceUtf16Safe, truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-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 { emitTrustedDiagnosticEvent } from "openclaw/plugin-sdk/diagnostic-runtime";
-import { expectDefined } from "openclaw/plugin-sdk/expect-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 { isDiagnosticFlagEnabled } from "openclaw/plugin-sdk/diagnostic-flags";
 import { listRegisteredPluginAgentPromptGuidance } from "openclaw/plugin-sdk/plugin-runtime";
 import { buildHostnameAllowlistPolicyFromSuffixAllowlist } from "openclaw/plugin-sdk/ssrf-policy";
-//#region extensions/codex/src/app-server/plugin-inventory.ts
-/**
-* Reads Codex plugin marketplace state and app inventory to decide which
-* plugin-owned apps can be exposed to a native Codex thread.
-*/
-const CODEX_PLUGINS_REMOTE_MARKETPLACE_NAME = `${CODEX_PLUGINS_MARKETPLACE_NAME}-remote`;
-const CODEX_PLUGINS_API_MARKETPLACE_NAME = "openai-api-curated";
-/** Reads configured Codex plugin state and maps owned apps to readiness diagnostics. */
-async function readCodexPluginInventory(params) {
-	const policy = params.policy ?? resolveCodexPluginsPolicy(params.pluginConfig);
-	if (!policy.enabled) return {
-		policy,
-		records: [],
-		diagnostics: [{
-			code: "disabled",
-			message: "Native Codex plugin support is disabled."
-		}]
-	};
-	const appInventory = readCachedAppInventory(params);
-	const installedPlugins = await readInstalledCodexPluginMetadata({
-		...params,
-		policy
-	});
-	const pluginCatalogs = /* @__PURE__ */ new Map();
-	const diagnostics = [];
-	const records = [];
-	if (appInventory?.state === "missing") diagnostics.push({
-		code: "app_inventory_missing",
-		message: "Cached Codex app inventory is missing; plugin apps are excluded for this setup."
-	});
-	else if (appInventory?.state === "stale") diagnostics.push({
-		code: "app_inventory_stale",
-		message: "Cached Codex app inventory is stale; using stale app readiness and refreshing."
-	});
-	for (const pluginPolicy of policy.pluginPolicies) {
-		if (!pluginPolicy.enabled && !policy.allowAllPlugins) continue;
-		let listed = installedPlugins;
-		let resolvedPlugin = findConfiguredMarketplacePlugin(listed, pluginPolicy);
-		if (!resolvedPlugin && pluginPolicy.enabled && pluginPolicy.marketplaceName !== "workspace-directory") {
-			const requestParams = buildPluginCatalogRequestParams(params, pluginPolicy.marketplaceName);
-			const catalogKey = JSON.stringify([requestParams, pluginMetadataCatalogScope(pluginPolicy.marketplaceName)]);
-			let catalog = pluginCatalogs.get(catalogKey);
-			if (!catalog) {
-				catalog = listCodexPluginMetadata(params, pluginPolicy.marketplaceName);
-				pluginCatalogs.set(catalogKey, catalog);
-			}
-			listed = await catalog;
-			resolvedPlugin = findConfiguredMarketplacePlugin(listed, pluginPolicy);
-		}
-		if (!listed.marketplaces.some((marketplace) => marketplaceMatchesConfiguredName(marketplace, pluginPolicy.marketplaceName))) {
-			diagnostics.push({
-				code: "marketplace_missing",
-				plugin: pluginPolicy,
-				message: `Codex marketplace ${pluginPolicy.marketplaceName} was not found.`
-			});
-			continue;
-		}
-		if (!resolvedPlugin) {
-			diagnostics.push({
-				code: "plugin_missing",
-				plugin: pluginPolicy,
-				message: `${pluginPolicy.pluginName} was not found in ${pluginPolicy.marketplaceName}.`
-			});
-			continue;
-		}
-		const { summary } = resolvedPlugin;
-		const unavailableByMarketplacePolicy = summary.availability === "DISABLED_BY_ADMIN" || summary.installPolicy === "NOT_AVAILABLE";
-		if (unavailableByMarketplacePolicy) {
-			diagnostics.push({
-				code: "plugin_disabled",
-				plugin: pluginPolicy,
-				message: `${pluginPolicy.pluginName} is unavailable in ${pluginPolicy.marketplaceName}.`
-			});
-			if (!summary.installed) continue;
-		}
-		const detail = await readPluginDetail(params, marketplaceRef(resolvedPlugin.marketplace, pluginPolicy.marketplaceName), pluginPolicy, summary, diagnostics);
-		const ownedAppIds = detail?.apps.map((app) => app.id).filter(Boolean).toSorted() ?? [];
-		const appOwnership = resolveAppOwnership({
-			detail,
-			appInventory,
-			summary
-		});
-		if (appOwnership === "ambiguous") diagnostics.push({
-			code: "app_ownership_ambiguous",
-			plugin: pluginPolicy,
-			message: `${pluginPolicy.pluginName} has only display-name app matches; apps are not exposed until ownership is stable.`
-		});
-		if (summary.installed && !summary.enabled) diagnostics.push({
-			code: "plugin_disabled",
-			plugin: pluginPolicy,
-			message: `${pluginPolicy.pluginName} is installed in Codex but disabled.`
-		});
-		const apps = resolveOwnedApps({
-			pluginPolicy,
-			detail,
-			appInventory
-		});
-		records.push({
-			policy: pluginPolicy,
-			summary,
-			...detail ? { detail } : {},
-			activationRequired: pluginPolicy.enabled && (unavailableByMarketplacePolicy || !summary.installed || !summary.enabled),
-			authRequired: apps.some((app) => app.needsAuth || !app.accessible),
-			appOwnership,
-			ownedAppIds,
-			apps
-		});
-	}
-	return {
-		policy,
-		records,
-		diagnostics,
-		...appInventory ? { appInventory } : {}
-	};
-}
-/** Finds a configured plugin only in its authorized marketplace identity. */
-function findCodexMarketplacePluginSummary(listed, marketplaceName, pluginName) {
-	const resolved = findConfiguredMarketplacePlugin(listed, {
-		marketplaceName,
-		pluginName
-	});
-	return resolved ? {
-		marketplace: marketplaceRef(resolved.marketplace, marketplaceName),
-		summary: resolved.summary
-	} : void 0;
-}
-/** Builds plugin/read or plugin/install params from a marketplace reference. */
-function pluginReadParams(marketplace, pluginName) {
-	return {
-		...marketplace.path ? { marketplacePath: marketplace.path } : {},
-		...marketplace.remoteMarketplaceName ? { remoteMarketplaceName: marketplace.remoteMarketplaceName } : {},
-		pluginName
-	};
-}
-/** Returns configured plugin keys whose current metadata may still recover. */
-function resolveRecoverableCodexPluginConfigKeys(params) {
-	return params.policy.pluginPolicies.filter((pluginPolicy) => pluginPolicy.enabled && !isSettledMissingPluginPolicy({
-		pluginPolicy,
-		metadataCache: params.metadataCache,
-		appCacheKey: params.appCacheKey,
-		configCwd: params.configCwd
-	})).map((pluginPolicy) => pluginPolicy.configKey).toSorted();
-}
-async function listCodexPluginMetadata(params, marketplaceName) {
-	const requestParams = buildPluginCatalogRequestParams(params, marketplaceName);
-	if (!params.metadataCache || !params.appCacheKey) return await params.request("plugin/list", requestParams);
-	return (await params.metadataCache.load({
-		appCacheKey: params.appCacheKey,
-		queryKind: "curated-global",
-		requestParams,
-		catalogScope: pluginMetadataCatalogScope(marketplaceName),
-		request: async (method, listedParams) => await params.request(method, listedParams),
-		cacheable: (response) => response.marketplaces.some((marketplace) => marketplaceMatchesConfiguredName(marketplace, marketplaceName))
-	})).response;
-}
-async function readInstalledCodexPluginMetadata(params) {
-	const requestParams = params.configCwd ? { cwds: [params.configCwd] } : {};
-	if (!params.metadataCache || !params.appCacheKey) return await params.request("plugin/installed", requestParams);
-	return (await params.metadataCache.load({
-		appCacheKey: params.appCacheKey,
-		queryKind: "installed",
-		requestParams,
-		request: async (method, installedParams) => await params.request(method, installedParams),
-		cacheable: (response) => params.policy.pluginPolicies.every((pluginPolicy) => {
-			if (!pluginPolicy.enabled && !params.policy.allowAllPlugins) return true;
-			return Boolean(findConfiguredMarketplacePlugin(response, pluginPolicy));
-		})
-	})).response;
-}
-function isSettledMissingPluginPolicy(params) {
-	const queryKind = params.pluginPolicy.marketplaceName === "workspace-directory" ? "installed" : "curated-global";
-	const requestParams = queryKind === "installed" ? params.configCwd ? { cwds: [params.configCwd] } : {} : buildPluginCatalogRequestParams(params, params.pluginPolicy.marketplaceName);
-	const listed = params.metadataCache.read(params.appCacheKey, queryKind, requestParams, queryKind === "curated-global" ? pluginMetadataCatalogScope(params.pluginPolicy.marketplaceName) : void 0)?.response;
-	if (!listed) return false;
-	return !findConfiguredMarketplacePlugin(listed, params.pluginPolicy);
-}
-function pluginMetadataCatalogScope(marketplaceName) {
-	return isOpenAiCuratedMarketplaceName(marketplaceName) ? void 0 : marketplaceName;
-}
-function buildPluginCatalogRequestParams(params, marketplaceName) {
-	const marketplaceKinds = marketplaceName === "created-by-me-remote" ? ["created-by-me-remote"] : marketplaceName.startsWith("workspace-shared-with-me") ? ["shared-with-me"] : void 0;
-	return {
-		...params.configCwd ? { cwds: [params.configCwd] } : {},
-		...marketplaceKinds ? { marketplaceKinds: [...marketplaceKinds] } : {}
-	};
-}
-function readCachedAppInventory(params) {
-	if (!params.appCache || !params.appCacheKey) return;
-	const request = async (method, requestParams) => await params.request(method, requestParams);
-	return params.appCache.read({
-		key: params.appCacheKey,
-		request,
-		nowMs: params.nowMs,
-		suppressRefresh: params.suppressAppInventoryRefresh
-	});
-}
-async function readPluginDetail(params, marketplace, pluginPolicy, summary, diagnostics) {
-	if (params.readPluginDetails === false) return;
-	if (marketplace.remoteMarketplaceName && !summary.remotePluginId) {
-		diagnostics.push({
-			code: "plugin_detail_unavailable",
-			plugin: pluginPolicy,
-			message: `${pluginPolicy.pluginName} detail unavailable: Codex did not return a remote plugin id.`
-		});
-		return;
-	}
-	try {
-		return (await params.request("plugin/read", pluginReadParams(marketplace, marketplace.remoteMarketplaceName && summary.remotePluginId ? summary.remotePluginId : pluginPolicy.pluginName))).plugin;
-	} catch (error) {
-		diagnostics.push({
-			code: "plugin_detail_unavailable",
-			plugin: pluginPolicy,
-			message: `${pluginPolicy.pluginName} detail unavailable: ${error instanceof Error ? error.message : String(error)}`
-		});
-		return;
-	}
-}
-function resolveAppOwnership(params) {
-	if (params.detail && params.detail.apps.length > 0) return "proven";
-	return (params.appInventory?.snapshot?.apps ?? []).filter((app) => app.pluginDisplayNames.some((displayName) => displayName === params.summary.name)).length > 0 ? "ambiguous" : "none";
-}
-function resolveOwnedApps(params) {
-	const detailApps = params.detail?.apps ?? [];
-	if (detailApps.length === 0) return [];
-	if (params.appInventory?.state === "missing") {
-		embeddedAgentLog.warn("codex plugin inventory missing app inventory for detail apps", {
-			configKey: params.pluginPolicy.configKey,
-			pluginName: params.pluginPolicy.pluginName,
-			appIds: detailApps.map((app) => app.id).toSorted()
-		});
-		return [];
-	}
-	const appInfoById = new Map((params.appInventory?.snapshot?.apps ?? []).map((app) => [app.id, app]));
-	return detailApps.map((app) => {
-		const info = appInfoById.get(app.id);
-		if (!info) return {
-			id: app.id,
-			name: app.name,
-			accessible: false,
-			enabled: false,
-			needsAuth: true
-		};
-		return Object.assign({
-			id: app.id,
-			name: app.name,
-			accessible: info.isAccessible,
-			enabled: info.isEnabled,
-			needsAuth: !info.isAccessible
-		}, resolveOwnedAppApprovalOverrideKeys(info));
-	}).toSorted((left, right) => left.id.localeCompare(right.id));
-}
-/** Returns current tool keys whose overrides could bypass the requested reviewer. */
-function resolveOwnedAppApprovalOverrideKeys(app) {
-	if (!app.toolSummaries) return {};
-	const appName = app.name.trim();
-	const appNameLower = appName.toLowerCase();
-	const keys = app.toolSummaries.filter((tool) => !tool.isReadOnly).flatMap((tool) => resolveAppToolConfigKeys({
-		appName,
-		appNameLower,
-		tool
-	}));
-	return { approvalOverrideToolConfigKeys: Array.from(new Set(keys)).toSorted() };
-}
-function resolveAppToolConfigKeys(params) {
-	const keys = [params.tool.name];
-	if (params.tool.title) keys.push(params.tool.title);
-	if (params.appName) keys.push(`${params.appName}_${params.tool.name}`);
-	if (params.appNameLower && params.appNameLower !== params.appName) keys.push(`${params.appNameLower}_${params.tool.name}`);
-	return keys;
-}
-function findPluginSummary(marketplace, pluginName) {
-	const exact = marketplace.plugins.find((plugin) => plugin.id === pluginName || plugin.id === `${pluginName}@${marketplace.name}`);
-	if (exact) return exact;
-	const matches = marketplace.plugins.filter((plugin) => plugin.name === pluginName || pluginNameFromPluginId(plugin.id, marketplace.name) === pluginName);
-	return matches.length === 1 ? matches[0] : void 0;
-}
-function findConfiguredMarketplacePlugin(listed, plugin) {
-	if (plugin.marketplaceName === "workspace-directory") return findWorkspaceMarketplacePlugin(listed, plugin.pluginName);
-	for (const marketplace of listed.marketplaces) {
-		if (!marketplaceMatchesConfiguredName(marketplace, plugin.marketplaceName)) continue;
-		const summary = findPluginSummary(marketplace, plugin.pluginName);
-		if (summary) return {
-			marketplace,
-			summary
-		};
-	}
-}
-function marketplaceMatchesConfiguredName(marketplace, configuredMarketplaceName) {
-	return isOpenAiCuratedMarketplaceName(configuredMarketplaceName) ? isOpenAiCuratedMarketplace(marketplace) : marketplace.name === configuredMarketplaceName;
-}
-function findWorkspaceMarketplacePlugin(listed, pluginName) {
-	const marketplace = listed.marketplaces.find((entry) => entry.name === CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME);
-	const summary = marketplace?.plugins.find((plugin) => plugin.id === pluginName);
-	return marketplace && summary ? {
-		marketplace,
-		summary
-	} : void 0;
-}
-function pluginNameFromPluginId(pluginId, marketplaceName) {
-	const trimmed = pluginId.trim();
-	if (!trimmed) return;
-	const marketplaceSuffix = `@${marketplaceName}`;
-	return (trimmed.endsWith(marketplaceSuffix) ? trimmed.slice(0, -marketplaceSuffix.length) : trimmed).split("/").at(-1)?.trim() || void 0;
-}
-function marketplaceRef(marketplace, name) {
-	return {
-		name,
-		...marketplace.path ? { path: marketplace.path } : {},
-		...!marketplace.path ? { remoteMarketplaceName: marketplace.name } : {}
-	};
-}
-/** True for any supported OpenAI curated marketplace wire name, matching Codex's own curated predicate. */
-function isOpenAiCuratedMarketplace(marketplace) {
-	return isOpenAiCuratedMarketplaceName(marketplace.name);
-}
-/** True for all Codex wire aliases of the same OpenAI-curated catalog. */
-function isOpenAiCuratedMarketplaceName(marketplaceName) {
-	return marketplaceName === "openai-curated" || marketplaceName === CODEX_PLUGINS_REMOTE_MARKETPLACE_NAME || marketplaceName === CODEX_PLUGINS_API_MARKETPLACE_NAME;
-}
-//#endregion
-//#region extensions/codex/src/app-server/plugin-activation.ts
-/**
-* Activates legacy curated Codex plugins while requiring owner-managed
-* installation for every other marketplace.
-*/
-/** Activates legacy curated plugins without granting install authority to other marketplaces. */
-async function ensureCodexPluginActivation(params) {
-	if (params.identity.marketplaceName === "workspace-directory") return activationFailure(params.identity, "disabled", { message: "workspace-directory plugins must be installed and enabled outside OpenClaw before use." });
-	if (!isOpenAiCuratedMarketplaceName(params.identity.marketplaceName)) {
-		const target = params.identity.pluginName.endsWith(`@${params.identity.marketplaceName}`) ? params.identity.pluginName : `${params.identity.pluginName}@${params.identity.marketplaceName}`;
-		return activationFailure(params.identity, "disabled", { message: `${params.identity.marketplaceName} plugins must be installed and enabled by an owner before use. Run /codex plugins install ${target}.` });
-	}
-	const listed = await listCuratedCodexPluginMetadata(params);
-	const resolved = findCodexMarketplacePluginSummary(listed, params.identity.marketplaceName, params.identity.pluginName);
-	if (!resolved) {
-		if (!listed.marketplaces.some((marketplace) => isOpenAiCuratedMarketplace(marketplace))) return activationFailure(params.identity, "marketplace_missing", { message: `Codex marketplace ${CODEX_PLUGINS_MARKETPLACE_NAME} was not found.` });
-		return activationFailure(params.identity, "plugin_missing", { message: `${params.identity.pluginName} was not found in ${CODEX_PLUGINS_MARKETPLACE_NAME}.` });
-	}
-	if (resolved.marketplace.remoteMarketplaceName && !resolved.summary.remotePluginId) return activationFailure(params.identity, "plugin_missing", { message: `${params.identity.pluginName} detail unavailable: Codex did not return a remote plugin id.` });
-	if (resolved.summary.availability === "DISABLED_BY_ADMIN" || resolved.summary.installPolicy === "NOT_AVAILABLE") return activationFailure(params.identity, "disabled", { message: `${params.identity.pluginName} was disabled or made unavailable by its marketplace administrator.` });
-	if (resolved.summary.installed && resolved.summary.enabled && !params.installEvenIfActive) return {
-		identity: params.identity,
-		ok: true,
-		reason: "already_active",
-		installAttempted: false,
-		marketplace: resolved.marketplace,
-		diagnostics: []
-	};
-	const remotePluginId = resolved.marketplace.remoteMarketplaceName ? resolved.summary.remotePluginId : void 0;
-	let installResponse;
-	try {
-		installResponse = await params.request("plugin/install", pluginReadParams(resolved.marketplace, remotePluginId ?? params.identity.pluginName));
-	} catch (error) {
-		if (!(error instanceof CodexAppServerRpcError) || error.code !== -32600 || !remotePluginId || error.message !== `remote plugin ${remotePluginId} is disabled by admin` && error.message !== `remote plugin ${remotePluginId} is not available for install`) throw error;
-		return {
-			identity: params.identity,
-			ok: false,
-			reason: "install_failed",
-			installAttempted: true,
-			marketplace: resolved.marketplace,
-			diagnostics: [{ message: `Codex plugin install failed: ${coerceErrorMessage(error)}` }]
-		};
-	}
-	if (params.metadataCache && params.appCacheKey) params.metadataCache.invalidate(params.appCacheKey);
-	const refreshDiagnostics = [];
-	let refreshFailed = false;
-	try {
-		const refreshResult = await refreshCodexPluginRuntimeState({
-			request: params.request,
-			appCache: params.appCache,
-			appCacheKey: params.appCacheKey,
-			configCwd: params.configCwd,
-			metadataCache: params.metadataCache,
-			deferAppInventoryRefresh: params.deferAppInventoryRefresh,
-			targetAppIds: params.targetAppIds
-		});
-		refreshDiagnostics.push(...refreshResult.diagnostics);
-	} catch (error) {
-		refreshFailed = true;
-		refreshDiagnostics.push({ message: `Codex plugin runtime refresh failed after install: ${coerceErrorMessage(error)}` });
-	}
-	const authRequired = installResponse.appsNeedingAuth.length > 0;
-	return {
-		identity: params.identity,
-		ok: !authRequired && !refreshFailed,
-		reason: refreshFailed ? "refresh_failed" : authRequired ? "auth_required" : resolved.summary.installed && resolved.summary.enabled ? "already_active" : "installed",
-		installAttempted: true,
-		marketplace: resolved.marketplace,
-		installResponse,
-		diagnostics: [...refreshDiagnostics, ...installResponse.appsNeedingAuth.map((app) => ({ message: `${app.name} requires app authentication before plugin tools are exposed.` }))]
-	};
-}
-/** Forces Codex plugin, skill, hook, MCP, and app inventory refreshes after activation. */
-async function refreshCodexPluginRuntimeState(params) {
-	const diagnostics = [];
-	await listCuratedCodexPluginMetadata(params, { forceRefetch: true });
-	await params.request("skills/list", {
-		cwds: params.configCwd ? [params.configCwd] : [],
-		forceReload: true
-	});
-	try {
-		await params.request("hooks/list", { cwds: params.configCwd ? [params.configCwd] : [] });
-	} catch (error) {
-		diagnostics.push({ message: `Codex hooks refresh skipped: ${coerceErrorMessage(error)}` });
-	}
-	await params.request("config/mcpServer/reload", void 0);
-	if (params.appCache && params.appCacheKey) {
-		params.appCache.invalidate(params.appCacheKey, "Codex plugin activation changed app inventory", void 0, params.targetAppIds);
-		if (params.deferAppInventoryRefresh) return { diagnostics };
-		const request = async (method, requestParams) => await params.request(method, requestParams);
-		try {
-			await params.appCache.refreshNow({
-				key: params.appCacheKey,
-				request,
-				forceRefetch: true,
-				targetAppIds: params.targetAppIds
-			});
-		} catch (error) {
-			diagnostics.push({ message: `Codex app inventory refresh skipped: ${coerceErrorMessage(error)}` });
-		}
-	}
-	return { diagnostics };
-}
-async function listCuratedCodexPluginMetadata(params, options = {}) {
-	const requestParams = {
-		...params.configCwd ? { cwds: [params.configCwd] } : {},
-		...options.forceRefetch ? { forceRefetch: true } : {}
-	};
-	if (!params.metadataCache || !params.appCacheKey) return await params.request("plugin/list", requestParams);
-	return (await params.metadataCache.load({
-		appCacheKey: params.appCacheKey,
-		queryKind: "curated-global",
-		requestParams,
-		request: async (method, listedParams) => await params.request(method, listedParams),
-		cacheable: (response) => response.marketplaces.some((marketplace) => isOpenAiCuratedMarketplace(marketplace))
-	})).response;
-}
-function activationFailure(identity, reason, diagnostic, extraDiagnostics = []) {
-	return {
-		identity,
-		ok: false,
-		reason,
-		installAttempted: false,
-		diagnostics: [diagnostic, ...extraDiagnostics]
-	};
-}
-//#endregion
 //#region extensions/codex/src/app-server/plugin-app-approval-overrides.ts
 /** Projects ask approvals into the native session layer without changing saved settings. */
 function buildCodexAppApprovalOverrides(config, app) {
@@ -1050,6 +615,12 @@ function stringifyCodexPluginPolicy(value) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/context-engine-projection.ts
+/**
+* Projects OpenClaw context-engine assemblies into Codex prompt text while
+* preserving safety boundaries and redacting tool payloads.
+*/
+/** Attachment preparation must not degrade to a prompt that silently loses the saved input. */
+var CodexContextAttachmentError = class extends Error {};
 const CONTEXT_HEADER = "OpenClaw assembled context for this turn:";
 const CONTEXT_OPEN = "<conversation_context>";
 const CONTEXT_CLOSE = "</conversation_context>";
@@ -1068,16 +639,22 @@ const MIN_PROMPT_BUDGET_TOKENS = 8e3;
 function neutralizeCodexExplicitMentionSigils(text) {
 	return text.replace(/\$(?=[A-Za-z0-9_:-])/gu, "＄").replace(/\[@(?=[A-Za-z0-9_:-]+\]\()/gu, "[＠");
 }
+/** Hidden durable notes are context; transient runtime carriers are current-turn only. */
+function isCodexDurableCustomMessage(message) {
+	return message.role === "custom" && message.excludeFromContext !== true && !isOpenClawRuntimeContextCustomMessage(message);
+}
 /** Projects assembled OpenClaw context-engine messages into Codex prompt inputs. */
-function projectContextEngineAssemblyForCodex(params) {
+async function projectContextEngineAssemblyForCodex(params) {
 	const prompt = params.prompt.trim();
-	const contextMessages = dropDuplicateTrailingPrompt(params.assembledMessages, prompt);
 	const maxRenderedContextChars = normalizeRenderedContextMaxChars(params.maxRenderedContextChars);
-	const boundedContext = renderMessagesForCodexContext(contextMessages, {
+	const context = await renderMessagesForCodexContext(params.assembledMessages.filter((message) => message.role !== "custom" || isCodexDurableCustomMessage(message)), {
 		maxTextPartChars: resolveTextPartMaxChars(maxRenderedContextChars),
 		toolPayloadMode: params.toolPayloadMode ?? "elide",
-		maxRenderedContextChars
+		maxRenderedContextChars,
+		prepareFileContext: params.prepareFileContext,
+		currentUserTurnIdempotencyKey: params.currentUserTurnIdempotencyKey
 	});
+	const boundedContext = context.text;
 	const promptPrefix = boundedContext ? [
 		CONTEXT_HEADER,
 		CONTEXT_SAFETY_NOTE,
@@ -1095,7 +672,8 @@ function projectContextEngineAssemblyForCodex(params) {
 		promptText,
 		...promptContextRange ? { promptContextRange } : {},
 		assembledMessages: params.assembledMessages,
-		prePromptMessageCount: params.originalHistoryMessages.length
+		prePromptMessageCount: params.originalHistoryMessages.length,
+		...context.images.length ? { images: context.images } : {}
 	};
 }
 /** Resolves rendered context size from a token budget and reserve. */
@@ -1183,30 +761,43 @@ function resolveProjectionPromptBudgetTokens(params) {
 	const effectiveReserveTokens = Math.min(requestedReserveTokens, Math.max(0, params.contextTokenBudget - minPromptBudget));
 	return Math.max(1, params.contextTokenBudget - effectiveReserveTokens);
 }
-function dropDuplicateTrailingPrompt(messages, prompt) {
-	if (!prompt) return messages;
-	const trailing = messages.at(-1);
-	if (!trailing || trailing.role !== "user") return messages;
-	return extractMessageText(trailing).trim() === prompt ? messages.slice(0, -1) : messages;
-}
-function renderMessagesForCodexContext(messages, options) {
+async function renderMessagesForCodexContext(messages, options) {
 	const tail = [];
+	const images = [];
+	let retainedImageChars = 0;
 	let totalChars = 0;
 	let retainedChars = 0;
 	for (let index = messages.length - 1; index >= 0; index--) {
 		const message = messages[index];
-		const text = renderMessageBody(message, options);
-		if (!text) continue;
+		if (message.role === "user" && options.currentUserTurnIdempotencyKey && Reflect.get(message, "idempotencyKey") === options.currentUserTurnIdempotencyKey) continue;
+		const remaining = options.maxRenderedContextChars - retainedChars;
+		const files = remaining > 0 && message.role === "user" ? await options.prepareFileContext?.(message, Math.min(remaining, options.maxTextPartChars)) : void 0;
+		const imageChars = (files?.images.length ?? 0) * IMAGE_BLOCK_TOKENS * APPROX_RENDERED_CHARS_PER_TOKEN;
+		const imagesFit = imageChars < remaining;
+		const acceptedImageChars = imagesFit ? imageChars : 0;
+		const text = [
+			renderMessageBody(message, {
+				...options,
+				mediaPrepared: files !== void 0
+			}),
+			files?.text ? truncateText(files.text, options.maxTextPartChars) : void 0,
+			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" : ""}`;
 		totalChars += chunk.length;
-		const remaining = options.maxRenderedContextChars - retainedChars;
 		if (remaining > 0) {
-			const retained = neutralizeCodexExplicitMentionSigils(chunk).slice(-remaining);
+			const retained = neutralizeCodexExplicitMentionSigils(chunk).slice(-(remaining - acceptedImageChars));
 			tail.push(retained);
-			retainedChars += retained.length;
+			retainedChars += retained.length + acceptedImageChars;
+			retainedImageChars += acceptedImageChars;
+			if (imagesFit && files?.images.length) images.unshift(...files.images);
 		}
 	}
-	return truncateOlderContext(tail.toReversed().join(""), options.maxRenderedContextChars, totalChars);
+	return {
+		text: truncateOlderContext(tail.toReversed().join(""), options.maxRenderedContextChars - retainedImageChars, totalChars),
+		images
+	};
 }
 function renderMessageBody(message, options) {
 	if (message.role === "compactionSummary" || message.role === "branchSummary") return truncateText(message.summary.trim(), options.maxTextPartChars);
@@ -1220,7 +811,7 @@ function renderMessagePart(part, options) {
 	const record = part;
 	const type = typeof record.type === "string" ? record.type : void 0;
 	if (type === "text") return typeof record.text === "string" ? truncateText(record.text.trim(), options.maxTextPartChars) : "";
-	if (type === "image") return "[image omitted]";
+	if (type === "image") return options.mediaPrepared ? "" : "[image omitted]";
 	if (type === "toolCall" || type === "tool_use") {
 		const label = `tool call${typeof record.name === "string" ? `: ${record.name}` : ""}`;
 		if (options.toolPayloadMode === "preserve") return truncateText(`${label}\n${stableJson(renderToolCallPayload(record))}`, options.maxTextPartChars);
@@ -1303,16 +894,6 @@ function stableJson(value) {
 		return "[unserializable payload omitted]";
 	}
 }
-function extractMessageText(message) {
-	if (!hasMessageContent(message)) return "";
-	if (typeof message.content === "string") return message.content;
-	if (!Array.isArray(message.content)) return "";
-	return message.content.flatMap((part) => {
-		if (!part || typeof part !== "object" || !("type" in part)) return [];
-		const record = part;
-		return record.type === "text" ? [typeof record.text === "string" ? record.text : ""] : [];
-	}).join("\n");
-}
 function hasMessageContent(message) {
 	return "content" in message;
 }
@@ -1549,7 +1130,7 @@ function shouldRecheckRecoverablePluginBinding(params) {
 //#endregion
 //#region extensions/codex/src/app-server/thread-fingerprints.ts
 function codexDynamicToolsFingerprint(dynamicTools) {
-	return fingerprintDynamicTools(dynamicTools);
+	return hashCodexAppServerBindingFingerprint(legacyFingerprintDynamicTools(dynamicTools));
 }
 function codexLegacyDynamicToolsFingerprint(dynamicTools) {
 	return legacyFingerprintDynamicTools(dynamicTools);
@@ -1557,11 +1138,8 @@ function codexLegacyDynamicToolsFingerprint(dynamicTools) {
 function areCodexDynamicToolFingerprintsCompatible(params) {
 	return areDynamicToolFingerprintsCompatible(params.previous, params.next, params.nextLegacy);
 }
-function fingerprintDynamicTools(dynamicTools) {
-	return hashCodexAppServerBindingFingerprint(legacyFingerprintDynamicTools(dynamicTools));
-}
 function legacyFingerprintDynamicTools(dynamicTools) {
-	return JSON.stringify(dynamicTools.map(fingerprintDynamicToolSpec).toSorted(compareJsonFingerprint));
+	return JSON.stringify(dynamicTools.map(stabilizeJsonValue).toSorted(compareJsonFingerprint));
 }
 function legacyFingerprintUserMcpServersConfigPatch(configPatch) {
 	return configPatch ? JSON.stringify(stabilizeJsonValue(configPatch)) : void 0;
@@ -1600,9 +1178,6 @@ function fingerprintCodexThreadConfig(request, authProfileId, dynamicToolsFinger
 function fingerprintEnvironmentSelection(environments) {
 	return environments ? JSON.stringify(environments.map(stabilizeJsonValue)) : void 0;
 }
-function fingerprintDynamicToolSpec(tool) {
-	return stabilizeJsonValue(tool);
-}
 function stabilizeJsonValue(value) {
 	if (Array.isArray(value)) return value.map(stabilizeJsonValue);
 	if (!isJsonObject(value)) return value;
@@ -1893,68 +1468,6 @@ async function loadCodexNativeToolCatalog(params) {
 	return parseCodexNativeToolCatalog(metadata, binding.threadId, binding.dynamicToolsFingerprint);
 }
 //#endregion
-//#region extensions/codex/src/app-server/managed-thread-store.ts
-const CODEX_MANAGED_THREAD_NAMESPACE = "app-server-managed-threads";
-const CODEX_MANAGED_THREAD_MAX_ENTRIES = 2e4;
-const managedThreadSchema = z.object({
-	version: z.literal(1),
-	kind: z.literal("managed-thread"),
-	sourceHomeId: z.string().min(1),
-	threadId: z.string().min(1),
-	rolloutPath: z.string().min(1).optional()
-});
-async function markStartedCodexManagedThread(store, params) {
-	if (!store) return;
-	try {
-		await store.mark({
-			sourceHomeId: params.sourceHomeId,
-			threadId: params.threadId,
-			...params.rolloutPath ? { rolloutPath: params.rolloutPath } : {}
-		});
-	} catch (error) {
-		embeddedAgentLog.warn("failed to record Codex managed thread ownership", { error });
-	}
-}
-function managedThreadStoreKey(sourceHomeId, threadId) {
-	return `sha256:${createHash("sha256").update("openclaw:codex-managed-thread:v1\0").update(sourceHomeId).update("\0").update(threadId).digest("hex")}`;
-}
-/** Durable ownership index for Codex threads created by OpenClaw. */
-function createCodexManagedThreadStore(state) {
-	return {
-		async has(sourceHomeId, threadId) {
-			const parsed = managedThreadSchema.safeParse(state.lookup(managedThreadStoreKey(sourceHomeId, threadId)));
-			return parsed.success && parsed.data.sourceHomeId === sourceHomeId && parsed.data.threadId === threadId;
-		},
-		async mark(params) {
-			try {
-				const value = managedThreadSchema.parse({
-					version: 1,
-					kind: "managed-thread",
-					sourceHomeId: params.sourceHomeId.trim(),
-					threadId: params.threadId.trim(),
-					...params.rolloutPath?.trim() ? { rolloutPath: params.rolloutPath.trim() } : {}
-				});
-				state.registerIfAbsent(managedThreadStoreKey(value.sourceHomeId, value.threadId), value);
-				return true;
-			} catch (error) {
-				embeddedAgentLog.warn("failed to record Codex managed thread ownership", { error });
-				return false;
-			}
-		},
-		async snapshot() {
-			const byHome = /* @__PURE__ */ new Map();
-			for (const entry of state.entries()) {
-				const parsed = managedThreadSchema.safeParse(entry.value);
-				if (!parsed.success) continue;
-				const ids = byHome.get(parsed.data.sourceHomeId) ?? /* @__PURE__ */ new Set();
-				ids.add(parsed.data.threadId);
-				byHome.set(parsed.data.sourceHomeId, ids);
-			}
-			return byHome;
-		}
-	};
-}
-//#endregion
 //#region extensions/codex/src/app-server/thread-mcp-attestation.ts
 async function attestCodexRestrictedToolSurfaceMcpServersDisabled(client, threadId, threadConfig, signal, expectedActiveServerNames = []) {
 	const configuredServers = threadConfig?.mcp_servers;
@@ -2541,7 +2054,6 @@ function buildDeveloperInstructions(params, options = {}) {
 	let hasSubagentsList = false;
 	let hasSessionsSend = false;
 	let hasSeenDirectNamespace = false;
-	let messageToolAvailable = options.dynamicTools ? false : params.disableMessageTool !== true;
 	for (const spec of options.dynamicTools ?? []) {
 		const isDirectNamespace = spec.type === "namespace" && !hasSeenDirectNamespace && spec.name.trim() === "openclaw_direct";
 		if (isDirectNamespace) hasSeenDirectNamespace = true;
@@ -2558,7 +2070,6 @@ function buildDeveloperInstructions(params, options = {}) {
 			hasSessionsYield ||= isDirectNamespace && name === "sessions_yield";
 			hasSubagentsList ||= name === "subagents";
 			hasSessionsSend ||= name === "sessions_send";
-			messageToolAvailable ||= name === "message";
 		}
 	}
 	const nativeCommandGuidance = listRegisteredPluginAgentPromptGuidance({
@@ -2588,15 +2099,11 @@ function buildDeveloperInstructions(params, options = {}) {
 			hasSubagentsList,
 			hasSessionsSend
 		}).join("\n") : void 0,
-		buildHarnessVisibleReplyGuidance({
-			sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,
-			messageToolAvailable,
-			uiPresentation: params.disableTools !== true && params.promptMode !== "minimal" && params.promptMode !== "none" ? {
-				showWidgetToolName,
-				dashboardToolName,
-				portalToolName
-			} : void 0
-		}),
+		params.disableTools !== true && params.promptMode !== "minimal" && params.promptMode !== "none" ? buildUiPresentationPrompt({
+			showWidgetToolName,
+			dashboardToolName,
+			portalToolName
+		}) : void 0,
 		buildCredentialSafetyPrompt(secretsToolName),
 		nativeCommandGuidance,
 		params.extraSystemPrompt
@@ -3383,51 +2890,26 @@ function shouldWarnCodexThreadLifecycleTimingSummary(summary, options = {}) {
 	return summary.totalMs >= totalThresholdMs || summary.spans.some((span) => span.durationMs >= stageThresholdMs);
 }
 function formatCodexThreadLifecycleTimingSummary(params) {
-	const spans = params.summary.spans.length > 0 ? params.summary.spans.map((span) => `${span.name}:${span.durationMs}ms@${span.elapsedMs}ms`).join(",") : "none";
+	const spans = formatStageTimings(params.summary.spans);
 	return `[trace:codex-app-server] thread lifecycle: runId=${params.runId} sessionId=${params.sessionId} sessionKey=${params.sessionKey ?? "unknown"} action=${params.action} totalMs=${params.summary.totalMs} stages=${spans}`;
 }
 function createCodexThreadLifecycleTimingTracker(options = {}) {
 	const log = options.log ?? embeddedAgentLog;
-	const now = options.now ?? Date.now;
-	const startedAt = now();
+	const timing = createStageTimingTracker(options.now ?? Date.now);
 	let didLog = false;
-	const spans = [];
-	const toMs = (value) => Math.max(0, Math.round(value));
-	const record = (name, spanStartedAt) => {
-		const currentAt = now();
-		spans.push({
-			name,
-			durationMs: toMs(currentAt - spanStartedAt),
-			elapsedMs: toMs(currentAt - startedAt)
-		});
-	};
-	const snapshot = () => ({
-		totalMs: toMs(now() - startedAt),
-		spans: spans.slice()
-	});
 	return {
-		async measure(name, run) {
-			const spanStartedAt = now();
-			try {
-				return await run();
-			} finally {
-				record(name, spanStartedAt);
-			}
-		},
-		measureSync(name, run) {
-			const spanStartedAt = now();
-			try {
-				return run();
-			} finally {
-				record(name, spanStartedAt);
-			}
-		},
+		measure: timing.measure,
+		measureSync: timing.measureSync,
 		mark(name) {
-			record(name, now());
+			timing.measureSync(name, () => void 0);
 		},
 		logSummary(params) {
 			if (didLog) return;
-			const summary = snapshot();
+			const { totalMs, stages: spans } = timing.snapshot();
+			const summary = {
+				totalMs,
+				spans
+			};
 			const shouldWarn = shouldWarnCodexThreadLifecycleTimingSummary(summary, {
 				...options,
 				log
@@ -3463,7 +2945,7 @@ function resolveCodexThreadAgentDir(params) {
 		sessionKey: params.params.sessionKey,
 		agentId: params.agentId ?? params.params.agentId
 	}).sessionAgentId;
-	return params.agentDir ?? params.params.agentDir ?? resolveAgentDir$2(params.params.config ?? {}, agentId);
+	return params.agentDir ?? params.params.agentDir ?? resolveAgentDir$1(params.params.config ?? {}, agentId);
 }
 async function prepareCodexThreadLifecyclePreflight(params) {
 	let effectiveConfig = await assertCodexModelBackedReviewerEffectiveConfig({
@@ -3624,6 +3106,7 @@ async function resumeExistingCodexThread(params, context) {
 		acceptedConfiguration = configuration;
 		assertCodexThreadAcceptsDirectInput(response.thread);
 		configuration.assertConfigured();
+		if (requestModelProvider && response.modelProvider !== requestModelProvider) throw new Error("Codex resumed a different model provider than the one selected for this turn");
 		const loadedPluginThreadConfig = await context.buildLoadedPluginThreadConfig?.(resumeBinding);
 		if (loadedPluginThreadConfig && loadedPluginThreadConfig.fingerprint !== (pluginThreadConfig?.fingerprint ?? resumeBinding.pluginAppsFingerprint)) {
 			ordinaryAppConfigChanged = resumeBinding.connectionScope !== "supervision" && !resumeBinding.pendingResumeConfiguration;
@@ -3657,7 +3140,7 @@ async function resumeExistingCodexThread(params, context) {
 			cwd: params.cwd,
 			rolloutPath: resolveCodexThreadRolloutPath(response.thread) ?? resumeBinding.rolloutPath,
 			authProfileId,
-			model: response.model ?? resumeParams.model ?? params.params.modelId,
+			model: resumeParams.model ?? response.model ?? params.params.modelId,
 			preserveNativeModel: resumeBinding.preserveNativeModel === true ? true : void 0,
 			modelProvider: normalizeBindingModelProvider(authProfileId, response.modelProvider ?? requestModelProvider ?? startModelProvider),
 			dynamicToolsFingerprint,
@@ -4239,8 +3722,7 @@ async function preparePendingCodexThreadResume(params, binding, dynamicToolsFing
 		assertCurrent
 	});
 	assertCurrent();
-	const statusType = thread.status?.type;
-	if (thread.id !== binding.threadId || statusType !== "idle" && statusType !== "notLoaded") throw fail("the native thread is not idle; wait for its current run to finish");
+	if (thread.id !== binding.threadId || !isCodexThreadNonRunning(thread.status)) throw fail("the native thread is not idle; wait for its current run to finish");
 	assertCodexThreadAcceptsDirectInput(thread);
 	const observation = observeCodexThreadConfiguration(params, thread, assertCurrent);
 	const dispose = observation.dispose;
@@ -4284,8 +3766,11 @@ async function prepareCodexThreadResume(params, binding, context) {
 		assertCurrent
 	};
 }
+function isCodexThreadNonRunning(status) {
+	return status?.type === "idle" || status?.type === "notLoaded" || status?.type === "systemError";
+}
 function observeCodexThreadConfiguration(params, thread, assertCurrent) {
-	if (thread.status?.type !== "idle" && thread.status?.type !== "notLoaded") throw new CodexAdoptedThreadActiveError();
+	if (!isCodexThreadNonRunning(thread.status)) throw new CodexAdoptedThreadActiveError();
 	let unloaded = thread.status.type === "notLoaded";
 	return {
 		dispose: params.client.addNotificationHandler((notification) => {
@@ -5133,6 +4618,17 @@ function buildTurnStartParams(params, options) {
 	const useThreadPermissionProfile = options.appServer.networkProxy && !options.sandboxPolicy;
 	const currentSenderContext = params.trigger === "user" ? buildCodexCurrentSenderContextValue(params) : void 0;
 	let additionalContext = buildCodexTemporalAdditionalContext(params, { sessionStatusAvailable: options.sessionStatusAvailable === true });
+	additionalContext = {
+		...additionalContext,
+		openclaw_source_delivery: {
+			kind: "application",
+			value: ["Current source-delivery policy for this turn (replaces earlier source-delivery guidance):", buildHarnessVisibleReplyGuidance({
+				sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,
+				messageToolAvailable: options.messageToolAvailable === true,
+				requireExplicitMessageTarget: options.requireExplicitMessageTarget
+			})].join("\n")
+		}
+	};
 	if (currentSenderContext) additionalContext = {
 		...additionalContext,
 		openclaw_current_sender: {
@@ -5225,4 +4721,4 @@ function joinPresentSections(...sections) {
 	return sections.filter((section) => Boolean(section?.trim())).join("\n\n");
 }
 //#endregion
-export { resolveCodexNativeSkillIsolation as $, readCodexMcpToolConnectorId as A, refreshCodexPluginRuntimeState as At, emitCodexNativePreToolUseFailureDiagnostic as B, buildDeveloperInstructions as C, buildCodexPluginThreadConfigInputFingerprint as Ct, resolveCodexAppServerThreadModelSelection as D, refreshCodexPluginAppApprovalPolicy as Dt, resolveCodexAppServerRequestModelSelection as E, mergeCodexThreadConfigs as Et, assertCodexNativeHookRelayAllowed as F, attestCodexRestrictedToolSurfaceMcpServersDisabled as G, resolveCodexNativeHookRelayTtlMs as H, buildCodexNativeHookRelayConfig as I, createCodexManagedThreadStore as J, CODEX_MANAGED_THREAD_MAX_ENTRIES as K, buildCodexNativeHookRelayDisabledConfig as L, isCodexAppServerProfilerEnabled as M, isOpenAiCuratedMarketplaceName as Mt, CODEX_NATIVE_HOOK_RELAY_EVENTS as N, pluginReadParams as Nt, resolveCodexBindingModelProviderFallback as O, shouldBuildCodexPluginThreadConfig as Ot, CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS as P, resolveRecoverableCodexPluginConfigKeys as Pt, applyCodexNativeSkillIsolation as Q, buildCodexNativeHookRelayId as R, resolveCodexWebSearchPlan as S, buildCodexPluginThreadConfig as St, resolveCodexAppServerModelProvider as T, buildDisabledAppsConfigPatch as Tt, scheduleCodexNativeHookRelayUnregister as U, resolveCodexNativeHookRelayEvents as V, checkCodexThreadAppAvailability as W, loadCodexNativeToolCatalog as X, hasCodexNativeToolCatalog as Y, parseCodexNativeToolCatalog as Z, buildCodexRingZeroThreadConfigPatch as _, neutralizeCodexExplicitMentionSigils as _t, readCodexSupportedReasoningEfforts as a, filterCodexDynamicTools as at, readCodexInheritedMcpServerNames as b, resolveCodexContextEngineProjectionReserveTokens as bt, assertScheduledCodexAppAuthorityRuntime as c, isMessageOnlyCodexSourceReply as ct, buildScheduledCodexAppServerConnectionIdentity as d, resolveCodexDynamicToolsLoading as dt, areCodexDynamicToolFingerprintsCompatible as et, captureScheduledCodexAppAuthority as f, resolveCodexDynamicToolsLoadingForRuntime as ft, assertCodexManagedRequirementsDoNotOverrideToolPolicy as g, fitCodexProjectedContextForTurnStart as gt, resolveScheduledCodexAppCreatorCaptureDecision as h, buildCodexContinuityCalibration as ht, buildCodexUserInput as i, fingerprintUserMcpServersConfigPatch as it, readCodexMcpToolUiVisibility as j, isOpenAiCuratedMarketplace as jt, buildCodexProjectDocThreadConfig as k, ensureCodexPluginActivation as kt, buildLegacyScheduledCodexAppRecoveryPrompt as l, isSystemAgentOnlyCodexDynamicToolAllowlist as lt, readCurrentCodexScheduledAppPolicy as m, isContextEngineBindingCompatible as mt, buildTurnCollaborationMode as n, codexLegacyDynamicToolsFingerprint as nt, resolveCodexAppServerReasoningEffort as o, filterCodexDynamicToolsForDisabledNativeSurface as ot, intersectCodexPluginThreadConfigWithScheduledAuthority as p, buildContextEngineBinding as pt, CODEX_MANAGED_THREAD_NAMESPACE as q, buildTurnStartParams as r, fingerprintJsonObject as rt, startOrResumeThread as s, isForcedPrivateQaCodexRuntime as st, buildCodexTemporalAdditionalContext as t, codexDynamicToolsFingerprint as tt, buildScheduledCodexAppAuthorityInputFingerprint as u, normalizeCodexDynamicToolName as ut, buildCodexRuntimeThreadConfig as v, projectContextEngineAssemblyForCodex as vt, CODEX_NATIVE_PERSONALITY_NONE as w, buildCodexPluginThreadConfigTimeoutFallback as wt, buildCodexNativeWebSearchThreadConfig as x, resolveCodexContinuityProjectionMaxChars as xt, buildCodexThreadConfiguration as y, resolveCodexContextEngineProjectionMaxChars as yt, createCodexNativeHookRelay as z };
+export { codexLegacyDynamicToolsFingerprint as $, readCodexMcpToolConnectorId as A, emitCodexNativePreToolUseFailureDiagnostic as B, buildDeveloperInstructions as C, buildCodexPluginThreadConfigTimeoutFallback as Ct, resolveCodexAppServerThreadModelSelection as D, shouldBuildCodexPluginThreadConfig as Dt, resolveCodexAppServerRequestModelSelection as E, refreshCodexPluginAppApprovalPolicy as Et, assertCodexNativeHookRelayAllowed as F, attestCodexRestrictedToolSurfaceMcpServersDisabled as G, resolveCodexNativeHookRelayTtlMs as H, buildCodexNativeHookRelayConfig as I, parseCodexNativeToolCatalog as J, hasCodexNativeToolCatalog as K, buildCodexNativeHookRelayDisabledConfig as L, isCodexAppServerProfilerEnabled as M, CODEX_NATIVE_HOOK_RELAY_EVENTS as N, resolveCodexBindingModelProviderFallback as O, CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS as P, codexDynamicToolsFingerprint as Q, buildCodexNativeHookRelayId as R, resolveCodexWebSearchPlan as S, buildCodexPluginThreadConfigInputFingerprint as St, resolveCodexAppServerModelProvider as T, mergeCodexThreadConfigs as Tt, scheduleCodexNativeHookRelayUnregister as U, resolveCodexNativeHookRelayEvents as V, checkCodexThreadAppAvailability as W, resolveCodexNativeSkillIsolation as X, applyCodexNativeSkillIsolation as Y, areCodexDynamicToolFingerprintsCompatible as Z, buildCodexRingZeroThreadConfigPatch as _, projectContextEngineAssemblyForCodex as _t, readCodexSupportedReasoningEfforts as a, isMessageOnlyCodexSourceReply as at, readCodexInheritedMcpServerNames as b, resolveCodexContinuityProjectionMaxChars as bt, assertScheduledCodexAppAuthorityRuntime as c, resolveCodexDynamicToolsLoading as ct, buildScheduledCodexAppServerConnectionIdentity as d, isContextEngineBindingCompatible as dt, fingerprintJsonObject as et, captureScheduledCodexAppAuthority as f, CodexContextAttachmentError as ft, assertCodexManagedRequirementsDoNotOverrideToolPolicy as g, neutralizeCodexExplicitMentionSigils as gt, resolveScheduledCodexAppCreatorCaptureDecision as h, isCodexDurableCustomMessage as ht, buildCodexUserInput as i, isForcedPrivateQaCodexRuntime as it, readCodexMcpToolUiVisibility as j, buildCodexProjectDocThreadConfig as k, buildLegacyScheduledCodexAppRecoveryPrompt as l, resolveCodexDynamicToolsLoadingForRuntime as lt, readCurrentCodexScheduledAppPolicy as m, fitCodexProjectedContextForTurnStart as mt, buildTurnCollaborationMode as n, filterCodexDynamicTools as nt, resolveCodexAppServerReasoningEffort as o, isSystemAgentOnlyCodexDynamicToolAllowlist as ot, intersectCodexPluginThreadConfigWithScheduledAuthority as p, buildCodexContinuityCalibration as pt, loadCodexNativeToolCatalog as q, buildTurnStartParams as r, filterCodexDynamicToolsForDisabledNativeSurface as rt, startOrResumeThread as s, normalizeCodexDynamicToolName as st, buildCodexTemporalAdditionalContext as t, fingerprintUserMcpServersConfigPatch as tt, buildScheduledCodexAppAuthorityInputFingerprint as u, buildContextEngineBinding as ut, buildCodexRuntimeThreadConfig as v, resolveCodexContextEngineProjectionMaxChars as vt, CODEX_NATIVE_PERSONALITY_NONE as w, buildDisabledAppsConfigPatch as wt, buildCodexNativeWebSearchThreadConfig as x, buildCodexPluginThreadConfig as xt, buildCodexThreadConfiguration as y, resolveCodexContextEngineProjectionReserveTokens as yt, createCodexNativeHookRelay as z };