@vanillagreen/pi-claude-bridge 4.0.0 → 4.0.2

package/src/tool-mapping.ts

@@ -1,11 +1,48 @@
+import { isMcpResourceTool } from "./connectors.js";
 import { MCP_SERVER_NAME, MCP_TOOL_PREFIX } from "./skills.js";
 
 const SDK_TO_PI_TOOL_NAME: Record<string, string> = {
 	read: "read", write: "write", edit: "edit", bash: "bash",
 };
 
+const BRIDGED_TOOL_PREFIXES = [
+	MCP_TOOL_PREFIX,
+	`mcp__${MCP_SERVER_NAME.replace(/-/g, "_")}__`,
+	`mcp/${MCP_SERVER_NAME}/`,
+	`mcp/${MCP_SERVER_NAME.replace(/-/g, "_")}/`,
+];
+
 // --- Provider helpers: tool name mapping ---
 
+function bridgedToolSuffix(normalized: string): string | undefined {
+	const prefix = BRIDGED_TOOL_PREFIXES.find((candidate) => normalized.startsWith(candidate));
+	return prefix ? normalized.slice(prefix.length) : undefined;
+}
+
+export function isForeignMcpTool(name: unknown): boolean {
+	if (typeof name !== "string") return false;
+	const normalized = name.toLowerCase();
+	return (normalized.startsWith("mcp__") || normalized.startsWith("mcp/")) && bridgedToolSuffix(normalized) === undefined;
+}
+
+export function isPiDispatchable(name: unknown, customToolNameToPi?: Map<string, string>): boolean {
+	if (typeof name !== "string" || !name) return false;
+	const normalized = name.toLowerCase();
+	const hasManifest = Boolean(customToolNameToPi?.size);
+	if (customToolNameToPi?.has(name) || customToolNameToPi?.has(normalized)) return true;
+	const bridgedSuffix = bridgedToolSuffix(normalized);
+	if (bridgedSuffix !== undefined) {
+		if (!hasManifest) return true;
+		return customToolNameToPi?.has(`${MCP_TOOL_PREFIX}${bridgedSuffix}`) ?? false;
+	}
+	// A foreign MCP namespace belongs to a child-loaded server, not Pi's bridge.
+	if (isForeignMcpTool(name)) return false;
+	// Resource discovery is deliberately mirrored as Pi's account-access audit.
+	if (isMcpResourceTool(name)) return true;
+	// A populated manifest is authoritative: every other bare name is a naming slip.
+	return !hasManifest;
+}
+
 export function mapToolName(name: string, customToolNameToPi?: Map<string, string>): string {
 	const normalized = name.toLowerCase();
 	const builtin = SDK_TO_PI_TOOL_NAME[normalized];
@@ -14,19 +51,15 @@ export function mapToolName(name: string, customToolNameToPi?: Map<string, strin
 		const mapped = customToolNameToPi.get(name) ?? customToolNameToPi.get(normalized);
 		if (mapped) return mapped;
 	}
-	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);
+	const bridgedSuffix = bridgedToolSuffix(normalized);
+	if (bridgedSuffix !== undefined) {
+		return customToolNameToPi?.get(`${MCP_TOOL_PREFIX}${bridgedSuffix}`) ?? bridgedSuffix;
 	}
 	return name;
 }
 
 // Renames for Claude Code SDK param names that differ from pi's native names.
-// Keys not listed here pass through unchanged, so new pi params work automatically.
+// Keys not listed here pass through unchanged, so additional Pi parameters work automatically.
 const SDK_KEY_RENAMES: Record<string, Record<string, string>> = {
 	read:  { file_path: "path" },
 	write: { file_path: "path" },

package/src/tool-pairing-audit.ts

@@ -122,7 +122,8 @@ export function findUnpairedToolUses(messages: Array<{ role?: string; content?:
 }
 
 export const LOST_TOOL_RESULT_TEXT =
-	"Claude bridge: the result of this tool call was lost before the session was rebuilt "
+	"tool-result-lost=interrupted\n"
+	+ "Claude bridge: the result of this tool call was lost before the session was rebuilt "
 	+ "(the turn was interrupted). Treat the call as failed — it may or may not have executed. "
 	+ "Re-run the tool if its output is still needed.";
 
@@ -131,13 +132,12 @@ export const LOST_TOOL_RESULT_TEXT =
  * IN PLACE, before cc-session-io's repairToolPairing runs.
  *
  * repairToolPairing backfills with a bare "[no tool result recorded]" — a
- * placeholder the model reads as tool OUTPUT and keeps reasoning on (observed:
- * two bash calls in the 2026-07-28 token test, silently treated as if they had
- * returned). An is_error result that says what happened and what to do turns a
+ * placeholder the model reads as tool OUTPUT and continues to reason from.
+ * An is_error result that says what happened and what to do turns a
  * silent correctness hazard into a recoverable failure.
  *
  * Results are prepended to the immediately following user message (tool_result
- * blocks must lead a user message), or a new user message is inserted when none
+ * blocks must lead a user message), or a synthetic user message is inserted when none
  * follows. `missing` must come from findUnpairedToolUses on the same array.
  */
 export function insertLostToolResultPlaceholders(
@@ -151,8 +151,8 @@ export function insertLostToolResultPlaceholders(
 		group.push(item);
 		byAssistant.set(item.assistantIndex, group);
 	}
-	// Descending order so inserting a new user message never shifts an index a
-	// later (earlier-in-array) group still needs.
+	// Descending order ensures that inserting a user message does not shift an index
+	// for a group that is earlier in the array.
 	for (const assistantIndex of [...byAssistant.keys()].sort((a, b) => b - a)) {
 		const group = byAssistant.get(assistantIndex)!;
 		const blocks = group.map((item) => block(item.id));