Repository navigation
Feature A: Normalize captured bases before sandboxed task checkout - #1043
Conversation
A fresh task worktree shares the source repository's refs. When the local branch a task base names stayed behind the commit the base resolves to (for example a local `main` after the checkout fetched a newer one), the task's own diff against `main` read as the whole repository divergence. Advance that branch when no work can be lost: only when it is a strict ancestor of the frozen base, no worktree has it checked out, and the update is a compare-and-swap against the observed tip. Any other state is left untouched and never blocks the task. Refs #1027
Codex Review Summary: ✅ CompletedThis comment shows the latest Codex review activity on this pull request.
Security findingsAdvisory findings (1)
ℹ️ 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. |
|
First-pass review by oxa → oxc →
TIER: T2 🤖 Generated with Claude Code (oxa review lane) |
Both fixtures kept the source checkout on `main`, so the sandboxed base merge had to leave the checked-out branch where it was and the new worktree never agreed with its base. Put the source checkout on its own branch first, assert the frozen base is the fetched commit, and name the base after that ref so the branch-advance path is what the tests cover. Refs #1027
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 39a0bc1536
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
There was a problem hiding this comment.
🛡️ Codex Security Review · Automatically triggered
Here are some automated security review suggestions for this pull request.
Reviewed commit: 39a0bc1536
ℹ️ About Codex security reviews in GitHub
This is an experimental Codex feature. Security reviews are triggered when:
- You comment "@codex security review"
- A regular code review gets triggered (for example, "@codex review" or when a PR is opened), and you’re opted in so security review runs alongside code review
Once complete, Codex will leave suggestions, or a comment if no findings are found.
|
First-pass review by oxa → oxc → Codex findings
TIER: T3 🤖 Generated with Claude Code (oxa review lane) |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 769bd7cf10
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
The base-branch advance ran `git update-ref` on the host. `update-ref` fires the repository's `reference-transaction` hook, so a branch that lags its fetched base would execute project-controlled code outside the sandbox -- the path worktree creation already closes by pinning `core.hooksPath=/dev/null`. Pin the same hooks path for that one metadata command and add a regression test: a failing `reference-transaction` hook must neither stop the advance nor run on the host, and the base branch still reaches the fetched commit. The work doc now says the move is host metadata. Refs #1027
|
First-pass review by oxa → oxc → Codex findings
Additional defect
TIER: T3 🤖 Generated with Claude Code (oxa review lane) |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: f67becdb3b
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
The hook regression test checked out `source` before committing, so the fixture committed onto `source` and pushed an unchanged `main`. The fetched base then equalled the stale one and the fixture's own precondition failed. Build the fetched commit on `main`, then leave it, and install the reference-transaction hook afterwards so only the runner's host metadata could run it. Refs #1027
|
First-pass review by oxa → oxc → Codex findings
TIER: T3 🤖 Generated with Claude Code (oxa review lane) |
|
@codex review |
|
@codex security review |
|
Codex Review: Didn't find any major issues. 🚀 Reviewed commit: ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
🛡️ Codex Security ReviewSecurity review completed. No security issues were found in this pull request. Reviewed commit: Only the user who started this review can view the report in Codex. ℹ️ About Codex security reviews in GitHubThis is an experimental Codex feature. Security reviews are triggered when:
Once complete, Codex will leave suggestions, or a comment if no findings are found. |
# Conflicts: # oxa/oxa-cli/src/work_checks.rs # oxa/oxa-cli/tests/common/work.rs # oxa/oxa-work/src/committed.rs # oxa/oxa-work/src/lib.rs # oxa/oxa-work/src/tree.rs
|
Merged as The Core binding API slice also merged in #1220. #1097 remains Draft on its existing branch while candidate |
Feature A (#1214), T3. Fixes #1027. Ports #307's worktree lifecycle and post-commit publish row: a new task uses the captured base without moving another checkout or freezing inconsistent aliases in the same batch.
Resolve the actual Git ref instead of guessing from remote-name spelling. Tags and symbolic local aliases cannot nominate a mutable local base. An empty no-checkout holder reserves an eligible stale base through the existing sandboxed checkout operation; a concurrent checkout makes Git refuse the reservation. The update compares the original OID without dereferencing aliases, runs before checkout callbacks, and preserves unexpected contents during cleanup.
The existing planner freezes batch inputs before callbacks. A local base and its sole requested remote fast-forward target share the captured commit and acceptance commands. Conflicting remote targets do not select a winner. Saved checkpoints and main's object-integrity, reviewed-branch, bounded-execution and committed-acceptance guards remain. No new store or checkpoint schema.
Validation of final source
5ed1e3dc114b1849b581b5a80eb12fffc2aee0f0:ac139a53failed at runtime before the fix. Retains all original controls and adds tag, symbolic-ref, concurrent-checkout, batch-alias and callback-order regressions. A separately corrected fixture expectation is not counted as product failure proof.Merged through the normal queue as
0611054fa399c1b44584af5688d877c8279aad38. Retains the complete existingoxa/issue-1027history and every test; normal main merges resolved actual conflicts. Removes host-side ref mutation in favor of the existing sandboxed operation. Helpers remain paused; no lab script changes.