pi-mcp-adapter 2.5.4 → 2.6.0

package/mcp-auth-flow.ts

@@ -10,24 +10,26 @@ import {
 } from "@modelcontextprotocol/sdk/client/auth.js"
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js"
 import open from "open"
-import { McpOAuthProvider, type McpOAuthConfig } from "./mcp-oauth-provider.js"
+import { McpOAuthProvider, type McpOAuthConfig } from "./mcp-oauth-provider.ts"
 import {
   ensureCallbackServer,
   waitForCallback,
   cancelPendingCallback,
   stopCallbackServer,
-} from "./mcp-callback-server.js"
+} from "./mcp-callback-server.ts"
 import {
   getAuthForUrl,
   isTokenExpired,
   hasStoredTokens,
   clearAllCredentials,
+  clearClientInfo,
+  clearCodeVerifier,
   updateOAuthState,
   getOAuthState,
   clearOAuthState,
   type StoredTokens,
-} from "./mcp-auth.js"
-import type { ServerEntry } from "./types.js"
+} from "./mcp-auth.ts"
+import type { ServerEntry } from "./types.ts"
 
 /** Auth status for a server */
 export type AuthStatus = "authenticated" | "expired" | "not_authenticated"
@@ -74,6 +76,13 @@ export async function startAuth(
 ): Promise<{ authorizationUrl: string }> {
   const config = definition ? extractOAuthConfig(definition) : {}
 
+  const storedAuth = await getAuthForUrl(serverName, serverUrl)
+  if (storedAuth?.clientInfo && !storedAuth.tokens && !config.clientId) {
+    clearClientInfo(serverName)
+    clearCodeVerifier(serverName)
+    await clearOAuthState(serverName)
+  }
+
   if (config.grantType === "client_credentials") {
     const authProvider = new McpOAuthProvider(serverName, serverUrl, config, {
       onRedirect: async () => {
@@ -92,7 +101,7 @@ export async function startAuth(
   await ensureCallbackServer({ strictPort: Boolean(config.clientId) })
 
   const oauthState = generateState()
-  await updateOAuthState(serverName, oauthState)
+  await updateOAuthState(serverName, oauthState, serverUrl)
 
   let capturedUrl: URL | undefined
   const authProvider = new McpOAuthProvider(serverName, serverUrl, config, {

package/mcp-auth.ts

@@ -11,7 +11,7 @@
 
 import { mkdirSync, readFileSync, writeFileSync, existsSync, rmSync } from 'fs';
 import { join } from 'path';
-import { getAgentPath } from './agent-dir.js';
+import { getAgentPath } from './agent-dir.ts';
 
 /** OAuth token storage format */
 export interface StoredTokens {
@@ -163,6 +163,11 @@ export function updateTokens(
   serverUrl?: string
 ): void {
   const entry = getAuthEntry(serverName) ?? {};
+  if (serverUrl && entry.serverUrl !== serverUrl) {
+    delete entry.clientInfo;
+    delete entry.codeVerifier;
+    delete entry.oauthState;
+  }
   entry.tokens = tokens;
   saveAuthEntry(serverName, entry, serverUrl);
 }
@@ -176,6 +181,11 @@ export function updateClientInfo(
   serverUrl?: string
 ): void {
   const entry = getAuthEntry(serverName) ?? {};
+  if (serverUrl && entry.serverUrl !== serverUrl) {
+    delete entry.tokens;
+    delete entry.codeVerifier;
+    delete entry.oauthState;
+  }
   entry.clientInfo = clientInfo;
   saveAuthEntry(serverName, entry, serverUrl);
 }
@@ -183,10 +193,15 @@ export function updateClientInfo(
 /**
  * Update code verifier for a server.
  */
-export function updateCodeVerifier(serverName: string, codeVerifier: string): void {
+export function updateCodeVerifier(serverName: string, codeVerifier: string, serverUrl?: string): void {
   const entry = getAuthEntry(serverName) ?? {};
+  if (serverUrl && entry.serverUrl !== serverUrl) {
+    delete entry.tokens;
+    delete entry.clientInfo;
+    delete entry.oauthState;
+  }
   entry.codeVerifier = codeVerifier;
-  saveAuthEntry(serverName, entry);
+  saveAuthEntry(serverName, entry, serverUrl);
 }
 
 /**
@@ -203,10 +218,15 @@ export function clearCodeVerifier(serverName: string): void {
 /**
  * Update OAuth state for a server.
  */
-export function updateOAuthState(serverName: string, state: string): void {
+export function updateOAuthState(serverName: string, state: string, serverUrl?: string): void {
   const entry = getAuthEntry(serverName) ?? {};
+  if (serverUrl && entry.serverUrl !== serverUrl) {
+    delete entry.tokens;
+    delete entry.clientInfo;
+    delete entry.codeVerifier;
+  }
   entry.oauthState = state;
-  saveAuthEntry(serverName, entry);
+  saveAuthEntry(serverName, entry, serverUrl);
 }
 
 /**

package/mcp-callback-server.ts

@@ -11,7 +11,7 @@ import {
   getConfiguredOAuthCallbackPort,
   getOAuthCallbackPort,
   setOAuthCallbackPort,
-} from "./mcp-oauth-provider.js"
+} from "./mcp-oauth-provider.ts"
 
 // HTML templates for callback responses
 const HTML_SUCCESS = `<!DOCTYPE html>

package/mcp-oauth-provider.ts

@@ -14,7 +14,6 @@ import type {
   OAuthClientInformationFull,
 } from "@modelcontextprotocol/sdk/shared/auth.js"
 import {
-  getAuthEntry,
   getAuthForUrl,
   updateTokens,
   updateClientInfo,
@@ -25,7 +24,7 @@ import {
   clearTokens,
   type StoredTokens,
   type StoredClientInfo,
-} from "./mcp-auth.js"
+} from "./mcp-auth.ts"
 
 // Callback server configuration
 const DEFAULT_OAUTH_CALLBACK_PORT = 19876
@@ -212,7 +211,7 @@ export class McpOAuthProvider implements OAuthClientProvider {
       throw new Error("redirectToAuthorization is not used for client_credentials flow")
     }
     // No saved oauthState means we're on the post-refresh authorize fallback.
-    const entry = await getAuthEntry(this.serverName)
+    const entry = await getAuthForUrl(this.serverName, this.serverUrl)
     if (!entry?.oauthState) {
       throw new UnauthorizedError(
         `Re-authentication required for MCP server: ${this.serverName}`,
@@ -226,7 +225,7 @@ export class McpOAuthProvider implements OAuthClientProvider {
    * Save the PKCE code verifier.
    */
   async saveCodeVerifier(codeVerifier: string): Promise<void> {
-    updateCodeVerifier(this.serverName, codeVerifier)
+    updateCodeVerifier(this.serverName, codeVerifier, this.serverUrl)
   }
 
   /**
@@ -237,7 +236,7 @@ export class McpOAuthProvider implements OAuthClientProvider {
     if (this.usesClientCredentials) {
       throw new Error("codeVerifier is not used for client_credentials flow")
     }
-    const entry = await getAuthEntry(this.serverName)
+    const entry = await getAuthForUrl(this.serverName, this.serverUrl)
     if (!entry?.codeVerifier) {
       throw new Error(`No code verifier saved for MCP server: ${this.serverName}`)
     }
@@ -248,7 +247,7 @@ export class McpOAuthProvider implements OAuthClientProvider {
    * Save the OAuth state parameter for CSRF protection.
    */
   async saveState(state: string): Promise<void> {
-    updateOAuthState(this.serverName, state)
+    updateOAuthState(this.serverName, state, this.serverUrl)
   }
 
   /**
@@ -259,7 +258,7 @@ export class McpOAuthProvider implements OAuthClientProvider {
     if (this.usesClientCredentials) {
       throw new Error("state is not used for client_credentials flow")
     }
-    const entry = await getAuthEntry(this.serverName)
+    const entry = await getAuthForUrl(this.serverName, this.serverUrl)
     if (!entry?.oauthState) {
       throw new UnauthorizedError(
         `Re-authentication required for MCP server: ${this.serverName}`,

package/mcp-panel.ts

@@ -1,8 +1,8 @@
-import { matchesKey, truncateToWidth, visibleWidth } from "@mariozechner/pi-tui";
-import { isToolExcluded } from "./types.js";
-import type { McpConfig, McpPanelCallbacks, McpPanelResult, ServerProvenance } from "./types.js";
-import { resourceNameToToolName } from "./resource-tools.js";
-import type { MetadataCache, ServerCacheEntry, CachedTool } from "./metadata-cache.js";
+import { matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { isToolExcluded } from "./types.ts";
+import type { McpConfig, McpPanelCallbacks, McpPanelResult, ServerProvenance } from "./types.ts";
+import { resourceNameToToolName } from "./resource-tools.ts";
+import type { MetadataCache, ServerCacheEntry, CachedTool } from "./metadata-cache.ts";
 
 interface PanelTheme {
   border: string;
@@ -120,10 +120,12 @@ class McpPanel {
   private discardSelected = 1;
   private importNotice: string | null = null;
   private authNotice: string | null = null;
+  private authInFlight: string | null = null;
   private inactivityTimeout: ReturnType<typeof setTimeout> | null = null;
   private visibleItems: VisibleItem[] = [];
   private tui: { requestRender(): void };
   private t = DEFAULT_THEME;
+  private authOnly: boolean;
 
   private static readonly MAX_VISIBLE = 12;
   private static readonly INACTIVITY_MS = 60_000;
@@ -135,13 +137,15 @@ class McpPanel {
     private callbacks: McpPanelCallbacks,
     tui: { requestRender(): void },
     private done: (result: McpPanelResult) => void,
-    noticeLines: string[] = [],
+    options: { noticeLines?: string[]; authOnly?: boolean } = {},
   ) {
     this.tui = tui;
-    this.noticeLines = noticeLines;
+    this.noticeLines = options.noticeLines ?? [];
+    this.authOnly = options.authOnly === true;
     this.prefix = config.settings?.toolPrefix ?? "server";
 
     for (const [serverName, definition] of Object.entries(config.mcpServers)) {
+      if (this.authOnly && !callbacks.canAuthenticate(serverName)) continue;
       const prov = provenance.get(serverName);
       const serverCache = cache?.servers?.[serverName];
 
@@ -154,7 +158,7 @@ class McpPanel {
       }
 
       const tools: ToolState[] = [];
-      if (serverCache) {
+      if (serverCache && !this.authOnly) {
         for (const tool of serverCache.tools ?? []) {
           if (isToolExcluded(tool.name, serverName, this.prefix, definition.excludeTools)) {
             continue;
@@ -230,6 +234,14 @@ class McpPanel {
     this.visibleItems = [];
     for (let si = 0; si < this.servers.length; si++) {
       const server = this.servers[si];
+      if (query && this.authOnly) {
+        const score = mode === "name" ? fuzzyScore(query, server.name) : 0;
+        if (score > 0) {
+          this.visibleItems.push({ type: "server", serverIndex: si });
+        }
+        continue;
+      }
+
       this.visibleItems.push({ type: "server", serverIndex: si });
       if (server.expanded || query) {
         for (let ti = 0; ti < server.tools.length; ti++) {
@@ -248,7 +260,7 @@ class McpPanel {
       }
     }
 
-    if (query) {
+    if (query && !this.authOnly) {
       this.visibleItems = this.visibleItems.filter((item) => {
         if (item.type === "server") {
           return this.visibleItems.some(
@@ -284,7 +296,7 @@ class McpPanel {
   handleInput(data: string): void {
     this.resetInactivityTimeout();
     this.importNotice = null;
-    this.authNotice = null;
+    if (!this.authInFlight) this.authNotice = null;
 
     if (this.confirmingDiscard) {
       this.handleDiscardInput(data);
@@ -360,7 +372,7 @@ class McpPanel {
 
     if (matchesKey(data, "space")) {
       const item = this.visibleItems[this.cursorIndex];
-      if (item) this.toggleItem(item);
+      if (item && !this.authOnly) this.toggleItem(item);
       return;
     }
 
@@ -369,8 +381,8 @@ class McpPanel {
       if (!item) return;
       const server = this.servers[item.serverIndex];
       if (item.type === "server") {
-        if (server.connectionStatus === "needs-auth") {
-          this.authNotice = `OAuth required — run /mcp-auth ${server.name} after closing this panel`;
+        if (this.authOnly || server.connectionStatus === "needs-auth") {
+          this.authenticateServer(server);
           return;
         }
         server.expanded = !server.expanded;
@@ -387,6 +399,12 @@ class McpPanel {
       return;
     }
 
+    if (matchesKey(data, "ctrl+a")) {
+      const item = this.visibleItems[this.cursorIndex];
+      if (item) this.authenticateSelectedServer(item);
+      return;
+    }
+
     if (matchesKey(data, "ctrl+r")) {
       const item = this.visibleItems[this.cursorIndex];
       if (!item) return;
@@ -413,6 +431,7 @@ class McpPanel {
     }
 
     if (data === "?") {
+      if (this.authOnly) return;
       this.descSearchActive = true;
       this.descQuery = "";
       this.rebuildVisibleItems();
@@ -439,7 +458,39 @@ class McpPanel {
     }
   }
 
+  private authenticateSelectedServer(item: VisibleItem): void {
+    this.authenticateServer(this.servers[item.serverIndex]);
+  }
+
+  private authenticateServer(server: ServerState): void {
+    if (this.authInFlight) return;
+    if (!this.callbacks.canAuthenticate(server.name)) {
+      this.authNotice = `${server.name} does not use OAuth authentication.`;
+      return;
+    }
+
+    this.authInFlight = server.name;
+    this.authNotice = `Authenticating ${server.name}...`;
+    this.tui.requestRender();
+
+    this.callbacks.authenticate(server.name).then((result) => {
+      server.connectionStatus = this.callbacks.getConnectionStatus(server.name);
+      this.authNotice = result.ok
+        ? `OAuth finished for ${server.name}. Run reconnect if it is still idle.`
+        : `OAuth failed for ${server.name}${result.message ? `: ${result.message}` : ". Check the notification for details."}`;
+      this.authInFlight = null;
+      this.tui.requestRender();
+    }).catch((error) => {
+      const message = error instanceof Error ? error.message : String(error);
+      server.connectionStatus = this.callbacks.getConnectionStatus(server.name);
+      this.authNotice = `OAuth failed for ${server.name}: ${message}`;
+      this.authInFlight = null;
+      this.tui.requestRender();
+    });
+  }
+
   private toggleItem(item: VisibleItem): void {
+    if (this.authOnly) return;
     const server = this.servers[item.serverIndex];
     if (item.type === "server") {
       const newState = !server.tools.every((t) => t.isDirect);
@@ -550,7 +601,7 @@ class McpPanel {
     const emptyRow = () => fg(t.border, "│") + " ".repeat(innerW) + fg(t.border, "│");
     const divider = () => fg(t.border, "├" + "─".repeat(innerW) + "┤");
 
-    const titleText = " MCP Servers ";
+    const titleText = this.authOnly ? " MCP OAuth " : " MCP Servers ";
     const borderLen = innerW - visibleWidth(titleText);
     const leftB = Math.floor(borderLen / 2);
     const rightB = borderLen - leftB;
@@ -579,7 +630,7 @@ class McpPanel {
 
     if (this.servers.length === 0) {
       lines.push(emptyRow());
-      lines.push(row(fg(t.hint, italic("No MCP servers configured."))));
+      lines.push(row(fg(t.hint, italic(this.authOnly ? "No OAuth-capable MCP servers configured." : "No MCP servers configured."))));
       lines.push(emptyRow());
     } else {
       const maxVis = McpPanel.MAX_VISIBLE;
@@ -631,27 +682,40 @@ class McpPanel {
         : fg(t.hint, "  Keep  ");
       lines.push(row(`Discard unsaved changes?  ${discardBtn}   ${keepBtn}`));
     } else {
-      const directCount = this.servers.reduce((sum, s) => sum + s.tools.filter((t) => t.isDirect).length, 0);
-      const totalTokens = this.servers.reduce(
-        (sum, s) => sum + s.tools.filter((t) => t.isDirect).reduce((ts, t) => ts + t.estimatedTokens, 0),
-        0,
-      );
-      const stats =
-        directCount > 0 ? `${directCount} direct  ~${totalTokens.toLocaleString()} tokens` : "no direct tools";
-      lines.push(row(fg(t.description, stats + (this.dirty ? fg(t.needsAuth, "  (unsaved)") : ""))));
+      if (this.authOnly) {
+        lines.push(row(fg(t.description, "select a server to authenticate")));
+      } else {
+        const directCount = this.servers.reduce((sum, s) => sum + s.tools.filter((t) => t.isDirect).length, 0);
+        const totalTokens = this.servers.reduce(
+          (sum, s) => sum + s.tools.filter((t) => t.isDirect).reduce((ts, t) => ts + t.estimatedTokens, 0),
+          0,
+        );
+        const stats =
+          directCount > 0 ? `${directCount} direct  ~${totalTokens.toLocaleString()} tokens` : "no direct tools";
+        lines.push(row(fg(t.description, stats + (this.dirty ? fg(t.needsAuth, "  (unsaved)") : ""))));
+      }
     }
 
     lines.push(emptyRow());
-    const hints = [
-      italic("↑↓") + " navigate",
-      italic("space") + " toggle",
-      italic("⏎") + " expand",
-      italic("ctrl+r") + " reconnect",
-      italic("?") + " desc search",
-      italic("ctrl+s") + " save",
-      italic("esc") + " clear/close",
-      italic("ctrl+c") + " quit",
-    ];
+    const hints = this.authOnly
+      ? [
+          italic("↑↓") + " navigate",
+          italic("⏎") + " auth",
+          italic("ctrl+a") + " auth",
+          italic("esc") + " clear/close",
+          italic("ctrl+c") + " quit",
+        ]
+      : [
+          italic("↑↓") + " navigate",
+          italic("space") + " toggle",
+          italic("⏎") + " expand/auth",
+          italic("ctrl+a") + " auth",
+          italic("ctrl+r") + " reconnect",
+          italic("?") + " desc search",
+          italic("ctrl+s") + " save",
+          italic("esc") + " clear/close",
+          italic("ctrl+c") + " quit",
+        ];
     const gap = "  ";
     const gapW = 2;
     const maxW = innerW - 2;
@@ -685,9 +749,10 @@ class McpPanel {
 
     const nameStr = isCursor ? bold(fg(t.selected, server.name)) : server.name;
     const importLabel = server.source === "import" ? fg(t.description, ` (${server.importKind ?? "import"})`) : "";
+    const statusLabel = this.renderConnectionStatus(server);
 
-    if (!server.hasCachedData) {
-      return `${prefix}   ${nameStr}${importLabel}  ${fg(t.description, "(not cached)")}`;
+    if (!server.hasCachedData && !this.authOnly) {
+      return `${prefix}   ${nameStr}${importLabel}  ${fg(t.description, "(not cached)")}${statusLabel}`;
     }
 
     const directCount = server.tools.filter((t) => t.isDirect).length;
@@ -709,7 +774,18 @@ class McpPanel {
       toolInfo = fg(t.description, toolInfo);
     }
 
-    return `${prefix} ${toggleIcon} ${nameStr}${importLabel}  ${toolInfo}`;
+    return `${prefix} ${toggleIcon} ${nameStr}${importLabel}  ${toolInfo}${statusLabel}`;
+  }
+
+  private renderConnectionStatus(server: ServerState): string {
+    const t = this.t;
+    if (this.authInFlight === server.name) return `  ${fg(t.needsAuth, "authenticating")}`;
+    if (server.connectionStatus === "needs-auth") return `  ${fg(t.needsAuth, "needs auth")}`;
+    if (server.connectionStatus === "connecting") return `  ${fg(t.needsAuth, "connecting")}`;
+    if (server.connectionStatus === "failed") return `  ${fg(t.cancel, "failed")}`;
+    if (this.authOnly && server.connectionStatus === "connected") return `  ${fg(t.direct, "connected")}`;
+    if (this.authOnly) return `  ${fg(t.description, "idle")}`;
+    return "";
   }
 
   private renderToolRow(tool: ToolState, isCursor: boolean, innerW: number): string {
@@ -744,7 +820,7 @@ export function createMcpPanel(
   callbacks: McpPanelCallbacks,
   tui: { requestRender(): void },
   done: (result: McpPanelResult) => void,
-  options?: { noticeLines?: string[] },
+  options?: { noticeLines?: string[]; authOnly?: boolean },
 ): McpPanel & { dispose(): void } {
-  return new McpPanel(config, cache, provenance, callbacks, tui, done, options?.noticeLines ?? []);
+  return new McpPanel(config, cache, provenance, callbacks, tui, done, options ?? {});
 }

package/mcp-setup-panel.ts

@@ -1,7 +1,7 @@
-import { matchesKey, truncateToWidth, visibleWidth } from "@mariozechner/pi-tui";
-import type { ImportKind } from "./types.js";
-import type { ConfigWritePreview, McpDiscoverySummary } from "./config.js";
-import type { McpOnboardingState } from "./onboarding-state.js";
+import { matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import type { ImportKind } from "./types.ts";
+import type { ConfigWritePreview, McpDiscoverySummary } from "./config.ts";
+import type { McpOnboardingState } from "./onboarding-state.ts";
 
 interface SetupTheme {
   border: string;

package/metadata-cache.ts

@@ -1,13 +1,13 @@
 // metadata-cache.ts - Persistent MCP metadata cache
 import { existsSync, readFileSync, writeFileSync, renameSync, mkdirSync } from "node:fs";
 import { dirname } from "node:path";
-import { getAgentPath } from "./agent-dir.js";
+import { getAgentPath } from "./agent-dir.ts";
 import { createHash } from "node:crypto";
 import { getToolUiResourceUri } from "@modelcontextprotocol/ext-apps/app-bridge";
-import type { McpTool, McpResource, ServerEntry, ToolMetadata } from "./types.js";
-import { formatToolName, isToolExcluded } from "./types.js";
-import { resourceNameToToolName } from "./resource-tools.js";
-import { extractToolUiStreamMode, interpolateEnvRecord, resolveBearerToken, resolveConfigPath } from "./utils.js";
+import type { McpTool, McpResource, ServerEntry, ToolMetadata } from "./types.ts";
+import { formatToolName, isToolExcluded } from "./types.ts";
+import { resourceNameToToolName } from "./resource-tools.ts";
+import { extractToolUiStreamMode, interpolateEnvRecord, resolveBearerToken, resolveConfigPath } from "./utils.ts";
 
 const CACHE_VERSION = 1;
 const CACHE_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000;

package/npx-resolver.ts

@@ -1,7 +1,7 @@
 // npx-resolver.ts - Resolve npx/npm exec binaries to avoid npm parent processes
 import { existsSync, readFileSync, realpathSync, readdirSync, statSync, writeFileSync, renameSync, mkdirSync, openSync, readSync, closeSync } from "node:fs";
 import { join, dirname, extname, resolve, sep } from "node:path";
-import { getAgentPath } from "./agent-dir.js";
+import { getAgentPath } from "./agent-dir.ts";
 import { spawn, spawnSync } from "node:child_process";
 
 const CACHE_VERSION = 1;

package/oauth-handler.ts

@@ -1,7 +1,7 @@
 // oauth-handler.ts - OAuth token management for MCP servers
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
-import { getAgentPath } from "./agent-dir.js";
+import { getAgentPath } from "./agent-dir.ts";
 import type { OAuthTokens } from "@modelcontextprotocol/sdk/shared/auth.js";
 
 // Token storage path for a server

package/onboarding-state.ts

@@ -1,6 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync, renameSync } from "node:fs";
 import { dirname } from "node:path";
-import { getAgentPath } from "./agent-dir.js";
+import { getAgentPath } from "./agent-dir.ts";
 
 export interface McpOnboardingState {
   version: 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-mcp-adapter",
-  "version": "2.5.4",
+  "version": "2.6.0",
   "description": "MCP (Model Context Protocol) adapter extension for Pi coding agent",
   "type": "module",
   "license": "MIT",
@@ -55,6 +55,7 @@
     "server-manager.ts",
     "sampling-handler.ts",
     "tool-registrar.ts",
+    "tool-result-renderer.ts",
     "resource-tools.ts",
     "lifecycle.ts",
     "metadata-cache.ts",
@@ -73,22 +74,25 @@
     "logger.ts",
     "errors.ts",
     "app-bridge.bundle.js",
+    "banner.png",
     "README.md",
     "CHANGELOG.md",
     "LICENSE"
   ],
   "dependencies": {
+    "@earendil-works/pi-ai": "^0.74.0",
+    "@earendil-works/pi-tui": "^0.74.0",
     "@modelcontextprotocol/ext-apps": "^1.2.2",
     "@modelcontextprotocol/sdk": "^1.25.1",
-    "@mariozechner/pi-ai": "^0.70.2",
-    "typebox": "^1.1.24",
     "open": "^10.2.0",
+    "typebox": "^1.1.24",
     "zod": "^3.25.0 || ^4.0.0"
   },
   "peerDependencies": {
     "zod": "^3.25.0 || ^4.0.0"
   },
   "devDependencies": {
+    "@earendil-works/pi-coding-agent": "^0.74.0",
     "@types/bun": "^1.0.0",
     "@types/node": "^20.0.0",
     "@types/open": "^6.2.1",

package/proxy-modes.ts

@@ -1,13 +1,13 @@
-import type { AgentToolResult, ToolInfo } from "@mariozechner/pi-coding-agent";
-import type { McpExtensionState } from "./state.js";
-import type { ToolMetadata, McpContent } from "./types.js";
-import { getServerPrefix, parseUiPromptHandoff } from "./types.js";
-import { lazyConnect, updateServerMetadata, updateMetadataCache, getFailureAgeSeconds, updateStatusBar } from "./init.js";
-import { buildToolMetadata, getToolNames, findToolByName, formatSchema } from "./tool-metadata.js";
-import { transformMcpContent } from "./tool-registrar.js";
-import { maybeStartUiSession, type UiSessionRuntime } from "./ui-session.js";
-import { formatAuthRequiredMessage, truncateAtWord } from "./utils.js";
-import { authenticate, supportsOAuth } from "./mcp-auth-flow.js";
+import type { AgentToolResult, ToolInfo } from "@earendil-works/pi-coding-agent";
+import type { McpExtensionState } from "./state.ts";
+import type { ToolMetadata, McpContent } from "./types.ts";
+import { getServerPrefix, parseUiPromptHandoff } from "./types.ts";
+import { lazyConnect, updateServerMetadata, updateMetadataCache, getFailureAgeSeconds, updateStatusBar } from "./init.ts";
+import { buildToolMetadata, getToolNames, findToolByName, formatSchema } from "./tool-metadata.ts";
+import { transformMcpContent } from "./tool-registrar.ts";
+import { maybeStartUiSession, type UiSessionRuntime } from "./ui-session.ts";
+import { formatAuthRequiredMessage, truncateAtWord } from "./utils.ts";
+import { authenticate, supportsOAuth } from "./mcp-auth-flow.ts";
 
 type ProxyToolResult = AgentToolResult<Record<string, unknown>>;
 
@@ -45,7 +45,7 @@ async function attemptAutoAuth(
     return { status: "skipped" };
   }
 
-  const grantType = definition.oauth?.grantType ?? "authorization_code";
+  const grantType = definition.oauth ? definition.oauth.grantType ?? "authorization_code" : "authorization_code";
   if (!state.ui && grantType !== "client_credentials") {
     return {
       status: "failed",

package/sampling-handler.ts

@@ -1,6 +1,6 @@
-import { complete, type Api, 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,
@@ -147,10 +147,11 @@ async function resolveSamplingModel(
   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) {