@google/adk 1.4.0 → 1.5.0

package/dist/web/runner/runner.js

@@ -252,7 +252,7 @@ class Runner {
                   throw new Error("No parts in the newMessage.");
                 }
                 if (runConfig.saveInputBlobsAsArtifacts) {
-                  yield new __await(this.saveArtifacts(
+                  newMessage = yield new __await(this.saveArtifacts(
                     invocationContext.invocationId,
                     session.userId,
                     session.id,
@@ -354,7 +354,7 @@ class Runner {
   }
   /**
    * Saves artifacts from the message parts and replaces the inline data with
-   * a file name placeholder.
+   * a file name placeholder and optional file reference.
    *
    * @param invocationId The current invocation ID.
    * @param userId The user ID of the session.
@@ -364,27 +364,64 @@ class Runner {
   async saveArtifacts(invocationId, userId, sessionId, message) {
     var _a2;
     if (!this.artifactService || !((_a2 = message.parts) == null ? void 0 : _a2.length)) {
-      return;
+      return message;
     }
     const sessionKey = {
       appName: this.appName,
       userId,
       sessionId
     };
+    const newParts = [];
+    let modified = false;
     for (let i = 0; i < message.parts.length; i++) {
       const part = message.parts[i];
       if (!part.inlineData) {
+        newParts.push(part);
         continue;
       }
-      const fileName = "artifact_".concat(invocationId, "_").concat(i);
-      await this.artifactService.saveArtifact(__spreadProps(__spreadValues({}, sessionKey), {
-        filename: fileName,
-        artifact: part
-      }));
-      message.parts[i] = createPartFromText(
-        "Uploaded file: ".concat(fileName, ". It is saved into artifacts")
-      );
+      try {
+        const inlineData = part.inlineData;
+        const fileName = inlineData.displayName || "artifact_".concat(invocationId, "_").concat(i);
+        const version = await this.artifactService.saveArtifact(__spreadProps(__spreadValues({}, sessionKey), {
+          filename: fileName,
+          artifact: part
+        }));
+        newParts.push(createPartFromText('[Uploaded Artifact: "'.concat(fileName, '"]')));
+        try {
+          const artifactVersion = await this.artifactService.getArtifactVersion(
+            __spreadProps(__spreadValues({}, sessionKey), {
+              filename: fileName,
+              version
+            })
+          );
+          if ((artifactVersion == null ? void 0 : artifactVersion.canonicalUri) && /^(gs|https?):/i.test(artifactVersion.canonicalUri)) {
+            newParts.push({
+              fileData: {
+                fileUri: artifactVersion.canonicalUri,
+                mimeType: artifactVersion.mimeType || inlineData.mimeType || "",
+                displayName: fileName
+              }
+            });
+          }
+        } catch (error) {
+          logger.warn(
+            "Failed to resolve artifact version for ".concat(fileName, ":"),
+            error
+          );
+        }
+        modified = true;
+        logger.info("Successfully saved artifact: ".concat(fileName));
+      } catch (error) {
+        logger.error("Failed to save artifact for part ".concat(i, ":"), error);
+        newParts.push(part);
+      }
     }
+    if (!modified) {
+      return message;
+    }
+    return __spreadProps(__spreadValues({}, message), {
+      parts: newParts
+    });
   }
   /**
    * Determines the next agent to run to continue the session. This is primarily

package/dist/web/tools/enterprise_web_search_tool.js

@@ -0,0 +1,55 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import {
+  isGemini1Model,
+  isGeminiModel,
+  isGeminiModelIdCheckDisabled
+} from "../utils/model_name.js";
+import { BaseTool } from "./base_tool.js";
+function applyEnterpriseWebSearch(llmRequest) {
+  if (!llmRequest.model) {
+    return;
+  }
+  const modelCheckDisabled = isGeminiModelIdCheckDisabled();
+  llmRequest.config = llmRequest.config || {};
+  llmRequest.config.tools = llmRequest.config.tools || [];
+  if (isGeminiModel(llmRequest.model) || modelCheckDisabled) {
+    if (isGemini1Model(llmRequest.model) && llmRequest.config.tools.length > 0) {
+      throw new Error(
+        "Enterprise Web Search tool cannot be used with other tools in Gemini 1.x."
+      );
+    }
+    llmRequest.config.tools.push({ enterpriseWebSearch: {} });
+    return;
+  }
+  throw new Error(
+    "Enterprise Web Search tool is not supported for model ".concat(llmRequest.model)
+  );
+}
+class EnterpriseWebSearchTool extends BaseTool {
+  constructor() {
+    super({
+      name: "enterprise_web_search",
+      description: "Enterprise Web Search Tool"
+    });
+  }
+  runAsync() {
+    return Promise.resolve();
+  }
+  async processLlmRequest({
+    llmRequest
+  }) {
+    applyEnterpriseWebSearch(llmRequest);
+  }
+}
+const ENTERPRISE_WEB_SEARCH = new EnterpriseWebSearchTool();
+export {
+  ENTERPRISE_WEB_SEARCH,
+  EnterpriseWebSearchTool,
+  applyEnterpriseWebSearch
+};

package/dist/web/tools/example_tool.js

@@ -0,0 +1,42 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { buildExampleSi } from "../examples/example_util.js";
+import { appendInstructions } from "../models/llm_request.js";
+import {
+  BaseTool
+} from "./base_tool.js";
+class ExampleTool extends BaseTool {
+  constructor(examples) {
+    super({
+      // Name and description are not used because this tool only changes
+      // llmRequest.
+      name: "example_tool",
+      description: "example tool"
+    });
+    this.examples = examples;
+  }
+  async runAsync(_request) {
+    throw new Error("ExampleTool should not be called by model");
+  }
+  async processLlmRequest({
+    toolContext,
+    llmRequest
+  }) {
+    var _a, _b;
+    const parts = (_a = toolContext.userContent) == null ? void 0 : _a.parts;
+    if (!parts || !((_b = parts[0]) == null ? void 0 : _b.text)) {
+      return;
+    }
+    appendInstructions(llmRequest, [
+      buildExampleSi(this.examples, parts[0].text, llmRequest.model)
+    ]);
+  }
+}
+export {
+  ExampleTool
+};

package/dist/web/tools/load_web_page.js

@@ -0,0 +1,221 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { lookup } from "node:dns/promises";
+import { isIP } from "node:net";
+import { z } from "zod";
+import { FunctionTool } from "./function_tool.js";
+const ALLOWED_SCHEMES = /* @__PURE__ */ new Set(["http:", "https:"]);
+const DEFAULT_TIMEOUT_MS = 3e4;
+const BLOCKED_IPV4_CIDRS = [
+  "0.0.0.0/8",
+  // "this host on this network"
+  "10.0.0.0/8",
+  // private
+  "100.64.0.0/10",
+  // shared address space / CGNAT
+  "127.0.0.0/8",
+  // loopback
+  "169.254.0.0/16",
+  // link-local (includes GCP metadata 169.254.169.254)
+  "172.16.0.0/12",
+  // private
+  "192.0.0.0/24",
+  // IETF protocol assignments
+  "192.0.2.0/24",
+  // TEST-NET-1 (documentation)
+  "192.88.99.0/24",
+  // 6to4 relay anycast (deprecated)
+  "192.168.0.0/16",
+  // private
+  "198.18.0.0/15",
+  // benchmarking
+  "198.51.100.0/24",
+  // TEST-NET-2 (documentation)
+  "203.0.113.0/24",
+  // TEST-NET-3 (documentation)
+  "224.0.0.0/4",
+  // multicast
+  "240.0.0.0/4"
+  // reserved / future use (includes 255.255.255.255)
+].map(parseIpv4Cidr);
+const BLOCKED_IPV6_CIDRS = [
+  "::/128",
+  // unspecified
+  "::1/128",
+  // loopback
+  "64:ff9b:1::/48",
+  // local NAT64
+  "100::/64",
+  // discard-only
+  "2001:db8::/32",
+  // documentation
+  "fc00::/7",
+  // unique-local (ULA, private)
+  "fe80::/10",
+  // link-local
+  "ff00::/8"
+  // multicast
+].map(parseIpv6Cidr);
+function failedToFetchMessage(url) {
+  return "Failed to fetch url: ".concat(url);
+}
+function isBlockedHostname(hostname) {
+  const normalized = hostname.replace(/\.+$/, "").toLowerCase();
+  return normalized === "localhost" || normalized.endsWith(".localhost");
+}
+function normalizeHost(hostname) {
+  return hostname.startsWith("[") ? hostname.slice(1, -1) : hostname;
+}
+function parseIpv4(address) {
+  const match = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.exec(address);
+  if (!match) {
+    return null;
+  }
+  const octets = match.slice(1).map(Number);
+  if (octets.some((octet) => octet > 255)) {
+    return null;
+  }
+  return octets;
+}
+function parseIpv6(address) {
+  if (isIP(address) !== 6) {
+    return null;
+  }
+  const [head, tail] = address.split("::");
+  const highGroups = head ? expandHextets(head) : [];
+  const lowGroups = tail ? expandHextets(tail) : [];
+  const compressed = address.includes("::") ? new Array(8 - highGroups.length - lowGroups.length).fill(0) : [];
+  return [...highGroups, ...compressed, ...lowGroups];
+}
+function expandHextets(fragment) {
+  const hextets = [];
+  for (const group of fragment.split(":")) {
+    if (group.includes(".")) {
+      const octets = parseIpv4(group);
+      hextets.push(octets[0] << 8 | octets[1], octets[2] << 8 | octets[3]);
+    } else {
+      hextets.push(parseInt(group, 16));
+    }
+  }
+  return hextets;
+}
+function ipv4ToInt(octets) {
+  return (octets[0] << 24 | octets[1] << 16 | octets[2] << 8 | octets[3]) >>> 0;
+}
+function hextetsToBigInt(hextets) {
+  let value = /* @__PURE__ */ BigInt("0");
+  for (const hextet of hextets) {
+    value = value << /* @__PURE__ */ BigInt("16") | BigInt(hextet);
+  }
+  return value;
+}
+function parseIpv4Cidr(cidr) {
+  const [address, prefix] = cidr.split("/");
+  const mask = 4294967295 << 32 - Number(prefix) >>> 0;
+  return { base: (ipv4ToInt(parseIpv4(address)) & mask) >>> 0, mask };
+}
+function parseIpv6Cidr(cidr) {
+  const [address, prefix] = cidr.split("/");
+  return { base: hextetsToBigInt(parseIpv6(address)), prefix: Number(prefix) };
+}
+function isBlockedIpv4(octets) {
+  const value = ipv4ToInt(octets);
+  return BLOCKED_IPV4_CIDRS.some(
+    ({ base, mask }) => (value & mask) >>> 0 === base
+  );
+}
+function isBlockedIpv6(hextets) {
+  const value = hextetsToBigInt(hextets);
+  if (value >> /* @__PURE__ */ BigInt("32") === /* @__PURE__ */ BigInt("0xffff")) {
+    return isBlockedIpv4([
+      Number(value >> /* @__PURE__ */ BigInt("24") & /* @__PURE__ */ BigInt("0xff")),
+      Number(value >> /* @__PURE__ */ BigInt("16") & /* @__PURE__ */ BigInt("0xff")),
+      Number(value >> /* @__PURE__ */ BigInt("8") & /* @__PURE__ */ BigInt("0xff")),
+      Number(value & /* @__PURE__ */ BigInt("0xff"))
+    ]);
+  }
+  return BLOCKED_IPV6_CIDRS.some(
+    ({ base, prefix }) => value >> BigInt(128 - prefix) === base >> BigInt(128 - prefix)
+  );
+}
+function isBlockedAddress(address) {
+  const octets = parseIpv4(address);
+  if (octets) {
+    return isBlockedIpv4(octets);
+  }
+  const hextets = parseIpv6(address);
+  if (hextets) {
+    return isBlockedIpv6(hextets);
+  }
+  return true;
+}
+async function resolveHostAddresses(hostname) {
+  if (isIP(hostname) !== 0) {
+    return [hostname];
+  }
+  const records = await lookup(hostname, { all: true });
+  const addresses = [...new Set(records.map((record) => record.address))];
+  if (addresses.length === 0) {
+    throw new Error("Unable to resolve host: ".concat(hostname));
+  }
+  return addresses;
+}
+function assertUrlAllowed(url) {
+  const parsed = new URL(url);
+  if (!ALLOWED_SCHEMES.has(parsed.protocol)) {
+    throw new Error("Unsupported url scheme: ".concat(url));
+  }
+  if (isBlockedHostname(parsed.hostname)) {
+    throw new Error("Blocked host: ".concat(parsed.hostname));
+  }
+  return parsed;
+}
+async function validateResolvedAddresses(hostname) {
+  const addresses = await resolveHostAddresses(hostname);
+  if (addresses.some(isBlockedAddress)) {
+    throw new Error("Blocked host: ".concat(hostname));
+  }
+}
+function decodeHtmlEntities(text) {
+  return text.replace(/&nbsp;/g, " ").replace(/&#39;/g, "'").replace(/&#x27;/g, "'").replace(/&quot;/g, '"').replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&");
+}
+function htmlToText(html) {
+  const withoutCode = html.replace(/<script[\s\S]*?<\/script>/gi, " ").replace(/<style[\s\S]*?<\/style>/gi, " ").replace(/<!--[\s\S]*?-->/g, " ");
+  const text = decodeHtmlEntities(withoutCode.replace(/<[^>]+>/g, "\n"));
+  return text.split("\n").map((line) => line.trim()).filter((line) => line.split(/\s+/).filter(Boolean).length > 3).join("\n");
+}
+async function loadWebPage(url, options) {
+  var _a;
+  const timeoutMs = (_a = options == null ? void 0 : options.timeoutMs) != null ? _a : DEFAULT_TIMEOUT_MS;
+  try {
+    const parsed = assertUrlAllowed(url);
+    await validateResolvedAddresses(normalizeHost(parsed.hostname));
+    const response = await fetch(url, {
+      redirect: "manual",
+      signal: AbortSignal.timeout(timeoutMs)
+    });
+    if (response.status !== 200) {
+      return failedToFetchMessage(url);
+    }
+    return htmlToText(await response.text());
+  } catch (e) {
+    return failedToFetchMessage(url);
+  }
+}
+const LOAD_WEB_PAGE = new FunctionTool({
+  name: "load_web_page",
+  description: "Fetches the content at the given URL and returns the readable text extracted from the page.",
+  parameters: z.object({
+    url: z.string().describe("The URL to fetch and extract text from.")
+  }),
+  execute: ({ url }) => loadWebPage(url)
+});
+export {
+  LOAD_WEB_PAGE,
+  loadWebPage
+};

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

@@ -0,0 +1,107 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { Type } from "@google/genai";
+import { appendInstructions } from "../../models/llm_request.js";
+import { logger } from "../../utils/logger.js";
+import {
+  BaseTool
+} from "../base_tool.js";
+class LoadMcpResourceTool extends BaseTool {
+  constructor(mcpToolset) {
+    super({
+      name: "load_mcp_resource",
+      description: "Loads resources from the MCP server.\n\nNOTE: Call when you need access to resources."
+    });
+    this.mcpToolset = mcpToolset;
+  }
+  _getDeclaration() {
+    return {
+      name: this.name,
+      description: this.description,
+      parameters: {
+        type: Type.OBJECT,
+        properties: {
+          resource_names: {
+            type: Type.ARRAY,
+            items: {
+              type: Type.STRING
+            },
+            description: "The names of the MCP resources to load."
+          }
+        }
+      }
+    };
+  }
+  async runAsync({ args }) {
+    const resourceNames = args["resource_names"] || [];
+    return {
+      resource_names: resourceNames,
+      status: "resource contents temporarily inserted and removed. to access these resources, call load_mcp_resource tool again."
+    };
+  }
+  async processLlmRequest(request) {
+    await super.processLlmRequest(request);
+    await this.appendResourcesToLlmRequest(request.llmRequest);
+  }
+  async appendResourcesToLlmRequest(llmRequest) {
+    var _a, _b;
+    try {
+      const availableResourceNames = await this.mcpToolset.listResources();
+      if (availableResourceNames.length > 0) {
+        appendInstructions(llmRequest, [
+          "You have a list of MCP resources:\n".concat(JSON.stringify(
+            availableResourceNames
+          ), "\n\nWhen the user asks questions about any of the resources, you should call the\n`load_mcp_resource` function to load the resource. Always call load_mcp_resource\nbefore answering questions related to the resources.")
+        ]);
+      }
+    } catch (e) {
+      logger.warn("Failed to list MCP resources: ".concat(e));
+    }
+    const lastContent = llmRequest.contents.at(-1);
+    const functionResponse = (_b = (_a = lastContent == null ? void 0 : lastContent.parts) == null ? void 0 : _a[0]) == null ? void 0 : _b.functionResponse;
+    if (!functionResponse || functionResponse.name !== this.name) {
+      return;
+    }
+    const response = functionResponse.response || {};
+    const requestedResourceNames = response["resource_names"] || [];
+    for (const resourceName of requestedResourceNames) {
+      try {
+        const resourceContents = await this.mcpToolset.readResource(resourceName);
+        for (const content of resourceContents) {
+          llmRequest.contents.push({
+            role: "user",
+            parts: [
+              { text: "Resource ".concat(resourceName, " is:") },
+              this.mcpContentToPart(content, resourceName)
+            ]
+          });
+        }
+      } catch (e) {
+        logger.warn("Failed to read MCP resource '".concat(resourceName, "': ").concat(e));
+      }
+    }
+  }
+  mcpContentToPart(content, resourceName) {
+    var _a;
+    if ("text" in content) {
+      return { text: content.text };
+    }
+    if ("blob" in content) {
+      return {
+        inlineData: {
+          data: content.blob,
+          mimeType: (_a = content.mimeType) != null ? _a : "application/octet-stream"
+        }
+      };
+    }
+    return { text: "[Unknown content type for ".concat(resourceName, "]") };
+  }
+}
+export {
+  LoadMcpResourceTool
+};

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

@@ -66,6 +66,69 @@ class MCPToolset extends BaseToolset {
     );
     return tools;
   }
+  /**
+   * Lists the names of the resources advertised by the MCP server.
+   *
+   * @return The resource names available on the server.
+   */
+  async listResources() {
+    const session = await this.mcpSessionManager.createSession();
+    try {
+      const result = await session.listResources();
+      return result.resources.map((resource) => resource.name);
+    } finally {
+      await this.mcpSessionManager.closeSession(session);
+    }
+  }
+  /**
+   * Returns metadata for the resource whose name matches `name`.
+   *
+   * @param name The advertised name of the resource.
+   * @return The matching MCP `Resource`.
+   * @throws If no resource with the given name is advertised by the server.
+   */
+  async getResourceInfo(name) {
+    const session = await this.mcpSessionManager.createSession();
+    let result;
+    try {
+      result = await session.listResources();
+    } finally {
+      await this.mcpSessionManager.closeSession(session);
+    }
+    const resource = result.resources.find(
+      (candidate) => candidate.name === name
+    );
+    if (!resource) {
+      throw new Error("Resource with name '".concat(name, "' not found."));
+    }
+    return resource;
+  }
+  /**
+   * Reads the contents of the named resource from the MCP server.
+   *
+   * The resource name is resolved to a URI via {@link getResourceInfo} before
+   * reading. Binary contents are returned base64-encoded, exactly as provided
+   * by the server (never decoded and re-encoded).
+   *
+   * @param name The advertised name of the resource to read.
+   * @return The resource contents (text and/or base64-encoded binary).
+   * @throws If the resource is unknown or has no URI.
+   */
+  async readResource(name) {
+    const resourceInfo = await this.getResourceInfo(name);
+    if (!resourceInfo.uri) {
+      throw new Error("Resource '".concat(name, "' has no URI."));
+    }
+    const session = await this.mcpSessionManager.createSession();
+    try {
+      const result = await session.readResource({
+        uri: resourceInfo.uri
+      });
+      return result.contents;
+    } finally {
+      await this.mcpSessionManager.closeSession(session);
+    }
+  }
   async close() {
     const sessions = this.mcpSessionManager.getActiveSessions();
     await Promise.allSettled(

package/dist/web/tools/openapi_tool/openapi_spec_parser/tool_auth_handler.js

@@ -62,19 +62,22 @@ let ToolAuthHandler = class {
       rawAuthCredential: this.authCredential,
       credentialKey: this.credentialKey || "default_openapi_key"
     };
-    const credential = this.context.getAuthResponse(authConfig);
-    if (credential) {
-      const exchanger = new AutoAuthCredentialExchanger();
-      const result = await exchanger.exchange({
-        authScheme: this.authScheme,
-        authCredential: credential
-      });
+    const authResponseCredential = this.context.getAuthResponse(authConfig);
+    const credential = authResponseCredential != null ? authResponseCredential : this.authCredential;
+    if (!credential) {
+      this.context.requestCredential(authConfig);
+      return { state: "pending" };
+    }
+    const exchanger = new AutoAuthCredentialExchanger();
+    const result = await exchanger.exchange({
+      authScheme: this.authScheme,
+      authCredential: credential
+    });
+    if (authResponseCredential || result.wasExchanged) {
       const key = store.getCredentialKey(this.authScheme);
       store.storeCredential(key, result.credential);
-      return { state: "done", authCredential: result.credential };
     }
-    this.context.requestCredential(authConfig);
-    return { state: "pending" };
+    return { state: "done", authCredential: result.credential };
   }
 };
 __decorateClass([