@openclaw/codex 2026.5.10-beta.2 → 2026.5.10-beta.4

package/dist/media-understanding-provider.js

@@ -1,8 +1,9 @@
 import { CODEX_PROVIDER_ID, FALLBACK_CODEX_MODELS } from "./provider-catalog.js";
-import { s as resolveCodexAppServerRuntimeOptions } from "./config-CT01BBDc.js";
-import { a as readCodexErrorNotification, c as readCodexTurnCompletedNotification, n as assertCodexThreadStartResponse, r as assertCodexTurnStartResponse } from "./protocol-validators-CeCyJaWj.js";
-import { i as readModelListResult } from "./models-H-PTi3W0.js";
+import { s as resolveCodexAppServerRuntimeOptions } from "./config-C7xdbzrp.js";
+import { i as assertCodexTurnStartResponse, l as readCodexTurnCompletedNotification, o as readCodexErrorNotification, r as assertCodexThreadStartResponse } from "./protocol-validators-CSY0BFBo.js";
+import { i as readModelListResult } from "./models-Bg-Qf5s-.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
+import { validateJsonSchemaValue } from "openclaw/plugin-sdk/json-schema-runtime";
 //#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;
 const DEFAULT_CODEX_IMAGE_PROMPT = "Describe the image.";
@@ -28,38 +29,63 @@ function buildCodexMediaUnderstandingProvider(options = {}) {
 			agentDir: req.agentDir,
 			cfg: req.cfg
 		}, options),
-		describeImages: async (req) => describeCodexImages(req, options)
+		describeImages: async (req) => describeCodexImages(req, options),
+		extractStructured: async (req) => extractCodexStructured(req, options)
 	};
 }
 async function describeCodexImages(req, options) {
 	const model = req.model.trim();
 	if (!model) throw new Error("Codex image understanding requires model id.");
-	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-p-TvEiNL.js").then((n) => n.r).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
+	return {
+		text: await runBoundedCodexVisionTurn({
+			model,
+			profile: req.profile,
+			timeoutMs: req.timeoutMs,
+			agentDir: req.agentDir,
+			options,
+			taskLabel: "image understanding",
+			developerInstructions: "You are OpenClaw's bounded image-understanding worker. Describe only the provided image content. Do not call tools, edit files, or ask follow-up questions.",
+			input: [{
+				type: "text",
+				text: buildCodexImagePrompt(req),
+				text_elements: []
+			}, ...req.images.map((image) => ({
+				type: "image",
+				url: `data:${image.mime ?? "image/png"};base64,${image.buffer.toString("base64")}`
+			}))],
+			requiredModalities: ["text", "image"]
+		}),
+		model
+	};
+}
+async function runBoundedCodexVisionTurn(params) {
+	const appServer = resolveCodexAppServerRuntimeOptions({ pluginConfig: params.options.pluginConfig });
+	const timeoutMs = Math.max(100, params.timeoutMs);
+	const ownsClient = !params.options.clientFactory;
+	const client = params.options.clientFactory ? await params.options.clientFactory(appServer.start, params.profile) : await import("./shared-client-K13b0L1X.js").then((n) => n.i).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
 		startOptions: appServer.start,
 		timeoutMs,
-		authProfileId: req.profile
+		authProfileId: params.profile
 	}));
 	const abortController = new AbortController();
 	const timeout = setTimeout(() => abortController.abort("timeout"), timeoutMs);
 	timeout.unref?.();
 	try {
-		await assertCodexModelSupportsImage({
+		await assertCodexModelSupportsInput({
 			client,
-			model,
+			model: params.model,
+			requiredModalities: params.requiredModalities,
 			timeoutMs,
 			signal: abortController.signal
 		});
 		const thread = assertCodexThreadStartResponse(await client.request("thread/start", {
-			model,
+			model: params.model,
 			modelProvider: "openai",
-			cwd: req.agentDir || process.cwd(),
+			cwd: params.agentDir || process.cwd(),
 			approvalPolicy: "on-request",
 			sandbox: "read-only",
 			serviceName: "OpenClaw",
-			developerInstructions: "You are OpenClaw's bounded image-understanding worker. Describe only the provided image content. Do not call tools, edit files, or ask follow-up questions.",
+			developerInstructions: params.developerInstructions,
 			dynamicTools: [],
 			experimentalRawEvents: true,
 			persistExtendedHistory: false,
@@ -68,35 +94,25 @@ async function describeCodexImages(req, options) {
 			timeoutMs,
 			signal: abortController.signal
 		}));
-		const collector = createCodexImageTurnCollector(thread.thread.id);
+		const collector = createCodexTurnCollector(thread.thread.id, params.taskLabel);
 		const cleanup = client.addNotificationHandler(collector.handleNotification);
 		const requestCleanup = client.addRequestHandler(denyCodexImageApprovalRequest);
 		try {
 			const turn = assertCodexTurnStartResponse(await client.request("turn/start", {
 				threadId: thread.thread.id,
-				input: [{
-					type: "text",
-					text: buildCodexImagePrompt(req),
-					text_elements: []
-				}, ...req.images.map((image) => ({
-					type: "image",
-					url: `data:${image.mime ?? "image/png"};base64,${image.buffer.toString("base64")}`
-				}))],
-				cwd: req.agentDir || process.cwd(),
+				input: params.input,
+				cwd: params.agentDir || process.cwd(),
 				approvalPolicy: "on-request",
-				model,
+				model: params.model,
 				effort: "low"
 			}, {
 				timeoutMs,
 				signal: abortController.signal
 			}));
-			return {
-				text: await collector.collect(turn.turn, {
-					timeoutMs,
-					signal: abortController.signal
-				}),
-				model
-			};
+			return await collector.collect(turn.turn, {
+				timeoutMs,
+				signal: abortController.signal
+			});
 		} finally {
 			requestCleanup();
 			cleanup();
@@ -106,6 +122,29 @@ async function describeCodexImages(req, options) {
 		if (ownsClient) client.close();
 	}
 }
+async function extractCodexStructured(req, options) {
+	const model = req.model.trim();
+	if (!model) throw new Error("Codex structured extraction requires model id.");
+	if (!req.instructions.trim()) throw new Error("Codex structured extraction requires instructions.");
+	if (req.input.length === 0) throw new Error("Codex structured extraction requires at least one input.");
+	if (!req.input.some((entry) => entry.type === "image")) throw new Error("Codex structured extraction requires at least one image input.");
+	return normalizeStructuredExtractionResult({
+		text: await runBoundedCodexVisionTurn({
+			model,
+			profile: req.profile,
+			timeoutMs: req.timeoutMs,
+			agentDir: req.agentDir,
+			options,
+			taskLabel: "structured extraction",
+			developerInstructions: "You are OpenClaw's bounded structured-extraction worker. Return only the requested extraction. Do not call tools, edit files, ask follow-up questions, or include secrets.",
+			input: buildCodexStructuredInput(req),
+			requiredModalities: requiredStructuredModalities()
+		}),
+		model,
+		provider: req.provider,
+		req
+	});
+}
 function denyCodexImageApprovalRequest(request) {
 	if (request.method === "item/commandExecution/requestApproval" || request.method === "item/fileChange/requestApproval") return {
 		decision: "decline",
@@ -121,7 +160,7 @@ function denyCodexImageApprovalRequest(request) {
 	};
 	if (request.method === "mcpServer/elicitation/request") return { action: "decline" };
 }
-async function assertCodexModelSupportsImage(params) {
+async function assertCodexModelSupportsInput(params) {
 	const match = readModelListResult(await params.client.request("model/list", {
 		limit: 100,
 		cursor: null,
@@ -131,14 +170,75 @@ async function assertCodexModelSupportsImage(params) {
 		signal: params.signal
 	})).models.find((entry) => entry.model === params.model || entry.id === params.model);
 	if (!match) throw new Error(`Codex app-server model not found: ${params.model}`);
-	if (!match.inputModalities.includes("image")) throw new Error(`Codex app-server model does not support images: ${params.model}`);
+	if (params.requiredModalities.includes("image") && !match.inputModalities.includes("image")) throw new Error(`Codex app-server model does not support images: ${params.model}`);
+	if (params.requiredModalities.includes("text") && !match.inputModalities.includes("text")) throw new Error(`Codex app-server model does not support text: ${params.model}`);
 }
 function buildCodexImagePrompt(req) {
 	const prompt = req.prompt?.trim() || DEFAULT_CODEX_IMAGE_PROMPT;
 	if (req.images.length <= 1) return prompt;
 	return `${prompt}\n\nAnalyze all ${req.images.length} images together.`;
 }
-function createCodexImageTurnCollector(threadId) {
+function requiredStructuredModalities() {
+	return ["text", "image"];
+}
+function buildCodexStructuredInput(req) {
+	return [{
+		type: "text",
+		text: buildStructuredExtractionPrompt(req),
+		text_elements: []
+	}, ...req.input.map((entry) => {
+		if (entry.type === "text") return {
+			type: "text",
+			text: entry.text,
+			text_elements: []
+		};
+		return {
+			type: "image",
+			url: `data:${entry.mime ?? "image/png"};base64,${entry.buffer.toString("base64")}`
+		};
+	})];
+}
+function buildStructuredExtractionPrompt(req) {
+	return [
+		req.instructions.trim(),
+		req.schemaName ? `Schema name: ${req.schemaName}` : void 0,
+		req.jsonSchema ? `JSON schema:\n${JSON.stringify(req.jsonSchema)}` : void 0,
+		req.jsonMode === false ? "Return the extraction as concise text." : "Return valid JSON only. Do not wrap the JSON in Markdown fences."
+	].filter((part) => Boolean(part)).join("\n\n");
+}
+function isJsonSchemaObject(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function normalizeStructuredExtractionResult(params) {
+	const result = {
+		text: params.text,
+		model: params.model,
+		provider: params.provider,
+		contentType: params.req.jsonMode === false ? "text" : "json"
+	};
+	if (params.req.jsonMode !== false) {
+		try {
+			result.parsed = JSON.parse(params.text);
+		} catch {
+			throw new Error("Codex structured extraction returned invalid JSON.");
+		}
+		if (isJsonSchemaObject(params.req.jsonSchema)) {
+			const validation = validateJsonSchemaValue({
+				schema: params.req.jsonSchema,
+				cacheKey: "codex.media-understanding.extractStructured",
+				value: result.parsed,
+				cache: false
+			});
+			if (!validation.ok) {
+				const message = validation.errors.map((error) => error.text).join("; ") || "invalid";
+				throw new Error(`Codex structured extraction JSON did not match schema: ${message}`);
+			}
+			result.parsed = validation.value;
+		}
+	}
+	return result;
+}
+function createCodexTurnCollector(threadId, taskLabel) {
 	let turnId;
 	let completedTurn;
 	let promptError;
@@ -174,7 +274,7 @@ function createCodexImageTurnCollector(threadId) {
 			return;
 		}
 		if (notification.method === "error") {
-			promptError = readCodexErrorNotification(notification.params)?.error.message ?? "codex app-server image turn failed";
+			promptError = readCodexErrorNotification(notification.params)?.error.message ?? `codex app-server ${taskLabel} turn failed`;
 			resolveCompletion?.();
 		}
 	};
@@ -187,14 +287,15 @@ function createCodexImageTurnCollector(threadId) {
 			if (!completedTurn && !promptError) await waitForTurnCompletion({
 				completion,
 				timeoutMs: options.timeoutMs,
-				signal: options.signal
+				signal: options.signal,
+				taskLabel
 			});
 			if (promptError) throw new Error(promptError);
-			if (completedTurn?.status === "failed") throw new Error(completedTurn.error?.message ?? "codex app-server image turn failed");
+			if (completedTurn?.status === "failed") throw new Error(completedTurn.error?.message ?? `codex app-server ${taskLabel} turn failed`);
 			const itemText = collectAssistantTextFromItems(completedTurn?.items);
 			const deltaText = assistantItemOrder.map((itemId) => assistantTextByItem.get(itemId)?.trim()).filter((text) => Boolean(text)).join("\n\n").trim();
 			const text = (itemText || deltaText).trim();
-			if (!text) throw new Error("Codex app-server image turn returned no text.");
+			if (!text) throw new Error(`Codex app-server ${taskLabel} turn returned no text.`);
 			return text;
 		}
 	};
@@ -204,9 +305,9 @@ async function waitForTurnCompletion(params) {
 	let cleanupAbort;
 	try {
 		await Promise.race([params.completion, new Promise((_, reject) => {
-			timeout = setTimeout(() => reject(/* @__PURE__ */ new Error("codex app-server image turn timed out")), params.timeoutMs);
+			timeout = setTimeout(() => reject(/* @__PURE__ */ new Error(`codex app-server ${params.taskLabel} turn timed out`)), params.timeoutMs);
 			timeout.unref?.();
-			const abortListener = () => reject(/* @__PURE__ */ new Error("codex app-server image turn aborted"));
+			const abortListener = () => reject(/* @__PURE__ */ new Error(`codex app-server ${params.taskLabel} turn aborted`));
 			params.signal.addEventListener("abort", abortListener, { once: true });
 			cleanupAbort = () => params.signal.removeEventListener("abort", abortListener);
 		})]);

package/dist/{models-H-PTi3W0.js → models-Bg-Qf5s-.js}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-DUslC3ob.js";
-import { o as readCodexModelListResponse } from "./protocol-validators-CeCyJaWj.js";
+import { s as readCodexModelListResponse } from "./protocol-validators-CSY0BFBo.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-p-TvEiNL.js").then((n) => n.r);
+	const { createIsolatedCodexAppServerClient, getSharedCodexAppServerClient } = await import("./shared-client-K13b0L1X.js").then((n) => n.i);
 	const client = useSharedClient ? await getSharedCodexAppServerClient({
 		startOptions: options.startOptions,
 		timeoutMs,

package/dist/{plugin-activation-CweAZa7r.js → plugin-activation-C0soz2YD.js}

@@ -1,4 +1,4 @@
-import { l as resolveCodexPluginsPolicy, t as CODEX_PLUGINS_MARKETPLACE_NAME } from "./config-CT01BBDc.js";
+import { l as resolveCodexPluginsPolicy, t as CODEX_PLUGINS_MARKETPLACE_NAME } from "./config-C7xdbzrp.js";
 import "node:fs/promises";
 import "node:path";
 var CodexAppInventoryCache = class {

package/dist/{protocol-validators-CeCyJaWj.js → protocol-validators-CSY0BFBo.js}

@@ -5900,6 +5900,9 @@ const validateTurnStartResponse = ajv.compile(TurnStartResponse_default);
 function assertCodexThreadStartResponse(value) {
 	return assertCodexShape(validateThreadStartResponse, normalizeThreadResponse(value), "thread/start response");
 }
+function assertCodexThreadForkResponse(value) {
+	return assertCodexShape(validateThreadStartResponse, normalizeThreadResponse(value), "thread/fork response");
+}
 function assertCodexThreadResumeResponse(value) {
 	return assertCodexShape(validateThreadResumeResponse, normalizeThreadResponse(value), "thread/resume response");
 }
@@ -6010,4 +6013,4 @@ function formatAjvErrors(validate) {
 	return ajv.errorsText(errors, { separator: "; " });
 }
 //#endregion
-export { readCodexErrorNotification as a, readCodexTurnCompletedNotification as c, readCodexDynamicToolCallParams as i, assertCodexThreadStartResponse as n, readCodexModelListResponse as o, assertCodexTurnStartResponse as r, readCodexTurn as s, assertCodexThreadResumeResponse as t };
+export { readCodexDynamicToolCallParams as a, readCodexTurn as c, assertCodexTurnStartResponse as i, readCodexTurnCompletedNotification as l, assertCodexThreadResumeResponse as n, readCodexErrorNotification as o, assertCodexThreadStartResponse as r, readCodexModelListResponse as s, assertCodexThreadForkResponse as t };

package/dist/provider.js

@@ -1,5 +1,5 @@
 import { CODEX_APP_SERVER_AUTH_MARKER, CODEX_BASE_URL, CODEX_PROVIDER_ID, FALLBACK_CODEX_MODELS, buildCodexModelDefinition, buildCodexProviderConfig } from "./provider-catalog.js";
-import { o as readCodexPluginConfig, s as resolveCodexAppServerRuntimeOptions } from "./config-CT01BBDc.js";
+import { o as readCodexPluginConfig, s as resolveCodexAppServerRuntimeOptions } from "./config-C7xdbzrp.js";
 import { resolveCodexSystemPromptContribution } from "./prompt-overlay.js";
 import { resolvePluginConfigObject } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { createSubsystemLogger } from "openclaw/plugin-sdk/core";
@@ -123,7 +123,7 @@ async function listModelsBestEffort(params) {
 	}
 }
 async function listCodexAppServerModelsLazy(options) {
-	const { listCodexAppServerModels } = await import("./models-H-PTi3W0.js").then((n) => n.r);
+	const { listCodexAppServerModels } = await import("./models-Bg-Qf5s-.js").then((n) => n.r);
 	return listCodexAppServerModels(options);
 }
 function normalizeTimeoutMs(value) {

package/dist/rate-limit-cache-dvhq-4pi.js

@@ -0,0 +1,24 @@
+//#region extensions/codex/src/app-server/rate-limit-cache.ts
+const DEFAULT_CODEX_RATE_LIMIT_CACHE_MAX_AGE_MS = 10 * 6e4;
+const CODEX_RATE_LIMIT_CACHE_STATE = Symbol.for("openclaw.codexRateLimitCacheState");
+function getCodexRateLimitCacheState() {
+	const globalState = globalThis;
+	globalState[CODEX_RATE_LIMIT_CACHE_STATE] ??= {};
+	return globalState[CODEX_RATE_LIMIT_CACHE_STATE];
+}
+function rememberCodexRateLimits(value, nowMs = Date.now()) {
+	if (value === void 0) return;
+	const state = getCodexRateLimitCacheState();
+	state.value = value;
+	state.updatedAtMs = nowMs;
+}
+function readRecentCodexRateLimits(options) {
+	const state = getCodexRateLimitCacheState();
+	if (state.value === void 0 || state.updatedAtMs === void 0) return;
+	const nowMs = options?.nowMs ?? Date.now();
+	const maxAgeMs = options?.maxAgeMs ?? DEFAULT_CODEX_RATE_LIMIT_CACHE_MAX_AGE_MS;
+	if (maxAgeMs >= 0 && nowMs - state.updatedAtMs > maxAgeMs) return;
+	return state.value;
+}
+//#endregion
+export { rememberCodexRateLimits as n, readRecentCodexRateLimits as t };

package/dist/request-BCAfJvSg.js

@@ -0,0 +1,41 @@
+import { n as CodexAppServerRpcError } from "./client-CpksBQ9l.js";
+import { a as withTimeout, n as createIsolatedCodexAppServerClient, r as getSharedCodexAppServerClient } from "./shared-client-K13b0L1X.js";
+//#region extensions/codex/src/app-server/capabilities.ts
+const CODEX_CONTROL_METHODS = {
+	account: "account/read",
+	compact: "thread/compact/start",
+	feedback: "feedback/upload",
+	listMcpServers: "mcpServerStatus/list",
+	listSkills: "skills/list",
+	listThreads: "thread/list",
+	rateLimits: "account/rateLimits/read",
+	resumeThread: "thread/resume",
+	review: "review/start"
+};
+function describeControlFailure(error) {
+	if (isUnsupportedControlError(error)) return "unsupported by this Codex app-server";
+	return error instanceof Error ? error.message : String(error);
+}
+function isUnsupportedControlError(error) {
+	return error instanceof CodexAppServerRpcError && error.code === -32601;
+}
+//#endregion
+//#region extensions/codex/src/app-server/request.ts
+async function requestCodexAppServerJson(params) {
+	const timeoutMs = params.timeoutMs ?? 6e4;
+	return await withTimeout((async () => {
+		const client = await (params.isolated ? createIsolatedCodexAppServerClient : getSharedCodexAppServerClient)({
+			startOptions: params.startOptions,
+			timeoutMs,
+			authProfileId: params.authProfileId,
+			config: params.config
+		});
+		try {
+			return await client.request(params.method, params.requestParams, { timeoutMs });
+		} finally {
+			if (params.isolated) client.close();
+		}
+	})(), timeoutMs, `codex app-server ${params.method} timed out`);
+}
+//#endregion
+export { CODEX_CONTROL_METHODS as n, describeControlFailure as r, requestCodexAppServerJson as t };