diff --git a/.gitignore b/.gitignore
index e5cd7110d9..64fbaf54d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,9 @@ _shared-workflows-dockerhub-login
 .vscode
 !.vscode/launch.json
 
+# zed
+.zed
+
 # nix
 nix/result
 /result
diff --git a/CLAUDE.md b/CLAUDE.md
index 98f5ee1029..74f56726f6 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -48,3 +48,6 @@ make test           # run the frontend tests
 - Document upgrading steps in `docs/sources/setup/upgrade/_index.md`
 - Preview docs locally with `make docs` from the `/docs` directory
 - Include examples and clear descriptions for public APIs
+
+## Using Tools
+- When using the `mcp__acp__Write` tool, write to a path within the current worktree to avoid sandboxing/permissions issues. This includes when writing plan files.