@openclaw/codex 2026.9.1 → 2026.9.3

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

@@ -1,10 +1,32 @@
-import { $t as isJsonObject, jt as unsubscribeCodexAppServerLiveThread, q as CodexAppServerRpcError, y as retireSharedCodexAppServerClientIfCurrent } from "./shared-client-DxcfF9KX.js";
+import { o as isJsonObject } from "./protocol-CAAcVIKF.js";
+import "./client-BEKu4yDx.js";
+import { m as retireSharedCodexAppServerClientIfCurrent } from "./auth-cache-key-Kq6oerr6.js";
+import { r as CodexAppServerRpcError } from "./session-catalog-provenance-DkJHo735.js";
+import { G as unsubscribeCodexAppServerLiveThread } from "./shared-client-CVhez2Uo.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 { AsyncResource } from "node:async_hooks";
 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
+	};
+	if (codexErrorInfo === "misalignmentPolicyViolation") return {
+		category: "misalignment",
+		message
+	};
+	return message.startsWith(BIO_POLICY_SAFETY_ACCESS_BLOCK_PREFIX) ? {
+		category: "bio",
+		message
+	} : void 0;
+}
 function readNonEmptyString(record, key) {
 	return normalizeOptionalString$1(record[key]);
 }
@@ -279,7 +301,6 @@ var ClientTurnRouter = class {
 		this.routes = /* @__PURE__ */ new Map();
 		this.globalWarnings = [];
 		this.nativeTurnCompletionWatchers = /* @__PURE__ */ new Map();
-		this.disposed = false;
 		client.addNotificationHandler((notification) => this.routeNotification(notification));
 		client.addRequestHandler((request, signal) => this.routeRequest(request, signal));
 		client.addCloseHandler((closedClient) => {
@@ -320,9 +341,12 @@ var ClientTurnRouter = class {
 			get observedNativeTurnId() {
 				return route.observedNativeTurn?.id;
 			},
+			get completed() {
+				return Boolean(route.turnId && route.completedNativeTurnIds.has(route.turnId));
+			},
 			activate: (handlers) => this.activate(route, handlers),
 			armTurn: () => this.armTurn(route),
-			bindTurn: (turnId) => this.bindTurn(route, turnId),
+			bindTurn: (turnId, bindingOptions) => this.bindTurn(route, turnId, bindingOptions),
 			cancelTurn: () => this.cancelTurn(route),
 			drain: () => this.drainNotifications(route),
 			release: () => this.release(route)
@@ -334,28 +358,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,13 +395,17 @@ var ClientTurnRouter = class {
 		options.signal?.addEventListener("abort", abort, { once: true });
 		return {
 			completion,
+			settledSignal: settlement.signal,
+			get state() {
+				return state;
+			},
 			cancel: () => finish(false)
 		};
 	}
 	dispose(cause) {
-		if (this.disposed) return;
-		this.disposed = true;
+		if (this.closeError) return;
 		const closeError = cause ? new Error("codex app-server turn router closed", { cause }) : /* @__PURE__ */ new Error("codex app-server turn router closed");
+		this.closeError = closeError;
 		for (const route of this.routes.values()) this.release(route, closeError);
 		for (const watchers of this.nativeTurnCompletionWatchers.values()) for (const watcher of watchers) watcher.finish(false);
 	}
@@ -384,7 +419,11 @@ var ClientTurnRouter = class {
 		if (route.handlers) throw new Error(`codex app-server thread route already activated: ${route.threadId}`);
 		this.assertRoute(route);
 		if (!handlers.onNotification && !handlers.onRequest) throw new Error("codex app-server thread route requires a notification or request handler");
-		route.handlers = handlers;
+		route.handlers = {
+			onRequest: handlers.onRequest && AsyncResource.bind(handlers.onRequest),
+			onNotification: handlers.onNotification && AsyncResource.bind(handlers.onNotification),
+			onNotificationReceived: handlers.onNotificationReceived && AsyncResource.bind(handlers.onNotificationReceived, void 0, handlers)
+		};
 		if (!handlers.onNotification) route.pending.length = 0;
 		else if (route.gate !== "armed") this.flushNotifications(route);
 		route.activated.resolve();
@@ -407,20 +446,22 @@ var ClientTurnRouter = class {
 		await this.waitForNotifications(route);
 		this.assertRoute(route);
 	}
-	async bindTurn(route, turnIdInput) {
-		this.assertRoute(route);
+	async bindTurn(route, turnIdInput, options) {
+		const turnId = requireId(turnIdInput, "turn id");
+		if (options?.completed && route.gate === "armed" && (!route.released || route.released === this.closeError)) route.completedNativeTurnIds.add(turnId);
+		this.assertRoute(route, route.gate === "armed" ? turnId : void 0);
 		if (!route.handlers) throw new Error("codex app-server thread route must be activated before binding a turn");
 		if (route.gate !== "armed") throw new Error(`codex app-server thread route cannot bind from ${route.gate}`);
-		const turnId = requireId(turnIdInput, "turn id");
 		route.gate = "bound";
 		route.turnId = turnId;
 		this.flushNotifications(route);
 		route.binding?.resolve();
 		await this.waitForNotifications(route);
-		this.assertRoute(route);
+		this.assertRoute(route, turnId);
+		await route.notificationTail;
 	}
 	routeNotification(notification) {
-		if (this.disposed) return;
+		if (this.closeError) return;
 		const scope = readScope(notification.params);
 		if (!scope.threadId && (notification.method === "configWarning" || notification.method === "warning")) {
 			if (this.globalWarnings.length === DEFAULT_GLOBAL_WARNING_LIMIT) this.globalWarnings.shift();
@@ -436,6 +477,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 +485,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,
@@ -475,7 +520,7 @@ var ClientTurnRouter = class {
 		return route.notificationTail;
 	}
 	async routeRequest(request, signal = new AbortController().signal) {
-		if (this.disposed || signal.aborted) return;
+		if (this.closeError || signal.aborted) return;
 		const scope = readScope(request.params);
 		if (!scope.threadId) return;
 		const route = this.routes.get(scope.threadId);
@@ -550,7 +595,7 @@ var ClientTurnRouter = class {
 		this.release(route, error);
 	}
 	enqueueNotification(route, handler, notification, scope) {
-		if (route.released) return;
+		if (route.released && !this.canDrainClosedTurn(route, route.turnId)) return;
 		route.notificationTail = route.notificationTail.then(() => handler(notification, scope)).catch((error) => {
 			if (!route.released) embeddedAgentLog.warn("codex app-server keyed notification handler failed", {
 				method: notification.method,
@@ -569,7 +614,7 @@ var ClientTurnRouter = class {
 	release(route, error = /* @__PURE__ */ new Error("codex app-server thread route is released")) {
 		if (route.released) return;
 		route.released = error;
-		route.pending.length = 0;
+		if (error !== this.closeError) route.pending.length = 0;
 		route.ended.resolve();
 		route.activated.resolve();
 		route.binding?.resolve();
@@ -578,10 +623,13 @@ var ClientTurnRouter = class {
 		if (this.routes.get(route.threadId) === route) this.routes.delete(route.threadId);
 	}
 	assertActive() {
-		if (this.disposed) throw new Error("codex app-server turn router is closed");
+		if (this.closeError) throw new Error("codex app-server turn router is closed");
+	}
+	canDrainClosedTurn(route, turnId) {
+		return Boolean(this.closeError && route.released === this.closeError && turnId && route.completedNativeTurnIds.has(turnId));
 	}
-	assertRoute(route) {
-		if (route.released) throw route.released;
+	assertRoute(route, completedTurnId) {
+		if (route.released && !this.canDrainClosedTurn(route, completedTurnId)) throw route.released;
 	}
 };
 async function waitForPromiseOrAbort(promise, signal) {
@@ -626,8 +674,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 +692,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,25 +723,48 @@ 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. */
-async function terminateCodexBackgroundTerminals(client, threadId) {
+async function terminateCodexBackgroundTerminals(client, threadId, oneShotCliRun = false) {
 	const options = {
 		timeoutMs: CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS,
 		signal: AbortSignal.timeout(CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS)
@@ -717,6 +780,7 @@ async function terminateCodexBackgroundTerminals(client, threadId) {
 				threadId,
 				limit: 1
 			}, options)).data.length > 0) throw new Error("native background terminals remain running");
+			if (oneShotCliRun) throw new Error("native terminal termination did not confirm process cleanup");
 		}
 	} catch (cause) {
 		throw new Error("Codex background-terminal cleanup failed; inspect the thread's running terminals before starting more work.", { cause });
@@ -737,4 +801,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-AO4DSjE0.js}

@@ -1,11 +1,11 @@
-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 { a as flattenCodexDynamicToolFunctions, o as isJsonObject } from "./protocol-CAAcVIKF.js";
+import { t as readCodexMirroredSessionHistoryMessages } from "./session-history-Cz-tOOYj.js";
+import { Z as areCodexDynamicToolFingerprintsCompatible, at as isMessageOnlyCodexSourceReply, dt as isContextEngineBindingCompatible } from "./thread-lifecycle-D1pzRwHB.js";
 import { readNonBlankString } from "openclaw/plugin-sdk/string-coerce-runtime";
-import path from "node:path";
-import { buildBootstrapContextForFiles, buildWatchedSessionsHarnessContext, embeddedAgentLog, resolveBootstrapFilesForRun } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { createHash } from "node:crypto";
+import path from "node:path";
 import { resolveAgentWorkspaceDir } from "openclaw/plugin-sdk/agent-runtime";
+import { buildBootstrapContextForFiles, buildWatchedSessionsHarnessContext, embeddedAgentLog, resolveBootstrapFilesForRun } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { resolveBootstrapFilesForPreparation } from "openclaw/plugin-sdk/codex-mcp-projection";
 import { prepareMemorySystemPromptAddition } from "openclaw/plugin-sdk/core";
 import { MESSAGE_TOOL_DELIVERY_HINTS } from "openclaw/plugin-sdk/message-tool-delivery-hints";
@@ -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;
 }
@@ -214,6 +214,7 @@ function buildCodexSystemPromptReport(params) {
 		injectedWorkspaceFiles: buildCodexBootstrapInjectionStats({
 			bootstrapFiles: params.workspaceBootstrapContext.bootstrapFiles,
 			injectedFiles: params.workspaceBootstrapContext.promptContextFiles ?? [],
+			omitReferenceFiles: params.omitWorkspaceReferences,
 			developerInstructionFiles: [...params.workspaceBootstrapContext.threadDeveloperInstructionFiles ?? [], ...params.workspaceBootstrapContext.turnScopedDeveloperInstructionFiles ?? []],
 			memoryToolRoutedBootstrapFiles: params.workspaceBootstrapContext.memoryToolRoutedBootstrapFiles ?? [],
 			memoryToolRouted: params.workspaceBootstrapContext.memoryToolRouted === true
@@ -304,8 +305,9 @@ function buildCodexBootstrapInjectionStats(params) {
 			injectedChars: null,
 			truncated: null
 		};
-		const injectedChars = memoryToolRoutedFile ? 0 : injected?.length ?? 0;
-		const truncated = memoryToolRoutedFile ? false : !file.missing && injectedChars < rawChars;
+		const omitted = memoryToolRoutedFile || params.omitReferenceFiles && readCodexIndexedContextFileContent(injectedIndex, pathValue, fileName) !== void 0;
+		const injectedChars = omitted ? 0 : injected?.length ?? 0;
+		const truncated = omitted ? false : !file.missing && injectedChars < rawChars;
 		return {
 			name: displayName,
 			path: pathValue,

package/dist/{event-projector-usage-C5mcrGjp.js → attempt-notifications--H8zXR5-.js}

@@ -1,6 +1,5 @@
-import { $t as isJsonObject } from "./shared-client-DxcfF9KX.js";
-import { asSafeIntegerInRange, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { normalizeUsage } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { o as isJsonObject } from "./protocol-CAAcVIKF.js";
+import { readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/codex/src/app-server/attempt-notifications.ts
 const CODEX_TURN_ABORT_MARKER_START = "<turn_aborted>";
 const CODEX_TURN_ABORT_MARKER_END = "</turn_aborted>";
@@ -41,10 +40,6 @@ function isAssistantCommentaryCompletionNotification(notification) {
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
 	return Boolean(item && readStringField(item, "type") === "agentMessage" && (readStringField(item, "phase") === "commentary" || readStringField(item, "delivery") === "async"));
 }
-/** A retryable native error is not a terminal outcome for bounded operations. */
-function isRetryableErrorNotification(value) {
-	return isJsonObject(value) && value.willRetry === true;
-}
 /** Returns true for terminal app-server thread status strings. */
 function isTerminalTurnStatus(status) {
 	return status === "completed" || status === "interrupted" || status === "failed";
@@ -111,85 +106,4 @@ function isNonEmptyString(value) {
 	return typeof value === "string" && value.length > 0;
 }
 //#endregion
-//#region extensions/codex/src/app-server/event-projector-usage.ts
-function readTokenCount(record, key) {
-	return asSafeIntegerInRange(record[key], { min: 0 });
-}
-function readCodexThreadTokenUsage(params) {
-	const tokenUsage = isJsonObject(params.tokenUsage) ? params.tokenUsage : void 0;
-	const last = tokenUsage && isJsonObject(tokenUsage.last) ? tokenUsage.last : void 0;
-	return last ? normalizeCodexResponseTokenUsage(last) : void 0;
-}
-function readCodexThreadContextSnapshot(params) {
-	const tokenUsage = isJsonObject(params.tokenUsage) ? params.tokenUsage : void 0;
-	const last = tokenUsage && isJsonObject(tokenUsage.last) ? tokenUsage.last : void 0;
-	const modelContextWindow = tokenUsage ? readTokenCount(tokenUsage, "modelContextWindow") : void 0;
-	const activeContextTokens = last ? readTokenCount(last, "totalTokens") : void 0;
-	const inputTokens = last ? readTokenCount(last, "inputTokens") : void 0;
-	const cachedInputTokens = last ? readTokenCount(last, "cachedInputTokens") : void 0;
-	const cacheWriteInputTokens = last ? readTokenCount(last, "cacheWriteInputTokens") : void 0;
-	const reasoningOutputTokens = last ? readTokenCount(last, "reasoningOutputTokens") : void 0;
-	return {
-		...activeContextTokens !== void 0 ? { activeContextTokens } : {},
-		...cachedInputTokens !== void 0 ? { cachedInputTokens } : {},
-		...cacheWriteInputTokens !== void 0 ? { cacheWriteInputTokens } : {},
-		...inputTokens !== void 0 ? { inputTokens } : {},
-		...modelContextWindow && modelContextWindow > 0 ? { modelContextWindow } : {},
-		...inputTokens !== void 0 ? { promptTokens: inputTokens } : {},
-		...reasoningOutputTokens !== void 0 ? { reasoningOutputTokens } : {}
-	};
-}
-function projectCodexThreadUsageUpdate(params, currentUsage, applyUsage, emitContext) {
-	applyUsage(readCodexThreadTokenUsage(params) ?? currentUsage);
-	const context = readCodexThreadContextSnapshot(params);
-	if (Object.keys(context).length > 0) emitContext(context);
-}
-function normalizeCodexResponseTokenUsage(record) {
-	const totalTokens = readTokenCount(record, "totalTokens");
-	const inputTokens = readTokenCount(record, "inputTokens");
-	const cacheRead = readTokenCount(record, "cachedInputTokens");
-	const output = readTokenCount(record, "outputTokens");
-	const reasoningTokens = readTokenCount(record, "reasoningOutputTokens");
-	const cacheWrite = record.cacheWriteInputTokens === void 0 ? 0 : readTokenCount(record, "cacheWriteInputTokens");
-	const hasCoherentInput = inputTokens !== void 0 && cacheRead !== void 0 && cacheWrite !== void 0 && cacheRead + cacheWrite <= inputTokens;
-	const hasCoherentContext = hasCoherentInput && totalTokens !== void 0 && output !== void 0 && totalTokens === inputTokens + output;
-	const usage = normalizeUsage({
-		input: hasCoherentInput ? inputTokens - cacheRead - cacheWrite : void 0,
-		output,
-		cacheRead,
-		cacheWrite,
-		reasoningTokens,
-		total: totalTokens
-	});
-	if (!usage) return;
-	return {
-		...usage,
-		contextUsage: hasCoherentContext ? {
-			state: "available",
-			promptTokens: inputTokens,
-			totalTokens
-		} : { state: "unavailable" }
-	};
-}
-var CodexResponseCompletionProjection = class {
-	constructor() {
-		this.responseIds = /* @__PURE__ */ new Set();
-	}
-	get modelIterations() {
-		return this.responseIds.size;
-	}
-	clear() {
-		this.usage = void 0;
-	}
-	record(params, reportOutputTokens) {
-		const responseId = readStringField(params, "responseId");
-		if (!responseId || this.responseIds.has(responseId)) return;
-		this.responseIds.add(responseId);
-		const usage = isJsonObject(params.usage) ? params.usage : void 0;
-		this.usage = usage ? normalizeCodexResponseTokenUsage(usage) : void 0;
-		const outputTokens = this.usage?.output;
-		if (outputTokens !== void 0) reportOutputTokens?.(outputTokens);
-	}
-};
-//#endregion
-export { codexExecutionToolName as a, isPendingOpenClawDynamicToolCompletionNotification as c, isTerminalTurnStatus as d, readCodexNotificationItem as f, updateActiveTurnItemIds as h, readCodexThreadContextSnapshot as i, isRawFunctionToolOutputCompletionNotification as l, readRawResponseToolCallId as m, normalizeCodexResponseTokenUsage as n, isAssistantCommentaryCompletionNotification as o, readNotificationItemId as p, projectCodexThreadUsageUpdate as r, isCodexTurnAbortMarkerNotification as s, CodexResponseCompletionProjection as t, isRetryableErrorNotification as u };
+export { isRawFunctionToolOutputCompletionNotification as a, readNotificationItemId as c, isPendingOpenClawDynamicToolCompletionNotification as i, readRawResponseToolCallId as l, isAssistantCommentaryCompletionNotification as n, isTerminalTurnStatus as o, isCodexTurnAbortMarkerNotification as r, readCodexNotificationItem as s, codexExecutionToolName as t, updateActiveTurnItemIds as u };