@openclaw/codex 2026.7.2-beta.5 → 2026.8.1-beta.2

package/dist/effective-mcp-catalog-DIIhAtOZ.js

@@ -0,0 +1,119 @@
+import { d as sessionBindingIdentity } from "./session-binding-DPxIvMgE.js";
+import { d as retainSharedCodexAppServerClientByInstanceId } from "./shared-client-kIBbGjk4.js";
+import { asOptionalRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { assignMcpCatalogSafeServerNames } from "openclaw/plugin-sdk/agent-harness-runtime";
+//#region extensions/codex/src/app-server/effective-mcp-catalog.ts
+const MCP_STATUS_PAGE_SIZE = 100;
+const MCP_STATUS_MAX_PAGES = 100;
+function catalogTool(params) {
+	const raw = asOptionalRecord(params.raw);
+	const description = normalizeOptionalString(raw?.description);
+	const title = normalizeOptionalString(raw?.title);
+	return {
+		serverName: params.serverName,
+		safeServerName: params.safeServerName,
+		toolName: params.toolName,
+		...title ? { title } : {},
+		...description ? { description } : {},
+		inputSchema: asOptionalRecord(raw?.inputSchema) ?? { type: "object" },
+		fallbackDescription: description ?? params.toolName,
+		...params.deniedBySession ? { deniedBySession: true } : {}
+	};
+}
+/** Converts Codex's thread-scoped status response into OpenClaw's MCP catalog shape. */
+function buildCodexEffectiveMcpCatalog(statuses, toolOverrides) {
+	const orderedStatuses = [...new Map(statuses.map((status) => [status.name, status])).values()].toSorted((left, right) => left.name.localeCompare(right.name));
+	const safeNames = assignMcpCatalogSafeServerNames(orderedStatuses.map((status) => status.name));
+	const serverEntries = [];
+	const tools = [];
+	const sessionDeniedTools = [];
+	for (const status of orderedStatuses) {
+		const safeServerName = safeNames.get(status.name) ?? status.name;
+		const denialMap = toolOverrides?.mcpToolsDeny;
+		const deniedNames = new Set(denialMap && Object.hasOwn(denialMap, status.name) ? denialMap[status.name] : []);
+		const observedNames = /* @__PURE__ */ new Set();
+		for (const [toolName, raw] of Object.entries(status.tools).toSorted(([left], [right]) => left.localeCompare(right))) {
+			observedNames.add(toolName);
+			const deniedBySession = deniedNames.has(toolName) ? true : void 0;
+			const tool = catalogTool({
+				serverName: status.name,
+				safeServerName,
+				toolName,
+				raw,
+				...deniedBySession ? { deniedBySession } : {}
+			});
+			if (deniedBySession) sessionDeniedTools.push(tool);
+			else tools.push(tool);
+		}
+		for (const toolName of [...deniedNames].toSorted()) {
+			if (observedNames.has(toolName)) continue;
+			sessionDeniedTools.push(catalogTool({
+				serverName: status.name,
+				safeServerName,
+				toolName,
+				deniedBySession: true
+			}));
+		}
+		serverEntries.push([status.name, {
+			serverName: status.name,
+			safeServerName,
+			launchSummary: "Codex native MCP connection",
+			toolCount: observedNames.size + [...deniedNames].filter((name) => !observedNames.has(name)).length
+		}]);
+	}
+	return {
+		version: 1,
+		generatedAt: Date.now(),
+		servers: Object.fromEntries(serverEntries),
+		tools,
+		...sessionDeniedTools.length > 0 ? { sessionDeniedTools } : {}
+	};
+}
+async function listCodexMcpServerStatuses(client, threadId) {
+	const statuses = [];
+	const seenCursors = /* @__PURE__ */ new Set();
+	let cursor;
+	for (let page = 0; page < MCP_STATUS_MAX_PAGES; page += 1) {
+		const response = await client.request("mcpServerStatus/list", {
+			threadId,
+			detail: "toolsAndAuthOnly",
+			limit: MCP_STATUS_PAGE_SIZE,
+			...cursor ? { cursor } : {}
+		});
+		statuses.push(...response.data);
+		cursor = response.nextCursor;
+		if (!cursor) return statuses;
+		if (seenCursors.has(cursor)) throw new Error("Codex mcpServerStatus/list repeated its pagination cursor");
+		seenCursors.add(cursor);
+	}
+	throw new Error("Codex mcpServerStatus/list exceeded the bounded page limit");
+}
+/** Loads the requested MCP inventory from the exact client/thread already selected for a run. */
+async function loadCodexEffectiveMcpCatalogFromThread(params) {
+	const allowedServerNames = new Set(params.mcpServerNames);
+	return buildCodexEffectiveMcpCatalog((await listCodexMcpServerStatuses(params.client, params.threadId)).filter((status) => allowedServerNames.has(status.name)), params.toolOverrides);
+}
+/** Loads MCP inventory from the bound Codex client while retaining its lease through all pages. */
+async function loadCodexEffectiveMcpCatalog(params, options) {
+	const binding = await options.bindingStore.read(sessionBindingIdentity({
+		agentId: params.agentId,
+		sessionId: params.sessionId,
+		sessionKey: params.sessionKey,
+		config: params.config
+	}));
+	if (!binding?.clientId) return;
+	const retained = retainSharedCodexAppServerClientByInstanceId(binding.clientId);
+	if (!retained) return;
+	try {
+		return await loadCodexEffectiveMcpCatalogFromThread({
+			client: retained.client,
+			threadId: binding.threadId,
+			mcpServerNames: params.mcpServerNames,
+			toolOverrides: params.toolOverrides
+		});
+	} finally {
+		retained.release();
+	}
+}
+//#endregion
+export { loadCodexEffectiveMcpCatalog };

package/dist/{event-projector-assistant-message-DTgnPPVF.js → event-projector-assistant-message-BwxV4d6N.js}

@@ -1,24 +1,5 @@
+import { t as resolveCodexLocalRuntimeAttribution } from "./local-runtime-attribution-B_2mnqhb.js";
 import { formatErrorMessage } from "openclaw/plugin-sdk/agent-harness-runtime";
-//#region extensions/codex/src/app-server/local-runtime-attribution.ts
-const OPENAI_PROVIDER_ID = "openai";
-const OPENAI_RESPONSES_API = "openai-responses";
-const OPENAI_CODEX_RESPONSES_API = "openai-chatgpt-responses";
-function normalizeRuntimeId(value) {
-	return value?.trim().toLowerCase() ?? "";
-}
-/** Maps local Codex runtime plans onto the provider/api pair exposed to event projection. */
-function resolveCodexLocalRuntimeAttribution(params) {
-	const authProfileProvider = normalizeRuntimeId(params.runtimePlan?.auth?.authProfileProviderForAuth);
-	if (normalizeRuntimeId(params.runtimePlan?.observability.harnessId) === "codex" && authProfileProvider !== OPENAI_PROVIDER_ID && normalizeRuntimeId(params.model.provider) === OPENAI_PROVIDER_ID && normalizeRuntimeId(params.model.api) === OPENAI_RESPONSES_API) return {
-		provider: OPENAI_PROVIDER_ID,
-		api: OPENAI_CODEX_RESPONSES_API
-	};
-	return {
-		provider: params.provider,
-		api: params.model.api
-	};
-}
-//#endregion
 //#region extensions/codex/src/app-server/event-projector-assistant-message.ts
 const ZERO_USAGE = {
 	input: 0,
@@ -35,12 +16,19 @@ const ZERO_USAGE = {
 	}
 };
 function createAssistantMessage(params, text, options) {
-	const attribution = resolveCodexLocalRuntimeAttribution(params);
+	return createAttributedCodexAssistantMessage({
+		...resolveCodexLocalRuntimeAttribution(params),
+		modelId: params.modelId
+	}, text, options);
+}
+/** Creates a Codex assistant row when a bounded call already owns attribution. */
+function createAttributedCodexAssistantMessage(attribution, text, options) {
 	const usage = options.tokenUsage ? {
 		input: options.tokenUsage.input ?? 0,
 		output: options.tokenUsage.output ?? 0,
 		cacheRead: options.tokenUsage.cacheRead ?? 0,
 		cacheWrite: options.tokenUsage.cacheWrite ?? 0,
+		...options.tokenUsage.reasoningTokens !== void 0 ? { reasoningTokens: options.tokenUsage.reasoningTokens } : {},
 		...options.tokenUsage.contextUsage ? { contextUsage: options.tokenUsage.contextUsage } : {},
 		totalTokens: options.tokenUsage.total ?? (options.tokenUsage.input ?? 0) + (options.tokenUsage.output ?? 0) + (options.tokenUsage.cacheRead ?? 0) + (options.tokenUsage.cacheWrite ?? 0),
 		cost: ZERO_USAGE.cost
@@ -53,7 +41,7 @@ function createAssistantMessage(params, text, options) {
 		}],
 		api: attribution.api ?? "openai-chatgpt-responses",
 		provider: attribution.provider,
-		model: params.modelId,
+		model: attribution.modelId,
 		usage,
 		stopReason: options.aborted ? "aborted" : options.promptError ? "error" : "stop",
 		errorMessage: options.promptError ? formatErrorMessage(options.promptError) : void 0,
@@ -98,4 +86,4 @@ function createAssistantMirrorMessage(params, title, text) {
 	};
 }
 //#endregion
-export { resolveCodexLocalRuntimeAttribution as i, createAssistantMessage as n, createAssistantMirrorMessage as r, createAssistantCommentaryMessage as t };
+export { createAttributedCodexAssistantMessage as i, createAssistantMessage as n, createAssistantMirrorMessage as r, createAssistantCommentaryMessage as t };

package/dist/{attempt-notifications-CMR2_fmR.js → event-projector-usage-e5huIQWu.js}

@@ -1,4 +1,6 @@
-import { V as isJsonObject } from "./shared-client-BVKE40c-.js";
+import { ct as isJsonObject } from "./shared-client-kIBbGjk4.js";
+import { asFiniteNumber, asSafeIntegerInRange, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { normalizeUsage } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 //#region extensions/codex/src/app-server/attempt-notifications.ts
 /**
@@ -14,9 +16,9 @@ function describeNotificationActivity(notification) {
 	if (!item) return { lastNotificationMethod: notification.method };
 	return {
 		lastNotificationMethod: notification.method,
-		lastNotificationItemId: readString(item, "id"),
-		lastNotificationItemType: readString(item, "type"),
-		lastNotificationItemRole: readString(item, "role"),
+		lastNotificationItemId: readStringField(item, "id"),
+		lastNotificationItemType: readStringField(item, "type"),
+		lastNotificationItemRole: readStringField(item, "role"),
 		lastAssistantTextPreview: readRawAssistantTextPreview(item)
 	};
 }
@@ -59,25 +61,25 @@ function isCompletedAssistantNotification(notification) {
 	if (!isJsonObject(notification.params)) return false;
 	if (notification.method !== "item/completed") return false;
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	return Boolean(item && readString(item, "type") === "agentMessage" && readString(item, "phase") !== "commentary");
+	return Boolean(item && readStringField(item, "type") === "agentMessage" && readStringField(item, "phase") !== "commentary");
 }
 /** Returns true for completed app-server reasoning items. */
 function isReasoningItemCompletionNotification(notification) {
 	if (!isJsonObject(notification.params) || notification.method !== "item/completed") return false;
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	return item ? readString(item, "type") === "reasoning" : false;
+	return item ? readStringField(item, "type") === "reasoning" : false;
 }
 /** Returns true for completed assistant commentary items. */
 function isAssistantCommentaryCompletionNotification(notification) {
 	if (!isJsonObject(notification.params) || notification.method !== "item/completed") return false;
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	return Boolean(item && readString(item, "type") === "agentMessage" && readString(item, "phase") === "commentary");
+	return Boolean(item && readStringField(item, "type") === "agentMessage" && readStringField(item, "phase") === "commentary");
 }
 /** Returns true for completed raw response reasoning items. */
 function isRawReasoningCompletionNotification(notification) {
 	if (!isJsonObject(notification.params) || notification.method !== "rawResponseItem/completed") return false;
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	return item ? readString(item, "type") === "reasoning" : false;
+	return item ? readStringField(item, "type") === "reasoning" : false;
 }
 /** Returns true for streamed app-server reasoning progress. */
 function isReasoningProgressNotification(notification) {
@@ -99,7 +101,7 @@ function shouldDisarmAssistantCompletionIdleWatch(notification) {
 function readNotificationItemId(notification) {
 	if (!isJsonObject(notification.params)) return;
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	return (item ? readString(item, "id") : void 0) ?? readString(notification.params, "itemId") ?? readString(notification.params, "id");
+	return (item ? readStringField(item, "id") : void 0) ?? readStringField(notification.params, "itemId") ?? readStringField(notification.params, "id");
 }
 /** Detects completion for an OpenClaw dynamic tool result still awaited by Codex. */
 function isPendingOpenClawDynamicToolCompletionNotification(notification, pendingOpenClawDynamicToolCompletionIds) {
@@ -107,14 +109,14 @@ function isPendingOpenClawDynamicToolCompletionNotification(notification, pendin
 	const itemId = readNotificationItemId(notification);
 	if (!itemId || !pendingOpenClawDynamicToolCompletionIds.has(itemId)) return false;
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	const itemType = item ? readString(item, "type") : void 0;
+	const itemType = item ? readStringField(item, "type") : void 0;
 	return itemType === void 0 || itemType === "dynamicToolCall";
 }
 /** Returns true for raw response tool-output completion notifications. */
 function isRawToolOutputCompletionNotification(notification) {
 	if (notification.method !== "rawResponseItem/completed" || !isJsonObject(notification.params)) return false;
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	switch (item ? readString(item, "type") : void 0) {
+	switch (item ? readStringField(item, "type") : void 0) {
 		case "custom_tool_call_output":
 		case "function_call_output": return true;
 		default: return false;
@@ -123,14 +125,14 @@ function isRawToolOutputCompletionNotification(notification) {
 function isRawFunctionToolOutputCompletionNotification(notification) {
 	if (notification.method !== "rawResponseItem/completed" || !isJsonObject(notification.params)) return false;
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	return item ? readString(item, "type") === "function_call_output" : false;
+	return item ? readStringField(item, "type") === "function_call_output" : false;
 }
 /** Returns true for progress on Codex-native tool item types. */
 function isNativeToolProgressNotification(notification) {
 	if (notification.method !== "item/started" && notification.method !== "item/completed" && notification.method !== "item/updated") return false;
 	if (!isJsonObject(notification.params)) return false;
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	switch (item ? readString(item, "type") : void 0) {
+	switch (item ? readStringField(item, "type") : void 0) {
 		case "commandExecution":
 		case "fileChange":
 		case "mcpToolCall":
@@ -146,19 +148,19 @@ function isFileChangePatchUpdatedNotification(notification) {
 function isRawAssistantProgressNotification(notification) {
 	if (notification.method !== "rawResponseItem/completed" || !isJsonObject(notification.params)) return false;
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	return Boolean(item && readString(item, "type") === "message" && readString(item, "role") === "assistant" && readRawAssistantTextPreview(item));
+	return Boolean(item && readStringField(item, "type") === "message" && readStringField(item, "role") === "assistant" && readRawAssistantTextPreview(item));
 }
 /** Returns true for raw assistant completion outside commentary phase. */
 function isRawAssistantCompletionNotification(notification) {
 	if (!isRawAssistantProgressNotification(notification) || !isJsonObject(notification.params)) return false;
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	return Boolean(item && readString(item, "phase") !== "commentary");
+	return Boolean(item && readStringField(item, "phase") !== "commentary");
 }
 function readRawAssistantTextPreview(item) {
-	if (readString(item, "role") !== "assistant" || !Array.isArray(item.content)) return;
+	if (readStringField(item, "role") !== "assistant" || !Array.isArray(item.content)) return;
 	const text = item.content.flatMap((content) => {
 		if (!isJsonObject(content)) return [];
-		const contentText = readString(content, "text");
+		const contentText = readStringField(content, "text");
 		return contentText ? [contentText] : [];
 	}).join("\n").trim();
 	if (!text) return;
@@ -179,8 +181,8 @@ function isTerminalTurnStatus(status) {
 function isCodexTurnAbortMarkerNotification(notification, options = {}) {
 	if (notification.method !== "rawResponseItem/completed" || !isJsonObject(notification.params)) return false;
 	const item = notification.params.item;
-	const role = isJsonObject(item) ? readString(item, "role") : void 0;
-	if (!isJsonObject(item) || readString(item, "type") !== "message" || role !== "user" && role !== "developer") return false;
+	const role = isJsonObject(item) ? readStringField(item, "role") : void 0;
+	if (!isJsonObject(item) || readStringField(item, "type") !== "message" || role !== "user" && role !== "developer") return false;
 	const text = extractRawResponseItemText(item).trim();
 	const currentPromptTexts = [options.currentPromptText, ...options.currentPromptTexts ?? []].filter(isNonEmptyString).map((prompt) => prompt.trim());
 	if (role === "user" && currentPromptTexts.includes(text)) return false;
@@ -195,16 +197,12 @@ function extractRawResponseItemText(item) {
 	if (!Array.isArray(content)) return "";
 	return content.flatMap((entry) => {
 		if (!isJsonObject(entry)) return [];
-		const type = readString(entry, "type");
+		const type = readStringField(entry, "type");
 		if (type !== "input_text" && type !== "text") return [];
-		const text = readString(entry, "text");
+		const text = readStringField(entry, "text");
 		return text ? [text] : [];
 	}).join("");
 }
-function readString(record, key) {
-	const value = record[key];
-	return typeof value === "string" ? value : void 0;
-}
 /** Reads a typed Codex item from notification params when id/type are present. */
 function readCodexNotificationItem(params) {
 	if (!isJsonObject(params) || !isJsonObject(params.item)) return;
@@ -216,13 +214,13 @@ function readRawResponseToolCallId(notification) {
 	if (notification.method !== "rawResponseItem/completed" || !isJsonObject(notification.params)) return;
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
 	if (!item) return;
-	switch (readString(item, "type")) {
+	switch (readStringField(item, "type")) {
 		case "custom_tool_call":
 		case "function_call":
 		case "local_shell_call":
-		case "tool_search_call": return readString(item, "call_id");
+		case "tool_search_call": return readStringField(item, "call_id");
 		case "image_generation_call":
-		case "web_search_call": return readString(item, "id");
+		case "web_search_call": return readStringField(item, "id");
 		default: return;
 	}
 }
@@ -241,4 +239,90 @@ function isNonEmptyString(value) {
 	return typeof value === "string" && value.length > 0;
 }
 //#endregion
-export { updateActiveTurnItemIds as S, readCodexNotificationItem as _, isCodexTurnAbortMarkerNotification as a, shouldDisarmAssistantCompletionIdleWatch as b, isPendingOpenClawDynamicToolCompletionNotification as c, isRawReasoningCompletionNotification as d, isRawToolOutputCompletionNotification as f, isTerminalTurnStatus as g, isRetryableErrorNotification as h, isAssistantCompletionReleaseNotification as i, isRawAssistantProgressNotification as l, isReasoningProgressNotification as m, describeNotificationActivity as n, isFileChangePatchUpdatedNotification as o, isReasoningItemCompletionNotification as p, isAssistantCommentaryCompletionNotification as r, isNativeToolProgressNotification as s, codexExecutionToolName as t, isRawFunctionToolOutputCompletionNotification as u, readNotificationItemId as v, updateActiveCompletionBlockerItemIds as x, readRawResponseToolCallId as y };
+//#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 ? normalizeCodexThreadTokenUsage(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 outputTokens = last ? readTokenCount(last, "outputTokens") : 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 } : {},
+		...outputTokens !== void 0 ? { outputTokens } : {},
+		...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 normalizeCodexThreadTokenUsage(record) {
+	return normalizeCodexTokenUsageBreakdown(record, "thread");
+}
+function normalizeCodexResponseTokenUsage(record) {
+	return normalizeCodexTokenUsageBreakdown(record, "response");
+}
+function normalizeCodexTokenUsageBreakdown(record, source) {
+	const readCount = source === "response" ? readTokenCount : (value, key) => asFiniteNumber(value[key]);
+	const totalTokens = readCount(record, "totalTokens");
+	const inputTokens = readCount(record, "inputTokens");
+	const cacheRead = readCount(record, "cachedInputTokens");
+	const output = readCount(record, "outputTokens");
+	const reasoningTokens = readCount(record, "reasoningOutputTokens");
+	const cacheWrite = record.cacheWriteInputTokens === void 0 && source === "response" ? 0 : readCount(record, "cacheWriteInputTokens");
+	if (source === "response" && (totalTokens === void 0 || inputTokens === void 0 || cacheRead === void 0 || cacheWrite === void 0 || output === void 0 || reasoningTokens === void 0 || cacheRead + cacheWrite > inputTokens || totalTokens !== inputTokens + output)) return;
+	const usage = normalizeUsage({
+		input: inputTokens === void 0 ? void 0 : Math.max(0, inputTokens - (cacheRead ?? 0) - (cacheWrite ?? 0)),
+		output,
+		cacheRead,
+		cacheWrite,
+		reasoningTokens,
+		total: totalTokens
+	});
+	if (!usage) return;
+	return {
+		...usage,
+		contextUsage: source === "response" && inputTokens !== void 0 && totalTokens !== void 0 ? {
+			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) {
+		const responseId = readStringField(params, "responseId");
+		if (responseId) this.responseIds.add(responseId);
+		const usage = isJsonObject(params.usage) ? params.usage : void 0;
+		this.usage = usage ? normalizeCodexResponseTokenUsage(usage) : void 0;
+	}
+};
+//#endregion
+export { readRawResponseToolCallId as C, updateActiveTurnItemIds as E, readNotificationItemId as S, updateActiveCompletionBlockerItemIds as T, isReasoningItemCompletionNotification as _, codexExecutionToolName as a, isTerminalTurnStatus as b, isAssistantCompletionReleaseNotification as c, isNativeToolProgressNotification as d, isPendingOpenClawDynamicToolCompletionNotification as f, isRawToolOutputCompletionNotification as g, isRawReasoningCompletionNotification as h, readCodexThreadContextSnapshot as i, isCodexTurnAbortMarkerNotification as l, isRawFunctionToolOutputCompletionNotification as m, normalizeCodexResponseTokenUsage as n, describeNotificationActivity as o, isRawAssistantProgressNotification as p, projectCodexThreadUsageUpdate as r, isAssistantCommentaryCompletionNotification as s, CodexResponseCompletionProjection as t, isFileChangePatchUpdatedNotification as u, isReasoningProgressNotification as v, shouldDisarmAssistantCompletionIdleWatch as w, readCodexNotificationItem as x, isRetryableErrorNotification as y };

package/dist/harness.js

@@ -1,6 +1,24 @@
+import { completeWithPreparedSimpleCompletionModel } from "openclaw/plugin-sdk/simple-completion-runtime";
 //#region extensions/codex/harness.ts
 const DEFAULT_CODEX_HARNESS_PROVIDER_IDS = /* @__PURE__ */ new Set(["codex", "openai"]);
 const SHARED_CODEX_APP_SERVER_CLIENT_DISPOSER = Symbol.for("openclaw.codexAppServerClientDisposer");
+const CODEX_TOOL_POLICY_SAFE_DENY_NAMES = [
+	"web_fetch",
+	"x_search",
+	"memory_search",
+	"memory_get",
+	"dashboard",
+	"canvas",
+	"show_widget",
+	"message",
+	"heartbeat_respond",
+	"automations",
+	"gateway",
+	"skill_workshop",
+	"music_generate",
+	"video_generate",
+	"tts"
+];
 const CODEX_APP_SERVER_CONTEXT_ENGINE_HOST_CAPABILITIES = [
 	"bootstrap",
 	"assemble-before-prompt",
@@ -10,6 +28,30 @@ const CODEX_APP_SERVER_CONTEXT_ENGINE_HOST_CAPABILITIES = [
 	"runtime-llm-complete",
 	"thread-bootstrap-projection"
 ];
+async function runCodexHostPreparedIsolatedCompletion(params) {
+	const timeoutSignal = AbortSignal.timeout(params.timeoutMs);
+	const signal = params.abortSignal ? AbortSignal.any([params.abortSignal, timeoutSignal]) : timeoutSignal;
+	return { assistant: await completeWithPreparedSimpleCompletionModel({
+		model: params.model,
+		auth: params.auth,
+		cfg: params.config,
+		context: {
+			systemPrompt: params.systemPrompt,
+			messages: [{
+				role: "user",
+				content: params.prompt,
+				timestamp: Date.now()
+			}],
+			tools: []
+		},
+		options: {
+			maxTokens: params.streamParams?.maxTokens,
+			temperature: params.streamParams?.temperature,
+			reasoning: params.thinkLevel,
+			signal
+		}
+	}) };
+}
 async function disposeSharedCodexAppServerClients() {
 	const dispose = globalThis[SHARED_CODEX_APP_SERVER_CLIENT_DISPOSER];
 	await dispose?.();
@@ -28,14 +70,17 @@ function createCodexAppServerAgentHarness(options) {
 		id: harnessRuntimeId,
 		label: options?.label ?? "Codex agent harness",
 		autoSelection: { providerIds: [...providerIds] },
+		cloudPlacement: { mode: "remote-exec" },
 		delegatedExecutionPluginIds: ["voice-call"],
 		contextEngineHostCapabilities: CODEX_APP_SERVER_CONTEXT_ENGINE_HOST_CAPABILITIES,
+		conversationToolPolicySupport: "exact",
+		conversationToolPolicySafeDenyTools: CODEX_TOOL_POLICY_SAFE_DENY_NAMES,
 		deliveryDefaults: { visibleReplies: "message_tool" },
 		authBootstrap: "harness",
 		...sessionCatalogControl && sessionRuntime ? { sessionFork: {
 			upstreamKinds: ["codex-app-server"],
 			fork: async (params) => {
-				const { forkCodexUpstreamSession } = await import("./upstream-session-fork-_Vrz4WJr.js");
+				const { forkCodexUpstreamSession } = await import("./upstream-session-fork-CE-_LdnP.js");
 				return await forkCodexUpstreamSession(params, {
 					bindingStore: options.bindingStore,
 					control: sessionCatalogControl,
@@ -50,13 +95,17 @@ function createCodexAppServerAgentHarness(options) {
 			return fingerprintCodexAppServerAuthBinding(params);
 		} },
 		runtimeArtifact: { validate: async (binding) => {
-			const { validateCodexAppServerRuntimeArtifact } = await import("./runtime-artifact-C2ITXdhM.js");
+			const { validateCodexAppServerRuntimeArtifact } = await import("./runtime-artifact-BVSPdd6g.js");
 			return validateCodexAppServerRuntimeArtifact(binding);
 		} },
 		fetchUsageSnapshot: async (ctx) => {
-			const { fetchCodexAppServerUsageSnapshot } = await import("./usage-UpVbdX5G.js");
+			const { fetchCodexAppServerUsageSnapshot } = await import("./usage-CHlV0e-o.js");
 			return await fetchCodexAppServerUsageSnapshot(ctx, { pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig });
 		},
+		loadMcpToolCatalog: async (params) => {
+			const { loadCodexEffectiveMcpCatalog } = await import("./effective-mcp-catalog-DIIhAtOZ.js");
+			return await loadCodexEffectiveMcpCatalog(params, { bindingStore: options.bindingStore });
+		},
 		supports: (ctx) => {
 			const provider = ctx.provider.trim().toLowerCase();
 			if (!providerIds.has(provider)) return {
@@ -65,7 +114,8 @@ function createCodexAppServerAgentHarness(options) {
 			};
 			if (ctx.modelProvider?.requestTransportOverrides === "present") return {
 				supported: false,
-				reason: "Codex cannot reproduce authored request transport overrides"
+				reason: "Codex cannot reproduce authored request transport overrides",
+				fallbackRuntime: "openclaw"
 			};
 			const preparedAuth = ctx.modelProvider?.preparedAuth;
 			const runtimePolicy = ctx.modelProvider?.runtimePolicy;
@@ -95,19 +145,35 @@ function createCodexAppServerAgentHarness(options) {
 			};
 		},
 		runAttempt: async (params) => {
-			const { runCodexAppServerAttempt } = await import("./run-attempt-C5GTPJOE.js");
+			const { runCodexAppServerAttempt } = await import("./run-attempt-P8BdxC1I.js");
 			return runCodexAppServerAttempt(params, {
 				bindingStore: options.bindingStore,
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
 				nativeHookRelay: { enabled: true }
 			});
 		},
+		runIsolatedCompletionV2: async (params) => {
+			if (params.authorization.owner === "host") {
+				const { authorization, ...commonParams } = params;
+				return runCodexHostPreparedIsolatedCompletion({
+					...commonParams,
+					model: authorization.model,
+					auth: authorization.auth,
+					...authorization.sourceAuthFingerprint ? { sourceAuthFingerprint: authorization.sourceAuthFingerprint } : {}
+				});
+			}
+			const { runCodexIsolatedCompletion } = await import("./isolated-completion-C58NbL40.js");
+			return runCodexIsolatedCompletion(params, { pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig });
+		},
+		runIsolatedCompletion: async (params) => {
+			return runCodexHostPreparedIsolatedCompletion(params);
+		},
 		finalizeSettledTurn: async (params) => {
-			const { runCodexSettledTurnFinalization } = await import("./settled-turn-finalizer-CA_2QXIE.js");
+			const { runCodexSettledTurnFinalization } = await import("./settled-turn-finalizer-BRWBO4MO.js");
 			return runCodexSettledTurnFinalization(params, { pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig });
 		},
 		runSideQuestion: async (params) => {
-			const { runCodexAppServerSideQuestion } = await import("./side-question-CO12sHxo.js");
+			const { runCodexAppServerSideQuestion } = await import("./side-question-9HAL26l9.js");
 			return runCodexAppServerSideQuestion(params, {
 				bindingStore: options.bindingStore,
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
@@ -115,14 +181,14 @@ function createCodexAppServerAgentHarness(options) {
 			});
 		},
 		compact: async (params) => {
-			const { maybeCompactCodexAppServerSession } = await import("./compact-dEN49UH6.js");
+			const { maybeCompactCodexAppServerSession } = await import("./compact-LspQaGfl.js");
 			return maybeCompactCodexAppServerSession(params, {
 				bindingStore: options.bindingStore,
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig
 			});
 		},
 		compactAfterContextEngine: async (params) => {
-			const { maybeCompactCodexAppServerSession } = await import("./compact-dEN49UH6.js");
+			const { maybeCompactCodexAppServerSession } = await import("./compact-LspQaGfl.js");
 			return maybeCompactCodexAppServerSession(params, {
 				bindingStore: options.bindingStore,
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
@@ -131,20 +197,24 @@ function createCodexAppServerAgentHarness(options) {
 		},
 		reset: async (params) => {
 			if (params.sessionId) {
-				const { reclaimCurrentCodexSessionGeneration, sessionBindingIdentity } = await import("./session-binding-DlVQ-Pxs.js").then((n) => n.u);
+				const [{ reclaimCurrentCodexSessionGeneration, sessionBindingIdentity }, { retireCodexAppServerSessionGeneration }] = await Promise.all([import("./session-binding-DPxIvMgE.js").then((n) => n.f), import("./session-retirement-DoMMJFKm.js")]);
 				const identity = sessionBindingIdentity({
 					agentId: params.agentId,
 					sessionId: params.sessionId,
 					sessionKey: params.sessionKey
 				});
-				const resetGeneration = params.reason === "deleted" ? options.bindingStore.retireSessionGeneration.bind(options.bindingStore) : options.bindingStore.resetSessionGeneration.bind(options.bindingStore);
-				let reset = await resetGeneration(identity);
+				const resetGeneration = () => retireCodexAppServerSessionGeneration({
+					bindingStore: options.bindingStore,
+					identity,
+					mode: params.reason === "deleted" ? "retire" : "reset"
+				});
+				let reset = await resetGeneration();
 				if (reset === "conflict") {
 					if (await reclaimCurrentCodexSessionGeneration({
 						bindingStore: options.bindingStore,
 						identity,
 						config: options.resolveConfig?.()
-					})) reset = await resetGeneration(identity);
+					})) reset = await resetGeneration();
 				}
 				if (reset === "conflict") throw new Error(`Codex binding generation changed before session ${params.sessionId} could reset`);
 			}