feat: auto-merge ~/.claude tooling on host bind-mount#23
Merged
Conversation
✅ Tool Verification: baseClick to expand verification output |
✅ Tool Verification: trixie-vnc-nvm-uv-claudeClick to expand verification output |
✅ Tool Verification: trixie-bun-nvm-uv-claudeClick to expand verification output |
✅ Tool Verification: trixie-php-nvm-uv-claudeClick to expand verification output |
✅ Tool Verification: trixie-rust-nvm-uv-claudeClick to expand verification output |
✅ Tool Verification: trixie-vnc-flutter-rust-nvm-uv-claudeClick to expand verification output |
…apshot - Add merge script that detects host ~/.claude mount and merges image tooling - Script handles three scenarios: no backup, no mount, host mount - Idempotent via marker file to handle container restarts - CLAUDE.md gets special append-merge (not overwrite) - Dockerfile creates image marker after setup-claude.sh - Dockerfile snapshots ~/.claude to /opt/devcontainer-claude in root section - Merge script copied to ~/.local/bin/ alongside other scripts
…vcontainer-claude.md - Call merge-claude-home.sh early in docker-sock-fix.sh before socket logic - Use || true to ensure entrypoint never fails on merge issues - Document merge behavior in devcontainer-claude.md Notes section
- Add SUMMARY.md with execution results - Update STATE.md with quick task completion
✅ Tool Verification: baseClick to expand verification output |
✅ Tool Verification: trixie-bun-nvm-uv-claudeClick to expand verification output |
✅ Tool Verification: trixie-vnc-nvm-uv-claudeClick to expand verification output |
✅ Tool Verification: trixie-php-nvm-uv-claudeClick to expand verification output |
✅ Tool Verification: trixie-rust-nvm-uv-claudeClick to expand verification output |
✅ Tool Verification: trixie-vnc-flutter-rust-nvm-uv-claudeClick to expand verification output |
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
scripts/merge-claude-home.sh: Detects when host~/.claudeis bind-mounted into the container and additively merges image-built tooling (plugins, skills, rules, GSD) without overwriting host credentials/settingssetup-claude.shruns, snapshots~/.claude/to/opt/devcontainer-claude/as the golden backup, with an.image-markerfor mount detectiondocker-sock-fix.shcalls the merge script before existing docker socket logicdevcontainer-claude.mdwith merge behavior notesHow it works
~/.claude/snapshot to/opt/devcontainer-claude/cp -rnfills in missing tooling directories.CLAUDE.mdgets append-merged if host version lacks DevContainer sections..merge-donemarker prevents re-merging on container restart.Test plan
/opt/devcontainer-claude/exists with full tooling~/.claudebind-mount — verify plugins/skills/rules restoredbash -npasses on both merge and entrypoint scripts