@openclaw/codex 2026.8.1-beta.3 → 2026.8.2

package/dist/index.js

@@ -1,30 +1,27 @@
 import { registerCodexCliMetadata } from "./cli-metadata.js";
-import { n as createCodexAppServerNativeCompaction, t as createCodexAppServerAgentHarness } from "./harness-DoKQcF8n.js";
-import { A as resolveOpenClawExecPolicyForCodexAppServer, _ as CODEX_PLUGINS_MARKETPLACE_NAME, b as canUseCodexModelBackedApprovalsReviewerForModel, c as assertCodexAppServerConnectionSecurity, h as readCodexPluginConfig, i as resolveCodexAppServerRuntimeOptions, n as codexSandboxPolicyForTurn, s as resolveCodexSupervisionAppServerRuntimeOptions, t as codexAppServerStartOptionsKey } from "./config-CpNeo5AE.js";
-import { G as isCodexAppServerClientRuntimeLive, J as releaseCodexAppServerLiveThread, K as isCodexAppServerLiveThreadClaimed, L as isUnsupportedCodexAppServerVersionError, N as isCodexAppServerIndeterminateRequestCancellationError, U as consumeCodexAppServerLiveThread, a as getLeasedSharedCodexAppServerClient, c as releaseCodexAppServerClientLease, d as retainSharedCodexAppServerClientByInstanceId, et as resolveCodexAppServerAuthAccountCacheKey, h as withLeasedCodexAppServerClientStartSelectionRetry, l as releaseLeasedSharedCodexAppServerClient, nt as resolveCodexAppServerAuthProfileIdForAgent, r as clearSharedCodexAppServerClientIfCurrentAndWait, rt as resolveCodexAppServerFallbackApiKeyCacheKey, st as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS, ut as isJsonObject } from "./shared-client-Dw-rzii0.js";
+import { n as createCodexAppServerNativeCompaction, t as createCodexAppServerAgentHarness } from "./harness-BgeB7LnD.js";
+import { D as resolveOpenClawExecPolicyForCodexAppServer, T as readCodexPluginConfig, c as assertCodexAppServerConnectionSecurity, i as resolveCodexAppServerRuntimeOptions, j as CODEX_PLUGINS_MARKETPLACE_NAME, n as codexSandboxPolicyForTurn, p as canUseCodexModelBackedApprovalsReviewerForModel, s as resolveCodexSupervisionAppServerRuntimeOptions, t as codexAppServerStartOptionsKey, v as readCodexRequirementsToml } from "./config-CcYL77O6.js";
+import { C as withLeasedCodexAppServerClientStartSelectionRetry, Ft as resolveCodexAppServerFallbackApiKeyCacheKey, Ht as isJsonObject, J as isCodexAppServerOverloadError, K as isCodexAppServerIndeterminateRequestCancellationError, Nt as resolveCodexAppServerAuthProfileIdForAgent, St as releaseCodexAppServerLiveThread, Z as isUnsupportedCodexAppServerVersionError, _ as retainSharedCodexAppServerClientByInstanceId, b as retireSharedCodexAppServerClientsBeforeDesktopGeneration, bt as isCodexAppServerLiveThreadClaimed, c as getLeasedSharedCodexAppServerClient, gt as consumeCodexAppServerLiveThread, h as releaseLeasedSharedCodexAppServerClient, jt as resolveCodexAppServerAuthAccountCacheKey, k as createCodexDesktopGenerationService, m as releaseCodexAppServerClientLease, o as clearSharedCodexAppServerClientIfCurrentAndWait, vt as hasCodexAppServerLiveThread, yt as isCodexAppServerClientRuntimeLive, zt as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS } from "./shared-client-B1tT5U6r.js";
+import { i as setManagedCodexPluginRoot } from "./managed-binary-ZkGodW19.js";
 import { n as CODEX_APP_SERVER_BINDING_NAMESPACE, t as CODEX_APP_SERVER_BINDING_MAX_ENTRIES } from "./session-binding-meta-B7aEMU7g.js";
-import { d as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced, o as isCodexAppServerNativeAuthProfile, s as normalizeCodexAppServerBindingModelProvider } from "./session-binding-BTrLf9Qm.js";
-import { i as setManagedCodexPluginRoot } from "./managed-binary-By4FZC6i.js";
-import { a as closeCodexStartupClientBestEffort, d as unsubscribeCodexThreadBestEffort, h as isCodexNotificationForTurn, o as interruptCodexTurnAndWaitBestEffort, p as getCodexAppServerTurnRouter, u as retireUnsafeCodexTurnClientBestEffort } from "./attempt-client-cleanup-URjUlCHg.js";
-import { s as isAssistantCommentaryCompletionNotification } from "./event-projector-usage-CLwNEJqW.js";
-import { a as assertCodexThreadStartResponse } from "./protocol-validators-VAVyEnDp.js";
-import { o as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-DMNQ8Zi8.js";
-import { $ as ensureCodexPluginActivation, C as CODEX_MANAGED_THREAD_NAMESPACE, S as CODEX_MANAGED_THREAD_MAX_ENTRIES, Y as buildDisabledAppsConfigPatch, Z as mergeCodexThreadConfigs, _ as resolveCodexAppServerRequestModelSelection, h as CODEX_NATIVE_PERSONALITY_NONE, m as buildCodexProjectDocThreadConfig, rt as pluginReadParams, tt as isOpenAiCuratedMarketplace, w as createCodexManagedThreadStore } from "./thread-lifecycle-DKdrnTMX.js";
-import { t as isIncognitoSessionKey } from "./incognito-session-ET_ufDH-.js";
-import { t as resumeCodexAppServerThread } from "./thread-resume-CdJk2Ehf.js";
-import { d as projectBoundedCodexVisibleSessionHistory } from "./transcript-mirror-BU0_LKAL.js";
+import { d as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced, o as isCodexAppServerNativeAuthProfile, s as normalizeCodexAppServerBindingModelProvider } from "./session-binding-D0zinCP1.js";
+import { o as createCodexAppServerProcessReaperService } from "./transport-stdio-NT_Dpd9V.js";
+import { r as assertCodexThreadAcceptsDirectInput, s as assertCodexThreadStartResponse, t as CodexThreadDirectInputError } from "./protocol-validators-Bg5rpNxk.js";
+import { a as closeCodexStartupClientBestEffort, c as isCodexAppServerUnsafeSubscriptionError, f as unsubscribeCodexThreadBestEffort, g as isCodexNotificationForTurn, m as getCodexAppServerTurnRouter, o as interruptCodexTurnAndWaitBestEffort, u as retireUnsafeCodexTurnClientBestEffort } from "./attempt-client-cleanup-CpVfwctT.js";
+import { s as isAssistantCommentaryCompletionNotification } from "./event-projector-usage-B2r5vhWH.js";
+import { i as buildCodexPluginAppCacheKey, s as defaultCodexAppInventoryCache, t as resumeCodexAppServerThread } from "./thread-resume-BFt1-ZDa.js";
+import { C as buildCodexProjectDocThreadConfig, E as resolveCodexAppServerRequestModelSelection, M as CODEX_MANAGED_THREAD_NAMESPACE, N as createCodexManagedThreadStore, ct as ensureCodexPluginActivation, ft as pluginReadParams, it as buildDisabledAppsConfigPatch, j as CODEX_MANAGED_THREAD_MAX_ENTRIES, ot as mergeCodexThreadConfigs, ut as isOpenAiCuratedMarketplace, w as CODEX_NATIVE_PERSONALITY_NONE } 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, i as requestCodexAppServerJson, o as withCodexAppServerJsonClient, s as resolveCodexNativeExecutionBlock } from "./request-BWxweEdK.js";
+import { p as projectBoundedCodexVisibleSessionHistory } from "./transcript-mirror-1ep4XjzF.js";
 import { buildCodexMediaUnderstandingProvider } from "./media-understanding-provider.js";
-import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-CH3K57v4.js";
-import { r as formatCodexDisplayText } from "./command-formatters-D0nZ3qtd.js";
-import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-bg5QPSVP.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 { f as trackCodexConversationActiveTurn, h as canMutateCodexHost, m as CODEX_NATIVE_EXECUTION_AUTH_ERROR, t as discoverCodexMarketplacePlugins } from "./plugin-marketplace-discovery-CSWDkMrP.js";
-import { a as readCodexConversationBindingDataRecord, i as readCodexConversationBindingData, o as resolveCodexDefaultWorkspaceDir, r as createCodexConversationBindingData } from "./conversation-binding-data-CW2GuupV.js";
-import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-DAvZwp96.js";
-import { c as createCodexCliSessionNodeInvokePolicies, d as resolveCodexCliSessionForBindingOnNode, f as resumeCodexCliSessionOnNode, i as createCodexSessionCatalogNodeHostCommands, n as createCodexSessionCatalogNodeInvokePolicies, o as assertCodexArchiveDescendantsUnowned, r as createCodexSessionCatalogControl, s as createCodexCliSessionNodeHostCommands, t as codexSessionCatalogRuntime, u as listCodexCliSessionsOnNode } from "./session-catalog-ezP_UcRM.js";
-import { i as withCodexAppServerJsonClient, r as requestCodexAppServerJson } from "./request-DSK0W6YI.js";
-import { t as codexControlRequest } from "./command-rpc-xUIIonsO.js";
+import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-D6m_TdVy.js";
+import { r as formatCodexDisplayText } from "./command-formatters--UToCokS.js";
+import { a as resolveCodexAppServerForModelProvider, i as resolveCodexSessionPermissionCwd, n as applyCodexSessionPermissionPolicy, t as CODEX_SESSION_PERMISSION_EXEC_MODES } from "./session-permission-policy-ScnAyG90.js";
+import { f as trackCodexConversationActiveTurn, g as canMutateCodexHost, h as CODEX_NATIVE_EXECUTION_AUTH_ERROR, t as discoverCodexMarketplacePlugins } from "./plugin-marketplace-discovery-BXjIFEiw.js";
+import { a as readCodexConversationBindingDataRecord, i as readCodexConversationBindingData, o as resolveCodexDefaultWorkspaceDir, r as createCodexConversationBindingData } from "./conversation-binding-data-BiodpIzq.js";
+import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-CF7BmrDk.js";
+import { d as createCodexCliSessionNodeHostCommands, f as createCodexCliSessionNodeInvokePolicies, g as resumeCodexCliSessionOnNode, h as resolveCodexCliSessionForBindingOnNode, i as createCodexSessionCatalogNodeHostCommands, m as listCodexCliSessionsOnNode, n as createCodexSessionCatalogNodeInvokePolicies, o as assertCodexArchiveDescendantsUnowned, r as createCodexSessionCatalogControl, s as codexControlRequest, t as codexSessionCatalogRuntime } from "./session-catalog-eMhVm0Ql.js";
 import { t as createCodexWebSearchProviderBase } from "./web-search-provider.shared-BrZmlqyR.js";
 import { mutateConfigFile } from "openclaw/plugin-sdk/config-mutation";
 import { normalizePluginsConfig, resolveEffectiveEnableState, resolveLivePluginConfigObject, resolvePluginConfigObject } from "openclaw/plugin-sdk/plugin-config-runtime";
@@ -37,18 +34,17 @@ import { embeddedAgentLog, formatErrorMessage, resolveActiveEmbeddedRunSessionId
 import os from "node:os";
 import { loadAuthProfileStoreWithoutExternalProfiles, resolveAgentConfig, resolveAgentWorkspaceDir, resolveDefaultAgentDir, resolveDefaultAgentId } from "openclaw/plugin-sdk/agent-runtime";
 import { applyAuthProfileConfig, buildApiKeyCredential, buildOauthProviderAuthResult, buildOpenAICodexCredentialExtra, readCodexCliCredentialsCached, resolveOpenAICodexAuthIdentity, resolveOpenAICodexImportProfileName, updateAuthProfileStoreWithLock } from "openclaw/plugin-sdk/provider-auth";
-import { resolveSessionAgentIds as resolveSessionAgentIds$2, tryResolveDefaultAgentId } from "openclaw/plugin-sdk/agent-scope-runtime";
-import { loadExecApprovals } from "openclaw/plugin-sdk/exec-approvals-runtime";
 import { extractErrorCode, pathExists } from "openclaw/plugin-sdk/security-runtime";
+import { resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
+import { loadExecApprovals } from "openclaw/plugin-sdk/exec-approvals-runtime";
 import { getSessionEntry, resolveStorePath, resolveTranscriptSessionKeyBySessionId } from "openclaw/plugin-sdk/session-store-runtime";
 import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { fileURLToPath } from "node:url";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
-import { normalizeAgentId } from "openclaw/plugin-sdk/routing";
 import { canonicalPathFromExistingAncestor, isPathInside } from "openclaw/plugin-sdk/file-access-runtime";
+import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { readVisibleSessionTranscriptMessageEntries } from "openclaw/plugin-sdk/session-transcript-runtime";
 import { getSessionBindingService } from "openclaw/plugin-sdk/conversation-binding-runtime";
-import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { ModelSelectionLockedError, isModelSelectionLocked } from "openclaw/plugin-sdk/model-session-runtime";
 import { MIGRATION_REASON_TARGET_EXISTS, applyMigrationManualItem, createMigrationItem, createMigrationManualItem, hasMigrationConfigPatchConflict, markMigrationItemConflict, markMigrationItemError, markMigrationItemSkipped, mergeMigrationConfigValue, readMigrationConfigPath, resolveMigrationConfigRuntime, summarizeMigrationItems, writeMigrationConfigPath } from "openclaw/plugin-sdk/migration";
 import { archiveMigrationItem, copyMemoryMigrationFileItem, copyMigrationFileItem, withCachedMigrationConfigRuntime, writeMigrationReport } from "openclaw/plugin-sdk/migration-runtime";
@@ -185,17 +181,18 @@ function waitForReconnect(delayMs, signal) {
 /** Defers schema compilation and auth loading until the first binding operation. */
 function createLazyCodexAppServerBindingStore(state, managedThreadState) {
 	let resolved;
-	const store = () => resolved ??= import("./session-binding-BTrLf9Qm.js").then((n) => n.f).then(({ createCodexAppServerBindingStore }) => createCodexAppServerBindingStore(state));
+	const store = () => resolved ??= import("./session-binding-D0zinCP1.js").then((n) => n.f).then(({ createCodexAppServerBindingStore }) => createCodexAppServerBindingStore(state));
 	const managedThreads = managedThreadState ? createCodexManagedThreadStore(managedThreadState) : void 0;
 	return {
 		...managedThreads ? { managedThreads } : {},
 		read: async (identity) => (await store()).read(identity),
 		hasOtherThreadOwner: async (threadId, currentIdentity) => (await store()).hasOtherThreadOwner(threadId, currentIdentity),
-		mutate: async (identity, mutation) => (await store()).mutate(identity, mutation),
+		mutate: async (identity, mutation, assertCurrent) => (await store()).mutate(identity, mutation, assertCurrent),
 		prepareSessionGenerationReclaim: async (identity) => (await store()).prepareSessionGenerationReclaim(identity),
 		adoptSessionGeneration: async (identity, previousSessionId) => (await store()).adoptSessionGeneration(identity, previousSessionId),
 		resetSessionGeneration: async (identity) => (await store()).resetSessionGeneration(identity),
 		retireSessionGeneration: async (identity) => (await store()).retireSessionGeneration(identity),
+		withSessionDeletion: async (identity, assertCurrent, run) => (await store()).withSessionDeletion(identity, assertCurrent, run),
 		withThreadArchiveFence: async (run) => (await store()).withThreadArchiveFence(run),
 		withLease: async (identity, run) => (await store()).withLease(identity, run)
 	};
@@ -215,7 +212,7 @@ async function handleCodexCommand(ctx, options) {
 	}
 }
 async function loadDefaultCodexSubcommandHandler() {
-	const { handleCodexSubcommand } = await import("./command-handlers-DC86lgT4.js");
+	const { handleCodexSubcommand } = await import("./command-handlers-CLFx2Ypa.js");
 	return handleCodexSubcommand;
 }
 //#endregion
@@ -397,7 +394,7 @@ function isImageMedia(media) {
 	return IMAGE_EXTENSIONS.has(path.extname(candidate.split(/[?#]/, 1)[0] ?? "").toLowerCase());
 }
 function normalizeFileUrl(value) {
-	if (!value.startsWith("file://")) return value;
+	if (!/^file:\/\//iu.test(value)) return value;
 	try {
 		return fileURLToPath(value);
 	} catch {
@@ -406,36 +403,83 @@ function normalizeFileUrl(value) {
 }
 function readLocalMediaPath(value) {
 	if (!value) return;
-	if (value.startsWith("file://")) return value;
+	if (/^file:\/\//iu.test(value)) return value;
 	if (value.startsWith("//")) return;
 	if (path.isAbsolute(value) || path.win32.isAbsolute(value)) return value;
 	return /^[a-z][a-z0-9+.-]*:/i.test(value) ? void 0 : value;
 }
 //#endregion
 //#region extensions/codex/src/conversation-binding.ts
-const DEFAULT_BOUND_TURN_TIMEOUT_MS = 20 * 6e4;
+const DEFAULT_BOUND_TURN_TIMEOUT_MS = 12e5;
 const NATIVE_CONVERSATION_INTERACTIVE_APPROVALS_UNAVAILABLE = "OpenClaw native Codex conversation binding cannot route interactive approvals yet; use the Codex harness or explicit /acp spawn codex for that workflow.";
 async function resolveConversationAppServerRuntime(params) {
-	const execPolicy = resolveConversationExecPolicy({
+	const source = params.source;
+	const agentId = source?.agentId ?? params.agentId ?? (params.config ? resolveSessionAgentIdsStrict({
+		sessionKey: params.sessionKey,
+		config: params.config
+	}).sessionAgentId : void 0);
+	const storePath = agentId && (source || params.sessionKey) ? resolveStorePath(params.config?.session?.store, { agentId }) : void 0;
+	const sessionKey = source ? source.sessionKey ?? (storePath ? resolveTranscriptSessionKeyBySessionId({
+		agentId: source.agentId,
+		sessionId: source.sessionId,
+		storePath
+	}) : void 0) : params.sessionKey;
+	const storedEntry = sessionKey && storePath ? getSessionEntry({
+		agentId,
+		storePath,
+		sessionKey,
+		readConsistency: "latest"
+	}) : void 0;
+	const entry = !source || storedEntry?.sessionId === source.sessionId ? storedEntry : void 0;
+	if (source && !entry) throw new Error("Codex conversation source session is missing or no longer current; rebind this conversation before retrying.");
+	const permissionMode = entry?.permissionMode;
+	const sessionRoot = permissionMode ? entry?.sessionRoot : void 0;
+	const agentWorkspaceDir = params.config && agentId ? resolveAgentWorkspaceDir(params.config, agentId) : resolveCodexDefaultWorkspaceDir(params.pluginConfig);
+	const execPolicy = resolveOpenClawExecPolicyForCodexAppServer({
 		config: params.config,
-		agentId: params.agentId,
-		sessionKey: params.sessionKey
+		agentId,
+		permissionMode,
+		execOverrides: permissionMode ? { mode: CODEX_SESSION_PERMISSION_EXEC_MODES[permissionMode] } : void 0,
+		approvals: permissionMode === "full" ? void 0 : loadExecApprovals()
 	});
 	const sandboxForPolicy = execPolicy.touched && execPolicy.security === "full" && execPolicy.ask !== "off" ? await resolveSandboxContext({
 		config: params.config,
-		sessionKey: params.sessionKey,
-		workspaceDir: params.workspaceDir
+		sessionKey,
+		workspaceDir: agentWorkspaceDir
 	}) : void 0;
-	return {
+	const configuredRuntime = resolveCodexAppServerRuntimeOptions({
+		pluginConfig: params.pluginConfig,
 		execPolicy,
-		runtime: resolveCodexAppServerRuntimeOptions({
-			pluginConfig: params.pluginConfig,
-			execPolicy,
-			modelProvider: params.modelProvider,
-			model: params.model,
-			config: params.config,
-			agentDir: params.agentDir,
-			openClawSandboxActive: Boolean(sandboxForPolicy?.enabled)
+		modelProvider: params.modelProvider,
+		model: params.model,
+		config: params.config,
+		agentDir: params.agentDir,
+		openClawSandboxActive: Boolean(sandboxForPolicy?.enabled)
+	});
+	const canUseAutoReview = canUseCodexModelBackedApprovalsReviewerForModel({
+		modelProvider: params.modelProvider,
+		model: params.model,
+		config: params.config,
+		env: process.env,
+		agentDir: params.agentDir
+	});
+	return {
+		runtime: applyCodexSessionPermissionPolicy({
+			appServer: configuredRuntime,
+			permissionMode,
+			sessionRoot,
+			defaultRoot: agentWorkspaceDir,
+			pluginConfig: readCodexPluginConfig(params.pluginConfig),
+			canUseAutoReview,
+			requirementsToml: readCodexRequirementsToml({}),
+			execMode: execPolicy.mode
+		}),
+		workspaceDir: resolveCodexSessionPermissionCwd({
+			permissionMode,
+			sessionRoot,
+			defaultRoot: agentWorkspaceDir,
+			requestedCwd: params.workspaceDir,
+			fallbackCwd: params.workspaceDir
 		})
 	};
 }
@@ -465,42 +509,27 @@ async function startCodexConversationThread(params) {
 		authProfileId: params.authProfileId ?? existingBinding?.authProfileId,
 		...agentLookup
 	});
-	const incognito = isIncognitoSessionKey(params.sessionKey);
-	if (params.threadId?.trim()) await attachExistingThread({
+	const bindingParams = {
 		pluginConfig: params.pluginConfig,
 		bindingStore: params.bindingStore,
 		identity,
-		threadId: params.threadId.trim(),
 		workspaceDir,
 		...agentDir ? { agentDir } : {},
 		model: params.model,
 		modelProvider: params.modelProvider,
 		authProfileId,
-		approvalPolicy: params.approvalPolicy,
-		sandbox: params.sandbox,
 		serviceTier: params.serviceTier,
 		config: params.config,
 		sessionKey: params.sessionKey,
-		incognito,
-		agentId: params.agentId
-	});
-	else await createThread({
-		pluginConfig: params.pluginConfig,
-		bindingStore: params.bindingStore,
-		identity,
-		workspaceDir,
-		...agentDir ? { agentDir } : {},
-		model: params.model,
-		modelProvider: params.modelProvider,
-		authProfileId,
-		approvalPolicy: params.approvalPolicy,
-		sandbox: params.sandbox,
-		serviceTier: params.serviceTier,
-		config: params.config,
-		sessionKey: params.sessionKey,
-		incognito,
+		incognito: isIncognitoSessionKey(params.sessionKey),
 		agentId: params.agentId
+	};
+	const threadId = params.threadId?.trim();
+	if (threadId) await attachExistingThread({
+		...bindingParams,
+		threadId
 	});
+	else await bindThread(bindingParams);
 	const storedBinding = await params.bindingStore.read(identity);
 	if (!storedBinding) throw new Error("Codex session binding disappeared while starting its conversation thread.");
 	return createCodexConversationBindingData({
@@ -639,11 +668,12 @@ async function resolveThreadBindingRuntime(params) {
 		modelProvider: params.modelProvider,
 		...agentLookup
 	});
-	const { execPolicy, runtime } = await resolveConversationAppServerRuntime({
+	const { runtime, workspaceDir } = await resolveConversationAppServerRuntime({
 		pluginConfig: params.pluginConfig,
 		config: params.config,
 		agentId: params.agentId,
 		sessionKey: params.sessionKey,
+		source: params.source,
 		workspaceDir: params.workspaceDir,
 		modelProvider: reviewerModelProvider,
 		model: params.model,
@@ -657,43 +687,32 @@ async function resolveThreadBindingRuntime(params) {
 		env: process.env,
 		agentDir: params.agentDir
 	});
-	assertNativeConversationApprovalPolicySupported({
-		execPolicy,
-		approvalPolicy: execPolicy?.touched ? modelScopedRuntime.approvalPolicy : params.approvalPolicy ?? modelScopedRuntime.approvalPolicy,
-		approvalsReviewer: modelScopedRuntime.approvalsReviewer,
-		modelBackedApprovalsReviewerUnavailable: !canUseCodexModelBackedApprovalsReviewerForModel({
-			modelProvider: reviewerModelProvider,
-			model: params.model,
-			config: params.config,
-			env: process.env,
-			agentDir: params.agentDir
-		})
-	});
+	assertNativeConversationApprovalPolicySupported(modelScopedRuntime);
 	const clientOptions = {
 		startOptions: runtime.start,
 		timeoutMs: runtime.requestTimeoutMs,
 		authProfileId: params.authProfileId,
 		...agentLookup
 	};
-	const client = await getLeasedSharedCodexAppServerClient(clientOptions);
 	return {
-		execPolicy,
 		runtime: modelScopedRuntime,
+		workspaceDir,
 		agentLookup,
 		model: modelSelection?.model,
 		modelProvider: modelSelection?.modelProvider ?? modelProvider,
-		client,
-		clientLease: { client },
 		clientOptions
 	};
 }
-function buildThreadRequestRuntimeOptions(params, resolved) {
-	const serviceTier = params.serviceTier ?? resolved.runtime.serviceTier;
-	const sandbox = resolved.execPolicy?.touched ? resolved.runtime.sandbox : params.sandbox ?? resolved.runtime.sandbox;
+function buildConversationThreadRequest(resolved, serviceTier) {
 	return {
-		approvalPolicy: resolved.execPolicy?.touched ? resolved.runtime.approvalPolicy : params.approvalPolicy ?? resolved.runtime.approvalPolicy,
+		cwd: resolved.workspaceDir,
+		...resolved.model ? { model: resolved.model } : {},
+		...resolved.modelProvider ? { modelProvider: resolved.modelProvider } : {},
+		personality: CODEX_NATIVE_PERSONALITY_NONE,
+		approvalPolicy: resolved.runtime.approvalPolicy,
 		approvalsReviewer: resolved.runtime.approvalsReviewer,
-		...codexConversationSandboxOrPermissions(resolved.runtime, sandbox),
+		...resolved.runtime.sessionRoot ? { runtimeWorkspaceRoots: [resolved.runtime.sessionRoot] } : {},
+		...codexConversationSandboxOrPermissions(resolved.runtime, resolved.runtime.sandbox),
 		...serviceTier ? { serviceTier } : {}
 	};
 }
@@ -706,47 +725,34 @@ function codexConversationSandboxOrPermissions(runtime, sandbox) {
 		config
 	};
 }
-async function requestNewConversationBindingThread(params, resolved) {
-	return await withLeasedCodexAppServerClientStartSelectionRetry({
-		lease: resolved.clientLease,
-		options: resolved.clientOptions,
-		run: async (client, requestOptions) => await client.request("thread/start", {
-			cwd: params.workspaceDir,
-			...resolved.model ? { model: resolved.model } : {},
-			...resolved.modelProvider ? { modelProvider: resolved.modelProvider } : {},
-			personality: CODEX_NATIVE_PERSONALITY_NONE,
-			...buildThreadRequestRuntimeOptions(params, resolved),
-			developerInstructions: CODEX_CONVERSATION_THREAD_DEVELOPER_INSTRUCTIONS,
-			experimentalRawEvents: true,
-			...params.incognito ? { ephemeral: true } : {}
-		}, requestOptions),
-		onClientChange: (client) => {
-			resolved.client = client;
-		}
-	});
-}
-async function writeThreadBindingFromResponse(params, resolved, response) {
-	const current = await params.bindingStore.read(params.identity);
-	assertCodexBindingMayBeReplaced(current, "storing a conversation-bound Codex thread");
-	const runtimeApprovalPolicy = typeof resolved.runtime.approvalPolicy === "string" ? resolved.runtime.approvalPolicy : void 0;
-	const trackSubscription = !params.incognito && isCodexAppServerClientRuntimeLive(resolved.client);
-	const sameOwner = isSameCodexAppServerThreadOwner(current, {
-		threadId: response.thread.id,
-		clientId: resolved.client.getInstanceId()
-	});
+async function writeThreadBindingFromResponse(params, resolved, client, response, requestOptions) {
 	let retained = false;
+	let sameOwner = false;
 	try {
+		const current = await params.bindingStore.read(params.identity);
+		assertCodexBindingMayBeReplaced(current, "storing a conversation-bound Codex thread");
+		const trackSubscription = !params.incognito && isCodexAppServerClientRuntimeLive(client);
+		sameOwner = isSameCodexAppServerThreadOwner(current, {
+			threadId: response.thread.id,
+			clientId: client.getInstanceId()
+		});
+		requestOptions();
+		assertCodexThreadAcceptsDirectInput(response.thread);
 		if (trackSubscription) {
-			retained = await retainCodexAppServerBindingSubscription(resolved.client, response.thread.id);
+			retained = await retainCodexAppServerBindingSubscription(client, response.thread.id);
 			if (!retained) throw new Error("Codex conversation thread lost its native subscription owner.");
 		}
-		if (current && !sameOwner) await releaseCodexAppServerBindingSubscription(current);
+		if (current && !sameOwner) {
+			const { assertCurrent } = requestOptions();
+			await releaseCodexAppServerBindingSubscription(current, { assertCurrent });
+		}
+		requestOptions();
 		if (!await params.bindingStore.mutate(params.identity, {
 			kind: "set",
 			binding: {
 				threadId: response.thread.id,
-				clientId: resolved.client.getInstanceId(),
-				cwd: params.workspaceDir,
+				clientId: client.getInstanceId(),
+				cwd: resolved.workspaceDir,
 				authProfileId: params.authProfileId,
 				model: response.model ?? resolved.model ?? params.model,
 				modelProvider: normalizeCodexAppServerBindingModelProvider({
@@ -754,15 +760,13 @@ async function writeThreadBindingFromResponse(params, resolved, response) {
 					modelProvider: response.modelProvider ?? resolved.modelProvider ?? params.modelProvider,
 					...resolved.agentLookup
 				}),
-				approvalPolicy: resolved.execPolicy?.touched ? runtimeApprovalPolicy : params.approvalPolicy ?? runtimeApprovalPolicy,
-				sandbox: resolved.execPolicy?.touched ? resolved.runtime.sandbox : params.sandbox ?? resolved.runtime.sandbox,
 				serviceTier: params.serviceTier ?? resolved.runtime.serviceTier ?? void 0,
 				networkProxyProfileName: resolved.runtime.networkProxy?.profileName,
 				networkProxyConfigFingerprint: resolved.runtime.networkProxy?.configFingerprint
 			}
-		})) throw new Error("Codex conversation binding changed while storing its thread.");
+		}, requestOptions)) throw new Error("Codex conversation binding changed while storing its thread.");
 	} catch (error) {
-		if (trackSubscription && !sameOwner) await rollbackCodexAppServerBindingSubscription(resolved.client, response.thread.id, retained);
+		if (retained && !sameOwner || !hasCodexAppServerLiveThread(client, response.thread.id)) await rollbackCodexAppServerBindingSubscription(client, response.thread.id, retained);
 		throw error;
 	}
 }
@@ -771,44 +775,51 @@ async function attachExistingThread(params) {
 		bindingStore: params.bindingStore,
 		identity: params.identity,
 		threadId: params.threadId,
-		run: async () => {
-			assertCodexBindingMayBeReplaced(await params.bindingStore.read(params.identity), "attaching a conversation-bound Codex thread");
-			const resolved = await resolveThreadBindingRuntime(params);
-			try {
-				const response = resolved.runtime.networkProxy ? await requestNewConversationBindingThread(params, resolved) : await withLeasedCodexAppServerClientStartSelectionRetry({
-					lease: resolved.clientLease,
-					options: resolved.clientOptions,
-					run: async (client, requestOptions) => {
-						if (isCodexAppServerLiveThreadClaimed(client, params.threadId)) throw new Error(`Codex thread ${params.threadId} has an active run; stop it before binding its conversation.`);
-						await releaseCodexAppServerLiveThread(client, params.threadId);
-						if (isCodexAppServerLiveThreadClaimed(client, params.threadId)) throw new Error(`Codex thread ${params.threadId} has an active run; stop it before binding its conversation.`);
-						return await client.request(CODEX_CONTROL_METHODS.resumeThread, {
-							threadId: params.threadId,
-							...resolved.model ? { model: resolved.model } : {},
-							...resolved.modelProvider ? { modelProvider: resolved.modelProvider } : {},
-							personality: CODEX_NATIVE_PERSONALITY_NONE,
-							...buildThreadRequestRuntimeOptions(params, resolved)
-						}, requestOptions);
-					},
-					onClientChange: (client) => {
-						resolved.client = client;
-					}
-				});
-				if (!resolved.runtime.networkProxy && response.thread.id !== params.threadId) throw new Error(`Codex conversation resume returned ${response.thread.id} for ${params.threadId}.`);
-				await writeThreadBindingFromResponse(params, resolved, response);
-			} finally {
-				releaseCodexAppServerClientLease(resolved.clientLease);
-			}
-		}
+		run: () => bindThread(params, params.threadId)
 	});
 }
-async function createThread(params) {
-	assertCodexBindingMayBeReplaced(await params.bindingStore.read(params.identity), "creating a conversation-bound Codex thread");
+async function bindThread(params, threadId) {
+	const current = await params.bindingStore.read(params.identity);
+	assertCodexBindingMayBeReplaced(current, "binding a conversation-bound Codex thread");
 	const resolved = await resolveThreadBindingRuntime(params);
+	const clientLease = { client: await getLeasedSharedCodexAppServerClient(resolved.clientOptions) };
 	try {
-		await writeThreadBindingFromResponse(params, resolved, await requestNewConversationBindingThread(params, resolved));
+		await withLeasedCodexAppServerClientStartSelectionRetry({
+			lease: clientLease,
+			options: resolved.clientOptions,
+			run: async (client, requestOptions) => {
+				const request = buildConversationThreadRequest(resolved, params.serviceTier ?? resolved.runtime.serviceTier);
+				let response;
+				if (threadId && !resolved.runtime.networkProxy) {
+					if (isCodexAppServerLiveThreadClaimed(client, threadId)) throw new Error(`Codex thread ${threadId} has an active run; stop it before binding its conversation.`);
+					const { thread } = await client.request("thread/read", {
+						threadId,
+						includeTurns: false
+					}, requestOptions());
+					assertCodexThreadAcceptsDirectInput(thread);
+					const { assertCurrent } = requestOptions();
+					await releaseCodexAppServerLiveThread(client, threadId, assertCurrent);
+					if (isCodexAppServerLiveThreadClaimed(client, threadId)) throw new Error(`Codex thread ${threadId} has an active run; stop it before binding its conversation.`);
+					response = await resumeCodexAppServerThread({
+						client,
+						abandonClient: () => closeCodexStartupClientBestEffort(client),
+						request: {
+							...request,
+							threadId
+						},
+						requestResume: (resumeRequest) => client.request("thread/resume", resumeRequest, requestOptions())
+					});
+				} else response = await client.request("thread/start", {
+					...request,
+					developerInstructions: CODEX_CONVERSATION_THREAD_DEVELOPER_INSTRUCTIONS,
+					experimentalRawEvents: true,
+					...params.incognito ? { ephemeral: true } : {}
+				}, requestOptions());
+				await writeThreadBindingFromResponse(params, resolved, client, response, requestOptions);
+			}
+		});
 	} finally {
-		releaseCodexAppServerClientLease(resolved.clientLease);
+		releaseCodexAppServerClientLease(clientLease);
 	}
 }
 async function runBoundTurn(params) {
@@ -821,18 +832,19 @@ async function runBoundTurn(params) {
 	if (!binding?.threadId) throw new Error("bound Codex conversation has no thread binding");
 	assertCodexBindingMayBeReplaced(binding, "running a conversation-bound Codex thread");
 	let threadId = binding.threadId;
-	const workspaceDir = binding.cwd || params.data.workspaceDir;
+	const requestedWorkspaceDir = binding.cwd || params.data.workspaceDir;
 	const reviewerModelProvider = resolveModelBackedReviewerPolicyProvider({
 		authProfileId: binding.authProfileId,
 		modelProvider: binding.modelProvider,
 		...agentLookup
 	});
-	const { execPolicy, runtime } = await resolveConversationAppServerRuntime({
+	const { runtime, workspaceDir } = await resolveConversationAppServerRuntime({
 		pluginConfig: params.pluginConfig,
 		config: params.config,
-		agentId: params.data.agentId,
-		sessionKey: params.sessionKey,
-		workspaceDir,
+		agentId: params.data.source?.agentId ?? params.data.agentId,
+		sessionKey: params.data.legacyBinding ? params.sessionKey : params.data.source?.sessionKey,
+		source: params.data.source,
+		workspaceDir: requestedWorkspaceDir,
 		modelProvider: reviewerModelProvider,
 		model: binding.model,
 		agentDir: params.data.agentDir
@@ -845,33 +857,26 @@ async function runBoundTurn(params) {
 		env: process.env,
 		agentDir: params.data.agentDir
 	});
-	const modelBackedApprovalsReviewerUnavailable = !canUseCodexModelBackedApprovalsReviewerForModel({
-		modelProvider: reviewerModelProvider,
-		model: binding.model,
-		config: params.config,
-		env: process.env,
-		agentDir: params.data.agentDir
-	});
-	const useModelScopedPolicy = execPolicy?.touched === true || modelBackedApprovalsReviewerUnavailable;
-	const approvalPolicy = useModelScopedPolicy ? modelScopedRuntime.approvalPolicy : binding.approvalPolicy ?? modelScopedRuntime.approvalPolicy;
-	const sandbox = useModelScopedPolicy ? modelScopedRuntime.sandbox : binding.sandbox ?? modelScopedRuntime.sandbox;
+	const sessionRoot = modelScopedRuntime.sessionRoot;
+	const approvalPolicy = modelScopedRuntime.approvalPolicy;
+	const sandbox = modelScopedRuntime.sandbox;
 	const permissionProfile = modelScopedRuntime.networkProxy?.profileName;
 	const networkProxyConfigFingerprint = modelScopedRuntime.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({
-		execPolicy,
-		approvalPolicy,
-		approvalsReviewer: modelScopedRuntime.approvalsReviewer,
-		modelBackedApprovalsReviewerUnavailable
-	});
+	assertNativeConversationApprovalPolicySupported(modelScopedRuntime);
 	const modelSelection = binding.model ? resolveCodexAppServerRequestModelSelection({
 		model: binding.model,
 		modelProvider: binding.modelProvider,
 		authProfileId: binding.authProfileId,
 		...agentLookup
 	}) : void 0;
+	const threadRequestRuntime = {
+		runtime: modelScopedRuntime,
+		workspaceDir,
+		...modelSelection
+	};
 	const clientOptions = {
 		startOptions: runtime.start,
 		timeoutMs: runtime.requestTimeoutMs,
@@ -882,12 +887,20 @@ async function runBoundTurn(params) {
 	const clientLease = { client };
 	let activeTurnId;
 	let activeTurnCleanup = () => void 0;
-	let retiredUnsafeClient;
+	let isolatedSubscriptionClient;
 	let turnRoute;
 	let liveThreadOwnership;
 	let ownsNativeSubscription = false;
 	let turnSucceeded = false;
+	const assertResumeInputAllowed = async () => {
+		const { thread } = await client.request("thread/read", {
+			threadId,
+			includeTurns: false
+		}, { timeoutMs: runtime.requestTimeoutMs });
+		assertCodexThreadAcceptsDirectInput(thread);
+	};
 	try {
+		if (!networkProxyBindingChanged && binding.clientId !== client.getInstanceId()) await assertResumeInputAllowed();
 		if (!params.incognito && isCodexAppServerClientRuntimeLive(client)) {
 			const ownership = await consumeCodexAppServerLiveThread(client, threadId);
 			if (ownership) {
@@ -904,24 +917,18 @@ async function runBoundTurn(params) {
 				lease: clientLease,
 				options: clientOptions,
 				run: async (requestClient, requestOptions) => await requestClient.request("thread/start", {
-					cwd: workspaceDir,
-					...modelSelection?.model ? { model: modelSelection.model } : {},
-					...modelSelection?.modelProvider ? { modelProvider: modelSelection.modelProvider } : {},
-					personality: CODEX_NATIVE_PERSONALITY_NONE,
-					approvalPolicy,
-					approvalsReviewer: modelScopedRuntime.approvalsReviewer,
-					...codexConversationSandboxOrPermissions(modelScopedRuntime, sandbox),
-					...serviceTier ? { serviceTier } : {},
+					...buildConversationThreadRequest(threadRequestRuntime, serviceTier),
 					developerInstructions: CODEX_CONVERSATION_THREAD_DEVELOPER_INSTRUCTIONS,
 					experimentalRawEvents: true,
 					...params.incognito ? { ephemeral: true } : {}
-				}, requestOptions),
+				}, requestOptions()),
 				onClientChange: (nextClient) => {
 					client = nextClient;
 				}
 			}));
 			threadId = response.thread.id;
 			ownsNativeSubscription = true;
+			assertCodexThreadAcceptsDirectInput(response.thread);
 			if (liveThreadOwnership && (liveThreadOwnership.threadId !== threadId || liveThreadOwnership.client !== client)) {
 				const previousOwnership = liveThreadOwnership;
 				try {
@@ -946,8 +953,6 @@ async function runBoundTurn(params) {
 						modelProvider: response.modelProvider ?? modelSelection?.modelProvider ?? binding.modelProvider,
 						...agentLookup
 					}),
-					approvalPolicy: typeof approvalPolicy === "string" ? approvalPolicy : void 0,
-					sandbox,
 					serviceTier: serviceTier ?? void 0,
 					networkProxyProfileName: modelScopedRuntime.networkProxy?.profileName,
 					networkProxyConfigFingerprint: modelScopedRuntime.networkProxy?.configFingerprint,
@@ -958,26 +963,24 @@ async function runBoundTurn(params) {
 			})) throw new Error("Codex conversation binding changed while rotating its thread.");
 			useStickyNetworkProfile = modelScopedRuntime.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({
 				lease: clientLease,
 				options: clientOptions,
 				run: async (requestClient, requestOptions) => await resumeCodexAppServerThread({
 					client: requestClient,
+					onSubscriptionReleased: () => {
+						isolatedSubscriptionClient = requestClient;
+					},
 					abandonClient: async () => {
-						retiredUnsafeClient = requestClient;
 						await closeCodexStartupClientBestEffort(requestClient);
+						isolatedSubscriptionClient = requestClient;
 					},
 					request: {
 						threadId,
-						...modelSelection?.model ? { model: modelSelection.model } : {},
-						...modelSelection?.modelProvider ? { modelProvider: modelSelection.modelProvider } : {},
-						personality: CODEX_NATIVE_PERSONALITY_NONE,
-						approvalPolicy,
-						approvalsReviewer: modelScopedRuntime.approvalsReviewer,
-						...codexConversationSandboxOrPermissions(modelScopedRuntime, sandbox),
-						...serviceTier ? { serviceTier } : {}
+						...buildConversationThreadRequest(threadRequestRuntime, serviceTier)
 					},
-					...requestOptions
+					requestResume: (request) => requestClient.request("thread/resume", request, requestOptions())
 				}),
 				onClientChange: (nextClient) => {
 					client = nextClient;
@@ -985,6 +988,7 @@ async function runBoundTurn(params) {
 			});
 			threadId = response.thread.id;
 			ownsNativeSubscription = true;
+			assertCodexThreadAcceptsDirectInput(response.thread);
 			if (!isSameCodexAppServerThreadOwner(binding, {
 				threadId,
 				clientId: client.getInstanceId()
@@ -1017,9 +1021,10 @@ async function runBoundTurn(params) {
 				event: params.event
 			}),
 			cwd: workspaceDir,
+			...sessionRoot ? { runtimeWorkspaceRoots: [sessionRoot] } : {},
 			approvalPolicy,
 			approvalsReviewer: modelScopedRuntime.approvalsReviewer,
-			...useStickyNetworkProfile ? {} : { sandboxPolicy: codexSandboxPolicyForTurn(sandbox, workspaceDir) },
+			...useStickyNetworkProfile ? {} : { sandboxPolicy: codexSandboxPolicyForTurn(sandbox, sessionRoot ?? workspaceDir) },
 			...modelSelection?.model ? { model: modelSelection.model } : {},
 			personality: CODEX_NATIVE_PERSONALITY_NONE,
 			...serviceTier ? { serviceTier } : {}
@@ -1036,20 +1041,30 @@ async function runBoundTurn(params) {
 		turnSucceeded = true;
 		return { reply: { text: replyText || "Codex completed without a text reply." } };
 	} catch (error) {
+		if (isCodexAppServerOverloadError(error) && error.method === "thread/resume") throw error;
+		if (error instanceof CodexThreadDirectInputError) {
+			if (params.incognito && ownsNativeSubscription) {
+				if (!await unsubscribeCodexThreadBestEffort(client, {
+					threadId,
+					timeoutMs: 5e3
+				})) await retireUnsafeCodexTurnClientBestEffort(client, "parent-owned thread unsubscribe");
+			}
+			throw error;
+		}
 		if (error instanceof CodexConversationTurnTimeoutError && activeTurnId || turnRoute && isCodexAppServerIndeterminateRequestCancellationError(error)) {
 			if (!await interruptCodexTurnAndWaitBestEffort(client, {
 				threadId,
 				turnId: activeTurnId ?? ""
 			})) {
-				retiredUnsafeClient = client;
 				await retireUnsafeCodexTurnClientBestEffort(client, "turn interrupt");
+				isolatedSubscriptionClient = client;
 			}
 		}
 		if (params.incognito) {
 			if (await params.bindingStore.mutate(identity, {
 				kind: "clear",
 				threadId
-			}) && retiredUnsafeClient !== client) {
+			}) && isolatedSubscriptionClient !== client) {
 				if (!await unsubscribeCodexThreadBestEffort(client, {
 					threadId,
 					timeoutMs: 5e3
@@ -1061,7 +1076,7 @@ async function runBoundTurn(params) {
 		activeTurnCleanup();
 		turnRoute?.release();
 		try {
-			if (ownsNativeSubscription && retiredUnsafeClient !== client && !params.incognito && isCodexAppServerClientRuntimeLive(client)) {
+			if (ownsNativeSubscription && isolatedSubscriptionClient !== client && !params.incognito && isCodexAppServerClientRuntimeLive(client)) {
 				const currentLiveThreadOwnership = liveThreadOwnership?.client === client && liveThreadOwnership.threadId === threadId ? liveThreadOwnership.ownership : void 0;
 				let retained = false;
 				if (turnSucceeded) retained = await params.bindingStore.withLease(identity, async () => {
@@ -1087,8 +1102,8 @@ async function runBoundTurn(params) {
 		}
 	}
 }
-function assertNativeConversationApprovalPolicySupported(params) {
-	if (params.approvalPolicy !== "never" && (params.execPolicy?.touched === true || params.modelBackedApprovalsReviewerUnavailable && params.approvalsReviewer === "user")) throw new Error(NATIVE_CONVERSATION_INTERACTIVE_APPROVALS_UNAVAILABLE);
+function assertNativeConversationApprovalPolicySupported(runtime) {
+	if (runtime.approvalPolicy !== "never" && runtime.approvalsReviewer === "user") throw new Error(NATIVE_CONVERSATION_INTERACTIVE_APPROVALS_UNAVAILABLE);
 }
 async function runBoundTurnWithMissingThreadRecovery(params) {
 	await prepareConversationBinding(params);
@@ -1116,11 +1131,6 @@ async function prepareConversationBinding(params, options = {}) {
 		assertCodexBindingMayBeReplaced(current, "initializing a conversation-bound Codex thread");
 		assertCodexBindingMayBeReplaced(sourceBinding, "transferring a session into a conversation-bound Codex thread");
 		const inherited = current ?? sourceBinding;
-		const execPolicy = resolveConversationExecPolicy({
-			config: params.config,
-			agentId: params.data.agentId,
-			sessionKey: params.sessionKey
-		});
 		const agentLookup = buildAgentLookup({
 			agentDir: params.data.agentDir,
 			config: params.config
@@ -1134,20 +1144,19 @@ async function prepareConversationBinding(params, options = {}) {
 			model: requested?.model ?? inherited?.model,
 			modelProvider: requested?.modelProvider ?? inherited?.modelProvider,
 			authProfileId: requested?.authProfileId ?? inherited?.authProfileId,
-			approvalPolicy: execPolicy.touched ? void 0 : inherited?.approvalPolicy,
-			sandbox: execPolicy.touched ? void 0 : inherited?.sandbox,
 			serviceTier: inherited?.serviceTier,
 			config: params.config,
-			sessionKey: params.sessionKey,
+			sessionKey: params.data.legacyBinding ? params.sessionKey : params.data.source?.sessionKey,
+			source: params.data.source,
 			incognito: params.incognito,
-			agentId: params.data.agentId
+			agentId: params.data.source?.agentId ?? params.data.agentId
 		};
 		const threadId = requested?.threadId;
 		if (threadId && !options.forceNew) await attachExistingThread({
 			...bindingParams,
 			threadId
 		});
-		else await createThread(bindingParams);
+		else await bindThread(bindingParams);
 		const stored = await params.bindingStore.read(identity);
 		if (!stored) throw new Error("Codex conversation binding disappeared while initializing its thread.");
 		if (sourceIdentity && params.data.source && !current?.conversationSourceTransferComplete) await params.bindingStore.withLease(sourceIdentity, async () => {
@@ -1187,12 +1196,13 @@ async function projectConversationSourceHistory(source, target, config) {
 		storePath
 	});
 	if (!sessionKey) return;
-	const history = projectBoundedCodexVisibleSessionHistory(await readVisibleSessionTranscriptMessageEntries({
+	const entries = await readVisibleSessionTranscriptMessageEntries({
 		agentId: source.agentId,
 		sessionId: source.sessionId,
 		sessionKey,
 		storePath
-	}));
+	});
+	const history = projectBoundedCodexVisibleSessionHistory(entries);
 	if (history.length === 0) return;
 	const clientLease = retainSharedCodexAppServerClientByInstanceId(target.clientId);
 	if (!clientLease) throw new Error("Codex conversation source history lost its bound client owner.");
@@ -1205,66 +1215,8 @@ async function projectConversationSourceHistory(source, target, config) {
 		clientLease.release();
 	}
 }
-function resolveConversationExecPolicy(params) {
-	const agentId = params.agentId ?? (params.config ? resolveSessionAgentIds$2({
-		sessionKey: params.sessionKey,
-		config: params.config
-	}).sessionAgentId : void 0);
-	return resolveOpenClawExecPolicyForCodexAppServer({
-		config: params.config,
-		agentId,
-		execOverrides: readSessionExecOverrides({
-			config: params.config,
-			agentId,
-			sessionKey: params.sessionKey
-		}),
-		approvals: loadExecApprovals()
-	});
-}
-function readSessionExecOverrides(params) {
-	const sessionKey = params.sessionKey?.trim();
-	if (!params.config || !sessionKey) return;
-	if (!canReadSessionExecOverrides({
-		config: params.config,
-		agentId: params.agentId,
-		sessionKey
-	})) return;
-	const entry = getSessionEntry({
-		storePath: resolveStorePath(params.config.session?.store, { agentId: params.agentId }),
-		sessionKey,
-		readConsistency: "latest"
-	});
-	if (!entry?.execSecurity && !entry?.execAsk) return;
-	return {
-		security: entry.execSecurity,
-		ask: entry.execAsk
-	};
-}
-function canReadSessionExecOverrides(params) {
-	const agentId = normalizeAgentIdOrDefault(params.agentId);
-	if (!agentId) return true;
-	const sessionAgentId = parseAgentIdFromSessionKey(params.sessionKey);
-	if (!sessionAgentId) return isDefaultAgentSessionKeyForAgent({
-		config: params.config,
-		agentId
-	});
-	return sessionAgentId === agentId;
-}
-function parseAgentIdFromSessionKey(sessionKey) {
-	const raw = sessionKey?.trim();
-	if (!raw) return;
-	const parts = raw.toLowerCase().split(":").filter(Boolean);
-	if (parts.length < 3 || parts[0] !== "agent" || !parts[2]) return;
-	return normalizeAgentIdOrDefault(parts[1]);
-}
-function isDefaultAgentSessionKeyForAgent(params) {
-	return normalizeAgentId(params.agentId) === tryResolveDefaultAgentId(params.config);
-}
-function normalizeAgentIdOrDefault(value) {
-	const normalized = normalizeAgentId(value);
-	return normalized === "main" && !(value ?? "").trim() ? void 0 : normalized;
-}
 function isCodexThreadNotFoundError(error) {
+	if (isCodexAppServerOverloadError(error) || isCodexAppServerUnsafeSubscriptionError(error)) return false;
 	const message = formatErrorMessage(error);
 	return /\bthread not found:/iu.test(message) || /\bbound Codex conversation has no thread binding\b/u.test(message);
 }
@@ -1435,7 +1387,8 @@ async function buildCodexOAuthCredential(source) {
 	} : null;
 }
 async function buildCodexApiKeyCredential(source) {
-	const key = normalizeOptionalString((await readJsonObject(source.authPath)).OPENAI_API_KEY);
+	const raw = await readJsonObject(source.authPath);
+	const key = normalizeOptionalString(raw.OPENAI_API_KEY);
 	if (!key) return null;
 	return {
 		kind: "api_key",
@@ -2743,7 +2696,8 @@ async function requestTargetCodexAppServerJson(params) {
 		});
 		if (hasOpenAiCuratedMarketplace(lastResponse)) return lastResponse;
 		if (Date.now() >= discoveryDeadline) return lastResponse;
-		await sleep(Math.min(TARGET_CODEX_MARKETPLACE_DISCOVERY_POLL_MS, discoveryDeadline - Date.now()));
+		const waitMs = Math.min(TARGET_CODEX_MARKETPLACE_DISCOVERY_POLL_MS, discoveryDeadline - Date.now());
+		await sleep(waitMs);
 	} while (Date.now() < discoveryDeadline);
 	return lastResponse;
 }
@@ -3298,7 +3252,8 @@ function createCodexNodeExecServerCommand() {
 			} catch {
 				throw new Error("Codex node exec-server requires a valid workspace request.");
 			}
-			const placement = parseCodexNodePlacementWorkspace(request);
+			if (!isRecord(request) || Object.keys(request).length !== 2 || request.authorization !== "human-approved" && request.authorization !== "session-full") throw new Error("Codex node exec-server requires an authorized managed placement workspace launch.");
+			const placement = parseCodexNodePlacementWorkspace(request.placement);
 			if (!context?.acquireManagedWorkspace || context.sessionKey !== placement.sessionKey || io.signal.aborted) throw new Error("Codex node exec-server requires active managed placement authority.");
 			const workspace = context.acquireManagedWorkspace({
 				workspaceDir: placement.cwd,
@@ -3310,11 +3265,14 @@ function createCodexNodeExecServerCommand() {
 			const frames = io.frames;
 			let unsubscribe;
 			try {
-				const { runCodexNodeExecServer } = await import("./node-exec-server.runtime-Bsu1LdFZ.js");
+				if (!context.prepareExecAuthorization) throw new Error("Codex node execution requires node-local exec policy support; update the node.");
+				const assertExecAuthorized = context.prepareExecAuthorization(request.authorization);
+				const { runCodexNodeExecServer } = await import("./node-exec-server.runtime-DirKVZ5h.js");
 				return await runCodexNodeExecServer({
 					workspaceDir: workspace.workspaceDir,
 					io,
 					activeProcesses,
+					assertExecAuthorized,
 					onFrameReceiver: (receiver) => {
 						unsubscribe = frames.onMessage(receiver);
 					}
@@ -3329,7 +3287,7 @@ function createCodexNodeExecServerCommand() {
 		}
 	};
 }
-/** Keeps paired-device exec-server launch behind explicit arming and one-time approval. */
+/** Keeps node launch behind command opt-in and a live Full owner or human decision. */
 function createCodexNodeExecServerInvokePolicy() {
 	return {
 		commands: [CODEX_NODE_EXEC_SERVER_COMMAND],
@@ -3339,10 +3297,10 @@ function createCodexNodeExecServerInvokePolicy() {
 			family: CODEX_NODE_EXEC_SERVER_CAPABILITY
 		}),
 		handle: async (context) => {
-			if (!context.approvals || context.risk?.level !== "high") return {
+			if (context.risk?.level !== "high") return {
 				ok: false,
 				code: "CODEX_NODE_EXEC_APPROVAL_REQUIRED",
-				message: "Codex paired-device execution requires an available approval reviewer."
+				message: "Codex node execution requires an available approval reviewer."
 			};
 			let placement;
 			try {
@@ -3351,21 +3309,60 @@ function createCodexNodeExecServerInvokePolicy() {
 				return {
 					ok: false,
 					code: "CODEX_NODE_EXEC_WORKSPACE_INVALID",
-					message: "Codex paired-device execution requires an exact managed placement workspace."
+					message: "Codex node execution requires an exact managed placement workspace."
 				};
 			}
-			const deviceName = context.node?.displayName ?? context.nodeId;
-			if ((await context.approvals.request({
-				title: "Run Codex execution on paired device",
-				description: `${deviceName}: ${placement.cwd}; allows arbitrary processes and filesystem access across the paired-device account, not only this workspace.`,
-				severity: "critical",
-				allowedDecisions: ["allow-once"]
-			})).decision !== "allow-once") return {
+			const workspace = {
+				workspaceDir: placement.cwd,
+				environmentId: placement.environmentId,
+				sessionId: placement.sessionId,
+				ownerEpoch: placement.ownerEpoch,
+				sessionKey: placement.sessionKey
+			};
+			const fullLaunch = await context.invokeNodeWithSessionFull?.({
+				workspace,
+				createParams: () => ({
+					placement,
+					authorization: "session-full"
+				})
+			});
+			if (fullLaunch) return fullLaunch;
+			if (!context.approvals) return {
 				ok: false,
-				code: "CODEX_NODE_EXEC_APPROVAL_DENIED",
-				message: "Codex paired-device execution requires one-time approval."
+				code: "CODEX_NODE_EXEC_APPROVAL_REQUIRED",
+				message: "Codex node execution requires an available approval reviewer."
 			};
-			return await context.invokeNode({ params: placement });
+			const nodeName = context.node?.displayName ?? context.nodeId;
+			const approval = await context.approvals.request({
+				title: "Run Codex execution on node",
+				description: `Allows arbitrary processes and filesystem access across the node account, not only this workspace. ${nodeName}: ${placement.cwd}`,
+				severity: "critical",
+				allowedDecisions: ["allow-once"]
+			});
+			if (approval.decision !== "allow-once") {
+				if (approval.decision === "deny") return {
+					ok: false,
+					code: "CODEX_NODE_EXEC_APPROVAL_DENIED",
+					message: "Codex node execution was denied. Retry the action and choose Allow once to continue."
+				};
+				if (approval.decision === "allow-always") return {
+					ok: false,
+					code: "CODEX_NODE_EXEC_APPROVAL_INVALID",
+					message: "Codex node execution cannot use permanent approval. Retry the action and choose Allow once."
+				};
+				return {
+					ok: false,
+					code: "CODEX_NODE_EXEC_APPROVAL_EXPIRED",
+					message: "Codex node execution approval expired before a decision. Retry the action and approve the new request."
+				};
+			}
+			return await context.invokeNode({
+				workspace,
+				params: {
+					placement,
+					authorization: "human-approved"
+				}
+			});
 		}
 	};
 }
@@ -4151,7 +4148,7 @@ function createCodexSupervisionTools(options) {
 }
 //#endregion
 //#region extensions/codex/src/web-search-provider.ts
-const loadCodexWebSearchRuntime = createLazyRuntimeModule(() => import("./web-search-provider.runtime-DCdx4DGu.js"));
+const loadCodexWebSearchRuntime = createLazyRuntimeModule(() => import("./web-search-provider.runtime-BEmlE7ov.js"));
 const CodexWebSearchSchema = {
 	type: "object",
 	properties: { query: {
@@ -4187,8 +4184,7 @@ const ENDED_SESSION_REASONS = /* @__PURE__ */ new Set([
 	"new",
 	"reset",
 	"idle",
-	"daily",
-	"deleted"
+	"daily"
 ]);
 var codex_default = definePluginEntry({
 	id: "codex",
@@ -4211,7 +4207,10 @@ var codex_default = definePluginEntry({
 			return livePluginConfig;
 		};
 		const resolveCurrentPluginConfig = () => resolvePluginConfig(resolveCurrentConfig);
-		if (readCodexPluginConfig(resolveCurrentPluginConfig()).appServer?.transport === "websocket") api.registerService(createCodexAppServerConnectionHealthService({
+		const appServerConfig = readCodexPluginConfig(resolveCurrentPluginConfig()).appServer;
+		api.registerService(createCodexDesktopGenerationService({ onGenerationChange: retireSharedCodexAppServerClientsBeforeDesktopGeneration }));
+		api.registerService(createCodexAppServerProcessReaperService());
+		if (appServerConfig?.transport === "websocket") api.registerService(createCodexAppServerConnectionHealthService({
 			getPluginConfig: resolveCurrentPluginConfig,
 			getRuntimeConfig: resolveCurrentConfig
 		}));
@@ -4223,9 +4222,10 @@ var codex_default = definePluginEntry({
 			overflowPolicy: "reject-new"
 		});
 		const lazyBindingStateStore = {
-			delete: (key) => openBindingStateStore().delete(key),
+			deleteIf: (key, predicate) => openBindingStateStore().deleteIf(key, predicate),
 			entries: () => openBindingStateStore().entries(),
 			lookup: (key) => openBindingStateStore().lookup(key),
+			registerIfAbsent: (key, value, options) => openBindingStateStore().registerIfAbsent(key, value, options),
 			get update() {
 				const store = openBindingStateStore();
 				return store.update?.bind(store);
@@ -4238,10 +4238,12 @@ var codex_default = definePluginEntry({
 		});
 		const bindingStore = createLazyCodexAppServerBindingStore(lazyBindingStateStore, {
 			entries: () => openManagedThreadStateStore().entries(),
+			lookup: (key) => openManagedThreadStateStore().lookup(key),
 			registerIfAbsent: (key, value) => openManagedThreadStateStore().registerIfAbsent(key, value)
 		});
 		registerCodexCliMetadata(api);
 		const sessionCatalogControlFactory = createCodexSessionCatalogControl({
+			managedThreads: bindingStore.managedThreads,
 			config: api.config,
 			getPluginConfig: resolveCurrentPluginConfig,
 			getRuntimeConfig: resolveCurrentConfig
@@ -4381,7 +4383,7 @@ var codex_default = definePluginEntry({
 			if (!previousSessionId || !sessionId || previousSessionId === sessionId) return;
 			const config = resolveCurrentConfig();
 			const sessionKey = ctx.sessionKey?.trim();
-			const { sessionBindingIdentity } = await import("./session-binding-BTrLf9Qm.js").then((n) => n.f);
+			const { sessionBindingIdentity } = await import("./session-binding-D0zinCP1.js").then((n) => n.f);
 			const identity = sessionBindingIdentity({
 				sessionId,
 				...sessionKey ? { sessionKey } : {},
@@ -4399,7 +4401,7 @@ var codex_default = definePluginEntry({
 			if (endedSessionKey && nextSessionKey && nextSessionKey !== endedSessionKey) return;
 			if (event.nextSessionId?.trim() === event.sessionId.trim()) return;
 			const config = resolveCurrentConfig();
-			const [{ sessionBindingIdentity }, { retireCodexAppServerSessionGeneration }] = await Promise.all([import("./session-binding-BTrLf9Qm.js").then((n) => n.f), import("./session-retirement-CE4iMiLh.js")]);
+			const [{ sessionBindingIdentity }, { retireCodexAppServerSessionGeneration }] = await Promise.all([import("./session-binding-D0zinCP1.js").then((n) => n.f), import("./session-retirement-CtUtUTr9.js")]);
 			await retireCodexAppServerSessionGeneration({
 				bindingStore,
 				identity: sessionBindingIdentity({