@vanillagreen/pi-claude-bridge 1.0.2 → 1.0.4

package/bundle/index.js

@@ -19487,8 +19487,7 @@ function popContext() {
 import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
 import { homedir as homedir2 } from "os";
 import { dirname as dirname2, join as join2, resolve } from "path";
-var PACKAGE_ID = "pi-claude-bridge";
-var SCOPED_PACKAGE_ID = "@vanillagreen/pi-claude-bridge";
+var PACKAGE_ID = "@vanillagreen/pi-claude-bridge";
 function expandHome(input) {
   if (input === "~") return homedir2();
   if (input.startsWith("~/")) return join2(homedir2(), input.slice(2));
@@ -19539,7 +19538,7 @@ function readManagerConfig(cwd) {
     try {
       const parsed = JSON.parse(readFileSync3(path, "utf8"));
       const configRoot = asRecord(asRecord(asRecord(parsed?.vstack)?.extensionManager)?.config);
-      const config2 = asRecord(configRoot?.[PACKAGE_ID]) ?? asRecord(configRoot?.[SCOPED_PACKAGE_ID]);
+      const config2 = asRecord(configRoot?.[PACKAGE_ID]);
       if (config2) mergeDeep(merged, config2);
     } catch {
     }
@@ -33844,7 +33843,14 @@ function mapToolName(name, customToolNameToPi) {
     const mapped = customToolNameToPi.get(name) ?? customToolNameToPi.get(normalized);
     if (mapped) return mapped;
   }
-  if (normalized.startsWith(MCP_TOOL_PREFIX)) return name.slice(MCP_TOOL_PREFIX.length);
+  for (const prefix of [
+    MCP_TOOL_PREFIX,
+    `mcp__${MCP_SERVER_NAME.replace(/-/g, "_")}__`,
+    `mcp/${MCP_SERVER_NAME}/`,
+    `mcp/${MCP_SERVER_NAME.replace(/-/g, "_")}/`
+  ]) {
+    if (normalized.startsWith(prefix)) return normalized.slice(prefix.length);
+  }
   return name;
 }
 var SDK_KEY_RENAMES = {
@@ -34435,5 +34441,6 @@ function index_default(pi) {
 export {
   CLAUDE_BRIDGE_TOOL_ISOLATION,
   DISALLOWED_BUILTIN_TOOLS,
-  index_default as default
+  index_default as default,
+  mapToolName
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanillagreen/pi-claude-bridge",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Pi provider bridge that runs Claude Code through the Claude Agent SDK, with opt-in forwarding for Pi prompt context.",
   "type": "module",
   "keywords": [

package/src/config.ts

@@ -7,8 +7,7 @@ import { existsSync, readFileSync } from "fs";
 import { homedir } from "os";
 import { dirname, join, resolve } from "path";
 
-export const PACKAGE_ID = "pi-claude-bridge";
-export const SCOPED_PACKAGE_ID = "@vanillagreen/pi-claude-bridge";
+export const PACKAGE_ID = "@vanillagreen/pi-claude-bridge";
 
 export interface Config {
 	enabled?: boolean;
@@ -87,7 +86,7 @@ function readManagerConfig(cwd: string): SettingsRecord {
 		try {
 			const parsed = JSON.parse(readFileSync(path, "utf8"));
 			const configRoot = asRecord(asRecord(asRecord(parsed?.vstack)?.extensionManager)?.config);
-			const config = asRecord(configRoot?.[PACKAGE_ID]) ?? asRecord(configRoot?.[SCOPED_PACKAGE_ID]);
+			const config = asRecord(configRoot?.[PACKAGE_ID]);
 			if (config) mergeDeep(merged, config);
 		} catch {
 			// Ignore malformed optional manager config; Pi will surface settings issues elsewhere.

package/src/index.ts

@@ -426,7 +426,7 @@ function syncSharedSession(
 
 // --- Provider helpers: tool name mapping ---
 
-function mapToolName(name: string, customToolNameToPi?: Map<string, string>): string {
+export function mapToolName(name: string, customToolNameToPi?: Map<string, string>): string {
 	const normalized = name.toLowerCase();
 	const builtin = SDK_TO_PI_TOOL_NAME[normalized];
 	if (builtin) return builtin;
@@ -434,7 +434,14 @@ function mapToolName(name: string, customToolNameToPi?: Map<string, string>): st
 		const mapped = customToolNameToPi.get(name) ?? customToolNameToPi.get(normalized);
 		if (mapped) return mapped;
 	}
-	if (normalized.startsWith(MCP_TOOL_PREFIX)) return name.slice(MCP_TOOL_PREFIX.length);
+	for (const prefix of [
+		MCP_TOOL_PREFIX,
+		`mcp__${MCP_SERVER_NAME.replace(/-/g, "_")}__`,
+		`mcp/${MCP_SERVER_NAME}/`,
+		`mcp/${MCP_SERVER_NAME.replace(/-/g, "_")}/`,
+	]) {
+		if (normalized.startsWith(prefix)) return normalized.slice(prefix.length);
+	}
 	return name;
 }