Skip to content

Make speaker profile merges atomic on current main#1567

Closed
r3dbars wants to merge 4 commits into
mainfrom
codex/speaker-merge-current-main-v2
Closed

Make speaker profile merges atomic on current main#1567
r3dbars wants to merge 4 commits into
mainfrom
codex/speaker-merge-current-main-v2

Conversation

@r3dbars

@r3dbars r3dbars commented Jul 18, 2026

Copy link
Copy Markdown
Owner

Current-main replacement for #1546 after #1563, #1538, #1549, and #1565 advanced main.

This keeps the later speaker-finalization and transcript-owner behavior from main, makes profile merge plus transcript rewrite rollback-safe, and propagates persistence failures from the naming mutation batch. It intentionally does not restore the deleted Tests/FastTests.manifest.

Proof plan:

  • build-deps.sh --force
  • signed local build
  • fast/full Swift tests
  • integration smoke
  • exact-head merge simulation and independent review

Manual Settings speaker merge proof remains separate and is not claimed here.

@r3dbars

r3dbars commented Jul 18, 2026

Copy link
Copy Markdown
Owner Author

Disposition: superseded by replacement #1571, which carries the repaired atomic speaker merge implementation on current main and has merged as e1f7440. This stale replacement is not being merged.

@r3dbars r3dbars closed this Jul 18, 2026
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