Skip to content

chore(compliance): integrate published 3.1.33 records on 3.2.x - #8961

Merged
bokelley merged 1 commit into
3.2.xfrom
forward-merge/3.1.x-3.1.33-records-to-3.2
Nov 13, 2026
Merged

bokelley merged 1 commit into
3.2.xfrom
forward-merge/3.1.x-3.1.33-records-to-3.2

Conversation

@bokelley

Copy link
Copy Markdown
Contributor

Summary

Registers the published 3.1.33 compliance records on 3.2.x, following #8825, which did the same for 3.1.32.

@adcp/sdk 16.7.1 (latest / adcp-3.2) was published on 2026-11-12 at 18:07Z and ships the 3.1.33 compliance bundle. Since then, Build Check's "Check hosted compliance publication manifest" step has failed on every 3.2.x PR and push, including #8959 and the 3.2.11 Version Packages PR #8942 once it regenerates. main already registers 3.1.33 (#8852), so it doesn't need this.

What changes

These artifacts are taken unchanged from v3.1.33 with git checkout v3.1.33 -- …. Their tree and blob hashes are identical on the tag and on main:

Path Hash (tag = main)
dist/compliance/3.1.33/ 2d42dd58ad
dist/schemas/3.1.33/ 68e9e4c9d0
dist/protocol/3.1.33.tgz 9f45146801
dist/protocol/3.1.33.tgz.sig 2bdba302ef
dist/protocol/3.1.33.tgz.sha256, .crt from the tag

Registration and bookkeeping, matching #8825:

  • static/compliance/published-versions.json: registers 3.1.33.
  • dist/schemas/index.json: regenerated with buildRootSchemaDiscovery(). v3.1 and 3.1 now point to 3.1.33, and a 3.1.33 entry is added.
  • server/tests/unit/storyboards.test.ts: the 3.1 hosted alias floor moves to 3.1.33, and 3.1.32 stays pinned as an explicit exact target, as chore(compliance): integrate published 3.1.32 records on 3.2.x #8825 did for 3.1.30.
  • CHANGELOG.md: the ## 3.1.33 section, verbatim from v3.1.33.

This PR has no changeset: the forward-merge/ branch skips the changeset check, as on #8825, and it adds nothing to the 3.2.11 notes.

Verification (on 3.2.x a07826a449 + this commit)

  • npm run check:published-compliance: "Published compliance manifest is current for npm tags: adcp-3.0, adcp-3.1, adcp-3.2, latest, rc."
  • check-immutable-release-artifacts.cjs origin/3.2.x: passed.
  • server/tests/unit/storyboards.test.ts: 69/69.
  • npm run test:release-workflow: passes.
  • npm run test:dist-schema-version-ids: passes.

Merge order (3.2.11)

  1. fix(release): tolerate pulls API lag after the fence's acknowledged push (3.2.x backport of #8397) #8959 (fence backport) merges. Its Release run regenerates Version Packages #8942 with fix(compliance): 3.2.x backport - functional-dispatch signing key (#8889) and enforced_policies gate for policy_backed_rejections (#8850) #8938 + fix(schemas): open schemas that were closed by accident (3.2.x backport) #8864.
  2. This PR merges, and Version Packages #8942 regenerates again. That's fine while it is Draft; this PR adds no changeset.
  3. Brian approves Version Packages #8942 only once its Build Check is green on its exact head.

Brian merges. No auto-merge.

🤖 Generated with Claude Code

Publishing @adcp/sdk 16.7.1 (latest / adcp-3.2, 2026-11-12 18:07Z)
shipped the 3.1.33 compliance bundle, so the 3.2.x publication-manifest
check has failed Build Check since then, including the 3.2.11 backports.

Integrate only the published 3.1.33 records, following #8825 (3.1.32):
the immutable compliance bundle, schemas and signed protocol tarball,
taken unchanged from v3.1.33 (tree hashes match main), the manifest
registration, regenerated root schema discovery, and the release notes.
The 3.1 hosted alias floor advances to 3.1.33 and 3.1.32 stays pinned as
an explicit target.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

@aao-secretariat aao-secretariat Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ladon verdict: Approve

Approve — clean forward-merge of published 3.1.33 compliance/schema/protocol records onto 3.2.x (following #8825).

What I checked:

  • The high_risk flag is driven entirely by dist/** matches, but every one of those entries is (added) — new append-only semver artifact paths (dist/compliance/3.1.33/**, dist/schemas/3.1.33/**, dist/protocol/3.1.33.*) copied verbatim from v3.1.33. No existing immutable released artifact is modified, so the immutability rule (critical on in-place edits) is not triggered. Added files matching high-risk globs are normal release scaffolding, not an escalation trigger.
  • No (deleted) or (modified) high-risk entries — rows 3 and 5 do not fire.
  • The only mutable dist edit is dist/schemas/index.json: 3.1 alias advance (3.1.32→3.1.33) plus a new 3.1.33 entry, coherent, with v3/v3.2 correctly unchanged.
  • storyboards.test.ts moves the 3.1 floor to 3.1.33 and pins 3.1.32 as an explicit exact target (the #8825 pattern); copied 3.1.33 compliance and schema indexes both declare adcp_version 3.1.33, matching the test. published-versions.json registers 3.1.33.
  • Absent changeset is intentional and precedent-backed for a forward-merge branch.

Gates: gated_paths: false; no no-auto-approve team match; no prior decision. No critical/high/medium findings.

Decision table: rows 1–8 do not fire (no findings, high-risk is additive-only), falls through to row 9 → approve.

@bokelley
bokelley merged commit 57f4bb6 into 3.2.x Nov 13, 2026
49 checks passed
@bokelley
bokelley deleted the forward-merge/3.1.x-3.1.33-records-to-3.2 branch November 13, 2026 12:05
KonstantinMirin pushed a commit to KonstantinMirin/adcp that referenced this pull request Nov 13, 2026
Forward-merges the published 3.2.11 release (3.2.x = v3.2.11 =
9df1dd7, the adcontextprotocol#8942 Version Packages merge) and the 3.2.x commits since
v3.2.10: adcontextprotocol#8873, adcontextprotocol#8938, adcontextprotocol#8864, adcontextprotocol#8959 and adcontextprotocol#8961.

Release records:
- dist/compliance/3.2.11, dist/schemas/3.2.11 and the signed
  dist/protocol/3.2.11.tgz tuple are taken from v3.2.11 unchanged.
- dist/schemas/index.json and latest.json are regenerated
  (forward-merge-release-records.cjs schema-discovery).
- CHANGELOG.md is main's file plus the 3.2.11 block
  (forward-merge-release-records.cjs changelog).
- package.json, package-lock.json, static/schemas/source/index.json: main's.
- static/compliance/published-versions.json: main's. 3.2.x's only extra
  entry is 3.2.11, which is registered in a separate commit after
  qualification.

adcontextprotocol#8961's 3.1.33 records already equal main's (same tree hashes). adcontextprotocol#8959 and
the adcontextprotocol#8889 half of adcontextprotocol#8938 are cherry-picks of main commits and auto-merged
to main's bytes.

Content conflicts, all resolved to main's file. Each 3.2.x side is a 3.2
backport or 3.2-only adaptation of work main carries in its 3.3 form:
- 33 schema sources under static/schemas/source and 14 test files, from
  adcontextprotocol#8864 (the 3.2 backport of main's schema opening and adcontextprotocol#8866's named
  rejections). Main's copies are the 3.3 opening: no location 3.2.11
  opens is closed on main, and the tests cite DR-0036.
- tests/policy-backed-rejections-storyboard.test.cjs, from the adcontextprotocol#8850 half
  of adcontextprotocol#8938: main tests its capability-gated storyboard (adcontextprotocol#8857).
- docs/media-buy/media-buys/lifecycle.mdx, from adcontextprotocol#8873: the 3.2
  pending_creatives prose. Main's prose matches main's 3.3 enum.
- server/tests/unit/storyboards.test.ts, from adcontextprotocol#8961: 3.2.x's floors and
  pins. Main keeps its own.

Auto-merge reverted: the non-conflicting adcontextprotocol#8850 hunk in
creative/policy_backed_rejections.yaml. It adds the 3.2-only
enforced_policies skip_if gate on top of main's
creative.supports_registry_policy_enforcement capability gate, and its
own narrative says the 3.3 line uses the capability instead.

Outside dist/ and CHANGELOG.md the merged tree equals main's.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant