@openclaw/codex 2026.7.2-beta.5 → 2026.8.1-beta.2

package/dist/{conversation-binding-data-BHRpYbX3.js → conversation-binding-data-CW2GuupV.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
+import { asOptionalRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash, randomUUID } from "node:crypto";
-import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import process from "node:process";
 //#region extensions/codex/src/conversation-binding-data.ts
 var conversation_binding_data_exports = /* @__PURE__ */ __exportAll({
@@ -77,10 +77,10 @@ function readCodexConversationBindingDataRecord(data) {
 	};
 }
 function readConversationSource(value) {
-	const agentId = readString(value, "agentId");
-	const sessionId = readString(value, "sessionId");
-	const threadId = readString(value, "threadId");
-	const sessionKey = readString(value, "sessionKey");
+	const agentId = normalizeOptionalString(value?.agentId);
+	const sessionId = normalizeOptionalString(value?.sessionId);
+	const threadId = normalizeOptionalString(value?.threadId);
+	const sessionKey = normalizeOptionalString(value?.sessionKey);
 	if (!agentId || !sessionId || !threadId) return;
 	return {
 		agentId,
@@ -94,11 +94,7 @@ function legacyCodexConversationBindingId(sessionFile) {
 	return `legacy-${createHash("sha256").update(sessionFile).digest("base64url")}`;
 }
 function resolveCodexDefaultWorkspaceDir(pluginConfig) {
-	return readString(asOptionalRecord(asOptionalRecord(pluginConfig)?.appServer), "defaultWorkspaceDir") ?? process.cwd();
-}
-function readString(record, key) {
-	const value = record?.[key];
-	return typeof value === "string" && value.trim() ? value.trim() : void 0;
+	return normalizeOptionalString(asOptionalRecord(asOptionalRecord(pluginConfig)?.appServer)?.defaultWorkspaceDir) ?? process.cwd();
 }
 function readConversationStart(value) {
 	const read = (key) => {

package/dist/doctor-contract-api.js

@@ -1,13 +1,12 @@
 import { n as CODEX_APP_SERVER_BINDING_NAMESPACE, t as CODEX_APP_SERVER_BINDING_MAX_ENTRIES } from "./session-binding-meta-B7aEMU7g.js";
+import { asNullableRecord, isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import fs from "node:fs/promises";
 import path from "node:path";
-import { listAgentIds, resolveAgentDir, resolveSessionAgentIds } from "openclaw/plugin-sdk/agent-runtime";
 import { isDeepStrictEqual } from "node:util";
-import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { patchSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { canonicalPathFromExistingAncestor, isPathInside, pathExists } from "openclaw/plugin-sdk/security-runtime";
+import { listAgentIds, resolveAgentDir, resolveSessionAgentIds } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { withFileLock } from "openclaw/plugin-sdk/file-lock";
-import { archiveLegacyStateSource, legacyStateFileExists } from "openclaw/plugin-sdk/runtime-doctor";
+import { archiveLegacyStateSource, legacyStateFileExists } from "openclaw/plugin-sdk/runtime-doctor-migrations";
 //#region extensions/codex/src/migration/session-binding-sidecars.ts
 const LEGACY_BINDING_SUFFIX = ".codex-app-server.json";
 const CODEX_AGENT_HARNESS_ID = "codex";
@@ -22,6 +21,7 @@ const LEGACY_BINDING_LOCK_OPTIONS = {
 	stale: 12e4
 };
 async function collectSessionSurfaces(params) {
+	const { resolveStorePath } = await import("openclaw/plugin-sdk/session-store-runtime");
 	const surfaces = /* @__PURE__ */ new Map();
 	const stateRoot = await canonicalPathFromExistingAncestor(params.stateDir);
 	const add = async (root, storePath, agentId, scan) => {
@@ -34,7 +34,7 @@ async function collectSessionSurfaces(params) {
 		};
 		surface.scan ||= scan;
 		surface.storePaths.add(path.resolve(storePath));
-		surface.agentIds.add(agentId);
+		if (agentId) surface.agentIds.add(agentId);
 		surfaces.set(canonicalRoot, surface);
 	};
 	const agentIds = new Set(listAgentIds(params.config));
@@ -58,8 +58,11 @@ async function collectSessionSurfaces(params) {
 		await add(root, storePath, agentId, isPathInside(stateRoot, await canonicalPathFromExistingAncestor(root)));
 	}
 	const legacyRoot = path.join(params.stateDir, "sessions");
-	const defaultAgentId = resolveSessionAgentIds({ config: params.config }).defaultAgentId;
-	await add(legacyRoot, path.join(legacyRoot, "sessions.json"), defaultAgentId, true);
+	const legacyOwner = tryResolveLegacyBindingOwnerAgentId({
+		sessionKey: "",
+		config: params.config
+	});
+	await add(legacyRoot, path.join(legacyRoot, "sessions.json"), legacyOwner, true);
 	return [...surfaces.values()].toSorted((a, b) => a.root.localeCompare(b.root));
 }
 async function collectLegacyBindingSources(params, options = {}) {
@@ -164,6 +167,7 @@ async function* walkSidecars(root) {
 	}
 }
 async function collectBindingOwners(sources, surfaces, params) {
+	const { resolveStorePath } = await import("openclaw/plugin-sdk/session-store-runtime");
 	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]));
@@ -184,11 +188,15 @@ async function collectBindingOwners(sources, surfaces, params) {
 		const sessionsDir = path.dirname(storePath);
 		for (const { sessionKey, entry } of index.entries) {
 			const sessionId = entry.sessionId;
-			const agentId = resolveLegacyBindingOwnerAgentId({
+			const agentId = tryResolveLegacyBindingOwnerAgentId({
 				sessionKey,
 				config: params.config,
 				storeAgentIds: storeAgentIds.get(storePath)
 			});
+			if (!agentId) {
+				failures.push(`session index ${storePath} has an ambiguous owner for ${sessionKey}`);
+				continue;
+			}
 			let legacyTranscriptPath;
 			let canonicalLegacyTranscriptPath;
 			try {
@@ -246,6 +254,14 @@ function resolveLegacyBindingOwnerAgentId(params) {
 		...storeAgentId ? { agentId: storeAgentId } : {}
 	}).sessionAgentId;
 }
+function tryResolveLegacyBindingOwnerAgentId(params) {
+	try {
+		return resolveLegacyBindingOwnerAgentId(params);
+	} catch (error) {
+		if (error.code === "AGENT_SELECTION_REQUIRED") return;
+		throw error;
+	}
+}
 function copyBindingForSession(stored, sessionId) {
 	return stored.state === "active" ? {
 		version: 1,
@@ -276,7 +292,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-DlVQ-Pxs.js").then((n) => n.u), import("./conversation-binding-data-BHRpYbX3.js").then((n) => n.t)]);
+			const [{ bindingStoreKey, createStoredCodexAppServerBinding, normalizeStoredCodexAppServerBindingFingerprints, readStoredCodexAppServerBinding }, { legacyCodexConversationBindingId }] = await Promise.all([import("./session-binding-DPxIvMgE.js").then((n) => n.f), import("./conversation-binding-data-CW2GuupV.js").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(),
@@ -398,6 +414,7 @@ async function migrateSource(source, candidates, params, store) {
 	}
 }
 async function recordSessionOwner(owner, env) {
+	const { patchSessionEntry } = await import("openclaw/plugin-sdk/session-store-runtime");
 	const currentIndex = await readLegacySessionIndex(owner.storePath);
 	if ("failure" in currentIndex) return "its legacy session owner could not be revalidated";
 	const currentOwner = currentIndex.entries.find(({ sessionKey }) => sessionKey === owner.sessionKey);
@@ -509,21 +526,18 @@ const stateMigrations = [{
 }];
 //#endregion
 //#region extensions/codex/doctor-contract-api.ts
-function asRecord(value) {
-	return value && typeof value === "object" && !Array.isArray(value) ? value : null;
-}
 function hasRetiredDynamicToolsProfile(value) {
-	return Object.hasOwn(asRecord(value) ?? {}, "codexDynamicToolsProfile");
+	return Object.hasOwn(asNullableRecord(value) ?? {}, "codexDynamicToolsProfile");
 }
 function hasLegacyPluginDestructivePolicy(value) {
-	const codexPlugins = asRecord(value);
+	const codexPlugins = asNullableRecord(value);
 	if (!codexPlugins) return false;
 	if (codexPlugins.allow_destructive_actions === "on-request") return true;
-	const plugins = asRecord(codexPlugins.plugins);
-	return Object.values(plugins ?? {}).some((plugin) => asRecord(plugin)?.allow_destructive_actions === "on-request");
+	const plugins = asNullableRecord(codexPlugins.plugins);
+	return Object.values(plugins ?? {}).some((plugin) => asNullableRecord(plugin)?.allow_destructive_actions === "on-request");
 }
 function hasRetiredOnFailureApprovalPolicy(value) {
-	return asRecord(value)?.approvalPolicy === "on-failure";
+	return asNullableRecord(value)?.approvalPolicy === "on-failure";
 }
 /** Legacy Codex config keys that doctor should report or repair. */
 const legacyConfigRules = [
@@ -564,9 +578,9 @@ const legacyConfigRules = [
 * Removes retired Codex plugin config keys while preserving unrelated config.
 */
 function normalizeCompatibilityConfig({ cfg }) {
-	const rawPluginConfig = asRecord(asRecord(cfg.plugins?.entries?.codex)?.config);
-	const rawCodexPlugins = asRecord(rawPluginConfig?.codexPlugins);
-	const rawAppServer = asRecord(rawPluginConfig?.appServer);
+	const rawPluginConfig = asNullableRecord(asNullableRecord(cfg.plugins?.entries?.codex)?.config);
+	const rawCodexPlugins = asNullableRecord(rawPluginConfig?.codexPlugins);
+	const rawAppServer = asNullableRecord(rawPluginConfig?.appServer);
 	const shouldRemoveDynamicToolsProfile = rawPluginConfig !== null && hasRetiredDynamicToolsProfile(rawPluginConfig);
 	const shouldRewriteDestructivePolicy = hasLegacyPluginDestructivePolicy(rawCodexPlugins);
 	const shouldRewriteApprovalPolicy = hasRetiredOnFailureApprovalPolicy(rawAppServer);
@@ -575,7 +589,7 @@ function normalizeCompatibilityConfig({ cfg }) {
 		changes: []
 	};
 	const nextConfig = structuredClone(cfg);
-	const nextPluginConfig = asRecord(asRecord(asRecord(asRecord(nextConfig.plugins)?.entries)?.codex)?.config);
+	const nextPluginConfig = asNullableRecord(asNullableRecord(asNullableRecord(asNullableRecord(nextConfig.plugins)?.entries)?.codex)?.config);
 	if (!nextPluginConfig) return {
 		config: cfg,
 		changes: []
@@ -586,17 +600,17 @@ function normalizeCompatibilityConfig({ cfg }) {
 		changes.push("Removed retired plugins.entries.codex.config.codexDynamicToolsProfile; Codex app-server always keeps Codex-native workspace tools native.");
 	}
 	if (shouldRewriteDestructivePolicy) {
-		const nextCodexPlugins = asRecord(nextPluginConfig.codexPlugins);
+		const nextCodexPlugins = asNullableRecord(nextPluginConfig.codexPlugins);
 		if (nextCodexPlugins?.allow_destructive_actions === "on-request") nextCodexPlugins.allow_destructive_actions = "auto";
-		const nextPluginPolicies = asRecord(nextCodexPlugins?.plugins);
+		const nextPluginPolicies = asNullableRecord(nextCodexPlugins?.plugins);
 		for (const plugin of Object.values(nextPluginPolicies ?? {})) {
-			const nextPlugin = asRecord(plugin);
+			const nextPlugin = asNullableRecord(plugin);
 			if (nextPlugin?.allow_destructive_actions === "on-request") nextPlugin.allow_destructive_actions = "auto";
 		}
 		changes.push("Renamed plugins.entries.codex.config.codexPlugins allow_destructive_actions=\"on-request\" values to \"auto\".");
 	}
 	if (shouldRewriteApprovalPolicy) {
-		const nextAppServer = asRecord(nextPluginConfig.appServer);
+		const nextAppServer = asNullableRecord(nextPluginConfig.appServer);
 		if (nextAppServer?.approvalPolicy === "on-failure") nextAppServer.approvalPolicy = "on-request";
 		changes.push("Renamed plugins.entries.codex.config.appServer.approvalPolicy=\"on-failure\" to \"on-request\".");
 	}
@@ -605,22 +619,5 @@ function normalizeCompatibilityConfig({ cfg }) {
 		changes
 	};
 }
-/** Session/auth ownership metadata used by doctor route-state checks. */
-const sessionRouteStateOwners = [{
-	id: "codex",
-	label: "Codex",
-	providerIds: [
-		"codex",
-		"codex-cli",
-		"openai-codex"
-	],
-	runtimeIds: ["codex", "codex-cli"],
-	cliSessionKeys: ["codex-cli"],
-	authProfilePrefixes: [
-		"codex:",
-		"codex-cli:",
-		"openai-codex:"
-	]
-}];
 //#endregion
-export { legacyConfigRules, normalizeCompatibilityConfig, sessionRouteStateOwners, stateMigrations };
+export { legacyConfigRules, normalizeCompatibilityConfig, stateMigrations };