@openclaw/codex 2026.9.1 → 2026.9.3

package/dist/{plugin-marketplace-discovery-CfFlKqDl.js → conversation-control-CUCrSIQI.js}

@@ -1,24 +1,15 @@
-import { c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-DxcfF9KX.js";
-import { A as isCodexFastServiceTier } from "./config-BhmfC1s6.js";
-import { o as isCodexAppServerNativeAuthProfile, r as bindingStoreKey, s as normalizeCodexAppServerBindingModelProvider } from "./session-binding-BHuTCRZQ.js";
-import { E as resolveCodexAppServerRequestModelSelection, O as resolveCodexBindingModelProviderFallback } from "./thread-lifecycle-DAcEJ_Om.js";
-import { a as formatCodexDisplayText } from "./command-formatters-CLHhEB1Q.js";
-import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-E6uDsPlx.js";
-import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { n as isCodexFastServiceTier } from "./config-utils-C57JiJrU.js";
+import { r as bindingStoreKey } from "./session-binding-record-CaZjYwNS.js";
+import { a as formatCodexDisplayText } from "./command-formatters-DeTfrapr.js";
+import "./config-JDfTI4VI.js";
+import { i as resolveCodexBindingAppServerConnection } from "./binding-connection-QqgcPCgk.js";
+import { n as normalizeCodexAppServerBindingModelProvider, t as isCodexAppServerNativeAuthProfile } from "./auth-profile-CwzO4_RG.js";
+import { c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-CVhez2Uo.js";
+import { E as resolveCodexAppServerRequestModelSelection, O as resolveCodexBindingModelProviderFallback } from "./thread-lifecycle-D1pzRwHB.js";
+import "./session-binding-CKSepwIC.js";
 import { resolveAgentDir } from "openclaw/plugin-sdk/agent-runtime";
 import { getSessionEntry, patchSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { ModelSelectionLockedError, applyModelOverrideWithAuthProfileCompatibility } from "openclaw/plugin-sdk/model-session-runtime";
-//#region extensions/codex/src/command-authorization.ts
-const CODEX_NATIVE_EXECUTION_AUTH_ERROR = "Only an owner or operator.admin can control Codex native execution.";
-const CODEX_HOST_INSPECTION_AUTH_ERROR = "Only an owner or operator.admin can inspect Codex host state.";
-const CODEX_FULL_PERMISSIONS_AUTH_ERROR = "Full Codex permissions require operator.admin. Choose Admin in the Control UI permission picker, or use an admin-authenticated CLI.";
-function hasCodexAdminScope(ctx) {
-	return ctx.gatewayClientScopes?.includes("operator.admin") === true;
-}
-function canMutateCodexHost(ctx) {
-	return ctx.senderIsOwner === true || hasCodexAdminScope(ctx);
-}
-//#endregion
 //#region extensions/codex/src/conversation-control.ts
 const CODEX_CONVERSATION_CONTROL_STATE = Symbol.for("openclaw.codex.conversationControl");
 function getActiveTurns() {
@@ -44,7 +35,7 @@ async function stopCodexConversationTurn(params) {
 		message: "No active Codex run to stop."
 	};
 	const lookup = buildBindingLookup(params);
-	const binding = await params.bindingStore.read(params.identity);
+	const binding = params.binding;
 	if (binding?.threadId !== active.threadId) return {
 		stopped: false,
 		message: "The active Codex run no longer matches this session binding."
@@ -65,7 +56,10 @@ async function stopCodexConversationTurn(params) {
 		await client.request("turn/interrupt", {
 			threadId: active.threadId,
 			turnId: active.turnId
-		}, { timeoutMs: runtime.requestTimeoutMs });
+		}, {
+			timeoutMs: runtime.requestTimeoutMs,
+			assertCurrent: params.assertCurrent
+		});
 	} finally {
 		if (!active.client) releaseLeasedSharedCodexAppServerClient(client);
 	}
@@ -86,7 +80,7 @@ async function steerCodexConversationTurn(params) {
 		message: "No active Codex run to steer."
 	};
 	const lookup = buildBindingLookup(params);
-	const binding = await params.bindingStore.read(params.identity);
+	const binding = params.binding;
 	if (binding?.threadId !== active.threadId) return {
 		steered: false,
 		message: "The active Codex run no longer matches this session binding."
@@ -112,7 +106,10 @@ async function steerCodexConversationTurn(params) {
 				text,
 				text_elements: []
 			}]
-		}, { timeoutMs: runtime.requestTimeoutMs });
+		}, {
+			timeoutMs: runtime.requestTimeoutMs,
+			assertCurrent: params.assertCurrent
+		});
 	} finally {
 		if (!active.client) releaseLeasedSharedCodexAppServerClient(client);
 	}
@@ -125,7 +122,8 @@ async function setCodexConversationModel(params) {
 	const model = params.model.trim();
 	if (!model) return "Usage: /codex model <model>";
 	const lookup = buildBindingLookup(params);
-	const binding = await requireThreadBinding(params.bindingStore, params.identity);
+	params.assertCurrent();
+	const binding = requirePreparedThreadBinding(params.binding);
 	if (binding.connectionScope === "supervision") throw new ModelSelectionLockedError();
 	const modelProvider = resolveConversationControlModelProvider({
 		authProfileId: binding.authProfileId,
@@ -155,10 +153,11 @@ async function setCodexConversationModel(params) {
 	if (identity.kind === "session" && identity.sessionKey) {
 		if (!await patchSessionEntry({
 			agentId: identity.agentId,
-			storePath: resolveStorePath(params.config?.session?.store, { agentId: identity.agentId }),
+			storePath: params.storePath ?? resolveStorePath(params.config?.session?.store, { agentId: identity.agentId }),
 			sessionKey: identity.sessionKey,
 			requireWriteSuccess: true,
 			replaceEntry: true,
+			assertCommitAllowed: params.assertCurrent,
 			update: (entry) => {
 				if (entry.sessionId !== identity.sessionId) throw new Error("Codex session changed while applying the model selection.");
 				applyModelOverrideWithAuthProfileCompatibility({
@@ -175,23 +174,25 @@ async function setCodexConversationModel(params) {
 				return entry;
 			}
 		})) throw new Error("Codex session changed while applying the model selection.");
-		if (modelChanged && binding.contextEngine?.projection) await patchThreadBinding(params.bindingStore, identity, binding.threadId, projectionPatch);
+		if (modelChanged && binding.contextEngine?.projection) await patchThreadBinding(params.bindingStore, identity, binding.threadId, projectionPatch, params.assertCurrent);
 	} else await patchThreadBinding(params.bindingStore, params.identity, binding.threadId, {
 		model: nextModel,
 		modelProvider: nextModelProvider,
 		...projectionPatch
-	});
+	}, params.assertCurrent);
 	return `Codex model set to ${formatCodexDisplayText(nextModel)}.`;
 }
 async function setCodexConversationFastMode(params) {
-	const binding = await requireThreadBinding(params.bindingStore, params.identity);
+	params.assertCurrent();
+	const binding = requirePreparedThreadBinding(params.binding);
 	if (params.enabled == null) return `Codex fast mode: ${isCodexFastServiceTier(binding.serviceTier) ? "on" : "off"}.`;
 	const serviceTier = params.enabled ? "priority" : "flex";
-	await patchThreadBinding(params.bindingStore, params.identity, binding.threadId, { serviceTier });
+	await patchThreadBinding(params.bindingStore, params.identity, binding.threadId, { serviceTier }, params.assertCurrent);
 	return `Codex fast mode ${params.enabled ? "enabled" : "disabled"}.`;
 }
 async function setCodexConversationPermissions(params) {
-	const storePath = resolveStorePath(params.config?.session?.store, { agentId: params.session.agentId });
+	params.assertCurrent();
+	const storePath = params.storePath ?? resolveStorePath(params.config?.session?.store, { agentId: params.session.agentId });
 	if (!params.mode) {
 		const entry = getSessionEntry({
 			agentId: params.session.agentId,
@@ -200,6 +201,7 @@ async function setCodexConversationPermissions(params) {
 			sessionKey: params.session.sessionKey,
 			storePath
 		});
+		params.assertCurrent();
 		if (entry?.sessionId !== params.session.sessionId) throw new Error("Codex session changed while reading the permission mode.");
 		return `Codex permissions: ${formatPermissionsMode(entry.permissionMode)}.`;
 	}
@@ -209,6 +211,7 @@ async function setCodexConversationPermissions(params) {
 		sessionKey: params.session.sessionKey,
 		requireWriteSuccess: true,
 		replaceEntry: true,
+		assertCommitAllowed: params.assertCurrent,
 		update: (entry) => {
 			if (entry.sessionId !== params.session.sessionId) throw new Error("Codex session changed while applying the permission mode.");
 			entry.permissionMode = params.mode === "yolo" ? "full" : "guarded";
@@ -237,17 +240,16 @@ function parseCodexPermissionsModeArg(arg) {
 function formatPermissionsMode(mode) {
 	return mode === "full" ? "full access" : mode ?? "default";
 }
-async function requireThreadBinding(bindingStore, identity) {
-	const binding = await bindingStore.read(identity);
+function requirePreparedThreadBinding(binding) {
 	if (!binding?.threadId) throw new Error("No Codex thread is attached to this OpenClaw session yet.");
 	return binding;
 }
-async function patchThreadBinding(bindingStore, identity, threadId, patch) {
+async function patchThreadBinding(bindingStore, identity, threadId, patch, assertCurrent) {
 	if (!await bindingStore.mutate(identity, {
 		kind: "patch",
 		threadId,
 		patch
-	})) throw new Error("Codex thread binding changed while applying the control update.");
+	}, assertCurrent)) throw new Error("Codex thread binding changed while applying the control update.");
 }
 function buildBindingLookup(params) {
 	const agentDir = params.agentDir?.trim();
@@ -267,125 +269,4 @@ function resolveConversationControlModelProvider(params) {
 	return modelProvider.toLowerCase() === "openai" ? "openai" : modelProvider;
 }
 //#endregion
-//#region extensions/codex/src/plugin-marketplace-discovery.ts
-/** Read-only discovery of Codex-owned local, curated, and remote plugin marketplaces. */
-const PLUGIN_SEGMENT_PATTERN = /^[A-Za-z0-9_-]+$/;
-const MAX_PLUGIN_DESCRIPTION_LENGTH = 160;
-const SUPPLEMENTAL_MARKETPLACE_KINDS = [
-	"workspace-directory",
-	"shared-with-me",
-	"created-by-me-remote",
-	"vertical"
-];
-/** Validates the same identifier segments required by Codex's stable PluginId parser. */
-function parseCodexPluginMarketplaceId(value) {
-	const separator = value.lastIndexOf("@");
-	if (separator <= 0 || separator === value.length - 1) return;
-	const pluginName = value.slice(0, separator);
-	const marketplaceName = value.slice(separator + 1);
-	return PLUGIN_SEGMENT_PATTERN.test(pluginName) && PLUGIN_SEGMENT_PATTERN.test(marketplaceName) ? {
-		pluginName,
-		marketplaceName
-	} : void 0;
-}
-/** Lists local/global first and separately requests workspace, shared, and personal catalogs. */
-async function discoverCodexMarketplacePlugins(params) {
-	const requestParams = { cwds: [params.workspaceDir] };
-	const primary = await params.request(requestParams);
-	const warnings = (primary.marketplaceLoadErrors ?? []).map((error) => boundedCatalogText(error.message));
-	const marketplaces = [...primary.marketplaces];
-	try {
-		const supplemental = await params.request({
-			...requestParams,
-			marketplaceKinds: [...SUPPLEMENTAL_MARKETPLACE_KINDS]
-		});
-		marketplaces.push(...supplemental.marketplaces);
-		warnings.push(...(supplemental.marketplaceLoadErrors ?? []).map((error) => boundedCatalogText(error.message)));
-	} catch (error) {
-		let recoveredSupplementalMarketplace = false;
-		for (const kind of SUPPLEMENTAL_MARKETPLACE_KINDS) try {
-			const supplemental = await params.request({
-				...requestParams,
-				marketplaceKinds: [kind]
-			});
-			marketplaces.push(...supplemental.marketplaces);
-			recoveredSupplementalMarketplace ||= supplemental.marketplaces.length > 0;
-			warnings.push(...(supplemental.marketplaceLoadErrors ?? []).map((loadError) => boundedCatalogText(loadError.message)));
-		} catch (kindError) {
-			warnings.push(boundedCatalogText(`${kind} marketplace unavailable: ${kindError instanceof Error ? kindError.message : String(kindError)}`));
-		}
-		if (!recoveredSupplementalMarketplace && warnings.length === 0) warnings.push(boundedCatalogText(`Additional marketplaces could not be listed: ${error instanceof Error ? error.message : String(error)}`));
-	}
-	const discovered = /* @__PURE__ */ new Map();
-	const ambiguous = /* @__PURE__ */ new Set();
-	for (const marketplace of marketplaces) {
-		if (!PLUGIN_SEGMENT_PATTERN.test(marketplace.name)) continue;
-		for (const summary of marketplace.plugins) {
-			const pluginName = pluginSlug(summary, marketplace.name);
-			if (!pluginName) continue;
-			const id = `${pluginName}@${marketplace.name}`;
-			if (ambiguous.has(id)) continue;
-			const previous = discovered.get(id);
-			const next = {
-				id,
-				pluginName,
-				marketplaceName: marketplace.name,
-				installed: summary.installed,
-				enabled: summary.enabled,
-				available: summary.availability !== "DISABLED_BY_ADMIN" && summary.installPolicy !== "NOT_AVAILABLE",
-				...summary.installPolicy ? { installPolicy: summary.installPolicy } : {},
-				...summary.authPolicy ? { authPolicy: summary.authPolicy } : {},
-				...marketplace.path ? { marketplacePath: marketplace.path } : {},
-				...summary.remotePluginId?.trim() ? {
-					remotePluginId: summary.remotePluginId.trim(),
-					mustShowInstallationInterstitial: summary.mustShowInstallationInterstitial ?? null
-				} : {},
-				summaryId: summary.id
-			};
-			const description = pluginDescription(summary);
-			if (description) next.description = description;
-			if (previous && (previous.marketplacePath !== next.marketplacePath || previous.remotePluginId !== next.remotePluginId)) {
-				discovered.delete(id);
-				ambiguous.add(id);
-				warnings.push(`Multiple discovered plugins share ${id}; installation requires a unique identity.`);
-				continue;
-			}
-			if (!previous) discovered.set(id, next);
-			else {
-				const preferred = !previous.installed && next.installed || !previous.enabled && next.installed && next.enabled ? next : previous;
-				discovered.set(id, {
-					...preferred,
-					available: previous.available && next.available,
-					...preferred.remotePluginId ? { mustShowInstallationInterstitial: previous.mustShowInstallationInterstitial === true || next.mustShowInstallationInterstitial === true ? true : previous.mustShowInstallationInterstitial === false && next.mustShowInstallationInterstitial === false ? false : null } : {},
-					...previous.installPolicy === "NOT_AVAILABLE" || next.installPolicy === "NOT_AVAILABLE" ? { installPolicy: "NOT_AVAILABLE" } : {}
-				});
-			}
-		}
-	}
-	return {
-		plugins: [...discovered.values()].toSorted((left, right) => left.id.localeCompare(right.id)),
-		warnings
-	};
-}
-function pluginSlug(summary, marketplaceName) {
-	const qualified = parseCodexPluginMarketplaceId(summary.id);
-	if (qualified?.marketplaceName === marketplaceName) return qualified.pluginName;
-	const identitySegment = summary.id.split("/").at(-1);
-	if (identitySegment && PLUGIN_SEGMENT_PATTERN.test(identitySegment)) return identitySegment;
-	return PLUGIN_SEGMENT_PATTERN.test(summary.name) ? summary.name : void 0;
-}
-function pluginDescription(summary) {
-	const description = asOptionalRecord(summary.interface)?.shortDescription;
-	if (typeof description !== "string") return;
-	return boundedCatalogText(description) || void 0;
-}
-function boundedCatalogText(value) {
-	let sanitized = "";
-	for (const character of value) {
-		const codePoint = character.codePointAt(0);
-		sanitized += codePoint !== void 0 && (codePoint <= 31 || codePoint >= 127 && codePoint <= 159) ? " " : character;
-	}
-	return sanitized.replace(/\s+/g, " ").trim().slice(0, MAX_PLUGIN_DESCRIPTION_LENGTH);
-}
-//#endregion
-export { hasCodexAdminScope as _, parseCodexPermissionsModeArg as a, setCodexConversationModel as c, stopCodexConversationTurn as d, trackCodexConversationActiveTurn as f, canMutateCodexHost as g, CODEX_NATIVE_EXECUTION_AUTH_ERROR as h, parseCodexFastModeArg as i, setCodexConversationPermissions as l, CODEX_HOST_INSPECTION_AUTH_ERROR as m, parseCodexPluginMarketplaceId as n, readCodexConversationActiveTurn as o, CODEX_FULL_PERMISSIONS_AUTH_ERROR as p, formatPermissionsMode as r, setCodexConversationFastMode as s, discoverCodexMarketplacePlugins as t, steerCodexConversationTurn as u };
+export { setCodexConversationFastMode as a, steerCodexConversationTurn as c, readCodexConversationActiveTurn as i, stopCodexConversationTurn as l, parseCodexFastModeArg as n, setCodexConversationModel as o, parseCodexPermissionsModeArg as r, setCodexConversationPermissions as s, formatPermissionsMode as t, trackCodexConversationActiveTurn as u };

package/dist/doctor-contract-api.js

@@ -1,16 +1,17 @@
 import { n as CODEX_APP_SERVER_BINDING_NAMESPACE, t as CODEX_APP_SERVER_BINDING_MAX_ENTRIES } from "./session-binding-meta-B7aEMU7g.js";
 import { asNullableRecord, asOptionalRecord, isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
-import fs from "node:fs/promises";
-import path from "node:path";
-import { canonicalPathFromExistingAncestor, isPathInside } from "openclaw/plugin-sdk/file-access-runtime";
 import { createHash } from "node:crypto";
-import { isDeepStrictEqual } from "node:util";
-import { pathExists } from "openclaw/plugin-sdk/security-runtime";
 import { listAgentIds, resolveAgentDir, resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
+import path from "node:path";
+import fs from "node:fs/promises";
 import { setImmediate } from "node:timers/promises";
-import { normalizeAgentId } from "openclaw/plugin-sdk/routing";
+import { canonicalPathFromExistingAncestor, isPathInside } from "openclaw/plugin-sdk/file-access-runtime";
+import { isDeepStrictEqual } from "node:util";
 import { withFileLock } from "openclaw/plugin-sdk/file-lock";
+import { normalizeAgentId } from "openclaw/plugin-sdk/routing";
 import { archiveLegacyStateSource, legacyStateFileExists } from "openclaw/plugin-sdk/runtime-doctor-migrations";
+import { pathExists } from "openclaw/plugin-sdk/security-runtime";
+import { resolveStorePath } from "openclaw/plugin-sdk/session-store-paths";
 //#region extensions/codex/src/migration/session-binding-orphans.ts
 const PAGE_SIZE = 512;
 const KEY_PREFIXES = ["session-key:", "session:"];
@@ -122,7 +123,6 @@ 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) => {
@@ -268,7 +268,6 @@ 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]));
@@ -392,7 +391,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-BHuTCRZQ.js").then((n) => n.f), import("./conversation-binding-data-BiodpIzq.js").then((n) => n.t)]);
+			const [{ bindingStoreKey, createStoredCodexAppServerBinding, normalizeStoredCodexAppServerBindingFingerprints, readStoredCodexAppServerBinding }, { legacyCodexConversationBindingId }] = await Promise.all([import("./session-binding-CKSepwIC.js").then((n) => n.c), import("./conversation-binding-data-BiodpIzq.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(),