@google/adk 0.4.0 → 0.5.0

package/dist/cjs/a2a/part_converter_utils.js

@@ -29,6 +29,7 @@ __export(part_converter_utils_exports, {
   toA2APart: () => toA2APart,
   toA2AParts: () => toA2AParts,
   toA2ATextPart: () => toA2ATextPart,
+  toGenAIContent: () => toGenAIContent,
   toGenAIPart: () => toGenAIPart,
   toGenAIPartData: () => toGenAIPartData,
   toGenAIPartFile: () => toGenAIPartFile,
@@ -36,17 +37,13 @@ __export(part_converter_utils_exports, {
   toGenAIParts: () => toGenAIParts
 });
 module.exports = __toCommonJS(part_converter_utils_exports);
+var import_genai = require("@google/genai");
+var import_metadata_converter_utils = require("./metadata_converter_utils.js");
 /**
  * @license
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-var MetadataKeys = /* @__PURE__ */ ((MetadataKeys2) => {
-  MetadataKeys2["TYPE"] = "adk_type";
-  MetadataKeys2["LONG_RUNNING"] = "adk_is_long_running";
-  MetadataKeys2["THOUGHT"] = "adk_thought";
-  return MetadataKeys2;
-})(MetadataKeys || {});
 var DataPartType = /* @__PURE__ */ ((DataPartType2) => {
   DataPartType2["FUNCTION_CALL"] = "function_call";
   DataPartType2["FUNCTION_RESPONSE"] = "function_response";
@@ -54,7 +51,7 @@ var DataPartType = /* @__PURE__ */ ((DataPartType2) => {
   DataPartType2["CODE_EXECUTABLE_CODE"] = "executable_code";
   return DataPartType2;
 })(DataPartType || {});
-function toA2AParts(parts, longRunningToolIDs = []) {
+function toA2AParts(parts = [], longRunningToolIDs = []) {
   return parts.map((part) => toA2APart(part, longRunningToolIDs));
 }
 function toA2APart(part, longRunningToolIDs) {
@@ -68,9 +65,9 @@ function toA2APart(part, longRunningToolIDs) {
 }
 function toA2ATextPart(part) {
   const a2aPart = { kind: "text", text: part.text || "" };
-  if ("thought" in part && part["thought"]) {
+  if (part.thought) {
     a2aPart.metadata = {
-      ["adk_thought" /* THOUGHT */]: true
+      [import_metadata_converter_utils.A2AMetadataKeys.THOUGHT]: true
     };
   }
   return a2aPart;
@@ -99,31 +96,31 @@ function toA2AFilePart(part) {
   throw new Error(`Not a file part: ${JSON.stringify(part)}`);
 }
 function toA2ADataPart(part, longRunningToolIDs = []) {
-  let type;
+  let dataPartType;
   let data;
   if (part.functionCall) {
-    type = "function_call" /* FUNCTION_CALL */;
+    dataPartType = "function_call" /* FUNCTION_CALL */;
     data = part.functionCall;
   } else if (part.functionResponse) {
-    type = "function_response" /* FUNCTION_RESPONSE */;
+    dataPartType = "function_response" /* FUNCTION_RESPONSE */;
     data = part.functionResponse;
   } else if (part.executableCode) {
-    type = "executable_code" /* CODE_EXECUTABLE_CODE */;
+    dataPartType = "executable_code" /* CODE_EXECUTABLE_CODE */;
     data = part.executableCode;
   } else if (part.codeExecutionResult) {
-    type = "code_execution_result" /* CODE_EXEC_RESULT */;
+    dataPartType = "code_execution_result" /* CODE_EXEC_RESULT */;
     data = part.codeExecutionResult;
   } else {
     throw new Error(`Unknown part type: ${JSON.stringify(part)}`);
   }
   const metadata = {
-    ["adk_type" /* TYPE */]: type
+    [import_metadata_converter_utils.A2AMetadataKeys.DATA_PART_TYPE]: dataPartType
   };
-  if (part.functionCall && part.functionCall.name && longRunningToolIDs.includes(part.functionCall.name)) {
-    metadata["adk_is_long_running" /* LONG_RUNNING */] = true;
+  if (part.functionCall && part.functionCall.id && longRunningToolIDs.includes(part.functionCall.id)) {
+    metadata[import_metadata_converter_utils.A2AMetadataKeys.IS_LONG_RUNNING] = true;
   }
-  if (part.functionResponse && part.functionResponse.name && longRunningToolIDs.includes(part.functionResponse.name)) {
-    metadata["adk_is_long_running" /* LONG_RUNNING */] = true;
+  if (part.functionResponse && part.functionResponse.id && longRunningToolIDs.includes(part.functionResponse.id)) {
+    metadata[import_metadata_converter_utils.A2AMetadataKeys.IS_LONG_RUNNING] = true;
   }
   return {
     kind: "data",
@@ -131,6 +128,10 @@ function toA2ADataPart(part, longRunningToolIDs = []) {
     metadata
   };
 }
+function toGenAIContent(a2aMessage) {
+  const parts = toGenAIParts(a2aMessage.parts);
+  return a2aMessage.role === "user" ? (0, import_genai.createUserContent)(parts) : (0, import_genai.createModelContent)(parts);
+}
 function toGenAIParts(a2aParts) {
   return a2aParts.map((a2aPart) => toGenAIPart(a2aPart));
 }
@@ -150,7 +151,7 @@ function toGenAIPartText(a2aPart) {
   var _a;
   return {
     text: a2aPart.text,
-    thought: !!((_a = a2aPart.metadata) == null ? void 0 : _a["adk_thought" /* THOUGHT */])
+    thought: !!((_a = a2aPart.metadata) == null ? void 0 : _a[import_metadata_converter_utils.A2AMetadataKeys.THOUGHT])
   };
 }
 function toGenAIPartFile(a2aPart) {
@@ -178,7 +179,7 @@ function toGenAIPartData(a2aPart) {
     throw new Error(`No data in part: ${JSON.stringify(a2aPart)}`);
   }
   const data = a2aPart.data;
-  const type = (_a = a2aPart.metadata) == null ? void 0 : _a["adk_type" /* TYPE */];
+  const type = (_a = a2aPart.metadata) == null ? void 0 : _a[import_metadata_converter_utils.A2AMetadataKeys.DATA_PART_TYPE];
   if (type === "function_call" /* FUNCTION_CALL */) {
     return { functionCall: data };
   }
@@ -202,6 +203,7 @@ function toGenAIPartData(a2aPart) {
   toA2APart,
   toA2AParts,
   toA2ATextPart,
+  toGenAIContent,
   toGenAIPart,
   toGenAIPartData,
   toGenAIPartFile,

package/dist/cjs/agents/base_agent.js

@@ -32,7 +32,7 @@ module.exports = __toCommonJS(base_agent_exports);
 var import_api = require("@opentelemetry/api");
 var import_event = require("../events/event.js");
 var import_tracing = require("../telemetry/tracing.js");
-var import_callback_context = require("./callback_context.js");
+var import_context = require("./context.js");
 var import_invocation_context = require("./invocation_context.js");
 /**
  * @license
@@ -180,7 +180,7 @@ class BaseAgent {
     if (this.beforeAgentCallback.length === 0) {
       return void 0;
     }
-    const callbackContext = new import_callback_context.CallbackContext({ invocationContext });
+    const callbackContext = new import_context.Context({ invocationContext });
     for (const callback of this.beforeAgentCallback) {
       const content = await callback(callbackContext);
       if (content) {
@@ -215,7 +215,7 @@ class BaseAgent {
     if (this.afterAgentCallback.length === 0) {
       return void 0;
     }
-    const callbackContext = new import_callback_context.CallbackContext({ invocationContext });
+    const callbackContext = new import_context.Context({ invocationContext });
     for (const callback of this.afterAgentCallback) {
       const content = await callback(callbackContext);
       if (content) {

package/dist/cjs/{tools/tool_context.js → agents/context.js}

@@ -22,39 +22,94 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var tool_context_exports = {};
-__export(tool_context_exports, {
-  ToolContext: () => ToolContext
+var context_exports = {};
+__export(context_exports, {
+  Context: () => Context
 });
-module.exports = __toCommonJS(tool_context_exports);
-var import_callback_context = require("../agents/callback_context.js");
+module.exports = __toCommonJS(context_exports);
 var import_auth_handler = require("../auth/auth_handler.js");
+var import_event_actions = require("../events/event_actions.js");
+var import_state = require("../sessions/state.js");
 var import_tool_confirmation = require("../tools/tool_confirmation.js");
+var import_readonly_context = require("./readonly_context.js");
 /**
  * @license
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-class ToolContext extends import_callback_context.CallbackContext {
+class Context extends import_readonly_context.ReadonlyContext {
   /**
-   * @param params.invocationContext The invocation context of the tool.
-   * @param params.eventActions The event actions of the current tool call.
-   * @param params.functionCallId The function call id of the current tool call.
+   * @param options The configuration options for the Context.
+   * @param options.invocationContext The invocation context.
+   * @param options.eventActions The event actions of the current call.
+   * @param options.functionCallId The function call id of the current tool call.
    *     This id was returned in the function call event from LLM to identify a
    *     function call. If LLM didn't return this id, ADK will assign one to it.
    *     This id is used to map function call response to the original function
    *     call.
-   * @param params.toolConfirmation The tool confirmation of the current tool
+   * @param options.toolConfirmation The tool confirmation of the current tool
    *     call.
    */
-  constructor(params) {
-    super(params);
-    this.functionCallId = params.functionCallId;
-    this.toolConfirmation = params.toolConfirmation;
+  constructor(options) {
+    super(options.invocationContext);
+    this.eventActions = options.eventActions || (0, import_event_actions.createEventActions)();
+    this._state = new import_state.State(
+      options.invocationContext.session.state,
+      this.eventActions.stateDelta
+    );
+    this.functionCallId = options.functionCallId;
+    this.toolConfirmation = options.toolConfirmation;
+  }
+  /**
+   * The delta-aware state of the current session.
+   */
+  get state() {
+    return this._state;
   }
   get actions() {
     return this.eventActions;
   }
+  /**
+   * Loads an artifact attached to the current session.
+   *
+   * @param filename The filename of the artifact.
+   * @param version The version of the artifact. If not provided, the latest
+   *     version will be used.
+   * @return A promise that resolves to the loaded artifact.
+   */
+  loadArtifact(filename, version) {
+    if (!this.invocationContext.artifactService) {
+      throw new Error("Artifact service is not initialized.");
+    }
+    return this.invocationContext.artifactService.loadArtifact({
+      appName: this.invocationContext.appName,
+      userId: this.invocationContext.userId,
+      sessionId: this.invocationContext.session.id,
+      filename,
+      version
+    });
+  }
+  /**
+   * Saves an artifact attached to the current session.
+   *
+   * @param filename The filename of the artifact.
+   * @param artifact The artifact to save.
+   * @return A promise that resolves to the version of the saved artifact.
+   */
+  async saveArtifact(filename, artifact) {
+    if (!this.invocationContext.artifactService) {
+      throw new Error("Artifact service is not initialized.");
+    }
+    const version = await this.invocationContext.artifactService.saveArtifact({
+      appName: this.invocationContext.appName,
+      userId: this.invocationContext.userId,
+      sessionId: this.invocationContext.session.id,
+      filename,
+      artifact
+    });
+    this.eventActions.artifactDelta[filename] = version;
+    return version;
+  }
   requestCredential(authConfig) {
     if (!this.functionCallId) {
       throw new Error("functionCallId is not set.");
@@ -120,5 +175,5 @@ class ToolContext extends import_callback_context.CallbackContext {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ToolContext
+  Context
 });

package/dist/cjs/agents/functions.js

@@ -42,9 +42,9 @@ var import_genai = require("@google/genai");
 var import_lodash_es = require("lodash-es");
 var import_event = require("../events/event.js");
 var import_event_actions = require("../events/event_actions.js");
-var import_tool_context = require("../tools/tool_context.js");
 var import_env_aware_utils = require("../utils/env_aware_utils.js");
 var import_logger = require("../utils/logger.js");
+var import_context = require("./context.js");
 var import_tracing = require("../telemetry/tracing.js");
 /**
  * @license
@@ -388,7 +388,7 @@ function getToolAndContext({
       `Function ${functionCall.name} is not found in the toolsDict.`
     );
   }
-  const toolContext = new import_tool_context.ToolContext({
+  const toolContext = new import_context.Context({
     invocationContext,
     functionCallId: functionCall.id || void 0,
     toolConfirmation