Skip to content

chore(release): record main ancestry for dev promotion#619

Merged
EivMeyer merged 2 commits into
devfrom
codex/release-resolve-main-conflicts
Jul 10, 2026
Merged

chore(release): record main ancestry for dev promotion#619
EivMeyer merged 2 commits into
devfrom
codex/release-resolve-main-conflicts

Conversation

@EivMeyer

Copy link
Copy Markdown
Collaborator

Summary

Verification

  • git merge-tree --write-tree origin/main HEAD -> clean locally after the merge commit
  • node tests/run-tests.js tests/unit/start-cluster-config.test.js
  • npm run typecheck

EivMeyer and others added 2 commits July 9, 2026 03:28
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>
@EivMeyer
EivMeyer added this pull request to the merge queue Jul 10, 2026
Merged via the queue into dev with commit 992b7b0 Jul 10, 2026
4 checks passed
@EivMeyer
EivMeyer deleted the codex/release-resolve-main-conflicts branch July 10, 2026 02:13
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