fix(auth): scope external CLI auth status overlays by steipete · Pull Request #74156 · openclaw/openclaw

steipete · 2026-04-29T06:38:28Z

Summary

scope runtime-only external CLI auth overlays to configured providers, runtimes, auth profiles, auth.order, and channel/model override surfaces
preserve no-prompt status/doctor paths by forwarding allowKeychainPrompt: false through Claude/Codex CLI discovery while still allowing cached positive Keychain credentials
document external CLI credential discovery semantics and add regression coverage

Fixes #73908.

Tests

git diff --check
pnpm exec oxfmt --check --threads=1 CHANGELOG.md docs/auth-credential-semantics.md src/agents/auth-profiles.external-cli-sync.test.ts src/agents/auth-profiles.store-cache.test.ts src/agents/auth-profiles/external-auth.ts src/agents/auth-profiles/external-cli-sync.ts src/agents/auth-profiles/external-oauth.test.ts src/agents/auth-profiles/store.ts src/agents/cli-credentials.test.ts src/agents/cli-credentials.ts src/gateway/server-methods/models-auth-status.test.ts src/gateway/server-methods/models-auth-status.ts
pnpm test src/agents/auth-profiles.external-cli-sync.test.ts src/agents/auth-profiles.store-cache.test.ts src/agents/auth-profiles/external-oauth.test.ts src/agents/cli-credentials.test.ts src/gateway/server-methods/models-auth-status.test.ts

steipete · 2026-04-29T06:38:43Z

/clownfish automerge

openclaw-clownfish · 2026-04-29T06:39:08Z

Clownfish automerge is enabled for this PR.

I added clownfish:automerge and asked ClawSweeper to review this head. If ClawSweeper requests changes, I will repair the branch and ask for another review, up to the configured round limit.

A maintainer can pause this with /clownfish stop.

greptile-apps · 2026-04-29T06:42:05Z

Greptile Summary

This PR scopes external CLI credential discovery (Claude CLI, Codex CLI, MiniMax) so that models.authStatus only probes CLIs relevant to the current Gateway configuration, and prevents any new macOS Keychain prompt on status/doctor read paths. The eligibility logic in isExternalCliProviderEligible correctly preserves store-persisted profiles and auth.order entries as always eligible, while using the supplied provider/profile scope lists to skip unrelated CLI probes. The new caching path in readClaudeCliCredentialsCached / readCodexCliCredentialsCached that reuses a prior positive Keychain result for allowKeychainPrompt: false callers is sound, as the early-return only fires when the cache key matches a previous :keychain read and the TTL is still live. The test coverage is thorough and directly validates the fixed regression.

Confidence Score: 5/5

Safe to merge — no correctness issues found in any of the changed files.

All logic paths are well-tested. The scoping, caching, and keychain-prompt suppression are correctly implemented with no observable edge-case bugs. MiniMax intentionally omits allowKeychainPrompt since it has no keychain path, and TypeScript permits the narrower () => T signature for the optional-param slot. The normalizeScopeSet / undefined vs empty-Set distinction is used consistently throughout.

No files require special attention.

_{Reviews (1): Last reviewed commit: "fix(auth): scope external CLI auth statu..." | Re-trigger Greptile}

clawsweeper · 2026-04-29T06:42:11Z

Codex review: needs maintainer review before merge.

What this changes:

The PR scopes external CLI auth overlays for models.authStatus and auth profile stores, adds no-prompt Keychain handling for Claude/Codex CLI credential reads, documents external CLI credential semantics, updates regression coverage, and includes small ClawSweeper skill/test assertion wording changes.

Maintainer follow-up before merge:

Keep the PR open for maintainer/secops review. Rebase it onto current main, reconcile it with the shipped #73908 and #73682 behavior, then either merge a reviewed version of the remaining scoped auth/Keychain changes or close it with a maintainer-stated replacement path.

Best possible solution:

Keep the PR open for maintainer/secops review. Rebase it onto current main, reconcile it with the shipped #73908 and #73682 behavior, then either merge a reviewed version of the remaining scoped auth/Keychain changes or close it with a maintainer-stated replacement path.

What I checked:

protected-open-pr: Provided PR context shows this PR is open, unmerged, and labeled maintainer; cleanup policy requires protected-label items to stay open for explicit maintainer handling. (cd6ab82083de)
current-main-status-overlay-gap: Current main still calls ensureAuthProfileStore from models.authStatus without allowKeychainPrompt: false or runtime config; the PR changes this status path. (src/gateway/server-methods/models-auth-status.ts:296, 77a5d82e64d1)
current-main-scope-gap: Current main recognizes codex/codex-cli but not codex-app-server in external CLI runtime scope, and auth.order contributes provider keys but not ordered profile ids. (src/agents/auth-profiles/external-cli-scope.ts:45, 77a5d82e64d1)
current-main-codex-keychain-gap: Current main Codex credential reads still call the macOS Keychain path without an allowKeychainPrompt guard, and cached Codex reads do not accept or forward that option. (src/agents/cli-credentials.ts:248, 77a5d82e64d1)
claude-cache-semantics-conflict: Current main intentionally reuses a positive Claude Keychain cache for no-prompt reads, and the current test expects that behavior; the PR changes this to file-only, so it needs an explicit maintainer/security decision rather than cleanup closure. (src/agents/cli-credentials.ts:451, 77a5d82e64d1)
related-issue-partially-fixed-on-main: Current main already has a changelog entry for the narrower [Bug]: Gateway unconditionally probes all 115 manifest providers and external CLI credentials at startup — causing 50s+ blocking even with 1 configured provider #73908 fix, which means this PR needs reconciliation with current main rather than automatic closure as fully implemented. (CHANGELOG.md:84, 77a5d82e64d1)

Likely related people:

steipete: Local history and blame for the central auth profile, credential, and nearby gateway/auth files point to Peter Steinberger on recent current-main commits, including the auth read-through work and the repository-wide import cleanup that owns the current shallow blame for these files. (role: recent current-main auth/gateway maintainer and likely follow-up owner; confidence: high; commits: e6cd90e3fd9c, 3b10b8cf74e3, 06088c6b05a9; files: src/agents/auth-profiles/store.ts, src/agents/auth-profiles/external-cli-sync.ts, src/agents/cli-credentials.ts)
openclaw/secops: CODEOWNERS explicitly assigns src/agents/*auth*, src/agents/auth-profiles/, and gateway auth paths to this team; the PR changes credential discovery and macOS Keychain/no-prompt behavior. (role: required auth/security reviewer; confidence: high; files: .github/CODEOWNERS, src/agents/cli-credentials.ts, src/agents/auth-profiles/external-auth.ts)

Remaining risk / open question:

The PR changes credential discovery and macOS Keychain read/cache semantics, so it needs secops/maintainer review before merge.
The branch appears to reverse current main behavior for [Bug]: "No credentials found for profile anthropic:claude-cli" fires in cron lane despite fresh keychain — #71026 fix not reaching runtime path #73682 by making no-prompt Claude reads file-only instead of reusing a cached positive Keychain credential.
The branch is based behind current main, which already carries a narrower [Bug]: Gateway unconditionally probes all 115 manifest providers and external CLI credentials at startup — causing 50s+ blocking even with 1 configured provider #73908 fix and related auth-read-through changes; a rebase/reconciliation is needed before deciding whether the remaining diff is still desired.
The provided diff does not show dependency, workflow, package-resolution, or install-script changes, but it does include unrelated ClawSweeper skill wording and package-acceptance test assertion edits that should be reviewed separately from the auth fix.

Codex review notes: model gpt-5.5, reasoning high; reviewed against 77a5d82e64d1.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2122b19ae3

ℹ️ 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-04-29T06:43:45Z

+    if (normalized === "codex" || normalized === "codex-cli") {
+      providerIds.add("openai-codex");
+    }


Map codex-app-server runtime alias into Codex auth scope

When resolveExternalAuthScope adds runtime IDs, it only aliases codex and codex-cli to openai-codex; the accepted legacy runtime alias codex-app-server is not mapped, so models.authStatus can skip Codex CLI external credentials for configurations/environments that still use codex-app-server (for example via OPENCLAW_AGENT_RUNTIME). In that case the auth overlay scope excludes openai-codex, and status can incorrectly show Codex auth as missing even though valid Codex CLI credentials exist.

Useful? React with 👍 / 👎.

openclaw-clownfish · 2026-04-29T06:47:35Z

Thanks, ClawSweeper. Clownfish picked up the repair feedback.

Source: clawsweeper[bot]
Feedback: structured ClawSweeper marker: fix-required (finding=review-feedback sha=2122b19ae300850ba92cf612167af5b4d2568efa)
Action: dispatched cluster-worker.yml for jobs/openclaw/inbox/automerge-openclaw-openclaw-74156.md in autonomous mode.
Model: gpt-5.5

I will update this PR branch, or open a safe credited replacement, if the repair worker finds a narrow fix.

steipete · 2026-04-29T06:55:46Z

/clownfish automerge

openclaw-clownfish · 2026-04-29T06:57:02Z

Clownfish automerge is enabled for this PR.

I added clownfish:automerge and asked ClawSweeper to review this head. If ClawSweeper requests changes, I will repair the branch and ask for another review, up to the configured round limit.

A maintainer can pause this with /clownfish stop.

openclaw-clownfish · 2026-04-29T07:02:59Z

Clownfish did not dispatch a repair worker for this one.

Reason: unsupported command or target.

Supported repair commands work on existing Clownfish PRs and PRs opted into clownfish:automerge: /clownfish fix ci, /clownfish address review, /clownfish rebase.
A maintainer can opt a PR in with /clownfish automerge and I can take another pass.

steipete · 2026-04-29T07:07:35Z

/clownfish automerge

openclaw-clownfish · 2026-04-29T07:08:42Z

Clownfish automerge is enabled for this PR.

I added clownfish:automerge and asked ClawSweeper to review this head. If ClawSweeper requests changes, I will repair the branch and ask for another review, up to the configured round limit.

A maintainer can pause this with /clownfish stop.

openclaw-clownfish · 2026-04-29T07:16:14Z

Thanks, ClawSweeper. Clownfish is continuing the automerge repair loop for this PR.

Source: clawsweeper[bot]
Feedback: structured ClawSweeper verdict: needs-human (sha=2122b19ae300850ba92cf612167af5b4d2568efa)
Action: dispatched cluster-worker.yml for jobs/openclaw/inbox/automerge-openclaw-openclaw-74156.md in autonomous mode.
Model: gpt-5.5

I will update this PR branch, or open a safe credited replacement, if the repair worker finds a narrow fix.

steipete · 2026-04-29T07:22:10Z

Clownfish 🐠 automerge status

Repair pass finished without changing this PR.

Target: #74156
Executor outcome: no planned fix actions.
Worker summary: Hydrated preflight marks #74156 as security-sensitive under central_security_only, so this worker is routing that PR to central security handling and not emitting a repair, merge, close, comment, label, or fix PR action. #73908 is already closed as fixed on main, and #73952 remains open as related non-security context.

Worker actions:

route_security on #74156: planned - Security-sensitive hydrated refs must be quarantined to central OpenClaw security handling; Clownfish must not repair, close, merge, comment, label, or open a fix PR for fix(auth): scope external CLI auth status overlays #74156.
keep_closed on #73908: skipped - Already closed on live hydrated state; no mutation is valid for this worker.
keep_related on #73952: planned - Keep fix(auth): scope external CLI credential overlays #73952 open as related non-security contributor work; it is not safe or permitted to close or merge it from this fix(auth): scope external CLI auth status overlays #74156 automerge repair job.

No branch push, rebase, replacement PR, merge, or ClawSweeper re-review was started by this pass.

fish notes: model gpt-5.5, reasoning xhigh.

steipete · 2026-04-29T09:20:19Z

/clawsweeper automerge

steipete · 2026-04-29T09:24:43Z

ClawSweeper automerge is enabled for this PR.

I added clawsweeper:automerge and asked ClawSweeper to review this head. If ClawSweeper requests changes or returns needs-human, I will repair/rebase the branch and ask for another review, up to the configured round limit.