Skip to content

sync: upstream catch-up (133 commits, base 2026-05-26) + re-home fork delta after supervisor split#10

Merged
vessux merged 0 commit into
mainfrom
sync/upstream-2026-06-18
Jun 23, 2026
Merged

sync: upstream catch-up (133 commits, base 2026-05-26) + re-home fork delta after supervisor split#10
vessux merged 0 commit into
mainfrom
sync/upstream-2026-06-18

Conversation

@vessux

@vessux vessux commented Jun 18, 2026

Copy link
Copy Markdown
Owner

Summary

Upstream-sync rebase: fork delta re-parented onto upstream/main (4848c409f23c2c8e, 133 commits absorbed). Per the fork-sync flow this PR is a review artifact, not a merge — it will show CONFLICTING because the rebased branch cannot fast-forward into main. Land via the force-push below.

17 fork-delta commits replayed + 1 adaptation commit. The stale style: cargo fmt commit was dropped (re-formatted in the adaptation pass).

Verification (macOS)

  • cargo build/clippy/test --workspace --features openshell-prover/bundled-z3green, clippy zero warnings, all tests pass (722/723 + ignored gateway/podman integration tests).
  • Proto pre-flight clean: fork fields all in 9000+ (cred_inject=9000, echo=9001, trust_check=9002, volumes=9003, SANDBOX_PHASE_STOPPED=9004); zero upstream collisions in the 8000/9000 range.

Conflict surfaces resolved

Not landing via this PR

Force-push to main is the human step (default-branch protection):

git push origin sync/upstream-2026-06-18:main --force-with-lease

Post-merge: tag vX.Y.0 → release workflow builds binaries → bump OPENSHELL_FORK_TAG in openlock src/sandbox/fork-binaries.ts; smoke-test a fresh gateway on Mac/podman.

@vessux vessux merged commit 9ae1ad9 into main Jun 23, 2026
1 check 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