diff --git a/hooks/hooks.json b/hooks/hooks.json
index f1b41df..153b64e 100644
--- a/hooks/hooks.json
+++ b/hooks/hooks.json
@@ -21,13 +21,13 @@
           {
             "type": "command",
             "shell": "bash",
-            "command": "export PATH=\"$($SHELL -lc 'echo $PATH' 2>/dev/null):$PATH\"; _R=\"${CODEBUDDY_PLUGIN_ROOT:-$HOME/.codebuddy-mem}\"; _R=\"${_R%/}\"; node \"$_R/scripts/bun-runner.js\" \"$_R/scripts/worker-service.cjs\" start; echo '{\"continue\":true,\"suppressOutput\":true}'",
+            "command": "export CLAUDE_MEM_DATA_DIR=\"${CODEBUDDY_MEM_DATA_DIR:-$HOME/.codebuddy-mem}\"; export CODEBUDDY_MEM_DATA_DIR=\"${CODEBUDDY_MEM_DATA_DIR:-$HOME/.codebuddy-mem}\"; export PATH=\"$($SHELL -lc 'echo $PATH' 2>/dev/null):$PATH\"; _R=\"${CODEBUDDY_PLUGIN_ROOT:-$HOME/.codebuddy-mem}\"; _R=\"${_R%/}\"; node \"$_R/scripts/bun-runner.js\" \"$_R/scripts/worker-service.cjs\" start; echo '{\"continue\":true,\"suppressOutput\":true}'",
             "timeout": 60
           },
           {
             "type": "command",
             "shell": "bash",
-            "command": "export PATH=\"$($SHELL -lc 'echo $PATH' 2>/dev/null):$PATH\"; _R=\"${CODEBUDDY_PLUGIN_ROOT:-$HOME/.codebuddy-mem}\"; _R=\"${_R%/}\"; node \"$_R/scripts/bun-runner.js\" \"$_R/scripts/worker-service.cjs\" hook codebuddy context",
+            "command": "export CLAUDE_MEM_DATA_DIR=\"${CODEBUDDY_MEM_DATA_DIR:-$HOME/.codebuddy-mem}\"; export CODEBUDDY_MEM_DATA_DIR=\"${CODEBUDDY_MEM_DATA_DIR:-$HOME/.codebuddy-mem}\"; export PATH=\"$($SHELL -lc 'echo $PATH' 2>/dev/null):$PATH\"; _R=\"${CODEBUDDY_PLUGIN_ROOT:-$HOME/.codebuddy-mem}\"; _R=\"${_R%/}\"; node \"$_R/scripts/bun-runner.js\" \"$_R/scripts/worker-service.cjs\" hook codebuddy context",
             "timeout": 60
           }
         ]
@@ -39,7 +39,7 @@
           {
             "type": "command",
             "shell": "bash",
-            "command": "export PATH=\"$($SHELL -lc 'echo $PATH' 2>/dev/null):$PATH\"; _R=\"${CODEBUDDY_PLUGIN_ROOT:-$HOME/.codebuddy-mem}\"; _R=\"${_R%/}\"; node \"$_R/scripts/bun-runner.js\" \"$_R/scripts/worker-service.cjs\" hook codebuddy session-init",
+            "command": "export CLAUDE_MEM_DATA_DIR=\"${CODEBUDDY_MEM_DATA_DIR:-$HOME/.codebuddy-mem}\"; export CODEBUDDY_MEM_DATA_DIR=\"${CODEBUDDY_MEM_DATA_DIR:-$HOME/.codebuddy-mem}\"; export PATH=\"$($SHELL -lc 'echo $PATH' 2>/dev/null):$PATH\"; _R=\"${CODEBUDDY_PLUGIN_ROOT:-$HOME/.codebuddy-mem}\"; _R=\"${_R%/}\"; node \"$_R/scripts/bun-runner.js\" \"$_R/scripts/worker-service.cjs\" hook codebuddy session-init",
             "timeout": 60
           }
         ]
@@ -52,7 +52,7 @@
           {
             "type": "command",
             "shell": "bash",
-            "command": "export PATH=\"$($SHELL -lc 'echo $PATH' 2>/dev/null):$PATH\"; _R=\"${CODEBUDDY_PLUGIN_ROOT:-$HOME/.codebuddy-mem}\"; _R=\"${_R%/}\"; node \"$_R/scripts/bun-runner.js\" \"$_R/scripts/worker-service.cjs\" hook codebuddy observation",
+            "command": "export CLAUDE_MEM_DATA_DIR=\"${CODEBUDDY_MEM_DATA_DIR:-$HOME/.codebuddy-mem}\"; export CODEBUDDY_MEM_DATA_DIR=\"${CODEBUDDY_MEM_DATA_DIR:-$HOME/.codebuddy-mem}\"; export PATH=\"$($SHELL -lc 'echo $PATH' 2>/dev/null):$PATH\"; _R=\"${CODEBUDDY_PLUGIN_ROOT:-$HOME/.codebuddy-mem}\"; _R=\"${_R%/}\"; node \"$_R/scripts/bun-runner.js\" \"$_R/scripts/worker-service.cjs\" hook codebuddy observation",
             "timeout": 120
           }
         ]
@@ -65,7 +65,7 @@
           {
             "type": "command",
             "shell": "bash",
-            "command": "export PATH=\"$($SHELL -lc 'echo $PATH' 2>/dev/null):$PATH\"; _R=\"${CODEBUDDY_PLUGIN_ROOT:-$HOME/.codebuddy-mem}\"; _R=\"${_R%/}\"; node \"$_R/scripts/bun-runner.js\" \"$_R/scripts/worker-service.cjs\" hook codebuddy file-context",
+            "command": "export CLAUDE_MEM_DATA_DIR=\"${CODEBUDDY_MEM_DATA_DIR:-$HOME/.codebuddy-mem}\"; export CODEBUDDY_MEM_DATA_DIR=\"${CODEBUDDY_MEM_DATA_DIR:-$HOME/.codebuddy-mem}\"; export PATH=\"$($SHELL -lc 'echo $PATH' 2>/dev/null):$PATH\"; _R=\"${CODEBUDDY_PLUGIN_ROOT:-$HOME/.codebuddy-mem}\"; _R=\"${_R%/}\"; node \"$_R/scripts/bun-runner.js\" \"$_R/scripts/worker-service.cjs\" hook codebuddy file-context",
             "timeout": 60
           }
         ]
@@ -77,7 +77,7 @@
           {
             "type": "command",
             "shell": "bash",
-            "command": "export PATH=\"$($SHELL -lc 'echo $PATH' 2>/dev/null):$PATH\"; _R=\"${CODEBUDDY_PLUGIN_ROOT:-$HOME/.codebuddy-mem}\"; _R=\"${_R%/}\"; node \"$_R/scripts/bun-runner.js\" \"$_R/scripts/worker-service.cjs\" hook codebuddy summarize",
+            "command": "export CLAUDE_MEM_DATA_DIR=\"${CODEBUDDY_MEM_DATA_DIR:-$HOME/.codebuddy-mem}\"; export CODEBUDDY_MEM_DATA_DIR=\"${CODEBUDDY_MEM_DATA_DIR:-$HOME/.codebuddy-mem}\"; export PATH=\"$($SHELL -lc 'echo $PATH' 2>/dev/null):$PATH\"; _R=\"${CODEBUDDY_PLUGIN_ROOT:-$HOME/.codebuddy-mem}\"; _R=\"${_R%/}\"; node \"$_R/scripts/bun-runner.js\" \"$_R/scripts/worker-service.cjs\" hook codebuddy summarize",
             "timeout": 120
           }
         ]