@contextstream/mcp-server 0.4.58 → 0.4.60

package/dist/index.js

@@ -958,7 +958,7 @@ var init_rules_templates = __esm({
       "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",
@@ -982,7 +982,7 @@ var init_rules_templates = __esm({
 |---------|----------|
 | **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.
@@ -1005,7 +1005,7 @@ v${RULES_VERSION}
 | 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.
@@ -1057,7 +1057,7 @@ v${RULES_VERSION}
    - 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
 
@@ -1081,7 +1081,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.
@@ -1090,11 +1090,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
 
@@ -1165,7 +1165,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", ...)\` |
 
@@ -1185,7 +1185,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 |
@@ -1212,7 +1212,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")\` |
@@ -1358,7 +1358,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):**
 \`\`\`
@@ -1367,14 +1367,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
@@ -1383,7 +1383,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) |
@@ -1534,7 +1534,7 @@ See full documentation: https://contextstream.io/docs/mcp/tools
 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>
@@ -1547,7 +1547,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 |
 
@@ -1563,7 +1563,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="...")\` |
@@ -1572,7 +1572,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 |
@@ -1752,7 +1753,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):**
@@ -2829,7 +2830,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":
@@ -2841,12 +2842,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)
@@ -2873,7 +2874,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]"""
@@ -3309,7 +3310,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."
             )
@@ -3336,7 +3337,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]"""
@@ -3487,7 +3488,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."
             )
 
@@ -4059,7 +4060,7 @@ async function runPreToolUseHook() {
     fs9.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.`;
       fs9.appendFileSync(DEBUG_FILE, `[PreToolUse] Intercepting discovery glob: ${msg}
 `);
       if (editorFormat === "cline") {
@@ -4082,7 +4083,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") {
@@ -4094,7 +4095,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") {
@@ -4123,7 +4124,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") {
@@ -4381,6 +4382,34 @@ async function saveLastExchange(exchange, cwd, clientName) {
   } catch {
   }
 }
+async function fetchHookContext() {
+  if (!API_KEY2) return null;
+  try {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), 2e3);
+    const url = `${API_URL2}/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_KEY2,
+        "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_KEY2) return null;
   try {
@@ -4459,26 +4488,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) {
@@ -4496,7 +4505,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)
 
 `);
   }
@@ -4537,7 +4546,7 @@ function buildEnhancedReminder(ctx, isNewSession2, versionNotice) {
     parts.push("");
   }
   parts.push("---\n");
-  parts.push(REMINDER);
+  parts.push(FULL_REMINDER);
   parts.push(`
 
 ---
@@ -4554,7 +4563,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
@@ -4625,61 +4634,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_KEY2) {
+      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 ENABLED3, API_URL2, API_KEY2, WORKSPACE_ID, PROJECT_ID, REMINDER, ENHANCED_REMINDER_HEADER, isDirectRun3;
+var ENABLED3, API_URL2, API_KEY2, WORKSPACE_ID, PROJECT_ID, REMINDER, FULL_REMINDER, ENHANCED_REMINDER_HEADER, isDirectRun3;
 var init_user_prompt_submit = __esm({
   "src/hooks/user-prompt-submit.ts"() {
     "use strict";
@@ -4689,7 +4695,9 @@ var init_user_prompt_submit = __esm({
     API_KEY2 = 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
@@ -4699,7 +4707,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)
 
@@ -11311,7 +11319,16 @@ async function request(config, path22, options = {}) {
   const authOverride = getAuthOverride();
   const apiKey = authOverride?.apiKey ?? config.apiKey;
   const jwt = authOverride?.jwt ?? config.jwt;
-  const apiPath = path22.startsWith("/api/") ? path22 : `/api/v1${path22}`;
+  const rawPath = path22.startsWith("/") ? path22 : `/${path22}`;
+  const apiPath = rawPath.startsWith("/api/") ? rawPath : `/api/v1${rawPath}`;
+  const unauthenticatedEndpoints = ["/api/v1/auth/device/start", "/api/v1/auth/device/token"];
+  const isUnauthenticatedEndpoint = unauthenticatedEndpoints.some(
+    (endpoint) => apiPath === endpoint || apiPath.startsWith(`${endpoint}?`)
+  );
+  if (!isUnauthenticatedEndpoint && !apiKey && !jwt) {
+    const message = config.allowHeaderAuth ? "Missing authentication: CONTEXTSTREAM_ALLOW_HEADER_AUTH is enabled, but this request did not include auth credentials." : "Missing authentication: set CONTEXTSTREAM_API_KEY or CONTEXTSTREAM_JWT.";
+    throw new HttpError(401, message);
+  }
   const url = `${apiUrl.replace(/\/$/, "")}${apiPath}`;
   const maxRetries = options.retries ?? MAX_RETRIES;
   const baseDelay = options.retryDelay ?? BASE_DELAY;
@@ -12294,6 +12311,12 @@ var ContextStreamClient = class {
     this.indexRefreshInProgress = false;
     this.hasTriggeredAutoIndex = false;
   }
+  hasEffectiveAuth() {
+    const authOverride = getAuthOverride();
+    const apiKey = authOverride?.apiKey ?? this.config.apiKey;
+    const jwt = authOverride?.jwt ?? this.config.jwt;
+    return Boolean(apiKey || jwt);
+  }
   /**
    * Update the client's default workspace/project IDs at runtime.
    *
@@ -14731,7 +14754,7 @@ ${context2}`;
     let candidateContext;
     const CS_HEADER = "\u2B21 ContextStream \u2014 Smart Context & Memory";
     const CS_HEADER_MINIFIED = "CS:active";
-    const CS_FIRST_RULE = "\u26A0\uFE0F STOP: Before Glob/Grep/Read \u2192 search(mode=hybrid) FIRST. Local tools ONLY if 0 results.";
+    const CS_FIRST_RULE = "\u26A0\uFE0F STOP: Before Glob/Grep/Read \u2192 search(mode=auto) FIRST. Local tools ONLY if 0 results.";
     const CS_FIRST_RULE_MINIFIED = "R:CS-first|Idx:project.index_status->ingest|NoLocalScanUnlessCSempty";
     if (format === "minified") {
       const parts = [CS_HEADER_MINIFIED, CS_FIRST_RULE_MINIFIED];
@@ -16537,10 +16560,22 @@ var TASK_HINTS = {
   created: "Task created. Use update_task() to change status.",
   completed: "Task completed. Well done!",
   blocked: "Task blocked. Add blocked_reason for context.",
+  cancelled: "Task cancelled.",
   linked_to_plan: "Task linked to plan. Progress will be tracked."
 };
 
 // src/tools.ts
+function parseBoolEnvDefault(raw, fallback) {
+  if (raw === void 0) return fallback;
+  const normalized = raw.trim().toLowerCase();
+  if (normalized === "1" || normalized === "true" || normalized === "yes" || normalized === "on") {
+    return true;
+  }
+  if (normalized === "0" || normalized === "false" || normalized === "no" || normalized === "off") {
+    return false;
+  }
+  return fallback;
+}
 var LOG_LEVEL = (process.env.CONTEXTSTREAM_LOG_LEVEL || "normal").toLowerCase();
 var LOG_QUIET = LOG_LEVEL === "quiet";
 var LOG_VERBOSE = LOG_LEVEL === "verbose";
@@ -16604,7 +16639,7 @@ var lastAutoSaveTime = 0;
 var lastAutoSavePressureLevel = "";
 var contextCallsSinceLastSave = 0;
 var SEARCH_RULES_REMINDER_ENABLED = process.env.CONTEXTSTREAM_SEARCH_REMINDER?.toLowerCase() !== "false";
-var SEARCH_RULES_REMINDER = `[SEARCH] Use search(mode="hybrid") before Glob/Grep/Read. Local tools only if 0 results.`;
+var SEARCH_RULES_REMINDER = `[SEARCH] Use search(mode="auto") before Glob/Grep/Read. Local tools only if 0 results.`;
 var CONTEXT_CALL_REMINDER = `[CONTEXT] Call context(user_message="...") at start of EVERY response. This is MANDATORY.`;
 var LESSONS_REMINDER_PREFIX = `
 \u{1F6A8} [LESSONS_WARNING] Past Mistakes Found - READ BEFORE PROCEEDING!
@@ -17834,7 +17869,7 @@ function getBundleInfo() {
     core: "Essential session tools (always enabled)",
     session: "Extended session management and utilities",
     memory: "Full memory CRUD operations",
-    search: "Semantic, hybrid, and keyword search",
+    search: "Auto, semantic, hybrid (legacy alias), and keyword search",
     graph: "Code graph analysis and dependencies",
     workspace: "Workspace management",
     project: "Project management and indexing",
@@ -17937,11 +17972,22 @@ function parsePositiveInt(raw, fallback) {
 var OUTPUT_FORMAT = process.env.CONTEXTSTREAM_OUTPUT_FORMAT || "compact";
 var COMPACT_OUTPUT = OUTPUT_FORMAT === "compact";
 var SHOW_TIMING = process.env.CONTEXTSTREAM_SHOW_TIMING === "true" || process.env.CONTEXTSTREAM_SHOW_TIMING === "1";
+var INCLUDE_STRUCTURED_CONTENT = parseBoolEnvDefault(
+  process.env.CONTEXTSTREAM_INCLUDE_STRUCTURED_CONTENT,
+  true
+);
 var DEFAULT_SEARCH_LIMIT = parsePositiveInt(process.env.CONTEXTSTREAM_SEARCH_LIMIT, 3);
 var DEFAULT_SEARCH_CONTENT_MAX_CHARS = parsePositiveInt(
   process.env.CONTEXTSTREAM_SEARCH_MAX_CHARS,
   400
 );
+function maybeStripStructuredContent(result) {
+  if (INCLUDE_STRUCTURED_CONTENT || !Object.prototype.hasOwnProperty.call(result, "structuredContent")) {
+    return result;
+  }
+  const { structuredContent: _structuredContent, ...rest } = result;
+  return rest;
+}
 var CONSOLIDATED_MODE = process.env.CONTEXTSTREAM_CONSOLIDATED !== "false";
 var CONSOLIDATED_TOOLS = /* @__PURE__ */ new Set([
   "init",
@@ -17971,6 +18017,38 @@ var CONSOLIDATED_TOOLS = /* @__PURE__ */ new Set([
   "help"
   // Consolidates session_tools, auth_me, mcp_server_version, etc.
 ]);
+function mapToolToConsolidatedDomain(toolName) {
+  if (CONSOLIDATED_TOOLS.has(toolName)) return toolName;
+  if (toolName === "session_init") return "init";
+  if (toolName === "context_smart") return "context";
+  if (toolName === "generate_rules" || toolName === "generate_editor_rules") return "generate_rules";
+  if (toolName.startsWith("search_")) return "search";
+  if (toolName.startsWith("session_") || toolName === "context_feedback") return "session";
+  if (toolName.startsWith("memory_") || toolName === "decision_trace") return "memory";
+  if (toolName.startsWith("graph_")) return "graph";
+  if (toolName.startsWith("projects_")) return "project";
+  if (toolName.startsWith("workspaces_") || toolName.startsWith("workspace_")) return "workspace";
+  if (toolName.startsWith("reminders_")) return "reminder";
+  if (toolName.startsWith("slack_") || toolName.startsWith("github_") || toolName.startsWith("integrations_") || toolName.startsWith("notion_")) {
+    return "integration";
+  }
+  if (toolName.startsWith("media_")) return "media";
+  if (toolName === "session_tools" || toolName === "auth_me" || toolName === "mcp_server_version" || toolName === "tools_enable_bundle") {
+    return "help";
+  }
+  return null;
+}
+function resolveConsolidatedAllowlist(allowlist) {
+  if (!allowlist) return null;
+  const mapped = /* @__PURE__ */ new Set();
+  for (const toolName of allowlist) {
+    const consolidated = mapToolToConsolidatedDomain(toolName);
+    if (consolidated) {
+      mapped.add(consolidated);
+    }
+  }
+  return mapped;
+}
 var TOOLSET_ALIASES = {
   // Light mode - minimal, fastest
   light: LIGHT_TOOLSET,
@@ -18141,10 +18219,15 @@ function setupClientDetection(server) {
 function registerTools(server, client, sessionManager) {
   const upgradeUrl2 = process.env.CONTEXTSTREAM_UPGRADE_URL || "https://contextstream.io/pricing";
   const toolFilter = resolveToolFilter();
-  const toolAllowlist = toolFilter.allowlist;
+  const rawToolAllowlist = toolFilter.allowlist;
+  const toolAllowlist = CONSOLIDATED_MODE ? resolveConsolidatedAllowlist(rawToolAllowlist) : rawToolAllowlist;
   if (toolAllowlist) {
     const source = toolFilter.source;
-    logDebug(`Toolset: ${source} (${toolAllowlist.size} tools)`);
+    if (CONSOLIDATED_MODE) {
+      logDebug(`Toolset: ${source} (${toolAllowlist.size} consolidated domain tools)`);
+    } else {
+      logDebug(`Toolset: ${source} (${toolAllowlist.size} tools)`);
+    }
   } else {
     logDebug("Toolset: complete (all tools)");
   }
@@ -18541,7 +18624,8 @@ function registerTools(server, client, sessionManager) {
         if (proGated) return proGated;
         const integrationGated = await gateIfIntegrationTool(name);
         if (integrationGated) return integrationGated;
-        return await handler(input, extra);
+        const result = await handler(input, extra);
+        return maybeStripStructuredContent(result);
       } catch (error) {
         const errorMessage = error?.message || String(error);
         const errorDetails = error?.body || error?.details || null;
@@ -18561,11 +18645,11 @@ Hint: Run session_init(folder_path="<your_project_path>") first to establish a s
           }
         };
         const errorText = `[${errorCode}] ${errorMessage}${upgradeHint}${sessionHint}${errorDetails ? `: ${JSON.stringify(errorDetails)}` : ""}`;
-        return {
+        return maybeStripStructuredContent({
           content: [{ type: "text", text: errorText }],
           structuredContent: errorPayload,
           isError: true
-        };
+        });
       }
     };
     serverRef.registerTool(name, annotatedConfig, wrapWithAutoContext(name, safeHandler));
@@ -18622,7 +18706,7 @@ Hint: Run session_init(folder_path="<your_project_path>") first to establish a s
       });
       return;
     }
-    if (!CONSOLIDATED_MODE && toolAllowlist && !toolAllowlist.has(name)) {
+    if (toolAllowlist && !toolAllowlist.has(name)) {
       if (ROUTER_MODE && !ROUTER_DIRECT_TOOLS.has(name)) {
         operationsRegistry.set(name, {
           name,
@@ -18771,7 +18855,7 @@ Hint: Run session_init(folder_path="<your_project_path>") first to establish a s
 Available bundles:
 - session: Extended session management (~6 tools)
 - memory: Full memory CRUD operations (~16 tools)
-- search: Semantic, hybrid, and keyword search (~3 tools)
+- search: Auto, semantic, hybrid (legacy alias), and keyword search (~3 tools)
 - graph: Code graph analysis and dependencies (~9 tools)
 - workspace: Workspace management (~4 tools)
 - project: Project management and indexing (~10 tools)
@@ -19226,10 +19310,18 @@ Access: Free`,
       output_format: input.output_format
     };
   }
+  function getSearchAuthError() {
+    if (client.hasEffectiveAuth()) return null;
+    return errorResult(
+      "Authentication required for search. Set CONTEXTSTREAM_API_KEY or CONTEXTSTREAM_JWT, or pass auth credentials from your MCP client when CONTEXTSTREAM_ALLOW_HEADER_AUTH=true."
+    );
+  }
   registerTool(
     "search_semantic",
     { title: "Semantic search", description: "Semantic vector search", inputSchema: searchSchema },
     async (input) => {
+      const authError = getSearchAuthError();
+      if (authError) return authError;
       const result = await client.searchSemantic(normalizeSearchParams(input));
       return {
         content: [{ type: "text", text: formatContent(result) }]
@@ -19244,6 +19336,8 @@ Access: Free`,
       inputSchema: searchSchema
     },
     async (input) => {
+      const authError = getSearchAuthError();
+      if (authError) return authError;
       const result = await client.searchHybrid(normalizeSearchParams(input));
       return {
         content: [{ type: "text", text: formatContent(result) }]
@@ -19254,6 +19348,8 @@ Access: Free`,
     "search_keyword",
     { title: "Keyword search", description: "Keyword search", inputSchema: searchSchema },
     async (input) => {
+      const authError = getSearchAuthError();
+      if (authError) return authError;
       const result = await client.searchKeyword(normalizeSearchParams(input));
       return {
         content: [{ type: "text", text: formatContent(result) }]
@@ -19264,6 +19360,8 @@ Access: Free`,
     "search_pattern",
     { title: "Pattern search", description: "Pattern/regex search", inputSchema: searchSchema },
     async (input) => {
+      const authError = getSearchAuthError();
+      if (authError) return authError;
       const result = await client.searchPattern(normalizeSearchParams(input));
       return {
         content: [{ type: "text", text: formatContent(result) }]
@@ -20291,7 +20389,7 @@ This does semantic search on the first message. You only need context on subsequ
       );
       result.tools_hint = getCoreToolsHint();
       const sessionId = typeof result.session_id === "string" ? result.session_id : void 0;
-      result.educational_tip = getSessionInitTip(sessionId);
+      result.educational_tip = getSessionInitTip(sessionId ?? "");
       const shouldRestoreContext = input.is_post_compact ?? RESTORE_CONTEXT_DEFAULT;
       if (shouldRestoreContext) {
         result.is_post_compact = true;
@@ -20557,7 +20655,7 @@ Format options:
 
 Example output (grouped):
 Session: init(start-conv) smart(each-msg) capture(save) recall(find) remember(quick)
-Search: semantic(meaning) hybrid(combo) keyword(exact)
+Search: auto(default) semantic(meaning) hybrid(alias) keyword(exact)
 Memory: events(crud) nodes(knowledge) search(find) decisions(choices)`,
       inputSchema: external_exports.object({
         format: external_exports.enum(["grouped", "minimal", "full"]).optional().default("grouped").describe(
@@ -21004,7 +21102,7 @@ Use this in combination with session_init(is_post_compact=true) for seamless con
       }
       try {
         if (input.snapshot_id) {
-          const eventResult = await client.getEvent(input.snapshot_id);
+          const eventResult = await client.getMemoryEvent(input.snapshot_id);
           const event = eventResult?.data || eventResult;
           if (!event || !event.content) {
             return errorResult(
@@ -22095,7 +22193,7 @@ Action: ${cp.suggested_action === "prepare_save" ? "Consider saving important de
           contextCallsSinceLastSave++;
           const now = Date.now();
           const timeSinceLastSave = now - lastAutoSaveTime;
-          const pressureLevelIncreased = lastAutoSavePressureLevel === "" && cp.level !== "low" || lastAutoSavePressureLevel === "medium" && (cp.level === "high" || cp.level === "critical") || lastAutoSavePressureLevel === "high" && cp.level === "critical";
+          const pressureLevelIncreased = lastAutoSavePressureLevel === "" || lastAutoSavePressureLevel === "medium" && (cp.level === "high" || cp.level === "critical") || lastAutoSavePressureLevel === "high" && cp.level === "critical";
           const shouldSave = pressureLevelIncreased && timeSinceLastSave > AUTO_SAVE_MIN_INTERVAL_MS || contextCallsSinceLastSave >= AUTO_SAVE_CALL_INTERVAL || timeSinceLastSave > AUTO_SAVE_MIN_INTERVAL_MS * 2.5;
           if (shouldSave) {
             const trigger = pressureLevelIncreased ? "pressure_increase" : contextCallsSinceLastSave >= AUTO_SAVE_CALL_INTERVAL ? "call_count" : "time_interval";
@@ -23160,11 +23258,11 @@ Use this to remove a reminder that is no longer relevant.`,
       "search",
       {
         title: "Search",
-        description: `Search workspace memory and knowledge. Modes: semantic (meaning-based), hybrid (semantic + keyword), keyword (exact match), pattern (regex), exhaustive (all matches like grep), refactor (word-boundary matching for symbol renaming), team (cross-project team search - team plans only).
+        description: `Search workspace memory and knowledge. Modes: auto (recommended), semantic (meaning-based), hybrid (legacy alias for auto), keyword (exact match), pattern (regex), exhaustive (all matches like grep), refactor (word-boundary matching for symbol renaming), team (cross-project team search - team plans only).
 
 Output formats: full (default, includes content), paths (file paths only - 80% token savings), minimal (compact - 60% savings), count (match counts only - 90% savings).`,
         inputSchema: external_exports.object({
-          mode: external_exports.enum(["semantic", "hybrid", "keyword", "pattern", "exhaustive", "refactor", "team"]).describe("Search mode"),
+          mode: external_exports.enum(["auto", "semantic", "hybrid", "keyword", "pattern", "exhaustive", "refactor", "team"]).optional().default("auto").describe("Search mode (auto recommended; hybrid is a backward-compatible alias)"),
           query: external_exports.string().describe("Search query"),
           workspace_id: external_exports.string().uuid().optional(),
           project_id: external_exports.string().uuid().optional(),
@@ -23179,21 +23277,25 @@ Output formats: full (default, includes content), paths (file paths only - 80% t
         })
       },
       async (input) => {
+        const authError = getSearchAuthError();
+        if (authError) return authError;
         client.checkAndIndexChangedFiles().catch(() => {
         });
         const params = normalizeSearchParams(input);
         const startTime = Date.now();
+        const requestedMode = input.mode || "auto";
         let result;
         let toolType;
-        switch (input.mode) {
-          case "semantic":
-            result = await client.searchSemantic(params);
-            toolType = "search_semantic";
-            break;
+        switch (requestedMode) {
+          case "auto":
           case "hybrid":
             result = await client.searchHybrid(params);
             toolType = "search_hybrid";
             break;
+          case "semantic":
+            result = await client.searchSemantic(params);
+            toolType = "search_semantic";
+            break;
           case "keyword":
             result = await client.searchKeyword(params);
             toolType = "search_keyword";
@@ -23257,6 +23359,7 @@ Output formats: full (default, includes content), paths (file paths only - 80% t
             break;
           }
           default:
+            result = await client.searchHybrid(params);
             toolType = "search_hybrid";
         }
         const roundTripMs = Date.now() - startTime;
@@ -23728,7 +23831,7 @@ Output formats: full (default, includes content), paths (file paths only - 80% t
               );
             }
             if (input.snapshot_id) {
-              const eventResult = await client.getEvent(input.snapshot_id);
+              const eventResult = await client.getMemoryEvent(input.snapshot_id);
               const event = eventResult?.data || eventResult;
               if (!event || !event.content) {
                 return errorResult(
@@ -24896,7 +24999,7 @@ ${formatContent(result)}`
                   workspace_id: ws.id,
                   status: input.todo_status,
                   priority: input.todo_priority,
-                  limit: input.limit ? Math.ceil(input.limit / workspacesForTodos.length) : 10
+                  per_page: input.limit ? Math.ceil(input.limit / workspacesForTodos.length) : 10
                 });
                 const items = todos?.data?.items || todos?.items || [];
                 allTodos.push(...items.map((t) => ({ ...t, workspace_name: ws.name })));
@@ -24946,7 +25049,7 @@ ${formatContent(result)}`
                 const diagrams = await client.diagramsList({
                   workspace_id: ws.id,
                   diagram_type: input.diagram_type,
-                  limit: input.limit ? Math.ceil(input.limit / workspacesForDiagrams.length) : 10
+                  per_page: input.limit ? Math.ceil(input.limit / workspacesForDiagrams.length) : 10
                 });
                 const items = diagrams?.data?.items || diagrams?.items || [];
                 allDiagrams.push(...items.map((d) => ({ ...d, workspace_name: ws.name })));
@@ -24988,7 +25091,7 @@ ${formatContent(result)}`
                 const docs = await client.docsList({
                   workspace_id: ws.id,
                   doc_type: input.doc_type,
-                  limit: input.limit ? Math.ceil(input.limit / workspacesForDocs.length) : 10
+                  per_page: input.limit ? Math.ceil(input.limit / workspacesForDocs.length) : 10
                 });
                 const items = docs?.data?.items || docs?.items || [];
                 allDocs.push(...items.map((d) => ({ ...d, workspace_name: ws.name })));
@@ -26257,7 +26360,6 @@ Last edited: ${updatedPage.last_edited_time}`
               try {
                 const notionActivity = await client.notionActivity({
                   workspace_id: ws.id,
-                  days,
                   limit: perSourceLimit
                 });
                 const notionItems = notionActivity?.data || notionActivity || [];
@@ -26281,7 +26383,6 @@ Last edited: ${updatedPage.last_edited_time}`
               try {
                 const slackActivity = await client.slackActivity({
                   workspace_id: ws.id,
-                  days,
                   limit: perSourceLimit
                 });
                 const slackItems = slackActivity?.data || slackActivity || [];
@@ -26305,7 +26406,6 @@ Last edited: ${updatedPage.last_edited_time}`
               try {
                 const githubActivity = await client.githubActivity({
                   workspace_id: ws.id,
-                  days,
                   limit: perSourceLimit
                 });
                 const githubItems = githubActivity?.data || githubActivity || [];
@@ -29098,21 +29198,22 @@ async function isEditorInstalled(editor) {
   }
 }
 var IS_WINDOWS = process.platform === "win32";
-function buildContextStreamMcpServer(params) {
-  const env = {
+function escapeTomlString(value) {
+  return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+}
+function formatTomlEnvLines(env) {
+  return Object.entries(env).map(([key, value]) => `${key} = "${escapeTomlString(value)}"`).join("\n");
+}
+function buildSetupEnv(params) {
+  const contextPack = params.contextPackEnabled === false ? "false" : "true";
+  return {
     CONTEXTSTREAM_API_URL: params.apiUrl,
-    CONTEXTSTREAM_API_KEY: params.apiKey
+    CONTEXTSTREAM_API_KEY: params.apiKey,
+    CONTEXTSTREAM_CONTEXT_PACK: contextPack
   };
-  if (params.toolset === "router") {
-    env.CONTEXTSTREAM_PROGRESSIVE_MODE = "true";
-  }
-  env.CONTEXTSTREAM_CONTEXT_PACK = params.contextPackEnabled === false ? "false" : "true";
-  if (params.restoreContextEnabled === false) {
-    env.CONTEXTSTREAM_RESTORE_CONTEXT = "false";
-  }
-  if (params.showTiming) {
-    env.CONTEXTSTREAM_SHOW_TIMING = "true";
-  }
+}
+function buildContextStreamMcpServer(params) {
+  const env = buildSetupEnv(params);
   if (IS_WINDOWS) {
     return {
       command: "cmd",
@@ -29127,20 +29228,7 @@ function buildContextStreamMcpServer(params) {
   };
 }
 function buildContextStreamVsCodeServer(params) {
-  const env = {
-    CONTEXTSTREAM_API_URL: params.apiUrl,
-    CONTEXTSTREAM_API_KEY: params.apiKey
-  };
-  if (params.toolset === "router") {
-    env.CONTEXTSTREAM_PROGRESSIVE_MODE = "true";
-  }
-  env.CONTEXTSTREAM_CONTEXT_PACK = params.contextPackEnabled === false ? "false" : "true";
-  if (params.restoreContextEnabled === false) {
-    env.CONTEXTSTREAM_RESTORE_CONTEXT = "false";
-  }
-  if (params.showTiming) {
-    env.CONTEXTSTREAM_SHOW_TIMING = "true";
-  }
+  const env = buildSetupEnv(params);
   if (IS_WINDOWS) {
     return {
       type: "stdio",
@@ -29238,16 +29326,10 @@ async function upsertCodexTomlConfig(filePath, params) {
   await fs7.mkdir(path8.dirname(filePath), { recursive: true });
   const exists = await fileExists(filePath);
   const existing = exists ? await fs7.readFile(filePath, "utf8").catch(() => "") : "";
+  const env = buildSetupEnv(params);
+  const envLines = formatTomlEnvLines(env);
   const marker = "[mcp_servers.contextstream]";
   const envMarker = "[mcp_servers.contextstream.env]";
-  const toolsetLine = params.toolset === "router" ? `CONTEXTSTREAM_PROGRESSIVE_MODE = "true"
-` : "";
-  const contextPackLine = `CONTEXTSTREAM_CONTEXT_PACK = "${params.contextPackEnabled === false ? "false" : "true"}"
-`;
-  const restoreContextLine = params.restoreContextEnabled === false ? `CONTEXTSTREAM_RESTORE_CONTEXT = "false"
-` : "";
-  const showTimingLine = params.showTiming ? `CONTEXTSTREAM_SHOW_TIMING = "true"
-` : "";
   const commandLine = IS_WINDOWS ? `command = "cmd"
 args = ["/c", "npx", "--prefer-online", "-y", "@contextstream/mcp-server@latest"]
 ` : `command = "npx"
@@ -29259,9 +29341,7 @@ args = ["--prefer-online", "-y", "@contextstream/mcp-server@latest"]
 [mcp_servers.contextstream]
 ` + commandLine + `
 [mcp_servers.contextstream.env]
-CONTEXTSTREAM_API_URL = "${params.apiUrl}"
-CONTEXTSTREAM_API_KEY = "${params.apiKey}"
-` + toolsetLine + contextPackLine + restoreContextLine + showTimingLine;
+` + envLines + "\n";
   if (!exists) {
     await fs7.writeFile(filePath, block.trimStart(), "utf8");
     return "created";
@@ -29273,10 +29353,7 @@ CONTEXTSTREAM_API_KEY = "${params.apiKey}"
   if (!existing.includes(envMarker)) {
     await fs7.writeFile(
       filePath,
-      existing.trimEnd() + "\n\n" + envMarker + `
-CONTEXTSTREAM_API_URL = "${params.apiUrl}"
-CONTEXTSTREAM_API_KEY = "${params.apiKey}"
-` + toolsetLine + contextPackLine,
+      existing.trimEnd() + "\n\n" + envMarker + "\n" + envLines + "\n",
       "utf8"
     );
     return "updated";
@@ -29284,51 +29361,43 @@ CONTEXTSTREAM_API_KEY = "${params.apiKey}"
   const lines = existing.split(/\r?\n/);
   const out = [];
   let inEnv = false;
-  let sawUrl = false;
-  let sawKey = false;
-  let sawContextPack = false;
+  const seen = /* @__PURE__ */ new Set();
+  const managedKeys = new Set(Object.keys(env));
   for (const line of lines) {
     const trimmed = line.trim();
     if (trimmed.startsWith("[") && trimmed.endsWith("]")) {
       if (inEnv && trimmed !== envMarker) {
-        if (!sawUrl) out.push(`CONTEXTSTREAM_API_URL = "${params.apiUrl}"`);
-        if (!sawKey) out.push(`CONTEXTSTREAM_API_KEY = "${params.apiKey}"`);
-        if (!sawContextPack)
-          out.push(
-            `CONTEXTSTREAM_CONTEXT_PACK = "${params.contextPackEnabled === false ? "false" : "true"}"`
-          );
+        for (const [key, value] of Object.entries(env)) {
+          if (!seen.has(key)) {
+            out.push(`${key} = "${escapeTomlString(value)}"`);
+          }
+        }
         inEnv = false;
       }
-      if (trimmed === envMarker) inEnv = true;
+      if (trimmed === envMarker) {
+        inEnv = true;
+        seen.clear();
+      }
       out.push(line);
       continue;
     }
-    if (inEnv && /^\s*CONTEXTSTREAM_API_URL\s*=/.test(line)) {
-      out.push(`CONTEXTSTREAM_API_URL = "${params.apiUrl}"`);
-      sawUrl = true;
-      continue;
-    }
-    if (inEnv && /^\s*CONTEXTSTREAM_API_KEY\s*=/.test(line)) {
-      out.push(`CONTEXTSTREAM_API_KEY = "${params.apiKey}"`);
-      sawKey = true;
-      continue;
-    }
-    if (inEnv && /^\s*CONTEXTSTREAM_CONTEXT_PACK\s*=/.test(line)) {
-      out.push(
-        `CONTEXTSTREAM_CONTEXT_PACK = "${params.contextPackEnabled === false ? "false" : "true"}"`
-      );
-      sawContextPack = true;
-      continue;
+    if (inEnv) {
+      const match = line.match(/^\s*([A-Za-z0-9_]+)\s*=/);
+      if (match && managedKeys.has(match[1])) {
+        const key = match[1];
+        out.push(`${key} = "${escapeTomlString(env[key])}"`);
+        seen.add(key);
+        continue;
+      }
     }
     out.push(line);
   }
   if (inEnv) {
-    if (!sawUrl) out.push(`CONTEXTSTREAM_API_URL = "${params.apiUrl}"`);
-    if (!sawKey) out.push(`CONTEXTSTREAM_API_KEY = "${params.apiKey}"`);
-    if (!sawContextPack)
-      out.push(
-        `CONTEXTSTREAM_CONTEXT_PACK = "${params.contextPackEnabled === false ? "false" : "true"}"`
-      );
+    for (const [key, value] of Object.entries(env)) {
+      if (!seen.has(key)) {
+        out.push(`${key} = "${escapeTomlString(value)}"`);
+      }
+    }
   }
   const updated = out.join("\n");
   if (updated === existing) return "skipped";
@@ -29764,11 +29833,7 @@ Code: ${device.user_code}`);
     const planLabel = detectedPlanName ?? "unknown";
     console.log(`
 Detected plan: ${planLabel} (graph: ${graphTierLabel})`);
-    const toolset = "consolidated";
-    const isPro = detectedPlanName && ["pro", "team", "enterprise"].some((p) => detectedPlanName.toLowerCase().includes(p));
-    const contextPackEnabled = isPro;
-    const showTiming = false;
-    const restoreContextEnabled = true;
+    const contextPackEnabled = !!detectedPlanName && ["pro", "team", "enterprise"].some((p) => detectedPlanName.toLowerCase().includes(p));
     console.log("\nAuto-Update:");
     console.log("  When enabled, ContextStream will automatically update to the latest version");
     console.log("  on new sessions (checks daily). You can disable this if you prefer manual updates.");
@@ -29856,23 +29921,9 @@ Detected plan: ${planLabel} (graph: ${graphTierLabel})`);
       )
     ) || mcpChoiceDefault;
     const mcpScope = mcpChoice === "2" && hasCodex && !hasProjectMcpEditors ? "skip" : mcpChoice === "4" ? "skip" : mcpChoice === "1" ? "global" : mcpChoice === "2" ? "project" : "both";
-    const mcpServer = buildContextStreamMcpServer({ apiUrl, apiKey, toolset, contextPackEnabled, showTiming, restoreContextEnabled });
-    const mcpServerClaude = buildContextStreamMcpServer({
-      apiUrl,
-      apiKey,
-      toolset,
-      contextPackEnabled,
-      showTiming,
-      restoreContextEnabled
-    });
-    const vsCodeServer = buildContextStreamVsCodeServer({
-      apiUrl,
-      apiKey,
-      toolset,
-      contextPackEnabled,
-      showTiming,
-      restoreContextEnabled
-    });
+    const mcpServer = buildContextStreamMcpServer({ apiUrl, apiKey, contextPackEnabled });
+    const mcpServerClaude = buildContextStreamMcpServer({ apiUrl, apiKey, contextPackEnabled });
+    const vsCodeServer = buildContextStreamVsCodeServer({ apiUrl, apiKey, contextPackEnabled });
     const needsGlobalMcpConfig = mcpScope === "global" || mcpScope === "both" || mcpScope === "project" && hasCodex;
     if (needsGlobalMcpConfig) {
       console.log("\nInstalling global MCP config...");
@@ -29889,10 +29940,7 @@ Detected plan: ${planLabel} (graph: ${graphTierLabel})`);
             const status = await upsertCodexTomlConfig(filePath, {
               apiUrl,
               apiKey,
-              toolset,
-              contextPackEnabled,
-              showTiming,
-              restoreContextEnabled
+              contextPackEnabled
             });
             writeActions.push({ kind: "mcp-config", target: filePath, status });
             console.log(`- ${EDITOR_LABELS[editor]}: ${status} ${filePath}`);
@@ -29918,10 +29966,9 @@ Detected plan: ${planLabel} (graph: ${graphTierLabel})`);
             console.log(
               "- Claude Code: global MCP config is best done via `claude mcp add --transport stdio ...` (see docs)."
             );
-            const envHint = toolset === "router" ? " --env CONTEXTSTREAM_PROGRESSIVE_MODE=true" : "";
             const packHint = contextPackEnabled === false ? " --env CONTEXTSTREAM_CONTEXT_PACK=false" : " --env CONTEXTSTREAM_CONTEXT_PACK=true";
             console.log(
-              `  macOS/Linux: claude mcp add --transport stdio contextstream --scope user --env CONTEXTSTREAM_API_URL=... --env CONTEXTSTREAM_API_KEY=...${envHint}${packHint} -- npx --prefer-online -y @contextstream/mcp-server@latest`
+              `  macOS/Linux: claude mcp add --transport stdio contextstream --scope user --env CONTEXTSTREAM_API_URL=... --env CONTEXTSTREAM_API_KEY=...${packHint} -- npx --prefer-online -y @contextstream/mcp-server@latest`
             );
             console.log(
               "  Windows (native): use `cmd /c npx --prefer-online -y @contextstream/mcp-server@latest` after `--` if `npx` is not found."
@@ -30371,6 +30418,7 @@ Environment variables:
   CONTEXTSTREAM_PROGRESSIVE_MODE  Progressive disclosure: true|false (default: false, starts with ~13 core tools)
   CONTEXTSTREAM_ROUTER_MODE   Router pattern: true|false (default: false, exposes only 2 meta-tools)
   CONTEXTSTREAM_OUTPUT_FORMAT Output verbosity: compact|pretty (default: compact, ~30% fewer tokens)
+  CONTEXTSTREAM_INCLUDE_STRUCTURED_CONTENT Include structured JSON payloads in tool results: true|false (default: true)
   CONTEXTSTREAM_SEARCH_LIMIT  Default MCP search limit (default: 3)
   CONTEXTSTREAM_SEARCH_MAX_CHARS  Max chars per search result content (default: 400)
   CONTEXTSTREAM_CONSOLIDATED  Consolidated domain tools: true|false (default: true in v0.4.x, ~75% token reduction)