@openclaw/codex 2026.6.5 → 2026.6.6-beta.2

package/dist/provider.js

@@ -1,165 +1,2 @@
-import { CODEX_APP_SERVER_AUTH_MARKER, CODEX_BASE_URL, CODEX_PROVIDER_ID, FALLBACK_CODEX_MODELS, buildCodexModelDefinition, buildCodexProviderConfig } from "./provider-catalog.js";
-import { c as readCodexPluginConfig, l as resolveCodexAppServerRuntimeOptions } from "./config-BT6SLiE6.js";
-import { resolveCodexSystemPromptContribution } from "./prompt-overlay.js";
-import { resolvePluginConfigObject } from "openclaw/plugin-sdk/plugin-config-runtime";
-import { normalizeModelCompat } from "openclaw/plugin-sdk/provider-model-shared";
-import { createSubsystemLogger } from "openclaw/plugin-sdk/core";
-//#region extensions/codex/provider.ts
-/**
-* Codex provider plugin and live app-server model catalog discovery.
-*/
-const DEFAULT_DISCOVERY_TIMEOUT_MS = 2500;
-const LIVE_DISCOVERY_ENV = "OPENCLAW_CODEX_DISCOVERY_LIVE";
-const MODEL_DISCOVERY_PAGE_LIMIT = 100;
-const CODEX_APP_SERVER_SETUP_METHOD_ID = "app-server";
-const CODEX_DEFAULT_MODEL_REF = `${CODEX_PROVIDER_ID}/${FALLBACK_CODEX_MODELS[0].id}`;
-const codexCatalogLog = createSubsystemLogger("codex/catalog");
-/**
-* Builds the Codex provider plugin, including setup metadata, catalog discovery,
-* dynamic model resolution, and prompt/thinking hooks.
-*/
-function buildCodexProvider(options = {}) {
-	return {
-		id: CODEX_PROVIDER_ID,
-		label: "Codex",
-		docsPath: "/providers/models",
-		auth: [{
-			id: CODEX_APP_SERVER_SETUP_METHOD_ID,
-			label: "Codex app-server",
-			hint: "Use the Codex app-server runtime and managed model catalog.",
-			kind: "custom",
-			wizard: {
-				choiceId: CODEX_PROVIDER_ID,
-				choiceLabel: "Codex app-server",
-				choiceHint: "Use the Codex app-server runtime and managed model catalog.",
-				assistantPriority: -40,
-				groupId: CODEX_PROVIDER_ID,
-				groupLabel: "Codex",
-				groupHint: "Codex app-server model provider",
-				onboardingScopes: ["text-inference"]
-			},
-			run: async () => ({
-				profiles: [],
-				defaultModel: CODEX_DEFAULT_MODEL_REF
-			})
-		}],
-		catalog: {
-			order: "late",
-			run: async (ctx) => {
-				const pluginConfig = resolvePluginConfigObject(ctx.config, "codex") ?? (ctx.config ? void 0 : options.pluginConfig);
-				return await buildCodexProviderCatalog({
-					env: ctx.env,
-					pluginConfig,
-					listModels: options.listModels
-				});
-			}
-		},
-		staticCatalog: {
-			order: "late",
-			run: async () => ({ provider: buildCodexProviderConfig(FALLBACK_CODEX_MODELS) })
-		},
-		resolveDynamicModel: (ctx) => resolveCodexDynamicModel(ctx.modelId),
-		resolveSyntheticAuth: () => ({
-			apiKey: CODEX_APP_SERVER_AUTH_MARKER,
-			source: "codex-app-server",
-			mode: "token"
-		}),
-		resolveThinkingProfile: ({ modelId }) => ({ levels: [
-			{ id: "off" },
-			{ id: "minimal" },
-			{ id: "low" },
-			{ id: "medium" },
-			{ id: "high" },
-			...isKnownXHighCodexModel(modelId) ? [{ id: "xhigh" }] : []
-		] }),
-		resolveSystemPromptContribution: ({ config, modelId }) => resolveCodexSystemPromptContribution({
-			config,
-			modelId
-		}),
-		isModernModelRef: ({ modelId }) => isModernCodexModel(modelId)
-	};
-}
-/**
-* Builds the Codex model catalog from live app-server discovery, falling back
-* to built-in model records when discovery is disabled or unavailable.
-*/
-async function buildCodexProviderCatalog(options = {}) {
-	const config = readCodexPluginConfig(options.pluginConfig);
-	const appServer = resolveCodexAppServerRuntimeOptions({ pluginConfig: options.pluginConfig });
-	const timeoutMs = normalizeTimeoutMs(config.discovery?.timeoutMs);
-	let discovered = [];
-	if (config.discovery?.enabled !== false && !shouldSkipLiveDiscovery(options.env)) discovered = await listModelsBestEffort({
-		listModels: options.listModels ?? listCodexAppServerModelsLazy,
-		timeoutMs,
-		startOptions: appServer.start,
-		onDiscoveryFailure: options.onDiscoveryFailure
-	});
-	return { provider: buildCodexProviderConfig(discovered.length > 0 ? discovered : FALLBACK_CODEX_MODELS) };
-}
-function resolveCodexDynamicModel(modelId) {
-	const id = modelId.trim();
-	if (!id) return;
-	const fallbackModel = FALLBACK_CODEX_MODELS.find((model) => model.id === id);
-	return normalizeModelCompat({
-		...buildCodexModelDefinition({
-			id,
-			model: id,
-			inputModalities: fallbackModel?.inputModalities ?? ["text"],
-			supportedReasoningEfforts: fallbackModel?.supportedReasoningEfforts ?? (shouldDefaultToReasoningModel(id) ? ["medium"] : [])
-		}),
-		provider: CODEX_PROVIDER_ID,
-		baseUrl: CODEX_BASE_URL
-	});
-}
-async function listModelsBestEffort(params) {
-	try {
-		const models = [];
-		let cursor;
-		do {
-			const result = await params.listModels({
-				timeoutMs: params.timeoutMs,
-				limit: MODEL_DISCOVERY_PAGE_LIMIT,
-				cursor,
-				startOptions: params.startOptions,
-				sharedClient: false
-			});
-			models.push(...result.models.filter((model) => !model.hidden));
-			cursor = result.nextCursor;
-		} while (cursor);
-		return models;
-	} catch (error) {
-		params.onDiscoveryFailure?.(error);
-		codexCatalogLog.debug("codex model discovery failed; using fallback catalog", { error: error instanceof Error ? error.message : String(error) });
-		return [];
-	}
-}
-async function listCodexAppServerModelsLazy(options) {
-	const { listCodexAppServerModels } = await import("./models-DXorTaja.js").then((n) => n.r);
-	return listCodexAppServerModels(options);
-}
-function normalizeTimeoutMs(value) {
-	return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : DEFAULT_DISCOVERY_TIMEOUT_MS;
-}
-function shouldSkipLiveDiscovery(env = process.env) {
-	const override = env[LIVE_DISCOVERY_ENV]?.trim().toLowerCase();
-	if (override === "0" || override === "false") return true;
-	return Boolean(env.VITEST) && override !== "1";
-}
-function shouldDefaultToReasoningModel(modelId) {
-	const lower = modelId.toLowerCase();
-	return lower.startsWith("gpt-5") || lower.startsWith("o1") || lower.startsWith("o3") || lower.startsWith("o4");
-}
-function isKnownXHighCodexModel(modelId) {
-	const lower = modelId.trim().toLowerCase();
-	return lower.startsWith("gpt-5") || lower.startsWith("o3") || lower.startsWith("o4") || lower.includes("codex");
-}
-/**
-* Returns true for Codex models that use the modern reasoning effort enum and
-* reject the legacy CLI `minimal` default.
-*/
-function isModernCodexModel(modelId) {
-	const lower = modelId.trim().toLowerCase();
-	return lower === "gpt-5.5" || lower === "gpt-5.4" || lower === "gpt-5.4-mini" || lower === "gpt-5.3-codex-spark";
-}
-//#endregion
+import { n as buildCodexProviderCatalog, r as isModernCodexModel, t as buildCodexProvider } from "./provider-Cs6kWhDQ.js";
 export { buildCodexProvider, buildCodexProviderCatalog, isModernCodexModel };

package/dist/request-Dq0LUOqZ.js

@@ -0,0 +1,36 @@
+import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
+import { a as getLeasedSharedCodexAppServerClient, i as createIsolatedCodexAppServerClient, l as withTimeout, o as releaseLeasedSharedCodexAppServerClient } from "./shared-client-CflavQ_i.js";
+import { t as resolveCodexAppServerDirectSandboxBypassBlock } from "./sandbox-guard-C-Yv9uwY.js";
+//#region extensions/codex/src/app-server/request.ts
+var request_exports = /* @__PURE__ */ __exportAll({ requestCodexAppServerJson: () => requestCodexAppServerJson });
+async function requestCodexAppServerJson(params) {
+	const sandboxBlock = resolveCodexAppServerDirectSandboxBypassBlock({
+		method: params.method,
+		requestParams: params.requestParams,
+		config: params.config,
+		sessionKey: params.sessionKey,
+		sessionId: params.sessionId
+	});
+	if (sandboxBlock) throw new Error(sandboxBlock);
+	const timeoutMs = params.timeoutMs ?? 6e4;
+	return await withTimeout((async () => {
+		const client = await (params.isolated ? createIsolatedCodexAppServerClient : getLeasedSharedCodexAppServerClient)({
+			startOptions: params.startOptions,
+			timeoutMs,
+			authProfileId: params.authProfileId,
+			agentDir: params.agentDir,
+			config: params.config
+		});
+		try {
+			return await client.request(params.method, params.requestParams, { timeoutMs });
+		} finally {
+			if (params.isolated) await client.closeAndWait({
+				exitTimeoutMs: 2e3,
+				forceKillDelayMs: 250
+			});
+			else releaseLeasedSharedCodexAppServerClient(client);
+		}
+	})(), timeoutMs, `codex app-server ${params.method} timed out`);
+}
+//#endregion
+export { request_exports as n, requestCodexAppServerJson as t };