diff --git a/.gitignore b/.gitignore
index 1c2a976..60e10f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,6 @@ internal/examples/nats-chatroom/nats-chatroom
 
 # NATS data directory
 data/
+
+# Claude Code worktrees
+.claude/worktrees/
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 0000000..6e0181e
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,5 @@
+# Via Project Instructions
+
+## Worktree Usage
+
+Always enter a worktree at the start of a session using the `EnterWorktree` tool. This prevents parallel Claude Code sessions from interfering with each other.