context-mode 1.0.136 → 1.0.138

package/.claude-plugin/marketplace.json

@@ -6,14 +6,14 @@
   },
   "metadata": {
     "description": "Claude Code plugins by Mert Koseoğlu",
-    "version": "1.0.136"
+    "version": "1.0.138"
   },
   "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.136",
+      "version": "1.0.138",
       "author": {
         "name": "Mert Koseoğlu"
       },

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "context-mode",
-  "version": "1.0.136",
+  "version": "1.0.138",
   "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",
@@ -27,5 +27,5 @@
       ]
     }
   },
-  "skills": "./skills/"
+  "skills": "./.claude/skills/"
 }

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "context-mode",
-  "version": "1.0.136",
+  "version": "1.0.138",
   "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.136",
+  "version": "1.0.138",
   "sandbox": {
     "mode": "permissive",
     "filesystem_access": "full",

package/.openclaw-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "context-mode",
-  "version": "1.0.136",
+  "version": "1.0.138",
   "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

@@ -421,20 +421,11 @@ Full configs: [`configs/cursor/hooks.json`](configs/cursor/hooks.json) | [`confi
    ```json
    {
      "$schema": "https://opencode.ai/config.json",
-     "mcp": {
-       "context-mode": {
-         "type": "local",
-         "command": ["context-mode"],
-         "environment": {
-           "CONTEXT_MODE_IDLE_TIMEOUT_MS": "900000"
-         }
-       }
-     },
      "plugin": ["context-mode"]
    }
    ```
 
-   The `mcp` entry registers all 11 MCP tools. The `plugin` entry enables hooks — OpenCode calls the plugin's TypeScript functions directly before and after each tool execution, blocking dangerous commands and enforcing sandbox routing.
+   The `plugin` entry registers all 11 `ctx_*` tools natively and enables hooks — OpenCode calls context-mode's TypeScript plugin in-process, so there is no redundant stdio MCP child per session.
 
 3. *(Optional)* Copy the routing rules file. The model needs an `AGENTS.md` file for routing awareness:
 
@@ -448,6 +439,8 @@ Full configs: [`configs/cursor/hooks.json`](configs/cursor/hooks.json) | [`confi
 
 **Verify:** In the OpenCode session, type `ctx stats`. Context-mode tools should appear and respond.
 
+**Upgrade note:** If an existing config still has `mcp.context-mode`, run `context-mode upgrade`. OpenCode now gets `ctx_*` tools from the plugin; the upgrade removes only `mcp.context-mode` and preserves any other MCP servers.
+
 **Routing:** Hooks enforce routing programmatically via `tool.execute.before` and `tool.execute.after`. The optional [`AGENTS.md`](configs/opencode/AGENTS.md) file provides routing instructions for model awareness. The `experimental.session.compacting` hook builds resume snapshots when the conversation compacts. The `experimental.chat.system.transform` hook injects the routing block and prior-session snapshots at session start, enabling session continuity across restarts. The `chat.message` hook captures user prompts and decisions (UserPromptSubmit equivalent).
 
 > **Note:** OpenCode lacks a real SessionStart hook ([#14808](https://github.com/sst/opencode/issues/14808), [#5409](https://github.com/sst/opencode/issues/5409)). The plugin uses `experimental.chat.system.transform` as a surrogate — it injects both the routing block and resume snapshots into the system prompt. User-prompt capture uses `chat.message` instead of the missing UserPromptSubmit hook. AGENTS.md/CLAUDE.md/CONTEXT.md rules are captured automatically on first hook fire per project.
@@ -474,20 +467,11 @@ Full configs: [`configs/opencode/opencode.json`](configs/opencode/opencode.json)
    ```json
    {
      "$schema": "https://app.kilo.ai/config.json",
-     "mcp": {
-       "context-mode": {
-         "type": "local",
-         "command": ["context-mode"],
-         "environment": {
-           "CONTEXT_MODE_IDLE_TIMEOUT_MS": "900000"
-         }
-       }
-     },
      "plugin": ["context-mode"]
    }
    ```
 
-   The `mcp` entry registers all 11 MCP tools. The `plugin` entry enables hooks — KiloCode calls the plugin's TypeScript functions directly before and after each tool execution, blocking dangerous commands and enforcing sandbox routing.
+   The `plugin` entry registers all 11 `ctx_*` tools natively and enables hooks — KiloCode calls context-mode's TypeScript plugin in-process, so there is no redundant stdio MCP child per session.
 
 3. *(Optional)* Copy the routing rules file. KiloCode shares the OpenCode plugin architecture, so the model needs an `AGENTS.md` file for routing awareness:
 
@@ -499,6 +483,8 @@ Full configs: [`configs/opencode/opencode.json`](configs/opencode/opencode.json)
 
 **Verify:** In the KiloCode session, type `ctx stats`. Context-mode tools should appear and respond.
 
+**Upgrade note:** If an existing config still has `mcp.context-mode`, run `context-mode upgrade`. KiloCode now gets `ctx_*` tools from the plugin; the upgrade removes only `mcp.context-mode` and preserves any other MCP servers.
+
 **Routing:** Hooks enforce routing programmatically via `tool.execute.before` and `tool.execute.after`. The optional [`AGENTS.md`](configs/opencode/AGENTS.md) file provides routing instructions for model awareness. The `experimental.session.compacting` hook builds resume snapshots when the conversation compacts. The `experimental.chat.system.transform` hook injects the routing block and prior-session snapshots at session start, enabling session continuity across restarts. The `chat.message` hook captures user prompts and decisions (UserPromptSubmit equivalent).
 
 > **Note:** KiloCode shares the same plugin architecture as OpenCode, using the OpenCodeAdapter with platform-specific configuration paths (`kilo.json` instead of `opencode.json`, `~/.config/kilo/` instead of `~/.config/opencode/`). Like OpenCode, it lacks a real SessionStart hook — the plugin uses `experimental.chat.system.transform` as a surrogate. User-prompt capture uses `chat.message` instead of the missing UserPromptSubmit hook. AGENTS.md/CLAUDE.md/CONTEXT.md rules are captured automatically on first hook fire per project.
@@ -1208,7 +1194,7 @@ Tool call output can be collapsed/expanded with the default Pi's default keybind
 
 | Feature | Claude Code | Qwen Code | Gemini CLI | VS Code Copilot | JetBrains Copilot | Cursor | OpenCode | KiloCode | OpenClaw | Codex CLI | Antigravity | Kiro | Zed | Pi | OMP |
 |---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-| MCP Server | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
+| MCP Server / Native Tools | Yes | Yes | Yes | Yes | Yes | Yes | Native plugin | Native plugin | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
 | PreToolUse Hook | Yes | Yes | Yes | Yes | Yes | Yes | Plugin | Plugin | Plugin | Yes | -- | Yes | -- | Yes (extension) | Plugin |
 | PostToolUse Hook | Yes | Yes | Yes | Yes | Yes | Yes | Plugin | Plugin | Plugin | Yes | -- | Yes | -- | Yes (extension) | Plugin |
 | SessionStart Hook | Yes | Yes | Yes | Yes | Yes | -- | ✓ (via experimental.chat.system.transform) | ✓ (via experimental.chat.system.transform) | Plugin | Yes | -- | -- | -- | Yes (extension) | Plugin |
@@ -1405,14 +1391,13 @@ That blocks loopback + RFC1918 + ULA in addition to the always-blocked ranges. U
 
 ### Lifecycle environment variables
 
-Two runtime knobs control how MCP server processes self-manage. Defaults are conservative after [#592](https://github.com/mksglu/context-mode/issues/592): idle self-shutdown is disabled unless a host config explicitly opts in. OpenCode and KiloCode opt in because they open one MCP child per session/subagent; Claude Code/Codex/editor hosts keep registered tool handles after a clean MCP exit and therefore must not idle-exit by default.
+One runtime knob controls MCP sibling cleanup. Idle self-shutdown was removed after [#592](https://github.com/mksglu/context-mode/issues/592): hosts can keep registered tool handles after a clean MCP exit, making a timer-driven exit unsafe.
 
 | Variable | Default | Purpose |
 |---|---|---|
-| `CONTEXT_MODE_IDLE_TIMEOUT_MS` | `0` (disabled) | When set to a positive integer, an MCP child self-exits cleanly after this many milliseconds of stdin/request inactivity. OpenCode and KiloCode configs set `900000` (15 min) because those hosts can accumulate one MCP child per session/subagent. Leave disabled for hosts that do not auto-respawn after MCP EOF (Claude Code, Codex, editor MCP clients) or ctx_* tools may go stale after idle. |
 | `CONTEXT_MODE_STARTUP_SWEEP` | `1` (enabled) | At boot, a newly-spawned MCP child reaps any other context-mode MCP server pids that share its parent process (`sameParentOnly: true` — never touches MCP children of a different host). This reclaims accumulated siblings immediately instead of waiting for each idle timer to fire. Set to `0` or `false` to disable (useful when you intentionally want multiple concurrent MCP children under the same host, e.g. multi-tenant test runners). |
 
-Both vars are read fresh at MCP server start — no restart of the host CLI is required, just spawn a new MCP child (open a new session) for changes to take effect. Invalid/non-numeric `CONTEXT_MODE_IDLE_TIMEOUT_MS` values fall back to `0` (disabled); unrecognized `CONTEXT_MODE_STARTUP_SWEEP` values fall back to enabled.
+`CONTEXT_MODE_STARTUP_SWEEP` is read fresh at MCP server start — no restart of the host CLI is required, just spawn a new MCP child (open a new session) for changes to take effect. Unrecognized values fall back to enabled.
 
 ### Routing-guidance environment variables
 

package/build/adapters/codex/index.js

@@ -402,7 +402,7 @@ export class CodexAdapter extends BaseAdapter {
                 }]);
         }
         const expected = this.generateHookConfig("");
-        return results.concat(Object.entries(expected).map(([hookName, entries]) => {
+        const hookChecks = Object.entries(expected).map(([hookName, entries]) => {
             const actualEntries = hookConfig.config.hooks?.[hookName];
             const expectedEntry = entries[0];
             const ok = Array.isArray(actualEntries)
@@ -410,7 +410,7 @@ export class CodexAdapter extends BaseAdapter {
             const missingStatus = hookName === "PreCompact" ? "warn" : "fail";
             return {
                 check: `${hookName} hook`,
-                status: ok ? "pass" : missingStatus,
+                status: (ok ? "pass" : missingStatus),
                 message: ok
                     ? `${hookName} hook configured in ${this.getHooksPath()}`
                     : hookName === "PreCompact"
@@ -418,7 +418,28 @@ export class CodexAdapter extends BaseAdapter {
                         : `${hookName} hook missing or not pointing to context-mode`,
                 fix: ok ? undefined : `Update ${this.getHooksPath()} to match configs/codex/hooks.json`,
             };
-        }));
+        });
+        // #603: surface duplicate context-mode entries per hook event. Codex fires
+        // every matching entry, so duplicates double the work, can saturate the
+        // MCP transport (`Transport closed`), and have been observed to inflate
+        // codex-tui.log into the multi-GB range. `context-mode upgrade` collapses
+        // them via `upsertManagedHookEntry`, so the fix is one command away.
+        const duplicateChecks = [];
+        for (const hookName of Object.keys(expected)) {
+            const actualEntries = hookConfig.config.hooks?.[hookName];
+            if (!Array.isArray(actualEntries))
+                continue;
+            const managedCount = actualEntries.filter((entry) => this.isManagedContextModeEntry(hookName, entry)).length;
+            if (managedCount > 1) {
+                duplicateChecks.push({
+                    check: `${hookName} duplicates`,
+                    status: "warn",
+                    message: `${managedCount} context-mode entries found for ${hookName} in ${this.getHooksPath()}; Codex will fire all of them`,
+                    fix: "context-mode upgrade (collapses duplicate context-mode entries; preserves unrelated hooks)",
+                });
+            }
+        }
+        return results.concat(hookChecks, duplicateChecks);
     }
     checkPluginRegistration() {
         // Check for context-mode in [mcp_servers] section of config.toml

package/build/adapters/jetbrains-copilot/hooks.d.ts

@@ -45,7 +45,15 @@ export declare function isContextModeHook(entry: {
 }, hookType: HookType): boolean;
 /**
  * Build the hook command string for a given hook type.
- * Uses absolute node path to avoid PATH issues (homebrew, nvm, volta, etc.).
- * Falls back to CLI dispatcher if pluginRoot is not provided.
+ *
+ * Always emits the CLI dispatcher form
+ * (`context-mode hook jetbrains-copilot <event>`) — the `pluginRoot`
+ * argument is accepted for API compatibility but intentionally ignored.
+ *
+ * Same Tier C contract as VS Code Copilot (Issue #613):
+ * `.github/hooks/context-mode.json` is workspace-committed (team-shared
+ * via git). Embedding `process.execPath` or absolute pluginRoot paths
+ * leaks PII and breaks cross-machine portability. See
+ * src/adapters/vscode-copilot/hooks.ts for the full archaeology.
  */
-export declare function buildHookCommand(hookType: HookType, pluginRoot?: string): string;
+export declare function buildHookCommand(hookType: HookType, _pluginRoot?: string): string;

package/build/adapters/jetbrains-copilot/hooks.js

@@ -1,4 +1,3 @@
-import { buildNodeCommand } from "../types.js";
 /**
  * adapters/jetbrains-copilot/hooks — JetBrains Copilot hook definitions and matchers.
  *
@@ -68,16 +67,21 @@ export function isContextModeHook(entry, hookType) {
 }
 /**
  * Build the hook command string for a given hook type.
- * Uses absolute node path to avoid PATH issues (homebrew, nvm, volta, etc.).
- * Falls back to CLI dispatcher if pluginRoot is not provided.
+ *
+ * Always emits the CLI dispatcher form
+ * (`context-mode hook jetbrains-copilot <event>`) — the `pluginRoot`
+ * argument is accepted for API compatibility but intentionally ignored.
+ *
+ * Same Tier C contract as VS Code Copilot (Issue #613):
+ * `.github/hooks/context-mode.json` is workspace-committed (team-shared
+ * via git). Embedding `process.execPath` or absolute pluginRoot paths
+ * leaks PII and breaks cross-machine portability. See
+ * src/adapters/vscode-copilot/hooks.ts for the full archaeology.
  */
-export function buildHookCommand(hookType, pluginRoot) {
+export function buildHookCommand(hookType, _pluginRoot) {
     const scriptName = HOOK_SCRIPTS[hookType];
     if (!scriptName) {
         throw new Error(`No script defined for hook type: ${hookType}`);
     }
-    if (pluginRoot) {
-        return buildNodeCommand(`${pluginRoot}/hooks/jetbrains-copilot/${scriptName}`);
-    }
     return `context-mode hook jetbrains-copilot ${hookType.toLowerCase()}`;
 }

package/build/adapters/opencode/index.d.ts

@@ -58,6 +58,7 @@ export declare class OpenCodeAdapter extends BaseAdapter implements HookAdapter
      * Check whether a settings object has the context-mode plugin registered.
      */
     private hasContextModePlugin;
+    private hasLegacyContextModeMcp;
     /**
      * Extract session ID from OpenCode hook input.
      * OpenCode uses camelCase sessionID.

package/build/adapters/opencode/index.js

@@ -310,6 +310,14 @@ export class OpenCodeAdapter extends BaseAdapter {
                 fix: "context-mode upgrade",
             });
         }
+        if (this.hasLegacyContextModeMcp(settings)) {
+            results.push({
+                check: "Legacy MCP registration",
+                status: "warn",
+                message: "mcp.context-mode is redundant: ctx_* tools are now provided by the plugin",
+                fix: "context-mode upgrade (removes only mcp.context-mode; preserves other MCP servers)",
+            });
+        }
         // Note: SessionStart handled via experimental.chat.system.transform surrogate
         results.push({
             check: "SessionStart hook",
@@ -368,6 +376,16 @@ export class OpenCodeAdapter extends BaseAdapter {
             changes.push("context-mode already in plugin array");
         }
         settings.plugin = plugins;
+        const mcp = settings.mcp;
+        if (mcp && typeof mcp === "object" && !Array.isArray(mcp)) {
+            const servers = mcp;
+            if (Object.prototype.hasOwnProperty.call(servers, "context-mode")) {
+                delete servers["context-mode"];
+                changes.push("Removed legacy context-mode MCP block (plugin-native tools)");
+            }
+            if (Object.keys(servers).length === 0)
+                delete settings.mcp;
+        }
         this.writeSettings(settings);
         return changes;
     }
@@ -405,6 +423,13 @@ export class OpenCodeAdapter extends BaseAdapter {
         const plugins = settings.plugin;
         return Array.isArray(plugins) && plugins.some((p) => typeof p === "string" && p.includes("context-mode"));
     }
+    hasLegacyContextModeMcp(settings) {
+        const mcp = settings.mcp;
+        return !!(mcp &&
+            typeof mcp === "object" &&
+            !Array.isArray(mcp) &&
+            Object.prototype.hasOwnProperty.call(mcp, "context-mode"));
+    }
     /**
      * Extract session ID from OpenCode hook input.
      * OpenCode uses camelCase sessionID.

package/build/adapters/opencode/plugin.d.ts

@@ -44,6 +44,27 @@ type PluginContext = {
     client: PluginClient;
     directory: string;
 };
+type NativeToolContext = {
+    sessionID: string;
+    messageID: string;
+    agent: string;
+    directory: string;
+    worktree?: string;
+    abort?: AbortSignal;
+    metadata?: (input: {
+        title?: string;
+        metadata?: Record<string, unknown>;
+    }) => void;
+};
+type NativeToolDefinition = {
+    description: string;
+    args: Record<string, unknown>;
+    execute: (args: Record<string, unknown>, ctx: NativeToolContext) => Promise<string | {
+        title?: string;
+        output: string;
+        metadata?: Record<string, unknown>;
+    }>;
+};
 /** OpenCode tool.execute.before — first parameter */
 interface BeforeHookInput {
     tool: string;
@@ -130,6 +151,7 @@ declare function systemHasRoutingInstructions(system: string[]): boolean;
  * OpenCode expects: export const ContextModePlugin = (ctx) => Promise<Hooks>
  */
 declare function createContextModePlugin(ctx: PluginContext): Promise<{
+    tool: Record<string, NativeToolDefinition>;
     "tool.execute.before": (input: BeforeHookInput, output: BeforeHookOutput) => Promise<void>;
     "tool.execute.after": (input: AfterHookInput, output: AfterHookOutput) => Promise<void>;
     "chat.message": (input: ChatMessageHookInput, output: ChatMessageHookOutput) => Promise<void>;

package/build/adapters/opencode/plugin.js

@@ -231,7 +231,59 @@ async function createContextModePlugin(ctx) {
             // Never break the turn on debug-log failure.
         }
     }
+    async function buildNativeTools() {
+        // Import the existing MCP server registry without starting its stdio
+        // transport. This is the plugin-only bridge for #574: OpenCode/Kilo
+        // call ctx_* tools in-process through Hooks.tool instead of spawning
+        // a separate MCP child per session.
+        const prevEmbedded = process.env.CONTEXT_MODE_EMBEDDED_PLUGIN_TOOLS;
+        process.env.CONTEXT_MODE_EMBEDDED_PLUGIN_TOOLS = "1";
+        let mod;
+        try {
+            mod = await import("../../server.js");
+        }
+        finally {
+            if (prevEmbedded === undefined)
+                delete process.env.CONTEXT_MODE_EMBEDDED_PLUGIN_TOOLS;
+            else
+                process.env.CONTEXT_MODE_EMBEDDED_PLUGIN_TOOLS = prevEmbedded;
+        }
+        const tools = {};
+        for (const registered of mod.REGISTERED_CTX_TOOLS) {
+            const config = registered.config;
+            const schema = config.inputSchema;
+            const shape = typeof schema?.shape === "object" && schema.shape !== null
+                ? schema.shape
+                : typeof schema?._def?.shape === "function"
+                    ? schema._def.shape()
+                    : {};
+            tools[registered.name] = {
+                description: String(config.description ?? ""),
+                args: shape,
+                async execute(args, toolCtx) {
+                    toolCtx.metadata?.({ title: String(config.title ?? registered.name) });
+                    const project = toolCtx.directory || projectDir;
+                    const result = await mod.withProjectDirOverride({ projectDir: project, sessionId: toolCtx.sessionID }, async () => registered.handler(args ?? {}));
+                    const r = result;
+                    const text = Array.isArray(r?.content)
+                        ? r.content
+                            .filter((c) => c?.type === "text" && typeof c.text === "string")
+                            .map((c) => c.text)
+                            .join("\n")
+                        : typeof result === "string"
+                            ? result
+                            : JSON.stringify(result ?? "");
+                    if (r?.isError)
+                        throw new Error(text || `${registered.name} returned an error`);
+                    return { title: String(config.title ?? registered.name), output: text };
+                },
+            };
+        }
+        return tools;
+    }
+    const nativeTools = await buildNativeTools();
     return {
+        tool: nativeTools,
         // ── PreToolUse: Routing enforcement ─────────────────
         "tool.execute.before": async (input, output) => {
             const toolName = input.tool ?? "";

package/build/adapters/pi/extension.js

@@ -288,6 +288,11 @@ export default function piExtension(pi) {
         pwd: process.env.PWD,
         cwd: process.cwd(),
     });
+    // Attribution object for project isolation — ensures every event recorded
+    // by the pi adapter carries the correct project_dir. Without this, all
+    // events default to project_dir="" which causes cross-project data leakage
+    // in shared SessionDB instances.
+    const _attribution = { projectDir, source: "workspace_root", confidence: 0.98 };
     const db = getOrCreateDB();
     // ── 1. session_start — Initialize session ──────────────
     pi.on("session_start", (_event, ctx) => {
@@ -351,7 +356,7 @@ export default function piExtension(pi) {
             const events = extractEvents(hookInput);
             if (events.length > 0) {
                 for (const ev of events) {
-                    db.insertEvent(_sessionId, ev, "PostToolUse");
+                    db.insertEvent(_sessionId, ev, "PostToolUse", _attribution);
                 }
             }
             else if (rawToolName) {
@@ -369,7 +374,7 @@ export default function piExtension(pi) {
                         .update(data)
                         .digest("hex")
                         .slice(0, 16),
-                }, "PostToolUse");
+                }, "PostToolUse", _attribution);
             }
         }
         catch {
@@ -398,7 +403,7 @@ export default function piExtension(pi) {
             if (prompt) {
                 const userEvents = extractUserEvents(prompt);
                 for (const ev of userEvents) {
-                    db.insertEvent(_sessionId, ev, "UserPromptSubmit");
+                    db.insertEvent(_sessionId, ev, "UserPromptSubmit", _attribution);
                 }
             }
             const existingPrompt = String(event?.systemPrompt ?? "");
@@ -420,6 +425,7 @@ export default function piExtension(pi) {
                 minPriority: 3,
                 limit: 50,
             });
+            let behavioralDirective = "";
             if (activeEvents.length > 0) {
                 const buildAuto = await getAutoInjection(pluginRoot);
                 let memoryContext = "";
@@ -428,6 +434,14 @@ export default function piExtension(pi) {
                         category: String(e.category ?? ""),
                         data: String(e.data ?? ""),
                     })));
+                    const bdMatch = memoryContext.match(/(<behavioral_directive>\n[^<]*\n<\/behavioral_directive>)/);
+                    if (bdMatch) {
+                        behavioralDirective = bdMatch[1];
+                        memoryContext = memoryContext.replace(bdMatch[1], "");
+                        if (memoryContext.match(/^<session_state[^>]*>\s*<\/session_state>\s*$/)) {
+                            memoryContext = "";
+                        }
+                    }
                 }
                 // Fallback (or if helper produced empty output): inline 500-token cap.
                 if (!memoryContext) {
@@ -453,6 +467,8 @@ export default function piExtension(pi) {
                 parts.push(resume.snapshot);
                 db.markResumeConsumed(_sessionId);
             }
+            if (behavioralDirective)
+                parts.push(behavioralDirective);
             // Return modified systemPrompt only if we added something beyond existing.
             const baseLen = existingPrompt ? 1 : 0;
             if (parts.length > baseLen) {
@@ -491,7 +507,7 @@ export default function piExtension(pi) {
                 data,
                 priority: 1,
                 data_hash: createHash("sha256").update(data).digest("hex").slice(0, 16),
-            }, "PostToolUse");
+            }, "PostToolUse", _attribution);
         }
         catch {
             // best effort — never break provider response

package/build/adapters/pi/mcp-bridge.d.ts

@@ -97,12 +97,13 @@ export declare class MCPStdioClient {
     private onExit;
     private onData;
     request<T = unknown>(method: string, params: unknown, timeoutMs?: number): Promise<T>;
+    private writeFrame;
     notify(method: string, params: unknown): void;
     initialize(): Promise<void>;
     listTools(): Promise<MCPTool[]>;
     callTool(name: string, args: unknown): Promise<MCPCallResult>;
     /**
-     * Respawn the MCP child after an exit (clean idle shutdown or crash).
+     * Respawn the MCP child after an exit (clean shutdown or crash).
      * Resets state so a fresh `start()` + `initialize()` cycle runs, then
      * the caller's pending request flows through the new child.
      *

package/build/adapters/pi/mcp-bridge.js

@@ -366,14 +366,60 @@ export class MCPStdioClient {
                 },
             });
             const frame = JSON.stringify({ jsonrpc: "2.0", id, method, params });
-            this.child.stdin?.write(frame + "\n");
+            const rejectWrite = (err) => {
+                const handler = this.pending.get(id);
+                if (handler) {
+                    this.pending.delete(id);
+                    handler.reject(err);
+                    return;
+                }
+                reject(err);
+            };
+            this.writeFrame(frame, rejectWrite);
         });
     }
+    writeFrame(frame, onError) {
+        if (!this.child || this.exited) {
+            onError?.(new Error("MCP server exited"));
+            return false;
+        }
+        const stdin = this.child.stdin;
+        if (!stdin || stdin.destroyed || stdin.writableEnded || stdin.closed) {
+            this.onExit();
+            onError?.(new Error("MCP server stdin unavailable"));
+            return false;
+        }
+        try {
+            stdin.write(frame + "\n", (err) => {
+                if (!err)
+                    return;
+                const code = err.code;
+                if (code === "EPIPE" || code === "ERR_STREAM_DESTROYED") {
+                    this.onExit();
+                    onError?.(err);
+                    return;
+                }
+                onError?.(err);
+            });
+            return true;
+        }
+        catch (err) {
+            const code = err && typeof err === "object" && "code" in err
+                ? err.code
+                : undefined;
+            if (err instanceof Error && (code === "EPIPE" || code === "ERR_STREAM_DESTROYED")) {
+                this.onExit();
+                onError?.(err);
+                return false;
+            }
+            throw err;
+        }
+    }
     notify(method, params) {
         if (!this.child)
             return;
         const frame = JSON.stringify({ jsonrpc: "2.0", method, params });
-        this.child.stdin?.write(frame + "\n");
+        this.writeFrame(frame);
     }
     async initialize() {
         if (this.initialized)
@@ -402,7 +448,7 @@ export class MCPStdioClient {
         return this.request("tools/call", { name, arguments: args ?? {} }, DEFAULT_CALL_TIMEOUT_MS);
     }
     /**
-     * Respawn the MCP child after an exit (clean idle shutdown or crash).
+     * Respawn the MCP child after an exit (clean shutdown or crash).
      * Resets state so a fresh `start()` + `initialize()` cycle runs, then
      * the caller's pending request flows through the new child.
      *

package/build/adapters/vscode-copilot/hooks.d.ts

@@ -41,7 +41,31 @@ export declare function isContextModeHook(entry: {
 }, hookType: HookType): boolean;
 /**
  * Build the hook command string for a given hook type.
- * Uses absolute node path to avoid PATH issues (homebrew, nvm, volta, etc.).
- * Falls back to CLI dispatcher if pluginRoot is not provided.
+ *
+ * Always emits the CLI dispatcher form
+ * (`context-mode hook vscode-copilot <event>`) — the `pluginRoot` argument
+ * is accepted for API compatibility but intentionally ignored.
+ *
+ * Why the dispatcher form is mandatory here (Issue #613 — Tier C contract):
+ *   `.github/hooks/context-mode.json` is a **workspace-committed** file
+ *   (upstream: refs/platforms/vscode-copilot/assets/prompts/skills/
+ *   agent-customization/references/hooks.md line 7 — "Workspace
+ *   (team-shared)"). It lands in every teammate's `git status`. Embedding
+ *   `process.execPath` or any absolute pluginRoot path here:
+ *     - Leaks PII (username, `C:/Users/<user>/...` paths).
+ *     - Breaks cross-machine portability (fnm/nvm/volta/brew shims are
+ *       per-shell-session ephemeral; the path goes stale immediately on
+ *       Windows + fnm).
+ *
+ * Commit `f5c9d02` (2026-03-06) added an absolute-path branch when a
+ * pluginRoot was passed. It solved a real PATH-availability bug on
+ * Brew/nvm setups by going too far — the CLI then always passes
+ * pluginRoot, so the portable form became unreachable in production
+ * and every `/ctx-upgrade` baked a non-portable command into the
+ * committed config. This reverts to the pre-`f5c9d02` shape.
+ *
+ * For users without a global install, the recovery path is the same as
+ * every other CLI-dispatcher adapter (cursor, codex):
+ *   `npm install -g context-mode`
  */
-export declare function buildHookCommand(hookType: HookType, pluginRoot?: string): string;
+export declare function buildHookCommand(hookType: HookType, _pluginRoot?: string): string;