fix: rebuild bwrap sandbox after cwd change - #22
Merged
Conversation
zhanghanduo
approved these changes
Aug 27, 2026
zhanghanduo
left a comment
Collaborator
There was a problem hiding this comment.
The fix correctly rebuilds the cached Bubblewrap sandbox after /cwd switches to a different workspace, while preserving reuse for equivalent paths and cleaning up the retired sandbox. The regression test covers the expected behavior well. LGTM!
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes an issue where the Bubblewrap (bwrap) sandbox instance was cached process-wide and incorrectly reused after the session working directory changed, causing writable binds to point at the wrong workspace.
Changes:
- Key the cached bwrap sandbox by the resolved
cwdand rebuild it when the resolved workspace changes. - Dispose of the previously cached sandbox when replacing it.
- Add a regression test covering reuse for equivalent paths, replacement on workspace change, and cleanup behavior.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| apodex/sandbox.py | Cache bwrap sandbox by resolved workspace and rebuild/cleanup when cwd switches. |
| apodex/tests/test_native.py | Add regression test ensuring sandbox reuse for the same workspace and rebuild on workspace change. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
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.
Summary
/cwdswitches to a different workspaceBackground
_get_bwrap_sandbox()previously cached one process-wide jail. After/cwdchanged the session workspace, later shell commands reused a jail whose writable bind still pointed at the original directory.Validation
uv run pytest -q— 1722 passeduv run ruff check frontier_agent/ apodex/ benchmarks/ workflows/ plugins/ deploy/ tools/ scripts/uv run pyright— 0 errorsgit diff --check