@office-ai/aioncli-core 0.1.21 → 0.2.2

package/dist/src/tools/mcp-tool.js

@@ -3,49 +3,32 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { BaseTool, ToolConfirmationOutcome, Icon, } from './tools.js';
-import { Type, } from '@google/genai';
-export class DiscoveredMCPTool extends BaseTool {
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome, } from './tools.js';
+class DiscoveredMCPToolInvocation extends BaseToolInvocation {
     mcpTool;
     serverName;
     serverToolName;
-    parameterSchemaJson;
+    displayName;
     timeout;
     trust;
     static allowlist = new Set();
-    constructor(mcpTool, serverName, serverToolName, description, parameterSchemaJson, timeout, trust, nameOverride) {
-        super(nameOverride ?? generateValidName(serverToolName), `${serverToolName} (${serverName} MCP Server)`, description, Icon.Hammer, { type: Type.OBJECT }, // this is a dummy Schema for MCP, will be not be used to construct the FunctionDeclaration
-        true, // isOutputMarkdown
-        false);
+    constructor(mcpTool, serverName, serverToolName, displayName, timeout, trust, params = {}) {
+        super(params);
         this.mcpTool = mcpTool;
         this.serverName = serverName;
         this.serverToolName = serverToolName;
-        this.parameterSchemaJson = parameterSchemaJson;
+        this.displayName = displayName;
         this.timeout = timeout;
         this.trust = trust;
     }
-    asFullyQualifiedTool() {
-        return new DiscoveredMCPTool(this.mcpTool, this.serverName, this.serverToolName, this.description, this.parameterSchemaJson, this.timeout, this.trust, `${this.serverName}__${this.serverToolName}`);
-    }
-    /**
-     * Overrides the base schema to use parametersJsonSchema when building
-     * FunctionDeclaration
-     */
-    get schema() {
-        return {
-            name: this.name,
-            description: this.description,
-            parametersJsonSchema: this.parameterSchemaJson,
-        };
-    }
-    async shouldConfirmExecute(_params, _abortSignal) {
+    async shouldConfirmExecute(_abortSignal) {
         const serverAllowListKey = this.serverName;
         const toolAllowListKey = `${this.serverName}.${this.serverToolName}`;
         if (this.trust) {
             return false; // server is trusted, no confirmation needed
         }
-        if (DiscoveredMCPTool.allowlist.has(serverAllowListKey) ||
-            DiscoveredMCPTool.allowlist.has(toolAllowListKey)) {
+        if (DiscoveredMCPToolInvocation.allowlist.has(serverAllowListKey) ||
+            DiscoveredMCPToolInvocation.allowlist.has(toolAllowListKey)) {
             return false; // server and/or tool already allowlisted
         }
         const confirmationDetails = {
@@ -53,32 +36,78 @@ export class DiscoveredMCPTool extends BaseTool {
             title: 'Confirm MCP Tool Execution',
             serverName: this.serverName,
             toolName: this.serverToolName, // Display original tool name in confirmation
-            toolDisplayName: this.name, // Display global registry name exposed to model and user
+            toolDisplayName: this.displayName, // Display global registry name exposed to model and user
             onConfirm: async (outcome) => {
                 if (outcome === ToolConfirmationOutcome.ProceedAlwaysServer) {
-                    DiscoveredMCPTool.allowlist.add(serverAllowListKey);
+                    DiscoveredMCPToolInvocation.allowlist.add(serverAllowListKey);
                 }
                 else if (outcome === ToolConfirmationOutcome.ProceedAlwaysTool) {
-                    DiscoveredMCPTool.allowlist.add(toolAllowListKey);
+                    DiscoveredMCPToolInvocation.allowlist.add(toolAllowListKey);
                 }
             },
         };
         return confirmationDetails;
     }
-    async execute(params) {
+    // Determine if the response contains tool errors
+    // This is needed because CallToolResults should return errors inside the response.
+    // ref: https://modelcontextprotocol.io/specification/2025-06-18/schema#calltoolresult
+    isMCPToolError(rawResponseParts) {
+        const functionResponse = rawResponseParts?.[0]?.functionResponse;
+        const response = functionResponse?.response;
+        if (response) {
+            const error = response?.error;
+            const isError = error?.isError;
+            if (error && (isError === true || isError === 'true')) {
+                return true;
+            }
+        }
+        return false;
+    }
+    async execute() {
         const functionCalls = [
             {
                 name: this.serverToolName,
-                args: params,
+                args: this.params,
             },
         ];
         const rawResponseParts = await this.mcpTool.callTool(functionCalls);
+        // Ensure the response is not an error
+        if (this.isMCPToolError(rawResponseParts)) {
+            throw new Error(`MCP tool '${this.serverToolName}' reported tool error with response: ${JSON.stringify(rawResponseParts)}`);
+        }
         const transformedParts = transformMcpContentToParts(rawResponseParts);
         return {
             llmContent: transformedParts,
             returnDisplay: getStringifiedResultForDisplay(rawResponseParts),
         };
     }
+    getDescription() {
+        return this.displayName;
+    }
+}
+export class DiscoveredMCPTool extends BaseDeclarativeTool {
+    mcpTool;
+    serverName;
+    serverToolName;
+    parameterSchema;
+    timeout;
+    trust;
+    constructor(mcpTool, serverName, serverToolName, description, parameterSchema, timeout, trust, nameOverride) {
+        super(nameOverride ?? generateValidName(serverToolName), `${serverToolName} (${serverName} MCP Server)`, description, Kind.Other, parameterSchema, true, // isOutputMarkdown
+        false);
+        this.mcpTool = mcpTool;
+        this.serverName = serverName;
+        this.serverToolName = serverToolName;
+        this.parameterSchema = parameterSchema;
+        this.timeout = timeout;
+        this.trust = trust;
+    }
+    asFullyQualifiedTool() {
+        return new DiscoveredMCPTool(this.mcpTool, this.serverName, this.serverToolName, this.description, this.parameterSchema, this.timeout, this.trust, `${this.serverName}__${this.serverToolName}`);
+    }
+    createInvocation(params) {
+        return new DiscoveredMCPToolInvocation(this.mcpTool, this.serverName, this.serverToolName, this.displayName, this.timeout, this.trust, params);
+    }
 }
 function transformTextBlock(block) {
     return { text: block.text };
@@ -130,7 +159,7 @@ function transformResourceLinkBlock(block) {
  */
 function transformMcpContentToParts(sdkResponse) {
     const funcResponse = sdkResponse?.[0]?.functionResponse;
-    const mcpContent = funcResponse?.response?.content;
+    const mcpContent = funcResponse?.response?.['content'];
     const toolName = funcResponse?.name || 'unknown tool';
     if (!Array.isArray(mcpContent)) {
         return [{ text: '[Error: Could not parse tool response]' }];
@@ -161,8 +190,7 @@ function transformMcpContentToParts(sdkResponse) {
  * @returns A formatted string representing the tool's output.
  */
 function getStringifiedResultForDisplay(rawResponse) {
-    const mcpContent = rawResponse?.[0]?.functionResponse?.response
-        ?.content;
+    const mcpContent = rawResponse?.[0]?.functionResponse?.response?.['content'];
     if (!Array.isArray(mcpContent)) {
         return '```json\n' + JSON.stringify(rawResponse, null, 2) + '\n```';
     }

package/dist/src/tools/mcp-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-tool.js","sourceRoot":"","sources":["../../../src/tools/mcp-tool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp-tool.js","sourceRoot":"","sources":["../../../src/tools/mcp-tool.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,IAAI,EAEJ,uBAAuB,GAIxB,MAAM,YAAY,CAAC;AAuCpB,MAAM,2BAA4B,SAAQ,kBAGzC;IAIoB;IACR;IACA;IACA;IACA;IACA;IARH,MAAM,CAAU,SAAS,GAAgB,IAAI,GAAG,EAAE,CAAC;IAE3D,YACmB,OAAqB,EAC7B,UAAkB,EAClB,cAAsB,EACtB,WAAmB,EACnB,OAAgB,EAChB,KAAe,EACxB,SAAqB,EAAE;QAEvB,KAAK,CAAC,MAAM,CAAC,CAAC;QARG,YAAO,GAAP,OAAO,CAAc;QAC7B,eAAU,GAAV,UAAU,CAAQ;QAClB,mBAAc,GAAd,cAAc,CAAQ;QACtB,gBAAW,GAAX,WAAW,CAAQ;QACnB,YAAO,GAAP,OAAO,CAAS;QAChB,UAAK,GAAL,KAAK,CAAU;IAI1B,CAAC;IAEQ,KAAK,CAAC,oBAAoB,CACjC,YAAyB;QAEzB,MAAM,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAC;QAC3C,MAAM,gBAAgB,GAAG,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;QAErE,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,KAAK,CAAC,CAAC,4CAA4C;QAC5D,CAAC;QAED,IACE,2BAA2B,CAAC,SAAS,CAAC,GAAG,CAAC,kBAAkB,CAAC;YAC7D,2BAA2B,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAC3D,CAAC;YACD,OAAO,KAAK,CAAC,CAAC,yCAAyC;QACzD,CAAC;QAED,MAAM,mBAAmB,GAA+B;YACtD,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,4BAA4B;YACnC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,6CAA6C;YAC5E,eAAe,EAAE,IAAI,CAAC,WAAW,EAAE,yDAAyD;YAC5F,SAAS,EAAE,KAAK,EAAE,OAAgC,EAAE,EAAE;gBACpD,IAAI,OAAO,KAAK,uBAAuB,CAAC,mBAAmB,EAAE,CAAC;oBAC5D,2BAA2B,CAAC,SAAS,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;gBAChE,CAAC;qBAAM,IAAI,OAAO,KAAK,uBAAuB,CAAC,iBAAiB,EAAE,CAAC;oBACjE,2BAA2B,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC;SACF,CAAC;QACF,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,iDAAiD;IACjD,mFAAmF;IACnF,sFAAsF;IACtF,cAAc,CAAC,gBAAwB;QACrC,MAAM,gBAAgB,GAAG,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC;QACjE,MAAM,QAAQ,GAAG,gBAAgB,EAAE,QAAQ,CAAC;QAM5C,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,KAAK,GAAI,QAAiC,EAAE,KAAK,CAAC;YACxD,MAAM,OAAO,GAAG,KAAK,EAAE,OAAO,CAAC;YAE/B,IAAI,KAAK,IAAI,CAAC,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,MAAM,CAAC,EAAE,CAAC;gBACtD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,aAAa,GAAmB;YACpC;gBACE,IAAI,EAAE,IAAI,CAAC,cAAc;gBACzB,IAAI,EAAE,IAAI,CAAC,MAAM;aAClB;SACF,CAAC;QAEF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAEpE,sCAAsC;QACtC,IAAI,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CACb,aAAa,IAAI,CAAC,cAAc,wCAAwC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,CAC3G,CAAC;QACJ,CAAC;QAED,MAAM,gBAAgB,GAAG,0BAA0B,CAAC,gBAAgB,CAAC,CAAC;QAEtE,OAAO;YACL,UAAU,EAAE,gBAAgB;YAC5B,aAAa,EAAE,8BAA8B,CAAC,gBAAgB,CAAC;SAChE,CAAC;IACJ,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;;AAGH,MAAM,OAAO,iBAAkB,SAAQ,mBAGtC;IAEoB;IACR;IACA;IAES;IACT;IACA;IAPX,YACmB,OAAqB,EAC7B,UAAkB,EAClB,cAAsB,EAC/B,WAAmB,EACD,eAAwB,EACjC,OAAgB,EAChB,KAAe,EACxB,YAAqB;QAErB,KAAK,CACH,YAAY,IAAI,iBAAiB,CAAC,cAAc,CAAC,EACjD,GAAG,cAAc,KAAK,UAAU,cAAc,EAC9C,WAAW,EACX,IAAI,CAAC,KAAK,EACV,eAAe,EACf,IAAI,EAAE,mBAAmB;QACzB,KAAK,CACN,CAAC;QAjBe,YAAO,GAAP,OAAO,CAAc;QAC7B,eAAU,GAAV,UAAU,CAAQ;QAClB,mBAAc,GAAd,cAAc,CAAQ;QAEb,oBAAe,GAAf,eAAe,CAAS;QACjC,YAAO,GAAP,OAAO,CAAS;QAChB,UAAK,GAAL,KAAK,CAAU;IAY1B,CAAC;IAED,oBAAoB;QAClB,OAAO,IAAI,iBAAiB,CAC1B,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,KAAK,EACV,GAAG,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,cAAc,EAAE,CAC7C,CAAC;IACJ,CAAC;IAES,gBAAgB,CACxB,MAAkB;QAElB,OAAO,IAAI,2BAA2B,CACpC,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,KAAK,EACV,MAAM,CACP,CAAC;IACJ,CAAC;CACF;AAED,SAAS,kBAAkB,CAAC,KAAmB;IAC7C,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;AAC9B,CAAC;AAED,SAAS,wBAAwB,CAC/B,KAAoB,EACpB,QAAgB;IAEhB,OAAO;QACL;YACE,IAAI,EAAE,UAAU,QAAQ,4BACtB,KAAK,CAAC,IACR,yBAAyB,KAAK,CAAC,QAAQ,GAAG;SAC3C;QACD;YACE,UAAU,EAAE;gBACV,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,IAAI,EAAE,KAAK,CAAC,IAAI;aACjB;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAC7B,KAAuB,EACvB,QAAgB;IAEhB,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;IAChC,IAAI,QAAQ,EAAE,IAAI,EAAE,CAAC;QACnB,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;IACjC,CAAC;IACD,IAAI,QAAQ,EAAE,IAAI,EAAE,CAAC;QACnB,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,IAAI,0BAA0B,CAAC;QACjE,OAAO;YACL;gBACE,IAAI,EAAE,UAAU,QAAQ,8DAA8D,QAAQ,GAAG;aAClG;YACD;gBACE,UAAU,EAAE;oBACV,QAAQ;oBACR,IAAI,EAAE,QAAQ,CAAC,IAAI;iBACpB;aACF;SACF,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,0BAA0B,CAAC,KAA2B;IAC7D,OAAO;QACL,IAAI,EAAE,kBAAkB,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,GAAG,EAAE;KACpE,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,0BAA0B,CAAC,WAAmB;IACrD,MAAM,YAAY,GAAG,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC;IACxD,MAAM,UAAU,GAAG,YAAY,EAAE,QAAQ,EAAE,CAAC,SAAS,CAAsB,CAAC;IAC5E,MAAM,QAAQ,GAAG,YAAY,EAAE,IAAI,IAAI,cAAc,CAAC;IAEtD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,EAAE,IAAI,EAAE,wCAAwC,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,CACpC,CAAC,KAAsB,EAAwB,EAAE;QAC/C,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,MAAM;gBACT,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;YACnC,KAAK,OAAO,CAAC;YACb,KAAK,OAAO;gBACV,OAAO,wBAAwB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACnD,KAAK,UAAU;gBACb,OAAO,sBAAsB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACjD,KAAK,eAAe;gBAClB,OAAO,0BAA0B,CAAC,KAAK,CAAC,CAAC;YAC3C;gBACE,OAAO,IAAI,CAAC;QAChB,CAAC;IACH,CAAC,CACF,CAAC;IAEF,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAgB,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;AACnE,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,8BAA8B,CAAC,WAAmB;IACzD,MAAM,UAAU,GAAG,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAC/D,SAAS,CACW,CAAC;IAEvB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,OAAO,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC;IACtE,CAAC;IAED,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,KAAsB,EAAU,EAAE;QACrE,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,MAAM;gBACT,OAAO,KAAK,CAAC,IAAI,CAAC;YACpB,KAAK,OAAO;gBACV,OAAO,WAAW,KAAK,CAAC,QAAQ,GAAG,CAAC;YACtC,KAAK,OAAO;gBACV,OAAO,WAAW,KAAK,CAAC,QAAQ,GAAG,CAAC;YACtC,KAAK,eAAe;gBAClB,OAAO,YAAY,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,GAAG,GAAG,CAAC;YAChE,KAAK,UAAU;gBACb,IAAI,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;oBACzB,OAAO,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAC7B,CAAC;gBACD,OAAO,uBACL,KAAK,CAAC,QAAQ,EAAE,QAAQ,IAAI,cAC9B,GAAG,CAAC;YACN;gBACE,OAAO,0BAA2B,KAA0B,CAAC,IAAI,GAAG,CAAC;QACzE,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjC,CAAC;AAED,0BAA0B;AAC1B,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC5C,2FAA2F;IAC3F,IAAI,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;IAE1D,0DAA0D;IAC1D,mEAAmE;IACnE,IAAI,aAAa,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;QAC9B,aAAa;YACX,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC"}

package/dist/src/tools/mcp-tool.test.js

@@ -48,18 +48,20 @@ describe('DiscoveredMCPTool', () => {
         properties: { param: { type: 'string' } },
         required: ['param'],
     };
+    let tool;
     beforeEach(() => {
         mockCallTool.mockClear();
         mockToolMethod.mockClear();
+        tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
         // Clear allowlist before each relevant test, especially for shouldConfirmExecute
-        DiscoveredMCPTool.allowlist.clear();
+        const invocation = tool.build({ param: 'mock' });
+        invocation.constructor.allowlist.clear();
     });
     afterEach(() => {
         vi.restoreAllMocks();
     });
     describe('constructor', () => {
         it('should set properties correctly', () => {
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
             expect(tool.name).toBe(serverToolName);
             expect(tool.schema.name).toBe(serverToolName);
             expect(tool.schema.description).toBe(baseDescription);
@@ -70,13 +72,12 @@ describe('DiscoveredMCPTool', () => {
         });
         it('should accept and store a custom timeout', () => {
             const customTimeout = 5000;
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema, customTimeout);
-            expect(tool.timeout).toBe(customTimeout);
+            const toolWithTimeout = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema, customTimeout);
+            expect(toolWithTimeout.timeout).toBe(customTimeout);
         });
     });
     describe('execute', () => {
         it('should call mcpTool.callTool with correct parameters and format display output', async () => {
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
             const params = { param: 'testValue' };
             const mockToolSuccessResultObject = {
                 success: true,
@@ -97,7 +98,8 @@ describe('DiscoveredMCPTool', () => {
                 },
             ];
             mockCallTool.mockResolvedValue(mockMcpToolResponseParts);
-            const toolResult = await tool.execute(params);
+            const invocation = tool.build(params);
+            const toolResult = await invocation.execute(new AbortController().signal);
             expect(mockCallTool).toHaveBeenCalledWith([
                 { name: serverToolName, args: params },
             ]);
@@ -108,26 +110,82 @@ describe('DiscoveredMCPTool', () => {
             expect(toolResult.returnDisplay).toBe(stringifiedResponseContent);
         });
         it('should handle empty result from getStringifiedResultForDisplay', async () => {
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
             const params = { param: 'testValue' };
             const mockMcpToolResponsePartsEmpty = [];
             mockCallTool.mockResolvedValue(mockMcpToolResponsePartsEmpty);
-            const toolResult = await tool.execute(params);
+            const invocation = tool.build(params);
+            const toolResult = await invocation.execute(new AbortController().signal);
             expect(toolResult.returnDisplay).toBe('```json\n[]\n```');
             expect(toolResult.llmContent).toEqual([
                 { text: '[Error: Could not parse tool response]' },
             ]);
         });
         it('should propagate rejection if mcpTool.callTool rejects', async () => {
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
             const params = { param: 'failCase' };
             const expectedError = new Error('MCP call failed');
             mockCallTool.mockRejectedValue(expectedError);
-            await expect(tool.execute(params)).rejects.toThrow(expectedError);
+            const invocation = tool.build(params);
+            await expect(invocation.execute(new AbortController().signal)).rejects.toThrow(expectedError);
         });
-        it('should handle a simple text response correctly', async () => {
+        it.each([
+            { isErrorValue: true, description: 'true (bool)' },
+            { isErrorValue: 'true', description: '"true" (str)' },
+        ])('should consider a ToolResult with isError $description to be a failure', async ({ isErrorValue }) => {
+            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
+            const params = { param: 'isErrorTrueCase' };
+            const errorResponse = { isError: isErrorValue };
+            const mockMcpToolResponseParts = [
+                {
+                    functionResponse: {
+                        name: serverToolName,
+                        response: { error: errorResponse },
+                    },
+                },
+            ];
+            mockCallTool.mockResolvedValue(mockMcpToolResponseParts);
+            const expectedError = new Error(`MCP tool '${serverToolName}' reported tool error with response: ${JSON.stringify(mockMcpToolResponseParts)}`);
+            const invocation = tool.build(params);
+            await expect(invocation.execute(new AbortController().signal)).rejects.toThrow(expectedError);
+        });
+        it.each([
+            { isErrorValue: false, description: 'false (bool)' },
+            { isErrorValue: 'false', description: '"false" (str)' },
+        ])('should consider a ToolResult with isError ${description} to be a success', async ({ isErrorValue }) => {
             const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
-            const params = { query: 'test' };
+            const params = { param: 'isErrorFalseCase' };
+            const mockToolSuccessResultObject = {
+                success: true,
+                details: 'executed',
+            };
+            const mockFunctionResponseContent = [
+                {
+                    type: 'text',
+                    text: JSON.stringify(mockToolSuccessResultObject),
+                },
+            ];
+            const errorResponse = { isError: isErrorValue };
+            const mockMcpToolResponseParts = [
+                {
+                    functionResponse: {
+                        name: serverToolName,
+                        response: {
+                            error: errorResponse,
+                            content: mockFunctionResponseContent,
+                        },
+                    },
+                },
+            ];
+            mockCallTool.mockResolvedValue(mockMcpToolResponseParts);
+            const invocation = tool.build(params);
+            const toolResult = await invocation.execute(new AbortController().signal);
+            const stringifiedResponseContent = JSON.stringify(mockToolSuccessResultObject);
+            expect(toolResult.llmContent).toEqual([
+                { text: stringifiedResponseContent },
+            ]);
+            expect(toolResult.returnDisplay).toBe(stringifiedResponseContent);
+        });
+        it('should handle a simple text response correctly', async () => {
+            const params = { param: 'test' };
             const successMessage = 'This is a success message.';
             // Simulate the response from the GenAI SDK, which wraps the MCP
             // response in a functionResponse Part.
@@ -143,7 +201,8 @@ describe('DiscoveredMCPTool', () => {
                 },
             ];
             mockCallTool.mockResolvedValue(sdkResponse);
-            const toolResult = await tool.execute(params);
+            const invocation = tool.build(params);
+            const toolResult = await invocation.execute(new AbortController().signal);
             // 1. Assert that the llmContent sent to the scheduler is a clean Part array.
             expect(toolResult.llmContent).toEqual([{ text: successMessage }]);
             // 2. Assert that the display output is the simple text message.
@@ -154,8 +213,7 @@ describe('DiscoveredMCPTool', () => {
             ]);
         });
         it('should handle an AudioBlock response', async () => {
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
-            const params = { action: 'play' };
+            const params = { param: 'play' };
             const sdkResponse = [
                 {
                     functionResponse: {
@@ -173,7 +231,8 @@ describe('DiscoveredMCPTool', () => {
                 },
             ];
             mockCallTool.mockResolvedValue(sdkResponse);
-            const toolResult = await tool.execute(params);
+            const invocation = tool.build(params);
+            const toolResult = await invocation.execute(new AbortController().signal);
             expect(toolResult.llmContent).toEqual([
                 {
                     text: `[Tool '${serverToolName}' provided the following audio data with mime-type: audio/mp3]`,
@@ -188,8 +247,7 @@ describe('DiscoveredMCPTool', () => {
             expect(toolResult.returnDisplay).toBe('[Audio: audio/mp3]');
         });
         it('should handle a ResourceLinkBlock response', async () => {
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
-            const params = { resource: 'get' };
+            const params = { param: 'get' };
             const sdkResponse = [
                 {
                     functionResponse: {
@@ -208,7 +266,8 @@ describe('DiscoveredMCPTool', () => {
                 },
             ];
             mockCallTool.mockResolvedValue(sdkResponse);
-            const toolResult = await tool.execute(params);
+            const invocation = tool.build(params);
+            const toolResult = await invocation.execute(new AbortController().signal);
             expect(toolResult.llmContent).toEqual([
                 {
                     text: 'Resource Link: My Resource at file:///path/to/thing',
@@ -217,8 +276,7 @@ describe('DiscoveredMCPTool', () => {
             expect(toolResult.returnDisplay).toBe('[Link to My Resource: file:///path/to/thing]');
         });
         it('should handle an embedded text ResourceBlock response', async () => {
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
-            const params = { resource: 'get' };
+            const params = { param: 'get' };
             const sdkResponse = [
                 {
                     functionResponse: {
@@ -239,15 +297,15 @@ describe('DiscoveredMCPTool', () => {
                 },
             ];
             mockCallTool.mockResolvedValue(sdkResponse);
-            const toolResult = await tool.execute(params);
+            const invocation = tool.build(params);
+            const toolResult = await invocation.execute(new AbortController().signal);
             expect(toolResult.llmContent).toEqual([
                 { text: 'This is the text content.' },
             ]);
             expect(toolResult.returnDisplay).toBe('This is the text content.');
         });
         it('should handle an embedded binary ResourceBlock response', async () => {
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
-            const params = { resource: 'get' };
+            const params = { param: 'get' };
             const sdkResponse = [
                 {
                     functionResponse: {
@@ -268,7 +326,8 @@ describe('DiscoveredMCPTool', () => {
                 },
             ];
             mockCallTool.mockResolvedValue(sdkResponse);
-            const toolResult = await tool.execute(params);
+            const invocation = tool.build(params);
+            const toolResult = await invocation.execute(new AbortController().signal);
             expect(toolResult.llmContent).toEqual([
                 {
                     text: `[Tool '${serverToolName}' provided the following embedded resource with mime-type: application/octet-stream]`,
@@ -283,8 +342,7 @@ describe('DiscoveredMCPTool', () => {
             expect(toolResult.returnDisplay).toBe('[Embedded Resource: application/octet-stream]');
         });
         it('should handle a mix of content block types', async () => {
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
-            const params = { action: 'complex' };
+            const params = { param: 'complex' };
             const sdkResponse = [
                 {
                     functionResponse: {
@@ -304,7 +362,8 @@ describe('DiscoveredMCPTool', () => {
                 },
             ];
             mockCallTool.mockResolvedValue(sdkResponse);
-            const toolResult = await tool.execute(params);
+            const invocation = tool.build(params);
+            const toolResult = await invocation.execute(new AbortController().signal);
             expect(toolResult.llmContent).toEqual([
                 { text: 'First part.' },
                 {
@@ -321,8 +380,7 @@ describe('DiscoveredMCPTool', () => {
             expect(toolResult.returnDisplay).toBe('First part.\n[Image: image/jpeg]\nSecond part.');
         });
         it('should ignore unknown content block types', async () => {
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
-            const params = { action: 'test' };
+            const params = { param: 'test' };
             const sdkResponse = [
                 {
                     functionResponse: {
@@ -337,13 +395,13 @@ describe('DiscoveredMCPTool', () => {
                 },
             ];
             mockCallTool.mockResolvedValue(sdkResponse);
-            const toolResult = await tool.execute(params);
+            const invocation = tool.build(params);
+            const toolResult = await invocation.execute(new AbortController().signal);
             expect(toolResult.llmContent).toEqual([{ text: 'Valid part.' }]);
             expect(toolResult.returnDisplay).toBe('Valid part.\n[Unknown content type: future_block]');
         });
         it('should handle a complex mix of content block types', async () => {
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
-            const params = { action: 'super-complex' };
+            const params = { param: 'super-complex' };
             const sdkResponse = [
                 {
                     functionResponse: {
@@ -376,7 +434,8 @@ describe('DiscoveredMCPTool', () => {
                 },
             ];
             mockCallTool.mockResolvedValue(sdkResponse);
-            const toolResult = await tool.execute(params);
+            const invocation = tool.build(params);
+            const toolResult = await invocation.execute(new AbortController().signal);
             expect(toolResult.llmContent).toEqual([
                 { text: 'Here is a resource.' },
                 {
@@ -397,25 +456,25 @@ describe('DiscoveredMCPTool', () => {
         });
     });
     describe('shouldConfirmExecute', () => {
-        // beforeEach is already clearing allowlist
         it('should return false if trust is true', async () => {
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema, undefined, true);
-            expect(await tool.shouldConfirmExecute({}, new AbortController().signal)).toBe(false);
+            const trustedTool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema, undefined, true);
+            const invocation = trustedTool.build({ param: 'mock' });
+            expect(await invocation.shouldConfirmExecute(new AbortController().signal)).toBe(false);
         });
         it('should return false if server is allowlisted', async () => {
-            DiscoveredMCPTool.allowlist.add(serverName);
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
-            expect(await tool.shouldConfirmExecute({}, new AbortController().signal)).toBe(false);
+            const invocation = tool.build({ param: 'mock' });
+            invocation.constructor.allowlist.add(serverName);
+            expect(await invocation.shouldConfirmExecute(new AbortController().signal)).toBe(false);
         });
         it('should return false if tool is allowlisted', async () => {
             const toolAllowlistKey = `${serverName}.${serverToolName}`;
-            DiscoveredMCPTool.allowlist.add(toolAllowlistKey);
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
-            expect(await tool.shouldConfirmExecute({}, new AbortController().signal)).toBe(false);
+            const invocation = tool.build({ param: 'mock' });
+            invocation.constructor.allowlist.add(toolAllowlistKey);
+            expect(await invocation.shouldConfirmExecute(new AbortController().signal)).toBe(false);
         });
         it('should return confirmation details if not trusted and not allowlisted', async () => {
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
-            const confirmation = await tool.shouldConfirmExecute({}, new AbortController().signal);
+            const invocation = tool.build({ param: 'mock' });
+            const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
             expect(confirmation).not.toBe(false);
             if (confirmation && confirmation.type === 'mcp') {
                 // Type guard for ToolMcpConfirmationDetails
@@ -432,39 +491,39 @@ describe('DiscoveredMCPTool', () => {
             }
         });
         it('should add server to allowlist on ProceedAlwaysServer', async () => {
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
-            const confirmation = await tool.shouldConfirmExecute({}, new AbortController().signal);
+            const invocation = tool.build({ param: 'mock' });
+            const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
             expect(confirmation).not.toBe(false);
             if (confirmation &&
                 typeof confirmation === 'object' &&
                 'onConfirm' in confirmation &&
                 typeof confirmation.onConfirm === 'function') {
                 await confirmation.onConfirm(ToolConfirmationOutcome.ProceedAlwaysServer);
-                expect(DiscoveredMCPTool.allowlist.has(serverName)).toBe(true);
+                expect(invocation.constructor.allowlist.has(serverName)).toBe(true);
             }
             else {
                 throw new Error('Confirmation details or onConfirm not in expected format');
             }
         });
         it('should add tool to allowlist on ProceedAlwaysTool', async () => {
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
             const toolAllowlistKey = `${serverName}.${serverToolName}`;
-            const confirmation = await tool.shouldConfirmExecute({}, new AbortController().signal);
+            const invocation = tool.build({ param: 'mock' });
+            const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
             expect(confirmation).not.toBe(false);
             if (confirmation &&
                 typeof confirmation === 'object' &&
                 'onConfirm' in confirmation &&
                 typeof confirmation.onConfirm === 'function') {
                 await confirmation.onConfirm(ToolConfirmationOutcome.ProceedAlwaysTool);
-                expect(DiscoveredMCPTool.allowlist.has(toolAllowlistKey)).toBe(true);
+                expect(invocation.constructor.allowlist.has(toolAllowlistKey)).toBe(true);
             }
             else {
                 throw new Error('Confirmation details or onConfirm not in expected format');
             }
         });
         it('should handle Cancel confirmation outcome', async () => {
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
-            const confirmation = await tool.shouldConfirmExecute({}, new AbortController().signal);
+            const invocation = tool.build({ param: 'mock' });
+            const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
             expect(confirmation).not.toBe(false);
             if (confirmation &&
                 typeof confirmation === 'object' &&
@@ -472,16 +531,16 @@ describe('DiscoveredMCPTool', () => {
                 typeof confirmation.onConfirm === 'function') {
                 // Cancel should not add anything to allowlist
                 await confirmation.onConfirm(ToolConfirmationOutcome.Cancel);
-                expect(DiscoveredMCPTool.allowlist.has(serverName)).toBe(false);
-                expect(DiscoveredMCPTool.allowlist.has(`${serverName}.${serverToolName}`)).toBe(false);
+                expect(invocation.constructor.allowlist.has(serverName)).toBe(false);
+                expect(invocation.constructor.allowlist.has(`${serverName}.${serverToolName}`)).toBe(false);
             }
             else {
                 throw new Error('Confirmation details or onConfirm not in expected format');
             }
         });
         it('should handle ProceedOnce confirmation outcome', async () => {
-            const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
-            const confirmation = await tool.shouldConfirmExecute({}, new AbortController().signal);
+            const invocation = tool.build({ param: 'mock' });
+            const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
             expect(confirmation).not.toBe(false);
             if (confirmation &&
                 typeof confirmation === 'object' &&
@@ -489,8 +548,8 @@ describe('DiscoveredMCPTool', () => {
                 typeof confirmation.onConfirm === 'function') {
                 // ProceedOnce should not add anything to allowlist
                 await confirmation.onConfirm(ToolConfirmationOutcome.ProceedOnce);
-                expect(DiscoveredMCPTool.allowlist.has(serverName)).toBe(false);
-                expect(DiscoveredMCPTool.allowlist.has(`${serverName}.${serverToolName}`)).toBe(false);
+                expect(invocation.constructor.allowlist.has(serverName)).toBe(false);
+                expect(invocation.constructor.allowlist.has(`${serverName}.${serverToolName}`)).toBe(false);
             }
             else {
                 throw new Error('Confirmation details or onConfirm not in expected format');