pi-mcp-adapter 1.5.0 → 2.0.0

package/resource-tools.ts

@@ -1,32 +1,4 @@
-// resource-tools.ts - MCP resource tool name collection
-// NOTE: Resources are NOT registered as Pi tools - they're called via the `mcp` proxy.
-
-import { formatToolName, type McpResource } from "./types.js";
-
-interface ResourceCollectionOptions {
-  serverName: string;
-  prefix: "server" | "none" | "short";
-}
-
-/**
- * Collect tool names for MCP resources.
- * Does NOT register with Pi - resources are called via the `mcp` proxy.
- */
-export function collectResourceToolNames(
-  resources: McpResource[],
-  options: ResourceCollectionOptions
-): string[] {
-  const collected: string[] = [];
-  const { serverName, prefix } = options;
-  
-  for (const resource of resources) {
-    const baseName = `get_${resourceNameToToolName(resource.name)}`;
-    const toolName = formatToolName(baseName, serverName, prefix);
-    collected.push(toolName);
-  }
-  
-  return collected;
-}
+// resource-tools.ts - MCP resource name utilities
 
 export function resourceNameToToolName(name: string): string {
   let result = name

package/server-manager.ts

@@ -5,6 +5,7 @@ import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import type { McpTool, McpResource, ServerDefinition, Transport } from "./types.js";
 import { getStoredTokens } from "./oauth-handler.js";
+import { resolveNpxBinary } from "./npx-resolver.js";
 
 interface ServerConnection {
   client: Client;
@@ -13,6 +14,7 @@ interface ServerConnection {
   tools: McpTool[];
   resources: McpResource[];
   lastUsedAt: number;
+  inFlight: number;
   status: "connected" | "closed";
 }
 
@@ -54,10 +56,21 @@ export class McpServerManager {
     let transport: Transport;
     
     if (definition.command) {
-      // Stdio transport
+      let command = definition.command;
+      let args = definition.args ?? [];
+
+      if (command === "npx" || command === "npm") {
+        const resolved = await resolveNpxBinary(command, args);
+        if (resolved) {
+          command = resolved.isJs ? "node" : resolved.binPath;
+          args = resolved.isJs ? [resolved.binPath, ...resolved.extraArgs] : resolved.extraArgs;
+          console.log(`MCP: ${name} resolved to ${resolved.binPath} (skipping npm parent)`);
+        }
+      }
+
       transport = new StdioClientTransport({
-        command: definition.command,
-        args: definition.args ?? [],
+        command,
+        args,
         env: resolveEnv(definition.env),
         cwd: definition.cwd,
         stderr: definition.debug ? "inherit" : "ignore",
@@ -85,6 +98,7 @@ export class McpServerManager {
         tools,
         resources,
         lastUsedAt: Date.now(),
+        inFlight: 0,
         status: "connected",
       };
     } catch (error) {
@@ -181,11 +195,13 @@ export class McpServerManager {
     const connection = this.connections.get(name);
     if (!connection) return;
     
+    // Delete from map BEFORE async cleanup to prevent a race where a
+    // concurrent connect() creates a new connection that our deferred
+    // delete() would then remove, orphaning the new server process.
     connection.status = "closed";
-    // Close both independently - don't let one failure prevent the other
+    this.connections.delete(name);
     await connection.client.close().catch(() => {});
     await connection.transport.close().catch(() => {});
-    this.connections.delete(name);
   }
   
   async closeAll(): Promise<void> {
@@ -200,6 +216,34 @@ export class McpServerManager {
   getAllConnections(): Map<string, ServerConnection> {
     return new Map(this.connections);
   }
+
+  touch(name: string): void {
+    const connection = this.connections.get(name);
+    if (connection) {
+      connection.lastUsedAt = Date.now();
+    }
+  }
+
+  incrementInFlight(name: string): void {
+    const connection = this.connections.get(name);
+    if (connection) {
+      connection.inFlight = (connection.inFlight ?? 0) + 1;
+    }
+  }
+
+  decrementInFlight(name: string): void {
+    const connection = this.connections.get(name);
+    if (connection && connection.inFlight) {
+      connection.inFlight--;
+    }
+  }
+
+  isIdle(name: string, timeoutMs: number): boolean {
+    const connection = this.connections.get(name);
+    if (!connection || connection.status !== "connected") return false;
+    if (connection.inFlight && connection.inFlight > 0) return false;
+    return (Date.now() - connection.lastUsedAt) > timeoutMs;
+  }
 }
 
 /**

package/tool-registrar.ts

@@ -1,39 +1,8 @@
-// tool-registrar.ts - MCP tool metadata and content transformation
+// tool-registrar.ts - MCP content transformation
 // NOTE: Tools are NOT registered with Pi - only the unified `mcp` proxy tool is registered.
 // This keeps the LLM context small (1 tool instead of 100s).
 
-import type { McpTool, McpContent, ContentBlock } from "./types.js";
-import { formatToolName } from "./types.js";
-
-interface ToolCollectionOptions {
-  serverName: string;
-  prefix: "server" | "none" | "short";
-}
-
-/**
- * Collect tool names from MCP server tools.
- * Does NOT register with Pi - tools are called via the `mcp` proxy.
- */
-export function collectToolNames(
-  tools: McpTool[],
-  options: ToolCollectionOptions
-): { collected: string[]; failed: string[] } {
-  const collected: string[] = [];
-  const failed: string[] = [];
-  
-  for (const tool of tools) {
-    // Basic validation - tool must have a name
-    if (!tool.name) {
-      failed.push("(unnamed)");
-      continue;
-    }
-    
-    const toolName = formatToolName(tool.name, options.serverName, options.prefix);
-    collected.push(toolName);
-  }
-  
-  return { collected, failed };
-}
+import type { McpContent, ContentBlock } from "./types.js";
 
 /**
  * Transform MCP content types to Pi content blocks.

package/types.ts

@@ -66,7 +66,8 @@ export interface ServerEntry {
   auth?: "oauth" | "bearer";
   bearerToken?: string;
   bearerTokenEnv?: string;
-  lifecycle?: "keep-alive" | "ephemeral";
+  lifecycle?: "keep-alive" | "lazy" | "eager";
+  idleTimeout?: number; // minutes, overrides global setting
   // Resource handling
   exposeResources?: boolean;
   // Debug
@@ -76,6 +77,7 @@ export interface ServerEntry {
 // Settings
 export interface McpSettings {
   toolPrefix?: "server" | "none" | "short";
+  idleTimeout?: number; // minutes, default 10, 0 to disable
 }
 
 // Root config
@@ -88,6 +90,30 @@ export interface McpConfig {
 // Alias for clarity
 export type ServerDefinition = ServerEntry;
 
+export interface ToolMetadata {
+  name: string;           // Prefixed tool name (e.g., "xcodebuild_list_sims")
+  originalName: string;   // Original MCP tool name (e.g., "list_sims")
+  description: string;
+  resourceUri?: string;   // For resource tools: the URI to read
+  inputSchema?: unknown;  // JSON Schema for parameters (stored for describe/errors)
+}
+
+/**
+ * Get server prefix based on tool prefix mode.
+ */
+export function getServerPrefix(
+  serverName: string,
+  mode: "server" | "none" | "short"
+): string {
+  if (mode === "none") return "";
+  if (mode === "short") {
+    let short = serverName.replace(/-?mcp$/i, "").replace(/-/g, "_");
+    if (!short) short = "mcp";
+    return short;
+  }
+  return serverName.replace(/-/g, "_");
+}
+
 /**
  * Format a tool name with server prefix.
  */
@@ -96,17 +122,6 @@ export function formatToolName(
   serverName: string,
   prefix: "server" | "none" | "short"
 ): string {
-  switch (prefix) {
-    case "none":
-      return toolName;
-    case "short":
-      let short = serverName.replace(/-?mcp$/i, "").replace(/-/g, "_");
-      // Fallback if server name was just "mcp" or similar
-      if (!short) short = "mcp";
-      return `${short}_${toolName}`;
-    case "server":
-    default:
-      const normalized = serverName.replace(/-/g, "_");
-      return `${normalized}_${toolName}`;
-  }
+  const p = getServerPrefix(serverName, prefix);
+  return p ? `${p}_${toolName}` : toolName;
 }