@openclaw/codex 2026.5.16-beta.4 → 2026.5.16-beta.6

package/dist/{command-handlers-jZV_1Ks9.js → command-handlers-DcoFMn4e.js}

@@ -4,11 +4,11 @@ import { t as isJsonObject } from "./protocol-C9UWI98H.js";
 import { i as describeControlFailure, r as CODEX_CONTROL_METHODS, t as requestCodexAppServerJson } from "./request-XPjLayGw.js";
 import { a as formatComputerUseStatus, c as formatThreads, i as formatCodexStatus, l as readString$1, n as formatAccount, o as formatList, p as summarizeCodexAccountUsage, r as formatCodexDisplayText, s as formatModels, t as buildHelp } from "./command-formatters-BRW7_Nu7.js";
 import { i as readCodexAppServerBinding, o as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-DqApZIgD.js";
-import { _ as steerCodexConversationTurn, b as readCodexConversationBindingData, d as parseCodexFastModeArg, f as parseCodexPermissionsModeArg, g as setCodexConversationPermissions, h as setCodexConversationModel, l as startCodexConversationThread, m as setCodexConversationFastMode, p as readCodexConversationActiveTurn, r as formatCodexCliSessions, u as formatPermissionsMode, v as stopCodexConversationTurn, x as resolveCodexDefaultWorkspaceDir, y as createCodexCliNodeConversationBindingData } from "./node-cli-sessions-BKhlcAB9.js";
+import { _ as steerCodexConversationTurn, b as readCodexConversationBindingData, d as parseCodexFastModeArg, f as parseCodexPermissionsModeArg, g as setCodexConversationPermissions, h as setCodexConversationModel, l as startCodexConversationThread, m as setCodexConversationFastMode, p as readCodexConversationActiveTurn, r as formatCodexCliSessions, u as formatPermissionsMode, v as stopCodexConversationTurn, x as resolveCodexDefaultWorkspaceDir, y as createCodexCliNodeConversationBindingData } from "./node-cli-sessions-C9rlYMPw.js";
 import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-UJ3dxrXF.js";
 import { n as rememberCodexRateLimits } from "./rate-limit-cache-dvhq-4pi.js";
 import crypto from "node:crypto";
-import { ensureAuthProfileStore, findNormalizedProviderValue, resolveAuthProfileEligibility, resolveAuthProfileOrder, resolveDefaultAgentDir, resolveProfileUnusableUntilForDisplay } from "openclaw/plugin-sdk/agent-runtime";
+import { ensureAuthProfileStore, findNormalizedProviderValue, resolveAgentDir, resolveAuthProfileEligibility, resolveAuthProfileOrder, resolveDefaultAgentDir, resolveProfileUnusableUntilForDisplay, resolveSessionAgentIds } from "openclaw/plugin-sdk/agent-runtime";
 //#region extensions/codex/src/command-account.ts
 const OPENAI_PROVIDER_ID = "openai";
 const OPENAI_CODEX_PROVIDER_ID = "openai-codex";
@@ -308,6 +308,7 @@ async function codexControlRequest(pluginConfig, method, requestParams, options
 		startOptions: runtime.start,
 		config: options.config,
 		authProfileId: options.authProfileId,
+		agentDir: options.agentDir,
 		isolated: options.isolated
 	});
 }
@@ -466,20 +467,28 @@ async function bindConversation(deps, ctx, pluginConfig, args) {
 	const parsed = parseBindArgs(args);
 	if (parsed.help) return { text: "Usage: /codex bind [thread-id] [--cwd <path>] [--model <model>] [--provider <provider>]" };
 	if (!ctx.sessionFile) return { text: "Cannot bind Codex because this command did not include an OpenClaw session file." };
+	const scope = resolveCodexConversationControlScope(ctx);
 	const workspaceDir = parsed.cwd ?? deps.resolveCodexDefaultWorkspaceDir(pluginConfig);
-	const authProfileId = (await deps.readCodexAppServerBinding(ctx.sessionFile))?.authProfileId;
+	const authProfileId = (await deps.readCodexAppServerBinding(ctx.sessionFile, {
+		agentDir: scope.agentDir,
+		config: ctx.config
+	}))?.authProfileId;
 	const startParams = {
 		pluginConfig,
 		config: ctx.config,
 		sessionFile: ctx.sessionFile,
 		workspaceDir,
+		agentDir: scope.agentDir,
 		threadId: parsed.threadId,
 		model: parsed.model,
 		modelProvider: parsed.provider
 	};
 	if (authProfileId) startParams.authProfileId = authProfileId;
 	const data = await deps.startCodexConversationThread(startParams);
-	const threadId = (await deps.readCodexAppServerBinding(ctx.sessionFile))?.threadId ?? parsed.threadId ?? "new thread";
+	const threadId = (await deps.readCodexAppServerBinding(ctx.sessionFile, {
+		agentDir: scope.agentDir,
+		config: ctx.config
+	}))?.threadId ?? parsed.threadId ?? "new thread";
 	const summary = `Codex app-server thread ${formatCodexDisplayText(threadId)} in ${formatCodexDisplayText(workspaceDir)}`;
 	let request;
 	try {
@@ -516,7 +525,10 @@ async function describeConversationBinding(deps, ctx) {
 		`- Workspace: ${formatCodexDisplayText(data.cwd ?? "unknown")}`,
 		"- Active run: not tracked"
 	].join("\n");
-	const threadBinding = await deps.readCodexAppServerBinding(data.sessionFile);
+	const threadBinding = await deps.readCodexAppServerBinding(data.sessionFile, {
+		agentDir: data.agentDir,
+		config: ctx.config
+	});
 	const active = deps.readCodexConversationActiveTurn(data.sessionFile);
 	return [
 		"Codex conversation binding:",
@@ -590,67 +602,98 @@ async function bindCodexCliNodeSession(deps, ctx, parsed) {
 	return formatCodexDisplayText(request.message);
 }
 async function stopConversationTurn(deps, ctx, pluginConfig) {
-	const sessionFile = await resolveControlSessionFile(ctx);
-	if (!sessionFile) return "Cannot stop Codex because this command did not include an OpenClaw session file.";
+	const target = await resolveControlTarget(ctx);
+	if (!target) return "Cannot stop Codex because this command did not include an OpenClaw session file.";
 	return (await deps.stopCodexConversationTurn({
-		sessionFile,
-		pluginConfig
+		sessionFile: target.sessionFile,
+		pluginConfig,
+		agentDir: target.agentDir,
+		config: ctx.config
 	})).message;
 }
 async function steerConversationTurn(deps, ctx, pluginConfig, message) {
-	const sessionFile = await resolveControlSessionFile(ctx);
-	if (!sessionFile) return "Cannot steer Codex because this command did not include an OpenClaw session file.";
+	const target = await resolveControlTarget(ctx);
+	if (!target) return "Cannot steer Codex because this command did not include an OpenClaw session file.";
 	return (await deps.steerCodexConversationTurn({
-		sessionFile,
+		sessionFile: target.sessionFile,
 		pluginConfig,
-		message
+		message,
+		agentDir: target.agentDir,
+		config: ctx.config
 	})).message;
 }
 async function setConversationModel(deps, ctx, pluginConfig, args) {
 	if (args.length > 1) return "Usage: /codex model <model>";
-	const sessionFile = await resolveControlSessionFile(ctx);
-	if (!sessionFile) return "Cannot set Codex model because this command did not include an OpenClaw session file.";
+	const target = await resolveControlTarget(ctx);
+	if (!target) return "Cannot set Codex model because this command did not include an OpenClaw session file.";
 	const [model = ""] = args;
 	const normalized = model.trim();
 	if (!normalized) {
-		const binding = await deps.readCodexAppServerBinding(sessionFile);
+		const binding = await deps.readCodexAppServerBinding(target.sessionFile, {
+			agentDir: target.agentDir,
+			config: ctx.config
+		});
 		return binding?.model ? `Codex model: ${formatCodexDisplayText(binding.model)}` : "Usage: /codex model <model>";
 	}
 	return await deps.setCodexConversationModel({
-		sessionFile,
+		sessionFile: target.sessionFile,
 		pluginConfig,
-		model: normalized
+		model: normalized,
+		agentDir: target.agentDir,
+		config: ctx.config
 	});
 }
 async function setConversationFastMode(deps, ctx, pluginConfig, args) {
 	if (args.length > 1) return "Usage: /codex fast [on|off|status]";
-	const sessionFile = await resolveControlSessionFile(ctx);
-	if (!sessionFile) return "Cannot set Codex fast mode because this command did not include an OpenClaw session file.";
+	const target = await resolveControlTarget(ctx);
+	if (!target) return "Cannot set Codex fast mode because this command did not include an OpenClaw session file.";
 	const value = args[0];
 	const parsed = parseCodexFastModeArg(value);
 	if (value && parsed == null && value.trim().toLowerCase() !== "status") return "Usage: /codex fast [on|off|status]";
 	return await deps.setCodexConversationFastMode({
-		sessionFile,
+		sessionFile: target.sessionFile,
 		pluginConfig,
-		enabled: parsed
+		enabled: parsed,
+		agentDir: target.agentDir,
+		config: ctx.config
 	});
 }
 async function setConversationPermissions(deps, ctx, pluginConfig, args) {
 	if (args.length > 1) return "Usage: /codex permissions [default|yolo|status]";
-	const sessionFile = await resolveControlSessionFile(ctx);
-	if (!sessionFile) return "Cannot set Codex permissions because this command did not include an OpenClaw session file.";
+	const target = await resolveControlTarget(ctx);
+	if (!target) return "Cannot set Codex permissions because this command did not include an OpenClaw session file.";
 	const value = args[0];
 	const parsed = parseCodexPermissionsModeArg(value);
 	if (value && !parsed && value.trim().toLowerCase() !== "status") return "Usage: /codex permissions [default|yolo|status]";
 	return await deps.setCodexConversationPermissions({
-		sessionFile,
+		sessionFile: target.sessionFile,
 		pluginConfig,
-		mode: parsed
+		mode: parsed,
+		agentDir: target.agentDir,
+		config: ctx.config
 	});
 }
-async function resolveControlSessionFile(ctx) {
+async function resolveControlTarget(ctx) {
 	const data = readCodexConversationBindingData(await ctx.getCurrentConversationBinding());
-	return data?.kind === "codex-app-server-session" ? data.sessionFile : ctx.sessionFile;
+	const scope = resolveCodexConversationControlScope(ctx);
+	if (data?.kind === "codex-app-server-session") return {
+		sessionFile: data.sessionFile,
+		agentDir: data.agentDir ?? scope.agentDir
+	};
+	return ctx.sessionFile ? {
+		sessionFile: ctx.sessionFile,
+		agentDir: scope.agentDir
+	} : void 0;
+}
+async function resolveControlSessionFile(ctx) {
+	return (await resolveControlTarget(ctx))?.sessionFile;
+}
+function resolveCodexConversationControlScope(ctx) {
+	const { sessionAgentId } = resolveSessionAgentIds({
+		sessionKey: ctx.sessionKey,
+		config: ctx.config
+	});
+	return { agentDir: resolveAgentDir(ctx.config, sessionAgentId) };
 }
 async function handleCodexDiagnosticsFeedback(deps, ctx, pluginConfig, args, commandPrefix) {
 	if (ctx.senderIsOwner !== true) return { text: "Only an owner can send Codex diagnostics." };
@@ -1120,15 +1163,26 @@ function normalizeCodexDiagnosticsScopeField(value) {
 }
 async function startThreadAction(deps, ctx, pluginConfig, method, label, args) {
 	if (args.length > 0) return `Usage: /codex ${label === "compaction" ? "compact" : label}`;
-	const sessionFile = await resolveControlSessionFile(ctx);
-	if (!sessionFile) return `Cannot start Codex ${label} because this command did not include an OpenClaw session file.`;
-	const binding = await deps.readCodexAppServerBinding(sessionFile);
+	const target = await resolveControlTarget(ctx);
+	if (!target) return `Cannot start Codex ${label} because this command did not include an OpenClaw session file.`;
+	const binding = await deps.readCodexAppServerBinding(target.sessionFile, {
+		agentDir: target.agentDir,
+		config: ctx.config
+	});
 	if (!binding?.threadId) return `No Codex thread is attached to this OpenClaw session yet.`;
 	if (method === CODEX_CONTROL_METHODS.review) await deps.codexControlRequest(pluginConfig, method, {
 		threadId: binding.threadId,
 		target: { type: "uncommittedChanges" }
+	}, {
+		agentDir: target.agentDir,
+		authProfileId: binding.authProfileId,
+		config: ctx.config
+	});
+	else await deps.codexControlRequest(pluginConfig, method, { threadId: binding.threadId }, {
+		agentDir: target.agentDir,
+		authProfileId: binding.authProfileId,
+		config: ctx.config
 	});
-	else await deps.codexControlRequest(pluginConfig, method, { threadId: binding.threadId });
 	return `Started Codex ${label} for thread ${formatCodexDisplayText(binding.threadId)}.`;
 }
 function splitArgs(value) {

package/dist/harness.js

@@ -18,15 +18,18 @@ function createCodexAppServerAgentHarness(options) {
 			};
 		},
 		runAttempt: async (params) => {
-			const { runCodexAppServerAttempt } = await import("./run-attempt-DMKAwtUV.js");
+			const { runCodexAppServerAttempt } = await import("./run-attempt-D6sdcUE0.js");
 			return runCodexAppServerAttempt(params, {
 				pluginConfig: options?.pluginConfig,
 				nativeHookRelay: { enabled: true }
 			});
 		},
 		runSideQuestion: async (params) => {
-			const { runCodexAppServerSideQuestion } = await import("./side-question-BYYJZq23.js");
-			return runCodexAppServerSideQuestion(params, { pluginConfig: options?.pluginConfig });
+			const { runCodexAppServerSideQuestion } = await import("./side-question-BzVnOoBU.js");
+			return runCodexAppServerSideQuestion(params, {
+				pluginConfig: options?.pluginConfig,
+				nativeHookRelay: { enabled: true }
+			});
 		},
 		compact: async (params) => {
 			const { maybeCompactCodexAppServerSession } = await import("./compact-UKyG6Pw2.js");

package/dist/index.js

@@ -5,7 +5,7 @@ import { buildCodexProvider } from "./provider.js";
 import { i as describeControlFailure, n as buildCodexPluginAppCacheKey, t as requestCodexAppServerJson } from "./request-XPjLayGw.js";
 import { r as formatCodexDisplayText } from "./command-formatters-BRW7_Nu7.js";
 import { c as resolveCodexAppServerAuthAccountCacheKey, d as resolveCodexAppServerEnvApiKeyCacheKey, i as getSharedCodexAppServerClient, n as clearSharedCodexAppServerClientIfCurrentAndWait, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-DlvmoLBJ.js";
-import { a as resolveCodexCliSessionForBindingOnNode, c as handleCodexConversationInboundClaim, i as listCodexCliSessionsOnNode, n as createCodexCliSessionNodeInvokePolicies, o as resumeCodexCliSessionOnNode, s as handleCodexConversationBindingResolved, t as createCodexCliSessionNodeHostCommands } from "./node-cli-sessions-BKhlcAB9.js";
+import { a as resolveCodexCliSessionForBindingOnNode, c as handleCodexConversationInboundClaim, i as listCodexCliSessionsOnNode, n as createCodexCliSessionNodeInvokePolicies, o as resumeCodexCliSessionOnNode, s as handleCodexConversationBindingResolved, t as createCodexCliSessionNodeHostCommands } from "./node-cli-sessions-C9rlYMPw.js";
 import { a as defaultCodexAppInventoryCache, n as pluginReadParams, t as ensureCodexPluginActivation } from "./plugin-activation-B49xb7pI.js";
 import { resolveLivePluginConfigObject } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
@@ -38,7 +38,7 @@ async function handleCodexCommand(ctx, options = {}) {
 	}
 }
 async function loadDefaultCodexSubcommandHandler() {
-	const { handleCodexSubcommand } = await import("./command-handlers-jZV_1Ks9.js");
+	const { handleCodexSubcommand } = await import("./command-handlers-DcoFMn4e.js");
 	return handleCodexSubcommand;
 }
 //#endregion

package/dist/{node-cli-sessions-BKhlcAB9.js → node-cli-sessions-C9rlYMPw.js}

@@ -16,11 +16,13 @@ import { resolvePreferredOpenClawTmpDir } from "openclaw/plugin-sdk/temp-path";
 //#region extensions/codex/src/conversation-binding-data.ts
 const BINDING_DATA_VERSION = 1;
 function createCodexConversationBindingData(params) {
+	const agentDir = params.agentDir?.trim();
 	return {
 		kind: "codex-app-server-session",
 		version: BINDING_DATA_VERSION,
 		sessionFile: params.sessionFile,
-		workspaceDir: params.workspaceDir
+		workspaceDir: params.workspaceDir,
+		...agentDir ? { agentDir } : {}
 	};
 }
 function createCodexCliNodeConversationBindingData(params) {
@@ -55,7 +57,8 @@ function readCodexConversationBindingDataRecord(data) {
 		kind: "codex-app-server-session",
 		version: BINDING_DATA_VERSION,
 		sessionFile: data.sessionFile,
-		workspaceDir: typeof data.workspaceDir === "string" && data.workspaceDir.trim() ? data.workspaceDir : process.cwd()
+		workspaceDir: typeof data.workspaceDir === "string" && data.workspaceDir.trim() ? data.workspaceDir : process.cwd(),
+		agentDir: typeof data.agentDir === "string" && data.agentDir.trim() ? data.agentDir : void 0
 	};
 }
 function resolveCodexDefaultWorkspaceDir(pluginConfig) {
@@ -93,11 +96,13 @@ async function stopCodexConversationTurn(params) {
 		message: "No active Codex run to stop."
 	};
 	const runtime = resolveCodexAppServerRuntimeOptions({ pluginConfig: params.pluginConfig });
-	const binding = await readCodexAppServerBinding(params.sessionFile);
+	const lookup = buildBindingLookup(params);
+	const binding = await readCodexAppServerBinding(params.sessionFile, lookup);
 	await (await getSharedCodexAppServerClient({
 		startOptions: runtime.start,
 		timeoutMs: runtime.requestTimeoutMs,
-		authProfileId: binding?.authProfileId
+		authProfileId: binding?.authProfileId,
+		...lookup
 	})).request("turn/interrupt", {
 		threadId: active.threadId,
 		turnId: active.turnId
@@ -119,11 +124,13 @@ async function steerCodexConversationTurn(params) {
 		message: "No active Codex run to steer."
 	};
 	const runtime = resolveCodexAppServerRuntimeOptions({ pluginConfig: params.pluginConfig });
-	const binding = await readCodexAppServerBinding(params.sessionFile);
+	const lookup = buildBindingLookup(params);
+	const binding = await readCodexAppServerBinding(params.sessionFile, lookup);
 	await (await getSharedCodexAppServerClient({
 		startOptions: runtime.start,
 		timeoutMs: runtime.requestTimeoutMs,
-		authProfileId: binding?.authProfileId
+		authProfileId: binding?.authProfileId,
+		...lookup
 	})).request("turn/steer", {
 		threadId: active.threadId,
 		expectedTurnId: active.turnId,
@@ -141,12 +148,14 @@ async function steerCodexConversationTurn(params) {
 async function setCodexConversationModel(params) {
 	const model = params.model.trim();
 	if (!model) return "Usage: /codex model <model>";
-	const binding = await requireThreadBinding(params.sessionFile);
+	const lookup = buildBindingLookup(params);
+	const binding = await requireThreadBinding(params.sessionFile, lookup);
 	const runtime = resolveCodexAppServerRuntimeOptions({ pluginConfig: params.pluginConfig });
 	const response = await resumeThreadWithOverrides({
 		pluginConfig: params.pluginConfig,
 		threadId: binding.threadId,
 		authProfileId: binding.authProfileId,
+		...lookup,
 		model
 	});
 	await writeCodexAppServerBinding(params.sessionFile, {
@@ -157,28 +166,30 @@ async function setCodexConversationModel(params) {
 		approvalPolicy: binding.approvalPolicy,
 		sandbox: binding.sandbox,
 		serviceTier: binding.serviceTier ?? runtime.serviceTier
-	});
+	}, lookup);
 	return `Codex model set to ${formatCodexDisplayText(response.model ?? model)}.`;
 }
 async function setCodexConversationFastMode(params) {
-	const binding = await requireThreadBinding(params.sessionFile);
+	const lookup = buildBindingLookup(params);
+	const binding = await requireThreadBinding(params.sessionFile, lookup);
 	if (params.enabled == null) return `Codex fast mode: ${isCodexFastServiceTier(binding.serviceTier) ? "on" : "off"}.`;
 	const serviceTier = params.enabled ? "priority" : "flex";
 	await writeCodexAppServerBinding(params.sessionFile, {
 		...binding,
 		serviceTier
-	});
+	}, lookup);
 	return `Codex fast mode ${params.enabled ? "enabled" : "disabled"}.`;
 }
 async function setCodexConversationPermissions(params) {
-	const binding = await requireThreadBinding(params.sessionFile);
+	const lookup = buildBindingLookup(params);
+	const binding = await requireThreadBinding(params.sessionFile, lookup);
 	if (!params.mode) return `Codex permissions: ${formatPermissionsMode(binding)}.`;
 	const policy = permissionsForMode(params.mode);
 	await writeCodexAppServerBinding(params.sessionFile, {
 		...binding,
 		approvalPolicy: policy.approvalPolicy,
 		sandbox: policy.sandbox
-	});
+	}, lookup);
 	return `Codex permissions set to ${params.mode === "yolo" ? "full access" : "default"}.`;
 }
 function parseCodexFastModeArg(arg) {
@@ -196,8 +207,8 @@ function parseCodexPermissionsModeArg(arg) {
 function formatPermissionsMode(binding) {
 	return binding.approvalPolicy === "never" && binding.sandbox === "danger-full-access" ? "full access" : "default";
 }
-async function requireThreadBinding(sessionFile) {
-	const binding = await readCodexAppServerBinding(sessionFile);
+async function requireThreadBinding(sessionFile, lookup = {}) {
+	const binding = await readCodexAppServerBinding(sessionFile, lookup);
 	if (!binding?.threadId) throw new Error("No Codex thread is attached to this OpenClaw session yet.");
 	return binding;
 }
@@ -206,7 +217,8 @@ async function resumeThreadWithOverrides(params) {
 	return await (await getSharedCodexAppServerClient({
 		startOptions: runtime.start,
 		timeoutMs: runtime.requestTimeoutMs,
-		authProfileId: params.authProfileId
+		authProfileId: params.authProfileId,
+		...buildBindingLookup(params)
 	})).request(CODEX_CONTROL_METHODS.resumeThread, {
 		threadId: params.threadId,
 		...params.model ? { model: params.model } : {},
@@ -217,6 +229,13 @@ async function resumeThreadWithOverrides(params) {
 		persistExtendedHistory: true
 	}, { timeoutMs: runtime.requestTimeoutMs });
 }
+function buildBindingLookup(params) {
+	const agentDir = params.agentDir?.trim();
+	return {
+		...agentDir ? { agentDir } : {},
+		...params.config ? { config: params.config } : {}
+	};
+}
 function permissionsForMode(mode) {
 	return mode === "yolo" ? {
 		approvalPolicy: "never",
@@ -438,16 +457,22 @@ function getGlobalState() {
 }
 async function startCodexConversationThread(params) {
 	const workspaceDir = params.workspaceDir?.trim() || resolveCodexDefaultWorkspaceDir(params.pluginConfig);
-	const existingBinding = await readCodexAppServerBinding(params.sessionFile, { config: params.config });
+	const agentDir = params.agentDir?.trim();
+	const agentLookup = buildAgentLookup({
+		agentDir,
+		config: params.config
+	});
+	const existingBinding = await readCodexAppServerBinding(params.sessionFile, { ...agentLookup });
 	const authProfileId = resolveCodexAppServerAuthProfileIdForAgent({
 		authProfileId: params.authProfileId ?? existingBinding?.authProfileId,
-		config: params.config
+		...agentLookup
 	});
 	if (params.threadId?.trim()) await attachExistingThread({
 		pluginConfig: params.pluginConfig,
 		sessionFile: params.sessionFile,
 		threadId: params.threadId.trim(),
 		workspaceDir,
+		...agentDir ? { agentDir } : {},
 		model: params.model,
 		modelProvider: params.modelProvider,
 		authProfileId,
@@ -460,6 +485,7 @@ async function startCodexConversationThread(params) {
 		pluginConfig: params.pluginConfig,
 		sessionFile: params.sessionFile,
 		workspaceDir,
+		...agentDir ? { agentDir } : {},
 		model: params.model,
 		modelProvider: params.modelProvider,
 		authProfileId,
@@ -470,7 +496,8 @@ async function startCodexConversationThread(params) {
 	});
 	return createCodexConversationBindingData({
 		sessionFile: params.sessionFile,
-		workspaceDir
+		workspaceDir,
+		...agentDir ? { agentDir } : {}
 	});
 }
 async function handleCodexConversationInboundClaim(event, ctx, options = {}) {
@@ -531,15 +558,20 @@ async function handleCodexConversationBindingResolved(event) {
 }
 async function attachExistingThread(params) {
 	const runtime = resolveCodexAppServerRuntimeOptions({ pluginConfig: params.pluginConfig });
+	const agentLookup = buildAgentLookup({
+		agentDir: params.agentDir,
+		config: params.config
+	});
 	const modelProvider = resolveThreadRequestModelProvider({
 		authProfileId: params.authProfileId,
 		modelProvider: params.modelProvider,
-		config: params.config
+		...agentLookup
 	});
 	const response = await (await getSharedCodexAppServerClient({
 		startOptions: runtime.start,
 		timeoutMs: runtime.requestTimeoutMs,
-		authProfileId: params.authProfileId
+		authProfileId: params.authProfileId,
+		...agentLookup
 	})).request(CODEX_CONTROL_METHODS.resumeThread, {
 		threadId: params.threadId,
 		...params.model ? { model: params.model } : {},
@@ -558,26 +590,31 @@ async function attachExistingThread(params) {
 		authProfileId: params.authProfileId,
 		model: response.model ?? params.model,
 		modelProvider: normalizeCodexAppServerBindingModelProvider({
-			config: params.config,
 			authProfileId: params.authProfileId,
-			modelProvider: response.modelProvider ?? params.modelProvider
+			modelProvider: response.modelProvider ?? params.modelProvider,
+			...agentLookup
 		}),
 		approvalPolicy: params.approvalPolicy ?? runtimeApprovalPolicy,
 		sandbox: params.sandbox ?? runtime.sandbox,
 		serviceTier: params.serviceTier ?? runtime.serviceTier
-	}, { config: params.config });
+	}, { ...agentLookup });
 }
 async function createThread(params) {
 	const runtime = resolveCodexAppServerRuntimeOptions({ pluginConfig: params.pluginConfig });
+	const agentLookup = buildAgentLookup({
+		agentDir: params.agentDir,
+		config: params.config
+	});
 	const modelProvider = resolveThreadRequestModelProvider({
 		authProfileId: params.authProfileId,
 		modelProvider: params.modelProvider,
-		config: params.config
+		...agentLookup
 	});
 	const response = await (await getSharedCodexAppServerClient({
 		startOptions: runtime.start,
 		timeoutMs: runtime.requestTimeoutMs,
-		authProfileId: params.authProfileId
+		authProfileId: params.authProfileId,
+		...agentLookup
 	})).request("thread/start", {
 		cwd: params.workspaceDir,
 		...params.model ? { model: params.model } : {},
@@ -597,24 +634,26 @@ async function createThread(params) {
 		authProfileId: params.authProfileId,
 		model: response.model ?? params.model,
 		modelProvider: normalizeCodexAppServerBindingModelProvider({
-			config: params.config,
 			authProfileId: params.authProfileId,
-			modelProvider: response.modelProvider ?? params.modelProvider
+			modelProvider: response.modelProvider ?? params.modelProvider,
+			...agentLookup
 		}),
 		approvalPolicy: params.approvalPolicy ?? runtimeApprovalPolicy,
 		sandbox: params.sandbox ?? runtime.sandbox,
 		serviceTier: params.serviceTier ?? runtime.serviceTier
-	}, { config: params.config });
+	}, { ...agentLookup });
 }
 async function runBoundTurn(params) {
 	const runtime = resolveCodexAppServerRuntimeOptions({ pluginConfig: params.pluginConfig });
-	const binding = await readCodexAppServerBinding(params.data.sessionFile);
+	const agentLookup = buildAgentLookup({ agentDir: params.data.agentDir });
+	const binding = await readCodexAppServerBinding(params.data.sessionFile, agentLookup);
 	const threadId = binding?.threadId;
 	if (!threadId) throw new Error("bound Codex conversation has no thread binding");
 	const client = await getSharedCodexAppServerClient({
 		startOptions: runtime.start,
 		timeoutMs: runtime.requestTimeoutMs,
-		authProfileId: binding.authProfileId
+		authProfileId: binding.authProfileId,
+		...agentLookup
 	});
 	const collector = createCodexConversationTurnCollector(threadId);
 	const notificationCleanup = client.addNotificationHandler((notification) => collector.handleNotification(notification));
@@ -670,11 +709,13 @@ async function runBoundTurnWithMissingThreadRecovery(params) {
 		return await runBoundTurn(params);
 	} catch (error) {
 		if (!isCodexThreadNotFoundError(error)) throw error;
-		const binding = await readCodexAppServerBinding(params.data.sessionFile);
+		const agentLookup = buildAgentLookup({ agentDir: params.data.agentDir });
+		const binding = await readCodexAppServerBinding(params.data.sessionFile, agentLookup);
 		await startCodexConversationThread({
 			pluginConfig: params.pluginConfig,
 			sessionFile: params.data.sessionFile,
 			workspaceDir: binding?.cwd || params.data.workspaceDir,
+			...agentLookup,
 			model: binding?.model,
 			modelProvider: binding?.modelProvider,
 			authProfileId: binding?.authProfileId,
@@ -704,6 +745,13 @@ function resolveThreadRequestModelProvider(params) {
 	if (isCodexAppServerNativeAuthProfile(params) && (modelProvider.toLowerCase() === "openai" || modelProvider.toLowerCase() === "openai-codex")) return;
 	return modelProvider.toLowerCase() === "openai-codex" ? "openai" : modelProvider;
 }
+function buildAgentLookup(params) {
+	const agentDir = params.agentDir?.trim();
+	return {
+		...agentDir ? { agentDir } : {},
+		...params.config ? { config: params.config } : {}
+	};
+}
 //#endregion
 //#region extensions/codex/src/node-cli-sessions.ts
 const CODEX_CLI_SESSIONS_LIST_COMMAND = "codex.cli.sessions.list";