@openclaw/codex 2026.7.1-beta.1 → 2026.7.1-beta.2

package/dist/{app-server-policy-xi0ZmBGO.js → app-server-policy-B7hqD3Xj.js}

@@ -1,6 +1,6 @@
 import { n as isJsonObject } from "./protocol-dh-ETiNd.js";
 import { n as canUseCodexModelBackedApprovalsReviewerForModel } from "./config-C_whBx3M.js";
-import { c as hasCodexRateLimitSnapshots, d as summarizeCodexAccountRateLimits, p as summarizeCodexRateLimits } from "./provider-DosqwRb6.js";
+import { c as hasCodexRateLimitSnapshots, d as summarizeCodexAccountRateLimits, p as summarizeCodexRateLimits } from "./provider-nmtMDcGH.js";
 //#region extensions/codex/src/command-formatters.ts
 /** Formats the combined `/codex status` probe result. */
 function formatCodexStatus(probes) {

package/dist/{attempt-notifications-l9LElGOU.js → attempt-notifications-tqyQ_Tdn.js}

@@ -1,5 +1,5 @@
 import { n as isJsonObject } from "./protocol-dh-ETiNd.js";
-import { V as isCodexNotificationForTurn } from "./thread-lifecycle-DeSMZSXr.js";
+import { V as isCodexNotificationForTurn } from "./thread-lifecycle-D6R40plk.js";
 import { asBoolean } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/codex/src/app-server/attempt-notifications.ts
 /**

package/dist/{client-factory-CwjdQQ4j.js → client-factory-DfFu9JH_.js}

@@ -1,9 +1,6 @@
+import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 //#region extensions/codex/src/app-server/client-factory.ts
-let sharedClientModulePromise = null;
-const loadSharedClientModule = async () => {
-	sharedClientModulePromise ??= import("./shared-client-rR6TDJA3.js").then((n) => n.c);
-	return await sharedClientModulePromise;
-};
+const loadSharedClientModule = createLazyRuntimeModule(() => import("./shared-client-rR6TDJA3.js").then((n) => n.c));
 /** Returns a leased shared client so startup can release ownership explicitly. */
 const defaultLeasedCodexAppServerClientFactory = (startOptions, authProfileId, agentDir, config, options) => loadSharedClientModule().then(({ getLeasedSharedCodexAppServerClient }) => getLeasedSharedCodexAppServerClient({
 	startOptions,

package/dist/{command-handlers-vZy8xX5X.js → command-handlers-C9K-KRU-.js}

@@ -1,14 +1,14 @@
 import { n as isJsonObject } from "./protocol-dh-ETiNd.js";
 import { d as resolveCodexAppServerRuntimeOptions, o as isCodexFastServiceTier } from "./config-C_whBx3M.js";
-import { n as listCodexAppServerModels, t as listAllCodexAppServerModels } from "./models-Ccy1_7nN.js";
-import { f as summarizeCodexAccountUsage } from "./provider-DosqwRb6.js";
+import { n as listCodexAppServerModels, t as listAllCodexAppServerModels } from "./models-DpzY1xpp.js";
+import { f as summarizeCodexAccountUsage } from "./provider-nmtMDcGH.js";
 import { l as writeCodexAppServerBinding, n as clearCodexAppServerBinding, o as readCodexAppServerBinding } from "./session-binding-Cm0Gg7Z1.js";
-import { i as describeControlFailure, r as CODEX_CONTROL_METHODS } from "./plugin-app-cache-key-CDioyur-.js";
-import { a as formatCodexDisplayText, c as formatList, d as formatThreads, f as readString$1, i as formatAccount, l as formatModels, o as formatCodexStatus, r as buildHelp, s as formatComputerUseStatus, u as formatSkills } from "./app-server-policy-xi0ZmBGO.js";
+import { i as describeControlFailure, r as CODEX_CONTROL_METHODS } from "./plugin-app-cache-key-BrZUG9jj.js";
+import { a as formatCodexDisplayText, c as formatList, d as formatThreads, f as readString$1, i as formatAccount, l as formatModels, o as formatCodexStatus, r as buildHelp, s as formatComputerUseStatus, u as formatSkills } from "./app-server-policy-B7hqD3Xj.js";
 import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-pTY2COoC.js";
-import { C as canMutateCodexHost, S as CODEX_NATIVE_EXECUTION_AUTH_ERROR, _ as steerCodexConversationTurn, b as readCodexConversationBindingData, d as parseCodexFastModeArg, f as parseCodexPermissionsModeArg, g as setCodexConversationPermissions, h as setCodexConversationModel, m as setCodexConversationFastMode, o as formatCodexCliSessions, p as readCodexConversationActiveTurn, r as startCodexConversationThread, u as formatPermissionsMode, v as stopCodexConversationTurn, x as resolveCodexDefaultWorkspaceDir, y as createCodexCliNodeConversationBindingData } from "./conversation-binding-CEE2UyYb.js";
+import { C as canMutateCodexHost, S as CODEX_NATIVE_EXECUTION_AUTH_ERROR, _ as steerCodexConversationTurn, b as readCodexConversationBindingData, d as parseCodexFastModeArg, f as parseCodexPermissionsModeArg, g as setCodexConversationPermissions, h as setCodexConversationModel, m as setCodexConversationFastMode, o as formatCodexCliSessions, p as readCodexConversationActiveTurn, r as startCodexConversationThread, u as formatPermissionsMode, v as stopCodexConversationTurn, x as resolveCodexDefaultWorkspaceDir, y as createCodexCliNodeConversationBindingData } from "./conversation-binding-DOJtUxOy.js";
 import { t as requestCodexAppServerJson } from "./request-BQuSQF29.js";
-import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-FPGG-mtX.js";
+import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-CpurU-G9.js";
 import { n as rememberCodexRateLimits } from "./rate-limit-cache-C7qmZ0Jh.js";
 import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
 import { normalizeOptionalString, normalizeUniqueStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";

package/dist/{compact-BzB9AqN1.js → compact-CILptrPS.js}

@@ -2,7 +2,7 @@ import { d as resolveCodexAppServerRuntimeOptions } from "./config-C_whBx3M.js";
 import { c as withCodexAppServerBindingLock, l as writeCodexAppServerBinding, o as readCodexAppServerBinding, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-Cm0Gg7Z1.js";
 import { o as releaseLeasedSharedCodexAppServerClient } from "./shared-client-rR6TDJA3.js";
 import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-pTY2COoC.js";
-import { t as defaultLeasedCodexAppServerClientFactory } from "./client-factory-CwjdQQ4j.js";
+import { t as defaultLeasedCodexAppServerClientFactory } from "./client-factory-DfFu9JH_.js";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/compact.ts
 /**

package/dist/{computer-use-FPGG-mtX.js → computer-use-CpurU-G9.js}

@@ -1,5 +1,5 @@
 import { d as resolveCodexAppServerRuntimeOptions, f as resolveCodexComputerUseConfig } from "./config-C_whBx3M.js";
-import { i as describeControlFailure } from "./plugin-app-cache-key-CDioyur-.js";
+import { i as describeControlFailure } from "./plugin-app-cache-key-BrZUG9jj.js";
 import { t as requestCodexAppServerJson } from "./request-BQuSQF29.js";
 import { existsSync } from "node:fs";
 //#region extensions/codex/src/app-server/computer-use.ts

package/dist/{conversation-binding-CEE2UyYb.js → conversation-binding-DOJtUxOy.js}

@@ -1,10 +1,10 @@
 import { n as isJsonObject } from "./protocol-dh-ETiNd.js";
-import { H as readCodexNotificationThreadId, U as readCodexNotificationTurnId, d as resolveCodexAppServerRequestModelSelection, p as resolveCodexBindingModelProviderFallback, t as CODEX_NATIVE_PERSONALITY_NONE } from "./thread-lifecycle-DeSMZSXr.js";
+import { H as readCodexNotificationThreadId, U as readCodexNotificationTurnId, d as resolveCodexAppServerRequestModelSelection, p as resolveCodexBindingModelProviderFallback, t as CODEX_NATIVE_PERSONALITY_NONE } from "./thread-lifecycle-D6R40plk.js";
 import { d as resolveCodexAppServerRuntimeOptions, h as resolveOpenClawExecPolicyForCodexAppServer, i as codexSandboxPolicyForTurn, n as canUseCodexModelBackedApprovalsReviewerForModel, o as isCodexFastServiceTier, p as resolveCodexModelBackedReviewerPolicyContext } from "./config-C_whBx3M.js";
-import { r as assertCodexThreadStartResponse } from "./protocol-validators-CB4mtyrs.js";
+import { r as assertCodexThreadStartResponse } from "./protocol-validators-CJiWigAJ.js";
 import { a as normalizeCodexAppServerBindingModelProvider, i as isCodexAppServerNativeAuthProfile, l as writeCodexAppServerBinding, n as clearCodexAppServerBinding, o as readCodexAppServerBinding } from "./session-binding-Cm0Gg7Z1.js";
-import { r as CODEX_CONTROL_METHODS } from "./plugin-app-cache-key-CDioyur-.js";
-import { a as formatCodexDisplayText, t as resolveCodexAppServerForModelProvider } from "./app-server-policy-xi0ZmBGO.js";
+import { r as CODEX_CONTROL_METHODS } from "./plugin-app-cache-key-BrZUG9jj.js";
+import { a as formatCodexDisplayText, t as resolveCodexAppServerForModelProvider } from "./app-server-policy-B7hqD3Xj.js";
 import { a as getLeasedSharedCodexAppServerClient, o as releaseLeasedSharedCodexAppServerClient, p as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-rR6TDJA3.js";
 import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-pTY2COoC.js";
 import fs from "node:fs/promises";

package/dist/harness.js

@@ -32,25 +32,25 @@ function createCodexAppServerAgentHarness(options) {
 			};
 		},
 		runAttempt: async (params) => {
-			const { runCodexAppServerAttempt } = await import("./run-attempt-O3Zs32KI.js");
+			const { runCodexAppServerAttempt } = await import("./run-attempt-DikbXia_.js");
 			return runCodexAppServerAttempt(params, {
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
 				nativeHookRelay: { enabled: true }
 			});
 		},
 		runSideQuestion: async (params) => {
-			const { runCodexAppServerSideQuestion } = await import("./side-question-DDVgFmpv.js");
+			const { runCodexAppServerSideQuestion } = await import("./side-question-Ca9wqmd0.js");
 			return runCodexAppServerSideQuestion(params, {
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
 				nativeHookRelay: { enabled: true }
 			});
 		},
 		compact: async (params) => {
-			const { maybeCompactCodexAppServerSession } = await import("./compact-BzB9AqN1.js");
+			const { maybeCompactCodexAppServerSession } = await import("./compact-CILptrPS.js");
 			return maybeCompactCodexAppServerSession(params, { pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig });
 		},
 		compactAfterContextEngine: async (params) => {
-			const { maybeCompactCodexAppServerSession } = await import("./compact-BzB9AqN1.js");
+			const { maybeCompactCodexAppServerSession } = await import("./compact-CILptrPS.js");
 			return maybeCompactCodexAppServerSession(params, {
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
 				allowNonManualNativeRequest: true

package/dist/index.js

@@ -1,12 +1,12 @@
 import { createCodexAppServerAgentHarness } from "./harness.js";
-import { I as ensureCodexPluginActivation, L as pluginReadParams, z as defaultCodexAppInventoryCache } from "./thread-lifecycle-DeSMZSXr.js";
+import { I as ensureCodexPluginActivation, L as pluginReadParams, z as defaultCodexAppInventoryCache } from "./thread-lifecycle-D6R40plk.js";
 import { d as resolveCodexAppServerRuntimeOptions, t as CODEX_PLUGINS_MARKETPLACE_NAME, u as readCodexPluginConfig } from "./config-C_whBx3M.js";
-import { t as buildCodexProvider } from "./provider-DosqwRb6.js";
-import { t as buildCodexMediaUnderstandingProvider } from "./media-understanding-provider-C5yYzx_6.js";
-import { i as describeControlFailure, n as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-CDioyur-.js";
-import { a as formatCodexDisplayText } from "./app-server-policy-xi0ZmBGO.js";
+import { t as buildCodexProvider } from "./provider-nmtMDcGH.js";
+import { t as buildCodexMediaUnderstandingProvider } from "./media-understanding-provider-BOeoBhEw.js";
+import { i as describeControlFailure, n as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-BrZUG9jj.js";
+import { a as formatCodexDisplayText } from "./app-server-policy-B7hqD3Xj.js";
 import { a as getLeasedSharedCodexAppServerClient, d as resolveCodexAppServerAuthAccountCacheKey, m as resolveCodexAppServerFallbackApiKeyCacheKey, o as releaseLeasedSharedCodexAppServerClient, p as resolveCodexAppServerAuthProfileIdForAgent, r as clearSharedCodexAppServerClientIfCurrentAndWait } from "./shared-client-rR6TDJA3.js";
-import { a as createCodexCliSessionNodeInvokePolicies, c as resolveCodexCliSessionForBindingOnNode, i as createCodexCliSessionNodeHostCommands, l as resumeCodexCliSessionOnNode, n as handleCodexConversationInboundClaim, s as listCodexCliSessionsOnNode, t as handleCodexConversationBindingResolved } from "./conversation-binding-CEE2UyYb.js";
+import { a as createCodexCliSessionNodeInvokePolicies, c as resolveCodexCliSessionForBindingOnNode, i as createCodexCliSessionNodeHostCommands, l as resumeCodexCliSessionOnNode, n as handleCodexConversationInboundClaim, s as listCodexCliSessionsOnNode, t as handleCodexConversationBindingResolved } from "./conversation-binding-DOJtUxOy.js";
 import { t as requestCodexAppServerJson } from "./request-BQuSQF29.js";
 import { t as createCodexWebSearchProviderBase } from "./web-search-provider.shared-BrZmlqyR.js";
 import { mutateConfigFile } from "openclaw/plugin-sdk/config-mutation";
@@ -22,7 +22,9 @@ import { applyAuthProfileConfig, buildApiKeyCredential, buildOauthProviderAuthRe
 import { pathExists } from "openclaw/plugin-sdk/security-runtime";
 import { MIGRATION_REASON_TARGET_EXISTS, applyMigrationManualItem, createMigrationItem, createMigrationManualItem, hasMigrationConfigPatchConflict, markMigrationItemConflict, markMigrationItemError, markMigrationItemSkipped, readMigrationConfigPath, summarizeMigrationItems, writeMigrationConfigPath } from "openclaw/plugin-sdk/migration";
 import { archiveMigrationItem, copyMigrationFileItem, withCachedMigrationConfigRuntime, writeMigrationReport } from "openclaw/plugin-sdk/migration-runtime";
+import { sleep } from "openclaw/plugin-sdk/runtime-env";
 import { readJsonFileWithFallback } from "openclaw/plugin-sdk/json-store";
+import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 //#region extensions/codex/src/commands.ts
 /** Creates the reserved `/codex` command definition exposed by the plugin. */
 function createCodexCommand(options) {
@@ -52,7 +54,7 @@ async function handleCodexCommand(ctx, options = {}) {
 	}
 }
 async function loadDefaultCodexSubcommandHandler() {
-	const { handleCodexSubcommand } = await import("./command-handlers-vZy8xX5X.js");
+	const { handleCodexSubcommand } = await import("./command-handlers-C9K-KRU-.js");
 	return handleCodexSubcommand;
 }
 //#endregion
@@ -1405,11 +1407,6 @@ function targetCodexMarketplaceDiscoveryTimeoutMs(env = process.env) {
 function isCodexPluginLoadWarningItem(item) {
 	return item.kind === "plugin" && item.action === "install" && item.status === "warning" && item.details?.warningReason === CODEX_PLUGIN_LOAD_WARNING;
 }
-async function sleep(ms) {
-	await new Promise((resolve) => {
-		setTimeout(resolve, ms);
-	});
-}
 async function buildTargetCodexPluginAppCacheKey(ctx) {
 	const targets = resolveCodexMigrationTargets(ctx);
 	const appServer = resolveTargetCodexAppServer(ctx);
@@ -1548,11 +1545,7 @@ function buildCodexMigrationProvider(params = {}) {
 }
 //#endregion
 //#region extensions/codex/src/web-search-provider.ts
-let codexWebSearchRuntimePromise;
-function loadCodexWebSearchRuntime() {
-	codexWebSearchRuntimePromise ??= import("./web-search-provider.runtime-Q89rQhsL.js");
-	return codexWebSearchRuntimePromise;
-}
+const loadCodexWebSearchRuntime = createLazyRuntimeModule(() => import("./web-search-provider.runtime-B6eZEFmd.js"));
 const CodexWebSearchSchema = {
 	type: "object",
 	properties: { query: {

package/dist/{media-understanding-provider-C5yYzx_6.js → media-understanding-provider-BOeoBhEw.js}

@@ -1,10 +1,10 @@
 import { CODEX_PROVIDER_ID, FALLBACK_CODEX_MODELS } from "./provider-catalog.js";
 import { n as isJsonObject } from "./protocol-dh-ETiNd.js";
-import { P as mergeCodexThreadConfigs, r as buildCodexRuntimeThreadConfig } from "./thread-lifecycle-DeSMZSXr.js";
-import { C as readCodexNotificationItem } from "./attempt-notifications-l9LElGOU.js";
+import { P as mergeCodexThreadConfigs, r as buildCodexRuntimeThreadConfig } from "./thread-lifecycle-D6R40plk.js";
+import { C as readCodexNotificationItem } from "./attempt-notifications-tqyQ_Tdn.js";
 import { d as resolveCodexAppServerRuntimeOptions } from "./config-C_whBx3M.js";
-import { i as assertCodexTurnStartResponse, l as readCodexTurnCompletedNotification, o as readCodexErrorNotification, r as assertCodexThreadStartResponse } from "./protocol-validators-CB4mtyrs.js";
-import { i as readModelListResult } from "./models-Ccy1_7nN.js";
+import { i as assertCodexTurnStartResponse, l as readCodexTurnCompletedNotification, o as readCodexErrorNotification, r as assertCodexThreadStartResponse } from "./protocol-validators-CJiWigAJ.js";
+import { i as readModelListResult } from "./models-DpzY1xpp.js";
 import { validateJsonSchemaValue } from "openclaw/plugin-sdk/json-schema-runtime";
 import fs from "node:fs/promises";
 import path from "node:path";

package/dist/media-understanding-provider.js

@@ -1,2 +1,2 @@
-import { t as buildCodexMediaUnderstandingProvider } from "./media-understanding-provider-C5yYzx_6.js";
+import { t as buildCodexMediaUnderstandingProvider } from "./media-understanding-provider-BOeoBhEw.js";
 export { buildCodexMediaUnderstandingProvider };

package/dist/{models-Ccy1_7nN.js → models-DpzY1xpp.js}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { s as readCodexModelListResponse } from "./protocol-validators-CB4mtyrs.js";
+import { s as readCodexModelListResponse } from "./protocol-validators-CJiWigAJ.js";
 import { uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/codex/src/app-server/models.ts
 /**

package/dist/{plugin-app-cache-key-CDioyur-.js → plugin-app-cache-key-BrZUG9jj.js}

@@ -1,4 +1,4 @@
-import { R as buildCodexAppInventoryCacheKey } from "./thread-lifecycle-DeSMZSXr.js";
+import { R as buildCodexAppInventoryCacheKey } from "./thread-lifecycle-D6R40plk.js";
 import { n as CodexAppServerRpcError } from "./client-IcTBKEqA.js";
 import { h as resolveCodexAppServerHomeDir } from "./shared-client-rR6TDJA3.js";
 import { createRequire } from "node:module";

package/dist/{protocol-validators-CB4mtyrs.js → protocol-validators-CJiWigAJ.js}

@@ -1,3 +1,4 @@
+import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { Compile } from "typebox/compile";
 //#region extensions/codex/src/app-server/protocol-generated/json/DynamicToolCallParams.json
 var DynamicToolCallParams_default = {
@@ -5816,9 +5817,6 @@ function compileCodexSchema(schema) {
 		errors: (value) => [...validator.Errors(value)]
 	};
 }
-function isRecord(value) {
-	return Boolean(value && typeof value === "object" && !Array.isArray(value));
-}
 const schemaMapKeywords = new Set([
 	"$defs",
 	"definitions",

package/dist/{provider-capabilities-CE5k8cmO.js → provider-capabilities-wqedK49Z.js}

@@ -1,7 +1,7 @@
 import { n as isJsonObject } from "./protocol-dh-ETiNd.js";
-import { C as isForcedPrivateQaCodexRuntime, S as filterCodexDynamicTools, _ as resolveCodexWebSearchPlan, w as normalizeCodexDynamicToolName, x as sanitizeInlineImageDataUrl, y as invalidInlineImageText } from "./thread-lifecycle-DeSMZSXr.js";
+import { C as isForcedPrivateQaCodexRuntime, S as filterCodexDynamicTools, _ as resolveCodexWebSearchPlan, w as normalizeCodexDynamicToolName, x as sanitizeInlineImageDataUrl, y as invalidInlineImageText } from "./thread-lifecycle-D6R40plk.js";
 import { c as isTrustedCodexModelBackedOpenAIProvider, u as readCodexPluginConfig } from "./config-C_whBx3M.js";
-import { a as formatCodexDisplayText } from "./app-server-policy-xi0ZmBGO.js";
+import { a as formatCodexDisplayText } from "./app-server-policy-B7hqD3Xj.js";
 import { o as releaseLeasedSharedCodexAppServerClient } from "./shared-client-rR6TDJA3.js";
 import { i as resolveCodexNativeExecutionPolicy } from "./sandbox-guard-pTY2COoC.js";
 import { addTimerTimeoutGraceMs, finiteSecondsToTimerSafeMilliseconds, resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
@@ -1784,7 +1784,11 @@ function hasExplicitNonSourceMessageRoute(args, hookContext, messagingTarget) {
 }
 /** Namespace attached to OpenClaw-owned dynamic tools exposed to Codex. */
 const CODEX_OPENCLAW_DYNAMIC_TOOL_NAMESPACE = "openclaw";
-const ALWAYS_DIRECT_DYNAMIC_TOOL_NAMES = new Set(["sessions_yield"]);
+const ALWAYS_DIRECT_DYNAMIC_TOOL_NAMES = new Set([
+	"agents_list",
+	"sessions_spawn",
+	"sessions_yield"
+]);
 const EXPLICIT_MESSAGE_PROVIDER_KEYS = ["channel", "provider"];
 const EXPLICIT_MESSAGE_TARGET_KEYS = [
 	"target",

package/dist/{provider-DosqwRb6.js → provider-nmtMDcGH.js}

@@ -545,7 +545,7 @@ async function listModelsBestEffort(params) {
 	}
 }
 async function listCodexAppServerModelsLazy(options) {
-	const { listCodexAppServerModels } = await import("./models-Ccy1_7nN.js").then((n) => n.r);
+	const { listCodexAppServerModels } = await import("./models-DpzY1xpp.js").then((n) => n.r);
 	return listCodexAppServerModels(options);
 }
 async function requestCodexAppServerRateLimitsLazy(options) {

package/dist/provider.js

@@ -1,2 +1,2 @@
-import { a as readCodexSupportedReasoningEfforts, i as isModernCodexModel, n as buildCodexProviderCatalog, o as resolveCodexSupportedReasoningEffort, r as isMaxReasoningCodexModel, t as buildCodexProvider } from "./provider-DosqwRb6.js";
+import { a as readCodexSupportedReasoningEfforts, i as isModernCodexModel, n as buildCodexProviderCatalog, o as resolveCodexSupportedReasoningEffort, r as isMaxReasoningCodexModel, t as buildCodexProvider } from "./provider-nmtMDcGH.js";
 export { buildCodexProvider, buildCodexProviderCatalog, isMaxReasoningCodexModel, isModernCodexModel, readCodexSupportedReasoningEfforts, resolveCodexSupportedReasoningEffort };

package/dist/{run-attempt-O3Zs32KI.js → run-attempt-DikbXia_.js}

@@ -1,17 +1,17 @@
 import { n as isJsonObject, t as flattenCodexDynamicToolFunctions } from "./protocol-dh-ETiNd.js";
-import { A as resolveCodexContextEngineProjectionReserveTokens, B as describeCodexNotificationCorrelation, D as fitCodexProjectedContextForTurnStart, E as resolveCodexDynamicToolsLoadingForRuntime, F as shouldBuildCodexPluginThreadConfig, H as readCodexNotificationThreadId, M as buildCodexPluginThreadConfig, N as buildCodexPluginThreadConfigInputFingerprint, O as projectContextEngineAssemblyForCodex, P as mergeCodexThreadConfigs, U as readCodexNotificationTurnId, _ as resolveCodexWebSearchPlan, a as buildDeveloperInstructions, b as sanitizeCodexHistoryImagePayloads, c as codexDynamicToolsFingerprint, f as resolveCodexAppServerThreadModelSelection, h as startOrResumeThread, i as buildContextEngineBinding, k as resolveCodexContextEngineProjectionMaxChars, l as isContextEngineBindingCompatible, n as areCodexDynamicToolFingerprintsCompatible, o as buildTurnCollaborationMode, s as buildTurnStartParams, v as isCodexAppServerProfilerEnabled, z as defaultCodexAppInventoryCache } from "./thread-lifecycle-DeSMZSXr.js";
-import { C as readCodexNotificationItem, D as updateActiveCompletionBlockerItemIds, E as shouldDisarmAssistantCompletionIdleWatch, O as updateActiveTurnItemIds, S as isTurnNotification, T as readRawResponseToolCallId, _ as isRawToolOutputCompletionNotification, a as isCodexNotificationOutsideActiveRun, b as isRetryableErrorNotification, c as isCurrentThreadOptionalTurnRequestParams, d as isNativeResponseStreamDeltaNotification, f as isNativeToolProgressNotification, g as isRawReasoningCompletionNotification, h as isRawFunctionToolOutputCompletionNotification, i as isAssistantCompletionReleaseNotification, l as isCurrentThreadTurnRequestParams, m as isRawAssistantProgressNotification, n as describeNotificationActivity, o as isCodexTurnAbortMarkerNotification, p as isPendingOpenClawDynamicToolCompletionNotification, r as isAssistantCommentaryCompletionNotification, s as isCurrentApprovalTurnRequestParams, t as codexExecutionToolName, u as isFileChangePatchUpdatedNotification, v as isReasoningItemCompletionNotification, w as readNotificationItemId, x as isTerminalTurnStatus, y as isReasoningProgressNotification } from "./attempt-notifications-l9LElGOU.js";
+import { A as resolveCodexContextEngineProjectionReserveTokens, B as describeCodexNotificationCorrelation, D as fitCodexProjectedContextForTurnStart, E as resolveCodexDynamicToolsLoadingForRuntime, F as shouldBuildCodexPluginThreadConfig, H as readCodexNotificationThreadId, M as buildCodexPluginThreadConfig, N as buildCodexPluginThreadConfigInputFingerprint, O as projectContextEngineAssemblyForCodex, P as mergeCodexThreadConfigs, U as readCodexNotificationTurnId, _ as resolveCodexWebSearchPlan, a as buildDeveloperInstructions, b as sanitizeCodexHistoryImagePayloads, c as codexDynamicToolsFingerprint, f as resolveCodexAppServerThreadModelSelection, h as startOrResumeThread, i as buildContextEngineBinding, k as resolveCodexContextEngineProjectionMaxChars, l as isContextEngineBindingCompatible, n as areCodexDynamicToolFingerprintsCompatible, o as buildTurnCollaborationMode, s as buildTurnStartParams, v as isCodexAppServerProfilerEnabled, z as defaultCodexAppInventoryCache } from "./thread-lifecycle-D6R40plk.js";
+import { C as readCodexNotificationItem, D as updateActiveCompletionBlockerItemIds, E as shouldDisarmAssistantCompletionIdleWatch, O as updateActiveTurnItemIds, S as isTurnNotification, T as readRawResponseToolCallId, _ as isRawToolOutputCompletionNotification, a as isCodexNotificationOutsideActiveRun, b as isRetryableErrorNotification, c as isCurrentThreadOptionalTurnRequestParams, d as isNativeResponseStreamDeltaNotification, f as isNativeToolProgressNotification, g as isRawReasoningCompletionNotification, h as isRawFunctionToolOutputCompletionNotification, i as isAssistantCompletionReleaseNotification, l as isCurrentThreadTurnRequestParams, m as isRawAssistantProgressNotification, n as describeNotificationActivity, o as isCodexTurnAbortMarkerNotification, p as isPendingOpenClawDynamicToolCompletionNotification, r as isAssistantCommentaryCompletionNotification, s as isCurrentApprovalTurnRequestParams, t as codexExecutionToolName, u as isFileChangePatchUpdatedNotification, v as isReasoningItemCompletionNotification, w as readNotificationItemId, x as isTerminalTurnStatus, y as isReasoningProgressNotification } from "./attempt-notifications-tqyQ_Tdn.js";
 import { _ as withMcpElicitationsApprovalPolicy, a as isCodexAppServerApprovalPolicyAllowedByRequirements, d as resolveCodexAppServerRuntimeOptions, f as resolveCodexComputerUseConfig, g as shouldAutoApproveCodexAppServerApprovals, h as resolveOpenClawExecPolicyForCodexAppServer, m as resolveCodexPluginsPolicy, p as resolveCodexModelBackedReviewerPolicyContext, s as isCodexSandboxExecServerEnabled, u as readCodexPluginConfig } from "./config-C_whBx3M.js";
-import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-CB4mtyrs.js";
-import { l as resolveCodexUsageLimitResetAtMs, s as formatCodexUsageLimitErrorMessage, u as shouldRefreshCodexRateLimitsForUsageLimitMessage } from "./provider-DosqwRb6.js";
+import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-CJiWigAJ.js";
+import { l as resolveCodexUsageLimitResetAtMs, s as formatCodexUsageLimitErrorMessage, u as shouldRefreshCodexRateLimitsForUsageLimitMessage } from "./provider-nmtMDcGH.js";
 import { a as isCodexAppServerConnectionClosedError, c as MIN_CODEX_SANDBOX_EXEC_SERVER_APP_SERVER_VERSION, i as isCodexAppServerApprovalRequest, n as CodexAppServerRpcError, r as compareCodexAppServerVersions } from "./client-IcTBKEqA.js";
 import { i as isCodexAppServerNativeAuthProfile, l as writeCodexAppServerBinding, n as clearCodexAppServerBinding, o as readCodexAppServerBinding, r as clearCodexAppServerBindingForThread } from "./session-binding-Cm0Gg7Z1.js";
-import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS, t as buildCodexAppServerRuntimeFingerprint } from "./plugin-app-cache-key-CDioyur-.js";
-import { a as formatCodexDisplayText, n as resolveCodexAppServerForOpenClawToolPolicy, t as resolveCodexAppServerForModelProvider } from "./app-server-policy-xi0ZmBGO.js";
+import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS, t as buildCodexAppServerRuntimeFingerprint } from "./plugin-app-cache-key-BrZUG9jj.js";
+import { a as formatCodexDisplayText, n as resolveCodexAppServerForOpenClawToolPolicy, t as resolveCodexAppServerForModelProvider } from "./app-server-policy-B7hqD3Xj.js";
 import { d as resolveCodexAppServerAuthAccountCacheKey, f as resolveCodexAppServerAuthProfileId, h as resolveCodexAppServerHomeDir, m as resolveCodexAppServerFallbackApiKeyCacheKey, n as clearSharedCodexAppServerClientIfCurrentAndUnclaimed, o as releaseLeasedSharedCodexAppServerClient, p as resolveCodexAppServerAuthProfileIdForAgent, s as retireSharedCodexAppServerClientIfCurrent, t as clearSharedCodexAppServerClientIfCurrent, u as refreshCodexAppServerAuthTokens } from "./shared-client-rR6TDJA3.js";
-import { t as defaultLeasedCodexAppServerClientFactory } from "./client-factory-CwjdQQ4j.js";
-import { A as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, C as resolveCodexMessageToolProvider, D as shouldWarnCodexDynamicToolBuildStageSummary, E as shouldRequireCodexSandboxExecServerEnvironment, F as resolveCodexTurnTerminalIdleTimeoutMs, I as withCodexStartupTimeout, M as resolveCodexStartupTimeoutMs, N as resolveCodexTurnAssistantCompletionIdleTimeoutMs, P as resolveCodexTurnCompletionIdleTimeoutMs, S as resolveCodexExternalSandboxPolicyForOpenClawSandbox, T as shouldEnableCodexAppServerNativeToolSurface, _ as createCodexDynamicToolBuildStageTracker, a as buildCodexNativeHookRelayConfig, b as resolveCodexAppServerExecutionCwd, c as resolveCodexNativeHookRelayEvents, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, g as buildDynamicTools, h as emitDynamicToolTerminalDiagnostic, i as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, j as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, k as handleCodexAppServerApprovalRequest, l as resolveCodexNativeHookRelayTtlMs, m as emitDynamicToolStartedDiagnostic, o as buildCodexNativeHookRelayDisabledConfig, p as emitDynamicToolErrorDiagnostic, s as createCodexNativeHookRelay, t as resolveCodexProviderWebSearchSupport, u as scheduleCodexNativeHookRelayUnregister, v as disableCodexPluginThreadConfig, w as resolveCodexSandboxEnvironmentSelection, x as resolveCodexAppServerHookChannelId, y as formatCodexDynamicToolBuildStageSummary } from "./provider-capabilities-CE5k8cmO.js";
-import { t as ensureCodexComputerUse } from "./computer-use-FPGG-mtX.js";
+import { t as defaultLeasedCodexAppServerClientFactory } from "./client-factory-DfFu9JH_.js";
+import { A as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, C as resolveCodexMessageToolProvider, D as shouldWarnCodexDynamicToolBuildStageSummary, E as shouldRequireCodexSandboxExecServerEnvironment, F as resolveCodexTurnTerminalIdleTimeoutMs, I as withCodexStartupTimeout, M as resolveCodexStartupTimeoutMs, N as resolveCodexTurnAssistantCompletionIdleTimeoutMs, P as resolveCodexTurnCompletionIdleTimeoutMs, S as resolveCodexExternalSandboxPolicyForOpenClawSandbox, T as shouldEnableCodexAppServerNativeToolSurface, _ as createCodexDynamicToolBuildStageTracker, a as buildCodexNativeHookRelayConfig, b as resolveCodexAppServerExecutionCwd, c as resolveCodexNativeHookRelayEvents, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, g as buildDynamicTools, h as emitDynamicToolTerminalDiagnostic, i as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, j as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, k as handleCodexAppServerApprovalRequest, l as resolveCodexNativeHookRelayTtlMs, m as emitDynamicToolStartedDiagnostic, o as buildCodexNativeHookRelayDisabledConfig, p as emitDynamicToolErrorDiagnostic, s as createCodexNativeHookRelay, t as resolveCodexProviderWebSearchSupport, u as scheduleCodexNativeHookRelayUnregister, v as disableCodexPluginThreadConfig, w as resolveCodexSandboxEnvironmentSelection, x as resolveCodexAppServerHookChannelId, y as formatCodexDynamicToolBuildStageSummary } from "./provider-capabilities-wqedK49Z.js";
+import { t as ensureCodexComputerUse } from "./computer-use-CpurU-G9.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-C7qmZ0Jh.js";
 import fs from "node:fs/promises";
 import path, { posix } from "node:path";
@@ -2912,7 +2912,7 @@ function createCodexAttemptTurnWatchController(params) {
 	}
 	function scheduleAssistantCompletionIdleWatch() {
 		clearAssistantCompletionIdleTimer();
-		if (params.isCompleted() || params.signal.aborted || !assistantCompletionIdleWatchArmed) return;
+		if (params.isCompleted() || params.signal.aborted || !assistantCompletionIdleWatchArmed || params.getActiveFinalizationHookCount() > 0) return;
 		const elapsedMs = Math.max(0, Date.now() - assistantCompletionLastActivityAt);
 		const delayMs = Math.max(1, turnAssistantCompletionIdleTimeoutMs - elapsedMs);
 		assistantCompletionIdleTimer = setTimeout(fireAssistantCompletionIdleRelease, delayMs);
@@ -2955,10 +2955,16 @@ function createCodexAttemptTurnWatchController(params) {
 	}
 	function fireAssistantCompletionIdleRelease() {
 		if (params.isCompleted() || params.signal.aborted || !assistantCompletionIdleWatchArmed) return;
-		if (params.getActiveAppServerTurnRequests() > 0 || params.getActiveTurnItemCount() > 0) {
+		if (params.getActiveAppServerTurnRequests() > 0 || params.getActiveTurnItemCount() > 0 || params.getActiveFinalizationHookCount() > 0) {
 			scheduleAssistantCompletionIdleWatch();
 			return;
 		}
+		if (!params.canReleaseAssistantCompletionIdle()) {
+			assistantCompletionIdleWatchArmed = false;
+			assistantCompletionLastActivityDetails = void 0;
+			clearAssistantCompletionIdleTimer();
+			return;
+		}
 		const idleMs = Math.max(0, Date.now() - assistantCompletionLastActivityAt);
 		if (idleMs < turnAssistantCompletionIdleTimeoutMs) {
 			scheduleAssistantCompletionIdleWatch();
@@ -3807,6 +3813,9 @@ var CodexAppServerEventProjector = class {
 		this.assistantTextByItem = /* @__PURE__ */ new Map();
 		this.assistantItemOrder = [];
 		this.assistantPhaseByItem = /* @__PURE__ */ new Map();
+		this.latestTerminalAssistantCandidateSuperseded = false;
+		this.latestTerminalAssistantCandidateCanReleaseAfterToolHandoff = false;
+		this.terminalAssistantCandidateEarlierActiveItemIds = /* @__PURE__ */ new Set();
 		this.lastCommentaryProgressTextByItem = /* @__PURE__ */ new Map();
 		this.pendingRawCommentaryEchoes = 0;
 		this.reasoningTextByGroup = /* @__PURE__ */ new Map();
@@ -3855,8 +3864,33 @@ var CodexAppServerEventProjector = class {
 		return this.completedTurn?.status;
 	}
 	hasCompletedTerminalAssistantText() {
+		const latestCompletedItemId = this.latestCompletedTerminalAssistantItemId;
+		if (!latestCompletedItemId) return false;
 		const finalItem = this.resolveFinalAssistantTextItem();
-		return finalItem !== void 0 && this.completedItemIds.has(finalItem.itemId);
+		return this.latestCompletedItemId === latestCompletedItemId && finalItem?.itemId === latestCompletedItemId && this.completedItemIds.has(latestCompletedItemId);
+	}
+	getLatestTerminalAssistantCandidate() {
+		const itemId = this.latestTerminalAssistantCandidateItemId;
+		if (!itemId) return;
+		const text = this.assistantTextByItem.get(itemId)?.trim();
+		return {
+			itemId,
+			hasText: Boolean(text && !this.toolProgressTexts.has(text))
+		};
+	}
+	hasLatestTerminalAssistantCandidateText() {
+		return !this.latestTerminalAssistantCandidateSuperseded && this.getLatestTerminalAssistantCandidate()?.hasText === true;
+	}
+	canReleaseLatestTerminalAssistantAfterToolHandoff() {
+		return this.latestTerminalAssistantCandidateCanReleaseAfterToolHandoff && this.hasLatestTerminalAssistantCandidateText();
+	}
+	/** Restores a completed final item after only the enclosing turn timeout fired. */
+	recoverCompletedTerminalAssistantAfterTurnWatchTimeout() {
+		if (!this.aborted || this.promptError !== "codex app-server attempt timed out" || !this.hasCompletedTerminalAssistantText()) return false;
+		this.aborted = false;
+		this.promptError = void 0;
+		this.promptErrorSource = null;
+		return true;
 	}
 	/** Resolves the shared model-order position for a native tool item. */
 	recordNativeToolOutcome(item) {
@@ -4047,9 +4081,12 @@ var CodexAppServerEventProjector = class {
 		const itemId = readString$5(params, "itemId") ?? readString$5(params, "id") ?? "assistant";
 		const delta = readString$5(params, "delta") ?? "";
 		if (!delta) return;
+		if (itemId !== this.pendingRawTerminalAssistantEchoItemId) this.pendingRawTerminalAssistantEchoItemId = void 0;
 		this.rememberAssistantPhase(readItem(params.item));
 		const phase = readString$5(params, "phase");
 		if (phase) this.assistantPhaseByItem.set(itemId, phase);
+		const isCommentary = this.isCommentaryAssistantItem(itemId);
+		if (!isCommentary && itemId !== this.latestTerminalAssistantCandidateItemId) this.markTerminalAssistantCandidateSupersededBy();
 		if (!this.assistantStarted) {
 			this.assistantStarted = true;
 			await this.params.onAssistantMessageStart?.();
@@ -4057,7 +4094,7 @@ var CodexAppServerEventProjector = class {
 		this.rememberAssistantItem(itemId);
 		const text = `${this.assistantTextByItem.get(itemId) ?? ""}${delta}`;
 		this.assistantTextByItem.set(itemId, text);
-		if (this.isCommentaryAssistantItem(itemId)) this.emitCommentaryProgress({
+		if (isCommentary) this.emitCommentaryProgress({
 			itemId,
 			text
 		});
@@ -4131,8 +4168,15 @@ var CodexAppServerEventProjector = class {
 	async handleItemStarted(params) {
 		const item = readItem(params.item);
 		const itemId = item?.id ?? readString$5(params, "itemId") ?? readString$5(params, "id");
+		if (item?.type === "agentMessage" && itemId && itemId !== this.pendingRawTerminalAssistantEchoItemId) this.pendingRawTerminalAssistantEchoItemId = void 0;
 		this.rememberAssistantPhase(item);
-		if (itemId) this.activeItemIds.add(itemId);
+		if (itemId) {
+			this.activeItemIds.add(itemId);
+			if (itemId !== this.latestTerminalAssistantCandidateItemId) {
+				this.markTerminalAssistantCandidateSupersededBy(itemId, { preserveEarlierActiveItem: true });
+				if (this.latestTerminalAssistantCandidateSuperseded) this.pendingRawTerminalAssistantEchoItemId = void 0;
+			}
+		}
 		this.recordNativeToolOutcome(item);
 		if (item?.type === "contextCompaction" && itemId) {
 			this.activeCompactionItemIds.add(itemId);
@@ -4186,11 +4230,21 @@ var CodexAppServerEventProjector = class {
 		this.recordNativeToolOutcome(item);
 		this.clearTerminalPresentationForNativeItem(item);
 		const itemId = item?.id ?? readString$5(params, "itemId") ?? readString$5(params, "id");
+		if (item?.type === "agentMessage" && itemId && itemId !== this.pendingRawTerminalAssistantEchoItemId) this.pendingRawTerminalAssistantEchoItemId = void 0;
 		if (itemId) {
 			this.activeItemIds.delete(itemId);
 			this.completedItemIds.add(itemId);
+			this.latestCompletedItemId = itemId;
 		}
 		this.rememberAssistantPhase(item);
+		if (item?.type === "agentMessage" && !this.isCommentaryAssistantItem(item.id)) {
+			this.latestCompletedTerminalAssistantItemId = item.id;
+			this.markLatestTerminalAssistantCandidate(item.id);
+			this.pendingRawTerminalAssistantEchoItemId = item.id;
+		} else if (itemId) {
+			this.markTerminalAssistantCandidateSupersededBy(itemId, { preserveEarlierActiveItem: true });
+			if (this.latestTerminalAssistantCandidateSuperseded) this.pendingRawTerminalAssistantEchoItemId = void 0;
+		}
 		if (item?.type === "agentMessage" && typeof item.text === "string") {
 			this.rememberAssistantItem(item.id);
 			this.assistantTextByItem.set(item.id, item.text);
@@ -4428,16 +4482,36 @@ var CodexAppServerEventProjector = class {
 	async handleRawResponseItemCompleted(params) {
 		const item = isJsonObject(params.item) ? params.item : void 0;
 		if (!item) return;
-		await this.recordRawGeneratedImageMedia(item);
-		if (readString$5(item, "role") !== "assistant") return;
+		const role = readString$5(item, "role");
 		const phase = readString$5(item, "phase");
+		const rawItemId = readString$5(item, "id");
+		const candidateWasSupersededBeforeRaw = this.latestTerminalAssistantCandidateSuperseded;
+		const pendingTerminalAssistantEchoItemId = this.pendingRawTerminalAssistantEchoItemId;
+		const isPendingTerminalAssistantEcho = role === "assistant" && phase !== "commentary" && pendingTerminalAssistantEchoItemId !== void 0 && (rawItemId === void 0 || rawItemId === pendingTerminalAssistantEchoItemId);
+		if (pendingTerminalAssistantEchoItemId !== void 0 && !isPendingTerminalAssistantEcho) this.pendingRawTerminalAssistantEchoItemId = void 0;
+		if (!isPendingTerminalAssistantEcho) {
+			this.latestCompletedItemId = void 0;
+			this.markTerminalAssistantCandidateSupersededBy(rawItemId);
+		}
+		await this.recordRawGeneratedImageMedia(item);
+		if (role !== "assistant") return;
 		if (phase === "commentary" && this.pendingRawCommentaryEchoes > 0) {
 			this.pendingRawCommentaryEchoes -= 1;
 			return;
 		}
 		const text = extractRawAssistantText(item);
+		if (isPendingTerminalAssistantEcho) {
+			const typedItemId = pendingTerminalAssistantEchoItemId;
+			this.pendingRawTerminalAssistantEchoItemId = void 0;
+			if (this.assistantTextByItem.get(typedItemId)?.trim() || !text) return;
+			this.rememberAssistantItem(typedItemId);
+			this.assistantTextByItem.set(typedItemId, text);
+			return;
+		}
 		if (!text) return;
-		const itemId = readString$5(item, "id") ?? `raw-assistant-${this.assistantItemOrder.length + 1}`;
+		const itemId = rawItemId ?? `raw-assistant-${this.assistantItemOrder.length + 1}`;
+		const isIdlessTerminalAssistantAfterCompletedWork = candidateWasSupersededBeforeRaw && rawItemId === void 0 && pendingTerminalAssistantEchoItemId === void 0 && this.activeItemIds.size === 0;
+		if (phase !== "commentary" && candidateWasSupersededBeforeRaw && itemId !== this.streamedPartialAssistantItemId && !isIdlessTerminalAssistantAfterCompletedWork) return;
 		if (phase) this.assistantPhaseByItem.set(itemId, phase);
 		this.rememberAssistantItem(itemId);
 		this.assistantTextByItem.set(itemId, text);
@@ -4445,6 +4519,23 @@ var CodexAppServerEventProjector = class {
 			itemId,
 			text
 		});
+		else this.markLatestTerminalAssistantCandidate(itemId, { canReleaseAfterToolHandoff: isIdlessTerminalAssistantAfterCompletedWork });
+	}
+	markLatestTerminalAssistantCandidate(itemId, options) {
+		this.latestTerminalAssistantCandidateItemId = itemId;
+		this.latestTerminalAssistantCandidateSuperseded = false;
+		this.latestTerminalAssistantCandidateCanReleaseAfterToolHandoff = options?.canReleaseAfterToolHandoff === true;
+		this.terminalAssistantCandidateEarlierActiveItemIds = new Set(this.activeItemIds);
+	}
+	markTerminalAssistantCandidateSupersededBy(itemId, options) {
+		if (!this.latestTerminalAssistantCandidateItemId) return;
+		if (itemId && this.terminalAssistantCandidateEarlierActiveItemIds.has(itemId)) {
+			if (!options?.preserveEarlierActiveItem) this.terminalAssistantCandidateEarlierActiveItemIds.delete(itemId);
+			return;
+		}
+		this.latestTerminalAssistantCandidateSuperseded = true;
+		this.latestTerminalAssistantCandidateCanReleaseAfterToolHandoff = false;
+		this.terminalAssistantCandidateEarlierActiveItemIds.clear();
 	}
 	recordNativeGeneratedMedia(item) {
 		if (item?.type !== "imageGeneration") return;
@@ -7614,6 +7705,10 @@ function readRequestId(record) {
 const CODEX_NATIVE_HOOK_RELAY_RENEW_INTERVAL_MS = 6e4;
 const CODEX_APP_SERVER_PROJECTED_CHARS_PER_TOKEN = 4;
 const CODEX_APP_SERVER_ACTIVE_NATIVE_TURN_WAIT_TIMEOUT_MS = 3e4;
+function shouldKeepCodexSharedAbortOpen(params) {
+	if (params.explicitCancellationObserved || params.result.aborted || params.result.externalAbort) return false;
+	return params.trigger === "memory" || !params.attemptSucceeded;
+}
 const ensuredCodexWorkspaceDirs = /* @__PURE__ */ new Set();
 function withCodexAppServerFastModeServiceTier(appServer, params) {
 	const fastMode = typeof params.fastMode === "function" ? params.fastMode() : params.fastMode;
@@ -7831,8 +7926,28 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	});
 	preDynamicStartupStages.mark("native-hook-relay");
 	const runAbortController = new AbortController();
+	let explicitCancellationObserved = false;
+	let explicitCancellationReason;
+	let terminalOutcomeFrozen = false;
+	let sharedAbortAllowedAfterTerminalOutcome = false;
+	let attemptAbortNotified = false;
+	const notifyAttemptAbort = () => {
+		if (attemptAbortNotified) return;
+		attemptAbortNotified = true;
+		params.onAttemptAbort?.();
+	};
+	const abortExplicitly = (reason) => {
+		if (terminalOutcomeFrozen) {
+			if (sharedAbortAllowedAfterTerminalOutcome) notifyAttemptAbort();
+			return;
+		}
+		notifyAttemptAbort();
+		explicitCancellationObserved = true;
+		explicitCancellationReason ??= reason;
+		runAbortController.abort(reason);
+	};
 	const abortFromUpstream = () => {
-		runAbortController.abort(params.abortSignal?.reason ?? "upstream_abort");
+		abortExplicitly(params.abortSignal?.reason ?? "upstream_abort");
 	};
 	if (params.abortSignal?.aborted) abortFromUpstream();
 	else params.abortSignal?.addEventListener("abort", abortFromUpstream, { once: true });
@@ -8625,6 +8740,10 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	const pendingOpenClawDynamicToolCompletionIds = /* @__PURE__ */ new Set();
 	const activeTurnItemIds = /* @__PURE__ */ new Set();
 	const activeCompletionBlockerItemIds = /* @__PURE__ */ new Set();
+	const activeFinalizationHookRunIds = /* @__PURE__ */ new Set();
+	const finalizationHookBatchStatuses = /* @__PURE__ */ new Map();
+	let unsettledFinalizationHookCount = 0;
+	let rejectedFinalizationHookAssistant;
 	let turnCrossedToolHandoff = false;
 	let pendingTerminalDynamicToolRelease;
 	let terminalDynamicToolReleaseCheckScheduled = false;
@@ -8656,6 +8775,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		getActiveAppServerTurnRequests: () => activeAppServerTurnRequests,
 		getActiveTurnItemCount: () => activeTurnItemIds.size,
 		getActiveCompletionBlockerItemCount: () => activeCompletionBlockerItemIds.size,
+		getActiveFinalizationHookCount: () => unsettledFinalizationHookCount,
+		canReleaseAssistantCompletionIdle: () => projectorRef.current?.hasLatestTerminalAssistantCandidateText() === true,
 		turnCompletionIdleTimeoutMs,
 		turnAssistantCompletionIdleTimeoutMs,
 		turnAttemptIdleTimeoutMs,
@@ -8876,10 +8997,23 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			onReportExecutionNotification: reportExecutionNotification
 		});
 		turnCrossedToolHandoff = notificationState.turnCrossedToolHandoff;
+		const finalizationHookNotification = readCodexFinalizationHookNotification(notification, thread.threadId, turnId);
+		if (finalizationHookNotification?.phase === "started") {
+			if (activeFinalizationHookRunIds.size === 0) finalizationHookBatchStatuses.clear();
+			activeFinalizationHookRunIds.add(finalizationHookNotification.runId);
+			turnWatches.disarmAssistantCompletionIdleWatch();
+		}
 		if (notificationState.isTurnTerminal) terminalTurnNotificationQueued = true;
 		try {
 			await waitForCodexNotificationDispatchTurn();
 			await projector.handleNotification(notification);
+			const projectedAssistantCompletionCanRelease = isAssistantCompletionReleaseNotification(notification, turnCrossedToolHandoff) || notificationState.isCurrentTurnNotification && turnCrossedToolHandoff && notification.method === "rawResponseItem/completed" && projector.canReleaseLatestTerminalAssistantAfterToolHandoff();
+			if (notificationState.isCurrentTurnNotification && projectedAssistantCompletionCanRelease) {
+				const completedAssistantItemId = projector.getLatestTerminalAssistantCandidate()?.itemId;
+				if (rejectedFinalizationHookAssistant !== void 0 && completedAssistantItemId !== void 0 && completedAssistantItemId !== rejectedFinalizationHookAssistant.itemId) rejectedFinalizationHookAssistant = void 0;
+				else if (rejectedFinalizationHookAssistant !== void 0) turnWatches.disarmAssistantCompletionIdleWatch();
+				else if (activeFinalizationHookRunIds.size === 0 && !terminalTurnNotificationQueued && activeAppServerTurnRequests === 0 && activeTurnItemIds.size === 0 && activeCompletionBlockerItemIds.size === 0 && pendingOpenClawDynamicToolCompletionIds.size === 0 && projector.hasLatestTerminalAssistantCandidateText()) turnWatches.armAssistantCompletionIdleWatch(describeNotificationActivity(notification));
+			}
 			if (notificationState.isCurrentTurnNotification && activeTurnItemIds.size === 0 && isRawFunctionToolOutputCompletionNotification(notification)) await maybeAnnounceFastModeAutoOff();
 		} catch (error) {
 			embeddedAgentLog.debug("codex app-server projector notification threw", {
@@ -8887,6 +9021,24 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				error
 			});
 		} finally {
+			if (finalizationHookNotification?.phase === "completed") {
+				unsettledFinalizationHookCount = Math.max(0, unsettledFinalizationHookCount - 1);
+				activeFinalizationHookRunIds.delete(finalizationHookNotification.runId);
+				finalizationHookBatchStatuses.set(finalizationHookNotification.runId, finalizationHookNotification.status);
+				if (activeFinalizationHookRunIds.size === 0) {
+					const statuses = new Set(finalizationHookBatchStatuses.values());
+					if (statuses.has("blocked") && !statuses.has("stopped")) {
+						const itemId = projector.getLatestTerminalAssistantCandidate()?.itemId;
+						rejectedFinalizationHookAssistant = itemId ? { itemId } : {};
+						turnWatches.disarmAssistantCompletionIdleWatch();
+					} else rejectedFinalizationHookAssistant = void 0;
+				}
+				if (activeFinalizationHookRunIds.size === 0 && rejectedFinalizationHookAssistant === void 0 && !terminalTurnNotificationQueued && activeAppServerTurnRequests === 0 && activeTurnItemIds.size === 0 && activeCompletionBlockerItemIds.size === 0 && pendingOpenClawDynamicToolCompletionIds.size === 0 && projector.hasLatestTerminalAssistantCandidateText()) turnWatches.armAssistantCompletionIdleWatch({
+					lastNotificationMethod: notification.method,
+					hookRunId: finalizationHookNotification.runId,
+					hookStatus: finalizationHookNotification.status
+				});
+			}
 			if (notificationState.isTurnTerminal) {
 				if (notificationState.isTurnAbortMarker) projector.markAborted();
 				if (!timedOut && !runAbortController.signal.aborted) await steeringQueue?.flushPending();
@@ -8954,14 +9106,27 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			const nativeItem = readCodexNotificationItem(notification.params);
 			if (nativeItem?.type === "webSearch") projector.recordNativeToolOutcome(nativeItem);
 		}
-		if (notificationMatchesActiveTurn) turnWatches.noteNotificationReceived(notification.method, isNativeResponseStreamDelta ? {
-			attemptProgress: true,
-			...turnCrossedToolHandoff ? { attemptTimeoutMs: postToolRawAssistantCompletionIdleTimeoutMs } : {},
-			details: { lastNotificationMethod: notification.method }
-		} : void 0);
+		if (notificationMatchesActiveTurn) {
+			if (readCodexFinalizationHookNotification(notification, thread.threadId, turnId)?.phase === "started") {
+				unsettledFinalizationHookCount += 1;
+				turnWatches.disarmAssistantCompletionIdleWatch();
+			}
+			turnWatches.noteNotificationReceived(notification.method, isNativeResponseStreamDelta ? {
+				attemptProgress: true,
+				...turnCrossedToolHandoff ? { attemptTimeoutMs: postToolRawAssistantCompletionIdleTimeoutMs } : {},
+				details: { lastNotificationMethod: notification.method }
+			} : void 0);
+		}
 		notificationQueue = notificationQueue.then(() => handleNotification(notification), () => handleNotification(notification));
 		return notificationQueue;
 	};
+	const drainNotificationQueue = async () => {
+		while (true) {
+			const queued = notificationQueue;
+			await queued;
+			if (queued === notificationQueue) return;
+		}
+	};
 	const nativeSubagentCodexHome = appServer.start.transport === "stdio" ? appServer.start.env?.CODEX_HOME ?? resolveCodexAppServerHomeDir(agentDir) : void 0;
 	registerCodexNativeSubagentMonitor({
 		client,
@@ -9579,15 +9744,23 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	steeringQueueRef.current = activeSteeringQueue;
 	const handle = {
 		kind: "embedded",
+		runId: params.runId,
 		queueMessage: async (text, optionsLocal) => activeSteeringQueue.queue(text, optionsLocal),
 		isStreaming: () => !completed && !runAbortController.signal.aborted,
 		isStopped: () => completed || timedOut || runAbortController.signal.aborted,
+		isAbortable: () => !terminalOutcomeFrozen || sharedAbortAllowedAfterTerminalOutcome,
 		isCompacting: () => projectorRef.current?.isCompacting() ?? false,
 		sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,
-		cancel: () => runAbortController.abort("cancelled"),
-		abort: () => runAbortController.abort("aborted")
+		cancel: () => abortExplicitly("cancelled"),
+		abort: () => abortExplicitly("aborted")
 	};
+	params.replyOperation?.attachBackend(handle);
 	setActiveEmbeddedRun(params.sessionId, handle, params.sessionKey, params.sessionFile);
+	const freezeRunTerminalOutcome = () => {
+		if (terminalOutcomeFrozen) return;
+		terminalOutcomeFrozen = true;
+		params.abortSignal?.removeEventListener("abort", abortFromUpstream);
+	};
 	const notifyUserMessagePersisted = createCodexAppServerUserMessagePersistenceNotifier(params);
 	mirrorPromptAtTurnStartBestEffort({
 		params,
@@ -9622,12 +9795,32 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	if (runAbortController.signal.aborted) abortListener();
 	try {
 		await completion;
-		await notificationQueue;
+		await drainNotificationQueue();
+		const hasQuiescentCompletedAssistant = activeProjector.hasCompletedTerminalAssistantText() && activeAppServerTurnRequests === 0 && activeTurnItemIds.size === 0 && activeCompletionBlockerItemIds.size === 0 && pendingOpenClawDynamicToolCompletionIds.size === 0 && activeFinalizationHookRunIds.size === 0 && unsettledFinalizationHookCount === 0 && rejectedFinalizationHookAssistant === void 0;
+		const hasRecoverableCompletedAssistant = !turnWatches.isCompletionIdleWatchPinnedByTerminalError() && turnWatches.isAssistantCompletionIdleWatchArmed() && hasQuiescentCompletedAssistant;
+		const recoveredTurnWatchTimeout = turnCompletionIdleTimedOut && !explicitCancellationObserved && !terminalTurnNotificationQueued && hasRecoverableCompletedAssistant && activeProjector.recoverCompletedTerminalAssistantAfterTurnWatchTimeout();
+		if (recoveredTurnWatchTimeout) {
+			embeddedAgentLog.warn("codex app-server recovered completed assistant output after missing turn completion", {
+				threadId: thread.threadId,
+				turnId: activeTurnId,
+				timeoutKind: turnWatchTimeoutKind,
+				idleMs: turnWatchTimeoutIdleMs,
+				timeoutMs: turnWatchTimeoutMs
+			});
+			trajectoryRecorder?.recordEvent("turn.watch_timeout_recovered", {
+				threadId: thread.threadId,
+				turnId: activeTurnId,
+				timeoutKind: turnWatchTimeoutKind,
+				idleMs: turnWatchTimeoutIdleMs,
+				timeoutMs: turnWatchTimeoutMs
+			});
+		}
 		const result = activeProjector.buildResult(toolBridge.telemetry, { yieldDetected });
-		const finalAborted = result.aborted || runAbortController.signal.aborted && !clientClosedAbort;
-		const canUseCompletedAssistantTextAfterClientClose = activeProjector.hasCompletedTerminalAssistantText() && activeAppServerTurnRequests === 0 && activeTurnItemIds.size === 0 && pendingOpenClawDynamicToolCompletionIds.size === 0;
-		const clientClosedPromptErrorForFinal = clientClosedPromptError && canUseCompletedAssistantTextAfterClientClose ? void 0 : clientClosedPromptError;
-		let finalPromptError = clientClosedPromptErrorForFinal ?? (turnCompletionIdleTimedOut ? turnCompletionIdleTimeoutMessage : timedOut ? "codex app-server attempt timed out" : result.promptError);
+		const effectiveTimedOut = timedOut && !recoveredTurnWatchTimeout;
+		const effectiveTurnCompletionIdleTimedOut = turnCompletionIdleTimedOut && !recoveredTurnWatchTimeout;
+		const isFinalAborted = () => result.aborted || explicitCancellationObserved || runAbortController.signal.aborted && !clientClosedAbort && !recoveredTurnWatchTimeout;
+		const clientClosedPromptErrorForFinal = clientClosedPromptError && hasRecoverableCompletedAssistant ? void 0 : clientClosedPromptError;
+		let finalPromptError = clientClosedPromptErrorForFinal ?? (effectiveTurnCompletionIdleTimedOut ? turnCompletionIdleTimeoutMessage : effectiveTimedOut ? "codex app-server attempt timed out" : result.promptError);
 		const finalPromptErrorMessage = typeof finalPromptError === "string" ? finalPromptError : finalPromptError ? formatErrorMessage(finalPromptError) : void 0;
 		if (isInvalidCodexImagePayloadError(finalPromptErrorMessage)) await clearCodexBindingAfterInvalidImagePayload(activeSessionFile, {
 			phase: "turn_completed",
@@ -9656,12 +9849,12 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			signal: runAbortController.signal
 		});
 		if (refreshedUsageLimitPromptError) finalPromptError = refreshedUsageLimitPromptError;
-		const finalPromptErrorSource = timedOut || clientClosedPromptErrorForFinal ? "prompt" : result.promptErrorSource;
-		const codexAppServerFailureKind = clientClosedPromptErrorForFinal ? "client_closed_before_turn_completed" : turnCompletionIdleTimedOut ? "turn_completion_idle_timeout" : void 0;
+		const finalPromptErrorSource = effectiveTimedOut || clientClosedPromptErrorForFinal ? "prompt" : result.promptErrorSource;
+		const codexAppServerFailureKind = clientClosedPromptErrorForFinal ? "client_closed_before_turn_completed" : effectiveTurnCompletionIdleTimedOut ? "turn_completion_idle_timeout" : void 0;
 		const codexAppServerReplayBlockedReason = codexAppServerFailureKind ? resolveCodexAppServerReplayBlockedReason(result) : void 0;
 		const promptTimeoutOutcome = buildCodexAppServerPromptTimeoutOutcome({
 			result,
-			turnCompletionIdleTimedOut,
+			turnCompletionIdleTimedOut: effectiveTurnCompletionIdleTimedOut,
 			turnWatchTimeoutKind
 		});
 		const codexAppServerFailureDiagnostics = codexAppServerFailureKind === "turn_completion_idle_timeout" && turnWatchTimeoutKind === "completion" ? buildCodexAppServerTimeoutDiagnostics({
@@ -9670,35 +9863,39 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			lastActivityReason: turnWatchTimeoutLastActivityReason,
 			details: turnWatchTimeoutDetails
 		}) : void 0;
+		const codexAppServerFailure = codexAppServerFailureKind ? {
+			kind: codexAppServerFailureKind,
+			...codexAppServerFailureKind === "turn_completion_idle_timeout" && turnWatchTimeoutKind ? { turnWatchTimeoutKind } : {},
+			transport: appServer.start.transport,
+			threadId: thread.threadId,
+			turnId: activeTurnId,
+			replaySafe: codexAppServerReplayBlockedReason === void 0,
+			...codexAppServerReplayBlockedReason ? { replayBlockedReason: codexAppServerReplayBlockedReason } : {},
+			...codexAppServerFailureDiagnostics ? { diagnostics: codexAppServerFailureDiagnostics } : {}
+		} : void 0;
+		const finalAborted = isFinalAborted();
+		const completedTurnStatus = activeProjector.getCompletedTurnStatus();
+		const completedWithoutTerminalNotification = completed && !terminalTurnNotificationQueued && !timedOut && clientClosedPromptErrorForFinal === void 0;
+		const attemptSucceeded = !finalAborted && !effectiveTimedOut && (finalPromptError === null || finalPromptError === void 0) && result.agentHarnessResultClassification === void 0 && (completedTurnStatus === "completed" || recoveredTurnWatchTimeout || completedWithoutTerminalNotification);
+		sharedAbortAllowedAfterTerminalOutcome = shouldKeepCodexSharedAbortOpen({
+			trigger: params.trigger,
+			result,
+			attemptSucceeded,
+			explicitCancellationObserved
+		});
+		freezeRunTerminalOutcome();
 		const modelCallFailureKind = classifyCodexModelCallFailureKind({
 			error: finalPromptError,
-			timedOut,
-			turnCompletionIdleTimedOut,
-			runAborted: runAbortController.signal.aborted,
-			abortReason: runAbortController.signal.reason,
+			timedOut: effectiveTimedOut,
+			turnCompletionIdleTimedOut: effectiveTurnCompletionIdleTimedOut,
+			runAborted: finalAborted,
+			abortReason: explicitCancellationReason ?? runAbortController.signal.reason,
 			clientClosedAbort,
 			formatError: formatErrorMessage
 		}) ?? (finalAborted ? "aborted" : void 0);
 		if (modelCallFailureKind) codexModelCallDiagnostics.emitError(finalPromptError ?? "codex app-server attempt interrupted", { failureKind: modelCallFailureKind });
 		else if (finalPromptError) codexModelCallDiagnostics.emitError(finalPromptError);
 		else codexModelCallDiagnostics.emitCompleted(result);
-		recordCodexTrajectoryCompletion(trajectoryRecorder, {
-			attempt: params,
-			result,
-			threadId: thread.threadId,
-			turnId: activeTurnId,
-			timedOut,
-			yieldDetected
-		});
-		trajectoryRecorder?.recordEvent("session.ended", {
-			status: finalPromptError ? "error" : finalAborted || timedOut ? "interrupted" : "success",
-			threadId: thread.threadId,
-			turnId: activeTurnId,
-			timedOut,
-			yieldDetected,
-			promptError: normalizeCodexTrajectoryError(finalPromptError)
-		});
-		markTrajectoryEndRecorded();
 		await mirrorTranscriptBestEffort({
 			params,
 			agentId: sessionAgentId,
@@ -9709,19 +9906,6 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			threadId: thread.threadId,
 			turnId: activeTurnId
 		});
-		const terminalAssistantText = collectTerminalAssistantText(result);
-		if (terminalAssistantText && (!assistantStreamEventEmitted || assistantStreamNeedsTerminalSnapshot) && !finalAborted && !finalPromptError) emitCodexAppServerEvent(params, {
-			stream: "assistant",
-			data: { text: terminalAssistantText }
-		});
-		if (finalPromptError) emitLifecycleTerminal({
-			phase: "error",
-			error: formatErrorMessage(finalPromptError)
-		});
-		else emitLifecycleTerminal({
-			phase: "end",
-			...finalAborted ? { aborted: true } : {}
-		});
 		if (activeContextEngine) {
 			const activeContextEnginePluginIdLocal = resolveContextEngineOwnerPluginId(activeContextEngine);
 			const isHeartbeatLifecycleRun = params.bootstrapContextRunKind === "heartbeat" || params.bootstrapContextRunKind === "commitment-only";
@@ -9786,30 +9970,64 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			ctx: hookContext,
 			hookRunner
 		});
-		shouldDelayNativeHookRelayUnregister = activeProjector.getCompletedTurnStatus() === "completed" && !timedOut && !runAbortController.signal.aborted && !finalAborted && !finalPromptError;
-		if (shouldDelayNativeHookRelayUnregister) await markCodexAppServerBindingCoveredThroughTurn({
-			sessionFile: params.sessionFile,
+		shouldDelayNativeHookRelayUnregister = completedTurnStatus === "completed" && !effectiveTimedOut && !runAbortController.signal.aborted && !finalAborted && !finalPromptError;
+		if (shouldDelayNativeHookRelayUnregister) try {
+			await markCodexAppServerBindingCoveredThroughTurn({
+				sessionFile: params.sessionFile,
+				threadId: thread.threadId,
+				authProfileStore: params.authProfileStore,
+				agentDir: params.agentDir,
+				config: params.config
+			});
+		} catch (error) {
+			if (!await clearCodexAppServerBindingForThread(params.sessionFile, thread.threadId, {
+				authProfileStore: params.authProfileStore,
+				agentDir: params.agentDir,
+				config: params.config
+			})) throw error;
+			embeddedAgentLog.warn("codex app-server binding coverage update failed after completed turn; cleared stale binding", {
+				threadId: thread.threadId,
+				turnId: activeTurnId,
+				error
+			});
+		}
+		recordCodexTrajectoryCompletion(trajectoryRecorder, {
+			attempt: params,
+			result,
 			threadId: thread.threadId,
-			authProfileStore: params.authProfileStore,
-			agentDir: params.agentDir,
-			config: params.config
+			turnId: activeTurnId,
+			timedOut: effectiveTimedOut,
+			yieldDetected
+		});
+		trajectoryRecorder?.recordEvent("session.ended", {
+			status: finalPromptError ? "error" : finalAborted || effectiveTimedOut ? "interrupted" : "success",
+			threadId: thread.threadId,
+			turnId: activeTurnId,
+			timedOut: effectiveTimedOut,
+			yieldDetected,
+			promptError: normalizeCodexTrajectoryError(finalPromptError)
+		});
+		markTrajectoryEndRecorded();
+		const terminalAssistantText = collectTerminalAssistantText(result);
+		if (terminalAssistantText && (!assistantStreamEventEmitted || assistantStreamNeedsTerminalSnapshot) && !finalAborted && !finalPromptError) emitCodexAppServerEvent(params, {
+			stream: "assistant",
+			data: { text: terminalAssistantText }
+		});
+		if (finalPromptError) emitLifecycleTerminal({
+			phase: "error",
+			error: formatErrorMessage(finalPromptError)
+		});
+		else emitLifecycleTerminal({
+			phase: "end",
+			...finalAborted ? { aborted: true } : {}
 		});
 		return {
 			...result,
-			timedOut,
+			timedOut: effectiveTimedOut,
 			aborted: finalAborted,
 			promptError: finalPromptError,
 			promptErrorSource: finalPromptErrorSource,
-			...codexAppServerFailureKind ? { codexAppServerFailure: {
-				kind: codexAppServerFailureKind,
-				...codexAppServerFailureKind === "turn_completion_idle_timeout" && turnWatchTimeoutKind ? { turnWatchTimeoutKind } : {},
-				transport: appServer.start.transport,
-				threadId: thread.threadId,
-				turnId: activeTurnId,
-				replaySafe: codexAppServerReplayBlockedReason === void 0,
-				...codexAppServerReplayBlockedReason ? { replayBlockedReason: codexAppServerReplayBlockedReason } : {},
-				...codexAppServerFailureDiagnostics ? { diagnostics: codexAppServerFailureDiagnostics } : {}
-			} } : {},
+			...codexAppServerFailure ? { codexAppServerFailure } : {},
 			...promptTimeoutOutcome ? { promptTimeoutOutcome } : {},
 			systemPromptReport
 		};
@@ -9854,8 +10072,9 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		else nativeHookRelay.unregister();
 		await releaseSandboxExecEnvironment();
 		runAbortController.signal.removeEventListener("abort", abortListener);
-		params.abortSignal?.removeEventListener("abort", abortFromUpstream);
 		steeringQueueRef.current?.cancel();
+		freezeRunTerminalOutcome();
+		params.replyOperation?.detachBackend(handle);
 		clearActiveEmbeddedRun(params.sessionId, handle, params.sessionKey, params.sessionFile);
 	}
 }
@@ -9919,6 +10138,21 @@ function isCodexThreadTurnCompletedNotification(notification, threadId, turnIds)
 	const turnId = correlation.turnId ?? correlation.nestedTurnId;
 	return !turnIds || turnId !== void 0 && turnIds.has(turnId);
 }
+function readCodexFinalizationHookNotification(notification, threadId, turnId) {
+	if (notification.method !== "hook/started" && notification.method !== "hook/completed") return;
+	const params = isJsonObject(notification.params) ? notification.params : void 0;
+	const run = params && isJsonObject(params.run) ? params.run : void 0;
+	if (params?.threadId !== threadId || params.turnId !== turnId || run?.eventName !== "stop" && run?.eventName !== "subagentStop" || typeof run.id !== "string" || !run.id) return;
+	if (notification.method === "hook/started") return {
+		phase: "started",
+		runId: run.id
+	};
+	return {
+		phase: "completed",
+		runId: run.id,
+		status: typeof run.status === "string" ? run.status : void 0
+	};
+}
 function joinPresentSections(...sections) {
 	return sections.filter((section) => Boolean(section?.trim())).join("\n\n");
 }

package/dist/{side-question-DDVgFmpv.js → side-question-Ca9wqmd0.js}

@@ -1,14 +1,14 @@
 import { n as isJsonObject } from "./protocol-dh-ETiNd.js";
-import { H as readCodexNotificationThreadId, P as mergeCodexThreadConfigs, S as filterCodexDynamicTools, T as resolveCodexDynamicToolsLoading, U as readCodexNotificationTurnId, _ as resolveCodexWebSearchPlan, d as resolveCodexAppServerRequestModelSelection, j as buildCodexPluginAppsConfigPatchFromPolicyContext, m as resolveReasoningEffort, p as resolveCodexBindingModelProviderFallback, r as buildCodexRuntimeThreadConfig, t as CODEX_NATIVE_PERSONALITY_NONE, u as resolveCodexAppServerModelProvider } from "./thread-lifecycle-DeSMZSXr.js";
+import { H as readCodexNotificationThreadId, P as mergeCodexThreadConfigs, S as filterCodexDynamicTools, T as resolveCodexDynamicToolsLoading, U as readCodexNotificationTurnId, _ as resolveCodexWebSearchPlan, d as resolveCodexAppServerRequestModelSelection, j as buildCodexPluginAppsConfigPatchFromPolicyContext, m as resolveReasoningEffort, p as resolveCodexBindingModelProviderFallback, r as buildCodexRuntimeThreadConfig, t as CODEX_NATIVE_PERSONALITY_NONE, u as resolveCodexAppServerModelProvider } from "./thread-lifecycle-D6R40plk.js";
 import { d as resolveCodexAppServerRuntimeOptions, g as shouldAutoApproveCodexAppServerApprovals, h as resolveOpenClawExecPolicyForCodexAppServer, n as canUseCodexModelBackedApprovalsReviewerForModel, p as resolveCodexModelBackedReviewerPolicyContext, u as readCodexPluginConfig } from "./config-C_whBx3M.js";
-import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse, t as assertCodexThreadForkResponse } from "./protocol-validators-CB4mtyrs.js";
-import { a as readCodexSupportedReasoningEfforts, s as formatCodexUsageLimitErrorMessage } from "./provider-DosqwRb6.js";
+import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse, t as assertCodexThreadForkResponse } from "./protocol-validators-CJiWigAJ.js";
+import { a as readCodexSupportedReasoningEfforts, s as formatCodexUsageLimitErrorMessage } from "./provider-nmtMDcGH.js";
 import { i as isCodexAppServerApprovalRequest } from "./client-IcTBKEqA.js";
 import { i as isCodexAppServerNativeAuthProfile, o as readCodexAppServerBinding } from "./session-binding-Cm0Gg7Z1.js";
-import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-xi0ZmBGO.js";
+import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-B7hqD3Xj.js";
 import { a as getLeasedSharedCodexAppServerClient, o as releaseLeasedSharedCodexAppServerClient, u as refreshCodexAppServerAuthTokens } from "./shared-client-rR6TDJA3.js";
 import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-pTY2COoC.js";
-import { C as resolveCodexMessageToolProvider, O as filterToolsForVisionInputs, T as shouldEnableCodexAppServerNativeToolSurface, a as buildCodexNativeHookRelayConfig, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, h as emitDynamicToolTerminalDiagnostic, k as handleCodexAppServerApprovalRequest, m as emitDynamicToolStartedDiagnostic, n as resolveCodexProviderWebSearchSupportForClient, o as buildCodexNativeHookRelayDisabledConfig, p as emitDynamicToolErrorDiagnostic, r as CODEX_NATIVE_HOOK_RELAY_EVENTS } from "./provider-capabilities-CE5k8cmO.js";
+import { C as resolveCodexMessageToolProvider, O as filterToolsForVisionInputs, T as shouldEnableCodexAppServerNativeToolSurface, a as buildCodexNativeHookRelayConfig, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, h as emitDynamicToolTerminalDiagnostic, k as handleCodexAppServerApprovalRequest, m as emitDynamicToolStartedDiagnostic, n as resolveCodexProviderWebSearchSupportForClient, o as buildCodexNativeHookRelayDisabledConfig, p as emitDynamicToolErrorDiagnostic, r as CODEX_NATIVE_HOOK_RELAY_EVENTS } from "./provider-capabilities-wqedK49Z.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-C7qmZ0Jh.js";
 import { loadExecApprovals } from "openclaw/plugin-sdk/exec-approvals-runtime";
 import { buildAgentHookContextChannelFields, embeddedAgentLog, formatErrorMessage, registerNativeHookRelay, resolveAgentDir, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";

package/dist/{thread-lifecycle-DeSMZSXr.js → thread-lifecycle-D6R40plk.js}

@@ -1,8 +1,8 @@
 import { n as isJsonObject, t as flattenCodexDynamicToolFunctions } from "./protocol-dh-ETiNd.js";
 import { i as codexSandboxPolicyForTurn, m as resolveCodexPluginsPolicy, t as CODEX_PLUGINS_MARKETPLACE_NAME } from "./config-C_whBx3M.js";
-import { n as assertCodexThreadResumeResponse, r as assertCodexThreadStartResponse } from "./protocol-validators-CB4mtyrs.js";
+import { n as assertCodexThreadResumeResponse, r as assertCodexThreadStartResponse } from "./protocol-validators-CJiWigAJ.js";
 import { CODEX_GPT5_HEARTBEAT_PROMPT_OVERLAY } from "./prompt-overlay.js";
-import { a as readCodexSupportedReasoningEfforts, i as isModernCodexModel, o as resolveCodexSupportedReasoningEffort, r as isMaxReasoningCodexModel } from "./provider-DosqwRb6.js";
+import { a as readCodexSupportedReasoningEfforts, i as isModernCodexModel, o as resolveCodexSupportedReasoningEffort, r as isMaxReasoningCodexModel } from "./provider-nmtMDcGH.js";
 import { a as isCodexAppServerConnectionClosedError, n as CodexAppServerRpcError } from "./client-IcTBKEqA.js";
 import { i as isCodexAppServerNativeAuthProfile, l as writeCodexAppServerBinding, n as clearCodexAppServerBinding, o as readCodexAppServerBinding } from "./session-binding-Cm0Gg7Z1.js";
 import "node:fs/promises";

package/dist/{web-search-provider.runtime-Q89rQhsL.js → web-search-provider.runtime-B6eZEFmd.js}

@@ -1,6 +1,6 @@
 import { n as isJsonObject } from "./protocol-dh-ETiNd.js";
-import { g as buildCodexNativeWebSearchThreadConfig } from "./thread-lifecycle-DeSMZSXr.js";
-import { n as runBoundedCodexAppServerTurn } from "./media-understanding-provider-C5yYzx_6.js";
+import { g as buildCodexNativeWebSearchThreadConfig } from "./thread-lifecycle-D6R40plk.js";
+import { n as runBoundedCodexAppServerTurn } from "./media-understanding-provider-BOeoBhEw.js";
 import { readStringParam, resolveSearchTimeoutSeconds, wrapWebContent } from "openclaw/plugin-sdk/provider-web-search";
 //#region extensions/codex/src/web-search-provider.runtime.ts
 async function executeCodexWebSearchProviderTool(ctx, args, executionContext, options) {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@openclaw/codex",
-  "version": "2026.7.1-beta.1",
+  "version": "2026.7.1-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/codex",
-      "version": "2026.7.1-beta.1",
+      "version": "2026.7.1-beta.2",
       "dependencies": {
         "@openai/codex": "0.142.4",
         "typebox": "1.1.39",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/codex",
-  "version": "2026.7.1-beta.1",
+  "version": "2026.7.1-beta.2",
   "description": "OpenClaw Codex app-server harness and model provider plugin with a Codex-managed GPT catalog.",
   "repository": {
     "type": "git",
@@ -34,10 +34,10 @@
       ]
     },
     "compat": {
-      "pluginApi": ">=2026.7.1-beta.1"
+      "pluginApi": ">=2026.7.1-beta.2"
     },
     "build": {
-      "openclawVersion": "2026.7.1-beta.1"
+      "openclawVersion": "2026.7.1-beta.2"
     },
     "release": {
       "publishToClawHub": true,
@@ -55,7 +55,7 @@
     "README.md"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.7.1-beta.1"
+    "openclaw": ">=2026.7.1-beta.2"
   },
   "peerDependenciesMeta": {
     "openclaw": {