@davidvornholt/standards 0.19.0 → 0.21.0

package/README.md

@@ -16,28 +16,30 @@ standards github --apply
 standards creds login github
 standards creds login cloudflare
 standards creds add cloudflare --dest ci:ci.cloudflare_workers_token --permissions "Workers Scripts Write"
+standards creds add cloudflare --dest ci:ci.cloudflare_dns_token --zone 1bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb --permissions "DNS Write"
 standards creds add cloudflare --dest ci:ci.r2_read --bucket assets --s3 --permissions "Workers R2 Storage Bucket Item Read"
 standards creds add cloudflare --dest ci:ci.eu_r2_read --bucket eu-assets --jurisdiction eu --s3 --permissions "Workers R2 Storage Bucket Item Read"
 standards creds add github --dest ci:ci.broker_app
 standards creds plan
 standards creds apply
+standards creds revoke --token-id <token-id>
 standards poller --config <path>
 standards poller --print-units --config <path>
 ```
 
 `dependabot --write` regenerates the composed `.github/dependabot.yml` from the canonical `.github/dependabot.base.yml` and the optional repo-owned `.github/dependabot.local.yml`; `init` and `sync` do the same automatically. `dependabot --check` verifies the generated file still matches its sources, and `doctor`/`check` include the same verification. The overlay is deliberately lean and additive only: new update blocks for repo-specific ecosystems, top-level private registry definitions, and `ignore` or `registries` entries appended by repeating a canonical block's normalized target. Matching blocks cannot add labels, groups, cooldowns, pull-request limits, or other policy. Update blocks for the same ecosystem and target branch must not select intersecting directories after Dependabot's path normalization. A plural `directories` target is expanded as a glob when it contains `*`, `?`, or both `[` and `]`: `*` and bare `**` stay within one path segment, `**/` matches zero or more directory segments, `?` matches one non-separator character, and bracket expressions match character sets or ranges. Singular `directory` values are always literal.
 
-`dev-env` decrypts the SOPS-encrypted `secrets/dev.yaml` — keyed by workspace group and a one-segment kebab-case workspace name (`apps.<name>`, `packages.<name>`), each mapping portable environment variable names to string values — and transactionally writes every declared workspace's `.env.local` with owner-only permissions and a do-not-edit header. Its Bun-specific dotenv codec exactly round-trips every value it accepts without adding helper environment variables; a value the codec cannot encode exactly is gathered as a validation problem instead of being changed silently. Validation gathers all document, containment, destination-type, workspace, and gitignore problems before writing anything. Generation then stages every output in its destination directory and rolls the whole set back if staging or commit fails, preserving prior contents, modes, and absent files; symlink destinations, duplicate resolved destinations, changed parent-directory identities, and symlinked workspace paths are rejected without following the link. Cleanup trouble after a completed commit is reported loudly as a warning rather than falsely reporting generation failure. Parent identities are checked immediately before each path operation; an unavoidable swap in the syscall-sized interval after a check remains outside the non-hostile maintainer threat model. The canonical `justfile` exposes the command as `just dev-env-generate`, and `just dev-refresh` chains a `just secrets edit dev` session into regeneration.
+`dev-env` composes each workspace's dev environment from three layers sharing one shape — keyed by workspace group and a one-segment kebab-case workspace name (`apps.<name>`, `packages.<name>`), each mapping portable environment variable names to string values: the tracked plain `config/dev.yaml`, the SOPS-encrypted `secrets/dev.yaml` (required, decrypted via sops), and the gitignored plain `config/dev.local.yaml`, applied in that order with later layers overriding per key. A key declared in both tracked shared layers is a validation problem — a value is either configuration or a secret — while a local override of either is the file's purpose. Plain layers are optional and may be comment-only; `config/dev.local.yaml` must itself be gitignored because it may override secret values. The command transactionally writes every declared workspace's `.env.local` with owner-only permissions and a do-not-edit header naming the contributing sources. It also discovers direct `apps/*` and `packages/*` directories containing `package.json` and removes a stale `.env.local` only when its first line is that exact header; hand-owned files, edited headers, nested directories, and symlinked paths are left untouched. Writes and removals commit or roll back as one transaction, preserving prior contents, modes, and absent files. The final files and the transaction's actual random `.env.local.standards-*.tmp` and `.env.local.standards-*.bak` paths must all be gitignored before staging starts. Existing consumers must add those two artifact patterns themselves because `.gitignore` is seeded only during `init`; `sync` does not change it. Its Bun-specific dotenv codec exactly round-trips every value it accepts without adding helper environment variables; a value the codec cannot encode exactly is gathered as a validation problem instead of being changed silently. Validation gathers all document, containment, destination-type, workspace, and gitignore problems before writing anything; symlink destinations, duplicate resolved destinations, changed parent-directory identities, and symlinked workspace paths are rejected without following the link. Cleanup trouble after a completed commit is reported loudly as a warning rather than falsely reporting generation failure. Parent identities are checked immediately before each path operation; an unavoidable swap in the syscall-sized interval after a check remains outside the non-hostile maintainer threat model. The canonical `justfile` exposes the command as `just dev-env-generate`, and `just dev-refresh` chains a `just secrets edit dev` session into regeneration.
 
 `check` also rejects the raw token formed by `biome-` + `ignore` anywhere in lock-listed canonical files. The intentionally blunt policy keeps synced sources compatible with consumer Biome configurations without invoking Biome or maintaining language-aware comment parsing.
 
-`github --check` compares the live GitHub repository (including the canonical squash-only repository settings, rulesets, and declared labels) against the merged declaration in `.github/settings.json` + `.github/settings.local.json`; `github --apply` converges that declared state. The canonical declaration enables squash while disabling merge commits and rebases, and its default-branch ruleset independently allows only squash. Undeclared live labels remain untouched, while undeclared repository-owned rulesets are removed. `check` runs the same comparison whenever `.github/settings.json` is present, and fails closed: declared state the token cannot see fails the gate with a message naming the token fix instead of passing unverified. The canonical workflow sets `STANDARDS_SKIP_GITHUB_CHECK=true` only in its unprivileged quality step because its isolated `github-settings` job runs the live comparison with the settings-read token; this is a workflow-internal integration seam, not a general way to disable the local gate. The CLI prints an explicit diagnostic whenever that exact value skips either `check`'s live phase or `github --check`; `github --apply` is never skipped. `--apply` re-diffs the PATCH response, so a setting GitHub accepts with HTTP 200 but silently ignores (plan-unavailable features) is a reported failure, not a false success. A repository whose GitHub plan cannot enforce rulesets can declare that in the seam (see `rulesetEnforcement` below); both commands then skip rulesets and plan-gated repository settings, converge the rest, and print an unprotected-branch notice on every run.
+`github --check` compares the live GitHub repository (including the canonical squash-only repository settings, rulesets, and declared labels) against the merged declaration in `.github/settings.json` + `.github/settings.local.json`; `github --apply` converges that declared state. The canonical declaration enables squash while disabling merge commits and rebases, and its default-branch ruleset independently allows only squash. Undeclared live labels remain untouched, while undeclared repository-owned rulesets are removed. `check` runs the same comparison whenever `.github/settings.json` is present, and fails closed: declared state the token cannot see fails the gate with a message naming the token fix instead of passing unverified. The canonical workflow sets `STANDARDS_SKIP_GITHUB_CHECK=true` only in its unprivileged quality step because its isolated `github-settings` job runs the live comparison with its own workflow token; this is a workflow-internal integration seam, not a general way to disable the local gate. The CLI prints an explicit diagnostic whenever that exact value skips either `check`'s live phase or `github --check`; `github --apply` is never skipped. `--apply` re-diffs the PATCH response, so a setting GitHub accepts with HTTP 200 but silently ignores (plan-unavailable features) is a reported failure, not a false success. A repository whose GitHub plan cannot enforce rulesets can declare that in the seam (see `rulesetEnforcement` below); both commands then skip rulesets and plan-gated repository settings, converge the rest, and print an unprotected-branch notice on every run.
 
 `structure` enforces the canonical monorepo structure contract: workspace scripts (`check-types`, `lint`, `lint:fix`, `test`), root gate scripts, filtered Turbo convenience aliases, internal `0.0.0`/`workspace:*` versioning, package `exports`, shared tsconfig inheritance, and browser a11y wiring. Only a workspace containing an explicit `*.a11y.ts` suite must provide a `test:a11y` script and direct `@axe-core/playwright` and `@playwright/test` dependencies. `check` includes `structure`, so these rules gate every consumer PR.
 
 `poller` runs one tick of the fix poller: host-level automation that turns maintainer-approved GitHub issues into verified draft PRs and maintainer-approved draft PRs into completed review-fix cycles, using headless Codex runs. All workflow state lives in GitHub labels, comments, and draft PRs (the labels are canonical declared settings — see `github --apply`), so ticks are stateless, re-runnable, and safe to schedule from any host. A tick claims work by label (`fix-in-progress` / `review-in-progress`), releases claims stale for longer than `staleClaimHours`, and fails loudly — a red tick means jobs stalled, never silence. A separate acknowledgement tick validates pending approvals and posts one deduplicated queued message per approval generation; it never claims or starts work, so it can keep giving maintainers prompt feedback while the worker is occupied. When a worker claims a request, it posts a concise start message. The exact approval and distributed claim records remain in hidden comment metadata, and losing claim contenders remove their duplicate comments. Trust is verified per event, not per configuration: the approval labels (`approved-for-fix`, `approved-for-review`) only count when the applying user holds the `admin` or `maintain` role, bind to the exact approved issue revision or PR head, and are revalidated before publication; only admin/maintain comments are treated as answers to agent questions. Approved Codex runs inherit the poller's GitHub token and use authenticated `gh` for relevant reads and comments; review runs also maintain the PR review ledger, apply authorized title or body edits, post fix threads, and file deferred findings directly. The run works in a throwaway git worktree, grants Codex write access to that worktree and its exact Git common directory so commits can update the linked repository metadata, and hands results back through a structured outcome file. The poller then verifies the approved head, commits, and protected paths before pushing or publishing; it replies to and resolves agent-posted fix threads only after the reviewed head is pushed, and it alone changes protocol labels, posts the final report, and flips a reviewed draft ready, while required CI remains the quality gate. If publishing a sealed fix or review result fails, the poller releases only its owned in-progress claim and keeps the approval and sealed output, so the next worker tick retries publication without another Codex run. Sealed review plans from the earlier protocol are rejected and their output branches are ignored, so the review reruns on a fresh protocol-versioned branch rather than silently dropping legacy deferred work. Host mutation is declarative-only: `--print-units` emits four correctly escaped systemd units for the polling host's infrastructure repository to adapt and deploy: the worker service and timer plus an independent lightweight acknowledgement service and timer. That repository owns the service identity, writable HOME, PATH, authenticated `gh`, lingering, and deployment. The worker service's tick budget (`TimeoutStartSec`) is derived from `maxJobsPerTick` × `runTimeoutMinutes` plus overhead, so re-render and redeploy the units after changing either value.
 
-`creds` is the credential broker: it mints scoped Cloudflare tokens, rotates and revokes those tokens, and places GitHub App credentials into SOPS-encrypted targets — secret values never touch stdout, argv, or an agent's context; commands print only metadata (token name, scopes, expiry, destination). Cloudflare reconciliation has exactly two sources of truth: the plaintext key structure of the SOPS files and the provider token list under the deterministic naming scheme `standards/<owner>/<repo>/<sops-target>/<dotted.key>`; there is no separate credential manifest. `plan` and `apply` reconcile Cloudflare only: each run uses the stored bootstrap credential to verify its current provider token ID, excludes that ID from reconciliation regardless of its current name, and aborts if the identity cannot be correlated with the complete account token list; a brokered token whose SOPS key was deleted is revoked, while one nearing expiry (30 days) is renewed by creating a fresh-expiry replacement with the live token's policy, durably writing and verifying the new value, and only then revoking the old token; secrets the broker did not mint are never touched. Without a manifest there is no desired-policy record, so live policy drift is not detected, and a repository rename or transfer changes the deterministic namespace and requires the visible old token to be re-minted under the new name and revoked. `add cloudflare` mints an account-owned API token (default TTL 90 days) scoped to the named permission groups (`permissions` lists the valid names) and writes it to `--dest <target>:<dotted.key>`, where `<target>` resolves like the canonical `just secrets` targets (`ci` → `secrets/ci.yaml`, `prod-1` → `infra/hosts/prod-1/secrets.yaml`); zone-scoped groups such as DNS Write are rejected because the current command supplies an account resource, not a zone resource. `--bucket <name>` switches the policy resource to a single R2 bucket; `--jurisdiction default|eu` selects the provider jurisdiction and defaults to `default`, producing `com.cloudflare.edge.r2.bucket.<account_id>_default_<bucket>` or `com.cloudflare.edge.r2.bucket.<account_id>_eu_<bucket>`. FedRAMP jurisdictions are not supported. Bucket destinations accept only bucket-scoped groups such as Workers R2 Storage Bucket Item Read/Write, and account-scoped groups are rejected. `--s3` requires `--bucket` and stores the S3-compatible credential pair Cloudflare derives from an API token — access key ID is the token ID, secret access key is the SHA-256 hex digest of the token value — as `<dotted.key>.access_key_id` and `<dotted.key>.secret_access_key` under the destination instead of the raw token value; the default endpoint is `https://<account_id>.r2.cloudflarestorage.com`, while EU uses `https://<account_id>.eu.r2.cloudflarestorage.com`. Reconciliation infers each destination's concrete write footprint from the plaintext SOPS key structure — a bearer owns the leaf at its key, while an S3 token owns both pair leaves — and aborts before mutation when managed footprints intersect. `plan` and `apply` renew and revoke S3 destinations like any other brokered token, but renewal first proves the stored access key ID matches the current provider token; an incomplete pair, unreadable value, or identity mismatch is surfaced as a finding and never mutated automatically. `add github` writes the broker GitHub App's `app_id` and `private_key` under the destination key; durable GitHub tokens cannot be created via API (PAT and OAuth-app creation are UI-only), so workflows mint short-lived installation tokens from the App at runtime (`actions/create-github-app-token`), scoped per repository and permission. The canonical weekly sync expects `bun standards creds add github --dest ci:ci.broker_app`, then mints a current-repository token with Contents read and Pull requests write; missing credentials or minting failures stop it without a fallback. Bootstrap is once per machine: `login github` runs the App manifest flow (a localhost page posts the pre-filled manifest; one "Create GitHub App" click; credentials return through the conversion endpoint — nothing is copied by hand) and opens the installation page, where the App must be bound to selected repositories rather than all repositories; `login cloudflare` guides the one dashboard paste Cloudflare requires for the first account token (named `standards-broker` to match the App, created from the "Create additional tokens" token template because its "Account API Tokens: Edit" permission is unavailable in the custom token builder, and holding that permission only), verifies that it is active, correlates its verified ID with the complete account token list and an active list record, and stores it; a bootstrap token named inside the minted `standards/` namespace is rejected before storage to keep its role unambiguous, while any other divergence from the recommended name only warns. `plan` and `apply` do not rotate GitHub App keys; create a replacement key on the App's settings page, atomically replace `github.private_key` in the protected machine-global broker store while preserving its `0600` mode, then update every intended SOPS destination, verify workflows can mint installation tokens, and revoke the old key manually. Root credentials live in the machine-global broker store (see Configuration); SOPS writes go through `sops edit` with a non-interactive editor, preserving comments and reusing the file's data key.
+`creds` is the credential broker: it mints scoped Cloudflare tokens, rotates and revokes those tokens, and places GitHub App credentials into SOPS-encrypted targets — secret values never touch stdout, argv, or an agent's context; commands print only metadata (token name, scopes, expiry, destination). Cloudflare reconciliation has exactly two sources of truth: the plaintext key structure of the SOPS files and the provider token list under the deterministic naming scheme `standards/<owner>/<repo>/<sops-target>/<dotted.key>`; there is no separate credential manifest. `plan` and `apply` reconcile Cloudflare only: each run uses the stored bootstrap credential to verify its current provider token ID, excludes that ID from reconciliation regardless of its current name, and aborts if the identity cannot be correlated with the complete account token list; a brokered token whose SOPS key was deleted is revoked, while one nearing expiry (30 days) is renewed by creating a fresh-expiry replacement with the live token's policies, durably writing and verifying the new value, and only then revoking the old token; secrets the broker did not mint are never touched. Both also report what reconciliation will never touch, in two separately labelled and separately counted blocks that never block: unmanaged tokens, meaning every unexpired token in the account whose name falls outside the reserved `standards/` namespace — with one exception, this machine's own bootstrap credential, which every run removes by verified ID before anything is classified — and tokens brokered to another repository, each printed with the repository whose `apply` owns it. An expired token is omitted from the unmanaged listing because it grants nothing. Neither block is idle information: nothing here renews or revokes those tokens, and a forgotten one — the original half of a hand-made credential that was replaced rather than retired, or a brokered token whose repository was renamed away — stays valid indefinitely, so a listed token is normally printed with the exact command that retires it, carrying `--account` and, for a token brokered elsewhere, `--force` and the one condition that justifies it. Two rows are exceptions. A token named `standards-broker` holds the reserved name for a machine's bootstrap credential, so it is either another machine's or a superseded one on this machine; `revoke` refuses it by name, so the row names the Cloudflare dashboard rather than a command that would always fail. The other exception looks like an ordinary brokered-elsewhere row, and its command fails. `plan` classifies by exact token name, so a token whose brokered repository differs from this checkout's origin only in capitalisation lands in the brokered-elsewhere block with a `--force` command; `revoke` compares repository names case-insensitively, reads the same token as this checkout's own, and refuses. Row and block header both read that token as foreign — the header labels the block tokens brokered to another repository, and the row explains the `--force` by the owning repository having been renamed, transferred, or deleted. Neither holds there: GitHub names are case-insensitive, so the owning repository is this one and it is still alive. Re-point the origin remote at the capitalisation the token carries, or retire the token in the Cloudflare dashboard. A name that claims this repository's brokered namespace without being one the broker mints is a finding instead, and findings abort reconciliation before any mutation, because reconciliation cannot own that token; plain `revoke --token-id` takes it once you decide it should go. `revoke --token-id <id>` deletes exactly one Cloudflare token, named by its 32-character hexadecimal ID, with `--account <id>` required whenever more than one account is configured; it records no ownership, so the power is momentary rather than standing and a human names the target every time. It refuses an ID the account does not hold, the bootstrap credential this machine has stored (matched by verified ID, so a rename cannot disguise it), and any other token named `standards-broker`, the reserved name for a machine's bootstrap (matched by name, because that one is another machine's bootstrap or a superseded one, retired in the Cloudflare dashboard where you can confirm whose it is — the broker cannot re-mint its own root credential). A token brokered to this repository is refused with the remedy that works here: delete its SOPS key in this repository and run `apply`, which revokes the token and keeps the secret in step. A token whose brokered name differs from this checkout's origin only in capitalisation is refused too, and without the `apply` remedy: reconciliation matches the name exactly, so from here it would neither renew nor revoke the token. Its remedies are re-pointing the origin remote at the capitalisation the token carries, which brings it back under reconciliation, or retiring it in the Cloudflare dashboard. A token brokered to a repository that is genuinely a different one is refused with that repository named, because the same `apply` remedy runs there. `--force` widens exactly that last refusal, and nothing else: it lets `revoke` delete a token whose brokered repository is not this checkout's. It verifies nothing about the state of that repository, so it is justified only when nothing reconciles the token any more — the owning repository was renamed, transferred, or deleted, and no checkout resolves to its name. `revoke` decides ownership from the origin remote and compares it case-insensitively, as GitHub names are; `plan` classifies by exact name instead, which is why the two disagree about a case-only difference. When the origin remote resolves to no GitHub repository, every brokered token is refused, `--force` included, because the check it widens is the one that could not be run. `--force` never bypasses either bootstrap guard, the case-only refusal, or that unresolvable-origin refusal. Without a manifest there is no desired-policy record, so live policy drift is not detected, and a repository rename or transfer changes the deterministic namespace and requires the visible old token to be re-minted under the new name and revoked. `add cloudflare` mints an account-owned API token (default TTL 90 days) scoped to the named permission groups (`permissions` lists the valid names) and writes it to `--dest <target>:<dotted.key>`, where `<target>` resolves like the canonical `just secrets` targets (`ci` → `secrets/ci.yaml`, `prod-1` → `infra/hosts/prod-1/secrets.yaml`). `--zone <zone-id>[,<zone-id>...]` adds a zone resource so zone-scoped groups such as DNS Write can be minted. Zones are named by their 32-character hexadecimal ID, shown on the zone's dashboard overview and not a secret; resolving a domain name instead would need Zone Read on the bootstrap token, which holds Account API Tokens / Edit and nothing else. With zones named, the selection is split by what each group can target: every group Cloudflare reports as zone-scoped forms one policy holding all named zones, and groups that can only target an account keep their own account policy on the same token, so one credential can hold DNS access next to account-wide access. A group Cloudflare reports as both takes the zone policy, which is the narrower reading of `--zone`. A group matching neither resource is named and rejected, `--zone` requires at least one zone-scoped group, and `--zone` cannot be combined with `--bucket`, which is a separate credential. The mint summary prints the resources the token reaches, so an account policy alongside the zones is visible rather than implied. `--bucket <name>` switches the policy resource to a single R2 bucket; `--jurisdiction default|eu` selects the provider jurisdiction and defaults to `default`, producing `com.cloudflare.edge.r2.bucket.<account_id>_default_<bucket>` or `com.cloudflare.edge.r2.bucket.<account_id>_eu_<bucket>`. FedRAMP jurisdictions are not supported. Bucket destinations accept only bucket-scoped groups such as Workers R2 Storage Bucket Item Read/Write, and account-scoped groups are rejected. `--s3` requires `--bucket` and stores the S3-compatible credential pair Cloudflare derives from an API token — access key ID is the token ID, secret access key is the SHA-256 hex digest of the token value — as `<dotted.key>.access_key_id` and `<dotted.key>.secret_access_key` under the destination instead of the raw token value; the default endpoint is `https://<account_id>.r2.cloudflarestorage.com`, while EU uses `https://<account_id>.eu.r2.cloudflarestorage.com`. Reconciliation infers each destination's concrete write footprint from the plaintext SOPS key structure — a bearer owns the leaf at its key, while an S3 token owns both pair leaves — and aborts before mutation when managed footprints intersect. `plan` and `apply` renew and revoke S3 destinations like any other brokered token, but renewal first proves the stored access key ID matches the current provider token; an incomplete pair, unreadable value, or identity mismatch is surfaced as a finding and never mutated automatically. `add github` selects the private broker App whose owner matches the destination repository's origin owner, checks both local SOPS leaves before authenticating, proves that the exact selected App is installed on that repository, and writes only while that full App identity still holds the synchronized broker-store entry; missing, duplicate, replaced, or mismatched owners fail before SOPS changes. Durable GitHub tokens cannot be created via API (PAT and OAuth-app creation are UI-only), so workflows mint short-lived installation tokens from the App at runtime (`actions/create-github-app-token`), scoped per repository and permission. The canonical weekly sync expects `bun standards creds add github --dest ci:ci.broker_app`, then mints a current-repository token with Contents read and Pull requests write; missing credentials or minting failures stop it without a fallback. Bootstrap is once per machine and per GitHub owner: `login github` creates a private personal App, while `login github --org <org>` creates or replaces only that organization's entry; each manifest conversion records GitHub's authoritative owner, and the command opens the installation page, where the App must be bound to selected repositories rather than all repositories. GitHub App names are globally unique and limited to 34 characters, so organization defaults include owners up to 17 characters; a longer owner or a colliding replacement name requires an explicit shorter unused `--name`. The first GitHub-specific command against an existing singleton broker store authenticates as that App, resolves its registration owner, and atomically migrates the old mapping to that one owner; a failed lookup leaves the persisted bytes untouched. If the singleton was a public App installed on repositories owned by other users or organizations, those repositories stop matching after migration because owner selection no longer treats that App as shared. For each affected owner, run `login github` while signed in as that personal owner or `login github --org <owner>`, install the new private App only on the selected repositories, run `bun standards creds add github --dest <target>:<key>` in every consumer, and verify its workflows can mint tokens. Retire the old public App only after every repository owner has its own entry, every intended SOPS destination has been reprovisioned, and token minting has been verified; until then, keep its key and installation available for any destinations not yet migrated. `login cloudflare` guides the one dashboard paste Cloudflare requires for the first account token (named `standards-broker` to match the App, created from the "Create additional tokens" token template because its "Account API Tokens: Edit" permission is unavailable in the custom token builder, and holding that permission only), verifies that it is active, correlates its verified ID with the complete account token list and an active list record, and stores it; a bootstrap token named inside the minted `standards/` namespace is rejected before storage to keep its role unambiguous, while any other divergence from the recommended name only warns. `plan` and `apply` do not rotate GitHub App keys; create a replacement key on the App's settings page, atomically replace that owner's `private_key` in the protected machine-global broker store while preserving its `0600` mode, then update every intended SOPS destination, verify workflows can mint installation tokens, and revoke the old key manually. Root credentials live in the machine-global broker store (see Configuration); SOPS writes go through `sops edit` with a non-interactive editor, preserving comments and reusing the file's data key.
 
 `structure --profile source` validates the standards source repository itself, which is deliberately not a consumer. The profile pins its intentional exceptions so they cannot drift silently: exact, ordered root gate scripts that run this CLI from the local checkout (`structure --profile source`, `dependabot --check` or `dependabot --write`, `github --check`, and the Turbo gate) instead of a recursive `standards check`, and a non-private published bin-only CLI workspace that carries a stable release SemVer and exactly maps the `standards` bin to `src/cli.ts` without `exports`. Every other consumer rule still applies.
 
@@ -47,7 +49,7 @@ standards poller --print-units --config <path>
 - **`sync-standards.local.json`** (optional) — consumer-owned sync policy at the repo root, validated by `doctor`/`check` and every `init`/`sync` even when an explicit ref or local source makes its `"ref"` irrelevant. All fields optional; a missing file means the defaults. `"ref"` is a non-empty single-line string that pins a tag, branch, or full commit sha to sync from instead of `main` (an explicit `--ref` overrides it; a local-path `--from` source is used as-is and ignores only the validated pin). `"autoSync": false` is read by the standards-sync workflow, not the CLI, and skips the weekly scheduled run; deliberate syncs then run locally because the secret-bearing workflow is schedule-only. Version 0.7.0 removes the legacy `STANDARDS_AUTO_SYNC` and `STANDARDS_SYNC_REF` variable behavior; consumers must upgrade the package and lockfile before adopting a policy file.
 - **`.github/settings.local.json` `"rulesetEnforcement": "unavailable-on-plan"`** (optional) — declares that the repository's GitHub plan cannot enforce rulesets (private repositories on GitHub Free, both personal accounts and organizations). `github --check` and `--apply` then skip rulesets instead of comparing them, because a comparison cannot be trusted there: personal accounts answer ruleset reads with HTTP 403, and free-plan organizations report declared rulesets as active while silently not enforcing them. Plan-gated repository settings that only function alongside branch protection (`allow_auto_merge`) are skipped for the same reason — GitHub accepts a PATCH for them with HTTP 200 and silently keeps the old value. The remaining repository merge settings are still checked and converged, and both commands print an unprotected-branch notice on every run. The only accepted value is `"unavailable-on-plan"` (enforcement is the default; omit the key on paid plans), and combining the opt-out with additional local rulesets is rejected. After upgrading the plan, remove the declaration and run `bun standards github --apply` to restore enforcement.
 - **Poller config file** (required for `poller`, passed via `--config`) — host-level JSON, deliberately not repository state. Required: `"repos"` (1–12 unique `owner/repo` strings), `"model"` and `"reasoningEffort"` (passed to `codex exec`; the model choice is deliberate and has no default). The 12-repository maximum and five-minute acknowledgement cooldown keep supported mixed fix/review queues and persisted review-plan recovery below the 5,000-request/hour GitHub API budget with at least 1,400 requests/hour reserved for pagination, active jobs, writes, and other token users; the compound regression bound covers four acknowledged fixes plus four acknowledged reviews with persisted plans in every repository at no more than 3,312 requests/hour. Existing configs above the repository limit must be reduced or split across pollers with independent GitHub API budgets before upgrading. Optional: `"maxJobsPerTick"` (default 1 — the maximum number of new Codex runs the sequential worker may start in one tick), `"staleClaimHours"` (default 6; must exceed `runTimeoutMinutes` so a sweep can never release the claim of a job that is still running), `"runTimeoutMinutes"` (default 240 — the timeout catches wedged agents, not honest multi-hour review runs), `"cacheDir"` (default `~/.cache/standards-poller`; holds bare mirrors and job worktrees; relative paths resolve against the config file), `"extraCodexArgs"` (extra `codex exec` arguments, e.g. enabling the collaboration feature for subagent fan-out). Unknown keys are rejected. The poller needs `git`, `gh`, `codex` (authenticated — its rotating auth state must live in a writable location), and a GitHub token per the bullet below; the token needs issues, pull-requests, and contents write on the watched repos, and nothing else.
-- **Broker store** (created by `creds login`) — machine-global root credentials at `$XDG_CONFIG_HOME/standards/broker.yaml` (default `~/.config/standards/broker.yaml`; override with `STANDARDS_BROKER_FILE`), holding the GitHub App identity (id, slug, client id, private key) and one bootstrap token per Cloudflare account. The file is plaintext with `0600` permissions — deliberately the same local-account trust boundary as the plaintext personal age identity at `~/.config/sops/age/keys.txt`, which unlocks the same secrets; SOPS-encrypting the store to that adjacent identity would not improve custody. Writes use an owner-only temporary file and atomic replacement, and simultaneous provider logins merge rather than overwrite each other; `creds status` warns when the final mode is broader. The store lives outside every repository, is never synced or backed up, and losing it is cheap: re-run the two login commands and revoke the old App key and bootstrap token. On an additional machine, do not create a second App: generate an additional private key from the existing App's settings page (GitHub Apps support several active keys; key generation has no API) and add it to that machine's store, so retiring a machine revokes one key, not the setup.
-- **`GH_TOKEN` / `GITHUB_TOKEN`** (optional generally; poller automation requires this or a logged-in `gh`) — GitHub API token for the `github` command and the GitHub portion of `check`; poller runs pass environment tokens through to Codex, while a local poller can share the service identity's authenticated `gh` state. When neither is available, other commands can still read public repositories anonymously, but poller writes and `github --apply` fail. GitHub's REST API reveals repo merge settings only to write-capable viewers, and `check` retries REST-hidden keys over GraphQL, which serves them to read-only tokens. REST serves ruleset `bypass_actors` only to a user-scoped token holding repository Administration read (a fine-grained PAT with that permission, such as CI's settings token, or the local `gh` CLI), and never to a GitHub App installation token at any permission level, so `check` retries the hidden lists over GraphQL, which withholds the actor identities but answers an exact bypass-actor count (established for a GitHub App installation token and for a non-admin classic-scope viewer, not for every identity class): a declared-empty list verifies exactly, a count that disagrees with the declared length is drift, and a matching non-zero count leaves *which* actors bypass unconfirmed, so the gate fails closed on that ruleset. An installation-token run therefore leaves a declared non-empty list failing until the check is re-run locally with admin `gh` auth; broadening the settings PAT beyond read-only Administration is not the fix. Private-repository labels require Issues read (or Pull requests read); a token that still cannot see declared state fails the check rather than passing unverified. In CI, the canonical workflow decrypts `ci.github_settings_read_token` from the SOPS-encrypted `secrets/ci.yaml`: a repository-scoped fine-grained PAT with read-only "Administration" and "Issues" access.
+- **Broker store** (created by `creds login`) — machine-global root credentials at `$XDG_CONFIG_HOME/standards/broker.yaml` (default `~/.config/standards/broker.yaml`; override with `STANDARDS_BROKER_FILE`), holding one private GitHub App identity (owner, id, slug, client id, private key) per GitHub account and one bootstrap token per Cloudflare account. The file is plaintext with `0600` permissions — deliberately the same local-account trust boundary as the plaintext personal age identity at `~/.config/sops/age/keys.txt`, which unlocks the same secrets; SOPS-encrypting the store to that adjacent identity would not improve custody. Writes use an owner-only temporary file and atomic replacement, and simultaneous provider logins merge rather than overwrite other accounts; `creds status` lists every App and owner and warns when the final mode is broader. The store lives outside every repository, is never synced or backed up, and losing it is cheap: re-run the provider login commands, revoke the old App keys on each App's settings page, and retire the old bootstrap tokens in the Cloudflare dashboard. The dashboard is the only route for those tokens: `login cloudflare` walks you through creating a second one under the reserved `standards-broker` name, the old one stays live under that same name, and `revoke` refuses every token holding it. On an additional machine, do not create second Apps: generate an additional private key from each existing App's settings page (GitHub Apps support several active keys; key generation has no API) and add it to that machine's store, so retiring a machine revokes one key per owner, not the setups.
+- **`GH_TOKEN` / `GITHUB_TOKEN`** (optional generally; poller automation requires this or a logged-in `gh`) — GitHub API token for the `github` command and the GitHub portion of `check`; poller runs pass environment tokens through to Codex, while a local poller can share the service identity's authenticated `gh` state. When neither is available, other commands can still read public repositories anonymously, but poller writes and `github --apply` fail. GitHub's REST API reveals repo merge settings only to write-capable viewers, and `check` retries REST-hidden keys over GraphQL, which serves them to read-only tokens. REST serves ruleset `bypass_actors` only to a user-scoped token holding repository Administration read (a fine-grained PAT with that permission, or the local `gh` CLI under an admin account), and never to a GitHub App installation token at any permission level, so `check` retries the hidden lists over GraphQL, which withholds the actor identities but answers an exact bypass-actor count (established for a GitHub App installation token and for a non-admin classic-scope viewer, not for every identity class): a declared-empty list verifies exactly, a count that disagrees with the declared length is drift, and a matching non-zero count leaves *which* actors bypass unconfirmed, so the gate fails closed on that ruleset. An installation-token run therefore leaves a declared non-empty list failing until the check is re-run locally with admin `gh` auth; widening the App's permissions is not the fix. Private-repository labels require Issues read (or Pull requests read); a token that still cannot see declared state fails the check rather than passing unverified. In CI, the canonical workflow verifies with the workflow token, granted read-only "Contents" and "Issues"; Issues is what declared-label reads need, listing rulesets rides on the implicit "Metadata" read, and merge settings come over GraphQL. A private-repository probe compared that grant set against a broker App installation token across every read the check performs and found no difference, so CI provisions no settings credential of its own.
 
 See the standards repository README for the ownership model and adoption workflow.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@davidvornholt/standards",
-  "version": "0.19.0",
+  "version": "0.21.0",
   "description": "Bootstrap, synchronize, and validate davidvornholt/standards consumers",
   "license": "MIT",
   "repository": {
@@ -25,16 +25,21 @@
     "src/creds-add-cloudflare-commit.ts",
     "src/creds-add-github.ts",
     "src/creds-add-policy.ts",
+    "src/creds-add-preflight.ts",
     "src/creds-browser.ts",
     "src/creds-cloudflare-account.ts",
     "src/creds-cloudflare.ts",
     "src/creds-cloudflare-api.ts",
     "src/creds-cloudflare-condition.ts",
     "src/creds-cloudflare-expiry.ts",
+    "src/creds-cloudflare-id.ts",
     "src/creds-cloudflare-pagination.ts",
+    "src/creds-cloudflare-zone.ts",
     "src/creds-commands.ts",
     "src/creds-args.ts",
     "src/creds-dest.ts",
+    "src/creds-github-app-api.ts",
+    "src/creds-github-apps.ts",
     "src/creds-login-cloudflare.ts",
     "src/creds-login-github.ts",
     "src/creds-login-github-manifest.ts",
@@ -42,16 +47,24 @@
     "src/creds-plan.ts",
     "src/creds-plan-groups.ts",
     "src/creds-plan-renew.ts",
+    "src/creds-plan-report.ts",
     "src/creds-plan-run.ts",
     "src/creds-plan-revoke.ts",
     "src/creds-plan-types.ts",
+    "src/creds-plan-unmanaged.ts",
     "src/creds-prompt.ts",
     "src/creds-r2.ts",
+    "src/creds-revoke.ts",
     "src/creds-sops.ts",
     "src/creds-sops-editor.ts",
     "src/creds-sops-structure.ts",
+    "src/creds-sops-value.ts",
     "src/creds-store.ts",
+    "src/creds-store-github.ts",
     "src/creds-store-lock.ts",
+    "src/creds-store-lock-holder.ts",
+    "src/creds-store-lock-inspection.ts",
+    "src/creds-store-lock-lease.ts",
     "src/dependabot-compose-input.ts",
     "src/dependabot-compose.ts",
     "src/dependabot-directory-character-class.ts",
@@ -59,11 +72,15 @@
     "src/dependabot-directory-overlap.ts",
     "src/dependabot-inspect.ts",
     "src/dependabot-update.ts",
+    "src/dev-env-compose.ts",
     "src/dev-env-document.ts",
     "src/dev-env-destination-duplicates.ts",
+    "src/dev-env-destination-gitignore.ts",
     "src/dev-env-destination.ts",
     "src/dev-env-dotenv-value.ts",
     "src/dev-env-dotenv.ts",
+    "src/dev-env-reconciliation.ts",
+    "src/dev-env-secrets.ts",
     "src/dev-env-transaction-recovery.ts",
     "src/dev-env-transaction.ts",
     "src/dev-env.ts",
@@ -95,6 +112,7 @@
     "src/poller-comment-metadata.ts",
     "src/poller-comment-reconciliation.ts",
     "src/poller-claim-reconciliation.ts",
+    "src/poller-closing-reference.ts",
     "src/poller-config.ts",
     "src/poller-fix-outcome.ts",
     "src/poller-fix-output.ts",

package/src/cli.ts

@@ -965,7 +965,7 @@ Commands:
   doctor      Validate extension seams only
   structure   Validate monorepo structure rules only
   dependabot  Verify (--check) or regenerate (--write) the composed .github/dependabot.yml
-  dev-env     Write each workspace's generated .env.local from the SOPS-encrypted secrets/dev.yaml
+  dev-env     Compose each workspace's generated .env.local from config/dev.yaml, the SOPS-encrypted secrets/dev.yaml, and gitignored config/dev.local.yaml overrides
   github      Compare (--check) or converge (--apply) live GitHub settings
   creds       Mint, rotate, and revoke brokered credentials (see \`standards creds help\`)
   poller      Run one fix-poller tick over the configured repositories (host automation)
@@ -1216,7 +1216,7 @@ const runCheckCommand = async (consumer: string): Promise<boolean> => {
 };
 
 // The canonical workflow sets this only for its unprivileged quality job,
-// where a separate isolated job runs the same live check with the settings-read
+// where a separate isolated job runs the same live check with its own workflow
 // token. Absent that exact workflow seam, local and explicit checks remain
 // fail-closed.
 const runGithubCheckGate = (consumer: string): Promise<boolean> => {

package/src/creds-add-cloudflare-commit.ts

@@ -1,9 +1,6 @@
 import { deleteAccountToken } from './creds-cloudflare';
-import {
-  type SopsValueChange,
-  type SopsWriteResult,
-  verifySopsStoredValue,
-} from './creds-sops';
+import type { SopsValueChange, SopsWriteResult } from './creds-sops';
+import { verifySopsStoredValue } from './creds-sops-value';
 
 export const commitCreatedCloudflareToken = async (input: {
   readonly consumer: string;

package/src/creds-add-github.ts

@@ -4,12 +4,18 @@
 // identity itself; workflows mint short-lived installation tokens from it at
 // runtime, scoped per repository and permission.
 
+import { inspectDestinations } from './creds-add-preflight';
 import { resolveContext } from './creds-dest';
+import { verifyGithubAppInstallation } from './creds-github-app-api';
 import {
-  inspectSopsScalarDestination,
-  setSopsValues,
-  verifySopsScalarLeaf,
-} from './creds-sops';
+  loadOwnedGithubStore,
+  sameGithubApp,
+  selectGithubAppForRepo,
+} from './creds-github-apps';
+import { setSopsValues } from './creds-sops';
+import { verifySopsStoredValue } from './creds-sops-value';
+import { readBrokerStore, resolveBrokerPath } from './creds-store';
+import { withBrokerLock } from './creds-store-lock';
 
 export const runCredsAddGithub = async (
   consumer: string,
@@ -19,41 +25,87 @@ export const runCredsAddGithub = async (
   if (context === null) {
     return false;
   }
-  if (context.store.github === null) {
-    console.error(
-      'standards creds: no broker GitHub App configured; run `standards creds login github`',
-    );
-    return false;
-  }
-  const { appId, privateKey, slug } = context.store.github;
   const appIdPath = `${context.dest.key}.app_id`;
   const privateKeyPath = `${context.dest.key}.private_key`;
-  const preflight = await Promise.all(
-    [appIdPath, privateKeyPath].map((path) =>
-      inspectSopsScalarDestination(consumer, context.rel, path),
-    ),
+  const blocked = await inspectDestinations(consumer, context.rel, [
+    appIdPath,
+    privateKeyPath,
+  ]);
+  if (blocked !== null) {
+    console.error(`standards creds: ${blocked}`);
+    return false;
+  }
+  const storePath = resolveBrokerPath();
+  const loaded = await loadOwnedGithubStore(storePath);
+  if (!loaded.ok) {
+    console.error(`standards creds: ${loaded.problem}`);
+    return false;
+  }
+  const selected = selectGithubAppForRepo(loaded.value.github, context.repo);
+  if (!selected.ok) {
+    console.error(`standards creds: ${selected.problem}`);
+    return false;
+  }
+  const installation = await verifyGithubAppInstallation(
+    selected.value,
+    context.repo,
   );
-  const blocked = preflight.find((result) => !result.ok);
-  if (blocked !== undefined && !blocked.ok) {
-    console.error(`standards creds: ${blocked.problem}`);
+  if (!installation.ok) {
+    console.error(`standards creds: ${installation.problem}`);
+    return false;
+  }
+  const { appId, privateKey, slug } = selected.value;
+  let writeResult:
+    | { readonly ok: true }
+    | { readonly ok: false; readonly problem: string };
+  try {
+    writeResult = await withBrokerLock(storePath, async () => {
+      const current = selectGithubAppForRepo(
+        (await readBrokerStore(storePath)).github,
+        context.repo,
+      );
+      if (!current.ok) {
+        return current;
+      }
+      if (!sameGithubApp(current.value, selected.value)) {
+        return {
+          ok: false,
+          problem: `the broker GitHub App for ${selected.value.owner} changed while its installation was being verified; retry so the replacement can be verified`,
+        };
+      }
+      return setSopsValues(consumer, context.rel, [
+        { path: appIdPath, value: String(appId) },
+        { path: privateKeyPath, value: privateKey },
+      ]);
+    });
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.error(`standards creds: ${message}`);
+    return false;
+  }
+  if (!writeResult.ok) {
+    console.error(`standards creds: ${writeResult.problem}`);
     return false;
   }
-  const written = setSopsValues(consumer, context.rel, [
+  const verified = [
     { path: appIdPath, value: String(appId) },
     { path: privateKeyPath, value: privateKey },
-  ]);
-  if (!written.ok) {
-    console.error(`standards creds: ${written.problem}`);
+  ].map(({ path, value }) => ({
+    path,
+    result: verifySopsStoredValue(consumer, context.rel, path, value),
+  }));
+  const unverifiable = verified.find(({ result }) => !result.ok);
+  if (unverifiable !== undefined && !unverifiable.result.ok) {
+    console.error(`standards creds: ${unverifiable.result.problem}`);
     return false;
   }
-  const verified = await Promise.all(
-    [appIdPath, privateKeyPath].map((path) =>
-      verifySopsScalarLeaf(consumer, context.rel, path),
-    ),
-  );
-  const failedVerification = verified.find((result) => !result.ok);
-  if (failedVerification !== undefined && !failedVerification.ok) {
-    console.error(`standards creds: ${failedVerification.problem}`);
+  const mismatched = verified
+    .filter(({ result }) => result.ok && !result.matches)
+    .map(({ path }) => path);
+  if (mismatched.length > 0) {
+    console.error(
+      `standards creds: the stored SOPS value at ${mismatched.join(', ')} does not match the selected GitHub App`,
+    );
     return false;
   }
   console.log(

package/src/creds-add-policy.ts

@@ -6,9 +6,8 @@
 
 import { listPermissionGroups } from './creds-cloudflare';
 import type { PermissionGroup, TokenPolicy } from './creds-cloudflare-api';
+import { ZONE_SCOPE, zoneResource } from './creds-cloudflare-zone';
 import {
-  DEFAULT_R2_JURISDICTION,
-  isR2BucketName,
   R2_BUCKET_SCOPE,
   type R2Jurisdiction,
   r2BucketResource,
@@ -17,6 +16,16 @@ import type { CloudflareBrokerAccount } from './creds-store';
 
 const ACCOUNT_SCOPE = 'com.cloudflare.api.account';
 
+const tokenPolicy = (
+  resources: TokenPolicy['resources'],
+  groups: ReadonlyArray<PermissionGroup>,
+): TokenPolicy => ({
+  effect: 'allow',
+  resources,
+  // biome-ignore lint/style/useNamingConvention: Cloudflare's policy wire field is snake_case.
+  permission_groups: groups.map(({ id }) => ({ id })),
+});
+
 export const unsupportedResourceScopes = (
   groups: ReadonlyArray<PermissionGroup>,
   scope: string,
@@ -26,23 +35,99 @@ export const unsupportedResourceScopes = (
     .map((group) => group.name);
 
 const scopeProblem = (
-  bucket: string | undefined,
+  resource: { readonly kind: 'account' | 'bucket' },
   selected: ReadonlyArray<PermissionGroup>,
 ): string | null => {
-  const scope = bucket === undefined ? ACCOUNT_SCOPE : R2_BUCKET_SCOPE;
+  const scope = resource.kind === 'account' ? ACCOUNT_SCOPE : R2_BUCKET_SCOPE;
   const unsupported = unsupportedResourceScopes(selected, scope);
   if (unsupported.length === 0) {
     return null;
   }
-  return bucket === undefined
-    ? `permission group(s) ${unsupported.join(', ')} cannot target an account resource; choose account-scoped groups (zone-scoped groups require an explicit zone resource, which this command does not yet support, and R2 bucket-item groups require --bucket)`
+  return resource.kind === 'account'
+    ? `permission group(s) ${unsupported.join(', ')} cannot target an account resource; choose account-scoped groups, name the zones with --zone for zone-scoped groups, or pass --bucket for R2 bucket-item groups`
     : `permission group(s) ${unsupported.join(', ')} cannot target an R2 bucket resource; --bucket accepts only bucket-scoped groups such as Workers R2 Storage Bucket Item Read/Write`;
 };
 
+// With zones named, a token spans two resources, so the selection is split by
+// what each group can actually target rather than checked against one scope.
+// A group matching neither resource is the operator's mistake and is named.
+// A group Cloudflare reports as both zone- and account-scoped goes to the zone
+// policy: `--zone` asks for zone reach, and the narrower reading is the safe
+// one to guess wrong.
+const zonePolicies = (
+  accountId: string,
+  zoneIds: ReadonlyArray<string>,
+  selected: ReadonlyArray<PermissionGroup>,
+):
+  | { readonly policies: ReadonlyArray<TokenPolicy> }
+  | { readonly problem: string } => {
+  const zoneGroups = selected.filter((group) =>
+    group.scopes.includes(ZONE_SCOPE),
+  );
+  const accountGroups = selected.filter(
+    (group) =>
+      !group.scopes.includes(ZONE_SCOPE) &&
+      group.scopes.includes(ACCOUNT_SCOPE),
+  );
+  const unsupported = selected
+    .filter(
+      (group) =>
+        !(
+          group.scopes.includes(ZONE_SCOPE) ||
+          group.scopes.includes(ACCOUNT_SCOPE)
+        ),
+    )
+    .map((group) => group.name);
+  if (unsupported.length > 0) {
+    return {
+      problem: `permission group(s) ${unsupported.join(', ')} target neither a zone nor an account resource; R2 bucket-item groups require --bucket, which cannot be combined with --zone`,
+    };
+  }
+  if (zoneGroups.length === 0) {
+    return {
+      problem:
+        '--zone was given but no selected permission group is zone-scoped; drop --zone, or add a zone-scoped group such as DNS Write',
+    };
+  }
+  const zoneResources = Object.fromEntries(
+    zoneIds.map((zoneId) => [zoneResource(zoneId), '*']),
+  );
+  return {
+    policies: [
+      ...(accountGroups.length === 0
+        ? []
+        : [
+            tokenPolicy(
+              { [`${ACCOUNT_SCOPE}.${accountId}`]: '*' },
+              accountGroups,
+            ),
+          ]),
+      tokenPolicy(zoneResources, zoneGroups),
+    ],
+  };
+};
+
+// One token reaches exactly one kind of resource, so the caller states which
+// rather than passing flags whose illegal combinations would have to be
+// re-rejected here.
+export type PolicyResource =
+  | { readonly kind: 'account' }
+  | {
+      readonly kind: 'bucket';
+      readonly bucket: string;
+      readonly jurisdiction: R2Jurisdiction;
+    }
+  | {
+      readonly kind: 'zones';
+      // Non-empty by type: a zone policy with no resource would be accepted by
+      // the wire shape and reach nothing.
+      readonly zoneIds: readonly [string, ...ReadonlyArray<string>];
+    };
+
 export type ResolvedTokenPolicy =
   | {
       readonly ok: true;
-      readonly policy: TokenPolicy;
+      readonly policies: ReadonlyArray<TokenPolicy>;
       readonly wanted: ReadonlyArray<string>;
     }
   | { readonly ok: false; readonly problem: string };
@@ -51,10 +136,10 @@ export const resolveTokenPolicy = async (
   account: CloudflareBrokerAccount,
   options: {
     readonly permissions: string | undefined;
-    readonly bucket: string | undefined;
-    readonly jurisdiction?: R2Jurisdiction;
+    readonly resource: PolicyResource;
   },
 ): Promise<ResolvedTokenPolicy> => {
+  const { resource } = options;
   if (options.permissions === undefined || options.permissions.length === 0) {
     return {
       ok: false,
@@ -62,12 +147,6 @@ export const resolveTokenPolicy = async (
         '--permissions "<Group Name>[,<Group Name>...]" is required; list names with `standards creds permissions`',
     };
   }
-  if (options.bucket !== undefined && !isR2BucketName(options.bucket)) {
-    return {
-      ok: false,
-      problem: `invalid R2 bucket name: ${options.bucket} (3-63 lowercase letters, digits, and hyphens)`,
-    };
-  }
   const groups = await listPermissionGroups(account.accountId, account.token);
   if (!groups.ok) {
     return { ok: false, problem: groups.problem };
@@ -93,26 +172,27 @@ export const resolveTokenPolicy = async (
   const selected = resolved.flatMap(({ group }) =>
     group === undefined ? [] : [group],
   );
-  const problem = scopeProblem(options.bucket, selected);
+  if (resource.kind === 'zones') {
+    const zoned = zonePolicies(account.accountId, resource.zoneIds, selected);
+    return 'problem' in zoned
+      ? { ok: false, problem: zoned.problem }
+      : { ok: true, wanted, policies: zoned.policies };
+  }
+  const problem = scopeProblem(resource, selected);
   if (problem !== null) {
     return { ok: false, problem };
   }
-  const resource =
-    options.bucket === undefined
+  const target =
+    resource.kind === 'account'
       ? `${ACCOUNT_SCOPE}.${account.accountId}`
       : r2BucketResource(
           account.accountId,
-          options.bucket,
-          options.jurisdiction ?? DEFAULT_R2_JURISDICTION,
+          resource.bucket,
+          resource.jurisdiction,
         );
   return {
     ok: true,
     wanted,
-    policy: {
-      effect: 'allow',
-      resources: { [resource]: '*' },
-      // biome-ignore lint/style/useNamingConvention: Cloudflare's policy wire field is snake_case.
-      permission_groups: selected.map(({ id }) => ({ id })),
-    },
+    policies: [tokenPolicy({ [target]: '*' }, selected)],
   };
 };

package/src/creds-add-preflight.ts

@@ -0,0 +1,68 @@
+// Everything `creds add cloudflare` can settle before it mints anything: which
+// resource the token will reach, and whether each destination is a writable
+// scalar leaf. Minting first and discovering these afterwards would leave a
+// live credential nobody asked for.
+
+import type { PolicyResource } from './creds-add-policy';
+import { parseZoneArgument } from './creds-cloudflare-zone';
+import {
+  DEFAULT_R2_JURISDICTION,
+  isR2BucketName,
+  type R2Jurisdiction,
+} from './creds-r2';
+import { inspectSopsScalarDestination } from './creds-sops';
+
+export const inspectDestinations = async (
+  consumer: string,
+  rel: string,
+  paths: ReadonlyArray<string>,
+): Promise<string | null> => {
+  const inspected = await Promise.all(
+    paths.map((path) => inspectSopsScalarDestination(consumer, rel, path)),
+  );
+  const blocked = inspected.find((result) => !result.ok);
+  return blocked !== undefined && !blocked.ok ? blocked.problem : null;
+};
+
+export type ResolvedResourceFlags =
+  | { readonly ok: true; readonly resource: PolicyResource }
+  | { readonly ok: false; readonly problem: string };
+
+// A token reaches one kind of resource, so the flags naming it collapse to that
+// one choice here — before any provider or SOPS work, because no rejection
+// below can be salvaged afterwards.
+export const resolveResourceFlags = (options: {
+  readonly bucket: string | undefined;
+  readonly zone: string | undefined;
+  readonly jurisdiction?: R2Jurisdiction;
+}): ResolvedResourceFlags => {
+  if (options.bucket !== undefined && options.zone !== undefined) {
+    return {
+      ok: false,
+      problem:
+        '--bucket and --zone cannot be combined; an R2 bucket credential and a zone credential are separate tokens',
+    };
+  }
+  if (options.bucket !== undefined) {
+    return isR2BucketName(options.bucket)
+      ? {
+          ok: true,
+          resource: {
+            kind: 'bucket',
+            bucket: options.bucket,
+            jurisdiction: options.jurisdiction ?? DEFAULT_R2_JURISDICTION,
+          },
+        }
+      : {
+          ok: false,
+          problem: `invalid R2 bucket name: ${options.bucket} (3-63 lowercase letters, digits, and hyphens)`,
+        };
+  }
+  if (options.zone === undefined) {
+    return { ok: true, resource: { kind: 'account' } };
+  }
+  const zones = parseZoneArgument(options.zone);
+  return zones.ok
+    ? { ok: true, resource: { kind: 'zones', zoneIds: zones.zoneIds } }
+    : { ok: false, problem: zones.problem };
+};