From 5cd528a4eff67f4da6e605f403b13d617f358b78 Mon Sep 17 00:00:00 2001 From: Josh Knapp Date: Wed, 1 Jul 2026 06:22:14 -0700 Subject: [PATCH] Use flags=rh so intra-workspace hardlinks survive the transform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Review caught that `flags=r` disables rewriting of both symlink AND hardlink target names. Leaving symlink targets alone is intended, but a hardlink's stored target is an archive-internal reference to another member's name — when member names become `workspace/...` but the hardlink target stays `./hard_link`, extraction fails hard: tar: workspace/file.txt: Cannot hard link to './hard_link': No such file or directory `flags=rh` rewrites regular member names and hardlink target names together (keeping the pair consistent) while still leaving symlink targets untouched. Verified in-container: extract exit 0, symlink target preserved, hardlink pair shares one inode, nesting under workspace/ intact. Co-Authored-By: Claude Opus 4.8 (1M context) --- app/src-tauri/src/commands/file_commands.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src-tauri/src/commands/file_commands.rs b/app/src-tauri/src/commands/file_commands.rs index 83bc5e7..200b082 100644 --- a/app/src-tauri/src/commands/file_commands.rs +++ b/app/src-tauri/src/commands/file_commands.rs @@ -206,8 +206,10 @@ pub async fn download_container_backup( // so secrets can't leak through the sanitization fallback. // The `--transform` nests the workspace under `workspace/` (parallel to // `home-claude/`) so an extracted archive has both clearly labeled instead - // of scattering the workspace files into the extraction dir. `flags=r` - // scopes the rewrite to member names only, leaving symlink targets intact. + // of scattering the workspace files into the extraction dir. `flags=rh` + // rewrites regular member names AND hardlink target names (so an intra- + // workspace hardlink pair still resolves on extract) while leaving symlink + // targets untouched (rewriting those would corrupt relative/absolute links). let script = r#"set -e STAGE=$(mktemp -d) trap 'rm -rf "$STAGE"' EXIT @@ -225,7 +227,7 @@ if [ -d "$HOME/.claude" ]; then fi tar czf - --ignore-failed-read \ --exclude='*/node_modules' --exclude='*/target' \ - --transform='flags=r;s,^\./,workspace/,' \ + --transform='flags=rh;s,^\./,workspace/,' \ -C "$TC_BACKUP_SRC" . \ -C "$STAGE" home-claude"#;