@openclaw/codex 2026.8.1-beta.3 → 2026.9.1-beta.1

package/dist/index.js

@@ -1,30 +1,30 @@
 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-Csz0F-DK.js";
+import { D as readCodexRequirementsToml, _ as CODEX_PLUGINS_MARKETPLACE_NAME, c as assertCodexAppServerConnectionSecurity, h as readCodexPluginConfig, i as resolveCodexAppServerRuntimeOptions, j as resolveOpenClawExecPolicyForCodexAppServer, n as codexSandboxPolicyForTurn, s as resolveCodexSupervisionAppServerRuntimeOptions, t as codexAppServerStartOptionsKey, x as canUseCodexModelBackedApprovalsReviewerForModel } from "./config-giW8X0QA.js";
+import { $ as releaseCodexAppServerLiveThread, C as createCodexDesktopGenerationService, H as isUnsupportedCodexAppServerVersionError, J as consumeCodexAppServerLiveThread, R as isCodexAppServerIndeterminateRequestCancellationError, X as isCodexAppServerClientRuntimeLive, Z as isCodexAppServerLiveThreadClaimed, ct as resolveCodexAppServerAuthAccountCacheKey, dt as resolveCodexAppServerFallbackApiKeyCacheKey, f as releaseCodexAppServerClientLease, h as retainSharedCodexAppServerClientByInstanceId, ht as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS, i as clearSharedCodexAppServerClientIfCurrentAndWait, o as getLeasedSharedCodexAppServerClient, p as releaseLeasedSharedCodexAppServerClient, ut as resolveCodexAppServerAuthProfileIdForAgent, v as retireSharedCodexAppServerClientsBeforeDesktopGeneration, vt as isJsonObject, x as withLeasedCodexAppServerClientStartSelectionRetry } from "./shared-client-DKz23hHY.js";
+import { i as setManagedCodexPluginRoot } from "./managed-binary-DFYK4DWq.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 { d as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced, o as isCodexAppServerNativeAuthProfile, s as normalizeCodexAppServerBindingModelProvider } from "./session-binding-Bcynfd-_.js";
+import { a as closeCodexStartupClientBestEffort, d as unsubscribeCodexThreadBestEffort, h as isCodexNotificationForTurn, o as interruptCodexTurnAndWaitBestEffort, p as getCodexAppServerTurnRouter, u as retireUnsafeCodexTurnClientBestEffort } from "./attempt-client-cleanup-bfsmcQ6m.js";
+import { s as isAssistantCommentaryCompletionNotification } from "./event-projector-usage-Bk1I90Bg.js";
+import { a as assertCodexThreadStartResponse } from "./protocol-validators-VeJxxJ0U.js";
+import { o as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-C1CAdfcP.js";
+import { B as resolveCodexAppServerRequestModelSelection, Et as pluginReadParams, G as CODEX_MANAGED_THREAD_MAX_ENTRIES, K as CODEX_MANAGED_THREAD_NAMESPACE, L as buildCodexProjectDocThreadConfig, R as CODEX_NATIVE_PERSONALITY_NONE, St as ensureCodexPluginActivation, bt as mergeCodexThreadConfigs, q as createCodexManagedThreadStore, vt as buildDisabledAppsConfigPatch, wt as isOpenAiCuratedMarketplace } from "./thread-lifecycle-L7oEkTlq.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 { t as resumeCodexAppServerThread } from "./thread-resume-BE9qNEW0.js";
+import { d as projectBoundedCodexVisibleSessionHistory } from "./transcript-mirror-DsCMWBca.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 { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-BRMh0aIq.js";
+import { r as formatCodexDisplayText } from "./command-formatters-DEsIufkt.js";
+import { a as resolveCodexAppServerForModelProvider, i as resolveCodexSessionPermissionCwd, n as applyCodexSessionPermissionPolicy, t as CODEX_SESSION_PERMISSION_EXEC_MODES } from "./session-permission-policy-BrNH1bjy.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 { f as trackCodexConversationActiveTurn, g as canMutateCodexHost, h as CODEX_NATIVE_EXECUTION_AUTH_ERROR, t as discoverCodexMarketplacePlugins } from "./plugin-marketplace-discovery-B9DvaAG-.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 resolveCodexBindingAppServerConnection } from "./binding-connection-BMvPX73o.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-DaLKVtpH.js";
+import { i as withCodexAppServerJsonClient, r as requestCodexAppServerJson } from "./request-DXXGHko0.js";
+import { t as codexControlRequest } from "./command-rpc-CCeCkf_v.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,14 +37,13 @@ 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 { resolveSessionAgentIds as resolveSessionAgentIds$2 } 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 { 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 { readVisibleSessionTranscriptMessageEntries } from "openclaw/plugin-sdk/session-transcript-runtime";
 import { getSessionBindingService } from "openclaw/plugin-sdk/conversation-binding-runtime";
@@ -185,7 +184,7 @@ 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-Bcynfd-_.js").then((n) => n.f).then(({ createCodexAppServerBindingStore }) => createCodexAppServerBindingStore(state));
 	const managedThreads = managedThreadState ? createCodexManagedThreadStore(managedThreadState) : void 0;
 	return {
 		...managedThreads ? { managedThreads } : {},
@@ -215,7 +214,7 @@ async function handleCodexCommand(ctx, options) {
 	}
 }
 async function loadDefaultCodexSubcommandHandler() {
-	const { handleCodexSubcommand } = await import("./command-handlers-DC86lgT4.js");
+	const { handleCodexSubcommand } = await import("./command-handlers-D_-1_qRp.js");
 	return handleCodexSubcommand;
 }
 //#endregion
@@ -416,26 +415,73 @@ function readLocalMediaPath(value) {
 const DEFAULT_BOUND_TURN_TIMEOUT_MS = 20 * 6e4;
 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 ? resolveSessionAgentIds$2({
+		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
 		})
 	};
 }
@@ -476,8 +522,6 @@ async function startCodexConversationThread(params) {
 		model: params.model,
 		modelProvider: params.modelProvider,
 		authProfileId,
-		approvalPolicy: params.approvalPolicy,
-		sandbox: params.sandbox,
 		serviceTier: params.serviceTier,
 		config: params.config,
 		sessionKey: params.sessionKey,
@@ -493,8 +537,6 @@ async function startCodexConversationThread(params) {
 		model: params.model,
 		modelProvider: params.modelProvider,
 		authProfileId,
-		approvalPolicy: params.approvalPolicy,
-		sandbox: params.sandbox,
 		serviceTier: params.serviceTier,
 		config: params.config,
 		sessionKey: params.sessionKey,
@@ -639,11 +681,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,18 +700,7 @@ 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,
@@ -677,8 +709,8 @@ async function resolveThreadBindingRuntime(params) {
 	};
 	const client = await getLeasedSharedCodexAppServerClient(clientOptions);
 	return {
-		execPolicy,
 		runtime: modelScopedRuntime,
+		workspaceDir,
 		agentLookup,
 		model: modelSelection?.model,
 		modelProvider: modelSelection?.modelProvider ?? modelProvider,
@@ -689,11 +721,11 @@ async function resolveThreadBindingRuntime(params) {
 }
 function buildThreadRequestRuntimeOptions(params, resolved) {
 	const serviceTier = params.serviceTier ?? resolved.runtime.serviceTier;
-	const sandbox = resolved.execPolicy?.touched ? resolved.runtime.sandbox : params.sandbox ?? resolved.runtime.sandbox;
 	return {
-		approvalPolicy: resolved.execPolicy?.touched ? resolved.runtime.approvalPolicy : params.approvalPolicy ?? resolved.runtime.approvalPolicy,
+		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 } : {}
 	};
 }
@@ -711,7 +743,7 @@ async function requestNewConversationBindingThread(params, resolved) {
 		lease: resolved.clientLease,
 		options: resolved.clientOptions,
 		run: async (client, requestOptions) => await client.request("thread/start", {
-			cwd: params.workspaceDir,
+			cwd: resolved.workspaceDir,
 			...resolved.model ? { model: resolved.model } : {},
 			...resolved.modelProvider ? { modelProvider: resolved.modelProvider } : {},
 			personality: CODEX_NATIVE_PERSONALITY_NONE,
@@ -728,7 +760,6 @@ async function requestNewConversationBindingThread(params, resolved) {
 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,
@@ -746,7 +777,7 @@ async function writeThreadBindingFromResponse(params, resolved, response) {
 			binding: {
 				threadId: response.thread.id,
 				clientId: resolved.client.getInstanceId(),
-				cwd: params.workspaceDir,
+				cwd: resolved.workspaceDir,
 				authProfileId: params.authProfileId,
 				model: response.model ?? resolved.model ?? params.model,
 				modelProvider: normalizeCodexAppServerBindingModelProvider({
@@ -754,8 +785,6 @@ 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
@@ -784,6 +813,7 @@ async function attachExistingThread(params) {
 						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,
+							cwd: resolved.workspaceDir,
 							...resolved.model ? { model: resolved.model } : {},
 							...resolved.modelProvider ? { modelProvider: resolved.modelProvider } : {},
 							personality: CODEX_NATIVE_PERSONALITY_NONE,
@@ -821,18 +851,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,27 +876,15 @@ 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,
@@ -905,6 +924,7 @@ async function runBoundTurn(params) {
 				options: clientOptions,
 				run: async (requestClient, requestOptions) => await requestClient.request("thread/start", {
 					cwd: workspaceDir,
+					...sessionRoot ? { runtimeWorkspaceRoots: [sessionRoot] } : {},
 					...modelSelection?.model ? { model: modelSelection.model } : {},
 					...modelSelection?.modelProvider ? { modelProvider: modelSelection.modelProvider } : {},
 					personality: CODEX_NATIVE_PERSONALITY_NONE,
@@ -946,8 +966,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,
@@ -969,6 +987,8 @@ async function runBoundTurn(params) {
 					},
 					request: {
 						threadId,
+						cwd: workspaceDir,
+						...sessionRoot ? { runtimeWorkspaceRoots: [sessionRoot] } : {},
 						...modelSelection?.model ? { model: modelSelection.model } : {},
 						...modelSelection?.modelProvider ? { modelProvider: modelSelection.modelProvider } : {},
 						personality: CODEX_NATIVE_PERSONALITY_NONE,
@@ -1017,9 +1037,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 } : {}
@@ -1087,8 +1108,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 +1137,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,13 +1150,12 @@ 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({
@@ -1205,65 +1220,6 @@ 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) {
 	const message = formatErrorMessage(error);
 	return /\bthread not found:/iu.test(message) || /\bbound Codex conversation has no thread binding\b/u.test(message);
@@ -3310,7 +3266,7 @@ function createCodexNodeExecServerCommand() {
 			const frames = io.frames;
 			let unsubscribe;
 			try {
-				const { runCodexNodeExecServer } = await import("./node-exec-server.runtime-Bsu1LdFZ.js");
+				const { runCodexNodeExecServer } = await import("./node-exec-server.runtime-BpWqJO1V.js");
 				return await runCodexNodeExecServer({
 					workspaceDir: workspace.workspaceDir,
 					io,
@@ -3329,7 +3285,7 @@ function createCodexNodeExecServerCommand() {
 		}
 	};
 }
-/** Keeps paired-device exec-server launch behind explicit arming and one-time approval. */
+/** Keeps node exec-server launch behind explicit arming and one-time approval. */
 function createCodexNodeExecServerInvokePolicy() {
 	return {
 		commands: [CODEX_NODE_EXEC_SERVER_COMMAND],
@@ -3342,7 +3298,7 @@ function createCodexNodeExecServerInvokePolicy() {
 			if (!context.approvals || 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,19 +3307,19 @@ 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;
+			const nodeName = 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.`,
+				title: "Run Codex execution on node",
+				description: `${nodeName}: ${placement.cwd}; allows arbitrary processes and filesystem access across the node account, not only this workspace.`,
 				severity: "critical",
 				allowedDecisions: ["allow-once"]
 			})).decision !== "allow-once") return {
 				ok: false,
 				code: "CODEX_NODE_EXEC_APPROVAL_DENIED",
-				message: "Codex paired-device execution requires one-time approval."
+				message: "Codex node execution requires one-time approval."
 			};
 			return await context.invokeNode({ params: placement });
 		}
@@ -4151,7 +4107,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-ClaNPV7N.js"));
 const CodexWebSearchSchema = {
 	type: "object",
 	properties: { query: {
@@ -4211,7 +4167,9 @@ 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 }));
+		if (appServerConfig?.transport === "websocket") api.registerService(createCodexAppServerConnectionHealthService({
 			getPluginConfig: resolveCurrentPluginConfig,
 			getRuntimeConfig: resolveCurrentConfig
 		}));
@@ -4381,7 +4339,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-Bcynfd-_.js").then((n) => n.f);
 			const identity = sessionBindingIdentity({
 				sessionId,
 				...sessionKey ? { sessionKey } : {},
@@ -4399,7 +4357,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-Bcynfd-_.js").then((n) => n.f), import("./session-retirement-CcNC3YSY.js")]);
 			await retireCodexAppServerSessionGeneration({
 				bindingStore,
 				identity: sessionBindingIdentity({

package/dist/{isolated-completion-DPMtlH9r.js → isolated-completion-Cv6FqygM.js}

@@ -1,7 +1,7 @@
-import { h as readCodexPluginConfig, r as resolveCodexAppServerHomeScope } from "./config-CpNeo5AE.js";
-import { at as resolveCodexAppServerPreparedAuthHandoff, ut as isJsonObject } from "./shared-client-Dw-rzii0.js";
-import { t as runBoundedCodexAppServerTurn } from "./bounded-turn-4BjrZEwW.js";
-import { i as createAttributedCodexAssistantMessage } from "./event-projector-assistant-message-BwxV4d6N.js";
+import { h as readCodexPluginConfig, r as resolveCodexAppServerHomeScope } from "./config-giW8X0QA.js";
+import { pt as resolveCodexAppServerPreparedAuthHandoff, vt as isJsonObject } from "./shared-client-DKz23hHY.js";
+import { t as runBoundedCodexAppServerTurn } from "./bounded-turn-B7iBUcuP.js";
+import { a as createAttributedCodexAssistantMessage } from "./event-projector-assistant-message-C5-Ds8mA.js";
 //#region extensions/codex/src/app-server/isolated-completion.ts
 const ISOLATED_PASSIVE_ITEM_TYPES = /* @__PURE__ */ new Set(["agentMessage", "reasoning"]);
 function assertIsolatedCompletionItems(items, prompt) {