@openclaw/codex 2026.9.5 → 2026.9.7

package/dist/.setup/{conversation-binding-DhzrpTM6.mjs → conversation-binding-3Min8qvP.mjs}

@@ -1,22 +1,25 @@
-import { n as assertCodexBindingMayBeReplaced, p as sessionBindingIdentity } from "./session-binding-record-TH3xA0zj.mjs";
-import { E as readCodexRequirementsToml, m as isJsonObject } from "./config-security-BRQ2mgW9.mjs";
-import { d as readCodexPluginConfig } from "./config-parsing-CcB9iPoq.mjs";
-import { _ as assertCodexThreadAcceptsDirectInput, b as assertCodexThreadStartResponse, l as isCodexAppServerOverloadError, m as CodexThreadDirectInputError, s as isCodexAppServerIndeterminateRequestCancellationError } from "./client-vXs2929Q.mjs";
-import { d as readCodexEffectiveConfig, n as codexSandboxPolicyForTurn } from "./config-options-BsanJ8QG.mjs";
-import { o as resolveCodexDefaultWorkspaceDir } from "./conversation-binding-data-CrcyZk6O.mjs";
-import { n as projectBoundedCodexVisibleSessionHistory } from "./transcript-history-projection-DHNBDhCU.mjs";
-import { n as resolveOpenClawExecPolicyForCodexAppServer, t as canUseCodexModelBackedApprovalsReviewerForModel } from "./config-CedDWjM-.mjs";
-import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-CeAhl_h4.mjs";
-import { n as normalizeCodexAppServerBindingModelProvider, t as isCodexAppServerNativeAuthProfile } from "./auth-profile-WqZtZfXN.mjs";
-import { I as hasCodexAppServerLiveThread, N as consumeCodexAppServerLiveThread, R as isCodexAppServerClientRuntimeLive, U as releaseCodexAppServerLiveThread, _ as retainSharedCodexAppServerClientByInstanceId, c as getLeasedSharedCodexAppServerClient, m as releaseCodexAppServerClientLease, x as withLeasedCodexAppServerClientStartSelectionRetry, z as isCodexAppServerLiveThreadClaimed } from "./shared-client-BpTtuLQ5.mjs";
-import { a as closeCodexStartupClientBestEffort, f as unsubscribeCodexThreadBestEffort, l as retireUnsafeCodexTurnClientBestEffort, m as getCodexAppServerTurnRouter, o as interruptCodexTurnAndWaitBestEffort, s as isCodexAppServerUnsafeSubscriptionError, v as isCodexNotificationForTurn } from "./attempt-client-cleanup-BpYKdTA0.mjs";
-import { Dt as buildDisabledAppsConfigPatch, E as CODEX_NATIVE_PERSONALITY_NONE, N as buildCodexProjectDocThreadConfig, O as resolveCodexAppServerRequestModelSelection, Ot as mergeCodexThreadConfigs } from "./thread-lifecycle-Cik28qWn.mjs";
-import "./session-binding-_0W_fHRr.mjs";
-import { t as resumeCodexAppServerThread } from "./thread-resume-BkNpj9Pz.mjs";
-import { a as rollbackCodexAppServerBindingSubscription, n as releaseCodexAppServerBindingSubscription, r as retainCodexAppServerBindingSubscription, s as withExclusiveCodexAppServerThread, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-skomxnIt.mjs";
-import { a as resolveCodexAppServerForModelProvider, i as resolveCodexSessionPermissionCwd, n as applyCodexSessionPermissionPolicy, t as CODEX_SESSION_PERMISSION_EXEC_MODES } from "./session-permission-policy-DhurXY0l.mjs";
-import { u as trackCodexConversationActiveTurn } from "./conversation-control-DN53ns41.mjs";
-import { asOptionalRecord, normalizeOptionalString, normalizeSingleOrTrimmedStringList } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
+import { n as assertCodexBindingMayBeReplaced, v as sessionBindingIdentity } from "./session-binding-record-Oe9L-CNY.mjs";
+import { m as readCodexRequirementsToml } from "./config-security-CE-FcGw9.mjs";
+import { d as readCodexPluginConfig } from "./config-parsing-b088LyhT.mjs";
+import { d as readCodexEffectiveConfig, n as codexSandboxPolicyForTurn } from "./config-options-CzyWLTJt.mjs";
+import { l as retainSharedCodexAppServerClientByInstanceId } from "./shared-client-lifecycle-DJIgqgMw.mjs";
+import { o as resolveCodexDefaultWorkspaceDir } from "./conversation-binding-data-C746z5Pn.mjs";
+import { n as projectBoundedCodexVisibleSessionHistory } from "./transcript-history-projection-DRSifI-1.mjs";
+import { n as canUseCodexModelBackedApprovalsReviewerForModel, r as resolveOpenClawExecPolicyForCodexAppServer } from "./config-DKhXquav.mjs";
+import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-C0NbLms1.mjs";
+import { n as normalizeCodexAppServerBindingModelProvider, t as isCodexAppServerNativeAuthProfile } from "./auth-profile-B0okYl2D.mjs";
+import { B as isCodexAppServerClientRuntimeLive, F as consumeCodexAppServerLiveThread, G as releaseCodexAppServerLiveThread, R as hasCodexAppServerLiveThread, V as isCodexAppServerLiveThreadClaimed, b as withLeasedCodexAppServerClientStartSelectionRetry, c as getLeasedSharedCodexAppServerClient, m as releaseCodexAppServerClientLease } from "./shared-client-DqyTMYug.mjs";
+import { h as CodexThreadDirectInputError, l as isCodexAppServerOverloadError, s as isCodexAppServerIndeterminateRequestCancellationError, v as assertCodexThreadAcceptsDirectInput, x as assertCodexThreadStartResponse } from "./client-N0JpgSzF.mjs";
+import { c as isCodexAppServerUnsafeSubscriptionError, h as getCodexAppServerTurnRouter, o as closeCodexStartupClientBestEffort, p as unsubscribeCodexThreadBestEffort, s as interruptCodexTurnAndWaitBestEffort, u as retireUnsafeCodexTurnClientBestEffort, v as isCodexNotificationForTurn } from "./attempt-client-cleanup-DOP-cW5j.mjs";
+import { S as buildCodexProjectDocThreadConfig, St as mergeCodexThreadConfigs, g as CODEX_NATIVE_PERSONALITY_NONE, v as resolveCodexAppServerRequestModelSelection, vt as buildDisabledAppsConfigPatch } from "./thread-requests-B_bRnMGN.mjs";
+import "./thread-lifecycle-DPflntEJ.mjs";
+import "./session-binding-DGCYAfvD.mjs";
+import { t as resumeCodexAppServerThread } from "./thread-resume-CdDaoc7T.mjs";
+import { a as rollbackCodexAppServerBindingSubscription, c as withExclusiveCodexAppServerThread, n as releaseCodexAppServerBindingSubscription, r as retainCodexAppServerBindingSubscription, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-roNP0l1c.mjs";
+import { a as resolveCodexAppServerForModelProvider, i as resolveCodexSessionPermissionCwd, n as applyCodexSessionPermissionPolicy, t as CODEX_SESSION_PERMISSION_EXEC_MODES } from "./session-permission-policy-Ci_fVX6y.mjs";
+import { u as trackCodexConversationActiveTurn } from "./conversation-control-CEP8X5JC.mjs";
+import { asOptionalRecord, normalizeOptionalString, readNonEmptyStringPreservingWhitespace } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import path from "node:path";
@@ -80,16 +83,24 @@ async function resolveConversationAppServerRuntime(params) {
 		env: process.env,
 		agentDir: params.agentDir
 	});
+	const runtime = applyCodexSessionPermissionPolicy({
+		appServer: configuredRuntime,
+		permissionMode,
+		sessionRoot,
+		defaultRoot: agentWorkspaceDir,
+		pluginConfig: readCodexPluginConfig(params.pluginConfig),
+		canUseAutoReview,
+		requirementsToml: readCodexRequirementsToml({}),
+		execMode: execPolicy.mode
+	});
 	return {
-		runtime: applyCodexSessionPermissionPolicy({
-			appServer: configuredRuntime,
-			permissionMode,
-			sessionRoot,
-			defaultRoot: agentWorkspaceDir,
-			pluginConfig: readCodexPluginConfig(params.pluginConfig),
-			canUseAutoReview,
-			requirementsToml: readCodexRequirementsToml({}),
-			execMode: execPolicy.mode
+		runtime: resolveCodexAppServerForModelProvider({
+			appServer: runtime,
+			provider: params.modelProvider,
+			model: params.model,
+			config: params.config,
+			env: process.env,
+			agentDir: params.agentDir
 		}),
 		workspaceDir: resolveCodexSessionPermissionCwd({
 			permissionMode,
@@ -111,12 +122,12 @@ async function resolveThreadBindingRuntime(params) {
 		modelProvider: params.modelProvider,
 		...agentLookup
 	});
-	const modelSelection = resolveOptionalThreadRequestModelSelection({
+	const modelSelection = params.model?.trim() ? resolveCodexAppServerRequestModelSelection({
 		model: params.model,
 		modelProvider,
 		authProfileId: params.authProfileId,
 		...agentLookup
-	});
+	}) : void 0;
 	const reviewerModelProvider = resolveModelBackedReviewerPolicyProvider({
 		authProfileId: params.authProfileId,
 		modelProvider: params.modelProvider,
@@ -133,15 +144,7 @@ async function resolveThreadBindingRuntime(params) {
 		model: params.model,
 		agentDir: params.agentDir
 	});
-	const modelScopedRuntime = resolveCodexAppServerForModelProvider({
-		appServer: runtime,
-		provider: reviewerModelProvider,
-		model: params.model,
-		config: params.config,
-		env: process.env,
-		agentDir: params.agentDir
-	});
-	assertNativeConversationApprovalPolicySupported(modelScopedRuntime);
+	assertNativeConversationApprovalPolicySupported(runtime);
 	const clientOptions = {
 		startOptions: runtime.start,
 		timeoutMs: runtime.requestTimeoutMs,
@@ -149,7 +152,7 @@ async function resolveThreadBindingRuntime(params) {
 		...agentLookup
 	};
 	return {
-		runtime: modelScopedRuntime,
+		runtime,
 		workspaceDir,
 		agentLookup,
 		model: modelSelection?.model,
@@ -158,6 +161,8 @@ async function resolveThreadBindingRuntime(params) {
 	};
 }
 function buildConversationThreadRequest(resolved, serviceTier, effectiveNativeConfig) {
+	const { runtime } = resolved;
+	const config = buildCodexProjectDocThreadConfig(mergeCodexThreadConfigs(runtime.networkProxy?.configPatch, buildDisabledAppsConfigPatch()), effectiveNativeConfig);
 	return {
 		cwd: resolved.workspaceDir,
 		...resolved.model ? { model: resolved.model } : {},
@@ -166,7 +171,10 @@ function buildConversationThreadRequest(resolved, serviceTier, effectiveNativeCo
 		approvalPolicy: resolved.runtime.approvalPolicy,
 		approvalsReviewer: resolved.runtime.approvalsReviewer,
 		...resolved.runtime.sessionRoot ? { runtimeWorkspaceRoots: [resolved.runtime.sessionRoot] } : {},
-		...codexConversationSandboxOrPermissions(resolved.runtime, resolved.runtime.sandbox, effectiveNativeConfig),
+		...runtime.networkProxy ? { config } : {
+			sandbox: runtime.sandbox,
+			config
+		},
 		...serviceTier ? { serviceTier } : {}
 	};
 }
@@ -175,14 +183,6 @@ async function buildConversationThreadRequestForClient(client, resolved, service
 	requestOptions();
 	return buildConversationThreadRequest(resolved, serviceTier, effectiveConfig);
 }
-function codexConversationSandboxOrPermissions(runtime, sandbox, effectiveNativeConfig) {
-	const networkProxy = runtime.networkProxy;
-	const config = buildCodexProjectDocThreadConfig(mergeCodexThreadConfigs(networkProxy?.configPatch, buildDisabledAppsConfigPatch()), effectiveNativeConfig);
-	return networkProxy ? { config } : {
-		sandbox,
-		config
-	};
-}
 async function writeThreadBindingFromResponse(params, resolved, client, response, requestOptions) {
 	let retained = false;
 	let sameOwner = false;
@@ -202,7 +202,10 @@ async function writeThreadBindingFromResponse(params, resolved, client, response
 		}
 		if (current && !sameOwner) {
 			const { assertCurrent } = requestOptions();
-			await releaseCodexAppServerBindingSubscription(current, { assertCurrent });
+			await releaseCodexAppServerBindingSubscription(current, {
+				assertCurrent,
+				retainedClientId: client.getInstanceId()
+			});
 		}
 		requestOptions();
 		if (!await params.bindingStore.mutate(params.identity, {
@@ -373,7 +376,7 @@ async function projectConversationSourceHistory(source, target, config) {
 	});
 	const history = projectBoundedCodexVisibleSessionHistory(entries);
 	if (history.length === 0) return;
-	const clientLease = retainSharedCodexAppServerClientByInstanceId(target.clientId);
+	const clientLease = await retainSharedCodexAppServerClientByInstanceId(target.clientId);
 	if (!clientLease) throw new Error("Codex conversation source history lost its bound client owner.");
 	try {
 		await clientLease.client.request("thread/inject_items", {
@@ -381,7 +384,7 @@ async function projectConversationSourceHistory(source, target, config) {
 			items: history
 		});
 	} finally {
-		clientLease.release();
+		await clientLease.release();
 	}
 }
 function resolveThreadRequestModelProvider(params) {
@@ -390,16 +393,6 @@ function resolveThreadRequestModelProvider(params) {
 	if (isCodexAppServerNativeAuthProfile(params) && modelProvider.toLowerCase() === "openai") return;
 	return modelProvider.toLowerCase() === "openai" ? "openai" : modelProvider;
 }
-function resolveOptionalThreadRequestModelSelection(params) {
-	if (!params.model?.trim()) return;
-	return resolveCodexAppServerRequestModelSelection({
-		model: params.model,
-		modelProvider: params.modelProvider,
-		authProfileId: params.authProfileId,
-		agentDir: params.agentDir,
-		config: params.config
-	});
-}
 function resolveModelBackedReviewerPolicyProvider(params) {
 	const modelProvider = params.modelProvider?.trim();
 	if (modelProvider && modelProvider.toLowerCase() !== "codex") return modelProvider.toLowerCase() === "openai" ? "openai" : modelProvider;
@@ -452,7 +445,7 @@ function createCodexConversationTurnCollector(threadId) {
 		if (!params || !turnId || !isCodexNotificationForTurn(params, threadId, turnId)) return;
 		if (notification.method === "item/agentMessage/delta") {
 			const itemId = normalizeOptionalString(params.itemId) ?? "assistant";
-			const delta = readTextString(params, "delta");
+			const delta = readNonEmptyStringPreservingWhitespace(params.delta);
 			if (!delta) return;
 			assistantTextByItem.set(itemId, `${assistantTextByItem.get(itemId) ?? ""}${delta}`);
 			return;
@@ -507,11 +500,7 @@ function createCodexConversationTurnCollector(threadId) {
 	};
 }
 function readAssistantReplyText(item) {
-	return item.phase === "commentary" || item.delivery === "async" ? void 0 : readTextString(item, "text");
-}
-function readTextString(record, key) {
-	const value = record?.[key];
-	return typeof value === "string" && value.length > 0 ? value : void 0;
+	return item.phase === "commentary" || item.delivery === "async" ? void 0 : readNonEmptyStringPreservingWhitespace(item.text);
 }
 //#endregion
 //#region extensions/codex/src/conversation-turn-input.ts
@@ -528,21 +517,7 @@ function buildCodexConversationTurnInput(params) {
 		type: "text",
 		text: params.prompt,
 		text_elements: []
-	}, ...extractInboundMedia(params.event).map(toCodexImageInput).filter((item) => item !== void 0)];
-}
-function extractInboundMedia(event) {
-	const metadata = event.metadata ?? {};
-	const paths = normalizeSingleOrTrimmedStringList(metadata.mediaPaths).concat(normalizeSingleOrTrimmedStringList(metadata.mediaPath));
-	const urls = normalizeSingleOrTrimmedStringList(metadata.mediaUrls).concat(normalizeSingleOrTrimmedStringList(metadata.mediaUrl));
-	const mimeTypes = normalizeSingleOrTrimmedStringList(metadata.mediaTypes).concat(normalizeSingleOrTrimmedStringList(metadata.mediaType));
-	const count = Math.max(paths.length, urls.length, mimeTypes.length);
-	const media = [];
-	for (let index = 0; index < count; index += 1) media.push({
-		path: paths[index],
-		url: urls[index],
-		mimeType: mimeTypes[index] ?? mimeTypes[0]
-	});
-	return media;
+	}, ...(params.event.media ?? []).map(toCodexImageInput).filter((item) => item !== void 0)];
 }
 function toCodexImageInput(media) {
 	if (!isImageMedia(media)) return;
@@ -560,7 +535,7 @@ function toCodexImageInput(media) {
 	} : void 0;
 }
 function isImageMedia(media) {
-	if (media.mimeType?.toLowerCase().startsWith("image/")) return true;
+	if (media.kind === "image" || media.contentType?.toLowerCase().startsWith("image/")) return true;
 	const candidate = media.path ?? media.url;
 	if (!candidate) return false;
 	return IMAGE_EXTENSIONS.has(path.extname(candidate.split(/[?#]/, 1)[0] ?? "").toLowerCase());
@@ -622,23 +597,13 @@ async function runBoundTurn(params) {
 				model: binding.model,
 				agentDir: params.data.agentDir
 			});
-			const modelScopedRuntime = resolveCodexAppServerForModelProvider({
-				appServer: runtime,
-				provider: reviewerModelProvider,
-				model: binding.model,
-				config: params.config,
-				env: process.env,
-				agentDir: params.data.agentDir
-			});
-			const sessionRoot = modelScopedRuntime.sessionRoot;
-			const approvalPolicy = modelScopedRuntime.approvalPolicy;
-			const sandbox = modelScopedRuntime.sandbox;
-			const permissionProfile = modelScopedRuntime.networkProxy?.profileName;
-			const networkProxyConfigFingerprint = modelScopedRuntime.networkProxy?.configFingerprint;
+			const { sessionRoot, approvalPolicy, sandbox } = runtime;
+			const permissionProfile = runtime.networkProxy?.profileName;
+			const networkProxyConfigFingerprint = runtime.networkProxy?.configFingerprint;
 			const networkProxyBindingChanged = binding.networkProxyProfileName !== permissionProfile || binding.networkProxyConfigFingerprint !== networkProxyConfigFingerprint;
 			const serviceTier = binding.serviceTier ?? runtime.serviceTier;
 			let useStickyNetworkProfile = permissionProfile !== void 0 && binding.networkProxyProfileName === permissionProfile && binding.networkProxyConfigFingerprint === networkProxyConfigFingerprint;
-			assertNativeConversationApprovalPolicySupported(modelScopedRuntime);
+			assertNativeConversationApprovalPolicySupported(runtime);
 			const modelSelection = binding.model ? resolveCodexAppServerRequestModelSelection({
 				model: binding.model,
 				modelProvider: binding.modelProvider,
@@ -646,7 +611,7 @@ async function runBoundTurn(params) {
 				...agentLookup
 			}) : void 0;
 			const threadRequestRuntime = {
-				runtime: modelScopedRuntime,
+				runtime,
 				workspaceDir,
 				...modelSelection
 			};
@@ -715,7 +680,7 @@ async function runBoundTurn(params) {
 							throw error;
 						}
 						liveThreadOwnership = void 0;
-					} else if (binding.threadId !== threadId) await releaseCodexAppServerBindingSubscription(binding);
+					} else if (binding.threadId !== threadId) await releaseCodexAppServerBindingSubscription(binding, { retainedClientId: client.getInstanceId() });
 					if (!await params.bindingStore.mutate(identity, {
 						kind: "set",
 						binding: {
@@ -730,14 +695,14 @@ async function runBoundTurn(params) {
 								...agentLookup
 							}),
 							serviceTier: serviceTier ?? void 0,
-							networkProxyProfileName: modelScopedRuntime.networkProxy?.profileName,
-							networkProxyConfigFingerprint: modelScopedRuntime.networkProxy?.configFingerprint,
+							networkProxyProfileName: runtime.networkProxy?.profileName,
+							networkProxyConfigFingerprint: runtime.networkProxy?.configFingerprint,
 							conversationStartId: binding.conversationStartId,
 							conversationSourceTransferComplete: binding.conversationSourceTransferComplete,
 							historyCoveredThrough: binding.historyCoveredThrough
 						}
 					})) throw new Error("Codex conversation binding changed while rotating its thread.");
-					useStickyNetworkProfile = modelScopedRuntime.networkProxy !== void 0;
+					useStickyNetworkProfile = runtime.networkProxy !== void 0;
 				} else if (binding.clientId !== client.getInstanceId() || isCodexAppServerClientRuntimeLive(client) && !params.incognito && !liveThreadOwnership) {
 					if (binding.clientId === client.getInstanceId()) await assertResumeInputAllowed();
 					const response = await withLeasedCodexAppServerClientStartSelectionRetry({
@@ -771,7 +736,7 @@ async function runBoundTurn(params) {
 					if (!isSameCodexAppServerThreadOwner(binding, {
 						threadId,
 						clientId: client.getInstanceId()
-					})) await releaseCodexAppServerBindingSubscription(binding);
+					})) await releaseCodexAppServerBindingSubscription(binding, { retainedClientId: client.getInstanceId() });
 					if (!await params.bindingStore.mutate(identity, {
 						kind: "patch",
 						threadId: binding.threadId,
@@ -802,7 +767,7 @@ async function runBoundTurn(params) {
 					cwd: workspaceDir,
 					...sessionRoot ? { runtimeWorkspaceRoots: [sessionRoot] } : {},
 					approvalPolicy,
-					approvalsReviewer: modelScopedRuntime.approvalsReviewer,
+					approvalsReviewer: runtime.approvalsReviewer,
 					...useStickyNetworkProfile ? {} : { sandboxPolicy: codexSandboxPolicyForTurn(sandbox, sessionRoot ?? workspaceDir) },
 					...modelSelection?.model ? { model: modelSelection.model } : {},
 					personality: CODEX_NATIVE_PERSONALITY_NONE,
@@ -811,6 +776,7 @@ async function runBoundTurn(params) {
 				activeTurnCleanup = trackCodexConversationActiveTurn({
 					identity,
 					client,
+					requestTimeoutMs: runtime.requestTimeoutMs,
 					threadId,
 					turnId: activeTurnId
 				});

package/dist/.setup/{conversation-binding-data-CrcyZk6O.mjs → conversation-binding-data-C746z5Pn.mjs}

@@ -1,4 +1,4 @@
-import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
+import { t as __exportAll } from "./session-binding-sidecars-jo6H8dFr.mjs";
 import { asOptionalRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash, randomUUID } from "node:crypto";
 import process from "node:process";
@@ -42,9 +42,8 @@ function createCodexCliNodeConversationBindingData(params) {
 	};
 }
 function readCodexConversationBindingData(binding) {
-	const data = binding?.data;
-	if (!data || typeof data !== "object" || Array.isArray(data)) return;
-	return readCodexConversationBindingDataRecord(data);
+	const data = asOptionalRecord(binding?.data);
+	return data ? readCodexConversationBindingDataRecord(data) : void 0;
 }
 function readCodexConversationBindingDataRecord(data) {
 	if (data.kind === "codex-cli-node-session") {
@@ -54,8 +53,8 @@ function readCodexConversationBindingDataRecord(data) {
 			version: CLI_BINDING_DATA_VERSION,
 			nodeId: data.nodeId.trim(),
 			sessionId: data.sessionId.trim(),
-			agentId: typeof data.agentId === "string" && data.agentId.trim() ? data.agentId.trim() : void 0,
-			cwd: typeof data.cwd === "string" && data.cwd.trim() ? data.cwd.trim() : void 0
+			agentId: normalizeOptionalString(data.agentId),
+			cwd: normalizeOptionalString(data.cwd)
 		};
 	}
 	if (data.kind !== "codex-app-server-session") return;
@@ -69,8 +68,8 @@ function readCodexConversationBindingDataRecord(data) {
 		version: APP_SERVER_BINDING_DATA_VERSION,
 		bindingId,
 		workspaceDir: typeof data.workspaceDir === "string" && data.workspaceDir.trim() ? data.workspaceDir : process.cwd(),
-		agentId: typeof data.agentId === "string" && data.agentId.trim() ? data.agentId.trim() : void 0,
-		agentDir: typeof data.agentDir === "string" && data.agentDir.trim() ? data.agentDir.trim() : void 0,
+		agentId: normalizeOptionalString(data.agentId),
+		agentDir: normalizeOptionalString(data.agentDir),
 		...source ? { source } : {},
 		...start ? { start } : {},
 		...legacyBinding ? { legacyBinding: true } : {}
@@ -98,10 +97,7 @@ function resolveCodexDefaultWorkspaceDir(pluginConfig) {
 	return normalizeOptionalString(appServer?.defaultWorkspaceDir) ?? process.cwd();
 }
 function readConversationStart(value) {
-	const read = (key) => {
-		const candidate = value?.[key];
-		return typeof candidate === "string" && candidate.trim() ? candidate.trim() : void 0;
-	};
+	const read = (key) => normalizeOptionalString(value?.[key]);
 	const start = {
 		id: read("id"),
 		threadId: read("threadId"),

package/dist/.setup/{conversation-control-DN53ns41.mjs → conversation-control-CEP8X5JC.mjs}

@@ -1,12 +1,11 @@
-import { n as isCodexFastServiceTier } from "./config-utils-DujwEnhg.mjs";
-import { r as bindingStoreKey } from "./session-binding-record-TH3xA0zj.mjs";
-import { o as formatCodexDisplayText } from "./command-formatters-CGEkdawF.mjs";
-import { i as resolveCodexBindingAppServerConnection } from "./binding-connection-Bm38niE8.mjs";
-import "./config-CedDWjM-.mjs";
-import { n as normalizeCodexAppServerBindingModelProvider, t as isCodexAppServerNativeAuthProfile } from "./auth-profile-WqZtZfXN.mjs";
-import { c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-BpTtuLQ5.mjs";
-import { A as resolveCodexBindingModelProviderFallback, O as resolveCodexAppServerRequestModelSelection } from "./thread-lifecycle-Cik28qWn.mjs";
-import "./session-binding-_0W_fHRr.mjs";
+import { n as isCodexFastServiceTier } from "./config-utils-D0CXecki.mjs";
+import { r as bindingStoreKey } from "./session-binding-record-Oe9L-CNY.mjs";
+import { o as formatCodexDisplayText } from "./command-formatters-R3ckE3Co.mjs";
+import "./config-DKhXquav.mjs";
+import { n as normalizeCodexAppServerBindingModelProvider, t as isCodexAppServerNativeAuthProfile } from "./auth-profile-B0okYl2D.mjs";
+import { b as resolveCodexBindingModelProviderFallback, v as resolveCodexAppServerRequestModelSelection } from "./thread-requests-B_bRnMGN.mjs";
+import "./thread-lifecycle-DPflntEJ.mjs";
+import "./session-binding-DGCYAfvD.mjs";
 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";
@@ -34,37 +33,17 @@ async function stopCodexConversationTurn(params) {
 		stopped: false,
 		message: "No active Codex run to stop."
 	};
-	const lookup = buildBindingLookup(params);
-	const binding = params.binding;
-	if (binding?.threadId !== active.threadId) return {
+	if (params.binding?.threadId !== active.threadId) return {
 		stopped: false,
 		message: "The active Codex run no longer matches this session binding."
 	};
-	const connection = await resolveCodexBindingAppServerConnection({
-		binding,
-		authProfileId: binding?.authProfileId,
-		pluginConfig: params.pluginConfig,
-		...lookup,
+	await active.client.request("turn/interrupt", {
+		threadId: active.threadId,
+		turnId: active.turnId
+	}, {
+		timeoutMs: active.requestTimeoutMs,
 		assertCurrent: params.assertCurrent
 	});
-	const runtime = connection.appServer;
-	const client = active.client ?? await getLeasedSharedCodexAppServerClient({
-		startOptions: runtime.start,
-		timeoutMs: runtime.requestTimeoutMs,
-		authProfileId: connection.clientAuthProfileId,
-		...lookup
-	});
-	try {
-		await client.request("turn/interrupt", {
-			threadId: active.threadId,
-			turnId: active.turnId
-		}, {
-			timeoutMs: runtime.requestTimeoutMs,
-			assertCurrent: params.assertCurrent
-		});
-	} finally {
-		if (!active.client) releaseLeasedSharedCodexAppServerClient(client);
-	}
 	return {
 		stopped: true,
 		message: "Codex stop requested."
@@ -81,52 +60,34 @@ async function steerCodexConversationTurn(params) {
 		steered: false,
 		message: "No active Codex run to steer."
 	};
-	const lookup = buildBindingLookup(params);
-	const binding = params.binding;
-	if (binding?.threadId !== active.threadId) return {
+	if (params.binding?.threadId !== active.threadId) return {
 		steered: false,
 		message: "The active Codex run no longer matches this session binding."
 	};
-	const connection = await resolveCodexBindingAppServerConnection({
-		binding,
-		authProfileId: binding?.authProfileId,
-		pluginConfig: params.pluginConfig,
-		...lookup,
+	await active.client.request("turn/steer", {
+		threadId: active.threadId,
+		expectedTurnId: active.turnId,
+		input: [{
+			type: "text",
+			text,
+			text_elements: []
+		}]
+	}, {
+		timeoutMs: active.requestTimeoutMs,
 		assertCurrent: params.assertCurrent
 	});
-	const runtime = connection.appServer;
-	const client = active.client ?? await getLeasedSharedCodexAppServerClient({
-		startOptions: runtime.start,
-		timeoutMs: runtime.requestTimeoutMs,
-		authProfileId: connection.clientAuthProfileId,
-		...lookup
-	});
-	try {
-		await client.request("turn/steer", {
-			threadId: active.threadId,
-			expectedTurnId: active.turnId,
-			input: [{
-				type: "text",
-				text,
-				text_elements: []
-			}]
-		}, {
-			timeoutMs: runtime.requestTimeoutMs,
-			assertCurrent: params.assertCurrent
-		});
-	} finally {
-		if (!active.client) releaseLeasedSharedCodexAppServerClient(client);
-	}
 	return {
 		steered: true,
 		message: "Sent steer message to Codex."
 	};
 }
-async function setCodexConversationModel(params) {
+async function setCodexConversationModel(input) {
+	const params = { ...input };
 	const model = params.model.trim();
 	if (!model) return "Usage: /codex model <model>";
 	const lookup = buildBindingLookup(params);
 	params.assertCurrent();
+	const assertCommitAllowed = params.assertCommitAllowed ?? params.assertCurrent;
 	const binding = requirePreparedThreadBinding(params.binding);
 	if (binding.connectionScope === "supervision") throw new ModelSelectionLockedError();
 	const modelProvider = resolveConversationControlModelProvider({
@@ -161,7 +122,7 @@ async function setCodexConversationModel(params) {
 			sessionKey: identity.sessionKey,
 			requireWriteSuccess: true,
 			replaceEntry: true,
-			assertCommitAllowed: params.assertCurrent,
+			assertCommitAllowed,
 			update: (entry) => {
 				if (entry.sessionId !== identity.sessionId) throw new Error("Codex session changed while applying the model selection.");
 				applyModelOverrideWithAuthProfileCompatibility({
@@ -183,7 +144,7 @@ async function setCodexConversationModel(params) {
 		model: nextModel,
 		modelProvider: nextModelProvider,
 		...projectionPatch
-	}, params.assertCurrent);
+	}, assertCommitAllowed);
 	return `Codex model set to ${formatCodexDisplayText(nextModel)}.`;
 }
 async function setCodexConversationFastMode(params) {

package/dist/.setup/{cyber-failover-DYwbmf1o.mjs → cyber-failover-XV0nNRZu.mjs}

@@ -1,4 +1,4 @@
-import { d as readCodexPluginConfig } from "./config-parsing-CcB9iPoq.mjs";
+import { d as readCodexPluginConfig } from "./config-parsing-b088LyhT.mjs";
 import { t as attemptTerminal } from "./attempt-terminal-gZrxQ35N.mjs";
 //#region extensions/codex/src/app-server/cyber-failover.ts
 /**

package/dist/.setup/{cyber-failover-notice-e9G3J9-e.mjs → cyber-failover-notice-RNpGpTyP.mjs}

@@ -1,4 +1,4 @@
-import { t as emitCodexAppServerEvent } from "./run-attempt-lifecycle-B7JbY4-F.mjs";
+import { t as emitCodexAppServerEvent } from "./run-attempt-lifecycle-C-6O3Exn.mjs";
 //#region extensions/codex/src/app-server/cyber-failover-notice.ts
 async function emitCodexCyberNotice(params, notice) {
 	await emitCodexAppServerEvent(params, {