pi-mcp-extension 1.5.1 → 1.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-mcp-extension",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "MCP (Model Context Protocol) client extension for the Pi coding agent — connect Pi to any MCP server",
   "type": "module",
   "keywords": [

package/src/server-manager.ts

@@ -369,20 +369,19 @@ export class ServerManager {
           try { await client.ping(); }
           catch {
             if (signal.aborted) return;
-            const recoveryGeneration = (server.generation ?? 0) + 1;
-            await this._shutdown(server);
-            if (server.generation === recoveryGeneration) {
-              // An external stop during cleanup increments the generation again.
-              queueMicrotask(() => {
-                if (server.generation !== recoveryGeneration) return;
-                void this.startServer(server.name, cwd).catch((error) => {
-                  server.lastError = error instanceof Error ? error : new Error(String(error));
-                });
-              });
-            }
+            await this._recover(server, cwd);
           }
         }, server.config.healthCheckIntervalMs);
       }
+      // Unexpected transport close (e.g. the server subprocess crashes
+      // mid-session). Without this the state would stay "ready" and tools
+      // would remain active against a dead server. Deliberate closes abort
+      // the signal first, so they are ignored here.
+      client.onclose = () => {
+        if (signal.aborted || server.client !== client) return;
+        console.error(`[pi-mcp] Server ${server.name} closed unexpectedly, reconnecting`);
+        void this._recover(server, cwd);
+      };
     } catch (err) {
       try { await client.close(); } catch { /* best effort */ }
       if (server.client === client) { server.client = null; server.childPid = null; }
@@ -410,6 +409,21 @@ export class ServerManager {
     }
   }
 
+  /** Tear down a server that died or stopped responding, then reconnect. */
+  private async _recover(server: ManagedServer, cwd: string): Promise<void> {
+    const recoveryGeneration = (server.generation ?? 0) + 1;
+    await this._shutdown(server);
+    if (server.generation === recoveryGeneration) {
+      // An external stop during cleanup increments the generation again.
+      queueMicrotask(() => {
+        if (server.generation !== recoveryGeneration) return;
+        void this.startServer(server.name, cwd).catch((error) => {
+          server.lastError = error instanceof Error ? error : new Error(String(error));
+        });
+      });
+    }
+  }
+
   private async _shutdown(server: ManagedServer): Promise<void> {
     server.controller?.abort();
     server.generation = (server.generation ?? 0) + 1;

package/src/tool-bridge.ts

@@ -9,7 +9,7 @@
  *   - AbortSignal → SDK's built-in cancellation (notifications/cancelled)
  *   - Protocol error vs tool execution error distinction
  *   - Activate/deactivate pattern (register once, toggle on server state change)
- *   - Image/audio/resource content → text description passthrough
+ *   - Image content → ImageContent passthrough; audio/resource → text description
  */
 
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
@@ -224,8 +224,9 @@ export function buildToolName(prefix: string, serverName: string, toolName: stri
 // ─── Content Conversion ───────────────────────────────────────────────────────
 
 type PiTextContent = { type: "text"; text: string };
+type PiImageContent = { type: "image"; data: string; mimeType: string };
 
-function convertMcpContent(items: unknown[]): PiTextContent[] {
+function convertMcpContent(items: unknown[]): (PiTextContent | PiImageContent)[] {
   return items.map((item: any) => {
     if (!item || typeof item !== "object") {
       return { type: "text", text: String(item) };
@@ -235,8 +236,9 @@ function convertMcpContent(items: unknown[]): PiTextContent[] {
         return { type: "text", text: String(item.text ?? "") };
       case "image":
         return {
-          type: "text",
-          text: `[Image: ${item.mimeType ?? "unknown"}, base64 encoded]`,
+          type: "image",
+          data: String(item.data ?? ""),
+          mimeType: String(item.mimeType ?? "image/png"),
         };
       case "audio":
         return {
@@ -445,7 +447,9 @@ export class ToolBridge {
 
           // Tool execution errors (isError: true) — distinct from protocol errors
           if (result.isError) {
-            const errorText = content.map((c) => c.text).join("\n");
+            const errorText = content
+              .map((c) => (c.type === "text" ? c.text : ""))
+              .join("\n");
             throw new McpError(
               errorText || "Tool reported an error",
               serverName,