@contextstream/mcp-server 0.4.58 → 0.4.60

package/dist/hooks/auto-rules.js

@@ -925,7 +925,7 @@ def main():
     if tool == "Glob":
         pattern = inp.get("pattern", "")
         if is_discovery_glob(pattern):
-            print(f"STOP: Use mcp__contextstream__search(mode=\\"hybrid\\", query=\\"{pattern}\\") instead of Glob.", file=sys.stderr)
+            print(f"STOP: Use mcp__contextstream__search(mode=\\"auto\\", query=\\"{pattern}\\") instead of Glob.", file=sys.stderr)
             sys.exit(2)
 
     elif tool == "Grep" or tool == "Search":
@@ -937,12 +937,12 @@ def main():
                 # Specific file - suggest Read instead
                 print(f"STOP: Use Read(\\"{path}\\") to view file content, or mcp__contextstream__search(mode=\\"keyword\\", query=\\"{pattern}\\") for codebase search.", file=sys.stderr)
             else:
-                print(f"STOP: Use mcp__contextstream__search(mode=\\"hybrid\\", query=\\"{pattern}\\") instead of {tool}.", file=sys.stderr)
+                print(f"STOP: Use mcp__contextstream__search(mode=\\"auto\\", query=\\"{pattern}\\") instead of {tool}.", file=sys.stderr)
             sys.exit(2)
 
     elif tool == "Task":
         if inp.get("subagent_type", "").lower() == "explore":
-            print("STOP: Use mcp__contextstream__search(mode=\\"hybrid\\") instead of Task(Explore).", file=sys.stderr)
+            print("STOP: Use mcp__contextstream__search(mode=\\"auto\\") instead of Task(Explore).", file=sys.stderr)
             sys.exit(2)
         if inp.get("subagent_type", "").lower() == "plan":
             print("STOP: Use mcp__contextstream__session(action=\\"capture_plan\\") for planning. ContextStream plans persist across sessions.", file=sys.stderr)
@@ -969,7 +969,7 @@ import os
 ENABLED = os.environ.get("CONTEXTSTREAM_REMINDER_ENABLED", "true").lower() == "true"
 
 REMINDER = """[CONTEXTSTREAM RULES]
-1. BEFORE Glob/Grep/Read/Search: mcp__contextstream__search(mode="hybrid") FIRST
+1. BEFORE Glob/Grep/Read/Search: mcp__contextstream__search(mode="auto") FIRST
 2. Call context_smart at start of EVERY response
 3. Local tools ONLY if ContextStream returns 0 results
 [END RULES]"""
@@ -1405,7 +1405,7 @@ def main():
         pattern = params.get("path", "") or params.get("regex", "")
         if is_discovery_glob(pattern) or is_discovery_grep(pattern):
             output_block(
-                f"Use mcp__contextstream__search(mode=\\"hybrid\\", query=\\"{pattern}\\") instead of {tool}. "
+                f"Use mcp__contextstream__search(mode=\\"auto\\", query=\\"{pattern}\\") instead of {tool}. "
                 "ContextStream search is indexed and faster. Only use local tools if ContextStream returns 0 results.",
                 "[CONTEXTSTREAM] Use ContextStream search for code discovery."
             )
@@ -1432,7 +1432,7 @@ import os
 ENABLED = os.environ.get("CONTEXTSTREAM_REMINDER_ENABLED", "true").lower() == "true"
 
 REMINDER = """[CONTEXTSTREAM RULES]
-1. BEFORE list_files/search_files/read_file: mcp__contextstream__search(mode="hybrid") FIRST
+1. BEFORE list_files/search_files/read_file: mcp__contextstream__search(mode="auto") FIRST
 2. Call context_smart at start of EVERY response
 3. Local tools ONLY if ContextStream returns 0 results
 [END RULES]"""
@@ -1583,7 +1583,7 @@ def main():
         pattern = params.get("pattern", "") or params.get("path", "")
         if is_discovery_glob(pattern):
             output_deny(
-                f"Use mcp__contextstream__search(mode=\\"hybrid\\", query=\\"{pattern}\\") instead of {tool}. "
+                f"Use mcp__contextstream__search(mode=\\"auto\\", query=\\"{pattern}\\") instead of {tool}. "
                 "ContextStream search is indexed and faster."
             )
 

package/dist/hooks/pre-tool-use.js

@@ -173,7 +173,7 @@ async function runPreToolUseHook() {
     fs.appendFileSync(DEBUG_FILE, `[PreToolUse] Glob pattern=${pattern}, isDiscovery=${isDiscoveryGlob(pattern)}
 `);
     if (isDiscoveryGlob(pattern)) {
-      const msg = `STOP: Use mcp__contextstream__search(mode="hybrid", query="${pattern}") instead of Glob.`;
+      const msg = `STOP: Use mcp__contextstream__search(mode="auto", query="${pattern}") instead of Glob.`;
       fs.appendFileSync(DEBUG_FILE, `[PreToolUse] Intercepting discovery glob: ${msg}
 `);
       if (editorFormat === "cline") {
@@ -196,7 +196,7 @@ async function runPreToolUseHook() {
         }
         blockClaudeCode(msg);
       } else {
-        const msg = `STOP: Use mcp__contextstream__search(mode="hybrid", query="${pattern}") instead of ${tool}.`;
+        const msg = `STOP: Use mcp__contextstream__search(mode="auto", query="${pattern}") instead of ${tool}.`;
         if (editorFormat === "cline") {
           outputClineBlock(msg, "[CONTEXTSTREAM] Use ContextStream search for code discovery.");
         } else if (editorFormat === "cursor") {
@@ -208,7 +208,7 @@ async function runPreToolUseHook() {
   } else if (tool === "Task") {
     const subagentType = toolInput?.subagent_type?.toLowerCase() || "";
     if (subagentType === "explore") {
-      const msg = 'STOP: Use mcp__contextstream__search(mode="hybrid") instead of Task(Explore).';
+      const msg = 'STOP: Use mcp__contextstream__search(mode="auto") instead of Task(Explore).';
       if (editorFormat === "cline") {
         outputClineBlock(msg, "[CONTEXTSTREAM] Use ContextStream search for code discovery.");
       } else if (editorFormat === "cursor") {
@@ -237,7 +237,7 @@ async function runPreToolUseHook() {
   if (tool === "list_files" || tool === "search_files") {
     const pattern = toolInput?.path || toolInput?.regex || "";
     if (isDiscoveryGlob(pattern) || isDiscoveryGrep(pattern)) {
-      const msg = `Use mcp__contextstream__search(mode="hybrid", query="${pattern}") instead of ${tool}. ContextStream search is indexed and faster.`;
+      const msg = `Use mcp__contextstream__search(mode="auto", query="${pattern}") instead of ${tool}. ContextStream search is indexed and faster.`;
       if (editorFormat === "cline") {
         outputClineBlock(msg, "[CONTEXTSTREAM] Use ContextStream search for code discovery.");
       } else if (editorFormat === "cursor") {

package/dist/hooks/runner.js

@@ -181,7 +181,7 @@ async function runPreToolUseHook() {
     fs.appendFileSync(DEBUG_FILE, `[PreToolUse] Glob pattern=${pattern}, isDiscovery=${isDiscoveryGlob(pattern)}
 `);
     if (isDiscoveryGlob(pattern)) {
-      const msg = `STOP: Use mcp__contextstream__search(mode="hybrid", query="${pattern}") instead of Glob.`;
+      const msg = `STOP: Use mcp__contextstream__search(mode="auto", query="${pattern}") instead of Glob.`;
       fs.appendFileSync(DEBUG_FILE, `[PreToolUse] Intercepting discovery glob: ${msg}
 `);
       if (editorFormat === "cline") {
@@ -204,7 +204,7 @@ async function runPreToolUseHook() {
         }
         blockClaudeCode(msg);
       } else {
-        const msg = `STOP: Use mcp__contextstream__search(mode="hybrid", query="${pattern}") instead of ${tool}.`;
+        const msg = `STOP: Use mcp__contextstream__search(mode="auto", query="${pattern}") instead of ${tool}.`;
         if (editorFormat === "cline") {
           outputClineBlock(msg, "[CONTEXTSTREAM] Use ContextStream search for code discovery.");
         } else if (editorFormat === "cursor") {
@@ -216,7 +216,7 @@ async function runPreToolUseHook() {
   } else if (tool === "Task") {
     const subagentType = toolInput?.subagent_type?.toLowerCase() || "";
     if (subagentType === "explore") {
-      const msg = 'STOP: Use mcp__contextstream__search(mode="hybrid") instead of Task(Explore).';
+      const msg = 'STOP: Use mcp__contextstream__search(mode="auto") instead of Task(Explore).';
       if (editorFormat === "cline") {
         outputClineBlock(msg, "[CONTEXTSTREAM] Use ContextStream search for code discovery.");
       } else if (editorFormat === "cursor") {
@@ -245,7 +245,7 @@ async function runPreToolUseHook() {
   if (tool === "list_files" || tool === "search_files") {
     const pattern = toolInput?.path || toolInput?.regex || "";
     if (isDiscoveryGlob(pattern) || isDiscoveryGrep(pattern)) {
-      const msg = `Use mcp__contextstream__search(mode="hybrid", query="${pattern}") instead of ${tool}. ContextStream search is indexed and faster.`;
+      const msg = `Use mcp__contextstream__search(mode="auto", query="${pattern}") instead of ${tool}. ContextStream search is indexed and faster.`;
       if (editorFormat === "cline") {
         outputClineBlock(msg, "[CONTEXTSTREAM] Use ContextStream search for code discovery.");
       } else if (editorFormat === "cursor") {
@@ -677,6 +677,34 @@ async function saveLastExchange(exchange, cwd, clientName) {
   } catch {
   }
 }
+async function fetchHookContext() {
+  if (!API_KEY) return null;
+  try {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), 2e3);
+    const url = `${API_URL}/api/v1/context/hook`;
+    const body = {};
+    if (WORKSPACE_ID) body.workspace_id = WORKSPACE_ID;
+    if (PROJECT_ID) body.project_id = PROJECT_ID;
+    const response = await fetch(url, {
+      method: "POST",
+      headers: {
+        "X-API-Key": API_KEY,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(body),
+      signal: controller.signal
+    });
+    clearTimeout(timeoutId);
+    if (response.ok) {
+      const data = await response.json();
+      return data?.data?.context || null;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
 async function fetchSessionContext() {
   if (!API_KEY) return null;
   try {
@@ -755,26 +783,6 @@ function transformSmartContextResponse(data) {
     return null;
   }
 }
-function buildClaudeReminder(ctx, versionNotice) {
-  const parts = [];
-  if (versionNotice?.behind) {
-    const versionInfo = getVersionNoticeForHook(versionNotice);
-    if (versionInfo) {
-      parts.push(versionInfo);
-      parts.push("");
-    }
-  }
-  const highImportancePrefs = ctx?.preferences?.filter((p) => p.importance === "high") || [];
-  if (highImportancePrefs.length > 0) {
-    parts.push(`[USER PREFERENCES - Always respect these]`);
-    for (const pref of highImportancePrefs.slice(0, 5)) {
-      parts.push(`\u2022 ${pref.title}: ${pref.content}`);
-    }
-    parts.push("");
-  }
-  parts.push(REMINDER);
-  return parts.join("\n");
-}
 function buildEnhancedReminder(ctx, isNewSession2, versionNotice) {
   const parts = [ENHANCED_REMINDER_HEADER];
   if (versionNotice?.behind) {
@@ -792,7 +800,7 @@ function buildEnhancedReminder(ctx, isNewSession2, versionNotice) {
 2. Wait for indexing: if \`init\` returns \`indexing_status: "started"\`, files are being indexed
 3. Generate a unique session_id (e.g., "session-" + timestamp or UUID) - use this for ALL context() calls
 4. Call \`context(user_message="...", save_exchange=true, session_id="<your-session-id>")\` for task-specific context
-5. Use \`search(mode="hybrid")\` for code discovery (not Glob/Grep/Read)
+5. Use \`search(mode="auto")\` for code discovery (not Glob/Grep/Read)
 
 `);
   }
@@ -833,7 +841,7 @@ function buildEnhancedReminder(ctx, isNewSession2, versionNotice) {
     parts.push("");
   }
   parts.push("---\n");
-  parts.push(REMINDER);
+  parts.push(FULL_REMINDER);
   parts.push(`
 
 ---
@@ -850,7 +858,7 @@ Returns: \`indexed\` (true/false), \`last_indexed_at\`, \`file_count\`
 ### \u{1F50D} Search Decision Tree:
 
 **IF indexed=true AND last_indexed_at is recent:**
-\u2192 Use \`search(mode="hybrid", query="...")\`
+\u2192 Use \`search(mode="auto", query="...")\`
 
 **IF indexed=false OR last_indexed_at is stale (>7 days):**
 \u2192 Use local tools (Glob/Grep/Read) directly
@@ -921,61 +929,58 @@ async function runUserPromptSubmitHook() {
   }
   const editorFormat = detectEditorFormat2(input);
   const cwd = input.cwd || process.cwd();
-  loadConfigFromMcpJson(cwd);
-  const versionNoticePromise = getUpdateNotice();
-  const lastExchange = extractLastExchange(input, editorFormat);
-  const clientName = editorFormat === "claude" ? "claude-code" : editorFormat;
-  const saveExchangePromise = lastExchange ? saveLastExchange(lastExchange, cwd, clientName) : Promise.resolve();
   if (editorFormat === "claude") {
-    saveExchangePromise.catch(() => {
-    });
-    const [ctx, versionNotice] = await Promise.all([fetchSessionContext(), versionNoticePromise]);
-    const claudeReminder = buildClaudeReminder(ctx, versionNotice);
+    loadConfigFromMcpJson(cwd);
+    let context = REMINDER;
+    if (API_KEY) {
+      try {
+        const hookContext = await fetchHookContext();
+        if (hookContext) {
+          context = hookContext;
+        }
+      } catch {
+      }
+    }
     console.log(
       JSON.stringify({
         hookSpecificOutput: {
           hookEventName: "UserPromptSubmit",
-          additionalContext: claudeReminder
+          additionalContext: context
         }
       })
     );
-  } else if (editorFormat === "cline") {
-    const newSession = isNewSession(input, editorFormat);
-    const [ctx, versionNotice] = await Promise.all([fetchSessionContext(), versionNoticePromise, saveExchangePromise]);
-    const enhancedReminder = buildEnhancedReminder(ctx, newSession, versionNotice);
-    console.log(
-      JSON.stringify({
-        cancel: false,
-        contextModification: enhancedReminder
-      })
-    );
-  } else if (editorFormat === "cursor") {
+  } else {
+    loadConfigFromMcpJson(cwd);
+    const versionNoticePromise = getUpdateNotice();
+    const lastExchange = extractLastExchange(input, editorFormat);
+    const clientName = editorFormat;
+    const saveExchangePromise = lastExchange ? saveLastExchange(lastExchange, cwd, clientName) : Promise.resolve();
     const newSession = isNewSession(input, editorFormat);
     const [ctx, versionNotice] = await Promise.all([fetchSessionContext(), versionNoticePromise, saveExchangePromise]);
-    let cursorReminder = ctx?.lessons?.length ? `[CONTEXTSTREAM] \u26A0\uFE0F ${ctx.lessons.length} lessons from past mistakes. Call context(save_exchange=true, session_id="...") FIRST. Use search(mode="hybrid") before Glob/Grep. After file edits: project(action="index").` : `[CONTEXTSTREAM] Call context(save_exchange=true, session_id="...") FIRST. Use search(mode="hybrid") before Glob/Grep/Read. After file edits: project(action="index").`;
-    if (versionNotice?.behind) {
-      cursorReminder += ` [UPDATE v${versionNotice.current}\u2192${versionNotice.latest}]`;
+    if (editorFormat === "cursor") {
+      let cursorReminder = ctx?.lessons?.length ? `[CONTEXTSTREAM] \u26A0\uFE0F ${ctx.lessons.length} lessons from past mistakes. Call context(save_exchange=true, session_id="...") FIRST. Use search(mode="auto") before Glob/Grep. After file edits: project(action="index").` : `[CONTEXTSTREAM] Call context(save_exchange=true, session_id="...") FIRST. Use search(mode="auto") before Glob/Grep/Read. After file edits: project(action="index").`;
+      if (versionNotice?.behind) {
+        cursorReminder += ` [UPDATE v${versionNotice.current}\u2192${versionNotice.latest}]`;
+      }
+      console.log(
+        JSON.stringify({
+          continue: true,
+          user_message: cursorReminder
+        })
+      );
+    } else {
+      const enhancedReminder = buildEnhancedReminder(ctx, newSession, versionNotice);
+      console.log(
+        JSON.stringify({
+          cancel: false,
+          contextModification: enhancedReminder
+        })
+      );
     }
-    console.log(
-      JSON.stringify({
-        continue: true,
-        user_message: cursorReminder
-      })
-    );
-  } else if (editorFormat === "antigravity") {
-    const newSession = isNewSession(input, editorFormat);
-    const [ctx, versionNotice] = await Promise.all([fetchSessionContext(), versionNoticePromise, saveExchangePromise]);
-    const enhancedReminder = buildEnhancedReminder(ctx, newSession, versionNotice);
-    console.log(
-      JSON.stringify({
-        cancel: false,
-        contextModification: enhancedReminder
-      })
-    );
   }
   process.exit(0);
 }
-var ENABLED2, API_URL, API_KEY, WORKSPACE_ID, PROJECT_ID, REMINDER, ENHANCED_REMINDER_HEADER, isDirectRun2;
+var ENABLED2, API_URL, API_KEY, WORKSPACE_ID, PROJECT_ID, REMINDER, FULL_REMINDER, ENHANCED_REMINDER_HEADER, isDirectRun2;
 var init_user_prompt_submit = __esm({
   "src/hooks/user-prompt-submit.ts"() {
     "use strict";
@@ -985,7 +990,9 @@ var init_user_prompt_submit = __esm({
     API_KEY = process.env.CONTEXTSTREAM_API_KEY || "";
     WORKSPACE_ID = null;
     PROJECT_ID = null;
-    REMINDER = `[CONTEXTSTREAM RULES - MANDATORY]
+    REMINDER = `[CONTEXTSTREAM] Call mcp__contextstream__context(user_message="...", save_exchange=true, session_id="<session-id>") FIRST before any other tool. Response contains dynamic rules, lessons, preferences. For search: use search(mode="auto") if indexed, else local tools.
+[END]`;
+    FULL_REMINDER = `[CONTEXTSTREAM RULES - MANDATORY]
 
 1. FIRST: Call mcp__contextstream__context(user_message="...", save_exchange=true, session_id="<session-id>") before ANY other tool
    - Returns: dynamic rules, lessons from past mistakes, relevant context
@@ -995,7 +1002,7 @@ var init_user_prompt_submit = __esm({
 
 2. FOR CODE SEARCH: Check index status, then search appropriately
    \u26A0\uFE0F BEFORE searching: mcp__contextstream__project(action="index_status")
-   \u2705 IF indexed & fresh: Use mcp__contextstream__search(mode="hybrid", query="...")
+   \u2705 IF indexed & fresh: Use mcp__contextstream__search(mode="auto", query="...")
    \u2705 IF NOT indexed OR stale: Use local tools (Glob/Grep/Read) directly
    \u2705 IF search returns 0 results: Fallback to local tools (Glob/Grep/Read)
 
@@ -2726,7 +2733,7 @@ def main():
     if tool == "Glob":
         pattern = inp.get("pattern", "")
         if is_discovery_glob(pattern):
-            print(f"STOP: Use mcp__contextstream__search(mode=\\"hybrid\\", query=\\"{pattern}\\") instead of Glob.", file=sys.stderr)
+            print(f"STOP: Use mcp__contextstream__search(mode=\\"auto\\", query=\\"{pattern}\\") instead of Glob.", file=sys.stderr)
             sys.exit(2)
 
     elif tool == "Grep" or tool == "Search":
@@ -2738,12 +2745,12 @@ def main():
                 # Specific file - suggest Read instead
                 print(f"STOP: Use Read(\\"{path}\\") to view file content, or mcp__contextstream__search(mode=\\"keyword\\", query=\\"{pattern}\\") for codebase search.", file=sys.stderr)
             else:
-                print(f"STOP: Use mcp__contextstream__search(mode=\\"hybrid\\", query=\\"{pattern}\\") instead of {tool}.", file=sys.stderr)
+                print(f"STOP: Use mcp__contextstream__search(mode=\\"auto\\", query=\\"{pattern}\\") instead of {tool}.", file=sys.stderr)
             sys.exit(2)
 
     elif tool == "Task":
         if inp.get("subagent_type", "").lower() == "explore":
-            print("STOP: Use mcp__contextstream__search(mode=\\"hybrid\\") instead of Task(Explore).", file=sys.stderr)
+            print("STOP: Use mcp__contextstream__search(mode=\\"auto\\") instead of Task(Explore).", file=sys.stderr)
             sys.exit(2)
         if inp.get("subagent_type", "").lower() == "plan":
             print("STOP: Use mcp__contextstream__session(action=\\"capture_plan\\") for planning. ContextStream plans persist across sessions.", file=sys.stderr)
@@ -2770,7 +2777,7 @@ import os
 ENABLED = os.environ.get("CONTEXTSTREAM_REMINDER_ENABLED", "true").lower() == "true"
 
 REMINDER = """[CONTEXTSTREAM RULES]
-1. BEFORE Glob/Grep/Read/Search: mcp__contextstream__search(mode="hybrid") FIRST
+1. BEFORE Glob/Grep/Read/Search: mcp__contextstream__search(mode="auto") FIRST
 2. Call context_smart at start of EVERY response
 3. Local tools ONLY if ContextStream returns 0 results
 [END RULES]"""
@@ -3206,7 +3213,7 @@ def main():
         pattern = params.get("path", "") or params.get("regex", "")
         if is_discovery_glob(pattern) or is_discovery_grep(pattern):
             output_block(
-                f"Use mcp__contextstream__search(mode=\\"hybrid\\", query=\\"{pattern}\\") instead of {tool}. "
+                f"Use mcp__contextstream__search(mode=\\"auto\\", query=\\"{pattern}\\") instead of {tool}. "
                 "ContextStream search is indexed and faster. Only use local tools if ContextStream returns 0 results.",
                 "[CONTEXTSTREAM] Use ContextStream search for code discovery."
             )
@@ -3233,7 +3240,7 @@ import os
 ENABLED = os.environ.get("CONTEXTSTREAM_REMINDER_ENABLED", "true").lower() == "true"
 
 REMINDER = """[CONTEXTSTREAM RULES]
-1. BEFORE list_files/search_files/read_file: mcp__contextstream__search(mode="hybrid") FIRST
+1. BEFORE list_files/search_files/read_file: mcp__contextstream__search(mode="auto") FIRST
 2. Call context_smart at start of EVERY response
 3. Local tools ONLY if ContextStream returns 0 results
 [END RULES]"""
@@ -3384,7 +3391,7 @@ def main():
         pattern = params.get("pattern", "") or params.get("path", "")
         if is_discovery_glob(pattern):
             output_deny(
-                f"Use mcp__contextstream__search(mode=\\"hybrid\\", query=\\"{pattern}\\") instead of {tool}. "
+                f"Use mcp__contextstream__search(mode=\\"auto\\", query=\\"{pattern}\\") instead of {tool}. "
                 "ContextStream search is indexed and faster."
             )
 

package/dist/hooks/session-init.js

@@ -344,7 +344,7 @@ var CONTEXTSTREAM_TOOL_NAMES = [
   "generate_rules",
   // Consolidated domain tools (v0.4.x default)
   "search",
-  // Modes: semantic, hybrid, keyword, pattern
+  // Modes: auto (recommended), semantic, hybrid (legacy alias), keyword, pattern
   "session",
   // Actions: capture, capture_lesson, get_lessons, recall, remember, user_context, summary, compress, delta, smart_search, decision_trace
   "memory",
@@ -373,7 +373,7 @@ var CONTEXTSTREAM_RULES_BOOTSTRAP = `
 |---------|----------|
 | **1st message** | \`init()\` \u2192 \`context(user_message="...")\` |
 | **Every message** | \`context(user_message="...")\` FIRST |
-| **Before file search** | \`search(mode="hybrid")\` BEFORE Glob/Grep/Read |
+| **Before file search** | \`search(mode="auto")\` BEFORE Glob/Grep/Read |
 </contextstream_rules>
 
 **Why?** \`context()\` delivers task-specific rules, lessons from past mistakes, and relevant decisions. Skip it = fly blind.
@@ -396,7 +396,7 @@ var CONTEXTSTREAM_RULES_FULL = `
 | 1st message | \`init()\` \u2192 \`context(user_message="<msg>")\` |
 | **EVERY message after** | \`context(user_message="<msg>")\` **FIRST** |
 
-**BEFORE Glob/Grep/Read/Search:** \u2192 \`search(mode="hybrid")\` FIRST
+**BEFORE Glob/Grep/Read/Search:** \u2192 \`search(mode="auto")\` FIRST
 </contextstream_rules>
 
 **This block MUST appear at the start of EVERY response.** Failing to call \`context()\` means missing rules, lessons, and relevant context.
@@ -448,7 +448,7 @@ var CONTEXTSTREAM_RULES_FULL = `
    - Example: \`[CONTEXTSTREAM RULES] 1. BEFORE Glob/Grep... [END RULES]\`
 
 2. **PreToolUse blocking** - If you try to use Glob/Grep/Search/Explore:
-   - Hook returns error: \`STOP: Use mcp__contextstream__search(mode="hybrid") instead\`
+   - Hook returns error: \`STOP: Use mcp__contextstream__search(mode="auto") instead\`
    - **You MUST use the suggested ContextStream tool instead**
    - Local tools are only allowed if project is not indexed or ContextStream returns 0 results
 
@@ -472,7 +472,7 @@ Set environment variable: \`CONTEXTSTREAM_HOOK_ENABLED=false\`
 
 **BEFORE using Glob, Grep, Search, Read (for discovery), Explore, or ANY local file scanning:**
 \`\`\`
-STOP \u2192 Call search(mode="hybrid", query="...") FIRST
+STOP \u2192 Call search(mode="auto", query="...") FIRST
 \`\`\`
 
 **Note:** PreToolUse hooks block these tools when ContextStream is available.
@@ -481,11 +481,11 @@ STOP \u2192 Call search(mode="hybrid", query="...") FIRST
 \u274C **NEVER DO THIS:**
 - \`Glob("**/*.ts")\` \u2192 Use \`search(mode="pattern", query="*.ts")\` instead
 - \`Grep("functionName")\` \u2192 Use \`search(mode="keyword", query="functionName")\` instead
-- \`Read(file)\` for discovery \u2192 Use \`search(mode="hybrid", query="...")\` instead
-- \`Task(subagent_type="Explore")\` \u2192 Use \`search(mode="hybrid")\` instead
+- \`Read(file)\` for discovery \u2192 Use \`search(mode="auto", query="...")\` instead
+- \`Task(subagent_type="Explore")\` \u2192 Use \`search(mode="auto")\` instead
 
 \u2705 **ALWAYS DO THIS:**
-1. \`search(mode="hybrid", query="what you're looking for")\`
+1. \`search(mode="auto", query="what you're looking for")\`
 2. Only use local tools (Glob/Grep/Read) if ContextStream returns **0 results**
 3. Use Read ONLY for exact file edits after you know the file path
 
@@ -556,7 +556,7 @@ Rules Version: ${RULES_VERSION}
 |---------|----------|
 | **1st message** | \`init()\` \u2192 \`context(user_message="<msg>")\` |
 | **EVERY message after** | \`context(user_message="<msg>")\` **FIRST** |
-| **Before file search** | \`search(mode="hybrid")\` FIRST |
+| **Before file search** | \`search(mode="auto")\` FIRST |
 | **After significant work** | \`session(action="capture", event_type="decision", ...)\` |
 | **User correction** | \`session(action="capture_lesson", ...)\` |
 
@@ -576,7 +576,7 @@ Rules Version: ${RULES_VERSION}
 |------|--------------|
 | **1st message** | \`init(folder_path="...", context_hint="<msg>")\`, then \`context(...)\` |
 | **2nd+ messages** | \`context(user_message="<msg>", format="minified", max_tokens=400)\` |
-| **Code search** | \`search(mode="hybrid", query="...")\` \u2014 BEFORE Glob/Grep/Read |
+| **Code search** | \`search(mode="auto", query="...")\` \u2014 BEFORE Glob/Grep/Read |
 | **After significant work** | \`session(action="capture", event_type="decision", ...)\` |
 | **User correction** | \`session(action="capture_lesson", ...)\` |
 | **\u26A0\uFE0F When warnings received** | **STOP**, acknowledge, explain mitigation, then proceed |
@@ -603,7 +603,7 @@ v0.4.x consolidates ~58 individual tools into ~11 domain tools with action/mode
 
 | Domain | Actions/Modes | Example |
 |--------|---------------|---------|
-| **\`search\`** | mode: semantic, hybrid, keyword, pattern | \`search(mode="hybrid", query="auth implementation", limit=3)\` |
+| **\`search\`** | mode: auto (recommended), semantic, hybrid (legacy alias), keyword, pattern | \`search(mode="auto", query="auth implementation", limit=3)\` |
 | **\`session\`** | action: capture, capture_lesson, get_lessons, recall, remember, user_context, summary, compress, delta, smart_search, decision_trace | \`session(action="capture", event_type="decision", title="Use JWT", content="...")\` |
 | **\`memory\`** | action: create_event, get_event, update_event, delete_event, list_events, distill_event, create_node, get_node, update_node, delete_node, list_nodes, supersede_node, search, decisions, timeline, summary | \`memory(action="list_events", limit=10)\` |
 | **\`graph\`** | action: dependencies, impact, call_path, related, path, decisions, ingest, circular_dependencies, unused_code, contradictions | \`graph(action="impact", symbol_name="AuthService")\` |
@@ -749,7 +749,7 @@ session(action="capture", event_type="session_snapshot", title="Pre-compaction s
 
 ### Search & Code Intelligence (ContextStream-first)
 
-\u26A0\uFE0F **STOP: Before using Search/Glob/Grep/Read/Explore** \u2192 Call \`search(mode="hybrid")\` FIRST. Use local tools ONLY if ContextStream returns 0 results.
+\u26A0\uFE0F **STOP: Before using Search/Glob/Grep/Read/Explore** \u2192 Call \`search(mode="auto")\` FIRST. Use local tools ONLY if ContextStream returns 0 results.
 
 **\u274C WRONG workflow (wastes tokens, slow):**
 \`\`\`
@@ -758,14 +758,14 @@ Grep "function" \u2192 Read file1.ts \u2192 Read file2.ts \u2192 Read file3.ts \
 
 **\u2705 CORRECT workflow (fast, complete):**
 \`\`\`
-search(mode="hybrid", query="function implementation") \u2192 done (results include context)
+search(mode="auto", query="function implementation") \u2192 done (results include context)
 \`\`\`
 
 **Why?** ContextStream search returns semantic matches + context + file locations in ONE call. Local tools require multiple round-trips.
 
 **Search order:**
 1. \`session(action="smart_search", query="...")\` - context-enriched
-2. \`search(mode="hybrid", query="...", limit=3)\` or \`search(mode="keyword", query="<filename>", limit=3)\`
+2. \`search(mode="auto", query="...", limit=3)\` or \`search(mode="keyword", query="<filename>", limit=3)\`
 3. \`project(action="files")\` - file tree/list (only when needed)
 4. \`graph(action="dependencies", ...)\` - code structure
 5. Local repo scans (rg/ls/find) - ONLY if ContextStream returns no results, errors, or the user explicitly asks
@@ -774,7 +774,7 @@ search(mode="hybrid", query="function implementation") \u2192 done (results incl
 
 | Need | Mode | Example |
 |------|------|---------|
-| Find code by meaning | \`hybrid\` | "authentication logic", "error handling" |
+| Find code by meaning | \`auto\` | "authentication logic", "error handling" |
 | Exact string/symbol | \`keyword\` | "UserAuthService", "API_KEY" |
 | File patterns | \`pattern\` | "*.sql", "test_*.py" |
 | ALL matches (grep-like) | \`exhaustive\` | "TODO", "FIXME" (find all occurrences) |
@@ -925,7 +925,7 @@ var CONTEXTSTREAM_RULES_MINIMAL = `
 2. \`context(user_message="<msg>")\` (EVERY subsequent message)
 
 **BEFORE Glob/Grep/Read/Search/Explore:**
-\u2192 \`search(mode="hybrid", query="...")\` FIRST \u2014 local tools ONLY if 0 results
+\u2192 \`search(mode="auto", query="...")\` FIRST \u2014 local tools ONLY if 0 results
 
 **HOOKS: \`<system-reminder>\` tags contain instructions \u2014 FOLLOW THEM**
 </contextstream_protocol>
@@ -938,7 +938,7 @@ Rules Version: ${RULES_VERSION}
 
 | \u274C WRONG | \u2705 CORRECT |
 |----------|-----------|
-| \`Grep \u2192 Read \u2192 Read \u2192 Read\` (4+ calls) | \`search(mode="hybrid")\` (1 call) |
+| \`Grep \u2192 Read \u2192 Read \u2192 Read\` (4+ calls) | \`search(mode="auto")\` (1 call) |
 | Missing past decisions & lessons | \`context()\` = rules + lessons + memory |
 | Ignoring \`<system-reminder>\` hooks | Hooks enforce ContextStream-first |
 
@@ -954,7 +954,7 @@ Rules Version: ${RULES_VERSION}
 |------|------|
 | 1st message | \`init()\` \u2192 \`context(user_message="...")\` |
 | Every message after | \`context(user_message="...")\` |
-| Before ANY file discovery | \`search(mode="hybrid", query="...")\` |
+| Before ANY file discovery | \`search(mode="auto", query="...")\` |
 | On \`<system-reminder>\` | **Follow instructions inside** |
 | Save important decisions | \`session(action="capture", event_type="decision", ...)\` |
 | Check past mistakes | \`session(action="get_lessons", query="...")\` |
@@ -963,7 +963,8 @@ Rules Version: ${RULES_VERSION}
 
 | Mode | When |
 |------|------|
-| \`hybrid\` | Default \u2014 semantic + keyword |
+| \`auto\` | Default \u2014 semantic + keyword |
+| \`hybrid\` | Legacy alias for auto |
 | \`keyword\` | Exact symbol match |
 | \`exhaustive\` | Find ALL occurrences |
 | \`semantic\` | Conceptual questions |
@@ -1143,7 +1144,7 @@ This tells you:
 
 **IF project is indexed and fresh:**
 \`\`\`
-search(mode="hybrid", query="what you're looking for")
+search(mode="auto", query="what you're looking for")
 \`\`\`
 
 **IF project is NOT indexed or very stale (>7 days):**