refactor: unify OpenAI provider identity by steipete · Pull Request #88451 · openclaw/openclaw

steipete · 2026-05-30T21:21:43Z

Summary

Unifies the OpenAI provider identity under openai across provider registration, auth/profile selection, model routing, usage polling, image routing, native/UI fixtures, and docs.
Renames the ChatGPT/Codex OAuth transport from the old Codex-named surface to openai-chatgpt-responses, while leaving legacy names only in doctor/migration compatibility paths.
Moves old OpenAI-Codex config/auth/session/Hermes state repair into doctor-owned migrations and keeps minimal pre-doctor visibility through generic provider-auth alias handling.
Generalizes harness selection so custom harness behavior is not OpenAI-specific and can share the same shape as Copilot.
Fixes review-discovered migration edges around CODEX_API_KEY, API-key usage polling, sidecar OAuth preservation, image auth lookup, OAuth refresh guidance, TLS preflight visibility, and Hermes nested token-pool detection.

Verification

OPENCLAW_VITEST_FS_MODULE_CACHE_PATH=.artifacts/vitest-cache-openai-unify node scripts/run-vitest.mjs extensions/migrate-hermes/files-and-skills.test.ts extensions/migrate-hermes/secrets.test.ts extensions/migrate-hermes/provider.secret-failure.test.ts src/commands/models/auth-list.test.ts src/commands/doctor-auth.hints.test.ts src/commands/doctor-auth.profile-health.test.ts
OPENCLAW_VITEST_FS_MODULE_CACHE_PATH=.artifacts/vitest-cache-oauth-tls node scripts/run-vitest.mjs src/commands/oauth-tls-preflight.test.ts src/commands/oauth-tls-preflight.doctor.test.ts
pnpm tsgo:prod
pnpm tsgo:test
git diff --check
rg -n 'openai-codex' . --glob '!node_modules/**' --glob '!.git/**' --glob '!CHANGELOG.md' --glob '!appcast.xml' --glob '!src/commands/doctor*' --glob '!src/commands/doctor/**' --glob '!docs/gateway/doctor.md' --glob '!docs/cli/doctor.md' --glob '!extensions/codex/doctor-contract-api.ts'; test $? -eq 1
rg -n 'openai-codex-responses|openai-codex-' . --glob '!node_modules/**' --glob '!.git/**' --glob '!CHANGELOG.md' --glob '!appcast.xml' --glob '!src/commands/doctor*' --glob '!src/commands/doctor/**' --glob '!docs/gateway/doctor.md' --glob '!docs/cli/doctor.md' --glob '!extensions/codex/doctor-contract-api.ts'; test $? -eq 1
/Users/steipete/Projects/agent-scripts/skills/autoreview/scripts/autoreview --mode local clean after fixing the accepted TLS-preflight finding.

Real behavior proof

Behavior addressed: OpenAI and ChatGPT OAuth now share the canonical openai provider identity; legacy OpenAI-Codex state is handled by doctor/migration paths instead of live provider ids.
Real environment tested: Local OpenClaw source checkout on macOS with Node/Vitest/tsgo.
Exact steps or command run after this patch: The verification commands above, including focused auth/migration/provider tests, type checks, strict retired-id scans, and autoreview.
Evidence after fix: Focused Vitest shards passed; tsgo:prod and tsgo:test passed; strict scans found no non-doctor live openai-codex references; autoreview reported no accepted/actionable findings.
Observed result after fix: The tree keeps openai-codex only in doctor/migration/history surfaces, preserves pre-doctor legacy profile visibility where migration diagnostics need it, and uses openai for live OpenAI provider/auth routing.
What was not tested: Live OAuth browser sign-in, live OpenAI API-key calls, and Crabbox/WebVNC were not rerun in this closeout pass.

clawsweeper · 2026-05-30T21:28:54Z

Codex review: needs real behavior proof before merge. Reviewed May 30, 2026, 7:19 PM ET / 23:19 UTC.

Summary
The branch canonicalizes OpenAI/Codex provider identity to openai, renames the ChatGPT Responses API id, updates auth/profile/model routing plus docs/tests, and moves legacy state handling toward doctor/migration paths.

Reproducibility: yes. for the PR defects via source inspection: the affected upgrade/setup paths are visible in the PR head without needing live credentials. I did not run live OAuth or doctor migration because this review is read-only and the PR body does not provide that proof.

Review metrics: 2 noteworthy metrics.

Deprecated auth-choice aliases: 3 removed from replacement allowlist. Existing non-interactive setup snippets using shipped OpenAI/Codex choice ids need a compatible migration path before merge.
Provider/API identity surfaces: 1 provider id retired, 1 API id renamed. Both identifiers are persisted/configured routing surfaces that affect auth, model selection, and upgrades.

Merge readiness
Overall: 🧂 unranked krab
Proof: 🧂 unranked krab
Patch quality: 🧂 unranked krab
Result: blocked until real behavior proof from a real setup is added.

Overall follows the weaker of proof and patch quality, so missing proof can cap an otherwise strong patch.

Rank-up moves:

Restore backward-compatible handling for dual OpenAI provider configs, deprecated auth choices, and legacy OAuth fallback refresh.
[P1] Add redacted real behavior proof for one fresh OpenAI auth path and one legacy doctor/upgrade path.

Proof guidance:

[P1] Needs real behavior proof before merge: The PR body’s proof is limited to local tests, type checks, static scans, and autoreview, and it explicitly says live OAuth/API-key/Crabbox proof was not rerun; contributor should add redacted real auth and legacy doctor/upgrade evidence. After adding proof, update the PR body; ClawSweeper should re-review automatically. If it does not, the PR author or someone with repository write access can comment @clawsweeper re-review.

Risk before merge

[P1] Existing configs with both models.providers.openai and legacy Codex provider settings can silently lose the legacy transport override during validation.
[P1] Copied non-interactive setup commands using shipped old OpenAI/Codex auth-choice values can stop routing to the canonical OpenAI setup flow.
[P2] Expired unmigrated legacy OpenAI-Codex OAuth profiles can miss the external CLI fallback refresh path until the user runs doctor or reauths.
[P1] The PR changes protected provider/auth upgrade behavior without redacted live OAuth, API-key, or legacy doctor/upgrade proof.

Maintainer options:

Preserve shipped upgrade inputs (recommended)
Keep deprecated OpenAI auth-choice aliases, dual-provider config handling, and legacy OAuth fallback routable while doctor performs the permanent migration.
Accept a breaking provider/auth cutover
A maintainer could explicitly accept that copied setup commands and unmigrated legacy profiles may fail until doctor or reauth, but that decision should be recorded before merge.
Pause for live upgrade proof
Hold the refactor until a redacted fresh OpenAI auth path and a legacy doctor/upgrade path have been exercised in a real setup.

Next step before merge

[P1] Human review remains needed because the PR has a protected provider/auth compatibility decision plus missing contributor real behavior proof that automation cannot supply.

Security
Cleared: No concrete new security or supply-chain issue was found in the inspected diff; the auth/provider concerns are compatibility and upgrade-safety blockers.

Review findings

[P1] Preserve dual OpenAI provider configs during validation — src/config/validation.ts:114-117
[P1] Keep deprecated OpenAI auth choices routable — src/commands/auth-choice-legacy.ts:8
[P1] Restore legacy Codex OAuth fallback refresh — src/agents/auth-profiles/oauth.ts:226

Review details

Best possible solution:

Land a backward-preserving unification that preserves or migrates shipped config/auth/setup inputs through doctor-owned repair, keeps legacy fallback refresh safe until migration, and includes redacted real proof for fresh OpenAI auth plus a legacy upgrade path.

Do we have a high-confidence way to reproduce the issue?

Yes for the PR defects via source inspection: the affected upgrade/setup paths are visible in the PR head without needing live credentials. I did not run live OAuth or doctor migration because this review is read-only and the PR body does not provide that proof.

Is this the best way to solve the issue?

No. Canonicalizing the OpenAI identity may be the right direction, but this implementation still removes shipped compatibility paths and needs real upgrade/auth proof before it is the safest maintainable solution.

Full review comments:

[P1] Preserve dual OpenAI provider configs during validation — src/config/validation.ts:114-117
When config has both models.providers.openai and models.providers.openai-codex, this only copies the legacy config if openai is absent and then deletes the legacy entry. That drops shipped ChatGPT/Codex transport overrides such as base URL, API, models, or headers, so upgraded users can silently route through the direct OpenAI settings instead of their legacy Codex transport.
Confidence: 0.89
[P1] Keep deprecated OpenAI auth choices routable — src/commands/auth-choice-legacy.ts:8
The shipped non-interactive choices codex-cli, openai-codex, and openai-codex-device-code were removed from the replacement allowlist, and the OpenAI manifest does not declare them as deprecated choices. Existing copied setup commands using those values no longer normalize to the canonical OpenAI choices before provider setup, which breaks CLI setup compatibility.
Confidence: 0.88
[P1] Restore legacy Codex OAuth fallback refresh — src/agents/auth-profiles/oauth.ts:226
This fallback now only runs for stored credentials whose provider is already openai, while shipped legacy profiles can still persist provider: "openai-codex". Those expired legacy profiles no longer reach readExternalCliFallbackCredential, so they can fail with no API key until doctor migration or manual reauth instead of using the external CLI fallback refresh path.
Confidence: 0.86

Overall correctness: patch is incorrect
Overall confidence: 0.88

AGENTS.md: found and applied where relevant.

Codex review notes: model gpt-5.5, reasoning high; reviewed against 8d6a6e9d0325.

Label changes

Label justifications:

P1: The PR changes provider/auth routing and upgrade behavior that can break existing OpenAI/Codex users now.
merge-risk: 🚨 compatibility: The diff removes shipped setup aliases and can drop legacy provider config during validation for upgraded users.
merge-risk: 🚨 auth-provider: The diff changes OAuth profile/provider identity and fallback refresh behavior for OpenAI/Codex credentials.
rating: 🧂 unranked krab: Overall readiness is 🧂 unranked krab; proof is 🧂 unranked krab and patch quality is 🧂 unranked krab.
status: 📣 needs proof: The PR needs real behavior proof before ClawSweeper can clear the contributor ask. Needs real behavior proof before merge: The PR body’s proof is limited to local tests, type checks, static scans, and autoreview, and it explicitly says live OAuth/API-key/Crabbox proof was not rerun; contributor should add redacted real auth and legacy doctor/upgrade evidence. After adding proof, update the PR body; ClawSweeper should re-review automatically. If it does not, the PR author or someone with repository write access can comment @clawsweeper re-review.

Evidence reviewed

What I checked:

Repository policy applied: Root AGENTS.md says provider routing, auth/session state, persisted preferences, config loading, setup, startup checks, and fallback behavior are compatibility/upgrade-sensitive review surfaces. (AGENTS.md:18, 8d6a6e9d0325)
Dual provider config is still dropped: On the PR head, validation copies the legacy provider into openai only when no openai provider exists, then deletes the legacy provider entry; configs that contain both ids lose the legacy transport config. (src/config/validation.ts:114, ea4251e562f1)
OpenAI legacy setup aliases removed: The PR head narrows LEGACY_REPLACEMENT_AUTH_CHOICES to only claude-cli, removing the shipped OpenAI/Codex legacy setup choices from the replacement path. (src/commands/auth-choice-legacy.ts:8, ea4251e562f1)
OpenAI manifest has no replacement aliases: The PR head OpenAI manifest lists only openai, openai-device-code, and openai-api-key provider auth choices with no deprecatedChoiceIds for the old setup values. (extensions/openai/openclaw.plugin.json:234, ea4251e562f1)
Current main preserves legacy setup aliases: Current main includes codex-cli, openai-codex, and openai-codex-device-code in the legacy replacement set, so removing them is a behavior change for copied setup commands. (src/commands/auth-choice-legacy.ts:8, 8d6a6e9d0325)
Legacy OAuth fallback no longer accepts retired provider id: The PR head changes the OAuth fallback gate to only credential.provider === "openai", so an unmigrated stored OAuth profile with the shipped retired provider id does not reach the external CLI fallback refresh path. (src/agents/auth-profiles/oauth.ts:226, ea4251e562f1)

Likely related people:

Ashd.LW.: Current-main blame and file history for the legacy auth-choice, config validation, and auth-profile surfaces point to commit eb170a0; the trail is shallow but consistent across the central files inspected. (role: current behavior introducer / recent area contributor; confidence: medium; commits: eb170a0adb19; files: src/commands/auth-choice-legacy.ts, src/config/validation.ts, src/agents/auth-profiles/store.ts)

What the crustacean ranks mean

🦀 challenger crab: rare, exceptional readiness with strong proof, clean implementation, and convincing validation.
🦞 diamond lobster: very strong readiness with only minor maintainer review expected.
🐚 platinum hermit: good normal PR, likely mergeable with ordinary maintainer review.
🦐 gold shrimp: useful signal, but proof or patch confidence is still limited.
🦪 silver shellfish: thin signal; proof, validation, or implementation needs work.
🧂 unranked krab: not merge-ready because proof is missing/unusable or there are serious correctness or safety concerns.
🌊 off-meta tidepool: rating does not apply to this item.

Shiny media proof means a screenshot, video, or linked artifact directly shows the changed behavior. Runtime, network, CSP, and security claims still need visible diagnostics.

How this review workflow works

ClawSweeper keeps one durable marker-backed review comment per issue or PR.
Re-runs edit this comment so the latest verdict, findings, and automation markers stay together instead of adding duplicate bot comments.
A fresh review can be triggered by eligible @clawsweeper re-review comments, exact-item GitHub events, scheduled/background review runs, or manual workflow dispatch.
PR/issue authors and users with repository write access can comment @clawsweeper re-review or @clawsweeper re-run on an open PR or issue to request a fresh review only.
Maintainers can also comment @clawsweeper review to request a fresh review only.
Fresh-review commands do not start repair, autofix, rebase, CI repair, or automerge.
Maintainer-only repair and merge flows require explicit commands such as @clawsweeper autofix, @clawsweeper automerge, @clawsweeper fix ci, or @clawsweeper address review.
Maintainers can comment @clawsweeper explain to ask for more context, or @clawsweeper stop to stop active automation.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f6e0e90dff

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-05-30T21:37:00Z

+    if (!Object.hasOwn(providers, OPENAI_PROVIDER_ID)) {
+      providers[OPENAI_PROVIDER_ID] = normalizedConfig;
+    }
+    delete providers[providerId];


Preserve legacy OpenAI provider config when both ids exist

When a user already has both models.providers.openai (for direct API-key/OpenAI Platform settings) and a legacy models.providers.openai-codex entry (often carrying ChatGPT/Codex proxy baseUrl, headers, or request options), this normalization deletes the legacy entry without merging or warning because openai is present. The validated runtime config then loses those Codex transport overrides, so upgraded configs with both providers silently route openai/* through the surviving direct OpenAI provider settings instead of the user's legacy ChatGPT/Codex transport.

Useful? React with 👍 / 👎.

* refactor: unify OpenAI provider identity * refactor: move legacy oauth sidecar doctor helpers * test: align OpenAI fixtures after rebase * test: clean OpenAI provider unification * fix: finish OpenAI provider cleanup * fix: finish OpenAI cleanup follow-through * fix: finish OpenAI CI cleanup

steipete requested a review from a team as a code owner May 30, 2026 21:21

steipete added 2 commits May 30, 2026 22:24

refactor: unify OpenAI provider identity

52d6177

refactor: move legacy oauth sidecar doctor helpers

af56fa6

test: align OpenAI fixtures after rebase

f6e0e90

steipete force-pushed the refactor/unify-openai-provider branch from f4c1f67 to f6e0e90 Compare May 30, 2026 21:31

chatgpt-codex-connector Bot reviewed May 30, 2026

View reviewed changes

clawsweeper Bot added the rating: 🧂 unranked krab Not merge-ready due to missing proof or serious correctness/safety concerns. label May 30, 2026

steipete deleted the refactor/unify-openai-provider branch May 30, 2026 23:29

github-actions Bot mentioned this pull request May 31, 2026

📡 Upstream Digest — 2026-05-31 02:41 UTC curtismercier/openclaw-mods#985

Open

clawsweeper Bot mentioned this pull request May 31, 2026

fix(update): preserve protected Codex routes #88516

Closed

edenfunf mentioned this pull request May 31, 2026

fix(model status): show codex runtime auth on bare codex/<model> picker rows #80983

Closed

25 tasks

clawsweeper Bot mentioned this pull request Jun 4, 2026

fix(agents): strip stale compaction thinking signatures before Anthropic replay #90163

Merged

3 tasks

sergiopesch mentioned this pull request Jun 4, 2026

[Bug]: OpenAI OAuth Realtime Talk sessions fail /v1/realtime/calls with HTTP 500 #90456

Closed

clawsweeper Bot mentioned this pull request Jun 15, 2026

Document/support a Pro-plan path for gpt-5.5-pro and retired Spark via Codex CLI/app-server #83954

Open

github-actions Bot mentioned this pull request Jun 16, 2026

Track OpenClaw native Codex auth mismatch claytono/infra#2061

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

refactor: unify OpenAI provider identity#88451

refactor: unify OpenAI provider identity#88451
steipete merged 7 commits into
mainfrom
refactor/unify-openai-provider

steipete commented May 30, 2026

Uh oh!

clawsweeper Bot commented May 30, 2026 •

edited

Loading

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

chatgpt-codex-connector Bot May 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

Uh oh!

Conversation

steipete commented May 30, 2026

Summary

Verification

Real behavior proof

Uh oh!

clawsweeper Bot commented May 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot May 30, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

clawsweeper Bot commented May 30, 2026 •

edited

Loading