context-mode 1.0.121 → 1.0.122

package/.claude-plugin/marketplace.json

@@ -6,14 +6,14 @@
   },
   "metadata": {
     "description": "Claude Code plugins by Mert Koseoğlu",
-    "version": "1.0.121"
+    "version": "1.0.122"
   },
   "plugins": [
     {
       "name": "context-mode",
       "source": "./",
       "description": "Claude Code MCP plugin that saves 98% of your context window. Sandboxed code execution in 11 languages, FTS5 knowledge base with BM25 ranking, and intent-driven search.",
-      "version": "1.0.121",
+      "version": "1.0.122",
       "author": {
         "name": "Mert Koseoğlu"
       },

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "context-mode",
-  "version": "1.0.121",
+  "version": "1.0.122",
   "description": "MCP server that saves 98% of your context window with session continuity. Sandboxed code execution in 11 languages, FTS5 knowledge base with BM25 ranking, and automatic state restore across compactions.",
   "author": {
     "name": "Mert Koseoğlu",

package/.openclaw-plugin/openclaw.plugin.json

@@ -3,7 +3,7 @@
   "name": "Context Mode",
   "kind": "tool",
   "description": "OpenClaw plugin that saves 98% of your context window. Sandboxed code execution in 11 languages, FTS5 knowledge base with BM25 ranking, and intent-driven search.",
-  "version": "1.0.121",
+  "version": "1.0.122",
   "sandbox": {
     "mode": "permissive",
     "filesystem_access": "full",

package/.openclaw-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "context-mode",
-  "version": "1.0.121",
+  "version": "1.0.122",
   "description": "OpenClaw plugin that saves 98% of your context window. Sandboxed code execution in 11 languages, FTS5 knowledge base with BM25 ranking, and intent-driven search.",
   "author": {
     "name": "Mert Koseoğlu",

package/README.md

@@ -146,7 +146,7 @@ This gives you all 11 MCP tools without automatic routing. The model can still u
      "hooks": {
        "BeforeTool": [
          {
-           "matcher": "run_shell_command|read_file|read_many_files|grep_search|search_file_content|web_fetch|activate_skill|mcp__plugin_context-mode",
+           "matcher": "run_shell_command|read_file|read_many_files|grep_search|search_file_content|web_fetch|activate_skill|mcp__plugin_context-mode|mcp__context-mode|mcp__(?!.*context-mode)",
            "hooks": [{ "type": "command", "command": "context-mode hook gemini-cli beforetool" }]
          }
        ],
@@ -570,7 +570,7 @@ Full documentation: [`docs/adapters/openclaw.md`](docs/adapters/openclaw.md)
    ```json
    {
      "hooks": {
-      "PreToolUse": [{ "matcher": "local_shell|shell|shell_command|exec_command|container.exec|functions\\.exec_command|Bash|Shell|apply_patch|functions\\.apply_patch|Edit|Write|grep_files|ctx_execute|ctx_execute_file|ctx_batch_execute|ctx_fetch_and_index|ctx_search|ctx_index|mcp__.*__ctx_execute|mcp__.*__ctx_execute_file|mcp__.*__ctx_batch_execute|mcp__.*__ctx_fetch_and_index|mcp__.*__ctx_search|mcp__.*__ctx_index", "hooks": [{ "type": "command", "command": "context-mode hook codex pretooluse" }] }],
+      "PreToolUse": [{ "matcher": "local_shell|shell|shell_command|exec_command|container.exec|functions\\.exec_command|Bash|Shell|apply_patch|functions\\.apply_patch|Edit|Write|grep_files|ctx_execute|ctx_execute_file|ctx_batch_execute|ctx_fetch_and_index|ctx_search|ctx_index|mcp__.*__ctx_execute|mcp__.*__ctx_execute_file|mcp__.*__ctx_batch_execute|mcp__.*__ctx_fetch_and_index|mcp__.*__ctx_search|mcp__.*__ctx_index|mcp__(?!.*context-mode)", "hooks": [{ "type": "command", "command": "context-mode hook codex pretooluse" }] }],
        "PostToolUse": [{ "hooks": [{ "type": "command", "command": "context-mode hook codex posttooluse" }] }],
        "SessionStart": [{ "hooks": [{ "type": "command", "command": "context-mode hook codex sessionstart" }] }],
        "PreCompact": [{ "hooks": [{ "type": "command", "command": "context-mode hook codex precompact" }] }],
@@ -632,7 +632,7 @@ Full documentation: [`docs/adapters/openclaw.md`](docs/adapters/openclaw.md)
    ```json
    {
      "hooks": {
-       "PreToolUse": [{ "matcher": "run_shell_command|read_file|read_many_files|grep_search|web_fetch|agent|mcp__plugin_context-mode_context-mode__ctx_execute|mcp__plugin_context-mode_context-mode__ctx_execute_file|mcp__plugin_context-mode_context-mode__ctx_batch_execute", "hooks": [{ "type": "command", "command": "context-mode hook qwen-code pretooluse" }] }],
+       "PreToolUse": [{ "matcher": "run_shell_command|read_file|read_many_files|grep_search|web_fetch|agent|mcp__plugin_context-mode_context-mode__ctx_execute|mcp__plugin_context-mode_context-mode__ctx_execute_file|mcp__plugin_context-mode_context-mode__ctx_batch_execute|mcp__(?!.*context-mode)", "hooks": [{ "type": "command", "command": "context-mode hook qwen-code pretooluse" }] }],
        "PostToolUse": [{ "matcher": "", "hooks": [{ "type": "command", "command": "context-mode hook qwen-code posttooluse" }] }],
        "SessionStart": [{ "matcher": "", "hooks": [{ "type": "command", "command": "context-mode hook qwen-code sessionstart" }] }],
        "PreCompact": [{ "matcher": "", "hooks": [{ "type": "command", "command": "context-mode hook qwen-code precompact" }] }],
@@ -731,7 +731,7 @@ Full configs: [`configs/antigravity/mcp_config.json`](configs/antigravity/mcp_co
      "description": "Context-mode hooks for context window protection",
      "hooks": {
        "preToolUse": [
-         { "matcher": "execute_bash|fs_read|@context-mode/ctx_execute|@context-mode/ctx_execute_file|@context-mode/ctx_batch_execute", "command": "context-mode hook kiro pretooluse" }
+         { "matcher": "execute_bash|fs_read|@context-mode/ctx_execute|@context-mode/ctx_execute_file|@context-mode/ctx_batch_execute|@(?!context-mode/)", "command": "context-mode hook kiro pretooluse" }
        ],
        "postToolUse": [
          { "matcher": "*", "command": "context-mode hook kiro posttooluse" }

package/build/adapters/claude-code/hooks.d.ts

@@ -24,8 +24,23 @@ export declare const HOOK_TYPES: {
     readonly USER_PROMPT_SUBMIT: "UserPromptSubmit";
 };
 export type HookType = (typeof HOOK_TYPES)[keyof typeof HOOK_TYPES];
+/**
+ * Negative-lookahead matcher for external MCP tool namespaces (#529).
+ *
+ * Claude Code's hook matcher engine evaluates each entry as a regex against
+ * the tool name. This pattern fires on any `mcp__<server>__<tool>` whose
+ * server segment is NOT context-mode's own (`plugin_context-mode_...`).
+ * Without it, large payloads from external MCPs (slack channel history,
+ * telegram messages, gdrive content, notion pages, …) bypass PreToolUse
+ * routing and flood the model's context window — PostToolUse runs too late
+ * to keep the raw data out.
+ *
+ * The negative lookahead prevents this entry from double-firing on
+ * context-mode's own ctx_* tools, which already have dedicated entries above.
+ */
+export declare const EXTERNAL_MCP_MATCHER_PATTERN = "mcp__(?!plugin_context-mode_)";
 /** Tools that context-mode's PreToolUse hook intercepts. */
-export declare const PRE_TOOL_USE_MATCHERS: readonly ["Bash", "WebFetch", "Read", "Grep", "Agent", "mcp__plugin_context-mode_context-mode__ctx_execute", "mcp__plugin_context-mode_context-mode__ctx_execute_file", "mcp__plugin_context-mode_context-mode__ctx_batch_execute"];
+export declare const PRE_TOOL_USE_MATCHERS: readonly ["Bash", "WebFetch", "Read", "Grep", "Agent", "mcp__plugin_context-mode_context-mode__ctx_execute", "mcp__plugin_context-mode_context-mode__ctx_execute_file", "mcp__plugin_context-mode_context-mode__ctx_batch_execute", "mcp__(?!plugin_context-mode_)"];
 /**
  * Combined matcher pattern for settings.json (pipe-separated).
  * Used by the upgrade command when writing a single consolidated entry.

package/build/adapters/claude-code/hooks.js

@@ -30,6 +30,21 @@ export const HOOK_TYPES = {
 // ─────────────────────────────────────────────────────────
 // PreToolUse matchers
 // ─────────────────────────────────────────────────────────
+/**
+ * Negative-lookahead matcher for external MCP tool namespaces (#529).
+ *
+ * Claude Code's hook matcher engine evaluates each entry as a regex against
+ * the tool name. This pattern fires on any `mcp__<server>__<tool>` whose
+ * server segment is NOT context-mode's own (`plugin_context-mode_...`).
+ * Without it, large payloads from external MCPs (slack channel history,
+ * telegram messages, gdrive content, notion pages, …) bypass PreToolUse
+ * routing and flood the model's context window — PostToolUse runs too late
+ * to keep the raw data out.
+ *
+ * The negative lookahead prevents this entry from double-firing on
+ * context-mode's own ctx_* tools, which already have dedicated entries above.
+ */
+export const EXTERNAL_MCP_MATCHER_PATTERN = "mcp__(?!plugin_context-mode_)";
 /** Tools that context-mode's PreToolUse hook intercepts. */
 export const PRE_TOOL_USE_MATCHERS = [
     "Bash",
@@ -40,6 +55,7 @@ export const PRE_TOOL_USE_MATCHERS = [
     "mcp__plugin_context-mode_context-mode__ctx_execute",
     "mcp__plugin_context-mode_context-mode__ctx_execute_file",
     "mcp__plugin_context-mode_context-mode__ctx_batch_execute",
+    EXTERNAL_MCP_MATCHER_PATTERN,
 ];
 /**
  * Combined matcher pattern for settings.json (pipe-separated).

package/build/adapters/claude-code/index.js

@@ -16,7 +16,7 @@ import { resolve, join } from "node:path";
 import { homedir } from "node:os";
 import { ClaudeCodeBaseAdapter } from "../claude-code-base.js";
 import { resolveClaudeConfigDir } from "../../util/claude-config.js";
-import { HOOK_TYPES, HOOK_SCRIPTS, REQUIRED_HOOKS, PRE_TOOL_USE_MATCHER_PATTERN, isContextModeHook, isAnyContextModeHook, extractHookScriptPath, buildHookCommand, } from "./hooks.js";
+import { HOOK_TYPES, HOOK_SCRIPTS, REQUIRED_HOOKS, PRE_TOOL_USE_MATCHERS, PRE_TOOL_USE_MATCHER_PATTERN, isContextModeHook, isAnyContextModeHook, extractHookScriptPath, buildHookCommand, } from "./hooks.js";
 // ─────────────────────────────────────────────────────────
 // Adapter implementation
 // ─────────────────────────────────────────────────────────
@@ -68,16 +68,7 @@ export class ClaudeCodeAdapter extends ClaudeCodeBaseAdapter {
     }
     generateHookConfig(pluginRoot) {
         const preToolUseCommand = `node ${pluginRoot}/hooks/pretooluse.mjs`;
-        const preToolUseMatchers = [
-            "Bash",
-            "WebFetch",
-            "Read",
-            "Grep",
-            "Task",
-            "mcp__plugin_context-mode_context-mode__ctx_execute",
-            "mcp__plugin_context-mode_context-mode__ctx_execute_file",
-            "mcp__plugin_context-mode_context-mode__ctx_batch_execute",
-        ];
+        const preToolUseMatchers = [...PRE_TOOL_USE_MATCHERS];
         return {
             PreToolUse: preToolUseMatchers.map((matcher) => ({
                 matcher,

package/build/adapters/codex/hooks.d.ts

@@ -26,6 +26,25 @@ export declare const HOOK_TYPES: {
     readonly USER_PROMPT_SUBMIT: "UserPromptSubmit";
     readonly STOP: "Stop";
 };
+/**
+ * Negative-lookahead matcher for external MCP tool namespaces on Codex CLI (#529).
+ *
+ * Codex CLI's hook `tool_name` payload uses `mcp__<server>__<tool>` for any
+ * MCP-namespaced tool — verified by configs/codex/hooks.json which already
+ * matches `mcp__.*__ctx_execute` style for context-mode's OWN MCP tools. This
+ * pattern fires PreToolUse for any external `mcp__<server>__<tool>` whose
+ * server segment does NOT contain `context-mode`. Without it, large payloads
+ * from slack / telegram / gdrive / notion-style MCPs bypass the routing nudge
+ * and flood the model's context — PostToolUse runs too late to keep raw data
+ * out.
+ *
+ * The negative lookahead `(?!.*context-mode)` covers both naming variants
+ * Codex sees in practice: the canonical `mcp__context-mode__ctx_*` AND the
+ * Claude Code plugin shim `mcp__plugin_context-mode_context-mode__ctx_*`.
+ * Codex own bare names (ctx_execute, local_shell, …) are not `mcp__`-prefixed
+ * and are unaffected.
+ */
+export declare const EXTERNAL_MCP_MATCHER_PATTERN = "mcp__(?!.*context-mode)";
 /**
  * Path to the routing instructions file for Codex CLI.
  * Used as fallback routing awareness alongside hook-based enforcement.

package/build/adapters/codex/hooks.js

@@ -30,6 +30,28 @@ export const HOOK_TYPES = {
     STOP: "Stop",
 };
 // ─────────────────────────────────────────────────────────
+// External MCP routing matcher (#529)
+// ─────────────────────────────────────────────────────────
+/**
+ * Negative-lookahead matcher for external MCP tool namespaces on Codex CLI (#529).
+ *
+ * Codex CLI's hook `tool_name` payload uses `mcp__<server>__<tool>` for any
+ * MCP-namespaced tool — verified by configs/codex/hooks.json which already
+ * matches `mcp__.*__ctx_execute` style for context-mode's OWN MCP tools. This
+ * pattern fires PreToolUse for any external `mcp__<server>__<tool>` whose
+ * server segment does NOT contain `context-mode`. Without it, large payloads
+ * from slack / telegram / gdrive / notion-style MCPs bypass the routing nudge
+ * and flood the model's context — PostToolUse runs too late to keep raw data
+ * out.
+ *
+ * The negative lookahead `(?!.*context-mode)` covers both naming variants
+ * Codex sees in practice: the canonical `mcp__context-mode__ctx_*` AND the
+ * Claude Code plugin shim `mcp__plugin_context-mode_context-mode__ctx_*`.
+ * Codex own bare names (ctx_execute, local_shell, …) are not `mcp__`-prefixed
+ * and are unaffected.
+ */
+export const EXTERNAL_MCP_MATCHER_PATTERN = "mcp__(?!.*context-mode)";
+// ─────────────────────────────────────────────────────────
 // Routing instructions
 // ─────────────────────────────────────────────────────────
 /**

package/build/adapters/codex/index.js

@@ -18,7 +18,14 @@ import { resolve, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { BaseAdapter } from "../base.js";
 import { resolveCodexConfigDir } from "./paths.js";
-const PRE_TOOL_USE_MATCHER_PATTERN = "local_shell|shell|shell_command|exec_command|container.exec|functions\\.exec_command|Bash|Shell|apply_patch|functions\\.apply_patch|Edit|Write|grep_files|ctx_execute|ctx_execute_file|ctx_batch_execute|ctx_fetch_and_index|ctx_search|ctx_index|mcp__.*__ctx_execute|mcp__.*__ctx_execute_file|mcp__.*__ctx_batch_execute|mcp__.*__ctx_fetch_and_index|mcp__.*__ctx_search|mcp__.*__ctx_index";
+// PreToolUse matcher: canonical Codex tool names + context-mode own MCP tools
+// (both bare and `mcp__<server>__<tool>` forms) + external MCP catch-all (#529).
+// The final `mcp__(?!.*context-mode)` segment uses a negative lookahead that
+// excludes any `mcp__` tool whose server segment contains `context-mode` so
+// context-mode's own MCP tools (already wired by the explicit entries above)
+// are not double-routed. Keep this as a single string literal — `codex.test.ts`
+// drift-guard parses the source with a `"([^"]+)"` regex.
+const PRE_TOOL_USE_MATCHER_PATTERN = "local_shell|shell|shell_command|exec_command|container.exec|functions\\.exec_command|Bash|Shell|apply_patch|functions\\.apply_patch|Edit|Write|grep_files|ctx_execute|ctx_execute_file|ctx_batch_execute|ctx_fetch_and_index|ctx_search|ctx_index|mcp__.*__ctx_execute|mcp__.*__ctx_execute_file|mcp__.*__ctx_batch_execute|mcp__.*__ctx_fetch_and_index|mcp__.*__ctx_search|mcp__.*__ctx_index|mcp__(?!.*context-mode)";
 const CODEX_HOOK_COMMANDS = {
     PreToolUse: "context-mode hook codex pretooluse",
     PostToolUse: "context-mode hook codex posttooluse",

package/build/adapters/copilot-base.d.ts

@@ -68,7 +68,23 @@ export declare abstract class CopilotBaseAdapter extends BaseAdapter implements
     formatPostToolUseResponse(response: PostToolUseResponse): unknown;
     formatPreCompactResponse(response: PreCompactResponse): unknown;
     formatSessionStartResponse(response: SessionStartResponse): unknown;
-    getSettingsPath(): string;
+    /**
+     * Resolve the absolute path to the Copilot-style hook settings file.
+     *
+     * Issue #539 fix: previously this returned `resolve(".github", ...)`
+     * — a CWD-relative path. `doctor` (validateHooks) and `upgrade`
+     * (configureAllHooks) could legitimately run from different working
+     * directories (CLI invoked from a subdir, MCP server cwd=projectDir),
+     * so each saw a DIFFERENT settings path and the diagnose/repair loop
+     * never converged on the same file.
+     *
+     * Now anchors on `projectDir` when supplied (matching the sibling
+     * `getConfigDir(projectDir?: string)` signature in
+     * vscode-copilot/index.ts:93). Falls back to `process.cwd()` to keep
+     * existing callers source-compatible — the slice-5 follow-up will
+     * thread projectDir through `cli.ts doctor`/`upgrade`.
+     */
+    getSettingsPath(projectDir?: string): string;
     generateHookConfig(pluginRoot: string): HookRegistration;
     readSettings(): Record<string, unknown> | null;
     writeSettings(settings: Record<string, unknown>): void;

package/build/adapters/copilot-base.js

@@ -149,8 +149,24 @@ export class CopilotBaseAdapter extends BaseAdapter {
         return response.context ?? "";
     }
     // ── Configuration (shared) ─────────────────────────────
-    getSettingsPath() {
-        return resolve(".github", "hooks", "context-mode.json");
+    /**
+     * Resolve the absolute path to the Copilot-style hook settings file.
+     *
+     * Issue #539 fix: previously this returned `resolve(".github", ...)`
+     * — a CWD-relative path. `doctor` (validateHooks) and `upgrade`
+     * (configureAllHooks) could legitimately run from different working
+     * directories (CLI invoked from a subdir, MCP server cwd=projectDir),
+     * so each saw a DIFFERENT settings path and the diagnose/repair loop
+     * never converged on the same file.
+     *
+     * Now anchors on `projectDir` when supplied (matching the sibling
+     * `getConfigDir(projectDir?: string)` signature in
+     * vscode-copilot/index.ts:93). Falls back to `process.cwd()` to keep
+     * existing callers source-compatible — the slice-5 follow-up will
+     * thread projectDir through `cli.ts doctor`/`upgrade`.
+     */
+    getSettingsPath(projectDir) {
+        return resolve(projectDir ?? process.cwd(), ".github", "hooks", "context-mode.json");
     }
     generateHookConfig(pluginRoot) {
         const { HOOK_TYPES, buildHookCommand } = this.hookModule;

package/build/adapters/cursor/hooks.d.ts

@@ -16,8 +16,21 @@ export declare const HOOK_TYPES: {
 export type HookType = (typeof HOOK_TYPES)[keyof typeof HOOK_TYPES];
 /** Map of hook types that have actual script files. */
 export declare const HOOK_SCRIPTS: Partial<Record<HookType, string>>;
+/**
+ * Negative-lookahead matcher for external MCP tool namespaces on Cursor (#529).
+ *
+ * Cursor MCP wire shape: `MCP:<tool>` (verified in
+ * tests/fixtures/cursor/pretooluse-mcp.json, hooks/cursor/posttooluse.mjs:19-25).
+ * Context-mode's own tools surface as `MCP:ctx_<...>`. The negative lookahead
+ * on the `ctx_` prefix fires for every other MCP tool whose payload would
+ * otherwise flood the model's context window before PostToolUse can act.
+ *
+ * Routing.mjs `isExternalMcpTool` is extended to recognise the `MCP:` prefix
+ * so the routing branch returns external-MCP guidance instead of passthrough.
+ */
+export declare const EXTERNAL_MCP_MATCHER_PATTERN = "MCP:(?!ctx_)";
 /** Canonical Cursor-native matchers for tools context-mode routes proactively. */
-export declare const PRE_TOOL_USE_MATCHERS: readonly ["Shell", "Read", "Grep", "WebFetch", "mcp_web_fetch", "mcp_fetch_tool", "Task", "MCP:ctx_execute", "MCP:ctx_execute_file", "MCP:ctx_batch_execute"];
+export declare const PRE_TOOL_USE_MATCHERS: readonly ["Shell", "Read", "Grep", "WebFetch", "mcp_web_fetch", "mcp_fetch_tool", "Task", "MCP:ctx_execute", "MCP:ctx_execute_file", "MCP:ctx_batch_execute", "MCP:(?!ctx_)"];
 export declare const PRE_TOOL_USE_MATCHER_PATTERN: string;
 /** Required hooks for native Cursor support. */
 export declare const REQUIRED_HOOKS: HookType[];

package/build/adapters/cursor/hooks.js

@@ -21,6 +21,19 @@ export const HOOK_SCRIPTS = {
     [HOOK_TYPES.STOP]: "stop.mjs",
     [HOOK_TYPES.AFTER_AGENT_RESPONSE]: "afteragentresponse.mjs",
 };
+/**
+ * Negative-lookahead matcher for external MCP tool namespaces on Cursor (#529).
+ *
+ * Cursor MCP wire shape: `MCP:<tool>` (verified in
+ * tests/fixtures/cursor/pretooluse-mcp.json, hooks/cursor/posttooluse.mjs:19-25).
+ * Context-mode's own tools surface as `MCP:ctx_<...>`. The negative lookahead
+ * on the `ctx_` prefix fires for every other MCP tool whose payload would
+ * otherwise flood the model's context window before PostToolUse can act.
+ *
+ * Routing.mjs `isExternalMcpTool` is extended to recognise the `MCP:` prefix
+ * so the routing branch returns external-MCP guidance instead of passthrough.
+ */
+export const EXTERNAL_MCP_MATCHER_PATTERN = "MCP:(?!ctx_)";
 /** Canonical Cursor-native matchers for tools context-mode routes proactively. */
 // NOTE (Cursor-3, deferred): Cursor is closed-source and does not currently
 // publish the exact tool name it uses for sub-agent dispatch (the analogue of
@@ -40,6 +53,7 @@ export const PRE_TOOL_USE_MATCHERS = [
     "MCP:ctx_execute",
     "MCP:ctx_execute_file",
     "MCP:ctx_batch_execute",
+    EXTERNAL_MCP_MATCHER_PATTERN,
 ];
 export const PRE_TOOL_USE_MATCHER_PATTERN = PRE_TOOL_USE_MATCHERS.join("|");
 /** Required hooks for native Cursor support. */

package/build/adapters/detect.d.ts

@@ -7,7 +7,8 @@
  *   3. Fallback to Claude Code (low confidence — most common)
  *
  * Verified env vars per platform (from source code audit):
- *   - Claude Code:    CLAUDE_PROJECT_DIR, CLAUDE_SESSION_ID | ~/.claude/
+ *   - Claude Code:    CLAUDE_CODE_ENTRYPOINT, CLAUDE_PLUGIN_ROOT,
+ *                     CLAUDE_PROJECT_DIR, CLAUDE_SESSION_ID | ~/.claude/
  *   - Gemini CLI:     GEMINI_PROJECT_DIR (hooks), GEMINI_CLI (MCP) | ~/.gemini/
  *   - KiloCode:       KILO, KILO_PID | ~/.config/kilo/
  *   - OpenCode:       OPENCODE, OPENCODE_PID | ~/.config/opencode/
@@ -18,12 +19,21 @@
  *   - JetBrains Copilot: IDEA_INITIAL_DIRECTORY, IDEA_HOME, JETBRAINS_CLIENT_ID | ~/.config/JetBrains/
  */
 import type { PlatformId, DetectionSignal, HookAdapter } from "./types.js";
+/** Test-only: reset the installed_plugins.json memo so each test starts cold. */
+export declare function __resetClaudeCodePluginCacheForTests(): void;
+/**
+ * Test-only: pretend installed_plugins.json does not exist (or has no
+ * context-mode entry). Lets tests that exercise the genuine vscode-copilot
+ * env-var path run on a developer machine that actually has context-mode
+ * installed as a Claude Code plugin.
+ */
+export declare function __seedClaudeCodePluginCacheMissForTests(): void;
 /**
  * High-confidence env vars per platform, checked in priority order.
  * Single source of truth — consumed by detectPlatform() below and by
  * tests that need to clear platform-related env vars deterministically.
  */
-export declare const PLATFORM_ENV_VARS: readonly [readonly ["claude-code", readonly ["CLAUDE_PROJECT_DIR", "CLAUDE_SESSION_ID"]], readonly ["antigravity", readonly ["ANTIGRAVITY_CLI_ALIAS"]], readonly ["cursor", readonly ["CURSOR_TRACE_ID", "CURSOR_CLI"]], readonly ["kilo", readonly ["KILO", "KILO_PID"]], readonly ["opencode", readonly ["OPENCODE", "OPENCODE_PID"]], readonly ["zed", readonly ["ZED_SESSION_ID", "ZED_TERM"]], readonly ["codex", readonly ["CODEX_THREAD_ID", "CODEX_CI"]], readonly ["gemini-cli", readonly ["GEMINI_PROJECT_DIR", "GEMINI_CLI"]], readonly ["vscode-copilot", readonly ["VSCODE_PID", "VSCODE_CWD"]], readonly ["jetbrains-copilot", readonly ["IDEA_INITIAL_DIRECTORY"]], readonly ["qwen-code", readonly ["QWEN_PROJECT_DIR"]], readonly ["omp", readonly ["PI_CODING_AGENT_DIR"]], readonly ["pi", readonly ["PI_PROJECT_DIR"]]];
+export declare const PLATFORM_ENV_VARS: readonly [readonly ["claude-code", readonly ["CLAUDE_CODE_ENTRYPOINT", "CLAUDE_PLUGIN_ROOT", "CLAUDE_PROJECT_DIR", "CLAUDE_SESSION_ID"]], readonly ["antigravity", readonly ["ANTIGRAVITY_CLI_ALIAS"]], readonly ["cursor", readonly ["CURSOR_TRACE_ID", "CURSOR_CLI"]], readonly ["kilo", readonly ["KILO", "KILO_PID"]], readonly ["opencode", readonly ["OPENCODE", "OPENCODE_PID"]], readonly ["zed", readonly ["ZED_SESSION_ID", "ZED_TERM"]], readonly ["codex", readonly ["CODEX_THREAD_ID", "CODEX_CI"]], readonly ["gemini-cli", readonly ["GEMINI_PROJECT_DIR", "GEMINI_CLI"]], readonly ["vscode-copilot", readonly ["VSCODE_PID", "VSCODE_CWD"]], readonly ["jetbrains-copilot", readonly ["IDEA_INITIAL_DIRECTORY"]], readonly ["qwen-code", readonly ["QWEN_PROJECT_DIR"]], readonly ["omp", readonly ["PI_CODING_AGENT_DIR"]], readonly ["pi", readonly ["PI_PROJECT_DIR"]]];
 /**
  * Sync map from platform identifier → home-relative path segments where that
  * platform stores its config. Mirrors the `super([...])` argument passed by

package/build/adapters/detect.js

@@ -7,7 +7,8 @@
  *   3. Fallback to Claude Code (low confidence — most common)
  *
  * Verified env vars per platform (from source code audit):
- *   - Claude Code:    CLAUDE_PROJECT_DIR, CLAUDE_SESSION_ID | ~/.claude/
+ *   - Claude Code:    CLAUDE_CODE_ENTRYPOINT, CLAUDE_PLUGIN_ROOT,
+ *                     CLAUDE_PROJECT_DIR, CLAUDE_SESSION_ID | ~/.claude/
  *   - Gemini CLI:     GEMINI_PROJECT_DIR (hooks), GEMINI_CLI (MCP) | ~/.gemini/
  *   - KiloCode:       KILO, KILO_PID | ~/.config/kilo/
  *   - OpenCode:       OPENCODE, OPENCODE_PID | ~/.config/opencode/
@@ -17,10 +18,45 @@
  *   - VS Code Copilot: VSCODE_PID, VSCODE_CWD | ~/.vscode/
  *   - JetBrains Copilot: IDEA_INITIAL_DIRECTORY, IDEA_HOME, JETBRAINS_CLIENT_ID | ~/.config/JetBrains/
  */
-import { existsSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { resolve } from "node:path";
 import { homedir } from "node:os";
 import { CLIENT_NAME_TO_PLATFORM } from "./client-map.js";
+let claudeCodePluginCache = null;
+function claudeCodeHasContextModePlugin() {
+    if (claudeCodePluginCache !== null) {
+        return claudeCodePluginCache !== "miss" && claudeCodePluginCache.hasCM;
+    }
+    try {
+        const path = resolve(homedir(), ".claude", "plugins", "installed_plugins.json");
+        const raw = readFileSync(path, "utf-8");
+        const parsed = JSON.parse(raw);
+        const keys = [
+            ...Object.keys(parsed.plugins ?? {}),
+            ...Object.keys(parsed.enabledPlugins ?? {}),
+        ];
+        const hasCM = keys.some((k) => k.includes("context-mode"));
+        claudeCodePluginCache = { hasCM };
+        return hasCM;
+    }
+    catch {
+        claudeCodePluginCache = "miss";
+        return false;
+    }
+}
+/** Test-only: reset the installed_plugins.json memo so each test starts cold. */
+export function __resetClaudeCodePluginCacheForTests() {
+    claudeCodePluginCache = null;
+}
+/**
+ * Test-only: pretend installed_plugins.json does not exist (or has no
+ * context-mode entry). Lets tests that exercise the genuine vscode-copilot
+ * env-var path run on a developer machine that actually has context-mode
+ * installed as a Claude Code plugin.
+ */
+export function __seedClaudeCodePluginCacheMissForTests() {
+    claudeCodePluginCache = "miss";
+}
 /**
  * High-confidence env vars per platform, checked in priority order.
  * Single source of truth — consumed by detectPlatform() below and by
@@ -30,7 +66,22 @@ export const PLATFORM_ENV_VARS = [
     // Order matters: forks listed BEFORE the fork's parent so collision
     // detection works. Every entry verified against platform's own runtime
     // source code (PR #376 follow-up: full audit, May 2026 — see git blame).
-    ["claude-code", ["CLAUDE_PROJECT_DIR", "CLAUDE_SESSION_ID"]],
+    // Claude Code — verified against a live `env` dump (2026-05-11):
+    //   CLAUDE_CODE_ENTRYPOINT=cli              (set on every CC session)
+    //   CLAUDE_PLUGIN_ROOT=/Users/.../<version>  (set when a plugin is loaded)
+    //   CLAUDE_PROJECT_DIR=/Users/.../project    (set in hooks context)
+    //   CLAUDE_SESSION_ID=<uuid>                 (legacy session marker)
+    // CLAUDE_CODE_ENTRYPOINT and CLAUDE_PLUGIN_ROOT are CC-exclusive — they
+    // are the disambiguators for issue #539 (Claude Code running inside a
+    // VS Code integrated terminal that has VSCODE_PID set). They MUST be
+    // checked here so detect resolves to claude-code BEFORE falling through
+    // to vscode-copilot at line 70 below.
+    ["claude-code", [
+            "CLAUDE_CODE_ENTRYPOINT",
+            "CLAUDE_PLUGIN_ROOT",
+            "CLAUDE_PROJECT_DIR",
+            "CLAUDE_SESSION_ID",
+        ]],
     // antigravity (Electron/VSCode fork) — google-gemini/gemini-cli
     // packages/core/src/ide/detect-ide.ts checks ANTIGRAVITY_CLI_ALIAS as the
     // canonical Antigravity marker. Listed before vscode-copilot.
@@ -148,6 +199,22 @@ export function detectPlatform(clientInfo) {
     // ── High confidence: environment variables ─────────────
     for (const [platform, vars] of PLATFORM_ENV_VARS) {
         if (vars.some((v) => process.env[v])) {
+            // Issue #539 belt-and-suspenders: VSCODE_PID/VSCODE_CWD are exported
+            // by VS Code into EVERY child process — including a Claude Code CLI
+            // launched from the integrated terminal. If env vars alone want to
+            // resolve to vscode-copilot, but ~/.claude/plugins/installed_plugins.json
+            // lists context-mode as a Claude Code plugin, the runtime must be
+            // Claude Code (VS Code Copilot has no plugin concept). The env-var
+            // tier above already handles the common case via CLAUDE_CODE_ENTRYPOINT
+            // / CLAUDE_PLUGIN_ROOT; this branch covers MCP-server-only boots where
+            // those vars have not propagated yet.
+            if (platform === "vscode-copilot" && claudeCodeHasContextModePlugin()) {
+                return {
+                    platform: "claude-code",
+                    confidence: "high",
+                    reason: "VSCODE_PID set but ~/.claude/plugins/installed_plugins.json lists context-mode (issue #539 fallback)",
+                };
+            }
             return {
                 platform,
                 confidence: "high",

package/build/adapters/gemini-cli/hooks.d.ts

@@ -27,6 +27,22 @@ export declare const HOOK_TYPES: {
     readonly SESSION_START: "SessionStart";
 };
 export type HookType = (typeof HOOK_TYPES)[keyof typeof HOOK_TYPES];
+/**
+ * Negative-lookahead matcher for external MCP tool namespaces on Gemini CLI (#529).
+ *
+ * Gemini CLI MCP wire shape: `mcp__<server>__<tool>` (verified in
+ * hooks/core/tool-naming.mjs — context-mode's own tools surface as
+ * `mcp__context-mode__<tool>`). This pattern fires BeforeTool for any
+ * external `mcp__<server>__<tool>` whose server segment does NOT contain
+ * `context-mode`. Without it, large payloads from slack / telegram / gdrive /
+ * notion-style MCPs bypass the routing nudge and flood the model's context.
+ *
+ * The negative lookahead `(?!.*context-mode)` covers both the canonical
+ * `mcp__context-mode__*` and any Claude shim `mcp__plugin_context-mode_*`
+ * names. Gemini native bare tool names (run_shell_command, read_file, …)
+ * are not `mcp__`-prefixed and are unaffected.
+ */
+export declare const EXTERNAL_MCP_MATCHER_PATTERN = "mcp__(?!.*context-mode)";
 /** Map of hook types to their script file names. */
 export declare const HOOK_SCRIPTS: Record<HookType, string>;
 /** Required hooks that must be configured for context-mode to function. */

package/build/adapters/gemini-cli/hooks.js

@@ -31,6 +31,25 @@ export const HOOK_TYPES = {
     SESSION_START: "SessionStart",
 };
 // ─────────────────────────────────────────────────────────
+// External MCP routing matcher (#529)
+// ─────────────────────────────────────────────────────────
+/**
+ * Negative-lookahead matcher for external MCP tool namespaces on Gemini CLI (#529).
+ *
+ * Gemini CLI MCP wire shape: `mcp__<server>__<tool>` (verified in
+ * hooks/core/tool-naming.mjs — context-mode's own tools surface as
+ * `mcp__context-mode__<tool>`). This pattern fires BeforeTool for any
+ * external `mcp__<server>__<tool>` whose server segment does NOT contain
+ * `context-mode`. Without it, large payloads from slack / telegram / gdrive /
+ * notion-style MCPs bypass the routing nudge and flood the model's context.
+ *
+ * The negative lookahead `(?!.*context-mode)` covers both the canonical
+ * `mcp__context-mode__*` and any Claude shim `mcp__plugin_context-mode_*`
+ * names. Gemini native bare tool names (run_shell_command, read_file, …)
+ * are not `mcp__`-prefixed and are unaffected.
+ */
+export const EXTERNAL_MCP_MATCHER_PATTERN = "mcp__(?!.*context-mode)";
+// ─────────────────────────────────────────────────────────
 // Hook script file names
 // ─────────────────────────────────────────────────────────
 /** Map of hook types to their script file names. */

package/build/adapters/gemini-cli/index.js

@@ -25,7 +25,7 @@ import { BaseAdapter } from "../base.js";
 // ─────────────────────────────────────────────────────────
 // Hook constants (re-exported from hooks.ts)
 // ─────────────────────────────────────────────────────────
-import { HOOK_TYPES as GEMINI_HOOK_NAMES, HOOK_SCRIPTS as GEMINI_HOOK_SCRIPTS, buildHookCommand as buildGeminiHookCommand, } from "./hooks.js";
+import { HOOK_TYPES as GEMINI_HOOK_NAMES, HOOK_SCRIPTS as GEMINI_HOOK_SCRIPTS, buildHookCommand as buildGeminiHookCommand, EXTERNAL_MCP_MATCHER_PATTERN, } from "./hooks.js";
 // ─────────────────────────────────────────────────────────
 // Adapter implementation
 // ─────────────────────────────────────────────────────────
@@ -178,7 +178,9 @@ export class GeminiCLIAdapter extends BaseAdapter {
             ],
             [GEMINI_HOOK_NAMES.BEFORE_TOOL]: [
                 {
-                    matcher: "run_shell_command|read_file|read_many_files|grep_search|search_file_content|web_fetch|activate_skill|mcp__plugin_context-mode",
+                    // Gemini native tools + context-mode own MCP (both canonical and Claude
+                    // shim prefixes) + external MCP catch-all (#529).
+                    matcher: `run_shell_command|read_file|read_many_files|grep_search|search_file_content|web_fetch|activate_skill|mcp__plugin_context-mode|mcp__context-mode|${EXTERNAL_MCP_MATCHER_PATTERN}`,
                     hooks: [
                         {
                             type: "command",

package/build/adapters/kiro/hooks.d.ts

@@ -18,6 +18,21 @@ export declare const HOOK_TYPES: {
 };
 export type HookType = (typeof HOOK_TYPES)[keyof typeof HOOK_TYPES];
 export declare const HOOK_SCRIPTS: Record<string, string>;
+/**
+ * Negative-lookahead matcher for external MCP tool namespaces on Kiro (#529).
+ *
+ * Kiro MCP wire shape: `@<server>/<tool>` (verified in
+ * hooks/core/tool-naming.mjs — context-mode's own tools surface as
+ * `@context-mode/<tool>`). This pattern fires PreToolUse for any external
+ * `@<server>/<tool>` whose server segment is NOT `context-mode`. Without it,
+ * large payloads from slack / telegram / gdrive / notion-style MCPs bypass
+ * the routing nudge and flood the model's context window — PostToolUse runs
+ * too late to keep the raw data out.
+ *
+ * Routing.mjs `isExternalMcpTool` is extended to recognise the `@<server>/`
+ * prefix shape so the routing branch returns external-MCP guidance.
+ */
+export declare const EXTERNAL_MCP_MATCHER_PATTERN = "@(?!context-mode/)";
 /**
  * Tools that context-mode's PreToolUse hook intercepts on Kiro.
  *
@@ -26,7 +41,7 @@ export declare const HOOK_SCRIPTS: Record<string, string>;
  *
  * MCP tools surface as @context-mode/ctx_* in Kiro.
  */
-export declare const PRE_TOOL_USE_MATCHERS: readonly ["execute_bash", "fs_read", "@context-mode/ctx_execute", "@context-mode/ctx_execute_file", "@context-mode/ctx_batch_execute"];
+export declare const PRE_TOOL_USE_MATCHERS: readonly ["execute_bash", "fs_read", "@context-mode/ctx_execute", "@context-mode/ctx_execute_file", "@context-mode/ctx_batch_execute", "@(?!context-mode/)"];
 /**
  * Combined matcher pattern for Kiro hook config (pipe-separated).
  * Used by generateHookConfig and configureAllHooks.

package/build/adapters/kiro/hooks.js

@@ -24,6 +24,24 @@ export const HOOK_SCRIPTS = {
     [HOOK_TYPES.AGENT_SPAWN]: "agentspawn.mjs",
 };
 // ─────────────────────────────────────────────────────────
+// External MCP routing matcher (#529)
+// ─────────────────────────────────────────────────────────
+/**
+ * Negative-lookahead matcher for external MCP tool namespaces on Kiro (#529).
+ *
+ * Kiro MCP wire shape: `@<server>/<tool>` (verified in
+ * hooks/core/tool-naming.mjs — context-mode's own tools surface as
+ * `@context-mode/<tool>`). This pattern fires PreToolUse for any external
+ * `@<server>/<tool>` whose server segment is NOT `context-mode`. Without it,
+ * large payloads from slack / telegram / gdrive / notion-style MCPs bypass
+ * the routing nudge and flood the model's context window — PostToolUse runs
+ * too late to keep the raw data out.
+ *
+ * Routing.mjs `isExternalMcpTool` is extended to recognise the `@<server>/`
+ * prefix shape so the routing branch returns external-MCP guidance.
+ */
+export const EXTERNAL_MCP_MATCHER_PATTERN = "@(?!context-mode/)";
+// ─────────────────────────────────────────────────────────
 // PreToolUse matchers
 // ─────────────────────────────────────────────────────────
 /**
@@ -40,6 +58,7 @@ export const PRE_TOOL_USE_MATCHERS = [
     "@context-mode/ctx_execute",
     "@context-mode/ctx_execute_file",
     "@context-mode/ctx_batch_execute",
+    EXTERNAL_MCP_MATCHER_PATTERN,
 ];
 /**
  * Combined matcher pattern for Kiro hook config (pipe-separated).