Update workspace stacks explicitly and stop on conflicts - #192
Open
nishu-builder wants to merge 1 commit into
Open
Conversation
This was referenced Sep 5, 2026
nishu-builder
force-pushed
the
codex/multiworkspace-04-stack-updates-01a06e14
branch
from
September 5, 2026 21:05
c70b866 to
b3ab5ae
Compare
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.
Workspaces now show when a named base has moved. Update stack (or
uin the picker) merges bases in dependency order and records each incorporated base commit with the workspace head under one conversation lease.An upstream rewrite fails explicitly. Conflicts leave that workspace unchanged and stop the batch, while earlier successful updates remain visible. Repeating an up-to-date operation makes no commits. There is no separate stack record: workspace base edges define the stack.
Validation: CLI/protocol unit tests and clippy; five selected suite entries with a fresh test salt; Nix build. The existing 42 suite entries are unchanged.
Stack: #189 → #190 → #191 → this PR. Repository attachment and independent launch follow.