Skip to content

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

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

chore(sync): backmerge main into develop after v2.9.2 + release fixes#71
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 performs a controlled backmerge from main into develop after v2.9.2 release activities.

Summary

Backmerge main into develop after the v2.9.2 release and related release-pipeline hardening work.

Incident Reference

Release follow-up synchronization after v2.9.2 publication.

Why This Hotfix Is Needed

main contains release-critical fixes that must be present in develop to prevent repeated release failures and Windows Git Bash portability issues.

Root Cause Summary

Post-release fixes and release-process hardening were merged on main and not yet synchronized back into develop.

Scope of This Fix

  • Backmerge all current commits from main into develop.
  • No feature-only changes are introduced intentionally in this PR.
  • Restore branch parity after release.

TDD & Verification

  • Verified v2.9.2 release was published with assets.
  • Verified release packaging succeeded after docs-gate fixes.
  • Verified Windows portability fix (python3 -> python -> py -3) is merged on main.

Risk Assessment

  • Risk: merge conflicts due branch divergence.
  • Impact: low-to-moderate; expected to affect release tooling/docs governance paths.
  • Mitigation: required CI checks and post-merge branch sync verification.

Rollback Plan (Mandatory)

Revert the merge commit on develop if regression is detected.

Post-Deploy Verification

  • Confirm origin/main and origin/develop no longer diverge on release-fix commits.
  • Confirm CI passes on develop.

Follow-up Required?

No additional follow-up required for this backmerge PR itself.

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
@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.
To continue using code reviews, you can upgrade your account or add credits to your account and enable them for code reviews in your settings.

@T72
T72 merged commit 78acb47 into develop Mar 2, 2026
7 of 8 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