@openclaw/codex 2026.10.1-beta.2 → 2026.10.5-beta.1

package/dist/.setup/{config-security-KAPScztc.mjs → config-security-clxAZYWX.mjs}

@@ -1,8 +1,10 @@
-import { b as readRecord, v as readNonEmptyString } from "./config-parsing-BQq-CHTF.mjs";
+import { l as readRecord, s as readNonEmptyString } from "./config-utils-DN_YT7dE.mjs";
+import "./config-parsing-DsWSCPHO.mjs";
 import { createHash } from "node:crypto";
 import { AgentHarnessPreflightError } from "openclaw/plugin-sdk/agent-harness-registration";
 import { parse } from "smol-toml";
 import { readFileSync } from "node:fs";
+import { escapeRegExp } from "openclaw/plugin-sdk/text-utility-runtime";
 import { hostname } from "node:os";
 import { isLoopbackHost } from "openclaw/plugin-sdk/request-url";
 //#region extensions/codex/src/app-server/config-exec-policy.ts
@@ -19,10 +21,11 @@ function selectForcedDangerFullAccessSandbox(params) {
 	return "danger-full-access";
 }
 function selectGuardianSandbox(allowedSandboxModes) {
-	if (allowedSandboxModes === void 0 || allowedSandboxModes.has("workspace-write")) return "workspace-write";
-	if (allowedSandboxModes.has("read-only")) return "read-only";
-	if (allowedSandboxModes.has("danger-full-access")) return "danger-full-access";
-	return "workspace-write";
+	return [
+		"workspace-write",
+		"read-only",
+		"danger-full-access"
+	].find((mode) => allowedSandboxModes?.has(mode)) ?? "workspace-write";
 }
 function resolveApprovalPolicy(value) {
 	if (value === "untrusted") throw new Error("Codex app-server approval policy \"untrusted\" is retired; run \"openclaw doctor --fix\" and use \"on-request\".");
@@ -101,9 +104,11 @@ function readRequirementsStringArray(value) {
 }
 function normalizeRequirementsSandboxMode(value) {
 	const compact = value.replace(/[\s_-]/g, "").toLowerCase();
-	if (compact === "readonly") return "read-only";
-	if (compact === "workspacewrite") return "workspace-write";
-	if (compact === "dangerfullaccess") return "danger-full-access";
+	return [
+		"read-only",
+		"workspace-write",
+		"danger-full-access"
+	].find((mode) => mode.replaceAll("-", "") === compact);
 }
 function normalizeRequirementsHostName(value) {
 	const normalized = value.trim().replace(/\.+$/g, "").toLowerCase();
@@ -116,12 +121,8 @@ function requirementsHostNameMatchesAnyPattern(hostName, patterns) {
 	});
 }
 function globPatternMatches(value, pattern) {
-	let regex = "^";
-	for (const char of pattern) if (char === "*") regex += ".*";
-	else if (char === "?") regex += ".";
-	else regex += char.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-	regex += "$";
-	return new RegExp(regex).test(value);
+	const regex = escapeRegExp(pattern).replaceAll("\\*", ".*").replaceAll("\\?", ".");
+	return new RegExp(`^${regex}$`).test(value);
 }
 function normalizeRequirementsApprovalPolicy(value) {
 	const normalized = value.trim().toLowerCase();
@@ -129,23 +130,29 @@ function normalizeRequirementsApprovalPolicy(value) {
 	return resolveApprovalPolicy(normalized);
 }
 function selectGuardianApprovalPolicy(allowedApprovalPolicies, execModeRequiringPromptingApprovals) {
-	if (allowedApprovalPolicies === void 0 || allowedApprovalPolicies.has("on-request")) return "on-request";
-	if (allowedApprovalPolicies.has("untrusted")) return "untrusted";
-	if (execModeRequiringPromptingApprovals) throw new Error(`tools.exec.mode=${execModeRequiringPromptingApprovals} requires Codex app-server prompting approvals`);
-	if (allowedApprovalPolicies.has("never")) return "never";
-	return "on-request";
+	return selectManagedPolicy(allowedApprovalPolicies, [
+		"on-request",
+		"untrusted",
+		"never"
+	], execModeRequiringPromptingApprovals && `tools.exec.mode=${execModeRequiringPromptingApprovals} requires Codex app-server prompting approvals`);
 }
 function selectGuardianApprovalsReviewer(allowedApprovalsReviewers, execModeRequiringAutoReviewer) {
-	if (allowedApprovalsReviewers === void 0 || allowedApprovalsReviewers.has("auto_review")) return "auto_review";
-	if (allowedApprovalsReviewers.has("guardian_subagent")) return "guardian_subagent";
-	if (execModeRequiringAutoReviewer) throw new Error(`tools.exec.mode=${execModeRequiringAutoReviewer} requires Codex app-server auto approvals`);
-	if (allowedApprovalsReviewers.has("user")) return "user";
-	return "auto_review";
+	return selectManagedPolicy(allowedApprovalsReviewers, [
+		"auto_review",
+		"guardian_subagent",
+		"user"
+	], execModeRequiringAutoReviewer && `tools.exec.mode=${execModeRequiringAutoReviewer} requires Codex app-server auto approvals`);
 }
 function selectUserApprovalsReviewer(allowedApprovalsReviewers, execModeRequiringUserReviewer) {
 	if (allowedApprovalsReviewers === void 0 || allowedApprovalsReviewers.has("user")) return "user";
 	throw new Error(`tools.exec.mode=${execModeRequiringUserReviewer ?? "ask"} requires Codex app-server user approvals`);
 }
+function selectManagedPolicy(allowed, [preferred, alternate, fallback], requiredMessage) {
+	if (allowed === void 0 || allowed.has(preferred)) return preferred;
+	if (allowed.has(alternate)) return alternate;
+	if (requiredMessage) throw new Error(requiredMessage);
+	return allowed.has(fallback) ? fallback : preferred;
+}
 //#endregion
 //#region extensions/codex/src/app-server/config-policy-json.ts
 function fingerprintCodexPolicy(value) {
@@ -232,25 +239,14 @@ function withMcpElicitationsApprovalPolicy(policy) {
 		skill_approval: prompting
 	} };
 }
-function resolveTransport(value) {
-	return value === "websocket" || value === "unix" ? value : "stdio";
-}
 function inferCodexAppServerConnectionClass(params) {
 	if (params.transport !== "websocket") return "local-loopback";
-	return params.url && isLoopbackWebSocketUrl(params.url) ? "local-loopback" : "remote";
+	const parsed = params.url ? URL.parse(params.url) : null;
+	return (parsed?.protocol === "ws:" || parsed?.protocol === "wss:") && isLoopbackHost(parsed.hostname) ? "local-loopback" : "remote";
 }
 /** Applies the canonical remote-auth boundary to any Codex AppServer transport. */
 function assertCodexAppServerConnectionSecurity(params) {
-	if (inferCodexAppServerConnectionClass(params) === "remote" && !hasIdentityBearingWebSocketAuth(params)) throw new Error("remote Codex app-server WebSocket URLs require appServer.authToken or an Authorization header");
-}
-function isLoopbackWebSocketUrl(value) {
-	const parsed = URL.parse(value);
-	if (parsed?.protocol !== "ws:" && parsed?.protocol !== "wss:") return false;
-	return isLoopbackHost(parsed.hostname);
-}
-function hasIdentityBearingWebSocketAuth(params) {
-	if (readNonEmptyString(params.authToken)) return true;
-	return Object.entries(params.headers).some(([key, value]) => key.trim().toLowerCase() === "authorization" && Boolean(readNonEmptyString(value)));
+	if (inferCodexAppServerConnectionClass(params) === "remote" && !readNonEmptyString(params.authToken) && !Object.entries(params.headers).some(([key, value]) => key.trim().toLowerCase() === "authorization" && Boolean(readNonEmptyString(value)))) throw new Error("remote Codex app-server WebSocket URLs require appServer.authToken or an Authorization header");
 }
 function resolvePolicyMode(value) {
 	return value === "guardian" || value === "yolo" ? value : void 0;
@@ -282,4 +278,4 @@ function resolveDefaultCodexAppServerPolicy(params) {
 	};
 }
 //#endregion
-export { selectForcedPromptingSandbox as C, selectForcedDangerFullAccessSandbox as S, resolveApprovalPolicy as _, resolveDefaultCodexAppServerPolicy as a, resolveEffectiveOpenClawExecModeForCodexAppServer as b, shouldAutoApproveCodexAppServerApprovals as c, parseCodexRequirementsPolicy as d, readCodexRequirementsToml as f, assertCodexAppServerAllowedForOpenClawExecMode as g, selectUserApprovalsReviewer as h, resolveCodexAppServerNetworkProxy as i, withMcpElicitationsApprovalPolicy as l, selectGuardianApprovalsReviewer as m, hasCodexMcpToolApprovalOverrides as n, resolvePolicyMode as o, selectGuardianApprovalPolicy as p, inferCodexAppServerConnectionClass as r, resolveTransport as s, assertCodexAppServerConnectionSecurity as t, fingerprintCodexPolicy as u, resolveApprovalsReviewer as v, selectGuardianSandbox as w, resolveSandbox as x, resolveCodexPolicyModeForOpenClawExecMode as y };
+export { selectGuardianSandbox as S, resolveCodexPolicyModeForOpenClawExecMode as _, resolveDefaultCodexAppServerPolicy as a, selectForcedDangerFullAccessSandbox as b, withMcpElicitationsApprovalPolicy as c, readCodexRequirementsToml as d, selectGuardianApprovalPolicy as f, resolveApprovalPolicy as g, assertCodexAppServerAllowedForOpenClawExecMode as h, resolveCodexAppServerNetworkProxy as i, fingerprintCodexPolicy as l, selectUserApprovalsReviewer as m, hasCodexMcpToolApprovalOverrides as n, resolvePolicyMode as o, selectGuardianApprovalsReviewer as p, inferCodexAppServerConnectionClass as r, shouldAutoApproveCodexAppServerApprovals as s, assertCodexAppServerConnectionSecurity as t, parseCodexRequirementsPolicy as u, resolveEffectiveOpenClawExecModeForCodexAppServer as v, selectForcedPromptingSandbox as x, resolveSandbox as y };

package/dist/.setup/config-utils-DN_YT7dE.mjs

@@ -0,0 +1,47 @@
+import { t as normalizeCodexServiceTier } from "./service-tier-normalization-BPgw2Wdt.mjs";
+import { asOptionalRecord as readRecord, normalizeOptionalString as readNonEmptyString, normalizeTrimmedStringList } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { createHmac, randomBytes } from "node:crypto";
+import { normalizeResolvedSecretInputString } from "openclaw/plugin-sdk/secret-input";
+import { resolveGlobalSingleton } from "openclaw/plugin-sdk/global-singleton";
+import { splitCommandArgs } from "openclaw/plugin-sdk/process-runtime";
+//#region extensions/codex/src/app-server/config-utils.ts
+const START_OPTIONS_KEY_SECRET = resolveGlobalSingleton(Symbol.for("openclaw.codexAppServerStartOptionsKeySecret"), () => randomBytes(32));
+const PLAIN_DECIMAL_NUMBER_RE = /^[+-]?(?:(?:\d+\.?\d*)|(?:\.\d+))$/;
+function appendCodexGitConfigParameters(base, parameters) {
+	return !base ? parameters : base === parameters || base.endsWith(` ${parameters}`) ? base : `${base} ${parameters}`;
+}
+function isCodexFastServiceTier(value) {
+	return normalizeCodexServiceTier(value) === "priority";
+}
+function normalizeHeaders(value) {
+	return Object.fromEntries(Object.entries(value ?? {}).flatMap(([key, child]) => {
+		const name = key.trim();
+		const header = normalizeResolvedSecretInputString({
+			value: child,
+			path: `plugins.entries.codex.config.appServer.headers.${key}`
+		});
+		return name && header ? [[name, header]] : [];
+	}));
+}
+function readExecSecurity(value) {
+	return value === "deny" || value === "allowlist" || value === "full" ? value : void 0;
+}
+function readExecAsk(value) {
+	return value === "off" || value === "on-miss" || value === "always" ? value : void 0;
+}
+function readNumberEnv(value) {
+	const trimmed = value?.trim();
+	if (!trimmed || !PLAIN_DECIMAL_NUMBER_RE.test(trimmed)) return;
+	const parsed = Number(trimmed);
+	return Number.isFinite(parsed) ? parsed : void 0;
+}
+function resolveArgs(configArgs, envArgs) {
+	if (Array.isArray(configArgs)) return normalizeTrimmedStringList(configArgs);
+	return splitCommandArgs(configArgs ?? envArgs ?? "", { allowUnclosedQuotes: true });
+}
+function hashSecretForKey(value, label) {
+	if (!value) return null;
+	return createHmac("sha256", START_OPTIONS_KEY_SECRET).update(label).update("\0").update(value).digest("hex");
+}
+//#endregion
+export { readExecAsk as a, readNumberEnv as c, normalizeHeaders as i, readRecord as l, hashSecretForKey as n, readExecSecurity as o, isCodexFastServiceTier as r, readNonEmptyString as s, appendCodexGitConfigParameters as t, resolveArgs as u };

package/dist/.setup/{context-engine-projection-CsgYSQhW.mjs → context-engine-projection-ps-yn_ci.mjs}

@@ -21,7 +21,6 @@ const DEFAULT_TEXT_PART_CHARS = 6e3;
 const MAX_TEXT_PART_CHARS = 128e3;
 const APPROX_RENDERED_CHARS_PER_TOKEN = 4;
 const CODEX_TURN_START_TEXT_INPUT_MAX_CHARS = 1 << 20;
-/** Default token reserve kept out of rendered context-engine prompt text. */
 const DEFAULT_CODEX_PROJECTION_RESERVE_TOKENS = 2e4;
 const MIN_PROMPT_BUDGET_RATIO = .5;
 const MIN_PROMPT_BUDGET_TOKENS = 8e3;
@@ -58,12 +57,11 @@ function neutralizeCodexExplicitMentionSigils(text) {
 function isCodexDurableCustomMessage(message) {
 	return message.role === "custom" && message.excludeFromContext !== true && !isOpenClawRuntimeContextCustomMessage(message);
 }
-/** Projects assembled OpenClaw context-engine messages into Codex prompt inputs. */
 async function projectContextEngineAssemblyForCodex(params) {
 	const prompt = params.prompt.trim();
 	const maxRenderedContextChars = normalizeRenderedContextMaxChars(params.maxRenderedContextChars);
 	const context = await renderMessagesForCodexContext(params.assembledMessages.filter((message) => message.role !== "custom" || isCodexDurableCustomMessage(message)), {
-		maxTextPartChars: resolveTextPartMaxChars(maxRenderedContextChars),
+		maxTextPartChars: Math.min(MAX_TEXT_PART_CHARS, Math.max(DEFAULT_TEXT_PART_CHARS, Math.floor(maxRenderedContextChars / 4))),
 		toolPayloadMode: params.toolPayloadMode ?? "elide",
 		maxRenderedContextChars,
 		prepareFileContext: params.prepareFileContext,
@@ -93,7 +91,6 @@ async function projectContextEngineAssemblyForCodex(params) {
 		})) } : {}
 	};
 }
-/** Resolves rendered context size from a token budget and reserve. */
 function resolveCodexContextEngineProjectionMaxChars(params) {
 	const contextTokenBudget = Math.floor(asFiniteNumber(params.contextTokenBudget) ?? 0);
 	if (contextTokenBudget <= 0) return DEFAULT_RENDERED_CONTEXT_CHARS;
@@ -107,28 +104,25 @@ const CONTINUITY_EMPIRICAL_CHARS_PER_TOKEN = 3;
 const CONTINUITY_MIN_CHARS_PER_TOKEN = .5;
 const CONTINUITY_MAX_CHARS_PER_TOKEN = CONTINUITY_EMPIRICAL_CHARS_PER_TOKEN;
 const CONTINUITY_CALIBRATION_MIN_PROMPT_CHARS = 5e4;
-/** Builds a calibration sample from a completed turn, or undefined if unusable. */
 function buildCodexContinuityCalibration(params) {
-	if (!Number.isFinite(params.promptChars) || !Number.isFinite(params.inputTokens) || params.promptChars < CONTINUITY_CALIBRATION_MIN_PROMPT_CHARS || params.inputTokens <= 0) return;
+	if (resolveContinuityCharsPerToken(params) === void 0) return;
 	return {
 		promptChars: Math.floor(params.promptChars),
 		inputTokens: Math.floor(params.inputTokens)
 	};
 }
 function resolveContinuityCharsPerToken(calibration) {
-	if (!calibration || !Number.isFinite(calibration.promptChars) || !Number.isFinite(calibration.inputTokens) || calibration.promptChars < CONTINUITY_CALIBRATION_MIN_PROMPT_CHARS || calibration.inputTokens <= 0) return CONTINUITY_EMPIRICAL_CHARS_PER_TOKEN;
+	if (!calibration || !Number.isFinite(calibration.promptChars) || !Number.isFinite(calibration.inputTokens) || calibration.promptChars < CONTINUITY_CALIBRATION_MIN_PROMPT_CHARS || calibration.inputTokens <= 0) return;
 	return Math.min(CONTINUITY_MAX_CHARS_PER_TOKEN, Math.max(CONTINUITY_MIN_CHARS_PER_TOKEN, calibration.promptChars / calibration.inputTokens));
 }
-/** Resolves rendered context size for no-engine continuity projections. */
 function resolveCodexContinuityProjectionMaxChars(params) {
 	const contextTokenBudget = Math.floor(asFiniteNumber(params.contextTokenBudget) ?? 0);
 	if (contextTokenBudget <= 0) return DEFAULT_RENDERED_CONTEXT_CHARS;
 	return normalizeRenderedContextMaxChars(resolveProjectionPromptBudgetTokens({
 		contextTokenBudget,
 		reserveTokens: Math.max(DEFAULT_CODEX_PROJECTION_RESERVE_TOKENS, Math.floor(contextTokenBudget * CONTINUITY_PROJECTION_RESERVE_RATIO))
-	}) * resolveContinuityCharsPerToken(params.calibration));
+	}) * (resolveContinuityCharsPerToken(params.calibration) ?? CONTINUITY_EMPIRICAL_CHARS_PER_TOKEN));
 }
-/** Fits projected context prompts under Codex app-server turn/start text limits. */
 function fitCodexProjectedContextForTurnStart(params) {
 	const slice = (start, end, budget = end - start) => {
 		const retained = truncateOlderContext(params.promptText.slice(start, end), budget);
@@ -278,15 +272,12 @@ function renderMessagePart(part, options, toolResultBody) {
 		return toolResultBody ? truncateText(text, options.maxTextPartChars) : text;
 	}
 	if (type === "image") return options.mediaPrepared ? "" : "[image omitted]";
-	if (type === "toolCall" || type === "tool_use") {
-		const label = `tool call${typeof record.name === "string" ? `: ${record.name}` : ""}`;
-		if (options.toolPayloadMode === "preserve") return truncateText(`${label}\n${stableJson(renderToolCallPayload(record))}`, options.maxTextPartChars);
-		return `${label} [input omitted]`;
-	}
-	if (type === "toolResult" || type === "tool_result") {
-		const label = typeof record.toolUseId === "string" ? `tool result: ${record.toolUseId}` : "tool result";
-		if (options.toolPayloadMode === "preserve") return truncateText(`${toolResultBody ? "" : `${label}\n`}${stableJson(renderToolResultPayload(record))}`, options.maxTextPartChars);
-		return `${label} [content omitted]`;
+	const toolCall = type === "toolCall" || type === "tool_use";
+	if (toolCall || type === "toolResult" || type === "tool_result") {
+		const label = toolCall ? `tool call${typeof record.name === "string" ? `: ${record.name}` : ""}` : typeof record.toolUseId === "string" ? `tool result: ${record.toolUseId}` : "tool result";
+		if (options.toolPayloadMode !== "preserve") return `${label} [${toolCall ? "input" : "content"} omitted]`;
+		const renderPayload = toolCall ? renderToolCallPayload : renderToolResultPayload;
+		return truncateText(`${!toolCall && toolResultBody ? "" : `${label}\n`}${stableJson(renderPayload(record))}`, options.maxTextPartChars);
 	}
 	return `[${type ?? "non-text"} content omitted]`;
 }
@@ -344,9 +335,6 @@ function normalizeRenderedContextMaxChars(value) {
 	if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) return DEFAULT_RENDERED_CONTEXT_CHARS;
 	return Math.min(MAX_RENDERED_CONTEXT_CHARS, Math.max(1, Math.floor(value)));
 }
-function resolveTextPartMaxChars(maxRenderedContextChars) {
-	return Math.min(MAX_TEXT_PART_CHARS, Math.max(DEFAULT_TEXT_PART_CHARS, Math.floor(maxRenderedContextChars / 4)));
-}
 function truncateText(text, maxChars) {
 	if (text.length <= maxChars) return text;
 	const truncated = truncateUtf16Safe(text, maxChars);

package/dist/.setup/{conversation-binding-B3MNMVzb.mjs → conversation-binding-CTSLDM9S.mjs}

@@ -1,34 +1,34 @@
 import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
-import { m as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced } from "./session-binding-record-BZB8RgcF.mjs";
-import { f as readCodexRequirementsToml } from "./config-security-KAPScztc.mjs";
-import { d as readCodexPluginConfig } from "./config-parsing-BQq-CHTF.mjs";
-import { d as readCodexEffectiveConfig, n as codexSandboxPolicyForTurn } from "./config-options-HG_Rr3W_.mjs";
-import { S as retainSharedCodexAppServerClientByInstanceId } from "./auth-cache-key-CGm0UJOr.mjs";
-import { o as resolveCodexDefaultWorkspaceDir } from "./conversation-binding-data-DJ4ix-W5.mjs";
-import { o as isCodexAppServerOverloadError } from "./rpc-error-hmWM21RB.mjs";
-import { n as projectBoundedCodexVisibleSessionHistory } from "./transcript-history-projection-B9a7HwUV.mjs";
-import { n as canUseCodexModelBackedApprovalsReviewerForModel, r as resolveOpenClawExecPolicyForCodexAppServer } from "./config-0Gxk3_eq.mjs";
-import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-cUYrqu_a.mjs";
+import { m as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced } from "./session-binding-record-DU_0biMD.mjs";
+import { d as readCodexRequirementsToml } from "./config-security-clxAZYWX.mjs";
+import { d as readCodexPluginConfig } from "./config-parsing-DsWSCPHO.mjs";
+import { d as readCodexEffectiveConfig, n as codexSandboxPolicyForTurn } from "./config-options-DDzeNQ8m.mjs";
+import { S as retainSharedCodexAppServerClientByInstanceId } from "./auth-cache-key-DyfUvsSa.mjs";
+import { o as resolveCodexDefaultWorkspaceDir } from "./conversation-binding-data-UgLuTSQT.mjs";
+import { o as isCodexAppServerOverloadError } from "./rpc-error-C98SHchT.mjs";
+import { n as projectBoundedCodexVisibleSessionHistory } from "./transcript-history-projection-DfKcoZCB.mjs";
+import { n as canUseCodexModelBackedApprovalsReviewerForModel, r as resolveOpenClawExecPolicyForCodexAppServer } from "./config-C1YVVLEA.mjs";
+import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-DWzK-k0n.mjs";
 import { n as normalizeCodexAppServerBindingModelProvider, t as isCodexAppServerNativeAuthProfile } from "./auth-profile-CgHQ8Vot.mjs";
-import { B as isCodexAppServerClientRuntimeLive, F as consumeCodexAppServerLiveThread, G as releaseCodexAppServerLiveThread, R as hasCodexAppServerLiveThread, V as isCodexAppServerLiveThreadClaimed, b as withLeasedCodexAppServerClientStartSelectionRetry, c as getLeasedSharedCodexAppServerClient, m as releaseCodexAppServerClientLease } from "./shared-client-qhyYWbew.mjs";
-import { a as isCodexAppServerIndeterminateRequestCancellationError, g as assertCodexThreadStartResponse, p as assertCodexThreadAcceptsDirectInput, u as CodexThreadDirectInputError } from "./client-C8lgBOoO.mjs";
-import { a as isCodexNotificationForTurn, n as getCodexAppServerTurnRouter } from "./turn-router-sS69wYnI.mjs";
-import { f as unsubscribeCodexThreadBestEffort, l as retireUnsafeCodexTurnClientBestEffort, o as closeCodexStartupClientBestEffort, r as CodexAppServerUnsafeSubscriptionError, s as interruptCodexTurnAndWaitBestEffort } from "./attempt-client-cleanup-BH0hW2xU.mjs";
-import { C as buildCodexProjectDocThreadConfig, Ct as mergeCodexThreadConfigs, _ as CODEX_NATIVE_PERSONALITY_NONE, y as resolveCodexAppServerRequestModelSelection, yt as buildDisabledAppsConfigPatch } from "./thread-requests-CL1e8Wmx.mjs";
-import "./thread-lifecycle-Cbz_7ySv.mjs";
-import "./session-binding-Ce7BqiPN.mjs";
-import { t as resumeCodexAppServerThread } from "./thread-resume-BT6NHMkM.mjs";
-import { a as rollbackCodexAppServerBindingSubscription, c as withExclusiveCodexAppServerThread, n as releaseCodexAppServerBindingSubscription, r as retainCodexAppServerBindingSubscription, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-DwuSrt3s.mjs";
-import { i as resolveCodexSessionPermissionCwd, n as applyCodexSessionPermissionPolicy, t as CODEX_SESSION_PERMISSION_EXEC_MODES } from "./session-permission-policy-BxIUJ0Zd.mjs";
-import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-Bg4FZw1f.mjs";
-import { f as trackCodexConversationActiveTurn, o as resolveThreadRequestModelProvider, t as buildCodexConversationAgentLookup } from "./conversation-control-CYsMlCuE.mjs";
+import { B as isCodexAppServerClientRuntimeLive, F as consumeCodexAppServerLiveThread, G as releaseCodexAppServerLiveThread, R as hasCodexAppServerLiveThread, V as isCodexAppServerLiveThreadClaimed, b as withLeasedCodexAppServerClientStartSelectionRetry, c as getLeasedSharedCodexAppServerClient, m as releaseCodexAppServerClientLease } from "./shared-client-ByIwuAC-.mjs";
+import { a as isCodexAppServerIndeterminateRequestCancellationError, g as assertCodexThreadStartResponse, p as assertCodexThreadAcceptsDirectInput, u as CodexThreadDirectInputError } from "./client-y7nO6X9c.mjs";
+import { a as isCodexNotificationForTurn, n as getCodexAppServerTurnRouter } from "./turn-router-DKDAziUW.mjs";
+import { f as unsubscribeCodexThreadBestEffort, l as retireUnsafeCodexTurnClientBestEffort, o as closeCodexStartupClientBestEffort, r as CodexAppServerUnsafeSubscriptionError, s as interruptCodexTurnAndWaitBestEffort } from "./attempt-client-cleanup-t-kd_1ys.mjs";
+import { d as mergeCodexThreadConfigs, s as buildDisabledAppsConfigPatch, t as buildCodexProjectDocThreadConfig } from "./project-doc-thread-config-BVcvnps8.mjs";
+import "./session-binding-JEHNMPsr.mjs";
+import { r as resolveCodexAppServerRequestModelSelection, t as CODEX_NATIVE_PERSONALITY_NONE } from "./thread-model-selection-DcVebr8N.mjs";
+import { a as rollbackCodexAppServerBindingSubscription, c as withExclusiveCodexAppServerThread, n as releaseCodexAppServerBindingSubscription, r as retainCodexAppServerBindingSubscription, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-Be53aiaG.mjs";
+import { t as resumeCodexAppServerThread } from "./thread-resume-B2EmMcgE.mjs";
+import { i as resolveCodexSessionPermissionCwd, n as applyCodexSessionPermissionPolicy, t as CODEX_SESSION_PERMISSION_EXEC_MODES } from "./session-permission-policy-CD2MAWU8.mjs";
+import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-D_zv8J7V.mjs";
+import { f as trackCodexConversationActiveTurn, o as resolveThreadRequestModelProvider, t as buildCodexConversationAgentLookup } from "./conversation-control-GXM3unE4.mjs";
 import { asOptionalRecord, normalizeOptionalString, readNonEmptyStringPreservingWhitespace } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import path from "node:path";
-import { embeddedAgentLog, formatErrorMessage, resolveActiveEmbeddedRunSessionId, resolveSandboxContext } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { fileURLToPath } from "node:url";
 import { resolveAgentWorkspaceDir } from "openclaw/plugin-sdk/agent-runtime";
+import { embeddedAgentLog, formatErrorMessage, resolveActiveEmbeddedRunSessionId, resolveSandboxContext } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { loadExecApprovals } from "openclaw/plugin-sdk/exec-approvals-runtime";
 import { getSessionEntry, resolveStorePath, resolveTranscriptSessionKeyBySessionId } from "openclaw/plugin-sdk/session-store-runtime";
 import { readVisibleSessionTranscriptMessageEntries } from "openclaw/plugin-sdk/session-transcript-runtime";
@@ -116,10 +116,7 @@ async function resolveConversationAppServerRuntime(params) {
 }
 const CODEX_CONVERSATION_THREAD_DEVELOPER_INSTRUCTIONS = "This Codex thread is bound to an OpenClaw conversation. Answer normally; OpenClaw will deliver your final response back to the conversation.";
 async function resolveThreadBindingRuntime(params) {
-	const agentLookup = buildCodexConversationAgentLookup({
-		agentDir: params.agentDir,
-		config: params.config
-	});
+	const agentLookup = buildCodexConversationAgentLookup(params);
 	const modelProvider = resolveThreadRequestModelProvider({
 		authProfileId: params.authProfileId,
 		modelProvider: params.modelProvider,
@@ -137,15 +134,8 @@ async function resolveThreadBindingRuntime(params) {
 		...agentLookup
 	});
 	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,
-		agentDir: params.agentDir
+		...params,
+		modelProvider: reviewerModelProvider
 	});
 	assertNativeConversationApprovalPolicySupported(runtime);
 	const clientOptions = {
@@ -414,7 +404,7 @@ function createCodexConversationTurnCollector(threadId) {
 	};
 	const completeItem = (item, itemId) => {
 		assistantTextByItem.delete(itemId);
-		const text = readAssistantReplyText(item);
+		const text = item.phase === "commentary" || item.delivery === "async" ? void 0 : readNonEmptyStringPreservingWhitespace(item.text);
 		if (text?.trim()) assistantTextByItem.set(itemId, text);
 	};
 	const clearWaitState = () => {
@@ -487,9 +477,6 @@ function createCodexConversationTurnCollector(threadId) {
 		}
 	};
 }
-function readAssistantReplyText(item) {
-	return item.phase === "commentary" || item.delivery === "async" ? void 0 : readNonEmptyStringPreservingWhitespace(item.text);
-}
 //#endregion
 //#region extensions/codex/src/conversation-turn-input.ts
 const IMAGE_EXTENSIONS = /* @__PURE__ */ new Set([
@@ -511,11 +498,21 @@ function toCodexImageInput(media) {
 	if (!isImageMedia(media)) return;
 	const localPath = media.path ?? readLocalMediaPath(media.url);
 	if (localPath) {
-		const normalized = normalizeFileUrl(localPath);
-		return normalized ? {
+		if (!/^file:\/\//iu.test(localPath)) return {
 			type: "localImage",
-			path: normalized
-		} : void 0;
+			path: localPath
+		};
+		try {
+			const fileUrl = new URL(localPath);
+			decodeURIComponent(fileUrl.pathname);
+			const normalized = fileURLToPath(fileUrl);
+			return normalized ? {
+				type: "localImage",
+				path: normalized
+			} : void 0;
+		} catch {
+			return;
+		}
 	}
 	return media.url ? {
 		type: "image",
@@ -528,16 +525,6 @@ function isImageMedia(media) {
 	if (!candidate) return false;
 	return IMAGE_EXTENSIONS.has(path.extname(candidate.split(/[?#]/, 1)[0] ?? "").toLowerCase());
 }
-function normalizeFileUrl(value) {
-	if (!/^file:\/\//iu.test(value)) return value;
-	try {
-		const fileUrl = new URL(value);
-		decodeURIComponent(fileUrl.pathname);
-		return fileURLToPath(fileUrl);
-	} catch {
-		return;
-	}
-}
 function readLocalMediaPath(value) {
 	if (!value) return;
 	if (/^file:\/\//iu.test(value)) return value;
@@ -590,7 +577,7 @@ async function runBoundTurn(params) {
 			const networkProxyConfigFingerprint = runtime.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;
+			let useStickyNetworkProfile = permissionProfile !== void 0 && !networkProxyBindingChanged;
 			assertNativeConversationApprovalPolicySupported(runtime);
 			const modelSelection = binding.model ? resolveCodexAppServerRequestModelSelection({
 				model: binding.model,
@@ -638,27 +625,44 @@ async function runBoundTurn(params) {
 						ownsNativeSubscription = true;
 					}
 				}
-				if (networkProxyBindingChanged) {
-					const response = assertCodexThreadStartResponse(await withLeasedCodexAppServerClientStartSelectionRetry({
+				if (networkProxyBindingChanged || binding.clientId !== client.getInstanceId() || isCodexAppServerClientRuntimeLive(client) && !params.incognito && !liveThreadOwnership) {
+					if (!networkProxyBindingChanged && binding.clientId === client.getInstanceId()) await assertResumeInputAllowed();
+					const result = await withLeasedCodexAppServerClientStartSelectionRetry({
 						lease: clientLease,
 						options: clientOptions,
 						run: async (requestClient, requestOptions) => {
 							const threadRequest = await buildConversationThreadRequestForClient(requestClient, threadRequestRuntime, serviceTier, requestOptions);
-							return await requestClient.request("thread/start", {
+							if (networkProxyBindingChanged) return await requestClient.request("thread/start", {
 								...threadRequest,
 								developerInstructions: CODEX_CONVERSATION_THREAD_DEVELOPER_INSTRUCTIONS,
 								experimentalRawEvents: true,
 								...params.incognito ? { ephemeral: true } : {}
 							}, requestOptions());
+							return await resumeCodexAppServerThread({
+								client: requestClient,
+								onSubscriptionReleased: () => {
+									isolatedSubscriptionClient = requestClient;
+								},
+								abandonClient: async () => {
+									await closeCodexStartupClientBestEffort(requestClient);
+									isolatedSubscriptionClient = requestClient;
+								},
+								request: {
+									threadId,
+									...threadRequest
+								},
+								requestResume: (request) => requestClient.request("thread/resume", request, requestOptions())
+							});
 						},
 						onClientChange: (nextClient) => {
 							client = nextClient;
 						}
-					}));
+					});
+					const response = networkProxyBindingChanged ? assertCodexThreadStartResponse(result) : result;
 					threadId = response.thread.id;
 					ownsNativeSubscription = true;
 					assertCodexThreadAcceptsDirectInput(response.thread);
-					if (liveThreadOwnership && (liveThreadOwnership.threadId !== threadId || liveThreadOwnership.client !== client)) {
+					if (networkProxyBindingChanged && liveThreadOwnership && (liveThreadOwnership.threadId !== threadId || liveThreadOwnership.client !== client)) {
 						const previousOwnership = liveThreadOwnership;
 						try {
 							await previousOwnership.ownership.release(previousOwnership.threadId);
@@ -668,20 +672,26 @@ async function runBoundTurn(params) {
 							throw error;
 						}
 						liveThreadOwnership = void 0;
-					} else if (binding.threadId !== threadId) await releaseCodexAppServerBindingSubscription(binding, { retainedClientId: client.getInstanceId() });
-					if (!await params.bindingStore.mutate(identity, {
+					} else if (networkProxyBindingChanged ? binding.threadId !== threadId : !isSameCodexAppServerThreadOwner(binding, {
+						threadId,
+						clientId: client.getInstanceId()
+					})) await releaseCodexAppServerBindingSubscription(binding, { retainedClientId: client.getInstanceId() });
+					const patch = {
+						clientId: client.getInstanceId(),
+						cwd: response.thread.cwd ?? (networkProxyBindingChanged ? workspaceDir : binding.cwd),
+						model: response.model ?? modelSelection?.model ?? binding.model,
+						modelProvider: normalizeCodexAppServerBindingModelProvider({
+							authProfileId: binding.authProfileId,
+							modelProvider: response.modelProvider ?? modelSelection?.modelProvider ?? binding.modelProvider,
+							...agentLookup
+						})
+					};
+					if (!await params.bindingStore.mutate(identity, networkProxyBindingChanged ? {
 						kind: "set",
 						binding: {
 							threadId,
-							clientId: client.getInstanceId(),
-							cwd: response.thread.cwd ?? workspaceDir,
+							...patch,
 							authProfileId: binding.authProfileId,
-							model: response.model ?? modelSelection?.model ?? binding.model,
-							modelProvider: normalizeCodexAppServerBindingModelProvider({
-								authProfileId: binding.authProfileId,
-								modelProvider: response.modelProvider ?? modelSelection?.modelProvider ?? binding.modelProvider,
-								...agentLookup
-							}),
 							serviceTier: serviceTier ?? void 0,
 							networkProxyProfileName: runtime.networkProxy?.profileName,
 							networkProxyConfigFingerprint: runtime.networkProxy?.configFingerprint,
@@ -689,56 +699,12 @@ async function runBoundTurn(params) {
 							conversationSourceTransferComplete: binding.conversationSourceTransferComplete,
 							historyCoveredThrough: binding.historyCoveredThrough
 						}
-					})) throw new Error("Codex conversation binding changed while rotating its thread.");
-					useStickyNetworkProfile = runtime.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) => {
-							const threadRequest = await buildConversationThreadRequestForClient(requestClient, threadRequestRuntime, serviceTier, requestOptions);
-							return await resumeCodexAppServerThread({
-								client: requestClient,
-								onSubscriptionReleased: () => {
-									isolatedSubscriptionClient = requestClient;
-								},
-								abandonClient: async () => {
-									await closeCodexStartupClientBestEffort(requestClient);
-									isolatedSubscriptionClient = requestClient;
-								},
-								request: {
-									threadId,
-									...threadRequest
-								},
-								requestResume: (request) => requestClient.request("thread/resume", request, requestOptions())
-							});
-						},
-						onClientChange: (nextClient) => {
-							client = nextClient;
-						}
-					});
-					threadId = response.thread.id;
-					ownsNativeSubscription = true;
-					assertCodexThreadAcceptsDirectInput(response.thread);
-					if (!isSameCodexAppServerThreadOwner(binding, {
-						threadId,
-						clientId: client.getInstanceId()
-					})) await releaseCodexAppServerBindingSubscription(binding, { retainedClientId: client.getInstanceId() });
-					if (!await params.bindingStore.mutate(identity, {
+					} : {
 						kind: "patch",
 						threadId: binding.threadId,
-						patch: {
-							clientId: client.getInstanceId(),
-							cwd: response.thread.cwd ?? binding.cwd,
-							model: response.model ?? modelSelection?.model ?? binding.model,
-							modelProvider: normalizeCodexAppServerBindingModelProvider({
-								authProfileId: binding.authProfileId,
-								modelProvider: response.modelProvider ?? modelSelection?.modelProvider ?? binding.modelProvider,
-								...agentLookup
-							})
-						}
-					})) throw new Error("Codex conversation binding changed while resuming on a new client.");
+						patch
+					})) throw new Error(networkProxyBindingChanged ? "Codex conversation binding changed while rotating its thread." : "Codex conversation binding changed while resuming on a new client.");
+					if (networkProxyBindingChanged) useStickyNetworkProfile = runtime.networkProxy !== void 0;
 				}
 				const turnCollector = createCodexConversationTurnCollector(threadId);
 				turnRoute = getCodexAppServerTurnRouter(client).reserveThread({
@@ -772,7 +738,7 @@ async function runBoundTurn(params) {
 				await turnRoute.bindTurn(activeTurnId);
 				const replyText = (await turnCollector.wait({ timeoutMs: params.timeoutMs ?? DEFAULT_BOUND_TURN_TIMEOUT_MS })).replyText.trim();
 				turnSucceeded = true;
-				return { reply: { text: replyText || "Codex completed without a text reply." } };
+				return { text: replyText || "Codex completed without a text reply." };
 			} catch (error) {
 				if (isCodexAppServerOverloadError(error) && error.method === "thread/resume") throw error;
 				if (error instanceof CodexThreadDirectInputError) {

package/dist/.setup/{conversation-binding-data-DJ4ix-W5.mjs → conversation-binding-data-UgLuTSQT.mjs}

@@ -1,5 +1,5 @@
-import { t as __exportAll } from "./session-binding-sidecars-BrdV95Fg.mjs";
-import { asOptionalRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { t as __exportAll } from "./session-binding-sidecars-DD-enC8w.mjs";
+import { asOptionalRecord, normalizeOptionalString, readNonBlankString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash, randomUUID } from "node:crypto";
 import process from "node:process";
 //#region extensions/codex/src/conversation-binding-data.ts
@@ -47,12 +47,14 @@ function readCodexConversationBindingData(binding) {
 }
 function readCodexConversationBindingDataRecord(data) {
 	if (data.kind === "codex-cli-node-session") {
-		if (data.version !== CLI_BINDING_DATA_VERSION || typeof data.nodeId !== "string" || !data.nodeId.trim() || typeof data.sessionId !== "string" || !data.sessionId.trim()) return;
+		const nodeId = normalizeOptionalString(data.nodeId);
+		const sessionId = normalizeOptionalString(data.sessionId);
+		if (data.version !== CLI_BINDING_DATA_VERSION || !nodeId || !sessionId) return;
 		return {
 			kind: "codex-cli-node-session",
 			version: CLI_BINDING_DATA_VERSION,
-			nodeId: data.nodeId.trim(),
-			sessionId: data.sessionId.trim(),
+			nodeId,
+			sessionId,
 			agentId: normalizeOptionalString(data.agentId),
 			cwd: normalizeOptionalString(data.cwd)
 		};
@@ -62,17 +64,16 @@ function readCodexConversationBindingDataRecord(data) {
 	if (!bindingId) return;
 	const start = readConversationStart(asOptionalRecord(data.start));
 	const source = readConversationSource(asOptionalRecord(data.source));
-	const legacyBinding = data.version === 1;
 	return {
 		kind: "codex-app-server-session",
 		version: APP_SERVER_BINDING_DATA_VERSION,
 		bindingId,
-		workspaceDir: typeof data.workspaceDir === "string" && data.workspaceDir.trim() ? data.workspaceDir : process.cwd(),
+		workspaceDir: readNonBlankString(data.workspaceDir) ?? process.cwd(),
 		agentId: normalizeOptionalString(data.agentId),
 		agentDir: normalizeOptionalString(data.agentDir),
 		...source ? { source } : {},
 		...start ? { start } : {},
-		...legacyBinding ? { legacyBinding: true } : {}
+		...data.version === 1 ? { legacyBinding: true } : {}
 	};
 }
 function readConversationSource(value) {