Pre-exec self-healing cleanup for sandbox#396
Merged
Conversation
Clean up dirty sandbox state before syncing so interrupted execs (Ctrl+C, crash, network drop) don't leave the sandbox in a broken state requiring manual reset. Only runs when sync is enabled.
jmsanders
approved these changes
Mar 5, 2026
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.
This addresses the "Known limitation" described in https://github.com/rwx-cloud/mint/pull/3616, where a forcibly-stopped sandbox command (i.e. running Ctrl+C or killing the pid locally) can leave the sandbox in a dirty state, making it impossible for the local environment to push a patch to it.
In this PR, the CLI starts from a defensive position and cleans the git state on the sandbox before applying its new patch.
Summary
cleanSandboxState()step that runs after lock acquisition but beforesyncChangesToSandbox(), resetting the sandbox working tree withgit checkout . && git clean -fdrevertSandbox(), the next exec now self-heals instead of failing with a stale patch--no-syncskips it)Test plan
Sync: false