diff --git a/.config/hooks/post-checkout b/.config/hooks/post-checkout
index 660157cd2..5670de725 100755
--- a/.config/hooks/post-checkout
+++ b/.config/hooks/post-checkout
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# pql: source .pql/hooks/post-checkout
+_pql_hook="$(git rev-parse --show-toplevel)/.pql/hooks/post-checkout"; [ -f "$_pql_hook" ] && . "$_pql_hook"
 # Post-checkout hook. Folds in pql's planning logic (its .pql/hooks installer is
 # dead under core.hooksPath=.config/hooks).
 #
diff --git a/.config/hooks/post-merge b/.config/hooks/post-merge
index f2602044f..51ba2301b 100755
--- a/.config/hooks/post-merge
+++ b/.config/hooks/post-merge
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# pql: source .pql/hooks/post-merge
+_pql_hook="$(git rev-parse --show-toplevel)/.pql/hooks/post-merge"; [ -f "$_pql_hook" ] && . "$_pql_hook"
 # Post-merge hook (also fires after `git pull`). Folds in pql's planning logic;
 # pql's own .pql/hooks installer is dead under core.hooksPath=.config/hooks.
 #
diff --git a/.config/hooks/post-rewrite b/.config/hooks/post-rewrite
index d39a7780e..c17ab89cb 100755
--- a/.config/hooks/post-rewrite
+++ b/.config/hooks/post-rewrite
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# pql: source .pql/hooks/post-rewrite
+_pql_hook="$(git rev-parse --show-toplevel)/.pql/hooks/post-rewrite"; [ -f "$_pql_hook" ] && . "$_pql_hook"
 # Post-rewrite hook (fires after `git rebase` / `git commit --amend`). Folds in
 # pql's planning logic; its .pql/hooks installer is dead under
 # core.hooksPath=.config/hooks.
diff --git a/.config/hooks/pre-commit b/.config/hooks/pre-commit
index c5564d17a..199ffc318 100755
--- a/.config/hooks/pre-commit
+++ b/.config/hooks/pre-commit
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# pql: source .pql/hooks/pre-commit
+_pql_hook="$(git rev-parse --show-toplevel)/.pql/hooks/pre-commit"; [ -f "$_pql_hook" ] && . "$_pql_hook"
 # Pre-commit hook dispatcher. Runs modular checks from tooling/.
 # Installed via: git config core.hooksPath .config/hooks
 set -euo pipefail
diff --git a/.gitattributes b/.gitattributes
index e2f87f6dc..bb4c85a7a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 .pql/changelog/**/*.sql merge=union
+.pql/changelog/*.sql merge=union
diff --git a/.gitignore b/.gitignore
index 8a12ad5e0..880da2ce0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,3 +126,5 @@ client/settings.db-shm
 client/settings.db-wal
 
 .claude/settings.local.json
+.pql/*
+!.pql/changelog/