npm - @chrischall/gemini-mcp - Versions diffs - 1.6.0 → 1.6.2 - Mend

@chrischall/gemini-mcp 1.6.0 → 1.6.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/.claude-plugin/marketplace.json +2 -2
package/.claude-plugin/plugin.json +1 -1
package/dist/blob-store.js +18 -2
package/dist/bundle.js +610 -600
package/dist/client.js +24 -6
package/dist/errors.js +120 -0
package/dist/index.js +6 -25
package/dist/media-url.js +10 -3
package/dist/registrars.js +50 -0
package/dist/signed-url.js +42 -0
package/dist/storage/media.js +6 -3
package/dist/tools/uploads.js +42 -19
package/dist/upload-url.js +24 -4
package/dist/version.js +1 -1
package/package.json +1 -1
package/server.json +2 -2

package/dist/bundle.js CHANGED Viewed

@@ -639,12 +639,12 @@ function isValidCidr(ip, version2) {
   }
   return false;
 }
-function floatSafeRemainder(val, step) {
+function floatSafeRemainder(val, step2) {
   const valDecCount = (val.toString().split(".")[1] || "").length;
-  const stepDecCount = (step.toString().split(".")[1] || "").length;
+  const stepDecCount = (step2.toString().split(".")[1] || "").length;
   const decCount = valDecCount > stepDecCount ? valDecCount : stepDecCount;
   const valInt = Number.parseInt(val.toFixed(decCount).replace(".", ""));
-  const stepInt = Number.parseInt(step.toFixed(decCount).replace(".", ""));
+  const stepInt = Number.parseInt(step2.toFixed(decCount).replace(".", ""));
   return valInt % stepInt / 10 ** decCount;
 }
 function deepPartialify(schema) {
@@ -4178,8 +4178,8 @@ function cleanRegex(source) {
   const end = source.endsWith("$") ? source.length - 1 : source.length;
   return source.slice(start, end);
 }
-function floatSafeRemainder2(val, step) {
-  const ratio = val / step;
+function floatSafeRemainder2(val, step2) {
+  const ratio = val / step2;
   const roundedRatio = Math.round(ratio);
   const tolerance = Number.EPSILON * Math.max(Math.abs(ratio), 1);
   if (Math.abs(ratio - roundedRatio) < tolerance)
@@ -5174,9 +5174,9 @@ var init_regexes = __esm({
 });
 // node_modules/zod/v4/core/checks.js
-function handleCheckPropertyResult(result, payload2, property) {
+function handleCheckPropertyResult(result, payload, property) {
   if (result.issues.length) {
-    payload2.issues.push(...prefixIssues(property, result.issues));
+    payload.issues.push(...prefixIssues(property, result.issues));
   }
 }
 var $ZodCheck, numericOriginMap, $ZodCheckLessThan, $ZodCheckGreaterThan, $ZodCheckMultipleOf, $ZodCheckNumberFormat, $ZodCheckBigIntFormat, $ZodCheckMaxSize, $ZodCheckMinSize, $ZodCheckSizeEquals, $ZodCheckMaxLength, $ZodCheckMinLength, $ZodCheckLengthEquals, $ZodCheckStringFormat, $ZodCheckRegex, $ZodCheckLowerCase, $ZodCheckUpperCase, $ZodCheckIncludes, $ZodCheckStartsWith, $ZodCheckEndsWith, $ZodCheckProperty, $ZodCheckMimeType, $ZodCheckOverwrite;
@@ -5209,15 +5209,15 @@ var init_checks = __esm({
             bag.exclusiveMaximum = def.value;
         }
       });
-      inst._zod.check = (payload2) => {
-        if (def.inclusive ? payload2.value <= def.value : payload2.value < def.value) {
+      inst._zod.check = (payload) => {
+        if (def.inclusive ? payload.value <= def.value : payload.value < def.value) {
           return;
         }
-        payload2.issues.push({
+        payload.issues.push({
           origin,
           code: "too_big",
           maximum: typeof def.value === "object" ? def.value.getTime() : def.value,
-          input: payload2.value,
+          input: payload.value,
           inclusive: def.inclusive,
           inst,
           continue: !def.abort
@@ -5237,15 +5237,15 @@ var init_checks = __esm({
             bag.exclusiveMinimum = def.value;
         }
       });
-      inst._zod.check = (payload2) => {
-        if (def.inclusive ? payload2.value >= def.value : payload2.value > def.value) {
+      inst._zod.check = (payload) => {
+        if (def.inclusive ? payload.value >= def.value : payload.value > def.value) {
           return;
         }
-        payload2.issues.push({
+        payload.issues.push({
           origin,
           code: "too_small",
           minimum: typeof def.value === "object" ? def.value.getTime() : def.value,
-          input: payload2.value,
+          input: payload.value,
           inclusive: def.inclusive,
           inst,
           continue: !def.abort
@@ -5258,17 +5258,17 @@ var init_checks = __esm({
         var _a3;
         (_a3 = inst2._zod.bag).multipleOf ?? (_a3.multipleOf = def.value);
       });
-      inst._zod.check = (payload2) => {
-        if (typeof payload2.value !== typeof def.value)
+      inst._zod.check = (payload) => {
+        if (typeof payload.value !== typeof def.value)
           throw new Error("Cannot mix number and bigint in multiple_of check.");
-        const isMultiple = typeof payload2.value === "bigint" ? payload2.value % def.value === BigInt(0) : floatSafeRemainder2(payload2.value, def.value) === 0;
+        const isMultiple = typeof payload.value === "bigint" ? payload.value % def.value === BigInt(0) : floatSafeRemainder2(payload.value, def.value) === 0;
         if (isMultiple)
           return;
-        payload2.issues.push({
-          origin: typeof payload2.value,
+        payload.issues.push({
+          origin: typeof payload.value,
           code: "not_multiple_of",
           divisor: def.value,
-          input: payload2.value,
+          input: payload.value,
           inst,
           continue: !def.abort
         });
@@ -5288,11 +5288,11 @@ var init_checks = __esm({
         if (isInt)
           bag.pattern = integer;
       });
-      inst._zod.check = (payload2) => {
-        const input = payload2.value;
+      inst._zod.check = (payload) => {
+        const input = payload.value;
         if (isInt) {
           if (!Number.isInteger(input)) {
-            payload2.issues.push({
+            payload.issues.push({
               expected: origin,
               format: def.format,
               code: "invalid_type",
@@ -5304,7 +5304,7 @@ var init_checks = __esm({
           }
           if (!Number.isSafeInteger(input)) {
             if (input > 0) {
-              payload2.issues.push({
+              payload.issues.push({
                 input,
                 code: "too_big",
                 maximum: Number.MAX_SAFE_INTEGER,
@@ -5315,7 +5315,7 @@ var init_checks = __esm({
                 continue: !def.abort
               });
             } else {
-              payload2.issues.push({
+              payload.issues.push({
                 input,
                 code: "too_small",
                 minimum: Number.MIN_SAFE_INTEGER,
@@ -5330,7 +5330,7 @@ var init_checks = __esm({
           }
         }
         if (input < minimum) {
-          payload2.issues.push({
+          payload.issues.push({
             origin: "number",
             input,
             code: "too_small",
@@ -5341,7 +5341,7 @@ var init_checks = __esm({
           });
         }
         if (input > maximum) {
-          payload2.issues.push({
+          payload.issues.push({
             origin: "number",
             input,
             code: "too_big",
@@ -5362,10 +5362,10 @@ var init_checks = __esm({
         bag.minimum = minimum;
         bag.maximum = maximum;
       });
-      inst._zod.check = (payload2) => {
-        const input = payload2.value;
+      inst._zod.check = (payload) => {
+        const input = payload.value;
         if (input < minimum) {
-          payload2.issues.push({
+          payload.issues.push({
             origin: "bigint",
             input,
             code: "too_small",
@@ -5376,7 +5376,7 @@ var init_checks = __esm({
           });
         }
         if (input > maximum) {
-          payload2.issues.push({
+          payload.issues.push({
             origin: "bigint",
             input,
             code: "too_big",
@@ -5391,8 +5391,8 @@ var init_checks = __esm({
     $ZodCheckMaxSize = /* @__PURE__ */ $constructor("$ZodCheckMaxSize", (inst, def) => {
       var _a3;
       $ZodCheck.init(inst, def);
-      (_a3 = inst._zod.def).when ?? (_a3.when = (payload2) => {
-        const val = payload2.value;
+      (_a3 = inst._zod.def).when ?? (_a3.when = (payload) => {
+        const val = payload.value;
         return !nullish(val) && val.size !== void 0;
       });
       inst._zod.onattach.push((inst2) => {
@@ -5400,12 +5400,12 @@ var init_checks = __esm({
         if (def.maximum < curr)
           inst2._zod.bag.maximum = def.maximum;
       });
-      inst._zod.check = (payload2) => {
-        const input = payload2.value;
+      inst._zod.check = (payload) => {
+        const input = payload.value;
         const size = input.size;
         if (size <= def.maximum)
           return;
-        payload2.issues.push({
+        payload.issues.push({
           origin: getSizableOrigin(input),
           code: "too_big",
           maximum: def.maximum,
@@ -5419,8 +5419,8 @@ var init_checks = __esm({
     $ZodCheckMinSize = /* @__PURE__ */ $constructor("$ZodCheckMinSize", (inst, def) => {
       var _a3;
       $ZodCheck.init(inst, def);
-      (_a3 = inst._zod.def).when ?? (_a3.when = (payload2) => {
-        const val = payload2.value;
+      (_a3 = inst._zod.def).when ?? (_a3.when = (payload) => {
+        const val = payload.value;
         return !nullish(val) && val.size !== void 0;
       });
       inst._zod.onattach.push((inst2) => {
@@ -5428,12 +5428,12 @@ var init_checks = __esm({
         if (def.minimum > curr)
           inst2._zod.bag.minimum = def.minimum;
       });
-      inst._zod.check = (payload2) => {
-        const input = payload2.value;
+      inst._zod.check = (payload) => {
+        const input = payload.value;
         const size = input.size;
         if (size >= def.minimum)
           return;
-        payload2.issues.push({
+        payload.issues.push({
           origin: getSizableOrigin(input),
           code: "too_small",
           minimum: def.minimum,
@@ -5447,8 +5447,8 @@ var init_checks = __esm({
     $ZodCheckSizeEquals = /* @__PURE__ */ $constructor("$ZodCheckSizeEquals", (inst, def) => {
       var _a3;
       $ZodCheck.init(inst, def);
-      (_a3 = inst._zod.def).when ?? (_a3.when = (payload2) => {
-        const val = payload2.value;
+      (_a3 = inst._zod.def).when ?? (_a3.when = (payload) => {
+        const val = payload.value;
         return !nullish(val) && val.size !== void 0;
       });
       inst._zod.onattach.push((inst2) => {
@@ -5457,18 +5457,18 @@ var init_checks = __esm({
         bag.maximum = def.size;
         bag.size = def.size;
       });
-      inst._zod.check = (payload2) => {
-        const input = payload2.value;
+      inst._zod.check = (payload) => {
+        const input = payload.value;
         const size = input.size;
         if (size === def.size)
           return;
         const tooBig2 = size > def.size;
-        payload2.issues.push({
+        payload.issues.push({
           origin: getSizableOrigin(input),
           ...tooBig2 ? { code: "too_big", maximum: def.size } : { code: "too_small", minimum: def.size },
           inclusive: true,
           exact: true,
-          input: payload2.value,
+          input: payload.value,
           inst,
           continue: !def.abort
         });
@@ -5477,8 +5477,8 @@ var init_checks = __esm({
     $ZodCheckMaxLength = /* @__PURE__ */ $constructor("$ZodCheckMaxLength", (inst, def) => {
       var _a3;
       $ZodCheck.init(inst, def);
-      (_a3 = inst._zod.def).when ?? (_a3.when = (payload2) => {
-        const val = payload2.value;
+      (_a3 = inst._zod.def).when ?? (_a3.when = (payload) => {
+        const val = payload.value;
         return !nullish(val) && val.length !== void 0;
       });
       inst._zod.onattach.push((inst2) => {
@@ -5486,13 +5486,13 @@ var init_checks = __esm({
         if (def.maximum < curr)
           inst2._zod.bag.maximum = def.maximum;
       });
-      inst._zod.check = (payload2) => {
-        const input = payload2.value;
+      inst._zod.check = (payload) => {
+        const input = payload.value;
         const length = input.length;
         if (length <= def.maximum)
           return;
         const origin = getLengthableOrigin(input);
-        payload2.issues.push({
+        payload.issues.push({
           origin,
           code: "too_big",
           maximum: def.maximum,
@@ -5506,8 +5506,8 @@ var init_checks = __esm({
     $ZodCheckMinLength = /* @__PURE__ */ $constructor("$ZodCheckMinLength", (inst, def) => {
       var _a3;
       $ZodCheck.init(inst, def);
-      (_a3 = inst._zod.def).when ?? (_a3.when = (payload2) => {
-        const val = payload2.value;
+      (_a3 = inst._zod.def).when ?? (_a3.when = (payload) => {
+        const val = payload.value;
         return !nullish(val) && val.length !== void 0;
       });
       inst._zod.onattach.push((inst2) => {
@@ -5515,13 +5515,13 @@ var init_checks = __esm({
         if (def.minimum > curr)
           inst2._zod.bag.minimum = def.minimum;
       });
-      inst._zod.check = (payload2) => {
-        const input = payload2.value;
+      inst._zod.check = (payload) => {
+        const input = payload.value;
         const length = input.length;
         if (length >= def.minimum)
           return;
         const origin = getLengthableOrigin(input);
-        payload2.issues.push({
+        payload.issues.push({
           origin,
           code: "too_small",
           minimum: def.minimum,
@@ -5535,8 +5535,8 @@ var init_checks = __esm({
     $ZodCheckLengthEquals = /* @__PURE__ */ $constructor("$ZodCheckLengthEquals", (inst, def) => {
       var _a3;
       $ZodCheck.init(inst, def);
-      (_a3 = inst._zod.def).when ?? (_a3.when = (payload2) => {
-        const val = payload2.value;
+      (_a3 = inst._zod.def).when ?? (_a3.when = (payload) => {
+        const val = payload.value;
         return !nullish(val) && val.length !== void 0;
       });
       inst._zod.onattach.push((inst2) => {
@@ -5545,19 +5545,19 @@ var init_checks = __esm({
         bag.maximum = def.length;
         bag.length = def.length;
       });
-      inst._zod.check = (payload2) => {
-        const input = payload2.value;
+      inst._zod.check = (payload) => {
+        const input = payload.value;
         const length = input.length;
         if (length === def.length)
           return;
         const origin = getLengthableOrigin(input);
         const tooBig2 = length > def.length;
-        payload2.issues.push({
+        payload.issues.push({
           origin,
           ...tooBig2 ? { code: "too_big", maximum: def.length } : { code: "too_small", minimum: def.length },
           inclusive: true,
           exact: true,
-          input: payload2.value,
+          input: payload.value,
           inst,
           continue: !def.abort
         });
@@ -5575,15 +5575,15 @@ var init_checks = __esm({
         }
       });
       if (def.pattern)
-        (_a3 = inst._zod).check ?? (_a3.check = (payload2) => {
+        (_a3 = inst._zod).check ?? (_a3.check = (payload) => {
           def.pattern.lastIndex = 0;
-          if (def.pattern.test(payload2.value))
+          if (def.pattern.test(payload.value))
             return;
-          payload2.issues.push({
+          payload.issues.push({
             origin: "string",
             code: "invalid_format",
             format: def.format,
-            input: payload2.value,
+            input: payload.value,
             ...def.pattern ? { pattern: def.pattern.toString() } : {},
             inst,
             continue: !def.abort
@@ -5595,15 +5595,15 @@ var init_checks = __esm({
     });
     $ZodCheckRegex = /* @__PURE__ */ $constructor("$ZodCheckRegex", (inst, def) => {
       $ZodCheckStringFormat.init(inst, def);
-      inst._zod.check = (payload2) => {
+      inst._zod.check = (payload) => {
         def.pattern.lastIndex = 0;
-        if (def.pattern.test(payload2.value))
+        if (def.pattern.test(payload.value))
           return;
-        payload2.issues.push({
+        payload.issues.push({
           origin: "string",
           code: "invalid_format",
           format: "regex",
-          input: payload2.value,
+          input: payload.value,
           pattern: def.pattern.toString(),
           inst,
           continue: !def.abort
@@ -5628,15 +5628,15 @@ var init_checks = __esm({
         bag.patterns ?? (bag.patterns = /* @__PURE__ */ new Set());
         bag.patterns.add(pattern);
       });
-      inst._zod.check = (payload2) => {
-        if (payload2.value.includes(def.includes, def.position))
+      inst._zod.check = (payload) => {
+        if (payload.value.includes(def.includes, def.position))
           return;
-        payload2.issues.push({
+        payload.issues.push({
           origin: "string",
           code: "invalid_format",
           format: "includes",
           includes: def.includes,
-          input: payload2.value,
+          input: payload.value,
           inst,
           continue: !def.abort
         });
@@ -5651,15 +5651,15 @@ var init_checks = __esm({
         bag.patterns ?? (bag.patterns = /* @__PURE__ */ new Set());
         bag.patterns.add(pattern);
       });
-      inst._zod.check = (payload2) => {
-        if (payload2.value.startsWith(def.prefix))
+      inst._zod.check = (payload) => {
+        if (payload.value.startsWith(def.prefix))
           return;
-        payload2.issues.push({
+        payload.issues.push({
           origin: "string",
           code: "invalid_format",
           format: "starts_with",
           prefix: def.prefix,
-          input: payload2.value,
+          input: payload.value,
           inst,
           continue: !def.abort
         });
@@ -5674,15 +5674,15 @@ var init_checks = __esm({
         bag.patterns ?? (bag.patterns = /* @__PURE__ */ new Set());
         bag.patterns.add(pattern);
       });
-      inst._zod.check = (payload2) => {
-        if (payload2.value.endsWith(def.suffix))
+      inst._zod.check = (payload) => {
+        if (payload.value.endsWith(def.suffix))
           return;
-        payload2.issues.push({
+        payload.issues.push({
           origin: "string",
           code: "invalid_format",
           format: "ends_with",
           suffix: def.suffix,
-          input: payload2.value,
+          input: payload.value,
           inst,
           continue: !def.abort
         });
@@ -5690,15 +5690,15 @@ var init_checks = __esm({
     });
     $ZodCheckProperty = /* @__PURE__ */ $constructor("$ZodCheckProperty", (inst, def) => {
       $ZodCheck.init(inst, def);
-      inst._zod.check = (payload2) => {
+      inst._zod.check = (payload) => {
         const result = def.schema._zod.run({
-          value: payload2.value[def.property],
+          value: payload.value[def.property],
           issues: []
         }, {});
         if (result instanceof Promise) {
-          return result.then((result2) => handleCheckPropertyResult(result2, payload2, def.property));
+          return result.then((result2) => handleCheckPropertyResult(result2, payload, def.property));
         }
-        handleCheckPropertyResult(result, payload2, def.property);
+        handleCheckPropertyResult(result, payload, def.property);
         return;
       };
     });
@@ -5708,13 +5708,13 @@ var init_checks = __esm({
       inst._zod.onattach.push((inst2) => {
         inst2._zod.bag.mime = def.mime;
       });
-      inst._zod.check = (payload2) => {
-        if (mimeSet.has(payload2.value.type))
+      inst._zod.check = (payload) => {
+        if (mimeSet.has(payload.value.type))
           return;
-        payload2.issues.push({
+        payload.issues.push({
           code: "invalid_value",
           values: def.mime,
-          input: payload2.value.type,
+          input: payload.value.type,
           inst,
           continue: !def.abort
         });
@@ -5722,8 +5722,8 @@ var init_checks = __esm({
     });
     $ZodCheckOverwrite = /* @__PURE__ */ $constructor("$ZodCheckOverwrite", (inst, def) => {
       $ZodCheck.init(inst, def);
-      inst._zod.check = (payload2) => {
-        payload2.value = def.tx(payload2.value);
+      inst._zod.check = (payload) => {
+        payload.value = def.tx(payload.value);
       };
     });
   }
@@ -5873,7 +5873,7 @@ function normalizeDef(def) {
     optionalKeys: new Set(okeys)
   };
 }
-function handleCatchall(proms, input, payload2, ctx, def, inst) {
+function handleCatchall(proms, input, payload, ctx, def, inst) {
   const unrecognized = [];
   const keySet = def.keySet;
   const _catchall = def.catchall._zod;
@@ -5891,13 +5891,13 @@ function handleCatchall(proms, input, payload2, ctx, def, inst) {
     }
     const r = _catchall.run({ value: input[key], issues: [] }, ctx);
     if (r instanceof Promise) {
-      proms.push(r.then((r2) => handlePropertyResult(r2, payload2, key, input, isOptionalIn, isOptionalOut)));
+      proms.push(r.then((r2) => handlePropertyResult(r2, payload, key, input, isOptionalIn, isOptionalOut)));
     } else {
-      handlePropertyResult(r, payload2, key, input, isOptionalIn, isOptionalOut);
+      handlePropertyResult(r, payload, key, input, isOptionalIn, isOptionalOut);
     }
   }
   if (unrecognized.length) {
-    payload2.issues.push({
+    payload.issues.push({
       code: "unrecognized_keys",
       keys: unrecognized,
       input,
@@ -5905,9 +5905,9 @@ function handleCatchall(proms, input, payload2, ctx, def, inst) {
     });
   }
   if (!proms.length)
-    return payload2;
+    return payload;
   return Promise.all(proms).then(() => {
-    return payload2;
+    return payload;
   });
 }
 function handleUnionResults(results, final, inst, ctx) {
@@ -6114,22 +6114,22 @@ function handleOptionalResult(result, input) {
   }
   return result;
 }
-function handleDefaultResult(payload2, def) {
-  if (payload2.value === void 0) {
-    payload2.value = def.defaultValue;
+function handleDefaultResult(payload, def) {
+  if (payload.value === void 0) {
+    payload.value = def.defaultValue;
   }
-  return payload2;
+  return payload;
 }
-function handleNonOptionalResult(payload2, inst) {
-  if (!payload2.issues.length && payload2.value === void 0) {
-    payload2.issues.push({
+function handleNonOptionalResult(payload, inst) {
+  if (!payload.issues.length && payload.value === void 0) {
+    payload.issues.push({
       code: "invalid_type",
       expected: "nonoptional",
-      input: payload2.value,
+      input: payload.value,
       inst
     });
   }
-  return payload2;
+  return payload;
 }
 function handlePipeResult(left, next, ctx) {
   if (left.issues.length) {
@@ -6165,11 +6165,11 @@ function handleCodecTxResult(left, value, nextSchema, ctx) {
   }
   return nextSchema._zod.run({ value, issues: left.issues }, ctx);
 }
-function handleReadonlyResult(payload2) {
-  payload2.value = Object.freeze(payload2.value);
-  return payload2;
+function handleReadonlyResult(payload) {
+  payload.value = Object.freeze(payload.value);
+  return payload;
 }
-function handleRefineResult(result, payload2, input, inst) {
+function handleRefineResult(result, payload, input, inst) {
   if (!result) {
     const _iss = {
       code: "custom",
@@ -6183,7 +6183,7 @@ function handleRefineResult(result, payload2, input, inst) {
     };
     if (inst._zod.def.params)
       _iss.params = inst._zod.def.params;
-    payload2.issues.push(issue(_iss));
+    payload.issues.push(issue(_iss));
   }
 }
 var $ZodType, $ZodString, $ZodStringFormat, $ZodGUID, $ZodUUID, $ZodEmail, $ZodURL, $ZodEmoji, $ZodNanoID, $ZodCUID, $ZodCUID2, $ZodULID, $ZodXID, $ZodKSUID, $ZodISODateTime, $ZodISODate, $ZodISOTime, $ZodISODuration, $ZodIPv4, $ZodIPv6, $ZodMAC, $ZodCIDRv4, $ZodCIDRv6, $ZodBase64, $ZodBase64URL, $ZodE164, $ZodJWT, $ZodCustomStringFormat, $ZodNumber, $ZodNumberFormat, $ZodBoolean, $ZodBigInt, $ZodBigIntFormat, $ZodSymbol, $ZodUndefined, $ZodNull, $ZodAny, $ZodUnknown, $ZodNever, $ZodVoid, $ZodDate, $ZodArray, $ZodObject, $ZodObjectJIT, $ZodUnion, $ZodXor, $ZodDiscriminatedUnion, $ZodIntersection, $ZodTuple, $ZodRecord, $ZodMap, $ZodSet, $ZodEnum, $ZodLiteral, $ZodFile, $ZodTransform, $ZodOptional, $ZodExactOptional, $ZodNullable, $ZodDefault, $ZodPrefault, $ZodNonOptional, $ZodSuccess, $ZodCatch, $ZodNaN, $ZodPipe, $ZodCodec, $ZodPreprocess, $ZodReadonly, $ZodTemplateLiteral, $ZodFunction, $ZodPromise, $ZodLazy, $ZodCustom;
@@ -6218,54 +6218,54 @@ var init_schemas = __esm({
           inst._zod.run = inst._zod.parse;
         });
       } else {
-        const runChecks = (payload2, checks2, ctx) => {
-          let isAborted2 = aborted(payload2);
+        const runChecks = (payload, checks2, ctx) => {
+          let isAborted2 = aborted(payload);
           let asyncResult;
           for (const ch of checks2) {
             if (ch._zod.def.when) {
-              if (explicitlyAborted(payload2))
+              if (explicitlyAborted(payload))
                 continue;
-              const shouldRun = ch._zod.def.when(payload2);
+              const shouldRun = ch._zod.def.when(payload);
               if (!shouldRun)
                 continue;
             } else if (isAborted2) {
               continue;
             }
-            const currLen = payload2.issues.length;
-            const _ = ch._zod.check(payload2);
+            const currLen = payload.issues.length;
+            const _ = ch._zod.check(payload);
             if (_ instanceof Promise && ctx?.async === false) {
               throw new $ZodAsyncError();
             }
             if (asyncResult || _ instanceof Promise) {
               asyncResult = (asyncResult ?? Promise.resolve()).then(async () => {
                 await _;
-                const nextLen = payload2.issues.length;
+                const nextLen = payload.issues.length;
                 if (nextLen === currLen)
                   return;
                 if (!isAborted2)
-                  isAborted2 = aborted(payload2, currLen);
+                  isAborted2 = aborted(payload, currLen);
               });
             } else {
-              const nextLen = payload2.issues.length;
+              const nextLen = payload.issues.length;
               if (nextLen === currLen)
                 continue;
               if (!isAborted2)
-                isAborted2 = aborted(payload2, currLen);
+                isAborted2 = aborted(payload, currLen);
             }
           }
           if (asyncResult) {
             return asyncResult.then(() => {
-              return payload2;
+              return payload;
             });
           }
-          return payload2;
+          return payload;
         };
-        const handleCanaryResult = (canary, payload2, ctx) => {
+        const handleCanaryResult = (canary, payload, ctx) => {
           if (aborted(canary)) {
             canary.aborted = true;
             return canary;
           }
-          const checkResult = runChecks(payload2, checks, ctx);
+          const checkResult = runChecks(payload, checks, ctx);
           if (checkResult instanceof Promise) {
             if (ctx.async === false)
               throw new $ZodAsyncError();
@@ -6273,20 +6273,20 @@ var init_schemas = __esm({
           }
           return inst._zod.parse(checkResult, ctx);
         };
-        inst._zod.run = (payload2, ctx) => {
+        inst._zod.run = (payload, ctx) => {
           if (ctx.skipChecks) {
-            return inst._zod.parse(payload2, ctx);
+            return inst._zod.parse(payload, ctx);
           }
           if (ctx.direction === "backward") {
-            const canary = inst._zod.parse({ value: payload2.value, issues: [] }, { ...ctx, skipChecks: true });
+            const canary = inst._zod.parse({ value: payload.value, issues: [] }, { ...ctx, skipChecks: true });
             if (canary instanceof Promise) {
               return canary.then((canary2) => {
-                return handleCanaryResult(canary2, payload2, ctx);
+                return handleCanaryResult(canary2, payload, ctx);
               });
             }
-            return handleCanaryResult(canary, payload2, ctx);
+            return handleCanaryResult(canary, payload, ctx);
           }
-          const result = inst._zod.parse(payload2, ctx);
+          const result = inst._zod.parse(payload, ctx);
           if (result instanceof Promise) {
             if (ctx.async === false)
               throw new $ZodAsyncError();
@@ -6311,21 +6311,21 @@ var init_schemas = __esm({
     $ZodString = /* @__PURE__ */ $constructor("$ZodString", (inst, def) => {
       $ZodType.init(inst, def);
       inst._zod.pattern = [...inst?._zod.bag?.patterns ?? []].pop() ?? string(inst._zod.bag);
-      inst._zod.parse = (payload2, _) => {
+      inst._zod.parse = (payload, _) => {
         if (def.coerce)
           try {
-            payload2.value = String(payload2.value);
+            payload.value = String(payload.value);
           } catch (_2) {
           }
-        if (typeof payload2.value === "string")
-          return payload2;
-        payload2.issues.push({
+        if (typeof payload.value === "string")
+          return payload;
+        payload.issues.push({
           expected: "string",
           code: "invalid_type",
-          input: payload2.value,
+          input: payload.value,
           inst
         });
-        return payload2;
+        return payload;
       };
     });
     $ZodStringFormat = /* @__PURE__ */ $constructor("$ZodStringFormat", (inst, def) => {
@@ -6362,16 +6362,16 @@ var init_schemas = __esm({
     });
     $ZodURL = /* @__PURE__ */ $constructor("$ZodURL", (inst, def) => {
       $ZodStringFormat.init(inst, def);
-      inst._zod.check = (payload2) => {
+      inst._zod.check = (payload) => {
         try {
-          const trimmed = payload2.value.trim();
+          const trimmed = payload.value.trim();
           if (!def.normalize && def.protocol?.source === httpProtocol.source) {
             if (!/^https?:\/\//i.test(trimmed)) {
-              payload2.issues.push({
+              payload.issues.push({
                 code: "invalid_format",
                 format: "url",
                 note: "Invalid URL format",
-                input: payload2.value,
+                input: payload.value,
                 inst,
                 continue: !def.abort
               });
@@ -6382,12 +6382,12 @@ var init_schemas = __esm({
           if (def.hostname) {
             def.hostname.lastIndex = 0;
             if (!def.hostname.test(url2.hostname)) {
-              payload2.issues.push({
+              payload.issues.push({
                 code: "invalid_format",
                 format: "url",
                 note: "Invalid hostname",
                 pattern: def.hostname.source,
-                input: payload2.value,
+                input: payload.value,
                 inst,
                 continue: !def.abort
               });
@@ -6396,28 +6396,28 @@ var init_schemas = __esm({
           if (def.protocol) {
             def.protocol.lastIndex = 0;
             if (!def.protocol.test(url2.protocol.endsWith(":") ? url2.protocol.slice(0, -1) : url2.protocol)) {
-              payload2.issues.push({
+              payload.issues.push({
                 code: "invalid_format",
                 format: "url",
                 note: "Invalid protocol",
                 pattern: def.protocol.source,
-                input: payload2.value,
+                input: payload.value,
                 inst,
                 continue: !def.abort
               });
             }
           }
           if (def.normalize) {
-            payload2.value = url2.href;
+            payload.value = url2.href;
           } else {
-            payload2.value = trimmed;
+            payload.value = trimmed;
           }
           return;
         } catch (_) {
-          payload2.issues.push({
+          payload.issues.push({
             code: "invalid_format",
             format: "url",
-            input: payload2.value,
+            input: payload.value,
             inst,
             continue: !def.abort
           });
@@ -6477,14 +6477,14 @@ var init_schemas = __esm({
       def.pattern ?? (def.pattern = ipv6);
       $ZodStringFormat.init(inst, def);
       inst._zod.bag.format = `ipv6`;
-      inst._zod.check = (payload2) => {
+      inst._zod.check = (payload) => {
         try {
-          new URL(`http://[${payload2.value}]`);
+          new URL(`http://[${payload.value}]`);
         } catch {
-          payload2.issues.push({
+          payload.issues.push({
             code: "invalid_format",
             format: "ipv6",
-            input: payload2.value,
+            input: payload.value,
             inst,
             continue: !def.abort
           });
@@ -6503,8 +6503,8 @@ var init_schemas = __esm({
     $ZodCIDRv6 = /* @__PURE__ */ $constructor("$ZodCIDRv6", (inst, def) => {
       def.pattern ?? (def.pattern = cidrv6);
       $ZodStringFormat.init(inst, def);
-      inst._zod.check = (payload2) => {
-        const parts = payload2.value.split("/");
+      inst._zod.check = (payload) => {
+        const parts = payload.value.split("/");
         try {
           if (parts.length !== 2)
             throw new Error();
@@ -6518,10 +6518,10 @@ var init_schemas = __esm({
             throw new Error();
           new URL(`http://[${address}]`);
         } catch {
-          payload2.issues.push({
+          payload.issues.push({
             code: "invalid_format",
             format: "cidrv6",
-            input: payload2.value,
+            input: payload.value,
             inst,
             continue: !def.abort
           });
@@ -6532,13 +6532,13 @@ var init_schemas = __esm({
       def.pattern ?? (def.pattern = base64);
       $ZodStringFormat.init(inst, def);
       inst._zod.bag.contentEncoding = "base64";
-      inst._zod.check = (payload2) => {
-        if (isValidBase64(payload2.value))
+      inst._zod.check = (payload) => {
+        if (isValidBase64(payload.value))
           return;
-        payload2.issues.push({
+        payload.issues.push({
           code: "invalid_format",
           format: "base64",
-          input: payload2.value,
+          input: payload.value,
           inst,
           continue: !def.abort
         });
@@ -6548,13 +6548,13 @@ var init_schemas = __esm({
       def.pattern ?? (def.pattern = base64url);
       $ZodStringFormat.init(inst, def);
       inst._zod.bag.contentEncoding = "base64url";
-      inst._zod.check = (payload2) => {
-        if (isValidBase64URL(payload2.value))
+      inst._zod.check = (payload) => {
+        if (isValidBase64URL(payload.value))
           return;
-        payload2.issues.push({
+        payload.issues.push({
           code: "invalid_format",
           format: "base64url",
-          input: payload2.value,
+          input: payload.value,
           inst,
           continue: !def.abort
         });
@@ -6566,13 +6566,13 @@ var init_schemas = __esm({
     });
     $ZodJWT = /* @__PURE__ */ $constructor("$ZodJWT", (inst, def) => {
       $ZodStringFormat.init(inst, def);
-      inst._zod.check = (payload2) => {
-        if (isValidJWT2(payload2.value, def.alg))
+      inst._zod.check = (payload) => {
+        if (isValidJWT2(payload.value, def.alg))
           return;
-        payload2.issues.push({
+        payload.issues.push({
           code: "invalid_format",
           format: "jwt",
-          input: payload2.value,
+          input: payload.value,
           inst,
           continue: !def.abort
         });
@@ -6580,13 +6580,13 @@ var init_schemas = __esm({
     });
     $ZodCustomStringFormat = /* @__PURE__ */ $constructor("$ZodCustomStringFormat", (inst, def) => {
       $ZodStringFormat.init(inst, def);
-      inst._zod.check = (payload2) => {
-        if (def.fn(payload2.value))
+      inst._zod.check = (payload) => {
+        if (def.fn(payload.value))
           return;
-        payload2.issues.push({
+        payload.issues.push({
           code: "invalid_format",
           format: def.format,
-          input: payload2.value,
+          input: payload.value,
           inst,
           continue: !def.abort
         });
@@ -6595,25 +6595,25 @@ var init_schemas = __esm({
     $ZodNumber = /* @__PURE__ */ $constructor("$ZodNumber", (inst, def) => {
       $ZodType.init(inst, def);
       inst._zod.pattern = inst._zod.bag.pattern ?? number;
-      inst._zod.parse = (payload2, _ctx) => {
+      inst._zod.parse = (payload, _ctx) => {
         if (def.coerce)
           try {
-            payload2.value = Number(payload2.value);
+            payload.value = Number(payload.value);
           } catch (_) {
           }
-        const input = payload2.value;
+        const input = payload.value;
         if (typeof input === "number" && !Number.isNaN(input) && Number.isFinite(input)) {
-          return payload2;
+          return payload;
         }
         const received = typeof input === "number" ? Number.isNaN(input) ? "NaN" : !Number.isFinite(input) ? "Infinity" : void 0 : void 0;
-        payload2.issues.push({
+        payload.issues.push({
           expected: "number",
           code: "invalid_type",
           input,
           inst,
           ...received ? { received } : {}
         });
-        return payload2;
+        return payload;
       };
     });
     $ZodNumberFormat = /* @__PURE__ */ $constructor("$ZodNumberFormat", (inst, def) => {
@@ -6623,42 +6623,42 @@ var init_schemas = __esm({
     $ZodBoolean = /* @__PURE__ */ $constructor("$ZodBoolean", (inst, def) => {
       $ZodType.init(inst, def);
       inst._zod.pattern = boolean;
-      inst._zod.parse = (payload2, _ctx) => {
+      inst._zod.parse = (payload, _ctx) => {
         if (def.coerce)
           try {
-            payload2.value = Boolean(payload2.value);
+            payload.value = Boolean(payload.value);
           } catch (_) {
           }
-        const input = payload2.value;
+        const input = payload.value;
         if (typeof input === "boolean")
-          return payload2;
-        payload2.issues.push({
+          return payload;
+        payload.issues.push({
           expected: "boolean",
           code: "invalid_type",
           input,
           inst
         });
-        return payload2;
+        return payload;
       };
     });
     $ZodBigInt = /* @__PURE__ */ $constructor("$ZodBigInt", (inst, def) => {
       $ZodType.init(inst, def);
       inst._zod.pattern = bigint;
-      inst._zod.parse = (payload2, _ctx) => {
+      inst._zod.parse = (payload, _ctx) => {
         if (def.coerce)
           try {
-            payload2.value = BigInt(payload2.value);
+            payload.value = BigInt(payload.value);
           } catch (_) {
           }
-        if (typeof payload2.value === "bigint")
-          return payload2;
-        payload2.issues.push({
+        if (typeof payload.value === "bigint")
+          return payload;
+        payload.issues.push({
           expected: "bigint",
           code: "invalid_type",
-          input: payload2.value,
+          input: payload.value,
           inst
         });
-        return payload2;
+        return payload;
       };
     });
     $ZodBigIntFormat = /* @__PURE__ */ $constructor("$ZodBigIntFormat", (inst, def) => {
@@ -6667,126 +6667,126 @@ var init_schemas = __esm({
     });
     $ZodSymbol = /* @__PURE__ */ $constructor("$ZodSymbol", (inst, def) => {
       $ZodType.init(inst, def);
-      inst._zod.parse = (payload2, _ctx) => {
-        const input = payload2.value;
+      inst._zod.parse = (payload, _ctx) => {
+        const input = payload.value;
         if (typeof input === "symbol")
-          return payload2;
-        payload2.issues.push({
+          return payload;
+        payload.issues.push({
           expected: "symbol",
           code: "invalid_type",
           input,
           inst
         });
-        return payload2;
+        return payload;
       };
     });
     $ZodUndefined = /* @__PURE__ */ $constructor("$ZodUndefined", (inst, def) => {
       $ZodType.init(inst, def);
       inst._zod.pattern = _undefined;
       inst._zod.values = /* @__PURE__ */ new Set([void 0]);
-      inst._zod.parse = (payload2, _ctx) => {
-        const input = payload2.value;
+      inst._zod.parse = (payload, _ctx) => {
+        const input = payload.value;
         if (typeof input === "undefined")
-          return payload2;
-        payload2.issues.push({
+          return payload;
+        payload.issues.push({
           expected: "undefined",
           code: "invalid_type",
           input,
           inst
         });
-        return payload2;
+        return payload;
       };
     });
     $ZodNull = /* @__PURE__ */ $constructor("$ZodNull", (inst, def) => {
       $ZodType.init(inst, def);
       inst._zod.pattern = _null;
       inst._zod.values = /* @__PURE__ */ new Set([null]);
-      inst._zod.parse = (payload2, _ctx) => {
-        const input = payload2.value;
+      inst._zod.parse = (payload, _ctx) => {
+        const input = payload.value;
         if (input === null)
-          return payload2;
-        payload2.issues.push({
+          return payload;
+        payload.issues.push({
           expected: "null",
           code: "invalid_type",
           input,
           inst
         });
-        return payload2;
+        return payload;
       };
     });
     $ZodAny = /* @__PURE__ */ $constructor("$ZodAny", (inst, def) => {
       $ZodType.init(inst, def);
-      inst._zod.parse = (payload2) => payload2;
+      inst._zod.parse = (payload) => payload;
     });
     $ZodUnknown = /* @__PURE__ */ $constructor("$ZodUnknown", (inst, def) => {
       $ZodType.init(inst, def);
-      inst._zod.parse = (payload2) => payload2;
+      inst._zod.parse = (payload) => payload;
     });
     $ZodNever = /* @__PURE__ */ $constructor("$ZodNever", (inst, def) => {
       $ZodType.init(inst, def);
-      inst._zod.parse = (payload2, _ctx) => {
-        payload2.issues.push({
+      inst._zod.parse = (payload, _ctx) => {
+        payload.issues.push({
           expected: "never",
           code: "invalid_type",
-          input: payload2.value,
+          input: payload.value,
           inst
         });
-        return payload2;
+        return payload;
       };
     });
     $ZodVoid = /* @__PURE__ */ $constructor("$ZodVoid", (inst, def) => {
       $ZodType.init(inst, def);
-      inst._zod.parse = (payload2, _ctx) => {
-        const input = payload2.value;
+      inst._zod.parse = (payload, _ctx) => {
+        const input = payload.value;
         if (typeof input === "undefined")
-          return payload2;
-        payload2.issues.push({
+          return payload;
+        payload.issues.push({
           expected: "void",
           code: "invalid_type",
           input,
           inst
         });
-        return payload2;
+        return payload;
       };
     });
     $ZodDate = /* @__PURE__ */ $constructor("$ZodDate", (inst, def) => {
       $ZodType.init(inst, def);
-      inst._zod.parse = (payload2, _ctx) => {
+      inst._zod.parse = (payload, _ctx) => {
         if (def.coerce) {
           try {
-            payload2.value = new Date(payload2.value);
+            payload.value = new Date(payload.value);
           } catch (_err) {
           }
         }
-        const input = payload2.value;
+        const input = payload.value;
         const isDate = input instanceof Date;
         const isValidDate = isDate && !Number.isNaN(input.getTime());
         if (isValidDate)
-          return payload2;
-        payload2.issues.push({
+          return payload;
+        payload.issues.push({
           expected: "date",
           code: "invalid_type",
           input,
           ...isDate ? { received: "Invalid Date" } : {},
           inst
         });
-        return payload2;
+        return payload;
       };
     });
     $ZodArray = /* @__PURE__ */ $constructor("$ZodArray", (inst, def) => {
       $ZodType.init(inst, def);
-      inst._zod.parse = (payload2, ctx) => {
-        const input = payload2.value;
+      inst._zod.parse = (payload, ctx) => {
+        const input = payload.value;
         if (!Array.isArray(input)) {
-          payload2.issues.push({
+          payload.issues.push({
             expected: "array",
             code: "invalid_type",
             input,
             inst
           });
-          return payload2;
+          return payload;
         }
-        payload2.value = Array(input.length);
+        payload.value = Array(input.length);
         const proms = [];
         for (let i = 0; i < input.length; i++) {
           const item = input[i];
@@ -6795,15 +6795,15 @@ var init_schemas = __esm({
             issues: []
           }, ctx);
           if (result instanceof Promise) {
-            proms.push(result.then((result2) => handleArrayResult(result2, payload2, i)));
+            proms.push(result.then((result2) => handleArrayResult(result2, payload, i)));
           } else {
-            handleArrayResult(result, payload2, i);
+            handleArrayResult(result, payload, i);
           }
         }
         if (proms.length) {
-          return Promise.all(proms).then(() => payload2);
+          return Promise.all(proms).then(() => payload);
         }
-        return payload2;
+        return payload;
       };
     });
     $ZodObject = /* @__PURE__ */ $constructor("$ZodObject", (inst, def) => {
@@ -6838,19 +6838,19 @@ var init_schemas = __esm({
       const isObject2 = isObject;
       const catchall = def.catchall;
       let value;
-      inst._zod.parse = (payload2, ctx) => {
+      inst._zod.parse = (payload, ctx) => {
         value ?? (value = _normalized.value);
-        const input = payload2.value;
+        const input = payload.value;
         if (!isObject2(input)) {
-          payload2.issues.push({
+          payload.issues.push({
             expected: "object",
             code: "invalid_type",
             input,
             inst
           });
-          return payload2;
+          return payload;
         }
-        payload2.value = {};
+        payload.value = {};
         const proms = [];
         const shape = value.shape;
         for (const key of value.keys) {
@@ -6859,15 +6859,15 @@ var init_schemas = __esm({
           const isOptionalOut = el._zod.optout === "optional";
           const r = el._zod.run({ value: input[key], issues: [] }, ctx);
           if (r instanceof Promise) {
-            proms.push(r.then((r2) => handlePropertyResult(r2, payload2, key, input, isOptionalIn, isOptionalOut)));
+            proms.push(r.then((r2) => handlePropertyResult(r2, payload, key, input, isOptionalIn, isOptionalOut)));
           } else {
-            handlePropertyResult(r, payload2, key, input, isOptionalIn, isOptionalOut);
+            handlePropertyResult(r, payload, key, input, isOptionalIn, isOptionalOut);
           }
         }
         if (!catchall) {
-          return proms.length ? Promise.all(proms).then(() => payload2) : payload2;
+          return proms.length ? Promise.all(proms).then(() => payload) : payload;
         }
-        return handleCatchall(proms, input, payload2, ctx, _normalized.value, inst);
+        return handleCatchall(proms, input, payload, ctx, _normalized.value, inst);
       };
     });
     $ZodObjectJIT = /* @__PURE__ */ $constructor("$ZodObjectJIT", (inst, def) => {
@@ -6965,7 +6965,7 @@ var init_schemas = __esm({
         doc.write(`payload.value = newResult;`);
         doc.write(`return payload;`);
         const fn = doc.compile();
-        return (payload2, ctx) => fn(shape, payload2, ctx);
+        return (payload, ctx) => fn(shape, payload, ctx);
       };
       let fastpass;
       const isObject2 = isObject;
@@ -6974,27 +6974,27 @@ var init_schemas = __esm({
       const fastEnabled = jit && allowsEval2.value;
       const catchall = def.catchall;
       let value;
-      inst._zod.parse = (payload2, ctx) => {
+      inst._zod.parse = (payload, ctx) => {
         value ?? (value = _normalized.value);
-        const input = payload2.value;
+        const input = payload.value;
         if (!isObject2(input)) {
-          payload2.issues.push({
+          payload.issues.push({
             expected: "object",
             code: "invalid_type",
             input,
             inst
           });
-          return payload2;
+          return payload;
         }
         if (jit && fastEnabled && ctx?.async === false && ctx.jitless !== true) {
           if (!fastpass)
             fastpass = generateFastpass(def.shape);
-          payload2 = fastpass(payload2, ctx);
+          payload = fastpass(payload, ctx);
           if (!catchall)
-            return payload2;
-          return handleCatchall([], input, payload2, ctx, value, inst);
+            return payload;
+          return handleCatchall([], input, payload, ctx, value, inst);
         }
-        return superParse(payload2, ctx);
+        return superParse(payload, ctx);
       };
     });
     $ZodUnion = /* @__PURE__ */ $constructor("$ZodUnion", (inst, def) => {
@@ -7015,15 +7015,15 @@ var init_schemas = __esm({
         return void 0;
       });
       const first = def.options.length === 1 ? def.options[0]._zod.run : null;
-      inst._zod.parse = (payload2, ctx) => {
+      inst._zod.parse = (payload, ctx) => {
         if (first) {
-          return first(payload2, ctx);
+          return first(payload, ctx);
         }
         let async = false;
         const results = [];
         for (const option of def.options) {
           const result = option._zod.run({
-            value: payload2.value,
+            value: payload.value,
             issues: []
           }, ctx);
           if (result instanceof Promise) {
@@ -7036,9 +7036,9 @@ var init_schemas = __esm({
           }
         }
         if (!async)
-          return handleUnionResults(results, payload2, inst, ctx);
+          return handleUnionResults(results, payload, inst, ctx);
         return Promise.all(results).then((results2) => {
-          return handleUnionResults(results2, payload2, inst, ctx);
+          return handleUnionResults(results2, payload, inst, ctx);
         });
       };
     });
@@ -7046,15 +7046,15 @@ var init_schemas = __esm({
       $ZodUnion.init(inst, def);
       def.inclusive = false;
       const first = def.options.length === 1 ? def.options[0]._zod.run : null;
-      inst._zod.parse = (payload2, ctx) => {
+      inst._zod.parse = (payload, ctx) => {
         if (first) {
-          return first(payload2, ctx);
+          return first(payload, ctx);
         }
         let async = false;
         const results = [];
         for (const option of def.options) {
           const result = option._zod.run({
-            value: payload2.value,
+            value: payload.value,
             issues: []
           }, ctx);
           if (result instanceof Promise) {
@@ -7065,9 +7065,9 @@ var init_schemas = __esm({
           }
         }
         if (!async)
-          return handleExclusiveUnionResults(results, payload2, inst, ctx);
+          return handleExclusiveUnionResults(results, payload, inst, ctx);
         return Promise.all(results).then((results2) => {
-          return handleExclusiveUnionResults(results2, payload2, inst, ctx);
+          return handleExclusiveUnionResults(results2, payload, inst, ctx);
         });
       };
     });
@@ -7107,25 +7107,25 @@ var init_schemas = __esm({
         }
         return map2;
       });
-      inst._zod.parse = (payload2, ctx) => {
-        const input = payload2.value;
+      inst._zod.parse = (payload, ctx) => {
+        const input = payload.value;
         if (!isObject(input)) {
-          payload2.issues.push({
+          payload.issues.push({
             code: "invalid_type",
             expected: "object",
             input,
             inst
           });
-          return payload2;
+          return payload;
         }
         const opt = disc.value.get(input?.[def.discriminator]);
         if (opt) {
-          return opt._zod.run(payload2, ctx);
+          return opt._zod.run(payload, ctx);
         }
         if (def.unionFallback || ctx.direction === "backward") {
-          return _super(payload2, ctx);
+          return _super(payload, ctx);
         }
-        payload2.issues.push({
+        payload.issues.push({
           code: "invalid_union",
           errors: [],
           note: "No matching discriminator",
@@ -7135,45 +7135,45 @@ var init_schemas = __esm({
           path: [def.discriminator],
           inst
         });
-        return payload2;
+        return payload;
       };
     });
     $ZodIntersection = /* @__PURE__ */ $constructor("$ZodIntersection", (inst, def) => {
       $ZodType.init(inst, def);
-      inst._zod.parse = (payload2, ctx) => {
-        const input = payload2.value;
+      inst._zod.parse = (payload, ctx) => {
+        const input = payload.value;
         const left = def.left._zod.run({ value: input, issues: [] }, ctx);
         const right = def.right._zod.run({ value: input, issues: [] }, ctx);
         const async = left instanceof Promise || right instanceof Promise;
         if (async) {
           return Promise.all([left, right]).then(([left2, right2]) => {
-            return handleIntersectionResults(payload2, left2, right2);
+            return handleIntersectionResults(payload, left2, right2);
           });
         }
-        return handleIntersectionResults(payload2, left, right);
+        return handleIntersectionResults(payload, left, right);
       };
     });
     $ZodTuple = /* @__PURE__ */ $constructor("$ZodTuple", (inst, def) => {
       $ZodType.init(inst, def);
       const items = def.items;
-      inst._zod.parse = (payload2, ctx) => {
-        const input = payload2.value;
+      inst._zod.parse = (payload, ctx) => {
+        const input = payload.value;
         if (!Array.isArray(input)) {
-          payload2.issues.push({
+          payload.issues.push({
             input,
             inst,
             expected: "tuple",
             code: "invalid_type"
           });
-          return payload2;
+          return payload;
         }
-        payload2.value = [];
+        payload.value = [];
         const proms = [];
         const optinStart = getTupleOptStart(items, "optin");
         const optoutStart = getTupleOptStart(items, "optout");
         if (!def.rest) {
           if (input.length < optinStart) {
-            payload2.issues.push({
+            payload.issues.push({
               code: "too_small",
               minimum: optinStart,
               inclusive: true,
@@ -7181,10 +7181,10 @@ var init_schemas = __esm({
               inst,
               origin: "array"
             });
-            return payload2;
+            return payload;
           }
           if (input.length > items.length) {
-            payload2.issues.push({
+            payload.issues.push({
               code: "too_big",
               maximum: items.length,
               inclusive: true,
@@ -7212,35 +7212,35 @@ var init_schemas = __esm({
             i++;
             const result = def.rest._zod.run({ value: el, issues: [] }, ctx);
             if (result instanceof Promise) {
-              proms.push(result.then((r) => handleTupleResult(r, payload2, i)));
+              proms.push(result.then((r) => handleTupleResult(r, payload, i)));
             } else {
-              handleTupleResult(result, payload2, i);
+              handleTupleResult(result, payload, i);
             }
           }
         }
         if (proms.length) {
-          return Promise.all(proms).then(() => handleTupleResults(itemResults, payload2, items, input, optoutStart));
+          return Promise.all(proms).then(() => handleTupleResults(itemResults, payload, items, input, optoutStart));
         }
-        return handleTupleResults(itemResults, payload2, items, input, optoutStart);
+        return handleTupleResults(itemResults, payload, items, input, optoutStart);
       };
     });
     $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
       $ZodType.init(inst, def);
-      inst._zod.parse = (payload2, ctx) => {
-        const input = payload2.value;
+      inst._zod.parse = (payload, ctx) => {
+        const input = payload.value;
         if (!isPlainObject(input)) {
-          payload2.issues.push({
+          payload.issues.push({
             expected: "record",
             code: "invalid_type",
             input,
             inst
           });
-          return payload2;
+          return payload;
         }
         const proms = [];
         const values = def.keyType._zod.values;
         if (values) {
-          payload2.value = {};
+          payload.value = {};
           const recordKeys = /* @__PURE__ */ new Set();
           for (const key of values) {
             if (typeof key === "string" || typeof key === "number" || typeof key === "symbol") {
@@ -7250,7 +7250,7 @@ var init_schemas = __esm({
                 throw new Error("Async schemas not supported in object keys currently");
               }
               if (keyResult.issues.length) {
-                payload2.issues.push({
+                payload.issues.push({
                   code: "invalid_key",
                   origin: "record",
                   issues: keyResult.issues.map((iss) => finalizeIssue(iss, ctx, config())),
@@ -7265,15 +7265,15 @@ var init_schemas = __esm({
               if (result instanceof Promise) {
                 proms.push(result.then((result2) => {
                   if (result2.issues.length) {
-                    payload2.issues.push(...prefixIssues(key, result2.issues));
+                    payload.issues.push(...prefixIssues(key, result2.issues));
                   }
-                  payload2.value[outKey] = result2.value;
+                  payload.value[outKey] = result2.value;
                 }));
               } else {
                 if (result.issues.length) {
-                  payload2.issues.push(...prefixIssues(key, result.issues));
+                  payload.issues.push(...prefixIssues(key, result.issues));
                 }
-                payload2.value[outKey] = result.value;
+                payload.value[outKey] = result.value;
               }
             }
           }
@@ -7285,7 +7285,7 @@ var init_schemas = __esm({
             }
           }
           if (unrecognized && unrecognized.length > 0) {
-            payload2.issues.push({
+            payload.issues.push({
               code: "unrecognized_keys",
               input,
               inst,
@@ -7293,7 +7293,7 @@ var init_schemas = __esm({
             });
           }
         } else {
-          payload2.value = {};
+          payload.value = {};
           for (const key of Reflect.ownKeys(input)) {
             if (key === "__proto__")
               continue;
@@ -7315,9 +7315,9 @@ var init_schemas = __esm({
             }
             if (keyResult.issues.length) {
               if (def.mode === "loose") {
-                payload2.value[key] = input[key];
+                payload.value[key] = input[key];
               } else {
-                payload2.issues.push({
+                payload.issues.push({
                   code: "invalid_key",
                   origin: "record",
                   issues: keyResult.issues.map((iss) => finalizeIssue(iss, ctx, config())),
@@ -7332,80 +7332,80 @@ var init_schemas = __esm({
             if (result instanceof Promise) {
               proms.push(result.then((result2) => {
                 if (result2.issues.length) {
-                  payload2.issues.push(...prefixIssues(key, result2.issues));
+                  payload.issues.push(...prefixIssues(key, result2.issues));
                 }
-                payload2.value[keyResult.value] = result2.value;
+                payload.value[keyResult.value] = result2.value;
               }));
             } else {
               if (result.issues.length) {
-                payload2.issues.push(...prefixIssues(key, result.issues));
+                payload.issues.push(...prefixIssues(key, result.issues));
               }
-              payload2.value[keyResult.value] = result.value;
+              payload.value[keyResult.value] = result.value;
             }
           }
         }
         if (proms.length) {
-          return Promise.all(proms).then(() => payload2);
+          return Promise.all(proms).then(() => payload);
         }
-        return payload2;
+        return payload;
       };
     });
     $ZodMap = /* @__PURE__ */ $constructor("$ZodMap", (inst, def) => {
       $ZodType.init(inst, def);
-      inst._zod.parse = (payload2, ctx) => {
-        const input = payload2.value;
+      inst._zod.parse = (payload, ctx) => {
+        const input = payload.value;
         if (!(input instanceof Map)) {
-          payload2.issues.push({
+          payload.issues.push({
             expected: "map",
             code: "invalid_type",
             input,
             inst
           });
-          return payload2;
+          return payload;
         }
         const proms = [];
-        payload2.value = /* @__PURE__ */ new Map();
+        payload.value = /* @__PURE__ */ new Map();
         for (const [key, value] of input) {
           const keyResult = def.keyType._zod.run({ value: key, issues: [] }, ctx);
           const valueResult = def.valueType._zod.run({ value, issues: [] }, ctx);
           if (keyResult instanceof Promise || valueResult instanceof Promise) {
             proms.push(Promise.all([keyResult, valueResult]).then(([keyResult2, valueResult2]) => {
-              handleMapResult(keyResult2, valueResult2, payload2, key, input, inst, ctx);
+              handleMapResult(keyResult2, valueResult2, payload, key, input, inst, ctx);
             }));
           } else {
-            handleMapResult(keyResult, valueResult, payload2, key, input, inst, ctx);
+            handleMapResult(keyResult, valueResult, payload, key, input, inst, ctx);
           }
         }
         if (proms.length)
-          return Promise.all(proms).then(() => payload2);
-        return payload2;
+          return Promise.all(proms).then(() => payload);
+        return payload;
       };
     });
     $ZodSet = /* @__PURE__ */ $constructor("$ZodSet", (inst, def) => {
       $ZodType.init(inst, def);
-      inst._zod.parse = (payload2, ctx) => {
-        const input = payload2.value;
+      inst._zod.parse = (payload, ctx) => {
+        const input = payload.value;
         if (!(input instanceof Set)) {
-          payload2.issues.push({
+          payload.issues.push({
             input,
             inst,
             expected: "set",
             code: "invalid_type"
           });
-          return payload2;
+          return payload;
         }
         const proms = [];
-        payload2.value = /* @__PURE__ */ new Set();
+        payload.value = /* @__PURE__ */ new Set();
         for (const item of input) {
           const result = def.valueType._zod.run({ value: item, issues: [] }, ctx);
           if (result instanceof Promise) {
-            proms.push(result.then((result2) => handleSetResult(result2, payload2)));
+            proms.push(result.then((result2) => handleSetResult(result2, payload)));
           } else
-            handleSetResult(result, payload2);
+            handleSetResult(result, payload);
         }
         if (proms.length)
-          return Promise.all(proms).then(() => payload2);
-        return payload2;
+          return Promise.all(proms).then(() => payload);
+        return payload;
       };
     });
     $ZodEnum = /* @__PURE__ */ $constructor("$ZodEnum", (inst, def) => {
@@ -7414,18 +7414,18 @@ var init_schemas = __esm({
       const valuesSet = new Set(values);
       inst._zod.values = valuesSet;
       inst._zod.pattern = new RegExp(`^(${values.filter((k) => propertyKeyTypes.has(typeof k)).map((o) => typeof o === "string" ? escapeRegex(o) : o.toString()).join("|")})$`);
-      inst._zod.parse = (payload2, _ctx) => {
-        const input = payload2.value;
+      inst._zod.parse = (payload, _ctx) => {
+        const input = payload.value;
         if (valuesSet.has(input)) {
-          return payload2;
+          return payload;
         }
-        payload2.issues.push({
+        payload.issues.push({
           code: "invalid_value",
           values,
           input,
           inst
         });
-        return payload2;
+        return payload;
       };
     });
     $ZodLiteral = /* @__PURE__ */ $constructor("$ZodLiteral", (inst, def) => {
@@ -7436,57 +7436,57 @@ var init_schemas = __esm({
       const values = new Set(def.values);
       inst._zod.values = values;
       inst._zod.pattern = new RegExp(`^(${def.values.map((o) => typeof o === "string" ? escapeRegex(o) : o ? escapeRegex(o.toString()) : String(o)).join("|")})$`);
-      inst._zod.parse = (payload2, _ctx) => {
-        const input = payload2.value;
+      inst._zod.parse = (payload, _ctx) => {
+        const input = payload.value;
         if (values.has(input)) {
-          return payload2;
+          return payload;
         }
-        payload2.issues.push({
+        payload.issues.push({
           code: "invalid_value",
           values: def.values,
           input,
           inst
         });
-        return payload2;
+        return payload;
       };
     });
     $ZodFile = /* @__PURE__ */ $constructor("$ZodFile", (inst, def) => {
       $ZodType.init(inst, def);
-      inst._zod.parse = (payload2, _ctx) => {
-        const input = payload2.value;
+      inst._zod.parse = (payload, _ctx) => {
+        const input = payload.value;
         if (input instanceof File)
-          return payload2;
-        payload2.issues.push({
+          return payload;
+        payload.issues.push({
           expected: "file",
           code: "invalid_type",
           input,
           inst
         });
-        return payload2;
+        return payload;
       };
     });
     $ZodTransform = /* @__PURE__ */ $constructor("$ZodTransform", (inst, def) => {
       $ZodType.init(inst, def);
       inst._zod.optin = "optional";
-      inst._zod.parse = (payload2, ctx) => {
+      inst._zod.parse = (payload, ctx) => {
         if (ctx.direction === "backward") {
           throw new $ZodEncodeError(inst.constructor.name);
         }
-        const _out = def.transform(payload2.value, payload2);
+        const _out = def.transform(payload.value, payload);
         if (ctx.async) {
           const output = _out instanceof Promise ? _out : Promise.resolve(_out);
           return output.then((output2) => {
-            payload2.value = output2;
-            payload2.fallback = true;
-            return payload2;
+            payload.value = output2;
+            payload.fallback = true;
+            return payload;
           });
         }
         if (_out instanceof Promise) {
           throw new $ZodAsyncError();
         }
-        payload2.value = _out;
-        payload2.fallback = true;
-        return payload2;
+        payload.value = _out;
+        payload.fallback = true;
+        return payload;
       };
     });
     $ZodOptional = /* @__PURE__ */ $constructor("$ZodOptional", (inst, def) => {
@@ -7500,26 +7500,26 @@ var init_schemas = __esm({
         const pattern = def.innerType._zod.pattern;
         return pattern ? new RegExp(`^(${cleanRegex(pattern.source)})?$`) : void 0;
       });
-      inst._zod.parse = (payload2, ctx) => {
+      inst._zod.parse = (payload, ctx) => {
         if (def.innerType._zod.optin === "optional") {
-          const input = payload2.value;
-          const result = def.innerType._zod.run(payload2, ctx);
+          const input = payload.value;
+          const result = def.innerType._zod.run(payload, ctx);
           if (result instanceof Promise)
             return result.then((r) => handleOptionalResult(r, input));
           return handleOptionalResult(result, input);
         }
-        if (payload2.value === void 0) {
-          return payload2;
+        if (payload.value === void 0) {
+          return payload;
         }
-        return def.innerType._zod.run(payload2, ctx);
+        return def.innerType._zod.run(payload, ctx);
       };
     });
     $ZodExactOptional = /* @__PURE__ */ $constructor("$ZodExactOptional", (inst, def) => {
       $ZodOptional.init(inst, def);
       defineLazy(inst._zod, "values", () => def.innerType._zod.values);
       defineLazy(inst._zod, "pattern", () => def.innerType._zod.pattern);
-      inst._zod.parse = (payload2, ctx) => {
-        return def.innerType._zod.run(payload2, ctx);
+      inst._zod.parse = (payload, ctx) => {
+        return def.innerType._zod.run(payload, ctx);
       };
     });
     $ZodNullable = /* @__PURE__ */ $constructor("$ZodNullable", (inst, def) => {
@@ -7533,25 +7533,25 @@ var init_schemas = __esm({
       defineLazy(inst._zod, "values", () => {
         return def.innerType._zod.values ? /* @__PURE__ */ new Set([...def.innerType._zod.values, null]) : void 0;
       });
-      inst._zod.parse = (payload2, ctx) => {
-        if (payload2.value === null)
-          return payload2;
-        return def.innerType._zod.run(payload2, ctx);
+      inst._zod.parse = (payload, ctx) => {
+        if (payload.value === null)
+          return payload;
+        return def.innerType._zod.run(payload, ctx);
       };
     });
     $ZodDefault = /* @__PURE__ */ $constructor("$ZodDefault", (inst, def) => {
       $ZodType.init(inst, def);
       inst._zod.optin = "optional";
       defineLazy(inst._zod, "values", () => def.innerType._zod.values);
-      inst._zod.parse = (payload2, ctx) => {
+      inst._zod.parse = (payload, ctx) => {
         if (ctx.direction === "backward") {
-          return def.innerType._zod.run(payload2, ctx);
+          return def.innerType._zod.run(payload, ctx);
         }
-        if (payload2.value === void 0) {
-          payload2.value = def.defaultValue;
-          return payload2;
+        if (payload.value === void 0) {
+          payload.value = def.defaultValue;
+          return payload;
         }
-        const result = def.innerType._zod.run(payload2, ctx);
+        const result = def.innerType._zod.run(payload, ctx);
         if (result instanceof Promise) {
           return result.then((result2) => handleDefaultResult(result2, def));
         }
@@ -7562,14 +7562,14 @@ var init_schemas = __esm({
       $ZodType.init(inst, def);
       inst._zod.optin = "optional";
       defineLazy(inst._zod, "values", () => def.innerType._zod.values);
-      inst._zod.parse = (payload2, ctx) => {
+      inst._zod.parse = (payload, ctx) => {
         if (ctx.direction === "backward") {
-          return def.innerType._zod.run(payload2, ctx);
+          return def.innerType._zod.run(payload, ctx);
         }
-        if (payload2.value === void 0) {
-          payload2.value = def.defaultValue;
+        if (payload.value === void 0) {
+          payload.value = def.defaultValue;
         }
-        return def.innerType._zod.run(payload2, ctx);
+        return def.innerType._zod.run(payload, ctx);
       };
     });
     $ZodNonOptional = /* @__PURE__ */ $constructor("$ZodNonOptional", (inst, def) => {
@@ -7578,8 +7578,8 @@ var init_schemas = __esm({
         const v = def.innerType._zod.values;
         return v ? new Set([...v].filter((x) => x !== void 0)) : void 0;
       });
-      inst._zod.parse = (payload2, ctx) => {
-        const result = def.innerType._zod.run(payload2, ctx);
+      inst._zod.parse = (payload, ctx) => {
+        const result = def.innerType._zod.run(payload, ctx);
         if (result instanceof Promise) {
           return result.then((result2) => handleNonOptionalResult(result2, inst));
         }
@@ -7588,19 +7588,19 @@ var init_schemas = __esm({
     });
     $ZodSuccess = /* @__PURE__ */ $constructor("$ZodSuccess", (inst, def) => {
       $ZodType.init(inst, def);
-      inst._zod.parse = (payload2, ctx) => {
+      inst._zod.parse = (payload, ctx) => {
         if (ctx.direction === "backward") {
           throw new $ZodEncodeError("ZodSuccess");
         }
-        const result = def.innerType._zod.run(payload2, ctx);
+        const result = def.innerType._zod.run(payload, ctx);
         if (result instanceof Promise) {
           return result.then((result2) => {
-            payload2.value = result2.issues.length === 0;
-            return payload2;
+            payload.value = result2.issues.length === 0;
+            return payload;
           });
         }
-        payload2.value = result.issues.length === 0;
-        return payload2;
+        payload.value = result.issues.length === 0;
+        return payload;
       };
     });
     $ZodCatch = /* @__PURE__ */ $constructor("$ZodCatch", (inst, def) => {
@@ -7608,56 +7608,56 @@ var init_schemas = __esm({
       inst._zod.optin = "optional";
       defineLazy(inst._zod, "optout", () => def.innerType._zod.optout);
       defineLazy(inst._zod, "values", () => def.innerType._zod.values);
-      inst._zod.parse = (payload2, ctx) => {
+      inst._zod.parse = (payload, ctx) => {
         if (ctx.direction === "backward") {
-          return def.innerType._zod.run(payload2, ctx);
+          return def.innerType._zod.run(payload, ctx);
         }
-        const result = def.innerType._zod.run(payload2, ctx);
+        const result = def.innerType._zod.run(payload, ctx);
         if (result instanceof Promise) {
           return result.then((result2) => {
-            payload2.value = result2.value;
+            payload.value = result2.value;
             if (result2.issues.length) {
-              payload2.value = def.catchValue({
-                ...payload2,
+              payload.value = def.catchValue({
+                ...payload,
                 error: {
                   issues: result2.issues.map((iss) => finalizeIssue(iss, ctx, config()))
                 },
-                input: payload2.value
+                input: payload.value
               });
-              payload2.issues = [];
-              payload2.fallback = true;
+              payload.issues = [];
+              payload.fallback = true;
             }
-            return payload2;
+            return payload;
           });
         }
-        payload2.value = result.value;
+        payload.value = result.value;
         if (result.issues.length) {
-          payload2.value = def.catchValue({
-            ...payload2,
+          payload.value = def.catchValue({
+            ...payload,
             error: {
               issues: result.issues.map((iss) => finalizeIssue(iss, ctx, config()))
             },
-            input: payload2.value
+            input: payload.value
           });
-          payload2.issues = [];
-          payload2.fallback = true;
+          payload.issues = [];
+          payload.fallback = true;
         }
-        return payload2;
+        return payload;
       };
     });
     $ZodNaN = /* @__PURE__ */ $constructor("$ZodNaN", (inst, def) => {
       $ZodType.init(inst, def);
-      inst._zod.parse = (payload2, _ctx) => {
-        if (typeof payload2.value !== "number" || !Number.isNaN(payload2.value)) {
-          payload2.issues.push({
-            input: payload2.value,
+      inst._zod.parse = (payload, _ctx) => {
+        if (typeof payload.value !== "number" || !Number.isNaN(payload.value)) {
+          payload.issues.push({
+            input: payload.value,
             inst,
             expected: "nan",
             code: "invalid_type"
           });
-          return payload2;
+          return payload;
         }
-        return payload2;
+        return payload;
       };
     });
     $ZodPipe = /* @__PURE__ */ $constructor("$ZodPipe", (inst, def) => {
@@ -7666,15 +7666,15 @@ var init_schemas = __esm({
       defineLazy(inst._zod, "optin", () => def.in._zod.optin);
       defineLazy(inst._zod, "optout", () => def.out._zod.optout);
       defineLazy(inst._zod, "propValues", () => def.in._zod.propValues);
-      inst._zod.parse = (payload2, ctx) => {
+      inst._zod.parse = (payload, ctx) => {
         if (ctx.direction === "backward") {
-          const right = def.out._zod.run(payload2, ctx);
+          const right = def.out._zod.run(payload, ctx);
           if (right instanceof Promise) {
             return right.then((right2) => handlePipeResult(right2, def.in, ctx));
           }
           return handlePipeResult(right, def.in, ctx);
         }
-        const left = def.in._zod.run(payload2, ctx);
+        const left = def.in._zod.run(payload, ctx);
         if (left instanceof Promise) {
           return left.then((left2) => handlePipeResult(left2, def.out, ctx));
         }
@@ -7687,16 +7687,16 @@ var init_schemas = __esm({
       defineLazy(inst._zod, "optin", () => def.in._zod.optin);
       defineLazy(inst._zod, "optout", () => def.out._zod.optout);
       defineLazy(inst._zod, "propValues", () => def.in._zod.propValues);
-      inst._zod.parse = (payload2, ctx) => {
+      inst._zod.parse = (payload, ctx) => {
         const direction = ctx.direction || "forward";
         if (direction === "forward") {
-          const left = def.in._zod.run(payload2, ctx);
+          const left = def.in._zod.run(payload, ctx);
           if (left instanceof Promise) {
             return left.then((left2) => handleCodecAResult(left2, def, ctx));
           }
           return handleCodecAResult(left, def, ctx);
         } else {
-          const right = def.out._zod.run(payload2, ctx);
+          const right = def.out._zod.run(payload, ctx);
           if (right instanceof Promise) {
             return right.then((right2) => handleCodecAResult(right2, def, ctx));
           }
@@ -7713,11 +7713,11 @@ var init_schemas = __esm({
       defineLazy(inst._zod, "values", () => def.innerType._zod.values);
       defineLazy(inst._zod, "optin", () => def.innerType?._zod?.optin);
       defineLazy(inst._zod, "optout", () => def.innerType?._zod?.optout);
-      inst._zod.parse = (payload2, ctx) => {
+      inst._zod.parse = (payload, ctx) => {
         if (ctx.direction === "backward") {
-          return def.innerType._zod.run(payload2, ctx);
+          return def.innerType._zod.run(payload, ctx);
         }
-        const result = def.innerType._zod.run(payload2, ctx);
+        const result = def.innerType._zod.run(payload, ctx);
         if (result instanceof Promise) {
           return result.then(handleReadonlyResult);
         }
@@ -7745,28 +7745,28 @@ var init_schemas = __esm({
         }
       }
       inst._zod.pattern = new RegExp(`^${regexParts.join("")}$`);
-      inst._zod.parse = (payload2, _ctx) => {
-        if (typeof payload2.value !== "string") {
-          payload2.issues.push({
-            input: payload2.value,
+      inst._zod.parse = (payload, _ctx) => {
+        if (typeof payload.value !== "string") {
+          payload.issues.push({
+            input: payload.value,
             inst,
             expected: "string",
             code: "invalid_type"
           });
-          return payload2;
+          return payload;
         }
         inst._zod.pattern.lastIndex = 0;
-        if (!inst._zod.pattern.test(payload2.value)) {
-          payload2.issues.push({
-            input: payload2.value,
+        if (!inst._zod.pattern.test(payload.value)) {
+          payload.issues.push({
+            input: payload.value,
             inst,
             code: "invalid_format",
             format: def.format ?? "template_literal",
             pattern: inst._zod.pattern.source
           });
-          return payload2;
+          return payload;
         }
-        return payload2;
+        return payload;
       };
     });
     $ZodFunction = /* @__PURE__ */ $constructor("$ZodFunction", (inst, def) => {
@@ -7799,23 +7799,23 @@ var init_schemas = __esm({
           return result;
         };
       };
-      inst._zod.parse = (payload2, _ctx) => {
-        if (typeof payload2.value !== "function") {
-          payload2.issues.push({
+      inst._zod.parse = (payload, _ctx) => {
+        if (typeof payload.value !== "function") {
+          payload.issues.push({
             code: "invalid_type",
             expected: "function",
-            input: payload2.value,
+            input: payload.value,
             inst
           });
-          return payload2;
+          return payload;
         }
         const hasPromiseOutput = inst._def.output && inst._def.output._zod.def.type === "promise";
         if (hasPromiseOutput) {
-          payload2.value = inst.implementAsync(payload2.value);
+          payload.value = inst.implementAsync(payload.value);
         } else {
-          payload2.value = inst.implement(payload2.value);
+          payload.value = inst.implement(payload.value);
         }
-        return payload2;
+        return payload;
       };
       inst.input = (...args) => {
         const F = inst.constructor;
@@ -7848,8 +7848,8 @@ var init_schemas = __esm({
     });
     $ZodPromise = /* @__PURE__ */ $constructor("$ZodPromise", (inst, def) => {
       $ZodType.init(inst, def);
-      inst._zod.parse = (payload2, ctx) => {
-        return Promise.resolve(payload2.value).then((inner) => def.innerType._zod.run({ value: inner, issues: [] }, ctx));
+      inst._zod.parse = (payload, ctx) => {
+        return Promise.resolve(payload.value).then((inner) => def.innerType._zod.run({ value: inner, issues: [] }, ctx));
       };
     });
     $ZodLazy = /* @__PURE__ */ $constructor("$ZodLazy", (inst, def) => {
@@ -7864,24 +7864,24 @@ var init_schemas = __esm({
       defineLazy(inst._zod, "propValues", () => inst._zod.innerType?._zod?.propValues);
       defineLazy(inst._zod, "optin", () => inst._zod.innerType?._zod?.optin ?? void 0);
       defineLazy(inst._zod, "optout", () => inst._zod.innerType?._zod?.optout ?? void 0);
-      inst._zod.parse = (payload2, ctx) => {
+      inst._zod.parse = (payload, ctx) => {
         const inner = inst._zod.innerType;
-        return inner._zod.run(payload2, ctx);
+        return inner._zod.run(payload, ctx);
       };
     });
     $ZodCustom = /* @__PURE__ */ $constructor("$ZodCustom", (inst, def) => {
       $ZodCheck.init(inst, def);
       $ZodType.init(inst, def);
-      inst._zod.parse = (payload2, _) => {
-        return payload2;
+      inst._zod.parse = (payload, _) => {
+        return payload;
       };
-      inst._zod.check = (payload2) => {
-        const input = payload2.value;
+      inst._zod.check = (payload) => {
+        const input = payload.value;
         const r = def.fn(input);
         if (r instanceof Promise) {
-          return r.then((r2) => handleRefineResult(r2, payload2, input, inst));
+          return r.then((r2) => handleRefineResult(r2, payload, input, inst));
         }
-        handleRefineResult(r, payload2, input, inst);
+        handleRefineResult(r, payload, input, inst);
         return;
       };
     });
@@ -15172,22 +15172,22 @@ function _refine(Class2, fn, _params) {
 }
 // @__NO_SIDE_EFFECTS__
 function _superRefine(fn, params) {
-  const ch = /* @__PURE__ */ _check((payload2) => {
-    payload2.addIssue = (issue2) => {
+  const ch = /* @__PURE__ */ _check((payload) => {
+    payload.addIssue = (issue2) => {
       if (typeof issue2 === "string") {
-        payload2.issues.push(issue(issue2, payload2.value, ch._zod.def));
+        payload.issues.push(issue(issue2, payload.value, ch._zod.def));
       } else {
         const _issue = issue2;
         if (_issue.fatal)
           _issue.continue = false;
         _issue.code ?? (_issue.code = "custom");
-        _issue.input ?? (_issue.input = payload2.value);
+        _issue.input ?? (_issue.input = payload.value);
         _issue.inst ?? (_issue.inst = ch);
         _issue.continue ?? (_issue.continue = !ch._zod.def.abort);
-        payload2.issues.push(issue(_issue));
+        payload.issues.push(issue(_issue));
       }
     };
-    return fn(payload2.value, payload2);
+    return fn(payload.value, payload);
   }, params);
   return ch;
 }
@@ -15246,7 +15246,7 @@ function _stringbool(Classes, _params) {
     type: "pipe",
     in: stringSchema,
     out: booleanSchema,
-    transform: ((input, payload2) => {
+    transform: ((input, payload) => {
       let data = input;
       if (params.case !== "sensitive")
         data = data.toLowerCase();
@@ -15255,11 +15255,11 @@ function _stringbool(Classes, _params) {
       } else if (falsySet.has(data)) {
         return false;
       } else {
-        payload2.issues.push({
+        payload.issues.push({
           code: "invalid_value",
           expected: "stringbool",
           values: [...truthySet, ...falsySet],
-          input: payload2.value,
+          input: payload.value,
           inst: codec2,
           continue: false
         });
@@ -17693,12 +17693,12 @@ function _instanceof(cls, params = {}) {
     ...util_exports.normalizeParams(params)
   });
   inst._zod.bag.Class = cls;
-  inst._zod.check = (payload2) => {
-    if (!(payload2.value instanceof cls)) {
-      payload2.issues.push({
+  inst._zod.check = (payload) => {
+    if (!(payload.value instanceof cls)) {
+      payload.issues.push({
         code: "invalid_type",
         expected: cls.name,
-        input: payload2.value,
+        input: payload.value,
         inst,
         path: [...inst._zod.def.path ?? []]
       });
@@ -18365,34 +18365,34 @@ var init_schemas3 = __esm({
       $ZodTransform.init(inst, def);
       ZodType2.init(inst, def);
       inst._zod.processJSONSchema = (ctx, json2, params) => transformProcessor(inst, ctx, json2, params);
-      inst._zod.parse = (payload2, _ctx) => {
+      inst._zod.parse = (payload, _ctx) => {
         if (_ctx.direction === "backward") {
           throw new $ZodEncodeError(inst.constructor.name);
         }
-        payload2.addIssue = (issue2) => {
+        payload.addIssue = (issue2) => {
           if (typeof issue2 === "string") {
-            payload2.issues.push(util_exports.issue(issue2, payload2.value, def));
+            payload.issues.push(util_exports.issue(issue2, payload.value, def));
           } else {
             const _issue = issue2;
             if (_issue.fatal)
               _issue.continue = false;
             _issue.code ?? (_issue.code = "custom");
-            _issue.input ?? (_issue.input = payload2.value);
+            _issue.input ?? (_issue.input = payload.value);
             _issue.inst ?? (_issue.inst = inst);
-            payload2.issues.push(util_exports.issue(_issue));
+            payload.issues.push(util_exports.issue(_issue));
           }
         };
-        const output = def.transform(payload2.value, payload2);
+        const output = def.transform(payload.value, payload);
         if (output instanceof Promise) {
           return output.then((output2) => {
-            payload2.value = output2;
-            payload2.fallback = true;
-            return payload2;
+            payload.value = output2;
+            payload.fallback = true;
+            return payload;
           });
         }
-        payload2.value = output;
-        payload2.fallback = true;
-        return payload2;
+        payload.value = output;
+        payload.fallback = true;
+        return payload;
       };
     });
     ZodOptional2 = /* @__PURE__ */ $constructor("ZodOptional", (inst, def) => {
@@ -32825,88 +32825,6 @@ var init_clipboard = __esm({
   }
 });
-// src/media-url.ts
-var media_url_exports = {};
-__export(media_url_exports, {
-  MEDIA_URL_TTL_MS: () => MEDIA_URL_TTL_MS,
-  SIGNING_SECRET_KV_KEY: () => SIGNING_SECRET_KV_KEY,
-  base64UrlDecode: () => base64UrlDecode,
-  base64UrlEncode: () => base64UrlEncode,
-  buildMediaUrl: () => buildMediaUrl,
-  loadSigningKey: () => loadSigningKey,
-  resolveSigningKey: () => resolveSigningKey,
-  signMediaKey: () => signMediaKey,
-  verifyMediaSignature: () => verifyMediaSignature
-});
-function base64UrlEncode(bytes) {
-  const view = bytes instanceof Uint8Array ? bytes : new Uint8Array(bytes);
-  let binary = "";
-  for (let i = 0; i < view.length; i++) binary += String.fromCharCode(view[i]);
-  return btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
-}
-function base64UrlDecode(text) {
-  const padded = text.replace(/-/g, "+").replace(/_/g, "/").padEnd(Math.ceil(text.length / 4) * 4, "=");
-  const binary = atob(padded);
-  const out = new Uint8Array(binary.length);
-  for (let i = 0; i < binary.length; i++) out[i] = binary.charCodeAt(i);
-  return out;
-}
-async function importKey(material) {
-  return crypto.subtle.importKey("raw", new TextEncoder().encode(material), { name: "HMAC", hash: "SHA-256" }, false, [
-    "sign",
-    "verify"
-  ]);
-}
-async function resolveSigningKey(secret, store) {
-  let material = secret?.trim();
-  if (!material) {
-    material = await store.get(SIGNING_SECRET_KV_KEY) ?? void 0;
-    if (!material) {
-      const generated = base64UrlEncode(crypto.getRandomValues(new Uint8Array(32)));
-      await store.put(SIGNING_SECRET_KV_KEY, generated);
-      material = await store.get(SIGNING_SECRET_KV_KEY) ?? generated;
-    }
-  }
-  return importKey(material);
-}
-async function loadSigningKey(secret, store) {
-  const material = secret?.trim() || await store.get(SIGNING_SECRET_KV_KEY);
-  return material ? importKey(material) : void 0;
-}
-function payload(key, expiresAtMs2) {
-  return new TextEncoder().encode(`${key}
-${expiresAtMs2}`);
-}
-async function signMediaKey(signingKey, key, expiresAtMs2) {
-  return base64UrlEncode(await crypto.subtle.sign("HMAC", signingKey, payload(key, expiresAtMs2)));
-}
-async function verifyMediaSignature(signingKey, key, exp, sig, nowMs) {
-  if (!exp || !sig) return { ok: false, reason: "missing" };
-  const expiresAtMs2 = Number(exp);
-  if (!Number.isFinite(expiresAtMs2)) return { ok: false, reason: "invalid" };
-  let valid;
-  try {
-    valid = await crypto.subtle.verify("HMAC", signingKey, base64UrlDecode(sig), payload(key, expiresAtMs2));
-  } catch {
-    return { ok: false, reason: "invalid" };
-  }
-  if (!valid) return { ok: false, reason: "invalid" };
-  if (nowMs > expiresAtMs2) return { ok: false, reason: "expired" };
-  return { ok: true };
-}
-function buildMediaUrl(baseUrl, key, expiresAtMs2, signature) {
-  const path = key.split("/").map(encodeURIComponent).join("/");
-  return `${baseUrl.replace(/\/+$/, "")}/${path}?exp=${expiresAtMs2}&sig=${signature}`;
-}
-var MEDIA_URL_TTL_MS, SIGNING_SECRET_KV_KEY;
-var init_media_url = __esm({
-  "src/media-url.ts"() {
-    "use strict";
-    MEDIA_URL_TTL_MS = 48 * 60 * 60 * 1e3;
-    SIGNING_SECRET_KV_KEY = "media:url-signing-secret";
-  }
-});
 // src/index.ts
 init_dist();
@@ -32920,7 +32838,65 @@ async function loadStdioDotenv() {
 }
 // src/version.ts
-var VERSION = "1.6.0";
+var VERSION = "1.6.2";
+// src/errors.ts
+init_dist();
+var MAX_CAUSE_DEPTH = 5;
+function describeError(err) {
+  const seen = /* @__PURE__ */ new Set();
+  const describe3 = (value, depth) => {
+    if (!(value instanceof Error)) {
+      if (typeof value === "string") return value;
+      try {
+        return typeof value === "object" && value !== null ? JSON.stringify(value) : String(value);
+      } catch {
+        return String(value);
+      }
+    }
+    const named = value.name && value.name !== "Error" && value.name !== "McpToolError" ? `${value.name}: ${value.message}` : value.message;
+    const hint = value instanceof McpToolError && value.hint && !value.message.includes(value.hint) ? ` ${value.hint}` : "";
+    const cause = value.cause;
+    if (cause === void 0 || cause === null || depth >= MAX_CAUSE_DEPTH || seen.has(cause)) {
+      return `${named}${hint}`;
+    }
+    seen.add(cause);
+    return `${named}${hint} [caused by: ${describe3(cause, depth + 1)}]`;
+  };
+  seen.add(err);
+  return describe3(err, 0);
+}
+async function step(label, run) {
+  try {
+    return await run();
+  } catch (err) {
+    if (err instanceof StepError) throw err;
+    throw new StepError(`${label}: ${describeError(err)}`, err);
+  }
+}
+var StepError = class extends McpToolError {
+  constructor(message, cause) {
+    super(message, { cause });
+    this.name = "McpToolError";
+  }
+};
+function surfaceToolErrors(server) {
+  return new Proxy(server, {
+    get(target, prop, receiver) {
+      const value = Reflect.get(target, prop, receiver);
+      if (prop !== "registerTool" || typeof value !== "function") {
+        return typeof value === "function" ? value.bind(target) : value;
+      }
+      return (name, config2, handler) => value.call(target, name, config2, async (...args) => {
+        try {
+          return await handler(...args);
+        } catch (err) {
+          throw new McpToolError(`${name} failed: ${describeError(err)}`, { cause: err });
+        }
+      });
+    }
+  });
+}
 // src/tools/models.ts
 init_dist();
@@ -33355,6 +33331,22 @@ init_zod();
 init_dist();
 init_images();
+// src/signed-url.ts
+function signedObjectUrl(baseUrl, key, params) {
+  const path = key.split("/").map(encodeURIComponent).join("/");
+  const query = new URLSearchParams();
+  for (const [name, value] of Object.entries(params)) query.set(name, String(value));
+  return `${baseUrl.replace(/\/+$/, "")}/${path}?${query}`;
+}
+function signedLinks(baseUrl) {
+  const base = baseUrl.replace(/\/+$/, "");
+  return {
+    base,
+    media: (key, expiresAtMs2, signature) => signedObjectUrl(base, key, { exp: expiresAtMs2, sig: signature }),
+    upload: (key, contentType, expiresAtMs2, signature) => signedObjectUrl(base, key, { ct: contentType.toLowerCase(), exp: expiresAtMs2, sig: signature })
+  };
+}
 // src/storage/media.ts
 function createDiskSink() {
   return {
@@ -33384,7 +33376,7 @@ function createR2Sink(bucket, opts) {
   const now = opts.now ?? (() => /* @__PURE__ */ new Date());
   const randomId = opts.randomId ?? (() => crypto.randomUUID().slice(0, 8));
   const publicBase = opts.publicBaseUrl?.replace(/\/+$/, "");
-  const signedBase = opts.signedBaseUrl?.replace(/\/+$/, "");
+  const signedBase = opts.links?.base ?? opts.signedBaseUrl?.replace(/\/+$/, "");
   const ttlMs = opts.urlTtlMs ?? 0;
   const readPrefixes = [prefix, ...opts.readPrefixes ?? []];
   let tenantCache;
@@ -33434,9 +33426,9 @@ function createR2Sink(bucket, opts) {
   async function describe3(key, expiresAtMs2) {
     if (publicBase) return { ref: `${publicBase}/${key}`, key };
     if (signedBase && opts.sign) {
-      const { buildMediaUrl: buildMediaUrl2 } = await Promise.resolve().then(() => (init_media_url(), media_url_exports));
       const signature = await opts.sign(key, expiresAtMs2);
-      return { ref: buildMediaUrl2(signedBase, key, expiresAtMs2, signature), key, expiresAt: new Date(expiresAtMs2).toISOString() };
+      const link = (opts.links ?? signedLinks(signedBase)).media(key, expiresAtMs2, signature);
+      return { ref: link, key, expiresAt: new Date(expiresAtMs2).toISOString() };
     }
     return { ref: key, key, unavailable: true };
   }
@@ -34504,20 +34496,24 @@ function createR2Library(bucket, opts) {
   };
 }
+// src/media-url.ts
+var MEDIA_URL_TTL_MS = 48 * 60 * 60 * 1e3;
 // src/upload-url.ts
-init_media_url();
 var UPLOAD_URL_TTL_MS = 10 * 60 * 1e3;
 var UPLOAD_MAX_BYTES = 15 * 1024 * 1024;
 var UPLOAD_KEY_PREFIX = "up";
-function buildUploadUrl(baseUrl, key, contentType, expiresAtMs2, signature) {
-  const path = key.split("/").map(encodeURIComponent).join("/");
-  return `${baseUrl.replace(/\/+$/, "")}/${path}?ct=${encodeURIComponent(contentType.toLowerCase())}&exp=${expiresAtMs2}&sig=${signature}`;
-}
 var RASTER_IMAGE_TYPE_PATTERN = /^image\/(jpeg|png|webp|gif|avif|heic|heif|bmp|tiff)$/i;
 function acceptableUploadType(contentType) {
   return RASTER_IMAGE_TYPE_PATTERN.test(contentType);
 }
 function createUploadUrlMinter(opts) {
+  const links = opts.links ?? (opts.baseUrl ? signedLinks(opts.baseUrl) : void 0);
+  if (!links) {
+    throw new Error(
+      "createUploadUrlMinter requires `links` (preferred) or `baseUrl`: there is nowhere to point a signed upload URL. Hosted, both come from the blob store \u2014 check MCP_BLOB_BASE_URL is set on the deployment."
+    );
+  }
   const now = opts.now ?? (() => /* @__PURE__ */ new Date());
   const randomId = opts.randomId ?? (() => crypto.randomUUID().slice(0, 8));
   const ttlMs = opts.ttlMs ?? UPLOAD_URL_TTL_MS;
@@ -34534,7 +34530,7 @@ function createUploadUrlMinter(opts) {
       const key = `${UPLOAD_KEY_PREFIX}/${tenant}/${day}/${randomId()}-${safeKeySegment(filename)}`;
       const expiresAtMs2 = now().getTime() + ttlMs;
       const signature = await opts.sign(key, ct, expiresAtMs2);
-      return { url: buildUploadUrl(opts.baseUrl, key, ct, expiresAtMs2, signature), key, contentType: ct, expiresAtMs: expiresAtMs2 };
+      return { url: links.upload(key, ct, expiresAtMs2, signature), key, contentType: ct, expiresAtMs: expiresAtMs2 };
     }
   };
 }
@@ -34551,7 +34547,7 @@ var DEFAULT_TTL_MS = 60 * 60 * 1e3;
 function base64url3(bytes) {
   return Buffer.from(bytes).toString("base64url");
 }
-async function hmac(secret, payload2) {
+async function hmac(secret, payload) {
   const key = await crypto.subtle.importKey(
     "raw",
     new TextEncoder().encode(secret),
@@ -34559,10 +34555,18 @@ async function hmac(secret, payload2) {
     false,
     ["sign"]
   );
-  return base64url3(await crypto.subtle.sign("HMAC", key, new TextEncoder().encode(payload2)));
+  return base64url3(await crypto.subtle.sign("HMAC", key, new TextEncoder().encode(payload)));
 }
 function prefixFromBaseUrl(baseUrl) {
-  const path = new URL(baseUrl).pathname.replace(/^\/+|\/+$/g, "");
+  let parsed;
+  try {
+    parsed = new URL(baseUrl);
+  } catch {
+    throw new Error(
+      `MCP_BLOB_BASE_URL is not a valid URL (got ${JSON.stringify(baseUrl)}). It should look like https://<host>/b/<registrationId> \u2014 check the deployment's environment.`
+    );
+  }
+  const path = parsed.pathname.replace(/^\/+|\/+$/g, "");
   const marker = path.startsWith("b/") ? path.slice(2) : path;
   return marker;
 }
@@ -34574,8 +34578,8 @@ function createBlobBucket(opts) {
   const now = opts.now ?? (() => Date.now());
   const full = (key) => `${prefix}/${key}`;
   const encode3 = (key) => key.split("/").map(encodeURIComponent).join("/");
-  async function signedUrl(key, payload2, exp) {
-    const sig = await hmac(opts.signingKey, payload2);
+  async function signedUrl(key, payload, exp) {
+    const sig = await hmac(opts.signingKey, payload);
     return `${base}/${encode3(key)}?exp=${exp}&sig=${encodeURIComponent(sig)}`;
   }
   return {
@@ -34590,8 +34594,8 @@ function createBlobBucket(opts) {
       const contentType = options?.httpMetadata?.contentType ?? "application/octet-stream";
       const exp = now() + ttl;
       const permanent = key.startsWith(`${PERMANENT_PREFIX}/`);
-      const payload2 = permanent ? WRITE_PERMANENT(full(key), contentType, exp) : WRITE(full(key), contentType, exp);
-      const url2 = await signedUrl(key, payload2, exp) + (permanent ? "&retain=permanent" : "");
+      const payload = permanent ? WRITE_PERMANENT(full(key), contentType, exp) : WRITE(full(key), contentType, exp);
+      const url2 = await signedUrl(key, payload, exp) + (permanent ? "&retain=permanent" : "");
       const body = typeof value === "string" ? value : toArrayBuffer(value);
       const res = await doFetch(url2, { method: "PUT", headers: { "content-type": contentType }, body });
       if (!res.ok) throw new Error(`blob put failed (${res.status}) for ${key}`);
@@ -34643,7 +34647,7 @@ function blobStoreFromEnv(env = process.env, overrides = {}) {
   const signingKey = overrides.signingKey ?? env.MCP_BLOB_SIGNING_KEY;
   if (!baseUrl || !signingKey) return void 0;
   const bucket = createBlobBucket({ ...overrides, baseUrl, signingKey });
-  return { bucket, baseUrl, signRead: bucket.signRead, signWrite: bucket.signWrite };
+  return { bucket, baseUrl, links: signedLinks(baseUrl), signRead: bucket.signRead, signWrite: bucket.signWrite };
 }
 // src/session.ts
@@ -35275,19 +35279,19 @@ var GeminiClient = class {
     const textParts = [];
     const searchQueries = [];
     const searchSuggestions = /* @__PURE__ */ new Set();
-    for (const step of data.steps ?? []) {
-      if (step.type === "google_search_call") {
-        for (const q of step.arguments?.queries ?? []) if (q?.trim()) searchQueries.push(q);
+    for (const step2 of data.steps ?? []) {
+      if (step2.type === "google_search_call") {
+        for (const q of step2.arguments?.queries ?? []) if (q?.trim()) searchQueries.push(q);
         continue;
       }
-      if (step.type === "google_search_result") {
+      if (step2.type === "google_search_result") {
         if (searchTypes?.includes("image_search")) {
-          for (const r of step.result ?? []) if (r.search_suggestions?.trim()) searchSuggestions.add(r.search_suggestions);
+          for (const r of step2.result ?? []) if (r.search_suggestions?.trim()) searchSuggestions.add(r.search_suggestions);
         }
         continue;
       }
-      if (step.type !== "model_output") continue;
-      for (const parts of [step.content ?? [], step.summary ?? []]) {
+      if (step2.type !== "model_output") continue;
+      for (const parts of [step2.content ?? [], step2.summary ?? []]) {
         for (const part of parts) {
           const mime = part.mime_type ?? part.mimeType;
           if (part.data) {
@@ -35315,9 +35319,13 @@ function hostedStorage() {
   const tenant = () => tenantIdFor(readEnvVar("GEMINI_API_KEY") ?? "local");
   return {
     mediaSink: createR2Sink(blob.bucket, {
-      signedBaseUrl: blob.baseUrl,
+      // The SAME `links` object the minter gets below. Media GETs and upload
+      // PUTs are one store reached two ways; handing each its own base URL is
+      // how the re-host moved the media links to /b/<registrationId>/ and left
+      // the upload links behind. One object, two shapes, no second edit.
+      links: blob.links,
       sign: blob.signRead,
-      urlTtlMs: MEDIA_URL_TTL_MS2,
+      urlTtlMs: BLOB_URL_TTL_MS,
       // Hard ceiling on any PER-PERSIST override. `gemini_image_set` asks for
       // a 7-day link (SET_URL_TTL_MS) — reasonable against a bucket we own,
       // but the blob store refuses any signature over 24h, so without this
@@ -35331,10 +35339,10 @@ function hostedStorage() {
       tenant
     }),
     library: createR2Library(blob.bucket, { tenant }),
-    uploadUrls: createUploadUrlMinter({ baseUrl: blob.baseUrl, sign: blob.signWrite, tenant })
+    uploadUrls: createUploadUrlMinter({ links: blob.links, sign: blob.signWrite, tenant })
   };
 }
-var MEDIA_URL_TTL_MS2 = 60 * 60 * 1e3;
+var BLOB_URL_TTL_MS = 24 * 60 * 60 * 1e3;
 var BLOB_MAX_TTL_MS = 24 * 60 * 60 * 1e3;
 var client = new GeminiClient(hostedStorage());
@@ -35949,7 +35957,7 @@ function registerUploadUrlTools(server, client2) {
   server.registerTool(
     "gemini_get_upload_url",
     {
-      description: `Mint a short-lived (~10 min) signed PUT URL for uploading one reference image to this connector with NO auth headers \u2014 usable from any shell: curl -sS -X PUT -H "Content-Type: image/jpeg" --data-binary @photo.jpg "<upload_url>". The response to the PUT returns an \`r2_key\` to reference the upload: pass it in \`images_r2_keys\` on generation tools, save it permanently with gemini_save_character, or convert it to a ~48h Files API reference with gemini_upload_file({ r2_key }). Prefer this over images_base64 (which costs ~14k tokens per photo) whenever the caller has a shell. Images only, up to ${wholeMb(UPLOAD_MAX_BYTES)}MB.`,
+      description: `Mint a short-lived (~10 min) signed PUT URL for uploading one reference image to this connector with NO auth headers \u2014 usable from any shell: curl -sS -X PUT -H "Content-Type: image/jpeg" --data-binary @photo.jpg "<upload_url>". A 2xx from that PUT means the bytes are stored; the key to reference them is the \`r2_key\` in THIS result (the PUT itself returns no useful body). Pass that r2_key in \`images_r2_keys\` on generation tools, save it permanently with gemini_save_character, or convert it to a ~48h Files API reference with gemini_upload_file({ r2_key }). Prefer this over images_base64 (which costs ~14k tokens per photo) whenever the caller has a shell. Images only, up to ${wholeMb(UPLOAD_MAX_BYTES)}MB. The PUT must send exactly the Content-Type this URL was minted for \u2014 the signature covers it, so a mismatched header is rejected.`,
       annotations: { readOnlyHint: true, openWorldHint: false },
       inputSchema: {
         filename: external_exports.string().min(1).max(120).describe('Filename of the upload (e.g. "finn.jpg") \u2014 sanitized into the object key and the suggested curl command'),
@@ -35957,12 +35965,10 @@ function registerUploadUrlTools(server, client2) {
       }
     },
     async (args) => {
-      let minted;
-      try {
-        minted = await minter.mint(args.filename, args.content_type);
-      } catch (err) {
-        throw new McpToolError(err instanceof Error ? err.message : String(err));
-      }
+      const minted = await step(
+        `minting a signed upload URL for ${args.filename} (${args.content_type})`,
+        () => minter.mint(args.filename, args.content_type)
+      );
       return textResult({
         upload_url: minted.url,
         method: "PUT",
@@ -35971,7 +35977,10 @@ function registerUploadUrlTools(server, client2) {
         expires_at: new Date(minted.expiresAtMs).toISOString(),
         max_bytes: UPLOAD_MAX_BYTES,
         curl_hint: `curl -sS -X PUT -H "Content-Type: ${minted.contentType}" --data-binary @${args.filename} "${minted.url}"`,
-        hint: "PUT the raw bytes within ~10 minutes; no Authorization header is needed (the signature in the URL is the auth). Then reference the returned r2_key: images_r2_keys on generation tools (master_images_r2_keys on gemini_image_set), gemini_save_character to keep it with no expiry, or gemini_upload_file({ r2_key }) for a ~48h files/\u2026 reference. Uploads themselves follow the media retention schedule (default 7 days)."
+        // Named for what it is: the PUT's own body is the object store's, not
+        // this connector's, so 2xx is the whole success signal.
+        success_is: "any 2xx from the PUT; the response body is not part of the contract and carries no r2_key",
+        hint: "PUT the raw bytes within ~10 minutes with exactly the Content-Type above; no Authorization header is needed (the signature in the URL is the auth, and it covers the content type). On a 2xx, reference the `r2_key` from THIS result \u2014 not the PUT response: images_r2_keys on generation tools (master_images_r2_keys on gemini_image_set), gemini_save_character to keep it with no expiry, or gemini_upload_file({ r2_key }) for a ~48h files/\u2026 reference. Uploads themselves follow the media retention schedule (default 7 days)."
       });
     }
   );
@@ -36152,26 +36161,27 @@ function registerLibraryTools(server, client2) {
   );
 }
+// src/registrars.ts
+var reporting = (register) => (server, deps) => register(surfaceToolErrors(server), deps);
+var TOOL_REGISTRARS = [
+  registerModelTools,
+  registerGenerateTools,
+  registerSetTools,
+  registerInteractTools,
+  registerVideoTools,
+  registerMusicTools,
+  registerJobTools,
+  registerFileTools,
+  registerUploadUrlTools,
+  registerLibraryTools
+].map(reporting);
 // src/index.ts
 await loadStdioDotenv();
 await runMcp({
   name: "gemini-mcp",
   version: VERSION,
   banner: "[gemini-mcp] This project was developed and is maintained by AI (Claude). Use at your own discretion.",
-  tools: [
-    registerModelTools,
-    registerGenerateTools,
-    registerSetTools,
-    registerInteractTools,
-    registerVideoTools,
-    registerMusicTools,
-    registerJobTools,
-    registerFileTools,
-    // Both gate on the client having somewhere to put bytes: hosted with a
-    // blob store they register, and on a local install they no-op rather than
-    // advertising a tool that cannot work.
-    registerUploadUrlTools,
-    registerLibraryTools
-  ],
+  tools: TOOL_REGISTRARS,
   deps: client
 });