@gcszhn/mcp-sentinel-opencode2-plugin 1.5.0 → 1.6.0

package/README.md

@@ -32,6 +32,16 @@ can observe agent tool calls, but nothing can execute a host MCP tool
 programmatically. The adapter therefore runs in connection-pool mode: it reads
 the server config from the host and lets the shared core own the MCP client.
 
+The config capture also acts as the reload hook. V2 replays every registered
+MCP transform whenever the registry is rebuilt (config change, another plugin's
+transform, `ctx.mcp.reload()`), so the same callback refreshes the server list
+and calls the core's `reconcileConnections`: servers that were removed, disabled,
+or whose `command`/`cwd`/`env`/`url`/`headers` changed have their cached client
+closed instead of leaking a child process. Servers that are still configured
+keep their connection, and every V2 location's config is passed to the
+reconciliation so one location never closes a connection another one still
+polls.
+
 Unlike V1, V2 config declares servers under `mcp.servers.{name}`:
 
 ```jsonc

package/dist/host-registry.d.ts

@@ -15,16 +15,32 @@
  *
  * @module
  */
-import type { LogSink, SentinelEvent, SentinelNotifier, SentinelTask } from "@gcszhn/mcp-sentinel-core";
+import type { LogSink, McpConfig, SentinelEvent, SentinelNotifier, SentinelTask } from "@gcszhn/mcp-sentinel-core";
 /** A single plugin instance's notification and logging channels. */
 export interface HostBinding {
     /** Delivers a resolved sentinel to this instance's host session channel. */
     readonly notifier: SentinelNotifier;
     /** Writes a structured log entry through this instance's host log channel. */
     readonly logSink: LogSink;
+    /**
+     * The MCP servers this instance's location sees, refreshed on every MCP
+     * transform replay. Used to reconcile the process-wide connection cache:
+     * a connection may only be closed once **no** live instance needs it.
+     */
+    mcpConfig?: McpConfig;
 }
 /** Return the most recently registered binding, if any. */
 export declare function getActiveHostBinding(): HostBinding | undefined;
+/**
+ * The MCP config of every live plugin instance.
+ *
+ * The core's connection cache is process-wide, while each V2 instance only sees
+ * the servers configured for its own location. Reconciliation must therefore
+ * run against every location's config; merging by name would drop a server two
+ * locations configure differently (for example a project overriding a global
+ * server), and closing it would break the other location's polls.
+ */
+export declare function getCombinedMcpConfigs(): McpConfig[];
 /** Number of currently registered plugin instances. */
 export declare function getHostBindingCount(): number;
 /**

package/dist/host-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"host-registry.d.ts","sourceRoot":"","sources":["../src/host-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,KAAK,EACV,OAAO,EACP,aAAa,EACb,gBAAgB,EAChB,YAAY,EACb,MAAM,2BAA2B,CAAC;AAEnC,oEAAoE;AACpE,MAAM,WAAW,WAAW;IAC1B,4EAA4E;IAC5E,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC;IACpC,8EAA8E;IAC9E,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B;AAKD,2DAA2D;AAC3D,wBAAgB,oBAAoB,IAAI,WAAW,GAAG,SAAS,CAE9D;AAED,uDAAuD;AACvD,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAEtF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,aAAa,GACnB,OAAO,CAAC,IAAI,CAAC,CAKf;AAQD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAI9D;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAahE"}
+{"version":3,"file":"host-registry.d.ts","sourceRoot":"","sources":["../src/host-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,KAAK,EACV,OAAO,EACP,SAAS,EACT,aAAa,EACb,gBAAgB,EAChB,YAAY,EACb,MAAM,2BAA2B,CAAC;AAEnC,oEAAoE;AACpE,MAAM,WAAW,WAAW;IAC1B,4EAA4E;IAC5E,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC;IACpC,8EAA8E;IAC9E,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAKD,2DAA2D;AAC3D,wBAAgB,oBAAoB,IAAI,WAAW,GAAG,SAAS,CAE9D;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,IAAI,SAAS,EAAE,CAEnD;AAED,uDAAuD;AACvD,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAEtF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,aAAa,GACnB,OAAO,CAAC,IAAI,CAAC,CAKf;AAQD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAI9D;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAahE"}

package/dist/host-registry.js

@@ -22,6 +22,18 @@ const sessionOwners = new Map();
 export function getActiveHostBinding() {
     return bindings[bindings.length - 1];
 }
+/**
+ * The MCP config of every live plugin instance.
+ *
+ * The core's connection cache is process-wide, while each V2 instance only sees
+ * the servers configured for its own location. Reconciliation must therefore
+ * run against every location's config; merging by name would drop a server two
+ * locations configure differently (for example a project overriding a global
+ * server), and closing it would break the other location's polls.
+ */
+export function getCombinedMcpConfigs() {
+    return bindings.map((binding) => binding.mcpConfig ?? { servers: {} });
+}
 /** Number of currently registered plugin instances. */
 export function getHostBindingCount() {
     return bindings.length;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;;AAiK1C,wBAoNG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;;AAmK1C,wBAmOG"}

package/dist/index.js

@@ -15,9 +15,9 @@
  * @module
  */
 import { Plugin } from "@opencode/plugin";
-import { ACTION_DESCRIPTION, ARGS_DESCRIPTION, ATTACH_ID_DESCRIPTION, ATTACH_TIMEOUT_DESCRIPTION, ATTACH_TOOL_DESCRIPTION, COMPLETION_NOTIFICATION_NOTE, INTERVAL_DESCRIPTION, POLL_TIMEOUT_DESCRIPTION, POLL_TOOL_DESCRIPTION, READ_ID_DESCRIPTION, READ_LIMIT_DESCRIPTION, READ_OFFSET_DESCRIPTION, READ_TOOL_DESCRIPTION, SERVER_DESCRIPTION, STATUS_ID_DESCRIPTION, STATUS_TOOL_DESCRIPTION, TOOL_DESCRIPTION, UNTIL_DESCRIPTION, cleanup, disconnectAll, handleAttach, handlePoll, handleRead, handleStatus, logError, logInfo, logWarn, makeConnectionInvoker, makeServerResolver, } from "@gcszhn/mcp-sentinel-core";
+import { ACTION_DESCRIPTION, ARGS_DESCRIPTION, ATTACH_ID_DESCRIPTION, ATTACH_TIMEOUT_DESCRIPTION, ATTACH_TOOL_DESCRIPTION, COMPLETION_NOTIFICATION_NOTE, INTERVAL_DESCRIPTION, POLL_TIMEOUT_DESCRIPTION, POLL_TOOL_DESCRIPTION, READ_ID_DESCRIPTION, READ_LIMIT_DESCRIPTION, READ_OFFSET_DESCRIPTION, READ_TOOL_DESCRIPTION, SERVER_DESCRIPTION, STATUS_ID_DESCRIPTION, STATUS_TOOL_DESCRIPTION, TOOL_DESCRIPTION, UNTIL_DESCRIPTION, cleanup, disconnectAll, handleAttach, handlePoll, handleRead, handleStatus, logError, logInfo, logWarn, makeConnectionInvoker, makeServerResolver, reconcileConnections, } from "@gcszhn/mcp-sentinel-core";
 import { describeServerProblem, normalizeOpencode2McpConfig } from "./config.js";
-import { claimSession, getHostBindingCount, registerHostBinding, unregisterHostBinding, } from "./host-registry.js";
+import { claimSession, getCombinedMcpConfigs, getHostBindingCount, registerHostBinding, unregisterHostBinding, } from "./host-registry.js";
 import { buildNotificationText } from "./notify.js";
 /** Stable plugin identifier used by OpenCode diagnostics and plugin storage. */
 const PLUGIN_ID = "mcp-sentinel-opencode2";
@@ -97,14 +97,6 @@ function isNonNegativeInteger(value) {
 export default Plugin.define({
     id: PLUGIN_ID,
     async setup(ctx) {
-        // V2 exposes MCP *configuration* only inside a transform; `ctx.mcp.list()`
-        // returns connection status, not config. Capture the current entries from
-        // this cheap, synchronous, replayable callback. OpenCode replays it when
-        // the registry is rebuilt (for example after a config reload).
-        let mcpEntries = [];
-        await ctx.mcp.transform((editor) => {
-            mcpEntries = editor.list();
-        });
         const delivery = ctx.options.delivery === "steer" ? "steer" : "queue";
         const resume = ctx.options.resume !== false;
         const logSink = (level, message, extra) => {
@@ -158,6 +150,20 @@ export default Plugin.define({
         };
         const binding = { notifier, logSink };
         registerHostBinding(binding);
+        // V2 exposes MCP *configuration* only inside a transform; `ctx.mcp.list()`
+        // returns connection status, not config. The callback is replayed whenever
+        // OpenCode rebuilds the MCP registry (config reload, another plugin's
+        // transform, `ctx.mcp.reload()`), so it doubles as the reload hook: refresh
+        // this location's config snapshot and reconcile the process-wide connection
+        // cache. Reconcile is fire-and-forget because the callback is synchronous.
+        let mcpEntries = [];
+        await ctx.mcp.transform((editor) => {
+            mcpEntries = editor.list();
+            binding.mcpConfig = normalizeOpencode2McpConfig(mcpEntries);
+            void reconcileConnections(getCombinedMcpConfigs()).catch((err) => {
+                logWarn("Failed to reconcile MCP connections", { error: String(err) });
+            });
+        });
         logInfo("MCP Sentinel OpenCode 2 plugin initialized", { version: ctx.app.version });
         /** Read a server's connection status from the host's MCP domain. */
         const getMcpStatus = async (name) => {
@@ -294,6 +300,15 @@ ${COMPLETION_NOTIFICATION_NOTE}`,
             if (getHostBindingCount() === 0) {
                 cleanup();
                 await disconnectAll();
+                return;
+            }
+            // Other locations still share the process-wide connection cache: drop
+            // only the connections this location owned.
+            try {
+                await reconcileConnections(getCombinedMcpConfigs());
+            }
+            catch (err) {
+                logWarn("Failed to reconcile MCP connections on unload", { error: String(err) });
             }
         };
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gcszhn/mcp-sentinel-opencode2-plugin",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "OpenCode 2 (V2) plugin that acts as a sentinel between the AI agent and MCP servers — polling long-running tasks on the agent's behalf so that token-costly status loops never enter the LLM inference path",
   "type": "module",
   "main": "dist/index.js",
@@ -19,7 +19,7 @@
     "format:check": "prettier --check \"src/**/*.ts\" \"tests/**/*.ts\""
   },
   "dependencies": {
-    "@gcszhn/mcp-sentinel-core": "1.5.0",
+    "@gcszhn/mcp-sentinel-core": "1.6.0",
     "@opencode/plugin": "2.3.0"
   },
   "devDependencies": {