@davidvornholt/standards 0.24.4 → 0.25.0

package/README.md

@@ -23,6 +23,7 @@ standards creds add github --dest ci:ci.broker_app
 standards creds plan
 standards creds apply
 standards creds revoke --token-id <token-id>
+standards screenshots publish docs/pr/settings-page.png docs/pr/settings-empty-state.png
 standards poller --config <path>
 standards poller --print-units --config <path>
 ```
@@ -41,6 +42,8 @@ standards poller --print-units --config <path>
 
 `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 branch writer with Contents write and Workflows write plus a separate PR opener with Contents read and Pull requests write; both mint before sync but enter only their post-sync operations, and missing credentials, unapproved App permissions, or minting failures stop the workflow without a fallback. Existing broker Apps must add Workflows write on the App settings page and have every installation owner approve that permission before consumers adopt the workflow. 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.
 
+`screenshots publish` uploads UI screenshots to the repository's configured public bucket and prints one PR-ready markdown image line per file in input order. The feature is opt-in through the tracked `config/screenshots.yaml`; without it the command reports that publishing is not enabled. Validation gathers every configuration and file problem before any upload starts. It rejects unreadable or empty files, unsupported extensions (`.png`, `.jpg`, `.jpeg`, `.gif`, `.webp`), and basenames that are not URL-safe. Objects land at `screenshots/<sha256-of-content>/<basename>`, so identical bytes republish to the same URL and a key cannot identify different bytes. The markdown alt text is the basename without its extension. The command resolves the named S3 pair from its SOPS target at publish time. It uses the values in memory and never prints, exports, or copies them elsewhere. A missing target or pair fails with the exact `creds add cloudflare --s3` invocation that mints it. Published URLs are public to anyone holding the link. The synced `screenshots-in-prs` skill owns the capture conventions and forbids screenshots of real secrets or personal data. `--dir <path>` selects the repository when not running from its root.
+
 `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.
 
 ## Configuration
@@ -48,6 +51,7 @@ standards poller --print-units --config <path>
 - **`.github/dependabot.local.yml`** (optional) — repo-owned Dependabot extension composed with the canonical `.github/dependabot.base.yml` into the generated `.github/dependabot.yml`. May define `updates` and top-level `registries`; a block matching a canonical normalized target may only add `ignore` and/or `registries` entries. Other matching-block policy is rejected deliberately. A missing or comments-only file means no additions. CLI 0.10.1 requires the selected content ref to contain the canonical base and rejects older refs before mutation.
 - **`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.
+- **`config/screenshots.yaml`** (optional; required for `screenshots publish`). This tracked per-repository declaration enables screenshot publishing. It has exactly four required keys: `pair` (the brokered S3 credential as `<target>:<dotted.key>`, e.g. `assets:assets.screenshots_rw`, minted with `bun standards creds add cloudflare --s3 --dest <target>:<key> --bucket <bucket> --permissions "Workers R2 Storage Bucket Item Write"`), `bucket` (the bucket name), `endpoint` (the S3 endpoint URL, e.g. `https://<account_id>.r2.cloudflarestorage.com`), and `publicBaseUrl` (the public base URL serving the bucket, e.g. a custom domain bound to it). Every value here is configuration, not a secret. The credential pair stays in its SOPS target and is resolved only at publish time.
 - **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 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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@davidvornholt/standards",
-  "version": "0.24.4",
+  "version": "0.25.0",
   "description": "Bootstrap, synchronize, and validate davidvornholt/standards consumers",
   "license": "MIT",
   "repository": {
@@ -157,6 +157,11 @@
     "src/poller-trust.ts",
     "src/poller-units.ts",
     "src/poller-workspace.ts",
+    "src/screenshots-commands.ts",
+    "src/screenshots-config.ts",
+    "src/screenshots-pair.ts",
+    "src/screenshots-publish.ts",
+    "src/screenshots-upload.ts",
     "src/sops-exec.ts",
     "src/structure-check.ts",
     "src/structure-profile.ts",

package/src/cli.ts

@@ -43,6 +43,7 @@ import {
   unlockedPathsUnder,
 } from './managed-path-ownership';
 import { runPollerCommand } from './poller-commands';
+import { runScreenshotsCommand } from './screenshots-commands';
 import { collectStructureProblems } from './structure-check';
 import type { StructureProfile } from './structure-profile';
 import { hasSafeCommand } from './structure-script';
@@ -973,6 +974,7 @@ Commands:
   dev-env     Compose each workspace's generated .env.local from its three dev layers and authorized broker-owned S3 pair references
   github      Compare (--check) or converge (--apply) live GitHub settings
   creds       Mint, rotate, and revoke brokered credentials (see \`standards creds help\`)
+  screenshots Publish UI screenshots to the configured public bucket and print PR-ready markdown (see \`standards screenshots help\`)
   poller      Run one fix-poller tick over the configured repositories (host automation)
   help        Show this help
 
@@ -1317,12 +1319,24 @@ const runGateCommand = (
   return apply ? runGithubApply(consumer) : runGithubCheckGate(consumer);
 };
 
+// The creds family owns its flag vocabulary and the screenshots family takes
+// variadic file operands; both route before the strict global parser rejects
+// their arguments.
+const commandFamilies: Readonly<
+  Record<string, (argv: ReadonlyArray<string>) => Promise<boolean>>
+> = {
+  creds: runCredsCommand,
+  screenshots: runScreenshotsCommand,
+};
+
 const main = async (): Promise<void> => {
-  // The creds family owns its flag vocabulary; route it before the strict
-  // global parser rejects those flags.
   const rawArgs = process.argv.slice(2);
-  if (rawArgs[0] === 'creds') {
-    if (!(await runCredsCommand(rawArgs.slice(1)))) {
+  const familyName = rawArgs[0] ?? '';
+  const family = Object.hasOwn(commandFamilies, familyName)
+    ? commandFamilies[familyName as keyof typeof commandFamilies]
+    : undefined;
+  if (family !== undefined) {
+    if (!(await family(rawArgs.slice(1)))) {
       process.exitCode = 1;
     }
     return;

package/src/creds-r2.ts

@@ -8,6 +8,7 @@
 
 import { createHash } from 'node:crypto';
 import type { SopsValueChange } from './creds-sops';
+import { isRecord } from './github-settings-parse';
 
 // Scope the permission_groups endpoint reports for the bucket-item groups
 // ("Workers R2 Storage Bucket Item Read"/"... Write"); account-scoped groups
@@ -41,6 +42,36 @@ export const s3Endpoint = (
 ): string =>
   `https://${accountId}.${jurisdiction === 'eu' ? 'eu.' : ''}r2.cloudflarestorage.com`;
 
+export type S3PairLookup =
+  | {
+      readonly ok: true;
+      readonly accessKeyId: string;
+      readonly secretAccessKey: string;
+    }
+  | { readonly ok: false; readonly kind: 'missing-key' | 'incomplete' };
+
+// Walks a decrypted SOPS document to the dotted key and requires the complete
+// pair shape destinationWrites stores: both leaves must be strings even when
+// the caller needs only one part.
+export const lookupS3Pair = (document: unknown, key: string): S3PairLookup => {
+  let node: unknown = document;
+  for (const segment of key.split('.')) {
+    if (!isRecord(node) || node[segment] === undefined) {
+      return { ok: false, kind: 'missing-key' };
+    }
+    node = node[segment];
+  }
+  return isRecord(node) &&
+    typeof node.access_key_id === 'string' &&
+    typeof node.secret_access_key === 'string'
+    ? {
+        ok: true,
+        accessKeyId: node.access_key_id,
+        secretAccessKey: node.secret_access_key,
+      }
+    : { ok: false, kind: 'incomplete' };
+};
+
 export type DestinationFormat = 'bearer' | 's3';
 
 const ACCESS_KEY_SEGMENT = 'access_key_id';

package/src/dev-env-brokered-resolve.ts

@@ -3,12 +3,12 @@
 // after layer composition so a later layer's literal can override an earlier
 // layer's reference, and a reference that lost the merge is never decrypted.
 
+import { lookupS3Pair } from './creds-r2';
 import { resolveTargetRelResult } from './creds-target';
 import type { BrokeredS3Reference } from './dev-env-brokered';
 import type { ComposedDevEnvTarget } from './dev-env-compose';
 import { encodePortableDotenvValue } from './dev-env-dotenv-value';
-import { isRecord } from './github-settings-parse';
-import { runSops } from './sops-exec';
+import { decryptSopsJson, type SopsJsonResult } from './sops-exec';
 
 export type ResolvedDevEnvTarget = {
   readonly group: string;
@@ -22,58 +22,27 @@ export type ResolvedDevEnv = {
   readonly problems: ReadonlyArray<string>;
 };
 
-type SopsDocumentResult =
-  | { readonly ok: true; readonly value: unknown }
-  | { readonly ok: false; readonly problem: string };
-
-const decryptSopsJson = (consumer: string, rel: string): SopsDocumentResult => {
-  const result = runSops(['--decrypt', '--output-type', 'json', rel], consumer);
-  if (result.status !== 0) {
-    const detail = result.errorMessage ?? result.stderr.trim();
-    return {
-      ok: false,
-      problem: detail
-        ? `could not decrypt ${rel}: ${detail}`
-        : `could not decrypt ${rel}`,
-    };
-  }
-  try {
-    return { ok: true, value: JSON.parse(result.stdout) as unknown };
-  } catch (error) {
-    return {
-      ok: false,
-      problem: `could not parse decrypted ${rel} as JSON: ${
-        error instanceof Error ? error.message : String(error)
-      }`,
-    };
-  }
-};
-
 const lookupReference = (
   document: unknown,
   reference: BrokeredS3Reference,
 ): { readonly value: string | null; readonly problem: string | null } => {
-  let node: unknown = document;
-  for (const segment of reference.key.split('.')) {
-    if (!isRecord(node) || node[segment] === undefined) {
-      return {
-        value: null,
-        problem: `has no key "${reference.key}"; mint the pair with \`bun standards creds add cloudflare --s3 --dest ${reference.brokeredS3}:${reference.key}\``,
-      };
-    }
-    node = node[segment];
-  }
-  if (
-    !isRecord(node) ||
-    typeof node.access_key_id !== 'string' ||
-    typeof node.secret_access_key !== 'string'
-  ) {
+  const pair = lookupS3Pair(document, reference.key);
+  if (!pair.ok) {
     return {
       value: null,
-      problem: `key "${reference.key}" does not hold a complete brokered S3 pair; both "access_key_id" and "secret_access_key" must be strings`,
+      problem:
+        pair.kind === 'missing-key'
+          ? `has no key "${reference.key}"; mint the pair with \`bun standards creds add cloudflare --s3 --dest ${reference.brokeredS3}:${reference.key}\``
+          : `key "${reference.key}" does not hold a complete brokered S3 pair; both "access_key_id" and "secret_access_key" must be strings`,
     };
   }
-  return { value: node[reference.part] as string, problem: null };
+  return {
+    value:
+      reference.part === 'access_key_id'
+        ? pair.accessKeyId
+        : pair.secretAccessKey,
+    problem: null,
+  };
 };
 
 export const resolveBrokeredReferences = (
@@ -83,8 +52,8 @@ export const resolveBrokeredReferences = (
   preservedReferences: ReadonlySet<string> = new Set(),
 ): ResolvedDevEnv => {
   const problems: Array<string> = [];
-  const documents = new Map<string, SopsDocumentResult>();
-  const readDocument = (targetName: string): SopsDocumentResult => {
+  const documents = new Map<string, SopsJsonResult>();
+  const readDocument = (targetName: string): SopsJsonResult => {
     const cached = documents.get(targetName);
     if (cached !== undefined) {
       return cached;

package/src/dev-env-secrets.ts

@@ -1,16 +1,11 @@
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
-import { runSops } from './sops-exec';
+import { decryptSopsJson, type SopsJsonResult } from './sops-exec';
 
 export const DEV_SECRETS_FILE = 'secrets/dev.yaml';
 
-const SOPS_ARGS = ['--decrypt', '--output-type', 'json', DEV_SECRETS_FILE];
+export type DevSecretsResult = SopsJsonResult;
 
-export type DevSecretsResult =
-  | { readonly ok: true; readonly value: unknown }
-  | { readonly ok: false; readonly problem: string };
-
-// sops emits JSON here so the CLI never parses the encrypted YAML itself.
 export const readDevSecrets = (consumer: string): DevSecretsResult => {
   if (!existsSync(join(consumer, DEV_SECRETS_FILE))) {
     return {
@@ -18,24 +13,5 @@ export const readDevSecrets = (consumer: string): DevSecretsResult => {
       problem: `${DEV_SECRETS_FILE} not found; create it with \`just secrets edit dev\``,
     };
   }
-  const result = runSops(SOPS_ARGS, consumer);
-  if (result.status !== 0) {
-    const detail = result.errorMessage ?? result.stderr.trim();
-    return {
-      ok: false,
-      problem: detail
-        ? `could not decrypt ${DEV_SECRETS_FILE}: ${detail}`
-        : `could not decrypt ${DEV_SECRETS_FILE}`,
-    };
-  }
-  try {
-    return { ok: true, value: JSON.parse(result.stdout) as unknown };
-  } catch (error) {
-    return {
-      ok: false,
-      problem: `could not parse decrypted ${DEV_SECRETS_FILE} as JSON: ${
-        error instanceof Error ? error.message : String(error)
-      }`,
-    };
-  }
+  return decryptSopsJson(consumer, DEV_SECRETS_FILE);
 };

package/src/screenshots-commands.ts

@@ -0,0 +1,64 @@
+// The screenshots command family: publish UI screenshots to the repository's
+// configured public bucket and print the markdown that embeds them in a pull
+// request description. Configuration lives in the tracked
+// config/screenshots.yaml; the signing credential stays in its SOPS target.
+
+import { resolve } from 'node:path';
+import process from 'node:process';
+import { SCREENSHOTS_CONFIG_FILE } from './screenshots-config';
+import { runScreenshotsPublish } from './screenshots-publish';
+
+const SCREENSHOTS_USAGE = `Usage: standards screenshots <command> [options]
+
+Commands:
+  publish <files...>  Upload screenshots to the configured public bucket at content-addressed keys and print one markdown image line per file
+
+Options:
+  --dir <path>  Repository holding ${SCREENSHOTS_CONFIG_FILE} and the SOPS credential target (default: current directory)
+
+Publishing reads ${SCREENSHOTS_CONFIG_FILE} (pair, bucket, endpoint, publicBaseUrl) and resolves the credential pair from its SOPS target at publish time. Published URLs are public to anyone holding the link and are kept indefinitely so pull request history keeps rendering.`;
+
+type ScreenshotsFlags = {
+  dir: string;
+  readonly words: Array<string>;
+};
+
+const parseScreenshotsArgs = (
+  argv: ReadonlyArray<string>,
+): ScreenshotsFlags => {
+  const flags: ScreenshotsFlags = { dir: process.cwd(), words: [] };
+  for (let index = 0; index < argv.length; index += 1) {
+    const arg = argv[index] ?? '';
+    if (arg === '--dir') {
+      const value = argv[index + 1];
+      if (value === undefined || value.startsWith('--')) {
+        throw new Error(`${arg} requires a value`);
+      }
+      flags.dir = value;
+      index += 1;
+    } else if (arg.startsWith('--')) {
+      throw new Error(`Unknown screenshots option: ${arg}`);
+    } else {
+      flags.words.push(arg);
+    }
+  }
+  flags.dir = resolve(flags.dir);
+  return flags;
+};
+
+export const runScreenshotsCommand = (
+  argv: ReadonlyArray<string>,
+): Promise<boolean> => {
+  const flags = parseScreenshotsArgs(argv);
+  const [route, ...files] = flags.words;
+  if (route === undefined || route === 'help') {
+    console.log(SCREENSHOTS_USAGE);
+    return Promise.resolve(route === 'help');
+  }
+  if (route === 'publish') {
+    return runScreenshotsPublish(flags.dir, files);
+  }
+  console.error(`standards screenshots: unknown command: ${route}\n`);
+  console.error(SCREENSHOTS_USAGE);
+  return Promise.resolve(false);
+};

package/src/screenshots-config.ts

@@ -0,0 +1,194 @@
+// The tracked config/screenshots.yaml is a repository's contract for
+// `standards screenshots publish`: which brokered S3 pair signs uploads,
+// which bucket and endpoint receive them, and which public base URL serves
+// the published objects. Every value here is configuration; the credential
+// pair stays in its SOPS target and is resolved only at publish time.
+
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { type CredsDestination, parseDestination } from './creds-dest';
+import { isR2BucketName } from './creds-r2';
+import { isRecord } from './github-settings-parse';
+import { parseYaml } from './yaml-parse';
+
+export const SCREENSHOTS_CONFIG_FILE = 'config/screenshots.yaml';
+
+const FIELDS = ['pair', 'bucket', 'endpoint', 'publicBaseUrl'] as const;
+
+const R2_ENDPOINT_HOST = /^[0-9a-f]{32}(?:\.eu)?\.r2\.cloudflarestorage\.com$/u;
+const LOCAL_ENDPOINT_HOSTS = new Set(['127.0.0.1', '[::1]', 'localhost']);
+const TRAILING_SLASHES = /\/+$/u;
+const MAX_ASCII_CONTROL_CODE = 0x1f;
+const DELETE_CONTROL_CODE = 0x7f;
+
+export type ScreenshotsConfig = {
+  readonly pair: CredsDestination;
+  readonly bucket: string;
+  readonly endpoint: string;
+  readonly publicBaseUrl: string;
+};
+
+export type ScreenshotsConfigResult =
+  | { readonly ok: true; readonly value: ScreenshotsConfig }
+  | { readonly ok: false; readonly problems: ReadonlyArray<string> };
+
+type RawScreenshotsConfigResult =
+  | { readonly ok: true; readonly value: string }
+  | { readonly ok: false; readonly problems: ReadonlyArray<string> };
+
+const parseUrl = (value: string): URL | null => {
+  if (
+    [...value].some((character) => {
+      const code = character.codePointAt(0) ?? 0;
+      return code <= MAX_ASCII_CONTROL_CODE || code === DELETE_CONTROL_CODE;
+    })
+  ) {
+    return null;
+  }
+  try {
+    return new URL(value);
+  } catch {
+    return null;
+  }
+};
+
+const isSafeEndpoint = (value: string): boolean => {
+  const url = parseUrl(value);
+  if (
+    url === null ||
+    url.username !== '' ||
+    url.password !== '' ||
+    url.pathname !== '/' ||
+    url.search !== '' ||
+    url.hash !== ''
+  ) {
+    return false;
+  }
+  if (LOCAL_ENDPOINT_HOSTS.has(url.hostname)) {
+    return url.protocol === 'http:' || url.protocol === 'https:';
+  }
+  return (
+    url.protocol === 'https:' &&
+    url.port === '' &&
+    R2_ENDPOINT_HOST.test(url.hostname)
+  );
+};
+
+const isSafePublicBaseUrl = (value: string): boolean => {
+  const url = parseUrl(value);
+  return (
+    url !== null &&
+    (url.protocol === 'https:' || url.protocol === 'http:') &&
+    url.username === '' &&
+    url.password === '' &&
+    url.search === '' &&
+    url.hash === ''
+  );
+};
+
+const normalizeUrl = (value: string): string => {
+  const url = parseUrl(value);
+  if (url === null) {
+    return value;
+  }
+  return `${url.origin}${url.pathname.replace(TRAILING_SLASHES, '')}`;
+};
+
+const readScreenshotsConfig = (
+  consumer: string,
+): RawScreenshotsConfigResult => {
+  const path = join(consumer, SCREENSHOTS_CONFIG_FILE);
+  if (!existsSync(path)) {
+    return {
+      ok: false,
+      problems: [
+        `${SCREENSHOTS_CONFIG_FILE} not found; screenshot publishing is not enabled for this repository`,
+      ],
+    };
+  }
+  try {
+    return { ok: true, value: readFileSync(path, 'utf8') };
+  } catch (error) {
+    return {
+      ok: false,
+      problems: [
+        `could not read ${SCREENSHOTS_CONFIG_FILE}: ${
+          error instanceof Error ? error.message : String(error)
+        }`,
+      ],
+    };
+  }
+};
+
+export const loadScreenshotsConfig = (
+  consumer: string,
+): ScreenshotsConfigResult => {
+  const raw = readScreenshotsConfig(consumer);
+  if (!raw.ok) {
+    return raw;
+  }
+  const parsed = parseYaml(raw.value, SCREENSHOTS_CONFIG_FILE);
+  if (parsed.problem !== null) {
+    return { ok: false, problems: [parsed.problem] };
+  }
+  if (!isRecord(parsed.value)) {
+    return {
+      ok: false,
+      problems: [
+        `${SCREENSHOTS_CONFIG_FILE} must be a mapping with ${FIELDS.join(', ')}`,
+      ],
+    };
+  }
+  const record = parsed.value;
+  const problems: Array<string> = [];
+  for (const key of Object.keys(record)) {
+    if (!(FIELDS as ReadonlyArray<string>).includes(key)) {
+      problems.push(`${SCREENSHOTS_CONFIG_FILE} has an unknown key "${key}"`);
+    }
+  }
+  const stringField = (field: (typeof FIELDS)[number]): string | null => {
+    const value = record[field];
+    if (typeof value === 'string' && value.length > 0) {
+      return value;
+    }
+    problems.push(
+      `${SCREENSHOTS_CONFIG_FILE} ${field} must be a non-empty string`,
+    );
+    return null;
+  };
+  const pairRaw = stringField('pair');
+  const pair = pairRaw === null ? null : parseDestination(pairRaw);
+  if (pairRaw !== null && pair === null) {
+    problems.push(
+      `${SCREENSHOTS_CONFIG_FILE} pair must be "<target>:<dotted.key>", e.g. assets:assets.screenshots_rw`,
+    );
+  }
+  const bucket = stringField('bucket');
+  if (bucket !== null && !isR2BucketName(bucket)) {
+    problems.push(
+      `${SCREENSHOTS_CONFIG_FILE} bucket "${bucket}" is not a valid bucket name`,
+    );
+  }
+  const urlField = (
+    field: 'endpoint' | 'publicBaseUrl',
+    isValid: (value: string) => boolean,
+  ): string | null => {
+    const value = stringField(field);
+    if (value !== null && !isValid(value)) {
+      problems.push(
+        `${SCREENSHOTS_CONFIG_FILE} ${field} must be a safe http(s) URL`,
+      );
+      return null;
+    }
+    return value === null ? null : normalizeUrl(value);
+  };
+  const endpoint = urlField('endpoint', isSafeEndpoint);
+  const publicBaseUrl = urlField('publicBaseUrl', isSafePublicBaseUrl);
+  return problems.length === 0 &&
+    pair !== null &&
+    bucket !== null &&
+    endpoint !== null &&
+    publicBaseUrl !== null
+    ? { ok: true, value: { pair, bucket, endpoint, publicBaseUrl } }
+    : { ok: false, problems };
+};

package/src/screenshots-pair.ts

@@ -0,0 +1,54 @@
+// Resolves the configured screenshots credential from its SOPS target: the
+// same `<target>:<dotted.key>` pair shape `creds add cloudflare --s3` mints
+// and dev-env references. The decrypted values stay in process memory for
+// the upload and are never printed.
+
+import type { CredsDestination } from './creds-dest';
+import { lookupS3Pair } from './creds-r2';
+import { resolveTargetRelResult } from './creds-target';
+import { decryptSopsJson } from './sops-exec';
+
+export type ScreenshotsPairResult =
+  | {
+      readonly ok: true;
+      readonly accessKeyId: string;
+      readonly secretAccessKey: string;
+    }
+  | { readonly ok: false; readonly problem: string };
+
+export const resolveScreenshotsPair = (
+  consumer: string,
+  pair: CredsDestination,
+  bucket: string,
+): ScreenshotsPairResult => {
+  const mintHint = `mint the pair with \`bun standards creds add cloudflare --s3 --dest ${pair.target}:${pair.key} --bucket ${bucket} --permissions "Workers R2 Storage Bucket Item Write"\``;
+  const resolved = resolveTargetRelResult(consumer, pair.target);
+  if (!resolved.ok) {
+    return {
+      ok: false,
+      problem:
+        resolved.kind === 'missing'
+          ? `${resolved.problem}; ${mintHint}`
+          : resolved.problem,
+    };
+  }
+  const document = decryptSopsJson(consumer, resolved.rel);
+  if (!document.ok) {
+    return { ok: false, problem: document.problem };
+  }
+  const lookup = lookupS3Pair(document.value, pair.key);
+  if (!lookup.ok) {
+    return {
+      ok: false,
+      problem:
+        lookup.kind === 'missing-key'
+          ? `${resolved.rel} has no key "${pair.key}"; ${mintHint}`
+          : `${resolved.rel} key "${pair.key}" does not hold a complete S3 pair; both "access_key_id" and "secret_access_key" must be strings`,
+    };
+  }
+  return {
+    ok: true,
+    accessKeyId: lookup.accessKeyId,
+    secretAccessKey: lookup.secretAccessKey,
+  };
+};

package/src/screenshots-publish.ts

@@ -0,0 +1,177 @@
+// `standards screenshots publish` uploads UI screenshots to the configured
+// public bucket at content-addressed keys and prints the markdown that embeds
+// them in a pull request description. Validation gathers every config and
+// file problem before any upload starts, and the resolved credential pair is
+// used in memory only, never printed.
+
+import { createHash } from 'node:crypto';
+import {
+  closeSync,
+  constants,
+  fstatSync,
+  lstatSync,
+  openSync,
+  readFileSync,
+  realpathSync,
+} from 'node:fs';
+import { basename, extname, resolve } from 'node:path';
+import {
+  loadScreenshotsConfig,
+  type ScreenshotsConfig,
+} from './screenshots-config';
+import { resolveScreenshotsPair } from './screenshots-pair';
+import {
+  cleanupUploads,
+  type PublishedScreenshot,
+  uploadIfAbsent,
+} from './screenshots-upload';
+
+const CONTENT_TYPES: Readonly<Record<string, string>> = {
+  '.gif': 'image/gif',
+  '.jpeg': 'image/jpeg',
+  '.jpg': 'image/jpeg',
+  '.png': 'image/png',
+  '.webp': 'image/webp',
+};
+
+// The basename becomes a URL path segment, so it must stay portable as-is:
+// no separators, spaces, or characters that need percent-encoding.
+const SAFE_BASENAME = /^[A-Za-z0-9][A-Za-z0-9._-]*$/u;
+
+const KEY_PREFIX = 'screenshots';
+
+const errorMessage = (error: unknown): string =>
+  error instanceof Error ? error.message : String(error);
+
+const readImageFile = (file: string): Uint8Array => {
+  const path = resolve(file);
+  const link = lstatSync(path);
+  if (link.isSymbolicLink() || !link.isFile() || realpathSync(path) !== path) {
+    throw new Error('not a regular file');
+  }
+  let descriptor: number | null = null;
+  try {
+    descriptor = openSync(path, constants.O_RDONLY + constants.O_NOFOLLOW);
+    if (!fstatSync(descriptor).isFile()) {
+      throw new Error('not a regular file');
+    }
+    return readFileSync(descriptor);
+  } finally {
+    if (descriptor !== null) {
+      closeSync(descriptor);
+    }
+  }
+};
+
+const fileProblems = (file: string): ReadonlyArray<string> => {
+  const name = basename(file);
+  const problems: Array<string> = [];
+  let size: number | null = null;
+  try {
+    size = readImageFile(file).byteLength;
+  } catch {
+    size = null;
+  }
+  if (size === null) {
+    problems.push(`${file} is not a readable file`);
+  } else if (size === 0) {
+    problems.push(`${file} is empty`);
+  }
+  if (CONTENT_TYPES[extname(name).toLowerCase()] === undefined) {
+    problems.push(
+      `${file} has an unsupported extension; supported: ${Object.keys(CONTENT_TYPES).join(', ')}`,
+    );
+  }
+  if (!SAFE_BASENAME.test(name)) {
+    problems.push(
+      `${file} has a name unsafe for URLs; rename it to letters, digits, ".", "_", and "-"`,
+    );
+  }
+  return problems;
+};
+
+const publishOne = async (
+  client: Bun.S3Client,
+  config: ScreenshotsConfig,
+  file: string,
+): Promise<PublishedScreenshot> => {
+  const bytes = readImageFile(file);
+  const digest = createHash('sha256').update(bytes).digest('hex');
+  const name = basename(file);
+  const key = `${KEY_PREFIX}/${digest}/${name}`;
+  const contentType = CONTENT_TYPES[extname(name).toLowerCase()];
+  const created = await uploadIfAbsent(client, key, bytes, contentType);
+  const alt = name.slice(0, name.length - extname(name).length);
+  const objectUrl = new URL(key, `${config.publicBaseUrl}/`).href;
+  return { key, line: `![${alt}](<${objectUrl}>)`, created };
+};
+
+export const runScreenshotsPublish = async (
+  dir: string,
+  files: ReadonlyArray<string>,
+): Promise<boolean> => {
+  if (files.length === 0) {
+    console.error(
+      'standards screenshots: publish requires at least one image file',
+    );
+    return false;
+  }
+  const config = loadScreenshotsConfig(dir);
+  const problems = [
+    ...(config.ok ? [] : config.problems),
+    ...files.flatMap(fileProblems),
+  ];
+  if (problems.length > 0 || !config.ok) {
+    console.error(
+      `standards screenshots: ${problems.length} problem(s):\n${problems.map((problem) => `  - ${problem}`).join('\n')}`,
+    );
+    return false;
+  }
+  const pair = resolveScreenshotsPair(
+    dir,
+    config.value.pair,
+    config.value.bucket,
+  );
+  if (!pair.ok) {
+    console.error(`standards screenshots: ${pair.problem}`);
+    return false;
+  }
+  const client = new globalThis.Bun.S3Client({
+    accessKeyId: pair.accessKeyId,
+    secretAccessKey: pair.secretAccessKey,
+    bucket: config.value.bucket,
+    endpoint: config.value.endpoint,
+  });
+  try {
+    const results = await Promise.allSettled(
+      files.map((file) => publishOne(client, config.value, file)),
+    );
+    const failures = results.flatMap((result) =>
+      result.status === 'rejected' ? [result.reason] : [],
+    );
+    if (failures.length > 0) {
+      const cleanupFailures = await cleanupUploads(client, results);
+      const [failure] = failures;
+      const detail = errorMessage(failure);
+      const cleanupDetail =
+        cleanupFailures.length > 0
+          ? `; cleanup failed: ${cleanupFailures.map(errorMessage).join('; ')}`
+          : '';
+      console.error(
+        `standards screenshots: upload failed: ${detail}${cleanupDetail}`,
+      );
+      return false;
+    }
+    for (const result of results) {
+      if (result.status === 'fulfilled') {
+        console.log(result.value.line);
+      }
+    }
+    return true;
+  } catch (error) {
+    console.error(
+      `standards screenshots: upload failed: ${errorMessage(error)}`,
+    );
+    return false;
+  }
+};

package/src/screenshots-upload.ts

@@ -0,0 +1,59 @@
+// S3 upload helpers keep content-addressed writes atomic and clean up only
+// objects this invocation successfully created.
+
+const HTTP_PRECONDITION_FAILED = 412;
+
+export type PublishedScreenshot = {
+  readonly key: string;
+  readonly line: string;
+  readonly created: boolean;
+};
+
+export const uploadIfAbsent = async (
+  client: Bun.S3Client,
+  key: string,
+  bytes: Uint8Array,
+  contentType: string,
+): Promise<boolean> => {
+  const body = new ArrayBuffer(bytes.byteLength);
+  new Uint8Array(body).set(bytes);
+  let response: Response;
+  try {
+    response = await fetch(client.presign(key, { method: 'PUT' }), {
+      method: 'PUT',
+      headers: {
+        'content-type': contentType,
+        'if-none-match': '*',
+      },
+      body,
+    });
+  } catch (error) {
+    throw new Error('S3 upload request failed', { cause: error });
+  }
+  if (response.status === HTTP_PRECONDITION_FAILED) {
+    return false;
+  }
+  if (!response.ok) {
+    throw new Error(`S3 upload failed with HTTP ${response.status}`);
+  }
+  return true;
+};
+
+export const cleanupUploads = async (
+  client: Bun.S3Client,
+  results: ReadonlyArray<PromiseSettledResult<PublishedScreenshot>>,
+): Promise<ReadonlyArray<unknown>> => {
+  const keys = new Set(
+    results.flatMap((result) =>
+      result.status === 'fulfilled' && result.value.created
+        ? [result.value.key]
+        : [],
+    ),
+  );
+  const cleanupResults = await Promise.allSettled(
+    [...keys].map((key) => client.delete(key)),
+  );
+  return cleanupResults.flatMap((result) =>
+    result.status === 'rejected' ? [result.reason] : [],
+  );
+};

package/src/sops-exec.ts

@@ -12,6 +12,34 @@ export type SopsRunResult = {
   readonly errorMessage: string | null;
 };
 
+export type SopsJsonResult =
+  | { readonly ok: true; readonly value: unknown }
+  | { readonly ok: false; readonly problem: string };
+
+// sops emits JSON here so callers never parse encrypted YAML themselves.
+export const decryptSopsJson = (cwd: string, rel: string): SopsJsonResult => {
+  const result = runSops(['--decrypt', '--output-type', 'json', rel], cwd);
+  if (result.status !== 0) {
+    const detail = result.errorMessage ?? result.stderr.trim();
+    return {
+      ok: false,
+      problem: detail
+        ? `could not decrypt ${rel}: ${detail}`
+        : `could not decrypt ${rel}`,
+    };
+  }
+  try {
+    return { ok: true, value: JSON.parse(result.stdout) as unknown };
+  } catch (error) {
+    return {
+      ok: false,
+      problem: `could not parse decrypted ${rel} as JSON: ${
+        error instanceof Error ? error.message : String(error)
+      }`,
+    };
+  }
+};
+
 export const runSops = (
   args: ReadonlyArray<string>,
   cwd: string,