@openclaw/codex 2026.7.2-beta.7 → 2026.7.34

package/dist/{conversation-binding-data-BHRpYbX3.js → .setup/conversation-binding-data-CrRxtDBu.mjs}

@@ -1,4 +1,4 @@
-import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
+import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import process from "node:process";

package/dist/{bounded-turn-D2ZAgZVz.js → .setup/media-understanding-provider-EbJCyDqe.mjs}

@@ -1,10 +1,11 @@
-import { W as isJsonObject, s as isCodexAppServerStartSelectionChangedError } from "./shared-client-DTbvH-XV.js";
-import { g as resolveCodexAppServerRuntimeOptions } from "./session-binding-BXpo9ymA.js";
-import { G as mergeCodexThreadConfigs, d as attestCodexRingZeroThreadHasNoMcpServers, f as buildCodexRingZeroThreadConfigPatch, m as readCodexInheritedMcpServerNames, mt as interruptCodexTurnAndWaitBestEffort, p as buildCodexRuntimeThreadConfig, u as assertCodexRingZeroHasNoManagedHooks, ut as CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS } from "./thread-lifecycle-DF53ogiA.js";
-import { _ as readCodexNotificationItem, h as isRetryableErrorNotification } from "./attempt-notifications-AP-a-Q5k.js";
-import { n as normalizeCodexResponseTokenUsage } from "./event-projector-usage-Xp4AlR2k.js";
-import { C as readCodexTurnCompletedNotification, _ as assertCodexThreadStartResponse, b as readCodexErrorNotification, v as assertCodexTurnStartResponse } from "./transcript-mirror-DzsdNCf5.js";
-import { r as readModelListResult } from "./models-BBMKU4jA.js";
+import { CODEX_PROVIDER_ID, FALLBACK_CODEX_MODELS } from "../provider-catalog.js";
+import { r as isJsonObject } from "./protocol-2POPqAY4.mjs";
+import { _ as readCodexNotificationItem } from "./attempt-notifications-F8krwWL4.mjs";
+import { d as resolveCodexAppServerRuntimeOptions } from "./config-CYEDnLJ2.mjs";
+import { i as assertCodexTurnStartResponse, l as readCodexTurnCompletedNotification, o as readCodexErrorNotification, r as assertCodexThreadStartResponse } from "./protocol-validators-dZQ-UTOa.mjs";
+import { i as readModelListResult } from "./models-C_aZk03A.mjs";
+import { H as mergeCodexThreadConfigs, r as buildCodexRuntimeThreadConfig } from "./thread-lifecycle-u6CZdOOH.mjs";
+import { validateJsonSchemaValue } from "openclaw/plugin-sdk/json-schema-runtime";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
@@ -15,7 +16,7 @@ const CODEX_PRIVATE_STDIO_ARGS = [
 	"--listen",
 	"stdio://"
 ];
-const CODEX_APP_SERVER_ARGS_ENV_KEY = "OPENCLAW_CODEX_APP_SERVER_ARGS";
+const OPENCLAW_CODEX_APP_SERVER_ARGS_ENV_VAR = "OPENCLAW_CODEX_APP_SERVER_ARGS";
 const CODEX_BOUNDED_THREAD_CONFIG = {
 	"features.multi_agent": false,
 	"features.apps": false,
@@ -28,22 +29,8 @@ const CODEX_PRIVATE_BOUNDED_THREAD_CONFIG = {
 	"features.hooks": false,
 	notify: []
 };
-const CODEX_SETTLED_FINALIZER_THREAD_CONFIG = {
-	"skills.include_instructions": false,
-	include_environment_context: false
-};
-var CodexBoundedTurnTimeoutError = class extends Error {
-	constructor(taskLabel, timeoutMs) {
-		const bound = timeoutMs % 1e3 === 0 ? `${timeoutMs / 1e3}s` : `${timeoutMs}ms`;
-		super(`codex app-server ${taskLabel} turn timed out after ${bound}`);
-		this.name = "TimeoutError";
-	}
-};
 async function runBoundedCodexAppServerTurn(params) {
-	const appServer = resolveCodexAppServerRuntimeOptions({
-		pluginConfig: params.options.pluginConfig,
-		managedCommandOrder: params.isolation === "private-stdio" ? "package-first" : void 0
-	});
+	const appServer = resolveCodexAppServerRuntimeOptions({ pluginConfig: params.options.pluginConfig });
 	if (params.isolation === "configured-transport") return await runBoundedCodexAppServerTurnInWorkspace(params, appServer, { cwd: params.agentDir?.trim() || process.cwd() });
 	if (appServer.start.transport !== "stdio") throw new Error("Bounded Codex turns require stdio transport so native tools can be isolated.");
 	return await withTempWorkspace({
@@ -59,12 +46,8 @@ async function runBoundedCodexAppServerTurn(params) {
 		});
 	});
 }
-async function runBoundedCodexAppServerTurnInWorkspace(params, appServer, workspace, selectionAttempt = 0, timing) {
-	const totalTimeoutMs = timing?.timeoutMs ?? resolveTimerTimeoutMs(params.timeoutMs, 100, 100);
-	const timeoutError = new CodexBoundedTurnTimeoutError(params.taskLabel, totalTimeoutMs);
-	const deadline = timing?.deadline ?? Date.now() + totalTimeoutMs;
-	const timeoutMs = deadline - Date.now();
-	if (timeoutMs <= 0) throw timeoutError;
+async function runBoundedCodexAppServerTurnInWorkspace(params, appServer, workspace) {
+	const timeoutMs = resolveTimerTimeoutMs(params.timeoutMs, 100, 100);
 	const agentDir = params.agentDir?.trim() || void 0;
 	const startOptions = workspace.codexHome ? buildPrivateCodexAppServerStartOptions(appServer.start, workspace.codexHome) : appServer.start;
 	const ownsClient = !params.options.clientFactory;
@@ -73,41 +56,21 @@ async function runBoundedCodexAppServerTurnInWorkspace(params, appServer, worksp
 		authProfileId: params.profile,
 		agentDir,
 		config: params.config,
-		timeoutMs,
-		...params.signal ? { abandonSignal: params.signal } : {}
-	}) : await import("./shared-client-DTbvH-XV.js").then((n) => n.m).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
+		timeoutMs
+	}) : await import("./shared-client-B2KmLPRw.mjs").then((n) => n.c).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
 		startOptions,
 		timeoutMs,
 		authProfileId: params.profile,
 		agentDir,
 		authProfileStore: params.authProfileStore,
-		config: params.config,
-		...params.signal ? { abandonSignal: params.signal } : {}
+		config: params.config
 	}));
 	const abortController = new AbortController();
-	let activeThreadId;
-	let activeTurnId = "";
-	let interruptPromise;
-	const requestInterrupt = () => {
-		if (!activeThreadId || interruptPromise) return;
-		interruptPromise = interruptCodexTurnAndWaitBestEffort(client, {
-			threadId: activeThreadId,
-			turnId: activeTurnId,
-			timeoutMs: CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS
-		});
-	};
-	const abortRun = (reason) => {
-		abortController.abort(reason);
-		requestInterrupt();
-	};
-	const abortFromCaller = () => abortRun(params.signal?.reason ?? "aborted");
+	const abortFromCaller = () => abortController.abort(params.signal?.reason ?? "aborted");
 	if (params.signal?.aborted) abortFromCaller();
 	else params.signal?.addEventListener("abort", abortFromCaller, { once: true });
-	const remainingRunMs = deadline - Date.now();
-	if (remainingRunMs <= 0) abortRun(timeoutError);
-	const timeout = setTimeout(() => abortRun(timeoutError), Math.max(1, remainingRunMs));
+	const timeout = setTimeout(() => abortController.abort("timeout"), timeoutMs);
 	timeout.unref?.();
-	let retrySelection = false;
 	try {
 		const model = await resolveCodexBoundedTurnModel({
 			client,
@@ -116,8 +79,6 @@ async function runBoundedCodexAppServerTurnInWorkspace(params, appServer, worksp
 			timeoutMs,
 			signal: abortController.signal
 		});
-		const inheritedMcpServerNames = params.requireNoExternalCapabilities ? await readCodexInheritedMcpServerNames(client, workspace.cwd, abortController.signal) : [];
-		if (params.requireNoExternalCapabilities) await assertCodexRingZeroHasNoManagedHooks(client, abortController.signal);
 		const thread = assertCodexThreadStartResponse(await client.request("thread/start", {
 			model,
 			modelProvider: "openai",
@@ -125,9 +86,8 @@ async function runBoundedCodexAppServerTurnInWorkspace(params, appServer, worksp
 			approvalPolicy: "on-request",
 			sandbox: "read-only",
 			serviceName: "OpenClaw",
-			...params.requireNoExternalCapabilities ? { baseInstructions: "" } : {},
 			developerInstructions: params.developerInstructions,
-			config: buildCodexRuntimeThreadConfig(resolveBoundedThreadConfig(params, workspace, inheritedMcpServerNames), { nativeCodeModeEnabled: false }),
+			config: buildCodexRuntimeThreadConfig(resolveBoundedThreadConfig(params, workspace), { nativeCodeModeEnabled: false }),
 			environments: [],
 			dynamicTools: [],
 			experimentalRawEvents: true,
@@ -136,16 +96,6 @@ async function runBoundedCodexAppServerTurnInWorkspace(params, appServer, worksp
 			timeoutMs,
 			signal: abortController.signal
 		}));
-		activeThreadId = thread.thread.id;
-		if (abortController.signal.aborted) requestInterrupt();
-		if (params.requireNoExternalCapabilities) await attestCodexRingZeroThreadHasNoMcpServers(client, thread.thread.id, abortController.signal);
-		if (params.historyItems?.length) await client.request("thread/inject_items", {
-			threadId: thread.thread.id,
-			items: params.historyItems
-		}, {
-			timeoutMs,
-			signal: abortController.signal
-		});
 		const collector = createCodexBoundedTurnCollector(thread.thread.id, params.taskLabel);
 		const cleanup = client.addNotificationHandler(collector.handleNotification);
 		const requestCleanup = client.addRequestHandler(createCodexBoundedApprovalHandler(params.taskLabel));
@@ -161,12 +111,10 @@ async function runBoundedCodexAppServerTurnInWorkspace(params, appServer, worksp
 				timeoutMs,
 				signal: abortController.signal
 			}));
-			activeTurnId = turn.turn.id;
-			if (abortController.signal.aborted) requestInterrupt();
 			return {
 				...await collector.collect(turn.turn, {
-					signal: abortController.signal,
-					timeoutError
+					timeoutMs,
+					signal: abortController.signal
 				}),
 				model
 			};
@@ -174,33 +122,21 @@ async function runBoundedCodexAppServerTurnInWorkspace(params, appServer, worksp
 			requestCleanup();
 			cleanup();
 		}
-	} catch (error) {
-		if (abortController.signal.aborted) throw resolveCodexBoundedTurnAbortError(abortController.signal, params.taskLabel, timeoutError);
-		if (ownsClient && isCodexAppServerStartSelectionChangedError(error) && selectionAttempt === 0) retrySelection = true;
-		else throw error;
 	} finally {
 		clearTimeout(timeout);
 		params.signal?.removeEventListener("abort", abortFromCaller);
-		await interruptPromise;
 		if (ownsClient) client.close();
 	}
-	if (retrySelection) return await runBoundedCodexAppServerTurnInWorkspace(params, appServer, workspace, selectionAttempt + 1, {
-		deadline,
-		timeoutMs: totalTimeoutMs
-	});
-	throw new Error("Codex bounded turn selection retry exited unexpectedly");
 }
-function resolveBoundedThreadConfig(params, workspace, inheritedMcpServerNames) {
+function resolveBoundedThreadConfig(params, workspace) {
 	const boundedConfig = mergeCodexThreadConfigs(CODEX_BOUNDED_THREAD_CONFIG, params.threadConfig) ?? CODEX_BOUNDED_THREAD_CONFIG;
-	const privateConfig = workspace.codexHome ? mergeCodexThreadConfigs(boundedConfig, CODEX_PRIVATE_BOUNDED_THREAD_CONFIG) ?? boundedConfig : boundedConfig;
-	if (!params.requireNoExternalCapabilities) return privateConfig;
-	return mergeCodexThreadConfigs(privateConfig, CODEX_SETTLED_FINALIZER_THREAD_CONFIG, buildCodexRingZeroThreadConfigPatch({ toolsAllow: ["openclaw"] }, true, inheritedMcpServerNames)) ?? privateConfig;
+	return workspace.codexHome ? mergeCodexThreadConfigs(boundedConfig, CODEX_PRIVATE_BOUNDED_THREAD_CONFIG) ?? boundedConfig : boundedConfig;
 }
 function buildPrivateCodexAppServerStartOptions(start, codexHome) {
-	const privateEnv = Object.fromEntries(Object.entries(start.env ?? {}).filter(([name]) => name.trim().toUpperCase() !== CODEX_APP_SERVER_ARGS_ENV_KEY));
+	const privateEnv = Object.fromEntries(Object.entries(start.env ?? {}).filter(([name]) => name.trim().toUpperCase() !== OPENCLAW_CODEX_APP_SERVER_ARGS_ENV_VAR));
 	const clearEnv = (start.clearEnv ?? []).filter((name) => {
 		const normalized = name.trim().toUpperCase();
-		return normalized !== "CODEX_HOME" && normalized !== CODEX_APP_SERVER_ARGS_ENV_KEY;
+		return normalized !== "CODEX_HOME" && normalized !== OPENCLAW_CODEX_APP_SERVER_ARGS_ENV_VAR;
 	});
 	return {
 		...start,
@@ -209,7 +145,7 @@ function buildPrivateCodexAppServerStartOptions(start, codexHome) {
 			...privateEnv,
 			CODEX_HOME: codexHome
 		},
-		clearEnv: [...clearEnv, CODEX_APP_SERVER_ARGS_ENV_KEY]
+		clearEnv: [...clearEnv, OPENCLAW_CODEX_APP_SERVER_ARGS_ENV_VAR]
 	};
 }
 function createCodexBoundedApprovalHandler(taskLabel) {
@@ -230,14 +166,15 @@ function createCodexBoundedApprovalHandler(taskLabel) {
 	};
 }
 async function resolveCodexBoundedTurnModel(params) {
-	const listed = readModelListResult(await params.client.request("model/list", {
+	const result = await params.client.request("model/list", {
 		limit: null,
 		cursor: null,
 		includeHidden: false
 	}, {
 		timeoutMs: Math.min(params.timeoutMs, 5e3),
 		signal: params.signal
-	})).models;
+	});
+	const listed = readModelListResult(result).models;
 	if (params.selection.mode === "live-default") {
 		const supported = listed.filter((entry) => params.requiredModalities.every((modality) => entry.inputModalities.includes(modality)));
 		const selected = supported.find((entry) => entry.isDefault) ?? supported[0];
@@ -255,7 +192,6 @@ function createCodexBoundedTurnCollector(threadId, taskLabel) {
 	let turnId;
 	let completedTurn;
 	let promptError;
-	let responseUsage;
 	const pending = [];
 	const completedItems = /* @__PURE__ */ new Map();
 	const assistantTextByItem = /* @__PURE__ */ new Map();
@@ -291,18 +227,12 @@ function createCodexBoundedTurnCollector(threadId, taskLabel) {
 			rememberAssistantText(itemId, `${assistantTextByItem.get(itemId) ?? ""}${delta}`);
 			return;
 		}
-		if (notification.method === "rawResponse/completed") {
-			const usage = isJsonObject(params.usage) ? params.usage : void 0;
-			responseUsage = usage ? normalizeCodexResponseTokenUsage(usage) : void 0;
-			return;
-		}
 		if (notification.method === "turn/completed") {
 			completedTurn = readCodexTurnCompletedNotification(notification.params)?.turn ?? completedTurn;
 			resolveCompletion?.();
 			return;
 		}
 		if (notification.method === "error") {
-			if (isRetryableErrorNotification(notification.params)) return;
 			promptError = readCodexErrorNotification(notification.params)?.error.message ?? `codex app-server ${taskLabel} turn failed`;
 			resolveCompletion?.();
 		}
@@ -315,13 +245,12 @@ function createCodexBoundedTurnCollector(threadId, taskLabel) {
 			for (const notification of pending.splice(0)) handleNotification(notification);
 			if (!completedTurn && !promptError) await waitForTurnCompletion({
 				completion,
+				timeoutMs: options.timeoutMs,
 				signal: options.signal,
-				taskLabel,
-				timeoutError: options.timeoutError
+				taskLabel
 			});
 			if (promptError) throw new Error(promptError);
 			if (completedTurn?.status === "failed") throw new Error(completedTurn.error?.message ?? `codex app-server ${taskLabel} turn failed`);
-			if (completedTurn?.status !== "completed") throw new Error(`codex app-server ${taskLabel} turn ended with status ${completedTurn?.status ?? "unknown"}`);
 			const items = collectCompletedItems(completedTurn?.items, completedItems);
 			const itemText = collectAssistantTextFromItems(items);
 			const deltaText = assistantItemOrder.map((itemId) => assistantTextByItem.get(itemId)?.trim()).filter((text) => Boolean(text)).join("\n\n").trim();
@@ -329,8 +258,7 @@ function createCodexBoundedTurnCollector(threadId, taskLabel) {
 			if (!text) throw new Error(`Codex app-server ${taskLabel} turn returned no text.`);
 			return {
 				text,
-				items,
-				...responseUsage ? { usage: responseUsage } : {}
+				items
 			};
 		}
 	};
@@ -341,21 +269,22 @@ function collectCompletedItems(turnItems, notificationItems) {
 	return [...items.values()];
 }
 async function waitForTurnCompletion(params) {
-	if (params.signal.aborted) throw resolveCodexBoundedTurnAbortError(params.signal, params.taskLabel, params.timeoutError);
+	if (params.signal.aborted) throw new Error(`codex app-server ${params.taskLabel} turn aborted`);
+	let timeout;
 	let cleanupAbort;
 	try {
 		await Promise.race([params.completion, new Promise((_, reject) => {
-			const abortListener = () => reject(resolveCodexBoundedTurnAbortError(params.signal, params.taskLabel, params.timeoutError));
+			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 ${params.taskLabel} turn aborted`));
 			params.signal.addEventListener("abort", abortListener, { once: true });
 			cleanupAbort = () => params.signal.removeEventListener("abort", abortListener);
 		})]);
 	} finally {
+		if (timeout) clearTimeout(timeout);
 		cleanupAbort?.();
 	}
 }
-function resolveCodexBoundedTurnAbortError(signal, taskLabel, timeoutError) {
-	return signal.reason === timeoutError ? timeoutError : /* @__PURE__ */ new Error(`codex app-server ${taskLabel} turn aborted`);
-}
 function collectAssistantTextFromItems(items) {
 	return (items ?? []).filter((item) => item.type === "agentMessage").map((item) => item.text.trim()).filter(Boolean).join("\n\n").trim();
 }
@@ -372,4 +301,169 @@ function isTerminalTurn(turn) {
 	return turn.status === "completed" || turn.status === "interrupted" || turn.status === "failed";
 }
 //#endregion
-export { runBoundedCodexAppServerTurn as t };
+//#region extensions/codex/media-understanding-provider.ts
+/**
+* Codex-backed media understanding provider for bounded image description and
+* structured extraction turns.
+*/
+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.";
+/**
+* Builds the media-understanding provider that delegates image tasks to an
+* isolated Codex app-server session.
+*/
+function buildCodexMediaUnderstandingProvider(options = {}) {
+	return {
+		id: CODEX_PROVIDER_ID,
+		capabilities: ["image"],
+		...DEFAULT_CODEX_IMAGE_MODEL ? { defaultModels: { image: DEFAULT_CODEX_IMAGE_MODEL } } : {},
+		describeImage: async (req) => describeCodexImages({
+			images: [{
+				buffer: req.buffer,
+				fileName: req.fileName,
+				mime: req.mime
+			}],
+			provider: req.provider,
+			model: req.model,
+			prompt: req.prompt,
+			maxTokens: req.maxTokens,
+			timeoutMs: req.timeoutMs,
+			profile: req.profile,
+			preferredProfile: req.preferredProfile,
+			authStore: req.authStore,
+			agentDir: req.agentDir,
+			cfg: req.cfg
+		}, 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 { text } = await runBoundedCodexAppServerTurn({
+		config: req.cfg,
+		model: {
+			mode: "required",
+			id: model
+		},
+		profile: req.profile,
+		timeoutMs: req.timeoutMs,
+		agentDir: req.agentDir,
+		authProfileStore: req.authStore,
+		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"],
+		isolation: "configured-transport"
+	});
+	return {
+		text,
+		model
+	};
+}
+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.");
+	const { text } = await runBoundedCodexAppServerTurn({
+		config: req.cfg,
+		model: {
+			mode: "required",
+			id: model
+		},
+		profile: req.profile,
+		timeoutMs: req.timeoutMs,
+		agentDir: req.agentDir,
+		authProfileStore: req.authStore,
+		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(),
+		isolation: "configured-transport"
+	});
+	return normalizeStructuredExtractionResult({
+		text,
+		model,
+		provider: req.provider,
+		req
+	});
+}
+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 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;
+}
+//#endregion
+export { runBoundedCodexAppServerTurn as n, buildCodexMediaUnderstandingProvider as t };

package/dist/{models-BBMKU4jA.js → .setup/models-C_aZk03A.mjs}

@@ -1,10 +1,16 @@
-import { x as readCodexModelListResponse } from "./transcript-mirror-DzsdNCf5.js";
+import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
+import { s as readCodexModelListResponse } from "./protocol-validators-dZQ-UTOa.mjs";
 import { uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/codex/src/app-server/models.ts
 /**
 * Lists and normalizes models exposed by the Codex app-server `model/list`
 * endpoint, including pagination and shared-client lease handling.
 */
+var models_exports = /* @__PURE__ */ __exportAll({
+	listAllCodexAppServerModels: () => listAllCodexAppServerModels,
+	listCodexAppServerModels: () => listCodexAppServerModels,
+	readModelListResult: () => readModelListResult
+});
 /** Lists one Codex app-server model page using the configured auth/client options. */
 async function listCodexAppServerModels(options = {}) {
 	return await withCodexAppServerModelClient(options, async ({ client, timeoutMs }) => requestModelListPage(client, {
@@ -40,19 +46,17 @@ async function listAllCodexAppServerModels(options = {}) {
 async function withCodexAppServerModelClient(options, run) {
 	const timeoutMs = options.timeoutMs ?? 2500;
 	const useSharedClient = options.sharedClient !== false;
-	const { createIsolatedCodexAppServerClient, getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient } = await import("./shared-client-DTbvH-XV.js").then((n) => n.m);
+	const { createIsolatedCodexAppServerClient, getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient } = await import("./shared-client-B2KmLPRw.mjs").then((n) => n.c);
 	const client = useSharedClient ? await getLeasedSharedCodexAppServerClient({
 		startOptions: options.startOptions,
 		timeoutMs,
 		authProfileId: options.authProfileId,
-		authRequirement: options.authRequirement,
 		agentDir: options.agentDir,
 		config: options.config
 	}) : await createIsolatedCodexAppServerClient({
 		startOptions: options.startOptions,
 		timeoutMs,
 		authProfileId: options.authProfileId,
-		authRequirement: options.authRequirement,
 		agentDir: options.agentDir,
 		config: options.config
 	});
@@ -101,7 +105,8 @@ function readCodexModel(value) {
 	};
 }
 function readReasoningEfforts(value) {
-	return uniqueStrings(value.map((entry) => readNonEmptyString(entry.reasoningEffort)).filter((entry) => entry !== void 0));
+	const efforts = value.map((entry) => readNonEmptyString(entry.reasoningEffort)).filter((entry) => entry !== void 0);
+	return uniqueStrings(efforts);
 }
 function readNonEmptyString(value) {
 	if (typeof value !== "string") return;
@@ -111,4 +116,4 @@ function normalizeMaxPages(value) {
 	return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : 20;
 }
 //#endregion
-export { listCodexAppServerModels as n, readModelListResult as r, listAllCodexAppServerModels as t };
+export { readModelListResult as i, listCodexAppServerModels as n, models_exports as r, listAllCodexAppServerModels as t };

package/dist/.setup/notification-correlation-iYs4WieS.mjs

@@ -0,0 +1,35 @@
+import { r as isJsonObject } from "./protocol-2POPqAY4.mjs";
+//#region extensions/codex/src/app-server/notification-correlation.ts
+/**
+* Correlates Codex app-server notifications with the active thread/turn so
+* projectors can ignore global or stale events without losing diagnostics.
+*/
+/** Returns true when a notification payload belongs to the exact active thread and turn. */
+function isCodexNotificationForTurn(value, threadId, turnId) {
+	if (!isJsonObject(value)) return false;
+	return readCodexNotificationThreadId(value) === threadId && readCodexNotificationTurnId(value) === turnId;
+}
+/**
+* Reads a thread id from canonical top-level or nested thread payloads.
+* The generated v2 schemas require top-level `threadId` on turn/item-scoped
+* notifications and define `Turn` without one, so `turn.threadId` is not a
+* wire shape and is deliberately not read here.
+*/
+function readCodexNotificationThreadId(record) {
+	const thread = isJsonObject(record.thread) ? record.thread : void 0;
+	return readString(record, "threadId") ?? (thread ? readString(thread, "id") : void 0);
+}
+/** Reads a turn id from either top-level notification params or nested turn payloads. */
+function readCodexNotificationTurnId(record) {
+	return readNestedTurnId(record) ?? readString(record, "turnId");
+}
+function readNestedTurnId(record) {
+	const turn = record.turn;
+	return isJsonObject(turn) ? readString(turn, "id") : void 0;
+}
+function readString(record, key) {
+	const value = record[key];
+	return typeof value === "string" && value.trim() ? value.trim() : void 0;
+}
+//#endregion
+export { readCodexNotificationThreadId as n, readCodexNotificationTurnId as r, isCodexNotificationForTurn as t };