pi-mcp-adapter 2.5.3 → 2.6.0

package/sampling-handler.ts

@@ -1,11 +1,12 @@
-import { complete, type AssistantMessage, type Message, type Model, type TextContent } from "@mariozechner/pi-ai";
-import { truncateAtWord } from "./utils.js";
-import type { ExtensionUIContext, ModelRegistry } from "@mariozechner/pi-coding-agent";
+import { complete, type Api, type AssistantMessage, type Message, type Model, type TextContent } from "@earendil-works/pi-ai";
+import { truncateAtWord } from "./utils.ts";
+import type { ExtensionUIContext, ModelRegistry } from "@earendil-works/pi-coding-agent";
 import type { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import {
   CreateMessageRequestSchema,
   type CreateMessageRequest,
   type CreateMessageResult,
+  type ModelPreferences,
   type SamplingMessage,
   type SamplingMessageContentBlock,
 } from "@modelcontextprotocol/sdk/types.js";
@@ -15,7 +16,7 @@ export interface SamplingHandlerOptions {
   autoApprove: boolean;
   ui?: ExtensionUIContext;
   modelRegistry: ModelRegistry;
-  getCurrentModel: () => Model<any> | undefined;
+  getCurrentModel: () => Model<Api> | undefined;
   getSignal: () => AbortSignal | undefined;
 }
 
@@ -50,7 +51,7 @@ export async function handleSamplingRequest(
   }
 
   const messages = params.messages.map(convertSamplingMessage);
-  const { model, apiKey, headers } = await resolveSamplingModel(options);
+  const { model, apiKey, headers } = await resolveSamplingModel(options, params.modelPreferences);
   await confirmSampling(
     options,
     "Approve MCP sampling request",
@@ -114,28 +115,43 @@ function messageText(message: Message): string {
   }).join("\n");
 }
 
-async function resolveSamplingModel(options: SamplingHandlerOptions): Promise<{
-  model: Model<any>;
+async function resolveSamplingModel(
+  options: SamplingHandlerOptions,
+  modelPreferences: ModelPreferences | undefined,
+): Promise<{
+  model: Model<Api>;
   apiKey?: string;
   headers?: Record<string, string>;
 }> {
-  const candidates: Model<any>[] = [];
-  const currentModel = options.getCurrentModel();
-  if (currentModel) candidates.push(currentModel);
+  const candidates: Model<Api>[] = [];
+  const availableModels = options.modelRegistry.getAvailable();
 
-  for (const model of options.modelRegistry.getAvailable()) {
-    if (!candidates.some((candidate) => candidate.provider === model.provider && candidate.id === model.id)) {
-      candidates.push(model);
+  for (const hint of modelPreferences?.hints ?? []) {
+    const normalizedHint = hint.name?.trim().toLowerCase();
+    if (!normalizedHint) continue;
+    for (const model of availableModels) {
+      const searchableNames = [`${model.provider}/${model.id}`, model.id, model.name];
+      if (searchableNames.some((name) => name.toLowerCase().includes(normalizedHint))) {
+        addSamplingCandidate(candidates, model);
+      }
     }
   }
 
+  const currentModel = options.getCurrentModel();
+  if (currentModel) addSamplingCandidate(candidates, currentModel);
+
+  for (const model of availableModels) {
+    addSamplingCandidate(candidates, model);
+  }
+
   const errors: string[] = [];
   for (const model of candidates) {
     const auth = await options.modelRegistry.getApiKeyAndHeaders(model);
-    if (auth.ok) {
-      return { model, apiKey: auth.apiKey, headers: auth.headers };
+    if (auth.ok === false) {
+      errors.push(`${model.provider}/${model.id}: ${auth.error}`);
+      continue;
     }
-    errors.push(`${model.provider}/${model.id}: ${auth.error}`);
+    return { model, apiKey: auth.apiKey, headers: auth.headers };
   }
 
   if (errors.length > 0) {
@@ -144,6 +160,12 @@ async function resolveSamplingModel(options: SamplingHandlerOptions): Promise<{
   throw new Error("No Pi model is available for MCP sampling");
 }
 
+function addSamplingCandidate(candidates: Model<Api>[], model: Model<Api>): void {
+  if (!candidates.some((candidate) => candidate.provider === model.provider && candidate.id === model.id)) {
+    candidates.push(model);
+  }
+}
+
 async function confirmSampling(options: SamplingHandlerOptions, title: string, message: string): Promise<void> {
   if (options.autoApprove) return;
   if (!options.ui) {

package/server-manager.ts

@@ -10,14 +10,14 @@ import type {
   ServerDefinition,
   ServerStreamResultPatchNotification,
   Transport,
-} from "./types.js";
-import { serverStreamResultPatchNotificationSchema } from "./types.js";
-import { resolveNpxBinary } from "./npx-resolver.js";
-import { logger } from "./logger.js";
-import { McpOAuthProvider } from "./mcp-oauth-provider.js";
-import { supportsOAuth } from "./mcp-auth-flow.js";
-import { registerSamplingHandler, type ServerSamplingConfig } from "./sampling-handler.js";
-import { interpolateEnvRecord, resolveConfigPath } from "./utils.js";
+} from "./types.ts";
+import { serverStreamResultPatchNotificationSchema } from "./types.ts";
+import { resolveNpxBinary } from "./npx-resolver.ts";
+import { logger } from "./logger.ts";
+import { McpOAuthProvider } from "./mcp-oauth-provider.ts";
+import { supportsOAuth } from "./mcp-auth-flow.ts";
+import { registerSamplingHandler, type ServerSamplingConfig } from "./sampling-handler.ts";
+import { interpolateEnvRecord, resolveBearerToken, resolveConfigPath } from "./utils.ts";
 
 interface ServerConnection {
   client: Client;
@@ -170,8 +170,7 @@ export class McpServerManager {
     
     // For bearer auth, add the token to headers BEFORE creating requestInit
     if (definition.auth === "bearer") {
-      const token = definition.bearerToken 
-        ?? (definition.bearerTokenEnv ? process.env[definition.bearerTokenEnv] : undefined);
+      const token = resolveBearerToken(definition);
       if (token) {
         headers["Authorization"] = `Bearer ${token}`;
       }

package/state.ts

@@ -1,10 +1,10 @@
-import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
-import type { ConsentManager } from "./consent-manager.js";
-import type { McpLifecycleManager } from "./lifecycle.js";
-import type { McpServerManager } from "./server-manager.js";
-import type { ToolMetadata, McpConfig, UiSessionMessages, UiStreamSummary } from "./types.js";
-import type { UiResourceHandler } from "./ui-resource-handler.js";
-import type { UiServerHandle } from "./ui-server.js";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { ConsentManager } from "./consent-manager.ts";
+import type { McpLifecycleManager } from "./lifecycle.ts";
+import type { McpServerManager } from "./server-manager.ts";
+import type { ToolMetadata, McpConfig, UiSessionMessages, UiStreamSummary } from "./types.ts";
+import type { UiResourceHandler } from "./ui-resource-handler.ts";
+import type { UiServerHandle } from "./ui-server.ts";
 
 export interface CompletedUiSession {
   serverName: string;
@@ -18,7 +18,7 @@ export interface CompletedUiSession {
 export type SendMessageFn = (
   message: {
     customType: string;
-    content: Array<{ type: string; text: string }>;
+    content: Array<{ type: "text"; text: string }>;
     display?: string;
     details?: unknown;
   },

package/tool-metadata.ts

@@ -1,9 +1,9 @@
 import { getToolUiResourceUri } from "@modelcontextprotocol/ext-apps/app-bridge";
-import type { McpExtensionState } from "./state.js";
-import type { ToolMetadata, McpTool, McpResource, ServerEntry } from "./types.js";
-import { formatToolName, isToolExcluded } from "./types.js";
-import { resourceNameToToolName } from "./resource-tools.js";
-import { extractToolUiStreamMode } from "./utils.js";
+import type { McpExtensionState } from "./state.ts";
+import type { ToolMetadata, McpTool, McpResource, ServerEntry } from "./types.ts";
+import { formatToolName, isToolExcluded } from "./types.ts";
+import { resourceNameToToolName } from "./resource-tools.ts";
+import { extractToolUiStreamMode } from "./utils.ts";
 
 export function buildToolMetadata(
   tools: McpTool[],

package/tool-registrar.ts

@@ -2,7 +2,7 @@
 // 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 { McpContent, ContentBlock } from "./types.js";
+import type { McpContent, ContentBlock } from "./types.ts";
 
 /**
  * Transform MCP content types to Pi content blocks.

package/tool-result-renderer.ts

@@ -0,0 +1,65 @@
+import type { AgentToolResult, ToolRenderResultOptions } from "@earendil-works/pi-coding-agent";
+import { Text } from "@earendil-works/pi-tui";
+
+type McpToolResultDetails = Record<string, unknown> & { error?: unknown };
+type McpToolContentBlock = AgentToolResult<McpToolResultDetails>["content"][number];
+
+interface RenderTheme {
+  fg: (name: string, text: string) => string;
+}
+
+interface McpToolRenderContext {
+  isError: boolean;
+}
+
+export interface McpToolResultDisplay {
+  lines: string[];
+  truncated: boolean;
+}
+
+function blockToLines(block: McpToolContentBlock): string[] {
+  if (block.type === "text") {
+    return block.text.split("\n");
+  }
+  return [`[image: ${block.mimeType}]`];
+}
+
+export function formatMcpToolResultLines(
+  result: Pick<AgentToolResult<McpToolResultDetails>, "content">,
+  expanded: boolean,
+  maxCollapsedLines = 3,
+): McpToolResultDisplay {
+  const allLines = result.content.flatMap(blockToLines);
+  const lines = allLines.length > 0 ? allLines : ["(empty result)"];
+
+  if (expanded || lines.length <= maxCollapsedLines) {
+    return { lines, truncated: false };
+  }
+
+  return {
+    lines: [...lines.slice(0, maxCollapsedLines), "…"],
+    truncated: true,
+  };
+}
+
+export function renderMcpToolResult(
+  result: AgentToolResult<McpToolResultDetails>,
+  options: ToolRenderResultOptions,
+  theme: RenderTheme,
+  context?: McpToolRenderContext,
+) {
+  if (options.isPartial) {
+    return new Text(theme.fg("warning", "Running MCP tool..."), 0, 0);
+  }
+
+  const hasErrorDetails = Boolean(result.details.error);
+  const display = formatMcpToolResultLines(result, options.expanded || context?.isError === true || hasErrorDetails);
+  const output = display.lines
+    .map((line) => line === "…" ? theme.fg("muted", line) : theme.fg("toolOutput", line))
+    .join("\n");
+  const hint = display.truncated && !options.expanded
+    ? `\n${theme.fg("muted", "(Ctrl+O to expand)")}`
+    : "";
+
+  return new Text(`${output}${hint}`, 0, 0);
+}

package/types.ts

@@ -2,8 +2,8 @@
 import type { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import type { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import type { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
-import type { TextContent, ImageContent } from "@mariozechner/pi-ai";
-import type { UiStreamMode } from "./ui-stream-types.js";
+import type { TextContent, ImageContent } from "@earendil-works/pi-ai";
+import type { UiStreamMode } from "./ui-stream-types.ts";
 
 // Transport type (stdio + HTTP)
 export type Transport = 
@@ -137,7 +137,7 @@ export {
   type UiStreamResultPatchNotification,
   type ServerStreamResultPatchNotification,
   type UiStreamSummary,
-} from "./ui-stream-types.js";
+} from "./ui-stream-types.ts";
 
 export interface UiMessageParams {
   role?: string;
@@ -365,10 +365,17 @@ export interface ServerProvenance {
   importKind?: string;
 }
 
+export interface McpAuthResult {
+  ok: boolean;
+  message?: string;
+}
+
 export interface McpPanelCallbacks {
   reconnect: (serverName: string) => Promise<boolean>;
+  canAuthenticate: (serverName: string) => boolean;
+  authenticate: (serverName: string) => Promise<McpAuthResult>;
   getConnectionStatus: (serverName: string) => "connected" | "idle" | "failed" | "needs-auth";
-  refreshCacheAfterReconnect: (serverName: string) => import("./metadata-cache.js").ServerCacheEntry | null;
+  refreshCacheAfterReconnect: (serverName: string) => import("./metadata-cache.ts").ServerCacheEntry | null;
 }
 
 export interface McpPanelResult {

package/ui-resource-handler.ts

@@ -1,9 +1,9 @@
 import { RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/app-bridge";
 import type { ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
-import { ResourceFetchError, ResourceParseError } from "./errors.js";
-import { logger } from "./logger.js";
-import type { McpServerManager } from "./server-manager.js";
-import type { UiResourceContent, UiResourceMeta } from "./types.js";
+import { ResourceFetchError, ResourceParseError } from "./errors.ts";
+import { logger } from "./logger.ts";
+import type { McpServerManager } from "./server-manager.ts";
+import type { UiResourceContent, UiResourceMeta } from "./types.ts";
 
 interface ResourceContentRecord {
   uri?: string;

package/ui-server.ts

@@ -7,11 +7,11 @@ import type {
   CallToolRequest,
   CallToolResult,
 } from "@modelcontextprotocol/sdk/types.js";
-import type { ConsentManager } from "./consent-manager.js";
-import { ServerError, wrapError } from "./errors.js";
-import { buildHostHtmlTemplate, buildCspMetaContent, applyCspMeta } from "./host-html-template.js";
-import { logger } from "./logger.js";
-import type { McpServerManager } from "./server-manager.js";
+import type { ConsentManager } from "./consent-manager.ts";
+import { ServerError, wrapError } from "./errors.ts";
+import { buildHostHtmlTemplate, buildCspMetaContent, applyCspMeta } from "./host-html-template.ts";
+import { logger } from "./logger.ts";
+import type { McpServerManager } from "./server-manager.ts";
 import {
   extractUiPromptText,
   getVisualizationStreamEnvelope,
@@ -27,7 +27,7 @@ import {
   type UiResourceContent,
   type UiSessionMessages,
   type UiStreamSummary,
-} from "./types.js";
+} from "./types.ts";
 
 const MAX_BODY_SIZE = 2 * 1024 * 1024;
 const ABANDONED_GRACE_MS = 60_000;

package/ui-session.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto";
 import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import type { McpExtensionState } from "./state.js";
+import type { McpExtensionState } from "./state.ts";
 import {
   extractUiPromptText,
   UI_STREAM_HOST_CONTEXT_KEY,
@@ -10,10 +10,10 @@ import {
   type UiMessageParams,
   type UiModelContextParams,
   type UiStreamMode,
-} from "./types.js";
-import { logger } from "./logger.js";
-import { startUiServer, type UiServerHandle } from "./ui-server.js";
-import { isGlimpseAvailable, openGlimpseWindow } from "./glimpse-ui.js";
+} from "./types.ts";
+import { logger } from "./logger.ts";
+import { startUiServer, type UiServerHandle } from "./ui-server.ts";
+import { isGlimpseAvailable, openGlimpseWindow } from "./glimpse-ui.ts";
 
 let activeGlimpseWindow: { close(): void } | null = null;
 

package/utils.ts

@@ -1,7 +1,7 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { homedir, platform } from "node:os";
 import { join } from "node:path";
-import type { McpConfig } from "./types.js";
+import type { McpConfig, ServerEntry } from "./types.ts";
 
 async function execOpen(pi: ExtensionAPI, target: string, browser?: string) {
   const os = platform();
@@ -86,6 +86,13 @@ export function resolveConfigPath(value: string | undefined): string | undefined
   return resolved;
 }
 
+export function resolveBearerToken(definition: Pick<ServerEntry, "bearerToken" | "bearerTokenEnv">): string | undefined {
+  if (definition.bearerToken !== undefined) {
+    return interpolateEnvVars(definition.bearerToken);
+  }
+  return definition.bearerTokenEnv ? process.env[definition.bearerTokenEnv] : undefined;
+}
+
 export function truncateAtWord(text: string, target: number): string {
   if (!text || text.length <= target) return text;