4 files changed, 24 insertions, 0 deletions
diff --git a/Omni/Ide/hooks/post-checkout b/Omni/Ide/hooks/post-checkout
index 85541a2..3fe14b5 100755
--- a/Omni/Ide/hooks/post-checkout
+++ b/Omni/Ide/hooks/post-checkout
@@ -14,6 +14,12 @@ elif [[ ${#changed[@]} -gt 0 ]]
 then
     MakeTags "${changed[@]}"
 fi
+
+# Task manager: Import tasks after branch switch
+if [ -f .tasks/tasks.jsonl ]; then
+    task import -i .tasks/tasks.jsonl 2>/dev/null || true
+fi
+
 ## START BRANCHLESS CONFIG
 
 git branchless hook post-checkout "$@"
diff --git a/Omni/Ide/hooks/post-merge b/Omni/Ide/hooks/post-merge
index fcfd314..3e0495b 100755
--- a/Omni/Ide/hooks/post-merge
+++ b/Omni/Ide/hooks/post-merge
@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
 "${CODEROOT:?}"/Omni/Ide/hooks/post-checkout 'HEAD@{1}' HEAD
+
+# Task manager: Import tasks after git pull/merge
+if [ -f .tasks/tasks.jsonl ]; then
+    task import -i .tasks/tasks.jsonl 2>/dev/null || true
+fi
+
 ## START BRANCHLESS CONFIG
 
 git branchless hook post-merge "$@"
diff --git a/Omni/Ide/hooks/pre-commit b/Omni/Ide/hooks/pre-commit
index 06f1716..d096f5b 100755
--- a/Omni/Ide/hooks/pre-commit
+++ b/Omni/Ide/hooks/pre-commit
@@ -18,4 +18,10 @@
     fi
   done
   lint "${changed[@]}"
+
+  # Task manager: Export tasks before commit
+  if [ -d .tasks ]; then
+      task export --flush 2>/dev/null || true
+      git add .tasks/tasks.jsonl 2>/dev/null || true
+  fi
 ##
diff --git a/Omni/Ide/hooks/pre-push b/Omni/Ide/hooks/pre-push
index 00110bd..adbf858 100755
--- a/Omni/Ide/hooks/pre-push
+++ b/Omni/Ide/hooks/pre-push
@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
 set -euo pipefail
+
+# Task manager: Ensure tasks are exported before push
+if [ -d .tasks ]; then
+    task export --flush 2>/dev/null || true
+fi
+
 remote="$1"
 z40=0000000000000000000000000000000000000000
 IFS=" "