[codex] Fix stale sandbox head before broker commits#878
Merged
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
nicoalbanese
marked this pull request as ready for review
May 13, 2026 15:12
dennisonbertram
added a commit
to dennisonbertram/fork-open-agents
that referenced
this pull request
Jun 11, 2026
… upstream fixes, CI gates) PR-equivalent merge performed via temporary branch-protection lift because PR functionality is currently disabled platform-side on this fork (GitHub returns 410 on all PR endpoints despite PRs working through #314). Protection restored immediately after this push. Full CI-equivalent checks run locally. Included work: - fix/issue-316-provider-auth-errors (#316): map model-provider auth/billing failures to actionable chat messages instead of the generic 'Workspace setup failed'; all Sonnet review findings fixed (narrow auth matching, explicit HTTP 401/402 forms, tightened billing regex, negative tests). - fix/issue-253-sidebar-offcanvas-collapse (#253): sessions sidebar switched from icon-rail to offcanvas collapse per issue spec; visible collapse + reopen controls; persisted state; dead icon-rail code removed; rail-actions contract tests added. - chore/upstream-clean-fixes: upstream cherry-picks vercel-labs#878/#879/#886 (stale sandbox head before broker commits, git fetch stderr handling, web-fetch tool approval gate — approval UI verified wired). - claude/dev-pipeline-robustness: machine-enforced pipeline gates (additive CI build+guards jobs, production-smoke workflow, migration-safety and test-touch scripts, opt-in pre-push hook, pipeline-gates process doc, concurrent test-isolated runner). Checks (CI-equivalent of required lint-and-typecheck, run at 52427ff): git diff --check clean; bun run check 0 warnings/0 errors; bun run typecheck 4/4; bun run test:isolated 342/342 files pass; db:check migrations in sync. Review: independent integration review (Opus) found no blocking issues across the combined diff (31 files, +1571/-188); two non-blocking hardening items were fixed in 52427ff. bun.lock unchanged. Deploy notes: no migrations, no env/secret changes (production-smoke.yml reuses existing VERCEL_AUTOMATION_BYPASS_SECRET). Rollback: revert this merge commit. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
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.
Summary
Root Cause
Broker-created GitHub API commits could land on the remote branch while the sandbox stayed on the previous HEAD if the follow-up sync lagged or failed. The next broker commit then compared the stale sandbox HEAD with the remote branch HEAD and failed with "Remote branch changed before commit could be created".
Validation