@iqai/adk 0.8.0 → 0.8.5

package/dist/index.js

@@ -1604,12 +1604,21 @@ var InvocationContext = class _InvocationContext {
    * The current session of this invocation context. Readonly.
    */
   session;
+  /**
+   * Shared flags container so that child/parent contexts stay in sync.
+   */
+  _invocationFlags;
   /**
    * Whether to end this invocation.
    *
    * Set to True in callbacks or tools to terminate this invocation.
    */
-  endInvocation = false;
+  get endInvocation() {
+    return this._invocationFlags.endInvocation;
+  }
+  set endInvocation(value) {
+    this._invocationFlags.endInvocation = value;
+  }
   /**
    * The queue to receive live requests.
    */
@@ -1650,7 +1659,9 @@ var InvocationContext = class _InvocationContext {
     this.agent = options.agent;
     this.userContent = options.userContent;
     this.session = options.session;
-    this.endInvocation = options.endInvocation || false;
+    this._invocationFlags = options.invocationFlags ?? {
+      endInvocation: options.endInvocation || false
+    };
     this.liveRequestQueue = options.liveRequestQueue;
     this.activeStreamingTools = options.activeStreamingTools;
     this.transcriptionCache = options.transcriptionCache;
@@ -1709,6 +1720,12 @@ var InvocationContext = class _InvocationContext {
   getSpanCounters() {
     return this._spanCounters;
   }
+  /**
+   * Exposes shared invocation flags for child contexts.
+   */
+  getInvocationFlags() {
+    return this._invocationFlags;
+  }
   /**
    * Creates a child invocation context for a sub-agent
    */
@@ -1727,7 +1744,7 @@ var InvocationContext = class _InvocationContext {
       // Update to the new agent
       userContent: this.userContent,
       session: this.session,
-      endInvocation: this.endInvocation,
+      invocationFlags: this._invocationFlags,
       liveRequestQueue: this.liveRequestQueue,
       activeStreamingTools: this.activeStreamingTools,
       transcriptionCache: this.transcriptionCache,
@@ -3943,15 +3960,10 @@ var VectorStorageProvider = class {
         this.memoryCache.delete(id);
       }
     } else {
-      const idsToDelete = [];
+      const vectorFilter = this.buildDeleteFilter(filter);
+      deleted = await this.vectorStore.delete({ filter: vectorFilter });
       for (const [id, record] of this.memoryCache.entries()) {
         if (this.matchesFilter(record, filter)) {
-          idsToDelete.push(id);
-        }
-      }
-      if (idsToDelete.length > 0) {
-        deleted = await this.vectorStore.delete({ ids: idsToDelete });
-        for (const id of idsToDelete) {
           this.memoryCache.delete(id);
         }
       }
@@ -3962,6 +3974,10 @@ var VectorStorageProvider = class {
    * Count memories matching filter.
    */
   async count(filter) {
+    if (this.vectorStore.count) {
+      const vectorFilter = this.buildDeleteFilter(filter);
+      return this.vectorStore.count(vectorFilter);
+    }
     let count = 0;
     for (const record of this.memoryCache.values()) {
       if (this.matchesFilter(record, filter)) {
@@ -4093,15 +4109,34 @@ var VectorStorageProvider = class {
     }
     return filter;
   }
+  /**
+   * Build filter object for vector store delete/count operations.
+   */
+  buildDeleteFilter(filter) {
+    const vectorFilter = {};
+    if (filter.userId !== void 0) vectorFilter.userId = filter.userId;
+    if (filter.appName !== void 0) vectorFilter.appName = filter.appName;
+    if (filter.sessionId !== void 0)
+      vectorFilter.sessionId = filter.sessionId;
+    if (filter.before !== void 0) vectorFilter.before = filter.before;
+    if (filter.after !== void 0) vectorFilter.after = filter.after;
+    if (this.namespace) vectorFilter.namespace = this.namespace;
+    return vectorFilter;
+  }
   /**
    * Check if a record matches the given filter.
    */
   matchesFilter(record, filter) {
-    if (filter.userId && record.userId !== filter.userId) return false;
-    if (filter.appName && record.appName !== filter.appName) return false;
-    if (filter.sessionId && record.sessionId !== filter.sessionId) return false;
-    if (filter.before && record.timestamp > filter.before) return false;
-    if (filter.after && record.timestamp < filter.after) return false;
+    if (filter.userId !== void 0 && record.userId !== filter.userId)
+      return false;
+    if (filter.appName !== void 0 && record.appName !== filter.appName)
+      return false;
+    if (filter.sessionId !== void 0 && record.sessionId !== filter.sessionId)
+      return false;
+    if (filter.before !== void 0 && record.timestamp > filter.before)
+      return false;
+    if (filter.after !== void 0 && record.timestamp < filter.after)
+      return false;
     return true;
   }
   /**
@@ -4308,11 +4343,12 @@ var LlmSummaryProvider = class {
     }
     const baseUrl = this.baseUrl ?? "https://generativelanguage.googleapis.com/v1beta";
     const response = await fetch(
-      `${baseUrl}/models/${this.model}:generateContent?key=${apiKey}`,
+      `${baseUrl}/models/${this.model}:generateContent`,
       {
         method: "POST",
         headers: {
-          "Content-Type": "application/json"
+          "Content-Type": "application/json",
+          "x-goog-api-key": apiKey
         },
         body: JSON.stringify({
           contents: [{ parts: [{ text: prompt }] }],
@@ -4689,7 +4725,7 @@ var OPERATIONS = {
   EXECUTE_TOOL: "execute_tool",
   // ============================================
   // ADK-specific operations (framework extensions)
-  // These are non-standard but useful for the ADK framework
+  // These are non-standard but useful for the ADK-TS framework
   // ============================================
   TRANSFER_AGENT: "transfer_agent",
   // Multi-agent transfer
@@ -5784,7 +5820,7 @@ var TracingService = class {
       [ADK_ATTRS.INVOCATION_ID]: invocationContext.invocationId,
       [ADK_ATTRS.EVENT_ID]: eventId,
       [ADK_ATTRS.ENVIRONMENT]: getEnvironment() || "",
-      // Content attributes (only if capture is enabled) - ADK namespace for backward compat
+      // Content attributes (only if capture is enabled) - ADK-TS namespace for backward compat
       [ADK_ATTRS.LLM_REQUEST]: captureContent ? safeJsonStringify(llmRequestData) : "{}",
       [ADK_ATTRS.LLM_RESPONSE]: captureContent ? safeJsonStringify(llmResponseData) : "{}"
     });
@@ -6483,7 +6519,7 @@ var BaseLlm = class {
         true
         // retry may be recommended for transient model errors
       );
-      this.logger.error("\u274C ADK LLM Error:", {
+      this.logger.error("\u274C ADK-TS LLM Error:", {
         model: this.model,
         error: error.message
       });
@@ -7251,7 +7287,7 @@ var AiSdkLlm = class _AiSdkLlm extends BaseLlm {
     });
   }
   /**
-   * Convert ADK LlmRequest to AI SDK CoreMessage format
+   * Convert ADK-TS LlmRequest to AI SDK CoreMessage format
    */
   convertToAiSdkMessages(llmRequest) {
     const messages = [];
@@ -7301,7 +7337,7 @@ var AiSdkLlm = class _AiSdkLlm extends BaseLlm {
     return transformedSchema;
   }
   /**
-   * Convert ADK tools to AI SDK tools format
+   * Convert ADK-TS tools to AI SDK tools format
    */
   convertToAiSdkTools(llmRequest) {
     const tools = {};
@@ -7322,7 +7358,7 @@ var AiSdkLlm = class _AiSdkLlm extends BaseLlm {
     return tools;
   }
   /**
-   * Convert ADK Content to AI SDK CoreMessage
+   * Convert ADK-TS Content to AI SDK CoreMessage
    */
   contentToAiSdkMessage(content) {
     const role = this.mapRole(content.role);
@@ -7424,7 +7460,7 @@ var AiSdkLlm = class _AiSdkLlm extends BaseLlm {
     return { role: "user", content: contentParts };
   }
   /**
-   * Map ADK role to AI SDK role
+   * Map ADK-TS role to AI SDK role
    */
   mapRole(role) {
     switch (role) {
@@ -7438,7 +7474,7 @@ var AiSdkLlm = class _AiSdkLlm extends BaseLlm {
     }
   }
   /**
-   * Map AI SDK finish reason to ADK finish reason
+   * Map AI SDK finish reason to ADK-TS finish reason
    */
   mapFinishReason(finishReason) {
     switch (finishReason) {
@@ -7457,6 +7493,21 @@ var AiSdkLlm = class _AiSdkLlm extends BaseLlm {
 // src/models/anthropic-llm.ts
 init_logger();
 var import_sdk = __toESM(require("@anthropic-ai/sdk"));
+
+// src/models/llm-utils.ts
+function safeParseToolArgs(json, logger2) {
+  try {
+    return JSON.parse(json || "{}");
+  } catch (error) {
+    logger2.warn("Failed to parse tool call arguments, using empty args", {
+      rawArgs: json,
+      error: String(error)
+    });
+    return {};
+  }
+}
+
+// src/models/anthropic-llm.ts
 var DEFAULT_MAX_OUTPUT_TOKENS = 1024;
 var THOUGHT_OPEN_TAGS = [
   "<thinking>",
@@ -7662,7 +7713,7 @@ var AnthropicLlm = class extends BaseLlm {
                 functionCall: {
                   id: block.id,
                   name: block.name,
-                  args: JSON.parse(block.inputJson || "{}")
+                  args: safeParseToolArgs(block.inputJson, this.logger)
                 }
               });
             }
@@ -7714,7 +7765,7 @@ var AnthropicLlm = class extends BaseLlm {
     throw new Error(`Live connection is not supported for ${this.model}.`);
   }
   /**
-   * Convert Anthropic Message to ADK LlmResponse
+   * Convert Anthropic Message to ADK-TS LlmResponse
    */
   anthropicMessageToLlmResponse(message) {
     this.logger.debug(
@@ -7742,7 +7793,7 @@ var AnthropicLlm = class extends BaseLlm {
     });
   }
   /**
-   * Convert ADK Content to Anthropic MessageParam
+   * Convert ADK-TS Content to Anthropic MessageParam
    */
   contentToAnthropicMessage(content) {
     return {
@@ -7753,39 +7804,39 @@ var AnthropicLlm = class extends BaseLlm {
     };
   }
   /**
-   * Convert ADK Part to Anthropic content block
+   * Convert ADK-TS Part to Anthropic content block
    */
   partToAnthropicBlock(part) {
     if (part.text) return { type: "text", text: part.text };
-    if (part.function_call)
+    if (part.functionCall)
       return {
         type: "tool_use",
-        id: part.function_call.id || "",
-        name: part.function_call.name,
-        input: part.function_call.args || {}
+        id: part.functionCall.id || "",
+        name: part.functionCall.name,
+        input: part.functionCall.args || {}
       };
-    if (part.function_response)
+    if (part.functionResponse)
       return {
         type: "tool_result",
-        tool_use_id: part.function_response.id || "",
-        content: String(part.function_response.response?.result || ""),
+        tool_use_id: part.functionResponse.id || "",
+        content: String(part.functionResponse.response?.result || ""),
         is_error: false
       };
     throw new Error("Unsupported part type for Anthropic conversion");
   }
   /**
-   * Convert Anthropic content block to ADK Part
+   * Convert Anthropic content block to ADK-TS Part
    */
   anthropicBlockToPart(block) {
     if (block.type === "text") return { text: block.text };
     if (block.type === "tool_use")
       return {
-        function_call: { id: block.id, name: block.name, args: block.input }
+        functionCall: { id: block.id, name: block.name, args: block.input }
       };
     throw new Error("Unsupported Anthropic content block type");
   }
   /**
-   * Convert ADK function declaration to Anthropic tool param
+   * Convert ADK-TS function declaration to Anthropic tool param
    */
   functionDeclarationToAnthropicTool(functionDeclaration) {
     const properties = {};
@@ -7805,14 +7856,14 @@ var AnthropicLlm = class extends BaseLlm {
     };
   }
   /**
-   * Convert ADK role to Anthropic role format
+   * Convert ADK-TS role to Anthropic role format
    */
   toAnthropicRole(role) {
     if (role === "model" || role === "assistant") return "assistant";
     return "user";
   }
   /**
-   * Convert Anthropic stop reason to ADK finish reason
+   * Convert Anthropic stop reason to ADK-TS finish reason
    */
   toAdkFinishReason(anthropicStopReason) {
     if (["end_turn", "stop_sequence", "tool_use"].includes(
@@ -8407,7 +8458,10 @@ var OpenAiLlm = class extends BaseLlm {
                     functionCall: {
                       id: toolCall.id,
                       name: toolCall.function.name,
-                      args: JSON.parse(toolCall.function.arguments || "{}")
+                      args: safeParseToolArgs(
+                        toolCall.function.arguments,
+                        this.logger
+                      )
                     }
                   });
                 }
@@ -8500,7 +8554,7 @@ var OpenAiLlm = class extends BaseLlm {
             functionCall: {
               id: toolCall.id || "",
               name: toolCall.function.name,
-              args: JSON.parse(toolCall.function.arguments || "{}")
+              args: safeParseToolArgs(toolCall.function.arguments, this.logger)
             }
           });
         }
@@ -8519,7 +8573,7 @@ var OpenAiLlm = class extends BaseLlm {
     });
   }
   /**
-   * Convert OpenAI message to ADK LlmResponse
+   * Convert OpenAI message to ADK-TS LlmResponse
    */
   openAiMessageToLlmResponse(choice, usage) {
     const message = choice.message;
@@ -8534,7 +8588,7 @@ var OpenAiLlm = class extends BaseLlm {
             functionCall: {
               id: toolCall.id,
               name: toolCall.function.name,
-              args: JSON.parse(toolCall.function.arguments || "{}")
+              args: safeParseToolArgs(toolCall.function.arguments, this.logger)
             }
           });
         }
@@ -8554,7 +8608,7 @@ var OpenAiLlm = class extends BaseLlm {
     });
   }
   /**
-   * Convert ADK Content to OpenAI ChatCompletionMessage
+   * Convert ADK-TS Content to OpenAI ChatCompletionMessage
    */
   contentToOpenAiMessage(content) {
     const role = this.toOpenAiRole(content.role);
@@ -8610,7 +8664,7 @@ var OpenAiLlm = class extends BaseLlm {
     };
   }
   /**
-   * Convert ADK Part to OpenAI message content
+   * Convert ADK-TS Part to OpenAI message content
    */
   partToOpenAiContent(part) {
     if (part.text) {
@@ -8667,7 +8721,7 @@ var OpenAiLlm = class extends BaseLlm {
     return transformedSchema;
   }
   /**
-   * Convert ADK function declaration to OpenAI tool
+   * Convert ADK-TS function declaration to OpenAI tool
    */
   functionDeclarationToOpenAiTool(functionDeclaration) {
     return {
@@ -8682,7 +8736,7 @@ var OpenAiLlm = class extends BaseLlm {
     };
   }
   /**
-   * Convert ADK role to OpenAI role format
+   * Convert ADK-TS role to OpenAI role format
    */
   toOpenAiRole(role) {
     if (role === "model") {
@@ -8694,7 +8748,7 @@ var OpenAiLlm = class extends BaseLlm {
     return "user";
   }
   /**
-   * Convert OpenAI finish reason to ADK finish reason
+   * Convert OpenAI finish reason to ADK-TS finish reason
    */
   toAdkFinishReason(openaiFinishReason) {
     switch (openaiFinishReason) {
@@ -9026,7 +9080,7 @@ var ReadonlyContext = class {
 // src/agents/callback-context.ts
 var CallbackContext = class extends ReadonlyContext {
   /**
-   * TODO: make this public for Agent Development Kit, but private for users.
+   * TODO: make this public for ADK-TS, but private for users.
    */
   _eventActions;
   _state;
@@ -9102,7 +9156,7 @@ var ToolContext = class extends CallbackContext {
   /**
    * 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
+   * If LLM didn't return this id, ADK-TS will assign one to it. This id is used
    * to map function call response to the original function call.
    */
   functionCallId;
@@ -9578,7 +9632,7 @@ function mergeParallelFunctionResponseEvents(functionResponseEvents) {
   }
   mergedActions.requestedAuthConfigs = mergedRequestedAuthConfigs;
   const mergedEvent = new Event({
-    invocationId: Event.newId(),
+    invocationId: baseEvent.invocationId,
     author: baseEvent.author,
     branch: baseEvent.branch,
     content: { role: "user", parts: mergedParts },
@@ -9630,7 +9684,7 @@ var EnhancedAuthConfig = class {
   rawAuthCredential;
   /**
    * Exchanged auth credential after processing
-   * Filled by ADK and client working together
+   * Filled by ADK-TS and client working together
    */
   exchangedAuthCredential;
   /**
@@ -10501,7 +10555,7 @@ var FileOperationsTool = class extends BaseTool {
   async runAsync(args, _context) {
     try {
       const resolvedPath = this.resolvePath(args.filepath);
-      this.validatePath(resolvedPath);
+      await this.validatePath(resolvedPath);
       const encoding = args.encoding || "utf8";
       switch (args.operation) {
         case "read":
@@ -10543,15 +10597,38 @@ var FileOperationsTool = class extends BaseTool {
     return import_node_path3.default.isAbsolute(filepath) ? filepath : import_node_path3.default.resolve(this.basePath, filepath);
   }
   /**
-   * Validate that a path is within the base path for security
+   * Validate that a path is within the base path for security.
+   * Resolves symlinks to prevent symlink escape attacks.
    */
-  validatePath(filepath) {
-    const normalizedPath = import_node_path3.default.normalize(filepath);
-    const normalizedBasePath = import_node_path3.default.normalize(this.basePath);
-    if (!normalizedPath.startsWith(normalizedBasePath)) {
-      throw new Error(
-        `Access denied: Can't access paths outside the base directory`
-      );
+  async validatePath(filepath) {
+    const realBasePath = await import_promises.default.realpath(this.basePath);
+    const isWithinBase = (p, base) => p === base || p.startsWith(base + import_node_path3.default.sep);
+    try {
+      const realPath = await import_promises.default.realpath(filepath);
+      if (!isWithinBase(realPath, realBasePath)) {
+        throw new Error(
+          "Access denied: Can't access paths outside the base directory"
+        );
+      }
+    } catch (error) {
+      if (error instanceof Error && "code" in error && error.code === "ENOENT") {
+        const parentDir = import_node_path3.default.dirname(filepath);
+        let realParent;
+        try {
+          realParent = await import_promises.default.realpath(parentDir);
+        } catch {
+          throw new Error(
+            "Access denied: Can't access paths outside the base directory"
+          );
+        }
+        if (!isWithinBase(realParent, realBasePath)) {
+          throw new Error(
+            "Access denied: Can't access paths outside the base directory"
+          );
+        }
+      } else {
+        throw error;
+      }
     }
   }
   /**
@@ -10649,7 +10726,7 @@ var FileOperationsTool = class extends BaseTool {
       const results = await Promise.all(
         entries.map(async (entry) => {
           const entryPath = import_node_path3.default.join(dirpath, entry.name);
-          const stats = await import_promises.default.stat(entryPath);
+          const stats = await import_promises.default.lstat(entryPath);
           return {
             name: entry.name,
             path: entryPath,
@@ -10891,6 +10968,62 @@ var googleSearchArgsSchema = import_zod.z.object({
 // src/tools/common/http-request-tool.ts
 var import_genai8 = require("@google/genai");
 init_base_tool();
+
+// src/tools/utils/url-validation.ts
+function validateUrlForFetch(urlString) {
+  const url = new URL(urlString);
+  if (url.protocol !== "http:" && url.protocol !== "https:") {
+    throw new Error(
+      `Blocked URL: only http and https protocols are allowed, got ${url.protocol}`
+    );
+  }
+  const hostname = url.hostname.toLowerCase();
+  if (hostname === "localhost" || hostname === "[::1]") {
+    throw new Error("Blocked URL: localhost is not allowed");
+  }
+  const ipv4 = extractIPv4(hostname);
+  if (ipv4 !== null && isPrivateIP(ipv4)) {
+    throw new Error(
+      "Blocked URL: private/internal IP addresses are not allowed"
+    );
+  }
+  if (isPrivateIP(hostname)) {
+    throw new Error(
+      "Blocked URL: private/internal IP addresses are not allowed"
+    );
+  }
+  return url;
+}
+function extractIPv4(hostname) {
+  const bare = hostname.replace(/^\[|\]$/g, "");
+  const dottedMatch = bare.match(
+    /^::ffff:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/i
+  );
+  if (dottedMatch) return dottedMatch[1];
+  const hexMatch = bare.match(/^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/i);
+  if (hexMatch) {
+    const high = Number.parseInt(hexMatch[1], 16);
+    const low = Number.parseInt(hexMatch[2], 16);
+    return `${high >> 8 & 255}.${high & 255}.${low >> 8 & 255}.${low & 255}`;
+  }
+  return null;
+}
+function isPrivateIP(hostname) {
+  const match = hostname.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/);
+  if (!match) return false;
+  const [, a, b] = match;
+  const first = Number(a);
+  const second = Number(b);
+  if (first === 0) return true;
+  if (first === 127) return true;
+  if (first === 10) return true;
+  if (first === 172 && second >= 16 && second <= 31) return true;
+  if (first === 192 && second === 168) return true;
+  if (first === 169 && second === 254) return true;
+  return false;
+}
+
+// src/tools/common/http-request-tool.ts
 var HttpRequestTool = class extends BaseTool {
   constructor() {
     super({
@@ -10953,7 +11086,7 @@ var HttpRequestTool = class extends BaseTool {
         params,
         timeout = 1e4
       } = args;
-      const urlObj = new URL(url);
+      const urlObj = validateUrlForFetch(url);
       if (params) {
         Object.entries(params).forEach(([key, value]) => {
           urlObj.searchParams.append(key, value);
@@ -10967,7 +11100,8 @@ var HttpRequestTool = class extends BaseTool {
         method,
         headers: requestHeaders,
         body,
-        signal: AbortSignal.timeout(timeout)
+        signal: AbortSignal.timeout(timeout),
+        redirect: "manual"
       };
       const response = await fetch(urlObj.toString(), options);
       const responseHeaders = {};
@@ -11775,16 +11909,16 @@ var BashTool = class _BashTool extends BaseTool {
     // filesystem formatting
     /dd\s+if=/,
     // disk operations
-    /wget.*\|\s*sh/,
+    /wget.*\|\s*(sh|bash)/,
     // download and execute
-    /curl.*\|\s*bash/,
+    /curl.*\|\s*(bash|sh)/,
     // download and execute
     /eval\s+['"`]/,
     // eval with strings
-    /base64.*\|\s*sh/,
+    /base64.*\|\s*(sh|bash)/,
     // decode and execute
-    /nc\s+-.*e/,
-    // netcat reverse shell
+    /(nc|ncat|netcat)\s+-.*e/,
+    // netcat reverse shell (nc, ncat, netcat)
     /\/proc\/.*\/mem/,
     // memory access
     /iptables/,
@@ -11795,8 +11929,18 @@ var BashTool = class _BashTool extends BaseTool {
     // ownership changes
     /sudo/,
     // privilege escalation
-    /su\s+/
+    /su\s+/,
     // user switching
+    /python[23]?(\.\d+)?\s+-c\s/,
+    // python interpreter execution (python, python3, python3.11, etc.)
+    /node\s+(-e|--eval)[\s=]/,
+    // node interpreter execution (-e and --eval)
+    /perl\s+-e\s/,
+    // perl interpreter execution
+    /ruby\s+-e\s/,
+    // ruby interpreter execution
+    /php\s+-r\s/
+    // php interpreter execution
   ];
   // Special characters that enable command chaining/injection
   static DANGEROUS_CHARS = /[;&|`$()<>]/;
@@ -12574,11 +12718,16 @@ var WebFetchTool = class extends BaseTool {
   }
   async runAsync(args, _context) {
     try {
+      validateUrlForFetch(args.url);
       const response = await import_axios2.default.get(args.url, {
         timeout: 3e4,
         maxRedirects: 5,
         headers: {
           "User-Agent": "Mozilla/5.0 (compatible; ADK/1.0; +http://example.com)"
+        },
+        beforeRedirect: (options) => {
+          const redirectUrl = typeof options.href === "string" ? options.href : `${options.protocol}//${options.hostname}${options.path}`;
+          validateUrlForFetch(redirectUrl);
         }
       });
       const contentType = response.headers["content-type"] || "";
@@ -12831,7 +12980,7 @@ var tavilySearchResultSchema = import_zod2.z.object({
 var tavilySearchResponseSchema = import_zod2.z.object({
   query: import_zod2.z.string(),
   results: import_zod2.z.array(tavilySearchResultSchema),
-  answer: import_zod2.z.string().optional(),
+  answer: import_zod2.z.string().nullable().optional(),
   images: import_zod2.z.array(import_zod2.z.object({ url: import_zod2.z.string(), description: import_zod2.z.string().optional() })).optional(),
   auto_parameters: import_zod2.z.record(import_zod2.z.any(), import_zod2.z.string()).optional(),
   response_time: import_zod2.z.number(),
@@ -12988,7 +13137,7 @@ var McpSamplingHandler = class {
           "INVALID_REQUEST_ERROR" /* INVALID_REQUEST_ERROR */
         );
       }
-      this.logger.debug("Converting MCP request to ADK format");
+      this.logger.debug("Converting MCP request to ADK-TS format");
       const adkContents = this.convertMcpMessagesToADK(
         mcpParams.messages,
         mcpParams.systemPrompt
@@ -13002,9 +13151,9 @@ var McpSamplingHandler = class {
           maxOutputTokens: mcpParams.maxTokens
         }
       });
-      this.logger.debug("Calling ADK sampling handler");
+      this.logger.debug("Calling ADK-TS sampling handler");
       const adkResponse = await this.samplingHandler(adkRequest);
-      this.logger.debug("Converting ADK response to MCP format");
+      this.logger.debug("Converting ADK-TS response to MCP format");
       const mcpResponse = this.convertADKResponseToMcp(
         adkResponse,
         requestModel
@@ -13034,7 +13183,7 @@ var McpSamplingHandler = class {
     }
   }
   /**
-   * Convert MCP messages to ADK Content format
+   * Convert MCP messages to ADK-TS Content format
    */
   convertMcpMessagesToADK(mcpMessages, systemPrompt) {
     const contents = [];
@@ -13052,7 +13201,7 @@ var McpSamplingHandler = class {
     return contents;
   }
   /**
-   * Convert a single MCP message to ADK Content format
+   * Convert a single MCP message to ADK-TS Content format
    */
   convertSingleMcpMessageToADK(mcpMessage) {
     const adkRole = mcpMessage.role === "assistant" ? "model" : "user";
@@ -13067,7 +13216,7 @@ var McpSamplingHandler = class {
     return adkContent;
   }
   /**
-   * Convert MCP message content to ADK parts format
+   * Convert MCP message content to ADK-TS parts format
    */
   convertMcpContentToADKParts(mcpContent) {
     const safeText = (value) => typeof value === "string" ? value : "";
@@ -13120,7 +13269,7 @@ var McpSamplingHandler = class {
     }
   }
   /**
-   * Convert ADK response to MCP response format
+   * Convert ADK-TS response to MCP response format
    */
   convertADKResponseToMcp(adkResponse, model) {
     let responseText = "";
@@ -13141,7 +13290,7 @@ var McpSamplingHandler = class {
       model,
       // Use the model from the request
       role: "assistant",
-      // ADK responses are always from assistant
+      // ADK-TS responses are always from assistant
       content: {
         type: "text",
         text: responseText
@@ -13151,11 +13300,11 @@ var McpSamplingHandler = class {
     return mcpResponse;
   }
   /**
-   * Update the ADK handler
+   * Update the ADK-TS handler
    */
   updateHandler(handler) {
     this.samplingHandler = handler;
-    this.logger.debug("ADK sampling handler updated");
+    this.logger.debug("ADK-TS sampling handler updated");
   }
 };
 function createSamplingHandler(handler) {
@@ -13428,13 +13577,13 @@ var McpClientService = class {
     }
   }
   /**
-   * Set a new ADK sampling handler
+   * Set a new ADK-TS sampling handler
    */
   setSamplingHandler(handler) {
     this.mcpSamplingHandler = new McpSamplingHandler(handler);
     if (this.client) {
       this.setupSamplingHandler(this.client).catch((error) => {
-        this.logger.error("Failed to update ADK sampling handler:", error);
+        this.logger.error("Failed to update ADK-TS sampling handler:", error);
       });
     }
   }
@@ -14017,6 +14166,9 @@ var McpToolset = class {
     }
     return true;
   }
+  isCacheEnabled() {
+    return this.config.cacheConfig?.enabled !== false;
+  }
   /**
    * Initializes the client service and establishes a connection.
    */
@@ -14035,9 +14187,9 @@ var McpToolset = class {
   }
   /**
    * Set a sampling handler for this MCP toolset.
-   * This allows MCP servers to request LLM completions through your ADK agent.
+   * This allows MCP servers to request LLM completions through your ADK-TS agent.
    *
-   * @param handler - ADK sampling handler that receives ADK-formatted messages
+   * @param handler - ADK-TS sampling handler that receives ADK-TS-formatted messages
    */
   setSamplingHandler(handler) {
     if (!this.clientService) {
@@ -14071,7 +14223,7 @@ var McpToolset = class {
           "resource_closed_error" /* RESOURCE_CLOSED_ERROR */
         );
       }
-      if (this.tools.length > 0 && !this.config.cacheConfig?.enabled === false) {
+      if (this.tools.length > 0 && this.isCacheEnabled()) {
         return this.tools;
       }
       if (!this.clientService) {
@@ -14100,7 +14252,7 @@ var McpToolset = class {
           }
         }
       }
-      if (this.config.cacheConfig?.enabled !== false) {
+      if (this.isCacheEnabled()) {
         this.tools = tools;
       }
       return tools;
@@ -14117,7 +14269,7 @@ var McpToolset = class {
     }
   }
   /**
-   * Converts ADK tools to MCP tool format for bidirectional support
+   * Converts ADK-TS tools to MCP tool format for bidirectional support
    */
   convertADKToolsToMCP(tools) {
     return tools.map((tool) => adkToMcpToolType(tool));
@@ -14810,10 +14962,7 @@ var CodeExecutionUtils = class _CodeExecutionUtils {
    * Gets the file content as a base64-encoded string
    */
   static getEncodedFileContent(data) {
-    let decodedData;
-    if (data instanceof ArrayBuffer) {
-      decodedData = new TextDecoder().decode(data);
-    }
+    const decodedData = data instanceof ArrayBuffer ? new TextDecoder().decode(data) : data;
     if (_CodeExecutionUtils.isBase64Encoded(decodedData)) {
       return decodedData;
     }
@@ -16776,7 +16925,7 @@ var BaseAgent = class {
   }
   /**
    * The resolved beforeAgentCallback field as a list of SingleAgentCallback.
-   * This method is only for use by Agent Development Kit.
+   * This method is only for use by ADK-TS.
    */
   get canonicalBeforeAgentCallbacks() {
     if (!this.beforeAgentCallback) {
@@ -16789,7 +16938,7 @@ var BaseAgent = class {
   }
   /**
    * The resolved afterAgentCallback field as a list of SingleAgentCallback.
-   * This method is only for use by Agent Development Kit.
+   * This method is only for use by ADK-TS.
    */
   get canonicalAfterAgentCallbacks() {
     if (!this.afterAgentCallback) {
@@ -17091,7 +17240,7 @@ var LlmAgent = class _LlmAgent extends BaseAgent {
   }
   /**
    * The resolved model field as BaseLLM
-   * This method is only for use by Agent Development Kit
+   * This method is only for use by ADK-TS
    */
   get canonicalModel() {
     if (typeof this.model === "string") {
@@ -17116,7 +17265,7 @@ var LlmAgent = class _LlmAgent extends BaseAgent {
   }
   /**
    * The resolved instruction field to construct instruction for this agent
-   * This method is only for use by Agent Development Kit
+   * This method is only for use by ADK-TS
    */
   async canonicalInstruction(ctx) {
     if (typeof this.instruction === "string") {
@@ -17127,7 +17276,7 @@ var LlmAgent = class _LlmAgent extends BaseAgent {
   }
   /**
    * The resolved global_instruction field to construct global instruction
-   * This method is only for use by Agent Development Kit
+   * This method is only for use by ADK-TS
    */
   async canonicalGlobalInstruction(ctx) {
     if (typeof this.globalInstruction === "string") {
@@ -17138,7 +17287,7 @@ var LlmAgent = class _LlmAgent extends BaseAgent {
   }
   /**
    * The resolved tools field as a list of BaseTool based on the context
-   * This method is only for use by Agent Development Kit
+   * This method is only for use by ADK-TS
    */
   async canonicalTools(_ctx) {
     const resolvedTools = [];
@@ -18543,6 +18692,7 @@ var LangGraphAgent = class extends BaseAgent {
    * Core logic to run this agent via text-based conversation.
    */
   async *runAsyncImpl(context4) {
+    this.results = [];
     this.logger.debug(
       `Starting graph execution from root node "${this.rootNode}"`
     );
@@ -18734,7 +18884,7 @@ function createBranchContextForSubAgent(agent, subAgent, invocationContext) {
     agent: subAgent,
     userContent: invocationContext.userContent,
     session: invocationContext.session,
-    endInvocation: invocationContext.endInvocation,
+    invocationFlags: invocationContext.getInvocationFlags(),
     liveRequestQueue: invocationContext.liveRequestQueue,
     activeStreamingTools: invocationContext.activeStreamingTools,
     transcriptionCache: invocationContext.transcriptionCache,
@@ -19700,8 +19850,29 @@ var GcsArtifactService = class {
       version
     );
     const blob = this.bucket.file(blobName);
-    await blob.save(artifact.inlineData.data, {
-      contentType: artifact.inlineData.mimeType,
+    let data;
+    let contentType;
+    let partType;
+    if (artifact.text !== void 0) {
+      data = artifact.text;
+      contentType = "text/plain";
+      partType = "text";
+    } else if (artifact.inlineData) {
+      data = artifact.inlineData.data;
+      contentType = artifact.inlineData.mimeType;
+      partType = "inlineData";
+    } else if (artifact.fileData) {
+      data = artifact.fileData.fileUri;
+      contentType = artifact.fileData.mimeType || "application/octet-stream";
+      partType = "fileData";
+    } else {
+      throw new Error(
+        "Unsupported artifact Part type: must have text, inlineData, or fileData"
+      );
+    }
+    await blob.save(data, {
+      contentType,
+      metadata: { partType },
       preconditionOpts: { ifGenerationMatch: 0 }
     });
     return version;
@@ -19735,12 +19906,25 @@ var GcsArtifactService = class {
       if (!artifactBuffer) {
         return null;
       }
-      const part = {
-        inlineData: {
-          data: artifactBuffer.toString(),
-          mimeType: metadata.contentType || "application/octet-stream"
-        }
-      };
+      const partType = metadata.metadata?.partType;
+      let part;
+      if (partType === "text") {
+        part = { text: artifactBuffer.toString() };
+      } else if (partType === "fileData") {
+        part = {
+          fileData: {
+            fileUri: artifactBuffer.toString(),
+            mimeType: metadata.contentType || "application/octet-stream"
+          }
+        };
+      } else {
+        part = {
+          inlineData: {
+            data: artifactBuffer.toString(),
+            mimeType: metadata.contentType || "application/octet-stream"
+          }
+        };
+      }
       return part;
     } catch (error) {
       if (error?.code === 404) {
@@ -19864,7 +20048,7 @@ var EvalResult = class {
     this.evalSetResultName = init.evalSetResultName;
     this.evalSetId = init.evalSetId || "";
     this.evalCaseResults = init.evalCaseResults || [];
-    this.creationTimestamp = init.creationTimestamp || Date.now() / 1e3;
+    this.creationTimestamp = init.creationTimestamp || Date.now();
   }
 };
 
@@ -19892,6 +20076,8 @@ var BaseEvalService = class {
 };
 
 // src/evaluation/vertex-ai-eval-facade.ts
+var import_google_auth_library = require("google-auth-library");
+var import_axios4 = __toESM(require("axios"));
 var ERROR_MESSAGE_SUFFIX = `
 You should specify both project id and location. This metric uses Vertex Gen AI
 Eval SDK, and it requires google cloud credentials.
@@ -19902,6 +20088,28 @@ the template below:
 process.env.GOOGLE_CLOUD_LOCATION = <LOCATION>
 process.env.GOOGLE_CLOUD_PROJECT = <PROJECT ID>
 `;
+var VERTEX_AI_EVAL_SCOPES = [
+  "https://www.googleapis.com/auth/cloud-platform"
+];
+var VERTEX_AI_METRIC_KEYS = {
+  ["response_evaluation_score" /* RESPONSE_EVALUATION_SCORE */]: {
+    inputKey: "coherence_input",
+    resultKey: "coherenceResult"
+  },
+  ["safety_v1" /* SAFETY_V1 */]: {
+    inputKey: "safety_input",
+    resultKey: "safetyResult"
+  }
+};
+function getMetricKeys(metric) {
+  const keys = VERTEX_AI_METRIC_KEYS[metric];
+  if (!keys) {
+    throw new Error(
+      `Metric "${metric}" is not supported by Vertex AI evaluation.`
+    );
+  }
+  return keys;
+}
 var VertexAiEvalFacade = class _VertexAiEvalFacade {
   threshold;
   metricName;
@@ -19926,8 +20134,8 @@ var VertexAiEvalFacade = class _VertexAiEvalFacade {
       };
       try {
         const evalCaseResult = await _VertexAiEvalFacade._performEval(
-          [evalCase],
-          [this.metricName]
+          evalCase,
+          this.metricName
         );
         const score = this._getScore(evalCaseResult);
         perInvocationResults.push({
@@ -19971,8 +20179,9 @@ var VertexAiEvalFacade = class _VertexAiEvalFacade {
     return "";
   }
   _getScore(evalResult) {
-    if (evalResult?.summaryMetrics?.[0]?.meanScore !== void 0 && typeof evalResult.summaryMetrics[0].meanScore === "number" && !Number.isNaN(evalResult.summaryMetrics[0].meanScore)) {
-      return evalResult.summaryMetrics[0].meanScore;
+    const meanScore = evalResult?.summaryMetrics?.[0]?.meanScore;
+    if (typeof meanScore === "number" && !Number.isNaN(meanScore)) {
+      return meanScore;
     }
     return void 0;
   }
@@ -19982,7 +20191,7 @@ var VertexAiEvalFacade = class _VertexAiEvalFacade {
     }
     return 3 /* NOT_EVALUATED */;
   }
-  static async _performEval(dataset, metrics3) {
+  static async _performEval(evalCase, metric) {
     const projectId = process.env.GOOGLE_CLOUD_PROJECT;
     const location = process.env.GOOGLE_CLOUD_LOCATION;
     if (!projectId) {
@@ -19991,13 +20200,50 @@ var VertexAiEvalFacade = class _VertexAiEvalFacade {
     if (!location) {
       throw new Error(`Missing location. ${ERROR_MESSAGE_SUFFIX}`);
     }
-    console.warn(
-      "Vertex AI evaluation is not fully implemented. Using mock response."
-    );
+    const auth = new import_google_auth_library.GoogleAuth({ scopes: VERTEX_AI_EVAL_SCOPES });
+    const accessToken = await auth.getAccessToken();
+    if (!accessToken) {
+      throw new Error(
+        "Failed to obtain Google Cloud access token. Ensure Application Default Credentials are configured (e.g. run 'gcloud auth application-default login')."
+      );
+    }
+    const { inputKey, resultKey } = getMetricKeys(metric);
+    const url = `https://${location}-aiplatform.googleapis.com/v1beta1/projects/${projectId}/locations/${location}:evaluateInstances`;
+    const instance = {
+      prediction: evalCase.response
+    };
+    if (metric === "response_evaluation_score" /* RESPONSE_EVALUATION_SCORE */) {
+      instance.reference = evalCase.reference;
+    }
+    const requestBody = {
+      [inputKey]: {
+        metric_spec: {},
+        instance
+      }
+    };
+    let responseData;
+    try {
+      const response = await import_axios4.default.post(url, requestBody, {
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+          "Content-Type": "application/json"
+        }
+      });
+      responseData = response.data;
+    } catch (error) {
+      if (import_axios4.default.isAxiosError(error)) {
+        const detail = error.response?.data ? JSON.stringify(error.response.data) : "";
+        throw new Error(
+          `Vertex AI evaluation API request failed: ${error.message}${detail ? ` \u2014 ${detail}` : ""}`
+        );
+      }
+      throw error;
+    }
+    const score = responseData?.[resultKey]?.score;
     return {
       summaryMetrics: [
         {
-          meanScore: Math.random() * 0.5 + 0.5
+          meanScore: typeof score === "number" ? score : void 0
         }
       ]
     };
@@ -20453,9 +20699,13 @@ var LocalEvalService = class extends BaseEvalService {
     super();
     this.agent = agent;
     this.parallelism = parallelism;
-    this.initializeRunner();
+    this.readyPromise = this.initializeRunner();
   }
   runner;
+  readyPromise;
+  ensureReady() {
+    return this.readyPromise;
+  }
   async initializeRunner() {
     if ("ask" in this.agent) {
       this.runner = this.agent;
@@ -20554,9 +20804,7 @@ var LocalEvalService = class extends BaseEvalService {
   }
   async runInference(evalCase) {
     const results = [];
-    if (!this.runner) {
-      await this.initializeRunner();
-    }
+    await this.ensureReady();
     if (evalCase.sessionInput) {
       try {
         if (this.runner.initializeSession) {
@@ -23114,6 +23362,7 @@ var import_kysely = require("kysely");
 var DatabaseSessionService = class extends BaseSessionService {
   db;
   initialized = false;
+  initPromise = null;
   constructor(config) {
     super();
     this.db = config.db;
@@ -23124,12 +23373,26 @@ var DatabaseSessionService = class extends BaseSessionService {
     }
   }
   /**
-   * Initialize the database by creating required tables if they don't exist
+   * Initialize the database by creating required tables if they don't exist.
+   * Uses promise deduplication so concurrent callers share a single initialization.
    */
-  async initializeDatabase() {
+  initializeDatabase() {
     if (this.initialized) {
-      return;
+      return Promise.resolve();
+    }
+    if (this.initPromise) {
+      return this.initPromise;
     }
+    const promise = this._doInitialize();
+    this.initPromise = promise;
+    promise.catch(() => {
+      if (this.initPromise === promise) {
+        this.initPromise = null;
+      }
+    });
+    return promise;
+  }
+  async _doInitialize() {
     try {
       await this.db.schema.createTable("sessions").ifNotExists().addColumn("id", "varchar(128)", (col) => col.notNull()).addColumn("app_name", "varchar(128)", (col) => col.notNull()).addColumn("user_id", "varchar(128)", (col) => col.notNull()).addColumn("state", "text", (col) => col.defaultTo("{}")).addColumn(
         "create_time",
@@ -23396,7 +23659,8 @@ var DatabaseSessionService = class extends BaseSessionService {
       session.lastUpdateTime = this.timestampToUnixSeconds(
         updatedSession.update_time
       );
-      super.appendEvent(session, event);
+      this.updateSessionState(session, event);
+      session.events.push(event);
       return event;
     });
   }