Scrub the writable layer on the migration path too, and de-duplicate CLAUDE_JSON

Two integration fixes after merging the three feature branches.

`scrub_writable_layer` is a `docker exec`, so it only works while the
container runs. `migrate_project_to_base` stops its container one line
before the pre-swap commit, which meant the single largest snapshot
Triple-C ever takes was the one path that committed unscrubbed. Call the
scrub explicitly before the stop instead of relying on the call inside
`commit_container_snapshot`.

Also drop a duplicate `CLAUDE_JSON=` assignment in entrypoint.sh. The
Shift+Enter block re-declared it defensively to avoid a merge conflict
with the awsAuthRefresh block; the conflict did not materialise.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GBq2rGum6GX7xXgsas1fDc
This commit is contained in:
2026-08-23 08:38:01 -07:00
co-authored by Claude Opus 5
parent df6d2f1ca4
commit 2ca86bb5d8
4 changed files with 20 additions and 4 deletions
@@ -460,6 +460,13 @@ async fn fresh_migration(
}
}
// Scrub *before* the stop, not inside the commit below. `scrub_writable_layer`
// is a `docker exec`, which only works on a running container — and the
// pre-swap commit is the single largest snapshot Triple-C ever takes, so
// letting this one path commit unscrubbed is what the scrub exists to
// prevent. Failure is swallowed inside; it must never block a migration.
docker::scrub_writable_layer(&container_id).await;
emit_progress(&app_handle, &project_id, "Stopping the container...");
let _ = state
.projects_store
+4 -3
View File
@@ -2047,9 +2047,10 @@ fn parse_scrub_total(output: &str) -> Option<u64> {
/// **Never fails the caller, by design.** A scrub is an optimisation; a commit
/// is the only copy of the user's system layer. Losing some disk is a strictly
/// better outcome than refusing to snapshot, so every failure here is a log
/// line and nothing more. Note that one caller (the pre-swap commit in
/// `migrate_project_to_base`) has already *stopped* the container, so `docker
/// exec` legitimately fails there — that path simply commits unscrubbed.
/// line and nothing more. Note that this is a `docker exec` and therefore only
/// works while the container runs: `migrate_project_to_base` stops its
/// container before the pre-swap commit, so it calls this itself beforehand
/// rather than relying on the call inside [`commit_container_snapshot`].
pub async fn scrub_writable_layer(container_id: &str) -> u64 {
let script = snapshot_scrub_script();
let cmd = vec!["/bin/sh".to_string(), "-c".to_string(), script];