@supatest/cli 0.0.8 → 0.0.10

package/dist/index.js

@@ -468,7 +468,7 @@ var init_config = __esm({
     config = {
       supatestApiKey: getEnvVar("SUPATEST_API_KEY"),
       supatestApiUrl: getEnvVar("SUPATEST_API_URL", "https://code-api.supatest.ai"),
-      claudeCodeExecutablePath: getEnvVar("CLAUDE_CODE_EXECUTABLE_PATH"),
+      claudeCodeExecutablePath: getEnvVar("SUPATEST_CLAUDE_CODE_PATH"),
       anthropicModelName: getEnvVar("ANTHROPIC_MODEL_NAME", "claude-sonnet-4-20250514"),
       headlessSystemPrompt: fixerPrompt,
       interactiveSystemPrompt: builderPrompt,
@@ -756,6 +756,23 @@ ${config2.logs}
 ${projectInstructions}`
           ].filter(Boolean).join("\n") || void 0;
         }
+        const cleanEnv = {};
+        const excludeKeys = /* @__PURE__ */ new Set([
+          "ANTHROPIC_API_KEY",
+          "ANTHROPIC_BASE_URL",
+          "ANTHROPIC_AUTH_TOKEN",
+          "CLAUDE_CODE_AUTH_TOKEN",
+          "CLAUDE_API_KEY"
+        ]);
+        for (const [key, value] of Object.entries(process.env)) {
+          if (value !== void 0 && !excludeKeys.has(key)) {
+            cleanEnv[key] = value;
+          }
+        }
+        cleanEnv.ANTHROPIC_API_KEY = config2.supatestApiKey || "";
+        cleanEnv.ANTHROPIC_BASE_URL = process.env.ANTHROPIC_BASE_URL || "";
+        cleanEnv.ANTHROPIC_AUTH_TOKEN = "";
+        cleanEnv.CLAUDE_CODE_AUTH_TOKEN = "";
         const queryOptions = {
           // AbortController for cancellation support
           abortController: this.abortController,
@@ -788,13 +805,7 @@ ${projectInstructions}`
               append: systemPromptAppend
             }
           },
-          env: {
-            ...process.env,
-            ANTHROPIC_API_KEY: config2.supatestApiKey,
-            ANTHROPIC_BASE_URL: process.env.ANTHROPIC_BASE_URL || "",
-            ANTHROPIC_AUTH_TOKEN: "",
-            CLAUDE_CODE_AUTH_TOKEN: ""
-          },
+          env: cleanEnv,
           stderr: (msg) => {
             this.presenter.onLog(`[Claude Code stderr] ${msg}`);
           }
@@ -901,31 +912,31 @@ ${projectInstructions}`
         return result;
       }
       async resolveClaudeCodePath() {
-        if (config.claudeCodeExecutablePath) {
-          this.presenter.onLog(
-            `Using CLAUDE_CODE_EXECUTABLE_PATH: ${config.claudeCodeExecutablePath}`
-          );
-          return config.claudeCodeExecutablePath;
-        }
-        const isCompiledBinary2 = process.execPath && !process.execPath.includes("node");
+        const fs4 = await import("fs/promises");
         let claudeCodePath;
-        if (isCompiledBinary2) {
-          claudeCodePath = join2(dirname(process.execPath), "claude-code-cli.js");
-          this.presenter.onLog(`Production mode: ${claudeCodePath}`);
-        } else {
+        const bundledPath = join2(dirname(import.meta.url.replace("file://", "")), "claude-code-cli.js");
+        try {
+          await fs4.access(bundledPath);
+          claudeCodePath = bundledPath;
+          this.presenter.onLog(`Bundled mode: ${claudeCodePath}`);
+        } catch {
           const require2 = createRequire(import.meta.url);
           const sdkPath = require2.resolve("@anthropic-ai/claude-agent-sdk/sdk.mjs");
           claudeCodePath = join2(dirname(sdkPath), "cli.js");
           this.presenter.onLog(`Development mode: ${claudeCodePath}`);
         }
-        const fs4 = await import("fs/promises");
+        if (config.claudeCodeExecutablePath) {
+          claudeCodePath = config.claudeCodeExecutablePath;
+          this.presenter.onLog(
+            `Using SUPATEST_CLAUDE_CODE_PATH override: ${claudeCodePath}`
+          );
+        }
         try {
           await fs4.access(claudeCodePath);
           this.presenter.onLog(`\u2713 Claude Code CLI found: ${claudeCodePath}`);
         } catch {
           const error = `Claude Code executable not found at: ${claudeCodePath}
-For compiled binaries, ensure claude-code-cli.js is in the same directory as the binary.
-Set CLAUDE_CODE_EXECUTABLE_PATH environment variable to override.`;
+Set SUPATEST_CLAUDE_CODE_PATH environment variable to override.`;
           await this.presenter.onError(error);
           throw new Error(error);
         }
@@ -936,11 +947,11 @@ Set CLAUDE_CODE_EXECUTABLE_PATH environment variable to override.`;
 });
 
 // ../shared/dist/shared.es.mjs
-function fe() {
-  return ze;
+function me() {
+  return Be;
 }
 function d(t, e) {
-  const r = fe(), n = me({
+  const r = me(), n = _e({
     issueData: e,
     data: t.data,
     path: t.path,
@@ -951,13 +962,13 @@ function d(t, e) {
       // then schema-bound map if available
       r,
       // then global override map
-      r === Q ? void 0 : Q
+      r === H ? void 0 : H
       // then global default map
     ].filter((s) => !!s)
   });
   t.common.issues.push(n);
 }
-function y(t) {
+function g(t) {
   if (!t)
     return {};
   const { errorMap: e, invalid_type_error: r, required_error: n, description: s } = t;
@@ -968,25 +979,25 @@ function y(t) {
     return i.code === "invalid_enum_value" ? { message: h ?? c.defaultError } : typeof c.data > "u" ? { message: h ?? n ?? c.defaultError } : i.code !== "invalid_type" ? { message: c.defaultError } : { message: h ?? r ?? c.defaultError };
   }, description: s };
 }
-function je(t) {
+function Ce(t) {
   let e = "[0-5]\\d";
   t.precision ? e = `${e}\\.\\d{${t.precision}}` : t.precision == null && (e = `${e}(\\.\\d+)?`);
   const r = t.precision ? "+" : "?";
   return `([01]\\d|2[0-3]):[0-5]\\d(:${e})${r}`;
 }
-function it(t) {
-  return new RegExp(`^${je(t)}$`);
-}
 function ct(t) {
-  let e = `${Ue}T${je(t)}`;
+  return new RegExp(`^${Ce(t)}$`);
+}
+function ot(t) {
+  let e = `${je}T${Ce(t)}`;
   const r = [];
   return r.push(t.local ? "Z?" : "Z"), t.offset && r.push("([+-]\\d{2}:?\\d{2})"), e = `${e}(${r.join("|")})`, new RegExp(`^${e}$`);
 }
-function ot(t, e) {
-  return !!((e === "v4" || !e) && He.test(t) || (e === "v6" || !e) && tt.test(t));
-}
 function dt(t, e) {
-  if (!Qe.test(t))
+  return !!((e === "v4" || !e) && et.test(t) || (e === "v6" || !e) && rt.test(t));
+}
+function ut(t, e) {
+  if (!Xe.test(t))
     return false;
   try {
     const [r] = t.split(".");
@@ -998,31 +1009,31 @@ function dt(t, e) {
     return false;
   }
 }
-function ut(t, e) {
-  return !!((e === "v4" || !e) && et.test(t) || (e === "v6" || !e) && rt.test(t));
-}
 function lt(t, e) {
+  return !!((e === "v4" || !e) && tt.test(t) || (e === "v6" || !e) && nt.test(t));
+}
+function ht(t, e) {
   const r = (t.toString().split(".")[1] || "").length, n = (e.toString().split(".")[1] || "").length, s = r > n ? r : n, a = Number.parseInt(t.toFixed(s).replace(".", "")), i = Number.parseInt(e.toFixed(s).replace(".", ""));
   return a % i / 10 ** s;
 }
-function V(t) {
+function q(t) {
   if (t instanceof x) {
     const e = {};
     for (const r in t.shape) {
       const n = t.shape[r];
-      e[r] = M.create(V(n));
+      e[r] = L.create(q(n));
     }
     return new x({
       ...t._def,
       shape: () => e
     });
-  } else return t instanceof I ? new I({
+  } else return t instanceof D ? new D({
     ...t._def,
-    type: V(t.element)
-  }) : t instanceof M ? M.create(V(t.unwrap())) : t instanceof C ? C.create(V(t.unwrap())) : t instanceof P ? P.create(t.items.map((e) => V(e))) : t;
+    type: q(t.element)
+  }) : t instanceof L ? L.create(q(t.unwrap())) : t instanceof B ? B.create(q(t.unwrap())) : t instanceof S ? S.create(t.items.map((e) => q(e))) : t;
 }
 function ge(t, e) {
-  const r = S(t), n = S(e);
+  const r = j(t), n = j(e);
   if (t === e)
     return { valid: true, data: t };
   if (r === u.object && n === u.object) {
@@ -1048,20 +1059,21 @@ function ge(t, e) {
   } else return r === u.date && n === u.date && +t == +e ? { valid: true, data: t } : { valid: false };
 }
 function $e(t, e) {
-  return new j({
+  return new F({
     values: t,
     typeName: p.ZodEnum,
-    ...y(e)
+    ...g(e)
   });
 }
-function Ct(t) {
+function qt(t) {
   return {
     Grep: "Search",
     Glob: "Search",
+    Bash: "Command",
     BashOutput: "Command Output"
   }[t] || t;
 }
-var E, be, u, S, o, A, Q, ze, me, k, _, W, b, Ne, Ae, z, re, f, w, Re, g, Be, Ge, Ye, We, qe, Qe, Xe, Ke, Je, he, He, et, tt, rt, nt, st, Ue, at, Z, B, X, _e, K, Ie, pe, ye, we, F, U, De, I, x, ne, D, Ee, se, P, ae, Ze, J, q, ve, ie, j, Te, H, $, M, C, ce, oe, Le, Ce, xe, de, p, m, L, ke, R, te, ee, T, ht, Ve, Y, Me, O, G, ft, Pe, xt, kt, Ot, bt, Nt, mt, Se, _t, At, pt, yt, gt, vt, Tt, Et, ue, It, wt, Dt, Zt, Lt, Mt, Pt;
+var E, Oe, u, j, o, R, H, Be, _e, O, _, K, N, Ne, Ae, W, ne, m, M, Re, v, Ge, qe, Ye, We, Qe, Xe, Ke, Je, He, fe, et, tt, rt, nt, st, at, je, it, w, $, V, se, Q, Ie, pe, ye, we, Y, C, De, D, x, ae, Z, Ee, ie, S, ce, Me, ee, J, ve, oe, F, Te, te, z, L, B, de, ue, Ze, Ve, ke, le, p, f, k, xe, I, re, P, y, ft, Fe, X, Le, b, U, mt, Se, Pe, Nt, At, Rt, It, wt, _t, Ue, pt, Dt, yt, gt, vt, Tt, Et, kt, G, Zt, Lt, St, Pt, Ut, jt, Ct, xt, bt, Ot, $t, Vt;
 var init_shared_es = __esm({
   "../shared/dist/shared.es.mjs"() {
     "use strict";
@@ -1107,7 +1119,7 @@ var init_shared_es = __esm({
         ...r
         // second overwrites first
       });
-    })(be || (be = {}));
+    })(Oe || (Oe = {}));
     u = E.arrayToEnum([
       "string",
       "nan",
@@ -1130,7 +1142,7 @@ var init_shared_es = __esm({
       "map",
       "set"
     ]);
-    S = (t) => {
+    j = (t) => {
       switch (typeof t) {
         case "undefined":
           return u.undefined;
@@ -1170,7 +1182,7 @@ var init_shared_es = __esm({
       "not_multiple_of",
       "not_finite"
     ]);
-    A = class _A extends Error {
+    R = class _R extends Error {
       get errors() {
         return this.issues;
       }
@@ -1207,7 +1219,7 @@ var init_shared_es = __esm({
         return s(this), n;
       }
       static assert(e) {
-        if (!(e instanceof _A))
+        if (!(e instanceof _R))
           throw new Error(`Not a ZodError: ${e}`);
       }
       toString() {
@@ -1233,8 +1245,8 @@ var init_shared_es = __esm({
         return this.flatten();
       }
     };
-    A.create = (t) => new A(t);
-    Q = (t, e) => {
+    R.create = (t) => new R(t);
+    H = (t, e) => {
       let r;
       switch (t.code) {
         case o.invalid_type:
@@ -1290,8 +1302,8 @@ var init_shared_es = __esm({
       }
       return { message: r };
     };
-    ze = Q;
-    me = (t) => {
+    Be = H;
+    _e = (t) => {
       const { data: e, path: r, errorMaps: n, issueData: s } = t, a = [...r, ...s.path || []], i = {
         ...s,
         path: a
@@ -1312,7 +1324,7 @@ var init_shared_es = __esm({
         message: c
       };
     };
-    k = class _k {
+    O = class _O {
       constructor() {
         this.value = "valid";
       }
@@ -1340,7 +1352,7 @@ var init_shared_es = __esm({
             value: i
           });
         }
-        return _k.mergeObjectSync(e, n);
+        return _O.mergeObjectSync(e, n);
       }
       static mergeObjectSync(e, r) {
         const n = {};
@@ -1356,16 +1368,16 @@ var init_shared_es = __esm({
     _ = Object.freeze({
       status: "aborted"
     });
-    W = (t) => ({ status: "dirty", value: t });
-    b = (t) => ({ status: "valid", value: t });
+    K = (t) => ({ status: "dirty", value: t });
+    N = (t) => ({ status: "valid", value: t });
     Ne = (t) => t.status === "aborted";
     Ae = (t) => t.status === "dirty";
-    z = (t) => t.status === "valid";
-    re = (t) => typeof Promise < "u" && t instanceof Promise;
+    W = (t) => t.status === "valid";
+    ne = (t) => typeof Promise < "u" && t instanceof Promise;
     (function(t) {
       t.errToObj = (e) => typeof e == "string" ? { message: e } : e || {}, t.toString = (e) => typeof e == "string" ? e : e == null ? void 0 : e.message;
-    })(f || (f = {}));
-    w = class {
+    })(m || (m = {}));
+    M = class {
       constructor(e, r, n, s) {
         this._cachedPath = [], this.parent = e, this.data = r, this._path = n, this._key = s;
       }
@@ -1374,7 +1386,7 @@ var init_shared_es = __esm({
       }
     };
     Re = (t, e) => {
-      if (z(e))
+      if (W(e))
         return { success: true, data: e.value };
       if (!t.common.issues.length)
         throw new Error("Validation failed but no issues detected.");
@@ -1383,23 +1395,23 @@ var init_shared_es = __esm({
         get error() {
           if (this._error)
             return this._error;
-          const r = new A(t.common.issues);
+          const r = new R(t.common.issues);
           return this._error = r, this._error;
         }
       };
     };
-    g = class {
+    v = class {
       get description() {
         return this._def.description;
       }
       _getType(e) {
-        return S(e.data);
+        return j(e.data);
       }
       _getOrReturnCtx(e, r) {
         return r || {
           common: e.parent.common,
           data: e.data,
-          parsedType: S(e.data),
+          parsedType: j(e.data),
           schemaErrorMap: this._def.errorMap,
           path: e.path,
           parent: e.parent
@@ -1407,11 +1419,11 @@ var init_shared_es = __esm({
       }
       _processInputParams(e) {
         return {
-          status: new k(),
+          status: new O(),
           ctx: {
             common: e.parent.common,
             data: e.data,
-            parsedType: S(e.data),
+            parsedType: j(e.data),
             schemaErrorMap: this._def.errorMap,
             path: e.path,
             parent: e.parent
@@ -1420,7 +1432,7 @@ var init_shared_es = __esm({
       }
       _parseSync(e) {
         const r = this._parse(e);
-        if (re(r))
+        if (ne(r))
           throw new Error("Synchronous parse encountered promise.");
         return r;
       }
@@ -1445,7 +1457,7 @@ var init_shared_es = __esm({
           schemaErrorMap: this._def.errorMap,
           parent: null,
           data: e,
-          parsedType: S(e)
+          parsedType: j(e)
         }, s = this._parseSync({ data: e, path: n.path, parent: n });
         return Re(n, s);
       }
@@ -1460,12 +1472,12 @@ var init_shared_es = __esm({
           schemaErrorMap: this._def.errorMap,
           parent: null,
           data: e,
-          parsedType: S(e)
+          parsedType: j(e)
         };
         if (!this["~standard"].async)
           try {
             const a = this._parseSync({ data: e, path: [], parent: r });
-            return z(a) ? {
+            return W(a) ? {
               value: a.value
             } : {
               issues: r.common.issues
@@ -1476,7 +1488,7 @@ var init_shared_es = __esm({
               async: true
             };
           }
-        return this._parseAsync({ data: e, path: [], parent: r }).then((a) => z(a) ? {
+        return this._parseAsync({ data: e, path: [], parent: r }).then((a) => W(a) ? {
           value: a.value
         } : {
           issues: r.common.issues
@@ -1499,8 +1511,8 @@ var init_shared_es = __esm({
           schemaErrorMap: this._def.errorMap,
           parent: null,
           data: e,
-          parsedType: S(e)
-        }, s = this._parse({ data: e, path: n.path, parent: n }), a = await (re(s) ? s : Promise.resolve(s));
+          parsedType: j(e)
+        }, s = this._parse({ data: e, path: n.path, parent: n }), a = await (ne(s) ? s : Promise.resolve(s));
         return Re(n, a);
       }
       refine(e, r) {
@@ -1517,7 +1529,7 @@ var init_shared_es = __esm({
         return this._refinement((n, s) => e(n) ? true : (s.addIssue(typeof r == "function" ? r(n, s) : r), false));
       }
       _refinement(e) {
-        return new $({
+        return new z({
           schema: this,
           typeName: p.ZodEffects,
           effect: { type: "refinement", refinement: e }
@@ -1534,29 +1546,29 @@ var init_shared_es = __esm({
         };
       }
       optional() {
-        return M.create(this, this._def);
+        return L.create(this, this._def);
       }
       nullable() {
-        return C.create(this, this._def);
+        return B.create(this, this._def);
       }
       nullish() {
         return this.nullable().optional();
       }
       array() {
-        return I.create(this);
+        return D.create(this);
       }
       promise() {
-        return H.create(this, this._def);
+        return te.create(this, this._def);
       }
       or(e) {
-        return ne.create([this, e], this._def);
+        return ae.create([this, e], this._def);
       }
       and(e) {
-        return se.create(this, e, this._def);
+        return ie.create(this, e, this._def);
       }
       transform(e) {
-        return new $({
-          ...y(this._def),
+        return new z({
+          ...g(this._def),
           schema: this,
           typeName: p.ZodEffects,
           effect: { type: "transform", transform: e }
@@ -1564,24 +1576,24 @@ var init_shared_es = __esm({
       }
       default(e) {
         const r = typeof e == "function" ? e : () => e;
-        return new ce({
-          ...y(this._def),
+        return new de({
+          ...g(this._def),
           innerType: this,
           defaultValue: r,
           typeName: p.ZodDefault
         });
       }
       brand() {
-        return new Ce({
+        return new Ve({
           typeName: p.ZodBranded,
           type: this,
-          ...y(this._def)
+          ...g(this._def)
         });
       }
       catch(e) {
         const r = typeof e == "function" ? e : () => e;
-        return new oe({
-          ...y(this._def),
+        return new ue({
+          ...g(this._def),
           innerType: this,
           catchValue: r,
           typeName: p.ZodCatch
@@ -1595,10 +1607,10 @@ var init_shared_es = __esm({
         });
       }
       pipe(e) {
-        return xe.create(this, e);
+        return ke.create(this, e);
       }
       readonly() {
-        return de.create(this);
+        return le.create(this);
       }
       isOptional() {
         return this.safeParse(void 0).success;
@@ -1607,24 +1619,24 @@ var init_shared_es = __esm({
         return this.safeParse(null).success;
       }
     };
-    Be = /^c[^\s-]{8,}$/i;
-    Ge = /^[0-9a-z]+$/;
+    Ge = /^c[^\s-]{8,}$/i;
+    qe = /^[0-9a-z]+$/;
     Ye = /^[0-9A-HJKMNP-TV-Z]{26}$/i;
     We = /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/i;
-    qe = /^[a-z0-9_-]{21}$/i;
-    Qe = /^[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_]*$/;
-    Xe = /^[-+]?P(?!$)(?:(?:[-+]?\d+Y)|(?:[-+]?\d+[.,]\d+Y$))?(?:(?:[-+]?\d+M)|(?:[-+]?\d+[.,]\d+M$))?(?:(?:[-+]?\d+W)|(?:[-+]?\d+[.,]\d+W$))?(?:(?:[-+]?\d+D)|(?:[-+]?\d+[.,]\d+D$))?(?:T(?=[\d+-])(?:(?:[-+]?\d+H)|(?:[-+]?\d+[.,]\d+H$))?(?:(?:[-+]?\d+M)|(?:[-+]?\d+[.,]\d+M$))?(?:[-+]?\d+(?:[.,]\d+)?S)?)??$/;
-    Ke = /^(?!\.)(?!.*\.\.)([A-Z0-9_'+\-\.]*)[A-Z0-9_+-]@([A-Z0-9][A-Z0-9\-]*\.)+[A-Z]{2,}$/i;
-    Je = "^(\\p{Extended_Pictographic}|\\p{Emoji_Component})+$";
-    He = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])$/;
-    et = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\/(3[0-2]|[12]?[0-9])$/;
-    tt = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/;
-    rt = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))\/(12[0-8]|1[01][0-9]|[1-9]?[0-9])$/;
-    nt = /^([0-9a-zA-Z+/]{4})*(([0-9a-zA-Z+/]{2}==)|([0-9a-zA-Z+/]{3}=))?$/;
-    st = /^([0-9a-zA-Z-_]{4})*(([0-9a-zA-Z-_]{2}(==)?)|([0-9a-zA-Z-_]{3}(=)?))?$/;
-    Ue = "((\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-((0[13578]|1[02])-(0[1-9]|[12]\\d|3[01])|(0[469]|11)-(0[1-9]|[12]\\d|30)|(02)-(0[1-9]|1\\d|2[0-8])))";
-    at = new RegExp(`^${Ue}$`);
-    Z = class _Z extends g {
+    Qe = /^[a-z0-9_-]{21}$/i;
+    Xe = /^[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_]*$/;
+    Ke = /^[-+]?P(?!$)(?:(?:[-+]?\d+Y)|(?:[-+]?\d+[.,]\d+Y$))?(?:(?:[-+]?\d+M)|(?:[-+]?\d+[.,]\d+M$))?(?:(?:[-+]?\d+W)|(?:[-+]?\d+[.,]\d+W$))?(?:(?:[-+]?\d+D)|(?:[-+]?\d+[.,]\d+D$))?(?:T(?=[\d+-])(?:(?:[-+]?\d+H)|(?:[-+]?\d+[.,]\d+H$))?(?:(?:[-+]?\d+M)|(?:[-+]?\d+[.,]\d+M$))?(?:[-+]?\d+(?:[.,]\d+)?S)?)??$/;
+    Je = /^(?!\.)(?!.*\.\.)([A-Z0-9_'+\-\.]*)[A-Z0-9_+-]@([A-Z0-9][A-Z0-9\-]*\.)+[A-Z]{2,}$/i;
+    He = "^(\\p{Extended_Pictographic}|\\p{Emoji_Component})+$";
+    et = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])$/;
+    tt = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\/(3[0-2]|[12]?[0-9])$/;
+    rt = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/;
+    nt = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))\/(12[0-8]|1[01][0-9]|[1-9]?[0-9])$/;
+    st = /^([0-9a-zA-Z+/]{4})*(([0-9a-zA-Z+/]{2}==)|([0-9a-zA-Z+/]{3}=))?$/;
+    at = /^([0-9a-zA-Z-_]{4})*(([0-9a-zA-Z-_]{2}(==)?)|([0-9a-zA-Z-_]{3}(=)?))?$/;
+    je = "((\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-((0[13578]|1[02])-(0[1-9]|[12]\\d|3[01])|(0[469]|11)-(0[1-9]|[12]\\d|30)|(02)-(0[1-9]|1\\d|2[0-8])))";
+    it = new RegExp(`^${je}$`);
+    w = class _w extends v {
       _parse(e) {
         if (this._def.coerce && (e.data = String(e.data)), this._getType(e) !== u.string) {
           const a = this._getOrReturnCtx(e);
@@ -1634,7 +1646,7 @@ var init_shared_es = __esm({
             received: a.parsedType
           }), _;
         }
-        const n = new k();
+        const n = new O();
         let s;
         for (const a of this._def.checks)
           if (a.kind === "min")
@@ -1673,13 +1685,13 @@ var init_shared_es = __esm({
               message: a.message
             }), n.dirty());
           } else if (a.kind === "email")
-            Ke.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
+            Je.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
               validation: "email",
               code: o.invalid_string,
               message: a.message
             }), n.dirty());
           else if (a.kind === "emoji")
-            he || (he = new RegExp(Je, "u")), he.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
+            fe || (fe = new RegExp(He, "u")), fe.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
               validation: "emoji",
               code: o.invalid_string,
               message: a.message
@@ -1691,19 +1703,19 @@ var init_shared_es = __esm({
               message: a.message
             }), n.dirty());
           else if (a.kind === "nanoid")
-            qe.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
+            Qe.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
               validation: "nanoid",
               code: o.invalid_string,
               message: a.message
             }), n.dirty());
           else if (a.kind === "cuid")
-            Be.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
+            Ge.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
               validation: "cuid",
               code: o.invalid_string,
               message: a.message
             }), n.dirty());
           else if (a.kind === "cuid2")
-            Ge.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
+            qe.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
               validation: "cuid2",
               code: o.invalid_string,
               message: a.message
@@ -1740,39 +1752,39 @@ var init_shared_es = __esm({
             code: o.invalid_string,
             validation: { endsWith: a.value },
             message: a.message
-          }), n.dirty()) : a.kind === "datetime" ? ct(a).test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
+          }), n.dirty()) : a.kind === "datetime" ? ot(a).test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
             code: o.invalid_string,
             validation: "datetime",
             message: a.message
-          }), n.dirty()) : a.kind === "date" ? at.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
+          }), n.dirty()) : a.kind === "date" ? it.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
             code: o.invalid_string,
             validation: "date",
             message: a.message
-          }), n.dirty()) : a.kind === "time" ? it(a).test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
+          }), n.dirty()) : a.kind === "time" ? ct(a).test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
             code: o.invalid_string,
             validation: "time",
             message: a.message
-          }), n.dirty()) : a.kind === "duration" ? Xe.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
+          }), n.dirty()) : a.kind === "duration" ? Ke.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
             validation: "duration",
             code: o.invalid_string,
             message: a.message
-          }), n.dirty()) : a.kind === "ip" ? ot(e.data, a.version) || (s = this._getOrReturnCtx(e, s), d(s, {
+          }), n.dirty()) : a.kind === "ip" ? dt(e.data, a.version) || (s = this._getOrReturnCtx(e, s), d(s, {
             validation: "ip",
             code: o.invalid_string,
             message: a.message
-          }), n.dirty()) : a.kind === "jwt" ? dt(e.data, a.alg) || (s = this._getOrReturnCtx(e, s), d(s, {
+          }), n.dirty()) : a.kind === "jwt" ? ut(e.data, a.alg) || (s = this._getOrReturnCtx(e, s), d(s, {
             validation: "jwt",
             code: o.invalid_string,
             message: a.message
-          }), n.dirty()) : a.kind === "cidr" ? ut(e.data, a.version) || (s = this._getOrReturnCtx(e, s), d(s, {
+          }), n.dirty()) : a.kind === "cidr" ? lt(e.data, a.version) || (s = this._getOrReturnCtx(e, s), d(s, {
             validation: "cidr",
             code: o.invalid_string,
             message: a.message
-          }), n.dirty()) : a.kind === "base64" ? nt.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
+          }), n.dirty()) : a.kind === "base64" ? st.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
             validation: "base64",
             code: o.invalid_string,
             message: a.message
-          }), n.dirty()) : a.kind === "base64url" ? st.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
+          }), n.dirty()) : a.kind === "base64url" ? at.test(e.data) || (s = this._getOrReturnCtx(e, s), d(s, {
             validation: "base64url",
             code: o.invalid_string,
             message: a.message
@@ -1783,56 +1795,56 @@ var init_shared_es = __esm({
         return this.refinement((s) => e.test(s), {
           validation: r,
           code: o.invalid_string,
-          ...f.errToObj(n)
+          ...m.errToObj(n)
         });
       }
       _addCheck(e) {
-        return new _Z({
+        return new _w({
           ...this._def,
           checks: [...this._def.checks, e]
         });
       }
       email(e) {
-        return this._addCheck({ kind: "email", ...f.errToObj(e) });
+        return this._addCheck({ kind: "email", ...m.errToObj(e) });
       }
       url(e) {
-        return this._addCheck({ kind: "url", ...f.errToObj(e) });
+        return this._addCheck({ kind: "url", ...m.errToObj(e) });
       }
       emoji(e) {
-        return this._addCheck({ kind: "emoji", ...f.errToObj(e) });
+        return this._addCheck({ kind: "emoji", ...m.errToObj(e) });
       }
       uuid(e) {
-        return this._addCheck({ kind: "uuid", ...f.errToObj(e) });
+        return this._addCheck({ kind: "uuid", ...m.errToObj(e) });
       }
       nanoid(e) {
-        return this._addCheck({ kind: "nanoid", ...f.errToObj(e) });
+        return this._addCheck({ kind: "nanoid", ...m.errToObj(e) });
       }
       cuid(e) {
-        return this._addCheck({ kind: "cuid", ...f.errToObj(e) });
+        return this._addCheck({ kind: "cuid", ...m.errToObj(e) });
       }
       cuid2(e) {
-        return this._addCheck({ kind: "cuid2", ...f.errToObj(e) });
+        return this._addCheck({ kind: "cuid2", ...m.errToObj(e) });
       }
       ulid(e) {
-        return this._addCheck({ kind: "ulid", ...f.errToObj(e) });
+        return this._addCheck({ kind: "ulid", ...m.errToObj(e) });
       }
       base64(e) {
-        return this._addCheck({ kind: "base64", ...f.errToObj(e) });
+        return this._addCheck({ kind: "base64", ...m.errToObj(e) });
       }
       base64url(e) {
         return this._addCheck({
           kind: "base64url",
-          ...f.errToObj(e)
+          ...m.errToObj(e)
         });
       }
       jwt(e) {
-        return this._addCheck({ kind: "jwt", ...f.errToObj(e) });
+        return this._addCheck({ kind: "jwt", ...m.errToObj(e) });
       }
       ip(e) {
-        return this._addCheck({ kind: "ip", ...f.errToObj(e) });
+        return this._addCheck({ kind: "ip", ...m.errToObj(e) });
       }
       cidr(e) {
-        return this._addCheck({ kind: "cidr", ...f.errToObj(e) });
+        return this._addCheck({ kind: "cidr", ...m.errToObj(e) });
       }
       datetime(e) {
         return typeof e == "string" ? this._addCheck({
@@ -1846,7 +1858,7 @@ var init_shared_es = __esm({
           precision: typeof (e == null ? void 0 : e.precision) > "u" ? null : e == null ? void 0 : e.precision,
           offset: (e == null ? void 0 : e.offset) ?? false,
           local: (e == null ? void 0 : e.local) ?? false,
-          ...f.errToObj(e == null ? void 0 : e.message)
+          ...m.errToObj(e == null ? void 0 : e.message)
         });
       }
       date(e) {
@@ -1860,17 +1872,17 @@ var init_shared_es = __esm({
         }) : this._addCheck({
           kind: "time",
           precision: typeof (e == null ? void 0 : e.precision) > "u" ? null : e == null ? void 0 : e.precision,
-          ...f.errToObj(e == null ? void 0 : e.message)
+          ...m.errToObj(e == null ? void 0 : e.message)
         });
       }
       duration(e) {
-        return this._addCheck({ kind: "duration", ...f.errToObj(e) });
+        return this._addCheck({ kind: "duration", ...m.errToObj(e) });
       }
       regex(e, r) {
         return this._addCheck({
           kind: "regex",
           regex: e,
-          ...f.errToObj(r)
+          ...m.errToObj(r)
         });
       }
       includes(e, r) {
@@ -1878,64 +1890,64 @@ var init_shared_es = __esm({
           kind: "includes",
           value: e,
           position: r == null ? void 0 : r.position,
-          ...f.errToObj(r == null ? void 0 : r.message)
+          ...m.errToObj(r == null ? void 0 : r.message)
         });
       }
       startsWith(e, r) {
         return this._addCheck({
           kind: "startsWith",
           value: e,
-          ...f.errToObj(r)
+          ...m.errToObj(r)
         });
       }
       endsWith(e, r) {
         return this._addCheck({
           kind: "endsWith",
           value: e,
-          ...f.errToObj(r)
+          ...m.errToObj(r)
         });
       }
       min(e, r) {
         return this._addCheck({
           kind: "min",
           value: e,
-          ...f.errToObj(r)
+          ...m.errToObj(r)
         });
       }
       max(e, r) {
         return this._addCheck({
           kind: "max",
           value: e,
-          ...f.errToObj(r)
+          ...m.errToObj(r)
         });
       }
       length(e, r) {
         return this._addCheck({
           kind: "length",
           value: e,
-          ...f.errToObj(r)
+          ...m.errToObj(r)
         });
       }
       /**
        * Equivalent to `.min(1)`
        */
       nonempty(e) {
-        return this.min(1, f.errToObj(e));
+        return this.min(1, m.errToObj(e));
       }
       trim() {
-        return new _Z({
+        return new _w({
           ...this._def,
           checks: [...this._def.checks, { kind: "trim" }]
         });
       }
       toLowerCase() {
-        return new _Z({
+        return new _w({
           ...this._def,
           checks: [...this._def.checks, { kind: "toLowerCase" }]
         });
       }
       toUpperCase() {
-        return new _Z({
+        return new _w({
           ...this._def,
           checks: [...this._def.checks, { kind: "toUpperCase" }]
         });
@@ -2001,13 +2013,13 @@ var init_shared_es = __esm({
         return e;
       }
     };
-    Z.create = (t) => new Z({
+    w.create = (t) => new w({
       checks: [],
       typeName: p.ZodString,
       coerce: (t == null ? void 0 : t.coerce) ?? false,
-      ...y(t)
+      ...g(t)
     });
-    B = class _B extends g {
+    $ = class _$ extends v {
       constructor() {
         super(...arguments), this.min = this.gte, this.max = this.lte, this.step = this.multipleOf;
       }
@@ -2021,7 +2033,7 @@ var init_shared_es = __esm({
           }), _;
         }
         let n;
-        const s = new k();
+        const s = new O();
         for (const a of this._def.checks)
           a.kind === "int" ? E.isInteger(e.data) || (n = this._getOrReturnCtx(e, n), d(n, {
             code: o.invalid_type,
@@ -2042,7 +2054,7 @@ var init_shared_es = __esm({
             inclusive: a.inclusive,
             exact: false,
             message: a.message
-          }), s.dirty()) : a.kind === "multipleOf" ? lt(e.data, a.value) !== 0 && (n = this._getOrReturnCtx(e, n), d(n, {
+          }), s.dirty()) : a.kind === "multipleOf" ? ht(e.data, a.value) !== 0 && (n = this._getOrReturnCtx(e, n), d(n, {
             code: o.not_multiple_of,
             multipleOf: a.value,
             message: a.message
@@ -2053,19 +2065,19 @@ var init_shared_es = __esm({
         return { status: s.value, value: e.data };
       }
       gte(e, r) {
-        return this.setLimit("min", e, true, f.toString(r));
+        return this.setLimit("min", e, true, m.toString(r));
       }
       gt(e, r) {
-        return this.setLimit("min", e, false, f.toString(r));
+        return this.setLimit("min", e, false, m.toString(r));
       }
       lte(e, r) {
-        return this.setLimit("max", e, true, f.toString(r));
+        return this.setLimit("max", e, true, m.toString(r));
       }
       lt(e, r) {
-        return this.setLimit("max", e, false, f.toString(r));
+        return this.setLimit("max", e, false, m.toString(r));
       }
       setLimit(e, r, n, s) {
-        return new _B({
+        return new _$({
           ...this._def,
           checks: [
             ...this._def.checks,
@@ -2073,13 +2085,13 @@ var init_shared_es = __esm({
               kind: e,
               value: r,
               inclusive: n,
-              message: f.toString(s)
+              message: m.toString(s)
             }
           ]
         });
       }
       _addCheck(e) {
-        return new _B({
+        return new _$({
           ...this._def,
           checks: [...this._def.checks, e]
         });
@@ -2087,7 +2099,7 @@ var init_shared_es = __esm({
       int(e) {
         return this._addCheck({
           kind: "int",
-          message: f.toString(e)
+          message: m.toString(e)
         });
       }
       positive(e) {
@@ -2095,7 +2107,7 @@ var init_shared_es = __esm({
           kind: "min",
           value: 0,
           inclusive: false,
-          message: f.toString(e)
+          message: m.toString(e)
         });
       }
       negative(e) {
@@ -2103,7 +2115,7 @@ var init_shared_es = __esm({
           kind: "max",
           value: 0,
           inclusive: false,
-          message: f.toString(e)
+          message: m.toString(e)
         });
       }
       nonpositive(e) {
@@ -2111,7 +2123,7 @@ var init_shared_es = __esm({
           kind: "max",
           value: 0,
           inclusive: true,
-          message: f.toString(e)
+          message: m.toString(e)
         });
       }
       nonnegative(e) {
@@ -2119,20 +2131,20 @@ var init_shared_es = __esm({
           kind: "min",
           value: 0,
           inclusive: true,
-          message: f.toString(e)
+          message: m.toString(e)
         });
       }
       multipleOf(e, r) {
         return this._addCheck({
           kind: "multipleOf",
           value: e,
-          message: f.toString(r)
+          message: m.toString(r)
         });
       }
       finite(e) {
         return this._addCheck({
           kind: "finite",
-          message: f.toString(e)
+          message: m.toString(e)
         });
       }
       safe(e) {
@@ -2140,12 +2152,12 @@ var init_shared_es = __esm({
           kind: "min",
           inclusive: true,
           value: Number.MIN_SAFE_INTEGER,
-          message: f.toString(e)
+          message: m.toString(e)
         })._addCheck({
           kind: "max",
           inclusive: true,
           value: Number.MAX_SAFE_INTEGER,
-          message: f.toString(e)
+          message: m.toString(e)
         });
       }
       get minValue() {
@@ -2173,13 +2185,13 @@ var init_shared_es = __esm({
         return Number.isFinite(r) && Number.isFinite(e);
       }
     };
-    B.create = (t) => new B({
+    $.create = (t) => new $({
       checks: [],
       typeName: p.ZodNumber,
       coerce: (t == null ? void 0 : t.coerce) || false,
-      ...y(t)
+      ...g(t)
     });
-    X = class _X extends g {
+    V = class _V extends v {
       constructor() {
         super(...arguments), this.min = this.gte, this.max = this.lte;
       }
@@ -2193,7 +2205,7 @@ var init_shared_es = __esm({
         if (this._getType(e) !== u.bigint)
           return this._getInvalidInput(e);
         let n;
-        const s = new k();
+        const s = new O();
         for (const a of this._def.checks)
           a.kind === "min" ? (a.inclusive ? e.data < a.value : e.data <= a.value) && (n = this._getOrReturnCtx(e, n), d(n, {
             code: o.too_small,
@@ -2223,19 +2235,19 @@ var init_shared_es = __esm({
         }), _;
       }
       gte(e, r) {
-        return this.setLimit("min", e, true, f.toString(r));
+        return this.setLimit("min", e, true, m.toString(r));
       }
       gt(e, r) {
-        return this.setLimit("min", e, false, f.toString(r));
+        return this.setLimit("min", e, false, m.toString(r));
       }
       lte(e, r) {
-        return this.setLimit("max", e, true, f.toString(r));
+        return this.setLimit("max", e, true, m.toString(r));
       }
       lt(e, r) {
-        return this.setLimit("max", e, false, f.toString(r));
+        return this.setLimit("max", e, false, m.toString(r));
       }
       setLimit(e, r, n, s) {
-        return new _X({
+        return new _V({
           ...this._def,
           checks: [
             ...this._def.checks,
@@ -2243,13 +2255,13 @@ var init_shared_es = __esm({
               kind: e,
               value: r,
               inclusive: n,
-              message: f.toString(s)
+              message: m.toString(s)
             }
           ]
         });
       }
       _addCheck(e) {
-        return new _X({
+        return new _V({
           ...this._def,
           checks: [...this._def.checks, e]
         });
@@ -2259,7 +2271,7 @@ var init_shared_es = __esm({
           kind: "min",
           value: BigInt(0),
           inclusive: false,
-          message: f.toString(e)
+          message: m.toString(e)
         });
       }
       negative(e) {
@@ -2267,7 +2279,7 @@ var init_shared_es = __esm({
           kind: "max",
           value: BigInt(0),
           inclusive: false,
-          message: f.toString(e)
+          message: m.toString(e)
         });
       }
       nonpositive(e) {
@@ -2275,7 +2287,7 @@ var init_shared_es = __esm({
           kind: "max",
           value: BigInt(0),
           inclusive: true,
-          message: f.toString(e)
+          message: m.toString(e)
         });
       }
       nonnegative(e) {
@@ -2283,14 +2295,14 @@ var init_shared_es = __esm({
           kind: "min",
           value: BigInt(0),
           inclusive: true,
-          message: f.toString(e)
+          message: m.toString(e)
         });
       }
       multipleOf(e, r) {
         return this._addCheck({
           kind: "multipleOf",
           value: e,
-          message: f.toString(r)
+          message: m.toString(r)
         });
       }
       get minValue() {
@@ -2306,13 +2318,13 @@ var init_shared_es = __esm({
         return e;
       }
     };
-    X.create = (t) => new X({
+    V.create = (t) => new V({
       checks: [],
       typeName: p.ZodBigInt,
       coerce: (t == null ? void 0 : t.coerce) ?? false,
-      ...y(t)
+      ...g(t)
     });
-    _e = class extends g {
+    se = class extends v {
       _parse(e) {
         if (this._def.coerce && (e.data = !!e.data), this._getType(e) !== u.boolean) {
           const n = this._getOrReturnCtx(e);
@@ -2322,15 +2334,15 @@ var init_shared_es = __esm({
             received: n.parsedType
           }), _;
         }
-        return b(e.data);
+        return N(e.data);
       }
     };
-    _e.create = (t) => new _e({
+    se.create = (t) => new se({
       typeName: p.ZodBoolean,
       coerce: (t == null ? void 0 : t.coerce) || false,
-      ...y(t)
+      ...g(t)
     });
-    K = class _K extends g {
+    Q = class _Q extends v {
       _parse(e) {
         if (this._def.coerce && (e.data = new Date(e.data)), this._getType(e) !== u.date) {
           const a = this._getOrReturnCtx(e);
@@ -2346,7 +2358,7 @@ var init_shared_es = __esm({
             code: o.invalid_date
           }), _;
         }
-        const n = new k();
+        const n = new O();
         let s;
         for (const a of this._def.checks)
           a.kind === "min" ? e.data.getTime() < a.value && (s = this._getOrReturnCtx(e, s), d(s, {
@@ -2370,7 +2382,7 @@ var init_shared_es = __esm({
         };
       }
       _addCheck(e) {
-        return new _K({
+        return new _Q({
           ...this._def,
           checks: [...this._def.checks, e]
         });
@@ -2379,14 +2391,14 @@ var init_shared_es = __esm({
         return this._addCheck({
           kind: "min",
           value: e.getTime(),
-          message: f.toString(r)
+          message: m.toString(r)
         });
       }
       max(e, r) {
         return this._addCheck({
           kind: "max",
           value: e.getTime(),
-          message: f.toString(r)
+          message: m.toString(r)
         });
       }
       get minDate() {
@@ -2402,13 +2414,13 @@ var init_shared_es = __esm({
         return e != null ? new Date(e) : null;
       }
     };
-    K.create = (t) => new K({
+    Q.create = (t) => new Q({
       checks: [],
       coerce: (t == null ? void 0 : t.coerce) || false,
       typeName: p.ZodDate,
-      ...y(t)
+      ...g(t)
     });
-    Ie = class extends g {
+    Ie = class extends v {
       _parse(e) {
         if (this._getType(e) !== u.symbol) {
           const n = this._getOrReturnCtx(e);
@@ -2418,14 +2430,14 @@ var init_shared_es = __esm({
             received: n.parsedType
           }), _;
         }
-        return b(e.data);
+        return N(e.data);
       }
     };
     Ie.create = (t) => new Ie({
       typeName: p.ZodSymbol,
-      ...y(t)
+      ...g(t)
     });
-    pe = class extends g {
+    pe = class extends v {
       _parse(e) {
         if (this._getType(e) !== u.undefined) {
           const n = this._getOrReturnCtx(e);
@@ -2435,14 +2447,14 @@ var init_shared_es = __esm({
             received: n.parsedType
           }), _;
         }
-        return b(e.data);
+        return N(e.data);
       }
     };
     pe.create = (t) => new pe({
       typeName: p.ZodUndefined,
-      ...y(t)
+      ...g(t)
     });
-    ye = class extends g {
+    ye = class extends v {
       _parse(e) {
         if (this._getType(e) !== u.null) {
           const n = this._getOrReturnCtx(e);
@@ -2452,38 +2464,38 @@ var init_shared_es = __esm({
             received: n.parsedType
           }), _;
         }
-        return b(e.data);
+        return N(e.data);
       }
     };
     ye.create = (t) => new ye({
       typeName: p.ZodNull,
-      ...y(t)
+      ...g(t)
     });
-    we = class extends g {
+    we = class extends v {
       constructor() {
         super(...arguments), this._any = true;
       }
       _parse(e) {
-        return b(e.data);
+        return N(e.data);
       }
     };
     we.create = (t) => new we({
       typeName: p.ZodAny,
-      ...y(t)
+      ...g(t)
     });
-    F = class extends g {
+    Y = class extends v {
       constructor() {
         super(...arguments), this._unknown = true;
       }
       _parse(e) {
-        return b(e.data);
+        return N(e.data);
       }
     };
-    F.create = (t) => new F({
+    Y.create = (t) => new Y({
       typeName: p.ZodUnknown,
-      ...y(t)
+      ...g(t)
     });
-    U = class extends g {
+    C = class extends v {
       _parse(e) {
         const r = this._getOrReturnCtx(e);
         return d(r, {
@@ -2493,11 +2505,11 @@ var init_shared_es = __esm({
         }), _;
       }
     };
-    U.create = (t) => new U({
+    C.create = (t) => new C({
       typeName: p.ZodNever,
-      ...y(t)
+      ...g(t)
     });
-    De = class extends g {
+    De = class extends v {
       _parse(e) {
         if (this._getType(e) !== u.undefined) {
           const n = this._getOrReturnCtx(e);
@@ -2507,14 +2519,14 @@ var init_shared_es = __esm({
             received: n.parsedType
           }), _;
         }
-        return b(e.data);
+        return N(e.data);
       }
     };
     De.create = (t) => new De({
       typeName: p.ZodVoid,
-      ...y(t)
+      ...g(t)
     });
-    I = class _I extends g {
+    D = class _D extends v {
       _parse(e) {
         const { ctx: r, status: n } = this._processInputParams(e), s = this._def;
         if (r.parsedType !== u.array)
@@ -2550,44 +2562,44 @@ var init_shared_es = __esm({
           exact: false,
           message: s.maxLength.message
         }), n.dirty()), r.common.async)
-          return Promise.all([...r.data].map((i, c) => s.type._parseAsync(new w(r, i, r.path, c)))).then((i) => k.mergeArray(n, i));
-        const a = [...r.data].map((i, c) => s.type._parseSync(new w(r, i, r.path, c)));
-        return k.mergeArray(n, a);
+          return Promise.all([...r.data].map((i, c) => s.type._parseAsync(new M(r, i, r.path, c)))).then((i) => O.mergeArray(n, i));
+        const a = [...r.data].map((i, c) => s.type._parseSync(new M(r, i, r.path, c)));
+        return O.mergeArray(n, a);
       }
       get element() {
         return this._def.type;
       }
       min(e, r) {
-        return new _I({
+        return new _D({
           ...this._def,
-          minLength: { value: e, message: f.toString(r) }
+          minLength: { value: e, message: m.toString(r) }
         });
       }
       max(e, r) {
-        return new _I({
+        return new _D({
           ...this._def,
-          maxLength: { value: e, message: f.toString(r) }
+          maxLength: { value: e, message: m.toString(r) }
         });
       }
       length(e, r) {
-        return new _I({
+        return new _D({
           ...this._def,
-          exactLength: { value: e, message: f.toString(r) }
+          exactLength: { value: e, message: m.toString(r) }
         });
       }
       nonempty(e) {
         return this.min(1, e);
       }
     };
-    I.create = (t, e) => new I({
+    D.create = (t, e) => new D({
       type: t,
       minLength: null,
       maxLength: null,
       exactLength: null,
       typeName: p.ZodArray,
-      ...y(e)
+      ...g(e)
     });
-    x = class _x extends g {
+    x = class _x extends v {
       constructor() {
         super(...arguments), this._cached = null, this.nonstrict = this.passthrough, this.augment = this.extend;
       }
@@ -2607,25 +2619,25 @@ var init_shared_es = __esm({
           }), _;
         }
         const { status: n, ctx: s } = this._processInputParams(e), { shape: a, keys: i } = this._getCached(), c = [];
-        if (!(this._def.catchall instanceof U && this._def.unknownKeys === "strip"))
+        if (!(this._def.catchall instanceof C && this._def.unknownKeys === "strip"))
           for (const l in s.data)
             i.includes(l) || c.push(l);
         const h = [];
         for (const l of i) {
-          const v = a[l], N = s.data[l];
+          const T = a[l], A = s.data[l];
           h.push({
             key: { status: "valid", value: l },
-            value: v._parse(new w(s, N, s.path, l)),
+            value: T._parse(new M(s, A, s.path, l)),
             alwaysSet: l in s.data
           });
         }
-        if (this._def.catchall instanceof U) {
+        if (this._def.catchall instanceof C) {
           const l = this._def.unknownKeys;
           if (l === "passthrough")
-            for (const v of c)
+            for (const T of c)
               h.push({
-                key: { status: "valid", value: v },
-                value: { status: "valid", value: s.data[v] }
+                key: { status: "valid", value: T },
+                value: { status: "valid", value: s.data[T] }
               });
           else if (l === "strict")
             c.length > 0 && (d(s, {
@@ -2635,36 +2647,36 @@ var init_shared_es = __esm({
           else if (l !== "strip") throw new Error("Internal ZodObject error: invalid unknownKeys value.");
         } else {
           const l = this._def.catchall;
-          for (const v of c) {
-            const N = s.data[v];
+          for (const T of c) {
+            const A = s.data[T];
             h.push({
-              key: { status: "valid", value: v },
+              key: { status: "valid", value: T },
               value: l._parse(
-                new w(s, N, s.path, v)
+                new M(s, A, s.path, T)
                 //, ctx.child(key), value, getParsedType(value)
               ),
-              alwaysSet: v in s.data
+              alwaysSet: T in s.data
             });
           }
         }
         return s.common.async ? Promise.resolve().then(async () => {
           const l = [];
-          for (const v of h) {
-            const N = await v.key, Oe = await v.value;
+          for (const T of h) {
+            const A = await T.key, be = await T.value;
             l.push({
-              key: N,
-              value: Oe,
-              alwaysSet: v.alwaysSet
+              key: A,
+              value: be,
+              alwaysSet: T.alwaysSet
             });
           }
           return l;
-        }).then((l) => k.mergeObjectSync(n, l)) : k.mergeObjectSync(n, h);
+        }).then((l) => O.mergeObjectSync(n, l)) : O.mergeObjectSync(n, h);
       }
       get shape() {
         return this._def.shape();
       }
       strict(e) {
-        return f.errToObj, new _x({
+        return m.errToObj, new _x({
           ...this._def,
           unknownKeys: "strict",
           ...e !== void 0 ? {
@@ -2672,7 +2684,7 @@ var init_shared_es = __esm({
               var a, i;
               const s = ((i = (a = this._def).errorMap) == null ? void 0 : i.call(a, r, n).message) ?? n.defaultError;
               return r.code === "unrecognized_keys" ? {
-                message: f.errToObj(e).message ?? s
+                message: m.errToObj(e).message ?? s
               } : {
                 message: s
               };
@@ -2821,7 +2833,7 @@ var init_shared_es = __esm({
        * @deprecated
        */
       deepPartial() {
-        return V(this);
+        return q(this);
       }
       partial(e) {
         const r = {};
@@ -2841,7 +2853,7 @@ var init_shared_es = __esm({
             r[n] = this.shape[n];
           else {
             let a = this.shape[n];
-            for (; a instanceof M; )
+            for (; a instanceof L; )
               a = a._def.innerType;
             r[n] = a;
           }
@@ -2857,25 +2869,25 @@ var init_shared_es = __esm({
     x.create = (t, e) => new x({
       shape: () => t,
       unknownKeys: "strip",
-      catchall: U.create(),
+      catchall: C.create(),
       typeName: p.ZodObject,
-      ...y(e)
+      ...g(e)
     });
     x.strictCreate = (t, e) => new x({
       shape: () => t,
       unknownKeys: "strict",
-      catchall: U.create(),
+      catchall: C.create(),
       typeName: p.ZodObject,
-      ...y(e)
+      ...g(e)
     });
     x.lazycreate = (t, e) => new x({
       shape: t,
       unknownKeys: "strip",
-      catchall: U.create(),
+      catchall: C.create(),
       typeName: p.ZodObject,
-      ...y(e)
+      ...g(e)
     });
-    ne = class extends g {
+    ae = class extends v {
       _parse(e) {
         const { ctx: r } = this._processInputParams(e), n = this._def.options;
         function s(a) {
@@ -2885,7 +2897,7 @@ var init_shared_es = __esm({
           for (const c of a)
             if (c.result.status === "dirty")
               return r.common.issues.push(...c.ctx.common.issues), c.result;
-          const i = a.map((c) => new A(c.ctx.common.issues));
+          const i = a.map((c) => new R(c.ctx.common.issues));
           return d(r, {
             code: o.invalid_union,
             unionErrors: i
@@ -2921,18 +2933,18 @@ var init_shared_es = __esm({
                 issues: []
               },
               parent: null
-            }, v = h._parseSync({
+            }, T = h._parseSync({
               data: r.data,
               path: r.path,
               parent: l
             });
-            if (v.status === "valid")
-              return v;
-            v.status === "dirty" && !a && (a = { result: v, ctx: l }), l.common.issues.length && i.push(l.common.issues);
+            if (T.status === "valid")
+              return T;
+            T.status === "dirty" && !a && (a = { result: T, ctx: l }), l.common.issues.length && i.push(l.common.issues);
           }
           if (a)
             return r.common.issues.push(...a.ctx.common.issues), a.result;
-          const c = i.map((h) => new A(h));
+          const c = i.map((h) => new R(h));
           return d(r, {
             code: o.invalid_union,
             unionErrors: c
@@ -2943,13 +2955,13 @@ var init_shared_es = __esm({
         return this._def.options;
       }
     };
-    ne.create = (t, e) => new ne({
+    ae.create = (t, e) => new ae({
       options: t,
       typeName: p.ZodUnion,
-      ...y(e)
+      ...g(e)
     });
-    D = (t) => t instanceof ve ? D(t.schema) : t instanceof $ ? D(t.innerType()) : t instanceof ie ? [t.value] : t instanceof j ? t.options : t instanceof Te ? E.objectValues(t.enum) : t instanceof ce ? D(t._def.innerType) : t instanceof pe ? [void 0] : t instanceof ye ? [null] : t instanceof M ? [void 0, ...D(t.unwrap())] : t instanceof C ? [null, ...D(t.unwrap())] : t instanceof Ce || t instanceof de ? D(t.unwrap()) : t instanceof oe ? D(t._def.innerType) : [];
-    Ee = class _Ee extends g {
+    Z = (t) => t instanceof ve ? Z(t.schema) : t instanceof z ? Z(t.innerType()) : t instanceof oe ? [t.value] : t instanceof F ? t.options : t instanceof Te ? E.objectValues(t.enum) : t instanceof de ? Z(t._def.innerType) : t instanceof pe ? [void 0] : t instanceof ye ? [null] : t instanceof L ? [void 0, ...Z(t.unwrap())] : t instanceof B ? [null, ...Z(t.unwrap())] : t instanceof Ve || t instanceof le ? Z(t.unwrap()) : t instanceof ue ? Z(t._def.innerType) : [];
+    Ee = class _Ee extends v {
       _parse(e) {
         const { ctx: r } = this._processInputParams(e);
         if (r.parsedType !== u.object)
@@ -2993,7 +3005,7 @@ var init_shared_es = __esm({
       static create(e, r, n) {
         const s = /* @__PURE__ */ new Map();
         for (const a of r) {
-          const i = D(a.shape[e]);
+          const i = Z(a.shape[e]);
           if (!i.length)
             throw new Error(`A discriminator value for key \`${e}\` could not be extracted from all schema options`);
           for (const c of i) {
@@ -3007,11 +3019,11 @@ var init_shared_es = __esm({
           discriminator: e,
           options: r,
           optionsMap: s,
-          ...y(n)
+          ...g(n)
         });
       }
     };
-    se = class extends g {
+    ie = class extends v {
       _parse(e) {
         const { status: r, ctx: n } = this._processInputParams(e), s = (a, i) => {
           if (Ne(a) || Ne(i))
@@ -3043,13 +3055,13 @@ var init_shared_es = __esm({
         }));
       }
     };
-    se.create = (t, e, r) => new se({
+    ie.create = (t, e, r) => new ie({
       left: t,
       right: e,
       typeName: p.ZodIntersection,
-      ...y(r)
+      ...g(r)
     });
-    P = class _P extends g {
+    S = class _S extends v {
       _parse(e) {
         const { status: r, ctx: n } = this._processInputParams(e);
         if (n.parsedType !== u.array)
@@ -3075,31 +3087,31 @@ var init_shared_es = __esm({
         }), r.dirty());
         const a = [...n.data].map((i, c) => {
           const h = this._def.items[c] || this._def.rest;
-          return h ? h._parse(new w(n, i, n.path, c)) : null;
+          return h ? h._parse(new M(n, i, n.path, c)) : null;
         }).filter((i) => !!i);
-        return n.common.async ? Promise.all(a).then((i) => k.mergeArray(r, i)) : k.mergeArray(r, a);
+        return n.common.async ? Promise.all(a).then((i) => O.mergeArray(r, i)) : O.mergeArray(r, a);
       }
       get items() {
         return this._def.items;
       }
       rest(e) {
-        return new _P({
+        return new _S({
           ...this._def,
           rest: e
         });
       }
     };
-    P.create = (t, e) => {
+    S.create = (t, e) => {
       if (!Array.isArray(t))
         throw new Error("You must pass an array of schemas to z.tuple([ ... ])");
-      return new P({
+      return new S({
         items: t,
         typeName: p.ZodTuple,
         rest: null,
-        ...y(e)
+        ...g(e)
       });
     };
-    ae = class _ae extends g {
+    ce = class _ce extends v {
       get keySchema() {
         return this._def.keyType;
       }
@@ -3117,30 +3129,30 @@ var init_shared_es = __esm({
         const s = [], a = this._def.keyType, i = this._def.valueType;
         for (const c in n.data)
           s.push({
-            key: a._parse(new w(n, c, n.path, c)),
-            value: i._parse(new w(n, n.data[c], n.path, c)),
+            key: a._parse(new M(n, c, n.path, c)),
+            value: i._parse(new M(n, n.data[c], n.path, c)),
             alwaysSet: c in n.data
           });
-        return n.common.async ? k.mergeObjectAsync(r, s) : k.mergeObjectSync(r, s);
+        return n.common.async ? O.mergeObjectAsync(r, s) : O.mergeObjectSync(r, s);
       }
       get element() {
         return this._def.valueType;
       }
       static create(e, r, n) {
-        return r instanceof g ? new _ae({
+        return r instanceof v ? new _ce({
           keyType: e,
           valueType: r,
           typeName: p.ZodRecord,
-          ...y(n)
-        }) : new _ae({
-          keyType: Z.create(),
+          ...g(n)
+        }) : new _ce({
+          keyType: w.create(),
           valueType: e,
           typeName: p.ZodRecord,
-          ...y(r)
+          ...g(r)
         });
       }
     };
-    Ze = class extends g {
+    Me = class extends v {
       get keySchema() {
         return this._def.keyType;
       }
@@ -3156,39 +3168,39 @@ var init_shared_es = __esm({
             received: n.parsedType
           }), _;
         const s = this._def.keyType, a = this._def.valueType, i = [...n.data.entries()].map(([c, h], l) => ({
-          key: s._parse(new w(n, c, n.path, [l, "key"])),
-          value: a._parse(new w(n, h, n.path, [l, "value"]))
+          key: s._parse(new M(n, c, n.path, [l, "key"])),
+          value: a._parse(new M(n, h, n.path, [l, "value"]))
         }));
         if (n.common.async) {
           const c = /* @__PURE__ */ new Map();
           return Promise.resolve().then(async () => {
             for (const h of i) {
-              const l = await h.key, v = await h.value;
-              if (l.status === "aborted" || v.status === "aborted")
+              const l = await h.key, T = await h.value;
+              if (l.status === "aborted" || T.status === "aborted")
                 return _;
-              (l.status === "dirty" || v.status === "dirty") && r.dirty(), c.set(l.value, v.value);
+              (l.status === "dirty" || T.status === "dirty") && r.dirty(), c.set(l.value, T.value);
             }
             return { status: r.value, value: c };
           });
         } else {
           const c = /* @__PURE__ */ new Map();
           for (const h of i) {
-            const l = h.key, v = h.value;
-            if (l.status === "aborted" || v.status === "aborted")
+            const l = h.key, T = h.value;
+            if (l.status === "aborted" || T.status === "aborted")
               return _;
-            (l.status === "dirty" || v.status === "dirty") && r.dirty(), c.set(l.value, v.value);
+            (l.status === "dirty" || T.status === "dirty") && r.dirty(), c.set(l.value, T.value);
           }
           return { status: r.value, value: c };
         }
       }
     };
-    Ze.create = (t, e, r) => new Ze({
+    Me.create = (t, e, r) => new Me({
       valueType: e,
       keyType: t,
       typeName: p.ZodMap,
-      ...y(r)
+      ...g(r)
     });
-    J = class _J extends g {
+    ee = class _ee extends v {
       _parse(e) {
         const { status: r, ctx: n } = this._processInputParams(e);
         if (n.parsedType !== u.set)
@@ -3216,26 +3228,26 @@ var init_shared_es = __esm({
         const a = this._def.valueType;
         function i(h) {
           const l = /* @__PURE__ */ new Set();
-          for (const v of h) {
-            if (v.status === "aborted")
+          for (const T of h) {
+            if (T.status === "aborted")
               return _;
-            v.status === "dirty" && r.dirty(), l.add(v.value);
+            T.status === "dirty" && r.dirty(), l.add(T.value);
           }
           return { status: r.value, value: l };
         }
-        const c = [...n.data.values()].map((h, l) => a._parse(new w(n, h, n.path, l)));
+        const c = [...n.data.values()].map((h, l) => a._parse(new M(n, h, n.path, l)));
         return n.common.async ? Promise.all(c).then((h) => i(h)) : i(c);
       }
       min(e, r) {
-        return new _J({
+        return new _ee({
           ...this._def,
-          minSize: { value: e, message: f.toString(r) }
+          minSize: { value: e, message: m.toString(r) }
         });
       }
       max(e, r) {
-        return new _J({
+        return new _ee({
           ...this._def,
-          maxSize: { value: e, message: f.toString(r) }
+          maxSize: { value: e, message: m.toString(r) }
         });
       }
       size(e, r) {
@@ -3245,14 +3257,14 @@ var init_shared_es = __esm({
         return this.min(1, e);
       }
     };
-    J.create = (t, e) => new J({
+    ee.create = (t, e) => new ee({
       valueType: t,
       minSize: null,
       maxSize: null,
       typeName: p.ZodSet,
-      ...y(e)
+      ...g(e)
     });
-    q = class _q extends g {
+    J = class _J extends v {
       constructor() {
         super(...arguments), this.validate = this.implement;
       }
@@ -3265,10 +3277,10 @@ var init_shared_es = __esm({
             received: r.parsedType
           }), _;
         function n(c, h) {
-          return me({
+          return _e({
             data: c,
             path: r.path,
-            errorMaps: [r.common.contextualErrorMap, r.schemaErrorMap, fe(), Q].filter((l) => !!l),
+            errorMaps: [r.common.contextualErrorMap, r.schemaErrorMap, me(), H].filter((l) => !!l),
             issueData: {
               code: o.invalid_arguments,
               argumentsError: h
@@ -3276,10 +3288,10 @@ var init_shared_es = __esm({
           });
         }
         function s(c, h) {
-          return me({
+          return _e({
             data: c,
             path: r.path,
-            errorMaps: [r.common.contextualErrorMap, r.schemaErrorMap, fe(), Q].filter((l) => !!l),
+            errorMaps: [r.common.contextualErrorMap, r.schemaErrorMap, me(), H].filter((l) => !!l),
             issueData: {
               code: o.invalid_return_type,
               returnTypeError: h
@@ -3287,26 +3299,26 @@ var init_shared_es = __esm({
           });
         }
         const a = { errorMap: r.common.contextualErrorMap }, i = r.data;
-        if (this._def.returns instanceof H) {
+        if (this._def.returns instanceof te) {
           const c = this;
-          return b(async function(...h) {
-            const l = new A([]), v = await c._def.args.parseAsync(h, a).catch((le) => {
-              throw l.addIssue(n(h, le)), l;
-            }), N = await Reflect.apply(i, this, v);
-            return await c._def.returns._def.type.parseAsync(N, a).catch((le) => {
-              throw l.addIssue(s(N, le)), l;
+          return N(async function(...h) {
+            const l = new R([]), T = await c._def.args.parseAsync(h, a).catch((he) => {
+              throw l.addIssue(n(h, he)), l;
+            }), A = await Reflect.apply(i, this, T);
+            return await c._def.returns._def.type.parseAsync(A, a).catch((he) => {
+              throw l.addIssue(s(A, he)), l;
             });
           });
         } else {
           const c = this;
-          return b(function(...h) {
+          return N(function(...h) {
             const l = c._def.args.safeParse(h, a);
             if (!l.success)
-              throw new A([n(h, l.error)]);
-            const v = Reflect.apply(i, this, l.data), N = c._def.returns.safeParse(v, a);
-            if (!N.success)
-              throw new A([s(v, N.error)]);
-            return N.data;
+              throw new R([n(h, l.error)]);
+            const T = Reflect.apply(i, this, l.data), A = c._def.returns.safeParse(T, a);
+            if (!A.success)
+              throw new R([s(T, A.error)]);
+            return A.data;
           });
         }
       }
@@ -3317,13 +3329,13 @@ var init_shared_es = __esm({
         return this._def.returns;
       }
       args(...e) {
-        return new _q({
+        return new _J({
           ...this._def,
-          args: P.create(e).rest(F.create())
+          args: S.create(e).rest(Y.create())
         });
       }
       returns(e) {
-        return new _q({
+        return new _J({
           ...this._def,
           returns: e
         });
@@ -3335,15 +3347,15 @@ var init_shared_es = __esm({
         return this.parse(e);
       }
       static create(e, r, n) {
-        return new _q({
-          args: e || P.create([]).rest(F.create()),
-          returns: r || F.create(),
+        return new _J({
+          args: e || S.create([]).rest(Y.create()),
+          returns: r || Y.create(),
           typeName: p.ZodFunction,
-          ...y(n)
+          ...g(n)
         });
       }
     };
-    ve = class extends g {
+    ve = class extends v {
       get schema() {
         return this._def.getter();
       }
@@ -3355,9 +3367,9 @@ var init_shared_es = __esm({
     ve.create = (t, e) => new ve({
       getter: t,
       typeName: p.ZodLazy,
-      ...y(e)
+      ...g(e)
     });
-    ie = class extends g {
+    oe = class extends v {
       _parse(e) {
         if (e.data !== this._def.value) {
           const r = this._getOrReturnCtx(e);
@@ -3373,12 +3385,12 @@ var init_shared_es = __esm({
         return this._def.value;
       }
     };
-    ie.create = (t, e) => new ie({
+    oe.create = (t, e) => new oe({
       value: t,
       typeName: p.ZodLiteral,
-      ...y(e)
+      ...g(e)
     });
-    j = class _j extends g {
+    F = class _F extends v {
       _parse(e) {
         if (typeof e.data != "string") {
           const r = this._getOrReturnCtx(e), n = this._def.values;
@@ -3396,7 +3408,7 @@ var init_shared_es = __esm({
             options: n
           }), _;
         }
-        return b(e.data);
+        return N(e.data);
       }
       get options() {
         return this._def.values;
@@ -3420,20 +3432,20 @@ var init_shared_es = __esm({
         return e;
       }
       extract(e, r = this._def) {
-        return _j.create(e, {
+        return _F.create(e, {
           ...this._def,
           ...r
         });
       }
       exclude(e, r = this._def) {
-        return _j.create(this.options.filter((n) => !e.includes(n)), {
+        return _F.create(this.options.filter((n) => !e.includes(n)), {
           ...this._def,
           ...r
         });
       }
     };
-    j.create = $e;
-    Te = class extends g {
+    F.create = $e;
+    Te = class extends v {
       _parse(e) {
         const r = E.getValidEnumValues(this._def.values), n = this._getOrReturnCtx(e);
         if (n.parsedType !== u.string && n.parsedType !== u.number) {
@@ -3452,7 +3464,7 @@ var init_shared_es = __esm({
             options: s
           }), _;
         }
-        return b(e.data);
+        return N(e.data);
       }
       get enum() {
         return this._def.values;
@@ -3461,9 +3473,9 @@ var init_shared_es = __esm({
     Te.create = (t, e) => new Te({
       values: t,
       typeName: p.ZodNativeEnum,
-      ...y(e)
+      ...g(e)
     });
-    H = class extends g {
+    te = class extends v {
       unwrap() {
         return this._def.type;
       }
@@ -3476,18 +3488,18 @@ var init_shared_es = __esm({
             received: r.parsedType
           }), _;
         const n = r.parsedType === u.promise ? r.data : Promise.resolve(r.data);
-        return b(n.then((s) => this._def.type.parseAsync(s, {
+        return N(n.then((s) => this._def.type.parseAsync(s, {
           path: r.path,
           errorMap: r.common.contextualErrorMap
         })));
       }
     };
-    H.create = (t, e) => new H({
+    te.create = (t, e) => new te({
       type: t,
       typeName: p.ZodPromise,
-      ...y(e)
+      ...g(e)
     });
-    $ = class extends g {
+    z = class extends v {
       innerType() {
         return this._def.schema;
       }
@@ -3514,7 +3526,7 @@ var init_shared_es = __esm({
                 path: n.path,
                 parent: n
               });
-              return h.status === "aborted" ? _ : h.status === "dirty" || r.value === "dirty" ? W(h.value) : h;
+              return h.status === "aborted" ? _ : h.status === "dirty" || r.value === "dirty" ? K(h.value) : h;
             });
           {
             if (r.value === "aborted")
@@ -3524,7 +3536,7 @@ var init_shared_es = __esm({
               path: n.path,
               parent: n
             });
-            return c.status === "aborted" ? _ : c.status === "dirty" || r.value === "dirty" ? W(c.value) : c;
+            return c.status === "aborted" ? _ : c.status === "dirty" || r.value === "dirty" ? K(c.value) : c;
           }
         }
         if (s.type === "refinement") {
@@ -3553,59 +3565,59 @@ var init_shared_es = __esm({
               path: n.path,
               parent: n
             });
-            if (!z(i))
+            if (!W(i))
               return _;
             const c = s.transform(i.value, a);
             if (c instanceof Promise)
               throw new Error("Asynchronous transform encountered during synchronous parse operation. Use .parseAsync instead.");
             return { status: r.value, value: c };
           } else
-            return this._def.schema._parseAsync({ data: n.data, path: n.path, parent: n }).then((i) => z(i) ? Promise.resolve(s.transform(i.value, a)).then((c) => ({
+            return this._def.schema._parseAsync({ data: n.data, path: n.path, parent: n }).then((i) => W(i) ? Promise.resolve(s.transform(i.value, a)).then((c) => ({
               status: r.value,
               value: c
             })) : _);
         E.assertNever(s);
       }
     };
-    $.create = (t, e, r) => new $({
+    z.create = (t, e, r) => new z({
       schema: t,
       typeName: p.ZodEffects,
       effect: e,
-      ...y(r)
+      ...g(r)
     });
-    $.createWithPreprocess = (t, e, r) => new $({
+    z.createWithPreprocess = (t, e, r) => new z({
       schema: e,
       effect: { type: "preprocess", transform: t },
       typeName: p.ZodEffects,
-      ...y(r)
+      ...g(r)
     });
-    M = class extends g {
+    L = class extends v {
       _parse(e) {
-        return this._getType(e) === u.undefined ? b(void 0) : this._def.innerType._parse(e);
+        return this._getType(e) === u.undefined ? N(void 0) : this._def.innerType._parse(e);
       }
       unwrap() {
         return this._def.innerType;
       }
     };
-    M.create = (t, e) => new M({
+    L.create = (t, e) => new L({
       innerType: t,
       typeName: p.ZodOptional,
-      ...y(e)
+      ...g(e)
     });
-    C = class extends g {
+    B = class extends v {
       _parse(e) {
-        return this._getType(e) === u.null ? b(null) : this._def.innerType._parse(e);
+        return this._getType(e) === u.null ? N(null) : this._def.innerType._parse(e);
       }
       unwrap() {
         return this._def.innerType;
       }
     };
-    C.create = (t, e) => new C({
+    B.create = (t, e) => new B({
       innerType: t,
       typeName: p.ZodNullable,
-      ...y(e)
+      ...g(e)
     });
-    ce = class extends g {
+    de = class extends v {
       _parse(e) {
         const { ctx: r } = this._processInputParams(e);
         let n = r.data;
@@ -3619,13 +3631,13 @@ var init_shared_es = __esm({
         return this._def.innerType;
       }
     };
-    ce.create = (t, e) => new ce({
+    de.create = (t, e) => new de({
       innerType: t,
       typeName: p.ZodDefault,
       defaultValue: typeof e.default == "function" ? e.default : () => e.default,
-      ...y(e)
+      ...g(e)
     });
-    oe = class extends g {
+    ue = class extends v {
       _parse(e) {
         const { ctx: r } = this._processInputParams(e), n = {
           ...r,
@@ -3640,11 +3652,11 @@ var init_shared_es = __esm({
             ...n
           }
         });
-        return re(s) ? s.then((a) => ({
+        return ne(s) ? s.then((a) => ({
           status: "valid",
           value: a.status === "valid" ? a.value : this._def.catchValue({
             get error() {
-              return new A(n.common.issues);
+              return new R(n.common.issues);
             },
             input: n.data
           })
@@ -3652,7 +3664,7 @@ var init_shared_es = __esm({
           status: "valid",
           value: s.status === "valid" ? s.value : this._def.catchValue({
             get error() {
-              return new A(n.common.issues);
+              return new R(n.common.issues);
             },
             input: n.data
           })
@@ -3662,13 +3674,13 @@ var init_shared_es = __esm({
         return this._def.innerType;
       }
     };
-    oe.create = (t, e) => new oe({
+    ue.create = (t, e) => new ue({
       innerType: t,
       typeName: p.ZodCatch,
       catchValue: typeof e.catch == "function" ? e.catch : () => e.catch,
-      ...y(e)
+      ...g(e)
     });
-    Le = class extends g {
+    Ze = class extends v {
       _parse(e) {
         if (this._getType(e) !== u.nan) {
           const n = this._getOrReturnCtx(e);
@@ -3681,11 +3693,11 @@ var init_shared_es = __esm({
         return { status: "valid", value: e.data };
       }
     };
-    Le.create = (t) => new Le({
+    Ze.create = (t) => new Ze({
       typeName: p.ZodNaN,
-      ...y(t)
+      ...g(t)
     });
-    Ce = class extends g {
+    Ve = class extends v {
       _parse(e) {
         const { ctx: r } = this._processInputParams(e), n = r.data;
         return this._def.type._parse({
@@ -3698,7 +3710,7 @@ var init_shared_es = __esm({
         return this._def.type;
       }
     };
-    xe = class _xe extends g {
+    ke = class _ke extends v {
       _parse(e) {
         const { status: r, ctx: n } = this._processInputParams(e);
         if (n.common.async)
@@ -3708,7 +3720,7 @@ var init_shared_es = __esm({
               path: n.path,
               parent: n
             });
-            return a.status === "aborted" ? _ : a.status === "dirty" ? (r.dirty(), W(a.value)) : this._def.out._parseAsync({
+            return a.status === "aborted" ? _ : a.status === "dirty" ? (r.dirty(), K(a.value)) : this._def.out._parseAsync({
               data: a.value,
               path: n.path,
               parent: n
@@ -3731,243 +3743,319 @@ var init_shared_es = __esm({
         }
       }
       static create(e, r) {
-        return new _xe({
+        return new _ke({
           in: e,
           out: r,
           typeName: p.ZodPipeline
         });
       }
     };
-    de = class extends g {
+    le = class extends v {
       _parse(e) {
-        const r = this._def.innerType._parse(e), n = (s) => (z(s) && (s.value = Object.freeze(s.value)), s);
-        return re(r) ? r.then((s) => n(s)) : n(r);
+        const r = this._def.innerType._parse(e), n = (s) => (W(s) && (s.value = Object.freeze(s.value)), s);
+        return ne(r) ? r.then((s) => n(s)) : n(r);
       }
       unwrap() {
         return this._def.innerType;
       }
     };
-    de.create = (t, e) => new de({
+    le.create = (t, e) => new le({
       innerType: t,
       typeName: p.ZodReadonly,
-      ...y(e)
+      ...g(e)
     });
     (function(t) {
       t.ZodString = "ZodString", t.ZodNumber = "ZodNumber", t.ZodNaN = "ZodNaN", t.ZodBigInt = "ZodBigInt", t.ZodBoolean = "ZodBoolean", t.ZodDate = "ZodDate", t.ZodSymbol = "ZodSymbol", t.ZodUndefined = "ZodUndefined", t.ZodNull = "ZodNull", t.ZodAny = "ZodAny", t.ZodUnknown = "ZodUnknown", t.ZodNever = "ZodNever", t.ZodVoid = "ZodVoid", t.ZodArray = "ZodArray", t.ZodObject = "ZodObject", t.ZodUnion = "ZodUnion", t.ZodDiscriminatedUnion = "ZodDiscriminatedUnion", t.ZodIntersection = "ZodIntersection", t.ZodTuple = "ZodTuple", t.ZodRecord = "ZodRecord", t.ZodMap = "ZodMap", t.ZodSet = "ZodSet", t.ZodFunction = "ZodFunction", t.ZodLazy = "ZodLazy", t.ZodLiteral = "ZodLiteral", t.ZodEnum = "ZodEnum", t.ZodEffects = "ZodEffects", t.ZodNativeEnum = "ZodNativeEnum", t.ZodOptional = "ZodOptional", t.ZodNullable = "ZodNullable", t.ZodDefault = "ZodDefault", t.ZodCatch = "ZodCatch", t.ZodPromise = "ZodPromise", t.ZodBranded = "ZodBranded", t.ZodPipeline = "ZodPipeline", t.ZodReadonly = "ZodReadonly";
     })(p || (p = {}));
-    m = Z.create;
-    L = B.create;
-    ke = _e.create;
-    R = K.create;
-    te = F.create;
-    U.create;
-    ee = I.create;
-    T = x.create;
-    ht = ne.create;
-    Ve = Ee.create;
-    se.create;
-    P.create;
-    Y = ae.create;
-    Me = q.create;
-    O = ie.create;
-    G = j.create;
-    ft = H.create;
-    M.create;
+    f = w.create;
+    k = $.create;
+    V.create;
+    xe = se.create;
+    I = Q.create;
+    re = Y.create;
     C.create;
+    P = D.create;
+    y = x.create;
+    ft = ae.create;
+    Fe = Ee.create;
+    ie.create;
+    S.create;
+    X = ce.create;
+    Le = J.create;
+    b = oe.create;
+    U = F.create;
+    mt = te.create;
+    L.create;
+    B.create;
+    Se = {
+      string: (t) => w.create({ ...t, coerce: true }),
+      number: (t) => $.create({ ...t, coerce: true }),
+      boolean: (t) => se.create({
+        ...t,
+        coerce: true
+      }),
+      bigint: (t) => V.create({ ...t, coerce: true }),
+      date: (t) => Q.create({ ...t, coerce: true })
+    };
     Pe = 100;
-    xt = T({
-      id: m().uuid(),
-      organizationId: m().uuid(),
-      name: m(),
-      keyHash: m(),
-      keyPrefix: m(),
-      keySuffix: m(),
-      isActive: ke(),
-      lastUsedAt: R().nullable(),
-      createdAt: R(),
-      updatedAt: R()
+    Nt = y({
+      id: f().uuid(),
+      organizationId: f().uuid(),
+      name: f(),
+      keyHash: f(),
+      keyPrefix: f(),
+      keySuffix: f(),
+      isActive: xe(),
+      lastUsedAt: I().nullable(),
+      createdAt: I(),
+      updatedAt: I()
     });
-    kt = T({
-      id: m().uuid(),
-      apiKeyId: m().uuid(),
-      organizationId: m().uuid(),
-      tokensUsed: L().int().positive(),
-      model: m(),
-      statusCode: L().int(),
-      createdAt: R()
+    At = y({
+      id: f().uuid(),
+      apiKeyId: f().uuid(),
+      organizationId: f().uuid(),
+      tokensUsed: k().int().positive(),
+      model: f(),
+      statusCode: k().int(),
+      createdAt: I()
     });
-    Ot = T({
-      name: m().min(1, "API key name is required").max(
+    Rt = y({
+      name: f().min(1, "API key name is required").max(
         Pe,
         `API key name must be less than ${Pe} characters`
       )
     });
-    bt = T({
-      id: m().uuid(),
-      name: m(),
-      keyPrefix: m(),
-      keySuffix: m(),
-      lastUsedAt: R().nullable(),
-      createdAt: R(),
-      currentMonthUsage: L().int().nonnegative(),
+    It = y({
+      id: f().uuid(),
+      name: f(),
+      keyPrefix: f(),
+      keySuffix: f(),
+      lastUsedAt: I().nullable(),
+      createdAt: I(),
+      currentMonthUsage: k().int().nonnegative(),
       // Full key is only returned once at creation
-      key: m().optional()
+      key: f().optional()
     });
-    Nt = T({
-      totalTokens: L().int(),
-      totalRequests: L().int(),
-      successfulRequests: L().int(),
-      failedRequests: L().int()
+    wt = y({
+      totalTokens: k().int(),
+      totalRequests: k().int(),
+      successfulRequests: k().int(),
+      failedRequests: k().int()
     });
-    mt = T({
-      error: m().describe("The error message")
+    _t = y({
+      error: f().describe("The error message")
     });
-    T({
-      error: m().describe("The error message")
+    y({
+      error: f().describe("The error message")
     });
-    Se = T({
-      errors: Y(ee(m())).describe("Field validation errors"),
-      message: m().optional().describe("General error message")
+    Ue = y({
+      errors: X(P(f())).describe("Field validation errors"),
+      message: f().optional().describe("General error message")
     });
-    ht([
-      mt,
-      Se,
-      T({
-        response: T({
-          clone: Me().returns(
-            T({
-              json: Me().returns(ft(Se))
+    ft([
+      _t,
+      Ue,
+      y({
+        response: y({
+          clone: Le().returns(
+            y({
+              json: Le().returns(mt(Ue))
             })
           )
         })
       })
     ]);
-    _t = 100;
-    At = T({
-      id: m().uuid(),
-      orgId: m(),
-      timezone: m().nullable(),
-      monthlyTokenLimit: L().int().positive(),
-      createdAt: R(),
-      updatedAt: R()
+    pt = 100;
+    Dt = y({
+      id: f().uuid(),
+      orgId: f(),
+      timezone: f().nullable(),
+      monthlyTokenLimit: k().int().positive(),
+      createdAt: I(),
+      updatedAt: I()
     });
-    pt = T({
-      timezone: m().max(_t, "Timezone must be less than 100 characters").nullable().optional(),
-      monthlyTokenLimit: L().int().positive().optional()
+    yt = y({
+      timezone: f().max(pt, "Timezone must be less than 100 characters").nullable().optional(),
+      monthlyTokenLimit: k().int().positive().optional()
     });
-    yt = T({
-      type: O("text"),
-      text: m()
+    gt = y({
+      type: b("text"),
+      text: f()
     });
-    gt = T({
-      type: O("tool_use"),
-      id: m(),
-      name: m(),
-      input: Y(te())
+    vt = y({
+      type: b("tool_use"),
+      id: f(),
+      name: f(),
+      input: X(re())
     });
-    vt = T({
-      type: O("tool_result"),
-      tool_use_id: m(),
-      content: m(),
-      is_error: ke().optional()
+    Tt = y({
+      type: b("tool_result"),
+      tool_use_id: f(),
+      content: f(),
+      is_error: xe().optional()
     });
-    Tt = T({
-      type: O("thinking"),
-      thinking: m()
+    Et = y({
+      type: b("thinking"),
+      thinking: f()
     });
-    Et = T({
-      type: O("image"),
-      source: T({
-        type: O("base64"),
-        media_type: m(),
-        data: m()
+    kt = y({
+      type: b("image"),
+      source: y({
+        type: b("base64"),
+        media_type: f(),
+        data: f()
       })
     });
-    ue = Ve("type", [
-      yt,
+    G = Fe("type", [
       gt,
       vt,
       Tt,
-      Et
+      Et,
+      kt
     ]);
-    It = T({
-      id: m().uuid(),
-      orgId: m(),
-      userId: m().uuid(),
-      title: m().nullable(),
-      origin: G(["cli", "web", "github"]).default("web"),
-      originMetadata: Y(te()).nullable().optional(),
-      authMethod: G(["clerk", "cli-token", "api-key"]).default("clerk"),
-      authId: m().nullable().optional(),
+    Zt = y({
+      id: f().uuid(),
+      orgId: f(),
+      userId: f().uuid(),
+      title: f().nullable(),
+      origin: U(["cli", "web", "github"]).default("web"),
+      originMetadata: X(re()).nullable().optional(),
+      authMethod: U(["clerk", "cli-token", "api-key"]).default("clerk"),
+      authId: f().nullable().optional(),
       // Claude Agent SDK session ID for resuming conversations
       // Sessions expire after ~30 days due to Anthropic's data retention policy
-      providerSessionId: m().nullable().optional(),
-      createdAt: R(),
-      updatedAt: R()
+      providerSessionId: f().nullable().optional(),
+      createdAt: I(),
+      updatedAt: I()
     });
-    wt = T({
-      title: m().optional(),
-      origin: G(["cli", "web", "github"]).optional(),
-      originMetadata: Y(te()).optional()
+    Lt = y({
+      title: f().optional(),
+      origin: U(["cli", "web", "github"]).optional(),
+      originMetadata: X(re()).optional()
     });
-    Dt = T({
-      title: m().optional(),
-      providerSessionId: m().optional()
+    St = y({
+      title: f().optional(),
+      providerSessionId: f().optional()
     });
-    Zt = T({
-      id: m().uuid(),
-      conversationId: m().uuid(),
-      role: G(["user", "assistant"]),
-      content: ee(ue),
-      createdAt: R()
+    Pt = y({
+      id: f().uuid(),
+      conversationId: f().uuid(),
+      role: U(["user", "assistant"]),
+      content: P(G),
+      createdAt: I()
     });
-    Lt = T({
-      role: G(["user", "assistant"]),
-      content: ee(ue)
+    Ut = y({
+      role: U(["user", "assistant"]),
+      content: P(G)
     });
-    Mt = Ve("type", [
-      T({
-        type: O("user_message"),
-        content: ee(ue)
+    jt = Fe("type", [
+      y({
+        type: b("user_message"),
+        content: P(G)
       }),
-      T({
-        type: O("assistant_text"),
-        delta: m()
+      y({
+        type: b("assistant_text"),
+        delta: f()
       }),
-      T({
-        type: O("assistant_thinking"),
-        delta: m()
+      y({
+        type: b("assistant_thinking"),
+        delta: f()
       }),
-      T({
-        type: O("tool_use"),
-        id: m(),
-        name: m(),
-        input: Y(te())
+      y({
+        type: b("tool_use"),
+        id: f(),
+        name: f(),
+        input: X(re())
       }),
-      T({
-        type: O("tool_result"),
-        tool_use_id: m(),
-        content: m(),
-        is_error: ke().optional()
+      y({
+        type: b("tool_result"),
+        tool_use_id: f(),
+        content: f(),
+        is_error: xe().optional()
       }),
-      T({
-        type: O("message_complete"),
-        message: T({
-          role: G(["user", "assistant"]),
-          content: ee(ue)
+      y({
+        type: b("message_complete"),
+        message: y({
+          role: U(["user", "assistant"]),
+          content: P(G)
         })
       }),
-      T({
-        type: O("session_complete")
+      y({
+        type: b("session_complete")
+      }),
+      y({
+        type: b("session_error"),
+        error: f()
+      }),
+      y({
+        type: b("query_start"),
+        prompt: f()
       }),
-      T({
-        type: O("session_error"),
-        error: m()
+      y({
+        type: b("query_complete"),
+        usage: y({
+          model: f(),
+          numTurns: k(),
+          durationMs: k(),
+          inputTokens: k(),
+          outputTokens: k(),
+          cacheReadTokens: k(),
+          cacheCreationTokens: k(),
+          costUsd: k()
+        }),
+        result: y({
+          status: U(["success", "error", "interrupted"]),
+          summary: f(),
+          error: f().optional()
+        })
       })
     ]);
-    Pt = T({
-      title: m(),
-      originMetadata: Y(te()).optional()
+    Ct = y({
+      title: f(),
+      originMetadata: X(re()).optional()
+    });
+    xt = y({
+      summary: f(),
+      status: U(["success", "error_max_turns", "error_during_execution", "interrupted"]),
+      error: f().optional()
+    });
+    bt = y({
+      assistant: P(G),
+      toolResults: P(G).optional()
+    });
+    Ot = y({
+      userMessage: P(G),
+      turns: P(bt),
+      result: xt
+    });
+    $t = y({
+      model: f(),
+      numTurns: k(),
+      durationMs: k(),
+      inputTokens: k(),
+      outputTokens: k(),
+      cacheReadTokens: k(),
+      cacheCreationTokens: k(),
+      costUsd: k()
+    });
+    Vt = y({
+      id: f().uuid(),
+      sessionId: f().uuid(),
+      sequence: k(),
+      prompt: f(),
+      content: Ot,
+      model: f(),
+      numTurns: k(),
+      durationMs: k().nullable(),
+      inputTokens: k(),
+      outputTokens: k(),
+      cacheReadTokens: k(),
+      cacheCreationTokens: k(),
+      costUsd: k(),
+      status: U(["running", "success", "error", "interrupted"]),
+      errorMessage: f().nullable(),
+      startedAt: Se.date(),
+      completedAt: Se.date().nullable()
     });
   }
 });
@@ -4429,7 +4517,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = "0.0.8";
+    CLI_VERSION = "0.0.10";
   }
 });
 
@@ -4502,103 +4590,6 @@ var init_encryption = __esm({
   }
 });
 
-// src/utils/keychain-storage.ts
-import crypto2 from "crypto";
-async function getKeytar() {
-  if (keytarLoadAttempted) {
-    return keytarModule;
-  }
-  keytarLoadAttempted = true;
-  try {
-    const moduleName = "keytar";
-    const mod = await import(moduleName);
-    keytarModule = mod.default || mod;
-  } catch {
-    keytarModule = null;
-  }
-  return keytarModule;
-}
-async function isKeychainAvailable() {
-  if (keychainAvailable !== null) {
-    return keychainAvailable;
-  }
-  if (process.env.SUPATEST_FORCE_FILE_STORAGE === "true") {
-    keychainAvailable = false;
-    return false;
-  }
-  try {
-    const keytar = await getKeytar();
-    if (!keytar) {
-      keychainAvailable = false;
-      return false;
-    }
-    const testAccount = `${KEYCHAIN_TEST_PREFIX}${crypto2.randomBytes(8).toString("hex")}`;
-    const testPassword = "test";
-    await keytar.setPassword(SERVICE_NAME, testAccount, testPassword);
-    const retrieved = await keytar.getPassword(SERVICE_NAME, testAccount);
-    const deleted = await keytar.deletePassword(SERVICE_NAME, testAccount);
-    keychainAvailable = deleted && retrieved === testPassword;
-  } catch {
-    keychainAvailable = false;
-  }
-  return keychainAvailable;
-}
-async function saveToKeychain(token, expiresAt) {
-  const keytar = await getKeytar();
-  if (!keytar) {
-    return false;
-  }
-  const payload = {
-    token,
-    expiresAt,
-    createdAt: (/* @__PURE__ */ new Date()).toISOString()
-  };
-  try {
-    await keytar.setPassword(SERVICE_NAME, ACCOUNT_NAME, JSON.stringify(payload));
-    return true;
-  } catch {
-    return false;
-  }
-}
-async function loadFromKeychain() {
-  const keytar = await getKeytar();
-  if (!keytar) {
-    return null;
-  }
-  try {
-    const data = await keytar.getPassword(SERVICE_NAME, ACCOUNT_NAME);
-    if (!data) {
-      return null;
-    }
-    return JSON.parse(data);
-  } catch {
-    return null;
-  }
-}
-async function removeFromKeychain() {
-  const keytar = await getKeytar();
-  if (!keytar) {
-    return false;
-  }
-  try {
-    return await keytar.deletePassword(SERVICE_NAME, ACCOUNT_NAME);
-  } catch {
-    return false;
-  }
-}
-var SERVICE_NAME, ACCOUNT_NAME, KEYCHAIN_TEST_PREFIX, keytarModule, keytarLoadAttempted, keychainAvailable;
-var init_keychain_storage = __esm({
-  "src/utils/keychain-storage.ts"() {
-    "use strict";
-    SERVICE_NAME = "supatest-cli";
-    ACCOUNT_NAME = "cli-token";
-    KEYCHAIN_TEST_PREFIX = "__keychain_test__";
-    keytarModule = null;
-    keytarLoadAttempted = false;
-    keychainAvailable = null;
-  }
-});
-
 // src/utils/token-storage.ts
 import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, unlinkSync, writeFileSync } from "fs";
 import { homedir } from "os";
@@ -4611,24 +4602,7 @@ function ensureConfigDir() {
     mkdirSync(CONFIG_DIR, { recursive: true, mode: 448 });
   }
 }
-async function initializeStorage() {
-  if (await isKeychainAvailable()) {
-    activeStorageType = "keychain" /* KEYCHAIN */;
-  } else {
-    activeStorageType = "encrypted_file" /* ENCRYPTED_FILE */;
-  }
-  return activeStorageType;
-}
-async function getStorageType() {
-  if (activeStorageType !== null) {
-    return activeStorageType;
-  }
-  if (!storageInitPromise) {
-    storageInitPromise = initializeStorage();
-  }
-  return storageInitPromise;
-}
-function saveTokenToFile(token, expiresAt) {
+function saveToken(token, expiresAt) {
   ensureConfigDir();
   const payload = {
     token,
@@ -4641,17 +4615,27 @@ function saveTokenToFile(token, expiresAt) {
   };
   writeFileSync(TOKEN_FILE, JSON.stringify(stored, null, 2), { mode: 384 });
 }
-function loadTokenFromFile() {
+function loadToken() {
   if (!existsSync2(TOKEN_FILE)) {
     return null;
   }
   try {
     const data = readFileSync2(TOKEN_FILE, "utf8");
     const stored = JSON.parse(data);
+    let payload;
     if (isV2Format(stored)) {
-      return JSON.parse(decrypt(stored.encryptedData));
+      payload = JSON.parse(decrypt(stored.encryptedData));
+    } else {
+      payload = stored;
+    }
+    if (payload.expiresAt) {
+      const expiresAt = new Date(payload.expiresAt);
+      if (expiresAt < /* @__PURE__ */ new Date()) {
+        console.warn("CLI token has expired. Please run 'supatest login' again.");
+        return null;
+      }
     }
-    return stored;
+    return payload.token;
   } catch (error) {
     const err = error;
     if (err.message?.includes("Invalid encrypted data format") || err.message?.includes("Unsupported state or unable to authenticate data")) {
@@ -4663,65 +4647,19 @@ function loadTokenFromFile() {
     return null;
   }
 }
-function removeTokenFile() {
+function removeToken() {
   if (existsSync2(TOKEN_FILE)) {
     unlinkSync(TOKEN_FILE);
   }
 }
-function loadToken() {
-  const payload = loadTokenFromFile();
-  if (!payload) {
-    return null;
-  }
-  if (payload.expiresAt) {
-    const expiresAt = new Date(payload.expiresAt);
-    if (expiresAt < /* @__PURE__ */ new Date()) {
-      console.warn("CLI token has expired. Please run 'supatest login' again.");
-      return null;
-    }
-  }
-  return payload.token;
-}
-async function saveTokenAsync(token, expiresAt) {
-  const storageType = await getStorageType();
-  if (storageType === "keychain" /* KEYCHAIN */) {
-    const saved = await saveToKeychain(token, expiresAt);
-    if (saved) {
-      removeTokenFile();
-      return;
-    }
-  }
-  saveTokenToFile(token, expiresAt);
-}
-async function loadTokenAsync() {
-  const storageType = await getStorageType();
-  if (storageType === "keychain" /* KEYCHAIN */) {
-    const payload = await loadFromKeychain();
-    if (payload) {
-      if (payload.expiresAt && new Date(payload.expiresAt) < /* @__PURE__ */ new Date()) {
-        console.warn("CLI token has expired. Please run 'supatest login' again.");
-        return null;
-      }
-      return payload.token;
-    }
-  }
-  return loadToken();
-}
-async function removeTokenAsync() {
-  await removeFromKeychain();
-  removeTokenFile();
-}
-var CONFIG_DIR, TOKEN_FILE, STORAGE_VERSION, activeStorageType, storageInitPromise;
+var CONFIG_DIR, TOKEN_FILE, STORAGE_VERSION;
 var init_token_storage = __esm({
   "src/utils/token-storage.ts"() {
     "use strict";
     init_encryption();
-    init_keychain_storage();
     CONFIG_DIR = join4(homedir(), ".supatest");
     TOKEN_FILE = join4(CONFIG_DIR, "token.json");
     STORAGE_VERSION = 2;
-    activeStorageType = null;
-    storageInitPromise = null;
   }
 });
 
@@ -4835,7 +4773,7 @@ var init_react = __esm({
         const message = {
           type: "tool",
           content: getToolDescription(tool, input),
-          toolName: Ct(tool),
+          toolName: qt(tool),
           toolInput: input,
           toolResult: void 0,
           isExpanded: false,
@@ -4930,14 +4868,14 @@ var init_react = __esm({
 
 // src/commands/login.ts
 import { spawn } from "child_process";
-import crypto3 from "crypto";
+import crypto2 from "crypto";
 import http from "http";
 import { platform } from "os";
 function escapeHtml(text) {
   return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
 }
 function generateState() {
-  return crypto3.randomBytes(STATE_LENGTH).toString("hex");
+  return crypto2.randomBytes(STATE_LENGTH).toString("hex");
 }
 async function exchangeCodeForToken(code, state) {
   const response = await fetch(`${API_URL}/web/auth/cli-token-exchange`, {
@@ -7342,7 +7280,7 @@ var init_ToolMessage = __esm({
       result,
       isExpanded = true
     }) => {
-      const displayName = Ct(toolName);
+      const displayName = qt(toolName);
       const { icon, color } = getToolStyle(toolName);
       const resultSummary = result ? getResultSummary(toolName, result) : null;
       const hasExpandableContent = !!result;
@@ -8034,7 +7972,7 @@ var init_App = __esm({
     };
     AppContent = ({ config: config2, sessionId, webUrl, queuedTasks = [], onExit, onSubmitTask, apiClient, onResumeSession }) => {
       const { exit } = useApp();
-      const { addMessage, clearMessages, isAgentRunning, messages, setSessionId, setWebUrl, setShouldInterruptAgent, toggleAllToolOutputs, allToolsExpanded } = useSession();
+      const { addMessage, clearMessages, isAgentRunning, messages, setSessionId, setWebUrl, setShouldInterruptAgent, setIsAgentRunning, toggleAllToolOutputs, allToolsExpanded } = useSession();
       useModeToggle();
       const [terminalWidth, setTerminalWidth] = useState7(process.stdout.columns || 80);
       const [terminalHeight, setTerminalHeight] = useState7(process.stdout.rows || 24);
@@ -8072,7 +8010,7 @@ var init_App = __esm({
         });
         try {
           const result = await loginCommand();
-          await saveTokenAsync(result.token, result.expiresAt);
+          saveToken(result.token, result.expiresAt);
           if (apiClient) {
             apiClient.setApiKey(result.token);
           }
@@ -8126,7 +8064,7 @@ var init_App = __esm({
               });
               return;
             }
-            await removeTokenAsync();
+            removeToken();
             if (apiClient) {
               apiClient.clearApiKey();
             }
@@ -8181,6 +8119,11 @@ var init_App = __esm({
         }
         setHasInputContent(false);
         setExitWarning(null);
+        addMessage({
+          type: "user",
+          content: task
+        });
+        setIsAgentRunning(true);
         if (onSubmitTask) {
           onSubmitTask(task);
         }
@@ -8566,7 +8509,8 @@ var init_interactive = __esm({
       const {
         addMessage,
         loadMessages,
-        setSessionId: setContextSessionId
+        setSessionId: setContextSessionId,
+        setIsAgentRunning
       } = useSession();
       const [sessionId, setSessionId] = React22.useState(initialSessionId);
       const [currentTask, setCurrentTask] = React22.useState(config2.task);
@@ -8591,6 +8535,7 @@ var init_interactive = __esm({
               content: errorMessage,
               errorType: error instanceof ApiError && error.isAuthError ? "warning" : "error"
             });
+            setIsAgentRunning(false);
             return;
           }
         }
@@ -8598,10 +8543,6 @@ var init_interactive = __esm({
           setTaskQueue((prev) => [...prev, task]);
         } else {
           setCurrentTask(task);
-          addMessage({
-            type: "user",
-            content: task
-          });
           setTaskId((prev) => prev + 1);
           setShouldRunAgent(true);
         }
@@ -8948,7 +8889,7 @@ var ConsolePresenter = class {
   }
   onToolUse(tool, input, _toolId) {
     if (this.spinner) {
-      const displayName = Ct(tool);
+      const displayName = qt(tool);
       this.spinner.text = `Using ${displayName}...`;
     }
     this.stopSpinner();
@@ -9472,7 +9413,7 @@ program.name("supatest").description(
         process.exit(1);
       }
     } else {
-      const cliToken = await loadTokenAsync();
+      const cliToken = loadToken();
       if (cliToken) {
         supatestApiKey = cliToken;
       } else {