@skydiveai/pi-extensions 0.1.258-beta.6 → 0.1.258-beta.60

package/dist/index.d.mts

@@ -1,27 +1,9 @@
-/// <reference types="node" />
 import { A2AOptions, Middleware, ProtocolsOptions } from "@skydiveai/pi-server";
 import { AgentSession, ExtensionFactory } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import * as _$qs from "qs";
-import * as _$express from "express";
 import { Logger } from "pino";
 
-//#region ../../node_modules/@types/express-serve-static-core/index.d.ts
-declare global {
-  namespace Express {
-    // These open interfaces may be extended in an application-specific manner via declaration merging.
-    // See for example method-override.d.ts (https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/method-override/index.d.ts)
-    interface Request {}
-    interface Response {}
-    interface Locals {}
-    interface Application {}
-  }
-}
-interface ParamsDictionary {
-  [key: string]: string;
-}
-//#endregion
 //#region src/harness.d.ts
 type CreateHarnessOptions = ProtocolsOptions & {
   cwd: string;
@@ -44,7 +26,7 @@ declare function createHarness(options: CreateHarnessOptions): {
   };
   protocols: {
     handlers: {
-      /** Express-style; mount at /a2a. */a2a: _$express.RequestHandler<ParamsDictionary, any, any, _$qs.ParsedQs, Record<string, any>>; /** GET /.well-known/agent-card.json. */
+      /** Express-style; mount at /a2a. */a2a: RequestHandler; /** GET /.well-known/agent-card.json. */
       agentCard: Middleware; /** Mirrors each vendor's API shape. */
       openai: {
         v1: {

package/dist/index.mjs

@@ -1288,17 +1288,23 @@ function legacyMcpToolName({ serverName, toolName }) {
 * a small, focused unit-test surface (typebox validation, error formatting).
 */
 const MCP_CONFIG_FILENAME = "mcp.config.json";
+const ToolSelectionSchema = {
+	tools: Type.Optional(Type.Union([Type.Array(Type.String()), Type.Null()])),
+	excludeTools: Type.Optional(Type.Union([Type.Array(Type.String()), Type.Null()]))
+};
 const StdioServerSchema = Type.Object({
 	transport: Type.Literal("stdio"),
 	command: Type.String(),
 	args: Type.Array(Type.String()),
 	env: Type.Optional(Type.Union([Type.Record(Type.String(), Type.String()), Type.Null()])),
-	cwd: Type.Optional(Type.Union([Type.String(), Type.Null()]))
+	cwd: Type.Optional(Type.Union([Type.String(), Type.Null()])),
+	...ToolSelectionSchema
 });
 const HttpServerSchema = Type.Object({
 	transport: Type.Literal("http"),
 	url: Type.String(),
-	headers: Type.Optional(Type.Union([Type.Record(Type.String(), Type.String()), Type.Null()]))
+	headers: Type.Optional(Type.Union([Type.Record(Type.String(), Type.String()), Type.Null()])),
+	...ToolSelectionSchema
 });
 const ServerSchema = Type.Union([StdioServerSchema, HttpServerSchema]);
 const McpConfigSchema = Type.Object({ servers: Type.Record(Type.String(), ServerSchema) });
@@ -1325,11 +1331,15 @@ async function loadMcpConfig(path) {
 	for (const [id, server] of Object.entries(json.servers)) if (server.transport === "stdio") servers[id] = {
 		...server,
 		env: server.env ?? null,
-		cwd: server.cwd ?? null
+		cwd: server.cwd ?? null,
+		tools: server.tools ?? null,
+		excludeTools: server.excludeTools ?? null
 	};
 	else servers[id] = {
 		...server,
-		headers: server.headers ?? null
+		headers: server.headers ?? null,
+		tools: server.tools ?? null,
+		excludeTools: server.excludeTools ?? null
 	};
 	return { servers };
 }
@@ -1491,6 +1501,54 @@ function toProviderSafeSchema(inputSchema) {
 * reloads — only changed configs reconnect.
 */
 const log$17 = logger.child({ module: "mcp-extension" });
+function resolveToolSelection(server) {
+	return {
+		allow: server?.tools?.length ? new Set(server.tools) : null,
+		deny: new Set(server?.excludeTools ?? [])
+	};
+}
+/**
+* Connection identity of a server config: everything except the per-server
+* tool selection. `tools`/`excludeTools` only filter the advertised list at
+* registration time, so an edit to them must re-register tools, not tear
+* down and re-handshake the client (kills the stdio process, re-runs the
+* http OAuth/handshake for an identical connection).
+*/
+function connectionKey(serverConfig) {
+	const { tools: _tools, excludeTools: _excludeTools, ...connection } = serverConfig;
+	return JSON.stringify(connection);
+}
+/**
+* Apply a server's configured tool selection to its advertised list.
+* Runs BEFORE the budget allocator: a filtered set is what competes for
+* the per-server / total / token caps, so an allowlisted tool wins the
+* budget contest instead of being truncated behind tools the config
+* never asked for. Intentional exclusions are NOT budget drops — they
+* don't count toward `droppedTools` and produce no truncation warning.
+*/
+function applyToolSelection(tools, selection) {
+	if (selection.allow === null && selection.deny.size === 0) return {
+		list: tools,
+		filteredOut: 0,
+		unknownTools: [],
+		unknownExcludeTools: []
+	};
+	const kept = [];
+	for (const tool of tools) {
+		if (selection.allow !== null && !selection.allow.has(tool.name)) continue;
+		if (selection.deny.has(tool.name)) continue;
+		kept.push(tool);
+	}
+	const notAdvertised = (names) => [...names].filter((name) => !tools.some((tool) => tool.name === name));
+	const unknownTools = selection.allow === null ? [] : notAdvertised(selection.allow);
+	const unknownExcludeTools = selection.deny.size === 0 ? [] : notAdvertised(selection.deny);
+	return {
+		list: kept,
+		filteredOut: tools.length - kept.length,
+		unknownTools,
+		unknownExcludeTools
+	};
+}
 async function closeConnected(connected) {
 	try {
 		await connected.client.close();
@@ -1797,9 +1855,11 @@ var McpExtension = class {
 			else if (outcome.change === "refreshed") summary.refreshed.push(id);
 		}
 		const alloc = outcomes.filter((o) => Boolean(o.tools)).map((o) => {
+			const selection = resolveToolSelection(config.servers[o.id]);
+			const picked = applyToolSelection(o.tools.list, selection);
 			const { tools: list, skipped } = providerSafeTools({
 				serverId: o.id,
-				tools: o.tools.list
+				tools: picked.list
 			});
 			return {
 				id: o.id,
@@ -1807,6 +1867,9 @@ var McpExtension = class {
 				list,
 				advertised: o.tools.list.length,
 				skipped,
+				filtered: picked.filteredOut,
+				unknownTools: picked.unknownTools,
+				unknownExcludeTools: picked.unknownExcludeTools,
 				room: Math.min(list.length, limits.maxToolsPerServer),
 				registered: 0,
 				serverTokens: 0,
@@ -1850,7 +1913,10 @@ var McpExtension = class {
 				registered: s.registered,
 				tokens: s.serverTokens,
 				droppedReason,
-				skipped: s.skipped
+				skipped: s.skipped,
+				filtered: s.filtered,
+				unknownTools: s.unknownTools,
+				unknownExcludeTools: s.unknownExcludeTools
 			};
 		}
 		return summary;
@@ -1862,10 +1928,10 @@ var McpExtension = class {
 	* map/summary, so callers can run these concurrently.
 	*/
 	async reconcileServer({ id, serverConfig, existing, connectTimeoutMs }) {
-		const configKey = JSON.stringify(serverConfig);
+		const configKey = connectionKey(serverConfig);
 		let action;
 		let connected;
-		if (existing && existing.configKey === configKey) {
+		if (existing && existing.connectionKey === configKey) {
 			connected = existing;
 			action = "reused";
 		} else {
@@ -1891,7 +1957,7 @@ var McpExtension = class {
 				id,
 				store: {
 					client: result.client,
-					configKey,
+					connectionKey: configKey,
 					status: "pending_auth",
 					stderrBuffer: result.stderrBuffer,
 					cliHint: result.cliHint
@@ -1909,7 +1975,7 @@ var McpExtension = class {
 				id,
 				store: {
 					client: result.client,
-					configKey,
+					connectionKey: configKey,
 					status: "timeout",
 					stderrBuffer: result.stderrBuffer,
 					cliHint: null
@@ -1925,7 +1991,7 @@ var McpExtension = class {
 			};
 			connected = {
 				client: result.client,
-				configKey,
+				connectionKey: configKey,
 				status: "connected",
 				stderrBuffer: result.stderr,
 				cliHint: null
@@ -1939,7 +2005,7 @@ var McpExtension = class {
 				id,
 				store: {
 					client: retry.client,
-					configKey,
+					connectionKey: configKey,
 					status: "pending_auth",
 					stderrBuffer: null,
 					cliHint: retry.cliHint
@@ -1957,7 +2023,7 @@ var McpExtension = class {
 				id,
 				store: {
 					client: retry.client,
-					configKey,
+					connectionKey: configKey,
 					status: "timeout",
 					stderrBuffer: retry.stderrBuffer,
 					cliHint: null
@@ -1985,7 +2051,7 @@ var McpExtension = class {
 			};
 			connected = {
 				client: retry.client,
-				configKey,
+				connectionKey: configKey,
 				status: "connected",
 				stderrBuffer: retry.stderr,
 				cliHint: null
@@ -2017,7 +2083,7 @@ var McpExtension = class {
 					id,
 					store: {
 						client: retry.client,
-						configKey,
+						connectionKey: configKey,
 						status: "pending_auth",
 						stderrBuffer: null,
 						cliHint: retry.cliHint
@@ -2049,7 +2115,7 @@ var McpExtension = class {
 				if (retry.status === "connected") {
 					connected = {
 						client: retry.client,
-						configKey,
+						connectionKey: configKey,
 						status: "connected",
 						stderrBuffer: retry.stderr,
 						cliHint: null
@@ -2304,11 +2370,27 @@ function skippedSchemaLines(summary) {
 	for (const [id, count] of entries) for (const { name, reason } of count.skipped) lines.push(`    - ${id}/${name}: ${reason}`);
 	return lines;
 }
+/**
+* Lines naming allowlist entries in mcp.config.json that matched no tool the
+* server advertises — almost always a typo, and silent otherwise: the agent
+* just sees a narrower tool set and can't tell the config is wrong.
+*/
+function unknownToolLines(summary) {
+	const entries = Object.entries(summary.toolCounts).filter(([, count]) => count.unknownTools.length > 0 || count.unknownExcludeTools.length > 0);
+	if (entries.length === 0) return [];
+	const lines = [];
+	for (const [id, count] of entries) {
+		if (count.unknownTools.length > 0) lines.push(`  NOTE: ${id}.tools in mcp.config.json names tool(s) the server does not advertise: ${count.unknownTools.join(", ")}.`);
+		if (count.unknownExcludeTools.length > 0) lines.push(`  NOTE: ${id}.excludeTools in mcp.config.json names tool(s) the server does not advertise: ${count.unknownExcludeTools.join(", ")}.`);
+	}
+	return lines;
+}
 function summaryText(summary) {
 	const lines = [];
 	lines.push(`MCP reconcile complete: ${summary.totalTools} tool(s) live.`);
 	lines.push(...truncationLines(summary));
 	lines.push(...skippedSchemaLines(summary));
+	lines.push(...unknownToolLines(summary));
 	if (summary.added.length > 0) lines.push(`  Added: ${summary.added.join(", ")}`);
 	if (summary.refreshed.length > 0) lines.push(`  Refreshed: ${summary.refreshed.join(", ")}`);
 	if (summary.removed.length > 0) lines.push(`  Removed: ${summary.removed.join(", ")}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skydiveai/pi-extensions",
-  "version": "0.1.258-beta.6",
+  "version": "0.1.258-beta.60",
   "homepage": "https://skydive.com",
   "license": "MIT",
   "author": "Create, Inc.",