chore(release): merge main into dev to restore ancestry#618
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>
… promotion Reconciles the divergent main commit ac354df (#591, deterministic e2e + run-plan hardening) with dev. Both branches independently built the run-plan refactor; conflicts were limited to resolveEffectiveRunPlan pr/ship resolution and its tests. Kept dev's settings.defaultDelivery feature (issue #606) and preserved main's net-new isolation tests. tests/unit/start-cluster-config: 17 passing. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
EivMeyer
enabled auto-merge
July 10, 2026 01:12
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
1 participant
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.
Restores
mainancestry intodevso thedev → mainrelease (#617) can merge cleanly.mainhad one divergent commit —ac354df(#591, deterministic e2e + run-plan hardening) — that overlapped the same run-plan refactor developed ondev(#588/#590).Conflicts resolved (2 files)
lib/start-cluster.js— kept dev'ssettings.defaultDeliverypr/ship resolution inresolveEffectiveRunPlan(feature from feat(setup): setup apply/undo with write-tracking and explicit undo conflict rules (2/5) #606/feat: Harden --pr/--ship autoMerge wiring: single-source the decision, drop dead ZEROSHOT_MERGE, doc server-side auto-merge #580; main's older squash lacked it).tests/unit/start-cluster-config.test.js— kept dev'sdefaultDeliverydescribe block and preserved main's net-newbuildStartOptions() isolationblock.Everything else auto-merged.
Verification
node tests/run-tests.js tests/unit/start-cluster-config.test.js→ 17 passing (both branches' test blocks present and green)git diff --checkclean, no residual conflict markerstsc --noEmitcleanMerge this, then #617 (dev → main) merges clean and semantic-release publishes.
🤖 Generated with Claude Code