@browserbasehq/orca 3.0.2-zod345 → 3.0.2-zod346

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import { ZodTypeAny, z, ZodObject, ZodRawShape, ZodError } from 'zod';
 import * as z3 from 'zod/v3';
-import { zodToJsonSchema } from 'zod-to-json-schema';
 import { ClientOptions as ClientOptions$2 } from '@anthropic-ai/sdk';
 import { LanguageModelV2 } from '@ai-sdk/provider';
 import { ClientOptions as ClientOptions$1 } from 'openai';
@@ -27,7 +26,7 @@ declare const isZod4Schema: (schema: StagehandZodSchema) => schema is ZodTypeAny
 };
 declare const isZod3Schema: (schema: StagehandZodSchema) => schema is z3.ZodTypeAny;
 type JsonSchemaDocument = Record<string, unknown>;
-declare function toJsonSchema(schema: StagehandZodSchema, options?: Parameters<typeof zodToJsonSchema>[1]): JsonSchemaDocument;
+declare function toJsonSchema(schema: StagehandZodSchema): JsonSchemaDocument;
 
 type AnthropicJsonSchemaObject = {
     definitions?: {
@@ -2104,6 +2103,7 @@ interface JsonSchemaProperty {
     minimum?: number;
     maximum?: number;
     description?: string;
+    format?: string;
 }
 interface JsonSchema extends JsonSchemaProperty {
     type: string;

package/dist/index.js

@@ -85,7 +85,7 @@ var __async = (__this, __arguments, generator) => {
 var STAGEHAND_VERSION;
 var init_version = __esm({
   "lib/version.ts"() {
-    STAGEHAND_VERSION = "3.0.2-zod345";
+    STAGEHAND_VERSION = "3.0.2-zod346";
   }
 });
 
@@ -7965,17 +7965,96 @@ var import_v3 = __toESM(require("zod/v3"));
 
 // lib/v3/zodCompat.ts
 var import_zod = require("zod");
-var import_zod_to_json_schema = require("zod-to-json-schema");
 var isZod4Schema = (schema) => typeof schema._zod !== "undefined";
 var isZod3Schema = (schema) => !isZod4Schema(schema);
-function toJsonSchema(schema, options) {
-  if (isZod4Schema(schema) && typeof import_zod.z.toJSONSchema === "function" && !options) {
-    return import_zod.z.toJSONSchema(schema);
+function ZodToJsonSchema(schema) {
+  const _def = schema._def;
+  if (!_def) {
+    return { type: "null" };
+  }
+  const typeName = _def.typeName;
+  switch (typeName) {
+    case "ZodObject": {
+      const shape = typeof _def.shape === "function" ? _def.shape() : _def.shape;
+      const properties = {};
+      const required = [];
+      for (const [key, value] of Object.entries(shape)) {
+        properties[key] = ZodToJsonSchema(value);
+        const valueDef = value._def;
+        if ((valueDef == null ? void 0 : valueDef.typeName) !== "ZodOptional") {
+          required.push(key);
+        }
+      }
+      return {
+        type: "object",
+        properties,
+        required,
+        additionalProperties: _def.unknownKeys === "passthrough"
+      };
+    }
+    case "ZodArray": {
+      const itemType = _def.type;
+      return {
+        type: "array",
+        items: ZodToJsonSchema(itemType)
+      };
+    }
+    case "ZodString": {
+      const result = { type: "string" };
+      const checks = _def.checks;
+      if (checks) {
+        for (const check of checks) {
+          if (check.kind === "url") {
+            result.format = "url";
+            break;
+          }
+        }
+      }
+      return result;
+    }
+    case "ZodNumber":
+      return { type: "number" };
+    case "ZodBoolean":
+      return { type: "boolean" };
+    case "ZodOptional":
+      return ZodToJsonSchema(_def.innerType);
+    case "ZodNullable": {
+      const innerSchema = ZodToJsonSchema(_def.innerType);
+      return __spreadProps(__spreadValues({}, innerSchema), {
+        nullable: true
+      });
+    }
+    case "ZodEnum":
+      return {
+        type: "string",
+        enum: _def.values
+      };
+    case "ZodLiteral":
+      return {
+        type: typeof _def.value,
+        const: _def.value
+      };
+    case "ZodUnion":
+      return {
+        anyOf: _def.options.map((opt) => ZodToJsonSchema(opt))
+      };
+    default:
+      console.warn(`Unknown Zod type: ${typeName}`);
+      return { type: "null" };
   }
-  return (0, import_zod_to_json_schema.zodToJsonSchema)(
-    schema,
-    options != null ? options : { $refStrategy: "none" }
-  );
+}
+function toJsonSchema(schema) {
+  if (!isZod4Schema(schema)) {
+    const result = __spreadValues({
+      $schema: "http://json-schema.org/draft-07/schema#"
+    }, ZodToJsonSchema(schema));
+    return result;
+  }
+  const zodWithJsonSchema = import_zod.z;
+  if (zodWithJsonSchema.toJSONSchema) {
+    return zodWithJsonSchema.toJSONSchema(schema);
+  }
+  throw new Error("Zod v4 toJSONSchema method not found");
 }
 
 // lib/utils.ts
@@ -8575,6 +8654,13 @@ function jsonSchemaToZod(schema) {
         return import_zod2.z.string().refine((val) => schema.enum.includes(val));
       }
       let zodString = import_zod2.z.string();
+      if (schema.format === "uri" || schema.format === "url") {
+        zodString = zodString.url();
+      } else if (schema.format === "email") {
+        zodString = zodString.email();
+      } else if (schema.format === "uuid") {
+        zodString = zodString.uuid();
+      }
       if (schema.description) {
         zodString = zodString.describe(schema.description);
       }
@@ -11324,11 +11410,6 @@ var ExtractHandler = class {
           logger: v3Logger,
           logInferenceToFile: this.logInferenceToFile
         });
-        console.log("transformedSchema", transformedSchema);
-        console.log(
-          "transformedSchema",
-          JSON.stringify(transformedSchema, null, 2)
-        );
         const _c = extractionResponse, {
           metadata: { completed },
           prompt_tokens,
@@ -19699,7 +19780,7 @@ var getRefs = (options) => {
     )
   });
 };
-var zodToJsonSchema2 = (schema, options) => {
+var zodToJsonSchema = (schema, options) => {
   var _a;
   const refs = getRefs(options);
   let definitions = typeof options === "object" && options.definitions ? Object.entries(options.definitions).reduce(
@@ -19744,7 +19825,7 @@ var zodToJsonSchema2 = (schema, options) => {
   combined.$schema = "http://json-schema.org/draft-07/schema#";
   return combined;
 };
-var zod_to_json_schema_default = zodToJsonSchema2;
+var zod_to_json_schema_default = zodToJsonSchema;
 function zod3Schema(zodSchema2, options) {
   var _a;
   const useReferences = (_a = options == null ? void 0 : options.useReferences) != null ? _a : false;
@@ -39351,7 +39432,7 @@ var CdpConnection = class _CdpConnection {
       yield this.send("Target.setAutoAttach", {
         autoAttach: true,
         flatten: true,
-        waitForDebuggerOnStart: true,
+        waitForDebuggerOnStart: false,
         filter: [
           { type: "worker", exclude: true },
           { type: "shared_worker", exclude: true },
@@ -39534,12 +39615,15 @@ init_logger();
 // lib/v3/dom/build/scriptV3Content.ts
 var v3ScriptContent = '(()=>{function b(_={}){let S=n=>{let{hostToRoot:l}=n,m=t=>{let o=[];if(t instanceof Document)return t.documentElement&&o.push(t.documentElement),o;if(t instanceof ShadowRoot||t instanceof DocumentFragment)return o.push(...Array.from(t.children)),o;if(t instanceof Element){o.push(...Array.from(t.children));let a=t.shadowRoot;a&&o.push(...Array.from(a.children));let r=l.get(t);return r&&o.push(...Array.from(r.children)),o}return o},v=t=>{let o=[],a=[...m(t)];for(;a.length;){let r=a.shift();o.push(r),a.push(...m(r))}return o},y=t=>{let o=String(t||"").trim();if(!o)return null;let a=o.replace(/^xpath=/i,""),r=[];{let e=0;for(;e<a.length;){let d="child";a.startsWith("//",e)?(d="desc",e+=2):a[e]==="/"&&(d="child",e+=1);let h=e;for(;e<a.length&&a[e]!=="/";)e++;let u=a.slice(h,e).trim();if(!u)continue;let p=u.match(/^(.*?)(\\[(\\d+)\\])?$/u),i=(p?.[1]??u).trim(),c=p?.[3]?Math.max(1,Number(p[3])):null,R=i===""?"*":i.toLowerCase();r.push({axis:d,raw:u,tag:R,index:c})}}n.debug&&console.info("[v3-piercer][resolve] start",{url:location.href,steps:r.map(e=>({axis:e.axis,raw:e.raw,tag:e.tag,index:e.index}))});let g=[document];for(let e of r){let d=e.index,h=null;for(let u of g){let p=e.axis==="child"?m(u):v(u),i=[];for(let c of p)(e.tag==="*"||c.localName===e.tag)&&i.push(c);if(n.debug&&console.info("[v3-piercer][resolve] step",{axis:e.axis,tag:e.tag,index:d,poolCount:p.length,matchesCount:i.length}),!!i.length){if(d!=null){let c=d-1;h=c>=0&&c<i.length?i[c]:null}else h=i[0];if(h)break}}if(!h)return n.debug&&console.info("[v3-piercer][resolve] no-match",{step:e.raw}),null;g=[h]}let E=g.length?g[0]:null;return n.debug&&console.info("[v3-piercer][resolve] done",{found:!!E,tag:E?.localName??""}),E};window.__stagehandV3__={getClosedRoot:t=>l.get(t),stats:()=>({installed:!0,url:location.href,isTop:window.top===window,open:n.openCount,closed:n.closedCount}),resolveSimpleXPath:y}},f=Element.prototype.attachShadow;if(f.__v3Patched&&f.__v3State){f.__v3State.debug=!0,S(f.__v3State);return}let s={hostToRoot:new WeakMap,openCount:0,closedCount:0,debug:!0},x=f,w=function(n){let l=n?.mode??"open",m=x.call(this,n);try{s.hostToRoot.set(this,m),l==="closed"?s.closedCount++:s.openCount++,s.debug&&console.info("[v3-piercer] attachShadow",{tag:this.tagName?.toLowerCase()??"",mode:l,url:location.href})}catch{}return m};if(w.__v3Patched=!0,w.__v3State=s,Object.defineProperty(Element.prototype,"attachShadow",{configurable:!0,writable:!0,value:w}),_.tagExisting)try{let n=document.createTreeWalker(document,NodeFilter.SHOW_ELEMENT);for(;n.nextNode();){let l=n.currentNode;l.shadowRoot&&(s.hostToRoot.set(l,l.shadowRoot),s.openCount++)}}catch{}window.__stagehandV3Injected=!0,S(s),s.debug&&console.info("[v3-piercer] installed",{url:location.href,isTop:window.top===window,readyState:document.readyState})}b({debug:!0,tagExisting:!1});})();\n';
 
+// lib/v3/dom/build/reRenderScriptContent.ts
+var reRenderScriptContent = '(()=>{function s(){try{let o=window.__stagehandV3__;if(!o||typeof o.getClosedRoot!="function")return;let t=[],r=document.createTreeWalker(document,NodeFilter.SHOW_ELEMENT);for(;r.nextNode();){let e=r.currentNode,n=e.tagName?.toLowerCase()??"";if(!n.includes("-")||typeof customElements?.get!="function"||!customElements.get(n))continue;let c=!!e.shadowRoot,i=!!o.getClosedRoot(e);c||i||t.push(e)}for(let e of t)try{let n=e.cloneNode(!0);e.replaceWith(n)}catch{}o.stats&&t.length&&console.info("[v3-piercer] rerender",{count:t.length})}catch(o){console.info("[v3-piercer] rerender error",{message:String(o??"")})}}s();})();\n';
+
 // lib/v3/understudy/piercer.ts
 function installV3PiercerIntoSession(session) {
   return __async(this, null, function* () {
     var _a, _b;
-    yield session.send("Page.enable").catch(() => {
-    });
+    const pageEnabled = yield session.send("Page.enable").then(() => true).catch(() => false);
+    if (!pageEnabled) return false;
     yield session.send("Runtime.enable").catch(() => {
     });
     try {
@@ -39549,7 +39633,7 @@ function installV3PiercerIntoSession(session) {
       );
     } catch (e) {
       const msg = String((_b = (_a = e == null ? void 0 : e.message) != null ? _a : e) != null ? _b : "");
-      if (msg.includes("Session with given id not found")) return;
+      if (msg.includes("Session with given id not found")) return false;
     }
     yield session.send("Runtime.evaluate", {
       expression: v3ScriptContent,
@@ -39557,6 +39641,13 @@ function installV3PiercerIntoSession(session) {
       awaitPromise: true
     }).catch(() => {
     });
+    yield session.send("Runtime.evaluate", {
+      expression: reRenderScriptContent,
+      returnByValue: true,
+      awaitPromise: false
+    }).catch(() => {
+    });
+    return true;
   });
 }
 
@@ -39663,9 +39754,12 @@ var V3Context = class _V3Context {
   ensurePiercer(session) {
     return __async(this, null, function* () {
       const key = this.sessionKey(session);
-      if (this._piercerInstalled.has(key)) return;
-      yield installV3PiercerIntoSession(session);
-      this._piercerInstalled.add(key);
+      if (this._piercerInstalled.has(key)) return true;
+      const installed = yield installV3PiercerIntoSession(session);
+      if (installed) {
+        this._piercerInstalled.add(key);
+      }
+      return installed;
     });
   }
   /** Mark a page target as the most-recent one (active). */
@@ -39803,11 +39897,7 @@ var V3Context = class _V3Context {
       this.conn.on(
         "Target.attachedToTarget",
         (evt) => __async(this, null, function* () {
-          yield this.onAttachedToTarget(
-            evt.targetInfo,
-            evt.sessionId,
-            evt.waitingForDebugger === true
-          );
+          yield this.onAttachedToTarget(evt.targetInfo, evt.sessionId);
         })
       );
       this.conn.on(
@@ -39860,29 +39950,20 @@ var V3Context = class _V3Context {
    *   if the parent is known; otherwise stage until parent `frameAttached`.
    * - Resume the target only after listeners are wired.
    */
-  onAttachedToTarget(info, sessionId, waitingForDebugger) {
+  onAttachedToTarget(info, sessionId) {
     return __async(this, null, function* () {
       var _a;
       const session = this.conn.getSession(sessionId);
       if (!session) return;
       if (this._sessionInit.has(sessionId)) return;
       this._sessionInit.add(sessionId);
-      const pageEnabled = yield session.send("Page.enable").then(() => true).catch(() => false);
-      if (!pageEnabled) {
-        if (waitingForDebugger) {
-          yield session.send("Runtime.runIfWaitingForDebugger").catch(() => {
-          });
-        }
-        return;
-      }
-      yield session.send("Page.setLifecycleEventsEnabled", { enabled: true }).catch(() => {
-      });
       yield session.send("Runtime.runIfWaitingForDebugger").catch(() => {
       });
       executionContexts.attachSession(session);
-      yield session.send("Runtime.enable").catch(() => {
+      const piercerReady = yield this.ensurePiercer(session);
+      if (!piercerReady) return;
+      yield session.send("Page.setLifecycleEventsEnabled", { enabled: true }).catch(() => {
       });
-      yield this.ensurePiercer(session);
       if (isTopLevelPage(info)) {
         const page = yield Page.create(
           this.conn,
@@ -39906,10 +39987,6 @@ var V3Context = class _V3Context {
         page.seedCurrentUrl((_a = pendingSeedUrl != null ? pendingSeedUrl : info.url) != null ? _a : "");
         this._pushActive(info.targetId);
         this.installFrameEventBridges(sessionId, page);
-        if (waitingForDebugger) {
-          yield session.send("Runtime.runIfWaitingForDebugger").catch(() => {
-          });
-        }
         return;
       }
       try {
@@ -39937,51 +40014,13 @@ var V3Context = class _V3Context {
           owner.adoptOopifSession(session, childMainId);
           this.sessionOwnerPage.set(sessionId, owner);
           this.installFrameEventBridges(sessionId, owner);
+          void executionContexts.waitForMainWorld(session, childMainId).catch(() => {
+          });
         } else {
           this.pendingOopifByMainFrame.set(childMainId, sessionId);
         }
       } catch (e) {
       }
-      if (info.type === "iframe" && !waitingForDebugger) {
-        try {
-          yield session.send("Page.setLifecycleEventsEnabled", { enabled: true }).catch(() => {
-          });
-          const loadWait = new Promise((resolve2) => {
-            const handler = (evt) => {
-              if (evt.name === "load") {
-                session.off("Page.lifecycleEvent", handler);
-                resolve2();
-              }
-            };
-            session.on("Page.lifecycleEvent", handler);
-          });
-          yield session.send("Runtime.evaluate", {
-            expression: "location.reload()",
-            returnByValue: true,
-            awaitPromise: false
-          }).catch(() => {
-          });
-          yield Promise.race([
-            loadWait,
-            new Promise((r) => setTimeout(r, 3e3))
-          ]);
-          yield this.ensurePiercer(session);
-        } catch (e) {
-          v3Logger({
-            category: "ctx",
-            message: "child reload attempt failed (continuing)",
-            level: 2,
-            auxiliary: {
-              sessionId: { value: String(sessionId), type: "string" },
-              err: { value: String(e), type: "string" }
-            }
-          });
-        }
-      }
-      if (waitingForDebugger) {
-        yield session.send("Runtime.runIfWaitingForDebugger").catch(() => {
-        });
-      }
     });
   }
   /**
@@ -40261,7 +40300,6 @@ var StagehandAPIClient = class {
       frameId
     }) {
       const jsonSchema2 = zodSchema2 ? toJsonSchema(zodSchema2) : void 0;
-      console.log("jsonSchema", JSON.stringify(jsonSchema2, null, 2));
       const args = {
         schema: jsonSchema2,
         instruction,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browserbasehq/orca",
-  "version": "3.0.2-zod345",
+  "version": "3.0.2-zod346",
   "description": "An AI web browsing framework focused on simplicity and extensibility.",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -24,7 +24,7 @@
   "peerDependencies": {
     "deepmerge": "^4.3.1",
     "dotenv": "^16.4.5",
-    "zod": "^3.25.0 || ^4.0.0"
+    "zod": "^4.1.8"
   },
   "dependencies": {
     "@ai-sdk/provider": "^2.0.0",
@@ -40,8 +40,7 @@
     "pino": "^9.6.0",
     "pino-pretty": "^13.0.0",
     "playwright": "^1.52.0",
-    "ws": "^8.18.0",
-    "zod-to-json-schema": "^3.24.5"
+    "ws": "^8.18.0"
   },
   "optionalDependencies": {
     "@ai-sdk/anthropic": "^2.0.34",
@@ -69,6 +68,7 @@
     "tsup": "^8.2.1",
     "tsx": "^4.10.5",
     "typescript": "^5.2.2",
+    "vitest": "^4.0.8",
     "zod": "^4.1.8"
   },
   "repository": {
@@ -92,6 +92,7 @@
     "e2e:local": "playwright test --config=lib/v3/tests/v3.local.playwright.config.ts",
     "e2e:bb": "playwright test --config=lib/v3/tests/v3.bb.playwright.config.ts",
     "lint": "cd ../.. && prettier --check packages/core && cd packages/core && eslint .",
-    "format": "prettier --write ."
+    "format": "prettier --write .",
+    "test:vitest": "pnpm run build-js && vitest run --config vitest.config.ts"
   }
 }