Add extensions logging (#11261)

packages/core/src/tools/mcp-client.ts

@@ -610,6 +610,7 @@ export async function discoverTools(
             mcpServerConfig.trust,
             undefined,
             cliConfig,
+            mcpServerConfig.extension?.id,
           ),
         );
       } catch (error) {

packages/core/src/tools/mcp-tool.ts

@@ -213,6 +213,7 @@ export class DiscoveredMCPTool extends BaseDeclarativeTool<
     readonly trust?: boolean,
     nameOverride?: string,
     private readonly cliConfig?: Config,
+    override readonly extensionId?: string,
   ) {
     super(
       nameOverride ?? generateValidName(serverToolName),
@@ -222,6 +223,8 @@ export class DiscoveredMCPTool extends BaseDeclarativeTool<
       parameterSchema,
       true, // isOutputMarkdown
       false, // canUpdateOutput
+      undefined, // messageBus
+      extensionId,
     );
   }
 
@@ -235,6 +238,7 @@ export class DiscoveredMCPTool extends BaseDeclarativeTool<
       this.trust,
       `${this.serverName}__${this.serverToolName}`,
       this.cliConfig,
+      this.extensionId,
     );
   }
 

packages/core/src/tools/tools.ts

@@ -290,6 +290,7 @@ export abstract class DeclarativeTool<
     readonly isOutputMarkdown: boolean = true,
     readonly canUpdateOutput: boolean = false,
     readonly messageBus?: MessageBus,
+    readonly extensionId?: string,
   ) {}
 
   get schema(): FunctionDeclaration {