@google/adk 0.6.0 → 0.6.1

package/dist/cjs/utils/gemini_schema_util.js

@@ -55,22 +55,50 @@ function toGeminiType(mcpType) {
       return import_genai.Type.ARRAY;
     case "object":
       return import_genai.Type.OBJECT;
+    case "null":
+      return import_genai.Type.NULL;
     default:
       return import_genai.Type.TYPE_UNSPECIFIED;
   }
 }
+const getTypeFromArrayItem = (mcpType) => {
+  var _a, _b;
+  if (typeof mcpType === "string") {
+    return mcpType.toLowerCase();
+  }
+  return (_b = (_a = mcpType == null ? void 0 : mcpType.type) == null ? void 0 : _a.toLowerCase) == null ? void 0 : _b.call(_a);
+};
 function toGeminiSchema(mcpSchema) {
   if (!mcpSchema) {
     return void 0;
   }
   function recursiveConvert(mcp) {
-    if (!mcp.type && mcp.anyOf && Array.isArray(mcp.anyOf)) {
-      const nonNullOption = mcp.anyOf.find((opt) => {
-        const t = opt.type;
-        return t !== "null" && t !== "NULL";
-      });
-      if (nonNullOption) {
-        mcp = nonNullOption;
+    var _a;
+    const sourceType = (_a = mcp.anyOf) != null ? _a : mcp.type;
+    let isNullable = false;
+    let nonNullTypes;
+    if (Array.isArray(sourceType)) {
+      nonNullTypes = sourceType.filter(
+        (t) => getTypeFromArrayItem(t) !== "null"
+      );
+      isNullable = sourceType.some(
+        (t) => getTypeFromArrayItem(t) === "null"
+      );
+      if (nonNullTypes.length === 1) {
+        const nonNullType = nonNullTypes[0];
+        if (typeof nonNullType === "object") {
+          mcp = nonNullType;
+        } else {
+          const { type: _removed, anyOf: _removedAnyOf, ...rest } = mcp;
+          mcp = { ...rest, type: nonNullType };
+        }
+      } else if (nonNullTypes.length === 0 && isNullable) {
+        const { type: _removed, anyOf: _removedAnyOf, ...rest } = mcp;
+        mcp = { ...rest, type: "null" };
+      } else if (typeof mcp.anyOf === "undefined") {
+        const anyOfItems = mcp.type.map((t) => ({ type: t }));
+        const { type: _removed, ...rest } = mcp;
+        mcp = { ...rest, anyOf: anyOfItems };
       }
     }
     if (!mcp.type) {
@@ -78,13 +106,25 @@ function toGeminiSchema(mcpSchema) {
         mcp.type = "object";
       } else if (mcp.items) {
         mcp.type = "array";
+      } else if (isNullable) {
+        mcp.type = "null";
       }
     }
     const geminiType = toGeminiType(mcp.type);
-    const geminiSchema = {
-      type: geminiType,
-      description: mcp.description
-    };
+    const geminiSchema = {};
+    if (mcp.anyOf) {
+      geminiSchema.anyOf = mcp.anyOf.map(
+        (item) => recursiveConvert(item)
+      );
+    } else {
+      geminiSchema.type = geminiType;
+    }
+    if (mcp.description) {
+      geminiSchema.description = mcp.description;
+    }
+    if (isNullable && mcp.type !== "null") {
+      geminiSchema.nullable = true;
+    }
     if (geminiType === import_genai.Type.OBJECT) {
       geminiSchema.properties = {};
       if (mcp.properties) {
@@ -94,7 +134,9 @@ function toGeminiSchema(mcpSchema) {
           );
         }
       }
-      geminiSchema.required = mcp.required;
+      if (mcp.required) {
+        geminiSchema.required = mcp.required;
+      }
     } else if (geminiType === import_genai.Type.ARRAY) {
       if (mcp.items) {
         geminiSchema.items = recursiveConvert(mcp.items);

package/dist/cjs/version.js

@@ -32,7 +32,7 @@ module.exports = __toCommonJS(version_exports);
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-const version = "0.6.0";
+const version = "0.6.1";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   version

package/dist/esm/a2a/a2a_remote_agent.js

@@ -26,17 +26,24 @@ class RemoteA2AAgent extends BaseAgent {
     super(a2aConfig);
     this.a2aConfig = a2aConfig;
     this.isInitialized = false;
-    if (!a2aConfig.agentCard) {
-      throw new Error("AgentCard must be provided");
+    if (!a2aConfig.agentCard && !a2aConfig.client) {
+      throw new Error("Either AgentCard or Client must be provided");
     }
   }
   async init() {
     if (this.isInitialized) {
       return;
     }
-    this.card = await resolveAgentCard(this.a2aConfig.agentCard);
-    const factory = this.a2aConfig.clientFactory || new ClientFactory();
-    this.client = await factory.createFromAgentCard(this.card);
+    if (this.a2aConfig.client) {
+      this.client = this.a2aConfig.client;
+    }
+    if (this.a2aConfig.agentCard) {
+      this.card = await resolveAgentCard(this.a2aConfig.agentCard);
+      if (!this.client) {
+        const factory = this.a2aConfig.clientFactory || new ClientFactory();
+        this.client = await factory.createFromAgentCard(this.card);
+      }
+    }
     this.isInitialized = true;
   }
   async *runAsyncImpl(context) {
@@ -72,13 +79,11 @@ class RemoteA2AAgent extends BaseAgent {
         messageId: randomUUID(),
         role: MessageRole.USER,
         parts,
-        metadata: {
-          ...getA2ASessionMetadata({
-            appName: context.session.appName,
-            userId: context.session.userId,
-            sessionId: context.session.id
-          })
-        }
+        metadata: getA2ASessionMetadata({
+          appName: context.session.appName,
+          userId: context.session.userId,
+          sessionId: context.session.id
+        })
       };
       if (taskId) message.taskId = taskId;
       if (contextId) message.contextId = contextId;
@@ -92,7 +97,7 @@ class RemoteA2AAgent extends BaseAgent {
           await callback(context, params);
         }
       }
-      const useStreaming = ((_b = this.card.capabilities) == null ? void 0 : _b.streaming) !== false;
+      const useStreaming = this.card ? ((_b = this.card.capabilities) == null ? void 0 : _b.streaming) !== false : true;
       if (useStreaming) {
         for await (const chunk of this.client.sendMessageStream(params)) {
           if (this.a2aConfig.afterRequestCallbacks) {

package/dist/esm/a2a/a2a_remote_agent_run_processor.js

@@ -157,6 +157,13 @@ class A2ARemoteAgentRunProcessor {
     }
     if (response) {
       toAdd["response"] = response;
+      if (isTask(response)) {
+        if (response.id) toAdd["task_id"] = response.id;
+        if (response.contextId) toAdd["context_id"] = response.contextId;
+      } else if (response.taskId) {
+        toAdd["task_id"] = response.taskId;
+        if (response.contextId) toAdd["context_id"] = response.contextId;
+      }
     }
     if (Object.keys(toAdd).length === 0) {
       return;