[seanspeaks]

The problem

The register has eight number collisions across six open PRs, four of them against numbers already merged to next. Three different decisions are currently titled ADR-027:

#	on next	also claimed by
010	Reporting as an Admin Operation ✅	#545 Decouple AWS from core
027	SSM Parameter Offload ✅	#624 Configuration & Secrets Model · #620 Integration Versioning
028	—	#624 secrets-config-provider-plugin · #619 app-init
029	—	#624 variable-secret-management · #619 skills
030	—	#624 config-secrets-docs · #619 agent-pipeline

ADR-014 created one register but no way to claim a number. Every author picks max + 1 in isolation, so each PR is internally consistent and only collides with branches its author cannot see. Nothing catches it.

What this does

Moves every unmerged ADR into one sequence, so the feature branches can drop their doc files and carry only code.

Assignment rule: uncontested claims keep their numbers; contested ones re-assign by PR age (#545 < #619 < #620 < #624), with clusters kept contiguous.

new	title	from	was
028	Multi-Provider Support	#545	un-numbered (docs/architecture/ADR-MULTI-PROVIDER-SUPPORT.md)
029	Decouple AWS SDK Dependencies from core	#545	010
030	Integration Versioning	#620	027
032 / 033 / 034	(unchanged)	#641 / #640 / #643	—
035–037	App Init · Skills · Agent Pipeline	#619	028–030
038–041	Configuration & Secrets cluster (4)	#624	027–030

Result: 001–041, no gaps, no duplicates. 028–030 are filled rather than left as holes — a number that has only ever existed in an unmerged branch is not yet claimed.

#545's two ADRs also move out of docs/architecture/, which ADR-014 retired for ADRs; they were the last two left there.

Cross-references

Rewritten per source PR, because the same token means different things in different branches:

• ADR-010 in docs(adr): Configuration &amp; Secrets — 027 model · 028 provider · 029 management · 030 docs/maturation #624 and docs(adr): ADR-032 integration deletion data cleanup #641 refers to next's merged Reporting as an Admin Operation (admin API key) → left alone
• ADR-010 in feat: provider plugin architecture + Netlify adapter #545 refers to its own Decouple AWS ADR → rewritten to ADR-029

Both intra-cluster link sets (#619's three, #624's four) were remapped, including two compound references (ADR-027/028) that a naïve word-boundary pass would have half-rewritten.

Two things ADR-014 mandated but didn't finish

ADR-004 and ADR-005 still used the ## Status heading form, and ADR-005 still had the old # Architecture Decision Record: title. Both now carry the standard block. Deciders were unrecorded for those two and are marked TBD rather than invented — worth someone filling in.

Preventing recurrence

ADR-014 gains an amendment: numbers are claimed at PR-open time and enforced by CI, not assigned at merge. It records why deferring to merge is worse (the file is named wrong for the whole review, cross-links can't be written, and someone repeats this reconciliation by hand at every merge), and the rule that merged numbers are permanent while unmerged ones are not yet claimed.

.github/workflows/adr-number-check.yml enforces it: on any PR touching docs/architecture-decisions/** it checks the claimed numbers against next and against every other open PR, verifies filename matches heading, and reports the next free number on failure. It re-runs when next moves so the loser of a simultaneous claim goes red before merge.

This is the one non-docs file here — drop that commit if you'd rather keep this docs-only, though then nothing stops the next collision.

Follow-up on the source PRs

Each should drop its ADR files and carry only code; I'm commenting on them individually. Nothing here touches their code, and no branch has been force-pushed.

README.md and website/roadmap/data/adrs.json are regenerated from the files rather than hand-edited.

🤖 Generated with Claude Code

[claude]

Claude Code Review

Claude Code Review is paused for this repository. To reconnect it, an admin of this repository's GitHub organization (or the account owner, for personal repositories) who can also manage your Claude organization's Code Review settings needs to re-link GitHub in Code Review settings. This is a one-time step.

_{Tip: disable this comment in your organization's Code Review settings.}

[netlify]

✅ Deploy Preview for friggframework-org canceled.

Name	Link
🔨 Latest commit	7b2344a
🔍 Latest deploy log	https://app.netlify.com/projects/friggframework-org/deploys/6aa578112185aa00087aa727

[claude]

⚠️ Code review skipped — your organization's overage spend limit has been reached.

Code review is billed via overage credits. To resume reviews, an organization admin can raise the monthly limit at claude.ai/admin-settings/claude-code.

Once credits are available, comment @claude review on this pull request, or push a new commit, to trigger a review.

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[seanspeaks]

ADR reconciliation needed after Stack A/B — drafted with Claude Code at Sean's request

Severity: must-reconcile. Stack A's #686 is the first code for ADR-028/029, and both stacks touch 030/032/034/038–039.

• ADR-028 (Multi-Provider). The earlier audit suggested Exploratory because no code existed. feat: Netlify provider on the v2 stack (port of #545) (F7) #686 now implements it (core/providers/resolve-provider.js, @friggframework/provider-netlify, NetlifySchedulerAdapter + ScheduledJob, queue providers, CLI dispatch), so keep Accepted. Update the text: AWS adapters stay in core and provider-aws is a facade; doctor/repair/generate-iam refuse non-AWS apps; "poll-and-dispatch" is the same shape as ADR-055's tick (docs(adr): ADR-054 one-file integrations via module extensions, ADR-055 recurring triggers #669), so say recurring work uses that tick on every provider.
• ADR-029 (Decouple AWS). Its text says breaking change with explicit injection required. feat: Netlify provider on the v2 stack (port of #545) (F7) #686 deliberately keeps it non-breaking: Worker takes an optional queueClient with a lazy SQS default, and Cryptor/QueuerUtil/WebSocket stay coupled because feat: provider plugin architecture + Netlify adapter #545's Cryptor change silently disabled KMS. Rewrite 029 to that: the queue port is done non-breaking, and the rest is Exploratory with "What would settle this" = a fail-closed keyProvider that satisfies feat(core)!: fail closed on field-level encryption in deployed stages #663. ADR-047 §5's dependency note (docs(adr): 044-047 — sync engine revitalization, capability traits, canonical models, orchestrator/worker #648) follows.
• ADR-034 (API-key login).
  • Reposition next to ADR-056 §2 adopter JWT (feat(core): adopter-token (JWT) authentication #678): 034 is for products with no IdP.
  • Use the membership path from feat(core): organization memberships, one active org per request (ADR-056 §3.6) #681 (056 §3.6), not the legacy organizationId link.
  • Define the session's org role (056 §3.6 lets role-less bearer tokens manage by default).
  • POST /user/login is frozen v1 under ADR-053, so a polymorphic body is a v1 behaviour change. Either accept that explicitly or give login a v2 home.
  • Public repo: Context names a specific adopter's identity module and a private repository. Please make them generic.
• ADR-030. ADR-063 §17 (Stack B) answers Path D for definition-published integrations. Add it to Related.
• ADR-038/039. feat: Netlify provider on the v2 stack (port of #545) (F7) #686's extension-db-credentials (OAuth app credentials in the DB, loaded through async definition.env) is a Tier-2 config source by another route. Cross-reference it, or fold it into the 039 plugin.
• ADR-032: identical to docs(adr): ADR-032 integration deletion data cleanup #641. Stack updates are listed there.
• Numbers.
  • 058 is withdrawn (folded into 056 by docs(adr): ADR-056 §3.1–3.6 ownership overrides + multi-org membership; ADR-059 app-level entity registry #677). List it as withdrawn so it is not reused.
  • 060 and 061 are unclaimed on every branch and PR body.
  • 062 is cited by ADR-063 as "proposed, not yet written".
  • The stray marketplace ADR-032 (branch claude/marketplace-scraping-system-zlxasp, no PR) cannot take 057 (now Canonical Schema). Recommend 060.

Merge order: this PR before #686 merges, so 028/029 describe what ships.

[seanspeaks]

Register note from the Stack B review (#692–#700): three branches each carry a file numbered ADR-028. This PR already resolves them, keeping 028 as Multi-Provider Support (Accepted, 2026-03-02) and moving App Init to 035 and the Secrets & Config Provider Plugin to 039. Their source PRs still use the old numbers:

• docs(adr): three new ADRs — ADR-028 App Init, ADR-029 Skills, ADR-030 Agent Pipeline #619 028-app-init.md (and its 029 Skills / 030 Agent Pipeline, which this PR moves to 036 / 037)
• docs(adr): Configuration &amp; Secrets — 027 model · 028 provider · 029 management · 030 docs/maturation #624 028-secrets-config-provider-plugin.md (and the rest of its 027–030 set, which this PR moves into 038–041)

They should take this PR's numbers when they're next touched, or merge after this PR and be renumbered then. ADR-063 (#692) cites 028 as Multi-Provider Support, so it is consistent with this register.

---

Generated by Claude Code

[cursor]

Frigg 2.0.1 ADR review (COMMENT only — not an approval)

Verdict: changes needed before merge (rebase / register integrity) — number plan vs 049–063 is otherwise good.

049–063 check

PASS — this PR introduces 028–041 only; does not collide with 049–063.

What this PR gets right

• Correctly absorbs docs(adr): Configuration &amp; Secrets — 027 model · 028 provider · 029 management · 030 docs/maturation #624’s config/secrets cluster as 038–041 (titles remapped).
• Correctly absorbs docs(adr): ADR-032 integration deletion data cleanup #641’s deletion-cleanup ADR as 032 (same content).
• adr-number-check.yml is a sensible core check (vs next, vs open PRs, heading match).

Blocking / merge-blocking hygiene

1. Rebase onto current next and restore register rows for ADRs already on next that this branch’s adrs.json omits (notably 042, 048, and 057 if dropped). Naive merge risks wiping Accepted/Proposed rows that landed after this branch diverged.
2. After merge, close/strip docs(adr): Configuration &amp; Secrets — 027 model · 028 provider · 029 management · 030 docs/maturation #624 and docs(adr): ADR-032 integration deletion data cleanup #641 ADR files so 027–030 / 032 are not re-introduced under the wrong titles.

Should-fix / nits

• README lists 030 as Proposed while the file is Proposed (exploratory:…) — once ADR-043 lands, prefer Exploratory.
• 032 still has Deciders: TBD (ADR-043 §4 forbids TBD on merge).
• Workflow gap: same-number/different-title replacement (docs(adr): Configuration &amp; Secrets — 027 model · 028 provider · 029 management · 030 docs/maturation #624’s 027 vs next 027) is not caught by “nums present here and absent on next”.

No new test failures vs next attributable to this docs PR (CI MongoMemoryServer noise on next excluded per instructions).