diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index ac01356b..76491c24 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -57,12 +57,14 @@ COPY npm/global.json /tmp/npm-global.json
 RUN CLAUDE_CODE_VERSION=$(node -pe "require('/tmp/npm-global.json').dependencies['@anthropic-ai/claude-code'].version") \
  && CODEX_VERSION=$(node -pe "require('/tmp/npm-global.json').dependencies['@openai/codex'].version") \
  && VERCEL_VERSION=$(node -pe "require('/tmp/npm-global.json').dependencies['vercel'].version") \
+ && GEMINI_CLI_VERSION=$(node -pe "require('/tmp/npm-global.json').dependencies['@google/gemini-cli'].version") \
  && npm install -g eslint \
     typescript \
     typescript-language-server \
     @anthropic-ai/claude-code@${CLAUDE_CODE_VERSION} \
     @openai/codex@${CODEX_VERSION} \
-    vercel@${VERCEL_VERSION}
+    vercel@${VERCEL_VERSION} \
+    @google/gemini-cli@${GEMINI_CLI_VERSION}
 
 USER vscode
 RUN bash -lc "cargo install similarity-ts" || true \
diff --git a/.devcontainer/claude-settings.local.json b/.devcontainer/claude-settings.local.json
index acd0a902..6e69b492 100644
--- a/.devcontainer/claude-settings.local.json
+++ b/.devcontainer/claude-settings.local.json
@@ -329,7 +329,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "python3 .claude/hooks/block_git_no_verify.py"
+            "command": "python3 /home/vscode/.claude/hooks/block_git_no_verify.py"
           }
         ]
       },
@@ -338,7 +338,27 @@
         "hooks": [
           {
             "type": "command",
-            "command": "python3 .claude/hooks/pre_git_quality_gates.py"
+            "command": "python3 /home/vscode/.claude/hooks/pre_git_quality_gates.py"
+          }
+        ]
+      },
+      {
+        "matcher": "tool_name == 'ExitPlanMode'",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "python3 /home/vscode/.claude/hooks/pre_exit_plan_ai_review.py"
+          }
+        ]
+      }
+    ],
+    "PostToolUse": [
+      {
+        "matcher": "tool_name == 'Bash'",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "python3 /home/vscode/.claude/hooks/post_pr_ai_review.py"
           }
         ]
       }
diff --git a/npm/global.json b/npm/global.json
index 86ea3352..f9090157 100644
--- a/npm/global.json
+++ b/npm/global.json
@@ -25,6 +25,10 @@
       "version": "0.88.0",
       "overridden": false
     },
+    "@google/gemini-cli": {
+      "version": "0.25.0",
+      "overridden": false
+    },
     "bash-language-server": {
       "version": "5.6.0",
       "overridden": false