@hasna/testers 0.0.34 → 0.0.36

package/dist/server/index.js

@@ -4036,6 +4036,56 @@ var init_zod = __esm(() => {
 });
 
 // src/types/index.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function stringValue(value) {
+  return typeof value === "string" && value.trim() ? value : undefined;
+}
+function numberValue(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+}
+function stringMap(value) {
+  if (!isRecord(value))
+    return;
+  const entries = Object.entries(value).filter((entry) => typeof entry[1] === "string");
+  return entries.length > 0 ? Object.fromEntries(entries) : undefined;
+}
+function cleanupValue(value) {
+  if (value === "delete" || value === "stop" || value === "keep")
+    return value;
+  return;
+}
+function workflowExecutionFromValue(value) {
+  const input = isRecord(value) ? value : {};
+  const rawTarget = stringValue(input["target"]) ?? "local";
+  if (rawTarget === "local") {
+    const timeoutMs2 = numberValue(input["timeoutMs"]);
+    return timeoutMs2 === undefined ? { target: "local" } : { target: "local", timeoutMs: timeoutMs2 };
+  }
+  if (rawTarget !== "sandbox" && rawTarget !== "connector:e2b") {
+    throw new Error(`Unsupported workflow execution target: ${rawTarget}`);
+  }
+  const provider = rawTarget === "connector:e2b" ? "e2b" : stringValue(input["provider"]) ?? stringValue(input["connector"]);
+  const sandboxImage = stringValue(input["sandboxImage"]) ?? stringValue(input["sandboxTemplate"]);
+  const sandboxRemoteDir = stringValue(input["sandboxRemoteDir"]);
+  const sandboxCleanup = cleanupValue(input["sandboxCleanup"]);
+  const setupCommand = stringValue(input["setupCommand"]);
+  const packageSpec = stringValue(input["packageSpec"]);
+  const timeoutMs = numberValue(input["timeoutMs"]);
+  const env = stringMap(input["env"]);
+  return {
+    target: "sandbox",
+    ...provider ? { provider } : {},
+    ...sandboxImage ? { sandboxImage } : {},
+    ...sandboxRemoteDir ? { sandboxRemoteDir } : {},
+    ...sandboxCleanup ? { sandboxCleanup } : {},
+    ...setupCommand ? { setupCommand } : {},
+    ...packageSpec ? { packageSpec } : {},
+    ...timeoutMs !== undefined ? { timeoutMs } : {},
+    ...env ? { env } : {}
+  };
+}
 function workflowFromRow(row) {
   return {
     id: row.id,
@@ -4045,7 +4095,7 @@ function workflowFromRow(row) {
     scenarioFilter: JSON.parse(row.scenario_filter || "{}"),
     personaIds: JSON.parse(row.persona_ids || "[]"),
     goal: row.goal ? JSON.parse(row.goal) : null,
-    execution: JSON.parse(row.execution || '{"target":"local"}'),
+    execution: workflowExecutionFromValue(JSON.parse(row.execution || '{"target":"local"}')),
     settings: JSON.parse(row.settings || "{}"),
     enabled: row.enabled === 1,
     createdAt: row.created_at,
@@ -8582,33 +8632,33 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
         this.ssl = config.ssl || false;
         this._ending = false;
         this._emitMessage = false;
-        const self2 = this;
+        const self = this;
         this.on("newListener", function(eventName) {
           if (eventName === "message") {
-            self2._emitMessage = true;
+            self._emitMessage = true;
           }
         });
       }
       connect(port, host) {
-        const self2 = this;
+        const self = this;
         this._connecting = true;
         this.stream.setNoDelay(true);
         this.stream.connect(port, host);
         this.stream.once("connect", function() {
-          if (self2._keepAlive) {
-            self2.stream.setKeepAlive(true, self2._keepAliveInitialDelayMillis);
+          if (self._keepAlive) {
+            self.stream.setKeepAlive(true, self._keepAliveInitialDelayMillis);
           }
-          self2.emit("connect");
+          self.emit("connect");
         });
         const reportStreamError = function(error) {
-          if (self2._ending && (error.code === "ECONNRESET" || error.code === "EPIPE")) {
+          if (self._ending && (error.code === "ECONNRESET" || error.code === "EPIPE")) {
             return;
           }
-          self2.emit("error", error);
+          self.emit("error", error);
         };
         this.stream.on("error", reportStreamError);
         this.stream.on("close", function() {
-          self2.emit("end");
+          self.emit("end");
         });
         if (!this.ssl) {
           return this.attachListeners(this.stream);
@@ -8619,19 +8669,19 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
             case "S":
               break;
             case "N":
-              self2.stream.end();
-              return self2.emit("error", new Error("The server does not support SSL connections"));
+              self.stream.end();
+              return self.emit("error", new Error("The server does not support SSL connections"));
             default:
-              self2.stream.end();
-              return self2.emit("error", new Error("There was an error establishing an SSL connection"));
+              self.stream.end();
+              return self.emit("error", new Error("There was an error establishing an SSL connection"));
           }
           const options = {
-            socket: self2.stream
+            socket: self.stream
           };
-          if (self2.ssl !== true) {
-            Object.assign(options, self2.ssl);
-            if ("key" in self2.ssl) {
-              options.key = self2.ssl.key;
+          if (self.ssl !== true) {
+            Object.assign(options, self.ssl);
+            if ("key" in self.ssl) {
+              options.key = self.ssl.key;
             }
           }
           const net = __require2("net");
@@ -8639,13 +8689,13 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
             options.servername = host;
           }
           try {
-            self2.stream = getSecureStream(options);
+            self.stream = getSecureStream(options);
           } catch (err) {
-            return self2.emit("error", err);
+            return self.emit("error", err);
           }
-          self2.attachListeners(self2.stream);
-          self2.stream.on("error", reportStreamError);
-          self2.emit("sslconnect");
+          self.attachListeners(self.stream);
+          self.stream.on("error", reportStreamError);
+          self.emit("sslconnect");
         });
       }
       attachListeners(stream) {
@@ -8780,9 +8830,9 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
       }
       cb();
     }
-    function push(self2, val) {
+    function push(self, val) {
       if (val !== undefined) {
-        self2.push(val);
+        self.push(val);
       }
     }
     function noop(incoming) {
@@ -9102,7 +9152,7 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
         this._queryQueue.length = 0;
       }
       _connect(callback) {
-        const self2 = this;
+        const self = this;
         const con = this.connection;
         this._connectionCallback = callback;
         if (this._connecting || this._connected) {
@@ -9128,14 +9178,14 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
           con.connect(this.port, this.host);
         }
         con.on("connect", function() {
-          if (self2.ssl) {
+          if (self.ssl) {
             con.requestSsl();
           } else {
-            con.startup(self2.getStartupConf());
+            con.startup(self.getStartupConf());
           }
         });
         con.on("sslconnect", function() {
-          con.startup(self2.getStartupConf());
+          con.startup(self.getStartupConf());
         });
         this._attachListeners(con);
         con.once("end", () => {
@@ -10067,34 +10117,34 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
     };
     NativeQuery.prototype.submit = function(client) {
       this.state = "running";
-      const self2 = this;
+      const self = this;
       this.native = client.native;
       client.native.arrayMode = this._arrayMode;
       let after = function(err, rows, results) {
         client.native.arrayMode = false;
         setImmediate(function() {
-          self2.emit("_done");
+          self.emit("_done");
         });
         if (err) {
-          return self2.handleError(err);
+          return self.handleError(err);
         }
-        if (self2._emitRowEvents) {
+        if (self._emitRowEvents) {
           if (results.length > 1) {
             rows.forEach((rowOfRows, i) => {
               rowOfRows.forEach((row) => {
-                self2.emit("row", row, results[i]);
+                self.emit("row", row, results[i]);
               });
             });
           } else {
             rows.forEach(function(row) {
-              self2.emit("row", row, results);
+              self.emit("row", row, results);
             });
           }
         }
-        self2.state = "end";
-        self2.emit("end", results);
-        if (self2.callback) {
-          self2.callback(null, results);
+        self.state = "end";
+        self.emit("end", results);
+        if (self.callback) {
+          self.callback(null, results);
         }
       };
       if (process.domain) {
@@ -10117,8 +10167,8 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
         return client.native.prepare(this.name, this.text, values.length, function(err) {
           if (err)
             return after(err);
-          client.namedQueries[self2.name] = self2.text;
-          return self2.native.execute(self2.name, values, after);
+          client.namedQueries[self.name] = self.text;
+          return self.native.execute(self.name, values, after);
         });
       } else if (this.values) {
         if (!Array.isArray(this.values)) {
@@ -10195,36 +10245,36 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
       this._queryQueue.length = 0;
     };
     Client.prototype._connect = function(cb) {
-      const self2 = this;
+      const self = this;
       if (this._connecting) {
         process.nextTick(() => cb(new Error("Client has already been connected. You cannot reuse a client.")));
         return;
       }
       this._connecting = true;
       this.connectionParameters.getLibpqConnectionString(function(err, conString) {
-        if (self2.connectionParameters.nativeConnectionString)
-          conString = self2.connectionParameters.nativeConnectionString;
+        if (self.connectionParameters.nativeConnectionString)
+          conString = self.connectionParameters.nativeConnectionString;
         if (err)
           return cb(err);
-        self2.native.connect(conString, function(err2) {
+        self.native.connect(conString, function(err2) {
           if (err2) {
-            self2.native.end();
+            self.native.end();
             return cb(err2);
           }
-          self2._connected = true;
-          self2.native.on("error", function(err3) {
-            self2._queryable = false;
-            self2._errorAllQueries(err3);
-            self2.emit("error", err3);
+          self._connected = true;
+          self.native.on("error", function(err3) {
+            self._queryable = false;
+            self._errorAllQueries(err3);
+            self.emit("error", err3);
           });
-          self2.native.on("notification", function(msg) {
-            self2.emit("notification", {
+          self.native.on("notification", function(msg) {
+            self.emit("notification", {
               channel: msg.relname,
               payload: msg.extra
             });
           });
-          self2.emit("connect");
-          self2._pulseQueryQueue(true);
+          self.emit("connect");
+          self._pulseQueryQueue(true);
           cb(null, this);
         });
       });
@@ -10315,7 +10365,7 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
       return result;
     };
     Client.prototype.end = function(cb) {
-      const self2 = this;
+      const self = this;
       this._ending = true;
       if (!this._connected) {
         this.once("connect", this.end.bind(this, cb));
@@ -10327,10 +10377,10 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
         });
       }
       this.native.end(function() {
-        self2._connected = false;
-        self2._errorAllQueries(new Error("Connection terminated"));
+        self._connected = false;
+        self._errorAllQueries(new Error("Connection terminated"));
         process.nextTick(() => {
-          self2.emit("end");
+          self.emit("end");
           if (cb)
             cb();
         });
@@ -10356,9 +10406,9 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
       }
       this._activeQuery = query;
       query.submit(this);
-      const self2 = this;
+      const self = this;
       query.once("_done", function() {
-        self2._pulseQueryQueue();
+        self._pulseQueryQueue();
       });
     };
     Client.prototype.cancel = function(query) {
@@ -15269,6 +15319,10 @@ function loadConfig() {
   if (envApiKey) {
     config.anthropicApiKey = envApiKey;
   }
+  const envSelfHeal = process.env["TESTERS_SELF_HEAL"];
+  if (envSelfHeal !== undefined) {
+    config.selfHeal = ["1", "true", "yes", "on"].includes(envSelfHeal.toLowerCase());
+  }
   return config;
 }
 var CONFIG_DIR3, CONFIG_PATH2;
@@ -15305,12 +15359,11 @@ Original selector that failed: "${request.failedSelector}"
 Please identify the correct selector from the screenshot.`;
   let rawResponse = "";
   try {
-    if (provider === "openai" || provider === "google") {
-      const baseUrl = provider === "openai" ? "https://api.openai.com/v1" : "https://generativelanguage.googleapis.com/v1beta/openai";
-      const apiKey = provider === "openai" ? process.env["OPENAI_API_KEY"] ?? "" : process.env["GOOGLE_API_KEY"] ?? "";
+    if (provider !== "anthropic") {
+      const compat = createOpenAICompatibleConfig(provider);
       const resp = await callOpenAICompatible({
-        baseUrl,
-        apiKey,
+        baseUrl: compat.baseUrl,
+        apiKey: compat.apiKey,
         model,
         system: HEAL_SYSTEM,
         messages: [{ role: "user", content: userMessage }],
@@ -15811,7 +15864,6 @@ async function executeTool(page, screenshotter, toolName, toolInput, context) {
         const assertionType = toolInput.assertion_type;
         const selector = toolInput.selector;
         const expected = toolInput.expected;
-        const sessionId = context.sessionId ?? "default";
         switch (assertionType) {
           case "element_exists": {
             if (!selector)
@@ -15876,7 +15928,6 @@ async function executeTool(page, screenshotter, toolName, toolInput, context) {
       case "browser_intercept": {
         const action = toolInput.action;
         const pattern = toolInput.pattern;
-        const interceptAction = toolInput.intercept_action;
         const statusCode = toolInput.status_code;
         const body = toolInput.body;
         const sessionId = context.sessionId ?? "default";
@@ -15953,7 +16004,28 @@ ${JSON.stringify(har, null, 2)}` };
       }
       case "browser_a11y": {
         const level = toolInput.level ?? "AA";
-        const snapshot = await page.accessibility.snapshot();
+        const snapshot = await page.evaluate(() => {
+          function readRole(el) {
+            return el.getAttribute("role") ?? el.tagName.toLowerCase();
+          }
+          function readName(el) {
+            const labelledBy = el.getAttribute("aria-labelledby");
+            if (labelledBy) {
+              const labelledText = labelledBy.split(/\s+/).map((id) => document.getElementById(id)?.textContent?.trim()).filter(Boolean).join(" ");
+              if (labelledText)
+                return labelledText;
+            }
+            return el.getAttribute("aria-label") ?? el.getAttribute("alt") ?? el.textContent?.trim() ?? "";
+          }
+          function walk(el) {
+            return {
+              role: readRole(el),
+              name: readName(el),
+              children: Array.from(el.children).map((child) => walk(child))
+            };
+          }
+          return document.body ? walk(document.body) : null;
+        });
         if (!snapshot)
           return { result: "Error: could not capture accessibility tree" };
         const issues = [];
@@ -15995,6 +16067,38 @@ ${filtered.join(`
     return { result: `Error executing ${toolName}: ${message}` };
   }
 }
+function resolveStartUrl(baseUrl, targetPath) {
+  try {
+    return new URL(targetPath, baseUrl.endsWith("/") ? baseUrl : `${baseUrl}/`).toString();
+  } catch {
+    return `${baseUrl.replace(/\/+$/, "")}/${targetPath.replace(/^\/+/, "")}`;
+  }
+}
+function buildScenarioUserMessage(scenario, baseUrl) {
+  const userParts = [
+    `**Scenario:** ${scenario.name}`,
+    `**Description:** ${scenario.description}`
+  ];
+  if (baseUrl) {
+    const normalizedBaseUrl = baseUrl.replace(/\/+$/, "");
+    userParts.push(`**Base URL:** ${normalizedBaseUrl}`);
+    if (scenario.targetPath) {
+      userParts.push(`**Start URL:** ${resolveStartUrl(normalizedBaseUrl, scenario.targetPath)}`);
+    }
+    userParts.push("**Navigation Boundary:** Treat the Base URL as the application under test. Resolve relative paths and in-app navigation against this origin. Do not navigate to another host unless a step explicitly includes an absolute external URL.");
+  }
+  if (scenario.targetPath) {
+    userParts.push(`**Target Path:** ${scenario.targetPath}`);
+  }
+  if (scenario.steps.length > 0) {
+    userParts.push("**Steps:**");
+    for (let i = 0;i < scenario.steps.length; i++) {
+      userParts.push(`${i + 1}. ${scenario.steps[i]}`);
+    }
+  }
+  return userParts.join(`
+`);
+}
 async function runAgentLoop(options) {
   const {
     client,
@@ -16004,6 +16108,7 @@ async function runAgentLoop(options) {
     model,
     runId,
     sessionId,
+    baseUrl,
     maxTurns = 30,
     onStep,
     persona,
@@ -16051,21 +16156,7 @@ Instructions: ${persona.instructions}` : "",
     "- Verify both positive and negative states"
   ].join(`
 `) + personaSection;
-  const userParts = [
-    `**Scenario:** ${scenario.name}`,
-    `**Description:** ${scenario.description}`
-  ];
-  if (scenario.targetPath) {
-    userParts.push(`**Target Path:** ${scenario.targetPath}`);
-  }
-  if (scenario.steps.length > 0) {
-    userParts.push("**Steps:**");
-    for (let i = 0;i < scenario.steps.length; i++) {
-      userParts.push(`${i + 1}. ${scenario.steps[i]}`);
-    }
-  }
-  const userMessage = userParts.join(`
-`);
+  const userMessage = buildScenarioUserMessage(scenario, baseUrl);
   const screenshots = [];
   let tokensUsed = 0;
   let stepNumber = 0;
@@ -16128,7 +16219,7 @@ Instructions: ${persona.instructions}` : "",
         if (onStep) {
           onStep({ type: "tool_call", toolName: toolBlock.name, toolInput, stepNumber });
         }
-        const execResult = await executeTool(page, screenshotter, toolBlock.name, toolInput, { runId, scenarioSlug, stepNumber, sessionId, a11y });
+        const execResult = await executeTool(page, screenshotter, toolBlock.name, toolInput, { runId, scenarioSlug, stepNumber, sessionId: sessionId ?? runId, a11y });
         if (onStep) {
           onStep({ type: "tool_result", toolName: toolBlock.name, toolResult: execResult.result, stepNumber });
         }
@@ -16179,10 +16270,17 @@ function detectProvider(model) {
     return "openai";
   if (model.startsWith("gemini-"))
     return "google";
+  if (model.startsWith("glm-") || model.startsWith("zai/") || model.startsWith("zai-"))
+    return "zai";
   if (model.startsWith("llama-") || model.startsWith("qwen-") || model.includes("cerebras"))
     return "cerebras";
   return "anthropic";
 }
+function resolveProviderApiKeyForModel(model, explicitApiKey, configuredAnthropicApiKey) {
+  if (explicitApiKey)
+    return explicitApiKey;
+  return detectProvider(model) === "anthropic" ? configuredAnthropicApiKey : undefined;
+}
 function createClient(apiKey) {
   const key = apiKey ?? process.env["ANTHROPIC_API_KEY"];
   if (!key) {
@@ -16260,26 +16358,34 @@ async function callOpenAICompatible(options) {
   const usage = { input_tokens: data.usage?.prompt_tokens ?? 0, output_tokens: data.usage?.completion_tokens ?? 0 };
   return { content, stop_reason: stopReason, usage };
 }
-function createClientForModel(model, apiKey) {
-  const provider = detectProvider(model);
+function createOpenAICompatibleConfig(provider, apiKey) {
   if (provider === "openai") {
-    const key = apiKey ?? process.env["OPENAI_API_KEY"];
-    if (!key)
+    const key2 = apiKey ?? process.env["OPENAI_API_KEY"];
+    if (!key2)
       throw new AIClientError("No OpenAI API key. Set OPENAI_API_KEY or pass it explicitly.");
-    return { provider: "openai", baseUrl: "https://api.openai.com/v1", apiKey: key };
+    return { provider: "openai", baseUrl: "https://api.openai.com/v1", apiKey: key2 };
   }
   if (provider === "google") {
-    const key = apiKey ?? process.env["GOOGLE_API_KEY"];
-    if (!key)
+    const key2 = apiKey ?? process.env["GOOGLE_API_KEY"];
+    if (!key2)
       throw new AIClientError("No Google API key. Set GOOGLE_API_KEY or pass it explicitly.");
-    return { provider: "google", baseUrl: "https://generativelanguage.googleapis.com/v1beta/openai", apiKey: key };
+    return { provider: "google", baseUrl: "https://generativelanguage.googleapis.com/v1beta/openai", apiKey: key2 };
   }
   if (provider === "cerebras") {
-    const key = apiKey ?? process.env["CEREBRAS_API_KEY"];
-    if (!key)
+    const key2 = apiKey ?? process.env["CEREBRAS_API_KEY"];
+    if (!key2)
       throw new AIClientError("No Cerebras API key. Set CEREBRAS_API_KEY or pass it explicitly.");
-    return { provider: "cerebras", baseUrl: "https://api.cerebras.ai/v1", apiKey: key };
+    return { provider: "cerebras", baseUrl: "https://api.cerebras.ai/v1", apiKey: key2 };
   }
+  const key = apiKey ?? process.env["ZAI_API_KEY"];
+  if (!key)
+    throw new AIClientError("No Z.AI API key. Set ZAI_API_KEY or pass it explicitly.");
+  return { provider: "zai", baseUrl: "https://api.z.ai/api/paas/v4", apiKey: key };
+}
+function createClientForModel(model, apiKey) {
+  const provider = detectProvider(model);
+  if (provider !== "anthropic")
+    return createOpenAICompatibleConfig(provider, apiKey);
   return createClient(apiKey);
 }
 var activeHARs, activeCoverage, BROWSER_TOOLS;
@@ -28623,34 +28729,27 @@ var init_v3 = __esm(() => {
 
 // node_modules/@ai-sdk/provider-utils/node_modules/eventsource-parser/dist/index.js
 function noop(_arg) {}
-function createParser(config2) {
-  if (typeof config2 == "function")
-    throw new TypeError("`config` must be an object, got a function instead. Did you mean `createParser({onEvent: fn})`?");
-  const { onEvent = noop, onError = noop, onRetry = noop, onComment, maxBufferSize } = config2, pendingFragments = [];
-  let pendingFragmentsLength = 0, isFirstChunk = true, id, data = "", dataLines = 0, eventType, terminated = false;
+function createParser(callbacks) {
+  if (typeof callbacks == "function")
+    throw new TypeError("`callbacks` must be an object, got a function instead. Did you mean `{onEvent: fn}`?");
+  const { onEvent = noop, onError = noop, onRetry = noop, onComment } = callbacks, pendingFragments = [];
+  let isFirstChunk = true, id, data = "", dataLines = 0, eventType;
   function feed(chunk) {
-    if (terminated)
-      throw new Error("Cannot feed parser: it was terminated after exceeding the configured max buffer size. Call `reset()` to resume parsing.");
     if (isFirstChunk && (isFirstChunk = false, chunk.charCodeAt(0) === 239 && chunk.charCodeAt(1) === 187 && chunk.charCodeAt(2) === 191 && (chunk = chunk.slice(3))), pendingFragments.length === 0) {
       const trailing2 = processLines(chunk);
-      trailing2 !== "" && (pendingFragments.push(trailing2), pendingFragmentsLength = trailing2.length), checkBufferSize();
+      trailing2 !== "" && pendingFragments.push(trailing2);
       return;
     }
     if (chunk.indexOf(`
 `) === -1 && chunk.indexOf("\r") === -1) {
-      pendingFragments.push(chunk), pendingFragmentsLength += chunk.length, checkBufferSize();
+      pendingFragments.push(chunk);
       return;
     }
     pendingFragments.push(chunk);
     const input = pendingFragments.join("");
-    pendingFragments.length = 0, pendingFragmentsLength = 0;
+    pendingFragments.length = 0;
     const trailing = processLines(input);
-    trailing !== "" && (pendingFragments.push(trailing), pendingFragmentsLength = trailing.length), checkBufferSize();
-  }
-  function checkBufferSize() {
-    maxBufferSize !== undefined && (pendingFragmentsLength + data.length <= maxBufferSize || (terminated = true, pendingFragments.length = 0, pendingFragmentsLength = 0, id = undefined, data = "", dataLines = 0, eventType = undefined, onError(new ParseError(`Buffered data exceeded max buffer size of ${maxBufferSize} characters`, {
-      type: "max-buffer-size-exceeded"
-    }))));
+    trailing !== "" && pendingFragments.push(trailing);
   }
   function processLines(chunk) {
     let searchIndex = 0;
@@ -28762,7 +28861,7 @@ ${value}`, dataLines++;
       const incompleteLine = pendingFragments.join("");
       parseLine(incompleteLine, 0, incompleteLine.length);
     }
-    isFirstChunk = true, id = undefined, data = "", dataLines = 0, eventType = undefined, pendingFragments.length = 0, pendingFragmentsLength = 0, terminated = false;
+    isFirstChunk = true, id = undefined, data = "", dataLines = 0, eventType = undefined, pendingFragments.length = 0;
   }
   return { feed, reset };
 }
@@ -28786,7 +28885,7 @@ var EventSourceParserStream;
 var init_stream = __esm(() => {
   init_dist3();
   EventSourceParserStream = class EventSourceParserStream extends TransformStream {
-    constructor({ onError, onRetry, onComment, maxBufferSize } = {}) {
+    constructor({ onError, onRetry, onComment } = {}) {
       let parser;
       super({
         start(controller) {
@@ -28795,11 +28894,10 @@ var init_stream = __esm(() => {
               controller.enqueue(event);
             },
             onError(error40) {
-              typeof onError == "function" && onError(error40), (onError === "terminate" || error40.type === "max-buffer-size-exceeded") && controller.error(error40);
+              onError === "terminate" ? controller.error(error40) : typeof onError == "function" && onError(error40);
             },
             onRetry,
-            onComment,
-            maxBufferSize
+            onComment
           });
         },
         transform(chunk) {
@@ -30238,7 +30336,7 @@ var DelayedPromise = class {
     });
   }
   return () => `${prefix}${separator}${generator()}`;
-}, generateId, FETCH_FAILED_ERROR_MESSAGES, BUN_ERROR_CODES, VERSION = "4.0.27", getOriginalFetch = () => globalThis.fetch, getFromApi = async ({
+}, generateId, FETCH_FAILED_ERROR_MESSAGES, BUN_ERROR_CODES, VERSION = "4.0.26", getOriginalFetch = () => globalThis.fetch, getFromApi = async ({
   url: url2,
   headers = {},
   successfulResponseHandler,
@@ -32377,7 +32475,7 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
       "ai-model-id": this.modelId
     };
   }
-}, gatewayRerankingResponseSchema, parallelSearchInputSchema, parallelSearchOutputSchema, parallelSearchToolFactory, parallelSearch = (config2 = {}) => parallelSearchToolFactory(config2), perplexitySearchInputSchema, perplexitySearchOutputSchema, perplexitySearchToolFactory, perplexitySearch = (config2 = {}) => perplexitySearchToolFactory(config2), gatewayTools, VERSION2 = "3.0.120", AI_GATEWAY_PROTOCOL_VERSION = "0.0.1", gateway;
+}, gatewayRerankingResponseSchema, parallelSearchInputSchema, parallelSearchOutputSchema, parallelSearchToolFactory, parallelSearch = (config2 = {}) => parallelSearchToolFactory(config2), perplexitySearchInputSchema, perplexitySearchOutputSchema, perplexitySearchToolFactory, perplexitySearch = (config2 = {}) => perplexitySearchToolFactory(config2), gatewayTools, VERSION2 = "3.0.110", AI_GATEWAY_PROTOCOL_VERSION = "0.0.1", gateway;
 var init_dist5 = __esm(() => {
   init_dist4();
   init_dist2();
@@ -32416,15 +32514,13 @@ var init_dist5 = __esm(() => {
       message,
       statusCode = 500,
       cause,
-      generationId,
-      isRetryable = statusCode != null && (statusCode === 408 || statusCode === 409 || statusCode === 429 || statusCode >= 500)
+      generationId
     }) {
       super(generationId ? `${message} [${generationId}]` : message);
       this[_a17] = true;
       this.statusCode = statusCode;
       this.cause = cause;
       this.generationId = generationId;
-      this.isRetryable = isRetryable;
     }
     static isInstance(error40) {
       return _GatewayError.hasMarker(error40);
@@ -32947,11 +33043,62 @@ Run 'npx vercel link' to link your project, then 'vc env pull' to fetch the toke
   gateway = createGatewayProvider();
 });
 
+// node_modules/@opentelemetry/api/build/src/platform/node/globalThis.js
+var require_globalThis = __commonJS((exports) => {
+  Object.defineProperty(exports, "__esModule", { value: true });
+  exports._globalThis = undefined;
+  exports._globalThis = typeof globalThis === "object" ? globalThis : global;
+});
+
+// node_modules/@opentelemetry/api/build/src/platform/node/index.js
+var require_node = __commonJS((exports) => {
+  var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
+    if (k2 === undefined)
+      k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() {
+      return m[k];
+    } });
+  } : function(o, m, k, k2) {
+    if (k2 === undefined)
+      k2 = k;
+    o[k2] = m[k];
+  });
+  var __exportStar = exports && exports.__exportStar || function(m, exports2) {
+    for (var p in m)
+      if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports2, p))
+        __createBinding(exports2, m, p);
+  };
+  Object.defineProperty(exports, "__esModule", { value: true });
+  __exportStar(require_globalThis(), exports);
+});
+
+// node_modules/@opentelemetry/api/build/src/platform/index.js
+var require_platform = __commonJS((exports) => {
+  var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
+    if (k2 === undefined)
+      k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() {
+      return m[k];
+    } });
+  } : function(o, m, k, k2) {
+    if (k2 === undefined)
+      k2 = k;
+    o[k2] = m[k];
+  });
+  var __exportStar = exports && exports.__exportStar || function(m, exports2) {
+    for (var p in m)
+      if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports2, p))
+        __createBinding(exports2, m, p);
+  };
+  Object.defineProperty(exports, "__esModule", { value: true });
+  __exportStar(require_node(), exports);
+});
+
 // node_modules/@opentelemetry/api/build/src/version.js
 var require_version = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.VERSION = undefined;
-  exports.VERSION = "1.9.1";
+  exports.VERSION = "1.9.0";
 });
 
 // node_modules/@opentelemetry/api/build/src/internal/semver.js
@@ -33029,11 +33176,12 @@ var require_semver = __commonJS((exports) => {
 var require_global_utils = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.unregisterGlobal = exports.getGlobal = exports.registerGlobal = undefined;
+  var platform_1 = require_platform();
   var version_1 = require_version();
   var semver_1 = require_semver();
   var major = version_1.VERSION.split(".")[0];
   var GLOBAL_OPENTELEMETRY_API_KEY = Symbol.for(`opentelemetry.js.api.${major}`);
-  var _global = typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : typeof window === "object" ? window : typeof global === "object" ? global : {};
+  var _global = platform_1._globalThis;
   function registerGlobal(type, instance, diag, allowOverride = false) {
     var _a16;
     const api2 = _global[GLOBAL_OPENTELEMETRY_API_KEY] = (_a16 = _global[GLOBAL_OPENTELEMETRY_API_KEY]) !== null && _a16 !== undefined ? _a16 : {
@@ -33105,7 +33253,8 @@ var require_ComponentLogger = __commonJS((exports) => {
     if (!logger) {
       return;
     }
-    return logger[funcName](namespace, ...args);
+    args.unshift(namespace);
+    return logger[funcName](...args);
   }
 });
 
@@ -33166,12 +33315,6 @@ var require_diag = __commonJS((exports) => {
   var API_NAME = "diag";
 
   class DiagAPI {
-    static instance() {
-      if (!this._instance) {
-        this._instance = new DiagAPI;
-      }
-      return this._instance;
-    }
     constructor() {
       function _logProxy(funcName) {
         return function(...args) {
@@ -33181,12 +33324,12 @@ var require_diag = __commonJS((exports) => {
           return logger[funcName](...args);
         };
       }
-      const self2 = this;
+      const self = this;
       const setLogger = (logger, optionsOrLogLevel = { logLevel: types_1.DiagLogLevel.INFO }) => {
         var _a16, _b16, _c;
-        if (logger === self2) {
+        if (logger === self) {
           const err = new Error("Cannot use diag as the logger for itself. Please use a DiagLogger implementation like ConsoleDiagLogger or a custom implementation");
-          self2.error((_a16 = err.stack) !== null && _a16 !== undefined ? _a16 : err.message);
+          self.error((_a16 = err.stack) !== null && _a16 !== undefined ? _a16 : err.message);
           return false;
         }
         if (typeof optionsOrLogLevel === "number") {
@@ -33201,20 +33344,26 @@ var require_diag = __commonJS((exports) => {
           oldLogger.warn(`Current logger will be overwritten from ${stack}`);
           newLogger.warn(`Current logger will overwrite one already registered from ${stack}`);
         }
-        return (0, global_utils_1.registerGlobal)("diag", newLogger, self2, true);
+        return (0, global_utils_1.registerGlobal)("diag", newLogger, self, true);
       };
-      self2.setLogger = setLogger;
-      self2.disable = () => {
-        (0, global_utils_1.unregisterGlobal)(API_NAME, self2);
+      self.setLogger = setLogger;
+      self.disable = () => {
+        (0, global_utils_1.unregisterGlobal)(API_NAME, self);
       };
-      self2.createComponentLogger = (options) => {
+      self.createComponentLogger = (options) => {
         return new ComponentLogger_1.DiagComponentLogger(options);
       };
-      self2.verbose = _logProxy("verbose");
-      self2.debug = _logProxy("debug");
-      self2.info = _logProxy("info");
-      self2.warn = _logProxy("warn");
-      self2.error = _logProxy("error");
+      self.verbose = _logProxy("verbose");
+      self.debug = _logProxy("debug");
+      self.info = _logProxy("info");
+      self.warn = _logProxy("warn");
+      self.error = _logProxy("error");
+    }
+    static instance() {
+      if (!this._instance) {
+        this._instance = new DiagAPI;
+      }
+      return this._instance;
     }
   }
   exports.DiagAPI = DiagAPI;
@@ -33237,7 +33386,7 @@ var require_baggage_impl = __commonJS((exports) => {
       return Object.assign({}, entry);
     }
     getAllEntries() {
-      return Array.from(this._entries.entries());
+      return Array.from(this._entries.entries()).map(([k, v]) => [k, v]);
     }
     setEntry(key, entry) {
       const newBaggage = new BaggageImpl(this._entries);
@@ -33308,16 +33457,16 @@ var require_context = __commonJS((exports) => {
 
   class BaseContext {
     constructor(parentContext) {
-      const self2 = this;
-      self2._currentContext = parentContext ? new Map(parentContext) : new Map;
-      self2.getValue = (key) => self2._currentContext.get(key);
-      self2.setValue = (key, value) => {
-        const context = new BaseContext(self2._currentContext);
+      const self = this;
+      self._currentContext = parentContext ? new Map(parentContext) : new Map;
+      self.getValue = (key) => self._currentContext.get(key);
+      self.setValue = (key, value) => {
+        const context = new BaseContext(self._currentContext);
         context._currentContext.set(key, value);
         return context;
       };
-      self2.deleteValue = (key) => {
-        const context = new BaseContext(self2._currentContext);
+      self.deleteValue = (key) => {
+        const context = new BaseContext(self._currentContext);
         context._currentContext.delete(key);
         return context;
       };
@@ -33329,7 +33478,7 @@ var require_context = __commonJS((exports) => {
 // node_modules/@opentelemetry/api/build/src/diag/consoleLogger.js
 var require_consoleLogger = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
-  exports.DiagConsoleLogger = exports._originalConsoleMethods = undefined;
+  exports.DiagConsoleLogger = undefined;
   var consoleMap = [
     { n: "error", c: "error" },
     { n: "warn", c: "warn" },
@@ -33337,39 +33486,19 @@ var require_consoleLogger = __commonJS((exports) => {
     { n: "debug", c: "debug" },
     { n: "verbose", c: "trace" }
   ];
-  exports._originalConsoleMethods = {};
-  if (typeof console !== "undefined") {
-    const keys = [
-      "error",
-      "warn",
-      "info",
-      "debug",
-      "trace",
-      "log"
-    ];
-    for (const key of keys) {
-      if (typeof console[key] === "function") {
-        exports._originalConsoleMethods[key] = console[key];
-      }
-    }
-  }
 
   class DiagConsoleLogger {
     constructor() {
       function _consoleFunc(funcName) {
         return function(...args) {
-          let theFunc = exports._originalConsoleMethods[funcName];
-          if (typeof theFunc !== "function") {
-            theFunc = exports._originalConsoleMethods["log"];
-          }
-          if (typeof theFunc !== "function" && console) {
-            theFunc = console[funcName];
+          if (console) {
+            let theFunc = console[funcName];
             if (typeof theFunc !== "function") {
               theFunc = console.log;
             }
-          }
-          if (typeof theFunc === "function") {
-            return theFunc.apply(console, args);
+            if (typeof theFunc === "function") {
+              return theFunc.apply(console, args);
+            }
           }
         };
       }
@@ -33607,8 +33736,8 @@ var require_NonRecordingSpan = __commonJS((exports) => {
   var invalid_span_constants_1 = require_invalid_span_constants();
 
   class NonRecordingSpan {
-    constructor(spanContext = invalid_span_constants_1.INVALID_SPAN_CONTEXT) {
-      this._spanContext = spanContext;
+    constructor(_spanContext = invalid_span_constants_1.INVALID_SPAN_CONTEXT) {
+      this._spanContext = _spanContext;
     }
     spanContext() {
       return this._spanContext;
@@ -33684,126 +33813,14 @@ var require_spancontext_utils = __commonJS((exports) => {
   exports.wrapSpanContext = exports.isSpanContextValid = exports.isValidSpanId = exports.isValidTraceId = undefined;
   var invalid_span_constants_1 = require_invalid_span_constants();
   var NonRecordingSpan_1 = require_NonRecordingSpan();
-  var isHex = new Uint8Array([
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    1,
-    1,
-    1,
-    1,
-    1,
-    1,
-    1,
-    1,
-    1,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    1,
-    1,
-    1,
-    1,
-    1,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    1,
-    1,
-    1,
-    1,
-    1,
-    1
-  ]);
-  function isValidHex(id, length) {
-    if (typeof id !== "string" || id.length !== length)
-      return false;
-    let r = 0;
-    for (let i = 0;i < id.length; i += 4) {
-      r += (isHex[id.charCodeAt(i)] | 0) + (isHex[id.charCodeAt(i + 1)] | 0) + (isHex[id.charCodeAt(i + 2)] | 0) + (isHex[id.charCodeAt(i + 3)] | 0);
-    }
-    return r === length;
-  }
+  var VALID_TRACEID_REGEX = /^([0-9a-f]{32})$/i;
+  var VALID_SPANID_REGEX = /^[0-9a-f]{16}$/i;
   function isValidTraceId(traceId) {
-    return isValidHex(traceId, 32) && traceId !== invalid_span_constants_1.INVALID_TRACEID;
+    return VALID_TRACEID_REGEX.test(traceId) && traceId !== invalid_span_constants_1.INVALID_TRACEID;
   }
   exports.isValidTraceId = isValidTraceId;
   function isValidSpanId(spanId) {
-    return isValidHex(spanId, 16) && spanId !== invalid_span_constants_1.INVALID_SPANID;
+    return VALID_SPANID_REGEX.test(spanId) && spanId !== invalid_span_constants_1.INVALID_SPANID;
   }
   exports.isValidSpanId = isValidSpanId;
   function isSpanContextValid(spanContext) {
@@ -33863,7 +33880,7 @@ var require_NoopTracer = __commonJS((exports) => {
   }
   exports.NoopTracer = NoopTracer;
   function isSpanContext(spanContext) {
-    return spanContext !== null && typeof spanContext === "object" && "spanId" in spanContext && typeof spanContext["spanId"] === "string" && "traceId" in spanContext && typeof spanContext["traceId"] === "string" && "traceFlags" in spanContext && typeof spanContext["traceFlags"] === "number";
+    return typeof spanContext === "object" && typeof spanContext["spanId"] === "string" && typeof spanContext["traceId"] === "string" && typeof spanContext["traceFlags"] === "number";
   }
 });
 
@@ -33875,8 +33892,8 @@ var require_ProxyTracer = __commonJS((exports) => {
   var NOOP_TRACER = new NoopTracer_1.NoopTracer;
 
   class ProxyTracer {
-    constructor(provider, name15, version2, options) {
-      this._provider = provider;
+    constructor(_provider, name15, version2, options) {
+      this._provider = _provider;
       this.name = name15;
       this.version = version2;
       this.options = options;
@@ -34036,7 +34053,7 @@ var require_tracestate_impl = __commonJS((exports) => {
       return this._internalState.get(key);
     }
     serialize() {
-      return Array.from(this._internalState.keys()).reduceRight((agg, key) => {
+      return this._keys().reduce((agg, key) => {
         agg.push(key + LIST_MEMBER_KEY_VALUE_SPLITTER + this.get(key));
         return agg;
       }, []).join(LIST_MEMBERS_SEPARATOR);
@@ -34044,7 +34061,7 @@ var require_tracestate_impl = __commonJS((exports) => {
     _parse(rawTraceState) {
       if (rawTraceState.length > MAX_TRACE_STATE_LEN)
         return;
-      this._internalState = rawTraceState.split(LIST_MEMBERS_SEPARATOR).reduceRight((agg, part) => {
+      this._internalState = rawTraceState.split(LIST_MEMBERS_SEPARATOR).reverse().reduce((agg, part) => {
         const listMember = part.trim();
         const i = listMember.indexOf(LIST_MEMBER_KEY_VALUE_SPLITTER);
         if (i !== -1) {
@@ -35144,10 +35161,7 @@ function convertToLanguageModelMessage({
                 type: "tool-result",
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
-                output: mapToolResultOutput({
-                  output: part.output,
-                  downloadedAssets
-                }),
+                output: mapToolResultOutput(part.output),
                 providerOptions
               };
             }
@@ -35166,10 +35180,7 @@ function convertToLanguageModelMessage({
                 type: "tool-result",
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
-                output: mapToolResultOutput({
-                  output: part.output,
-                  downloadedAssets
-                }),
+                output: mapToolResultOutput(part.output),
                 providerOptions: part.providerOptions
               };
             }
@@ -35193,44 +35204,15 @@ function convertToLanguageModelMessage({
   }
 }
 async function downloadAssets(messages, download2, supportedUrls) {
-  var _a21;
-  const downloadableFiles = [];
-  for (const message of messages) {
-    if (message.role === "user" && Array.isArray(message.content)) {
-      for (const part of message.content) {
-        if (part.type === "image" || part.type === "file") {
-          downloadableFiles.push({
-            data: part.type === "image" ? part.image : part.data,
-            mediaType: (_a21 = part.mediaType) != null ? _a21 : part.type === "image" ? "image/*" : undefined
-          });
-        }
-      }
-    }
-    if (message.role === "tool" || message.role === "assistant") {
-      if (!Array.isArray(message.content)) {
-        continue;
-      }
-      for (const part of message.content) {
-        if (part.type !== "tool-result") {
-          continue;
-        }
-        if (part.output.type !== "content") {
-          continue;
-        }
-        for (const contentPart of part.output.value) {
-          if (contentPart.type === "image-url" || contentPart.type === "file-url") {
-            downloadableFiles.push({
-              data: new URL(contentPart.url),
-              mediaType: contentPart.type === "image-url" ? "image/*" : undefined
-            });
-          }
-        }
-      }
+  const plannedDownloads = messages.filter((message) => message.role === "user").map((message) => message.content).filter((content) => Array.isArray(content)).flat().filter((part) => part.type === "image" || part.type === "file").map((part) => {
+    var _a21;
+    const mediaType = (_a21 = part.mediaType) != null ? _a21 : part.type === "image" ? "image/*" : undefined;
+    let data = part.type === "image" ? part.image : part.data;
+    if (typeof data === "string") {
+      try {
+        data = new URL(data);
+      } catch (ignored) {}
     }
-  }
-  const plannedDownloads = downloadableFiles.map((part) => {
-    const mediaType = part.mediaType;
-    const { data } = convertToLanguageModelV3DataContent(part.data);
     return { mediaType, data };
   }).filter((part) => part.data instanceof URL).map((part) => ({
     url: part.data,
@@ -35304,41 +35286,13 @@ function convertPartToLanguageModelPart(part, downloadedAssets) {
     }
   }
 }
-function mapToolResultOutput({
-  output,
-  downloadedAssets
-}) {
+function mapToolResultOutput(output) {
   if (output.type !== "content") {
     return output;
   }
   return {
     type: "content",
     value: output.value.map((item) => {
-      var _a21, _b16;
-      if (item.type === "image-url") {
-        const downloadedFile = downloadedAssets[new URL(item.url).toString()];
-        if (downloadedFile) {
-          return {
-            type: "image-data",
-            data: convertDataContentToBase64String(downloadedFile.data),
-            mediaType: (_a21 = downloadedFile.mediaType) != null ? _a21 : "image/*",
-            providerOptions: item.providerOptions
-          };
-        }
-        return item;
-      }
-      if (item.type === "file-url") {
-        const downloadedFile = downloadedAssets[new URL(item.url).toString()];
-        if (downloadedFile) {
-          return {
-            type: "file-data",
-            data: convertDataContentToBase64String(downloadedFile.data),
-            mediaType: (_b16 = downloadedFile.mediaType) != null ? _b16 : "application/octet-stream",
-            providerOptions: item.providerOptions
-          };
-        }
-        return item;
-      }
       if (item.type !== "media") {
         return item;
       }
@@ -35891,7 +35845,7 @@ function getRetryDelayInMs({
   error: error40,
   exponentialBackoffDelay
 }) {
-  const headers = APICallError.isInstance(error40) ? error40.responseHeaders : APICallError.isInstance(error40.cause) ? error40.cause.responseHeaders : undefined;
+  const headers = error40.responseHeaders;
   if (!headers)
     return exponentialBackoffDelay;
   let ms;
@@ -35941,7 +35895,7 @@ async function _retryWithExponentialBackoff(f, {
         errors: newErrors
       });
     }
-    if (error40 instanceof Error && (APICallError.isInstance(error40) && error40.isRetryable === true || GatewayError.isInstance(error40) && error40.isRetryable === true) && tryNumber <= maxRetries) {
+    if (error40 instanceof Error && APICallError.isInstance(error40) && error40.isRetryable === true && tryNumber <= maxRetries) {
       await delay(getRetryDelayInMs({
         error: error40,
         exponentialBackoffDelay: delayInMs
@@ -36159,8 +36113,7 @@ async function executeToolCall({
           input,
           error: error40,
           dynamic: tool2.type === "dynamic",
-          ...toolCall.providerMetadata != null ? { providerMetadata: toolCall.providerMetadata } : {},
-          ...toolCall.toolMetadata != null ? { toolMetadata: toolCall.toolMetadata } : {}
+          ...toolCall.providerMetadata != null ? { providerMetadata: toolCall.providerMetadata } : {}
         };
       }
       const durationMs = now2() - startTime;
@@ -36190,8 +36143,7 @@ async function executeToolCall({
         input,
         output,
         dynamic: tool2.type === "dynamic",
-        ...toolCall.providerMetadata != null ? { providerMetadata: toolCall.providerMetadata } : {},
-        ...toolCall.toolMetadata != null ? { toolMetadata: toolCall.toolMetadata } : {}
+        ...toolCall.providerMetadata != null ? { providerMetadata: toolCall.providerMetadata } : {}
       };
     }
   });
@@ -36556,6 +36508,15 @@ async function parsePartialJson(jsonText) {
   }
   return { value: undefined, state: "failed-parse" };
 }
+function mergeToolProviderMetadata(toolMetadata, callMetadata) {
+  if (toolMetadata == null) {
+    return callMetadata;
+  }
+  if (callMetadata == null) {
+    return toolMetadata;
+  }
+  return { ...toolMetadata, ...callMetadata };
+}
 async function parseToolCall({
   toolCall,
   tools,
@@ -36563,6 +36524,7 @@ async function parseToolCall({
   system,
   messages
 }) {
+  var _a21, _b16;
   try {
     if (tools == null) {
       if (toolCall.providerExecuted && toolCall.dynamic) {
@@ -36603,7 +36565,6 @@ async function parseToolCall({
   } catch (error40) {
     const parsedInput = await safeParseJSON({ text: toolCall.input });
     const input = parsedInput.success ? parsedInput.value : toolCall.input;
-    const tool2 = tools == null ? undefined : tools[toolCall.toolName];
     return {
       type: "tool-call",
       toolCallId: toolCall.toolCallId,
@@ -36612,10 +36573,9 @@ async function parseToolCall({
       dynamic: true,
       invalid: true,
       error: error40,
-      title: tool2 == null ? undefined : tool2.title,
+      title: (_a21 = tools == null ? undefined : tools[toolCall.toolName]) == null ? undefined : _a21.title,
       providerExecuted: toolCall.providerExecuted,
-      providerMetadata: toolCall.providerMetadata,
-      ...(tool2 == null ? undefined : tool2.metadata) != null ? { toolMetadata: tool2.metadata } : {}
+      providerMetadata: mergeToolProviderMetadata((_b16 = tools == null ? undefined : tools[toolCall.toolName]) == null ? undefined : _b16.providerMetadata, toolCall.providerMetadata)
     };
   }
 }
@@ -36662,14 +36622,14 @@ async function doParseToolCall({
       cause: parseResult.error
     });
   }
+  const mergedProviderMetadata = mergeToolProviderMetadata(tool2.providerMetadata, toolCall.providerMetadata);
   return tool2.type === "dynamic" ? {
     type: "tool-call",
     toolCallId: toolCall.toolCallId,
     toolName: toolCall.toolName,
     input: parseResult.value,
     providerExecuted: toolCall.providerExecuted,
-    providerMetadata: toolCall.providerMetadata,
-    ...tool2.metadata != null ? { toolMetadata: tool2.metadata } : {},
+    providerMetadata: mergedProviderMetadata,
     dynamic: true,
     title: tool2.title
   } : {
@@ -36678,8 +36638,7 @@ async function doParseToolCall({
     toolName,
     input: parseResult.value,
     providerExecuted: toolCall.providerExecuted,
-    providerMetadata: toolCall.providerMetadata,
-    ...tool2.metadata != null ? { toolMetadata: tool2.metadata } : {},
+    providerMetadata: mergedProviderMetadata,
     title: tool2.title
   };
 }
@@ -37511,8 +37470,7 @@ function asContent({
               error: part.result,
               providerExecuted: true,
               dynamic: part.dynamic,
-              ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
-              ...(tool2 == null ? undefined : tool2.metadata) != null ? { toolMetadata: tool2.metadata } : {}
+              ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
             });
           } else {
             contentParts.push({
@@ -37523,8 +37481,7 @@ function asContent({
               output: part.result,
               providerExecuted: true,
               dynamic: part.dynamic,
-              ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
-              ...(tool2 == null ? undefined : tool2.metadata) != null ? { toolMetadata: tool2.metadata } : {}
+              ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
             });
           }
           break;
@@ -37538,8 +37495,7 @@ function asContent({
             error: part.result,
             providerExecuted: true,
             dynamic: toolCall.dynamic,
-            ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
-            ...toolCall.toolMetadata != null ? { toolMetadata: toolCall.toolMetadata } : {}
+            ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
           });
         } else {
           contentParts.push({
@@ -37550,8 +37506,7 @@ function asContent({
             output: part.result,
             providerExecuted: true,
             dynamic: toolCall.dynamic,
-            ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
-            ...toolCall.toolMetadata != null ? { toolMetadata: toolCall.toolMetadata } : {}
+            ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
           });
         }
         break;
@@ -37765,9 +37720,6 @@ function processUIMessageStream({
             if (options.title !== undefined) {
               anyPart.title = options.title;
             }
-            if (options.toolMetadata !== undefined) {
-              anyPart.toolMetadata = options.toolMetadata;
-            }
             anyPart.providerExecuted = (_a222 = anyOptions.providerExecuted) != null ? _a222 : part.providerExecuted;
             const providerMetadata = anyOptions.providerMetadata;
             if (providerMetadata != null) {
@@ -37784,7 +37736,6 @@ function processUIMessageStream({
               toolCallId: options.toolCallId,
               state: options.state,
               title: options.title,
-              ...options.toolMetadata !== undefined ? { toolMetadata: options.toolMetadata } : {},
               input: anyOptions.input,
               output: anyOptions.output,
               rawInput: anyOptions.rawInput,
@@ -37812,9 +37763,6 @@ function processUIMessageStream({
             if (options.title !== undefined) {
               anyPart.title = options.title;
             }
-            if (options.toolMetadata !== undefined) {
-              anyPart.toolMetadata = options.toolMetadata;
-            }
             anyPart.providerExecuted = (_b23 = anyOptions.providerExecuted) != null ? _b23 : part.providerExecuted;
             const providerMetadata = anyOptions.providerMetadata;
             if (providerMetadata != null) {
@@ -37837,7 +37785,6 @@ function processUIMessageStream({
               preliminary: anyOptions.preliminary,
               providerExecuted: anyOptions.providerExecuted,
               title: options.title,
-              ...options.toolMetadata !== undefined ? { toolMetadata: options.toolMetadata } : {},
               ...anyOptions.providerMetadata != null && (options.state === "output-available" || options.state === "output-error") ? { resultProviderMetadata: anyOptions.providerMetadata } : {},
               ...anyOptions.providerMetadata != null && !(options.state === "output-available" || options.state === "output-error") ? { callProviderMetadata: anyOptions.providerMetadata } : {}
             });
@@ -37982,8 +37929,7 @@ function processUIMessageStream({
               toolName: chunk.toolName,
               index: toolInvocations.length,
               dynamic: chunk.dynamic,
-              title: chunk.title,
-              toolMetadata: chunk.toolMetadata
+              title: chunk.title
             };
             if (chunk.dynamic) {
               updateDynamicToolPart({
@@ -37993,7 +37939,6 @@ function processUIMessageStream({
                 input: undefined,
                 providerExecuted: chunk.providerExecuted,
                 title: chunk.title,
-                toolMetadata: chunk.toolMetadata,
                 providerMetadata: chunk.providerMetadata
               });
             } else {
@@ -38004,7 +37949,6 @@ function processUIMessageStream({
                 input: undefined,
                 providerExecuted: chunk.providerExecuted,
                 title: chunk.title,
-                toolMetadata: chunk.toolMetadata,
                 providerMetadata: chunk.providerMetadata
               });
             }
@@ -38028,8 +37972,7 @@ function processUIMessageStream({
                 toolName: partialToolCall.toolName,
                 state: "input-streaming",
                 input: partialArgs,
-                title: partialToolCall.title,
-                toolMetadata: partialToolCall.toolMetadata
+                title: partialToolCall.title
               });
             } else {
               updateToolPart({
@@ -38037,8 +37980,7 @@ function processUIMessageStream({
                 toolName: partialToolCall.toolName,
                 state: "input-streaming",
                 input: partialArgs,
-                title: partialToolCall.title,
-                toolMetadata: partialToolCall.toolMetadata
+                title: partialToolCall.title
               });
             }
             write();
@@ -38053,8 +37995,7 @@ function processUIMessageStream({
                 input: chunk.input,
                 providerExecuted: chunk.providerExecuted,
                 providerMetadata: chunk.providerMetadata,
-                title: chunk.title,
-                toolMetadata: chunk.toolMetadata
+                title: chunk.title
               });
             } else {
               updateToolPart({
@@ -38064,8 +38005,7 @@ function processUIMessageStream({
                 input: chunk.input,
                 providerExecuted: chunk.providerExecuted,
                 providerMetadata: chunk.providerMetadata,
-                title: chunk.title,
-                toolMetadata: chunk.toolMetadata
+                title: chunk.title
               });
             }
             write();
@@ -38087,8 +38027,7 @@ function processUIMessageStream({
                 input: chunk.input,
                 errorText: chunk.errorText,
                 providerExecuted: chunk.providerExecuted,
-                providerMetadata: chunk.providerMetadata,
-                toolMetadata: chunk.toolMetadata
+                providerMetadata: chunk.providerMetadata
               });
             } else {
               updateToolPart({
@@ -38099,8 +38038,7 @@ function processUIMessageStream({
                 rawInput: chunk.input,
                 errorText: chunk.errorText,
                 providerExecuted: chunk.providerExecuted,
-                providerMetadata: chunk.providerMetadata,
-                toolMetadata: chunk.toolMetadata
+                providerMetadata: chunk.providerMetadata
               });
             }
             write();
@@ -38131,8 +38069,7 @@ function processUIMessageStream({
                 preliminary: chunk.preliminary,
                 providerExecuted: chunk.providerExecuted,
                 providerMetadata: chunk.providerMetadata,
-                title: toolInvocation.title,
-                toolMetadata: toolInvocation.toolMetadata
+                title: toolInvocation.title
               });
             } else {
               updateToolPart({
@@ -38144,8 +38081,7 @@ function processUIMessageStream({
                 providerExecuted: chunk.providerExecuted,
                 preliminary: chunk.preliminary,
                 providerMetadata: chunk.providerMetadata,
-                title: toolInvocation.title,
-                toolMetadata: toolInvocation.toolMetadata
+                title: toolInvocation.title
               });
             }
             write();
@@ -38162,8 +38098,7 @@ function processUIMessageStream({
                 errorText: chunk.errorText,
                 providerExecuted: chunk.providerExecuted,
                 providerMetadata: chunk.providerMetadata,
-                title: toolInvocation.title,
-                toolMetadata: toolInvocation.toolMetadata
+                title: toolInvocation.title
               });
             } else {
               updateToolPart({
@@ -38175,8 +38110,7 @@ function processUIMessageStream({
                 errorText: chunk.errorText,
                 providerExecuted: chunk.providerExecuted,
                 providerMetadata: chunk.providerMetadata,
-                title: toolInvocation.title,
-                toolMetadata: toolInvocation.toolMetadata
+                title: toolInvocation.title
               });
             }
             write();
@@ -38634,8 +38568,7 @@ function runToolsTransformation({
                 input: toolCall.input,
                 error: getErrorMessage2(toolCall.error),
                 dynamic: true,
-                title: toolCall.title,
-                ...toolCall.toolMetadata != null ? { toolMetadata: toolCall.toolMetadata } : {}
+                title: toolCall.title
               });
               break;
             }
@@ -38703,7 +38636,6 @@ function runToolsTransformation({
         }
         case "tool-result": {
           const toolName = chunk.toolName;
-          const toolCall = toolCallsByToolCallId.get(chunk.toolCallId);
           if (chunk.isError) {
             toolResultsStreamController.enqueue({
               type: "tool-error",
@@ -38713,8 +38645,7 @@ function runToolsTransformation({
               providerExecuted: true,
               error: chunk.result,
               dynamic: chunk.dynamic,
-              ...chunk.providerMetadata != null ? { providerMetadata: chunk.providerMetadata } : {},
-              ...(toolCall == null ? undefined : toolCall.toolMetadata) != null ? { toolMetadata: toolCall.toolMetadata } : {}
+              ...chunk.providerMetadata != null ? { providerMetadata: chunk.providerMetadata } : {}
             });
           } else {
             controller.enqueue({
@@ -38725,8 +38656,7 @@ function runToolsTransformation({
               output: chunk.result,
               providerExecuted: true,
               dynamic: chunk.dynamic,
-              ...chunk.providerMetadata != null ? { providerMetadata: chunk.providerMetadata } : {},
-              ...(toolCall == null ? undefined : toolCall.toolMetadata) != null ? { toolMetadata: toolCall.toolMetadata } : {}
+              ...chunk.providerMetadata != null ? { providerMetadata: chunk.providerMetadata } : {}
             });
           }
           break;
@@ -39509,7 +39439,7 @@ async function embed({
         }),
         tracer,
         fn: async (doEmbedSpan) => {
-          var _a21, _b16;
+          var _a21;
           const modelResponse = await model.doEmbed({
             values: [value],
             abortSignal,
@@ -39530,7 +39460,7 @@ async function embed({
           return {
             embedding: embedding2,
             usage: usage2,
-            warnings: (_b16 = modelResponse.warnings) != null ? _b16 : [],
+            warnings: modelResponse.warnings,
             providerMetadata: modelResponse.providerMetadata,
             response: modelResponse.response
           };
@@ -39626,7 +39556,7 @@ async function embedMany({
             }),
             tracer,
             fn: async (doEmbedSpan) => {
-              var _a222, _b16;
+              var _a222;
               const modelResponse = await model.doEmbed({
                 values,
                 abortSignal,
@@ -39647,7 +39577,7 @@ async function embedMany({
               return {
                 embeddings: embeddings3,
                 usage: usage2,
-                warnings: (_b16 = modelResponse.warnings) != null ? _b16 : [],
+                warnings: modelResponse.warnings,
                 providerMetadata: modelResponse.providerMetadata,
                 response: modelResponse.response
               };
@@ -39704,7 +39634,7 @@ async function embedMany({
               }),
               tracer,
               fn: async (doEmbedSpan) => {
-                var _a222, _b16;
+                var _a222;
                 const modelResponse = await model.doEmbed({
                   values: chunk,
                   abortSignal,
@@ -39725,7 +39655,7 @@ async function embedMany({
                 return {
                   embeddings: embeddings2,
                   usage,
-                  warnings: (_b16 = modelResponse.warnings) != null ? _b16 : [],
+                  warnings: modelResponse.warnings,
                   providerMetadata: modelResponse.providerMetadata,
                   response: modelResponse.response
                 };
@@ -41839,7 +41769,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
   const bytes = typeof data === "string" ? convertBase64ToUint8Array(data) : data;
   const id3Size = (bytes[6] & 127) << 21 | (bytes[7] & 127) << 14 | (bytes[8] & 127) << 7 | bytes[9] & 127;
   return bytes.slice(id3Size + 10);
-}, VERSION3 = "6.0.191", download = async ({
+}, VERSION3 = "6.0.175", download = async ({
   url: url2,
   maxBytes,
   abortSignal
@@ -42347,7 +42277,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
     }
     return this._output;
   }
-}, JsonToSseTransformStream, UI_MESSAGE_STREAM_HEADERS, toolMetadataSchema, uiMessageChunkSchema, isToolOrDynamicToolUIPart, getToolOrDynamicToolName, originalGenerateId2, DefaultStreamTextResult = class {
+}, JsonToSseTransformStream, UI_MESSAGE_STREAM_HEADERS, uiMessageChunkSchema, isToolOrDynamicToolUIPart, getToolOrDynamicToolName, originalGenerateId2, DefaultStreamTextResult = class {
   constructor({
     model,
     telemetry,
@@ -42577,18 +42507,18 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
             const error40 = (abortSignal == null ? undefined : abortSignal.aborted) ? abortSignal.reason : new NoOutputGeneratedError({
               message: "No output generated. Check the stream for errors."
             });
-            self2._finishReason.reject(error40);
-            self2._rawFinishReason.reject(error40);
-            self2._totalUsage.reject(error40);
-            self2._steps.reject(error40);
+            self._finishReason.reject(error40);
+            self._rawFinishReason.reject(error40);
+            self._totalUsage.reject(error40);
+            self._steps.reject(error40);
             return;
           }
           const finishReason = recordedFinishReason != null ? recordedFinishReason : "other";
           const totalUsage = recordedTotalUsage != null ? recordedTotalUsage : createNullLanguageModelUsage();
-          self2._finishReason.resolve(finishReason);
-          self2._rawFinishReason.resolve(recordedRawFinishReason);
-          self2._totalUsage.resolve(totalUsage);
-          self2._steps.resolve(recordedSteps);
+          self._finishReason.resolve(finishReason);
+          self._rawFinishReason.resolve(recordedRawFinishReason);
+          self._totalUsage.resolve(totalUsage);
+          self._steps.resolve(recordedSteps);
           const finalStep = recordedSteps[recordedSteps.length - 1];
           await notify({
             event: {
@@ -42719,7 +42649,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
       headers,
       settings: { ...callSettings, maxRetries }
     });
-    const self2 = this;
+    const self = this;
     const modelInfo = { provider: model.provider, modelId: model.modelId };
     const callbackTelemetryProps = {
       functionId: telemetry == null ? undefined : telemetry.functionId,
@@ -42793,7 +42723,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
               toolExecutionStepStreamController = controller;
             }
           });
-          self2.addStream(toolExecutionStepStream);
+          self.addStream(toolExecutionStepStream);
           try {
             for (const toolApproval of [
               ...localDeniedToolApprovals,
@@ -42877,7 +42807,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
           usage
         }) {
           var _a21, _b16, _c, _d, _e, _f, _g, _h, _i;
-          const includeRawChunks2 = self2.includeRawChunks;
+          const includeRawChunks2 = self.includeRawChunks;
           const stepTimeoutId = stepTimeoutMs != null ? setTimeout(() => stepAbortController.abort(), stepTimeoutMs) : undefined;
           let chunkTimeoutId = undefined;
           function resetChunkTimeout() {
@@ -43049,7 +42979,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
               modelId: modelInfo.modelId
             };
             let activeText = "";
-            self2.addStream(streamWithToolResults.pipeThrough(new TransformStream({
+            self.addStream(streamWithToolResults.pipeThrough(new TransformStream({
               async transform(chunk, controller) {
                 var _a222, _b23, _c2, _d2, _e2;
                 resetChunkTimeout();
@@ -43312,7 +43242,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
                       type: "error",
                       error: error40
                     });
-                    self2.closeStream();
+                    self.closeStream();
                   }
                 } else {
                   controller.enqueue({
@@ -43321,7 +43251,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
                     rawFinishReason: stepRawFinishReason,
                     totalUsage: combinedUsage
                   });
-                  self2.closeStream();
+                  self.closeStream();
                 }
               }
             })));
@@ -43337,13 +43267,13 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
         });
       }
     }).catch((error40) => {
-      self2.addStream(new ReadableStream({
+      self.addStream(new ReadableStream({
         start(controller) {
           controller.enqueue({ type: "error", error: error40 });
           controller.close();
         }
       }));
-      self2.closeStream();
+      self.closeStream();
     });
   }
   get steps() {
@@ -43595,7 +43525,6 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
               toolName: part.toolName,
               ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
               ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
-              ...part.toolMetadata != null ? { toolMetadata: part.toolMetadata } : {},
               ...dynamic != null ? { dynamic } : {},
               ...part.title != null ? { title: part.title } : {}
             });
@@ -43619,7 +43548,6 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
                 input: part.input,
                 ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
                 ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
-                ...part.toolMetadata != null ? { toolMetadata: part.toolMetadata } : {},
                 ...dynamic != null ? { dynamic } : {},
                 errorText: onError(part.error),
                 ...part.title != null ? { title: part.title } : {}
@@ -43632,7 +43560,6 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
                 input: part.input,
                 ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
                 ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
-                ...part.toolMetadata != null ? { toolMetadata: part.toolMetadata } : {},
                 ...dynamic != null ? { dynamic } : {},
                 ...part.title != null ? { title: part.title } : {}
               });
@@ -43655,7 +43582,6 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
               output: part.output,
               ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
               ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
-              ...part.toolMetadata != null ? { toolMetadata: part.toolMetadata } : {},
               ...part.preliminary != null ? { preliminary: part.preliminary } : {},
               ...dynamic != null ? { dynamic } : {}
             });
@@ -43669,7 +43595,6 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
               errorText: part.providerExecuted ? typeof part.error === "string" ? part.error : JSON.stringify(part.error) : onError(part.error),
               ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
               ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
-              ...part.toolMetadata != null ? { toolMetadata: part.toolMetadata } : {},
               ...dynamic != null ? { dynamic } : {}
             });
             break;
@@ -43843,21 +43768,10 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
       ...options
     };
     const preparedCallArgs = (_d = await ((_c = (_b16 = this.settings).prepareCall) == null ? undefined : _c.call(_b16, baseCallArgs))) != null ? _d : baseCallArgs;
-    const {
-      instructions,
-      allowSystemInMessages,
-      messages,
-      prompt,
-      ...callArgs
-    } = preparedCallArgs;
+    const { instructions, messages, prompt, ...callArgs } = preparedCallArgs;
     return {
       ...callArgs,
-      ...{
-        system: instructions,
-        allowSystemInMessages,
-        messages,
-        prompt
-      }
+      ...{ system: instructions, messages, prompt }
     };
   }
   mergeOnStepFinishCallbacks(methodCallback) {
@@ -43898,7 +43812,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
       onStepFinish: this.mergeOnStepFinishCallbacks(onStepFinish)
     });
   }
-}, toolMetadataSchema2, uiMessagesSchema, DefaultEmbedResult = class {
+}, uiMessagesSchema, DefaultEmbedResult = class {
   constructor(options) {
     this.value = options.value;
     this.embedding = options.embedding;
@@ -44214,7 +44128,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
       settings: { ...callSettings, maxRetries }
     });
     const tracer = getTracer(telemetry);
-    const self2 = this;
+    const self = this;
     const stitchableStream = createStitchableStream();
     const eventProcessor = new TransformStream({
       transform(chunk, controller) {
@@ -44323,7 +44237,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
             result: await model.doStream(callOptions)
           })
         }));
-        self2._request.resolve(request != null ? request : {});
+        self._request.resolve(request != null ? request : {});
         let warnings;
         let usage = createNullLanguageModelUsage();
         let finishReason;
@@ -44414,24 +44328,24 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
                   provider: model.provider,
                   model: model.modelId
                 });
-                self2._usage.resolve(usage);
-                self2._providerMetadata.resolve(providerMetadata);
-                self2._warnings.resolve(warnings);
-                self2._response.resolve({
+                self._usage.resolve(usage);
+                self._providerMetadata.resolve(providerMetadata);
+                self._warnings.resolve(warnings);
+                self._response.resolve({
                   ...fullResponse,
                   headers: response == null ? undefined : response.headers
                 });
-                self2._finishReason.resolve(finishReason != null ? finishReason : "other");
+                self._finishReason.resolve(finishReason != null ? finishReason : "other");
                 try {
                   object22 = await parseAndValidateObjectResultWithRepair(accumulatedText, outputStrategy, repairText, {
                     response: fullResponse,
                     usage,
                     finishReason
                   });
-                  self2._object.resolve(object22);
+                  self._object.resolve(object22);
                 } catch (e) {
                   error40 = e;
-                  self2._object.reject(e);
+                  self._object.reject(e);
                 }
                 break;
               }
@@ -45406,7 +45320,6 @@ var init_dist6 = __esm(() => {
   init_dist5();
   init_dist2();
   init_dist2();
-  init_dist5();
   init_dist4();
   init_dist4();
   init_dist4();
@@ -46266,7 +46179,6 @@ var init_dist6 = __esm(() => {
     "x-vercel-ai-ui-message-stream": "v1",
     "x-accel-buffering": "no"
   };
-  toolMetadataSchema = exports_external3.record(exports_external3.string(), jsonValueSchema.optional());
   uiMessageChunkSchema = lazySchema(() => zodSchema(exports_external3.union([
     exports_external3.strictObject({
       type: exports_external3.literal("text-start"),
@@ -46294,7 +46206,6 @@ var init_dist6 = __esm(() => {
       toolName: exports_external3.string(),
       providerExecuted: exports_external3.boolean().optional(),
       providerMetadata: providerMetadataSchema.optional(),
-      toolMetadata: toolMetadataSchema.optional(),
       dynamic: exports_external3.boolean().optional(),
       title: exports_external3.string().optional()
     }),
@@ -46310,7 +46221,6 @@ var init_dist6 = __esm(() => {
       input: exports_external3.unknown(),
       providerExecuted: exports_external3.boolean().optional(),
       providerMetadata: providerMetadataSchema.optional(),
-      toolMetadata: toolMetadataSchema.optional(),
       dynamic: exports_external3.boolean().optional(),
       title: exports_external3.string().optional()
     }),
@@ -46321,7 +46231,6 @@ var init_dist6 = __esm(() => {
       input: exports_external3.unknown(),
       providerExecuted: exports_external3.boolean().optional(),
       providerMetadata: providerMetadataSchema.optional(),
-      toolMetadata: toolMetadataSchema.optional(),
       dynamic: exports_external3.boolean().optional(),
       errorText: exports_external3.string(),
       title: exports_external3.string().optional()
@@ -46337,7 +46246,6 @@ var init_dist6 = __esm(() => {
       output: exports_external3.unknown(),
       providerExecuted: exports_external3.boolean().optional(),
       providerMetadata: providerMetadataSchema.optional(),
-      toolMetadata: toolMetadataSchema.optional(),
       dynamic: exports_external3.boolean().optional(),
       preliminary: exports_external3.boolean().optional()
     }),
@@ -46347,7 +46255,6 @@ var init_dist6 = __esm(() => {
       errorText: exports_external3.string(),
       providerExecuted: exports_external3.boolean().optional(),
       providerMetadata: providerMetadataSchema.optional(),
-      toolMetadata: toolMetadataSchema.optional(),
       dynamic: exports_external3.boolean().optional()
     }),
     exports_external3.strictObject({
@@ -46435,7 +46342,6 @@ var init_dist6 = __esm(() => {
     prefix: "aitxt",
     size: 24
   });
-  toolMetadataSchema2 = exports_external3.record(exports_external3.string(), jsonValueSchema.optional());
   uiMessagesSchema = lazySchema(() => zodSchema(exports_external3.array(exports_external3.object({
     id: exports_external3.string(),
     role: exports_external3.enum(["system", "user", "assistant"]),
@@ -46487,7 +46393,6 @@ var init_dist6 = __esm(() => {
         type: exports_external3.literal("dynamic-tool"),
         toolName: exports_external3.string(),
         toolCallId: exports_external3.string(),
-        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("input-streaming"),
         input: exports_external3.unknown().optional(),
         providerExecuted: exports_external3.boolean().optional(),
@@ -46500,7 +46405,6 @@ var init_dist6 = __esm(() => {
         type: exports_external3.literal("dynamic-tool"),
         toolName: exports_external3.string(),
         toolCallId: exports_external3.string(),
-        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("input-available"),
         input: exports_external3.unknown(),
         providerExecuted: exports_external3.boolean().optional(),
@@ -46513,7 +46417,6 @@ var init_dist6 = __esm(() => {
         type: exports_external3.literal("dynamic-tool"),
         toolName: exports_external3.string(),
         toolCallId: exports_external3.string(),
-        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("approval-requested"),
         input: exports_external3.unknown(),
         providerExecuted: exports_external3.boolean().optional(),
@@ -46530,7 +46433,6 @@ var init_dist6 = __esm(() => {
         type: exports_external3.literal("dynamic-tool"),
         toolName: exports_external3.string(),
         toolCallId: exports_external3.string(),
-        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("approval-responded"),
         input: exports_external3.unknown(),
         providerExecuted: exports_external3.boolean().optional(),
@@ -46547,7 +46449,6 @@ var init_dist6 = __esm(() => {
         type: exports_external3.literal("dynamic-tool"),
         toolName: exports_external3.string(),
         toolCallId: exports_external3.string(),
-        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("output-available"),
         input: exports_external3.unknown(),
         providerExecuted: exports_external3.boolean().optional(),
@@ -46566,9 +46467,8 @@ var init_dist6 = __esm(() => {
         type: exports_external3.literal("dynamic-tool"),
         toolName: exports_external3.string(),
         toolCallId: exports_external3.string(),
-        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("output-error"),
-        input: exports_external3.unknown().optional(),
+        input: exports_external3.unknown(),
         rawInput: exports_external3.unknown().optional(),
         providerExecuted: exports_external3.boolean().optional(),
         output: exports_external3.never().optional(),
@@ -46585,7 +46485,6 @@ var init_dist6 = __esm(() => {
         type: exports_external3.literal("dynamic-tool"),
         toolName: exports_external3.string(),
         toolCallId: exports_external3.string(),
-        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("output-denied"),
         input: exports_external3.unknown(),
         providerExecuted: exports_external3.boolean().optional(),
@@ -46601,7 +46500,6 @@ var init_dist6 = __esm(() => {
       exports_external3.object({
         type: exports_external3.string().startsWith("tool-"),
         toolCallId: exports_external3.string(),
-        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("input-streaming"),
         providerExecuted: exports_external3.boolean().optional(),
         callProviderMetadata: providerMetadataSchema.optional(),
@@ -46613,7 +46511,6 @@ var init_dist6 = __esm(() => {
       exports_external3.object({
         type: exports_external3.string().startsWith("tool-"),
         toolCallId: exports_external3.string(),
-        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("input-available"),
         providerExecuted: exports_external3.boolean().optional(),
         input: exports_external3.unknown(),
@@ -46625,7 +46522,6 @@ var init_dist6 = __esm(() => {
       exports_external3.object({
         type: exports_external3.string().startsWith("tool-"),
         toolCallId: exports_external3.string(),
-        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("approval-requested"),
         input: exports_external3.unknown(),
         providerExecuted: exports_external3.boolean().optional(),
@@ -46641,7 +46537,6 @@ var init_dist6 = __esm(() => {
       exports_external3.object({
         type: exports_external3.string().startsWith("tool-"),
         toolCallId: exports_external3.string(),
-        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("approval-responded"),
         input: exports_external3.unknown(),
         providerExecuted: exports_external3.boolean().optional(),
@@ -46657,7 +46552,6 @@ var init_dist6 = __esm(() => {
       exports_external3.object({
         type: exports_external3.string().startsWith("tool-"),
         toolCallId: exports_external3.string(),
-        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("output-available"),
         providerExecuted: exports_external3.boolean().optional(),
         input: exports_external3.unknown(),
@@ -46675,10 +46569,9 @@ var init_dist6 = __esm(() => {
       exports_external3.object({
         type: exports_external3.string().startsWith("tool-"),
         toolCallId: exports_external3.string(),
-        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("output-error"),
         providerExecuted: exports_external3.boolean().optional(),
-        input: exports_external3.unknown().optional(),
+        input: exports_external3.unknown(),
         rawInput: exports_external3.unknown().optional(),
         output: exports_external3.never().optional(),
         errorText: exports_external3.string(),
@@ -46693,7 +46586,6 @@ var init_dist6 = __esm(() => {
       exports_external3.object({
         type: exports_external3.string().startsWith("tool-"),
         toolCallId: exports_external3.string(),
-        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("output-denied"),
         providerExecuted: exports_external3.boolean().optional(),
         input: exports_external3.unknown(),
@@ -47014,11 +46906,11 @@ var init_scan_issues = __esm(() => {
 
 // src/server/index.ts
 import { existsSync as existsSync10 } from "fs";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 // package.json
 var package_default = {
   name: "@hasna/testers",
-  version: "0.0.33",
+  version: "0.0.36",
   description: "AI-powered QA testing CLI \u2014 spawns cheap AI agents to test web apps with headless browsers",
   type: "module",
   main: "dist/index.js",
@@ -47042,10 +46934,10 @@ var package_default = {
   ],
   scripts: {
     build: "bun run build:dashboard && bun run build:cli && bun run build:mcp && bun run build:server && bun run build:lib && bun run build:types",
-    "build:cli": "bun build src/cli/index.tsx --outdir dist/cli --target bun --external ink --external react --external chalk --external @modelcontextprotocol/sdk --external @anthropic-ai/sdk --external playwright --external @hasna/browser",
-    "build:mcp": "bun build src/mcp/index.ts --outdir dist/mcp --target bun --external @modelcontextprotocol/sdk --external @anthropic-ai/sdk --external playwright --external @hasna/browser",
-    "build:server": "bun build src/server/index.ts --outdir dist/server --target bun --external @anthropic-ai/sdk --external playwright --external @hasna/browser",
-    "build:lib": "bun build src/index.ts --outdir dist --target bun --external playwright --external @anthropic-ai/sdk --external @modelcontextprotocol/sdk --external @hasna/browser",
+    "build:cli": "bun build src/cli/index.tsx --outdir dist/cli --target bun --external ink --external react --external chalk --external @modelcontextprotocol/sdk --external @anthropic-ai/sdk --external playwright --external @hasna/browser --external @hasna/sandboxes",
+    "build:mcp": "bun build src/mcp/index.ts --outdir dist/mcp --target bun --external @modelcontextprotocol/sdk --external @anthropic-ai/sdk --external playwright --external @hasna/browser --external @hasna/sandboxes",
+    "build:server": "bun build src/server/index.ts --outdir dist/server --target bun --external @anthropic-ai/sdk --external playwright --external @hasna/browser --external @hasna/sandboxes",
+    "build:lib": "bun build src/index.ts --outdir dist --target bun --external playwright --external @anthropic-ai/sdk --external @modelcontextprotocol/sdk --external @hasna/browser --external @hasna/sandboxes",
     "build:types": "NODE_OPTIONS='--max-old-space-size=8192' tsc --emitDeclarationOnly --outDir dist --skipLibCheck || true",
     "build:dashboard": "cd dashboard && bun run build",
     "build:ext": "cd extension && bun run build",
@@ -47059,10 +46951,11 @@ var package_default = {
   },
   dependencies: {
     "@anthropic-ai/sdk": "^0.52.0",
-    "@hasna/browser": "^0.4.5",
+    "@hasna/browser": "^0.4.12",
     "@hasna/cloud": "^0.1.24",
     "@hasna/contacts": "^0.6.8",
     "@hasna/projects": "^0.1.42",
+    "@hasna/sandboxes": "^0.1.27",
     "@modelcontextprotocol/sdk": "^1.12.1",
     ai: "^6.0.175",
     chalk: "^5.4.1",
@@ -47596,11 +47489,11 @@ function resolveJudgeModel(config) {
       apiKey = process.env["GOOGLE_API_KEY"];
     else if (provider === "cerebras")
       apiKey = process.env["CEREBRAS_API_KEY"];
+    else if (provider === "zai")
+      apiKey = process.env["ZAI_API_KEY"];
   }
   if (!apiKey) {
-    apiKey = process.env["ANTHROPIC_API_KEY"] ?? process.env["CEREBRAS_API_KEY"] ?? process.env["OPENAI_API_KEY"] ?? process.env["GOOGLE_API_KEY"] ?? globalConfig.anthropicApiKey;
-    if (!apiKey)
-      throw new AIClientError("No API key found for judge. Set ANTHROPIC_API_KEY, CEREBRAS_API_KEY, OPENAI_API_KEY, or GOOGLE_API_KEY.");
+    throw new AIClientError(`No API key found for ${provider} judge provider.`);
   }
   return { model, provider, apiKey };
 }
@@ -47615,11 +47508,11 @@ reason: 1-2 sentences max`;
 async function callJudge(prompt, config) {
   const { model, provider, apiKey } = resolveJudgeModel(config);
   const threshold = 0.7;
-  if (provider === "openai" || provider === "google" || provider === "cerebras") {
-    const baseUrl = provider === "openai" ? "https://api.openai.com/v1" : provider === "cerebras" ? "https://api.cerebras.ai/v1" : "https://generativelanguage.googleapis.com/v1beta/openai";
+  if (provider !== "anthropic") {
+    const compat = createOpenAICompatibleConfig(provider, apiKey);
     const resp2 = await callOpenAICompatible({
-      baseUrl,
-      apiKey,
+      baseUrl: compat.baseUrl,
+      apiKey: compat.apiKey,
       model,
       system: LLM_SYSTEM,
       messages: [{ role: "user", content: prompt }],
@@ -49216,12 +49109,348 @@ async function notifyRunToConversations(run, results, options) {
   } catch {}
 }
 
+// src/lib/a11y-audit.ts
+async function runA11yAudit(page, options = {}) {
+  const { level = "AA", rules, exclude = [] } = options;
+  await page.addScriptTag({ url: "https://cdnjs.cloudflare.com/ajax/libs/axe-core/4.9.1/axe.min.js" });
+  const config = {
+    runOnly: {
+      type: level === "AAA" ? "standard" : "tag",
+      values: level === "AAA" ? undefined : [level, "best-practice"]
+    }
+  };
+  if (rules && rules.length > 0) {
+    config.rules = Object.fromEntries(rules.map((r) => [r, { enabled: true }]));
+  }
+  if (exclude.length > 0) {
+    config.exclude = exclude;
+  }
+  const result = await page.evaluate(async (auditConfig) => {
+    const axeResult = await window.axe.run(auditConfig);
+    return axeResult;
+  }, config);
+  const violations = (result.violations ?? []).map((v) => ({
+    id: v.id,
+    impact: v.impact,
+    description: v.description,
+    help: v.help,
+    helpUrl: v.helpUrl,
+    nodes: (v.nodes ?? []).map((n) => ({
+      html: n.html,
+      target: n.target,
+      failureSummary: n.failureSummary
+    }))
+  }));
+  const passes = (result.passes ?? []).map((p) => ({
+    id: p.id,
+    description: p.description
+  }));
+  const incomplete = (result.incomplete ?? []).map((i) => ({
+    id: i.id,
+    description: i.description,
+    impact: i.impact
+  }));
+  const criticalCount = violations.filter((v) => v.impact === "critical").length;
+  const seriousCount = violations.filter((v) => v.impact === "serious").length;
+  const moderateCount = violations.filter((v) => v.impact === "moderate").length;
+  const minorCount = violations.filter((v) => v.impact === "minor").length;
+  return {
+    violations,
+    passes,
+    incomplete,
+    url: page.url(),
+    timestamp: new Date().toISOString(),
+    totalViolations: violations.length,
+    criticalCount,
+    seriousCount,
+    moderateCount,
+    minorCount
+  };
+}
+
+// src/lib/assertions.ts
+async function evaluateAssertions(page, assertions, context = {}) {
+  const results = [];
+  for (const assertion of assertions) {
+    try {
+      const result = await evaluateOne(page, assertion, context);
+      results.push(result);
+    } catch (err) {
+      results.push({
+        assertion,
+        passed: false,
+        actual: "",
+        error: err instanceof Error ? err.message : String(err)
+      });
+    }
+  }
+  return results;
+}
+async function evaluateOne(page, assertion, context) {
+  switch (assertion.type) {
+    case "visible": {
+      const visible = await page.locator(assertion.selector).isVisible();
+      return {
+        assertion,
+        passed: visible,
+        actual: String(visible)
+      };
+    }
+    case "not_visible": {
+      const visible = await page.locator(assertion.selector).isVisible();
+      return {
+        assertion,
+        passed: !visible,
+        actual: String(visible)
+      };
+    }
+    case "text_contains": {
+      const text = await page.locator(assertion.selector).textContent() ?? "";
+      const expected = String(assertion.expected ?? "");
+      return {
+        assertion,
+        passed: text.includes(expected),
+        actual: text
+      };
+    }
+    case "text_equals": {
+      const text = await page.locator(assertion.selector).textContent() ?? "";
+      const expected = String(assertion.expected ?? "");
+      return {
+        assertion,
+        passed: text.trim() === expected.trim(),
+        actual: text
+      };
+    }
+    case "element_count": {
+      const count = await page.locator(assertion.selector).count();
+      const expected = Number(assertion.expected ?? 0);
+      return {
+        assertion,
+        passed: count === expected,
+        actual: String(count)
+      };
+    }
+    case "no_console_errors": {
+      if (context.consoleErrors !== undefined) {
+        const errors2 = context.consoleErrors.filter(Boolean);
+        return {
+          assertion,
+          passed: errors2.length === 0,
+          actual: errors2.length === 0 ? "No console errors captured" : errors2.slice(0, 3).join(" | ")
+        };
+      }
+      const errorElements = await page.locator('[role="alert"], .error, .error-message, [data-testid="error"]').count();
+      return {
+        assertion,
+        passed: errorElements === 0,
+        actual: `${errorElements} error element(s) found`
+      };
+    }
+    case "no_a11y_violations": {
+      try {
+        const auditResult = await runA11yAudit(page);
+        const hasIssues = auditResult.violations.length > 0;
+        return {
+          assertion,
+          passed: !hasIssues,
+          actual: hasIssues ? `${auditResult.totalViolations} violation(s): ${auditResult.violations.map((v) => v.id).join(", ")}` : "No accessibility violations found"
+        };
+      } catch (err) {
+        return {
+          assertion,
+          passed: false,
+          actual: "",
+          error: err instanceof Error ? err.message : String(err)
+        };
+      }
+    }
+    case "url_contains": {
+      const url = page.url();
+      const expected = String(assertion.expected ?? "");
+      return {
+        assertion,
+        passed: url.includes(expected),
+        actual: url
+      };
+    }
+    case "title_contains": {
+      const title = await page.title();
+      const expected = String(assertion.expected ?? "");
+      return {
+        assertion,
+        passed: title.includes(expected),
+        actual: title
+      };
+    }
+    case "cookie_exists": {
+      const cookieName = assertion.expected;
+      const cookies = await page.context().cookies();
+      const found = cookies.some((c) => c.name === cookieName);
+      return {
+        assertion,
+        passed: found,
+        actual: found ? `Cookie "${cookieName}" exists` : `Cookie "${cookieName}" not found`
+      };
+    }
+    case "cookie_not_exists": {
+      const cookieName = assertion.expected;
+      const cookies = await page.context().cookies();
+      const found = cookies.some((c) => c.name === cookieName);
+      return {
+        assertion,
+        passed: !found,
+        actual: found ? `Cookie "${cookieName}" found (unexpected)` : `Cookie "${cookieName}" does not exist`
+      };
+    }
+    case "cookie_value": {
+      const [cookieName, expectedValue] = assertion.expected.split("=", 2);
+      const cookies = await page.context().cookies();
+      const cookie = cookies.find((c) => c.name === cookieName);
+      const actualValue = cookie?.value ?? "";
+      return {
+        assertion,
+        passed: actualValue === expectedValue,
+        actual: cookie ? `${cookieName}=${actualValue}` : `Cookie "${cookieName}" not found`
+      };
+    }
+    case "local_storage_exists": {
+      const key = assertion.expected;
+      const value = await page.evaluate((k) => localStorage.getItem(k), key);
+      return {
+        assertion,
+        passed: value !== null,
+        actual: value !== null ? `Key "${key}" exists with value "${value}"` : `Key "${key}" not found in localStorage`
+      };
+    }
+    case "local_storage_not_exists": {
+      const key = assertion.expected;
+      const value = await page.evaluate((k) => localStorage.getItem(k), key);
+      return {
+        assertion,
+        passed: value === null,
+        actual: value !== null ? `Key "${key}" exists (unexpected)` : `Key "${key}" does not exist in localStorage`
+      };
+    }
+    case "local_storage_value": {
+      const [lsKey, expectedValue] = assertion.expected.split("=", 2);
+      const value = await page.evaluate((k) => localStorage.getItem(k), lsKey ?? "");
+      return {
+        assertion,
+        passed: value === expectedValue,
+        actual: value !== null ? `${lsKey}=${value}` : `Key "${lsKey}" not found in localStorage`
+      };
+    }
+    case "session_storage_value": {
+      const [ssKey, expectedValue] = assertion.expected.split("=", 2);
+      const value = await page.evaluate((k) => sessionStorage.getItem(k), ssKey ?? "");
+      return {
+        assertion,
+        passed: value === expectedValue,
+        actual: value !== null ? `${ssKey}=${value}` : `Key "${ssKey}" not found in sessionStorage`
+      };
+    }
+    case "session_storage_not_exists": {
+      const key = assertion.expected;
+      const value = await page.evaluate((k) => sessionStorage.getItem(k), key);
+      return {
+        assertion,
+        passed: value === null,
+        actual: value !== null ? `Key "${key}" exists (unexpected)` : `Key "${key}" does not exist in sessionStorage`
+      };
+    }
+    default: {
+      return {
+        assertion,
+        passed: false,
+        actual: "",
+        error: `Unknown assertion type: ${assertion.type}`
+      };
+    }
+  }
+}
+function allAssertionsPassed(results) {
+  return results.every((r) => r.passed);
+}
+function formatAssertionResults(results) {
+  if (results.length === 0)
+    return "No assertions.";
+  const lines = [];
+  for (const r of results) {
+    const icon = r.passed ? "PASS" : "FAIL";
+    const desc = r.assertion.description || `${r.assertion.type}${r.assertion.selector ? ` ${r.assertion.selector}` : ""}`;
+    let line = `  [${icon}] ${desc}`;
+    if (!r.passed) {
+      line += ` (actual: ${r.actual})`;
+      if (r.error)
+        line += ` \u2014 ${r.error}`;
+    }
+    lines.push(line);
+  }
+  const passed = results.filter((r) => r.passed).length;
+  lines.push(`
+  ${passed}/${results.length} assertions passed.`);
+  return lines.join(`
+`);
+}
+
 // src/lib/runner.ts
 var eventHandler = null;
 function emit(event) {
   if (eventHandler)
     eventHandler(event);
 }
+function resolveAgentApiKeyForModel(model, explicitApiKey, configuredAnthropicApiKey) {
+  return resolveProviderApiKeyForModel(model, explicitApiKey, configuredAnthropicApiKey);
+}
+function assertionDescription(result) {
+  return result.assertion.description || `${result.assertion.type}${result.assertion.selector ? ` ${result.assertion.selector}` : ""}`;
+}
+function summarizeAssertionResult(result) {
+  const description = assertionDescription(result);
+  if (result.passed)
+    return description;
+  const suffix = result.error ? `; ${result.error}` : "";
+  return `${description} (actual: ${result.actual}${suffix})`;
+}
+async function applyStructuredAssertionsToResult(input) {
+  const assertions = input.scenario.assertions ?? [];
+  if (assertions.length === 0) {
+    return {
+      status: input.status,
+      reasoning: input.reasoning,
+      assertionsPassed: [],
+      assertionsFailed: [],
+      assertionResults: []
+    };
+  }
+  const results = await evaluateAssertions(input.page, assertions, {
+    consoleErrors: input.consoleErrors
+  });
+  const assertionsPassed = results.filter((r) => r.passed).map(summarizeAssertionResult);
+  const assertionsFailed = results.filter((r) => !r.passed).map(summarizeAssertionResult);
+  const assertionResults = results.map((result) => ({
+    type: result.assertion.type,
+    description: assertionDescription(result),
+    passed: result.passed,
+    actual: result.actual,
+    ...result.error ? { error: result.error } : {}
+  }));
+  const assertionsOk = allAssertionsPassed(results);
+  const status = assertionsOk || input.status !== "passed" ? input.status : "failed";
+  const assertionHeading = assertionsOk ? "Structured assertions passed:" : "Structured assertions failed:";
+  const reasoningParts = [input.reasoning, `${assertionHeading}
+${formatAssertionResults(results)}`].map((part) => part.trim()).filter(Boolean);
+  return {
+    status,
+    reasoning: reasoningParts.join(`
+
+`),
+    assertionsPassed,
+    assertionsFailed,
+    assertionResults
+  };
+}
 function withTimeout(promise, ms, label) {
   return new Promise((resolve, reject) => {
     const warningAt = Math.floor(ms * 0.8);
@@ -49282,7 +49511,7 @@ async function runSingleScenario(scenario, runId, options) {
       });
     }
   }
-  const client = createClientForModel(model, effectiveOptions.apiKey ?? config.anthropicApiKey);
+  const client = createClientForModel(model, resolveAgentApiKeyForModel(model, effectiveOptions.apiKey, config.anthropicApiKey));
   const screenshotter = new Screenshotter({
     baseDir: effectiveOptions.screenshotDir ?? config.screenshots.dir
   });
@@ -49392,6 +49621,7 @@ async function runSingleScenario(scenario, runId, options) {
       model,
       runId,
       sessionId: result.id,
+      baseUrl: options.url,
       maxTurns: effectiveOptions.minimal ? 10 : 30,
       a11y: effectiveOptions.a11y,
       persona: persona ? {
@@ -49474,27 +49704,46 @@ async function runSingleScenario(scenario, runId, options) {
     closeSession(result.id);
     const lightpandaNote = options.engine === "lightpanda" ? " (Running with Lightpanda \u2014 no screenshots)" : options.engine === "bun" ? " (Running with Bun.WebView \u2014 native, ~11x faster)" : "";
     const networkMeta = networkErrors.length > 0 ? { networkErrors: networkErrors.slice(0, 20) } : {};
-    let updatedResult = updateResult(result.id, {
+    const baseReasoning = agentResult.reasoning ? agentResult.reasoning + lightpandaNote : lightpandaNote || "";
+    const assertionOutcome = await applyStructuredAssertionsToResult({
+      page,
+      scenario,
+      consoleErrors,
       status: agentResult.status,
-      reasoning: agentResult.reasoning ? agentResult.reasoning + lightpandaNote : lightpandaNote || undefined,
+      reasoning: baseReasoning
+    });
+    const structuredAssertionMeta = assertionOutcome.assertionResults.length > 0 ? {
+      structuredAssertions: {
+        passed: assertionOutcome.assertionsPassed,
+        failed: assertionOutcome.assertionsFailed,
+        results: assertionOutcome.assertionResults
+      }
+    } : {};
+    let updatedResult = updateResult(result.id, {
+      status: assertionOutcome.status,
+      reasoning: assertionOutcome.reasoning || undefined,
       stepsCompleted: agentResult.stepsCompleted,
       durationMs: Date.now() - new Date(result.createdAt).getTime(),
       tokensUsed: agentResult.tokensUsed,
       costCents: estimateCost(model, agentResult.tokensUsed),
-      metadata: { consoleLogs, ...networkErrors.length > 0 ? networkMeta : {} }
+      metadata: {
+        consoleLogs,
+        ...networkErrors.length > 0 ? networkMeta : {},
+        ...structuredAssertionMeta
+      }
     });
-    if (agentResult.status === "failed" || agentResult.status === "error") {
-      const failureAnalysis = analyzeFailure(null, agentResult.reasoning ?? null);
+    if (assertionOutcome.status === "failed" || assertionOutcome.status === "error") {
+      const failureAnalysis = analyzeFailure(null, assertionOutcome.reasoning ?? null);
       if (failureAnalysis) {
         updatedResult = updateResult(result.id, { failureAnalysis });
       }
     }
-    if (agentResult.status === "passed") {
+    if (assertionOutcome.status === "passed") {
       try {
         updateScenarioPassedCache(scenario.id, options.url);
       } catch {}
     }
-    const eventType = agentResult.status === "passed" ? "scenario:pass" : "scenario:fail";
+    const eventType = assertionOutcome.status === "passed" ? "scenario:pass" : "scenario:fail";
     emit({ type: eventType, scenarioId: scenario.id, scenarioName: scenario.name, resultId: result.id, runId });
     return updatedResult;
   } catch (error) {
@@ -49519,7 +49768,8 @@ async function runSingleScenario(scenario, runId, options) {
   } finally {
     if (harPath) {
       try {
-        updateResult(result.id, { metadata: { harPath } });
+        const existing = getResult(result.id);
+        updateResult(result.id, { metadata: { ...existing?.metadata ?? {}, harPath } });
       } catch {}
     }
     if (browser) {
@@ -49691,22 +49941,31 @@ async function runBatch(scenarios, options) {
   }
   return { run: finalRun, results };
 }
-async function runByFilter(options) {
-  let scenarios;
+function findScenarioInList(scenarios, id) {
+  return scenarios.find((scenario) => scenario.id === id || scenario.shortId === id || scenario.id.startsWith(id)) ?? null;
+}
+function resolveScenariosForRun(options) {
   if (options.scenarioIds && options.scenarioIds.length > 0) {
-    const all = listScenarios({ projectId: options.projectId });
-    scenarios = all.filter((s) => options.scenarioIds.includes(s.id) || options.scenarioIds.includes(s.shortId));
-    if (scenarios.length === 0 && options.projectId) {
-      const global2 = listScenarios({});
-      scenarios = global2.filter((s) => options.scenarioIds.includes(s.id) || options.scenarioIds.includes(s.shortId));
+    const scoped = listScenarios({ projectId: options.projectId });
+    const resolved = [];
+    const seen = new Set;
+    for (const id of options.scenarioIds) {
+      const scenario = findScenarioInList(scoped, id) ?? getScenario(id);
+      if (scenario && !seen.has(scenario.id)) {
+        resolved.push(scenario);
+        seen.add(scenario.id);
+      }
     }
-  } else {
-    scenarios = listScenarios({
-      projectId: options.projectId,
-      tags: options.tags,
-      priority: options.priority
-    });
+    return resolved;
   }
+  return listScenarios({
+    projectId: options.projectId,
+    tags: options.tags,
+    priority: options.priority
+  });
+}
+async function runByFilter(options) {
+  const scenarios = resolveScenariosForRun(options);
   if (scenarios.length === 0) {
     const config = loadConfig();
     const model = resolveModel(options.model ?? config.defaultModel);
@@ -50870,18 +51129,7 @@ function normalizeFilter(input) {
   };
 }
 function normalizeExecution(input) {
-  const target = input?.target ?? "local";
-  if (target === "connector:e2b") {
-    return {
-      target,
-      connector: input?.connector ?? "e2b",
-      operation: input?.operation ?? "run",
-      sandboxTemplate: input?.sandboxTemplate,
-      timeoutMs: input?.timeoutMs,
-      env: input?.env
-    };
-  }
-  return { ...DEFAULT_EXECUTION, timeoutMs: input?.timeoutMs };
+  return input ? workflowExecutionFromValue(input) : DEFAULT_EXECUTION;
 }
 function createTestingWorkflow(input) {
   const db2 = getDatabase();
@@ -50980,6 +51228,10 @@ function db2() {
 }
 
 // src/lib/workflow-runner.ts
+init_database();
+import { mkdtempSync, rmSync, writeFileSync as writeFileSync3 } from "fs";
+import { tmpdir } from "os";
+import { join as join13 } from "path";
 function buildWorkflowRunPlan(workflow, options) {
   const runOptions = {
     url: options.url,
@@ -50996,10 +51248,10 @@ function buildWorkflowRunPlan(workflow, options) {
   return {
     workflow,
     runOptions,
-    connectorCommand: workflow.execution.target === "connector:e2b" ? buildConnectorCommand(workflow.execution, runOptions) : null
+    sandbox: workflow.execution.target === "sandbox" ? buildSandboxPlan(workflow, workflow.execution, runOptions) : null
   };
 }
-async function runTestingWorkflow(workflowId, options) {
+async function runTestingWorkflow(workflowId, options, dependencies = {}) {
   const workflow = getTestingWorkflow(workflowId);
   if (!workflow)
     throw new Error(`Testing workflow not found: ${workflowId}`);
@@ -51009,13 +51261,25 @@ async function runTestingWorkflow(workflowId, options) {
   const plan = buildWorkflowRunPlan(workflow, options);
   if (options.dryRun)
     return { run: null, results: [], plan };
-  if (workflow.execution.target === "connector:e2b") {
-    const connectorResult = await runViaConnector(plan);
-    return { run: null, results: [], plan, connectorResult };
+  if (workflow.execution.target === "sandbox") {
+    const sandboxResult = await runViaSandbox(plan, dependencies);
+    return { run: null, results: [], plan, sandboxResult };
   }
-  const { run, results } = await runByFilter(plan.runOptions);
+  const runLocal = dependencies.runByFilter ?? runByFilter;
+  const { run, results } = await runLocal(plan.runOptions);
   return { run, results, plan };
 }
+function createWorkflowDatabaseBundle(workflow, plan) {
+  if (!plan.sandbox)
+    throw new Error(`Workflow is not configured for sandbox execution: ${workflow.name}`);
+  const localDir = mkdtempSync(join13(tmpdir(), `testers-workflow-${workflow.id.slice(0, 8)}-`));
+  writeFileSync3(join13(localDir, "testers.db"), getDatabase().serialize());
+  return {
+    localDir,
+    remoteDir: plan.sandbox.stateRemoteDir,
+    cleanup: () => rmSync(localDir, { recursive: true, force: true })
+  };
+}
 function validatePersonaIds(workflow) {
   for (const personaId of workflow.personaIds) {
     if (!getPersona(personaId)) {
@@ -51023,46 +51287,109 @@ function validatePersonaIds(workflow) {
     }
   }
 }
-function buildConnectorCommand(execution, runOptions) {
-  const connector = execution.connector ?? "e2b";
-  const operation = execution.operation ?? "run";
-  const payload = JSON.stringify({
-    operation,
-    template: execution.sandboxTemplate,
+function buildSandboxPlan(workflow, execution, runOptions) {
+  const remoteDir = execution.sandboxRemoteDir ?? `/tmp/testers-workflow-${workflow.id.slice(0, 8)}`;
+  const stateRemoteDir = `${remoteDir.replace(/\/+$/, "")}/.testers-state`;
+  return {
+    provider: execution.provider,
+    image: execution.sandboxImage,
+    name: `testers-${workflow.id.slice(0, 8)}`,
+    remoteDir,
+    stateRemoteDir,
+    cleanup: execution.sandboxCleanup ?? "delete",
     timeoutMs: execution.timeoutMs,
-    env: execution.env ?? {},
-    command: [
-      "bunx",
-      "@hasna/testers",
-      "run",
-      runOptions.url,
-      ...runOptions.scenarioIds?.length ? ["--scenario", runOptions.scenarioIds.join(",")] : [],
-      ...runOptions.tags?.length ? runOptions.tags.flatMap((tag) => ["--tag", tag]) : [],
-      ...runOptions.priority ? ["--priority", runOptions.priority] : [],
-      ...runOptions.projectId ? ["--project", runOptions.projectId] : [],
-      ...runOptions.model ? ["--model", runOptions.model] : [],
-      "--json"
-    ]
-  });
-  return ["connectors", "run", connector, operation, payload];
+    env: execution.env,
+    command: buildSandboxCommand({
+      runOptions,
+      remoteDir,
+      dbPath: `${stateRemoteDir}/testers.db`,
+      setupCommand: execution.setupCommand,
+      packageSpec: execution.packageSpec ?? "@hasna/testers"
+    })
+  };
 }
-async function runViaConnector(plan) {
-  if (!plan.connectorCommand)
-    throw new Error("Workflow does not have a connector command");
-  const proc = Bun.spawn(plan.connectorCommand, {
-    stdout: "pipe",
-    stderr: "pipe",
-    env: process.env
-  });
-  const [stdout, stderr, exitCode] = await Promise.all([
-    new Response(proc.stdout).text(),
-    new Response(proc.stderr).text(),
-    proc.exited
-  ]);
-  if (exitCode !== 0) {
-    throw new Error(`Connector execution failed (${exitCode}): ${stderr || stdout}`);
+function buildSandboxCommand(input) {
+  const args = [
+    "bunx",
+    input.packageSpec,
+    "run",
+    input.runOptions.url,
+    ...input.runOptions.scenarioIds?.length ? ["--scenario", input.runOptions.scenarioIds.join(",")] : [],
+    ...input.runOptions.tags?.length ? input.runOptions.tags.flatMap((tag) => ["--tag", tag]) : [],
+    ...input.runOptions.priority ? ["--priority", input.runOptions.priority] : [],
+    ...input.runOptions.projectId ? ["--project", input.runOptions.projectId] : [],
+    ...input.runOptions.model ? ["--model", input.runOptions.model] : [],
+    ...input.runOptions.headed ? ["--headed"] : [],
+    ...input.runOptions.parallel ? ["--parallel", String(input.runOptions.parallel)] : [],
+    ...input.runOptions.timeout ? ["--timeout", String(input.runOptions.timeout)] : [],
+    ...input.runOptions.personaIds?.length ? ["--persona", input.runOptions.personaIds.join(",")] : [],
+    "--no-auto-generate",
+    "--json"
+  ];
+  return [
+    "set -euo pipefail",
+    `mkdir -p ${shellQuote(input.remoteDir)}`,
+    `cd ${shellQuote(input.remoteDir)}`,
+    input.setupCommand,
+    `HASNA_TESTERS_DB_PATH=${shellQuote(input.dbPath)} ${args.map(shellQuote).join(" ")}`
+  ].filter(Boolean).join(`
+`);
+}
+async function runViaSandbox(plan, dependencies) {
+  if (!plan.sandbox)
+    throw new Error("Workflow does not have a sandbox plan");
+  const sandboxes = await resolveSandboxesRuntime(dependencies);
+  const createBundle = dependencies.createDatabaseBundle ?? createWorkflowDatabaseBundle;
+  const bundle = createBundle(plan.workflow, plan);
+  try {
+    const raw = await sandboxes.runCommandInSandbox({
+      command: plan.sandbox.command,
+      provider: plan.sandbox.provider,
+      name: plan.sandbox.name,
+      image: plan.sandbox.image,
+      sandboxTimeout: plan.sandbox.timeoutMs,
+      commandTimeoutMs: plan.sandbox.timeoutMs,
+      projectId: plan.workflow.projectId ?? undefined,
+      config: {
+        source: "testers",
+        workflowId: plan.workflow.id,
+        workflowName: plan.workflow.name
+      },
+      sandboxEnvVars: plan.sandbox.env,
+      cleanup: plan.sandbox.cleanup,
+      upload: {
+        localDir: bundle.localDir,
+        remoteDir: bundle.remoteDir
+      }
+    });
+    const exitCode = raw.result.exit_code ?? raw.result.exitCode ?? 0;
+    const stdout = raw.result.stdout ?? "";
+    const stderr = raw.result.stderr ?? "";
+    if (exitCode !== 0) {
+      throw new Error(`Sandbox workflow execution failed (${exitCode}): ${stderr || stdout}`);
+    }
+    return {
+      sandboxId: raw.sandbox.id,
+      sessionId: raw.session.id,
+      exitCode,
+      stdout,
+      stderr,
+      cleanup: raw.cleanup
+    };
+  } finally {
+    bundle.cleanup?.();
   }
-  return stdout.trim();
+}
+async function resolveSandboxesRuntime(dependencies) {
+  if (dependencies.sandboxes)
+    return dependencies.sandboxes;
+  if (dependencies.createSandboxesSDK)
+    return dependencies.createSandboxesSDK();
+  const mod = await import("@hasna/sandboxes");
+  return mod.createSandboxesSDK();
+}
+function shellQuote(value) {
+  return `'${value.replaceAll("'", `'"'"'`)}'`;
 }
 
 // src/lib/workflow-agent.ts
@@ -51414,10 +51741,16 @@ var WorkflowFilterSchema = exports_external.object({
   priority: exports_external.enum(["low", "medium", "high", "critical"]).optional()
 }).optional();
 var WorkflowExecutionSchema = exports_external.object({
-  target: exports_external.enum(["local", "connector:e2b"]).default("local"),
+  target: exports_external.enum(["local", "sandbox", "connector:e2b"]).default("local"),
   connector: exports_external.string().optional(),
   operation: exports_external.string().optional(),
+  provider: exports_external.string().optional(),
+  sandboxImage: exports_external.string().optional(),
+  sandboxRemoteDir: exports_external.string().optional(),
+  sandboxCleanup: exports_external.enum(["delete", "stop", "keep"]).optional(),
   sandboxTemplate: exports_external.string().optional(),
+  setupCommand: exports_external.string().optional(),
+  packageSpec: exports_external.string().optional(),
   timeoutMs: exports_external.number().int().positive().optional(),
   env: exports_external.record(exports_external.string()).optional()
 }).optional();
@@ -51499,7 +51832,7 @@ async function handleRequest(req) {
   if (pathname === "/api/status" && method === "GET") {
     const config2 = loadConfig();
     getDatabase();
-    const dbPath = process.env["HASNA_TESTERS_DB_PATH"] ?? process.env["TESTERS_DB_PATH"] ?? join13(getTestersDir(), "testers.db");
+    const dbPath = process.env["HASNA_TESTERS_DB_PATH"] ?? process.env["TESTERS_DB_PATH"] ?? join14(getTestersDir(), "testers.db");
     const scenarios = listScenarios();
     const runs = listRuns();
     return jsonResponse({
@@ -52229,7 +52562,7 @@ async function handleRequest(req) {
     return jsonResponse({ routes, apiRoutes, totalCovered: coverageMap.size });
   }
   if (!pathname.startsWith("/api")) {
-    const dashboardDir = join13(import.meta.dir, "..", "..", "dashboard", "dist");
+    const dashboardDir = join14(import.meta.dir, "..", "..", "dashboard", "dist");
     if (!existsSync10(dashboardDir)) {
       return new Response(`<!DOCTYPE html>
 <html>
@@ -52248,7 +52581,7 @@ async function handleRequest(req) {
         }
       });
     }
-    const filePath = join13(dashboardDir, pathname === "/" ? "index.html" : pathname);
+    const filePath = join14(dashboardDir, pathname === "/" ? "index.html" : pathname);
     if (existsSync10(filePath)) {
       const file2 = Bun.file(filePath);
       return new Response(file2, {
@@ -52258,7 +52591,7 @@ async function handleRequest(req) {
         }
       });
     }
-    const indexPath = join13(dashboardDir, "index.html");
+    const indexPath = join14(dashboardDir, "index.html");
     if (existsSync10(indexPath)) {
       const file2 = Bun.file(indexPath);
       return new Response(file2, {