Reconcile stable master into dev #89

Merged

lost-rob0t merged 44 commits from agent/reconcile-master-into-dev-2026-07-31 into dev

2026-08-02 00:48:40 +00:00

lost-rob0t commented

2026-07-31 18:58:31 +00:00

(Migrated from github.com)

Goal

Restore the repository branch policy after recent work landed on master while dev continued independently.

dev remains the integration branch.
master remains the stable branch.
This branch starts from current master so conflict-resolution commits can be made without modifying master.
The merge must retain the 10 operational-salvage commits unique to dev and the 31 commits currently unique to master.

Why this must land first

Open PRs #79 and #86 now correctly target dev, but conflict because the branches diverged. PR #87 was already merged into master; this reconciliation carries its database repair into dev while preserving the operational runtime already present there.

Merge gate

resolve overlapping runtime/package/ASDF/view files without dropping either side
run schema lock, unit, integration, smoke, and container-stack checks on the merged tree
merge into dev only when required checks are green

After this lands, re-evaluate #79 and #86 against synchronized dev.

## Goal Restore the repository branch policy after recent work landed on `master` while `dev` continued independently. - `dev` remains the integration branch. - `master` remains the stable branch. - This branch starts from current `master` so conflict-resolution commits can be made without modifying `master`. - The merge must retain the 10 operational-salvage commits unique to `dev` and the 31 commits currently unique to `master`. ## Why this must land first Open PRs #79 and #86 now correctly target `dev`, but conflict because the branches diverged. PR #87 was already merged into `master`; this reconciliation carries its database repair into `dev` while preserving the operational runtime already present there. ## Merge gate - resolve overlapping runtime/package/ASDF/view files without dropping either side - run schema lock, unit, integration, smoke, and container-stack checks on the merged tree - merge into `dev` only when required checks are green After this lands, re-evaluate #79 and #86 against synchronized `dev`.