@google/adk 1.1.0 → 1.3.0

package/dist/cjs/utils/model_name.js

@@ -27,6 +27,7 @@ __export(model_name_exports, {
   extractModelName: () => extractModelName,
   isGemini1Model: () => isGemini1Model,
   isGemini2OrAbove: () => isGemini2OrAbove,
+  isGemini3xFlashLive: () => isGemini3xFlashLive,
   isGeminiModel: () => isGeminiModel,
   isGeminiModelIdCheckDisabled: () => isGeminiModelIdCheckDisabled
 });
@@ -77,6 +78,13 @@ function isGemini2OrAbove(modelString) {
   const parsedVersion = parseVersion(versionString);
   return parsedVersion.valid && parsedVersion.major >= 2;
 }
+function isGemini3xFlashLive(modelString) {
+  if (!modelString) {
+    return false;
+  }
+  const modelName = extractModelName(modelString);
+  return modelName.startsWith("gemini-3.") && modelName.includes("-flash-live");
+}
 function isGeminiModelIdCheckDisabled() {
   return (0, import_env_aware_utils.getBooleanEnvVar)("ADK_DISABLE_GEMINI_MODEL_ID_CHECK");
 }
@@ -85,6 +93,7 @@ function isGeminiModelIdCheckDisabled() {
   extractModelName,
   isGemini1Model,
   isGemini2OrAbove,
+  isGemini3xFlashLive,
   isGeminiModel,
   isGeminiModelIdCheckDisabled
 });

package/dist/cjs/utils/partial_copy.js

@@ -0,0 +1,51 @@
+/**
+  * @license
+  * Copyright 2026 Google LLC
+  * SPDX-License-Identifier: Apache-2.0
+  */
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var partial_copy_exports = {};
+__export(partial_copy_exports, {
+  partialCopy: () => partialCopy
+});
+module.exports = __toCommonJS(partial_copy_exports);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+function partialCopy(source, targetKeys) {
+  const result = {};
+  const sourceAsUnknown = source;
+  targetKeys.forEach((key) => {
+    const keyStr = key;
+    if (keyStr in source) {
+      result[key] = sourceAsUnknown[keyStr];
+    } else {
+      result[key] = void 0;
+    }
+  });
+  return result;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  partialCopy
+});

package/dist/cjs/utils/streaming_utils.js

@@ -24,7 +24,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var streaming_utils_exports = {};
 __export(streaming_utils_exports, {
-  StreamingResponseAggregator: () => StreamingResponseAggregator
+  StreamingResponseAggregator: () => StreamingResponseAggregator,
+  isEmptyContentPart: () => isEmptyContentPart
 });
 module.exports = __toCommonJS(streaming_utils_exports);
 var import_genai = require("@google/genai");
@@ -37,15 +38,9 @@ var import_llm_response = require("../models/llm_response.js");
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-class StreamingResponseAggregator {
-  constructor(isProgressiveMode = (0, import_feature_registry.isFeatureEnabled)(
-    import_feature_registry.FeatureName.PROGRESSIVE_SSE_STREAMING
-  )) {
-    this.isProgressiveMode = isProgressiveMode;
-    // For non-progressive SSE streaming mode
-    this.text = "";
-    this.thoughtText = "";
-    // For progressive SSE streaming mode: accumulate parts in order
+const UNSAFE_PROPERTY_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
+class ProgressiveStrategy {
+  constructor() {
     this.partsSequence = [];
     this.currentTextBuffer = "";
     this.currentFcArgs = {};
@@ -110,10 +105,13 @@ class StreamingResponseAggregator {
     const pathParts = import_jsonpath_plus.JSONPath.toPathArray(jsonPath).filter(
       (p) => p !== "$" && p !== "$["
     );
+    if (pathParts.some((part) => UNSAFE_PROPERTY_KEYS.has(String(part)))) {
+      return;
+    }
     let current = this.currentFcArgs;
     for (let i = 0; i < pathParts.length - 1; i++) {
       const part = pathParts[i];
-      if (!(part in current)) {
+      if (!Object.prototype.hasOwnProperty.call(current, part)) {
         current[part] = {};
       }
       current = current[part];
@@ -172,11 +170,6 @@ class StreamingResponseAggregator {
     if (!fc) {
       return;
     }
-    if (part.thoughtSignature) {
-      this.lastThoughtSignature = part.thoughtSignature;
-    } else if (this.lastThoughtSignature) {
-      part.thoughtSignature = this.lastThoughtSignature.toString();
-    }
     if (fc.partialArgs || fc.willContinue) {
       if (!fc.id && !this.currentFcId) {
         fc.id = (0, import_functions.generateClientFunctionCallId)();
@@ -195,63 +188,103 @@ class StreamingResponseAggregator {
       }
     }
   }
-  async *processResponse(response) {
-    var _a, _b, _c;
-    this.response = response;
-    const llmResponse = (0, import_llm_response.createLlmResponse)(response);
-    this.usageMetadata = llmResponse.usageMetadata;
-    if (llmResponse.groundingMetadata) {
-      this.groundingMetadata = llmResponse.groundingMetadata;
-    }
-    if (llmResponse.citationMetadata) {
-      this.citationMetadata = llmResponse.citationMetadata;
-    }
-    if (llmResponse.finishReason) {
-      this.finishReason = llmResponse.finishReason;
-    }
+  async *processResponse(llmResponse) {
+    var _a;
     if (llmResponse.content && llmResponse.content.parts) {
       for (const part of llmResponse.content.parts) {
-        if (part.thoughtSignature) {
-          this.lastThoughtSignature = part.thoughtSignature;
-        } else if (part.functionCall && this.lastThoughtSignature) {
-          part.thoughtSignature = this.lastThoughtSignature.toString();
+        if (part.text) {
+          const isThought = (_a = part.thought) != null ? _a : false;
+          if (this.currentTextBuffer && isThought !== this.currentTextIsThought) {
+            this.flushTextBufferToSequence();
+          }
+          if (!this.currentTextBuffer) {
+            this.currentTextIsThought = isThought;
+          }
+          this.currentTextBuffer += part.text;
+        } else if (part.functionCall) {
+          this.processFunctionCallPart(part);
+        } else {
+          this.flushTextBufferToSequence();
+          this.partsSequence.push(part);
         }
       }
     }
-    if (this.isProgressiveMode) {
-      if (llmResponse.content && llmResponse.content.parts) {
-        for (const part of llmResponse.content.parts) {
-          if (part.text) {
-            const isThought = (_a = part.thought) != null ? _a : false;
-            if (this.currentTextBuffer && isThought !== this.currentTextIsThought) {
-              this.flushTextBufferToSequence();
-            }
-            if (!this.currentTextBuffer) {
-              this.currentTextIsThought = isThought;
-            }
-            this.currentTextBuffer += part.text;
-          } else if (part.functionCall) {
-            this.processFunctionCallPart(part);
+    llmResponse.partial = true;
+    yield llmResponse;
+  }
+  close() {
+    this.flushTextBufferToSequence();
+    this.flushFunctionCallToSequence();
+    const finalParts = this.partsSequence;
+    if (finalParts.length === 0) {
+      return void 0;
+    }
+    return finalParts;
+  }
+}
+class NonProgressiveStrategy {
+  constructor() {
+    this.text = "";
+    this.thoughtText = "";
+  }
+  async *processResponse(llmResponse) {
+    var _a;
+    if ((_a = llmResponse.content) == null ? void 0 : _a.parts) {
+      const nonTextParts = [];
+      let sawTextPart = false;
+      for (const part of llmResponse.content.parts) {
+        if (typeof part.text === "string") {
+          sawTextPart = true;
+          if (part.thought) {
+            this.thoughtText += part.text;
           } else {
-            this.flushTextBufferToSequence();
-            this.partsSequence.push(part);
+            this.text += part.text;
           }
+          continue;
+        }
+        if (part.functionCall && !part.functionCall.id) {
+          part.functionCall.id = (0, import_functions.generateClientFunctionCallId)();
         }
+        nonTextParts.push(part);
       }
-      llmResponse.partial = true;
-      yield llmResponse;
-      return;
-    }
-    if (llmResponse.content && llmResponse.content.parts && typeof ((_b = llmResponse.content.parts[0]) == null ? void 0 : _b.text) === "string") {
-      const part0 = llmResponse.content.parts[0];
-      const partText = part0.text || "";
-      if (part0.thought) {
-        this.thoughtText += partText;
-      } else {
-        this.text += partText;
+      if (nonTextParts.length > 0) {
+        if (this.thoughtText || this.text) {
+          const parts = [];
+          if (this.thoughtText) {
+            parts.push({ text: this.thoughtText, thought: true });
+          }
+          if (this.text) {
+            parts.push({ text: this.text });
+          }
+          yield {
+            content: {
+              role: "model",
+              parts
+            },
+            usageMetadata: llmResponse.usageMetadata,
+            partial: false
+          };
+          this.thoughtText = "";
+          this.text = "";
+        }
+        yield {
+          ...llmResponse,
+          content: {
+            role: llmResponse.content.role,
+            parts: nonTextParts
+          },
+          partial: false
+        };
+        return;
+      }
+      if (sawTextPart) {
+        llmResponse.partial = true;
       }
-      llmResponse.partial = true;
-    } else if ((this.thoughtText || this.text) && (!llmResponse.content || !llmResponse.content.parts || !((_c = llmResponse.content.parts[0]) == null ? void 0 : _c.inlineData))) {
+    }
+    yield llmResponse;
+  }
+  close() {
+    if (this.text || this.thoughtText) {
       const parts = [];
       if (this.thoughtText) {
         parts.push({ text: this.thoughtText, thought: true });
@@ -259,75 +292,89 @@ class StreamingResponseAggregator {
       if (this.text) {
         parts.push({ text: this.text });
       }
-      yield {
-        content: {
-          role: "model",
-          parts
-        },
-        usageMetadata: llmResponse.usageMetadata,
-        partial: false
-      };
-      this.thoughtText = "";
-      this.text = "";
+      return parts;
     }
-    yield llmResponse;
+    return void 0;
   }
-  close() {
+}
+class StreamingResponseAggregator {
+  constructor(isProgressiveMode = (0, import_feature_registry.isFeatureEnabled)(
+    import_feature_registry.FeatureName.PROGRESSIVE_SSE_STREAMING
+  )) {
+    this.isProgressiveMode = isProgressiveMode;
+    this.lastThoughtSignature = {};
+    this.strategy = this.isProgressiveMode ? new ProgressiveStrategy() : new NonProgressiveStrategy();
+  }
+  async *processResponse(response) {
     var _a, _b;
-    if (!((_a = this.response) == null ? void 0 : _a.candidates) || this.response.candidates.length === 0) {
+    const llmResponse = (0, import_llm_response.createLlmResponse)(response);
+    const parts = (_b = (_a = llmResponse.content) == null ? void 0 : _a.parts) != null ? _b : [];
+    if (parts.every(isEmptyContentPart) && (llmResponse.finishReason === void 0 || llmResponse.finishReason === import_genai.FinishReason.STOP)) {
+      if (llmResponse.usageMetadata) {
+        this.usageMetadata = llmResponse.usageMetadata;
+      }
+      if (llmResponse.groundingMetadata) {
+        this.groundingMetadata = llmResponse.groundingMetadata;
+      }
+      if (llmResponse.citationMetadata) {
+        this.citationMetadata = llmResponse.citationMetadata;
+      }
+      if (llmResponse.finishReason) {
+        this.finishReason = llmResponse.finishReason;
+      }
       return;
     }
-    if (this.isProgressiveMode) {
-      this.flushTextBufferToSequence();
-      this.flushFunctionCallToSequence();
-      const finalParts = this.partsSequence;
-      if (finalParts.length === 0) {
-        return;
-      }
-      const candidate = this.response.candidates[0];
-      const finishReason = (_b = this.finishReason) != null ? _b : candidate.finishReason;
-      return {
-        content: {
-          role: "model",
-          parts: finalParts
-        },
-        groundingMetadata: this.groundingMetadata,
-        citationMetadata: this.citationMetadata,
-        errorCode: finishReason === import_genai.FinishReason.STOP ? void 0 : finishReason,
-        errorMessage: finishReason === import_genai.FinishReason.STOP ? void 0 : candidate.finishMessage,
-        usageMetadata: this.usageMetadata,
-        finishReason,
-        partial: false
-      };
+    this.response = response;
+    this.usageMetadata = llmResponse.usageMetadata;
+    if (llmResponse.groundingMetadata) {
+      this.groundingMetadata = llmResponse.groundingMetadata;
     }
-    if ((this.text || this.thoughtText) && this.response.candidates && this.response.candidates.length > 0) {
-      const parts = [];
-      if (this.thoughtText) {
-        parts.push({ text: this.thoughtText, thought: true });
-      }
-      if (this.text) {
-        parts.push({ text: this.text });
+    if (llmResponse.citationMetadata) {
+      this.citationMetadata = llmResponse.citationMetadata;
+    }
+    if (llmResponse.finishReason) {
+      this.finishReason = llmResponse.finishReason;
+    }
+    if (llmResponse.content && llmResponse.content.parts) {
+      for (const part of llmResponse.content.parts) {
+        if (part.thoughtSignature) {
+          this.lastThoughtSignature.value = part.thoughtSignature;
+        } else if (part.functionCall && this.lastThoughtSignature.value) {
+          part.thoughtSignature = this.lastThoughtSignature.value.toString();
+        }
       }
-      const candidate = this.response.candidates[0];
-      const finishReason = candidate.finishReason;
-      return {
-        content: {
-          role: "model",
-          parts
-        },
-        groundingMetadata: this.groundingMetadata,
-        citationMetadata: this.citationMetadata,
-        errorCode: finishReason === import_genai.FinishReason.STOP ? void 0 : finishReason,
-        errorMessage: finishReason === import_genai.FinishReason.STOP ? void 0 : candidate.finishMessage,
-        usageMetadata: this.usageMetadata,
-        finishReason,
-        partial: false
-      };
     }
-    return void 0;
+    yield* this.strategy.processResponse(llmResponse);
+  }
+  close() {
+    var _a, _b, _c;
+    const finalParts = this.strategy.close();
+    const hasMetadata = this.usageMetadata !== void 0 || this.groundingMetadata !== void 0 || this.citationMetadata !== void 0;
+    if (!finalParts && !hasMetadata) {
+      return void 0;
+    }
+    const candidate = (_b = (_a = this.response) == null ? void 0 : _a.candidates) == null ? void 0 : _b[0];
+    const finishReason = (_c = this.finishReason) != null ? _c : candidate == null ? void 0 : candidate.finishReason;
+    return {
+      content: {
+        role: "model",
+        parts: finalParts != null ? finalParts : []
+      },
+      groundingMetadata: this.groundingMetadata,
+      citationMetadata: this.citationMetadata,
+      errorCode: finishReason === import_genai.FinishReason.STOP ? void 0 : finishReason,
+      errorMessage: finishReason === import_genai.FinishReason.STOP ? void 0 : candidate == null ? void 0 : candidate.finishMessage,
+      usageMetadata: this.usageMetadata,
+      finishReason,
+      partial: false
+    };
   }
 }
+function isEmptyContentPart(part) {
+  return !part.functionCall && !part.functionResponse && !part.fileData && !part.inlineData && !part.executableCode && !part.codeExecutionResult && (!part.text || part.text === "");
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  StreamingResponseAggregator
+  StreamingResponseAggregator,
+  isEmptyContentPart
 });

package/dist/cjs/utils/vertex_ai_utils.js

@@ -0,0 +1,50 @@
+/**
+  * @license
+  * Copyright 2026 Google LLC
+  * SPDX-License-Identifier: Apache-2.0
+  */
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var vertex_ai_utils_exports = {};
+__export(vertex_ai_utils_exports, {
+  getExpressModeApiKey: () => getExpressModeApiKey
+});
+module.exports = __toCommonJS(vertex_ai_utils_exports);
+var import_env_aware_utils = require("./env_aware_utils.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+function getExpressModeApiKey(project, location, expressModeApiKey) {
+  if ((project || location) && expressModeApiKey) {
+    throw new Error(
+      "Cannot specify project or location and expressModeApiKey. Either use project and location, or just the expressModeApiKey."
+    );
+  }
+  if ((0, import_env_aware_utils.getBooleanEnvVar)("GOOGLE_GENAI_USE_VERTEXAI")) {
+    return expressModeApiKey || process.env.GOOGLE_API_KEY;
+  }
+  return void 0;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getExpressModeApiKey
+});

package/dist/cjs/version.js

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

package/dist/esm/agents/base_agent.js

@@ -99,9 +99,27 @@ class BaseAgent {
         ctx,
         this,
         async function* () {
+          var _a2, _b;
+          const context2 = this.createInvocationContext(parentContext);
+          const beforeAgentCallbackEvent = await this.handleBeforeAgentCallback(context2);
+          if (beforeAgentCallbackEvent) {
+            yield beforeAgentCallbackEvent;
+          }
+          if (context2.endInvocation || ((_a2 = parentContext.abortSignal) == null ? void 0 : _a2.aborted)) {
+            return;
+          }
+          for await (const event of this.runLiveImpl(context2)) {
+            yield event;
+          }
+          if (context2.endInvocation || ((_b = parentContext.abortSignal) == null ? void 0 : _b.aborted)) {
+            return;
+          }
+          const afterAgentCallbackEvent = await this.handleAfterAgentCallback(context2);
+          if (afterAgentCallbackEvent) {
+            yield afterAgentCallbackEvent;
+          }
         }
       );
-      throw new Error("Live mode is not implemented yet.");
     } finally {
       span.end();
     }

package/dist/esm/agents/functions.js

@@ -159,6 +159,8 @@ function buildResponseEvent(tool, functionResult, toolContext, invocationContext
   let responseResult;
   if (typeof functionResult !== "object" || functionResult == null) {
     responseResult = { result: functionResult };
+  } else if (Array.isArray(functionResult)) {
+    responseResult = { results: functionResult };
   } else {
     responseResult = functionResult;
   }
@@ -297,6 +299,8 @@ async function handleFunctionCallList({
       functionResponse = { error: functionResponseError };
     } else if (typeof functionResponse !== "object" || functionResponse == null) {
       functionResponse = { result: functionResponse };
+    } else if (Array.isArray(functionResponse)) {
+      functionResponse = { results: functionResponse };
     }
     const functionResponseEvent = createEvent({
       invocationId: invocationContext.invocationId,

package/dist/esm/agents/instructions.js

@@ -6,50 +6,98 @@ const require = topLevelCreateRequire(import.meta.url);
  * SPDX-License-Identifier: Apache-2.0
  */
 import { State } from "../sessions/state.js";
-async function injectSessionState(template, readonlyContext) {
+const ARTIFACT_PREFIX = "artifact.";
+async function resolveKey(key, isOptional, rawMatch, readonlyContext) {
   const invocationContext = readonlyContext.invocationContext;
-  async function replaceMatchedKeyWithItsValue(match) {
-    let key = match[0].replace(/^\{+/, "").replace(/\}+$/, "").trim();
+  if (key.startsWith(ARTIFACT_PREFIX)) {
+    const fileName = key.substring(ARTIFACT_PREFIX.length);
+    if (invocationContext.artifactService === void 0) {
+      throw new Error("Artifact service is not initialized.");
+    }
+    const artifact = await invocationContext.artifactService.loadArtifact({
+      appName: invocationContext.session.appName,
+      userId: invocationContext.session.userId,
+      sessionId: invocationContext.session.id,
+      filename: fileName
+    });
+    if (!artifact) {
+      if (isOptional) {
+        return "";
+      }
+      throw new Error(`Artifact ${fileName} not found.`);
+    }
+    return String(artifact);
+  }
+  if (!isValidStateName(key)) {
+    return rawMatch;
+  }
+  if (key in invocationContext.session.state) {
+    return String(invocationContext.session.state[key]);
+  }
+  if (isOptional) {
+    return "";
+  }
+  throw new Error(`Context variable not found: \`${key}\`.`);
+}
+async function injectSessionState(template, readonlyContext) {
+  const pattern = /\{+[^{}]*}+/g;
+  const matches = Array.from(template.matchAll(pattern));
+  if (matches.length === 0) {
+    return template;
+  }
+  const parsedMatches = matches.map((match) => {
+    const raw = match[0];
+    let key = raw.replace(/^\{+/, "").replace(/\}+$/, "").trim();
     const isOptional = key.endsWith("?");
     if (isOptional) {
       key = key.slice(0, -1);
     }
-    if (key.startsWith("artifact.")) {
-      const fileName = key.substring("artifact.".length);
-      if (invocationContext.artifactService === void 0) {
-        throw new Error("Artifact service is not initialized.");
+    const isValid = key.startsWith(ARTIFACT_PREFIX) || isValidStateName(key);
+    return {
+      raw,
+      key,
+      isOptional,
+      isValid,
+      index: match.index
+    };
+  });
+  const uniqueKeys = /* @__PURE__ */ new Map();
+  for (const pm of parsedMatches) {
+    if (!pm.isValid) {
+      continue;
+    }
+    const existing = uniqueKeys.get(pm.key);
+    if (existing) {
+      if (existing.isOptional && !pm.isOptional) {
+        existing.isOptional = false;
       }
-      const artifact = await invocationContext.artifactService.loadArtifact({
-        appName: invocationContext.session.appName,
-        userId: invocationContext.session.userId,
-        sessionId: invocationContext.session.id,
-        filename: fileName
+    } else {
+      uniqueKeys.set(pm.key, {
+        key: pm.key,
+        isOptional: pm.isOptional,
+        raw: pm.raw
       });
-      if (!artifact) {
-        throw new Error(`Artifact ${fileName} not found.`);
-      }
-      return String(artifact);
-    }
-    if (!isValidStateName(key)) {
-      return match[0];
-    }
-    if (key in invocationContext.session.state) {
-      return String(invocationContext.session.state[key]);
     }
-    if (isOptional) {
-      return "";
-    }
-    throw new Error(`Context variable not found: \`${key}\`.`);
   }
-  const pattern = /\{+[^{}]*}+/g;
+  const resolutions = /* @__PURE__ */ new Map();
+  for (const info of uniqueKeys.values()) {
+    resolutions.set(
+      info.key,
+      resolveKey(info.key, info.isOptional, info.raw, readonlyContext)
+    );
+  }
+  await Promise.all(resolutions.values());
   const result = [];
   let lastEnd = 0;
-  const matches = template.matchAll(pattern);
-  for (const match of matches) {
-    result.push(template.slice(lastEnd, match.index));
-    const replacement = await replaceMatchedKeyWithItsValue(match);
-    result.push(replacement);
-    lastEnd = match.index + match[0].length;
+  for (const pm of parsedMatches) {
+    result.push(template.slice(lastEnd, pm.index));
+    if (pm.isValid) {
+      const replacement = await resolutions.get(pm.key);
+      result.push(replacement);
+    } else {
+      result.push(pm.raw);
+    }
+    lastEnd = pm.index + pm.raw.length;
   }
   result.push(template.slice(lastEnd));
   return result.join("");