@google/adk 0.2.5 → 0.3.0

package/dist/cjs/runner/runner.js

@@ -36,6 +36,7 @@ var import_built_in_code_executor = require("../code_executors/built_in_code_exe
 var import_event = require("../events/event.js");
 var import_event_actions = require("../events/event_actions.js");
 var import_plugin_manager = require("../plugins/plugin_manager.js");
+var import_tracing = require("../telemetry/tracing.js");
 var import_logger = require("../utils/logger.js");
 var import_model_name = require("../utils/model_name.js");
 /**
@@ -67,109 +68,123 @@ class Runner {
    */
   // TODO - b/425992518: user, sessionId, and runConfig can be internalized.
   async *runAsync(params) {
-    var _a;
     const { userId, sessionId, stateDelta } = params;
     const runConfig = (0, import_run_config.createRunConfig)(params.runConfig);
     let newMessage = params.newMessage;
-    const span = import_api.trace.getTracer("gcp.vertex.agent").startSpan("invocation");
+    const span = import_tracing.tracer.startSpan("invocation");
+    const ctx = import_api.trace.setSpan(import_api.context.active(), span);
     try {
-      const session = await this.sessionService.getSession({
-        appName: this.appName,
-        userId,
-        sessionId
-      });
-      if (!session) {
-        if (!this.appName) {
-          throw new Error(
-            `Session lookup failed: appName must be provided in runner constructor`
-          );
-        }
-        throw new Error(`Session not found: ${sessionId}`);
-      }
-      if (runConfig.supportCfc && (0, import_llm_agent.isLlmAgent)(this.agent)) {
-        const modelName = this.agent.canonicalModel.model;
-        if (!(0, import_model_name.isGemini2OrAbove)(modelName)) {
-          throw new Error(
-            `CFC is not supported for model: ${modelName} in agent: ${this.agent.name}`
-          );
-        }
-        if (!(0, import_built_in_code_executor.isBuiltInCodeExecutor)(this.agent.codeExecutor)) {
-          this.agent.codeExecutor = new import_built_in_code_executor.BuiltInCodeExecutor();
-        }
-      }
-      const invocationContext = new import_invocation_context.InvocationContext({
-        artifactService: this.artifactService,
-        sessionService: this.sessionService,
-        memoryService: this.memoryService,
-        credentialService: this.credentialService,
-        invocationId: (0, import_invocation_context.newInvocationContextId)(),
-        agent: this.agent,
-        session,
-        userContent: newMessage,
-        runConfig,
-        pluginManager: this.pluginManager
-      });
-      const pluginUserMessage = await this.pluginManager.runOnUserMessageCallback({
-        userMessage: newMessage,
-        invocationContext
-      });
-      if (pluginUserMessage) {
-        newMessage = pluginUserMessage;
-      }
-      if (newMessage) {
-        if (!((_a = newMessage.parts) == null ? void 0 : _a.length)) {
-          throw new Error("No parts in the newMessage.");
-        }
-        if (runConfig.saveInputBlobsAsArtifacts) {
-          await this.saveArtifacts(
-            invocationContext.invocationId,
-            session.userId,
-            session.id,
-            newMessage
-          );
-        }
-        await this.sessionService.appendEvent({
-          session,
-          event: (0, import_event.createEvent)({
-            invocationId: invocationContext.invocationId,
-            author: "user",
-            actions: stateDelta ? (0, import_event_actions.createEventActions)({ stateDelta }) : void 0,
-            content: newMessage
-          })
-        });
-      }
-      invocationContext.agent = this.determineAgentForResumption(
-        session,
-        this.agent
-      );
-      const beforeRunCallbackResponse = await this.pluginManager.runBeforeRunCallback({ invocationContext });
-      if (beforeRunCallbackResponse) {
-        const earlyExitEvent = (0, import_event.createEvent)({
-          invocationId: invocationContext.invocationId,
-          author: "model",
-          content: beforeRunCallbackResponse
-        });
-        await this.sessionService.appendEvent({ session, event: earlyExitEvent });
-        yield earlyExitEvent;
-      } else {
-        for await (const event of invocationContext.agent.runAsync(
-          invocationContext
-        )) {
-          if (!event.partial) {
-            await this.sessionService.appendEvent({ session, event });
+      yield* (0, import_tracing.runAsyncGeneratorWithOtelContext)(
+        ctx,
+        this,
+        async function* () {
+          var _a;
+          const session = await this.sessionService.getSession({
+            appName: this.appName,
+            userId,
+            sessionId
+          });
+          if (!session) {
+            if (!this.appName) {
+              throw new Error(
+                `Session lookup failed: appName must be provided in runner constructor`
+              );
+            }
+            throw new Error(`Session not found: ${sessionId}`);
+          }
+          if (runConfig.supportCfc && (0, import_llm_agent.isLlmAgent)(this.agent)) {
+            const modelName = this.agent.canonicalModel.model;
+            if (!(0, import_model_name.isGemini2OrAbove)(modelName)) {
+              throw new Error(
+                `CFC is not supported for model: ${modelName} in agent: ${this.agent.name}`
+              );
+            }
+            if (!(0, import_built_in_code_executor.isBuiltInCodeExecutor)(this.agent.codeExecutor)) {
+              this.agent.codeExecutor = new import_built_in_code_executor.BuiltInCodeExecutor();
+            }
           }
-          const modifiedEvent = await this.pluginManager.runOnEventCallback({
-            invocationContext,
-            event
+          const invocationContext = new import_invocation_context.InvocationContext({
+            artifactService: this.artifactService,
+            sessionService: this.sessionService,
+            memoryService: this.memoryService,
+            credentialService: this.credentialService,
+            invocationId: (0, import_invocation_context.newInvocationContextId)(),
+            agent: this.agent,
+            session,
+            userContent: newMessage,
+            runConfig,
+            pluginManager: this.pluginManager
           });
-          if (modifiedEvent) {
-            yield modifiedEvent;
-          } else {
-            yield event;
+          const pluginUserMessage = await this.pluginManager.runOnUserMessageCallback({
+            userMessage: newMessage,
+            invocationContext
+          });
+          if (pluginUserMessage) {
+            newMessage = pluginUserMessage;
+          }
+          if (newMessage) {
+            if (!((_a = newMessage.parts) == null ? void 0 : _a.length)) {
+              throw new Error("No parts in the newMessage.");
+            }
+            if (runConfig.saveInputBlobsAsArtifacts) {
+              await this.saveArtifacts(
+                invocationContext.invocationId,
+                session.userId,
+                session.id,
+                newMessage
+              );
+            }
+            await this.sessionService.appendEvent({
+              session,
+              event: (0, import_event.createEvent)({
+                invocationId: invocationContext.invocationId,
+                author: "user",
+                actions: stateDelta ? (0, import_event_actions.createEventActions)({ stateDelta }) : void 0,
+                content: newMessage
+              })
+            });
+          }
+          invocationContext.agent = this.determineAgentForResumption(
+            session,
+            this.agent
+          );
+          if (newMessage) {
+            const beforeRunCallbackResponse = await this.pluginManager.runBeforeRunCallback({
+              invocationContext
+            });
+            if (beforeRunCallbackResponse) {
+              const earlyExitEvent = (0, import_event.createEvent)({
+                invocationId: invocationContext.invocationId,
+                author: "model",
+                content: beforeRunCallbackResponse
+              });
+              await this.sessionService.appendEvent({
+                session,
+                event: earlyExitEvent
+              });
+              yield earlyExitEvent;
+            } else {
+              for await (const event of invocationContext.agent.runAsync(
+                invocationContext
+              )) {
+                if (!event.partial) {
+                  await this.sessionService.appendEvent({ session, event });
+                }
+                const modifiedEvent = await this.pluginManager.runOnEventCallback({
+                  invocationContext,
+                  event
+                });
+                if (modifiedEvent) {
+                  yield modifiedEvent;
+                } else {
+                  yield event;
+                }
+              }
+              await this.pluginManager.runAfterRunCallback({ invocationContext });
+            }
           }
         }
-      }
-      await this.pluginManager.runAfterRunCallback({ invocationContext });
+      );
     } finally {
       span.end();
     }

package/dist/cjs/sessions/in_memory_session_service.js

@@ -55,7 +55,12 @@ class InMemorySessionService extends import_base_session_service.BaseSessionServ
      */
     this.appState = {};
   }
-  createSession({ appName, userId, state, sessionId }) {
+  createSession({
+    appName,
+    userId,
+    state,
+    sessionId
+  }) {
     const session = (0, import_session.createSession)({
       id: sessionId || (0, import_env_aware_utils.randomUUID)(),
       appName,
@@ -75,7 +80,12 @@ class InMemorySessionService extends import_base_session_service.BaseSessionServ
       this.mergeState(appName, userId, (0, import_lodash_es.cloneDeep)(session))
     );
   }
-  getSession({ appName, userId, sessionId, config }) {
+  getSession({
+    appName,
+    userId,
+    sessionId,
+    config
+  }) {
     if (!this.sessions[appName] || !this.sessions[appName][userId] || !this.sessions[appName][userId][sessionId]) {
       return Promise.resolve(void 0);
     }
@@ -83,7 +93,9 @@ class InMemorySessionService extends import_base_session_service.BaseSessionServ
     const copiedSession = (0, import_lodash_es.cloneDeep)(session);
     if (config) {
       if (config.numRecentEvents) {
-        copiedSession.events = copiedSession.events.slice(-config.numRecentEvents);
+        copiedSession.events = copiedSession.events.slice(
+          -config.numRecentEvents
+        );
       }
       if (config.afterTimestamp) {
         let i = copiedSession.events.length - 1;
@@ -100,31 +112,43 @@ class InMemorySessionService extends import_base_session_service.BaseSessionServ
     }
     return Promise.resolve(this.mergeState(appName, userId, copiedSession));
   }
-  listSessions({ appName, userId }) {
+  listSessions({
+    appName,
+    userId
+  }) {
     if (!this.sessions[appName] || !this.sessions[appName][userId]) {
       return Promise.resolve({ sessions: [] });
     }
     const sessionsWithoutEvents = [];
     for (const session of Object.values(this.sessions[appName][userId])) {
-      sessionsWithoutEvents.push((0, import_session.createSession)({
-        id: session.id,
-        appName: session.appName,
-        userId: session.userId,
-        state: {},
-        events: [],
-        lastUpdateTime: session.lastUpdateTime
-      }));
+      sessionsWithoutEvents.push(
+        (0, import_session.createSession)({
+          id: session.id,
+          appName: session.appName,
+          userId: session.userId,
+          state: {},
+          events: [],
+          lastUpdateTime: session.lastUpdateTime
+        })
+      );
     }
     return Promise.resolve({ sessions: sessionsWithoutEvents });
   }
-  async deleteSession({ appName, userId, sessionId }) {
+  async deleteSession({
+    appName,
+    userId,
+    sessionId
+  }) {
     const session = await this.getSession({ appName, userId, sessionId });
     if (!session) {
       return;
     }
     delete this.sessions[appName][userId][sessionId];
   }
-  async appendEvent({ session, event }) {
+  async appendEvent({
+    session,
+    event
+  }) {
     await super.appendEvent({ session, event });
     session.lastUpdateTime = event.timestamp;
     const appName = session.appName;

package/dist/cjs/telemetry/google_cloud.js

@@ -28,13 +28,13 @@ __export(google_cloud_exports, {
   getGcpResource: () => getGcpResource
 });
 module.exports = __toCommonJS(google_cloud_exports);
-var import_google_auth_library = require("google-auth-library");
-var import_sdk_metrics = require("@opentelemetry/sdk-metrics");
-var import_resources = require("@opentelemetry/resources");
-var import_resource_detector_gcp = require("@opentelemetry/resource-detector-gcp");
+var import_opentelemetry_cloud_monitoring_exporter = require("@google-cloud/opentelemetry-cloud-monitoring-exporter");
 var import_opentelemetry_cloud_trace_exporter = require("@google-cloud/opentelemetry-cloud-trace-exporter");
+var import_resource_detector_gcp = require("@opentelemetry/resource-detector-gcp");
+var import_resources = require("@opentelemetry/resources");
+var import_sdk_metrics = require("@opentelemetry/sdk-metrics");
 var import_sdk_trace_base = require("@opentelemetry/sdk-trace-base");
-var import_opentelemetry_cloud_monitoring_exporter = require("@google-cloud/opentelemetry-cloud-monitoring-exporter");
+var import_google_auth_library = require("google-auth-library");
 var import_logger = require("../utils/logger.js");
 /**
  * @license
@@ -47,7 +47,7 @@ async function getGcpProjectId() {
     const auth = new import_google_auth_library.GoogleAuth();
     const projectId = await auth.getProjectId();
     return projectId || void 0;
-  } catch (error) {
+  } catch (_e) {
     return void 0;
   }
 }
@@ -63,9 +63,7 @@ async function getGcpExporters(config = {}) {
     return {};
   }
   return {
-    spanProcessors: enableTracing ? [
-      new import_sdk_trace_base.BatchSpanProcessor(new import_opentelemetry_cloud_trace_exporter.TraceExporter({ projectId }))
-    ] : [],
+    spanProcessors: enableTracing ? [new import_sdk_trace_base.BatchSpanProcessor(new import_opentelemetry_cloud_trace_exporter.TraceExporter({ projectId }))] : [],
     metricReaders: enableMetrics ? [
       new import_sdk_metrics.PeriodicExportingMetricReader({
         exporter: new import_opentelemetry_cloud_monitoring_exporter.MetricExporter({ projectId }),

package/dist/cjs/telemetry/setup.js

@@ -29,14 +29,14 @@ __export(setup_exports, {
 module.exports = __toCommonJS(setup_exports);
 var import_api = require("@opentelemetry/api");
 var import_api_logs = require("@opentelemetry/api-logs");
+var import_exporter_logs_otlp_http = require("@opentelemetry/exporter-logs-otlp-http");
+var import_exporter_metrics_otlp_http = require("@opentelemetry/exporter-metrics-otlp-http");
+var import_exporter_trace_otlp_http = require("@opentelemetry/exporter-trace-otlp-http");
+var import_resources = require("@opentelemetry/resources");
 var import_sdk_logs = require("@opentelemetry/sdk-logs");
 var import_sdk_metrics = require("@opentelemetry/sdk-metrics");
-var import_resources = require("@opentelemetry/resources");
 var import_sdk_trace_base = require("@opentelemetry/sdk-trace-base");
 var import_sdk_trace_node = require("@opentelemetry/sdk-trace-node");
-var import_exporter_trace_otlp_http = require("@opentelemetry/exporter-trace-otlp-http");
-var import_exporter_metrics_otlp_http = require("@opentelemetry/exporter-metrics-otlp-http");
-var import_exporter_logs_otlp_http = require("@opentelemetry/exporter-logs-otlp-http");
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -45,9 +45,13 @@ var import_exporter_logs_otlp_http = require("@opentelemetry/exporter-logs-otlp-
 function maybeSetOtelProviders(otelHooksToSetup = [], otelResource) {
   const resource = otelResource || getOtelResource();
   const allHooks = [...otelHooksToSetup, getOtelExporters()];
-  const spanProcessors = allHooks.flatMap((hooks) => hooks.spanProcessors || []);
+  const spanProcessors = allHooks.flatMap(
+    (hooks) => hooks.spanProcessors || []
+  );
   const metricReaders = allHooks.flatMap((hooks) => hooks.metricReaders || []);
-  const logRecordProcessors = allHooks.flatMap((hooks) => hooks.logRecordProcessors || []);
+  const logRecordProcessors = allHooks.flatMap(
+    (hooks) => hooks.logRecordProcessors || []
+  );
   if (spanProcessors.length > 0) {
     const tracerProvider = new import_sdk_trace_node.NodeTracerProvider({
       resource,
@@ -87,7 +91,11 @@ function getOtelExporters(config = getOtelExportersConfig()) {
   const { enableTracing, enableMetrics, enableLogging } = config;
   return {
     spanProcessors: enableTracing ? [new import_sdk_trace_base.BatchSpanProcessor(new import_exporter_trace_otlp_http.OTLPTraceExporter())] : [],
-    metricReaders: enableMetrics ? [new import_sdk_metrics.PeriodicExportingMetricReader({ exporter: new import_exporter_metrics_otlp_http.OTLPMetricExporter() })] : [],
+    metricReaders: enableMetrics ? [
+      new import_sdk_metrics.PeriodicExportingMetricReader({
+        exporter: new import_exporter_metrics_otlp_http.OTLPMetricExporter()
+      })
+    ] : [],
     logRecordProcessors: enableLogging ? [new import_sdk_logs.BatchLogRecordProcessor(new import_exporter_logs_otlp_http.OTLPLogExporter())] : []
   };
 }

package/dist/cjs/telemetry/tracing.js

@@ -24,7 +24,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var tracing_exports = {};
 __export(tracing_exports, {
-  bindAsyncGenerator: () => bindAsyncGenerator,
+  runAsyncGeneratorWithOtelContext: () => runAsyncGeneratorWithOtelContext,
   traceAgentInvocation: () => traceAgentInvocation,
   traceCallLlm: () => traceCallLlm,
   traceMergedToolCalls: () => traceMergedToolCalls,
@@ -48,14 +48,11 @@ const GEN_AI_TOOL_CALL_ID = "gen_ai.tool.call.id";
 const GEN_AI_TOOL_DESCRIPTION = "gen_ai.tool.description";
 const GEN_AI_TOOL_NAME = "gen_ai.tool.name";
 const GEN_AI_TOOL_TYPE = "gen_ai.tool.type";
-const tracer = import_api.trace.getTracer(
-  "gcp.vertex.agent",
-  import_version.version
-);
+const tracer = import_api.trace.getTracer("gcp.vertex.agent", import_version.version);
 function safeJsonSerialize(obj) {
   try {
     return JSON.stringify(obj);
-  } catch (error) {
+  } catch (_e) {
     return "<not serializable>";
   }
 }
@@ -132,7 +129,10 @@ function traceMergedToolCalls({
     "gcp.vertex.agent.llm_request": "{}",
     "gcp.vertex.agent.llm_response": "{}"
   });
-  span.setAttribute("gcp.vertex.agent.tool_response", shouldAddRequestResponseToSpans() ? safeJsonSerialize(functionResponseEvent) : "{}");
+  span.setAttribute(
+    "gcp.vertex.agent.tool_response",
+    shouldAddRequestResponseToSpans() ? safeJsonSerialize(functionResponseEvent) : "{}"
+  );
 }
 function traceCallLlm({
   invocationContext,
@@ -156,14 +156,26 @@ function traceCallLlm({
     span.setAttribute("gen_ai.request.top_p", llmRequest.config.topP);
   }
   if (((_b = llmRequest.config) == null ? void 0 : _b.maxOutputTokens) !== void 0) {
-    span.setAttribute("gen_ai.request.max_tokens", llmRequest.config.maxOutputTokens);
+    span.setAttribute(
+      "gen_ai.request.max_tokens",
+      llmRequest.config.maxOutputTokens
+    );
   }
-  span.setAttribute("gcp.vertex.agent.llm_response", shouldAddRequestResponseToSpans() ? safeJsonSerialize(llmResponse) : "{}");
+  span.setAttribute(
+    "gcp.vertex.agent.llm_response",
+    shouldAddRequestResponseToSpans() ? safeJsonSerialize(llmResponse) : "{}"
+  );
   if (llmResponse.usageMetadata) {
-    span.setAttribute("gen_ai.usage.input_tokens", llmResponse.usageMetadata.promptTokenCount || 0);
+    span.setAttribute(
+      "gen_ai.usage.input_tokens",
+      llmResponse.usageMetadata.promptTokenCount || 0
+    );
   }
   if ((_c = llmResponse.usageMetadata) == null ? void 0 : _c.candidatesTokenCount) {
-    span.setAttribute("gen_ai.usage.output_tokens", llmResponse.usageMetadata.candidatesTokenCount);
+    span.setAttribute(
+      "gen_ai.usage.output_tokens",
+      llmResponse.usageMetadata.candidatesTokenCount
+    );
   }
   if (llmResponse.finishReason) {
     const finishReasonValue = typeof llmResponse.finishReason === "string" ? llmResponse.finishReason.toLowerCase() : String(llmResponse.finishReason).toLowerCase();
@@ -181,7 +193,10 @@ function traceSendData({
     "gcp.vertex.agent.invocation_id": invocationContext.invocationId,
     "gcp.vertex.agent.event_id": eventId
   });
-  span.setAttribute("gcp.vertex.agent.data", shouldAddRequestResponseToSpans() ? safeJsonSerialize(data) : "{}");
+  span.setAttribute(
+    "gcp.vertex.agent.data",
+    shouldAddRequestResponseToSpans() ? safeJsonSerialize(data) : "{}"
+  );
 }
 function buildLlmRequestForTrace(llmRequest) {
   const result = {
@@ -201,7 +216,7 @@ function buildLlmRequestForTrace(llmRequest) {
   });
   return result;
 }
-function bindAsyncGenerator(ctx, generator) {
+function bindOtelContextToAsyncGenerator(ctx, generator) {
   return {
     // Bind the next() method to execute within the provided context
     next: import_api.context.bind(ctx, generator.next.bind(generator)),
@@ -211,17 +226,24 @@ function bindAsyncGenerator(ctx, generator) {
     throw: import_api.context.bind(ctx, generator.throw.bind(generator)),
     // Ensure the async iterator symbol also returns a context-bound generator
     [Symbol.asyncIterator]() {
-      return bindAsyncGenerator(ctx, generator[Symbol.asyncIterator]());
+      return bindOtelContextToAsyncGenerator(
+        ctx,
+        generator[Symbol.asyncIterator]()
+      );
     }
   };
 }
+function runAsyncGeneratorWithOtelContext(otelContext, generatorFnContext, generatorFn) {
+  const generator = generatorFn.call(generatorFnContext);
+  return bindOtelContextToAsyncGenerator(otelContext, generator);
+}
 function shouldAddRequestResponseToSpans() {
   const envValue = process.env.ADK_CAPTURE_MESSAGE_CONTENT_IN_SPANS || "true";
   return envValue === "true" || envValue === "1";
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  bindAsyncGenerator,
+  runAsyncGeneratorWithOtelContext,
   traceAgentInvocation,
   traceCallLlm,
   traceMergedToolCalls,

package/dist/cjs/tools/agent_tool.js

@@ -48,9 +48,10 @@ function isAgentTool(obj) {
 }
 class AgentTool extends (_b = import_base_tool.BaseTool, _a = AGENT_TOOL_SIGNATURE_SYMBOL, _b) {
   constructor(config) {
-    super(
-      { name: config.agent.name, description: config.agent.description || "" }
-    );
+    super({
+      name: config.agent.name,
+      description: config.agent.description || ""
+    });
     /** A unique symbol to identify ADK agent tool class. */
     this[_a] = true;
     this.agent = config.agent;
@@ -88,7 +89,10 @@ class AgentTool extends (_b = import_base_tool.BaseTool, _a = AGENT_TOOL_SIGNATU
     }
     return declaration;
   }
-  async runAsync({ args, toolContext }) {
+  async runAsync({
+    args,
+    toolContext
+  }) {
     var _a2, _b2;
     if (this.skipSummarization) {
       toolContext.actions.skipSummarization = true;

package/dist/cjs/tools/base_tool.js

@@ -79,7 +79,7 @@ class BaseTool {
    *
    * @param request The request to process the LLM request.
    */
-  async processLlmRequest({ toolContext, llmRequest }) {
+  async processLlmRequest({ llmRequest }) {
     const functionDeclaration = this._getDeclaration();
     if (!functionDeclaration) {
       return;
@@ -108,7 +108,9 @@ class BaseTool {
 }
 function findToolWithFunctionDeclarations(llmRequest) {
   var _a2;
-  return (((_a2 = llmRequest.config) == null ? void 0 : _a2.tools) || []).find((tool) => "functionDeclarations" in tool);
+  return (((_a2 = llmRequest.config) == null ? void 0 : _a2.tools) || []).find(
+    (tool) => "functionDeclarations" in tool
+  );
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/tools/forwarding_artifact_service.js

@@ -45,7 +45,7 @@ class ForwardingArtifactService {
   async loadArtifact(request) {
     return this.toolContext.loadArtifact(request.filename, request.version);
   }
-  async listArtifactKeys(request) {
+  async listArtifactKeys() {
     return this.toolContext.listArtifacts();
   }
   async deleteArtifact(request) {

package/dist/cjs/tools/function_tool.js

@@ -29,7 +29,6 @@ __export(function_tool_exports, {
 });
 module.exports = __toCommonJS(function_tool_exports);
 var import_genai = require("@google/genai");
-var import_zod = require("zod");
 var import_simple_zod_to_json = require("../utils/simple_zod_to_json.js");
 var import_base_tool = require("./base_tool.js");
 /**
@@ -90,7 +89,7 @@ class FunctionTool extends (_b = import_base_tool.BaseTool, _a = FUNCTION_TOOL_S
   async runAsync(req) {
     try {
       let validatedArgs = req.args;
-      if (this.parameters instanceof import_zod.ZodObject) {
+      if ((0, import_simple_zod_to_json.isZodObject)(this.parameters)) {
         validatedArgs = this.parameters.parse(req.args);
       }
       return await this.execute(

package/dist/cjs/tools/google_search_tool.js

@@ -39,11 +39,10 @@ class GoogleSearchTool extends import_base_tool.BaseTool {
   constructor() {
     super({ name: "google_search", description: "Google Search Tool" });
   }
-  runAsync(request) {
+  runAsync() {
     return Promise.resolve();
   }
   async processLlmRequest({
-    toolContext,
     llmRequest
   }) {
     if (!llmRequest.model) {

package/dist/cjs/tools/mcp/mcp_session_manager.js

@@ -40,6 +40,7 @@ class MCPSessionManager {
     this.connectionParams = connectionParams;
   }
   async createSession() {
+    var _a;
     const client = new import_client.Client({ name: "MCPClient", version: "1.0.0" });
     switch (this.connectionParams.type) {
       case "StdioConnectionParams":
@@ -47,20 +48,25 @@ class MCPSessionManager {
           new import_stdio.StdioClientTransport(this.connectionParams.serverParams)
         );
         break;
-      case "StreamableHTTPConnectionParams":
-        const transportOptions = this.connectionParams.header ? {
-          requestInit: {
+      case "StreamableHTTPConnectionParams": {
+        const options = (_a = this.connectionParams.transportOptions) != null ? _a : {};
+        if (!options.requestInit && this.connectionParams.header !== void 0) {
+          options.requestInit = {
             headers: this.connectionParams.header
-          }
-        } : void 0;
-        await client.connect(new import_streamableHttp.StreamableHTTPClientTransport(
-          new URL(this.connectionParams.url),
-          transportOptions
-        ));
+          };
+        }
+        await client.connect(
+          new import_streamableHttp.StreamableHTTPClientTransport(
+            new URL(this.connectionParams.url),
+            options
+          )
+        );
         break;
-      default:
+      }
+      default: {
         const _exhaustiveCheck = this.connectionParams;
         break;
+      }
     }
     return client;
   }