chore(release): preserve main ancestry for 6.7 promotion - #716
Merged
Conversation
Promote current `dev` to `main` for the next npm release. Includes: - deterministic fake-provider e2e harness and CI wiring from #576 - foreground/resume lifecycle hardening covered by the new e2e path - run-plan ownership cleanup from #588/#590 Verification: - `dev` CI run 28990853028 passed on head `2c88554` --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> Co-authored-by: Eivind Meyer <eivind.meyer@ksat.no> Co-authored-by: Michael Eichelbeck <141341133+mkceichelbeck@users.noreply.github.com> Co-authored-by: tomdps <tom.dupuis24@gmail.com> Co-authored-by: tomdps <60640908+tomdps@users.noreply.github.com> Co-authored-by: Michael Eichelbeck <michael.eichelbeck.ext@wtsde.onmicrosoft.de> Co-authored-by: Ubuntu <ubuntu@ip-172-31-38-53.eu-north-1.compute.internal> Co-authored-by: Eivind <eivind@covibes.ai> Co-authored-by: CI Test <ci-test@covibes.ai> Co-authored-by: Codex <codex@example.com> Co-authored-by: Atharv Singh <132380045+atharvwasthere@users.noreply.github.com> Co-authored-by: Sense_wang <167664334+haosenwang1018@users.noreply.github.com> Co-authored-by: haosenwang1018 <haosenwang1018@users.noreply.github.com> Co-authored-by: Eivind <eivindcovibes.ai@Eivinds-MacBook-Pro.local> Co-authored-by: Zeroshot Agent <agent@covibes.ai>
…ode, AJV strict fix) (#617) Release promotion of `dev` → `main`. semantic-release publishes the computed version to npm on merge. ## Scope 259 commits accumulated on `dev` since the last promotion. Highlights: - **Providers:** GitHub Copilot, Pi, ACP-native adapter lane, gateway-backed model-agent runner (Hermes/OpenRouter/local), centralized provider engine registry. - **Setup contract:** `setup plan --json`, apply/undo with write-tracking and explicit undo conflict rules (versioned setup schema). - **Run mode:** canonical `RunPlan` owning isolation; run-mode vocabulary (worktree → pr → ship) surfaced in output; `--pr`/`--ship` autoMerge wiring single-sourced. - **Reliability:** `list`/`status` WAL read-race and phantom-cluster fixes, duplicate-run guard, Windows child-process/window hardening, deterministic e2e fake-provider harness. - **This session's fix:** #616 — quality-gate schema uses `anyOf` instead of union `type` arrays so strict-mode AJV validators no longer crash (closes #614). All commits are already merged and CI-passed on `dev`; the merge queue re-runs CI on the rebased promotion before publish. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: tomdps <60640908+tomdps@users.noreply.github.com> Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> Co-authored-by: tomdps <tom.dupuis24@gmail.com> Co-authored-by: Eivind Meyer <eivind.meyer@ksat.no> Co-authored-by: Michael Eichelbeck <141341133+mkceichelbeck@users.noreply.github.com> Co-authored-by: Michael Eichelbeck <michael.eichelbeck.ext@wtsde.onmicrosoft.de> Co-authored-by: Ubuntu <ubuntu@ip-172-31-38-53.eu-north-1.compute.internal> Co-authored-by: Eivind <eivind@covibes.ai> Co-authored-by: CI Test <ci-test@covibes.ai> Co-authored-by: Codex <codex@example.com> Co-authored-by: Atharv Singh <132380045+atharvwasthere@users.noreply.github.com> Co-authored-by: Sense_wang <167664334+haosenwang1018@users.noreply.github.com> Co-authored-by: haosenwang1018 <haosenwang1018@users.noreply.github.com> Co-authored-by: Eivind <eivindcovibes.ai@Eivinds-MacBook-Pro.local> Co-authored-by: Zeroshot Agent <agent@covibes.ai>
Release promotion of `dev` -> `main` after #624. ## Why this second promotion is needed The previous promotion (#617) merged cleanly and CI/release passed, but semantic-release did not publish because the squash commit type was `release:` and the analyzer had no rule for that type. #624 adds an explicit semantic-release rule mapping `release:` promotion commits to a minor release. This promotion carries that rule to `main`; the release workflow should then analyze this `release:` commit and publish the next minor. ## Diff - `.releaserc.json`: `release:` commits => minor release ## Verification - #624 PR CI passed - #624 merge-queue CI passed - local analyzer probe: `release: promote dev to main` => `minor` - `origin/main..origin/dev` diff is only `.releaserc.json` --------- Co-authored-by: tomdps <60640908+tomdps@users.noreply.github.com> Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> Co-authored-by: tomdps <tom.dupuis24@gmail.com> Co-authored-by: Eivind Meyer <eivind.meyer@ksat.no> Co-authored-by: Michael Eichelbeck <141341133+mkceichelbeck@users.noreply.github.com> Co-authored-by: Michael Eichelbeck <michael.eichelbeck.ext@wtsde.onmicrosoft.de> Co-authored-by: Ubuntu <ubuntu@ip-172-31-38-53.eu-north-1.compute.internal> Co-authored-by: Eivind <eivind@covibes.ai> Co-authored-by: CI Test <ci-test@covibes.ai> Co-authored-by: Codex <codex@example.com> Co-authored-by: Atharv Singh <132380045+atharvwasthere@users.noreply.github.com> Co-authored-by: Sense_wang <167664334+haosenwang1018@users.noreply.github.com> Co-authored-by: haosenwang1018 <haosenwang1018@users.noreply.github.com> Co-authored-by: Eivind <eivindcovibes.ai@Eivinds-MacBook-Pro.local> Co-authored-by: Zeroshot Agent <agent@covibes.ai>
…#627) Release promotion of `dev` -> `main` after #626. ## Why The prior release run for #625 correctly computed `6.5.0`, but failed when `@semantic-release/git` tried to push generated package/changelog changes directly to protected `main`. #626 removes release-time branch writes while keeping semantic-release npm and GitHub release publishing. ## Diff - `.releaserc.json`: remove changelog/git prepare plugins that push commits to `main` ## Verification - #626 PR CI passed - #626 merge-queue CI passed - previous failed release log showed analyzer computed `6.5.0`; failure was only protected branch rejection from `@semantic-release/git` --------- Co-authored-by: tomdps <60640908+tomdps@users.noreply.github.com> Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> Co-authored-by: tomdps <tom.dupuis24@gmail.com> Co-authored-by: Eivind Meyer <eivind.meyer@ksat.no> Co-authored-by: Michael Eichelbeck <141341133+mkceichelbeck@users.noreply.github.com> Co-authored-by: Michael Eichelbeck <michael.eichelbeck.ext@wtsde.onmicrosoft.de> Co-authored-by: Ubuntu <ubuntu@ip-172-31-38-53.eu-north-1.compute.internal> Co-authored-by: Eivind <eivind@covibes.ai> Co-authored-by: CI Test <ci-test@covibes.ai> Co-authored-by: Codex <codex@example.com> Co-authored-by: Atharv Singh <132380045+atharvwasthere@users.noreply.github.com> Co-authored-by: Sense_wang <167664334+haosenwang1018@users.noreply.github.com> Co-authored-by: haosenwang1018 <haosenwang1018@users.noreply.github.com> Co-authored-by: Eivind <eivindcovibes.ai@Eivinds-MacBook-Pro.local> Co-authored-by: Zeroshot Agent <agent@covibes.ai>
Release promotion of `dev` -> `main` after #629. ## Why Previous release runs computed `6.5.0` but failed because semantic-release loaded stale `.releaserc.json` and `@semantic-release/git` tried to push generated commits to protected `main`. #629 adds `package.json#release`, which semantic-release discovers before `.releaserc.json`. The effective publish config contains no changelog/git branch-write plugins. ## Verification - #629 PR CI passed - #629 merge-queue CI passed - simulated `git merge-tree origin/main origin/dev` includes `package.json#release` plugins: commit-analyzer, release-notes-generator, npm, github - npm version is still `6.4.0` before this promotion --------- Co-authored-by: tomdps <60640908+tomdps@users.noreply.github.com> Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> Co-authored-by: tomdps <tom.dupuis24@gmail.com> Co-authored-by: Eivind Meyer <eivind.meyer@ksat.no> Co-authored-by: Michael Eichelbeck <141341133+mkceichelbeck@users.noreply.github.com> Co-authored-by: Michael Eichelbeck <michael.eichelbeck.ext@wtsde.onmicrosoft.de> Co-authored-by: Ubuntu <ubuntu@ip-172-31-38-53.eu-north-1.compute.internal> Co-authored-by: Eivind <eivind@covibes.ai> Co-authored-by: CI Test <ci-test@covibes.ai> Co-authored-by: Codex <codex@example.com> Co-authored-by: Atharv Singh <132380045+atharvwasthere@users.noreply.github.com> Co-authored-by: Sense_wang <167664334+haosenwang1018@users.noreply.github.com> Co-authored-by: haosenwang1018 <haosenwang1018@users.noreply.github.com> Co-authored-by: Eivind <eivindcovibes.ai@Eivinds-MacBook-Pro.local> Co-authored-by: Zeroshot Agent <agent@covibes.ai>
## Summary - promote the current dev snapshot to main - includes release hardening that validates protected-main promotions before publish - expected semantic-release result: patch release for the release workflow hardening ## Verification - dev PR #631 passed pull_request CI - merge-group CI for #631 passed - release preflight is now part of the main promotion checks --------- Co-authored-by: tomdps <60640908+tomdps@users.noreply.github.com> Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> Co-authored-by: tomdps <tom.dupuis24@gmail.com> Co-authored-by: Eivind Meyer <eivind.meyer@ksat.no> Co-authored-by: Michael Eichelbeck <141341133+mkceichelbeck@users.noreply.github.com> Co-authored-by: Michael Eichelbeck <michael.eichelbeck.ext@wtsde.onmicrosoft.de> Co-authored-by: Ubuntu <ubuntu@ip-172-31-38-53.eu-north-1.compute.internal> Co-authored-by: Eivind <eivind@covibes.ai> Co-authored-by: CI Test <ci-test@covibes.ai> Co-authored-by: Codex <codex@example.com> Co-authored-by: Atharv Singh <132380045+atharvwasthere@users.noreply.github.com> Co-authored-by: Sense_wang <167664334+haosenwang1018@users.noreply.github.com> Co-authored-by: haosenwang1018 <haosenwang1018@users.noreply.github.com> Co-authored-by: Eivind <eivindcovibes.ai@Eivinds-MacBook-Pro.local> Co-authored-by: Zeroshot Agent <agent@covibes.ai>
# Conflicts: # AGENTS.md # lib/detached-startup.js # lib/start-cluster.js # scripts/assert-release-published.js # src/orchestrator.js # tests/e2e/helpers/e2e-harness.js
tomdps
added this pull request to the merge queue
Jul 17, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Merge current
main(v6.6.0) into currentdevbefore the 6.7 promotion.This repairs the release-history divergence that makes #715 conflict. The resolved tree is byte-identical to
dev; the commit changes ancestry only.Conflict resolution
All six conflicts resolve to
dev, whose implementations are strict supersets of the oldermaincopies:AGENTS.md: current protocol/native architecture routinglib/detached-startup.js,src/orchestrator.js: shared process-liveness plus atomic resume reconstructionlib/start-cluster.js: trusted canonical run-plan pathscripts/assert-release-published.js: npm propagation polling from fix(release): wait for npm latest propagation #635tests/e2e/helpers/e2e-harness.js: currentbuildEnvexportAll non-conflicting main release metadata was already present on dev. Proof:
781a173137c7d13ddff0a3267914e65d1ddd8584781a173137c7d13ddff0a3267914e65d1ddd8584git diff origin/dev..HEAD: emptyMerge requirement
This PR must be merged as a true merge commit, not squash. Squashing drops the
mainparent and recreates the exact conflict (what happened to #641). After required CI passes, use the repository-admin merge path to preserve both parents.No production file content changes in this PR; the complete
devrelease candidate already passed its full local and merge-queue gates at5dc1639.