vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 09:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(openai): use canonical GPT refs for Codex OAuth

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-23 20:40:28 +01:00
parent a8173276bf
commit 384eb6bc66
6 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/openai/default-models.ts
View File

@@ -5,7 +5,7 @@ import {
} from "openclaw/plugin-sdk/provider-onboard";
export const OPENAI_DEFAULT_MODEL = "openai/gpt-5.5";
export const OPENAI_CODEX_DEFAULT_MODEL = "openai-codex/gpt-5.5";
export const OPENAI_CODEX_DEFAULT_MODEL = "openai/gpt-5.5";
export const OPENAI_DEFAULT_IMAGE_MODEL = "gpt-image-2";
export const OPENAI_DEFAULT_TTS_MODEL = "gpt-4o-mini-tts";
export const OPENAI_DEFAULT_TTS_VOICE = "alloy";

2
extensions/openai/openai-provider.ts
View File

@@ -275,7 +275,7 @@ export function buildOpenAIProvider(): ProviderPlugin {
if (ctx.provider !== PROVIDER_ID || ctx.listProfileIds("openai-codex").length === 0) {
return undefined;
}
return 'No API key found for provider "openai". You are authenticated with OpenAI Codex OAuth. Use openai-codex/gpt-5.5 (OAuth) or set OPENAI_API_KEY to use openai/gpt-5.5.';
return 'No API key found for provider "openai". You are authenticated with OpenAI Codex OAuth. Use openai/gpt-5.5 with the Codex OAuth profile, or set OPENAI_API_KEY for direct OpenAI API access.';
},
suppressBuiltInModel: (ctx) => {
if (

2
src/auto-reply/reply/agent-runner-execution.ts
View File

@@ -356,7 +356,7 @@ function buildMissingApiKeyFailureText(message: string): string | null {
return null;
}
if (provider === "openai" && normalizedMessage.includes("OpenAI Codex OAuth")) {
return "⚠️ Missing API key for OpenAI on the gateway. Use `openai-codex/gpt-5.5` for OAuth, or set `OPENAI_API_KEY`, then try again.";
return "⚠️ Missing API key for OpenAI on the gateway. Use `openai/gpt-5.5` with the Codex OAuth profile, or set `OPENAI_API_KEY`, then try again.";
}
if (SAFE_MISSING_API_KEY_PROVIDERS.has(provider)) {
return `⚠️ Missing API key for provider "${provider}". Configure the gateway auth for that provider, then try again.`;

4
src/auto-reply/reply/response-prefix-template.ts
View File

@@ -10,7 +10,7 @@ import { normalizeLowercaseStringOrEmpty } from "../../shared/string-coerce.js";
export type ResponsePrefixContext = {
/** Short model name (e.g., "gpt-5.4", "claude-opus-4-6") */
model?: string;
/** Full model ID including provider (e.g., "openai-codex/gpt-5.4") */
/** Full model ID including provider (e.g., "openai/gpt-5.5") */
modelFull?: string;
/** Provider name (e.g., "openai-codex", "anthropic") */
provider?: string;
@@ -77,7 +77,7 @@ export function resolveResponsePrefixTemplate(
* - Common version suffixes (e.g., "-latest")
*
* @example
* extractShortModelName("openai-codex/gpt-5.4") // "gpt-5.4"
* extractShortModelName("openai/gpt-5.5") // "gpt-5.5"
* extractShortModelName("claude-opus-4-6-20260205") // "claude-opus-4-6"
* extractShortModelName("gpt-5.4-latest") // "gpt-5.4"
*/

23
src/gateway/gateway-codex-harness.live-helpers.ts
View File

@@ -7,7 +7,9 @@ export const EXPECTED_CODEX_MODELS_COMMAND_TEXT = [
"Available agent IDs in this session:",
"opened an interactive trust prompt",
"opened an interactive model-selection prompt",
"running as Codex on `openai/",
"running as Codex on `codex/",
"currently running on `openai/",
"currently running on `codex/",
"stdin is not a terminal",
"The local `codex models` entrypoint is interactive in this environment",
@@ -30,21 +32,33 @@ export const EXPECTED_CODEX_MODELS_COMMAND_TEXT = [
"Available models in this Codex install",
"Available agent models:",
"Visible options in this session:",
"Current: `openai/",
"Current: `codex/",
"Current model:",
"Current model: `openai/",
"Current model: `codex/",
"Current model is `openai/",
"Current model is `codex/",
"Current session model: `openai/",
"Current session model: `codex/",
"Current session model is `openai/",
"Current session model is `codex/",
"The current session is using `openai/",
"The current session is using `codex/",
"current session is using `openai/",
"current session is using `codex/",
"Configured model from `~/.codex/config.toml`:",
"Configured models in this session:",
"Default model:",
"This harness is configured with a single Codex model: `openai/",
"This harness is configured with a single Codex model: `codex/",
"Primary model: `openai/",
"Primary model: `codex/",
"Registered models: `openai/",
"Registered models: `codex/",
"Active model: `openai/",
"Active model: `codex/",
"Current active model is `openai/",
"Current active model is `codex/",
"Current OpenClaw session status reports the active model as:",
] as const;
@@ -98,7 +112,7 @@ export function isExpectedCodexModelsCommandText(text: string): boolean {
normalized.includes("live openclaw config shows") ||
normalized.includes("current gateway config");
const isSessionConfigFallback =
text.includes("`codex/") &&
(text.includes("`openai/") || text.includes("`codex/")) &&
((mentionsConfiguredModels && mentionsSessionModel) ||
(mentionsConfigSummary && (mentionsConfiguredModels || mentionsSessionModel)));
@@ -112,6 +126,8 @@ export function isExpectedCodexModelsCommandText(text: string): boolean {
normalized.includes("available here:") ||
normalized.includes("available agent ids in this session:");
const mentionsCurrentActiveModel =
normalized.includes("current active model is `openai/") ||
normalized.includes("current active model is openai/") ||
normalized.includes("current active model is `codex/") ||
normalized.includes("current active model is codex/");
const mentionsCurrentSelectedModel =
@@ -123,11 +139,12 @@ export function isExpectedCodexModelsCommandText(text: string): boolean {
mentionsVisibleOptions &&
mentionsCurrentActiveModel;
const isAgentIdModelSummary =
normalized.includes("available agent ids in this session:") && text.includes("`codex/");
normalized.includes("available agent ids in this session:") &&
(text.includes("`openai/") || text.includes("`codex/"));
const isAvailableHereModelSummary =
normalized.includes("available here:") &&
normalized.includes("current session model") &&
text.includes("`codex/");
(text.includes("`openai/") || text.includes("`codex/"));
const isInteractiveTuiSummary =
mentionsCodexModelsCommand &&
mentionsInteractiveSelection &&

2
src/plugins/provider-model-defaults.ts
View File

@@ -7,7 +7,7 @@ import { ensureModelAllowlistEntry } from "./provider-model-allowlist.js";
import { applyAgentDefaultPrimaryModel } from "./provider-model-primary.js";
export const OPENAI_DEFAULT_MODEL = "openai/gpt-5.5";
export const OPENAI_CODEX_DEFAULT_MODEL = "openai-codex/gpt-5.5";
export const OPENAI_CODEX_DEFAULT_MODEL = "openai/gpt-5.5";
export const OPENAI_DEFAULT_IMAGE_MODEL = "gpt-image-2";
export const OPENAI_DEFAULT_TTS_MODEL = "gpt-4o-mini-tts";
export const OPENAI_DEFAULT_TTS_VOICE = "alloy";