diff --git a/.claude/settings.json b/.claude/settings.json
new file mode 100644
index 000000000..ec5ce99e9
--- /dev/null
+++ b/.claude/settings.json
@@ -0,0 +1,6 @@
+{
+  "env": {
+    "CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS": "1"
+  },
+  "teammateMode": "in-process"
+}
diff --git a/.gitignore b/.gitignore
index 355e2c107..1ffae9ec9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,8 +27,7 @@ Thumbs.db
 *.swp
 *.swo
 
-# Claude Code internals (plans, session transcripts, local settings)
-# Note: .claude/agents/ and .claude/skills/ ARE tracked
+# Claude Code internals (plans, session transcripts)
+# Note: .claude/agents/, .claude/skills/, and .claude/settings.json ARE tracked
 .claude/plans/
 .claude/projects/
-.claude/settings.json