@openclaw/codex 2026.9.1-beta.1 → 2026.9.2

package/dist/{command-handlers-D_-1_qRp.js → command-handlers-DOJvGv6-.js}

@@ -1,27 +1,30 @@
-import { N as isCodexFastServiceTier, _ as CODEX_PLUGINS_MARKETPLACE_NAME, i as resolveCodexAppServerRuntimeOptions } from "./config-giW8X0QA.js";
-import { J as consumeCodexAppServerLiveThread, ct as resolveCodexAppServerAuthAccountCacheKey, dt as resolveCodexAppServerFallbackApiKeyCacheKey, o as getLeasedSharedCodexAppServerClient, p as releaseLeasedSharedCodexAppServerClient, ut as resolveCodexAppServerAuthProfileIdForAgent, vt as isJsonObject } from "./shared-client-DKz23hHY.js";
-import { c as reclaimCurrentCodexSessionGeneration, d as sessionBindingIdentity, i as createCodexSessionGenerationSupersededError, n as assertCodexBindingMayBeReplaced, r as bindingStoreKey, s as normalizeCodexAppServerBindingModelProvider } from "./session-binding-Bcynfd-_.js";
-import { i as assertCodexThreadResumeResponse } from "./protocol-validators-VeJxxJ0U.js";
-import { t as listAllCodexAppServerModels } from "./models-TS3HBU-q.js";
-import { o as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-C1CAdfcP.js";
-import { Ct as refreshCodexPluginRuntimeState, Tt as isOpenAiCuratedMarketplaceName } from "./thread-lifecycle-L7oEkTlq.js";
-import { t as isIncognitoSessionKey } from "./incognito-session-ET_ufDH-.js";
-import { t as CODEX_CONTROL_METHODS } from "./capabilities-BRMh0aIq.js";
-import { s as summarizeCodexAccountUsage } from "./rate-limits-C5_D8Gmb.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-DEsIufkt.js";
-import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-kuWTn9C5.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-DZeuKH1j.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-B9DvaAG-.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-BMvPX73o.js";
-import { l as formatCodexCliSessions } from "./session-catalog-DaLKVtpH.js";
-import { i as safeCodexControlRequest, n as readCodexStatusProbes, r as requestOptions, t as codexControlRequest } from "./command-rpc-CCeCkf_v.js";
-import { i as readCodexComputerUseStatus, r as installCodexComputerUse, t as defaultCodexPluginMetadataCache } from "./plugin-metadata-cache-CTCT3w5L.js";
+import { m as CODEX_PLUGINS_MARKETPLACE_NAME, n as isCodexFastServiceTier } from "./config-utils-C57JiJrU.js";
+import { l as sessionBindingIdentity, t as bindingStoreKey } from "./session-binding-record-CyaXZvTe.js";
+import { B as isJsonObject, i as resolveCodexAppServerRuntimeOptions } from "./config-CyapYSji.js";
+import { Bt as resolveCodexAppServerAuthAccountCacheKey, Et as hasCodexAppServerLiveThread, Ht as resolveCodexAppServerAuthProfileIdForAgent, Q as assertCodexThreadAcceptsDirectInput, Wt as resolveCodexAppServerFallbackApiKeyCacheKey, c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient, tt as assertCodexThreadResumeResponse, wt as consumeCodexAppServerLiveThread } from "./shared-client-CKhX2kFt.js";
+import { l as resolveCodexSessionBinding, n as assertCodexBindingMayBeReplaced, o as normalizeCodexAppServerBindingModelProvider, r as createCodexSessionGenerationSupersededError } from "./session-binding-4Ki04sW-.js";
+import { a as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-Bp1ZOnk2.js";
+import { t as listAllCodexAppServerModels } from "./models-CcrgSMQR.js";
+import { c as defaultCodexAppInventoryCache, i as buildCodexPluginAppCacheKey } from "./thread-resume-BLgqkUc1.js";
+import { At as refreshCodexPluginRuntimeState, Mt as isOpenAiCuratedMarketplaceName } from "./thread-lifecycle-DPK30jad.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-CbucAmmp.js";
+import { r as assertCodexSupervisionThreadLineage, s as resolveCodexBindingAppServerConnection } from "./thread-policy-CTalhWFy.js";
+import { c as resolveCodexNativeSandboxBlock, s as resolveCodexNativeExecutionBlock } from "./request-C8H22rPi.js";
+import { t as CODEX_CONTROL_METHODS } from "./capabilities-B1mgvpP8.js";
+import { s as summarizeCodexAccountUsage } from "./rate-limits-Fx_l4eNa.js";
+import { a as formatCodexDisplayText, c as formatComputerUseStatus, d as formatSkills, f as formatThreads, i as formatAccount, l as formatList, n as buildHelp, o as formatCodexStatus, r as escapeCodexChatText, s as formatCodexTextForDisplay, t as CODEX_RESUME_SAFE_THREAD_ID_PATTERN, u as formatModels } from "./command-formatters-DSbGMXA0.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-B7gHXJ3d.js";
+import { i as readCodexConversationBindingData, n as createCodexCliNodeConversationBindingData, o as resolveCodexDefaultWorkspaceDir, r as createCodexConversationBindingData } from "./conversation-binding-data-BiodpIzq.js";
+import { c as readCodexStatusProbes, l as requestOptions, p as formatCodexCliSessions, s as codexControlRequest, u as safeCodexControlRequest } from "./session-catalog-B47uwekb.js";
+import { i as readCodexComputerUseStatus, r as installCodexComputerUse, t as defaultCodexPluginMetadataCache } from "./plugin-metadata-cache-BwCLTY_U.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 { resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
+import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
+import { isDeepStrictEqual } from "node:util";
+import { ensureAuthProfileStore, resolveAgentDir as resolveAgentDir$1, resolveAuthProfileEligibility, resolveProfileUnusableUntilForDisplay } from "openclaw/plugin-sdk/agent-runtime";
+import { findNormalizedProviderValue, resolveAuthProfileOrder } from "openclaw/plugin-sdk/provider-auth";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { parseAgentSessionKey } from "openclaw/plugin-sdk/routing";
@@ -591,7 +594,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;
@@ -752,11 +756,10 @@ 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;
-const CODEX_RESUME_SAFE_THREAD_ID_PATTERN = /^[A-Za-z0-9._:-]+$/;
 const { lastUploadByThread: lastCodexDiagnosticsUploadByThread, lastUploadByScope: lastCodexDiagnosticsUploadByScope, pendingConfirmations: pendingCodexDiagnosticsConfirmations, pendingTokensByScope: pendingCodexDiagnosticsConfirmationTokensByScope } = codexDiagnosticsFeedbackState;
 function normalizeDiagnosticsReason(note) {
 	const normalized = normalizeOptionalString(note);
@@ -909,7 +912,7 @@ function formatCodexDiagnosticsTargetLines(targets) {
 }
 function formatCodexDiagnosticsTargetBlock(target, index) {
 	const lines = [`Session ${index + 1}`];
-	if (target.channel) lines.push(`Channel: ${formatCodexValueForDisplay(target.channel)}`);
+	if (target.channel) lines.push(`Channel: ${formatCodexDisplayText(target.channel)}`);
 	if (target.sessionKey) lines.push(`OpenClaw session key: ${formatCodexCopyableValueForDisplay(target.sessionKey)}`);
 	if (target.sessionId) lines.push(`OpenClaw session id: ${formatCodexCopyableValueForDisplay(target.sessionId)}`);
 	lines.push(`Codex thread id: ${formatCodexCopyableValueForDisplay(target.threadId)}`);
@@ -918,30 +921,18 @@ function formatCodexDiagnosticsTargetBlock(target, index) {
 }
 function formatCodexDiagnosticsTargetLine(target) {
 	const parts = [];
-	if (target.channel) parts.push(`channel ${formatCodexValueForDisplay(target.channel)}`);
+	if (target.channel) parts.push(`channel ${formatCodexDisplayText(target.channel)}`);
 	const sessionLabel = target.sessionId || target.sessionKey;
-	if (sessionLabel) parts.push(`OpenClaw session ${formatCodexValueForDisplay(sessionLabel)}`);
-	parts.push(`Codex thread ${formatCodexThreadIdForDisplay(target.threadId)}`);
+	if (sessionLabel) parts.push(`OpenClaw session ${formatCodexDisplayText(sessionLabel)}`);
+	parts.push(`Codex thread ${formatCodexDisplayText(target.threadId)}`);
 	return `- ${parts.join(", ")}`;
 }
-function escapeCodexChatText(value) {
-	return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("@", "＠").replaceAll("`", "｀").replaceAll("[", "［").replaceAll("]", "］").replaceAll("(", "（").replaceAll(")", "）").replaceAll("*", "∗").replaceAll("_", "＿").replaceAll("~", "～").replaceAll("|", "｜");
-}
-function formatCodexTextForDisplay(value) {
-	let safe = "";
-	for (const character of value) {
-		const codePoint = character.codePointAt(0);
-		safe += codePoint != null && isUnsafeDisplayCodePoint(codePoint) ? "?" : character;
-	}
-	safe = safe.trim();
-	return safe || "<unknown>";
-}
 function readCodexDiagnosticsTargetsCooldownMessage(targets, ctx, now, options = {}) {
 	for (const target of targets) {
 		const cooldownMs = readCodexDiagnosticsCooldownMs(target.threadId, now);
 		if (cooldownMs > 0) {
 			if (options.includeThreadId === false) return `Codex diagnostics were already sent for one of these Codex threads recently. Try again in ${Math.ceil(cooldownMs / 1e3)}s.`;
-			return `Codex diagnostics were already sent for thread ${formatCodexThreadIdForDisplay(target.threadId)} recently. Try again in ${Math.ceil(cooldownMs / 1e3)}s.`;
+			return `Codex diagnostics were already sent for thread ${formatCodexDisplayText(target.threadId)} recently. Try again in ${Math.ceil(cooldownMs / 1e3)}s.`;
 		}
 	}
 	const scopeCooldownMs = readCodexDiagnosticsScopeCooldownMs(options.cooldownScope ?? readCodexDiagnosticsCooldownScope(ctx), now);
@@ -973,12 +964,6 @@ function buildDiagnosticsTags(ctx) {
 function addTag(tags, key, value) {
 	if (typeof value === "string" && value.trim()) tags[key] = value.trim();
 }
-function formatCodexThreadIdForDisplay(threadId) {
-	return escapeCodexChatText(formatCodexTextForDisplay(threadId));
-}
-function formatCodexValueForDisplay(value) {
-	return escapeCodexChatText(formatCodexTextForDisplay(value));
-}
 function formatCodexCopyableValueForDisplay(value) {
 	const safe = formatCodexTextForDisplay(value);
 	if (CODEX_RESUME_SAFE_THREAD_ID_PATTERN.test(safe)) return `\`${safe}\``;
@@ -1014,16 +999,14 @@ function pruneCodexDiagnosticsCooldownMap(map, now) {
 	for (const [key, lastSentAt] of map) if (now - lastSentAt >= CODEX_DIAGNOSTICS_COOLDOWN_MS) map.delete(key);
 }
 function formatCodexErrorForDisplay(error) {
-	return escapeCodexChatText(truncateUtf16Safe(formatCodexTextForDisplay(error), CODEX_DIAGNOSTICS_ERROR_MAX_CHARS)) || "unknown error";
+	const safe = truncateUtf16Safe(formatCodexTextForDisplay(error), CODEX_DIAGNOSTICS_ERROR_MAX_CHARS);
+	return escapeCodexChatText(safe) || "unknown error";
 }
 function formatCodexResumeCommandForDisplay(threadId) {
 	const safeThreadId = formatCodexTextForDisplay(threadId);
 	if (!CODEX_RESUME_SAFE_THREAD_ID_PATTERN.test(safeThreadId)) return "run codex resume and paste the thread id shown above";
 	return `\`codex resume ${safeThreadId}\``;
 }
-function isUnsafeDisplayCodePoint(codePoint) {
-	return codePoint <= 31 || codePoint >= 127 && codePoint <= 159 || codePoint === 173 || codePoint === 1564 || codePoint === 6158 || codePoint >= 8203 && codePoint <= 8207 || codePoint >= 8234 && codePoint <= 8238 || codePoint >= 8288 && codePoint <= 8303 || codePoint === 65279 || codePoint >= 65529 && codePoint <= 65531 || codePoint >= 917504 && codePoint <= 917631;
-}
 function normalizeCodexDiagnosticsScopeField(value) {
 	const normalized = normalizeOptionalString(value);
 	if (!normalized) return;
@@ -1063,7 +1046,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),
@@ -1082,18 +1066,64 @@ async function resolveControlTarget(ctx) {
 		agentDir: scope.agentDir
 	} : void 0;
 }
-async function resolveCommandAppServerScope(deps, ctx, pluginConfig) {
+async function resolvePreparedCodexCommandAuthority(deps, ctx) {
 	const target = await resolveControlTarget(ctx);
 	const fallback = resolveCodexConversationControlScope(ctx);
+	const sessionId = ctx.sessionId;
+	const sessionKey = ctx.sessionKey;
+	const sessionAgentId = ctx.sessionTarget?.agentId ?? fallback.agentId;
+	const storePath = ctx.sessionTarget?.storePath ?? (sessionKey ? resolveStorePath(ctx.config.session?.store, { agentId: sessionAgentId }) : void 0);
+	const sessionIdentity = sessionId ? sessionBindingIdentity({
+		sessionId,
+		sessionKey,
+		agentId: sessionAgentId,
+		config: ctx.config
+	}) : void 0;
+	const currentSession = sessionIdentity ? await resolveCodexSessionBinding({
+		reclaimStale: true,
+		bindingStore: deps.bindingStore,
+		identity: sessionIdentity,
+		config: ctx.config,
+		storePath
+	}) : void 0;
+	const assertHostCurrent = currentSession?.assertCurrent ?? (() => {});
+	const binding = (target && (!sessionIdentity || !isDeepStrictEqual(target.identity, sessionIdentity)) ? await resolveCodexSessionBinding({
+		bindingStore: deps.bindingStore,
+		identity: target.identity,
+		config: ctx.config,
+		storePath,
+		assertCurrent: assertHostCurrent
+	}) : currentSession)?.binding;
+	const assertCurrent = () => {
+		assertHostCurrent();
+		if (target && !isDeepStrictEqual(deps.bindingStore.read(target.identity), binding)) throw new Error("Codex command binding changed before dispatch");
+		assertHostCurrent();
+	};
+	assertCurrent();
+	return {
+		target,
+		binding,
+		currentSessionBinding: currentSession?.binding,
+		sessionId,
+		sessionKey,
+		storePath,
+		assertHostCurrent,
+		assertCurrent
+	};
+}
+async function resolveCommandAppServerScope(deps, ctx, pluginConfig) {
+	const authority = await resolvePreparedCodexCommandAuthority(deps, ctx);
+	const { target, binding } = authority;
+	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 {
@@ -1101,8 +1131,10 @@ async function resolveCommandAppServerScope(deps, ctx, pluginConfig) {
 		agentDir,
 		...connection.clientAuthProfileId !== void 0 ? { authProfileId: connection.clientAuthProfileId } : {},
 		...connection.usesSupervisionConnection ? { startOptions: connection.appServer.start } : {},
-		...ctx.sessionKey ? { sessionKey: ctx.sessionKey } : {},
-		...ctx.sessionId ? { sessionId: ctx.sessionId } : {}
+		...authority.sessionKey ? { sessionKey: authority.sessionKey } : {},
+		...authority.sessionId ? { sessionId: authority.sessionId } : {},
+		...authority.storePath ? { storePath: authority.storePath } : {},
+		assertCurrent: authority.assertCurrent
 	};
 }
 function conversationBindingIdentity(bindingId) {
@@ -1112,14 +1144,14 @@ function conversationBindingIdentity(bindingId) {
 	};
 }
 function resolveCodexConversationControlScope(ctx) {
-	const { sessionAgentId } = resolveSessionAgentIds({
+	const { sessionAgentId } = resolveSessionAgentIdsStrict({
 		sessionKey: ctx.sessionKey,
 		agentId: ctx.agentId,
 		config: ctx.config
 	});
 	return {
 		agentId: sessionAgentId,
-		agentDir: resolveAgentDir(ctx.config, sessionAgentId)
+		agentDir: resolveAgentDir$1(ctx.config, sessionAgentId)
 	};
 }
 //#endregion
@@ -1155,7 +1187,7 @@ async function requestCodexDiagnosticsFeedbackApproval(deps, ctx, note, commandP
 	});
 	const confirmCommand = `${commandPrefix} confirm ${token}`;
 	const cancelCommand = `${commandPrefix} cancel ${token}`;
-	const displayReason = reason ? escapeCodexChatText(formatCodexTextForDisplay(reason)) : void 0;
+	const displayReason = reason ? formatCodexDisplayText(reason) : void 0;
 	return {
 		text: [
 			targets.length === 1 ? "Codex runtime thread detected." : "Codex runtime threads detected.",
@@ -1197,7 +1229,7 @@ async function previewCodexDiagnosticsFeedbackApproval(deps, ctx, note) {
 	const cooldownMessage = readCodexDiagnosticsTargetsCooldownMessage(targets, ctx, Date.now(), { includeThreadId: false });
 	if (cooldownMessage) return cooldownMessage;
 	const reason = normalizeDiagnosticsReason(note);
-	const displayReason = reason ? escapeCodexChatText(formatCodexTextForDisplay(reason)) : void 0;
+	const displayReason = reason ? formatCodexDisplayText(reason) : void 0;
 	return [
 		targets.length === 1 ? "Codex runtime thread detected." : "Codex runtime threads detected.",
 		`Approving diagnostics will also send ${targets.length === 1 ? "this thread's feedback bundle" : "these threads' feedback bundles"} to OpenAI servers.`,
@@ -1216,7 +1248,7 @@ async function confirmCodexDiagnosticsFeedback(deps, ctx, pluginConfig, token) {
 	if (scopeMismatch) return scopeMismatch.confirmMessage;
 	deletePendingCodexDiagnosticsConfirmation(token);
 	if (!pending.privateRouted && !await hasAnyCodexDiagnosticsIdentity(ctx)) return "Cannot send Codex diagnostics because this command did not include a stable session identity.";
-	const currentTargets = pending.privateRouted ? await resolvePendingCodexDiagnosticsTargets(deps, pending.targets, ctx.config) : await resolveCodexDiagnosticsTargets(deps, ctx);
+	const currentTargets = pending.privateRouted ? resolvePendingCodexDiagnosticsTargets(deps, pending.targets, ctx.config) : await resolveCodexDiagnosticsTargets(deps, ctx);
 	if (!codexDiagnosticsTargetsMatch(pending.targets, currentTargets)) return "The Codex diagnostics sessions changed before confirmation. Run /diagnostics again for the current threads.";
 	return await sendCodexDiagnosticsFeedbackForTargets(deps, ctx, pluginConfig, pending.note ?? "", currentTargets, { cooldownScope: pending.scopeKey });
 }
@@ -1323,7 +1355,7 @@ async function resolveCodexDiagnosticsTargets(deps, ctx) {
 		});
 		candidates.push({
 			identity,
-			agentDir: resolveAgentDir(ctx.config, identity.agentId),
+			agentDir: resolveAgentDir$1(ctx.config, identity.agentId),
 			sessionKey: session.sessionKey,
 			sessionId: session.sessionId,
 			channel: session.channel,
@@ -1340,17 +1372,17 @@ async function resolveCodexDiagnosticsTargets(deps, ctx) {
 		const key = bindingStoreKey(candidate.identity);
 		if (seenBindingKeys.has(key)) continue;
 		seenBindingKeys.add(key);
-		const binding = await deps.bindingStore.read(candidate.identity);
+		const binding = deps.bindingStore.read(candidate.identity);
 		if (!binding?.threadId || seenThreadIds.has(binding.threadId)) continue;
 		seenThreadIds.add(binding.threadId);
 		targets.push(resolveCodexDiagnosticsTarget(candidate, binding, ctx.config));
 	}
 	return targets;
 }
-async function resolvePendingCodexDiagnosticsTargets(deps, targets, config) {
+function resolvePendingCodexDiagnosticsTargets(deps, targets, config) {
 	const resolved = [];
 	for (const target of targets) {
-		const binding = await deps.bindingStore.read(target.identity);
+		const binding = deps.bindingStore.read(target.identity);
 		if (!binding?.threadId) continue;
 		resolved.push(resolveCodexDiagnosticsTarget(target, binding, config));
 	}
@@ -1392,8 +1424,9 @@ function isCurrentSessionModelSelectionLocked(ctx) {
 	const sessionKey = ctx.sessionKey?.trim();
 	if (!sessionKey) return false;
 	const { agentId } = resolveCodexConversationControlScope(ctx);
+	const storePath = ctx.sessionTarget?.storePath ?? resolveStorePath(ctx.config.session?.store, { agentId });
 	return isModelSelectionLocked(getSessionEntry({
-		storePath: resolveStorePath(ctx.config.session?.store, { agentId }),
+		storePath,
 		sessionKey,
 		hydrateSkillPromptRefs: false,
 		readConsistency: "latest"
@@ -1415,7 +1448,7 @@ async function bindConversation(deps, ctx, pluginConfig, args) {
 		config: ctx.config
 	}) : void 0;
 	const currentOwner = currentConversationData?.kind === "codex-app-server-session" ? conversationBindingIdentity(currentConversationData.bindingId) : sessionOwner;
-	const existingBinding = currentOwner ? await deps.bindingStore.read(currentOwner) : void 0;
+	const existingBinding = currentOwner ? deps.bindingStore.read(currentOwner) : void 0;
 	assertCodexBindingMayBeReplaced(existingBinding, "binding this conversation to another thread");
 	const sessionSource = sessionOwner && existingBinding ? {
 		agentId: sessionOwner.agentId,
@@ -1450,13 +1483,14 @@ 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;
 	let expectedStartId;
 	if (data?.kind === "codex-app-server-session") {
-		const binding = await deps.bindingStore.read(identity);
+		const binding = deps.bindingStore.read(identity);
 		assertCodexBindingMayBeReplaced(binding, "detaching its conversation binding");
 		if (deps.readCodexConversationActiveTurn(identity)) return "This Codex conversation has an active run; use /codex stop before detaching it.";
 		expectedThreadId = binding?.threadId;
@@ -1494,13 +1528,13 @@ async function describeConversationBinding(deps, ctx) {
 		"- Active run: not tracked"
 	].join("\n");
 	const identity = conversationBindingIdentity(data.bindingId);
-	const threadBinding = await deps.bindingStore.read(identity);
+	const threadBinding = deps.bindingStore.read(identity);
 	const active = deps.readCodexConversationActiveTurn(identity);
 	const sessionKey = ctx.sessionKey?.trim();
 	const { agentId } = resolveCodexConversationControlScope(ctx);
 	const sessionEntry = sessionKey ? getSessionEntry({
 		agentId,
-		storePath: resolveStorePath(ctx.config.session?.store, { agentId }),
+		storePath: ctx.sessionTarget?.storePath ?? resolveStorePath(ctx.config.session?.store, { agentId }),
 		sessionKey,
 		hydrateSkillPromptRefs: false,
 		readConsistency: "latest"
@@ -1519,13 +1553,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);
@@ -1551,25 +1586,25 @@ async function resumeThread(deps, ctx, pluginConfig, args) {
 		agentId: scope.agentId,
 		config: ctx.config
 	});
+	const { assertCurrent: assertHostGeneration } = await resolveCodexSessionBinding({
+		reclaimStale: true,
+		bindingStore: deps.bindingStore,
+		identity,
+		config: ctx.config,
+		storePath: ctx.sessionTarget?.storePath
+	});
 	return await withExclusiveCodexAppServerThread({
 		bindingStore: deps.bindingStore,
 		identity,
 		threadId: normalizedThreadId,
 		run: async () => await deps.bindingStore.withLease(identity, async () => {
-			if (!await reclaimCurrentCodexSessionGeneration({
-				bindingStore: deps.bindingStore,
-				identity,
-				config: ctx.config
-			})) throw createCodexSessionGenerationSupersededError(identity.sessionId);
-			const currentBinding = await deps.bindingStore.read(identity);
+			const generation = await deps.bindingStore.prepareSessionGenerationReclaim(identity);
+			assertHostGeneration();
+			if (generation.kind !== "resolved" || !generation.result) throw createCodexSessionGenerationSupersededError(identity.sessionId);
+			const currentBinding = 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}`);
@@ -1581,52 +1616,75 @@ 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.");
-					}
-					if (bindingBeforeCommit && !sameOwner) await releaseCodexAppServerBindingSubscription(bindingBeforeCommit);
+					const bindingBeforeCommit = 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 });
+					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,
+				storePath: ctx.sessionTarget?.storePath,
+				assertCurrent: assertHostGeneration,
+				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." : ""}`;
 		})
 	});
 }
@@ -1635,12 +1693,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 = 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,
@@ -1755,9 +1814,9 @@ async function handleComputerUseCommand(deps, ctx, pluginConfig, args) {
 async function handleNativeGoal(deps, ctx, pluginConfig, args) {
 	const action = (args[0] ?? "status").toLowerCase();
 	const objective = args.slice(1).join(" ").trim();
-	const target = await resolveControlTarget(ctx);
+	const authority = await resolvePreparedCodexCommandAuthority(deps, ctx);
+	const { target, binding } = authority;
 	if (!target) return "Cannot manage the Codex goal because this command has no stable binding identity.";
-	const binding = await deps.bindingStore.read(target.identity);
 	if (!binding?.threadId) return "No Codex thread is attached to this OpenClaw session yet.";
 	const connection = resolveCodexBindingAppServerConnection({
 		binding,
@@ -1768,6 +1827,10 @@ async function handleNativeGoal(deps, ctx, pluginConfig, args) {
 		agentDir: target.agentDir,
 		authProfileId: connection.clientAuthProfileId,
 		config: ctx.config,
+		sessionId: authority.sessionId,
+		sessionKey: authority.sessionKey,
+		storePath: authority.storePath,
+		assertCurrent: authority.assertCurrent,
 		...connection.usesSupervisionConnection ? { startOptions: connection.appServer.start } : {}
 	};
 	if (action === "status" || action === "get") {
@@ -1783,11 +1846,14 @@ async function handleNativeGoal(deps, ctx, pluginConfig, args) {
 	const isObjectiveUpdate = action === "set";
 	if (!requestedStatus && !isObjectiveUpdate || isObjectiveUpdate && !objective) return "Usage: /codex goal [status|set <objective>|pause|resume|block|complete|clear]";
 	if (requestedStatus && args.length > 1) return `Usage: /codex goal ${action}`;
-	return formatNativeGoal(await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.setThreadGoal, {
+	return formatNativeGoal(await deps.bindingStore.withLease(target.identity, () => deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.setThreadGoal, {
 		threadId: binding.threadId,
 		...objective ? { objective } : {},
 		...requestedStatus ? { status: requestedStatus } : {}
-	}, goalRequestOptions));
+	}, {
+		...goalRequestOptions,
+		...(isObjectiveUpdate || requestedStatus === "active") && connection.usesSupervisionConnection ? { beforeRequest: supervisedCommandGuard(deps, target.identity, binding) } : {}
+	})));
 }
 function formatNativeGoal(response) {
 	const goal = isJsonObject(response) && isJsonObject(response.goal) ? response.goal : void 0;
@@ -1803,26 +1869,30 @@ function formatNativeGoal(response) {
 	].join("\n");
 }
 async function stopConversationTurn(deps, ctx, pluginConfig) {
-	const target = await resolveControlTarget(ctx);
+	const authority = await resolvePreparedCodexCommandAuthority(deps, ctx);
+	const { target, binding } = authority;
 	if (!target) return "Cannot stop Codex because this command did not include a stable binding identity.";
 	return (await deps.stopCodexConversationTurn({
 		identity: target.identity,
-		bindingStore: deps.bindingStore,
+		binding,
 		pluginConfig,
 		agentDir: target.agentDir,
-		config: ctx.config
+		config: ctx.config,
+		assertCurrent: authority.assertCurrent
 	})).message;
 }
 async function steerConversationTurn(deps, ctx, pluginConfig, message) {
-	const target = await resolveControlTarget(ctx);
+	const authority = await resolvePreparedCodexCommandAuthority(deps, ctx);
+	const { target, binding } = authority;
 	if (!target) return "Cannot steer Codex because this command did not include a stable binding identity.";
 	return (await deps.steerCodexConversationTurn({
 		identity: target.identity,
-		bindingStore: deps.bindingStore,
+		binding,
 		message,
 		pluginConfig,
 		agentDir: target.agentDir,
-		config: ctx.config
+		config: ctx.config,
+		assertCurrent: authority.assertCurrent
 	})).message;
 }
 async function setConversationModel(deps, ctx, pluginConfig, args) {
@@ -1830,17 +1900,18 @@ async function setConversationModel(deps, ctx, pluginConfig, args) {
 	const [model = ""] = args;
 	const normalized = model.trim();
 	if (normalized && isCurrentSessionModelSelectionLocked(ctx)) return MODEL_SELECTION_LOCKED_MESSAGE;
-	const target = await resolveControlTarget(ctx);
+	const authority = await resolvePreparedCodexCommandAuthority(deps, ctx);
+	const { target, binding } = authority;
 	if (!target) return "Cannot set Codex model because this command did not include a stable binding identity.";
 	if (!normalized) {
-		const currentSession = ctx.sessionId && ctx.sessionKey ? getSessionEntry({
-			storePath: resolveStorePath(ctx.config.session?.store, { agentId: target.agentId }),
-			sessionKey: ctx.sessionKey,
+		const currentSession = authority.sessionId && authority.sessionKey && authority.storePath ? getSessionEntry({
+			storePath: authority.storePath,
+			sessionKey: authority.sessionKey,
 			hydrateSkillPromptRefs: false,
 			readConsistency: "latest"
 		}) : void 0;
-		const selectedModel = currentSession && currentSession.sessionId === ctx.sessionId ? currentSession.modelOverride ?? currentSession.model : void 0;
-		const binding = await deps.bindingStore.read(target.identity);
+		const selectedModel = currentSession && currentSession.sessionId === authority.sessionId ? currentSession.modelOverride ?? currentSession.model : void 0;
+		authority.assertCurrent();
 		const activeModel = target.identity.kind === "conversation" ? binding?.model : selectedModel ?? binding?.model;
 		return activeModel ? `Codex model: ${formatCodexDisplayText(activeModel)}` : "Usage: /codex model <model>";
 	}
@@ -1850,12 +1921,16 @@ async function setConversationModel(deps, ctx, pluginConfig, args) {
 		pluginConfig,
 		model: normalized,
 		agentDir: target.agentDir,
-		config: ctx.config
+		config: ctx.config,
+		binding,
+		storePath: authority.storePath,
+		assertCurrent: authority.assertCurrent
 	});
 }
 async function setConversationFastMode(deps, ctx, args) {
 	if (args.length > 1) return "Usage: /codex fast [on|off|status]";
-	const target = await resolveControlTarget(ctx);
+	const authority = await resolvePreparedCodexCommandAuthority(deps, ctx);
+	const { target, binding } = authority;
 	if (!target) return "Cannot set Codex fast mode because this command did not include a stable binding identity.";
 	const value = args[0];
 	const parsed = parseCodexFastModeArg(value);
@@ -1863,12 +1938,15 @@ async function setConversationFastMode(deps, ctx, args) {
 	return await deps.setCodexConversationFastMode({
 		identity: target.identity,
 		bindingStore: deps.bindingStore,
-		enabled: parsed
+		binding,
+		enabled: parsed,
+		assertCurrent: authority.assertCurrent
 	});
 }
 async function setConversationPermissions(deps, ctx, args) {
 	if (args.length > 1) return "Usage: /codex permissions [default|yolo|status]";
-	const target = await resolveControlTarget(ctx);
+	const authority = await resolvePreparedCodexCommandAuthority(deps, ctx);
+	const { target } = authority;
 	if (!target || !ctx.sessionId || !ctx.sessionKey) return "Cannot set Codex permissions because this command did not include a complete session identity.";
 	const value = args[0];
 	const parsed = parseCodexPermissionsModeArg(value);
@@ -1877,6 +1955,8 @@ async function setConversationPermissions(deps, ctx, args) {
 	return await deps.setCodexConversationPermissions({
 		mode: parsed,
 		config: ctx.config,
+		storePath: authority.storePath,
+		assertCurrent: authority.assertHostCurrent,
 		session: {
 			agentId: target.agentId,
 			sessionId: ctx.sessionId,
@@ -1886,30 +1966,26 @@ async function setConversationPermissions(deps, ctx, args) {
 }
 async function startThreadAction(deps, ctx, pluginConfig, kind, args) {
 	if (args.length > 0) return `Usage: /codex ${kind}`;
-	const target = await resolveControlTarget(ctx);
+	const authority = await resolvePreparedCodexCommandAuthority(deps, ctx);
+	const { target, binding } = authority;
 	if (!target) return `Cannot start Codex ${kind === "compact" ? "compaction" : "review"} because this command did not include a stable binding identity.`;
-	const binding = await deps.bindingStore.read(target.identity);
 	if (!binding?.threadId) return `No Codex thread is attached to this OpenClaw session yet.`;
 	if (kind === "compact") {
 		const sessionTarget = ctx.sessionTarget;
 		if (!ctx.sessionId || !ctx.sessionKey || !sessionTarget || sessionTarget.sessionId !== ctx.sessionId || sessionTarget.sessionKey !== ctx.sessionKey) return "Codex compaction is unavailable because this command is not bound to a complete session identity.";
 		const currentSession = getSessionEntry({
-			storePath: sessionTarget.storePath,
+			storePath: authority.storePath ?? sessionTarget.storePath,
 			sessionKey: ctx.sessionKey,
 			hydrateSkillPromptRefs: false,
 			readConsistency: "latest"
 		});
 		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({
-				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.";
+			if (!isSameCodexAppServerThreadOwner(binding, authority.currentSessionBinding)) 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.";
+		authority.assertCurrent();
 		const result = await compactCurrent();
 		return result.compacted ? `Compacted Codex session (${result.tokensAfter ?? "unknown"} tokens after).` : `Codex compaction did not complete: ${formatCodexDisplayText(result.reason ?? "no reason returned")}.`;
 	}
@@ -1918,20 +1994,39 @@ async function startThreadAction(deps, ctx, pluginConfig, kind, args) {
 		authProfileId: binding.authProfileId,
 		pluginConfig
 	});
-	await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.review, {
+	await deps.bindingStore.withLease(target.identity, () => deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.review, {
 		threadId: binding.threadId,
 		target: { type: "uncommittedChanges" }
 	}, {
 		agentDir: target.agentDir,
 		authProfileId: connection.clientAuthProfileId,
 		config: ctx.config,
-		...connection.usesSupervisionConnection ? { startOptions: connection.appServer.start } : {}
-	});
+		sessionId: authority.sessionId,
+		sessionKey: authority.sessionKey,
+		storePath: authority.storePath,
+		assertCurrent: authority.assertCurrent,
+		...connection.usesSupervisionConnection ? {
+			startOptions: connection.appServer.start,
+			beforeRequest: supervisedCommandGuard(deps, target.identity, binding)
+		} : {}
+	}));
 	return `Started Codex review for thread ${formatCodexDisplayText(binding.threadId)}.`;
 }
+function supervisedCommandGuard(deps, identity, binding) {
+	return async (_request, client, scope) => {
+		const { thread } = await client.request("thread/read", {
+			threadId: binding.threadId,
+			includeTurns: false
+		});
+		scope.assertCurrent();
+		if (!isDeepStrictEqual(deps.bindingStore.read(identity), binding)) throw new Error("Codex command binding changed before model execution");
+		scope.assertCurrent();
+		assertCodexSupervisionThreadLineage(binding, thread);
+	};
+}
 //#endregion
 //#region extensions/codex/src/command-plugins-management.ts
-const POLICY_REFRESH_HINT = "New Codex conversations pick this up automatically. Use /new or /reset to refresh the current one.";
+const POLICY_REFRESH_HINT = "Takes effect on your next message.";
 async function handleCodexPluginsSubcommand(ctx, rest, io, runtime) {
 	const [verb = "list", ...args] = rest;
 	const normalized = verb.toLowerCase();
@@ -2290,7 +2385,7 @@ function formatPluginList(plugins, options = {}) {
 		...rows.map((r) => `  ${r.state}  ${r.displayKey.padEnd(keyW)}  ${r.pluginName.padEnd(pluginW)}  [${r.marketplace}]`),
 		"",
 		...globalEnabled ? [] : ["Global codexPlugins.enabled is off; configured sub-plugins are inactive.", ""],
-		"New Codex conversations pick up policy changes automatically; /new or /reset to refresh the current one."
+		POLICY_REFRESH_HINT
 	].join("\n");
 }
 //#endregion