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

package/dist/.setup/{run-attempt-lifecycle-BuZgVbDA.mjs → run-attempt-lifecycle-KN4oh-7O.mjs}

@@ -1,7 +1,7 @@
-import { t as attemptTerminal } from "./attempt-terminal-gZrxQ35N.mjs";
+import { t as attemptTerminal } from "./attempt-terminal-jO5IMj9K.mjs";
 import path from "node:path";
 import fs from "node:fs/promises";
-import { awaitAgentEndSideEffects, embeddedAgentLog, formatErrorMessage, runAgentEndSideEffects } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { awaitAgentEndSideEffects, embeddedAgentLog, formatErrorMessage, runAgentCleanupStep, runAgentEndSideEffectsAsync } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { emitAgentHarnessAttemptEvent } from "openclaw/plugin-sdk/agent-harness-attempt-runtime";
 //#region extensions/codex/src/app-server/workspace-dir-cache.ts
 /** Process-local cache of Codex workspaces already created by the run loop. */
@@ -52,7 +52,7 @@ async function runCodexAgentEndHook(params, hookParams) {
 		await awaitAgentEndSideEffects(sideEffectParams);
 		return;
 	}
-	runAgentEndSideEffects(sideEffectParams);
+	await runAgentEndSideEffectsAsync(sideEffectParams);
 }
 function reportCodexBackgroundCleanupFailure(params, error) {
 	const message = formatErrorMessage(error);
@@ -69,5 +69,14 @@ function reportCodexBackgroundCleanupFailure(params, error) {
 		}
 	});
 }
+function runCodexCleanupStep(params, step, cleanup) {
+	return runAgentCleanupStep({
+		runId: params.runId,
+		sessionId: params.sessionId,
+		step,
+		log: embeddedAgentLog,
+		cleanup
+	});
+}
 //#endregion
-export { runCodexAgentEndHook as a, reportCodexBackgroundCleanupFailure as i, ensureCodexWorkspaceDirOnce as n, shouldKeepCodexSharedAbortOpen as o, estimateCodexAppServerProjectedTurnTokens as r, withCodexAppServerFastModeServiceTier as s, emitCodexAppServerEvent as t };
+export { runCodexAgentEndHook as a, withCodexAppServerFastModeServiceTier as c, reportCodexBackgroundCleanupFailure as i, ensureCodexWorkspaceDirOnce as n, runCodexCleanupStep as o, estimateCodexAppServerProjectedTurnTokens as r, shouldKeepCodexSharedAbortOpen as s, emitCodexAppServerEvent as t };

package/dist/.setup/{runtime-artifact-CUTOOnKw.mjs → runtime-artifact-C13pR7tD.mjs}

@@ -1,7 +1,7 @@
 import { n as isCodexAppServerProxyLaunch } from "./launch-args-DbFCehO7.mjs";
-import { a as resolvePackagedCodexNativeCommand } from "./managed-binary-C1VFoVPf.mjs";
-import { n as resolveCodexAppServerSpawnEnv, r as resolveCodexAppServerSpawnInvocation } from "./transport-stdio-a0HDa2Mj.mjs";
-import { captureCodexConfiguredConnection, finalizeCodexConfiguredConnection, isCodexConfiguredConnectionArtifact, validateCodexConfiguredConnectionCapture } from "./runtime-artifact-connection-CADz3_BY.mjs";
+import { a as resolvePackagedCodexNativeCommand } from "./managed-binary-BtIjV7yN.mjs";
+import { n as resolveCodexAppServerSpawnEnv, r as resolveCodexAppServerSpawnInvocation } from "./transport-stdio-CRWTkKOn.mjs";
+import { captureCodexConfiguredConnection, finalizeCodexConfiguredConnection, isCodexConfiguredConnectionArtifact, validateCodexConfiguredConnectionCapture } from "./runtime-artifact-connection-jS5DeCok.mjs";
 import { createHash } from "node:crypto";
 import { resolveWindowsExecutablePath } from "openclaw/plugin-sdk/windows-spawn";
 import { resolveGlobalSingleton } from "openclaw/plugin-sdk/global-singleton";
@@ -57,11 +57,16 @@ function throwIfAborted(signal) {
 function compareArtifactNames(left, right) {
 	return left < right ? -1 : left > right ? 1 : 0;
 }
-function normalizeRelativePath(filePath) {
-	return filePath.split(path.sep).join("/");
-}
+const ARTIFACT_STAT_FIELDS = [
+	"dev",
+	"ino",
+	"mode",
+	"size",
+	"mtimeNs",
+	"ctimeNs"
+];
 function sameOpenedFile(left, right) {
-	return left.dev === right.dev && left.ino === right.ino && left.mode === right.mode && left.size === right.size && left.mtimeNs === right.mtimeNs && left.ctimeNs === right.ctimeNs;
+	return ARTIFACT_STAT_FIELDS.every((field) => left[field] === right[field]);
 }
 async function readRegularFileFingerprint(params) {
 	throwIfAborted(params.signal);
@@ -111,7 +116,7 @@ async function listPackageFiles(params) {
 				continue;
 			}
 			if (!entry.isFile()) throw new Error(`Codex runtime artifact contains an unsupported entry: ${entryPath}`);
-			files.push(normalizeRelativePath(path.relative(params.rootPath, entryPath)));
+			files.push(path.relative(params.rootPath, entryPath).split(path.sep).join("/"));
 		}
 	};
 	await visit(params.rootPath, 0);
@@ -172,20 +177,13 @@ function attestNodeOptions(value) {
 			};
 		}
 		if (flag === "--disable-warning" && inlineValue && /^[A-Za-z][A-Za-z0-9_.:-]{0,63}$/u.test(inlineValue)) continue;
-		if (flag === "--dns-result-order") {
-			const order = inlineValue ?? tokens[++index];
-			if (order && SAFE_NODE_OPTIONS_DNS_RESULT_ORDERS.has(order)) continue;
-			return {
-				ok: false,
-				option: flag
-			};
-		}
-		if (!SAFE_NODE_OPTIONS_NUMERIC_FLAGS.has(flag)) return {
+		const dnsOrder = flag === "--dns-result-order";
+		if (!dnsOrder && !SAFE_NODE_OPTIONS_NUMERIC_FLAGS.has(flag)) return {
 			ok: false,
 			option: flag
 		};
-		const numericValue = inlineValue ?? tokens[++index];
-		if (!numericValue || !/^\d+$/u.test(numericValue)) return {
+		const argument = inlineValue ?? tokens[++index];
+		if (!argument || !(dnsOrder ? SAFE_NODE_OPTIONS_DNS_RESULT_ORDERS.has(argument) : /^\d+$/u.test(argument))) return {
 			ok: false,
 			option: flag
 		};
@@ -408,9 +406,7 @@ function isBoundedPath(value) {
 }
 function validateFilesystemDescriptorShape(descriptor) {
 	if (descriptor.version !== 1 || !isBoundedPath(descriptor.commandPath) || !isBoundedPath(descriptor.commandRealPath) || !isBoundedPath(descriptor.nativePath) || !isBoundedPath(descriptor.codeModeHostCandidatePath) || !Array.isArray(descriptor.invocationPaths) || descriptor.invocationPaths.length === 0 || descriptor.invocationPaths.length > MAX_ARTIFACT_INVOCATION_PATHS || descriptor.invocationPaths.some((entry) => !isBoundedPath(entry)) || !descriptor.invocationPaths.includes(descriptor.commandRealPath) || !/^[a-f0-9]{64}$/u.test(descriptor.argsFingerprint)) throw new Error("Invalid Codex runtime artifact descriptor");
-	if (descriptor.packageRoot) {
-		if (!isBoundedPath(descriptor.packageRoot) || path.dirname(path.dirname(descriptor.nativePath)) !== descriptor.packageRoot || path.basename(path.dirname(descriptor.nativePath)) !== "bin") throw new Error("Invalid Codex runtime package descriptor");
-	}
+	if (descriptor.packageRoot && (!isBoundedPath(descriptor.packageRoot) || path.dirname(path.dirname(descriptor.nativePath)) !== descriptor.packageRoot || path.basename(path.dirname(descriptor.nativePath)) !== "bin")) throw new Error("Invalid Codex runtime package descriptor");
 	if (descriptor.codeModeHostPath && !isBoundedPath(descriptor.codeModeHostPath)) throw new Error("Invalid Codex code-mode host artifact descriptor");
 	if (descriptor.commandSource !== void 0 && ![
 		"managed",

package/dist/.setup/{runtime-artifact-connection-CADz3_BY.mjs → runtime-artifact-connection-jS5DeCok.mjs}

@@ -1,6 +1,6 @@
-import { t as codexAppServerStartOptionsKey } from "./config-options-HG_Rr3W_.mjs";
-import "./config-runtime-cUYrqu_a.mjs";
-import { r as resolveCodexAppServerUnixSocketPath } from "./transport-websocket-zqJ0Cmtn.mjs";
+import { t as codexAppServerStartOptionsKey } from "./config-options-DDzeNQ8m.mjs";
+import "./config-runtime-DWzK-k0n.mjs";
+import { r as resolveCodexAppServerUnixSocketPath } from "./transport-websocket-DIyPfkHo.mjs";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import path from "node:path";

package/dist/.setup/{sandbox-guard-WqE8yPge.mjs → sandbox-guard-DIImwCy1.mjs}

@@ -1,6 +1,6 @@
-import { l as isCodexRemoteExecPlacementSandbox } from "./config-parsing-BQq-CHTF.mjs";
-import { n as resolveCodexNativeExecutionPolicy, t as formatCodexNativeNodeExecBlock } from "./native-execution-policy-ClzpdG3D.mjs";
-import { t as __exportAll } from "./session-binding-sidecars-BrdV95Fg.mjs";
+import { l as isCodexRemoteExecPlacementSandbox } from "./config-parsing-DsWSCPHO.mjs";
+import { n as resolveCodexNativeExecutionPolicy, t as formatCodexNativeNodeExecBlock } from "./native-execution-policy-MXEe7PB3.mjs";
+import { t as __exportAll } from "./session-binding-sidecars-DD-enC8w.mjs";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { tryResolveDefaultAgentId } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { parseAgentSessionKey } from "openclaw/plugin-sdk/routing";
@@ -72,9 +72,7 @@ function resolveCodexAppServerDirectSandboxBypassBlock(params) {
 		sandbox: params.sandbox,
 		surface: `app-server method \`${params.method}\``
 	});
-	if (!sandboxBlock) return;
-	if (params.method === "thread/start" && hasOpenClawSandboxEnvironmentSelection(params.requestParams)) return;
-	return sandboxBlock;
+	return sandboxBlock && params.method === "thread/start" && hasOpenClawSandboxEnvironmentSelection(params.requestParams) ? void 0 : sandboxBlock;
 }
 /** Resolves the generic native-execution block for sandboxed or node-hosted sessions. */
 function resolveCodexNativeExecutionBlock(params) {

package/dist/.setup/service-tier-normalization-BPgw2Wdt.mjs

@@ -0,0 +1,9 @@
+//#region extensions/codex/src/app-server/service-tier-normalization.ts
+function normalizeCodexServiceTier(value) {
+	const trimmed = typeof value === "string" ? value.trim() : "";
+	if (!trimmed) return;
+	const normalized = trimmed.toLowerCase();
+	return normalized === "fast" || normalized === "priority" ? "priority" : normalized === "flex" ? "flex" : trimmed;
+}
+//#endregion
+export { normalizeCodexServiceTier as t };

package/dist/.setup/{session-binding-Ce7BqiPN.mjs → session-binding-JEHNMPsr.mjs}

@@ -1,27 +1,13 @@
-import { i as adoptCodexNativeSubagentSubmissions, n as mutateNativePendingAssignments, o as mutateCodexNativeSubagentSubmissions } from "./native-subagent-pending-assignments-BDqhOdJp.mjs";
-import { a as readStoredCodexAppServerBinding, i as readCodexBindingTimestamp, n as matchesPendingSupervisionBranch, o as stripUndefinedBinding, r as readCodexAppServerThreadBinding, s as validateBindingForWrite } from "./session-binding-record-codec-z4ZpDn6E.mjs";
-import { a as ownsStoredSessionGeneration, c as preserveNativeTaskImport, d as readCurrentCodexNativeSubagentSubmissions, f as readCurrentNativePendingAssignments, i as matchesCodexNativeSubagentSubmissionBinding, l as readCurrentCodexAppServerBinding, m as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced, o as preserveCodexNativeSubagentSubmissions, p as readPluginAppPolicyContext, r as bindingStoreKey, s as preserveNativePendingAssignments, t as CodexSupervisionBindingReplacementError, u as readCurrentCodexAppServerBindings } from "./session-binding-record-BZB8RgcF.mjs";
+import { i as adoptCodexNativeSubagentSubmissions, n as mutateNativePendingAssignments, o as mutateCodexNativeSubagentSubmissions } from "./native-subagent-pending-assignments-DmVhedNs.mjs";
+import { a as readStoredCodexAppServerBinding, i as readCodexBindingTimestamp, n as matchesPendingSupervisionBranch, o as stripUndefinedBinding, r as readCodexAppServerThreadBinding, s as validateBindingForWrite } from "./session-binding-record-codec-BpH8u_G9.mjs";
+import { a as ownsStoredSessionGeneration, c as preserveNativeTaskImport, d as readCurrentCodexNativeSubagentSubmissions, f as readCurrentNativePendingAssignments, i as matchesCodexNativeSubagentSubmissionBinding, l as readCurrentCodexAppServerBinding, m as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced, o as preserveCodexNativeSubagentSubmissions, p as readPluginAppPolicyContext, r as bindingStoreKey, s as preserveNativePendingAssignments, t as CodexSupervisionBindingReplacementError, u as readCurrentCodexAppServerBindings } from "./session-binding-record-DU_0biMD.mjs";
 import { a as PHYSICAL_SESSION_RETIRE_TTL_MS, i as CODEX_APP_SERVER_BINDING_NAMESPACE, n as CODEX_APP_SERVER_BINDING_LEASE, r as CODEX_APP_SERVER_BINDING_MAX_ENTRIES, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-meta-Lkm5Lpf4.mjs";
 import { n as normalizeCodexAppServerBindingModelProvider } from "./auth-profile-CgHQ8Vot.mjs";
-import { t as __exportAll } from "./session-binding-sidecars-BrdV95Fg.mjs";
+import { t as __exportAll } from "./session-binding-sidecars-DD-enC8w.mjs";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import { AgentHarnessSessionSupersededError, embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
-import { combineNativeSessionBindingAuthority as combineCodexBindingAuthority, createNativeSessionBindingLifecycle, prepareNativeSessionGenerationAuthority, reclaimNativeSessionGenerationWithAuthority, resolveNativeSessionBindingWithAuthority } from "openclaw/plugin-sdk/agent-harness-session-runtime";
-//#region extensions/codex/src/app-server/session-binding-authority.ts
-/** Decides whether a run may share the durable stable-key binding owner. */
-async function resolveCodexRunSessionBindingAuthority(params) {
-	return (await prepareNativeSessionGenerationAuthority({
-		...params,
-		target: params.identity,
-		createSupersededError: createCodexSessionGenerationSupersededError
-	})).state;
-}
-/** Builds the terminal coordination error used when a newer OpenClaw session owns the binding. */
-function createCodexSessionGenerationSupersededError(sessionId) {
-	return new AgentHarnessSessionSupersededError(`Codex session generation is no longer current: ${sessionId}`);
-}
-//#endregion
+import { combineNativeSessionBindingAuthority as combineCodexBindingAuthority, createNativeSessionBindingLifecycle, reclaimNativeSessionGenerationWithAuthority, resolveNativeSessionBindingWithAuthority } from "openclaw/plugin-sdk/agent-harness-session-runtime";
 //#region extensions/codex/src/app-server/session-binding-native-mutations.ts
 /** The caller supplies the transaction's freshly parsed row and current-authority closure. */
 function mutateNativeSubagentBinding({ identity, current, mutation, assertCurrent }) {
@@ -57,15 +43,11 @@ const BOUNDED_BINDING_FINGERPRINT_PATTERN = /^sha256:[a-f0-9]{64}$/i;
 function hashCodexAppServerBindingFingerprint(canonical) {
 	return `sha256:${createHash("sha256").update(canonical).digest("hex")}`;
 }
-function normalizeLegacyBindingFingerprint(value) {
-	if (typeof value !== "string" || value === "" || value === "[]" || BOUNDED_BINDING_FINGERPRINT_PATTERN.test(value)) return value;
-	return hashCodexAppServerBindingFingerprint(value);
-}
 function normalizeLegacyBindingFingerprints(record) {
 	let normalized = record;
 	for (const key of ["dynamicToolsFingerprint", "userMcpServersFingerprint"]) {
 		const value = record[key];
-		const next = normalizeLegacyBindingFingerprint(value);
+		const next = typeof value === "string" && value !== "" && value !== "[]" && !BOUNDED_BINDING_FINGERPRINT_PATTERN.test(value) ? hashCodexAppServerBindingFingerprint(value) : value;
 		if (next === value) continue;
 		if (normalized === record) normalized = { ...record };
 		Object.assign(normalized, { [key]: next });
@@ -127,7 +109,6 @@ var session_binding_exports = /* @__PURE__ */ __exportAll({
 	readCodexAppServerThreadBinding: () => readCodexAppServerThreadBinding,
 	readStoredCodexAppServerBinding: () => readStoredCodexAppServerBinding,
 	reclaimCurrentCodexSessionGeneration: () => reclaimCurrentCodexSessionGeneration,
-	resolveCodexRunSessionBindingAuthority: () => resolveCodexRunSessionBindingAuthority,
 	resolveCodexSessionBinding: () => resolveCodexSessionBinding,
 	sessionBindingIdentity: () => sessionBindingIdentity,
 	validateBindingForWrite: () => validateBindingForWrite
@@ -144,6 +125,10 @@ async function clearCodexBindingForClient(store, identity, thread, authority) {
 function bindingLeaseLostError(key, cause) {
 	return new Error(`Lost Codex binding lease: ${key}`, cause === void 0 ? void 0 : { cause });
 }
+/** Builds the terminal coordination error used when a newer OpenClaw session owns the binding. */
+function createCodexSessionGenerationSupersededError(sessionId) {
+	return new AgentHarnessSessionSupersededError(`Codex session generation is no longer current: ${sessionId}`);
+}
 /** Lets the authoritative OpenClaw session generation claim a stale stable binding row. */
 async function reclaimCurrentCodexSessionGeneration(params) {
 	return await reclaimNativeSessionGenerationWithAuthority({
@@ -294,20 +279,8 @@ function createCodexAppServerBindingStore(state) {
 						if (identity.kind !== "session" || !identity.sessionKey?.trim()) return { result: false };
 						if (!current) return { result: true };
 						if (ownsGeneration) {
-							if (current.state === "cleared" && current.retired === true && current.sessionId === mutation.expectedPreviousSessionId) return {
-								result: true,
-								next: {
-									version: 1,
-									state: "cleared",
-									sessionId: identity.sessionId,
-									...preserveNativeTaskImport(current),
-									...ownedLease
-								}
-							};
-							return { result: current.state !== "cleared" || current.retired !== true };
-						}
-						if (current.sessionId !== mutation.expectedPreviousSessionId) return { result: false };
-						if (current.state === "active" && current.binding.connectionScope === "supervision") return { result: false };
+							if (current.state !== "cleared" || current.retired !== true || current.sessionId !== mutation.expectedPreviousSessionId) return { result: current.state !== "cleared" || current.retired !== true };
+						} else if (current.sessionId !== mutation.expectedPreviousSessionId || current.state === "active" && current.binding.connectionScope === "supervision") return { result: false };
 						return {
 							result: true,
 							next: {
@@ -430,4 +403,4 @@ function preservedSessionGeneration(identity, current) {
 	return storedSessionGeneration(identity, current);
 }
 //#endregion
-export { hashCodexAppServerBindingFingerprint as a, session_binding_exports as i, reclaimCurrentCodexSessionGeneration as n, createCodexSessionGenerationSupersededError as o, resolveCodexSessionBinding as r, resolveCodexRunSessionBindingAuthority as s, clearCodexBindingForClient as t };
+export { session_binding_exports as a, resolveCodexSessionBinding as i, createCodexSessionGenerationSupersededError as n, hashCodexAppServerBindingFingerprint as o, reclaimCurrentCodexSessionGeneration as r, clearCodexBindingForClient as t };

package/dist/.setup/{session-binding-record-BZB8RgcF.mjs → session-binding-record-DU_0biMD.mjs}

@@ -1,6 +1,6 @@
-import { a as matchesCodexNativeSubagentSubmissionOwner, h as codexNativeSubagentHistoryConnectionFingerprint, r as readNativePendingAssignments, s as readCodexNativeSubagentSubmissions, t as matchesNativeAssignmentLifecycle } from "./native-subagent-pending-assignments-BDqhOdJp.mjs";
-import { a as readStoredCodexAppServerBinding, t as legacyAppPolicyEntrySchema } from "./session-binding-record-codec-z4ZpDn6E.mjs";
-import { t as __exportAll } from "./session-binding-sidecars-BrdV95Fg.mjs";
+import { a as matchesCodexNativeSubagentSubmissionOwner, h as codexNativeSubagentHistoryConnectionFingerprint, r as readNativePendingAssignments, s as readCodexNativeSubagentSubmissions, t as matchesNativeAssignmentLifecycle } from "./native-subagent-pending-assignments-DmVhedNs.mjs";
+import { a as readStoredCodexAppServerBinding, t as legacyAppPolicyEntrySchema } from "./session-binding-record-codec-BpH8u_G9.mjs";
+import { t as __exportAll } from "./session-binding-sidecars-DD-enC8w.mjs";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
@@ -94,7 +94,7 @@ function matchesCodexNativeSubagentSubmissionBinding(binding, owner) {
 }
 /** Unknown metadata stays opaque through ordinary binding writes. */
 function preserveCodexNativeSubagentSubmissions(currentBinding, nextBinding, value) {
-	return currentBinding.threadId === nextBinding.threadId && codexNativeSubagentHistoryConnectionFingerprint(currentBinding) === codexNativeSubagentHistoryConnectionFingerprint(nextBinding) && isDeepStrictEqual(currentBinding.pendingSupervisionBranch, nextBinding.pendingSupervisionBranch) ? value : void 0;
+	return currentBinding.threadId === nextBinding.threadId ? preserveNativePendingAssignments(currentBinding, nextBinding, value) : void 0;
 }
 function readCurrentCodexNativeSubagentSubmissions(state, identity, owner) {
 	const stored = readCurrentNativeSubagentBinding(state, identity, owner);

package/dist/.setup/{session-binding-record-codec-z4ZpDn6E.mjs → session-binding-record-codec-BpH8u_G9.mjs}

@@ -1,4 +1,5 @@
-import { n as CODEX_PLUGIN_MARKETPLACE_NAME_PATTERN, t as normalizeCodexServiceTier } from "./service-tier-normalization-Cei89SW6.mjs";
+import { t as CODEX_PLUGIN_MARKETPLACE_NAME_PATTERN } from "./config-contracts.shared-D85SGEuq.mjs";
+import { t as normalizeCodexServiceTier } from "./service-tier-normalization-BPgw2Wdt.mjs";
 import { z } from "zod";
 //#region extensions/codex/src/app-server/session-binding-record-codec.ts
 /** Canonical persisted binding codec; safe to load before worker transaction admission. */
@@ -117,45 +118,22 @@ const threadBindingSchema = z.object({
 		inputTokens: z.number().int().positive()
 	}).optional().catch(void 0)
 }).superRefine((binding, context) => {
-	if (binding.connectionScope === "supervision") {
-		if (!binding.supervisionSourceThreadId) context.addIssue({
-			code: "custom",
-			message: "supervision connection ownership requires its native source thread id"
-		});
-		if (binding.preserveNativeModel !== true) context.addIssue({
-			code: "custom",
-			message: "supervision connection ownership requires native model ownership"
-		});
-		if (binding.conversationSourceTransferComplete !== true) context.addIssue({
-			code: "custom",
-			message: "supervision connection ownership requires a completed source transfer"
-		});
-		if (!binding.pendingSupervisionBranch && (!binding.model?.trim() || !binding.modelProvider)) context.addIssue({
-			code: "custom",
-			message: "materialized supervision bindings require a native model and provider"
-		});
-	}
-	if (binding.supervisionSourceThreadId && binding.connectionScope !== "supervision") context.addIssue({
+	const report = (message) => context.addIssue({
 		code: "custom",
-		message: "a supervision source thread id requires supervision connection ownership"
+		message
 	});
+	if (binding.connectionScope === "supervision") {
+		if (!binding.supervisionSourceThreadId) report("supervision connection ownership requires its native source thread id");
+		if (binding.preserveNativeModel !== true) report("supervision connection ownership requires native model ownership");
+		if (binding.conversationSourceTransferComplete !== true) report("supervision connection ownership requires a completed source transfer");
+		if (!binding.pendingSupervisionBranch && (!binding.model?.trim() || !binding.modelProvider)) report("materialized supervision bindings require a native model and provider");
+	}
+	if (binding.supervisionSourceThreadId && binding.connectionScope !== "supervision") report("a supervision source thread id requires supervision connection ownership");
 	if (!binding.pendingSupervisionBranch) return;
-	if (binding.threadId !== binding.pendingSupervisionBranch.sourceThreadId) context.addIssue({
-		code: "custom",
-		message: "pending supervision source must match the provisional thread binding"
-	});
-	if (binding.supervisionSourceThreadId !== binding.pendingSupervisionBranch.sourceThreadId) context.addIssue({
-		code: "custom",
-		message: "pending supervision source must match its durable source identity"
-	});
-	if (binding.preserveNativeModel !== true) context.addIssue({
-		code: "custom",
-		message: "pending supervision bindings must defer model selection to Codex App Server"
-	});
-	if (binding.connectionScope !== "supervision") context.addIssue({
-		code: "custom",
-		message: "pending supervision bindings require supervision connection ownership"
-	});
+	if (binding.threadId !== binding.pendingSupervisionBranch.sourceThreadId) report("pending supervision source must match the provisional thread binding");
+	if (binding.supervisionSourceThreadId !== binding.pendingSupervisionBranch.sourceThreadId) report("pending supervision source must match its durable source identity");
+	if (binding.preserveNativeModel !== true) report("pending supervision bindings must defer model selection to Codex App Server");
+	if (binding.connectionScope !== "supervision") report("pending supervision bindings require supervision connection ownership");
 });
 function matchesPendingSupervisionBranch(binding, expected) {
 	const pending = binding?.pendingSupervisionBranch;
@@ -198,8 +176,7 @@ function validateBindingForWrite(binding) {
 /** Parses stored or shipped sidecar data into the current domain value. */
 function readCodexAppServerThreadBinding(value) {
 	const result = threadBindingSchema.safeParse(value);
-	if (!result.success) return;
-	return result.data;
+	return result.success ? result.data : void 0;
 }
 function stripUndefinedBinding(binding) {
 	return stripUndefinedValue(binding);

package/dist/.setup/{session-binding-sidecars-BrdV95Fg.mjs → session-binding-sidecars-DD-enC8w.mjs}

@@ -220,20 +220,23 @@ async function readLegacySessionIndex(storePath) {
 	for (const [sessionKey, value] of Object.entries(raw)) {
 		if (!isRecord(value)) return { failure: `session index ${storePath} has invalid entries` };
 		if (value.sessionId === void 0) continue;
-		const sessionId = typeof value.sessionId === "string" ? value.sessionId.trim() : "";
-		const sessionFile = value.sessionFile;
-		const lifecycleRevision = value.lifecycleRevision;
-		const agentHarnessId = value.agentHarnessId;
-		if (!isSafeLegacySessionId(value.sessionId) || sessionFile !== void 0 && typeof sessionFile !== "string" || lifecycleRevision !== void 0 && typeof lifecycleRevision !== "string" || agentHarnessId !== void 0 && typeof agentHarnessId !== "string") return { failure: `session index ${storePath} has invalid entries` };
+		if (!isSafeLegacySessionId(value.sessionId)) return { failure: `session index ${storePath} has invalid entries` };
+		const entry = { sessionId: value.sessionId.trim() };
+		for (const key of [
+			"sessionFile",
+			"lifecycleRevision",
+			"agentHarnessId"
+		]) {
+			const field = value[key];
+			if (field !== void 0) {
+				if (typeof field !== "string") return { failure: `session index ${storePath} has invalid entries` };
+				entry[key] = field;
+			}
+		}
+		if (typeof value.updatedAt === "number" && Number.isFinite(value.updatedAt) && value.updatedAt >= 0) entry.updatedAt = value.updatedAt;
 		entries.push({
 			sessionKey,
-			entry: {
-				sessionId,
-				...typeof sessionFile === "string" ? { sessionFile } : {},
-				...typeof lifecycleRevision === "string" ? { lifecycleRevision } : {},
-				...typeof agentHarnessId === "string" ? { agentHarnessId } : {},
-				...typeof value.updatedAt === "number" && Number.isFinite(value.updatedAt) && value.updatedAt >= 0 ? { updatedAt: value.updatedAt } : {}
-			}
+			entry
 		});
 	}
 	return { entries };
@@ -304,21 +307,17 @@ async function collectSessionSurfaces(params) {
 async function collectLegacyBindingSources(params, options = {}) {
 	const surfaces = await collectSessionSurfaces(params);
 	const sources = /* @__PURE__ */ new Map();
-	const addSource = async (sidecarPath, surface) => {
-		const canonicalSidecar = await canonicalPathFromExistingAncestor(sidecarPath);
-		const source = sources.get(canonicalSidecar) ?? {
-			sidecarPath: canonicalSidecar,
-			transcriptPath: sidecarPath.slice(0, -22),
-			agentIds: /* @__PURE__ */ new Set()
-		};
-		for (const agentId of surface.agentIds) source.agentIds.add(agentId);
-		sources.set(canonicalSidecar, source);
-		return source;
-	};
 	for (const surface of surfaces) {
 		const sidecars = surface.scan ? walkSidecars(surface.root) : iterateIndexedSidecars(surface);
 		for await (const sidecarPath of sidecars) {
-			const source = await addSource(sidecarPath, surface);
+			const canonicalSidecar = await canonicalPathFromExistingAncestor(sidecarPath);
+			const source = sources.get(canonicalSidecar) ?? {
+				sidecarPath: canonicalSidecar,
+				transcriptPath: sidecarPath.slice(0, -22),
+				agentIds: /* @__PURE__ */ new Set()
+			};
+			for (const agentId of surface.agentIds) source.agentIds.add(agentId);
+			sources.set(canonicalSidecar, source);
 			if (options.firstOnly) return {
 				sources: [source],
 				surfaces
@@ -368,7 +367,6 @@ async function* walkSidecars(root) {
 async function collectBindingOwners(sources, surfaces, params) {
 	const sourcePaths = new Set(await Promise.all(sources.map((source) => canonicalPathFromExistingAncestor(source.transcriptPath))));
 	const owners = /* @__PURE__ */ new Map();
-	const storePaths = new Set(surfaces.flatMap((surface) => [...surface.storePaths]));
 	const storeAgentIds = /* @__PURE__ */ new Map();
 	for (const surface of surfaces) for (const storePath of surface.storePaths) {
 		const agents = storeAgentIds.get(storePath) ?? /* @__PURE__ */ new Set();
@@ -376,7 +374,7 @@ async function collectBindingOwners(sources, surfaces, params) {
 		storeAgentIds.set(storePath, agents);
 	}
 	const failures = [];
-	for (const storePath of storePaths) {
+	for (const [storePath, agentIds] of storeAgentIds) {
 		const canonicalStorePath = await canonicalPathFromExistingAncestor(storePath);
 		const index = await readLegacySessionIndex(storePath);
 		if ("failure" in index) {
@@ -389,7 +387,7 @@ async function collectBindingOwners(sources, surfaces, params) {
 			const agentId = tryResolveLegacyBindingOwnerAgentId({
 				sessionKey,
 				config: params.config,
-				storeAgentIds: storeAgentIds.get(storePath)
+				storeAgentIds: agentIds
 			});
 			if (!agentId) {
 				failures.push(`session index ${storePath} has an ambiguous owner for ${sessionKey}`);
@@ -484,7 +482,7 @@ async function migrateSource(source, candidates, params, store) {
 		return await withFileLock(source.sidecarPath, LEGACY_BINDING_LOCK_OPTIONS, async () => {
 			const [contents, stat] = await Promise.all([fs.readFile(source.sidecarPath, "utf8"), fs.stat(source.sidecarPath)]);
 			const raw = JSON.parse(contents);
-			const [{ bindingStoreKey, createStoredCodexAppServerBinding, normalizeStoredCodexAppServerBindingFingerprints, readStoredCodexAppServerBinding }, { legacyCodexConversationBindingId }] = await Promise.all([import("./session-binding-Ce7BqiPN.mjs").then((n) => n.i), import("./conversation-binding-data-DJ4ix-W5.mjs").then((n) => n.t)]);
+			const [{ bindingStoreKey, createStoredCodexAppServerBinding, normalizeStoredCodexAppServerBindingFingerprints, readStoredCodexAppServerBinding }, { legacyCodexConversationBindingId }] = await Promise.all([import("./session-binding-JEHNMPsr.mjs").then((n) => n.a), import("./conversation-binding-data-UgLuTSQT.mjs").then((n) => n.t)]);
 			const agentId = owner?.agentId ?? (source.agentIds.size === 1 ? [...source.agentIds][0] : void 0);
 			const baseStored = createStoredCodexAppServerBinding(raw, {
 				now: stat.mtime.toISOString(),
@@ -509,46 +507,45 @@ async function migrateSource(source, candidates, params, store) {
 				kind: "conversation",
 				bindingId: legacyCodexConversationBindingId(sessionFile)
 			}));
-			const normalizeStoredRow = async (key, current) => {
+			const readNormalizedRow = async (key) => {
+				const current = await store.lookup(key);
+				if (current === void 0) return;
 				const parsed = readStoredCodexAppServerBinding(current);
-				if (!parsed) return { warning: `canonical plugin state is invalid at ${key}` };
+				if (!parsed) return `canonical plugin state is invalid at ${key}`;
 				const normalized = normalizeStoredCodexAppServerBindingFingerprints(parsed);
-				if (!normalized) return { warning: `canonical plugin state is invalid at ${key}` };
-				if (isDeepStrictEqual(parsed, normalized)) return { value: parsed };
-				if (parsed.lease && parsed.lease.expiresAt > Date.now()) return { warning: `canonical plugin state is leased at ${key}` };
+				if (!normalized) return `canonical plugin state is invalid at ${key}`;
+				if (isDeepStrictEqual(parsed, normalized)) return parsed;
+				if (parsed.lease && parsed.lease.expiresAt > Date.now()) return `canonical plugin state is leased at ${key}`;
 				const update = store.update;
-				if (!update) return { warning: `canonical plugin state could not be normalized at ${key}` };
+				if (!update) return `canonical plugin state could not be normalized at ${key}`;
 				await update(key, (candidate) => {
 					const candidateParsed = readStoredCodexAppServerBinding(candidate);
 					if (!candidateParsed || !isDeepStrictEqual(candidateParsed, parsed)) return;
 					return normalized;
 				});
 				const persisted = readStoredCodexAppServerBinding(await store.lookup(key));
-				if (!persisted || !isDeepStrictEqual(persisted, normalized)) return { warning: `canonical plugin state changed at ${key}` };
+				if (!persisted || !isDeepStrictEqual(persisted, normalized)) return `canonical plugin state changed at ${key}`;
 				importedKeys++;
-				return { value: normalized };
+				return normalized;
 			};
 			let currentConversation;
 			for (const key of conversationKeys) {
-				const current = await store.lookup(key);
-				if (current === void 0) continue;
-				const result = await normalizeStoredRow(key, current);
-				if (result.warning || !result.value) return retain(result.warning ?? `canonical plugin state is invalid at ${key}`);
-				currentConversation ??= result.value;
+				const current = await readNormalizedRow(key);
+				if (typeof current === "string") return retain(current);
+				currentConversation ??= current;
 			}
 			const stored = currentConversation ?? baseStored;
-			const sessionKey = owner ? bindingStoreKey({
-				kind: "session",
-				agentId: owner.agentId,
-				sessionId: owner.sessionId,
-				sessionKey: owner.sessionKey
-			}) : void 0;
 			const conversationEntries = conversationKeys.map((key) => ({
 				key,
 				value: stored
 			}));
-			const sessionEntry = owner && sessionKey ? {
-				key: sessionKey,
+			const sessionEntry = owner ? {
+				key: bindingStoreKey({
+					kind: "session",
+					agentId: owner.agentId,
+					sessionId: owner.sessionId,
+					sessionKey: owner.sessionKey
+				}),
 				value: copyBindingForSession(stored, owner.sessionId)
 			} : void 0;
 			const entries = [...conversationEntries, ...sessionEntry ? [sessionEntry] : []];
@@ -558,11 +555,9 @@ async function migrateSource(source, candidates, params, store) {
 				return target.state === "cleared" ? parsed.state === "cleared" && parsed.sessionId === target.sessionId && parsed.retired === target.retired : parsed.state === "active" && parsed.sessionId === target.sessionId && isDeepStrictEqual(parsed.binding, target.binding);
 			};
 			for (const entry of entries) {
-				const current = await store.lookup(entry.key);
-				if (current === void 0) continue;
-				const result = await normalizeStoredRow(entry.key, current);
-				if (result.warning || !result.value) return retain(result.warning ?? `canonical plugin state is invalid at ${entry.key}`);
-				if (!hasExpected(result.value, entry.value)) return retain(`canonical plugin state changed at ${entry.key}`);
+				const current = await readNormalizedRow(entry.key);
+				if (typeof current === "string") return retain(current);
+				if (current && !hasExpected(current, entry.value)) return retain(`canonical plugin state changed at ${entry.key}`);
 			}
 			for (const entry of entries) {
 				if (await store.registerIfAbsent(entry.key, entry.value)) importedKeys++;

package/dist/.setup/{session-catalog-adoption-CPIP4S_y.mjs → session-catalog-adoption-Ca3OYGYM.mjs}

@@ -1,8 +1,8 @@
-import { T as requireBoundThread, d as boundedCatalogString, o as CatalogParamsError } from "./session-catalog-parsing-B-qWJh2x.mjs";
-import { m as sessionBindingIdentity } from "./session-binding-record-BZB8RgcF.mjs";
+import { T as requireBoundThread, d as boundedCatalogString, o as CatalogParamsError } from "./session-catalog-parsing-DkeoVn60.mjs";
+import { m as sessionBindingIdentity } from "./session-binding-record-DU_0biMD.mjs";
 import { n as codexUpstreamBaseline, t as codexLastTerminalTurnId } from "./session-upstream-marker-D15C9NHp.mjs";
-import { n as reclaimCurrentCodexSessionGeneration } from "./session-binding-Ce7BqiPN.mjs";
-import { adoptionSessionKeyRest, catalogSessionActions } from "./session-catalog-node-adoption-7-WEQTB1.mjs";
+import { r as reclaimCurrentCodexSessionGeneration } from "./session-binding-JEHNMPsr.mjs";
+import { adoptionSessionKeyRest, catalogSessionActions } from "./session-catalog-node-adoption-BdP9Zjqo.mjs";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { listSessionCatalogEntries, sessionCatalogAdoptedSessionKey, sessionCatalogAdoptedSourceKey } from "openclaw/plugin-sdk/session-catalog";
 //#region extensions/codex/src/session-catalog-adoption.ts
@@ -34,34 +34,30 @@ function readCodexSupervisionMarker(entry) {
 	};
 }
 async function listAdoptedSessionEntries(params) {
-	const candidateForEntry = ({ agentId, entry, sessionKey }) => {
-		const sessionKeyRest = adoptionSessionKeyRest(sessionKey);
-		const marker = readCodexSupervisionMarker(entry);
-		if (!sessionKeyRest.startsWith(CODEX_SUPERVISION_SESSION_KEY_PREFIX) || !marker || entry.initializationPending === true || entry.agentHarnessId !== "codex" || entry.modelSelectionLocked !== true) return;
-		const sessionId = entry.sessionId?.trim();
-		if (!sessionId) return;
-		return {
-			agentId,
-			sessionKey,
-			sessionKeyRest,
-			sessionId,
-			marker,
-			identity: sessionBindingIdentity({
-				sessionId,
-				sessionKey,
-				config: params.config
-			})
-		};
-	};
 	function* candidates() {
-		for (const entry of listSessionCatalogEntries({
+		for (const { agentId, entry, sessionKey } of listSessionCatalogEntries({
 			...params.agentId ? { agentId: params.agentId } : {},
 			config: params.config ?? {},
 			runtime: params.runtime,
 			sessionEntries: params.sessionEntries
 		})) {
-			const candidate = candidateForEntry(entry);
-			if (candidate) yield candidate;
+			const sessionKeyRest = adoptionSessionKeyRest(sessionKey);
+			const marker = readCodexSupervisionMarker(entry);
+			if (!sessionKeyRest.startsWith(CODEX_SUPERVISION_SESSION_KEY_PREFIX) || !marker || entry.initializationPending === true || entry.agentHarnessId !== "codex" || entry.modelSelectionLocked !== true) continue;
+			const sessionId = entry.sessionId?.trim();
+			if (!sessionId) continue;
+			yield {
+				agentId,
+				sessionKey,
+				sessionKeyRest,
+				sessionId,
+				marker,
+				identity: sessionBindingIdentity({
+					sessionId,
+					sessionKey,
+					config: params.config
+				})
+			};
 		}
 	}
 	const collect = async (selected, readBinding = async (identity) => {
@@ -168,7 +164,7 @@ async function createOrReuseAdoptedSession(params) {
 			sourceThreadId: params.sourceThread.id,
 			...params.sourceHomeId ? { sourceHomeId: params.sourceHomeId } : {}
 		};
-		const { createImportedCodexSession } = await import("./session-history-import-NWKPa4ZO.mjs");
+		const { createImportedCodexSession } = await import("./session-history-import-CaO8s6ta.mjs");
 		const created = await createImportedCodexSession({
 			runtime: params.api.runtime,
 			bindingStore: params.bindingStore,

package/dist/.setup/{session-catalog-archive-DcgwvSbF.mjs → session-catalog-archive-Bv6gV7x9.mjs}

@@ -1,9 +1,9 @@
-import { o as CatalogParamsError } from "./session-catalog-parsing-B-qWJh2x.mjs";
-import { m as sessionBindingIdentity } from "./session-binding-record-BZB8RgcF.mjs";
-import { t as assertCodexArchiveDescendantsUnowned } from "./thread-archive-guard-C9frICzX.mjs";
-import "./session-binding-Ce7BqiPN.mjs";
-import { catalogSessionActions } from "./session-catalog-node-adoption-7-WEQTB1.mjs";
-import { isAdoptionSessionKeyForThread, requireIdleThread } from "./session-catalog-adoption-CPIP4S_y.mjs";
+import { o as CatalogParamsError } from "./session-catalog-parsing-DkeoVn60.mjs";
+import { m as sessionBindingIdentity } from "./session-binding-record-DU_0biMD.mjs";
+import { t as assertCodexArchiveDescendantsUnowned } from "./thread-archive-guard-LKdwQKyr.mjs";
+import "./session-binding-JEHNMPsr.mjs";
+import { catalogSessionActions } from "./session-catalog-node-adoption-BdP9Zjqo.mjs";
+import { isAdoptionSessionKeyForThread, requireIdleThread } from "./session-catalog-adoption-Ca3OYGYM.mjs";
 import { listAgentIds } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { sessionCatalogAdoptedSourceKey } from "openclaw/plugin-sdk/session-catalog";
 //#region extensions/codex/src/session-catalog-archive.ts