@google/adk 0.2.4 → 0.3.0

package/dist/web/telemetry/tracing.js

@@ -18,7 +18,7 @@ var __objRest = (source, exclude) => {
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { trace, context } from "@opentelemetry/api";
+import { context, trace } from "@opentelemetry/api";
 import { version } from "../version.js";
 const GEN_AI_AGENT_DESCRIPTION = "gen_ai.agent.description";
 const GEN_AI_AGENT_NAME = "gen_ai.agent.name";
@@ -28,14 +28,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 = trace.getTracer(
-  "gcp.vertex.agent",
-  version
-);
+const tracer = trace.getTracer("gcp.vertex.agent", version);
 function safeJsonSerialize(obj) {
   try {
     return JSON.stringify(obj);
-  } catch (error) {
+  } catch (_e) {
     return "<not serializable>";
   }
 }
@@ -112,7 +109,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,
@@ -136,14 +136,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();
@@ -161,7 +173,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 = {
@@ -181,7 +196,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: context.bind(ctx, generator.next.bind(generator)),
@@ -191,16 +206,23 @@ function bindAsyncGenerator(ctx, generator) {
     throw: 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";
 }
 export {
-  bindAsyncGenerator,
+  runAsyncGeneratorWithOtelContext,
   traceAgentInvocation,
   traceCallLlm,
   traceMergedToolCalls,

package/dist/web/tools/agent_tool.js

@@ -5,25 +5,33 @@ var __forAwait = (obj, it, method) => (it = obj[__knownSymbol("asyncIterator")])
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+var _a, _b;
 import { Type } from "@google/genai";
-import { LlmAgent } from "../agents/llm_agent.js";
+import { isLlmAgent } from "../agents/llm_agent.js";
 import { InMemoryMemoryService } from "../memory/in_memory_memory_service.js";
 import { Runner } from "../runner/runner.js";
 import { InMemorySessionService } from "../sessions/in_memory_session_service.js";
 import { GoogleLLMVariant } from "../utils/variant_utils.js";
 import { BaseTool } from "./base_tool.js";
 import { ForwardingArtifactService } from "./forwarding_artifact_service.js";
-class AgentTool extends BaseTool {
+const AGENT_TOOL_SIGNATURE_SYMBOL = Symbol.for("google.adk.agentTool");
+function isAgentTool(obj) {
+  return typeof obj === "object" && obj !== null && AGENT_TOOL_SIGNATURE_SYMBOL in obj && obj[AGENT_TOOL_SIGNATURE_SYMBOL] === true;
+}
+class AgentTool extends (_b = 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;
     this.skipSummarization = config.skipSummarization || false;
   }
   _getDeclaration() {
     let declaration;
-    if (this.agent instanceof LlmAgent && this.agent.inputSchema) {
+    if (isLlmAgent(this.agent) && this.agent.inputSchema) {
       declaration = {
         name: this.name,
         description: this.description,
@@ -48,17 +56,20 @@ class AgentTool extends BaseTool {
       };
     }
     if (this.apiVariant !== GoogleLLMVariant.GEMINI_API) {
-      const hasOutputSchema = this.agent instanceof LlmAgent && this.agent.outputSchema;
+      const hasOutputSchema = isLlmAgent(this.agent) && this.agent.outputSchema;
       declaration.response = hasOutputSchema ? { type: Type.OBJECT } : { type: Type.STRING };
     }
     return declaration;
   }
-  async runAsync({ args, toolContext }) {
-    var _a, _b;
+  async runAsync({
+    args,
+    toolContext
+  }) {
+    var _a2, _b2;
     if (this.skipSummarization) {
       toolContext.actions.skipSummarization = true;
     }
-    const hasInputSchema = this.agent instanceof LlmAgent && this.agent.inputSchema;
+    const hasInputSchema = isLlmAgent(this.agent) && this.agent.inputSchema;
     const content = {
       role: "user",
       parts: [
@@ -105,14 +116,15 @@ class AgentTool extends BaseTool {
           throw error[0];
       }
     }
-    if (!((_b = (_a = lastEvent == null ? void 0 : lastEvent.content) == null ? void 0 : _a.parts) == null ? void 0 : _b.length)) {
+    if (!((_b2 = (_a2 = lastEvent == null ? void 0 : lastEvent.content) == null ? void 0 : _a2.parts) == null ? void 0 : _b2.length)) {
       return "";
     }
-    const hasOutputSchema = this.agent instanceof LlmAgent && this.agent.outputSchema;
+    const hasOutputSchema = isLlmAgent(this.agent) && this.agent.outputSchema;
     const mergedText = lastEvent.content.parts.map((part) => part.text).filter((text) => text).join("\n");
     return hasOutputSchema ? JSON.parse(mergedText) : mergedText;
   }
 }
 export {
-  AgentTool
+  AgentTool,
+  isAgentTool
 };

package/dist/web/tools/base_tool.js

@@ -3,7 +3,13 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+var _a;
 import { getGoogleLlmVariant } from "../utils/variant_utils.js";
+const BASE_TOOL_SIGNATURE_SYMBOL = Symbol.for("google.adk.baseTool");
+function isBaseTool(obj) {
+  return typeof obj === "object" && obj !== null && BASE_TOOL_SIGNATURE_SYMBOL in obj && obj[BASE_TOOL_SIGNATURE_SYMBOL] === true;
+}
+_a = BASE_TOOL_SIGNATURE_SYMBOL;
 class BaseTool {
   /**
    * Base constructor for a tool.
@@ -11,10 +17,12 @@ class BaseTool {
    * @param params The parameters for `BaseTool`.
    */
   constructor(params) {
-    var _a;
+    /** A unique symbol to identify ADK base tool class. */
+    this[_a] = true;
+    var _a2;
     this.name = params.name;
     this.description = params.description;
-    this.isLongRunning = (_a = params.isLongRunning) != null ? _a : false;
+    this.isLongRunning = (_a2 = params.isLongRunning) != null ? _a2 : false;
   }
   /**
    * Gets the OpenAPI specification of this tool in the form of a
@@ -41,7 +49,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;
@@ -69,9 +77,12 @@ class BaseTool {
   }
 }
 function findToolWithFunctionDeclarations(llmRequest) {
-  var _a;
-  return (((_a = llmRequest.config) == null ? void 0 : _a.tools) || []).find((tool) => "functionDeclarations" in tool);
+  var _a2;
+  return (((_a2 = llmRequest.config) == null ? void 0 : _a2.tools) || []).find(
+    (tool) => "functionDeclarations" in tool
+  );
 }
 export {
-  BaseTool
+  BaseTool,
+  isBaseTool
 };

package/dist/web/tools/forwarding_artifact_service.js

@@ -16,7 +16,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/web/tools/function_tool.js

@@ -3,10 +3,8 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+var _a, _b;
 import { Type } from "@google/genai";
-import {
-  ZodObject
-} from "zod";
 import { isZodObject, zodObjectToSchema } from "../utils/simple_zod_to_json.js";
 import { BaseTool } from "./base_tool.js";
 function toSchema(parameters) {
@@ -18,14 +16,18 @@ function toSchema(parameters) {
   }
   return parameters;
 }
-class FunctionTool extends BaseTool {
+const FUNCTION_TOOL_SIGNATURE_SYMBOL = Symbol.for("google.adk.functionTool");
+function isFunctionTool(obj) {
+  return typeof obj === "object" && obj !== null && FUNCTION_TOOL_SIGNATURE_SYMBOL in obj && obj[FUNCTION_TOOL_SIGNATURE_SYMBOL] === true;
+}
+class FunctionTool extends (_b = BaseTool, _a = FUNCTION_TOOL_SIGNATURE_SYMBOL, _b) {
   /**
    * The constructor acts as the user-friendly factory.
    * @param options The configuration for the tool.
    */
   constructor(options) {
-    var _a;
-    const name = (_a = options.name) != null ? _a : options.execute.name;
+    var _a2;
+    const name = (_a2 = options.name) != null ? _a2 : options.execute.name;
     if (!name) {
       throw new Error(
         "Tool name cannot be empty. Either name the `execute` function or provide a `name`."
@@ -36,6 +38,8 @@ class FunctionTool extends BaseTool {
       description: options.description,
       isLongRunning: options.isLongRunning
     });
+    /** A unique symbol to identify ADK function tool class. */
+    this[_a] = true;
     this.execute = options.execute;
     this.parameters = options.parameters;
   }
@@ -55,7 +59,7 @@ class FunctionTool extends BaseTool {
   async runAsync(req) {
     try {
       let validatedArgs = req.args;
-      if (this.parameters instanceof ZodObject) {
+      if (isZodObject(this.parameters)) {
         validatedArgs = this.parameters.parse(req.args);
       }
       return await this.execute(
@@ -69,5 +73,6 @@ class FunctionTool extends BaseTool {
   }
 }
 export {
-  FunctionTool
+  FunctionTool,
+  isFunctionTool
 };

package/dist/web/tools/google_search_tool.js

@@ -9,10 +9,12 @@ class GoogleSearchTool extends BaseTool {
   constructor() {
     super({ name: "google_search", description: "Google Search Tool" });
   }
-  runAsync(request) {
+  runAsync() {
     return Promise.resolve();
   }
-  async processLlmRequest({ toolContext, llmRequest }) {
+  async processLlmRequest({
+    llmRequest
+  }) {
     if (!llmRequest.model) {
       return;
     }
@@ -42,5 +44,6 @@ class GoogleSearchTool extends BaseTool {
 }
 const GOOGLE_SEARCH = new GoogleSearchTool();
 export {
-  GOOGLE_SEARCH
+  GOOGLE_SEARCH,
+  GoogleSearchTool
 };

package/dist/web/tools/long_running_tool.js

@@ -22,7 +22,9 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { FunctionTool } from "./function_tool.js";
+import {
+  FunctionTool
+} from "./function_tool.js";
 const LONG_RUNNING_INSTRUCTION = "\n\nNOTE: This is a long-running operation. Do not call this tool again if it has already returned some intermediate or pending status.";
 class LongRunningFunctionTool extends FunctionTool {
   /**

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

@@ -4,13 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
-import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import {
+  StdioClientTransport
+} from "@modelcontextprotocol/sdk/client/stdio.js";
+import {
+  StreamableHTTPClientTransport
+} from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 class MCPSessionManager {
   constructor(connectionParams) {
     this.connectionParams = connectionParams;
   }
   async createSession() {
+    var _a;
     const client = new Client({ name: "MCPClient", version: "1.0.0" });
     switch (this.connectionParams.type) {
       case "StdioConnectionParams":
@@ -18,20 +23,25 @@ class MCPSessionManager {
           new 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 StreamableHTTPClientTransport(
-          new URL(this.connectionParams.url),
-          transportOptions
-        ));
+          };
+        }
+        await client.connect(
+          new StreamableHTTPClientTransport(
+            new URL(this.connectionParams.url),
+            options
+          )
+        );
         break;
-      default:
+      }
+      default: {
         const _exhaustiveCheck = this.connectionParams;
         break;
+      }
     }
     return client;
   }

package/dist/web/tools/mcp/mcp_tool.js

@@ -12,8 +12,7 @@ class MCPTool extends BaseTool {
     this.mcpSessionManager = mcpSessionManager;
   }
   _getDeclaration() {
-    let declaration;
-    declaration = {
+    return {
       name: this.mcpTool.name,
       description: this.mcpTool.description,
       parameters: toGeminiSchema(this.mcpTool.inputSchema),
@@ -21,7 +20,6 @@ class MCPTool extends BaseTool {
       // https://modelcontextprotocol.io/specification/2025-06-18/server/tools#tool-result
       response: toGeminiSchema(this.mcpTool.outputSchema)
     };
-    return declaration;
   }
   async runAsync(request) {
     const session = await this.mcpSessionManager.createSession();

package/dist/web/tools/mcp/mcp_toolset.js

@@ -12,7 +12,7 @@ class MCPToolset extends BaseToolset {
     super(toolFilter);
     this.mcpSessionManager = new MCPSessionManager(connectionParams);
   }
-  async getTools(context) {
+  async getTools() {
     const session = await this.mcpSessionManager.createSession();
     const listResult = await session.listTools();
     logger.debug("number of tools: ".concat(listResult.tools.length));

package/dist/web/tools/tool_context.js

@@ -18,15 +18,10 @@ class ToolContext extends CallbackContext {
    * @param params.toolConfirmation The tool confirmation of the current tool
    *     call.
    */
-  constructor({
-    invocationContext,
-    eventActions,
-    functionCallId,
-    toolConfirmation
-  }) {
-    super({ invocationContext, eventActions });
-    this.functionCallId = functionCallId;
-    this.toolConfirmation = toolConfirmation;
+  constructor(params) {
+    super(params);
+    this.functionCallId = params.functionCallId;
+    this.toolConfirmation = params.toolConfirmation;
   }
   get actions() {
     return this.eventActions;

package/dist/web/utils/env_aware_utils.js

@@ -36,7 +36,7 @@ function base64Decode(data) {
 function isBase64Encoded(data) {
   try {
     return base64Encode(base64Decode(data)) === data;
-  } catch (e) {
+  } catch (_e) {
     return false;
   }
 }

package/dist/web/utils/gemini_schema_util.js

@@ -5,12 +5,13 @@
  */
 import { Type } from "@google/genai";
 import { z } from "zod";
-const MCPToolSchema = z.object({
+const MCPToolSchemaObject = z.object({
   type: z.literal("object"),
-  properties: z.record(z.unknown()).optional(),
+  properties: z.record(z.string(), z.unknown()).optional(),
   required: z.string().array().optional()
 });
 function toGeminiType(mcpType) {
+  if (!mcpType) return Type.TYPE_UNSPECIFIED;
   switch (mcpType.toLowerCase()) {
     case "text":
     case "string":
@@ -51,12 +52,17 @@ function toGeminiSchema(mcpSchema) {
       }
     }
     const geminiType = toGeminiType(mcp.type);
-    const geminiSchema = { type: geminiType, description: mcp.description };
+    const geminiSchema = {
+      type: geminiType,
+      description: mcp.description
+    };
     if (geminiType === Type.OBJECT) {
       geminiSchema.properties = {};
       if (mcp.properties) {
         for (const name in mcp.properties) {
-          geminiSchema.properties[name] = recursiveConvert(mcp.properties[name]);
+          geminiSchema.properties[name] = recursiveConvert(
+            mcp.properties[name]
+          );
         }
       }
       geminiSchema.required = mcp.required;

package/dist/web/utils/logger.js

@@ -61,6 +61,18 @@ class SimpleLogger {
     console.error(getColoredPrefix(3 /* ERROR */), ...args);
   }
 }
+class NoOpLogger {
+  log(_level, ..._args) {
+  }
+  debug(..._args) {
+  }
+  info(..._args) {
+  }
+  warn(..._args) {
+  }
+  error(..._args) {
+  }
+}
 const LOG_LEVEL_STR = {
   [0 /* DEBUG */]: "DEBUG",
   [1 /* INFO */]: "INFO",
@@ -81,9 +93,38 @@ const RESET_COLOR = "\x1B[0m";
 function getColoredPrefix(level) {
   return "".concat(CONSOLE_COLOR_MAP[level], "[ADK ").concat(LOG_LEVEL_STR[level], "]:").concat(RESET_COLOR);
 }
-const logger = new SimpleLogger();
+let currentLogger = new SimpleLogger();
+function setLogger(customLogger) {
+  currentLogger = customLogger != null ? customLogger : new NoOpLogger();
+}
+function getLogger() {
+  return currentLogger;
+}
+function resetLogger() {
+  currentLogger = new SimpleLogger();
+}
+const logger = {
+  log(level, ...args) {
+    currentLogger.log(level, ...args);
+  },
+  debug(...args) {
+    currentLogger.debug(...args);
+  },
+  info(...args) {
+    currentLogger.info(...args);
+  },
+  warn(...args) {
+    currentLogger.warn(...args);
+  },
+  error(...args) {
+    currentLogger.error(...args);
+  }
+};
 export {
   LogLevel,
+  getLogger,
   logger,
-  setLogLevel
+  resetLogger,
+  setLogLevel,
+  setLogger
 };