@google/adk 0.6.1 → 1.0.0

package/dist/esm/auth/auth_handler.js

@@ -1,8 +1,12 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
 /**
  * @license
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { randomUUID } from "../utils/env_aware_utils.js";
+import { OAuth2CredentialExchanger } from "./oauth2/oauth2_credential_exchanger.js";
 class AuthHandler {
   constructor(authConfig) {
     this.authConfig = authConfig;
@@ -11,6 +15,22 @@ class AuthHandler {
     const credentialKey = "temp:" + this.authConfig.credentialKey;
     return state.get(credentialKey);
   }
+  async parseAndStoreAuthResponse(state) {
+    const credentialKey = "temp:" + this.authConfig.credentialKey;
+    const authSchemeType = this.authConfig.authScheme.type;
+    if (!["oauth2", "openIdConnect"].includes(authSchemeType)) {
+      state.set(credentialKey, this.authConfig.exchangedAuthCredential);
+      return;
+    }
+    if (this.authConfig.exchangedAuthCredential) {
+      const exchanger = new OAuth2CredentialExchanger();
+      const exchangedCredential = await exchanger.exchange({
+        authCredential: this.authConfig.exchangedAuthCredential,
+        authScheme: this.authConfig.authScheme
+      });
+      state.set(credentialKey, exchangedCredential.credential);
+    }
+  }
   generateAuthRequest() {
     var _a, _b;
     const authSchemeType = this.authConfig.authScheme.type;
@@ -56,7 +76,54 @@ class AuthHandler {
    *     auth scheme.
    */
   generateAuthUri() {
-    return this.authConfig.rawAuthCredential;
+    const authScheme = this.authConfig.authScheme;
+    const authCredential = this.authConfig.rawAuthCredential;
+    if (!authCredential || !authCredential.oauth2) {
+      return authCredential;
+    }
+    let authorizationEndpoint = "";
+    let scopes = [];
+    if ("authorizationEndpoint" in authScheme) {
+      authorizationEndpoint = authScheme.authorizationEndpoint;
+      scopes = authScheme.scopes || [];
+    } else if (authScheme.type === "oauth2" && authScheme.flows) {
+      const flows = authScheme.flows;
+      const flow = flows.implicit || flows.authorizationCode || flows.clientCredentials || flows.password;
+      if (flow) {
+        if ("authorizationUrl" in flow && flow.authorizationUrl) {
+          authorizationEndpoint = flow.authorizationUrl;
+        } else if ("tokenUrl" in flow && flow.tokenUrl) {
+          authorizationEndpoint = flow.tokenUrl;
+        }
+        if (flow.scopes) {
+          scopes = Object.keys(flow.scopes);
+        }
+      }
+    }
+    if (!authorizationEndpoint) {
+      throw new Error("Authorization endpoint not configured in auth scheme.");
+    }
+    const state = randomUUID();
+    const url = new URL(authorizationEndpoint);
+    url.searchParams.set("client_id", authCredential.oauth2.clientId || "");
+    url.searchParams.set(
+      "redirect_uri",
+      authCredential.oauth2.redirectUri || ""
+    );
+    url.searchParams.set("response_type", "code");
+    url.searchParams.set("scope", scopes.join(" "));
+    url.searchParams.set("state", state);
+    url.searchParams.set("access_type", "offline");
+    url.searchParams.set("prompt", "consent");
+    const exchangedAuthCredential = {
+      ...authCredential,
+      oauth2: {
+        ...authCredential.oauth2,
+        authUri: url.toString(),
+        state
+      }
+    };
+    return exchangedAuthCredential;
   }
 }
 export {

package/dist/esm/auth/auth_preprocessor.js

@@ -0,0 +1,155 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import {
+  REQUEST_EUC_FUNCTION_CALL_NAME,
+  handleFunctionCallsAsync
+} from "../agents/functions.js";
+import { isLlmAgent } from "../agents/llm_agent.js";
+import { BaseLlmRequestProcessor } from "../agents/processors/base_llm_processor.js";
+import { ReadonlyContext } from "../agents/readonly_context.js";
+import {
+  getFunctionCalls,
+  getFunctionResponses
+} from "../events/event.js";
+import { State } from "../sessions/state.js";
+import { AuthHandler } from "./auth_handler.js";
+const TOOLSET_AUTH_CREDENTIAL_ID_PREFIX = "_adk_toolset_auth_";
+async function storeAuthAndCollectResumeTargets(events, authFcIds, authResponses, state) {
+  const requestedAuthConfigById = {};
+  for (const event of events) {
+    const eventFunctionCalls = getFunctionCalls(event);
+    for (const functionCall of eventFunctionCalls) {
+      if (functionCall.id && authFcIds.has(functionCall.id) && functionCall.name === REQUEST_EUC_FUNCTION_CALL_NAME) {
+        const args = functionCall.args;
+        if (args && args.authConfig) {
+          requestedAuthConfigById[functionCall.id] = args.authConfig;
+        }
+      }
+    }
+  }
+  for (const fcId of authFcIds) {
+    if (!(fcId in authResponses)) {
+      continue;
+    }
+    const authConfig = authResponses[fcId];
+    const requestedAuthConfig = requestedAuthConfigById[fcId];
+    if (requestedAuthConfig && requestedAuthConfig.credentialKey) {
+      authConfig.credentialKey = requestedAuthConfig.credentialKey;
+    }
+    await new AuthHandler(authConfig).parseAndStoreAuthResponse(state);
+  }
+  const toolsToResume = /* @__PURE__ */ new Set();
+  for (const fcId of authFcIds) {
+    const requestedAuthConfig = requestedAuthConfigById[fcId];
+    if (!requestedAuthConfig) {
+      continue;
+    }
+    for (const event of events) {
+      const eventFunctionCalls = getFunctionCalls(event);
+      for (const functionCall of eventFunctionCalls) {
+        if (functionCall.id === fcId && functionCall.name === REQUEST_EUC_FUNCTION_CALL_NAME) {
+          const args = functionCall.args;
+          if (args && args.functionCallId) {
+            if (args.functionCallId.startsWith(TOOLSET_AUTH_CREDENTIAL_ID_PREFIX)) {
+              continue;
+            }
+            toolsToResume.add(args.functionCallId);
+          }
+        }
+      }
+    }
+  }
+  return toolsToResume;
+}
+class AuthPreprocessor extends BaseLlmRequestProcessor {
+  async *runAsync(invocationContext) {
+    const agent = invocationContext.agent;
+    if (!isLlmAgent(agent)) {
+      return;
+    }
+    const events = invocationContext.session.events;
+    if (!events || events.length === 0) {
+      return;
+    }
+    let lastEventWithContent = null;
+    for (let i = events.length - 1; i >= 0; i--) {
+      const event = events[i];
+      if (event.content !== void 0) {
+        lastEventWithContent = event;
+        break;
+      }
+    }
+    if (!lastEventWithContent || lastEventWithContent.author !== "user") {
+      return;
+    }
+    const responses = getFunctionResponses(lastEventWithContent);
+    if (!responses || responses.length === 0) {
+      return;
+    }
+    const authFcIds = /* @__PURE__ */ new Set();
+    const authResponses = {};
+    for (const functionCallResponse of responses) {
+      if (functionCallResponse.name !== REQUEST_EUC_FUNCTION_CALL_NAME) {
+        continue;
+      }
+      if (functionCallResponse.id) {
+        authFcIds.add(functionCallResponse.id);
+        authResponses[functionCallResponse.id] = functionCallResponse.response;
+      }
+    }
+    if (authFcIds.size === 0) {
+      return;
+    }
+    const state = new State(invocationContext.session.state);
+    const toolsToResume = await storeAuthAndCollectResumeTargets(
+      events,
+      authFcIds,
+      authResponses,
+      state
+    );
+    if (toolsToResume.size === 0) {
+      return;
+    }
+    for (let i = events.length - 2; i >= 0; i--) {
+      const event = events[i];
+      const functionCalls = getFunctionCalls(event);
+      if (!functionCalls || functionCalls.length === 0) {
+        continue;
+      }
+      const hasMatchingCall = functionCalls.some(
+        (call) => call.id ? toolsToResume.has(call.id) : false
+      );
+      if (hasMatchingCall) {
+        const canonicalTools = await agent.canonicalTools(
+          new ReadonlyContext(invocationContext)
+        );
+        const toolsDict = {};
+        for (const tool of canonicalTools) {
+          toolsDict[tool.name] = tool;
+        }
+        const functionResponseEvent = await handleFunctionCallsAsync({
+          invocationContext,
+          functionCallEvent: event,
+          toolsDict,
+          beforeToolCallbacks: agent.canonicalBeforeToolCallbacks,
+          afterToolCallbacks: agent.canonicalAfterToolCallbacks,
+          filters: toolsToResume
+        });
+        if (functionResponseEvent) {
+          yield functionResponseEvent;
+        }
+        return;
+      }
+    }
+  }
+}
+const AUTH_PREPROCESSOR = new AuthPreprocessor();
+export {
+  AUTH_PREPROCESSOR,
+  AuthPreprocessor
+};

package/dist/esm/auth/auth_provider_registry.js

@@ -0,0 +1,33 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+class AuthProviderRegistry {
+  constructor() {
+    this.providers = /* @__PURE__ */ new Map();
+  }
+  /**
+   * Register a provider instance for an auth scheme type.
+   *
+   * @param authSchemeType The auth scheme type (e.g., 'oauth2', 'apiKey').
+   * @param providerInstance The provider instance to register.
+   */
+  register(authSchemeType, providerInstance) {
+    this.providers.set(authSchemeType, providerInstance);
+  }
+  /**
+   * Get the provider instance for an auth scheme.
+   *
+   * @param authScheme The auth scheme to get provider for.
+   * @returns The provider instance if registered, undefined otherwise.
+   */
+  getProvider(authScheme) {
+    return this.providers.get(authScheme.type);
+  }
+}
+export {
+  AuthProviderRegistry
+};

package/dist/esm/auth/auth_schemes.js

@@ -1,3 +1,5 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
 /**
  * @license
  * Copyright 2025 Google LLC

package/dist/esm/auth/auth_tool.js

@@ -1,3 +1,5 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
 /**
  * @license
  * Copyright 2025 Google LLC

package/dist/esm/auth/base_auth_provider.js

@@ -0,0 +1,7 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */

package/dist/esm/auth/credential_service/base_credential_service.js

@@ -1,3 +1,5 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
 /**
  * @license
  * Copyright 2025 Google LLC

package/dist/esm/auth/credential_service/in_memory_credential_service.js

@@ -1,3 +1,5 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
 /**
  * @license
  * Copyright 2025 Google LLC

package/dist/esm/auth/credential_service/session_state_credential_service.js

@@ -0,0 +1,23 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+class SessionStateCredentialService {
+  loadCredential(authConfig, toolContext) {
+    return Promise.resolve(toolContext.state.get(authConfig.credentialKey));
+  }
+  async saveCredential(authConfig, toolContext) {
+    if (authConfig.exchangedAuthCredential) {
+      toolContext.state.set(
+        authConfig.credentialKey,
+        authConfig.exchangedAuthCredential
+      );
+    }
+  }
+}
+export {
+  SessionStateCredentialService
+};

package/dist/esm/auth/exchanger/base_credential_exchanger.js

@@ -1,3 +1,5 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
 /**
  * @license
  * Copyright 2025 Google LLC

package/dist/esm/auth/exchanger/credential_exchanger_registry.js

@@ -1,3 +1,5 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
 /**
  * @license
  * Copyright 2025 Google LLC

package/dist/esm/auth/oauth2/oauth2_credential_exchanger.js

@@ -0,0 +1,177 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { logger } from "../../utils/logger.js";
+import {
+  getOAuthGrantTypeFromFlow,
+  OAuthGrantType
+} from "../auth_schemes.js";
+import {
+  CredentialExchangeError
+} from "../exchanger/base_credential_exchanger.js";
+import {
+  createOAuth2TokenRequestBody,
+  fetchOAuth2Tokens,
+  getTokenEndpoint,
+  parseAuthorizationCode
+} from "./oauth2_utils.js";
+class OAuth2CredentialExchanger {
+  async exchange({
+    authCredential,
+    authScheme
+  }) {
+    var _a;
+    if (!authScheme) {
+      throw new CredentialExchangeError(
+        "authScheme is required for OAuth2 credential exchange"
+      );
+    }
+    if ((_a = authCredential.oauth2) == null ? void 0 : _a.accessToken) {
+      return {
+        credential: authCredential,
+        wasExchanged: false
+      };
+    }
+    const grantType = determineGrantType(authScheme);
+    if (grantType === OAuthGrantType.CLIENT_CREDENTIALS) {
+      return exchangeClientCredentials({ authCredential, authScheme });
+    }
+    if (grantType === OAuthGrantType.AUTHORIZATION_CODE) {
+      return exchangeAuthorizationCode({ authCredential, authScheme });
+    }
+    logger.warn(`Unsupported OAuth2 grant type: ${grantType}`);
+    return {
+      credential: authCredential,
+      wasExchanged: false
+    };
+  }
+}
+function determineGrantType(authScheme) {
+  var _a;
+  if ("flows" in authScheme && authScheme.flows) {
+    return getOAuthGrantTypeFromFlow(authScheme.flows);
+  }
+  if (authScheme.grantTypesSupported) {
+    const oidcScheme = authScheme;
+    if ((_a = oidcScheme.grantTypesSupported) == null ? void 0 : _a.includes("client_credentials")) {
+      return OAuthGrantType.CLIENT_CREDENTIALS;
+    }
+    return OAuthGrantType.AUTHORIZATION_CODE;
+  }
+  return void 0;
+}
+async function exchangeClientCredentials({
+  authCredential,
+  authScheme
+}) {
+  var _a, _b;
+  const tokenEndpoint = getTokenEndpoint(authScheme);
+  if (!tokenEndpoint) {
+    throw new CredentialExchangeError(
+      "Token endpoint not found in auth scheme."
+    );
+  }
+  if (!((_a = authCredential.oauth2) == null ? void 0 : _a.clientId) || !((_b = authCredential.oauth2) == null ? void 0 : _b.clientSecret)) {
+    throw new CredentialExchangeError(
+      "clientId and clientSecret are required for client credentials exchange."
+    );
+  }
+  const body = createOAuth2TokenRequestBody({
+    grantType: "client_credentials",
+    clientId: authCredential.oauth2.clientId,
+    clientSecret: authCredential.oauth2.clientSecret
+  });
+  try {
+    const oauth2Auth = await fetchOAuth2Tokens(tokenEndpoint, body);
+    return {
+      credential: {
+        ...authCredential,
+        oauth2: {
+          ...authCredential.oauth2,
+          ...oauth2Auth
+        }
+      },
+      wasExchanged: true
+    };
+  } catch (error) {
+    throw new CredentialExchangeError(
+      `Failed to exchange tokens: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+}
+async function exchangeAuthorizationCode({
+  authCredential,
+  authScheme
+}) {
+  var _a, _b, _c, _d;
+  const tokenEndpoint = getTokenEndpoint(authScheme);
+  if (!tokenEndpoint) {
+    throw new CredentialExchangeError(
+      "Token endpoint not found in auth scheme."
+    );
+  }
+  if (!((_a = authCredential.oauth2) == null ? void 0 : _a.clientId) || !((_b = authCredential.oauth2) == null ? void 0 : _b.clientSecret) || !((_c = authCredential.oauth2) == null ? void 0 : _c.authCode) && !((_d = authCredential.oauth2) == null ? void 0 : _d.authResponseUri)) {
+    throw new CredentialExchangeError(
+      "clientId, clientSecret, and either authCode or authResponseUri are required for authorization code exchange."
+    );
+  }
+  let code = authCredential.oauth2.authCode;
+  if (!code && authCredential.oauth2.authResponseUri) {
+    code = parseAuthorizationCode(authCredential.oauth2.authResponseUri);
+  }
+  if (authCredential.oauth2.authResponseUri && authCredential.oauth2.state) {
+    try {
+      const url = new URL(authCredential.oauth2.authResponseUri);
+      const receivedState = url.searchParams.get("state") || void 0;
+      if (authCredential.oauth2.state !== receivedState) {
+        throw new CredentialExchangeError(
+          "State mismatch detected. Potential CSRF attack."
+        );
+      }
+    } catch (e) {
+      throw new CredentialExchangeError(
+        `Failed to parse authResponseUri for state validation: ${e instanceof Error ? e.message : String(e)}`
+      );
+    }
+  }
+  if (!code) {
+    throw new CredentialExchangeError(
+      "Authorization code not found in auth response."
+    );
+  }
+  const body = createOAuth2TokenRequestBody({
+    grantType: "authorization_code",
+    clientId: authCredential.oauth2.clientId,
+    clientSecret: authCredential.oauth2.clientSecret,
+    code,
+    redirectUri: authCredential.oauth2.redirectUri,
+    codeVerifier: authCredential.oauth2.codeVerifier
+  });
+  try {
+    const oauth2Auth = await fetchOAuth2Tokens(tokenEndpoint, body);
+    return {
+      credential: {
+        ...authCredential,
+        oauth2: {
+          ...authCredential.oauth2,
+          ...oauth2Auth
+        }
+      },
+      wasExchanged: true
+    };
+  } catch (error) {
+    throw new CredentialExchangeError(
+      `Failed to exchange tokens: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+}
+export {
+  OAuth2CredentialExchanger,
+  determineGrantType,
+  exchangeAuthorizationCode,
+  exchangeClientCredentials
+};

package/dist/esm/auth/oauth2/oauth2_credential_refresher.js

@@ -0,0 +1,85 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { logger } from "../../utils/logger.js";
+import {
+  fetchOAuth2Tokens,
+  getTokenEndpoint,
+  isTokenExpired
+} from "./oauth2_utils.js";
+class OAuth2CredentialRefresher {
+  /**
+   * Check if the OAuth2 credential needs to be refreshed.
+   *
+   * @param authCredential The OAuth2 credential to check.
+   * @param authScheme The OAuth2 authentication scheme (optional).
+   * @returns True if the credential needs to be refreshed, False otherwise.
+   */
+  async isRefreshNeeded(authCredential) {
+    if (!authCredential.oauth2) {
+      return false;
+    }
+    if (authCredential.oauth2 && authCredential.oauth2.expiresAt) {
+      return isTokenExpired(authCredential.oauth2);
+    }
+    return false;
+  }
+  /**
+   * Refresh the OAuth2 credential.
+   *
+   * @param authCredential The OAuth2 credential to refresh.
+   * @param authScheme The OAuth2 authentication scheme.
+   * @returns The refreshed credential.
+   */
+  async refresh(authCredential, authScheme) {
+    if (!authCredential.oauth2 || !authScheme) {
+      return authCredential;
+    }
+    if (!authCredential.oauth2.refreshToken) {
+      logger.warn("No refresh token available to refresh credential");
+      return authCredential;
+    }
+    const isNeeded = await this.isRefreshNeeded(authCredential);
+    if (!isNeeded) {
+      return authCredential;
+    }
+    const tokenEndpoint = getTokenEndpoint(authScheme);
+    if (!tokenEndpoint) {
+      logger.warn("Token endpoint not found in auth scheme.");
+      return authCredential;
+    }
+    if (!authCredential.oauth2.clientId || !authCredential.oauth2.clientSecret) {
+      logger.warn("clientId and clientSecret are required for token refresh.");
+      return authCredential;
+    }
+    const body = new URLSearchParams();
+    body.set("grant_type", "refresh_token");
+    body.set("refresh_token", authCredential.oauth2.refreshToken);
+    body.set("client_id", authCredential.oauth2.clientId);
+    body.set("client_secret", authCredential.oauth2.clientSecret);
+    try {
+      const data = await fetchOAuth2Tokens(tokenEndpoint, body);
+      const updatedOAuth2 = {
+        ...authCredential.oauth2,
+        accessToken: data.accessToken || authCredential.oauth2.accessToken,
+        refreshToken: data.refreshToken || authCredential.oauth2.refreshToken,
+        expiresIn: data.expiresIn,
+        expiresAt: data.expiresAt || authCredential.oauth2.expiresAt
+      };
+      return {
+        ...authCredential,
+        oauth2: updatedOAuth2
+      };
+    } catch (error) {
+      logger.error("Failed to refresh tokens:", error);
+      return authCredential;
+    }
+  }
+}
+export {
+  OAuth2CredentialRefresher
+};