diff --git a/.claude/scripts/install_pkgs.sh b/.claude/scripts/install_pkgs.sh
new file mode 100755
index 00000000000..b407f3ce31a
--- /dev/null
+++ b/.claude/scripts/install_pkgs.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ "$CLAUDE_CODE_REMOTE" != "true" ]; then
+  exit 0
+fi
+
+pnpm install
diff --git a/.claude/settings.json b/.claude/settings.json
new file mode 100644
index 00000000000..502fd54dc4b
--- /dev/null
+++ b/.claude/settings.json
@@ -0,0 +1,15 @@
+{
+  "hooks": {
+    "SessionStart": [
+      {
+        "matcher": "startup",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/scripts/install_pkgs.sh"
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/.gitignore b/.gitignore
index 164a3881bb8..5d4494d1cbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,7 +117,9 @@ next-env.d.ts
 .vercel
 
 # AI assistant local files
-.claude/
+.claude/*
+!.claude/settings.json
+!.claude/scripts/
 CLAUDE.md
 
 #include template .env file for docker-compose
@@ -149,4 +151,4 @@ gcloud.json
 # Sentry CLI config
 **/.sentryclirc
 
-keys.json
\ No newline at end of file
+keys.json