diff --git a/claude/settings.json b/claude/settings.json
index 59bf678..17c9812 100644
--- a/claude/settings.json
+++ b/claude/settings.json
@@ -93,10 +93,14 @@
     "command": "~/.claude/statusline.sh",
     "padding": 0
   },
+  "env": {
+    "CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS": "1"
+  },
+  "teammateMode": "auto",
   "enabledPlugins": {
     "code-review@claude-plugins-official": true,
     "code-simplifier@claude-plugins-official": true,
-    "commit-commands@claude-plugins-official": true,
+    "commit-commands@claude-plugins-official": false,
     "feature-dev@claude-plugins-official": true,
     "frontend-design@claude-plugins-official": true,
     "gopls-lsp@claude-plugins-official": true,