diff --git a/.claude/settings.json b/.claude/settings.json
index e10b552..5668f6d 100644
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -25,5 +25,49 @@
       "filePattern": ".claude/skills/deploy-workflow.md",
       "description": "CI/CD pipeline, Docker patterns, deployment guide"
     }
-  ]
+  ],
+  "hooks": {
+    "PreToolUse": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "serena-hooks remind --client=claude-code"
+          }
+        ]
+      },
+      {
+        "matcher": "mcp__serena__*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "serena-hooks auto-approve --client=claude-code"
+          }
+        ]
+      }
+    ],
+    "SessionStart": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "serena-hooks activate --client=claude-code"
+          }
+        ]
+      }
+    ],
+    "SessionEnd": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "serena-hooks cleanup --client=claude-code"
+          }
+        ]
+      }
+    ]
+  }
 }
diff --git a/.gitignore b/.gitignore
index ae5bb70..b64e486 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ node_modules
 .turbo/
 # IDEs and editors
 /.idea
+.serena/
 .project
 .classpath
 .c9/
diff --git a/plugins/hub-guide b/plugins/hub-guide
index abd60c6..ffcd3ba 160000
--- a/plugins/hub-guide
+++ b/plugins/hub-guide
@@ -1 +1 @@
-Subproject commit abd60c607ddd6eddb60b1c74b6773fdc5e8ad3e1
+Subproject commit ffcd3ba8e31b7b50c12825ac66433c4268f55916