Skip to content

chore(sync): backmerge main into develop after v2.9.2 + release fixes#72

Merged
T72 merged 6 commits into
developfrom
main
Mar 2, 2026
Merged

chore(sync): backmerge main into develop after v2.9.2 + release fixes#72
T72 merged 6 commits into
developfrom
main

Conversation

@T72

@T72 T72 commented Mar 2, 2026

Copy link
Copy Markdown
Owner

Hotfix Pull Request

This PR backmerges main into develop to synchronize release and pipeline fixes after v2.9.2.

Summary

Backmerge main into develop so release hardening changes and post-release fixes become the new integration baseline.

Incident Reference

Post-release branch drift after v2.9.2 publication and subsequent release tooling fixes.

Why This Hotfix Is Needed

main contains release process fixes that must be present in develop to prevent recurrence of packaging/version-marker failures and Windows execution friction.

Root Cause Summary

Multiple release fixes landed on main after publication, but develop advanced independently; without a backmerge, branch drift remains and can reintroduce release-process instability.

Scope of This Fix

  • Merge all current commits from main into develop.
  • Synchronize release script hardening and documentation/process fixes.
  • No new feature development introduced intentionally.

TDD & Verification

  • Verified release v2.9.2 is published with artifacts.
  • Verified open PR list has no active main -> develop sync PR before this change.
  • Verified divergence before PR creation: origin/main...origin/develop = 6 19.

Risk Assessment

  • Primary risk: merge conflicts due parallel work on both branches.
  • Runtime risk: low; this is branch synchronization of already-reviewed mainline changes.
  • Mitigation: required CI checks and post-merge divergence verification.

Rollback Plan (Mandatory)

If regression is detected on develop, revert the merge commit from this PR and reopen a narrowed sync PR.

Post-Deploy Verification

  • Confirm CI passes on merged develop.
  • Confirm divergence is reduced/expected after merge with git rev-list --left-right --count origin/main...origin/develop.

Follow-up Required?

No immediate follow-up expected beyond standard post-merge sync verification.

T72 and others added 6 commits March 1, 2026 02:54
  merge develop into main (#61)

* ci: add separate main-to-develop backmerge workflow for non-hotfix merges

* ci: handle fork develop branch names in backmerge sync guard

* docs: refresh release docs metadata, module paths, and Claude integration link

* docs(deploy): restore CLAUDE_CODE_WHITELIST.md at canonical path

* docs(reference): add API_REFERENCE.md compatibility shim

* docs(reference): mirror full api-reference content to API_REFERENCE.md

* governance: establish two-repo public promotion contract and automation

* governance: transition to single-repo public release model

* docs(reference): convert API_REFERENCE.md to compatibility stub

* docs(reference): remove API_REFERENCE.md and normalize canonical API links

* chore: sync develop into main (docs + release governance updates) (#53) (#54)

* ci: add separate main-to-develop backmerge workflow for non-hotfix merges

* ci: handle fork develop branch names in backmerge sync guard

* docs: refresh release docs metadata, module paths, and Claude integration link

* docs(deploy): restore CLAUDE_CODE_WHITELIST.md at canonical path

* docs(reference): add API_REFERENCE.md compatibility shim

* docs(reference): mirror full api-reference content to API_REFERENCE.md

* governance: establish two-repo public promotion contract and automation

* governance: transition to single-repo public release model

* docs(reference): convert API_REFERENCE.md to compatibility stub

* docs(reference): remove API_REFERENCE.md and normalize canonical API links

* docs(quickstart): prioritize project-local usage and separate contributor clone path

* docs: add agent onboarding snippets and align discovery contract

* feat(skills): ship official task-orchestrator skill package

* fix(release): include agent skill package in public subset allowlist
…ng (#70)

* fix(release): use portable python resolver in release scripts

* fix(release): auto-insert missing docs version markers during packaging
@T72
T72 merged commit f75d069 into develop Mar 2, 2026
13 of 14 checks passed
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