fix: clean up mcp app types

Author: RomneyDa

core/context/mcp/MCPAppsResource.ts

@@ -118,6 +118,10 @@ class MCPConnection {
     };
   }
 
+  async getResource(uri: string) {
+    return await this.client.readResource({ uri });
+  }
+
   async connectClient(forceRefresh: boolean, externalSignal: AbortSignal) {
     if (this.status === "disabled") {
       return;

core/context/mcp/MCPConnection.ts

@@ -74,9 +74,8 @@ class MCPContextProvider extends BaseContextProvider {
       throw new Error(`No MCP connection found for ${mcpId}`);
     }
 
-    const { contents } = await connection.client.readResource({
-      uri: this.insertInputToUriTemplate(uri, extras.fullInput),
-    });
+    const resourceuri = this.insertInputToUriTemplate(uri, extras.fullInput);
+    const { contents } = await connection.getResource(resourceuri);
 
     return await Promise.all(
       contents.map(async (resource) => {

core/context/providers/MCPContextProvider.ts

@@ -563,6 +563,14 @@ export class Core {
       );
     });
 
+    // // MCP Apps
+    // on("mcp/fetchResourceUri", async (msg) => {
+    //   removeMCPAuth(msg.data.serverUrl, this.ide);
+    //   await MCPManagerSingleton.getInstance().refreshConnection(
+    //     msg.data.serverId,
+    //   );
+    // });
+
     // Context providers
     on("context/addDocs", async (msg) => {
       void this.docsService.indexAndAdd(msg.data);

core/core.ts

@@ -497,6 +497,7 @@ export type ToolStatus =
   | "done" // Tool execution completed successfully
   | "canceled"; // Tool call was canceled by user or system
 
+interface;
 // Will exist only on "assistant" messages with tool calls
 interface ToolCallState {
   toolCallId: string;
@@ -1134,7 +1135,7 @@ export interface Tool {
   };
   defaultToolPolicy?: ToolPolicy;
   toolCallIcon?: string;
-  mcpAppUI?: MCPToolUIMetadata; // MCP Apps UI metadata
+  mcpAppUI?: MCPToolUIMetadata;
   preprocessArgs?: (
     args: Record<string, unknown>,
     extras: {
@@ -1338,9 +1339,6 @@ export interface MCPPrompt {
   arguments?: MCPPromptArgs;
 }
 
-// Leaving here to ideate on
-// export type ContinueConfigSource = "local-yaml" | "local-json" | "hub-assistant" | "hub"
-
 // https://modelcontextprotocol.io/docs/concepts/resources#direct-resources
 export interface MCPResource {
   name: string;
@@ -1349,10 +1347,17 @@ export interface MCPResource {
   mimeType?: string;
 }
 
+// https://modelcontextprotocol.io/docs/extensions/apps
+export type MCPToolUIMetadata = {
+  resourceUri: string; // URI of the UI resource (typically ui://)
+  permissions?: string[]; // Additional iframe permissions (e.g., "microphone", "camera")
+  csp?: string[]; // Content Security Policy origins for loading external resources
+};
+
 // https://modelcontextprotocol.io/docs/concepts/resources#resource-templates
 export interface MCPResourceTemplate {
-  uriTemplate: string;
   name: string;
+  uriTemplate: string;
   description?: string;
   mimeType?: string;
 }
@@ -1369,23 +1374,13 @@ export interface MCPTool {
   };
 }
 
-// MCP Apps UI metadata (https://modelcontextprotocol.io/docs/extensions/apps)
-export interface MCPToolUIMetadata {
-  resourceUri: string; // URI of the UI resource (typically ui://)
-  permissions?: string[]; // Additional iframe permissions (e.g., "microphone", "camera")
-  csp?: string[]; // Content Security Policy origins for loading external resources
-}
-
 export interface MCPAppResourceContent {
   uri: string;
   mimeType: string;
   text?: string;
   blob?: string;
   _meta?: {
-    ui?: {
-      permissions?: string[];
-      csp?: string[];
-    };
+    ui?: Pick<MCPToolUIMetadata, "permissions", "csp">;
   };
 }
 

core/index.d.ts

@@ -173,33 +173,6 @@ export type ToCoreFromIdeOrWebviewProtocol = {
     },
     void,
   ];
-  "mcpApp/fetchUI": [
-    {
-      toolCallId: string;
-      mcpServerId: string;
-      resourceUri: string;
-    },
-    {
-      htmlContent?: string;
-      permissions?: string[];
-      csp?: string[];
-      error?: string;
-    },
-  ];
-  "mcpApp/callTool": [
-    {
-      mcpServerId: string;
-      name: string;
-      arguments: Record<string, any>;
-    },
-    {
-      content: Array<{
-        type: string;
-        text?: string;
-        [key: string]: any;
-      }>;
-    },
-  ];
   "context/getSymbolsForFiles": [{ uris: string[] }, FileSymbolMap];
   "context/loadSubmenuItems": [{ title: string }, ContextSubmenuItem[]];
   "autocomplete/complete": [AutocompleteInput, string[]];

core/protocol/core.ts

@@ -1,10 +1,8 @@
 import { ToCoreFromIdeOrWebviewProtocol } from "./core.js";
-import { MCPAppProtocol } from "./mcpApps.js";
 import { ToWebviewFromIdeOrCoreProtocol } from "./webview.js";
 
 export type ToCoreFromWebviewProtocol = ToCoreFromIdeOrWebviewProtocol & {
   didChangeSelectedProfile: [{ id: string }, void];
   didChangeSelectedOrg: [{ id: string; profileId?: string }, void];
 };
-export type ToWebviewFromCoreProtocol = ToWebviewFromIdeOrCoreProtocol &
-  MCPAppProtocol;
+export type ToWebviewFromCoreProtocol = ToWebviewFromIdeOrCoreProtocol;

core/protocol/coreWebview.ts

@@ -6,7 +6,6 @@ interface MCPAppIframeProps {
   toolCallId: string;
   permissions?: string[];
   csp?: string[];
-  onMessage?: (message: any) => void;
   toolResult?: any;
   resourceUri?: string;
 }
@@ -19,7 +18,6 @@ interface MCPAppIframeProps {
 export function MCPAppIframe({
   htmlContent,
   toolCallId,
-  onMessage,
   toolResult,
   resourceUri = `ui://${toolCallId}`,
 }: MCPAppIframeProps) {

core/protocol/mcpApps.ts

@@ -43,7 +43,6 @@ export function ToolCallDiv({
       functionName && tool?.toolCallIcon
         ? getIconByName(tool.toolCallIcon)
         : undefined;
-
     // Render MCP App UI if available
     if (toolCallState.mcpAppUI?.htmlContent) {
       return (
@@ -57,6 +56,7 @@ export function ToolCallDiv({
             permissions={toolCallState.mcpAppUI.permissions}
             csp={toolCallState.mcpAppUI.csp}
             toolResult={toolCallState.output}
+            resourceUri={toolCallState.mcpAppUI?.resourceUri}
           />
         </div>
       );