Repository navigation
fix: preserve unmanaged dock content and add sync - #37
Merged
Merged
Conversation
Reconcile managed links from workspace configuration without disturbing extra files or manual symlinks. Recover missing links, reject conflicts before mutation, and atomically replace ownership locks. Make delete --force remove the entire validated owned dock without following symlink targets. Cover recovery, conflicts, ownership checks, and complete deletion with regression tests. Fixes #35
Distinguish case-insensitive lookup aliases from separate directory entries before rejecting unmanaged collisions. Recreate renamed links after removing their old managed spelling, including configuration target changes. Add CLI regression tests and run case-only rename coverage on macOS CI. Local Linux suite, formatting, Clippy, and local/Windows compilation pass; native macOS execution remains pending.
tevass
force-pushed
the
fix/35-dock-reconciliation-and-sync
branch
from
October 31, 2026 23:03
ae64f04 to
74d2e27
Compare
Merged
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
Fixes #35: reopening a dock containing a tool-generated directory such as
.diracnow preserves that content and opens the workspace normally.open,sync,add, andremove, while rejecting managed-link conflicts before changes.zwd sync [workspace]to recover missing links and reconcile workspace configuration without launching Zed. Accept registered names, workspace paths, or inference from the current dock root.statusto distinguish extra content from inconsistent managed links.deleteas a preview; makedelete --forceremove the entire validated owned dock, including extra content, without following symlink targets.Validation
All 80 tests passed, along with the following checks through Devbox:
cargo fmt --all -- --check cargo check --all-targets --locked cargo test --locked cargo clippy --all-targets --all-features --locked -- -D warnings cargo check --target x86_64-pc-windows-msvc --all-targets --locked git diff --checkManual Zed smoke tests and native macOS/Windows runtime checks were not performed locally. The new macOS CI job exercises case-only link rename regressions.
Impact
Lock version 1 and the persistence layout remain unchanged.
delete --forcenow deletes files stored exclusively inside the dock; its preview explains this behavior. Linked project targets remain intact.Security and Supply Chain