@openclaw/codex 2026.9.2 → 2026.9.3

package/dist/{plugin-marketplace-discovery-B7gHXJ3d.js → conversation-control-CUCrSIQI.js}

@@ -1,26 +1,15 @@
 import { n as isCodexFastServiceTier } from "./config-utils-C57JiJrU.js";
-import { t as bindingStoreKey } from "./session-binding-record-CyaXZvTe.js";
-import "./config-CyapYSji.js";
-import { c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-CKhX2kFt.js";
-import { a as isCodexAppServerNativeAuthProfile, o as normalizeCodexAppServerBindingModelProvider } from "./session-binding-4Ki04sW-.js";
-import { E as resolveCodexAppServerRequestModelSelection, O as resolveCodexBindingModelProviderFallback } from "./thread-lifecycle-DPK30jad.js";
-import { s as resolveCodexBindingAppServerConnection } from "./thread-policy-CTalhWFy.js";
-import { a as formatCodexDisplayText } from "./command-formatters-DSbGMXA0.js";
-import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { getSessionEntry, patchSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
+import { r as bindingStoreKey } from "./session-binding-record-CaZjYwNS.js";
+import { a as formatCodexDisplayText } from "./command-formatters-DeTfrapr.js";
+import "./config-JDfTI4VI.js";
+import { i as resolveCodexBindingAppServerConnection } from "./binding-connection-QqgcPCgk.js";
+import { n as normalizeCodexAppServerBindingModelProvider, t as isCodexAppServerNativeAuthProfile } from "./auth-profile-CwzO4_RG.js";
+import { c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-CVhez2Uo.js";
+import { E as resolveCodexAppServerRequestModelSelection, O as resolveCodexBindingModelProviderFallback } from "./thread-lifecycle-D1pzRwHB.js";
+import "./session-binding-CKSepwIC.js";
 import { resolveAgentDir } from "openclaw/plugin-sdk/agent-runtime";
+import { getSessionEntry, patchSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { ModelSelectionLockedError, applyModelOverrideWithAuthProfileCompatibility } from "openclaw/plugin-sdk/model-session-runtime";
-//#region extensions/codex/src/command-authorization.ts
-const CODEX_NATIVE_EXECUTION_AUTH_ERROR = "Only an owner or operator.admin can control Codex native execution.";
-const CODEX_HOST_INSPECTION_AUTH_ERROR = "Only an owner or operator.admin can inspect Codex host state.";
-const CODEX_FULL_PERMISSIONS_AUTH_ERROR = "Full Codex permissions require operator.admin. Choose Admin in the Control UI permission picker, or use an admin-authenticated CLI.";
-function hasCodexAdminScope(ctx) {
-	return ctx.gatewayClientScopes?.includes("operator.admin") === true;
-}
-function canMutateCodexHost(ctx) {
-	return ctx.senderIsOwner === true || hasCodexAdminScope(ctx);
-}
-//#endregion
 //#region extensions/codex/src/conversation-control.ts
 const CODEX_CONVERSATION_CONTROL_STATE = Symbol.for("openclaw.codex.conversationControl");
 function getActiveTurns() {
@@ -280,125 +269,4 @@ function resolveConversationControlModelProvider(params) {
 	return modelProvider.toLowerCase() === "openai" ? "openai" : modelProvider;
 }
 //#endregion
-//#region extensions/codex/src/plugin-marketplace-discovery.ts
-/** Read-only discovery of Codex-owned local, curated, and remote plugin marketplaces. */
-const PLUGIN_SEGMENT_PATTERN = /^[A-Za-z0-9_-]+$/;
-const MAX_PLUGIN_DESCRIPTION_LENGTH = 160;
-const SUPPLEMENTAL_MARKETPLACE_KINDS = [
-	"workspace-directory",
-	"shared-with-me",
-	"created-by-me-remote",
-	"vertical"
-];
-/** Validates the same identifier segments required by Codex's stable PluginId parser. */
-function parseCodexPluginMarketplaceId(value) {
-	const separator = value.lastIndexOf("@");
-	if (separator <= 0 || separator === value.length - 1) return;
-	const pluginName = value.slice(0, separator);
-	const marketplaceName = value.slice(separator + 1);
-	return PLUGIN_SEGMENT_PATTERN.test(pluginName) && PLUGIN_SEGMENT_PATTERN.test(marketplaceName) ? {
-		pluginName,
-		marketplaceName
-	} : void 0;
-}
-/** Lists local/global first and separately requests workspace, shared, and personal catalogs. */
-async function discoverCodexMarketplacePlugins(params) {
-	const requestParams = { cwds: [params.workspaceDir] };
-	const primary = await params.request(requestParams);
-	const warnings = (primary.marketplaceLoadErrors ?? []).map((error) => boundedCatalogText(error.message));
-	const marketplaces = [...primary.marketplaces];
-	try {
-		const supplemental = await params.request({
-			...requestParams,
-			marketplaceKinds: [...SUPPLEMENTAL_MARKETPLACE_KINDS]
-		});
-		marketplaces.push(...supplemental.marketplaces);
-		warnings.push(...(supplemental.marketplaceLoadErrors ?? []).map((error) => boundedCatalogText(error.message)));
-	} catch (error) {
-		let recoveredSupplementalMarketplace = false;
-		for (const kind of SUPPLEMENTAL_MARKETPLACE_KINDS) try {
-			const supplemental = await params.request({
-				...requestParams,
-				marketplaceKinds: [kind]
-			});
-			marketplaces.push(...supplemental.marketplaces);
-			recoveredSupplementalMarketplace ||= supplemental.marketplaces.length > 0;
-			warnings.push(...(supplemental.marketplaceLoadErrors ?? []).map((loadError) => boundedCatalogText(loadError.message)));
-		} catch (kindError) {
-			warnings.push(boundedCatalogText(`${kind} marketplace unavailable: ${kindError instanceof Error ? kindError.message : String(kindError)}`));
-		}
-		if (!recoveredSupplementalMarketplace && warnings.length === 0) warnings.push(boundedCatalogText(`Additional marketplaces could not be listed: ${error instanceof Error ? error.message : String(error)}`));
-	}
-	const discovered = /* @__PURE__ */ new Map();
-	const ambiguous = /* @__PURE__ */ new Set();
-	for (const marketplace of marketplaces) {
-		if (!PLUGIN_SEGMENT_PATTERN.test(marketplace.name)) continue;
-		for (const summary of marketplace.plugins) {
-			const pluginName = pluginSlug(summary, marketplace.name);
-			if (!pluginName) continue;
-			const id = `${pluginName}@${marketplace.name}`;
-			if (ambiguous.has(id)) continue;
-			const previous = discovered.get(id);
-			const next = {
-				id,
-				pluginName,
-				marketplaceName: marketplace.name,
-				installed: summary.installed,
-				enabled: summary.enabled,
-				available: summary.availability !== "DISABLED_BY_ADMIN" && summary.installPolicy !== "NOT_AVAILABLE",
-				...summary.installPolicy ? { installPolicy: summary.installPolicy } : {},
-				...summary.authPolicy ? { authPolicy: summary.authPolicy } : {},
-				...marketplace.path ? { marketplacePath: marketplace.path } : {},
-				...summary.remotePluginId?.trim() ? {
-					remotePluginId: summary.remotePluginId.trim(),
-					mustShowInstallationInterstitial: summary.mustShowInstallationInterstitial ?? null
-				} : {},
-				summaryId: summary.id
-			};
-			const description = pluginDescription(summary);
-			if (description) next.description = description;
-			if (previous && (previous.marketplacePath !== next.marketplacePath || previous.remotePluginId !== next.remotePluginId)) {
-				discovered.delete(id);
-				ambiguous.add(id);
-				warnings.push(`Multiple discovered plugins share ${id}; installation requires a unique identity.`);
-				continue;
-			}
-			if (!previous) discovered.set(id, next);
-			else {
-				const preferred = !previous.installed && next.installed || !previous.enabled && next.installed && next.enabled ? next : previous;
-				discovered.set(id, {
-					...preferred,
-					available: previous.available && next.available,
-					...preferred.remotePluginId ? { mustShowInstallationInterstitial: previous.mustShowInstallationInterstitial === true || next.mustShowInstallationInterstitial === true ? true : previous.mustShowInstallationInterstitial === false && next.mustShowInstallationInterstitial === false ? false : null } : {},
-					...previous.installPolicy === "NOT_AVAILABLE" || next.installPolicy === "NOT_AVAILABLE" ? { installPolicy: "NOT_AVAILABLE" } : {}
-				});
-			}
-		}
-	}
-	return {
-		plugins: [...discovered.values()].toSorted((left, right) => left.id.localeCompare(right.id)),
-		warnings
-	};
-}
-function pluginSlug(summary, marketplaceName) {
-	const qualified = parseCodexPluginMarketplaceId(summary.id);
-	if (qualified?.marketplaceName === marketplaceName) return qualified.pluginName;
-	const identitySegment = summary.id.split("/").at(-1);
-	if (identitySegment && PLUGIN_SEGMENT_PATTERN.test(identitySegment)) return identitySegment;
-	return PLUGIN_SEGMENT_PATTERN.test(summary.name) ? summary.name : void 0;
-}
-function pluginDescription(summary) {
-	const description = asOptionalRecord(summary.interface)?.shortDescription;
-	if (typeof description !== "string") return;
-	return boundedCatalogText(description) || void 0;
-}
-function boundedCatalogText(value) {
-	let sanitized = "";
-	for (const character of value) {
-		const codePoint = character.codePointAt(0);
-		sanitized += codePoint !== void 0 && (codePoint <= 31 || codePoint >= 127 && codePoint <= 159) ? " " : character;
-	}
-	return sanitized.replace(/\s+/g, " ").trim().slice(0, MAX_PLUGIN_DESCRIPTION_LENGTH);
-}
-//#endregion
-export { hasCodexAdminScope as _, parseCodexPermissionsModeArg as a, setCodexConversationModel as c, stopCodexConversationTurn as d, trackCodexConversationActiveTurn as f, canMutateCodexHost as g, CODEX_NATIVE_EXECUTION_AUTH_ERROR as h, parseCodexFastModeArg as i, setCodexConversationPermissions as l, CODEX_HOST_INSPECTION_AUTH_ERROR as m, parseCodexPluginMarketplaceId as n, readCodexConversationActiveTurn as o, CODEX_FULL_PERMISSIONS_AUTH_ERROR as p, formatPermissionsMode as r, setCodexConversationFastMode as s, discoverCodexMarketplacePlugins as t, steerCodexConversationTurn as u };
+export { setCodexConversationFastMode as a, steerCodexConversationTurn as c, readCodexConversationActiveTurn as i, stopCodexConversationTurn as l, parseCodexFastModeArg as n, setCodexConversationModel as o, parseCodexPermissionsModeArg as r, setCodexConversationPermissions as s, formatPermissionsMode as t, trackCodexConversationActiveTurn as u };

package/dist/doctor-contract-api.js

@@ -2,15 +2,15 @@ import { n as CODEX_APP_SERVER_BINDING_NAMESPACE, t as CODEX_APP_SERVER_BINDING_
 import { asNullableRecord, asOptionalRecord, isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import { listAgentIds, resolveAgentDir, resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
-import fs from "node:fs/promises";
 import path from "node:path";
+import fs from "node:fs/promises";
+import { setImmediate } from "node:timers/promises";
 import { canonicalPathFromExistingAncestor, isPathInside } from "openclaw/plugin-sdk/file-access-runtime";
 import { isDeepStrictEqual } from "node:util";
-import { pathExists } from "openclaw/plugin-sdk/security-runtime";
-import { setImmediate } from "node:timers/promises";
-import { normalizeAgentId } from "openclaw/plugin-sdk/routing";
 import { withFileLock } from "openclaw/plugin-sdk/file-lock";
+import { normalizeAgentId } from "openclaw/plugin-sdk/routing";
 import { archiveLegacyStateSource, legacyStateFileExists } from "openclaw/plugin-sdk/runtime-doctor-migrations";
+import { pathExists } from "openclaw/plugin-sdk/security-runtime";
 import { resolveStorePath } from "openclaw/plugin-sdk/session-store-paths";
 //#region extensions/codex/src/migration/session-binding-orphans.ts
 const PAGE_SIZE = 512;
@@ -391,7 +391,7 @@ async function migrateSource(source, candidates, params, store) {
 		return await withFileLock(source.sidecarPath, LEGACY_BINDING_LOCK_OPTIONS, async () => {
 			const [contents, stat] = await Promise.all([fs.readFile(source.sidecarPath, "utf8"), fs.stat(source.sidecarPath)]);
 			const raw = JSON.parse(contents);
-			const [{ bindingStoreKey, createStoredCodexAppServerBinding, normalizeStoredCodexAppServerBindingFingerprints, readStoredCodexAppServerBinding }, { legacyCodexConversationBindingId }] = await Promise.all([import("./session-binding-4Ki04sW-.js").then((n) => n.d), import("./conversation-binding-data-BiodpIzq.js").then((n) => n.t)]);
+			const [{ bindingStoreKey, createStoredCodexAppServerBinding, normalizeStoredCodexAppServerBindingFingerprints, readStoredCodexAppServerBinding }, { legacyCodexConversationBindingId }] = await Promise.all([import("./session-binding-CKSepwIC.js").then((n) => n.c), import("./conversation-binding-data-BiodpIzq.js").then((n) => n.t)]);
 			const agentId = owner?.agentId ?? (source.agentIds.size === 1 ? [...source.agentIds][0] : void 0);
 			const baseStored = createStoredCodexAppServerBinding(raw, {
 				now: stat.mtime.toISOString(),

package/dist/{dynamic-tools-BwpvTxaX.js → dynamic-tools-D-JBoaLt.js}

@@ -1,39 +1,41 @@
-import { B as isJsonObject, E as isCodexRemoteExecPlacementSandbox, O as readCodexPluginConfig, R as CODEX_OPENCLAW_DIRECT_DYNAMIC_TOOL_NAMESPACE, z as flattenCodexDynamicToolFunctions } from "./config-CyapYSji.js";
-import { St as withDynamicToolTranscriptDetails, bt as createFailedDynamicToolResponse, ct as createCodexElicitationResponse, ot as readCodexTurn, xt as withDynamicToolExecutionState, yt as resolveCodexToolAbortTerminalReason } from "./shared-client-CKhX2kFt.js";
-import { E as itemStatus, L as readItem, T as itemName, b as auditNativeToolUnfinishedStatus, h as isCodexNotificationForTurn, k as shouldClearTerminalPresentationForNativeItem, v as auditNativeToolName, y as auditNativeToolTerminalStatus } from "./attempt-client-cleanup-Bp1ZOnk2.js";
-import { B as emitCodexNativePreToolUseFailureDiagnostic, S as resolveCodexWebSearchPlan, at as filterCodexDynamicTools, lt as isSystemAgentOnlyCodexDynamicToolAllowlist, ot as filterCodexDynamicToolsForDisabledNativeSurface, st as isForcedPrivateQaCodexRuntime, ut as normalizeCodexDynamicToolName } from "./thread-lifecycle-DPK30jad.js";
-import { l as resolveCodexNativeExecutionPolicy, u as resolveCodexNodeExecToolOverrides } from "./request-C8H22rPi.js";
+import { a as flattenCodexDynamicToolFunctions, o as isJsonObject, r as CODEX_OPENCLAW_DIRECT_DYNAMIC_TOOL_NAMESPACE, x as readCodexPluginConfig, y as isCodexRemoteExecPlacementSandbox } from "./protocol-CAAcVIKF.js";
+import { B as withDynamicToolTranscriptDetails, E as createCodexElicitationResponse, L as resolveCodexToolAbortTerminalReason, R as createFailedDynamicToolResponse, w as readCodexTurn, z as withDynamicToolExecutionState } from "./client-BEKu4yDx.js";
+import { a as formatCodexDisplayText } from "./command-formatters-DeTfrapr.js";
+import "./config-JDfTI4VI.js";
 import { r as sanitizeInlineImageDataUrl, t as invalidInlineImageText } from "./image-payload-sanitizer-tupAr-2o.js";
-import { a as formatCodexDisplayText } from "./command-formatters-DSbGMXA0.js";
-import { a as CODEX_NODE_EXEC_DYNAMIC_TOOL_NAME, c as createNodeExecAliasDynamicTool, i as CODEX_GATEWAY_PROCESS_DYNAMIC_TOOL_NAME, l as isCodexDynamicToolExcluded, o as createGatewayExecProjection, r as CODEX_GATEWAY_EXEC_DYNAMIC_TOOL_NAME, s as createGatewayProcessProjection } from "./provider-capabilities-BpG9Ltc5.js";
-import { a as requestPluginApprovalOutcome, c as truncateCodexApprovalDisplayText, i as requestPluginApproval, l as waitForPluginApprovalDecision, n as codexApprovalTimeoutText, o as sanitizeCodexApprovalVisibleText, r as mapExecDecisionToOutcome, s as stripDanglingCodexApprovalTerminalSequence, t as approvalRequestExplicitlyUnavailable } from "./plugin-approval-roundtrip-aQVdyL5g.js";
+import { E as itemStatus, L as readItem, T as itemName, b as auditNativeToolUnfinishedStatus, h as isCodexNotificationForTurn, k as shouldClearTerminalPresentationForNativeItem, v as auditNativeToolName, y as auditNativeToolTerminalStatus } from "./attempt-client-cleanup-D6cR54TV.js";
+import { B as emitCodexNativePreToolUseFailureDiagnostic, S as resolveCodexWebSearchPlan, it as isForcedPrivateQaCodexRuntime, nt as filterCodexDynamicTools, ot as isSystemAgentOnlyCodexDynamicToolAllowlist, rt as filterCodexDynamicToolsForDisabledNativeSurface, st as normalizeCodexDynamicToolName } from "./thread-lifecycle-D1pzRwHB.js";
+import { n as resolveCodexNativeExecutionPolicy, r as resolveCodexNodeExecToolOverrides } from "./native-execution-policy-umd0tgh4.js";
+import { a as CODEX_NODE_EXEC_DYNAMIC_TOOL_NAME, c as createNodeExecAliasDynamicTool, i as CODEX_GATEWAY_PROCESS_DYNAMIC_TOOL_NAME, l as isCodexDynamicToolExcluded, o as createGatewayExecProjection, r as CODEX_GATEWAY_EXEC_DYNAMIC_TOOL_NAME, s as createGatewayProcessProjection } from "./provider-capabilities-W4tfK5Y5.js";
+import { a as requestPluginApprovalOutcome, c as truncateCodexApprovalDisplayText, i as requestPluginApproval, l as waitForPluginApprovalDecision, n as codexApprovalTimeoutText, o as sanitizeCodexApprovalVisibleText, r as mapExecDecisionToOutcome, s as stripDanglingCodexApprovalTerminalSequence, t as approvalRequestExplicitlyUnavailable } from "./plugin-approval-roundtrip-DeW95wB5.js";
+import { createRequire } from "node:module";
 import { asNonArrayRecord, asOptionalRecord, isRecord, normalizeOptionalString, normalizeTrimmedStringList, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash, randomUUID } from "node:crypto";
 import { asDateTimestampMs } from "openclaw/plugin-sdk/number-runtime";
 import { killProcessTree } from "openclaw/plugin-sdk/process-runtime";
 import { validateJsonSchemaValue } from "openclaw/plugin-sdk/json-schema-runtime";
 import path, { posix } from "node:path";
-import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
-import { HEARTBEAT_RESPONSE_TOOL_NAME, buildAgentHookContextChannelFields, buildEmbeddedAttemptToolRunContext, consumeAdjustedParamsForToolCall, consumePreExecutionBlockedToolCall, createAgentToolResultMiddlewareRunner, createCodexAppServerToolResultExtensionRunner, embeddedAgentLog, extractMessagingToolSend, extractMessagingToolSendResult, extractToolResultMediaArtifact, filterProviderNormalizableTools, filterToolResultMediaUrls, finalizeAgentToolAvailability, finalizeToolTerminalPresentation, formatApprovalDisplayPath, formatToolExecutionErrorMessage, getBeforeToolCallFailureDisposition, getChannelAgentToolMeta, getPluginToolMeta, getPluginToolSideEffectOwnerKey, hasNativeHookRelayInvocation, invokeNativeHookRelay, isDeliveredMessageToolOnlySourceReplyResult, isDeliveredMessagingToolResult, isHostScopedAgentToolActive, isMessagingTool, isMessagingToolSendAction, isReplaySafeToolCall, isSubagentSessionKey, isToolResultError, isToolWrappedWithBeforeToolCallHook, normalizeAgentRuntimeTools, normalizeHeartbeatToolResponse, projectRuntimeToolInputSchema, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveNativeHookRelayDeferredToolApproval, resolveToolExecutionErrorKind, resolveToolResultFailureKind, runAgentHarnessAfterToolCallHook, sanitizeToolResult, setBeforeToolCallDiagnosticsEnabled, supportsModelTools, wrapToolWithBeforeToolCallHook } from "openclaw/plugin-sdk/agent-harness-runtime";
-import { isPathStrictlyInside, root } from "openclaw/plugin-sdk/file-access-runtime";
-import { resolveAgentDir as resolveAgentDir$1 } from "openclaw/plugin-sdk/agent-runtime";
-import { formatErrorMessage as formatErrorMessage$1, redactSensitiveText } from "openclaw/plugin-sdk/security-runtime";
-import { SsrFBlockedError, isBlockedHostnameOrIp } from "openclaw/plugin-sdk/ssrf-runtime";
-import { spawn } from "node:child_process";
+import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { once } from "node:events";
+import { spawn } from "node:child_process";
 import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { DEFAULT_MAX_LIVE_TOOL_RESULT_CHARS, estimateToolResultTextChars, resolveLiveToolResultMaxChars, sliceToolResultTextToBudget, sliceUtf16Safe, truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
+import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
+import { createStageTimingTracker, formatStageTimings } from "openclaw/plugin-sdk/time-runtime";
+import { isPathStrictlyInside, root } from "openclaw/plugin-sdk/file-access-runtime";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { resolveAgentDir } from "openclaw/plugin-sdk/agent-runtime";
+import { HEARTBEAT_RESPONSE_TOOL_NAME, buildAgentHookContextChannelFields, buildEmbeddedAttemptToolRunContext, consumeAdjustedParamsForToolCall, consumePreExecutionBlockedToolCall, createAgentToolResultMiddlewareRunner, createCodexAppServerToolResultExtensionRunner, embeddedAgentLog, extractMessagingToolSend, extractMessagingToolSendResult, extractToolResultMediaArtifact, filterProviderNormalizableTools, filterToolResultMediaUrls, finalizeAgentToolAvailability, finalizeToolTerminalPresentation, formatApprovalDisplayPath, formatToolExecutionErrorMessage, getBeforeToolCallFailureDisposition, getChannelAgentToolMeta, getPluginToolMeta, getPluginToolSideEffectOwnerKey, hasNativeHookRelayInvocation, invokeNativeHookRelay, isDeliveredMessageToolOnlySourceReplyResult, isDeliveredMessagingToolResult, isHostScopedAgentToolActive, isMessagingTool, isMessagingToolSendAction, isReplaySafeToolCall, isSubagentSessionKey, isToolResultError, isToolWrappedWithBeforeToolCallHook, normalizeAgentRuntimeTools, normalizeHeartbeatToolResponse, projectRuntimeToolInputSchema, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveNativeHookRelayDeferredToolApproval, resolveToolExecutionErrorKind, resolveToolResultFailureKind, runAgentHarnessAfterToolCallHook, sanitizeToolResult, setBeforeToolCallDiagnosticsEnabled, supportsModelTools, wrapToolWithBeforeToolCallHook } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { formatErrorMessage as formatErrorMessage$2, redactSensitiveText } from "openclaw/plugin-sdk/security-runtime";
 import { emitTrustedDiagnosticEvent } from "openclaw/plugin-sdk/diagnostic-runtime";
 import { isIP } from "node:net";
-import { WebSocketServer } from "ws";
-import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
 import { formatMcpCodexApprovalRemedy, requiresMcpCodexToolApproval, resolveCodexScheduledToolProjectionFactory, resolveProjectedMcpCodexToolApprovalMode, runWithCronCreatorAuthorityCapabilityResolver } from "openclaw/plugin-sdk/codex-mcp-projection";
 import { buildRemoteCommand, isToolAllowed, sanitizeEnvVars } from "openclaw/plugin-sdk/sandbox";
-import { fileURLToPath, pathToFileURL } from "node:url";
 import { saveMediaBuffer } from "openclaw/plugin-sdk/media-store";
 import { getMediaDir } from "openclaw/plugin-sdk/media-runtime";
 import { consumeTrustedToolNoStartError, copyInternalToolResultState, getCoreTtsToolResultMediaUrls } from "openclaw/plugin-sdk/agent-harness-tool-runtime";
+import { SsrFBlockedError, isBlockedHostnameOrIp } from "openclaw/plugin-sdk/ssrf-runtime";
 import { normalizeOpenAIStrictCompatSchema } from "openclaw/plugin-sdk/provider-tools";
 //#region extensions/codex/src/app-server/dynamic-tool-build-state.ts
 /** Mutable dependency seam shared by dynamic-tool construction and its behavioral tests. */
@@ -156,26 +158,10 @@ const CODEX_DYNAMIC_TOOL_BUILD_WARN_TOTAL_MS = 1e3;
 const CODEX_DYNAMIC_TOOL_BUILD_WARN_STAGE_MS = 500;
 /** Captures bounded preparation stages before a slow turn needs diagnosis. */
 function createCodexDynamicToolBuildStageTracker() {
-	const startedAt = Date.now();
-	let previousAt = startedAt;
-	const stages = [];
-	const toMs = (value) => Math.max(0, Math.round(value));
+	const { mark, snapshot } = createStageTimingTracker();
 	return {
-		mark(name) {
-			const currentAt = Date.now();
-			stages.push({
-				name,
-				durationMs: toMs(currentAt - previousAt),
-				elapsedMs: toMs(currentAt - startedAt)
-			});
-			previousAt = currentAt;
-		},
-		snapshot() {
-			return {
-				totalMs: toMs(Date.now() - startedAt),
-				stages: stages.slice()
-			};
-		}
+		mark,
+		snapshot
 	};
 }
 /** Returns true when dynamic-tool construction is slow enough to warrant a warning log. */
@@ -186,7 +172,7 @@ function shouldWarnCodexDynamicToolBuildStageSummary(summary, profilerEnabled =
 }
 /** Formats per-stage timings into the compact form used by Codex app-server logs. */
 function formatCodexDynamicToolBuildStageSummary(summary) {
-	return summary.stages.length > 0 ? summary.stages.map((stage) => `${stage.name}:${stage.durationMs}ms@${stage.elapsedMs}ms`).join(",") : "none";
+	return formatStageTimings(summary.stages);
 }
 /** Builds, filters, and normalizes Codex-compatible runtime tools for a single turn. */
 async function buildDynamicTools(input) {
@@ -210,7 +196,7 @@ async function buildDynamicTools(input) {
 	}
 	const toolBuildStages = createCodexDynamicToolBuildStageTracker();
 	const modelHasVision = params.model.input?.includes("image") ?? false;
-	const agentDir = params.agentDir ?? resolveAgentDir$1(params.config ?? {}, input.sessionAgentId);
+	const agentDir = params.agentDir ?? resolveAgentDir(params.config ?? {}, input.sessionAgentId);
 	const injectedOpenClawCodingToolsFactory = dynamicToolBuildState.openClawCodingToolsFactory;
 	const nativeExecutionPolicy = resolveCodexNativeExecutionPolicyForRun(params, {
 		agentId: input.policyAgentId,
@@ -248,31 +234,13 @@ async function buildDynamicTools(input) {
 			send: params.onToolResult,
 			...params.messageChannel ? { messageChannel: params.messageChannel } : {}
 		} } : {},
-		clientCaps: params.clientCaps,
-		chatType: params.chatType,
-		agentAccountId: params.agentAccountId,
-		messageTo: params.messageTo,
-		messageThreadId: params.messageThreadId,
-		nativeChannelId: params.chatId,
-		messageActionTurnCapability: params.messageActionTurnCapability,
-		groupId: params.groupId,
-		groupChannel: params.groupChannel,
-		groupSpace: params.groupSpace,
-		spawnedBy: params.spawnedBy,
-		senderId: params.senderId,
-		senderName: params.senderName,
-		senderUsername: params.senderUsername,
-		senderE164: params.senderE164,
-		senderIsOwner: params.senderIsOwner,
 		inputProvenance: params.inputProvenance,
 		trustedInternalHandoff: params.trustedInternalHandoff,
-		scheduledToolPolicy: params.scheduledToolPolicy,
 		allowGatewaySubagentBinding: params.allowGatewaySubagentBinding || isForcedPrivateQaCodexRuntime(),
 		sessionKey: input.sandboxSessionKey,
 		runSessionKey: params.sessionKey && params.sessionKey !== input.sandboxSessionKey ? params.sessionKey : void 0,
 		sessionId: params.sessionId,
 		runId: params.runId,
-		approvalReviewerDeviceId: params.approvalReviewerDeviceId,
 		agentDir,
 		preparedModelRuntime: params.preparedModelRuntime,
 		cwd: input.effectiveCwd ?? input.effectiveWorkspace,
@@ -297,25 +265,18 @@ async function buildDynamicTools(input) {
 		modelAuthMode: resolveModelAuthMode(params.model.provider, params.config, params.toolAuthProfileStore ?? params.authProfileStore, { workspaceDir: input.effectiveWorkspace }),
 		suppressManagedWebSearch: false,
 		webFetchHostnameAllowlistRef,
-		currentChannelId: params.currentChannelId,
-		currentMessagingTarget: params.currentMessagingTarget,
 		hookChannelId: resolveCodexAppServerHookChannelId(params, input.sandboxSessionKey),
-		currentThreadTs: params.currentThreadTs,
-		currentMessageId: params.currentMessageId,
-		replyToMode: params.replyToMode,
-		hasRepliedRef: params.hasRepliedRef,
 		modelHasVision,
 		computerContextEpoch: input.computerContextEpoch,
+		oneShotCliRun: params.oneShotCliRun,
 		registerRunCleanup: input.registerRunCleanup,
 		requireExplicitMessageTarget: params.requireExplicitMessageTarget ?? isSubagentSessionKey(params.sessionKey),
-		sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,
-		taskSuggestionDeliveryMode: params.taskSuggestionDeliveryMode,
 		disableMessageTool: input.ignoreDisableMessageTool ? false : params.disableMessageTool,
 		forceMessageTool: shouldForceMessageTool(messagePolicyParams),
 		enableHeartbeatTool: params.trigger === "heartbeat" || input.forceHeartbeatTool === true,
 		forceHeartbeatTool: params.trigger === "heartbeat" || input.forceHeartbeatTool === true,
 		onYield: (message, acknowledgment) => {
-			input.onYieldDetected(acknowledgment);
+			input.onYieldDetected(message, acknowledgment);
 			input.onCodexAppServerEvent?.({
 				stream: "codex_app_server.tool",
 				data: {
@@ -335,6 +296,7 @@ async function buildDynamicTools(input) {
 		cronCreatorToolAllowlistCaptureRef: input.cronCreatorToolAllowlistCaptureRef,
 		cronCreatorAuthorityUnavailableReason: input.cronCreatorAuthorityUnavailableReason
 	};
+	input.onMessageToolTargetResolved?.(options.requireExplicitMessageTarget === true);
 	const buildOpenClawCodingTools = () => {
 		const bindingOptions = { cwd: input.effectiveCwd ?? input.effectiveWorkspace };
 		if (injectedOpenClawCodingToolsFactory) return params.hostCapabilities.bindToolSurface(injectedOpenClawCodingToolsFactory(options), bindingOptions);
@@ -1157,7 +1119,7 @@ const CODEX_NODE_HTTP_CREDENTIAL_FIELD_NAME_PATTERN = /^(?:(?:[a-z\d]+_)*(?:toke
 const nodeExecServerTextDecoder = new TextDecoder("utf-8", { fatal: true });
 /** Produces the bounded, redacted terminal failure shared by pending and claimed node leases. */
 function createCodexNodeExecServerDisconnectError(reason, cause) {
-	const detail = cause === void 0 ? "" : `: ${truncateUtf16Safe(redactSensitiveText(formatErrorMessage$1(cause), { mode: "tools" }), CODEX_NODE_EXEC_SERVER_MAX_FAILURE_DETAIL_CHARS)}`;
+	const detail = cause === void 0 ? "" : `: ${truncateUtf16Safe(redactSensitiveText(formatErrorMessage$2(cause), { mode: "tools" }), CODEX_NODE_EXEC_SERVER_MAX_FAILURE_DETAIL_CHARS)}`;
 	return /* @__PURE__ */ new Error(`Codex execution node disconnected; start a fresh attempt. (${reason}${detail})`);
 }
 /** Relays one authorized, single-use Codex exec-server channel without interpreting its protocol. */
@@ -1451,6 +1413,10 @@ const sandboxExecServerRegistry = {
 	}
 };
 //#endregion
+//#region extensions/codex/src/app-server/sandbox-exec-server.websocket.ts
+const require = createRequire(import.meta.url);
+const websocket = require(path.join(path.dirname(require.resolve("ws/package.json")), "index.js"));
+//#endregion
 //#region extensions/codex/src/app-server/sandbox-exec-server/json-rpc.ts
 /** JSON-RPC error code used when a sandbox filesystem resource does not exist. */
 const JSON_RPC_NOT_FOUND = -32004;
@@ -3129,7 +3095,7 @@ async function startOpenClawExecServer(sandbox) {
 			fsBridge
 		};
 	}
-	const server = new WebSocketServer({
+	const server = new websocket.WebSocketServer({
 		host: "127.0.0.1",
 		port: 0,
 		maxPayload: connection.kind === "node" ? CODEX_NODE_EXEC_SERVER_MAX_MESSAGE_BYTES : CODEX_SANDBOX_EXEC_SERVER_MAX_INBOUND_MESSAGE_BYTES
@@ -5477,7 +5443,8 @@ function notifyAgentToolResult(observer, toolName, result, isError) {
 			isError
 		});
 	} catch (error) {
-		embeddedAgentLog.warn(`onAgentToolResult handler failed: tool=${toolName} error=${String(error)}`);
+		const message = formatToolExecutionErrorMessage(error, "Unknown error");
+		embeddedAgentLog.warn(`onAgentToolResult handler failed: tool=${toolName} error=${message}`);
 	}
 }
 function failedToolResult(message, status = "failed") {
@@ -5684,7 +5651,36 @@ function withDynamicToolAsyncStarted(response, asyncStarted) {
 function normalizeToolResultMaxChars(maxChars) {
 	return typeof maxChars === "number" && Number.isFinite(maxChars) && maxChars > 0 ? Math.floor(maxChars) : DEFAULT_MAX_LIVE_TOOL_RESULT_CHARS;
 }
-function convertToolContents(content, toolResultMaxChars = DEFAULT_MAX_LIVE_TOOL_RESULT_CHARS) {
+function sanitizeToolTextRuns(rawContent) {
+	const content = [];
+	for (let index = 0; index < rawContent.length;) {
+		const item = rawContent[index];
+		if (item.type !== "text") {
+			content.push(item);
+			index += 1;
+			continue;
+		}
+		const textRun = [];
+		while (index < rawContent.length) {
+			const next = rawContent[index];
+			if (next.type !== "text") break;
+			textRun.push(next);
+			index += 1;
+		}
+		const sanitizedText = sanitizeToolResult(textRun.map((entry) => entry.text).join(""));
+		let offset = 0;
+		content.push(...textRun.map((entry, runIndex) => {
+			const targetEnd = runIndex === textRun.length - 1 ? sanitizedText.length : Math.min(sanitizedText.length, offset + entry.text.length);
+			const text = sliceUtf16Safe(sanitizedText, offset, targetEnd);
+			const sanitized = Object.assign({}, entry, { text });
+			offset += text.length;
+			return sanitized;
+		}));
+	}
+	return content;
+}
+function convertToolContents(rawContent, toolResultMaxChars = DEFAULT_MAX_LIVE_TOOL_RESULT_CHARS) {
+	const content = sanitizeToolTextRuns(rawContent);
 	const maxChars = normalizeToolResultMaxChars(toolResultMaxChars);
 	const totalTextChars = content.reduce((total, item) => total + (item.type === "text" ? item.text.length : 0), 0);
 	if (content.reduce((total, item) => total + (item.type === "text" ? estimateToolResultTextChars(item.text) : 0), 0) <= maxChars) return content.flatMap(convertToolContent);

package/dist/{effective-mcp-catalog-CY9Jn4bA.js → effective-mcp-catalog-J_5Ep5Um.js}

@@ -1,6 +1,6 @@
-import { l as sessionBindingIdentity } from "./session-binding-record-CyaXZvTe.js";
-import { _ as retainSharedCodexAppServerClientByInstanceId } from "./shared-client-CKhX2kFt.js";
-import "./session-binding-4Ki04sW-.js";
+import { l as sessionBindingIdentity } from "./session-binding-record-CaZjYwNS.js";
+import { _ as retainSharedCodexAppServerClientByInstanceId } from "./shared-client-CVhez2Uo.js";
+import "./session-binding-CKSepwIC.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

package/dist/{elicitation-input-DMkeki8d.js → elicitation-input-DPoK8F7w.js}

@@ -1,17 +1,8 @@
 import { agentHarnessStructuredInput } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/elicitation-input.ts
-/** Snapshots and compiles ordinary Codex input before it enters the per-turn queue. */
+/** Compiles a validated Codex input snapshot before it enters the per-turn queue. */
 function compileCodexOrdinaryElicitation(params) {
-	if (readRawOwnString(params.value, "threadId") !== params.threadId) return { kind: "ignored" };
-	const snapshot = agentHarnessStructuredInput.snapshot(params.value);
-	if (!agentHarnessStructuredInput.isRecord(snapshot)) return {
-		kind: "compiled",
-		input: {
-			kind: "unsupported",
-			message: "OpenClaw declined a malformed or over-limit MCP elicitation request."
-		}
-	};
-	const requestTurnId = readValue(snapshot, "turnId");
+	const requestTurnId = readValue(params.snapshot, "turnId");
 	if (typeof requestTurnId === "string" && requestTurnId !== params.turnId) return { kind: "ignored" };
 	if (requestTurnId !== null && typeof requestTurnId !== "string") return {
 		kind: "compiled",
@@ -20,13 +11,13 @@ function compileCodexOrdinaryElicitation(params) {
 			message: "OpenClaw declined an MCP elicitation with invalid turn correlation."
 		}
 	};
-	const mode = readCodexElicitationString(snapshot, "mode");
+	const mode = readCodexElicitationString(params.snapshot, "mode");
 	if (mode === "url") return {
 		kind: "compiled",
 		input: agentHarnessStructuredInput.compileUrl({
-			url: readValue(snapshot, "url"),
-			elicitationId: readValue(snapshot, "elicitationId"),
-			message: readValue(snapshot, "message"),
+			url: readValue(params.snapshot, "url"),
+			elicitationId: readValue(params.snapshot, "elicitationId"),
+			message: readValue(params.snapshot, "message"),
 			fallbackMessage: "Codex provided a URL",
 			protocolName: "MCP"
 		})
@@ -41,8 +32,8 @@ function compileCodexOrdinaryElicitation(params) {
 	return {
 		kind: "compiled",
 		input: agentHarnessStructuredInput.compileForm({
-			schema: readValue(snapshot, "requestedSchema"),
-			message: readCodexElicitationString(snapshot, "message"),
+			schema: readValue(params.snapshot, "requestedSchema"),
+			message: readCodexElicitationString(params.snapshot, "message"),
 			fallbackMessage: "Codex needs input",
 			options: {
 				protocolName: mode === "openai/form" ? "OpenAI" : "MCP",
@@ -62,10 +53,5 @@ function readCodexElicitationString(record, key) {
 	const value = readValue(record, key);
 	return typeof value === "string" ? value : void 0;
 }
-function readRawOwnString(value, key) {
-	if (!value || typeof value !== "object" || Array.isArray(value)) return;
-	const descriptor = Object.getOwnPropertyDescriptor(value, key);
-	return descriptor && "value" in descriptor && typeof descriptor.value === "string" ? descriptor.value : void 0;
-}
 //#endregion
 export { compileCodexOrdinaryElicitation };

package/dist/ephemeral-turn-DSwzP8YY.js

@@ -0,0 +1,101 @@
+import { o as isJsonObject } from "./protocol-CAAcVIKF.js";
+import { T as readCodexTurnCompletedNotification } from "./client-BEKu4yDx.js";
+import { p as getCodexAppServerTurnRouter } from "./attempt-client-cleanup-D6cR54TV.js";
+import { o as isTerminalTurnStatus, s as readCodexNotificationItem } from "./attempt-notifications--H8zXR5-.js";
+import { t as CodexUsageProjection } from "./event-projector-usage-CIyrYYid.js";
+import { readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { toStringifiedError } from "openclaw/plugin-sdk/error-runtime";
+import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
+//#region extensions/codex/src/app-server/ephemeral-turn.ts
+/** One ephemeral turn; the client router owns correlation, buffering and request lifetime. */
+var CodexEphemeralTurn = class {
+	constructor(client, threadId, options) {
+		this.options = options;
+		this.completion = createDeferred();
+		this.usage = new CodexUsageProjection();
+		this.items = /* @__PURE__ */ new Map();
+		this.assistantItems = /* @__PURE__ */ new Map();
+		this.assistantText = "";
+		this.route = getCodexAppServerTurnRouter(client).reserveThread({
+			threadId,
+			...options,
+			onNotification: async (notification, scope) => {
+				const params = isJsonObject(notification.params) ? notification.params : void 0;
+				if (params && scope.turnId) {
+					if (notification.method === "item/completed" && options.textMode === "all") {
+						const item = readCodexNotificationItem(params);
+						if (item) {
+							this.items.set(item.id, item);
+							if (item.type === "agentMessage" && item.text) this.assistantItems.set(item.id, item.text);
+						}
+					} else if (notification.method === "item/agentMessage/delta") {
+						const delta = readStringField(params, "delta") ?? "";
+						const itemId = readStringField(params, "itemId") ?? readStringField(params, "id") ?? "assistant";
+						const firstDelta = !this.assistantText && Boolean(delta);
+						this.assistantText += delta;
+						if (delta && options.textMode === "all") this.assistantItems.set(itemId, `${this.assistantItems.get(itemId) ?? ""}${delta}`);
+						if (firstDelta) await options.onAssistantMessageStart?.();
+					} else if (notification.method === "rawResponse/completed") this.usage.record(params);
+					else if (notification.method === "turn/completed") {
+						this.turn = readCodexTurnCompletedNotification(params)?.turn ?? this.turn;
+						this.completion.resolve();
+					} else if (notification.method === "error") {
+						this.usage.invalidateContext();
+						if (params.willRetry !== true) {
+							this.error = params;
+							this.completion.resolve();
+						}
+					}
+				}
+				await options.onNotification?.(notification, scope);
+			}
+		});
+		this.route.armTurn();
+	}
+	get completed() {
+		return this.turn !== void 0;
+	}
+	async wait(turn, options) {
+		if (isTerminalTurnStatus(turn.status)) {
+			this.turn = turn;
+			this.completion.resolve();
+		}
+		const completion = this.route.bindTurn(turn.id, { completed: isTerminalTurnStatus(turn.status) }).then(() => this.completion.promise);
+		const signals = [this.route.signal, options.signal];
+		const abortError = () => options.signal.aborted ? options.abortError() : toStringifiedError(this.route.signal.reason);
+		let timer;
+		let abort = () => {};
+		try {
+			await Promise.race([completion, new Promise((_resolve, reject) => {
+				abort = () => {
+					if (options.signal.aborted || !this.route.completed) reject(abortError());
+				};
+				for (const signal of signals) {
+					signal.addEventListener("abort", abort, { once: true });
+					if (signal.aborted) abort();
+				}
+				const timeout = options.timeout;
+				if (timeout) {
+					timer = setTimeout(() => reject(timeout.error), timeout.ms);
+					timer.unref?.();
+				}
+			})]);
+		} finally {
+			clearTimeout(timer);
+			for (const signal of signals) signal.removeEventListener("abort", abort);
+		}
+		const items = new Map(this.items);
+		for (const item of this.turn?.items ?? []) items.set(item.id, item);
+		const messages = (this.options.textMode === "last" ? this.turn?.items ?? [] : [...items.values()]).filter((item) => item.type === "agentMessage").map((item) => item.text.trim()).filter(Boolean);
+		const text = this.options.textMode === "last" ? messages.at(-1) || this.assistantText : messages.join("\n\n") || [...this.assistantItems.values()].map((message) => message.trim()).filter(Boolean).join("\n\n");
+		return {
+			turn: this.turn,
+			error: this.error,
+			items: [...items.values()],
+			text: text.trim(),
+			usage: this.usage.usage
+		};
+	}
+};
+//#endregion
+export { CodexEphemeralTurn as t };