@openclaw/codex 2026.9.1 → 2026.9.2

package/dist/api.js

@@ -1,8 +1,8 @@
-import { a as resolveCodexAppServerStartOptionsForAgent, i as resolveCodexAppServerRuntimeOptions } from "./config-BhmfC1s6.js";
-import { n as resolveManagedCodexAppServerStartOptions, o as CODEX_APP_SERVER_VERSION, r as resolveManagedCodexNativeCommand, t as isManagedCodexDesktopCommand } from "./managed-binary-4-Vjz5GH.js";
+import { a as resolveCodexAppServerStartOptionsForAgent, i as resolveCodexAppServerRuntimeOptions } from "./config-CyapYSji.js";
+import { n as resolveManagedCodexAppServerStartOptions, o as CODEX_APP_SERVER_VERSION, r as resolveManagedCodexNativeCommand, t as isManagedCodexDesktopCommand } from "./managed-binary-DcpnJF9x.js";
+import { listAgentIds, resolveAgentDir } from "openclaw/plugin-sdk/agent-scope-runtime";
 import path from "node:path";
 import { resolveDefaultModelForAgent } from "openclaw/plugin-sdk/agent-runtime";
-import { listAgentIds as listAgentIds$1, resolveAgentDir as resolveAgentDir$1 } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { execFile } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { resolveEffectiveAgentRuntime } from "openclaw/plugin-sdk/command-auth-native";
@@ -67,7 +67,7 @@ function createCodexManagedAppServerHealthCheck(params) {
 			if (start.transport !== "stdio" || start.commandSource !== "managed") return [];
 			const env = ctx.env ?? process.env;
 			let resolved;
-			for (const agentId of listAgentIds$1(ctx.cfg)) {
+			for (const agentId of listAgentIds(ctx.cfg)) {
 				const model = resolveDefaultModelForAgent({
 					cfg: ctx.cfg,
 					agentId
@@ -80,7 +80,7 @@ function createCodexManagedAppServerHealthCheck(params) {
 				}) !== "codex") continue;
 				const agentStart = resolveAgentStartOptions({
 					startOptions: start,
-					agentDir: resolveAgentDir$1(ctx.cfg, agentId, env),
+					agentDir: resolveAgentDir(ctx.cfg, agentId, env),
 					env
 				});
 				try {
@@ -116,7 +116,7 @@ function createCodexManagedAppServerHealthCheck(params) {
 				})];
 			}
 			const detectedVersion = parseCodexVersion(`${output.stdout}\n${output.stderr}`);
-			if (detectedVersion !== "0.152.1") return [managedCodexFinding({
+			if (detectedVersion !== "0.153.4") return [managedCodexFinding({
 				message: detectedVersion ? `Managed Codex app-server version mismatch: expected ${CODEX_APP_SERVER_VERSION}, detected ${detectedVersion}.` : `Managed Codex app-server did not report a parseable version; expected ${CODEX_APP_SERVER_VERSION}.`,
 				path: nativeCommand,
 				requirement: `the exact OpenClaw-pinned Codex version ${CODEX_APP_SERVER_VERSION}`,

package/dist/{attempt-client-cleanup-DYHcRQAa.js → attempt-client-cleanup-Bp1ZOnk2.js}

@@ -1,10 +1,24 @@
-import { $t as isJsonObject, jt as unsubscribeCodexAppServerLiveThread, q as CodexAppServerRpcError, y as retireSharedCodexAppServerClientIfCurrent } from "./shared-client-DxcfF9KX.js";
+import { B as isJsonObject } from "./config-CyapYSji.js";
+import { Nt as unsubscribeCodexAppServerLiveThread, q as CodexAppServerRpcError, y as retireSharedCodexAppServerClientIfCurrent } from "./shared-client-CKhX2kFt.js";
 import { asFiniteNumber, normalizeOptionalString, normalizeOptionalString as normalizeOptionalString$1, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { redactSensitiveText } from "openclaw/plugin-sdk/logging-core";
 import { sanitizeTerminalText } from "openclaw/plugin-sdk/text-chunking";
 //#region extensions/codex/src/app-server/event-projector-values.ts
+const BIO_POLICY_SAFETY_ACCESS_BLOCK_PREFIX = "This content was flagged for possible biological risk.";
+/** Project only Codex's explicit refusal contracts; other policy errors retain their own paths. */
+function readCodexProviderRefusal(message, codexErrorInfo) {
+	if (!message) return;
+	if (codexErrorInfo === "cyberPolicy") return {
+		category: "cyber",
+		message
+	};
+	return message.startsWith(BIO_POLICY_SAFETY_ACCESS_BLOCK_PREFIX) ? {
+		category: "bio",
+		message
+	} : void 0;
+}
 function readNonEmptyString(record, key) {
 	return normalizeOptionalString$1(record[key]);
 }
@@ -334,28 +348,35 @@ var ClientTurnRouter = class {
 		const turnId = requireId(options.turnId, "turn id");
 		if (options.signal?.aborted) return {
 			completion: Promise.resolve(false),
+			state: "unconfirmed",
+			settledSignal: AbortSignal.abort(),
 			cancel: () => {}
 		};
-		if (this.routes.get(threadId)?.completedNativeTurnIds.delete(turnId)) return {
+		if (this.routes.get(threadId)?.completedNativeTurnIds.has(turnId)) return {
 			completion: Promise.resolve(true),
+			state: "confirmed",
+			settledSignal: AbortSignal.abort(),
 			cancel: () => {}
 		};
 		const { promise: completion, resolve: settle } = createDeferred();
+		const settlement = new AbortController();
 		const watchers = this.nativeTurnCompletionWatchers.get(threadId) ?? /* @__PURE__ */ new Set();
 		this.nativeTurnCompletionWatchers.set(threadId, watchers);
-		let settled = false;
+		let state = "pending";
 		const finish = (completed) => {
-			if (settled) return;
-			settled = true;
+			if (state !== "pending") return;
+			state = completed ? "confirmed" : "unconfirmed";
 			watchers.delete(watcher);
 			if (watchers.size === 0) this.nativeTurnCompletionWatchers.delete(threadId);
 			clearTimeout(timeout);
 			options.signal?.removeEventListener("abort", abort);
+			settlement.abort();
 			settle(completed);
 		};
 		const watcher = {
 			turnId,
-			finish
+			finish,
+			onStarted: options.onStarted
 		};
 		watchers.add(watcher);
 		const timeout = setTimeout(() => finish(false), Math.max(1, options.timeoutMs));
@@ -364,6 +385,10 @@ var ClientTurnRouter = class {
 		options.signal?.addEventListener("abort", abort, { once: true });
 		return {
 			completion,
+			settledSignal: settlement.signal,
+			get state() {
+				return state;
+			},
 			cancel: () => finish(false)
 		};
 	}
@@ -436,6 +461,7 @@ var ClientTurnRouter = class {
 		if (!watchers && !route) return;
 		if (scope.turnId && watchers) {
 			for (const watcher of watchers) if (watcher.turnId === scope.turnId && notification.method === "turn/completed") watcher.finish(true);
+			else if (watcher.turnId === scope.turnId && notification.method === "turn/started") watcher.onStarted?.();
 		}
 		if (!route) return;
 		const routeScope = {
@@ -443,12 +469,15 @@ var ClientTurnRouter = class {
 			...scope.turnId ? { turnId: scope.turnId } : {}
 		};
 		const receivedAtMs = Date.now();
-		if (route.gate !== "bound" && scope.turnId) {
-			if (notification.method === "turn/started") route.observedNativeTurn = {
-				id: scope.turnId,
-				completed: false
-			};
-			else if (notification.method === "turn/completed") {
+		if (scope.turnId && (route.gate !== "bound" || scope.turnId === route.turnId)) {
+			if (notification.method === "turn/started") {
+				route.completedNativeTurnIds.delete(scope.turnId);
+				route.observedNativeTurn = {
+					id: scope.turnId,
+					completed: false
+				};
+			} else if (notification.method === "turn/completed") {
+				if (route.gate === "bound") route.completedNativeTurnIds.clear();
 				route.completedNativeTurnIds.add(scope.turnId);
 				if (!route.observedNativeTurn || route.observedNativeTurn.completed || route.observedNativeTurn.id === scope.turnId) route.observedNativeTurn = {
 					id: scope.turnId,
@@ -626,8 +655,8 @@ const CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS = 5e3;
 const CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS = 5e3;
 const CODEX_NO_ACTIVE_TURN_ERROR_CODE = -32600;
 const CODEX_NO_ACTIVE_TURN_ERROR_MESSAGE = "no active turn to interrupt";
-/** Identifies Codex's exact proof that an interrupt target already finished. */
-function isCodexAlreadyTerminalInterruptError(error) {
+/** Codex also reports this before an accepted turn publishes its start event. */
+function isCodexNoActiveTurnInterruptError(error) {
 	return error instanceof CodexAppServerRpcError && error.code === CODEX_NO_ACTIVE_TURN_ERROR_CODE && error.message === CODEX_NO_ACTIVE_TURN_ERROR_MESSAGE;
 }
 /** Raised when a thread subscription may be live on a client OpenClaw no longer controls. */
@@ -644,18 +673,10 @@ function isCodexAppServerUnsafeSubscriptionError(error) {
 function assertCodexThreadResumeSubscription(requestedThreadId, returnedThreadId) {
 	if (returnedThreadId !== requestedThreadId) throw new CodexAppServerUnsafeSubscriptionError(`Codex thread/resume returned ${returnedThreadId} for ${requestedThreadId}`);
 }
-async function closeClientAndWaitIfAvailable(client) {
-	const closeable = client;
-	if (typeof closeable.closeAndWait === "function") {
-		await closeable.closeAndWait();
-		return;
-	}
-	closeable.close?.();
-}
 async function closeCodexStartupClientBestEffort(client) {
 	if (!client) return;
 	const retiredSharedClient = retireSharedCodexAppServerClientIfCurrent(client);
-	if (!retiredSharedClient || retiredSharedClient.closed) await closeClientAndWaitIfAvailable(client);
+	if (!retiredSharedClient || retiredSharedClient.closed) await client.closeAndWait();
 }
 /** Retires an unsafe turn client without replacing an already-authoritative failure. */
 async function retireUnsafeCodexTurnClientBestEffort(client, operation) {
@@ -683,21 +704,44 @@ async function interruptCodexTurnAndWaitBestEffort(client, params) {
 		threadId: params.threadId,
 		turnId: params.turnId
 	};
-	let completion;
+	let cancelWatch;
 	try {
-		completion = params.turnId ? getCodexAppServerTurnRouter(client).watchNativeTurnCompletion({
+		if (!params.turnId) {
+			await client.request("turn/interrupt", requestParams, { timeoutMs });
+			return true;
+		}
+		const deadline = Date.now() + timeoutMs;
+		const started = createDeferred();
+		const completion = getCodexAppServerTurnRouter(client).watchNativeTurnCompletion({
 			threadId: params.threadId,
 			turnId: params.turnId,
-			timeoutMs
-		}) : void 0;
-		await client.request("turn/interrupt", requestParams, { timeoutMs });
-		return completion ? await completion.completion : true;
+			timeoutMs,
+			onStarted: () => started.resolve(true)
+		});
+		cancelWatch = completion.cancel;
+		if (completion.state !== "pending") return await completion.completion;
+		const requestInterrupt = async () => {
+			try {
+				await client.request("turn/interrupt", requestParams, {
+					timeoutMs: Math.max(1, deadline - Date.now()),
+					signal: completion.settledSignal
+				});
+				return true;
+			} catch (error) {
+				if (completion.state === "confirmed") return true;
+				if (isCodexNoActiveTurnInterruptError(error)) return false;
+				throw error;
+			}
+		};
+		if (!await requestInterrupt()) {
+			if (await Promise.race([completion.completion.then(() => false), started.promise]) && completion.state === "pending" && Date.now() < deadline) await requestInterrupt();
+		}
+		return await completion.completion;
 	} catch (error) {
-		if (isCodexAlreadyTerminalInterruptError(error)) return true;
 		embeddedAgentLog.debug("codex app-server turn interrupt failed during abort", { error });
 		return false;
 	} finally {
-		completion?.cancel();
+		cancelWatch?.();
 	}
 }
 /** Stops native terminals on the cancelled thread without retiring peer threads. */
@@ -737,4 +781,4 @@ async function unsubscribeCodexThreadBestEffort(client, params) {
 	}
 }
 //#endregion
-export { shouldRecordNativeToolTranscript as A, readNonNegativeInteger as B, isSideEffectingNativeToolItem as C, itemTitle as D, itemStatus as E, readHookOutputEntries as F, splitPlanText as H, readItem as I, readItemString as L, extractRawAssistantText as M, normalizeOptionalString$1 as N, matchesCodexSnapshotTurn as O, readCodexErrorNotificationMessage as P, readNonEmptyString as R, isNonSuccessItemStatus as S, itemName as T, readNullableString as V, readCodexNotificationTurnId as _, closeCodexStartupClientBestEffort as a, auditNativeToolUnfinishedStatus as b, isCodexAppServerUnsafeSubscriptionError as c, unsubscribeCodexThreadBestEffort as d, CODEX_APP_SERVER_NATIVE_TURN_WAIT_TIMEOUT_MS as f, readCodexNotificationThreadId as g, isCodexNotificationForTurn as h, assertCodexThreadResumeSubscription as i, shouldSynthesizeToolProgressForItem as j, shouldClearTerminalPresentationForNativeItem as k, retireUnsafeCodexTurnClientBestEffort as l, CodexProjectionDiagnostics as m, CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS as n, interruptCodexTurnAndWaitBestEffort as o, getCodexAppServerTurnRouter as p, CodexAppServerUnsafeSubscriptionError as r, isCodexAlreadyTerminalInterruptError as s, CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS as t, terminateCodexBackgroundTerminals as u, auditNativeToolName as v, itemKind as w, isMutatingNativeToolItem as x, auditNativeToolTerminalStatus as y, readNonEmptyStringArray as z };
+export { shouldRecordNativeToolTranscript as A, readNonEmptyStringArray as B, isSideEffectingNativeToolItem as C, itemTitle as D, itemStatus as E, readCodexProviderRefusal as F, readNullableString as H, readHookOutputEntries as I, readItem as L, extractRawAssistantText as M, normalizeOptionalString$1 as N, matchesCodexSnapshotTurn as O, readCodexErrorNotificationMessage as P, readItemString as R, isNonSuccessItemStatus as S, itemName as T, splitPlanText as U, readNonNegativeInteger as V, readCodexNotificationTurnId as _, closeCodexStartupClientBestEffort as a, auditNativeToolUnfinishedStatus as b, isCodexNoActiveTurnInterruptError as c, unsubscribeCodexThreadBestEffort as d, CODEX_APP_SERVER_NATIVE_TURN_WAIT_TIMEOUT_MS as f, readCodexNotificationThreadId as g, isCodexNotificationForTurn as h, assertCodexThreadResumeSubscription as i, shouldSynthesizeToolProgressForItem as j, shouldClearTerminalPresentationForNativeItem as k, retireUnsafeCodexTurnClientBestEffort as l, CodexProjectionDiagnostics as m, CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS as n, interruptCodexTurnAndWaitBestEffort as o, getCodexAppServerTurnRouter as p, CodexAppServerUnsafeSubscriptionError as r, isCodexAppServerUnsafeSubscriptionError as s, CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS as t, terminateCodexBackgroundTerminals as u, auditNativeToolName as v, itemKind as w, isMutatingNativeToolItem as x, auditNativeToolTerminalStatus as y, readNonEmptyString as z };

package/dist/{attempt-context-DmQUNWwT.js → attempt-context-CSazkWns.js}

@@ -1,10 +1,10 @@
-import { $t as isJsonObject, Qt as flattenCodexDynamicToolFunctions } from "./shared-client-DxcfF9KX.js";
-import { ct as isMessageOnlyCodexSourceReply, et as areCodexDynamicToolFingerprintsCompatible, mt as isContextEngineBindingCompatible } from "./thread-lifecycle-DAcEJ_Om.js";
-import { n as readCodexMirroredSessionHistoryMessages } from "./session-history-C5J1AKzG.js";
+import { B as isJsonObject, z as flattenCodexDynamicToolFunctions } from "./config-CyapYSji.js";
+import { ct as isMessageOnlyCodexSourceReply, et as areCodexDynamicToolFingerprintsCompatible, mt as isContextEngineBindingCompatible } from "./thread-lifecycle-DPK30jad.js";
+import { t as readCodexMirroredSessionHistoryMessages } from "./session-history-DWmMqiqW.js";
 import { readNonBlankString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { createHash } from "node:crypto";
 import path from "node:path";
 import { buildBootstrapContextForFiles, buildWatchedSessionsHarnessContext, embeddedAgentLog, resolveBootstrapFilesForRun } from "openclaw/plugin-sdk/agent-harness-runtime";
-import { createHash } from "node:crypto";
 import { resolveAgentWorkspaceDir } from "openclaw/plugin-sdk/agent-runtime";
 import { resolveBootstrapFilesForPreparation } from "openclaw/plugin-sdk/codex-mcp-projection";
 import { prepareMemorySystemPromptAddition } from "openclaw/plugin-sdk/core";
@@ -32,8 +32,8 @@ const CODEX_BOOTSTRAP_CONTEXT_ORDER = /* @__PURE__ */ new Map([
 ]);
 /** Reads mirrored Codex session history for harness hooks. */
 async function readMirroredSessionHistoryMessages(params) {
-	const { admission, ...target } = params;
-	const messages = await readCodexMirroredSessionHistoryMessages(target, admission, "model-context");
+	const { admission, signal, ...target } = params;
+	const messages = await readCodexMirroredSessionHistoryMessages(target, admission, "model-context", signal);
 	if (!messages) embeddedAgentLog.warn("failed to read mirrored session history for codex harness hooks", { sessionFile: params.sessionFile });
 	return messages;
 }

package/dist/{bounded-turn-wzJrwKKe.js → bounded-turn-DxGJRYbY.js}

@@ -1,15 +1,15 @@
-import { $t as isJsonObject, at as readCodexTurnCompletedNotification, et as assertCodexThreadStartResponse, ot as createCodexElicitationResponse, rt as readCodexErrorNotification, tt as assertCodexTurnStartResponse, u as isCodexAppServerStartSelectionChangedError } from "./shared-client-DxcfF9KX.js";
-import { r as readCodexAppServerConfigOptions } from "./launch-args-RXQwn8zV.js";
-import { i as resolveCodexAppServerRuntimeOptions } from "./config-BhmfC1s6.js";
-import { _ as readCodexNotificationTurnId, a as closeCodexStartupClientBestEffort, o as interruptCodexTurnAndWaitBestEffort, t as CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS } from "./attempt-client-cleanup-DYHcRQAa.js";
-import { d as isTerminalTurnStatus, f as readCodexNotificationItem, n as normalizeCodexResponseTokenUsage, u as isRetryableErrorNotification } from "./event-projector-usage-C5mcrGjp.js";
-import { r as readModelListResult } from "./models-sYnEc0gd.js";
-import { Dt as mergeCodexThreadConfigs, G as attestCodexRestrictedToolSurfaceMcpServersDisabled, _ as buildCodexRingZeroThreadConfigPatch, b as readCodexInheritedMcpServerNames, g as assertCodexManagedRequirementsDoNotOverrideToolPolicy, v as buildCodexRuntimeThreadConfig } from "./thread-lifecycle-DAcEJ_Om.js";
+import { B as isJsonObject, i as resolveCodexAppServerRuntimeOptions } from "./config-CyapYSji.js";
+import { at as readCodexErrorNotification, ct as createCodexElicitationResponse, nt as assertCodexThreadStartResponse, rt as assertCodexTurnStartResponse, st as readCodexTurnCompletedNotification, u as isCodexAppServerStartSelectionChangedError } from "./shared-client-CKhX2kFt.js";
+import { m as readCodexAppServerConfigOptions } from "./managed-binary-DcpnJF9x.js";
+import { _ as readCodexNotificationTurnId, a as closeCodexStartupClientBestEffort, o as interruptCodexTurnAndWaitBestEffort, t as CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS } from "./attempt-client-cleanup-Bp1ZOnk2.js";
+import { c as isRetryableErrorNotification, l as isTerminalTurnStatus, t as CodexUsageProjection, u as readCodexNotificationItem } from "./event-projector-usage-ZqEVbAEY.js";
+import { r as readModelListResult } from "./models-CcrgSMQR.js";
+import { Et as mergeCodexThreadConfigs, G as attestCodexRestrictedToolSurfaceMcpServersDisabled, _ as buildCodexRingZeroThreadConfigPatch, b as readCodexInheritedMcpServerNames, g as assertCodexManagedRequirementsDoNotOverrideToolPolicy, v as buildCodexRuntimeThreadConfig } from "./thread-lifecycle-DPK30jad.js";
 import { readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
-import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { resolvePreferredOpenClawTmpDir, withTempWorkspace } from "openclaw/plugin-sdk/temp-path";
 //#region extensions/codex/src/app-server/bounded-turn.ts
 const CODEX_APP_SERVER_ARGS_ENV_KEY = "OPENCLAW_CODEX_APP_SERVER_ARGS";
@@ -39,6 +39,7 @@ var CodexBoundedTurnTimeoutError = class extends Error {
 	}
 };
 async function runBoundedCodexAppServerTurn(params) {
+	params.assertCurrent?.();
 	const appServer = resolveCodexAppServerRuntimeOptions({
 		pluginConfig: params.options.pluginConfig,
 		managedCommandOrder: params.isolation === "private-stdio" ? "package-first" : void 0
@@ -64,27 +65,23 @@ async function runBoundedCodexAppServerTurnInWorkspace(params, appServer, worksp
 	const deadline = timing?.deadline ?? Date.now() + totalTimeoutMs;
 	const timeoutMs = deadline - Date.now();
 	if (timeoutMs <= 0) throw timeoutError;
+	params.assertCurrent?.();
 	const agentDir = params.agentDir?.trim() || void 0;
 	const startOptions = workspace.codexHome ? buildPrivateCodexAppServerStartOptions(appServer.start, workspace.codexHome) : appServer.start;
 	const ownsClient = !params.options.clientFactory;
-	const authSelection = params.preparedAuth ? { preparedAuth: params.preparedAuth } : { authProfileId: params.profile };
-	const client = params.options.clientFactory ? await params.options.clientFactory({
+	const clientOptions = {
 		startOptions,
-		...authSelection,
+		...params.preparedAuth ? { preparedAuth: params.preparedAuth } : { authProfileId: params.profile },
 		authRequirement: params.authRequirement,
 		agentDir,
 		config: params.config,
 		timeoutMs,
+		assertCurrent: params.assertCurrent,
 		...params.signal ? { abandonSignal: params.signal } : {}
-	}) : await import("./shared-client-DxcfF9KX.js").then((n) => n.x).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
-		startOptions,
-		timeoutMs,
-		...authSelection,
-		authRequirement: params.authRequirement,
-		agentDir,
-		authProfileStore: params.authProfileStore,
-		config: params.config,
-		...params.signal ? { abandonSignal: params.signal } : {}
+	};
+	const client = params.options.clientFactory ? await params.options.clientFactory(clientOptions) : await import("./shared-client-CKhX2kFt.js").then((n) => n.x).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
+		...clientOptions,
+		authProfileStore: params.authProfileStore
 	}));
 	const abortController = new AbortController();
 	let activeThreadId;
@@ -110,17 +107,23 @@ async function runBoundedCodexAppServerTurnInWorkspace(params, appServer, worksp
 	const timeout = setTimeout(() => abortRun(timeoutError), Math.max(1, remainingRunMs));
 	timeout.unref?.();
 	let retrySelection = false;
+	const requestOptions = {
+		timeoutMs,
+		signal: abortController.signal,
+		assertCurrent: params.assertCurrent
+	};
 	try {
+		params.assertCurrent?.();
 		const modelSelection = await resolveCodexBoundedTurnModel({
 			client,
 			selection: params.model,
 			requiredModalities: params.requiredModalities,
-			timeoutMs,
-			signal: abortController.signal
+			...requestOptions
 		});
 		const inheritedMcpServerNames = params.requireNoExternalCapabilities ? await readCodexInheritedMcpServerNames(client, workspace.cwd, abortController.signal) : [];
 		if (params.requireNoExternalCapabilities) await assertCodexManagedRequirementsDoNotOverrideToolPolicy(client, { restrictedToolSurface: true }, abortController.signal);
 		const threadConfig = buildCodexRuntimeThreadConfig(resolveBoundedThreadConfig(params, workspace, inheritedMcpServerNames), { nativeCodeModeEnabled: false });
+		params.assertCurrent?.();
 		const thread = assertCodexThreadStartResponse(await client.request("thread/start", {
 			model: modelSelection.runtimeModelId,
 			...params.modelProvider ? { modelProvider: params.modelProvider } : {},
@@ -135,20 +138,15 @@ async function runBoundedCodexAppServerTurnInWorkspace(params, appServer, worksp
 			dynamicTools: [],
 			experimentalRawEvents: true,
 			ephemeral: true
-		}, {
-			timeoutMs,
-			signal: abortController.signal
-		}));
+		}, requestOptions));
 		activeThreadId = thread.thread.id;
 		if (abortController.signal.aborted) requestInterrupt();
 		if (params.requireNoExternalCapabilities) await attestCodexRestrictedToolSurfaceMcpServersDisabled(client, thread.thread.id, threadConfig, abortController.signal);
 		if (params.historyItems?.length) await client.request("thread/inject_items", {
 			threadId: thread.thread.id,
 			items: params.historyItems
-		}, {
-			timeoutMs,
-			signal: abortController.signal
-		});
+		}, requestOptions);
+		params.assertCurrent?.();
 		const collector = createCodexBoundedTurnCollector(thread.thread.id, params.taskLabel, params.allowEmptyText === true);
 		const cleanup = client.addNotificationHandler(collector.handleNotification);
 		const requestCleanup = client.addRequestHandler(createCodexBoundedApprovalHandler(params.taskLabel));
@@ -157,20 +155,22 @@ async function runBoundedCodexAppServerTurnInWorkspace(params, appServer, worksp
 				threadId: thread.thread.id,
 				input: params.input,
 				approvalPolicy: "on-request",
-				model: modelSelection.runtimeModelId,
 				effort: "low"
-			}, {
-				timeoutMs,
-				signal: abortController.signal
-			}));
+			}, requestOptions));
 			activeTurnId = turn.turn.id;
 			if (abortController.signal.aborted) requestInterrupt();
+			const result = await collector.collect(turn.turn, {
+				signal: abortController.signal,
+				timeoutError
+			});
+			params.assertCurrent?.();
 			return {
-				...await collector.collect(turn.turn, {
-					signal: abortController.signal,
-					timeoutError
-				}),
-				model: modelSelection.catalogId
+				...result,
+				model: modelSelection.catalogId,
+				nativeSelection: {
+					model: thread.model,
+					modelProvider: thread.modelProvider
+				}
 			};
 		} finally {
 			await interruptPromise;
@@ -246,7 +246,8 @@ async function resolveCodexBoundedTurnModel(params) {
 		includeHidden: params.selection.mode === "required"
 	}, {
 		timeoutMs: Math.min(params.timeoutMs, 5e3),
-		signal: params.signal
+		signal: params.signal,
+		assertCurrent: params.assertCurrent
 	});
 	const listed = readModelListResult(result).models;
 	if (params.selection.mode === "live-default") {
@@ -272,7 +273,7 @@ function createCodexBoundedTurnCollector(threadId, taskLabel, allowEmptyText) {
 	let turnId;
 	let completedTurn;
 	let promptError;
-	let responseUsage;
+	const usageProjection = new CodexUsageProjection();
 	const pending = [];
 	const completedItems = /* @__PURE__ */ new Map();
 	const assistantTextByItem = /* @__PURE__ */ new Map();
@@ -306,8 +307,7 @@ function createCodexBoundedTurnCollector(threadId, taskLabel, allowEmptyText) {
 			return;
 		}
 		if (notification.method === "rawResponse/completed") {
-			const usage = isJsonObject(params.usage) ? params.usage : void 0;
-			responseUsage = usage ? normalizeCodexResponseTokenUsage(usage) : void 0;
+			usageProjection.record(params);
 			return;
 		}
 		if (notification.method === "turn/completed") {
@@ -316,6 +316,7 @@ function createCodexBoundedTurnCollector(threadId, taskLabel, allowEmptyText) {
 			return;
 		}
 		if (notification.method === "error") {
+			usageProjection.invalidateContext();
 			if (isRetryableErrorNotification(notification.params)) return;
 			promptError = readCodexErrorNotification(notification.params)?.error.message ?? `codex app-server ${taskLabel} turn failed`;
 			resolveCompletion();
@@ -344,7 +345,7 @@ function createCodexBoundedTurnCollector(threadId, taskLabel, allowEmptyText) {
 			return {
 				text,
 				items,
-				...responseUsage ? { usage: responseUsage } : {}
+				usage: usageProjection.usage
 			};
 		}
 	};

package/dist/{capabilities-dIjNVCYH.js → capabilities-B1mgvpP8.js}

@@ -1,4 +1,4 @@
-import { q as CodexAppServerRpcError } from "./shared-client-DxcfF9KX.js";
+import { q as CodexAppServerRpcError } from "./shared-client-CKhX2kFt.js";
 //#region extensions/codex/src/app-server/capabilities.ts
 /**
 * Capability helpers for optional Codex app-server control-plane methods.
@@ -17,6 +17,7 @@ const CODEX_CONTROL_METHODS = {
 	listSkills: "skills/list",
 	listThreads: "thread/list",
 	listThreadTurns: "thread/turns/list",
+	listThreadItems: "thread/items/list",
 	readThread: "thread/read",
 	rateLimits: "account/rateLimits/read",
 	archiveThread: "thread/archive",

package/dist/cli-metadata.js

@@ -2,7 +2,7 @@ import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
 //#region extensions/codex/cli-metadata.ts
 function registerCodexCliMetadata(api) {
 	api.registerCli(async ({ program }) => {
-		const { registerCodexSessionCli } = await import("./session-cli-CmFEXMAM.js");
+		const { registerCodexSessionCli } = await import("./session-cli-BjLhpmS1.js");
 		registerCodexSessionCli(program);
 	}, { descriptors: [{
 		name: "codex",

package/dist/{command-formatters-CLHhEB1Q.js → command-formatters-DSbGMXA0.js}

@@ -1,5 +1,5 @@
-import { $t as isJsonObject } from "./shared-client-DxcfF9KX.js";
-import { c as summarizeCodexRateLimits, o as summarizeCodexAccountRateLimits, r as hasCodexRateLimitSnapshots } from "./rate-limits-CawQJfUS.js";
+import { B as isJsonObject } from "./config-CyapYSji.js";
+import { c as summarizeCodexRateLimits, o as summarizeCodexAccountRateLimits, r as hasCodexRateLimitSnapshots } from "./rate-limits-Fx_l4eNa.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/codex/src/command-formatters.ts
 /**