@herbertgao/pi-extensions 2026.8.1 → 2026.8.2

package/node_modules/pi-mcp-adapter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-mcp-adapter",
-  "version": "2.19.0",
+  "version": "2.21.2",
   "description": "MCP (Model Context Protocol) adapter extension for Pi coding agent",
   "type": "module",
   "types": "./index.ts",
@@ -25,6 +25,7 @@
     "pi-mcp-adapter": "cli.js"
   },
   "scripts": {
+    "typecheck": "tsc --noEmit",
     "test": "vitest run",
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",
@@ -80,6 +81,7 @@
     "types.ts",
     "ui-stream-types.ts",
     "ui-tool-visibility.ts",
+    "ui-app-bridge-helpers.ts",
     "config.ts",
     "server-manager.ts",
     "unix-socket-transport.ts",
@@ -93,6 +95,7 @@
     "mcp-code.ts",
     "mcp-script-worker.mjs",
     "mcp-probe.ts",
+    "agent-plugin-loader.ts",
     "resource-tools.ts",
     "lifecycle.ts",
     "mcp-status.ts",
@@ -122,8 +125,9 @@
     "LICENSE"
   ],
   "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0",
+    "@modelcontextprotocol/core": "2.0.0",
     "@modelcontextprotocol/ext-apps": "^1.2.2",
-    "@modelcontextprotocol/sdk": "^1.30.0",
     "@napi-rs/keyring": "^1.3.0",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
@@ -135,7 +139,7 @@
     "zod": "^3.25.0 || ^4.0.0"
   },
   "peerDependencies": {
-    "@earendil-works/pi-ai": "*",
+    "@earendil-works/pi-ai": "^0.84.1",
     "@earendil-works/pi-tui": "*",
     "typebox": "*",
     "zod": "^3.25.0 || ^4.0.0"
@@ -152,16 +156,17 @@
     }
   },
   "devDependencies": {
-    "@earendil-works/pi-ai": "0.74.2",
-    "@earendil-works/pi-coding-agent": "0.79.10",
-    "@earendil-works/pi-tui": "0.74.2",
+    "@earendil-works/pi-ai": "0.84.1",
+    "@earendil-works/pi-coding-agent": "0.84.1",
+    "@earendil-works/pi-tui": "0.84.1",
     "@modelcontextprotocol/conformance": "0.1.16",
     "@types/bun": "^1.0.0",
-    "@types/node": "^20.0.0",
+    "@types/cross-spawn": "6.0.6",
+    "@types/node": "20.19.43",
     "@types/open": "^6.2.1",
     "tsx": "^4.21.0",
     "typebox": "1.3.3",
-    "typescript": "^5.0.0",
+    "typescript": "5.9.3",
     "vitest": "^3.0.0"
   }
 }

package/node_modules/pi-mcp-adapter/panel-keys.ts

@@ -1,6 +1,6 @@
-import { matchesKey } from "@earendil-works/pi-tui";
+import { matchesKey, type KeyId } from "@earendil-works/pi-tui";
 
-/** The `tui.select.*` keybinding ids the adapter panels resolve. */
+/** The panel keybinding ids the adapter panels resolve through pi-tui. */
 export type PanelSelectKeybinding =
   | "tui.select.up"
   | "tui.select.down"
@@ -9,29 +9,45 @@ export type PanelSelectKeybinding =
 /** Structural subset of pi-tui's `KeybindingsManager` (which satisfies it). */
 export interface PanelKeybindings {
   matches(data: string, keybinding: PanelSelectKeybinding): boolean;
+  getUserBindings?(): Record<string, KeyId | KeyId[] | undefined>;
 }
 
 /**
- * Key matchers for list navigation: user's `tui.select.*` bindings when a
- * manager is provided, otherwise the previous hardcoded defaults.
+ * Key matchers for panel actions: user bindings when a manager is provided,
+ * otherwise the previous hardcoded defaults.
  */
 export interface PanelKeys {
   selectUp(data: string): boolean;
   selectDown(data: string): boolean;
   selectConfirm(data: string): boolean;
+  save(data: string): boolean;
+  saveLabel(): string | null;
+}
+
+function configuredSaveKeys(keybindings?: PanelKeybindings): { keys: KeyId[]; configured: boolean } {
+  const explicit = keybindings?.getUserBindings?.()["mcp.panel.save"];
+  if (explicit !== undefined) return { keys: Array.isArray(explicit) ? explicit : [explicit], configured: true };
+  return { keys: [], configured: false };
 }
 
 export function createPanelKeys(keybindings?: PanelKeybindings): PanelKeys {
+  const saveBinding = configuredSaveKeys(keybindings);
   if (keybindings) {
     return {
       selectUp: (data) => keybindings.matches(data, "tui.select.up"),
       selectDown: (data) => keybindings.matches(data, "tui.select.down"),
       selectConfirm: (data) => keybindings.matches(data, "tui.select.confirm"),
+      save: (data) => saveBinding.keys.length > 0
+        ? saveBinding.keys.some((key) => matchesKey(data, key))
+        : !saveBinding.configured && matchesKey(data, "ctrl+s"),
+      saveLabel: () => saveBinding.keys[0] ?? (saveBinding.configured ? null : "ctrl+s"),
     };
   }
   return {
     selectUp: (data) => matchesKey(data, "up"),
     selectDown: (data) => matchesKey(data, "down"),
     selectConfirm: (data) => matchesKey(data, "return"),
+    save: (data) => matchesKey(data, "ctrl+s"),
+    saveLabel: () => "ctrl+s",
   };
 }

package/node_modules/pi-mcp-adapter/prompts.ts

@@ -2,7 +2,7 @@ import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-c
 import type {
   GetPromptResult,
   PromptMessage,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/client";
 import type { McpExtensionState } from "./state.ts";
 import { isServerDisabled, type McpConfig, type PromptMetadata } from "./types.ts";
 import { formatPromptCommandName } from "./types.ts";
@@ -117,7 +117,7 @@ function findUnquotedEquals(token: string): number {
 }
 
 function stripQuotes(value: string): string {
-  if (value.length >= 2 && (value.startsWith('"') || value.startsWith("'")) && value.endsWith(value[0])) {
+  if (value.length >= 2 && (value.startsWith('"') || value.startsWith("'")) && value.endsWith(value.charAt(0))) {
     return value.slice(1, -1);
   }
   return value;

package/node_modules/pi-mcp-adapter/proxy-modes.ts

@@ -1,5 +1,5 @@
 import type { AgentToolResult, ToolInfo } from "@earendil-works/pi-coding-agent";
-import { UrlElicitationRequiredError } from "@modelcontextprotocol/sdk/types.js";
+import { UrlElicitationRequiredError, type Client } from "@modelcontextprotocol/client";
 import { createRequire } from "node:module";
 import type { McpExtensionState } from "./state.ts";
 import type { ToolMetadata, McpContent } from "./types.ts";
@@ -20,6 +20,7 @@ import { paginate, rankSuggestions, rankToolMatches } from "./search-ranking.ts"
 import { ensureToolCallApproved, isToolCallApprovalRequired } from "./tool-approval.ts";
 
 type ProxyToolResult = AgentToolResult<Record<string, unknown>>;
+type ClientCallToolResult = Awaited<ReturnType<Client["callTool"]>>;
 
 const require = createRequire(import.meta.url);
 const MAX_REGEX_SEARCH_QUERY_LENGTH = 256;
@@ -524,10 +525,28 @@ export function executeSearch(
 
   const page = paginate(matches, offset, limit);
   if (page.total === 0) {
+    const connectingServers = server
+      ? state.config.mcpServers[server] && state.manager.isConnecting(server) ? [server] : []
+      : Object.keys(state.config.mcpServers)
+        .filter(name => !isServerDisabled(state.config.mcpServers[name]) && state.manager.isConnecting(name))
+        .sort((a, b) => a.localeCompare(b));
     const msg = server ? `No tools matching "${query}" in "${server}"` : `No tools matching "${query}"`;
+    const connectingMessage = connectingServers.length === 1
+      ? ` Server "${connectingServers[0]}" is still connecting; retry in a moment.`
+      : connectingServers.length > 1
+        ? ` Servers ${connectingServers.map(name => `"${name}"`).join(", ")} are still connecting; retry in a moment.`
+        : "";
     return {
-      content: [{ type: "text" as const, text: msg }],
-      details: { mode: "search", matches: [], count: 0, hasMore: false, nextOffset: null, query },
+      content: [{ type: "text" as const, text: `${msg}${connectingMessage}` }],
+      details: {
+        mode: "search",
+        matches: [],
+        count: 0,
+        hasMore: false,
+        nextOffset: null,
+        query,
+        ...(connectingServers.length > 0 ? { connectingServers } : {}),
+      },
     };
   }
 
@@ -748,6 +767,7 @@ export async function executeCall(
   serverOverride?: string,
   getPiTools?: () => ToolInfo[],
   signal?: AbortSignal,
+  origin?: "proxy" | "script",
 ): Promise<ProxyToolResult> {
   const ownedSignal = combineAbortSignals(state.owner?.signal, signal);
   throwIfAborted(ownedSignal);
@@ -1033,7 +1053,14 @@ export async function executeCall(
     return disabledCallResult(serverName, toolMeta);
   }
 
-  const approval = await ensureToolCallApproved(state, serverName, toolMeta, args, ownedSignal);
+  const approval = await ensureToolCallApproved(
+    state,
+    serverName,
+    toolMeta,
+    args,
+    ownedSignal,
+    origin ?? (toolMeta.resourceUri ? "resource" : "proxy"),
+  );
   if (approval.ok === false) {
     const denied = approval.reason === "denied";
     const message = denied
@@ -1086,7 +1113,12 @@ export async function executeCall(
 
     if (toolMeta.resourceUri) {
       const result = await withSessionRecovery(
-        { manager: state.manager, config: state.config, signal: ownedSignal, onNeedsAuth: recoverAuthConnection },
+        {
+          manager: state.manager,
+          config: state.config,
+          ...(ownedSignal ? { signal: ownedSignal } : {}),
+          onNeedsAuth: recoverAuthConnection,
+        },
         serverName,
         (conn) => conn.client.readResource({ uri: toolMeta.resourceUri! }, requestOptions),
       );
@@ -1107,24 +1139,29 @@ export async function executeCall(
           toolName: toolMeta.originalName,
           toolArgs: args ?? {},
           uiResourceUri: toolMeta.uiResourceUri,
-          streamMode: toolMeta.uiStreamMode,
-          signal,
+          ...(toolMeta.uiStreamMode !== undefined ? { streamMode: toolMeta.uiStreamMode } : {}),
+          ...(signal ? { signal } : {}),
           onNeedsAuth: recoverAuthConnection,
         })
       : null;
 
-    const result = await withSessionRecovery(
-      { manager: state.manager, config: state.config, signal: ownedSignal, onNeedsAuth: recoverAuthConnection },
+    const result = await withSessionRecovery<ClientCallToolResult>(
+      {
+        manager: state.manager,
+        config: state.config,
+        ...(ownedSignal ? { signal: ownedSignal } : {}),
+        onNeedsAuth: recoverAuthConnection,
+      },
       serverName,
       (conn) => abortable(conn.client.callTool({
         name: toolMeta.originalName,
         arguments: args ?? {},
         _meta: uiSession?.requestMeta,
-      }, undefined, requestOptions), ownedSignal),
+      }, requestOptions), ownedSignal),
     );
 
     if (toolMeta.uiResourceUri) {
-      uiSession?.sendToolResult(result as unknown as import("@modelcontextprotocol/sdk/types.js").CallToolResult);
+      uiSession?.sendToolResult(result as unknown as import("@modelcontextprotocol/client").CallToolResult);
 
       if (result.isError) {
         const mcpContent = (result.content ?? []) as McpContent[];

package/node_modules/pi-mcp-adapter/sampling-handler.ts

@@ -1,22 +1,25 @@
-import { complete, type Api, type AssistantMessage, type Message, type Model, type TextContent } from "@earendil-works/pi-ai";
+import { complete } from "@earendil-works/pi-ai/compat";
+import type { Api, AssistantMessage, Message, Model, ProviderHeaders, TextContent } from "@earendil-works/pi-ai";
 import { truncateAtWord } from "./utils.ts";
 import { throwIfAborted } from "./abort.ts";
 import type { ExtensionUIContext, ModelRegistry } from "@earendil-works/pi-coding-agent";
-import type { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import type { Client } from "@modelcontextprotocol/client";
 import {
-  CreateMessageRequestSchema,
   type CreateMessageRequest,
   type CreateMessageResult,
   type ModelPreferences,
   type SamplingMessage,
   type SamplingMessageContentBlock,
-} from "@modelcontextprotocol/sdk/types.js";
+} from "@modelcontextprotocol/client";
+
+export type SamplingUIContext = Pick<ExtensionUIContext, "confirm">;
+export type SamplingModelRegistry = Pick<ModelRegistry, "getAvailable" | "getApiKeyAndHeaders">;
 
 export interface SamplingHandlerOptions {
   serverName: string;
   autoApprove: boolean;
-  ui?: ExtensionUIContext;
-  modelRegistry: ModelRegistry;
+  ui?: SamplingUIContext;
+  modelRegistry: SamplingModelRegistry;
   getCurrentModel: () => Model<Api> | undefined;
   getSignal: () => AbortSignal | undefined;
 }
@@ -24,7 +27,7 @@ export interface SamplingHandlerOptions {
 export type ServerSamplingConfig = Omit<SamplingHandlerOptions, "serverName">;
 
 export function registerSamplingHandler(client: Client, options: SamplingHandlerOptions): void {
-  client.setRequestHandler(CreateMessageRequestSchema, request => {
+  client.setRequestHandler("sampling/createMessage", request => {
     return handleSamplingRequest(options, request);
   });
 }
@@ -66,16 +69,16 @@ export async function handleSamplingRequest(
   const result = await complete(
     model,
     {
-      systemPrompt: params.systemPrompt,
+      ...(params.systemPrompt !== undefined ? { systemPrompt: params.systemPrompt } : {}),
       messages,
     },
     {
-      apiKey,
-      headers,
+      ...(apiKey !== undefined ? { apiKey } : {}),
+      ...(headers !== undefined ? { headers } : {}),
       maxTokens: params.maxTokens,
-      temperature: params.temperature,
-      metadata: params.metadata as Record<string, unknown> | undefined,
-      signal,
+      ...(params.temperature !== undefined ? { temperature: params.temperature } : {}),
+      ...(params.metadata !== undefined ? { metadata: params.metadata as Record<string, unknown> } : {}),
+      ...(signal ? { signal } : {}),
     },
   );
 
@@ -127,7 +130,7 @@ async function resolveSamplingModel(
 ): Promise<{
   model: Model<Api>;
   apiKey?: string;
-  headers?: Record<string, string>;
+  headers?: ProviderHeaders;
 }> {
   const candidates: Model<Api>[] = [];
   const availableModels = options.modelRegistry.getAvailable();
@@ -160,7 +163,11 @@ async function resolveSamplingModel(
       errors.push(`${model.provider}/${model.id}: ${auth.error}`);
       continue;
     }
-    return { model, apiKey: auth.apiKey, headers: auth.headers };
+    return {
+      model,
+      ...(auth.apiKey !== undefined ? { apiKey: auth.apiKey } : {}),
+      ...(auth.headers !== undefined ? { headers: auth.headers } : {}),
+    };
   }
 
   if (errors.length > 0) {

package/node_modules/pi-mcp-adapter/search-ranking.ts

@@ -82,7 +82,8 @@ export function scoreToolMatch(tool: ToolMetadata, server: string, query: string
   if (!phraseMatched && (queryTokens.length <= 2 ? coverage !== 1 : coverage < 0.6)) return null;
 
   score += coverage === 1 ? 25 : Math.round(coverage * 10);
-  if (tokenize(fields.name).includes(queryTokens[0])) score += 8;
+  const firstQueryToken = queryTokens[0];
+  if (firstQueryToken !== undefined && tokenize(fields.name).includes(firstQueryToken)) score += 8;
   if (wholeFieldExact) score += 20;
   return score;
 }