diff --git a/README.md b/README.md
index 565ebc3..6b35185 100644
--- a/README.md
+++ b/README.md
@@ -116,12 +116,12 @@ Just ask Claude naturally:
 ## Available Tools
 
 **Quick Tool Selection Guide:**
+- **Need a thinking partner?** → `chat` (brainstorm ideas, get second opinions, validate approaches)
 - **Need deeper thinking?** → `think_deeper` (extends Claude's analysis, finds edge cases)
 - **Code needs review?** → `review_code` (bugs, security, performance issues)
 - **Pre-commit validation?** → `review_pending_changes` (validate git changes before committing)
 - **Something's broken?** → `debug_issue` (root cause analysis, error tracing)
 - **Want to understand code?** → `analyze` (architecture, patterns, dependencies)
-- **Need a thinking partner?** → `chat` (brainstorm ideas, get second opinions, validate approaches)
 - **Check models?** → `list_models` (see available Gemini models)
 - **Server info?** → `get_version` (version and configuration details)
 
diff --git a/config.py b/config.py
index 5794fd3..29521fe 100644
--- a/config.py
+++ b/config.py
@@ -21,6 +21,23 @@ TEMPERATURE_CREATIVE = 0.7  # For architecture, deep thinking
 
 # Tool trigger phrases for natural language matching
 TOOL_TRIGGERS = {
+    "chat": [
+        "chat with gemini",
+        "ask gemini",
+        "brainstorm",
+        "discuss",
+        "get gemini's opinion",
+        "talk to gemini",
+        "gemini's thoughts",
+        "collaborate with gemini",
+        "second opinion",
+        "what does gemini think",
+        "bounce ideas",
+        "thinking partner",
+        "explain",
+        "help me understand",
+        "clarify",
+    ],
     "think_deeper": [
         "think deeper",
         "ultrathink",
@@ -32,6 +49,11 @@ TOOL_TRIGGERS = {
         "extended thinking",
         "validate my approach",
         "find edge cases",
+        "gemini think deeper",
+        "deeper analysis",
+        "extend thinking",
+        "critical thinking",
+        "comprehensive analysis",
     ],
     "review_code": [
         "review",
@@ -44,6 +66,11 @@ TOOL_TRIGGERS = {
         "check this code",
         "review for",
         "find vulnerabilities",
+        "review my code",
+        "code problems",
+        "code issues",
+        "find security issues",
+        "performance review",
     ],
     "debug_issue": [
         "debug",
@@ -56,6 +83,13 @@ TOOL_TRIGGERS = {
         "diagnose",
         "troubleshoot",
         "investigate this error",
+        "stack trace",
+        "exception",
+        "crashed",
+        "broken",
+        "fix this error",
+        "debug this",
+        "what's wrong",
     ],
     "analyze": [
         "analyze",
@@ -66,6 +100,13 @@ TOOL_TRIGGERS = {
         "understand",
         "analyze file",
         "analyze these files",
+        "what does this do",
+        "how does this work",
+        "explain this code",
+        "architecture analysis",
+        "code structure",
+        "dependencies",
+        "analyze directory",
     ],
     "review_pending_changes": [
         "review pending changes",
@@ -83,5 +124,10 @@ TOOL_TRIGGERS = {
         "pre-commit",
         "before I commit",
         "should I commit",
+        "commit ready",
+        "review diff",
+        "check diff",
+        "validate implementation",
+        "review my work",
     ],
 }