fix(macos): skip unresolved dashboard auth templates by fengjikui · Pull Request #101375 · openclaw/openclaw

fengjikui · 2026-07-07T05:14:53Z

What Problem This Solves

macOS OpenClaw.app could treat gateway.auth.token: "${OPENCLAW_GATEWAY_TOKEN}" as a literal local dashboard token when the GUI app environment did not contain that variable. That bypassed the LaunchAgent token fallback and produced a dashboard URL with an encoded placeholder fragment instead of a usable token.

Why This Change Was Made

Teach the local macOS auth resolver to recognize the same env SecretRef shorthand accepted by core config: ${NAME} and $NAME, with NAME matching ^[A-Z][A-Z0-9_]{0,127}$.
Resolve valid env SecretRefs from the app process environment when available.
If a valid env SecretRef is unresolved, return nil so the existing LaunchAgent snapshot fallback can supply the local token/password, and so unresolved placeholders are never embedded in the dashboard URL.
Keep non-matching strings such as ${custom_gateway_token} as plaintext, matching the core SecretInput parser instead of introducing a broader Swift-only grammar.
Keep remote gateway config token/password behavior unchanged.

User Impact

Users launching OpenClaw.app from Finder/Dock can recover when the gateway token only exists in the per-user LaunchAgent environment. The dashboard URL uses the resolved LaunchAgent token when available, or omits token auto-auth instead of passing a raw placeholder. Existing literal strings that are not valid env SecretRefs continue to be treated as plaintext.

Evidence

Rebased the branch on current origin/main (942b4496) and pushed head 2e00abe3.
Contract checked against src/config/types.secrets.ts: ENV_SECRET_TEMPLATE_RE, ENV_SECRET_SHORTHAND_RE, and ENV_SECRET_REF_ID_RE accept only ${NAME} / $NAME uppercase env ids.
Docs checked in docs/gateway/secrets.md: public SecretRef docs list both ${OPENAI_API_KEY} and $OPENAI_API_KEY, with id validation ^[A-Z][A-Z0-9_]{0,127}$.
Added GatewayEndpointStoreTests coverage for ${NAME} LaunchAgent fallback, $NAME LaunchAgent fallback, app-env template resolution, invalid lowercase template as plaintext, unresolved-template omission from the dashboard URL, and password fallback.
Latest upstream macOS CI passed for current PR head 2e00abe3: macos-swift succeeded and ran swift test --package-path apps/macos --parallel --enable-code-coverage --show-codecov-path successfully. Check: https://github.com/openclaw/openclaw/actions/runs/28859753269/job/85595172193
Upstream macos-node and native-i18n also passed on the same run: https://github.com/openclaw/openclaw/actions/runs/28859753269/job/85595172221 and https://github.com/openclaw/openclaw/actions/runs/28859753269/job/85595172145
The repository Real behavior proof check passed on the current head: https://github.com/openclaw/openclaw/actions/runs/28859751829/job/85595097589
git diff --check passed locally.
Local cd apps/macos && swift test --parallel --filter GatewayEndpointStoreTests was also attempted under Apple Swift 6.2.4 on macOS 15.0, but the local environment hit unrelated strict-concurrency diagnostics in apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatTranscriptCache.swift before the filtered tests executed. The upstream macOS CI above is the authoritative validation for this PR.

clawsweeper · 2026-07-07T05:24:08Z

Codex review: stale review; fresh review needed.

Summary
The latest durable ClawSweeper review was for head 3e1c9a65efe744414c1998aa2b4834aa8dfd7ff1, but the PR head is now 8f15aa861c85b8190efa33f0502ceed2fcd2a495. Its old verdict and PR readiness labels are no longer current.

Next step
Run or wait for a fresh ClawSweeper review on the current PR head.

Review history (8 earlier review cycles)

reviewed 2026-07-07T05:29:51.877Z sha 41eaef2 :: needs real behavior proof before merge. :: [P2] Align the Swift template parser with the SecretRef grammar
reviewed 2026-07-07T06:01:51.206Z sha 7467386 :: needs real behavior proof before merge. :: none
reviewed 2026-07-07T06:15:34.346Z sha 7467386 :: needs real behavior proof before merge. :: none
reviewed 2026-07-07T07:02:19.869Z sha 5e49845 :: needs real behavior proof before merge. :: none
reviewed 2026-07-07T10:46:19.935Z sha 2e00abe :: needs real behavior proof before merge. :: none
reviewed 2026-07-07T11:02:32.136Z sha 2e00abe :: needs real behavior proof before merge. :: none
reviewed 2026-07-07T11:36:06.143Z sha 46e8fb9 :: needs real behavior proof before merge. :: none
reviewed 2026-07-09T03:20:51.007Z sha 0324d55 :: needs real behavior proof before merge. :: [P3] Remove the release-owned changelog edit

fengjikui · 2026-07-07T05:56:13Z

@clawsweeper re-review

I pushed 7467386 to address the parser-contract finding by matching ${NAME} / $NAME uppercase SecretRef grammar, added LaunchAgent fallback tests for token and password, and updated the PR body with the current upstream macOS CI evidence. macos-swift, macos-node, native-i18n, and the repository Real behavior proof check are now passing on the updated branch.

clawsweeper · 2026-07-07T05:56:15Z

🦞🧹
ClawSweeper re-review requested.

I asked ClawSweeper to review this item again.
Action: item re-review queued (workflow sweep.yml, event repository_dispatch).
Result: the existing ClawSweeper review comment will be edited in place when the review finishes.

fengjikui · 2026-07-07T10:40:43Z

@clawsweeper re-review

Current head is 2e00abe3; the branch has been rebased onto origin/main 942b4496, and the PR body now points to the passing Real behavior proof, macos-swift, macos-node, and native-i18n checks for this head.

clawsweeper · 2026-07-07T10:40:46Z

🦞🧹
ClawSweeper re-review requested.

I asked ClawSweeper to review this item again.
Action: item re-review queued (workflow sweep.yml, event repository_dispatch).
Result: the existing ClawSweeper review comment will be edited in place when the review finishes.

fengjikui · 2026-07-07T15:09:36Z

Quick status update while refreshing proof for this PR:

The current PR head 46e8fb95a73323445fe3dc550df86516d0de70f1 is currently blocked locally by the same Swift 6.2 ChatTranscriptCache.swift strict-concurrency diagnostic that fix(chat): keep proof decision out of actor closure #101611 fixes (sending 'db' risks causing data races).
I verified the dependency relationship in a temporary worktree: applying fix(chat): keep proof decision out of actor closure #101611 (975aba8109fc5b519fb8f52c62eb06a568068d3f) on top of this PR head lets swift test --package-path apps/macos --filter GatewayEndpointStoreTests pass (40 tests).

So I am not refreshing this PR branch yet to avoid stacking an unmerged dependency into it. Once #101611 lands, I will rebase this PR onto current main, rerun the full proof set, and refresh the PR evidence for the rebased head.

steipete · 2026-07-09T03:29:29Z

Land-ready proof for exact head 8f15aa861c85b8190efa33f0502ceed2fcd2a495:

Before: current main treats a valid local $NAME or ${NAME} SecretRef as the literal dashboard credential, so the placeholder reaches the URL fragment before LaunchAgent fallback.
After: local token/password refs resolve in documented precedence order from the app environment, the inline LaunchAgent environment, or the canonical generated service environment used by current installs. Unresolved valid refs never reach the URL; literals and remote gateway behavior remain unchanged.
Current-install proof: this Mac's installed LaunchAgent references the canonical generated wrapper/environment-file pair exercised by the new parser tests. No credential values were printed or uploaded.
Native macOS proof: GatewayLaunchAgentManagerTests 5/5 and GatewayEndpointStoreTests 42/42 passed; touched Swift files were formatted; git diff --check passed.
Fresh Codex autoreview: no actionable findings.
Exact-head CI: run 28992029782, including macos-swift, macos-node, native-i18n, and security-fast.

No before/after screenshot: this changes credential-source routing, not pixels or layout; a screenshot would expose no meaningful behavioral difference and could risk showing auth material.

steipete · 2026-07-09T03:35:57Z

Merged via squash.

Prepared head SHA: 8f15aa861c85b8190efa33f0502ceed2fcd2a495
Landed commit: 003bb8284bea4975aa0b71b9cc0ac5e7e69f5552

* fix(macos): skip unresolved auth env templates * fix(macos): align gateway auth env refs * fix(macos): resolve dashboard refs from service env * fix(macos): read generated gateway service env * chore: keep release changelog owner-only --------- Co-authored-by: Peter Steinberger <[email protected]>

openclaw-barnacle Bot added app: macos App: macos size: S labels Jul 7, 2026

fengjikui force-pushed the codex/macos-secretref-token branch from 41eaef2 to 7467386 Compare July 7, 2026 05:49

openclaw-barnacle Bot added size: M and removed size: S labels Jul 7, 2026

clawsweeper Bot mentioned this pull request Jul 7, 2026

fix(gateway): detect unresolved env-var placeholders in gateway auth token #101399

Closed

2 tasks

fengjikui force-pushed the codex/macos-secretref-token branch from 7467386 to 5e49845 Compare July 7, 2026 06:48

This was referenced Jul 7, 2026

fix(macos): skip unresolved ${...} placeholder in gateway token and dashboard URL #101330

Closed

fix: resolve macOS dashboard token placeholders #101526

Closed

fengjikui force-pushed the codex/macos-secretref-token branch 2 times, most recently from 104a877 to 0006394 Compare July 7, 2026 10:25

clawsweeper Bot mentioned this pull request Jul 7, 2026

fix(macos): throw clear error when dashboard token contains unresolved env placeholder (fixes #101286) (AI-assisted) #101559

Closed

1 task

fengjikui force-pushed the codex/macos-secretref-token branch from 0006394 to 2e00abe Compare July 7, 2026 10:34

clawsweeper Bot added the merge-risk: 🚨 auth-provider 🚨 May break OAuth, tokens, provider routing, model choice, or credentials. label Jul 7, 2026

fengjikui force-pushed the codex/macos-secretref-token branch 2 times, most recently from 620842d to 46e8fb9 Compare July 7, 2026 11:16

clawsweeper Bot mentioned this pull request Jul 7, 2026

macOS app: dashboard fails silently with unresolved ${OPENCLAW_GATEWAY_TOKEN} placeholder when env var not in app's environment, with no in-app recovery path #101286

Closed

steipete self-assigned this Jul 9, 2026

steipete force-pushed the codex/macos-secretref-token branch from 46e8fb9 to 0324d55 Compare July 9, 2026 03:15

fengjikui and others added 4 commits July 9, 2026 04:21

fix(macos): skip unresolved auth env templates

d0d3199

fix(macos): align gateway auth env refs

fc0fc92

fix(macos): resolve dashboard refs from service env

d45d379

fix(macos): read generated gateway service env

3e1c9a6

steipete force-pushed the codex/macos-secretref-token branch from 0324d55 to 3e1c9a6 Compare July 9, 2026 03:24

chore: keep release changelog owner-only

8f15aa8

steipete merged commit 003bb82 into openclaw:main Jul 9, 2026
49 of 55 checks passed

PollyBot13 mentioned this pull request Jul 24, 2026

[Regression] macOS app bootouts healthy managed gateway after attach/pairing failure #113284

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

fix(macos): skip unresolved dashboard auth templates#101375

fix(macos): skip unresolved dashboard auth templates#101375
steipete merged 5 commits into
openclaw:mainfrom
fengjikui:codex/macos-secretref-token

fengjikui commented Jul 7, 2026 •

edited

Loading

Uh oh!

clawsweeper Bot commented Jul 7, 2026 •

edited

Loading

Uh oh!

fengjikui commented Jul 7, 2026

Uh oh!

clawsweeper Bot commented Jul 7, 2026 •

edited

Loading

Uh oh!

fengjikui commented Jul 7, 2026

Uh oh!

clawsweeper Bot commented Jul 7, 2026 •

edited

Loading

Uh oh!

fengjikui commented Jul 7, 2026

Uh oh!

steipete commented Jul 9, 2026 •

edited

Loading

Uh oh!

Uh oh!

steipete commented Jul 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Uh oh!

Conversation

fengjikui commented Jul 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What Problem This Solves

Why This Change Was Made

User Impact

Evidence

Uh oh!

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

Uh oh!

Uh oh!

fengjikui commented Jul 7, 2026

Uh oh!

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

Uh oh!

Uh oh!

fengjikui commented Jul 7, 2026

Uh oh!

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

Uh oh!

Uh oh!

fengjikui commented Jul 7, 2026

Uh oh!

steipete commented Jul 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

steipete commented Jul 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

fengjikui commented Jul 7, 2026 •

edited

Loading

clawsweeper Bot commented Jul 7, 2026 •

edited

Loading

clawsweeper Bot commented Jul 7, 2026 •

edited

Loading

clawsweeper Bot commented Jul 7, 2026 •

edited

Loading

steipete commented Jul 9, 2026 •

edited

Loading