diff --git a/hindsight-integrations/claude-code/.claude-plugin/plugin.json b/hindsight-integrations/claude-code/.claude-plugin/plugin.json
index 8046c62a3..576f40bff 100644
--- a/hindsight-integrations/claude-code/.claude-plugin/plugin.json
+++ b/hindsight-integrations/claude-code/.claude-plugin/plugin.json
@@ -1,7 +1,7 @@
 {
   "name": "hindsight-memory",
   "description": "Automatic long-term memory for Claude Code via Hindsight. Recalls relevant memories before each prompt and retains conversation transcripts after each response.",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "author": {"name": "Hindsight Team", "url": "https://vectorize.io/hindsight"},
   "license": "MIT",
   "keywords": ["memory", "hindsight", "recall", "retain"]
diff --git a/hindsight-integrations/claude-code/scripts/setup_hooks.py b/hindsight-integrations/claude-code/scripts/setup_hooks.py
new file mode 100644
index 000000000..114756240
--- /dev/null
+++ b/hindsight-integrations/claude-code/scripts/setup_hooks.py
@@ -0,0 +1,115 @@
+#!/usr/bin/env python3
+"""Register hindsight-memory hooks into ~/.claude/settings.json.
+
+Claude Code's plugin installer does not currently merge hooks.json into
+settings.json automatically. Run this script once after installing the plugin:
+
+    python3 setup_hooks.py
+
+Or via the /hindsight:setup skill inside a Claude Code session.
+"""
+
+import json
+import os
+import sys
+
+SETTINGS_PATH = os.path.expanduser("~/.claude/settings.json")
+
+
+def find_plugin_root() -> str:
+    """Locate the installed hindsight-memory plugin cache directory."""
+    cache_base = os.path.expanduser("~/.claude/plugins/cache/hindsight/hindsight-memory")
+    if not os.path.isdir(cache_base):
+        raise RuntimeError(
+            "hindsight-memory plugin not found. "
+            "Run /plugin install hindsight-memory inside Claude Code first."
+        )
+    versions = sorted(os.listdir(cache_base), reverse=True)
+    if not versions:
+        raise RuntimeError(f"No versions found in {cache_base}")
+    return os.path.join(cache_base, versions[0])
+
+
+def build_hooks(plugin_root: str) -> dict:
+    return {
+        "UserPromptSubmit": [
+            {
+                "hooks": [
+                    {
+                        "type": "command",
+                        "command": f'python3 "{plugin_root}/scripts/recall.py"',
+                        "timeout": 12,
+                    }
+                ]
+            }
+        ],
+        "Stop": [
+            {
+                "hooks": [
+                    {
+                        "type": "command",
+                        "command": f'python3 "{plugin_root}/scripts/retain.py"',
+                        "timeout": 15,
+                        "async": True,
+                    }
+                ]
+            }
+        ],
+        "SessionStart": [
+            {
+                "hooks": [
+                    {
+                        "type": "command",
+                        "command": f'python3 "{plugin_root}/scripts/session_start.py"',
+                        "timeout": 5,
+                    }
+                ]
+            }
+        ],
+        "SessionEnd": [
+            {
+                "hooks": [
+                    {
+                        "type": "command",
+                        "command": f'python3 "{plugin_root}/scripts/session_end.py"',
+                        "timeout": 10,
+                    }
+                ]
+            }
+        ],
+    }
+
+
+def main():
+    try:
+        plugin_root = find_plugin_root()
+    except RuntimeError as e:
+        print(f"Error: {e}", file=sys.stderr)
+        sys.exit(1)
+
+    if not os.path.isfile(SETTINGS_PATH):
+        print(f"Error: {SETTINGS_PATH} not found. Is Claude Code installed?", file=sys.stderr)
+        sys.exit(1)
+
+    with open(SETTINGS_PATH) as f:
+        settings = json.load(f)
+
+    existing_hooks = settings.get("hooks", {})
+    if existing_hooks:
+        print("Existing hooks found — merging (hindsight-memory hooks take precedence).")
+
+    new_hooks = build_hooks(plugin_root)
+    merged = {**existing_hooks, **new_hooks}
+    settings["hooks"] = merged
+    settings.setdefault("env", {})["CLAUDE_PLUGIN_ROOT"] = plugin_root
+
+    with open(SETTINGS_PATH, "w") as f:
+        json.dump(settings, f, indent=2)
+
+    print(f"hindsight-memory hooks registered successfully.")
+    print(f"Plugin root: {plugin_root}")
+    print(f"Restart Claude Code for changes to take effect.")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/hindsight-integrations/claude-code/skills/setup.md b/hindsight-integrations/claude-code/skills/setup.md
new file mode 100644
index 000000000..d36f926e4
--- /dev/null
+++ b/hindsight-integrations/claude-code/skills/setup.md
@@ -0,0 +1,24 @@
+---
+name: hindsight:setup
+description: Register hindsight-memory hooks into Claude Code settings. Run this once after installing the plugin.
+---
+
+Register the hindsight-memory hooks into `~/.claude/settings.json` by running the setup script:
+
+```bash
+python3 "$CLAUDE_PLUGIN_ROOT/scripts/setup_hooks.py"
+```
+
+If `CLAUDE_PLUGIN_ROOT` is not set, find the path manually:
+
+```bash
+ls ~/.claude/plugins/cache/hindsight/hindsight-memory/
+```
+
+Then run:
+
+```bash
+python3 ~/.claude/plugins/cache/hindsight/hindsight-memory/<version>/scripts/setup_hooks.py
+```
+
+After the script completes, restart Claude Code for the hooks to take effect. You should see `[Hindsight]` log lines on the next session start.