Keep draft-spec work on a next branch, with backport and forward-port rules #1525

Activity

1. bokelley commented on Oct 18, 2026

   

   bokelley

   on Oct 18, 2026 – with conductor.build App

   Contributor

   More actions

   Implemented as proposed. The one difference: next is the renamed next/3.3 branch, not a fresh branch from main.

   next (done; it's not a protected branch)

   • Renamed next/3.3 → next with the branch-rename API, in two hops (next/3.3 → next-rename-tmp → next), because git can't create refs/heads/next while refs/heads/next/3.3 exists. fix(identity): align AdCP 3.3 agent identity with the final spec and the Go and TS SDKs #1514 retargeted to next automatically; refactor(signing): RFC 9421 on http-message-signatures; align Web Bot Auth with adcp#7894 #1523 stays stacked on fix(identity): align AdCP 3.3 agent identity with the final spec and the Go and TS SDKs #1514's branch.
   • 634f527: CI push and pull_request triggers now name next.
   • df3ee2c: next's own Release Please setup, in separate files so merges in either direction never change the other line's release flow:
     • .github/workflows/release-please-next.yml: runs on push to next, concurrency group release-please-next, target-branch: next, and queues release-publish.yml --ref next.
     • release-please-config.next.json: versioning: prerelease, prerelease-type: alpha, prerelease: true, changelog in CHANGELOG.next.md.
     • .release-please-manifest.next.json: baseline 9.0.0-beta.3. The adopting commit's Release-As: 10.0.0-alpha.0 footer pins the first version; after that every release bumps the alpha number (10.0.0-alpha.1, ...). I verified this with a release-please dry run before pushing.
     • The PEP 440 normalizer takes --target-branch next and accepts only release-please--branches--next--components--adcp → next.
     • release-publish.yml (its file name stays, because Trusted Publishing is bound to it) builds from main or next and waits for that branch's CI.
     • PyPI treats 10.0.0aN as a pre-release, so pip install adcp stays on 9.x.
   • 3b34786: the IPR and conventional-commit policy checks failed every PR into next ("PR must target main"). PRs into main or next now pass the base check. Push checks remain main-only.
   • Release-please has opened chore(next): release 10.0.0-alpha.0 #1533, chore(next): release 10.0.0-alpha.0, with pyproject.toml normalized to 10.0.0a0.

   PRs into main (not merged)

   • revert: move experimental AdCP 3.3 identity from main to next #1534 reverts feat(identity): add experimental AdCP 3.3 agent identity #1502 on main. It should merge before chore(main): release 9.0.0-beta.4 #1465 (9.0.0-beta.4); I commented there. One conflict, in client.py against feat(property-lists): unify resolution and validate seller inventory #1532's product_property_policy, which the PR keeps. No later commit depends on feat(identity): add experimental AdCP 3.3 agent identity #1502. Its description has the -s ours sequence that keeps the identity code on next after the revert merges.
   • docs(releasing): write the main, release/N.x, and next branch rules #1535 writes the branch and port rules, the next release flow, the feat(identity): add experimental AdCP 3.3 agent identity #1502 procedure, and the ratification steps into RELEASING.md. The backport release/8.x and forward-port next labels exist.

   Maintainer to-do, in order

   1. Merge revert: move experimental AdCP 3.3 identity from main to next #1534, then right away run the -s ours sequence on next (in revert: move experimental AdCP 3.3 identity from main to next #1534 and RELEASING.md).
   2. Merge chore(main): release 9.0.0-beta.4 #1465 after release-please regenerates it with the revert.
   3. Merge docs(releasing): write the main, release/N.x, and next branch rules #1535 (independent of the others).
   4. Add next to the release-publish environment's deployment branches. Today only main, release/7.x, and release/8.x are allowed, so a next publish would be blocked.
   5. Merge fix(identity): align AdCP 3.3 agent identity with the final spec and the Go and TS SDKs #1514, then refactor(signing): RFC 9421 on http-message-signatures; align Web Bot Auth with adcp#7894 #1523, into next before merging chore(next): release 10.0.0-alpha.0 #1533, so 10.0.0-alpha.0 ships the aligned identity code.

   adcp-go took the other route the user chose for Go: main is the AdCP 3.3 pre-release line for adcp/v3 (adcontextprotocol/adcp-go#578, which proposes adcp/v3.3.0-beta.0). Cross-SDK tracking: adcontextprotocol/adcp#8118.
2. bokelley commented on Oct 18, 2026

   

   bokelley

   on Oct 18, 2026 – with conductor.build App

   Contributor

   More actions

   Follow-up: #1533, the 10.0.0-alpha.0 release PR, had one failing test, the adcp.types.generated_poc alias's own v10 sunset check (REMOVED_IN_MAJOR = 10). #1536, into next, removes the alias as planned (breaking: adopters run adcp migrate v3-to-v4 --apply). All checks pass and it's approved. Merge it into next before #1533, then update #1533's branch.