Repository navigation
Continue retained tasks with sandboxed base merges (#333) - #678
Merged
Merged
Conversation
This was referenced Nov 16, 2026
n0rpan
marked this pull request as ready for review
November 16, 2026 10:05
Codex Review Summary: ✅ CompletedThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
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
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.
Existing task branches and receipts were refused, so a retained conflict or committed task could not be continued. This adds ordinary sandboxed merges of the captured base, reuses matching linked worktrees/receipts, and hands unresolved merges to the real worker without discarding edits.
Tier T3. Main-based re-cut of #358 after #336, for #333. This branch contains only continuation; it supersedes the old stacked draft without rewriting its history.
Validation at 72bf8d1: 287 touched-crate tests, including 62 runner cases, pass with real mandatory bwrap, an isolated HOME and loopback fake engine. Strict all-target Clippy, CI’s pinned Rust 1.99.1 formatter, Markdown links and all four unchanged scans pass. Five regressions failed with the previous behavior: hidden worker failure, host merge hook, host clean filter, source alias and unbounded conflict handoff. No checks, sandbox protections or dependencies changed. Own draft gate 43845421819 passed; the PR is ready and full component CI/review is running.
Runtime footprint, paired at the same build path against main 5421e91, x86_64 stripped ci profile (opt-level 1), Rust 1.100.0, three private mock samples per mode:
Active runner median: 5,872 KiB and 3 threads (including the two child-pipe readers); accepted batch completion 1,717.1 ms. Samples include a 1,200 ms synthetic stream stall; these are completion times, not TTFB. The runner exits after the batch, adding no persistent idle process, memory or threads.
Local done still means accepted local work, which may be uncommitted. Clean accepted head/tree binding and base-object integrity remain blocking requirements before #397; a worker deadline precedes unattended use. Durable save/revision/event emission is the next #387 re-cut.