@skydiveai/pi-extensions 0.1.251-beta.4 → 0.1.251-beta.6

package/dist/index.mjs

@@ -1169,6 +1169,34 @@ function estimateToolTokens(tool) {
 	return Math.ceil(chars / 4);
 }
 //#endregion
+//#region src/extensions/mcp/tool-name.ts
+const MAX_LENGTH = 128;
+/**
+* Deterministically coerce `raw` into the Anthropic tool-name alphabet.
+* Same input always yields the same output, so a tool keeps ONE stable
+* registered name across turns and reconciles (history stays valid).
+*
+* - every invalid char run collapses to a single `_`
+* - the result trims to 128 chars
+* - a degenerate all-underscore result becomes `tool`
+*/
+function sanitizeToolName(raw) {
+	const stripped = raw.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, MAX_LENGTH).replace(/_+$/, "");
+	return stripped === "" ? "tool" : stripped;
+}
+/**
+* First free `name`, `name_2`, `name_3`, ... within the 128-char budget.
+* Suffixes come out of the kept base so the whole string stays <= 128.
+*/
+function uniqueSanitizedToolName(base, used) {
+	if (!used.has(base)) return base;
+	for (let n = 2;; n++) {
+		const suffix = `_${n}`;
+		const candidate = base.slice(0, MAX_LENGTH - suffix.length) + suffix;
+		if (!used.has(candidate)) return candidate;
+	}
+}
+//#endregion
 //#region src/extensions/mcp/mcp-config.ts
 /**
 * mcp.config.json schema + loader. Split out from the extension so it has
@@ -1267,8 +1295,17 @@ async function readConfigMtimeMs(configPath) {
 		throw err;
 	}
 }
-function makeToolName(serverId, toolName) {
-	return `mcp_${serverId}_${toolName}`;
+/**
+* The registered tool name must satisfy Anthropic's tools[].name pattern
+* (`^[a-zA-Z0-9_-]{1,128}$`) or the WHOLE Messages request hard-400s — real
+* servers emit names that fail it (e.g. granola's `granola.meetings.list
+* (v2)`). Sanitize here at registration time; execution still calls the
+* server with the ORIGINAL name, and model tool_use round-trips on the
+* sanitized one, so no reverse mapping is needed. `used` dedupes collisions
+* (two distinct raw names can sanitize to the same string).
+*/
+function makeToolName(serverId, toolName, used) {
+	return uniqueSanitizedToolName(sanitizeToolName(`mcp_${serverId}_${toolName}`), used);
 }
 function toMcpArguments(params) {
 	const out = {};
@@ -1372,6 +1409,7 @@ function buildToolPromptSnippet({ description, inputSchema, serverId }) {
 var McpExtension = class {
 	mcpClients = /* @__PURE__ */ new Map();
 	registeredMcpToolNames = /* @__PURE__ */ new Set();
+	usedSanitizedToolNames = /* @__PURE__ */ new Set();
 	lastConfigMtimeMs = 0;
 	pendingMcpUpdate = null;
 	/** Non-consuming peek used by `shouldStopAfterTurn`. */
@@ -1385,7 +1423,7 @@ var McpExtension = class {
 		return update;
 	}
 	registerMcpTool({ pi, serverId, client, tool }) {
-		const name = makeToolName(serverId, tool.name);
+		const name = makeToolName(serverId, tool.name, this.usedSanitizedToolNames);
 		const parameters = Type.Unsafe(tool.inputSchema);
 		const description = tool.description?.trim() ?? "";
 		const promptSnippet = buildToolPromptSnippet({
@@ -1429,6 +1467,7 @@ var McpExtension = class {
 			}
 		}));
 		this.registeredMcpToolNames.add(name);
+		this.usedSanitizedToolNames.add(name);
 	}
 	async reconcile({ pi, configPath, connectTimeoutMs, contextWindow }) {
 		let config;
@@ -1454,6 +1493,7 @@ var McpExtension = class {
 		};
 		const desiredIds = new Set(Object.keys(config.servers));
 		this.registeredMcpToolNames.clear();
+		this.usedSanitizedToolNames.clear();
 		for (const [id, existing] of [...this.mcpClients.entries()]) if (!desiredIds.has(id)) {
 			await closeConnected(existing);
 			this.mcpClients.delete(id);

package/package.json

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