@openclaw/codex 2026.8.1-beta.3 → 2026.8.2

package/dist/{command-handlers-DC86lgT4.js → command-handlers-CLFx2Ypa.js}

@@ -1,26 +1,26 @@
-import { M as isCodexFastServiceTier, _ as CODEX_PLUGINS_MARKETPLACE_NAME, i as resolveCodexAppServerRuntimeOptions } from "./config-CpNeo5AE.js";
-import { U as consumeCodexAppServerLiveThread, a as getLeasedSharedCodexAppServerClient, et as resolveCodexAppServerAuthAccountCacheKey, l as releaseLeasedSharedCodexAppServerClient, nt as resolveCodexAppServerAuthProfileIdForAgent, rt as resolveCodexAppServerFallbackApiKeyCacheKey, ut as isJsonObject } from "./shared-client-Dw-rzii0.js";
-import { c as reclaimCurrentCodexSessionGeneration, d as sessionBindingIdentity, i as createCodexSessionGenerationSupersededError, n as assertCodexBindingMayBeReplaced, r as bindingStoreKey, s as normalizeCodexAppServerBindingModelProvider } from "./session-binding-BTrLf9Qm.js";
-import { i as assertCodexThreadResumeResponse } from "./protocol-validators-VAVyEnDp.js";
-import { t as listAllCodexAppServerModels } from "./models-CZw1wClT.js";
-import { o as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-DMNQ8Zi8.js";
-import { et as refreshCodexPluginRuntimeState, nt as isOpenAiCuratedMarketplaceName } from "./thread-lifecycle-DKdrnTMX.js";
-import { t as isIncognitoSessionKey } from "./incognito-session-ET_ufDH-.js";
-import { t as CODEX_CONTROL_METHODS } from "./capabilities-CH3K57v4.js";
-import { s as summarizeCodexAccountUsage } from "./rate-limits-BI1dMHDG.js";
-import { a as formatComputerUseStatus, c as formatSkills, i as formatCodexStatus, l as formatThreads, n as formatAccount, o as formatList, r as formatCodexDisplayText, s as formatModels, t as buildHelp } from "./command-formatters-D0nZ3qtd.js";
-import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-C1qEeZ5C.js";
-import { a as rollbackCodexAppServerBindingSubscription, i as retireCodexConversationThreadBinding, n as releaseCodexAppServerBindingSubscription, o as withCodexConversationThreadActivity, r as retainCodexAppServerBindingSubscription, s as withExclusiveCodexAppServerThread, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-i2NBwDUL.js";
-import { a as parseCodexPermissionsModeArg, c as setCodexConversationModel, d as stopCodexConversationTurn, g as hasCodexAdminScope, h as canMutateCodexHost, i as parseCodexFastModeArg, l as setCodexConversationPermissions, m as CODEX_NATIVE_EXECUTION_AUTH_ERROR, n as parseCodexPluginMarketplaceId, o as readCodexConversationActiveTurn, p as CODEX_FULL_PERMISSIONS_AUTH_ERROR, r as formatPermissionsMode, s as setCodexConversationFastMode, t as discoverCodexMarketplacePlugins, u as steerCodexConversationTurn } from "./plugin-marketplace-discovery-CSWDkMrP.js";
-import { i as readCodexConversationBindingData, n as createCodexCliNodeConversationBindingData, o as resolveCodexDefaultWorkspaceDir, r as createCodexConversationBindingData } from "./conversation-binding-data-CW2GuupV.js";
-import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-DAvZwp96.js";
-import { l as formatCodexCliSessions } from "./session-catalog-ezP_UcRM.js";
-import { i as safeCodexControlRequest, n as readCodexStatusProbes, r as requestOptions, t as codexControlRequest } from "./command-rpc-xUIIonsO.js";
-import { i as readCodexComputerUseStatus, r as installCodexComputerUse, t as defaultCodexPluginMetadataCache } from "./plugin-metadata-cache-BXH5NF-4.js";
+import { i as resolveCodexAppServerRuntimeOptions, j as CODEX_PLUGINS_MARKETPLACE_NAME, k as isCodexFastServiceTier } from "./config-CcYL77O6.js";
+import { Ft as resolveCodexAppServerFallbackApiKeyCacheKey, Ht as isJsonObject, Nt as resolveCodexAppServerAuthProfileIdForAgent, c as getLeasedSharedCodexAppServerClient, gt as consumeCodexAppServerLiveThread, h as releaseLeasedSharedCodexAppServerClient, jt as resolveCodexAppServerAuthAccountCacheKey, vt as hasCodexAppServerLiveThread } from "./shared-client-B1tT5U6r.js";
+import { c as reclaimCurrentCodexSessionGeneration, d as sessionBindingIdentity, i as createCodexSessionGenerationSupersededError, n as assertCodexBindingMayBeReplaced, r as bindingStoreKey, s as normalizeCodexAppServerBindingModelProvider } from "./session-binding-D0zinCP1.js";
+import { o as assertCodexThreadResumeResponse, r as assertCodexThreadAcceptsDirectInput } from "./protocol-validators-Bg5rpNxk.js";
+import { a as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-CpVfwctT.js";
+import { t as listAllCodexAppServerModels } from "./models-DaWfETQk.js";
+import { i as buildCodexPluginAppCacheKey, s as defaultCodexAppInventoryCache } from "./thread-resume-BFt1-ZDa.js";
+import { dt as isOpenAiCuratedMarketplaceName, lt as refreshCodexPluginRuntimeState } from "./thread-lifecycle-CGGKP720.js";
+import { a as rollbackCodexAppServerBindingSubscription, c as withExclusiveCodexAppServerThread, i as retireCodexConversationThreadBinding, l as isIncognitoSessionKey, n as releaseCodexAppServerBindingSubscription, r as retainCodexAppServerBindingSubscription, s as withCodexConversationThreadActivity, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-RkaoZCmQ.js";
+import { c as resolveCodexNativeSandboxBlock, s as resolveCodexNativeExecutionBlock } from "./request-BWxweEdK.js";
+import { t as CODEX_CONTROL_METHODS } from "./capabilities-D6m_TdVy.js";
+import { s as summarizeCodexAccountUsage } from "./rate-limits-BqHEHXQJ.js";
+import { a as formatComputerUseStatus, c as formatSkills, i as formatCodexStatus, l as formatThreads, n as formatAccount, o as formatList, r as formatCodexDisplayText, s as formatModels, t as buildHelp } from "./command-formatters--UToCokS.js";
+import { _ as hasCodexAdminScope, a as parseCodexPermissionsModeArg, c as setCodexConversationModel, d as stopCodexConversationTurn, g as canMutateCodexHost, h as CODEX_NATIVE_EXECUTION_AUTH_ERROR, i as parseCodexFastModeArg, l as setCodexConversationPermissions, m as CODEX_HOST_INSPECTION_AUTH_ERROR, n as parseCodexPluginMarketplaceId, o as readCodexConversationActiveTurn, p as CODEX_FULL_PERMISSIONS_AUTH_ERROR, r as formatPermissionsMode, s as setCodexConversationFastMode, t as discoverCodexMarketplacePlugins, u as steerCodexConversationTurn } from "./plugin-marketplace-discovery-BXjIFEiw.js";
+import { i as readCodexConversationBindingData, n as createCodexCliNodeConversationBindingData, o as resolveCodexDefaultWorkspaceDir, r as createCodexConversationBindingData } from "./conversation-binding-data-BiodpIzq.js";
+import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-CF7BmrDk.js";
+import { c as readCodexStatusProbes, l as requestOptions, p as formatCodexCliSessions, s as codexControlRequest, u as safeCodexControlRequest } from "./session-catalog-eMhVm0Ql.js";
+import { i as readCodexComputerUseStatus, r as installCodexComputerUse, t as defaultCodexPluginMetadataCache } from "./plugin-metadata-cache-DQQm4gWT.js";
 import { normalizeOptionalString, normalizeUniqueStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
 import crypto from "node:crypto";
-import { ensureAuthProfileStore, findNormalizedProviderValue, resolveAgentDir, resolveAuthProfileEligibility, resolveAuthProfileOrder, resolveProfileUnusableUntilForDisplay, resolveSessionAgentIds } from "openclaw/plugin-sdk/agent-runtime";
+import { ensureAuthProfileStore, findNormalizedProviderValue, resolveAgentDir, resolveAuthProfileEligibility, resolveAuthProfileOrder, resolveProfileUnusableUntilForDisplay } from "openclaw/plugin-sdk/agent-runtime";
+import { resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
@@ -51,8 +51,8 @@ async function readCodexAccountAuthOverview(params) {
 		limits: params.limits,
 		now
 	});
-	const subscriptionProfileId = order.find((profileId) => isChatGptSubscriptionProfile(store.profiles[profileId]));
 	const activeIsSubscription = activeProfileId !== void 0 && isChatGptSubscriptionProfile(store.profiles[activeProfileId]);
+	const subscriptionProfileId = activeIsSubscription ? activeProfileId : order.find((profileId) => isChatGptSubscriptionProfile(store.profiles[profileId]));
 	const activeUsage = activeIsSubscription && params.limits.ok ? summarizeCodexAccountUsage(params.limits.value, now) : void 0;
 	const subscriptionUsage = subscriptionProfileId && (!activeIsSubscription || subscriptionProfileId !== activeProfileId) ? await readSubscriptionUsage({
 		...params,
@@ -157,13 +157,20 @@ function resolveLiveAccountProfileId(params) {
 	const type = normalizeOptionalString(account.type)?.toLowerCase();
 	if (type === "chatgpt") {
 		const email = normalizeOptionalString(account.email)?.toLowerCase();
-		const firstSubscription = params.order.find((profileId) => isChatGptSubscriptionProfile(params.store.profiles[profileId]));
-		if (!email) return firstSubscription;
-		return params.order.find((profileId) => {
-			const credential = params.store.profiles[profileId];
-			if (!credential || !isChatGptSubscriptionProfile(credential)) return false;
-			return (credential.email?.trim().toLowerCase() ?? extractEmailFromProfileId(profileId))?.toLowerCase() === email;
-		}) ?? firstSubscription;
+		const accountId = normalizeOptionalString(account.accountId ?? account.chatgptAccountId);
+		const subscriptionProfiles = params.order.filter((profileId) => isChatGptSubscriptionProfile(params.store.profiles[profileId]));
+		if (accountId) {
+			const exactWorkspace = subscriptionProfiles.find((profileId) => {
+				const credential = params.store.profiles[profileId];
+				return credential && "accountId" in credential && credential.accountId === accountId;
+			});
+			if (exactWorkspace) return exactWorkspace;
+		}
+		const matchingProfiles = email ? subscriptionProfiles.filter((profileId) => {
+			return (params.store.profiles[profileId]?.email?.trim().toLowerCase() ?? extractEmailFromProfileId(profileId))?.toLowerCase() === email;
+		}) : subscriptionProfiles;
+		const lastGood = params.store.lastGood?.[OPENAI_PROVIDER_ID];
+		return (lastGood && matchingProfiles.includes(lastGood) ? lastGood : void 0) ?? matchingProfiles[0] ?? subscriptionProfiles[0];
 	}
 	if (type === "apikey" || type === "api_key") return params.order.find((profileId) => params.store.profiles[profileId]?.type === "api_key");
 }
@@ -584,7 +591,8 @@ function parseCodexCliSessionsArgs(args) {
 			continue;
 		}
 		if (arg === "--limit") {
-			const parsedLimit = parseStrictPositiveInteger(readRequiredOptionValue(args, index));
+			const value = readRequiredOptionValue(args, index);
+			const parsedLimit = parseStrictPositiveInteger(value);
 			if (parsedLimit === void 0) {
 				parsed.help = true;
 				continue;
@@ -745,7 +753,7 @@ const CODEX_DIAGNOSTICS_COOLDOWN_MS = 6e4;
 const CODEX_DIAGNOSTICS_ERROR_MAX_CHARS = 500;
 const CODEX_DIAGNOSTICS_COOLDOWN_MAX_THREADS = 100;
 const CODEX_DIAGNOSTICS_COOLDOWN_MAX_SCOPES = 100;
-const CODEX_DIAGNOSTICS_CONFIRMATION_TTL_MS = 5 * 6e4;
+const CODEX_DIAGNOSTICS_CONFIRMATION_TTL_MS = 3e5;
 const CODEX_DIAGNOSTICS_CONFIRMATION_MAX_REQUESTS_PER_SCOPE = 100;
 const CODEX_DIAGNOSTICS_CONFIRMATION_MAX_SCOPES = 100;
 const CODEX_DIAGNOSTICS_SCOPE_FIELD_MAX_CHARS = 128;
@@ -1056,7 +1064,8 @@ function resolveCodexCommandDeps(overrides) {
 //#endregion
 //#region extensions/codex/src/command-handler-scope.ts
 async function resolveControlTarget(ctx) {
-	const data = readCodexConversationBindingData(await ctx.getCurrentConversationBinding());
+	const binding = await ctx.getCurrentConversationBinding();
+	const data = readCodexConversationBindingData(binding);
 	const scope = resolveCodexConversationControlScope(ctx);
 	if (data?.kind === "codex-app-server-session") return {
 		identity: conversationBindingIdentity(data.bindingId),
@@ -1080,13 +1089,14 @@ async function resolveCommandAppServerScope(deps, ctx, pluginConfig) {
 	const fallback = resolveCodexConversationControlScope(ctx);
 	const agentDir = target?.agentDir ?? fallback.agentDir;
 	const binding = target ? await deps.bindingStore.read(target.identity) : void 0;
+	const authProfileId = binding?.connectionScope === "supervision" ? void 0 : resolveCodexAppServerAuthProfileIdForAgent({
+		authProfileId: binding?.authProfileId ?? target?.requestedAuthProfileId,
+		agentDir,
+		config: ctx.config
+	});
 	const connection = resolveCodexBindingAppServerConnection({
 		binding,
-		authProfileId: binding?.connectionScope === "supervision" ? void 0 : resolveCodexAppServerAuthProfileIdForAgent({
-			authProfileId: binding?.authProfileId ?? target?.requestedAuthProfileId,
-			agentDir,
-			config: ctx.config
-		}),
+		authProfileId,
 		pluginConfig
 	});
 	return {
@@ -1105,7 +1115,7 @@ function conversationBindingIdentity(bindingId) {
 	};
 }
 function resolveCodexConversationControlScope(ctx) {
-	const { sessionAgentId } = resolveSessionAgentIds({
+	const { sessionAgentId } = resolveSessionAgentIdsStrict({
 		sessionKey: ctx.sessionKey,
 		agentId: ctx.agentId,
 		config: ctx.config
@@ -1385,8 +1395,9 @@ function isCurrentSessionModelSelectionLocked(ctx) {
 	const sessionKey = ctx.sessionKey?.trim();
 	if (!sessionKey) return false;
 	const { agentId } = resolveCodexConversationControlScope(ctx);
+	const storePath = resolveStorePath(ctx.config.session?.store, { agentId });
 	return isModelSelectionLocked(getSessionEntry({
-		storePath: resolveStorePath(ctx.config.session?.store, { agentId }),
+		storePath,
 		sessionKey,
 		hydrateSkillPromptRefs: false,
 		readConsistency: "latest"
@@ -1443,7 +1454,8 @@ async function bindConversation(deps, ctx, pluginConfig, args) {
 }
 async function detachConversation(deps, ctx) {
 	if (isCurrentSessionModelSelectionLocked(ctx)) return MODEL_SELECTION_LOCKED_MESSAGE;
-	const data = readCodexConversationBindingData(await ctx.getCurrentConversationBinding());
+	const current = await ctx.getCurrentConversationBinding();
+	const data = readCodexConversationBindingData(current);
 	const identity = data?.kind === "codex-app-server-session" ? conversationBindingIdentity(data.bindingId) : void 0;
 	const sourceSessionKey = data?.kind === "codex-app-server-session" ? data.source?.sessionKey : void 0;
 	let expectedThreadId;
@@ -1512,13 +1524,14 @@ async function describeConversationBinding(deps, ctx) {
 }
 async function buildThreads(deps, ctx, pluginConfig, filter) {
 	const scope = await resolveCommandAppServerScope(deps, ctx, pluginConfig);
-	return formatThreads(await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.listThreads, {
+	const response = await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.listThreads, {
 		limit: 10,
 		...filter.trim() ? { searchTerm: filter.trim() } : {}
 	}, {
 		config: ctx.config,
 		...scope
-	}));
+	});
+	return formatThreads(response);
 }
 async function buildCodexCliSessions(deps, args) {
 	const parsed = parseCodexCliSessionsArgs(args);
@@ -1556,13 +1569,8 @@ async function resumeThread(deps, ctx, pluginConfig, args) {
 			})) throw createCodexSessionGenerationSupersededError(identity.sessionId);
 			const currentBinding = await deps.bindingStore.read(identity);
 			assertCodexBindingMayBeReplaced(currentBinding, "attaching a different resumed thread");
-			const authProfileId = resolveCodexAppServerAuthProfileIdForAgent({
-				authProfileId: currentBinding?.authProfileId,
-				agentDir: scope.agentDir,
-				config: ctx.config
-			});
-			let committedResponse = false;
-			const commitResumedThread = async (value, client) => {
+			let pendingResumeConfiguration = false;
+			const commitResumedThread = async (value, client, { authProfileId, assertCurrent }) => {
 				const response = assertCodexThreadResumeResponse(value);
 				const effectiveThreadId = response.thread.id;
 				if (effectiveThreadId !== normalizedThreadId) throw new Error(`Codex thread/resume returned ${effectiveThreadId} for ${normalizedThreadId}`);
@@ -1574,52 +1582,73 @@ async function resumeThread(deps, ctx, pluginConfig, args) {
 					agentDir: scope.agentDir,
 					config: ctx.config
 				});
-				const bindingBeforeCommit = await deps.bindingStore.read(identity);
-				assertCodexBindingMayBeReplaced(bindingBeforeCommit, "committing a different resumed thread");
-				const clientId = client?.getInstanceId();
-				const sameOwner = client ? isSameCodexAppServerThreadOwner(bindingBeforeCommit, {
-					threadId: effectiveThreadId,
-					clientId
-				}) : bindingBeforeCommit?.threadId === effectiveThreadId;
+				const clientId = client.getInstanceId();
 				let retained = false;
+				let sameOwner = false;
+				let knownOwnership;
 				try {
-					if (client) {
-						retained = await retainCodexAppServerBindingSubscription(client, effectiveThreadId, sameOwner ? await consumeCodexAppServerLiveThread(client, effectiveThreadId) : void 0);
-						if (!retained) throw new Error("Codex resumed thread lost its native subscription owner.");
-					}
+					const bindingBeforeCommit = await deps.bindingStore.read(identity);
+					assertCodexBindingMayBeReplaced(bindingBeforeCommit, "committing a different resumed thread");
+					sameOwner = isSameCodexAppServerThreadOwner(bindingBeforeCommit, {
+						threadId: effectiveThreadId,
+						clientId
+					});
+					const sameThreadBinding = bindingBeforeCommit?.threadId === effectiveThreadId ? bindingBeforeCommit : void 0;
+					pendingResumeConfiguration = sameThreadBinding?.preserveNativeModel !== true && (!sameThreadBinding?.dynamicToolsFingerprint || !sameThreadBinding.webSearchThreadConfigFingerprint || sameThreadBinding.pendingResumeConfiguration === true);
+					assertCurrent();
+					assertCodexThreadAcceptsDirectInput(response.thread);
+					knownOwnership = sameOwner ? await consumeCodexAppServerLiveThread(client, effectiveThreadId) : void 0;
+					assertCurrent();
+					retained = await retainCodexAppServerBindingSubscription(client, effectiveThreadId, knownOwnership);
+					assertCurrent();
+					if (!retained) throw new Error("Codex resumed thread lost its native subscription owner.");
 					if (bindingBeforeCommit && !sameOwner) await releaseCodexAppServerBindingSubscription(bindingBeforeCommit);
+					assertCurrent();
 					if (!await deps.bindingStore.mutate(identity, {
 						kind: "set",
 						binding: {
-							...bindingBeforeCommit?.threadId === effectiveThreadId ? bindingBeforeCommit : {},
+							...sameThreadBinding,
 							threadId: effectiveThreadId,
-							...clientId ? { clientId } : {},
+							clientId,
 							cwd: resumedCwd,
+							rolloutPath: response.thread.path ?? sameThreadBinding?.rolloutPath,
+							pendingResumeConfiguration: pendingResumeConfiguration ? true : void 0,
 							authProfileId,
 							model: response.model,
 							modelProvider,
 							historyCoveredThrough: (/* @__PURE__ */ new Date()).toISOString()
 						}
-					})) throw new Error("Codex thread binding changed while attaching the resumed thread.");
+					}, assertCurrent)) throw new Error("Codex thread binding changed while attaching the resumed thread.");
 				} catch (error) {
-					if (client && !sameOwner) await rollbackCodexAppServerBindingSubscription(client, effectiveThreadId, retained);
+					if (sameOwner && knownOwnership && !retained) {
+						if (!await retainCodexAppServerBindingSubscription(client, effectiveThreadId, knownOwnership)) await closeCodexStartupClientBestEffort(client);
+					} else if (retained && !sameOwner || !hasCodexAppServerLiveThread(client, effectiveThreadId)) await rollbackCodexAppServerBindingSubscription(client, effectiveThreadId, retained);
 					throw error;
 				}
-				committedResponse = true;
 			};
-			const response = await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.resumeThread, {
+			await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.resumeThread, {
 				threadId: normalizedThreadId,
 				excludeTurns: true
 			}, {
 				config: ctx.config,
+				agentId: scope.agentId,
 				agentDir: scope.agentDir,
-				authProfileId,
+				authProfileId: currentBinding?.authProfileId,
 				sessionKey: ctx.sessionKey,
 				sessionId: ctx.sessionId,
+				beforeRequest: async (request) => {
+					const { thread } = await request({
+						method: "thread/read",
+						requestParams: {
+							threadId: normalizedThreadId,
+							includeTurns: false
+						}
+					});
+					assertCodexThreadAcceptsDirectInput(thread);
+				},
 				onResponse: commitResumedThread
 			});
-			if (!committedResponse) await commitResumedThread(response);
-			return `Attached this OpenClaw session to Codex thread ${formatCodexDisplayText(normalizedThreadId)}.`;
+			return `Attached this OpenClaw session to Codex thread ${formatCodexDisplayText(normalizedThreadId)}.${pendingResumeConfiguration ? " The next turn will validate its tools and apply this session's configuration before continuing." : ""}`;
 		})
 	});
 }
@@ -1628,12 +1657,13 @@ async function bindCodexCliNodeSession(deps, ctx, parsed) {
 	if (isCurrentSessionModelSelectionLocked(ctx)) return MODEL_SELECTION_LOCKED_MESSAGE;
 	if (ctx.sessionId) {
 		const scope = resolveCodexConversationControlScope(ctx);
-		assertCodexBindingMayBeReplaced(await deps.bindingStore.read(sessionBindingIdentity({
+		const binding = await deps.bindingStore.read(sessionBindingIdentity({
 			sessionId: ctx.sessionId,
 			sessionKey: ctx.sessionKey,
 			agentId: scope.agentId,
 			config: ctx.config
-		})), "binding a Codex CLI node session");
+		}));
+		assertCodexBindingMayBeReplaced(binding, "binding a Codex CLI node session");
 	}
 	const resolved = await deps.resolveCodexCliSessionForBindingOnNode({
 		requestedNode: parsed.host,
@@ -1834,7 +1864,7 @@ async function setConversationModel(deps, ctx, pluginConfig, args) {
 		}) : void 0;
 		const selectedModel = currentSession && currentSession.sessionId === ctx.sessionId ? currentSession.modelOverride ?? currentSession.model : void 0;
 		const binding = await deps.bindingStore.read(target.identity);
-		const activeModel = selectedModel ?? binding?.model;
+		const activeModel = target.identity.kind === "conversation" ? binding?.model : selectedModel ?? binding?.model;
 		return activeModel ? `Codex model: ${formatCodexDisplayText(activeModel)}` : "Usage: /codex model <model>";
 	}
 	return await deps.setCodexConversationModel({
@@ -1843,12 +1873,7 @@ async function setConversationModel(deps, ctx, pluginConfig, args) {
 		pluginConfig,
 		model: normalized,
 		agentDir: target.agentDir,
-		config: ctx.config,
-		...ctx.sessionId && ctx.sessionKey ? { session: {
-			agentId: target.agentId,
-			sessionId: ctx.sessionId,
-			sessionKey: ctx.sessionKey
-		} } : {}
+		config: ctx.config
 	});
 }
 async function setConversationFastMode(deps, ctx, args) {
@@ -1899,12 +1924,13 @@ async function startThreadAction(deps, ctx, pluginConfig, kind, args) {
 		});
 		if (currentSession?.sessionId !== ctx.sessionId || resolvePersistedSessionRuntimeId(currentSession) !== "codex") return "Codex compaction is unavailable because the current OpenClaw session is not using the Codex runtime.";
 		if (target.identity.kind === "conversation") {
-			if (!isSameCodexAppServerThreadOwner(binding, ctx.sessionId ? await deps.bindingStore.read(sessionBindingIdentity({
+			const sessionBinding = ctx.sessionId ? await deps.bindingStore.read(sessionBindingIdentity({
 				sessionId: ctx.sessionId,
 				sessionKey: ctx.sessionKey,
 				agentId: sessionTarget.agentId,
 				config: ctx.config
-			})) : void 0)) return "Codex compaction is unavailable because the conversation-bound thread differs from the current session binding. Resume that thread into the session first.";
+			})) : void 0;
+			if (!isSameCodexAppServerThreadOwner(binding, sessionBinding)) return "Codex compaction is unavailable because the conversation-bound thread differs from the current session binding. Resume that thread into the session first.";
 		}
 		const compactCurrent = ctx.runtimeContext?.compactCurrent;
 		if (!compactCurrent) return "Codex compaction is unavailable because this command is not bound to a session.";
@@ -2293,6 +2319,14 @@ function formatPluginList(plugins, options = {}) {
 }
 //#endregion
 //#region extensions/codex/src/command-handlers.ts
+const CODEX_HOST_INSPECTION_SUBCOMMANDS = /* @__PURE__ */ new Set([
+	"account",
+	"mcp",
+	"sessions",
+	"skills",
+	"status",
+	"threads"
+]);
 async function handleCodexSubcommand(ctx, options) {
 	const deps = resolveCodexCommandDeps(options.deps);
 	const args = splitArgs(ctx.args);
@@ -2300,6 +2334,7 @@ async function handleCodexSubcommand(ctx, options) {
 	const [subcommand = "status", ...rest] = args;
 	const normalized = subcommand.toLowerCase();
 	if (normalized === "help") return { text: buildHelp() };
+	if (CODEX_HOST_INSPECTION_SUBCOMMANDS.has(normalized) && !canMutateCodexHost(ctx)) return { text: CODEX_HOST_INSPECTION_AUTH_ERROR };
 	if (CODEX_NATIVE_CONTROL_SUBCOMMANDS.has(normalized) && !returnsBeforeNativeCodexExecution(normalized, rest) && !isReadOnlyCodexGoalCommand(normalized, rest) && !canMutateCodexHost(ctx)) return { text: CODEX_NATIVE_EXECUTION_AUTH_ERROR };
 	const sandboxBlock = resolveCodexNativeCommandSandboxBlock(ctx, normalized, rest);
 	if (sandboxBlock) return { text: sandboxBlock };

package/dist/{compact-COqgBRny.js → compact-5xqW1oCh.js}

@@ -1,12 +1,11 @@
-import { B as CodexAppServerRpcError, U as consumeCodexAppServerLiveThread, Y as retainCodexAppServerLiveThread, a as getLeasedSharedCodexAppServerClient, l as releaseLeasedSharedCodexAppServerClient, ut as isJsonObject } from "./shared-client-Dw-rzii0.js";
-import { d as sessionBindingIdentity, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-BTrLf9Qm.js";
-import { _ as readCodexNotificationTurnId, a as closeCodexStartupClientBestEffort, d as unsubscribeCodexThreadBestEffort, g as readCodexNotificationThreadId, r as CodexAppServerUnsafeSubscriptionError, s as isCodexAlreadyTerminalInterruptError } from "./attempt-client-cleanup-URjUlCHg.js";
-import { i as readCodexThreadContextSnapshot, x as readCodexNotificationItem } from "./event-projector-usage-CLwNEJqW.js";
-import { t as isIncognitoSessionKey } from "./incognito-session-ET_ufDH-.js";
-import { t as resumeCodexAppServerThread } from "./thread-resume-CdJk2Ehf.js";
-import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-C1qEeZ5C.js";
-import { t as isSameCodexAppServerThreadOwner } from "./thread-ownership-i2NBwDUL.js";
-import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-DAvZwp96.js";
+import { $ as CodexAppServerRpcError, Ct as retainCodexAppServerLiveThread, Ht as isJsonObject, c as getLeasedSharedCodexAppServerClient, gt as consumeCodexAppServerLiveThread, h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-B1tT5U6r.js";
+import { d as sessionBindingIdentity, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-D0zinCP1.js";
+import { _ as readCodexNotificationThreadId, a as closeCodexStartupClientBestEffort, f as unsubscribeCodexThreadBestEffort, r as CodexAppServerUnsafeSubscriptionError, s as isCodexAlreadyTerminalInterruptError, v as readCodexNotificationTurnId } from "./attempt-client-cleanup-CpVfwctT.js";
+import { i as readCodexThreadContextSnapshot, x as readCodexNotificationItem } from "./event-projector-usage-B2r5vhWH.js";
+import { t as resumeCodexAppServerThread } from "./thread-resume-BFt1-ZDa.js";
+import { l as isIncognitoSessionKey, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-RkaoZCmQ.js";
+import { s as resolveCodexNativeExecutionBlock } from "./request-BWxweEdK.js";
+import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-CF7BmrDk.js";
 import { t as persistCodexContextCompactionActivity } from "./context-compaction-activity-BOeJf7yo.js";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
@@ -282,7 +281,7 @@ async function compactCodexNativeThread(params, options) {
 		config: params.config,
 		sessionKey: params.sandboxSessionKey ?? params.sessionKey,
 		sessionId: params.sessionId,
-		agentId: params.agentId,
+		agentId: params.sandboxAgentId ?? params.agentId,
 		sandbox,
 		surface: "native compaction"
 	});
@@ -534,8 +533,10 @@ async function compactCodexNativeThread(params, options) {
 				try {
 					if ((compactionSucceeded || compactionRequestDefinitelyRejected) && retainedThreadOwnership) {
 						const ownership = retainedThreadOwnership;
-						if (!(isSameCodexAppServerThreadOwner(await options.bindingStore.read(bindingIdentity), binding) && await options.bindingStore.withLease(bindingIdentity, async () => {
-							if (!isSameCodexAppServerThreadOwner(await options.bindingStore.read(bindingIdentity), binding)) return false;
+						const currentBinding = await options.bindingStore.read(bindingIdentity);
+						if (!(isSameCodexAppServerThreadOwner(currentBinding, binding) && await options.bindingStore.withLease(bindingIdentity, async () => {
+							const leasedBinding = await options.bindingStore.read(bindingIdentity);
+							if (!isSameCodexAppServerThreadOwner(leasedBinding, binding)) return false;
 							return await retainCodexAppServerLiveThread(client, binding.threadId, ownership.release, ownership.configFingerprint, ownership.serviceTier);
 						}))) await releaseThreadSubscription?.();
 					} else await releaseThreadSubscription?.();