@openclaw/codex 2026.5.4-beta.1 → 2026.5.4-beta.3

package/dist/{conversation-binding-LXwwffvV.js → conversation-binding-CtHkMJfG.js}

@@ -1,10 +1,11 @@
-import { i as resolveCodexAppServerRuntimeOptions, n as codexSandboxPolicyForTurn } from "./config-CkkoMeqF.js";
+import { i as resolveCodexAppServerRuntimeOptions, n as codexSandboxPolicyForTurn } from "./config-ByrA30No.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
-import { n as getSharedCodexAppServerClient, s as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-B7LbV3PF.js";
-import { t as CODEX_CONTROL_METHODS } from "./capabilities-BmhO5h8O.js";
+import { d as CODEX_CONTROL_METHODS, r as formatCodexDisplayText } from "./command-formatters-PiJcdUbu.js";
+import { n as getSharedCodexAppServerClient, s as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-Dfk3Enm-.js";
 import { i as readCodexAppServerBinding, n as isCodexAppServerNativeAuthProfile, o as writeCodexAppServerBinding, r as normalizeCodexAppServerBindingModelProvider, t as clearCodexAppServerBinding } from "./session-binding-DuJYTJQy.js";
 import { formatErrorMessage } from "openclaw/plugin-sdk/agent-harness-runtime";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
 import process from "node:process";
 //#region extensions/codex/src/conversation-binding-data.ts
 const BINDING_DATA_VERSION = 1;
@@ -130,7 +131,7 @@ async function setCodexConversationModel(params) {
 		sandbox: binding.sandbox,
 		serviceTier: binding.serviceTier ?? runtime.serviceTier
 	});
-	return `Codex model set to ${response.model ?? model}.`;
+	return `Codex model set to ${formatCodexDisplayText(response.model ?? model)}.`;
 }
 async function setCodexConversationFastMode(params) {
 	const binding = await requireThreadBinding(params.sessionFile);
@@ -200,6 +201,7 @@ function permissionsForMode(mode) {
 }
 //#endregion
 //#region extensions/codex/src/conversation-turn-collector.ts
+const MAX_PENDING_NOTIFICATIONS_PER_TURN = 100;
 function createCodexConversationTurnCollector(threadId) {
 	let turnId;
 	let completed = false;
@@ -207,6 +209,7 @@ function createCodexConversationTurnCollector(threadId) {
 	let timeout;
 	const assistantTextByItem = /* @__PURE__ */ new Map();
 	const assistantOrder = [];
+	const pendingNotificationsByTurnId = /* @__PURE__ */ new Map();
 	let resolveCompletion;
 	let rejectCompletion;
 	const rememberItem = (itemId) => {
@@ -230,49 +233,65 @@ function createCodexConversationTurnCollector(threadId) {
 		else resolveCompletion?.({ replyText: collectReplyText() });
 		clearWaitState();
 	};
-	return {
-		setTurnId(nextTurnId) {
-			turnId = nextTurnId;
-		},
-		handleNotification(notification) {
-			const params = isJsonObject(notification.params) ? notification.params : void 0;
-			if (!params || !isNotificationForTurn(params, threadId, turnId)) return;
-			if (notification.method === "item/agentMessage/delta") {
-				const itemId = readString(params, "itemId") ?? readString(params, "id") ?? "assistant";
-				const delta = readTextString(params, "delta");
-				if (!delta) return;
-				rememberItem(itemId);
-				assistantTextByItem.set(itemId, `${assistantTextByItem.get(itemId) ?? ""}${delta}`);
-				return;
+	const handleNotification = (notification) => {
+		const params = isJsonObject(notification.params) ? notification.params : void 0;
+		if (!params || readString(params, "threadId") !== threadId) return;
+		if (!turnId) {
+			const pendingTurnId = readNotificationTurnId(params);
+			if (pendingTurnId) {
+				const pending = pendingNotificationsByTurnId.get(pendingTurnId) ?? [];
+				if (pending.length < MAX_PENDING_NOTIFICATIONS_PER_TURN) {
+					pending.push(notification);
+					pendingNotificationsByTurnId.set(pendingTurnId, pending);
+				}
 			}
-			if (notification.method === "item/completed") {
-				const item = isJsonObject(params.item) ? params.item : void 0;
-				if (item?.type === "agentMessage") {
-					const itemId = readString(item, "id") ?? readString(params, "itemId") ?? "assistant";
-					const text = readTextString(item, "text");
-					if (text) {
-						rememberItem(itemId);
-						assistantTextByItem.set(itemId, text);
-					}
+			return;
+		}
+		if (!isNotificationForTurn(params, threadId, turnId)) return;
+		if (notification.method === "item/agentMessage/delta") {
+			const itemId = readString(params, "itemId") ?? readString(params, "id") ?? "assistant";
+			const delta = readTextString(params, "delta");
+			if (!delta) return;
+			rememberItem(itemId);
+			assistantTextByItem.set(itemId, `${assistantTextByItem.get(itemId) ?? ""}${delta}`);
+			return;
+		}
+		if (notification.method === "item/completed") {
+			const item = isJsonObject(params.item) ? params.item : void 0;
+			if (item?.type === "agentMessage") {
+				const itemId = readString(item, "id") ?? readString(params, "itemId") ?? "assistant";
+				const text = readTextString(item, "text");
+				if (text) {
+					rememberItem(itemId);
+					assistantTextByItem.set(itemId, text);
 				}
-				return;
 			}
-			if (notification.method === "turn/completed") {
-				const turn = isJsonObject(params.turn) ? params.turn : void 0;
-				if (readString(turn, "status") === "failed") failedError = readString(readRecord(turn?.error), "message") ?? "codex app-server turn failed";
-				const items = Array.isArray(turn?.items) ? turn.items : [];
-				for (const item of items) {
-					if (!isJsonObject(item) || item.type !== "agentMessage") continue;
-					const itemId = readString(item, "id") ?? `assistant-${assistantOrder.length + 1}`;
-					const text = readTextString(item, "text");
-					if (text) {
-						rememberItem(itemId);
-						assistantTextByItem.set(itemId, text);
-					}
+			return;
+		}
+		if (notification.method === "turn/completed") {
+			const turn = isJsonObject(params.turn) ? params.turn : void 0;
+			if (readString(turn, "status") === "failed") failedError = readString(readRecord(turn?.error), "message") ?? "codex app-server turn failed";
+			const items = Array.isArray(turn?.items) ? turn.items : [];
+			for (const item of items) {
+				if (!isJsonObject(item) || item.type !== "agentMessage") continue;
+				const itemId = readString(item, "id") ?? `assistant-${assistantOrder.length + 1}`;
+				const text = readTextString(item, "text");
+				if (text) {
+					rememberItem(itemId);
+					assistantTextByItem.set(itemId, text);
 				}
-				finish();
 			}
+			finish();
+		}
+	};
+	return {
+		setTurnId(nextTurnId) {
+			turnId = nextTurnId;
+			const pending = pendingNotificationsByTurnId.get(nextTurnId) ?? [];
+			pendingNotificationsByTurnId.clear();
+			for (const notification of pending) handleNotification(notification);
 		},
+		handleNotification,
 		wait(params) {
 			if (completed) return failedError ? Promise.reject(new Error(failedError)) : Promise.resolve({ replyText: collectReplyText() });
 			return new Promise((resolve, reject) => {
@@ -295,6 +314,9 @@ function isNotificationForTurn(params, threadId, turnId) {
 	if (directTurnId) return directTurnId === turnId;
 	return readString(isJsonObject(params.turn) ? params.turn : void 0, "id") === turnId;
 }
+function readNotificationTurnId(params) {
+	return readString(params, "turnId") ?? readString(readRecord(params.turn), "id");
+}
 function readRecord(value) {
 	return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
@@ -339,10 +361,14 @@ function extractInboundMedia(event) {
 }
 function toCodexImageInput(media) {
 	if (!isImageMedia(media)) return;
-	if (media.path) return {
-		type: "localImage",
-		path: normalizeFileUrl(media.path)
-	};
+	const localPath = media.path ?? readLocalMediaPath(media.url);
+	if (localPath) {
+		const normalized = normalizeFileUrl(localPath);
+		return normalized ? {
+			type: "localImage",
+			path: normalized
+		} : void 0;
+	}
 	return media.url ? {
 		type: "image",
 		url: media.url
@@ -355,7 +381,19 @@ function isImageMedia(media) {
 	return IMAGE_EXTENSIONS.has(path.extname(candidate.split(/[?#]/, 1)[0] ?? "").toLowerCase());
 }
 function normalizeFileUrl(value) {
-	return value.startsWith("file://") ? new URL(value).pathname : value;
+	if (!value.startsWith("file://")) return value;
+	try {
+		return fileURLToPath(value);
+	} catch {
+		return;
+	}
+}
+function readLocalMediaPath(value) {
+	if (!value) return;
+	if (value.startsWith("file://")) return value;
+	if (value.startsWith("//")) return;
+	if (path.isAbsolute(value) || path.win32.isAbsolute(value)) return value;
+	return /^[a-z][a-z0-9+.-]*:/i.test(value) ? void 0 : value;
 }
 function readStringArray(value) {
 	if (typeof value === "string" && value.trim()) return [value.trim()];
@@ -386,6 +424,9 @@ async function startCodexConversationThread(params) {
 		model: params.model,
 		modelProvider: params.modelProvider,
 		authProfileId,
+		approvalPolicy: params.approvalPolicy,
+		sandbox: params.sandbox,
+		serviceTier: params.serviceTier,
 		config: params.config
 	});
 	else await createThread({
@@ -395,6 +436,9 @@ async function startCodexConversationThread(params) {
 		model: params.model,
 		modelProvider: params.modelProvider,
 		authProfileId,
+		approvalPolicy: params.approvalPolicy,
+		sandbox: params.sandbox,
+		serviceTier: params.serviceTier,
 		config: params.config
 	});
 	return createCodexConversationBindingData({
@@ -406,12 +450,12 @@ async function handleCodexConversationInboundClaim(event, ctx, options = {}) {
 	const data = readCodexConversationBindingData(ctx.pluginBinding);
 	if (!data) return;
 	if (event.commandAuthorized !== true) return { handled: true };
-	const prompt = (event.bodyForAgent ?? event.content ?? "").trim();
+	const prompt = event.bodyForAgent?.trim() || event.content?.trim() || "";
 	if (!prompt) return { handled: true };
 	try {
 		return {
 			handled: true,
-			reply: (await enqueueBoundTurn(data.sessionFile, () => runBoundTurn({
+			reply: (await enqueueBoundTurn(data.sessionFile, () => runBoundTurnWithMissingThreadRecovery({
 				data,
 				prompt,
 				event,
@@ -422,7 +466,7 @@ async function handleCodexConversationInboundClaim(event, ctx, options = {}) {
 	} catch (error) {
 		return {
 			handled: true,
-			reply: { text: `Codex app-server turn failed: ${formatErrorMessage(error)}` }
+			reply: { text: `Codex app-server turn failed: ${formatCodexDisplayText(formatErrorMessage(error))}` }
 		};
 	}
 }
@@ -447,10 +491,10 @@ async function attachExistingThread(params) {
 		threadId: params.threadId,
 		...params.model ? { model: params.model } : {},
 		...modelProvider ? { modelProvider } : {},
-		approvalPolicy: runtime.approvalPolicy,
+		approvalPolicy: params.approvalPolicy ?? runtime.approvalPolicy,
 		approvalsReviewer: runtime.approvalsReviewer,
-		sandbox: runtime.sandbox,
-		...runtime.serviceTier ? { serviceTier: runtime.serviceTier } : {},
+		sandbox: params.sandbox ?? runtime.sandbox,
+		...params.serviceTier ?? runtime.serviceTier ? { serviceTier: params.serviceTier ?? runtime.serviceTier } : {},
 		persistExtendedHistory: true
 	}, { timeoutMs: runtime.requestTimeoutMs });
 	const thread = response.thread;
@@ -464,9 +508,9 @@ async function attachExistingThread(params) {
 			authProfileId: params.authProfileId,
 			modelProvider: response.modelProvider ?? params.modelProvider
 		}),
-		approvalPolicy: runtime.approvalPolicy,
-		sandbox: runtime.sandbox,
-		serviceTier: runtime.serviceTier
+		approvalPolicy: params.approvalPolicy ?? runtime.approvalPolicy,
+		sandbox: params.sandbox ?? runtime.sandbox,
+		serviceTier: params.serviceTier ?? runtime.serviceTier
 	}, { config: params.config });
 }
 async function createThread(params) {
@@ -484,10 +528,10 @@ async function createThread(params) {
 		cwd: params.workspaceDir,
 		...params.model ? { model: params.model } : {},
 		...modelProvider ? { modelProvider } : {},
-		approvalPolicy: runtime.approvalPolicy,
+		approvalPolicy: params.approvalPolicy ?? runtime.approvalPolicy,
 		approvalsReviewer: runtime.approvalsReviewer,
-		sandbox: runtime.sandbox,
-		...runtime.serviceTier ? { serviceTier: runtime.serviceTier } : {},
+		sandbox: params.sandbox ?? runtime.sandbox,
+		...params.serviceTier ?? runtime.serviceTier ? { serviceTier: params.serviceTier ?? runtime.serviceTier } : {},
 		developerInstructions: "This Codex thread is bound to an OpenClaw conversation. Answer normally; OpenClaw will deliver your final response back to the conversation.",
 		experimentalRawEvents: true,
 		persistExtendedHistory: true
@@ -502,9 +546,9 @@ async function createThread(params) {
 			authProfileId: params.authProfileId,
 			modelProvider: response.modelProvider ?? params.modelProvider
 		}),
-		approvalPolicy: runtime.approvalPolicy,
-		sandbox: runtime.sandbox,
-		serviceTier: runtime.serviceTier
+		approvalPolicy: params.approvalPolicy ?? runtime.approvalPolicy,
+		sandbox: params.sandbox ?? runtime.sandbox,
+		serviceTier: params.serviceTier ?? runtime.serviceTier
 	}, { config: params.config });
 }
 async function runBoundTurn(params) {
@@ -566,6 +610,29 @@ async function runBoundTurn(params) {
 		requestCleanup();
 	}
 }
+async function runBoundTurnWithMissingThreadRecovery(params) {
+	try {
+		return await runBoundTurn(params);
+	} catch (error) {
+		if (!isCodexThreadNotFoundError(error)) throw error;
+		const binding = await readCodexAppServerBinding(params.data.sessionFile);
+		await startCodexConversationThread({
+			pluginConfig: params.pluginConfig,
+			sessionFile: params.data.sessionFile,
+			workspaceDir: binding?.cwd || params.data.workspaceDir,
+			model: binding?.model,
+			modelProvider: binding?.modelProvider,
+			authProfileId: binding?.authProfileId,
+			approvalPolicy: binding?.approvalPolicy,
+			sandbox: binding?.sandbox,
+			serviceTier: binding?.serviceTier
+		});
+		return await runBoundTurn(params);
+	}
+}
+function isCodexThreadNotFoundError(error) {
+	return /\bthread not found:/iu.test(formatErrorMessage(error));
+}
 function enqueueBoundTurn(key, run) {
 	const state = getGlobalState();
 	const next = (state.queues.get(key) ?? Promise.resolve()).then(run, run);

package/dist/doctor-contract-api.js

@@ -0,0 +1,19 @@
+//#region extensions/codex/doctor-contract-api.ts
+const sessionRouteStateOwners = [{
+	id: "codex",
+	label: "Codex",
+	providerIds: [
+		"codex",
+		"codex-cli",
+		"openai-codex"
+	],
+	runtimeIds: ["codex", "codex-cli"],
+	cliSessionKeys: ["codex-cli"],
+	authProfilePrefixes: [
+		"codex:",
+		"codex-cli:",
+		"openai-codex:"
+	]
+}];
+//#endregion
+export { sessionRouteStateOwners };

package/dist/harness.js

@@ -18,11 +18,11 @@ function createCodexAppServerAgentHarness(options) {
 			};
 		},
 		runAttempt: async (params) => {
-			const { runCodexAppServerAttempt } = await import("./run-attempt-DdEBxgoj.js");
+			const { runCodexAppServerAttempt } = await import("./run-attempt-CFL1BFBl.js");
 			return runCodexAppServerAttempt(params, { pluginConfig: options?.pluginConfig });
 		},
 		compact: async (params) => {
-			const { maybeCompactCodexAppServerSession } = await import("./compact-CCKeE8zJ.js");
+			const { maybeCompactCodexAppServerSession } = await import("./compact-DcR5aTxd.js");
 			return maybeCompactCodexAppServerSession(params, { pluginConfig: options?.pluginConfig });
 		},
 		reset: async (params) => {
@@ -32,7 +32,7 @@ function createCodexAppServerAgentHarness(options) {
 			}
 		},
 		dispose: async () => {
-			const { clearSharedCodexAppServerClientAndWait } = await import("./shared-client-B7LbV3PF.js").then((n) => n.r);
+			const { clearSharedCodexAppServerClientAndWait } = await import("./shared-client-Dfk3Enm-.js").then((n) => n.r);
 			await clearSharedCodexAppServerClientAndWait();
 		}
 	};

package/dist/index.js

@@ -1,7 +1,8 @@
 import { createCodexAppServerAgentHarness } from "./harness.js";
 import { buildCodexMediaUnderstandingProvider } from "./media-understanding-provider.js";
 import { buildCodexProvider } from "./provider.js";
-import { n as handleCodexConversationInboundClaim, t as handleCodexConversationBindingResolved } from "./conversation-binding-LXwwffvV.js";
+import { f as describeControlFailure, r as formatCodexDisplayText } from "./command-formatters-PiJcdUbu.js";
+import { n as handleCodexConversationInboundClaim, t as handleCodexConversationBindingResolved } from "./conversation-binding-CtHkMJfG.js";
 import { resolveLivePluginConfigObject } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
 import fs from "node:fs/promises";
@@ -23,8 +24,12 @@ function createCodexCommand(options) {
 	};
 }
 async function handleCodexCommand(ctx, options = {}) {
-	const { handleCodexSubcommand } = await import("./command-handlers-DsknA9lT.js");
-	return await handleCodexSubcommand(ctx, options);
+	const { handleCodexSubcommand } = await import("./command-handlers-DiH-D13x.js");
+	try {
+		return await handleCodexSubcommand(ctx, options);
+	} catch (error) {
+		return { text: `Codex command failed: ${formatCodexDisplayText(describeControlFailure(error))}` };
+	}
 }
 //#endregion
 //#region extensions/codex/src/migration/helpers.ts

package/dist/media-understanding-provider.js

@@ -1,7 +1,7 @@
 import { CODEX_PROVIDER_ID, FALLBACK_CODEX_MODELS } from "./provider-catalog.js";
-import { i as resolveCodexAppServerRuntimeOptions } from "./config-CkkoMeqF.js";
-import { a as readCodexErrorNotification, c as readCodexTurnCompletedNotification, n as assertCodexThreadStartResponse, r as assertCodexTurnStartResponse } from "./protocol-validators-Cpopom3_.js";
-import { i as readModelListResult } from "./models-B-1qT9nX.js";
+import { i as resolveCodexAppServerRuntimeOptions } from "./config-ByrA30No.js";
+import { a as readCodexErrorNotification, c as readCodexTurnCompletedNotification, n as assertCodexThreadStartResponse, r as assertCodexTurnStartResponse } from "./protocol-validators-Dky2yV4W.js";
+import { i as readModelListResult } from "./models-CkowdYbm.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
 //#region extensions/codex/media-understanding-provider.ts
 const DEFAULT_CODEX_IMAGE_MODEL = FALLBACK_CODEX_MODELS.find((model) => model.inputModalities.includes("image"))?.id ?? FALLBACK_CODEX_MODELS[0]?.id;
@@ -37,7 +37,7 @@ async function describeCodexImages(req, options) {
 	const appServer = resolveCodexAppServerRuntimeOptions({ pluginConfig: options.pluginConfig });
 	const timeoutMs = Math.max(100, req.timeoutMs);
 	const ownsClient = !options.clientFactory;
-	const client = options.clientFactory ? await options.clientFactory(appServer.start, req.profile) : await import("./shared-client-B7LbV3PF.js").then((n) => n.r).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
+	const client = options.clientFactory ? await options.clientFactory(appServer.start, req.profile) : await import("./shared-client-Dfk3Enm-.js").then((n) => n.r).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
 		startOptions: appServer.start,
 		timeoutMs,
 		authProfileId: req.profile

package/dist/{models-B-1qT9nX.js → models-CkowdYbm.js}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-DUslC3ob.js";
-import { o as readCodexModelListResponse } from "./protocol-validators-Cpopom3_.js";
+import { o as readCodexModelListResponse } from "./protocol-validators-Dky2yV4W.js";
 //#region extensions/codex/src/app-server/models.ts
 var models_exports = /* @__PURE__ */ __exportAll({
 	listAllCodexAppServerModels: () => listAllCodexAppServerModels,
@@ -39,7 +39,7 @@ async function listAllCodexAppServerModels(options = {}) {
 async function withCodexAppServerModelClient(options, run) {
 	const timeoutMs = options.timeoutMs ?? 2500;
 	const useSharedClient = options.sharedClient !== false;
-	const { createIsolatedCodexAppServerClient, getSharedCodexAppServerClient } = await import("./shared-client-B7LbV3PF.js").then((n) => n.r);
+	const { createIsolatedCodexAppServerClient, getSharedCodexAppServerClient } = await import("./shared-client-Dfk3Enm-.js").then((n) => n.r);
 	const client = useSharedClient ? await getSharedCodexAppServerClient({
 		startOptions: options.startOptions,
 		timeoutMs,