moodle-cli 0.7.0 → 0.8.0

package/dist/worker/recovery.js

@@ -445,10 +445,10 @@ var require_node2 = __commonJS({
     })();
     var __assign = exports && exports.__assign || function() {
       __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-          s = arguments[i];
-          for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-            t[p] = s[p];
+        for (var s2, i = 1, n2 = arguments.length; i < n2; i++) {
+          s2 = arguments[i];
+          for (var p in s2) if (Object.prototype.hasOwnProperty.call(s2, p))
+            t[p] = s2[p];
         }
         return t;
       };
@@ -1318,19 +1318,19 @@ var require_decode = __commonJS({
         };
         EntityDecoder2.prototype.stateNamedEntity = function(str, offset) {
           var decodeTree = this.decodeTree;
-          var current = decodeTree[this.treeIndex];
-          var valueLength = (current & BinTrieFlags.VALUE_LENGTH) >> 14;
+          var current2 = decodeTree[this.treeIndex];
+          var valueLength = (current2 & BinTrieFlags.VALUE_LENGTH) >> 14;
           for (; offset < str.length; offset++, this.excess++) {
             var char = str.charCodeAt(offset);
-            this.treeIndex = determineBranch(decodeTree, current, this.treeIndex + Math.max(1, valueLength), char);
+            this.treeIndex = determineBranch(decodeTree, current2, this.treeIndex + Math.max(1, valueLength), char);
             if (this.treeIndex < 0) {
               return this.result === 0 || // If we are parsing an attribute
               this.decodeMode === DecodingMode.Attribute && // We shouldn't have consumed any characters after the entity,
               (valueLength === 0 || // And there should be no invalid characters.
               isEntityInAttributeInvalidEnd(char)) ? 0 : this.emitNotTerminatedNamedEntity();
             }
-            current = decodeTree[this.treeIndex];
-            valueLength = (current & BinTrieFlags.VALUE_LENGTH) >> 14;
+            current2 = decodeTree[this.treeIndex];
+            valueLength = (current2 & BinTrieFlags.VALUE_LENGTH) >> 14;
             if (valueLength !== 0) {
               if (char === CharCodes.SEMI) {
                 return this.emitNamedEntityData(this.treeIndex, valueLength, this.consumed + this.excess);
@@ -1414,9 +1414,9 @@ var require_decode = __commonJS({
         return result;
       };
     }
-    function determineBranch(decodeTree, current, nodeIdx, char) {
-      var branchCount = (current & BinTrieFlags.BRANCH_LENGTH) >> 7;
-      var jumpOffset = current & BinTrieFlags.JUMP_TABLE;
+    function determineBranch(decodeTree, current2, nodeIdx, char) {
+      var branchCount = (current2 & BinTrieFlags.BRANCH_LENGTH) >> 7;
+      var jumpOffset = current2 & BinTrieFlags.JUMP_TABLE;
       if (branchCount === 0) {
         return jumpOffset !== 0 && char === jumpOffset ? nodeIdx : -1;
       }
@@ -1856,10 +1856,10 @@ var require_lib4 = __commonJS({
     "use strict";
     var __assign = exports && exports.__assign || function() {
       __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-          s = arguments[i];
-          for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-            t[p] = s[p];
+        for (var s2, i = 1, n2 = arguments.length; i < n2; i++) {
+          s2 = arguments[i];
+          for (var p in s2) if (Object.prototype.hasOwnProperty.call(s2, p))
+            t[p] = s2[p];
         }
         return t;
       };
@@ -2287,16 +2287,16 @@ var require_querying = __commonJS({
     exports.existsOne = existsOne;
     exports.findAll = findAll;
     var domhandler_1 = require_lib2();
-    function filter(test, node2, recurse, limit) {
+    function filter(test, node2, recurse, limit2) {
       if (recurse === void 0) {
         recurse = true;
       }
-      if (limit === void 0) {
-        limit = Infinity;
+      if (limit2 === void 0) {
+        limit2 = Infinity;
       }
-      return find(test, Array.isArray(node2) ? node2 : [node2], recurse, limit);
+      return find(test, Array.isArray(node2) ? node2 : [node2], recurse, limit2);
     }
-    function find(test, nodes, recurse, limit) {
+    function find(test, nodes, recurse, limit2) {
       var result = [];
       var nodeStack = [Array.isArray(nodes) ? nodes : [nodes]];
       var indexStack = [0];
@@ -2312,7 +2312,7 @@ var require_querying = __commonJS({
         var elem = nodeStack[0][indexStack[0]++];
         if (test(elem)) {
           result.push(elem);
-          if (--limit <= 0)
+          if (--limit2 <= 0)
             return result;
         }
         if (recurse && (0, domhandler_1.hasChildren)(elem) && elem.children.length > 0) {
@@ -2445,47 +2445,47 @@ var require_legacy = __commonJS({
       var test = compileTest(options);
       return test ? test(node2) : true;
     }
-    function getElements(options, nodes, recurse, limit) {
-      if (limit === void 0) {
-        limit = Infinity;
+    function getElements(options, nodes, recurse, limit2) {
+      if (limit2 === void 0) {
+        limit2 = Infinity;
       }
       var test = compileTest(options);
-      return test ? (0, querying_js_1.filter)(test, nodes, recurse, limit) : [];
+      return test ? (0, querying_js_1.filter)(test, nodes, recurse, limit2) : [];
     }
-    function getElementById(id, nodes, recurse) {
+    function getElementById(id2, nodes, recurse) {
       if (recurse === void 0) {
         recurse = true;
       }
       if (!Array.isArray(nodes))
         nodes = [nodes];
-      return (0, querying_js_1.findOne)(getAttribCheck("id", id), nodes, recurse);
+      return (0, querying_js_1.findOne)(getAttribCheck("id", id2), nodes, recurse);
     }
-    function getElementsByTagName(tagName, nodes, recurse, limit) {
+    function getElementsByTagName(tagName, nodes, recurse, limit2) {
       if (recurse === void 0) {
         recurse = true;
       }
-      if (limit === void 0) {
-        limit = Infinity;
+      if (limit2 === void 0) {
+        limit2 = Infinity;
       }
-      return (0, querying_js_1.filter)(Checks["tag_name"](tagName), nodes, recurse, limit);
+      return (0, querying_js_1.filter)(Checks["tag_name"](tagName), nodes, recurse, limit2);
     }
-    function getElementsByClassName(className, nodes, recurse, limit) {
+    function getElementsByClassName(className, nodes, recurse, limit2) {
       if (recurse === void 0) {
         recurse = true;
       }
-      if (limit === void 0) {
-        limit = Infinity;
+      if (limit2 === void 0) {
+        limit2 = Infinity;
       }
-      return (0, querying_js_1.filter)(getAttribCheck("class", className), nodes, recurse, limit);
+      return (0, querying_js_1.filter)(getAttribCheck("class", className), nodes, recurse, limit2);
     }
-    function getElementsByTagType(type, nodes, recurse, limit) {
+    function getElementsByTagType(type, nodes, recurse, limit2) {
       if (recurse === void 0) {
         recurse = true;
       }
-      if (limit === void 0) {
-        limit = Infinity;
+      if (limit2 === void 0) {
+        limit2 = Infinity;
       }
-      return (0, querying_js_1.filter)(Checks["tag_type"](type), nodes, recurse, limit);
+      return (0, querying_js_1.filter)(Checks["tag_type"](type), nodes, recurse, limit2);
     }
   }
 });
@@ -2531,15 +2531,15 @@ var require_helpers = __commonJS({
       if (nodeA === nodeB) {
         return 0;
       }
-      var current = (0, domhandler_1.hasChildren)(nodeA) ? nodeA : nodeA.parent;
-      while (current) {
-        aParents.unshift(current);
-        current = current.parent;
+      var current2 = (0, domhandler_1.hasChildren)(nodeA) ? nodeA : nodeA.parent;
+      while (current2) {
+        aParents.unshift(current2);
+        current2 = current2.parent;
       }
-      current = (0, domhandler_1.hasChildren)(nodeB) ? nodeB : nodeB.parent;
-      while (current) {
-        bParents.unshift(current);
-        current = current.parent;
+      current2 = (0, domhandler_1.hasChildren)(nodeB) ? nodeB : nodeB.parent;
+      while (current2) {
+        bParents.unshift(current2);
+        current2 = current2.parent;
       }
       var maxIdx = Math.min(aParents.length, bParents.length);
       var idx = 0;
@@ -3677,12 +3677,12 @@ var require_compile = __commonJS({
     function generate(parsed) {
       var a = parsed[0];
       var b = parsed[1] - 1;
-      var n = 0;
+      var n2 = 0;
       if (a < 0) {
         var aPos_1 = -a;
         var minValue_1 = (b % aPos_1 + aPos_1) % aPos_1;
         return function() {
-          var val = minValue_1 + aPos_1 * n++;
+          var val = minValue_1 + aPos_1 * n2++;
           return val > b ? null : val;
         };
       }
@@ -3695,14 +3695,14 @@ var require_compile = __commonJS({
         ) : (
           // Return `b` exactly once
           function() {
-            return n++ === 0 ? b : null;
+            return n2++ === 0 ? b : null;
           }
         );
       if (b < 0) {
         b += a * Math.ceil(-b / a);
       }
       return function() {
-        return a * n++ + b;
+        return a * n2++ + b;
       };
     }
     exports.generate = generate;
@@ -4091,8 +4091,8 @@ var require_subselects = __commonJS({
         var adapter = options.adapter;
         var opts = copyOptions(options);
         opts.relativeSelector = true;
-        var context = subselect.some(function(s) {
-          return s.some(sort_js_1.isTraversal);
+        var context = subselect.some(function(s2) {
+          return s2.some(sort_js_1.isTraversal);
         }) ? (
           // Used as a placeholder. Will be replaced with the actual element.
           [exports.PLACEHOLDER_ELEMENT]
@@ -4234,9 +4234,9 @@ var require_general = __commonJS({
         case css_what_1.SelectorType.Descendant: {
           if (options.cacheResults === false || typeof WeakSet === "undefined") {
             return function descendant(elem) {
-              var current = elem;
-              while (current = getElementParent(current, adapter)) {
-                if (next(current)) {
+              var current2 = elem;
+              while (current2 = getElementParent(current2, adapter)) {
+                if (next(current2)) {
                   return true;
                 }
               }
@@ -4245,13 +4245,13 @@ var require_general = __commonJS({
           }
           var isFalseCache_1 = /* @__PURE__ */ new WeakSet();
           return function cachedDescendant(elem) {
-            var current = elem;
-            while (current = getElementParent(current, adapter)) {
-              if (!isFalseCache_1.has(current)) {
-                if (adapter.isTag(current) && next(current)) {
+            var current2 = elem;
+            while (current2 = getElementParent(current2, adapter)) {
+              if (!isFalseCache_1.has(current2)) {
+                if (adapter.isTag(current2) && next(current2)) {
                   return true;
                 }
-                isFalseCache_1.add(current);
+                isFalseCache_1.add(current2);
               }
             }
             return false;
@@ -4259,11 +4259,11 @@ var require_general = __commonJS({
         }
         case "_flexibleDescendant": {
           return function flexibleDescendant(elem) {
-            var current = elem;
+            var current2 = elem;
             do {
-              if (next(current))
+              if (next(current2))
                 return true;
-            } while (current = getElementParent(current, adapter));
+            } while (current2 = getElementParent(current2, adapter));
             return false;
           };
         }
@@ -5269,7 +5269,7 @@ var require_html = __commonJS({
        * @param {string} id the id of the element to select
        * @returns {HTMLElement | null} the element with the given id or null if not found
        */
-      getElementById(id) {
+      getElementById(id2) {
         const stack = [];
         let currentNodeReference = this;
         let index = 0;
@@ -5284,7 +5284,7 @@ var require_html = __commonJS({
             continue;
           }
           if (child.nodeType === type_1.default.ELEMENT_NODE) {
-            if (child._id === id) {
+            if (child._id === id2) {
               return child;
             }
             if (child.childNodes.length > 0) {
@@ -6131,11 +6131,11 @@ function createOAuthRouter(options) {
     return false;
   }
   async function prune() {
-    const current = now();
+    const current2 = now();
     for (const prefix of [CODE_PREFIX, ACCESS_PREFIX, REFRESH_PREFIX, CONSUMED_REFRESH_PREFIX]) {
       const entries = await storage.list({ prefix });
       for (const [key, value] of entries) {
-        if (value.expiresAt <= current) await storage.delete(key);
+        if (value.expiresAt <= current2) await storage.delete(key);
       }
     }
   }
@@ -6194,8 +6194,8 @@ function createOAuthRouter(options) {
     const clients = await storage.list({ prefix: CLIENT_PREFIX });
     const pending = [];
     for (const client2 of clients.values()) {
-      const current = await readClient(client2.clientId);
-      if (current && current.approvedAt === void 0) pending.push(current);
+      const current2 = await readClient(client2.clientId);
+      if (current2 && current2.approvedAt === void 0) pending.push(current2);
     }
     if (pending.length >= MAX_REGISTERED_CLIENTS) {
       pending.sort((left, right) => left.createdAt - right.createdAt);
@@ -6416,8 +6416,8 @@ function createOAuthRouter(options) {
     async listClients() {
       const result = [];
       for (const client of (await storage.list({ prefix: CLIENT_PREFIX })).values()) {
-        const current = await readClient(client.clientId);
-        if (current) result.push({ clientId: current.clientId, clientName: current.clientName, approved: current.approvedAt !== void 0 });
+        const current2 = await readClient(client.clientId);
+        if (current2) result.push({ clientId: current2.clientId, clientName: current2.clientName, approved: current2.approvedAt !== void 0 });
       }
       return result;
     },
@@ -6600,9 +6600,9 @@ var AuthBroker = class {
       }
     }
     if (url2.pathname === INTERNAL_VERIFY_PATH && request.method === "POST") {
-      const input2 = await safeJson(request);
-      const token = typeof input2?.token === "string" ? input2.token : "";
-      const resource = typeof input2?.resource === "string" ? input2.resource : "";
+      const input3 = await safeJson(request);
+      const token = typeof input3?.token === "string" ? input3.token : "";
+      const resource = typeof input3?.resource === "string" ? input3.resource : "";
       const grant = await router.verifyAccessToken(token, resource);
       return grant ? Response.json(grant) : new Response(null, { status: 401 });
     }
@@ -7385,8 +7385,8 @@ var Cached = class {
 function cached(getter) {
   return new Cached(getter);
 }
-function nullish(input2) {
-  return input2 === null || input2 === void 0;
+function nullish(input3) {
+  return input3 === null || input3 === void 0;
 }
 function cleanRegex(source) {
   const start = source.startsWith("^") ? 1 : 0;
@@ -7523,8 +7523,8 @@ function randomString(length = 10) {
 function esc(str) {
   return JSON.stringify(str);
 }
-function slugify(input2) {
-  return input2.toLowerCase().trim().replace(/[^\w\s-]/g, "").replace(/[\s_-]+/g, "-").replace(/^-+|-+$/g, "");
+function slugify(input3) {
+  return input3.toLowerCase().trim().replace(/[^\w\s-]/g, "").replace(/[\s_-]+/g, "-").replace(/^-+|-+$/g, "");
 }
 var captureStackTrace = "captureStackTrace" in Error ? Error.captureStackTrace : (..._args) => {
 };
@@ -7880,12 +7880,12 @@ function finalizeIssue(iss, ctx, config2) {
   }
   return full;
 }
-function getSizableOrigin(input2) {
-  if (input2 instanceof Set)
+function getSizableOrigin(input3) {
+  if (input3 instanceof Set)
     return "set";
-  if (input2 instanceof Map)
+  if (input3 instanceof Map)
     return "map";
-  if (input2 instanceof File)
+  if (input3 instanceof File)
     return "file";
   return "unknown";
 }
@@ -7903,10 +7903,10 @@ function codePointLength(str) {
   }
   return count;
 }
-function getLengthableOrigin(input2) {
-  if (Array.isArray(input2))
+function getLengthableOrigin(input3) {
+  if (Array.isArray(input3))
     return "array";
-  if (typeof input2 === "string")
+  if (typeof input3 === "string")
     return "string";
   return "unknown";
 }
@@ -7932,12 +7932,12 @@ function parsedType(data) {
   return t;
 }
 function issue(...args) {
-  const [iss, input2, inst] = args;
+  const [iss, input3, inst] = args;
   if (typeof iss === "string") {
     return {
       message: iss,
       code: "custom",
-      input: input2,
+      input: input3,
       inst
     };
   }
@@ -8835,23 +8835,23 @@ var $ZodCheckNumberFormat = /* @__PURE__ */ $constructor("$ZodCheckNumberFormat"
   const origin = isInt ? "int" : "number";
   const [minimum, maximum] = NUMBER_FORMAT_RANGES[def.format];
   inst._zod.check = (payload) => {
-    const input2 = payload.value;
+    const input3 = payload.value;
     if (isInt) {
-      if (!Number.isInteger(input2)) {
+      if (!Number.isInteger(input3)) {
         payload.issues.push({
           expected: origin,
           format: def.format,
           code: "invalid_type",
           continue: false,
-          input: input2,
+          input: input3,
           inst
         });
         return;
       }
-      if (!Number.isSafeInteger(input2)) {
-        if (input2 > 0) {
+      if (!Number.isSafeInteger(input3)) {
+        if (input3 > 0) {
           payload.issues.push({
-            input: input2,
+            input: input3,
             code: "too_big",
             maximum: Number.MAX_SAFE_INTEGER,
             note: "Integers must be within the safe integer range.",
@@ -8862,7 +8862,7 @@ var $ZodCheckNumberFormat = /* @__PURE__ */ $constructor("$ZodCheckNumberFormat"
           });
         } else {
           payload.issues.push({
-            input: input2,
+            input: input3,
             code: "too_small",
             minimum: Number.MIN_SAFE_INTEGER,
             note: "Integers must be within the safe integer range.",
@@ -8875,10 +8875,10 @@ var $ZodCheckNumberFormat = /* @__PURE__ */ $constructor("$ZodCheckNumberFormat"
         return;
       }
     }
-    if (input2 < minimum) {
+    if (input3 < minimum) {
       payload.issues.push({
         origin: "number",
-        input: input2,
+        input: input3,
         code: "too_small",
         minimum,
         inclusive: true,
@@ -8886,10 +8886,10 @@ var $ZodCheckNumberFormat = /* @__PURE__ */ $constructor("$ZodCheckNumberFormat"
         continue: !def.abort
       });
     }
-    if (input2 > maximum) {
+    if (input3 > maximum) {
       payload.issues.push({
         origin: "number",
-        input: input2,
+        input: input3,
         code: "too_big",
         maximum,
         inclusive: true,
@@ -8903,11 +8903,11 @@ var $ZodCheckBigIntFormat = /* @__PURE__ */ $constructor("$ZodCheckBigIntFormat"
   $ZodCheck.init(inst, def);
   const [minimum, maximum] = BIGINT_FORMAT_RANGES[def.format];
   inst._zod.check = (payload) => {
-    const input2 = payload.value;
-    if (input2 < minimum) {
+    const input3 = payload.value;
+    if (input3 < minimum) {
       payload.issues.push({
         origin: "bigint",
-        input: input2,
+        input: input3,
         code: "too_small",
         minimum,
         inclusive: true,
@@ -8915,10 +8915,10 @@ var $ZodCheckBigIntFormat = /* @__PURE__ */ $constructor("$ZodCheckBigIntFormat"
         continue: !def.abort
       });
     }
-    if (input2 > maximum) {
+    if (input3 > maximum) {
       payload.issues.push({
         origin: "bigint",
-        input: input2,
+        input: input3,
         code: "too_big",
         maximum,
         inclusive: true,
@@ -8933,16 +8933,16 @@ var $ZodCheckMaxSize = /* @__PURE__ */ $constructor("$ZodCheckMaxSize", (inst, d
   $ZodCheck.init(inst, def);
   (_a3 = inst._zod.def).when ?? (_a3.when = _whenHasSize);
   inst._zod.check = (payload) => {
-    const input2 = payload.value;
-    const size = input2.size;
+    const input3 = payload.value;
+    const size = input3.size;
     if (size <= def.maximum)
       return;
     payload.issues.push({
-      origin: getSizableOrigin(input2),
+      origin: getSizableOrigin(input3),
       code: "too_big",
       maximum: def.maximum,
       inclusive: true,
-      input: input2,
+      input: input3,
       inst,
       continue: !def.abort
     });
@@ -8953,16 +8953,16 @@ var $ZodCheckMinSize = /* @__PURE__ */ $constructor("$ZodCheckMinSize", (inst, d
   $ZodCheck.init(inst, def);
   (_a3 = inst._zod.def).when ?? (_a3.when = _whenHasSize);
   inst._zod.check = (payload) => {
-    const input2 = payload.value;
-    const size = input2.size;
+    const input3 = payload.value;
+    const size = input3.size;
     if (size >= def.minimum)
       return;
     payload.issues.push({
-      origin: getSizableOrigin(input2),
+      origin: getSizableOrigin(input3),
       code: "too_small",
       minimum: def.minimum,
       inclusive: true,
-      input: input2,
+      input: input3,
       inst,
       continue: !def.abort
     });
@@ -8973,13 +8973,13 @@ var $ZodCheckSizeEquals = /* @__PURE__ */ $constructor("$ZodCheckSizeEquals", (i
   $ZodCheck.init(inst, def);
   (_a3 = inst._zod.def).when ?? (_a3.when = _whenHasSize);
   inst._zod.check = (payload) => {
-    const input2 = payload.value;
-    const size = input2.size;
+    const input3 = payload.value;
+    const size = input3.size;
     if (size === def.size)
       return;
     const tooBig = size > def.size;
     payload.issues.push({
-      origin: getSizableOrigin(input2),
+      origin: getSizableOrigin(input3),
       ...tooBig ? { code: "too_big", maximum: def.size } : { code: "too_small", minimum: def.size },
       inclusive: true,
       exact: true,
@@ -8994,18 +8994,18 @@ var $ZodCheckMaxLength = /* @__PURE__ */ $constructor("$ZodCheckMaxLength", (ins
   $ZodCheck.init(inst, def);
   (_a3 = inst._zod.def).when ?? (_a3.when = _whenHasLength);
   inst._zod.check = (payload) => {
-    const input2 = payload.value;
-    const units = input2.length;
-    const length = typeof input2 === "string" && units > def.maximum ? codePointLength(input2) : units;
+    const input3 = payload.value;
+    const units = input3.length;
+    const length = typeof input3 === "string" && units > def.maximum ? codePointLength(input3) : units;
     if (length <= def.maximum)
       return;
-    const origin = getLengthableOrigin(input2);
+    const origin = getLengthableOrigin(input3);
     payload.issues.push({
       origin,
       code: "too_big",
       maximum: def.maximum,
       inclusive: true,
-      input: input2,
+      input: input3,
       inst,
       continue: !def.abort
     });
@@ -9016,18 +9016,18 @@ var $ZodCheckMinLength = /* @__PURE__ */ $constructor("$ZodCheckMinLength", (ins
   $ZodCheck.init(inst, def);
   (_a3 = inst._zod.def).when ?? (_a3.when = _whenHasLength);
   inst._zod.check = (payload) => {
-    const input2 = payload.value;
-    const units = input2.length;
-    const length = typeof input2 === "string" && units >= def.minimum && units < def.minimum * 2 ? codePointLength(input2) : units;
+    const input3 = payload.value;
+    const units = input3.length;
+    const length = typeof input3 === "string" && units >= def.minimum && units < def.minimum * 2 ? codePointLength(input3) : units;
     if (length >= def.minimum)
       return;
-    const origin = getLengthableOrigin(input2);
+    const origin = getLengthableOrigin(input3);
     payload.issues.push({
       origin,
       code: "too_small",
       minimum: def.minimum,
       inclusive: true,
-      input: input2,
+      input: input3,
       inst,
       continue: !def.abort
     });
@@ -9038,12 +9038,12 @@ var $ZodCheckLengthEquals = /* @__PURE__ */ $constructor("$ZodCheckLengthEquals"
   $ZodCheck.init(inst, def);
   (_a3 = inst._zod.def).when ?? (_a3.when = _whenHasLength);
   inst._zod.check = (payload) => {
-    const input2 = payload.value;
-    const units = input2.length;
-    const length = typeof input2 === "string" && units >= def.length && units <= def.length * 2 ? codePointLength(input2) : units;
+    const input3 = payload.value;
+    const units = input3.length;
+    const length = typeof input3 === "string" && units >= def.length && units <= def.length * 2 ? codePointLength(input3) : units;
     if (length === def.length)
       return;
-    const origin = getLengthableOrigin(input2);
+    const origin = getLengthableOrigin(input3);
     const tooBig = length > def.length;
     payload.issues.push({
       origin,
@@ -9698,10 +9698,10 @@ function isLuhnAlgo(digits) {
   }
   return sum % 10 === 0;
 }
-function isValidCreditCard(input2) {
-  if (!creditCard.test(input2))
+function isValidCreditCard(input3) {
+  if (!creditCard.test(input3))
     return false;
-  return isLuhnAlgo(input2.replace(CC_SANITIZE, ""));
+  return isLuhnAlgo(input3.replace(CC_SANITIZE, ""));
 }
 var $ZodCreditCard = /* @__PURE__ */ $constructor("$ZodCreditCard", (inst, def) => {
   def.pattern ?? (def.pattern = creditCard);
@@ -9731,10 +9731,10 @@ function isIso7064Mod97(iban3) {
   }
   return remainder === 1;
 }
-function isValidIBAN(input2) {
-  if (!iban.test(input2))
+function isValidIBAN(input3) {
+  if (!iban.test(input3))
     return false;
-  return isIso7064Mod97(input2);
+  return isIso7064Mod97(input3);
 }
 var $ZodIBAN = /* @__PURE__ */ $constructor("$ZodIBAN", (inst, def) => {
   def.pattern ?? (def.pattern = iban);
@@ -9808,15 +9808,15 @@ var $ZodNumber = /* @__PURE__ */ $constructor("$ZodNumber", (inst, def) => {
         payload.value = Number(payload.value);
       } catch (_) {
       }
-    const input2 = payload.value;
-    if (typeof input2 === "number" && !Number.isNaN(input2) && Number.isFinite(input2)) {
+    const input3 = payload.value;
+    if (typeof input3 === "number" && !Number.isNaN(input3) && Number.isFinite(input3)) {
       return payload;
     }
-    const received = typeof input2 === "number" ? Number.isNaN(input2) ? "NaN" : !Number.isFinite(input2) ? String(input2) : void 0 : void 0;
+    const received = typeof input3 === "number" ? Number.isNaN(input3) ? "NaN" : !Number.isFinite(input3) ? String(input3) : void 0 : void 0;
     payload.issues.push({
       expected: "number",
       code: "invalid_type",
-      input: input2,
+      input: input3,
       inst,
       ...received ? { received } : {}
     });
@@ -9836,13 +9836,13 @@ var $ZodBoolean = /* @__PURE__ */ $constructor("$ZodBoolean", (inst, def) => {
         payload.value = Boolean(payload.value);
       } catch (_) {
       }
-    const input2 = payload.value;
-    if (typeof input2 === "boolean")
+    const input3 = payload.value;
+    if (typeof input3 === "boolean")
       return payload;
     payload.issues.push({
       expected: "boolean",
       code: "invalid_type",
-      input: input2,
+      input: input3,
       inst
     });
     return payload;
@@ -9875,13 +9875,13 @@ var $ZodBigIntFormat = /* @__PURE__ */ $constructor("$ZodBigIntFormat", (inst, d
 var $ZodSymbol = /* @__PURE__ */ $constructor("$ZodSymbol", (inst, def) => {
   $ZodType.init(inst, def);
   inst._zod.parse = (payload, _ctx) => {
-    const input2 = payload.value;
-    if (typeof input2 === "symbol")
+    const input3 = payload.value;
+    if (typeof input3 === "symbol")
       return payload;
     payload.issues.push({
       expected: "symbol",
       code: "invalid_type",
-      input: input2,
+      input: input3,
       inst
     });
     return payload;
@@ -9892,13 +9892,13 @@ var $ZodUndefined = /* @__PURE__ */ $constructor("$ZodUndefined", (inst, def) =>
   inst._zod.pattern = _undefined;
   inst._zod.values = /* @__PURE__ */ new Set([void 0]);
   inst._zod.parse = (payload, _ctx) => {
-    const input2 = payload.value;
-    if (typeof input2 === "undefined")
+    const input3 = payload.value;
+    if (typeof input3 === "undefined")
       return payload;
     payload.issues.push({
       expected: "undefined",
       code: "invalid_type",
-      input: input2,
+      input: input3,
       inst
     });
     return payload;
@@ -9909,13 +9909,13 @@ var $ZodNull = /* @__PURE__ */ $constructor("$ZodNull", (inst, def) => {
   inst._zod.pattern = _null;
   inst._zod.values = /* @__PURE__ */ new Set([null]);
   inst._zod.parse = (payload, _ctx) => {
-    const input2 = payload.value;
-    if (input2 === null)
+    const input3 = payload.value;
+    if (input3 === null)
       return payload;
     payload.issues.push({
       expected: "null",
       code: "invalid_type",
-      input: input2,
+      input: input3,
       inst
     });
     return payload;
@@ -9944,13 +9944,13 @@ var $ZodNever = /* @__PURE__ */ $constructor("$ZodNever", (inst, def) => {
 var $ZodVoid = /* @__PURE__ */ $constructor("$ZodVoid", (inst, def) => {
   $ZodType.init(inst, def);
   inst._zod.parse = (payload, _ctx) => {
-    const input2 = payload.value;
-    if (typeof input2 === "undefined")
+    const input3 = payload.value;
+    if (typeof input3 === "undefined")
       return payload;
     payload.issues.push({
       expected: "void",
       code: "invalid_type",
-      input: input2,
+      input: input3,
       inst
     });
     return payload;
@@ -9965,15 +9965,15 @@ var $ZodDate = /* @__PURE__ */ $constructor("$ZodDate", (inst, def) => {
       } catch (_err) {
       }
     }
-    const input2 = payload.value;
-    const isDate = input2 instanceof Date;
-    const isValidDate = isDate && !Number.isNaN(input2.getTime());
+    const input3 = payload.value;
+    const isDate = input3 instanceof Date;
+    const isValidDate = isDate && !Number.isNaN(input3.getTime());
     if (isValidDate)
       return payload;
     payload.issues.push({
       expected: "date",
       code: "invalid_type",
-      input: input2,
+      input: input3,
       ...isDate ? { received: "Invalid Date" } : {},
       inst
     });
@@ -9991,21 +9991,21 @@ var $ZodArray = /* @__PURE__ */ $constructor("$ZodArray", (inst, def) => {
   const memo2 = globalConfig.memoizer;
   memo2?.attach(inst);
   inst._zod.parse = (payload, ctx) => {
-    const input2 = payload.value;
-    if (!Array.isArray(input2)) {
+    const input3 = payload.value;
+    if (!Array.isArray(input3)) {
       payload.issues.push({
         expected: "array",
         code: "invalid_type",
-        input: input2,
+        input: input3,
         inst
       });
       return payload;
     }
-    payload.value = memo2 ? memo2.alloc(inst, payload, Array(input2.length), ctx) : Array(input2.length);
+    payload.value = memo2 ? memo2.alloc(inst, payload, Array(input3.length), ctx) : Array(input3.length);
     const proms = [];
     const abortEarly = ctx?.abortEarly;
-    for (let i = 0; i < input2.length; i++) {
-      const item = input2[i];
+    for (let i = 0; i < input3.length; i++) {
+      const item = input3[i];
       const result = def.element._zod.run({
         value: item,
         issues: []
@@ -10024,8 +10024,8 @@ var $ZodArray = /* @__PURE__ */ $constructor("$ZodArray", (inst, def) => {
     return payload;
   };
 });
-function handlePropertyResult(result, final, key, input2, optin, optout) {
-  const isPresent = key in input2;
+function handlePropertyResult(result, final, key, input3, optin, optout) {
+  const isPresent = key in input3;
   const isOptionalOut = optout === "optional";
   if (!isPresent && isOptionalOut && optin === "optional") {
     return;
@@ -10077,7 +10077,7 @@ function normalizeDef(def) {
     optionalKeys: new Set(okeys)
   };
 }
-function handleCatchall(proms, input2, payload, ctx, def, inst, abortEarly) {
+function handleCatchall(proms, input3, payload, ctx, def, inst, abortEarly) {
   const unrecognized = [];
   const keySet = def.keySet;
   const _catchall = def.catchall._zod;
@@ -10085,7 +10085,7 @@ function handleCatchall(proms, input2, payload, ctx, def, inst, abortEarly) {
   const optin = _catchall.optin;
   const optout = _catchall.optout;
   let seen = 0;
-  for (const key in input2) {
+  for (const key in input3) {
     if (abortEarly && payload.issues.length !== seen) {
       if (aborted(payload, seen))
         break;
@@ -10102,18 +10102,18 @@ function handleCatchall(proms, input2, payload, ctx, def, inst, abortEarly) {
       unrecognized.push(key);
       continue;
     }
-    const r = _catchall.run({ value: input2[key], issues: [] }, ctx);
+    const r = _catchall.run({ value: input3[key], issues: [] }, ctx);
     if (r instanceof Promise) {
-      proms.push(r.then((r2) => handlePropertyResult(r2, payload, key, input2, optin, optout)));
+      proms.push(r.then((r2) => handlePropertyResult(r2, payload, key, input3, optin, optout)));
     } else {
-      handlePropertyResult(r, payload, key, input2, optin, optout);
+      handlePropertyResult(r, payload, key, input3, optin, optout);
     }
   }
   if (unrecognized.length) {
     payload.issues.push({
       code: "unrecognized_keys",
       keys: unrecognized,
-      input: input2,
+      input: input3,
       inst,
       // Describes the shape of the input, not the validity of the parsed value, so it never aborts. The parse still fails; the schema's own checks just get to run first, and an enclosing intersection can reconcile the key against a sibling operand.
       continue: true
@@ -10164,12 +10164,12 @@ var $ZodObject = /* @__PURE__ */ $constructor("$ZodObject", (inst, def) => {
   memo2?.attach(inst);
   inst._zod.parse = (payload, ctx) => {
     value ?? (value = _normalized.value);
-    const input2 = payload.value;
-    if (!isObject2(input2)) {
+    const input3 = payload.value;
+    if (!isObject2(input3)) {
       payload.issues.push({
         expected: "object",
         code: "invalid_type",
-        input: input2,
+        input: input3,
         inst
       });
       return payload;
@@ -10190,17 +10190,17 @@ var $ZodObject = /* @__PURE__ */ $constructor("$ZodObject", (inst, def) => {
       const el = shape[key];
       const optin = el._zod.optin;
       const optout = el._zod.optout;
-      const r = el._zod.run({ value: input2[key], issues: [] }, ctx);
+      const r = el._zod.run({ value: input3[key], issues: [] }, ctx);
       if (r instanceof Promise) {
-        proms.push(r.then((r2) => handlePropertyResult(r2, payload, key, input2, optin, optout)));
+        proms.push(r.then((r2) => handlePropertyResult(r2, payload, key, input3, optin, optout)));
       } else {
-        handlePropertyResult(r, payload, key, input2, optin, optout);
+        handlePropertyResult(r, payload, key, input3, optin, optout);
       }
     }
     if (!catchall) {
       return proms.length ? Promise.all(proms).then(() => payload) : payload;
     }
-    return handleCatchall(proms, input2, payload, ctx, _normalized.value, inst, abortEarly === true);
+    return handleCatchall(proms, input3, payload, ctx, _normalized.value, inst, abortEarly === true);
   };
 });
 var $ZodObjectJIT = /* @__PURE__ */ $constructor("$ZodObjectJIT", (inst, def) => {
@@ -10213,15 +10213,15 @@ var $ZodObjectJIT = /* @__PURE__ */ $constructor("$ZodObjectJIT", (inst, def) =>
     const syms = normalized.symbolKeys;
     const doc = new Doc(["payload", "ctx"], { shape, inst, memo: memo2, syms });
     const parseStr = (k) => `shape[${k}]._zod.run({ value: input[${k}], issues: [] }, ctx)`;
-    const prefixStr = (id, k) => `
-          let ${id}_ab = false;
-          for (let i = 0; i < ${id}.issues.length; i++) {
-            const iss = ${id}.issues[i];
+    const prefixStr = (id2, k) => `
+          let ${id2}_ab = false;
+          for (let i = 0; i < ${id2}.issues.length; i++) {
+            const iss = ${id2}.issues[i];
             iss.path = iss.path ? [${k}, ...iss.path] : [${k}];
             payload.issues.push(iss);
-            if (iss.continue !== true) ${id}_ab = true;
+            if (iss.continue !== true) ${id2}_ab = true;
           }
-          if (${id}_ab && ctx && ctx.abortEarly) {
+          if (${id2}_ab && ctx && ctx.abortEarly) {
             payload.value = newResult;
             return payload;
           }`;
@@ -10235,34 +10235,34 @@ var $ZodObjectJIT = /* @__PURE__ */ $constructor("$ZodObjectJIT", (inst, def) =>
     for (const key of normalized.allKeys) {
       if (key === "__proto__")
         continue;
-      const id = ids[key];
+      const id2 = ids[key];
       const k = typeof key === "symbol" ? `syms[${syms.indexOf(key)}]` : esc(key);
       const isPresent = `${k} in input`;
       const schema2 = shape[key];
       const optin = schema2?._zod?.optin;
       const isOptionalIn = optin !== void 0;
       const isOptionalOut = schema2?._zod?.optout === "optional";
-      doc.write(`const ${id} = ${parseStr(k)};`);
+      doc.write(`const ${id2} = ${parseStr(k)};`);
       if (isOptionalIn && isOptionalOut) {
-        const assign = optin === "optional" ? `${id}_present` : `${id}.value !== undefined || ${id}_present`;
+        const assign = optin === "optional" ? `${id2}_present` : `${id2}.value !== undefined || ${id2}_present`;
         doc.write(`
-        const ${id}_present = ${isPresent};
-        if (!${id}.issues.length || ${id}_present) {
-          if (${id}.issues.length) {${prefixStr(id, k)}
+        const ${id2}_present = ${isPresent};
+        if (!${id2}.issues.length || ${id2}_present) {
+          if (${id2}.issues.length) {${prefixStr(id2, k)}
           }
 
           if (${assign}) {
-            newResult[${k}] = ${id}.value;
+            newResult[${k}] = ${id2}.value;
           }
         }
 
       `);
       } else if (!isOptionalIn) {
         doc.write(`
-        const ${id}_present = ${isPresent};
-        if (${id}.issues.length) {${prefixStr(id, k)}
+        const ${id2}_present = ${isPresent};
+        if (${id2}.issues.length) {${prefixStr(id2, k)}
         }
-        if (!${id}_present && !${id}.issues.length) {
+        if (!${id2}_present && !${id2}.issues.length) {
           payload.issues.push({
             code: "invalid_type",
             expected: "nonoptional",
@@ -10275,22 +10275,22 @@ var $ZodObjectJIT = /* @__PURE__ */ $constructor("$ZodObjectJIT", (inst, def) =>
           }
         }
 
-        if (${id}_present) {
-          newResult[${k}] = ${id}.value;
+        if (${id2}_present) {
+          newResult[${k}] = ${id2}.value;
         }
 
       `);
       } else {
         doc.write(`
-        if (${id}.issues.length) {${prefixStr(id, k)}
+        if (${id2}.issues.length) {${prefixStr(id2, k)}
         }
       `);
         if (optin === "defaulted") {
-          doc.write(`newResult[${k}] = ${id}.value;`);
+          doc.write(`newResult[${k}] = ${id2}.value;`);
         } else {
           doc.write(`
-        if (${id}.value !== undefined || ${isPresent}) {
-          newResult[${k}] = ${id}.value;
+        if (${id2}.value !== undefined || ${isPresent}) {
+          newResult[${k}] = ${id2}.value;
         }
       `);
         }
@@ -10309,12 +10309,12 @@ var $ZodObjectJIT = /* @__PURE__ */ $constructor("$ZodObjectJIT", (inst, def) =>
   let value;
   inst._zod.parse = (payload, ctx) => {
     value ?? (value = _normalized.value);
-    const input2 = payload.value;
-    if (!isObject2(input2)) {
+    const input3 = payload.value;
+    if (!isObject2(input3)) {
       payload.issues.push({
         expected: "object",
         code: "invalid_type",
-        input: input2,
+        input: input3,
         inst
       });
       return payload;
@@ -10325,7 +10325,7 @@ var $ZodObjectJIT = /* @__PURE__ */ $constructor("$ZodObjectJIT", (inst, def) =>
       payload = fastpass(payload, ctx);
       if (!catchall)
         return payload;
-      return handleCatchall([], input2, payload, ctx, value, inst, ctx?.abortEarly === true);
+      return handleCatchall([], input3, payload, ctx, value, inst, ctx?.abortEarly === true);
     }
     return superParse(payload, ctx);
   };
@@ -10517,17 +10517,17 @@ var $ZodDiscriminatedUnion = /* @__PURE__ */ $constructor("$ZodDiscriminatedUnio
   });
   const disc = cached(() => discriminatorMap(def));
   inst._zod.parse = (payload, ctx) => {
-    const input2 = payload.value;
-    if (!isObject(input2)) {
+    const input3 = payload.value;
+    if (!isObject(input3)) {
       payload.issues.push({
         code: "invalid_type",
         expected: "object",
-        input: input2,
+        input: input3,
         inst
       });
       return payload;
     }
-    const value = input2?.[def.discriminator];
+    const value = input3?.[def.discriminator];
     const opt = disc.value.get(value);
     if (opt && (value !== void 0 || ctx.direction !== "backward")) {
       return opt._zod.run(payload, ctx);
@@ -10541,7 +10541,7 @@ var $ZodDiscriminatedUnion = /* @__PURE__ */ $constructor("$ZodDiscriminatedUnio
       note: "No matching discriminator",
       discriminator: def.discriminator,
       options: Array.from(disc.value.keys()).filter((value2) => disc.value.get(value2) !== null),
-      input: input2,
+      input: input3,
       path: [def.discriminator],
       inst
     });
@@ -10551,9 +10551,9 @@ var $ZodDiscriminatedUnion = /* @__PURE__ */ $constructor("$ZodDiscriminatedUnio
 var $ZodIntersection = /* @__PURE__ */ $constructor("$ZodIntersection", (inst, def) => {
   $ZodType.init(inst, def);
   inst._zod.parse = (payload, ctx) => {
-    const input2 = payload.value;
-    const left = def.left._zod.run({ value: input2, issues: [] }, ctx);
-    const right = def.right._zod.run({ value: input2, issues: [] }, ctx);
+    const input3 = payload.value;
+    const left = def.left._zod.run({ value: input3, issues: [] }, ctx);
+    const right = def.right._zod.run({ value: input3, issues: [] }, ctx);
     const async = left instanceof Promise || right instanceof Promise;
     if (async) {
       return Promise.all([left, right]).then(([left2, right2]) => {
@@ -10668,10 +10668,10 @@ var $ZodTuple = /* @__PURE__ */ $constructor("$ZodTuple", (inst, def) => {
   const memo2 = globalConfig.memoizer;
   memo2?.attach(inst);
   inst._zod.parse = (payload, ctx) => {
-    const input2 = payload.value;
-    if (!Array.isArray(input2)) {
+    const input3 = payload.value;
+    if (!Array.isArray(input3)) {
       payload.issues.push({
-        input: input2,
+        input: input3,
         inst,
         expected: "tuple",
         code: "invalid_type"
@@ -10683,23 +10683,23 @@ var $ZodTuple = /* @__PURE__ */ $constructor("$ZodTuple", (inst, def) => {
     const optinStart = getTupleOptStart(items, "optin");
     const optoutStart = getTupleOptStart(items, "optout");
     if (!def.rest) {
-      if (input2.length < optinStart) {
+      if (input3.length < optinStart) {
         payload.issues.push({
           code: "too_small",
           minimum: optinStart,
           inclusive: true,
-          input: input2,
+          input: input3,
           inst,
           origin: "array"
         });
         return payload;
       }
-      if (input2.length > items.length) {
+      if (input3.length > items.length) {
         payload.issues.push({
           code: "too_big",
           maximum: items.length,
           inclusive: true,
-          input: input2,
+          input: input3,
           inst,
           origin: "array"
         });
@@ -10709,7 +10709,7 @@ var $ZodTuple = /* @__PURE__ */ $constructor("$ZodTuple", (inst, def) => {
     const abortEarly = def.rest ? ctx?.abortEarly : void 0;
     let itemAborted = false;
     for (let i = 0; i < items.length; i++) {
-      const r = items[i]._zod.run({ value: input2[i], issues: [] }, ctx);
+      const r = items[i]._zod.run({ value: input3[i], issues: [] }, ctx);
       if (r instanceof Promise) {
         proms.push(r.then((rr) => {
           itemResults[i] = rr;
@@ -10722,7 +10722,7 @@ var $ZodTuple = /* @__PURE__ */ $constructor("$ZodTuple", (inst, def) => {
     }
     if (def.rest && !itemAborted) {
       let i = items.length - 1;
-      const rest = input2.slice(items.length);
+      const rest = input3.slice(items.length);
       let seen = payload.issues.length;
       for (const el of rest) {
         if (abortEarly && payload.issues.length !== seen) {
@@ -10740,9 +10740,9 @@ var $ZodTuple = /* @__PURE__ */ $constructor("$ZodTuple", (inst, def) => {
       }
     }
     if (proms.length) {
-      return Promise.all(proms).then(() => handleTupleResults(itemResults, payload, items, input2, optoutStart));
+      return Promise.all(proms).then(() => handleTupleResults(itemResults, payload, items, input3, optoutStart));
     }
-    return handleTupleResults(itemResults, payload, items, input2, optoutStart);
+    return handleTupleResults(itemResults, payload, items, input3, optoutStart);
   };
 });
 function getTupleOptStart(items, key) {
@@ -10759,10 +10759,10 @@ function handleTupleResult(result, final, index) {
   }
   final.value[index] = result.value;
 }
-function handleTupleResults(itemResults, final, items, input2, optoutStart) {
+function handleTupleResults(itemResults, final, items, input3, optoutStart) {
   for (let i = 0; i < items.length; i++) {
     const r = itemResults[i];
-    const isPresent = i < input2.length;
+    const isPresent = i < input3.length;
     if (!isPresent && i >= optoutStart && items[i]._zod.optin === "optional") {
       final.value.length = i;
       break;
@@ -10776,7 +10776,7 @@ function handleTupleResults(itemResults, final, items, input2, optoutStart) {
     }
     final.value[i] = r.value;
   }
-  for (let i = final.value.length - 1; i >= input2.length; i--) {
+  for (let i = final.value.length - 1; i >= input3.length; i--) {
     if (items[i]._zod.optout === "optional" && final.value[i] === void 0) {
       final.value.length = i;
     } else {
@@ -10790,12 +10790,12 @@ var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
   const memo2 = globalConfig.memoizer;
   memo2?.attach(inst);
   inst._zod.parse = (payload, ctx) => {
-    const input2 = payload.value;
-    if (!isPlainObject(input2)) {
+    const input3 = payload.value;
+    if (!isPlainObject(input3)) {
       payload.issues.push({
         expected: "record",
         code: "invalid_type",
-        input: input2,
+        input: input3,
         inst
       });
       return payload;
@@ -10828,7 +10828,7 @@ var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
           const outKey = keyResult.value;
           if (outKey === "__proto__")
             continue;
-          const result = def.valueType._zod.run({ value: input2[key], issues: [] }, ctx);
+          const result = def.valueType._zod.run({ value: input3[key], issues: [] }, ctx);
           if (result instanceof Promise) {
             proms.push(result.then((result2) => {
               if (result2.issues.length) {
@@ -10845,12 +10845,12 @@ var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
         }
       }
       let unrecognized;
-      for (const key in input2) {
+      for (const key in input3) {
         if (!recordKeys.has(key)) {
           if (def.mode === "loose") {
             if (key === "__proto__")
               continue;
-            payload.value[key] = input2[key];
+            payload.value[key] = input3[key];
           } else {
             unrecognized = unrecognized ?? [];
             unrecognized.push(key);
@@ -10860,7 +10860,7 @@ var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
       if (unrecognized && unrecognized.length > 0) {
         payload.issues.push({
           code: "unrecognized_keys",
-          input: input2,
+          input: input3,
           inst,
           keys: unrecognized,
           continue: true
@@ -10869,10 +10869,10 @@ var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
     } else {
       payload.value = memo2 ? memo2.alloc(inst, payload, {}, ctx) : {};
       let unrecognized;
-      for (const key of Reflect.ownKeys(input2)) {
+      for (const key of Reflect.ownKeys(input3)) {
         if (key === "__proto__")
           continue;
-        if (!Object.prototype.propertyIsEnumerable.call(input2, key))
+        if (!Object.prototype.propertyIsEnumerable.call(input3, key))
           continue;
         let keyResult = def.keyType._zod.run({ value: key, issues: [] }, ctx);
         if (keyResult instanceof Promise) {
@@ -10890,7 +10890,7 @@ var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
         }
         if (keyResult.issues.length) {
           if (def.mode === "loose") {
-            payload.value[key] = input2[key];
+            payload.value[key] = input3[key];
           } else if (values) {
             unrecognized = unrecognized ?? [];
             unrecognized.push(key);
@@ -10909,7 +10909,7 @@ var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
         const outKey = keyResult.value;
         if (outKey === "__proto__")
           continue;
-        const result = def.valueType._zod.run({ value: input2[key], issues: [] }, ctx);
+        const result = def.valueType._zod.run({ value: input3[key], issues: [] }, ctx);
         if (result instanceof Promise) {
           proms.push(result.then((result2) => {
             if (result2.issues.length) {
@@ -10927,7 +10927,7 @@ var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
       if (unrecognized && unrecognized.length > 0) {
         payload.issues.push({
           code: "unrecognized_keys",
-          input: input2,
+          input: input3,
           inst,
           keys: unrecognized,
           continue: true
@@ -10945,12 +10945,12 @@ var $ZodMap = /* @__PURE__ */ $constructor("$ZodMap", (inst, def) => {
   const memo2 = globalConfig.memoizer;
   memo2?.attach(inst);
   inst._zod.parse = (payload, ctx) => {
-    const input2 = payload.value;
-    if (!(input2 instanceof Map)) {
+    const input3 = payload.value;
+    if (!(input3 instanceof Map)) {
       payload.issues.push({
         expected: "map",
         code: "invalid_type",
-        input: input2,
+        input: input3,
         inst
       });
       return payload;
@@ -10959,7 +10959,7 @@ var $ZodMap = /* @__PURE__ */ $constructor("$ZodMap", (inst, def) => {
     payload.value = memo2 ? memo2.alloc(inst, payload, /* @__PURE__ */ new Map(), ctx) : /* @__PURE__ */ new Map();
     const abortEarly = ctx?.abortEarly;
     let seen = payload.issues.length;
-    for (const [key, value] of input2) {
+    for (const [key, value] of input3) {
       if (abortEarly && payload.issues.length !== seen) {
         if (aborted(payload, seen))
           break;
@@ -10969,10 +10969,10 @@ var $ZodMap = /* @__PURE__ */ $constructor("$ZodMap", (inst, def) => {
       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, payload, key, input2, inst, ctx);
+          handleMapResult(keyResult2, valueResult2, payload, key, input3, inst, ctx);
         }));
       } else {
-        handleMapResult(keyResult, valueResult, payload, key, input2, inst, ctx);
+        handleMapResult(keyResult, valueResult, payload, key, input3, inst, ctx);
       }
     }
     if (proms.length)
@@ -10980,7 +10980,7 @@ var $ZodMap = /* @__PURE__ */ $constructor("$ZodMap", (inst, def) => {
     return payload;
   };
 });
-function handleMapResult(keyResult, valueResult, final, key, input2, inst, ctx) {
+function handleMapResult(keyResult, valueResult, final, key, input3, inst, ctx) {
   if (keyResult.issues.length) {
     if (propertyKeyTypes.has(typeof key)) {
       final.issues.push(...prefixIssues(key, keyResult.issues));
@@ -10988,7 +10988,7 @@ function handleMapResult(keyResult, valueResult, final, key, input2, inst, ctx)
       final.issues.push({
         code: "invalid_key",
         origin: "map",
-        input: input2,
+        input: input3,
         inst,
         issues: keyResult.issues.map((iss) => finalizeIssue(iss, ctx, config()))
       });
@@ -11001,7 +11001,7 @@ function handleMapResult(keyResult, valueResult, final, key, input2, inst, ctx)
       final.issues.push({
         origin: "map",
         code: "invalid_element",
-        input: input2,
+        input: input3,
         inst,
         key,
         issues: valueResult.issues.map((iss) => finalizeIssue(iss, ctx, config()))
@@ -11015,10 +11015,10 @@ var $ZodSet = /* @__PURE__ */ $constructor("$ZodSet", (inst, def) => {
   const memo2 = globalConfig.memoizer;
   memo2?.attach(inst);
   inst._zod.parse = (payload, ctx) => {
-    const input2 = payload.value;
-    if (!(input2 instanceof Set)) {
+    const input3 = payload.value;
+    if (!(input3 instanceof Set)) {
       payload.issues.push({
-        input: input2,
+        input: input3,
         inst,
         expected: "set",
         code: "invalid_type"
@@ -11029,7 +11029,7 @@ var $ZodSet = /* @__PURE__ */ $constructor("$ZodSet", (inst, def) => {
     payload.value = memo2 ? memo2.alloc(inst, payload, /* @__PURE__ */ new Set(), ctx) : /* @__PURE__ */ new Set();
     const abortEarly = ctx?.abortEarly;
     let seen = payload.issues.length;
-    for (const item of input2) {
+    for (const item of input3) {
       if (abortEarly && payload.issues.length !== seen) {
         if (aborted(payload, seen))
           break;
@@ -11062,14 +11062,14 @@ var $ZodEnum = /* @__PURE__ */ $constructor("$ZodEnum", (inst, def) => {
     return new RegExp(patternValues.length ? `^(${patternValues.map((o) => escapeRegex(o.toString())).join("|")})$` : "^[^\\s\\S]$");
   });
   inst._zod.parse = (payload, _ctx) => {
-    const input2 = payload.value;
-    if (valuesSet.has(input2)) {
+    const input3 = payload.value;
+    if (valuesSet.has(input3)) {
       return payload;
     }
     payload.issues.push({
       code: "invalid_value",
       values,
-      input: input2,
+      input: input3,
       inst
     });
     return payload;
@@ -11084,14 +11084,14 @@ var $ZodLiteral = /* @__PURE__ */ $constructor("$ZodLiteral", (inst, def) => {
     return new RegExp(vals.length ? `^(${vals.map((o) => typeof o === "string" ? escapeRegex(o) : o ? escapeRegex(o.toString()) : String(o)).join("|")})$` : "^[^\\s\\S]$");
   });
   inst._zod.parse = (payload, _ctx) => {
-    const input2 = payload.value;
-    if (values.has(input2)) {
+    const input3 = payload.value;
+    if (values.has(input3)) {
       return payload;
     }
     payload.issues.push({
       code: "invalid_value",
       values: def.values,
-      input: input2,
+      input: input3,
       inst
     });
     return payload;
@@ -11100,13 +11100,13 @@ var $ZodLiteral = /* @__PURE__ */ $constructor("$ZodLiteral", (inst, def) => {
 var $ZodFile = /* @__PURE__ */ $constructor("$ZodFile", (inst, def) => {
   $ZodType.init(inst, def);
   inst._zod.parse = (payload, _ctx) => {
-    const input2 = payload.value;
-    if (input2 instanceof File)
+    const input3 = payload.value;
+    if (input3 instanceof File)
       return payload;
     payload.issues.push({
       expected: "file",
       code: "invalid_type",
-      input: input2,
+      input: input3,
       inst
     });
     return payload;
@@ -11462,7 +11462,7 @@ function partPattern(schema2) {
   if (def.options) {
     const sources = def.options.map(partPattern);
     if (sources.every(Boolean))
-      return `^(${sources.map((s) => cleanRegex(s)).join("|")})$`;
+      return `^(${sources.map((s2) => cleanRegex(s2)).join("|")})$`;
   }
   return leafPattern(schema2);
 }
@@ -11614,20 +11614,20 @@ var $ZodCustom = /* @__PURE__ */ $constructor("$ZodCustom", (inst, def) => {
     return payload;
   };
   inst._zod.check = (payload) => {
-    const input2 = payload.value;
-    const r = def.fn(input2);
+    const input3 = payload.value;
+    const r = def.fn(input3);
     if (r instanceof Promise) {
-      return r.then((r2) => handleRefineResult(r2, payload, input2, inst));
+      return r.then((r2) => handleRefineResult(r2, payload, input3, inst));
     }
-    handleRefineResult(r, payload, input2, inst);
+    handleRefineResult(r, payload, input3, inst);
     return;
   };
 });
-function handleRefineResult(result, payload, input2, inst) {
+function handleRefineResult(result, payload, input3, inst) {
   if (!result) {
     const _iss = {
       code: "custom",
-      input: input2,
+      input: input3,
       inst,
       // incorporates params.error into issue reporting
       path: [...inst._zod.def.path ?? []],
@@ -11653,10 +11653,10 @@ var $ZodProperties = /* @__PURE__ */ $constructor("$ZodProperties", (inst, def)
   let entries;
   const runShape = (payload, ctx) => {
     entries ?? (entries = Reflect.ownKeys(def.shape).map((key) => [key, def.shape[key]]));
-    const input2 = payload.value;
+    const input3 = payload.value;
     let proms;
     for (const [key, schema2] of entries) {
-      const result = schema2._zod.run({ value: input2[key], issues: [] }, ctx);
+      const result = schema2._zod.run({ value: input3[key], issues: [] }, ctx);
       if (result instanceof Promise) {
         proms ?? (proms = []);
         proms.push(result.then((result2) => handlePropertiesResult(result2, payload, key)));
@@ -11669,15 +11669,15 @@ var $ZodProperties = /* @__PURE__ */ $constructor("$ZodProperties", (inst, def)
     return void 0;
   };
   inst._zod.parse = (payload, ctx) => {
-    const input2 = payload.value;
-    if (input2 === null || typeof input2 !== "object" && typeof input2 !== "function") {
-      payload.issues.push({ expected: "object", code: "invalid_type", input: input2, inst });
+    const input3 = payload.value;
+    if (input3 === null || typeof input3 !== "object" && typeof input3 !== "function") {
+      payload.issues.push({ expected: "object", code: "invalid_type", input: input3, inst });
       return payload;
     }
     if (ctx.direction === "backward")
       ctx = { ...ctx, direction: "forward" };
     if (memo2)
-      memo2.alloc(inst, payload, input2, ctx);
+      memo2.alloc(inst, payload, input3, ctx);
     const result = runShape(payload, ctx);
     return result instanceof Promise ? result.then(() => payload) : payload;
   };
@@ -11915,8 +11915,8 @@ var memo = {
           else
             rechecked = true;
         }
-        const input2 = payload.value;
-        if (!isRef(input2))
+        const input3 = payload.value;
+        if (!isRef(input3))
           return base(payload, ctx);
         let state = ctx[STATE];
         if (!state) {
@@ -11931,7 +11931,7 @@ var memo = {
           lastCtx = ctx;
           lastBucket = bucket;
         }
-        const hit = bucket.get(input2);
+        const hit = bucket.get(input3);
         if (hit) {
           payload.value = hit.value;
           if (hit.issues) {
@@ -13425,9 +13425,9 @@ var error12 = () => {
     nan: "NaN"
     // All other type names omitted - they fall back to raw values via ?? operator
   };
-  function getTypeName(type, input2) {
-    if (type === "number" && typeof input2 === "number" && !Number.isFinite(input2)) {
-      return String(input2);
+  function getTypeName(type, input3) {
+    if (type === "number" && typeof input3 === "number" && !Number.isFinite(input3)) {
+      return String(input3);
     }
     return TypeDictionary[type] ?? type;
   }
@@ -21832,23 +21832,23 @@ function _overwrite(tx) {
 }
 // @__NO_SIDE_EFFECTS__
 function _normalize(form) {
-  return /* @__PURE__ */ _overwrite((input2) => input2.normalize(form));
+  return /* @__PURE__ */ _overwrite((input3) => input3.normalize(form));
 }
 // @__NO_SIDE_EFFECTS__
 function _trim() {
-  return /* @__PURE__ */ _overwrite((input2) => input2.trim());
+  return /* @__PURE__ */ _overwrite((input3) => input3.trim());
 }
 // @__NO_SIDE_EFFECTS__
 function _toLowerCase() {
-  return /* @__PURE__ */ _overwrite((input2) => input2.toLowerCase());
+  return /* @__PURE__ */ _overwrite((input3) => input3.toLowerCase());
 }
 // @__NO_SIDE_EFFECTS__
 function _toUpperCase() {
-  return /* @__PURE__ */ _overwrite((input2) => input2.toUpperCase());
+  return /* @__PURE__ */ _overwrite((input3) => input3.toUpperCase());
 }
 // @__NO_SIDE_EFFECTS__
 function _slugify() {
-  return /* @__PURE__ */ _overwrite((input2) => slugify(input2));
+  return /* @__PURE__ */ _overwrite((input3) => slugify(input3));
 }
 // @__NO_SIDE_EFFECTS__
 function _array(Class2, element, params) {
@@ -22154,8 +22154,8 @@ function _stringbool(Classes, _params) {
     type: "pipe",
     in: stringSchema,
     out: booleanSchema,
-    transform: ((input2, payload) => {
-      let data = input2;
+    transform: ((input3, payload) => {
+      let data = input3;
       if (params.case !== "sensitive")
         data = data.toLowerCase();
       if (truthySet.has(data)) {
@@ -22174,8 +22174,8 @@ function _stringbool(Classes, _params) {
         return {};
       }
     }),
-    reverseTransform: ((input2, _payload) => {
-      if (input2 === true) {
+    reverseTransform: ((input3, _payload) => {
+      if (input3 === true) {
         return truthyArray[0] || "true";
       } else {
         return falsyArray[0] || "false";
@@ -22317,26 +22317,26 @@ function extractDefs(ctx, schema2) {
     return;
   const idToSchema = /* @__PURE__ */ new Map();
   for (const entry of ctx.seen.entries()) {
-    const id = ctx.metadataRegistry.get(entry[0])?.id;
-    if (id) {
-      const existing = idToSchema.get(id);
+    const id2 = ctx.metadataRegistry.get(entry[0])?.id;
+    if (id2) {
+      const existing = idToSchema.get(id2);
       if (existing && existing !== entry[0]) {
-        throw new Error(`Duplicate schema id "${id}" detected during JSON Schema conversion. Two different schemas cannot share the same id when converted together.`);
+        throw new Error(`Duplicate schema id "${id2}" detected during JSON Schema conversion. Two different schemas cannot share the same id when converted together.`);
       }
-      idToSchema.set(id, entry[0]);
+      idToSchema.set(id2, entry[0]);
     }
   }
   const makeURI = (entry) => {
     const defsSegment = ctx.target === "draft-2020-12" ? "$defs" : "definitions";
     if (ctx.external) {
       const externalId = ctx.external.registry.get(entry[0])?.id;
-      const uriGenerator = ctx.external.uri ?? ((id2) => id2);
+      const uriGenerator = ctx.external.uri ?? ((id3) => id3);
       if (externalId) {
         return { ref: uriGenerator(externalId) };
       }
-      const id = entry[1].defId ?? entry[1].schema.id ?? `schema${ctx.counter++}`;
-      entry[1].defId = id;
-      return { defId: id, ref: `${uriGenerator("__shared")}#/${defsSegment}/${encodeJSONPointerSegment(id)}` };
+      const id2 = entry[1].defId ?? entry[1].schema.id ?? `schema${ctx.counter++}`;
+      entry[1].defId = id2;
+      return { defId: id2, ref: `${uriGenerator("__shared")}#/${defsSegment}/${encodeJSONPointerSegment(id2)}` };
     }
     const uriPrefix = `#`;
     const defUriPrefix = `${uriPrefix}/${defsSegment}/`;
@@ -22351,7 +22351,7 @@ function extractDefs(ctx, schema2) {
       return;
     }
     const seen = entry[1];
-    const { ref, defId } = makeURI(entry);
+    const { ref: ref2, defId } = makeURI(entry);
     seen.def = { ...seen.schema };
     if (defId)
       seen.defId = defId;
@@ -22359,7 +22359,7 @@ function extractDefs(ctx, schema2) {
     for (const key in schema3) {
       delete schema3[key];
     }
-    schema3.$ref = ref;
+    schema3.$ref = ref2;
   };
   if (ctx.cycles === "throw") {
     for (const entry of ctx.seen.entries()) {
@@ -22384,8 +22384,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         continue;
       }
     }
-    const id = ctx.metadataRegistry.get(entry[0])?.id;
-    if (id) {
+    const id2 = ctx.metadataRegistry.get(entry[0])?.id;
+    if (id2) {
       extractToDef(entry);
       continue;
     }
@@ -22520,11 +22520,11 @@ function finalize(ctx, schema2) {
       return;
     const schema3 = seen.def ?? seen.schema;
     const _cached = { ...schema3 };
-    const ref = seen.ref;
+    const ref2 = seen.ref;
     seen.ref = null;
-    if (ref) {
-      flattenRef(ref);
-      const refSeen = ctx.seen.get(ref);
+    if (ref2) {
+      flattenRef(ref2);
+      const refSeen = ctx.seen.get(ref2);
       const refSchema = refSeen.schema;
       if (refSchema.$ref && (ctx.target === "draft-07" || ctx.target === "draft-04" || ctx.target === "openapi-3.0")) {
         schema3.allOf = schema3.allOf ?? [];
@@ -22533,7 +22533,7 @@ function finalize(ctx, schema2) {
         assignProps(schema3, refSchema);
       }
       assignProps(schema3, _cached);
-      const isParentRef = zodSchema._zod.parent === ref;
+      const isParentRef = zodSchema._zod.parent === ref2;
       if (isParentRef) {
         for (const key in schema3) {
           if (key === "$ref" || key === "allOf")
@@ -22554,7 +22554,7 @@ function finalize(ctx, schema2) {
       }
     }
     const parent = zodSchema._zod.parent;
-    if (parent && parent !== ref) {
+    if (parent && parent !== ref2) {
       flattenRef(parent);
       const parentSeen = ctx.seen.get(parent);
       if (parentSeen?.schema.$ref) {
@@ -22618,10 +22618,10 @@ function finalize(ctx, schema2) {
   } else {
   }
   if (ctx.external?.uri) {
-    const id = ctx.external.registry.get(schema2)?.id;
-    if (!id)
+    const id2 = ctx.external.registry.get(schema2)?.id;
+    if (!id2)
       throw new Error("Schema is missing an `id` property");
-    result.$id = ctx.external.uri(id);
+    result.$id = ctx.external.uri(id2);
   }
   assignProps(result, root.defId ? root.schema : root.def ?? root.schema);
   const rootMetaId = ctx.metadataRegistry.get(schema2)?.id;
@@ -22799,8 +22799,8 @@ var contributors = {
 function aggregateChecks(schema2) {
   const agg = {};
   const def = schema2._zod.def;
-  const list = schema2._zod.traits.has("$ZodCheck") ? [schema2, ...def.checks ?? []] : def.checks ?? [];
-  for (const ch of list)
+  const list2 = schema2._zod.traits.has("$ZodCheck") ? [schema2, ...def.checks ?? []] : def.checks ?? [];
+  for (const ch of list2)
     contributors[ch._zod.def.check]?.(agg, ch._zod.def);
   const bag = schema2._zod.bag;
   if (bag.minimum !== void 0)
@@ -23254,7 +23254,7 @@ function stringifyKeyNames(bySchema, json2, visited) {
   const values = json2.enum ?? (json2.const !== void 0 ? [json2.const] : void 0);
   if (!numericType && !values?.some((v) => typeof v === "number"))
     return json2;
-  const { minimum, maximum, exclusiveMinimum, exclusiveMaximum, multipleOf, format, id, ...rest } = json2;
+  const { minimum, maximum, exclusiveMinimum, exclusiveMaximum, multipleOf, format, id: id2, ...rest } = json2;
   if (rest.enum)
     rest.enum = rest.enum.map((v) => typeof v === "number" ? String(v) : v);
   else if (typeof rest.const === "number")
@@ -23476,9 +23476,9 @@ var allProcessors = {
   optional: optionalProcessor,
   lazy: lazyProcessor
 };
-function toJSONSchema(input2, params) {
-  if ("_idmap" in input2) {
-    const registry2 = input2;
+function toJSONSchema(input3, params) {
+  if ("_idmap" in input3) {
+    const registry2 = input3;
     const ctx2 = initializeContext({ ...params, processors: allProcessors });
     const defs = {};
     for (const entry of registry2._idmap.entries()) {
@@ -23506,9 +23506,9 @@ function toJSONSchema(input2, params) {
     return { schemas };
   }
   const ctx = initializeContext({ ...params, processors: allProcessors });
-  processSchema(input2, ctx);
-  extractDefs(ctx, input2);
-  return finalize(ctx, input2);
+  processSchema(input3, ctx);
+  extractDefs(ctx, input3);
+  return finalize(ctx, input3);
 }
 
 // node_modules/zod/v4/core/json-schema-generator.js
@@ -24654,17 +24654,17 @@ var ZodArray = /* @__PURE__ */ $constructor("ZodArray", (inst, def) => {
   inst._zod.processJSONSchema = (ctx, json2, params) => arrayProcessor(inst, ctx, json2, params);
   inst.element = def.element;
 }, {
-  min(n, params) {
-    return this.check(_minLength(n, params));
+  min(n2, params) {
+    return this.check(_minLength(n2, params));
   },
   nonempty(params) {
     return this.check(_minLength(1, params));
   },
-  max(n, params) {
-    return this.check(_maxLength(n, params));
+  max(n2, params) {
+    return this.check(_maxLength(n2, params));
   },
-  length(n, params) {
-    return this.check(_length(n, params));
+  length(n2, params) {
+    return this.check(_length(n2, params));
   },
   unwrap() {
     return this.element;
@@ -25485,11 +25485,11 @@ function applyMinItems(items, minItems) {
 function decodeJSONPointerSegment(segment) {
   return segment.replace(/~1/g, "/").replace(/~0/g, "~");
 }
-function resolveRef(ref, ctx) {
-  if (!ref.startsWith("#")) {
+function resolveRef(ref2, ctx) {
+  if (!ref2.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path = ref.slice(1).split("/").filter(Boolean);
+  const path = ref2.slice(1).split("/").filter(Boolean);
   if (path.length === 0) {
     return ctx.rootSchema;
   }
@@ -25497,11 +25497,11 @@ function resolveRef(ref, ctx) {
   if (path[0] === defsKey) {
     const key = path[1] === void 0 ? void 0 : decodeJSONPointerSegment(path[1]);
     if (!key || !ctx.defs[key]) {
-      throw new Error(`Reference not found: ${ref}`);
+      throw new Error(`Reference not found: ${ref2}`);
     }
     return ctx.defs[key];
   }
-  throw new Error(`Reference not found: ${ref}`);
+  throw new Error(`Reference not found: ${ref2}`);
 }
 function checkObjectGuards(objectSchema, guards) {
   const guard = z.transform((value) => value).check((payload) => {
@@ -25629,8 +25629,8 @@ function containsRef(value) {
     return Object.values(sub).some(containsRef);
   });
 }
-function plural(n) {
-  return n === 1 ? "element" : "elements";
+function plural(n2) {
+  return n2 === 1 ? "element" : "elements";
 }
 function checkArrayGuards(arraySchema, guards) {
   const guard = z.transform((value) => value).check((payload) => {
@@ -26025,12 +26025,12 @@ function convertSchema(schema2, ctx) {
   let baseSchema = convertBaseSchema(schema2, ctx);
   const hasExplicitType = schema2.type || schema2.enum !== void 0 || schema2.const !== void 0;
   if (schema2.anyOf && Array.isArray(schema2.anyOf)) {
-    const options = schema2.anyOf.map((s) => convertSchema(s, ctx));
+    const options = schema2.anyOf.map((s2) => convertSchema(s2, ctx));
     const anyOfUnion = z.union(options);
     baseSchema = hasExplicitType ? z.intersection(baseSchema, anyOfUnion) : anyOfUnion;
   }
   if (schema2.oneOf && Array.isArray(schema2.oneOf)) {
-    const options = schema2.oneOf.map((s) => convertSchema(s, ctx));
+    const options = schema2.oneOf.map((s2) => convertSchema(s2, ctx));
     const oneOfUnion = z.xor(options);
     baseSchema = hasExplicitType ? z.intersection(baseSchema, oneOfUnion) : oneOfUnion;
   }
@@ -26130,24 +26130,24 @@ function visit(schema2, fnOrHandlers) {
     return h ? h(node2, rewritten) : node2;
   };
   const cache = /* @__PURE__ */ new Map();
-  function run(s) {
-    const cached2 = cache.get(s);
+  function run(s2) {
+    const cached2 = cache.get(s2);
     if (cached2 === RESOLVING) {
       return new $ZodLazy({
         type: "lazy",
-        getter: () => cache.get(s)
+        getter: () => cache.get(s2)
       });
     }
     if (cached2 !== void 0)
       return cached2;
-    cache.set(s, RESOLVING);
-    const inner = mapInner(s);
-    const mapped = fn(inner, inner !== s);
-    cache.set(s, mapped);
+    cache.set(s2, RESOLVING);
+    const inner = mapInner(s2);
+    const mapped = fn(inner, inner !== s2);
+    cache.set(s2, mapped);
     return mapped;
   }
-  function mapInner(s) {
-    const def = s._zod.def;
+  function mapInner(s2) {
+    const def = s2._zod.def;
     const kind = def.type;
     switch (kind) {
       case "object": {
@@ -26167,11 +26167,11 @@ function visit(schema2, fnOrHandlers) {
           if (newCatchall !== def.catchall)
             changed = true;
         }
-        return changed ? clone(s, { ...def, shape: newShape, catchall: newCatchall }) : s;
+        return changed ? clone(s2, { ...def, shape: newShape, catchall: newCatchall }) : s2;
       }
       case "array": {
         const mapped = run(def.element);
-        return mapped === def.element ? s : clone(s, { ...def, element: mapped });
+        return mapped === def.element ? s2 : clone(s2, { ...def, element: mapped });
       }
       case "tuple": {
         const oldItems = def.items;
@@ -26189,17 +26189,17 @@ function visit(schema2, fnOrHandlers) {
           if (newRest !== def.rest)
             changed = true;
         }
-        return changed ? clone(s, { ...def, items: newItems, rest: newRest }) : s;
+        return changed ? clone(s2, { ...def, items: newItems, rest: newRest }) : s2;
       }
       case "record":
       case "map": {
         const newKey = run(def.keyType);
         const newVal = run(def.valueType);
-        return newKey === def.keyType && newVal === def.valueType ? s : clone(s, { ...def, keyType: newKey, valueType: newVal });
+        return newKey === def.keyType && newVal === def.valueType ? s2 : clone(s2, { ...def, keyType: newKey, valueType: newVal });
       }
       case "set": {
         const newVal = run(def.valueType);
-        return newVal === def.valueType ? s : clone(s, { ...def, valueType: newVal });
+        return newVal === def.valueType ? s2 : clone(s2, { ...def, valueType: newVal });
       }
       case "union": {
         const oldOptions = def.options;
@@ -26211,12 +26211,12 @@ function visit(schema2, fnOrHandlers) {
             changed = true;
           newOptions.push(mapped);
         }
-        return changed ? clone(s, { ...def, options: newOptions }) : s;
+        return changed ? clone(s2, { ...def, options: newOptions }) : s2;
       }
       case "intersection": {
         const newLeft = run(def.left);
         const newRight = run(def.right);
-        return newLeft === def.left && newRight === def.right ? s : clone(s, { ...def, left: newLeft, right: newRight });
+        return newLeft === def.left && newRight === def.right ? s2 : clone(s2, { ...def, left: newLeft, right: newRight });
       }
       case "optional":
       case "nullable":
@@ -26228,22 +26228,22 @@ function visit(schema2, fnOrHandlers) {
       case "promise":
       case "success": {
         const newInner = run(def.innerType);
-        return newInner === def.innerType ? s : clone(s, { ...def, innerType: newInner });
+        return newInner === def.innerType ? s2 : clone(s2, { ...def, innerType: newInner });
       }
       case "pipe": {
         const newIn = run(def.in);
         const newOut = run(def.out);
-        return newIn === def.in && newOut === def.out ? s : clone(s, { ...def, in: newIn, out: newOut });
+        return newIn === def.in && newOut === def.out ? s2 : clone(s2, { ...def, in: newIn, out: newOut });
       }
       case "function": {
         const newInput = run(def.input);
         const newOutput = run(def.output);
-        return newInput === def.input && newOutput === def.output ? s : clone(s, { ...def, input: newInput, output: newOutput });
+        return newInput === def.input && newOutput === def.output ? s2 : clone(s2, { ...def, input: newInput, output: newOutput });
       }
       case "lazy": {
         const original = def.getter;
         const { _cachedInner, ...rest } = def;
-        return clone(s, { ...rest, getter: () => run(original()) });
+        return clone(s2, { ...rest, getter: () => run(original()) });
       }
       case "properties": {
         const oldShape = def.shape;
@@ -26255,7 +26255,7 @@ function visit(schema2, fnOrHandlers) {
             changed = true;
           newShape[k] = mapped;
         }
-        return changed ? clone(s, { ...def, shape: newShape }) : s;
+        return changed ? clone(s2, { ...def, shape: newShape }) : s2;
       }
       // A leaf by choice: `parts` are regex fragments, not data positions.
       case "template_literal":
@@ -26279,10 +26279,10 @@ function visit(schema2, fnOrHandlers) {
       case "file":
       case "transform":
       case "custom":
-        return s;
+        return s2;
       default: {
         kind;
-        return s;
+        return s2;
       }
     }
   }
@@ -26292,11 +26292,11 @@ function visit(schema2, fnOrHandlers) {
 // node_modules/zod/v4/classic/deep-partial.js
 function deepPartial(schema2) {
   return visit(schema2, {
-    object: (s) => s.partial(),
+    object: (s2) => s2.partial(),
     // Every partialed option now admits `undefined`, which the constructor rejects as a duplicate.
-    union: (s) => {
-      const def = s._zod.def;
-      return def.discriminator === void 0 ? s : union(def.options);
+    union: (s2) => {
+      const def = s2._zod.def;
+      return def.discriminator === void 0 ? s2 : union(def.options);
     }
   });
 }
@@ -26316,18 +26316,18 @@ function inSide(def) {
 }
 function input(schema2) {
   return visit(schema2, {
-    pipe: (s) => inSide(s._zod.def),
+    pipe: (s2) => inSide(s2._zod.def),
     // A default value belongs to the output side, so a rewritten inner type leaves it stranded. `.default()` widens the declared input type with `undefined`, and `optional` is what carries that across.
-    default: (s, rewritten) => rewritten ? optional(s._zod.def.innerType) : s,
+    default: (s2, rewritten) => rewritten ? optional(s2._zod.def.innerType) : s2,
     // A catch value is output-side too, but `.catch()` leaves the declared input type alone, so the inner schema stands on its own.
-    catch: (s, rewritten) => rewritten ? s._zod.def.innerType : s
+    catch: (s2, rewritten) => rewritten ? s2._zod.def.innerType : s2
   });
 }
 function output(schema2) {
   return visit(schema2, {
-    pipe: (s) => outSide(s._zod.def),
+    pipe: (s2) => outSide(s2._zod.def),
     // A prefault value is fed through the schema, which makes it input-side, so a rewritten inner type leaves it stranded.
-    prefault: (s, rewritten) => rewritten ? s._zod.def.innerType : s
+    prefault: (s2, rewritten) => rewritten ? s2._zod.def.innerType : s2
   });
 }
 
@@ -26400,8 +26400,8 @@ var RequestMetadataMismatchError = class extends Error {
     this.actual = actual;
   }
 };
-function parseJsonRpcRequest(input2) {
-  return JsonRpcRequestSchema.parse(input2);
+function parseJsonRpcRequest(input3) {
+  return JsonRpcRequestSchema.parse(input3);
 }
 function resolveProtocolVersion(request, context = {}) {
   const meta3 = isRecord2(request.params?._meta) ? request.params._meta : void 0;
@@ -26438,11 +26438,11 @@ function isSupportedProtocolVersion(value) {
 function usesLegacyInitialize(version2) {
   return version2 !== MODERN_PROTOCOL_VERSION;
 }
-function jsonRpcSuccess(id, result) {
-  return { jsonrpc: "2.0", id, result };
+function jsonRpcSuccess(id2, result) {
+  return { jsonrpc: "2.0", id: id2, result };
 }
-function jsonRpcFailure(id, error62) {
-  return { jsonrpc: "2.0", id, error: error62 };
+function jsonRpcFailure(id2, error62) {
+  return { jsonrpc: "2.0", id: id2, error: error62 };
 }
 function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -26452,7 +26452,7 @@ function stringValue(value) {
 }
 
 // src/version.ts
-var VERSION = "0.7.0";
+var VERSION = "0.8.0";
 
 // src/worker/http.ts
 var HEALTH_PATH = "/healthz";
@@ -26790,7 +26790,7 @@ function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 async function boundedRequest(request) {
-  const limit = 64 * 1024;
+  const limit2 = 64 * 1024;
   const reader = request.body.getReader();
   const chunks2 = [];
   let length = 0;
@@ -26800,7 +26800,7 @@ async function boundedRequest(request) {
       const chunk = await reader.read();
       if (chunk.done) break;
       length += chunk.value.byteLength;
-      if (length > limit) return problemResponse(413, "REQUEST_TOO_LARGE", "Content Too Large", "Request bodies are limited to 64 KiB.");
+      if (length > limit2) return problemResponse(413, "REQUEST_TOO_LARGE", "Content Too Large", "Request bodies are limited to 64 KiB.");
       chunks2.push(chunk.value);
     }
     const body = new Uint8Array(length);
@@ -26824,13 +26824,13 @@ async function boundedRequest(request) {
 // src/worker/crypto.ts
 async function createEncryptionKeyring(currentSecret, previousSecret) {
   if (!currentSecret) throw new Error("SESSION_ENCRYPTION_KEY is required.");
-  const current = await deriveEncryptionKey(currentSecret);
-  const keys = /* @__PURE__ */ new Map([[current.id, current.key]]);
+  const current2 = await deriveEncryptionKey(currentSecret);
+  const keys = /* @__PURE__ */ new Map([[current2.id, current2.key]]);
   if (previousSecret) {
     const previous = await deriveEncryptionKey(previousSecret);
     keys.set(previous.id, previous.key);
   }
-  return { current, keys };
+  return { current: current2, keys };
 }
 async function encryptValue(value, keyring) {
   const iv = crypto.getRandomValues(new Uint8Array(12));
@@ -26864,8 +26864,8 @@ async function decryptValue(encrypted, keyring) {
 async function deriveEncryptionKey(secret) {
   const digest = new Uint8Array(await crypto.subtle.digest("SHA-256", new TextEncoder().encode(secret)));
   const key = await crypto.subtle.importKey("raw", digest, { name: "AES-GCM" }, false, ["encrypt", "decrypt"]);
-  const id = Array.from(digest.slice(0, 8), (byte) => byte.toString(16).padStart(2, "0")).join("");
-  return { id, key };
+  const id2 = Array.from(digest.slice(0, 8), (byte) => byte.toString(16).padStart(2, "0")).join("");
+  return { id: id2, key };
 }
 function parseEnvelope(value) {
   let parsed;
@@ -26895,12 +26895,97 @@ function isRecord4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
+// src/resolve.ts
+var ReferenceError2 = class extends Error {
+  constructor(code, message, candidates) {
+    super(message);
+    this.code = code;
+    this.candidates = candidates;
+    this.name = "ReferenceError";
+  }
+  code;
+  candidates;
+  hint = "Run `moodle units` to see this site's names, or refine the reference.";
+};
+var normalize = (value) => value.normalize("NFKC").toLocaleLowerCase().trim().replace(/\s+/gu, " ");
+var tokensMatch = (text, query) => normalize(query).split(" ").every((token) => /^\d+$/u.test(token) ? (normalize(text).match(/\b\d+\b/gu) ?? []).some((n2) => n2 === token) : normalize(text).includes(token));
+function resolveUnit(value, courses) {
+  if (typeof value === "number") {
+    const byId = courses.find((c) => c.id === value);
+    if (byId) return byId;
+    throw unitError("not_found", value, courses);
+  }
+  const raw = normalize(String(value));
+  const exact = courses.filter((c) => [c.shortname, c.fullname].some((name) => normalize(name) === raw));
+  const matches = exact.length ? exact : courses.filter((c) => [c.shortname, c.fullname].some((name) => normalize(name).includes(raw)));
+  if (raw && matches.length === 1) return matches[0];
+  let id2 = /^\d+$/u.test(raw) ? Number(raw) : void 0;
+  try {
+    const url2 = new URL(String(value));
+    if (url2.pathname.endsWith("/course/view.php")) id2 = Number(url2.searchParams.get("id"));
+  } catch {
+  }
+  const course = courses.find((c) => c.id === id2);
+  if (course) return course;
+  if (raw && matches.length > 1) throw unitError("ambiguous", value, matches);
+  throw unitError("not_found", value, courses);
+}
+function unitError(code, ref2, courses) {
+  const candidates = courses.map((c) => ({ id: c.id, name: c.fullname || c.shortname, code: c.shortname || void 0 }));
+  return new ReferenceError2(code, `${code === "ambiguous" ? "Several units match" : "No unit matches"} '${ref2}'. Your units: ${courses.map((c) => c.shortname || c.fullname).join(", ")}.`, candidates);
+}
+function resolveSection(ref2, sections) {
+  const raw = normalize(String(ref2));
+  const numbers = raw.match(/\b\d+\b/gu) ?? [];
+  const matches = sections.filter((s2) => numbers.length === 1 ? (s2.name.match(/\b\d+\b/gu) ?? []).some((n2) => Number(n2) === Number(numbers[0])) : normalize(s2.name).includes(raw));
+  if (matches.length === 1) return { section: matches[0] };
+  if (matches.length > 1) throw new ReferenceError2("ambiguous", `Several sections match '${ref2}'.`, matches.map((s2) => ({ id: s2.id, name: s2.name })));
+  if (/^\d+$/u.test(raw)) {
+    const positional = sections.filter((s2) => s2.section === Number(raw));
+    if (positional.length === 1) return { section: positional[0], positional: true };
+  }
+  throw new ReferenceError2("not_found", `No section matches '${ref2}'.`, sections.map((s2) => ({ id: s2.id, name: s2.name })));
+}
+function currentSection(sections) {
+  const marked = sections.filter((s2) => s2.current);
+  if (marked.length > 1) return void 0;
+  if (marked.length === 1) return { section: marked[0] };
+  const unfinished = sections.find((s2) => s2.activities.some((a) => a.completion === 0));
+  return unfinished ? { section: unfinished, estimated: true } : void 0;
+}
+function searchSections(course, sections, query) {
+  const rows = [];
+  for (const s2 of sections) {
+    const context = { unit_id: course.id, unit_code: course.shortname || course.fullname, section_id: s2.id, section: s2.name };
+    if (tokensMatch(s2.name, query)) rows.push({ ...context, id: s2.id, name: s2.name, type: "section", score: normalize(s2.name) === normalize(query) ? 100 : 70 });
+    for (const a of s2.activities) {
+      if (!tokensMatch(`${a.name} ${s2.name}`, query)) continue;
+      const chrome = ["label", "cms"].includes(a.modname);
+      const score = chrome ? 1 : normalize(a.name) === normalize(query) ? 100 : tokensMatch(a.name, query) ? 80 : 60;
+      rows.push({ ...context, id: a.id, name: a.name, type: a.modname, score, activity: a });
+    }
+  }
+  const useful = rows.filter((r) => r.score > 1);
+  return (useful.length ? useful : rows).sort((a, b) => b.score - a.score || a.id - b.id);
+}
+function splitUnitPhrase(phrase, courses) {
+  const words = phrase.trim().split(/\s+/u);
+  for (let count = words.length; count > 0; count--) {
+    try {
+      return { course: resolveUnit(words.slice(0, count).join(" "), courses), query: words.slice(count).join(" ") };
+    } catch (error62) {
+      if (!(error62 instanceof ReferenceError2) || error62.code === "ambiguous") throw error62;
+    }
+  }
+  return void 0;
+}
+
 // src/session-fetch.ts
 var MAX_REDIRECTS = 5;
 var REQUEST_TIMEOUT_MS = 3e4;
 var REDIRECT_STATUSES = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
-async function fetchWithSession(input2, init, moodleOrigin, cookie, fetchImpl = (url2, options) => fetch(url2, options)) {
-  let url2 = new URL(input2);
+async function fetchWithSession(input3, init, moodleOrigin, cookie, fetchImpl = (url2, options) => fetch(url2, options)) {
+  let url2 = new URL(input3);
   const initialOrigin = url2.origin;
   const trustedOrigin = new URL(moodleOrigin).origin;
   let method = (init.method ?? "GET").toUpperCase();
@@ -26965,6 +27050,7 @@ var FUNC_GET_COURSE_CONTENTS = "core_course_get_contents";
 var FUNC_GET_COURSE_FORMAT_STATE = "core_courseformat_get_state";
 var FUNC_GET_COURSE_MODULE = "core_course_get_course_module";
 var FUNC_GET_ACTION_EVENTS = "core_calendar_get_action_events_by_timesort";
+var FUNC_GET_ACTION_EVENTS_BY_COURSE = "core_calendar_get_action_events_by_course";
 var FUNC_GET_POPUP_NOTIFICATIONS = "message_popup_get_popup_notifications";
 var FUNC_GET_CONVERSATION_COUNTS = "core_message_get_conversation_counts";
 var FUNC_GET_UNREAD_CONVERSATION_COUNTS = "core_message_get_unread_conversation_counts";
@@ -27059,7 +27145,8 @@ function parseUserInfo(value) {
     fullname: stringValue2(data.fullname),
     sitename: stringValue2(data.sitename),
     siteurl: stringValue2(data.siteurl),
-    lang: stringValue2(data.lang)
+    lang: stringValue2(data.lang),
+    ...data.timezone ? { timezone: String(data.timezone) } : {}
   };
 }
 function parseCourse(value, nowSeconds = Math.floor(Date.now() / 1e3)) {
@@ -27073,7 +27160,7 @@ function parseCourse(value, nowSeconds = Math.floor(Date.now() / 1e3)) {
     startdate: numberValue(data.startdate)
   };
   const enddate = numberValue(data.enddate);
-  if (enddate > nowSeconds) {
+  if (enddate > 0) {
     course.enddate = enddate;
   }
   return course;
@@ -27089,7 +27176,9 @@ function parseActivity(value) {
     modname: stringValue2(data.modname),
     url: stringValue2(data.url),
     visible: booleanValue(data.visible, true),
-    description: stringValue2(data.description)
+    description: stringValue2(data.description),
+    ...data.completiondata && typeof data.completiondata === "object" ? { completion: numberValue(asRecord(data.completiondata).state) } : {},
+    ...Array.isArray(data.contents) ? { file_entries: data.contents.filter((f) => asRecord(f).fileurl).map((f) => ({ name: stringValue2(asRecord(f).filename), url: stringValue2(asRecord(f).fileurl), requires_authentication: true })) } : {}
   };
 }
 function parseSection(value) {
@@ -27100,6 +27189,7 @@ function parseSection(value) {
     section: numberValue(data.section),
     visible: booleanValue(data.visible, true),
     summary: stringValue2(data.summary),
+    ...data.current !== void 0 ? { current: booleanValue(data.current) } : {},
     activities: asArray(data.modules).map((item) => parseActivity(item))
   };
 }
@@ -27112,34 +27202,36 @@ function parseCourseFormatState(value, baseUrl) {
   const activitiesBySection = /* @__PURE__ */ new Map();
   for (const item of asArray(state.cm)) {
     const data = asRecord(item);
-    const id = numberValue(data.id);
+    const id2 = numberValue(data.id);
     const sectionId = stringValue2(data.sectionid);
     const module = stringValue2(data.module) || stringValue2(data.plugin).replace(/^mod_/u, "") || stringValue2(data.modname).toLowerCase();
     const activity = {
-      id,
+      id: id2,
       name: htmlText(data.name, baseUrl),
       modname: module.toLowerCase(),
       url: stringValue2(data.url) ? resolveUrl(baseUrl, stringValue2(data.url)) : "",
       visible: booleanValue(data.visible, true) && booleanValue(data.uservisible, true) && !booleanValue(data.stealth),
-      description: htmlText(data.content ?? data.description, baseUrl)
+      description: htmlText(data.content ?? data.description, baseUrl),
+      ...data.completionstate !== void 0 && data.completionstate !== null ? { completion: numberValue(data.completionstate) } : {}
     };
-    activities.set(String(id), activity);
+    activities.set(String(id2), activity);
     const sectionActivities = activitiesBySection.get(sectionId) ?? [];
     sectionActivities.push(activity);
     activitiesBySection.set(sectionId, sectionActivities);
   }
   return asArray(state.section).map((item) => {
     const data = asRecord(item);
-    const id = numberValue(data.id);
+    const id2 = numberValue(data.id);
     const hasActivityList = Array.isArray(data.cmlist);
     const listedActivities = asArray(data.cmlist).map((activityId) => activities.get(stringValue2(activityId))).filter((activity) => activity !== void 0);
     return {
-      id,
+      id: id2,
       name: htmlText(data.title || data.rawtitle, baseUrl),
       section: numberValue(data.section ?? data.number),
       visible: booleanValue(data.visible, true),
       summary: htmlText(data.summary, baseUrl),
-      activities: hasActivityList ? listedActivities : activitiesBySection.get(String(id)) ?? []
+      ...data.current !== void 0 ? { current: booleanValue(data.current) } : {},
+      activities: hasActivityList ? listedActivities : activitiesBySection.get(String(id2)) ?? []
     };
   });
 }
@@ -27185,16 +27277,16 @@ function parseAlertNotification(value) {
 }
 function parseAlertSummary(notificationsData, countsData, unreadCountsData) {
   const notificationsRecord = asRecord(notificationsData);
-  const counts = asRecord(countsData);
+  const counts2 = asRecord(countsData);
   const unreadCounts = asRecord(unreadCountsData);
-  const types = asRecord(counts.types);
+  const types = asRecord(counts2.types);
   const unreadTypes = asRecord(unreadCounts.types);
   const notifications = asArray(notificationsRecord.notifications).map((item) => parseAlertNotification(item));
   return {
     notifications,
     notification_count: notifications.length,
     unread_notification_count: notifications.filter((notification) => !notification.read).length,
-    starred_message_count: numberValue(counts.favourites),
+    starred_message_count: numberValue(counts2.favourites),
     direct_message_count: numberValue(types["1"]),
     group_message_count: numberValue(types["2"]),
     self_message_count: numberValue(types["3"]),
@@ -27334,6 +27426,7 @@ function parsePageContext(html, baseUrl) {
       fullname: cleanNodeText(root.querySelector(".userfullname")),
       sitename: extractSitename(root),
       siteurl: baseUrl,
+      ...config2.timezone ? { timezone: stringValue3(config2.timezone) } : {},
       lang: stringValue3(config2.language) || root.querySelector("html")?.getAttribute("lang") || ""
     }
   };
@@ -27357,12 +27450,12 @@ function parseCourseContentsHtml(html, baseUrl) {
     const activities = [];
     const seenActivities = /* @__PURE__ */ new Set();
     for (const activityElement of sectionElement.querySelectorAll('li[data-for="cmitem"]')) {
-      const id = safeInt(activityElement.getAttribute("data-id"));
-      if (id && seenActivities.has(id)) {
+      const id2 = safeInt(activityElement.getAttribute("data-id"));
+      if (id2 && seenActivities.has(id2)) {
         continue;
       }
-      if (id) {
-        seenActivities.add(id);
+      if (id2) {
+        seenActivities.add(id2);
       }
       const classes = (activityElement.getAttribute("class") ?? "").split(/\s+/).filter(Boolean);
       const modname = classes.find((item) => item.startsWith("modtype_"))?.slice("modtype_".length) ?? "";
@@ -27378,7 +27471,7 @@ function parseCourseContentsHtml(html, baseUrl) {
       }
       const href = activityElement.querySelector(".activityname a, a.aalink, a[href]")?.getAttribute("href") ?? "";
       activities.push({
-        id,
+        id: id2,
         name: name2,
         modname,
         url: href ? resolveUrl(baseUrl, href) : "",
@@ -27403,10 +27496,10 @@ function parseCourseSectionNumbers(html, courseId) {
   const hrefs = root.querySelectorAll('a[href*="/course/view.php"]').map((link) => link.getAttribute("href") ?? "");
   for (const href of hrefs) {
     const url2 = parseMaybeUrl(href.replace(/&amp;/gu, "&"), "https://moodle.invalid");
-    const id = url2?.searchParams.get("id");
-    const sectionValue2 = url2?.searchParams.get("section");
-    if (id === String(courseId) && sectionValue2 && /^\d+$/.test(sectionValue2)) {
-      const section = Number(sectionValue2);
+    const id2 = url2?.searchParams.get("id");
+    const sectionValue = url2?.searchParams.get("section");
+    if (id2 === String(courseId) && sectionValue && /^\d+$/.test(sectionValue)) {
+      const section = Number(sectionValue);
       if (!sections.includes(section)) {
         sections.push(section);
       }
@@ -27543,8 +27636,10 @@ function parseQuizHtml(html, quizId, baseUrl) {
 function parseResourceHtml(html, resourceId, baseUrl) {
   const root = (0, import_node_html_parser2.parse)(html);
   const link = root.querySelector(".resourceworkaround a[href], .resourcecontent a[href], a.resourceworkaround[href]");
-  const targetName = cleanNodeText(link);
-  const targetUrl = link ? resolveUrl(baseUrl, link.getAttribute("href") ?? "") : "";
+  const embed = root.querySelector(".resourcecontent iframe[src], .resourcecontent object[data], .resourcecontent embed[src]");
+  const rawUrl = link?.getAttribute("href") || embed?.getAttribute("src") || embed?.getAttribute("data") || "";
+  const targetUrl = rawUrl ? resolveUrl(baseUrl, rawUrl) : "";
+  const targetName = cleanNodeText(link) || (targetUrl ? decodeURIComponent(new URL(targetUrl).pathname.split("/").at(-1) || "file") : "");
   return {
     id: resourceId,
     name: pageTitle(html),
@@ -27903,7 +27998,11 @@ var ForumModule = class {
   loadCourses;
   loadCourseContents;
   forumDiscussionCache = /* @__PURE__ */ new Map();
+  groupResolved = /* @__PURE__ */ new Set();
   forumDiscussionRefsCache = /* @__PURE__ */ new Map();
+  // The forum view page answers both "what type is this forum" and "which
+  // discussions does it list"; load it once per forum.
+  forumViewCache = /* @__PURE__ */ new Map();
   constructor(options) {
     this.baseUrl = options.baseUrl.replace(/\/$/, "");
     this.callMoodle = options.call;
@@ -27911,9 +28010,13 @@ var ForumModule = class {
     this.loadCourses = options.getCourses;
     this.loadCourseContents = options.getCourseContents;
   }
-  async getForumDiscussion(discussionId) {
+  // The posts service does not name the discussion's group; that costs a page load,
+  // so callers that never show groups (announcements, thread pages) opt out.
+  async getForumDiscussion(discussionId, options = {}) {
+    const wantGroup = options.group !== false;
     const cached2 = this.forumDiscussionCache.get(discussionId);
     if (cached2) {
+      if (wantGroup && cached2.group_id <= 0 && !this.groupResolved.has(discussionId)) await this.resolveGroup(cached2);
       return cached2;
     }
     try {
@@ -27924,14 +28027,7 @@ var ForumModule = class {
         includeinlineattachments: true
       });
       const discussion2 = parseForumDiscussion(data, discussionId, this.baseUrl);
-      if (discussion2.group_id <= 0) {
-        const html2 = await this.loadPage(FORUM_DISCUSS_PATH, { d: discussionId }).catch(() => "");
-        if (html2) {
-          const [groupId, groupName] = parseForumDiscussionGroupHtml(html2);
-          discussion2.group_id = groupId;
-          discussion2.group_name = groupName;
-        }
-      }
+      if (wantGroup && discussion2.group_id <= 0) await this.resolveGroup(discussion2);
       this.forumDiscussionCache.set(discussionId, discussion2);
       return discussion2;
     } catch (error62) {
@@ -27941,9 +28037,18 @@ var ForumModule = class {
     }
     const html = await this.loadPage(FORUM_DISCUSS_PATH, { d: discussionId });
     const discussion = parseForumDiscussionHtml(html, this.baseUrl, discussionId);
+    this.groupResolved.add(discussionId);
     this.forumDiscussionCache.set(discussionId, discussion);
     return discussion;
   }
+  async resolveGroup(discussion) {
+    this.groupResolved.add(discussion.id);
+    const html = await this.loadPage(FORUM_DISCUSS_PATH, { d: discussion.id }).catch(() => "");
+    if (!html) return;
+    const [groupId, groupName] = parseForumDiscussionGroupHtml(html);
+    discussion.group_id = groupId;
+    discussion.group_name = groupName;
+  }
   async getForumViewCmid(discussionId) {
     const html = await this.loadPage(FORUM_DISCUSS_PATH, { d: discussionId });
     return parseForumViewCmidFromDiscussionHtml(html);
@@ -27953,23 +28058,32 @@ var ForumModule = class {
     if (cached2) {
       return cached2;
     }
-    const html = await this.loadPage(FORUM_VIEW_PATH, { id: forumCmid });
+    const html = await this.forumViewHtml(forumCmid);
     const groups = parseForumGroupsHtml(html);
     const refs = groups.length ? [] : parseForumDiscussionRefsHtml(html, this.baseUrl);
-    const seenIds = new Set(refs.map((ref) => ref.id));
+    const seenIds = new Set(refs.map((ref2) => ref2.id));
     for (const [groupId, groupName] of groups) {
       const groupHtml = await this.loadPage(FORUM_VIEW_PATH, { id: forumCmid, group: groupId });
-      for (const ref of parseForumDiscussionRefsHtml(groupHtml, this.baseUrl)) {
-        if (seenIds.has(ref.id)) {
+      for (const ref2 of parseForumDiscussionRefsHtml(groupHtml, this.baseUrl)) {
+        if (seenIds.has(ref2.id)) {
           continue;
         }
-        seenIds.add(ref.id);
-        refs.push({ ...ref, group_id: groupId, group_name: groupName });
+        seenIds.add(ref2.id);
+        refs.push({ ...ref2, group_id: groupId, group_name: groupName });
       }
     }
     this.forumDiscussionRefsCache.set(forumCmid, refs);
     return refs;
   }
+  forumViewHtml(forumCmid) {
+    const pending = this.forumViewCache.get(forumCmid) ?? this.loadPage(FORUM_VIEW_PATH, { id: forumCmid });
+    this.forumViewCache.set(forumCmid, pending);
+    pending.catch(() => this.forumViewCache.delete(forumCmid));
+    return pending;
+  }
+  async isNewsForum(forumCmid) {
+    return /\bforumtype-news\b|data-forumtype=["']news["']/u.test(await this.forumViewHtml(forumCmid));
+  }
   async getCourseForums(courseId, courseName = "") {
     if (!this.loadCourseContents) {
       throw new Error("getCourseContents loader is required to list course forums");
@@ -27993,9 +28107,11 @@ var ForumModule = class {
     if (!this.loadCourses) {
       throw new Error("getCourses loader is required to list all forums");
     }
+    const courses = await this.loadCourses();
     const forums = [];
-    for (const course of await this.loadCourses()) {
-      forums.push(...await this.getCourseForums(course.id, course.fullname || course.shortname));
+    for (let index = 0; index < courses.length; index += 4) {
+      const batch = await Promise.all(courses.slice(index, index + 4).map((course) => this.getCourseForums(course.id, course.fullname || course.shortname)));
+      forums.push(...batch.flat());
     }
     return forums;
   }
@@ -28025,11 +28141,12 @@ async function searchForumContent(source, query, options = {}) {
     return [];
   }
   const includePostText = options.includePostText ?? true;
+  const titlesOnly = options.titlesOnly ?? false;
   const unreadOnly = options.unreadOnly ?? false;
   const sortBy = options.sortBy ?? "relevance";
   let forumRefs = await source.getForums(options.courseId);
   if (options.forumCmid !== void 0) {
-    forumRefs = forumRefs.filter((ref) => ref.id === options.forumCmid);
+    forumRefs = forumRefs.filter((ref2) => ref2.id === options.forumCmid);
     if (!forumRefs.length) {
       forumRefs = [
         {
@@ -28046,30 +28163,38 @@ async function searchForumContent(source, query, options = {}) {
   }
   const hits = [];
   const seen = /* @__PURE__ */ new Set();
-  for (const forumRef of forumRefs) {
-    let refs = await source.getForumDiscussionRefs(forumRef.id);
-    if (options.maxDiscussionsPerForum !== void 0) {
-      refs = refs.slice(0, options.maxDiscussionsPerForum);
-    }
-    for (const ref of refs) {
+  const needsPosts = !titlesOnly || unreadOnly || sortBy === "recent";
+  const listings = await inParallel(forumRefs, 3, async (forumRef) => {
+    const refs = await source.getForumDiscussionRefs(forumRef.id);
+    return options.maxDiscussionsPerForum !== void 0 ? refs.slice(0, options.maxDiscussionsPerForum) : refs;
+  });
+  const discussions = /* @__PURE__ */ new Map();
+  if (needsPosts) {
+    const refs = listings.flat();
+    const loaded = await inParallel(refs, 4, (ref2) => source.getForumDiscussion(ref2.id));
+    for (const [index, ref2] of refs.entries()) discussions.set(ref2.id, loaded[index]);
+  }
+  for (const [forumIndex, forumRef] of forumRefs.entries()) {
+    const refs = listings[forumIndex];
+    for (const ref2 of refs) {
       let discussion = null;
       let latestPost = null;
       let discussionHasUnread = false;
       const matchingPostHits = [];
-      if (includePostText || unreadOnly || sortBy === "recent") {
-        discussion = await source.getForumDiscussion(ref.id);
+      if (needsPosts) {
+        discussion = discussions.get(ref2.id) ?? await source.getForumDiscussion(ref2.id);
         if (discussion.posts.length) {
           latestPost = discussion.posts.reduce((latest, post) => (post.time_created || 0) > (latest.time_created || 0) ? post : latest);
           discussionHasUnread = discussion.posts.some((post) => post.unread);
         }
       }
-      if (!includePostText) {
+      if (titlesOnly) {
         addSubjectHit({
           hits,
           seen,
-          score: matchScore(ref.subject, cleanedQuery),
+          score: matchScore(ref2.subject, cleanedQuery),
           query: cleanedQuery,
-          ref,
+          ref: ref2,
           forumRef,
           discussionHasUnread,
           unreadOnly,
@@ -28077,7 +28202,7 @@ async function searchForumContent(source, query, options = {}) {
         });
         continue;
       }
-      discussion ??= await source.getForumDiscussion(ref.id);
+      discussion ??= await source.getForumDiscussion(ref2.id);
       for (const post of discussion.posts) {
         const postSubjectScore = matchScore(post.subject, cleanedQuery);
         const postBodyScore = matchScore(post.message_text, cleanedQuery);
@@ -28096,17 +28221,17 @@ async function searchForumContent(source, query, options = {}) {
             course_name: forumRef.course_name,
             forum_id: forumRef.id,
             forum_name: forumRef.name,
-            group_id: discussion.group_id || ref.group_id,
-            group_name: discussion.group_name || ref.group_name,
-            discussion_id: ref.id,
-            discussion_subject: discussion.subject || ref.subject,
+            group_id: discussion.group_id || ref2.group_id,
+            group_name: discussion.group_name || ref2.group_name,
+            discussion_id: ref2.id,
+            discussion_subject: discussion.subject || ref2.subject,
             post_id: post.id,
             author_name: post.author.fullname,
             matched_in: matchedIn,
             snippet: snippetForText(matchedText, cleanedQuery),
             unread: post.unread,
             time_created: post.time_created,
-            url: post.url || ref.url
+            url: post.url || ref2.url
           }
         ]);
       }
@@ -28124,9 +28249,9 @@ async function searchForumContent(source, query, options = {}) {
       addSubjectHit({
         hits,
         seen,
-        score: matchScore(ref.subject, cleanedQuery),
+        score: matchScore(ref2.subject, cleanedQuery),
         query: cleanedQuery,
-        ref,
+        ref: ref2,
         forumRef,
         discussionHasUnread,
         unreadOnly,
@@ -28135,7 +28260,12 @@ async function searchForumContent(source, query, options = {}) {
     }
   }
   hits.sort(sortBy === "recent" ? sortRecent : sortRelevant);
-  return hits.slice(0, options.limit ?? 20).map(([, hit]) => hit);
+  return hits.slice(0, options.limit ?? 20).map(([, hit]) => includePostText ? hit : { ...hit, snippet: "" });
+}
+async function inParallel(items, size, run) {
+  const results = [];
+  for (let index = 0; index < items.length; index += size) results.push(...await Promise.all(items.slice(index, index + size).map(run)));
+  return results;
 }
 function normalizeQuery(value) {
   const normalized = value.toLowerCase().split(/\s+/).filter(Boolean).join(" ");
@@ -28277,6 +28407,9 @@ var AjaxEnvelopeSchema = external_exports.array(
 );
 var MoodleClientCore = class {
   baseUrl;
+  coursesCache;
+  contentsCache = /* @__PURE__ */ new Map();
+  unavailable;
   fetchImpl;
   cookie;
   sesskey;
@@ -28291,11 +28424,12 @@ var MoodleClientCore = class {
   constructor(baseUrl, options) {
     this.baseUrl = baseUrl.replace(/\/$/, "");
     const resolvedOptions = typeof options === "string" ? { cookie: { name: "MoodleSession", value: options } } : options;
-    this.fetchImpl = resolvedOptions.fetchImpl ?? ((input2, init) => fetch(input2, init));
+    this.fetchImpl = resolvedOptions.fetchImpl ?? ((input3, init) => fetch(input3, init));
     this.cookie = resolvedOptions.cookie;
     this.sesskey = resolvedOptions.pageContext?.sesskey ?? resolvedOptions.sesskey ?? null;
     this.userid = resolvedOptions.pageContext?.user_info.userid ?? resolvedOptions.userid ?? null;
     this.userInfo = resolvedOptions.pageContext?.user_info ?? resolvedOptions.userInfo ?? (this.userid ? placeholderUserInfo(this.baseUrl, this.userid) : null);
+    this.unavailable = new Set(resolvedOptions.unavailable ?? []);
     this.clearSessionCache = resolvedOptions.clearSessionCache;
     this.writeSessionCache = resolvedOptions.writeSessionCache;
     this.errors = resolvedOptions.errorAdapter ?? DEFAULT_ERROR_ADAPTER;
@@ -28314,6 +28448,7 @@ var MoodleClientCore = class {
   async getSiteInfo() {
     await this.ensureSession();
     try {
+      if (this.unavailable.has(FUNC_GET_SITE_INFO) && this.userInfo?.fullname) return this.userInfo;
       const data = await this.call(FUNC_GET_SITE_INFO);
       if (isRecord6(data) && "userid" in data) {
         const info = parseUserInfo(data);
@@ -28340,7 +28475,21 @@ var MoodleClientCore = class {
     await this.writeCache();
     return context.user_info;
   }
+  // Resolution, forum listing and every screen ask for the unit list, and sites that
+  // disable the enrolment service pay three requests for each answer. A short memo
+  // keeps one command to one round trip without pinning a server to stale enrolments.
   async getCourses() {
+    if (!this.coursesCache || Date.now() - this.coursesCache.at > 6e4) {
+      this.coursesCache = { at: Date.now(), courses: this.fetchCourses() };
+    }
+    try {
+      return await this.coursesCache.courses;
+    } catch (error62) {
+      this.coursesCache = void 0;
+      throw error62;
+    }
+  }
+  async fetchCourses() {
     await this.ensureSession();
     try {
       const data = await this.call(FUNC_GET_COURSES, { userid: this.userid });
@@ -28353,21 +28502,21 @@ var MoodleClientCore = class {
     }
   }
   async resolveCourseReference(value) {
-    const raw = value.trim();
-    if (/^\d+$/.test(raw)) {
-      return Number(raw);
-    }
-    const courses = await this.getCourses();
-    const matches = courses.filter((course) => queryMatches(course.fullname, raw) || queryMatches(course.shortname, raw));
-    if (matches.length === 1) {
-      return matches[0].id;
-    }
-    if (!matches.length) {
-      throw this.errors.notFound(`Could not find a course matching '${raw}'. Run 'moodle courses' to inspect course IDs.`);
-    }
-    throw this.errors.notFound(`Course '${raw}' is ambiguous. Matches: ${matches.slice(0, 5).map((course) => `${course.id}:${course.fullname || course.shortname}`).join(", ")}`);
+    return resolveUnit(value, await this.getCourses()).id;
   }
+  // One command asks for the same unit's sections from several places (resolution,
+  // forum listing, screens); fetch once per client and let a failure retry next time.
   async getCourseContents(courseId) {
+    const pending = this.contentsCache.get(courseId) ?? this.fetchCourseContents(courseId);
+    this.contentsCache.set(courseId, pending);
+    try {
+      return await pending;
+    } catch (error62) {
+      if (this.contentsCache.get(courseId) === pending) this.contentsCache.delete(courseId);
+      throw error62;
+    }
+  }
+  async fetchCourseContents(courseId) {
     await this.ensureSession();
     try {
       return parseCourseContents(await this.call(FUNC_GET_COURSE_CONTENTS, { courseid: courseId }));
@@ -28393,13 +28542,13 @@ var MoodleClientCore = class {
   async getActivities(courseId) {
     return (await this.getCourseContents(courseId)).flatMap((section) => section.activities);
   }
-  async getActivity(id) {
+  async getActivity(id2) {
     await this.ensureSession();
     let activity = null;
     let courseId;
     let type = "";
     try {
-      const data = await this.call(FUNC_GET_COURSE_MODULE, { cmid: id });
+      const data = await this.call(FUNC_GET_COURSE_MODULE, { cmid: id2 });
       const module = isRecord6(data) && isRecord6(data.cm) ? data.cm : data;
       type = isRecord6(module) && typeof module.modname === "string" ? module.modname : "";
       courseId = isRecord6(module) && typeof module.course === "number" ? module.course : void 0;
@@ -28407,48 +28556,74 @@ var MoodleClientCore = class {
       if (!this.errors.isApi(error62) || error62.moodleErrorCode !== "servicenotavailable") {
         throw error62;
       }
-      activity = await this.findActivity(id);
+      activity = await this.findActivity(id2);
       type = activity.modname;
     }
     const loaders = {
-      assign: () => this.getAssignment(id),
-      quiz: () => this.getQuiz(id),
-      resource: () => this.getResource(id),
-      url: () => this.getLink(id),
-      page: () => this.getPage(id),
-      folder: () => this.getFolder(id)
+      assign: () => this.getAssignment(id2),
+      quiz: () => this.getQuiz(id2),
+      resource: () => this.getResource(id2),
+      url: () => this.getLink(id2),
+      page: () => this.getPage(id2),
+      folder: () => this.getFolder(id2)
     };
     const load = loaders[type];
     if (!load) {
-      activity ??= await this.findActivity(id, courseId);
+      activity ??= await this.findActivity(id2, courseId);
       return { ...activity, type: type || activity.modname || "unknown" };
     }
     return { ...await load(), type: type === "url" ? "link" : type };
   }
-  async getTodo(limit = 20, days) {
+  async getTodo(limit2 = 20, days, courseId) {
     await this.ensureSession();
     const now = Math.floor(Date.now() / 1e3);
-    const data = await this.call(FUNC_GET_ACTION_EVENTS, {
-      limitnum: limit,
-      timesortfrom: now,
-      timesortto: days ? now + days * 24 * 60 * 60 : 0,
-      aftereventid: 0,
-      limittononsuspendedevents: true
-    });
-    const events = isRecord6(data) && Array.isArray(data.events) ? data.events : [];
-    return parseTodoItems(events);
+    const items = [];
+    let aftereventid = 0;
+    const seen = /* @__PURE__ */ new Set();
+    const byCourse = courseId !== void 0 && !this.unavailable.has(FUNC_GET_ACTION_EVENTS_BY_COURSE);
+    while (items.length < limit2) {
+      const batchSize = Math.min(50, limit2 - items.length);
+      const window = { timesortfrom: now, timesortto: days ? now + days * 86400 : 0, aftereventid, limitnum: batchSize };
+      let data;
+      if (byCourse) {
+        try {
+          data = await this.call(FUNC_GET_ACTION_EVENTS_BY_COURSE, { courseid: courseId, ...window });
+        } catch (error62) {
+          if (!this.errors.isApi(error62) || error62.moodleErrorCode !== "servicenotavailable") throw error62;
+          return (await this.getTodo(limit2, days)).filter((item) => item.course_id === courseId);
+        }
+      } else {
+        data = await this.call(FUNC_GET_ACTION_EVENTS, { ...window, limittononsuspendedevents: true });
+      }
+      const events = isRecord6(data) && Array.isArray(data.events) ? data.events : [];
+      for (const item of parseTodoItems(events)) if (!seen.has(item.id)) {
+        seen.add(item.id);
+        items.push(item);
+      }
+      if (events.length < batchSize) break;
+      const last = events.at(-1);
+      const next = isRecord6(last) && typeof last.id === "number" ? last.id : void 0;
+      if (!next || next === aftereventid) throw this.errors.api("Moodle repeated a calendar page; refine the date window.");
+      aftereventid = next;
+    }
+    return courseId === void 0 ? items : items.filter((item) => item.course_id === courseId);
   }
-  async getAlerts(limit = 20) {
+  async getAlerts(limit2 = 20) {
     await this.ensureSession();
-    const [notifications, counts, unread] = await this.callBatchValues([
-      { methodname: FUNC_GET_POPUP_NOTIFICATIONS, args: { useridto: this.userid, limit, offset: 0 } },
+    const [notifications, counts2, unread] = await this.callBatchValues([
+      { methodname: FUNC_GET_POPUP_NOTIFICATIONS, args: { useridto: this.userid, limit: limit2, offset: 0 } },
       { methodname: FUNC_GET_CONVERSATION_COUNTS, args: { userid: this.userid } },
       { methodname: FUNC_GET_UNREAD_CONVERSATION_COUNTS, args: { userid: this.userid } }
     ]);
-    return parseAlertSummary(notifications, counts, unread);
+    return parseAlertSummary(notifications, counts2, unread);
   }
   async getOverview(todoLimit = 5, todoDays, alertsLimit = 5) {
     await this.ensureSession();
+    if (todoLimit > 50) {
+      const snapshot = await this.getOverview(50, todoDays, alertsLimit);
+      if (snapshot.todo.length === 50) snapshot.todo = await this.getTodo(todoLimit, todoDays);
+      return snapshot;
+    }
     const now = Math.floor(Date.now() / 1e3);
     const results = await this.callBatch([
       { methodname: FUNC_GET_COURSES, args: { userid: this.userid } },
@@ -28466,16 +28641,16 @@ var MoodleClientCore = class {
       { methodname: FUNC_GET_CONVERSATION_COUNTS, args: { userid: this.userid } },
       { methodname: FUNC_GET_UNREAD_CONVERSATION_COUNTS, args: { userid: this.userid } }
     ]);
-    const [coursesData, todoData, notifications, counts, unread] = results;
+    const [coursesData, todoData, notifications, counts2, unread] = results;
     const userPromise = this.userInfo?.fullname ? Promise.resolve(this.userInfo) : this.getSiteInfo();
     const coursesPromise = coursesData?.ok ? Promise.resolve(parseCourses(coursesData.data)) : this.getCourses();
     const todoPromise = todoData?.ok ? Promise.resolve(parseTodoPayload(todoData.data)) : todoData ? Promise.reject(todoData.error) : this.getTodo(todoLimit, todoDays);
-    const alertResults = [notifications, counts, unread];
+    const alertResults = [notifications, counts2, unread];
     const alertFailureIndex = alertResults.findIndex((result) => result !== void 0 && !result.ok);
     const alertFailure = alertFailureIndex >= 0 ? alertResults[alertFailureIndex] : void 0;
     const alertsPromise = alertFailure && !alertFailure.ok ? Promise.reject(alertFailure.error) : alertResults.every((result) => result?.ok) ? Promise.resolve(parseAlertSummary(
       notifications && notifications.ok ? notifications.data : void 0,
-      counts && counts.ok ? counts.data : void 0,
+      counts2 && counts2.ok ? counts2.data : void 0,
       unread && unread.ok ? unread.data : void 0
     )) : this.getAlerts(alertsLimit);
     const settled = await Promise.allSettled([userPromise, coursesPromise, todoPromise, alertsPromise]);
@@ -28553,29 +28728,75 @@ var MoodleClientCore = class {
       items: []
     };
   }
-  async getAssignment(id) {
-    return parseAssignmentHtml(await this.get(ASSIGN_VIEW_PATH, { id }), id, this.baseUrl);
-  }
-  async getQuiz(id) {
-    return parseQuizHtml(await this.get(QUIZ_VIEW_PATH, { id }), id, this.baseUrl);
-  }
-  async getResource(id) {
-    return parseResourceHtml(await this.get(RESOURCE_VIEW_PATH, { id }), id, this.baseUrl);
+  async getAssignment(id2) {
+    return parseAssignmentHtml(await this.get(ASSIGN_VIEW_PATH, { id: id2 }), id2, this.baseUrl);
+  }
+  async getQuiz(id2) {
+    return parseQuizHtml(await this.get(QUIZ_VIEW_PATH, { id: id2 }), id2, this.baseUrl);
+  }
+  async getResource(id2) {
+    const url2 = `${this.baseUrl}${RESOURCE_VIEW_PATH}?id=${id2}`;
+    const response = await this.requestAbsolute(url2);
+    const type = response.headers.get("content-type") ?? "";
+    if (type && !/html/iu.test(type)) {
+      const finalUrl = response.url || url2;
+      const disposition = response.headers.get("content-disposition") ?? "";
+      const encodedName = disposition.match(/filename\*\s*=\s*UTF-8''([^;]+)/iu)?.[1];
+      const plainName = disposition.match(/filename\s*=\s*"([^"\r\n]+)"/iu)?.[1] || disposition.match(/filename\s*=\s*([^;\r\n]+)/iu)?.[1];
+      let filename = plainName || new URL(finalUrl).pathname.split("/").at(-1) || `resource-${id2}`;
+      try {
+        filename = decodeURIComponent(encodedName || filename);
+      } catch {
+      }
+      filename = filename.split(/[\\/]/u).at(-1) || `resource-${id2}`;
+      await response.body?.cancel();
+      return { id: id2, name: filename, course_id: 0, course_name: "", section_name: "", target_name: filename, target_url: url2, file_entries: [{ name: filename, url: url2, requires_authentication: true }], url: url2 };
+    }
+    const resource = parseResourceHtml(await response.text(), id2, this.baseUrl);
+    if (!resource.name) {
+      const activity = await this.findActivity(id2);
+      resource.name = activity.name;
+      if (!resource.file_entries.length && activity.file_entries?.length) resource.file_entries = activity.file_entries;
+    }
+    return resource;
   }
-  async getLink(id) {
-    return parseLinkHtml(await this.get(URL_VIEW_PATH, { id }), id, this.baseUrl);
+  async getLink(id2) {
+    return parseLinkHtml(await this.get(URL_VIEW_PATH, { id: id2 }), id2, this.baseUrl);
   }
-  async getPage(id) {
-    return parsePageHtml(await this.get(PAGE_VIEW_PATH, { id }), id, this.baseUrl);
+  async getPage(id2) {
+    return parsePageHtml(await this.get(PAGE_VIEW_PATH, { id: id2 }), id2, this.baseUrl);
   }
-  async getFolder(id) {
-    return parseFolderHtml(await this.get(FOLDER_VIEW_PATH, { id }), id, this.baseUrl);
+  async getFolder(id2) {
+    return parseFolderHtml(await this.get(FOLDER_VIEW_PATH, { id: id2 }), id2, this.baseUrl);
   }
   async requestAbsolute(url2, init = {}) {
     return this.requestAbsoluteInternal(url2, init, true);
   }
-  async getForumDiscussion(discussionId) {
-    return this.forum.getForumDiscussion(discussionId);
+  async getNewsForums(courseId) {
+    const units = courseId === void 0 ? await this.getCourses() : (await this.getCourses()).filter((c) => c.id === courseId);
+    const forums = [];
+    if (!units.length) return forums;
+    try {
+      await this.ensureSession();
+      const data = await this.call("mod_forum_get_forums_by_courses", { courseids: units.map((c) => c.id) });
+      for (const f of Array.isArray(data) ? data : []) {
+        if (!isRecord6(f) || f.type !== "news" || typeof f.cmid !== "number") continue;
+        const c = units.find((c2) => c2.id === f.course);
+        forums.push({ id: f.cmid, name: String(f.name || ""), course_id: Number(f.course), course_name: c?.fullname || "", url: `${this.baseUrl}/mod/forum/view.php?id=${f.cmid}` });
+      }
+      return forums;
+    } catch (error62) {
+      if (!this.errors.isApi(error62) || error62.moodleErrorCode !== "servicenotavailable") throw error62;
+    }
+    const candidates = await this.getForums(courseId);
+    const flags = [];
+    for (let index = 0; index < candidates.length; index += 4) {
+      flags.push(...await Promise.all(candidates.slice(index, index + 4).map((forum) => this.forum.isNewsForum(forum.id))));
+    }
+    return candidates.filter((_, index) => flags[index]);
+  }
+  async getForumDiscussion(discussionId, options = {}) {
+    return this.forum.getForumDiscussion(discussionId, options);
   }
   async getForumViewCmid(discussionId) {
     return this.forum.getForumViewCmid(discussionId);
@@ -28614,7 +28835,22 @@ var MoodleClientCore = class {
     }
     return completeResults.map((result) => result.ok ? result.data : void 0);
   }
+  // Moodle stops a batch at its first failing function, so a service the site has
+  // disabled would void every call queued behind it. Known-disabled functions are
+  // answered locally and only the rest travel.
   async callBatchInternal(requests, allowRetry) {
+    const live = requests.map((request, index) => ({ request, index })).filter(({ request }) => !this.unavailable.has(request.methodname));
+    if (live.length < requests.length) {
+      const results2 = Array(requests.length).fill(void 0);
+      for (const [index, request] of requests.entries()) {
+        if (!live.some((entry) => entry.index === index)) results2[index] = { ok: false, error: this.errors.api(`${request.methodname} is disabled on this site.`, "servicenotavailable") };
+      }
+      if (live.length) {
+        const sent = await this.callBatchInternal(live.map(({ request }) => request), allowRetry);
+        for (const [position, { index }] of live.entries()) results2[index] = sent[position];
+      }
+      return results2;
+    }
     const payload = requests.map((request, index) => ({ index, methodname: request.methodname, args: request.args ?? {} }));
     const response = await fetchWithSession(`${this.baseUrl}${AJAX_SERVICE_PATH}?sesskey=${encodeURIComponent(this.sesskey ?? "")}&info=${requests.map((request) => request.methodname).join(",")}`, {
       method: "POST",
@@ -28642,6 +28878,14 @@ var MoodleClientCore = class {
         error: this.errors.api(item.exception?.message ?? "Unknown API error", item.exception?.errorcode)
       } : { ok: true, data: item.data ?? item };
     }
+    let learned = false;
+    for (const [position, item] of envelope.entries()) {
+      const name = requests[item.index ?? position]?.methodname;
+      if (!name || !item.error || item.exception?.errorcode !== "servicenotavailable" || this.unavailable.has(name)) continue;
+      this.unavailable.add(name);
+      learned = true;
+    }
+    if (learned) await this.writeCache();
     if (allowRetry && !this.retryingLogin && this.onLoginRequired && results.some((result) => result !== void 0 && !result.ok && this.errors.isLoginRequired(result.error))) {
       await this.reauthenticate();
       return this.callBatchInternal(requests, false);
@@ -28696,7 +28940,7 @@ var MoodleClientCore = class {
       }
       courses.push(...data.courses);
       const nextOffset = typeof data.nextoffset === "number" ? data.nextoffset : offset;
-      if (nextOffset <= offset) {
+      if (nextOffset <= offset || data.courses.length < 100) {
         break;
       }
       offset = nextOffset;
@@ -28715,18 +28959,18 @@ var MoodleClientCore = class {
     const stateFallbacks = [];
     for (const courseIds of chunks(unresolved, ACTIVITY_SEARCH_BATCH_SIZE)) {
       const results = await this.callBatch(
-        courseIds.map((id) => ({ methodname: FUNC_GET_COURSE_CONTENTS, args: { courseid: id } }))
+        courseIds.map((id2) => ({ methodname: FUNC_GET_COURSE_CONTENTS, args: { courseid: id2 } }))
       );
-      for (const [index, id] of courseIds.entries()) {
+      for (const [index, id2] of courseIds.entries()) {
         const result = results[index];
         if (!result?.ok) {
           if (!result) {
-            stateFallbacks.push(id);
+            stateFallbacks.push(id2);
           } else if (this.errors.isLoginRequired(result.error)) {
             throw result.error;
           } else {
             lastError = result.error;
-            if (result.error.moodleErrorCode === "servicenotavailable") stateFallbacks.push(id);
+            if (result.error.moodleErrorCode === "servicenotavailable") stateFallbacks.push(id2);
           }
           continue;
         }
@@ -28739,24 +28983,24 @@ var MoodleClientCore = class {
     unresolved = stateFallbacks;
     for (const courseIds of chunks(unresolved, ACTIVITY_SEARCH_BATCH_SIZE)) {
       const results = await this.callBatch(
-        courseIds.map((id) => ({ methodname: FUNC_GET_COURSE_FORMAT_STATE, args: { courseid: id } }))
+        courseIds.map((id2) => ({ methodname: FUNC_GET_COURSE_FORMAT_STATE, args: { courseid: id2 } }))
       );
-      for (const [index, id] of courseIds.entries()) {
+      for (const [index, id2] of courseIds.entries()) {
         const result = results[index];
         if (!result?.ok) {
           if (!result) {
-            htmlFallbacks.push(id);
+            htmlFallbacks.push(id2);
           } else if (this.errors.isLoginRequired(result.error)) {
             throw result.error;
           } else {
             lastError = result.error;
-            if (result.error.moodleErrorCode === "servicenotavailable") htmlFallbacks.push(id);
+            if (result.error.moodleErrorCode === "servicenotavailable") htmlFallbacks.push(id2);
           }
           continue;
         }
         const sections = parseCourseFormatState(result.data, this.baseUrl);
         if (!sections.length) {
-          htmlFallbacks.push(id);
+          htmlFallbacks.push(id2);
           continue;
         }
         searchedCourses += 1;
@@ -28764,11 +29008,11 @@ var MoodleClientCore = class {
         if (activity) return activity;
       }
     }
-    for (const id of htmlFallbacks) {
+    for (const id2 of htmlFallbacks) {
       try {
         const activity = (await this.scrapeCourseContents(
-          id,
-          await this.get(COURSE_PATH, { id })
+          id2,
+          await this.get(COURSE_PATH, { id: id2 })
         )).flatMap((section) => section.activities).find((item) => item.id === activityId);
         searchedCourses += 1;
         if (activity) return activity;
@@ -28827,9 +29071,12 @@ var MoodleClientCore = class {
         await this.writeSessionCache({
           baseUrl: this.baseUrl,
           cookieName: this.cookie.name,
+          cookieSource: this.cookie.source,
           cookieValue: this.cookie.value,
           sesskey: this.sesskey,
-          userid: this.userid
+          userid: this.userid,
+          ...this.unavailable.size ? { unavailable: [...this.unavailable].sort() } : {},
+          ...this.userInfo?.fullname ? { user: this.userInfo } : {}
         });
       } catch {
         return;
@@ -28850,11 +29097,6 @@ function placeholderUserInfo(baseUrl, userid) {
     lang: ""
   };
 }
-function queryMatches(text, query) {
-  const haystack = text.toLowerCase().split(/\s+/).join(" ");
-  const needle = query.toLowerCase().split(/\s+/).join(" ");
-  return needle ? haystack.includes(needle) || needle.split(" ").every((token) => haystack.includes(token)) : true;
-}
 function parseTodoPayload(value) {
   return parseTodoItems(isRecord6(value) && Array.isArray(value.events) ? value.events : []);
 }
@@ -28904,7 +29146,10 @@ var MoodleGatewayError = class extends Error {
 function createMoodleGateway(client) {
   return {
     getUser: () => client.getSiteInfo(),
-    getOverview: (input2) => client.getOverview(input2.todoLimit, input2.todoDays, input2.alertsLimit),
+    listThreads: (id2) => client.getForumDiscussionRefs ? client.getForumDiscussionRefs(id2) : Promise.resolve([]),
+    listNewsForums: (id2) => client.getNewsForums ? client.getNewsForums(id2) : Promise.resolve([]),
+    getOverview: (input3) => client.getOverview(input3.todoLimit, input3.todoDays, input3.alertsLimit),
+    ...client.getTodo ? { getDue: (days, courseId) => client.getTodo(Number.MAX_SAFE_INTEGER, days, courseId) } : {},
     listCourses: () => client.getCourses(),
     async getCourse({ courseId }) {
       const [courses, sections] = await Promise.all([
@@ -28917,18 +29162,19 @@ function createMoodleGateway(client) {
       }
       return { course, sections };
     },
-    async listActivities({ courseId, limit }) {
+    async listActivities({ courseId, limit: limit2 }) {
       const activities = await client.getActivities(courseId);
-      return limit === void 0 ? activities : activities.slice(0, limit);
+      return limit2 === void 0 ? activities : activities.slice(0, limit2);
     },
     getActivity: ({ activityId }) => client.getActivity(activityId),
     getGrades: ({ courseId }) => client.getCourseGrades(courseId),
-    async listForums({ courseId, limit }) {
+    async listForums({ courseId, limit: limit2 }) {
       const forums = await client.getForums(courseId);
-      return limit === void 0 ? forums : forums.slice(0, limit);
+      return limit2 === void 0 ? forums : forums.slice(0, limit2);
     },
-    searchForums: ({ forumId, ...input2 }) => client.searchForumContent({ ...input2, forumCmid: forumId }),
-    getThread: ({ discussionId }) => client.getForumDiscussion(discussionId),
+    searchForums: ({ forumId, ...input3 }) => client.searchForumContent({ ...input3, forumCmid: forumId }),
+    // Thread and news results never show groups, so the group page load is skipped.
+    getThread: ({ discussionId }) => client.getForumDiscussion(discussionId, { group: false }),
     async getFile({ source }) {
       let target = await resolveFileTarget(client, source);
       let response = await client.requestAbsolute(target.url);
@@ -29135,6 +29381,300 @@ function encodeBase64(content) {
   return btoa(binary);
 }
 
+// src/intent-contract.ts
+var s = external_exports.string().optional();
+var n = external_exports.number().optional();
+var id = external_exports.number().int();
+var ref = external_exports.union([external_exports.string().trim().min(1).max(2048), external_exports.number().int().positive()]);
+var limit = external_exports.number().int().min(1).max(200).default(20);
+var fields = (keys) => Object.fromEntries(keys.map((key) => [key, s]));
+var file2 = external_exports.object({ name: s, url: s, requires_authentication: external_exports.boolean().optional() });
+var activityFields = { id, name: s, type: s, unit_id: n, section_id: n, hidden: external_exports.boolean().optional(), due: s, due_at: n, files: external_exports.array(file2).optional() };
+var activityListSchema = external_exports.object({ ...activityFields, section: s, unit_code: s, description: s });
+var activitySchema = external_exports.object({ ...activityFields, ...fields(["url", "target_url", "section", "unit_code", "description", "submission_status", "grading_status", "grade", "due_pretty", "opens_pretty", "closes_pretty", "attempts_allowed", "availability", "time_remaining", "content_text"]), files: external_exports.array(file2).optional() });
+var sectionSchema = external_exports.object({ id, name: s, activity_count: id, hidden: external_exports.boolean().optional(), positional: external_exports.boolean().optional(), activities: external_exports.array(activityListSchema).optional() });
+var current = external_exports.object({ id, name: s, estimated: external_exports.boolean().optional() });
+var unitSchema = external_exports.object({ id, code: s, name: s, start: s, end: s, start_at: n, end_at: n, hidden: external_exports.boolean().optional(), current_section: current.optional() });
+var dueSchema = external_exports.object({ id, activity_id: n, name: s, type: s, unit_id: id, unit_code: s, event: s, due: s, due_at: id, actionable: external_exports.boolean().optional(), status: s });
+var counts = external_exports.object(Object.fromEntries(["notification_count", "unread_notification_count", "starred_message_count", "direct_message_count", "group_message_count", "self_message_count", "unread_starred_message_count", "unread_direct_message_count", "unread_group_message_count", "unread_self_message_count"].map((key) => [key, n])));
+var postSchema = external_exports.object({ id, parent_id: n, name: s, author: external_exports.object({ id, name: s }), time_created: id, created: s, message_text: s, links: external_exports.array(external_exports.object({ text: s, url: s })).optional() });
+var gradeSchema = external_exports.object({ unit_id: id, code: s, graded: id, total: id, total_grade: s, total_range: s, total_percentage: s, items: external_exports.array(external_exports.object({ name: s, type: s, grade: s, range: s, percentage: s, weight: s, contribution: s, feedback: s, status: s, due: s, due_at: n })).optional() });
+var searchSchema = external_exports.object({ unit_id: id, forum_id: id, discussion_id: id, name: s, post_id: id, snippet: s, time_created: n, created: s, url: s });
+var input2 = (shape) => external_exports.object(shape).strict();
+var list = (key, value) => external_exports.object({ [key]: external_exports.array(value).optional(), total: id });
+var intentContracts = {
+  home: { when: "dashboard", command: "moodle", what: "Today, timezone, due items and unread counts.", instead: "due for longer deadline lists", refs: "days defaults to 14", then: "unit or item", cost: "small dashboard", input: input2({ days: external_exports.number().int().min(1).max(365).default(14) }), output: external_exports.object({ home: external_exports.object({ today: external_exports.string(), timezone: external_exports.string(), timezone_source: s, name: s, siteurl: s, units: external_exports.array(unitSchema).optional(), due: external_exports.array(dueSchema).optional(), total: id, unread: counts.optional(), errors: external_exports.array(external_exports.string()).optional() }) }) },
+  due: { when: "deadlines", command: "moodle due [UNIT] --days 14", what: "Items due in a date window.", instead: "item for submission details", refs: "unit code, name, id or URL", then: "item with activity_id", cost: "up to 20 rows by default", input: input2({ unit: ref.optional(), days: external_exports.number().int().min(1).max(365).default(14), limit }), output: list("due", dueSchema) },
+  units: { when: "unit names", command: "moodle units", what: "Enrolled units with ids, codes and names.", instead: "unit for sections", refs: "none", then: "unit with a name or id", cost: "small list", input: input2({ limit: limit.default(200) }), output: list("units", unitSchema) },
+  unit: { when: "a unit or section", command: "moodle UNIT [SECTION]", what: "Section index and current section; section argument returns activities and files.", instead: "find for a named item", refs: "unit code, name, id or URL; section number or name", then: "item or file with activity id", cost: "index about 4 KB; section about 0.5 KB", input: input2({ unit: ref, section: ref.optional() }), output: external_exports.object({ unit: unitSchema, sections: external_exports.array(sectionSchema).optional(), total: id }) },
+  find: { when: "find slides or a task", command: 'moodle find "QUERY" [UNIT]', what: "Ranked sections, activities and discussion subjects.", instead: "search_forums for post text; due for deadlines", refs: "query and optional unit code, name, id or URL", then: "item or file with id", cost: "up to 20 rows by default", input: input2({ query: external_exports.string().trim().min(1), unit: ref.optional(), types: external_exports.array(external_exports.string()).optional(), limit }), output: list("results", activityListSchema) },
+  item: { when: "submission or item detail", command: 'moodle UNIT "TASK"', what: "Activity due dates, status, grades, files, or latest forum threads.", instead: "file for binary content", refs: "id, same-site URL, or UNIT TASK phrase", then: "file with id or files URL", cost: "one item", input: input2({ ref }), output: external_exports.object({ item: activitySchema, threads: external_exports.array(external_exports.object({ id, name: s })).optional(), total: n }) },
+  grades: { when: "my grades", command: "moodle grades [UNIT]", what: "Grades across units or in one unit.", instead: "item for submission status", refs: "optional unit code, name, id or URL", then: "item for an ungraded task", cost: "graded_only narrows output", input: input2({ unit: ref.optional(), graded_only: external_exports.boolean().default(false) }), output: list("grades", gradeSchema) },
+  news: { when: "announcements", command: "moodle news [UNIT]", what: "Latest announcement threads with first-post text.", instead: "search_forums for other discussions", refs: "optional unit code, name, id or URL", then: "thread with discussion id", cost: "up to 5 announcements by default", input: input2({ unit: ref.optional(), limit: limit.default(5) }), output: list("news", external_exports.object({ id, name: s, unit_id: id, unit_code: s, forum_id: id, post: postSchema.optional() })) },
+  thread: { when: "discussion posts", command: "moodle threads show ID", what: "A discussion and a page of compact posts, with attachment links.", instead: "news for announcements", refs: "discussion_id; offset and limit", then: "increase offset while posts_total exceeds returned", cost: "up to 20 posts by default", input: input2({ discussion_id: external_exports.number().int().positive(), limit, offset: external_exports.number().int().nonnegative().default(0) }), output: external_exports.object({ thread: external_exports.object({ id, name: s, unit_id: id, forum_id: id, url: s, posts: external_exports.array(postSchema).optional(), posts_total: id, offset: id }) }) },
+  search_forums: { when: "forum post text", command: 'moodle forums search "QUERY" --unit UNIT', what: "Matching posts with unit and forum name maps.", instead: "find for activity names", refs: "query, optional unit or courseId and forumId", then: "thread with discussion_id", cost: "bounded forum scan; total covers scanned scope", input: input2({ query: external_exports.string().trim().min(1), unit: ref.optional(), courseId: external_exports.number().int().positive().optional(), forumId: external_exports.number().int().positive().optional(), limit, includePostText: external_exports.boolean().default(true), titlesOnly: external_exports.boolean().default(false), unreadOnly: external_exports.boolean().default(false), sortBy: external_exports.enum(["relevance", "recent"]).default("relevance"), maxForums: limit.default(20), maxDiscussionsPerForum: limit.default(50) }), output: external_exports.object({ results: external_exports.array(searchSchema).optional(), total: id, forums: external_exports.record(external_exports.string(), external_exports.string()).optional(), units: external_exports.record(external_exports.string(), external_exports.string()).optional(), scope: external_exports.object({ max_forums: id, max_discussions_per_forum: id }) }) },
+  file: { when: "download a file", command: 'moodle get "UNIT TASK" --to DIR', what: "One authenticated file as embedded content, at most 16 MiB.", instead: "item for file choices", refs: "resource id, same-site URL, or UNIT TASK phrase", then: "read the returned resource", cost: "binary content up to 16 MiB", input: input2({ ref }), output: external_exports.object({ file: external_exports.object({ name: external_exports.string(), mime_type: external_exports.string(), bytes: id, uri: external_exports.string() }) }) }
+};
+function intentDescription(name) {
+  const c = intentContracts[name];
+  return `${c.what} Use when: ${c.when}. Not for: ${c.instead}. Refs: ${c.refs}. Then: ${c.then}. Cost: ${c.cost}.`;
+}
+
+// src/results.ts
+function stripEmpty(value) {
+  if (Array.isArray(value)) {
+    const items = value.map(stripEmpty).filter((v) => v !== void 0);
+    return items.length ? items : void 0;
+  }
+  if (value && typeof value === "object") return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, stripEmpty(v)]).filter(([, v]) => v !== void 0));
+  return value === "" || value === void 0 ? void 0 : value;
+}
+function timezoneFor(value) {
+  try {
+    if (value && value !== "99") {
+      new Intl.DateTimeFormat("en", { timeZone: value }).format();
+      return { timezone: value, timezone_source: "site" };
+    }
+  } catch {
+  }
+  const host = Intl.DateTimeFormat().resolvedOptions().timeZone;
+  return host && host !== "UTC" ? { timezone: host, timezone_source: "local" } : { timezone: "UTC", timezone_source: "fallback" };
+}
+function isoTime(epoch, timezone = "UTC") {
+  if (!epoch) return void 0;
+  const date5 = new Date(epoch * 1e3);
+  const parts = new Intl.DateTimeFormat("sv-SE", { timeZone: timezone, year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit", hourCycle: "h23", timeZoneName: "longOffset" }).formatToParts(date5);
+  const get = (type) => parts.find((p) => p.type === type)?.value ?? "";
+  return `${get("year")}-${get("month")}-${get("day")}T${get("hour")}:${get("minute")}:${get("second")}${get("timeZoneName").replace("GMT", "") || "+00:00"}`;
+}
+function unitRow(c, tz = "UTC") {
+  return { id: c.id, code: c.shortname, name: c.fullname, start: isoTime(c.startdate, tz), start_at: c.startdate || void 0, end: isoTime(c.enddate, tz), end_at: c.enddate, hidden: c.visible === false ? true : void 0 };
+}
+function activityRow(a, section) {
+  return { id: a.id, name: a.name, type: a.modname, section_id: section?.id, description: a.description, files: a.file_entries, hidden: a.visible === false ? true : void 0 };
+}
+function itemRow(a) {
+  const { course_id, file_entries, ...detail } = a;
+  return { ...detail, unit_id: course_id, files: file_entries };
+}
+function dueRow(t, courses, tz = "UTC") {
+  let activityId;
+  try {
+    const url2 = new URL(t.url);
+    const value = Number(url2.searchParams.get("id"));
+    if (/\/mod\/[^/]+\/view.php$/u.test(url2.pathname) && value > 0) activityId = value;
+  } catch {
+  }
+  return { id: t.id, activity_id: activityId, name: t.activity_name || t.name, type: t.modname, unit_id: t.course_id, unit_code: courses.find((c) => c.id === t.course_id)?.shortname, event: t.event_type, due: isoTime(t.due_at, tz), due_at: t.due_at, actionable: t.actionable };
+}
+function postRow(p, subject, tz = "UTC") {
+  return { id: p.id, parent_id: p.parent_id || void 0, name: p.subject === subject || p.subject === `Re: ${subject}` ? void 0 : p.subject, author: { id: p.author.id, name: p.author.fullname }, time_created: p.time_created, created: isoTime(p.time_created, tz), message_text: p.message_text, links: p.links };
+}
+
+// src/intents.ts
+async function inParallel2(items, size, run) {
+  const results = [];
+  for (let index = 0; index < items.length; index += size) results.push(...await Promise.all(items.slice(index, index + size).map(run)));
+  return results;
+}
+function createIntentService(gateway, now = () => Date.now()) {
+  let coursesPromise;
+  let userPromise;
+  const courses = () => coursesPromise ??= gateway.listCourses();
+  const details = /* @__PURE__ */ new Map();
+  const courseDetail = (courseId) => {
+    const pending = details.get(courseId) ?? gateway.getCourse({ courseId });
+    details.set(courseId, pending);
+    return pending;
+  };
+  const user = () => userPromise ??= gateway.getUser();
+  const timezone = async () => timezoneFor((await user()).timezone).timezone;
+  const course = async (ref2) => {
+    if (String(ref2).includes("://")) {
+      const url2 = new URL(String(ref2));
+      const site = new URL((await user()).siteurl);
+      if (url2.origin !== site.origin) throw new ReferenceError2("not_found", "The URL belongs to a different Moodle site.", []);
+    }
+    return resolveUnit(ref2, await courses());
+  };
+  const selected = async (ref2) => ref2 === void 0 ? courses() : [await course(ref2)];
+  const overview = async (days) => gateway.getOverview({ todoDays: days, todoLimit: Number.MAX_SAFE_INTEGER, alertsLimit: 1 });
+  const unitDeadlines = async (unitId, days) => gateway.getDue ? gateway.getDue(days, unitId) : (await overview(days)).todo.filter((t) => t.course_id === unitId);
+  const compactCurrent = (sections2) => {
+    const result = currentSection(sections2);
+    return result ? { id: result.section.id, name: result.section.name, estimated: result.estimated } : void 0;
+  };
+  async function find(query, ref2, types, threads = true) {
+    const units = await selected(ref2);
+    const rows = [];
+    for (const [index, { sections: sections2 }] of (await inParallel2(units, 5, (c) => courseDetail(c.id))).entries()) {
+      rows.push(...searchSections(units[index], sections2, query === "*" ? "" : query));
+    }
+    if (!rows.length && threads && (!types || types.includes("thread"))) {
+      for (const c of units) {
+        for (const forum of await gateway.listForums({ courseId: c.id })) {
+          for (const thread of await gateway.listThreads?.(forum.id) ?? []) {
+            if (tokensMatch(thread.subject, query)) rows.push({ id: thread.id, name: thread.subject, type: "thread", unit_id: c.id, unit_code: c.shortname || c.fullname, section_id: 0, section: "", score: 50 });
+          }
+        }
+      }
+    }
+    const filtered = types?.length ? rows.filter((r) => types.includes(r.type ?? "")) : rows;
+    const useful = filtered.filter((r) => r.score > 1);
+    return (useful.length ? useful : filtered).sort((a, b) => b.score - a.score || a.id - b.id);
+  }
+  async function resolveItem(ref2) {
+    const raw = String(ref2).trim();
+    if (/^\d+$/u.test(raw)) return Number(raw);
+    if (raw.includes("://")) {
+      const url2 = new URL(raw);
+      if (url2.origin !== new URL((await user()).siteurl).origin || !/\/mod\/[^/]+\/view.php$/u.test(url2.pathname)) throw new ReferenceError2("not_found", "Use an activity URL from the configured Moodle site.", []);
+      const id2 = Number(url2.searchParams.get("id"));
+      if (Number.isSafeInteger(id2) && id2 > 0) return id2;
+      throw new ReferenceError2("not_found", "The activity URL has no valid id.", []);
+    }
+    const parsed = splitUnitPhrase(raw, await courses());
+    const matches = (await find(parsed?.query || raw, parsed?.course.id, void 0, false)).filter((r) => r.type !== "section");
+    if (matches.length === 1) return matches[0].id;
+    throw new ReferenceError2(matches.length ? "ambiguous" : "not_found", `${matches.length ? "Several items match" : "No item matches"} '${raw}'.`, matches.map(({ id: id2, name, type, unit_code }) => ({ id: id2, name, type, code: unit_code })));
+  }
+  async function run(name, args = {}) {
+    const input3 = intentContracts[name].input.parse(args);
+    const ref2 = input3.unit;
+    const limit2 = Number(input3.limit ?? 20);
+    let result;
+    switch (name) {
+      case "units": {
+        const rows = await courses();
+        result = { units: rows.slice(0, limit2).map((c) => unitRow(c)), total: rows.length };
+        break;
+      }
+      case "unit": {
+        const c = await course(ref2);
+        const { sections: sections2 } = await courseDetail(c.id);
+        const tz = await timezone();
+        const chosen = input3.section !== void 0 ? resolveSection(input3.section, sections2) : void 0;
+        const rows = chosen ? [chosen.section] : sections2;
+        result = { unit: { ...unitRow(c, tz), current_section: compactCurrent(sections2) }, sections: rows.map((s2) => ({ id: s2.id, name: s2.name, activity_count: s2.activities.length, hidden: s2.visible === false ? true : void 0, positional: chosen?.positional, activities: chosen ? s2.activities.filter((a) => a.modname !== "label").map((a) => activityRow(a, s2)) : void 0 })), total: rows.length };
+        break;
+      }
+      case "find": {
+        const rows = await find(String(input3.query), ref2, input3.types);
+        result = { results: rows.slice(0, limit2).map(({ activity, ...row }) => ({ ...row, files: activity?.file_entries })), total: rows.length };
+        break;
+      }
+      case "item": {
+        const id2 = await resolveItem(input3.ref);
+        const activity = await gateway.getActivity({ activityId: id2 });
+        const threads = activity.type === "forum" ? await gateway.listThreads?.(id2) : void 0;
+        let due = {};
+        if (["assign", "quiz"].includes(activity.type)) {
+          const unitId = activity.course_id;
+          const todo = await (unitId ? unitDeadlines(unitId, 365) : overview(365).then((o) => o.todo)).catch(() => []);
+          const dates = todo.filter((t) => dueRow(t, []).activity_id === id2);
+          if (dates.length === 1) due = { due_at: dates[0].due_at, due: isoTime(dates[0].due_at, await timezone()) };
+        }
+        result = { item: { ...itemRow(activity), ...due }, threads: threads?.slice(0, 20).map((t) => ({ id: t.id, name: t.subject })), total: threads?.length };
+        break;
+      }
+      case "home":
+      case "due": {
+        const data = name === "due" && gateway.getDue ? { user: await user(), courses: await courses(), todo: await gateway.getDue(Number(input3.days)), errors: [] } : await overview(Number(input3.days));
+        const tz = timezoneFor(data.user?.timezone);
+        const target = ref2 === void 0 ? void 0 : await course(ref2);
+        const todos = data.todo.filter((t) => target === void 0 || t.course_id === target.id);
+        const due = todos.slice(0, name === "home" ? 5 : limit2).map((t) => dueRow(t, data.courses, tz.timezone));
+        if (name === "due") {
+          if (data.errors.length) throw new Error("Moodle could not load the complete deadline list.");
+          result = { due, total: todos.length };
+          break;
+        }
+        const errors = [...data.errors];
+        const units = await inParallel2(data.courses, 5, async (c) => {
+          try {
+            return { id: c.id, code: c.shortname, name: c.fullname, current_section: compactCurrent((await courseDetail(c.id)).sections) };
+          } catch {
+            errors.push(`Could not load sections for unit ${c.id}.`);
+            return { id: c.id, code: c.shortname, name: c.fullname };
+          }
+        });
+        const unread = Object.fromEntries(Object.entries(data.alerts ?? {}).filter(([, v]) => typeof v === "number" && v > 0));
+        result = { home: { today: isoTime(now() / 1e3, tz.timezone).slice(0, 10), ...tz, name: data.user?.fullname, siteurl: data.user?.siteurl, units, due, total: todos.length, unread, errors } };
+        break;
+      }
+      case "grades": {
+        const units = await selected(ref2);
+        const tz = await timezone();
+        const graded = (grade) => Boolean(grade && !/^[\s–—-]+$/u.test(grade));
+        const rows = await inParallel2(units, 5, async (c) => {
+          const [g, todo] = await Promise.all([gateway.getGrades({ courseId: c.id }), unitDeadlines(c.id, 365)]);
+          const items = g.items.filter((i) => !input3.graded_only || graded(i.grade)).map((i) => {
+            const matches = todo.filter((t) => (t.activity_name || t.name) === i.name);
+            const due = matches.length === 1 && !graded(i.grade) ? matches[0].due_at : void 0;
+            return { ...i, type: i.item_type, due_at: due, due: isoTime(due, tz) };
+          });
+          return { unit_id: c.id, code: c.shortname || c.fullname, graded: g.items.filter((i) => graded(i.grade)).length, total: g.items.length, total_grade: g.total_grade, total_range: g.total_range, total_percentage: g.total_percentage, items };
+        });
+        result = { grades: rows, total: units.length };
+        break;
+      }
+      case "news": {
+        const units = await selected(ref2);
+        const tz = await timezone();
+        const byUnit = new Map(units.map((c) => [c.id, c]));
+        const forums = (await gateway.listNewsForums?.(ref2 === void 0 ? void 0 : units[0].id) ?? []).filter((f) => byUnit.has(f.course_id));
+        const listings = (await inParallel2(forums, 3, async (forum) => ({ c: byUnit.get(forum.course_id), forum, threads: await gateway.listThreads?.(forum.id) ?? [] }))).filter((l) => l.threads.length);
+        const total = listings.reduce((sum, listing) => sum + listing.threads.length, 0);
+        const load = async (listing, index) => {
+          const t = listing.threads[index];
+          const thread = await gateway.getThread({ discussionId: t.id });
+          const first2 = [...thread.posts].sort((a, b) => a.time_created - b.time_created)[0];
+          return { time: first2?.time_created ?? 0, row: { id: t.id, name: t.subject, unit_id: listing.c.id, unit_code: listing.c.shortname || listing.c.fullname, forum_id: listing.forum.id, post: first2 ? postRow(first2, t.subject, tz) : void 0 } };
+        };
+        const cursors = listings.map(() => 0);
+        const heads = await inParallel2(listings, 5, (l) => load(l, 0));
+        const rows = [];
+        while (rows.length < limit2) {
+          let best = -1;
+          for (let i = 0; i < heads.length; i++) if (heads[i] && (best < 0 || heads[i].time > heads[best].time)) best = i;
+          if (best < 0) break;
+          rows.push(heads[best].row);
+          cursors[best] += 1;
+          heads[best] = cursors[best] < listings[best].threads.length ? await load(listings[best], cursors[best]) : void 0;
+        }
+        result = { news: rows, total };
+        break;
+      }
+      case "thread": {
+        const thread = await gateway.getThread({ discussionId: Number(input3.discussion_id) });
+        const tz = await timezone();
+        result = { thread: { id: thread.id, name: thread.subject, unit_id: thread.course_id, forum_id: thread.forum_id, url: thread.url, posts: thread.posts.slice(Number(input3.offset), Number(input3.offset) + limit2).map((p) => postRow(p, thread.subject, tz)), posts_total: thread.posts.length, offset: input3.offset } };
+        break;
+      }
+      case "search_forums": {
+        const unitId = ref2 === void 0 ? input3.courseId : (await course(ref2)).id;
+        const rows = await gateway.searchForums({ query: String(input3.query), courseId: unitId, forumId: input3.forumId, includePostText: true, titlesOnly: Boolean(input3.titlesOnly), unreadOnly: Boolean(input3.unreadOnly), sortBy: input3.sortBy, maxForums: Number(input3.maxForums), maxDiscussionsPerForum: Number(input3.maxDiscussionsPerForum), limit: Number.MAX_SAFE_INTEGER });
+        const page2 = rows.slice(0, limit2);
+        const units = await courses();
+        result = { results: page2.map((r) => ({ unit_id: r.course_id, forum_id: r.forum_id, discussion_id: r.discussion_id, name: r.discussion_subject, post_id: r.post_id, snippet: input3.includePostText ? r.snippet : void 0, url: r.url, time_created: r.time_created })), total: rows.length, forums: Object.fromEntries(page2.map((r) => [r.forum_id, r.forum_name])), units: Object.fromEntries(page2.map((r) => [r.course_id, units.find((c) => c.id === r.course_id)?.shortname || r.course_name])), scope: { max_forums: input3.maxForums, max_discussions_per_forum: input3.maxDiscussionsPerForum } };
+        break;
+      }
+      case "file": {
+        const source = await fileSource(input3.ref);
+        const file3 = await gateway.getFile({ source });
+        result = { file: { name: file3.name, mime_type: file3.mimeType, bytes: file3.bytes, uri: file3.uri } };
+        break;
+      }
+    }
+    return intentContracts[name].output.parse(stripEmpty(result));
+  }
+  async function fileSource(ref2) {
+    return String(ref2).includes("://") ? ref2 : resolveItem(ref2);
+  }
+  const sections = async (unitId) => (await courseDetail(unitId)).sections;
+  return { run, resolveItem, fileSource, find, sections };
+}
+
 // src/mcp/server.ts
 var RESULT_META = { cacheScope: "private" };
 var READ_ONLY_ANNOTATIONS = {
@@ -29143,252 +29683,37 @@ var READ_ONLY_ANNOTATIONS = {
   idempotentHint: true,
   openWorldHint: true
 };
-var emptyInput = external_exports.object({}).strict();
-var positiveId = external_exports.number().int().positive();
-var integer2 = external_exports.number().int();
-var userValue = external_exports.looseObject({
-  userid: integer2,
-  username: external_exports.string(),
-  fullname: external_exports.string(),
-  sitename: external_exports.string(),
-  siteurl: external_exports.string(),
-  lang: external_exports.string().optional()
-});
-var courseValue = external_exports.looseObject({
-  id: integer2,
-  shortname: external_exports.string(),
-  fullname: external_exports.string(),
-  category: external_exports.number().int(),
-  visible: external_exports.boolean(),
-  startdate: external_exports.number(),
-  enddate: external_exports.number().optional()
-});
-var activityValue = external_exports.looseObject({
-  id: integer2,
-  name: external_exports.string(),
-  modname: external_exports.string(),
-  url: external_exports.string(),
-  visible: external_exports.boolean(),
-  description: external_exports.string()
-});
-var fileEntryValue = external_exports.looseObject({
-  name: external_exports.string(),
-  url: external_exports.string(),
-  requires_authentication: external_exports.boolean()
-});
-var activityDetailValue = external_exports.looseObject({
-  id: positiveId,
-  name: external_exports.string(),
-  type: external_exports.string(),
-  url: external_exports.string().optional(),
-  target_name: external_exports.string().optional(),
-  target_url: external_exports.string().optional(),
-  file_entries: external_exports.array(fileEntryValue).optional()
-});
-var sectionValue = external_exports.looseObject({
-  id: external_exports.number().int(),
-  name: external_exports.string(),
-  section: external_exports.number().int(),
-  visible: external_exports.boolean(),
-  summary: external_exports.string(),
-  activities: external_exports.array(activityValue)
-});
-var todoValue = external_exports.looseObject({
-  id: external_exports.number().int(),
-  name: external_exports.string(),
-  course_id: external_exports.number().int(),
-  course_name: external_exports.string(),
-  due_at: external_exports.number(),
-  url: external_exports.string()
-});
-var gradeItemValue = external_exports.looseObject({
-  name: external_exports.string(),
-  item_type: external_exports.string(),
-  grade: external_exports.string(),
-  range: external_exports.string(),
-  percentage: external_exports.string(),
-  feedback: external_exports.string(),
-  url: external_exports.string()
-});
-var gradesValue = external_exports.looseObject({
-  course_id: integer2,
-  course_name: external_exports.string(),
-  learner_name: external_exports.string(),
-  total_grade: external_exports.string(),
-  total_range: external_exports.string(),
-  total_percentage: external_exports.string(),
-  items: external_exports.array(gradeItemValue)
-});
-var forumValue = external_exports.looseObject({
-  id: integer2,
-  name: external_exports.string(),
-  course_id: integer2,
-  course_name: external_exports.string(),
-  url: external_exports.string()
-});
-var forumSearchValue = external_exports.looseObject({
-  course_id: integer2,
-  course_name: external_exports.string(),
-  forum_id: integer2,
-  forum_name: external_exports.string(),
-  discussion_id: integer2,
-  discussion_subject: external_exports.string(),
-  post_id: integer2,
-  snippet: external_exports.string(),
-  url: external_exports.string()
-});
-var forumPostValue = external_exports.looseObject({
-  id: integer2,
-  discussion_id: integer2,
-  subject: external_exports.string(),
-  message_text: external_exports.string(),
-  author: external_exports.looseObject({ id: integer2, fullname: external_exports.string() }),
-  url: external_exports.string()
-});
-var threadValue = external_exports.looseObject({
-  id: integer2,
-  subject: external_exports.string(),
-  course_id: integer2,
-  forum_id: integer2,
-  group_id: external_exports.number().int(),
-  group_name: external_exports.string(),
-  url: external_exports.string(),
-  posts: external_exports.array(forumPostValue)
-});
-var TOOL_REGISTRATIONS = [
-  {
-    name: "get_user",
-    description: "Get the authenticated Moodle user and site.",
-    input: emptyInput,
-    output: external_exports.object({ user: userValue })
-  },
-  {
-    name: "get_overview",
-    description: "Get a bounded dashboard overview with courses, deadlines, and alerts.",
-    input: external_exports.object({
-      todoLimit: external_exports.number().int().min(1).max(100).optional().default(5),
-      todoDays: external_exports.number().int().min(1).max(365).optional(),
-      alertsLimit: external_exports.number().int().min(1).max(100).optional().default(5)
-    }).strict(),
-    output: external_exports.object({
-      overview: external_exports.looseObject({
-        user: userValue,
-        courses: external_exports.array(courseValue),
-        todo: external_exports.array(todoValue),
-        errors: external_exports.array(external_exports.string())
-      })
-    })
-  },
-  {
-    name: "list_courses",
-    description: "List the authenticated user's Moodle courses.",
-    input: external_exports.object({ limit: external_exports.number().int().min(1).max(200).optional().default(100) }).strict(),
-    output: external_exports.object({ courses: external_exports.array(courseValue) })
-  },
-  {
-    name: "get_course",
-    description: "Get one Moodle course and its sections.",
-    input: external_exports.object({ courseId: positiveId }).strict(),
-    output: external_exports.object({
-      course: external_exports.looseObject({
-        course: courseValue,
-        sections: external_exports.array(sectionValue)
-      })
-    })
-  },
-  {
-    name: "list_activities",
-    description: "List a bounded set of activities in a Moodle course.",
-    input: external_exports.object({
-      courseId: positiveId,
-      limit: external_exports.number().int().min(1).max(200).optional().default(100)
-    }).strict(),
-    output: external_exports.object({ activities: external_exports.array(activityValue) })
-  },
-  {
-    name: "get_activity",
-    description: "Get the supported details for one Moodle activity.",
-    input: external_exports.object({ activityId: positiveId }).strict(),
-    output: external_exports.object({ activity: activityDetailValue })
-  },
-  {
-    name: "get_grades",
-    description: "Get the authenticated user's grades for one Moodle course.",
-    input: external_exports.object({ courseId: positiveId }).strict(),
-    output: external_exports.object({ grades: gradesValue })
-  },
-  {
-    name: "list_forums",
-    description: "List a bounded set of Moodle forums, optionally for one course.",
-    input: external_exports.object({
-      courseId: positiveId.optional(),
-      limit: external_exports.number().int().min(1).max(100).optional().default(50)
-    }).strict(),
-    output: external_exports.object({ forums: external_exports.array(forumValue) })
-  },
-  {
-    name: "search_forums",
-    description: "Search a bounded set of Moodle forum discussions and posts.",
-    input: external_exports.object({
-      query: external_exports.string().trim().min(1).max(200),
-      limit: external_exports.number().int().min(1).max(50).optional().default(20),
-      courseId: positiveId.optional(),
-      forumId: positiveId.optional(),
-      includePostText: external_exports.boolean().optional().default(true),
-      unreadOnly: external_exports.boolean().optional().default(false),
-      sortBy: external_exports.enum(["relevance", "recent"]).optional().default("relevance"),
-      maxForums: external_exports.number().int().min(1).max(50).optional(),
-      maxDiscussionsPerForum: external_exports.number().int().min(1).max(100).optional()
-    }).strict(),
-    output: external_exports.object({ results: external_exports.array(forumSearchValue) })
-  },
-  {
-    name: "get_thread",
-    description: "Get one Moodle forum discussion and its posts.",
-    input: external_exports.object({ discussionId: positiveId }).strict(),
-    output: external_exports.object({ thread: threadValue })
-  },
-  {
-    name: "get_file",
-    description: "Fetch one authenticated Moodle file and return its content directly (maximum 16 MiB).",
-    input: external_exports.object({
-      source: external_exports.union([positiveId, external_exports.string().trim().min(1).max(2048)])
-    }).strict(),
-    output: external_exports.object({
-      file: external_exports.object({
-        name: external_exports.string(),
-        mime_type: external_exports.string(),
-        bytes: external_exports.number().int().nonnegative(),
-        uri: external_exports.string()
-      })
-    })
-  }
-];
-var TOOL_CATALOG = TOOL_REGISTRATIONS.map(({ name, description, input: input2, output: output2 }) => ({
+var aliases = { get_overview: "home", list_courses: "units", get_course: "unit", get_activity: "item", get_grades: "grades", get_thread: "thread", get_file: "file" };
+var TOOL_CATALOG = Object.entries(intentContracts).map(([name, contract]) => ({
   name,
-  description,
-  inputSchema: external_exports.toJSONSchema(input2),
-  outputSchema: external_exports.toJSONSchema(output2),
+  description: intentDescription(name),
+  inputSchema: compactSchema(external_exports.toJSONSchema(contract.input, { io: "input" })),
   annotations: READ_ONLY_ANNOTATIONS
 }));
+var TOOL_OUTPUT_SCHEMAS = Object.fromEntries(Object.entries(intentContracts).map(([name, contract]) => [name, compactSchema(external_exports.toJSONSchema(contract.output))]));
+function compactSchema(value) {
+  if (Array.isArray(value)) return value.map(compactSchema);
+  if (value && typeof value === "object") return Object.fromEntries(Object.entries(value).filter(([key, item]) => key !== "$schema" && !(key === "minimum" && item === Number.MIN_SAFE_INTEGER) && !(key === "maximum" && item === Number.MAX_SAFE_INTEGER)).map(([key, item]) => [key, compactSchema(item)]));
+  return value;
+}
 function createMoodleMcpServer(gateway, options = {}) {
   const serverInfo = {
     name: options.name ?? "moodle",
     version: options.version ?? VERSION
   };
   return {
-    async handle(input2, context = {}) {
-      let id = null;
+    async handle(input3, context = {}) {
+      let id2 = null;
       try {
-        const request = parseJsonRpcRequest(input2);
-        id = request.id ?? null;
+        const request = parseJsonRpcRequest(input3);
+        id2 = request.id ?? null;
         const protocolVersion = resolveProtocolVersion(request, context);
         assertRequestMetadata(request, protocolVersion, context);
         if (request.id === void 0) {
           return null;
         }
         if (request.method === "server/discover" && protocolVersion === MODERN_PROTOCOL_VERSION) {
-          return jsonRpcSuccess(id, {
+          return jsonRpcSuccess(id2, {
             supportedVersions: [...SUPPORTED_PROTOCOL_VERSIONS],
             protocolVersion,
             capabilities: { tools: { listChanged: false } },
@@ -29398,7 +29723,7 @@ function createMoodleMcpServer(gateway, options = {}) {
           });
         }
         if (request.method === "initialize" && usesLegacyInitialize(protocolVersion)) {
-          return jsonRpcSuccess(id, {
+          return jsonRpcSuccess(id2, {
             protocolVersion,
             capabilities: { tools: { listChanged: false } },
             serverInfo,
@@ -29406,29 +29731,29 @@ function createMoodleMcpServer(gateway, options = {}) {
           });
         }
         if (request.method === "ping") {
-          return jsonRpcSuccess(id, {});
+          return jsonRpcSuccess(id2, {});
         }
         if (request.method === "tools/list") {
-          return jsonRpcSuccess(id, {
+          return jsonRpcSuccess(id2, {
             tools: TOOL_CATALOG,
             resultType: "complete",
             _meta: RESULT_META
           });
         }
         if (request.method === "tools/call") {
-          return jsonRpcSuccess(id, await callTool(gateway, request.params));
+          return jsonRpcSuccess(id2, await callTool(gateway, request.params));
         }
-        return jsonRpcFailure(id, { code: -32601, message: `Method not found: ${request.method}` });
+        return jsonRpcFailure(id2, { code: -32601, message: `Method not found: ${request.method}` });
       } catch (error62) {
         if (error62 instanceof McpCallError) {
-          return jsonRpcFailure(id, {
+          return jsonRpcFailure(id2, {
             code: -32602,
             message: error62.message,
             data: { type: error62.type, ...error62.details === void 0 ? {} : { issues: error62.details } }
           });
         }
         if (error62 instanceof UnsupportedProtocolVersionError) {
-          return jsonRpcFailure(id, {
+          return jsonRpcFailure(id2, {
             code: -32022,
             message: "Unsupported protocol version",
             data: {
@@ -29438,7 +29763,7 @@ function createMoodleMcpServer(gateway, options = {}) {
           });
         }
         if (error62 instanceof RequestMetadataMismatchError) {
-          return jsonRpcFailure(id, {
+          return jsonRpcFailure(id2, {
             code: -32602,
             message: error62.message,
             data: {
@@ -29450,131 +29775,77 @@ function createMoodleMcpServer(gateway, options = {}) {
           });
         }
         if (error62 instanceof ZodError) {
-          return jsonRpcFailure(id, {
+          return jsonRpcFailure(id2, {
             code: -32600,
             message: "Invalid JSON-RPC request.",
             data: { type: "INVALID_REQUEST", issues: error62.issues }
           });
         }
         const message = "The MCP request could not be completed.";
-        return jsonRpcFailure(id, { code: -32603, message });
+        return jsonRpcFailure(id2, { code: -32603, message });
       }
     }
   };
 }
 async function callTool(gateway, params) {
-  const name = typeof params?.name === "string" ? params.name : "";
-  const registration = TOOL_REGISTRATIONS.find((tool) => tool.name === name);
-  if (!registration) {
-    throw new McpCallError("TOOL_NOT_FOUND", `Unknown Moodle tool: ${name || "<missing>"}`);
+  const requested = typeof params?.name === "string" ? params.name : "";
+  const name = Object.hasOwn(aliases, requested) ? aliases[requested] : requested;
+  if (!Object.hasOwn(intentContracts, name) && !["get_user", "list_activities", "list_forums"].includes(name)) throw new McpCallError("TOOL_NOT_FOUND", `Unknown Moodle tool: ${requested || "<missing>"}`);
+  const raw = params?.arguments ?? {};
+  if (!isRecord7(raw)) throw new McpCallError("INVALID_TOOL_ARGUMENTS", "Tool arguments must be an object.");
+  const args = { ...raw };
+  if (Object.hasOwn(aliases, requested)) {
+    const renames = { courseId: "unit", activityId: "ref", discussionId: "discussion_id", source: "ref", todoDays: "days", gradedOnly: "graded_only" };
+    for (const [old, key] of Object.entries(renames)) if (old in args) {
+      args[key] = args[old];
+      delete args[old];
+    }
+    delete args.alertsLimit;
+    delete args.todoLimit;
+  }
+  const contract = intentContracts[name];
+  if (contract) {
+    const checked = contract.input.safeParse(args);
+    if (!checked.success) throw new McpCallError("INVALID_TOOL_ARGUMENTS", `Invalid arguments for ${requested}.`, checked.error.issues);
   }
-  let input2;
   try {
-    input2 = registration.input.parse(params?.arguments ?? {});
-  } catch (error62) {
-    if (error62 instanceof ZodError) {
-      throw new McpCallError("INVALID_TOOL_ARGUMENTS", `Invalid arguments for ${name}.`, error62.issues);
+    const service = createIntentService(gateway);
+    let structuredContent;
+    let payload;
+    if (name === "file") {
+      const input3 = intentContracts.file.input.parse(args);
+      payload = await gateway.getFile({ source: await service.fileSource(input3.ref) });
+      const file3 = payload;
+      structuredContent = intentContracts.file.output.parse({ file: { name: file3.name, mime_type: file3.mimeType, bytes: file3.bytes, uri: file3.uri } });
+    } else if (name === "get_user") {
+      external_exports.object({}).strict().parse(args);
+      const u = await gateway.getUser();
+      structuredContent = stripEmpty({ user: { id: u.userid, name: u.fullname, siteurl: u.siteurl, timezone: u.timezone } });
+    } else if (name === "list_activities") {
+      const input3 = external_exports.object({ courseId: external_exports.number().int().positive(), sectionId: external_exports.number().int().optional(), includeLabels: external_exports.boolean().default(false), limit: external_exports.number().int().min(1).max(200).default(200) }).strict().parse(args);
+      const { sections } = await gateway.getCourse({ courseId: input3.courseId });
+      const rows = sections.filter((s2) => input3.sectionId === void 0 || s2.id === input3.sectionId).flatMap((s2) => s2.activities.filter((a) => input3.includeLabels || a.modname !== "label").map((a) => activityRow(a, s2)));
+      structuredContent = stripEmpty({ activities: rows.slice(0, input3.limit).map((r) => activitySchema.parse(stripEmpty(r))), total: rows.length });
+    } else if (name === "list_forums") {
+      const input3 = external_exports.object({ courseId: external_exports.number().int().positive().optional(), limit: external_exports.number().int().min(1).max(200).default(50) }).strict().parse(args);
+      const rows = await gateway.listForums({ courseId: input3.courseId });
+      structuredContent = stripEmpty({ forums: rows.slice(0, input3.limit).map((f) => ({ id: f.id, name: f.name, unit_id: f.course_id })), total: rows.length });
+    } else {
+      structuredContent = await service.run(name, args);
     }
-    throw error62;
-  }
-  try {
-    const payload = await runGatewayTool(gateway, name, input2);
-    const structuredContent = registration.output.parse(wrapToolOutput(name, payload));
-    return {
-      content: toolContent(name, payload),
-      structuredContent,
-      resultType: "complete",
-      _meta: RESULT_META
-    };
+    return { content: toolContent(name === "file" ? "get_file" : name, payload, structuredContent), structuredContent, resultType: "complete", _meta: RESULT_META };
   } catch (error62) {
-    if (error62 instanceof McpCallError) {
-      throw error62;
+    if (error62 instanceof ZodError && !contract) throw new McpCallError("INVALID_TOOL_ARGUMENTS", `Invalid arguments for ${requested}.`, error62.issues);
+    if (error62 instanceof ZodError) {
+      const mapped2 = { type: "MOODLE_RESULT_INVALID", message: `Moodle returned ${name} data in an unexpected shape.`, hint: "Retry once; if it persists, run the same command locally with --verbose and report the tool name.", issues: error62.issues.slice(0, 5).map((issue2) => ({ path: issue2.path.join("."), message: issue2.message })) };
+      return { content: [{ type: "text", text: JSON.stringify({ error: mapped2 }) }], structuredContent: { error: mapped2 }, isError: true, resultType: "complete", _meta: RESULT_META };
     }
-    const mapped = mapMoodleError(error62);
-    return {
-      content: [{ type: "text", text: mapped.message }],
-      structuredContent: { error: mapped },
-      isError: true,
-      resultType: "complete",
-      _meta: RESULT_META
-    };
+    const mapped = error62 instanceof ReferenceError2 ? { type: error62.code, code: error62.code, message: error62.message, hint: error62.hint, candidates: error62.candidates } : mapMoodleError(error62);
+    return { content: [{ type: "text", text: JSON.stringify({ error: mapped }) }], structuredContent: { error: mapped }, isError: true, resultType: "complete", _meta: RESULT_META };
   }
 }
-async function runGatewayTool(gateway, name, input2) {
-  switch (name) {
-    case "get_user":
-      return gateway.getUser();
-    case "get_overview":
-      return gateway.getOverview({
-        todoLimit: numberValue3(input2.todoLimit),
-        todoDays: optionalNumber(input2.todoDays),
-        alertsLimit: numberValue3(input2.alertsLimit)
-      });
-    case "list_courses":
-      return (await gateway.listCourses()).slice(0, numberValue3(input2.limit));
-    case "get_course":
-      return gateway.getCourse({ courseId: numberValue3(input2.courseId) });
-    case "list_activities":
-      return gateway.listActivities({
-        courseId: numberValue3(input2.courseId),
-        limit: numberValue3(input2.limit)
-      });
-    case "get_activity":
-      return gateway.getActivity({ activityId: numberValue3(input2.activityId) });
-    case "get_grades":
-      return gateway.getGrades({ courseId: numberValue3(input2.courseId) });
-    case "list_forums":
-      return gateway.listForums({
-        courseId: optionalNumber(input2.courseId),
-        limit: numberValue3(input2.limit)
-      });
-    case "search_forums":
-      return gateway.searchForums({
-        query: stringValue4(input2.query),
-        limit: numberValue3(input2.limit),
-        courseId: optionalNumber(input2.courseId),
-        forumId: optionalNumber(input2.forumId),
-        includePostText: booleanValue2(input2.includePostText),
-        unreadOnly: booleanValue2(input2.unreadOnly),
-        sortBy: enumValue(input2.sortBy, ["relevance", "recent"]),
-        maxForums: optionalNumber(input2.maxForums),
-        maxDiscussionsPerForum: optionalNumber(input2.maxDiscussionsPerForum)
-      });
-    case "get_thread":
-      return gateway.getThread({ discussionId: numberValue3(input2.discussionId) });
-    case "get_file":
-      return gateway.getFile({ source: fileSource(input2.source) });
-    default:
-      throw new McpCallError("TOOL_NOT_FOUND", `Unknown Moodle tool: ${name}`);
-  }
-}
-function wrapToolOutput(name, payload) {
-  const keys = {
-    get_user: "user",
-    get_overview: "overview",
-    list_courses: "courses",
-    get_course: "course",
-    list_activities: "activities",
-    get_activity: "activity",
-    get_grades: "grades",
-    list_forums: "forums",
-    search_forums: "results",
-    get_thread: "thread"
-  };
-  if (name === "get_file" && isMoodleFile(payload)) {
-    return {
-      file: {
-        name: payload.name,
-        mime_type: payload.mimeType,
-        bytes: payload.bytes,
-        uri: payload.uri
-      }
-    };
-  }
-  return { [keys[name] ?? "result"]: payload };
-}
-function toolContent(name, payload) {
-  const text = { type: "text", text: summarizeToolOutput(name, payload) };
+function toolContent(name, payload, structuredContent) {
+  const text = { type: "text", text: JSON.stringify(structuredContent) };
   if (name !== "get_file" || !isMoodleFile(payload)) return [text];
   return [
     text,
@@ -29588,42 +29859,6 @@ function toolContent(name, payload) {
     }
   ];
 }
-function summarizeToolOutput(name, payload) {
-  if (Array.isArray(payload)) {
-    const labels = {
-      list_courses: ["Moodle course", "Moodle courses"],
-      list_activities: ["activity", "activities"],
-      list_forums: ["forum", "forums"],
-      search_forums: ["forum result", "forum results"]
-    };
-    const [singular, plural2] = labels[name] ?? ["result", "results"];
-    return `Found ${payload.length} ${payload.length === 1 ? singular : plural2}.`;
-  }
-  if (name === "get_user" && isRecord7(payload)) {
-    return `Authenticated as ${stringValue4(payload.fullname)}.`;
-  }
-  if (name === "get_overview" && isRecord7(payload)) {
-    const courses = Array.isArray(payload.courses) ? payload.courses.length : 0;
-    const todo = Array.isArray(payload.todo) ? payload.todo.length : 0;
-    return `Overview includes ${courses} courses and ${todo} upcoming items.`;
-  }
-  if (name === "get_course" && isRecord7(payload) && isRecord7(payload.course)) {
-    return `Loaded course ${stringValue4(payload.course.fullname) || numberValue3(payload.course.id)}.`;
-  }
-  if (name === "get_activity" && isRecord7(payload)) {
-    return `Loaded activity ${stringValue4(payload.name) || numberValue3(payload.id)}.`;
-  }
-  if (name === "get_grades" && isRecord7(payload)) {
-    return `Loaded grades for ${stringValue4(payload.course_name) || numberValue3(payload.course_id)}.`;
-  }
-  if (name === "get_thread" && isRecord7(payload)) {
-    return `Loaded forum thread ${stringValue4(payload.subject) || numberValue3(payload.id)}.`;
-  }
-  if (name === "get_file" && isMoodleFile(payload)) {
-    return `Loaded Moodle file ${payload.name} (${payload.bytes} bytes).`;
-  }
-  return "Moodle request completed.";
-}
 function mapMoodleError(error62) {
   const record2 = isRecord7(error62) ? error62 : {};
   const code = typeof record2.code === "string" ? record2.code : "";
@@ -29636,7 +29871,7 @@ function mapMoodleError(error62) {
   const type = code.startsWith("MOODLE_") ? code : typeByCode[code] ?? "MOODLE_UPSTREAM_ERROR";
   const message = type === "MOODLE_AUTH_REQUIRED" ? "The Moodle session has expired. Sign in again." : type === "MOODLE_NOT_FOUND" || type === "MOODLE_COURSE_NOT_FOUND" ? "The requested Moodle item was not found." : type === "MOODLE_INVALID_REQUEST" ? "The Moodle request is invalid." : "Moodle could not complete the request.";
   const moodleCode = typeof record2.moodleErrorCode === "string" && /^[a-z][a-z0-9_]{0,63}$/u.test(record2.moodleErrorCode) ? record2.moodleErrorCode : void 0;
-  return { type, message, ...moodleCode ? { moodleCode } : {} };
+  return { type, message, hint: type === "MOODLE_AUTH_REQUIRED" ? "Run moodle mcp login for a remote server, or moodle auth login locally; then retry." : "Run moodle doctor, or refine the request using units and find.", ...type === "MOODLE_AUTH_REQUIRED" ? { recovery: { action: "moodle mcp login", where: "machine running moodle-cli", then: "retry this tool" } } : {}, ...moodleCode ? { moodleCode } : {} };
 }
 var McpCallError = class extends Error {
   type;
@@ -29648,24 +29883,6 @@ var McpCallError = class extends Error {
     this.details = details;
   }
 };
-function numberValue3(value) {
-  return typeof value === "number" ? value : 0;
-}
-function optionalNumber(value) {
-  return typeof value === "number" ? value : void 0;
-}
-function stringValue4(value) {
-  return typeof value === "string" ? value : "";
-}
-function fileSource(value) {
-  return typeof value === "number" || typeof value === "string" ? value : "";
-}
-function booleanValue2(value) {
-  return value === true;
-}
-function enumValue(value, values) {
-  return typeof value === "string" && values.includes(value) ? value : values[0];
-}
 function isRecord7(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -29683,7 +29900,7 @@ var FetchMoodleSessionUpstream = class {
   fetchImpl;
   constructor(origin, fetchImpl) {
     this.origin = new URL(origin).origin;
-    this.fetchImpl = fetchImpl ?? ((input2, init) => fetch(input2, init));
+    this.fetchImpl = fetchImpl ?? ((input3, init) => fetch(input3, init));
   }
   async validate(candidate) {
     if (new URL(candidate.moodleOrigin).origin !== this.origin) return { valid: false, code: "SESSION_INVALID" };
@@ -29858,21 +30075,21 @@ var SessionBroker = class {
     if (!request.headers.get("content-type")?.toLowerCase().startsWith("application/json")) {
       return problemResponse(415, "UNSUPPORTED_MEDIA_TYPE", "Unsupported Media Type", "Session updates must use application/json.");
     }
-    let input2;
+    let input3;
     try {
-      input2 = await request.json();
+      input3 = await request.json();
     } catch {
       return problemResponse(400, "INVALID_JSON", "Bad Request", "The request body is not valid JSON.");
     }
-    if (!isSessionCandidate(input2)) {
+    if (!isSessionCandidate(input3)) {
       return problemResponse(400, "SESSION_CANDIDATE_INVALID", "Bad Request", "The session candidate is invalid.");
     }
-    if (normalizeOrigin(input2.moodleOrigin) !== normalizeOrigin(this.env.MOODLE_ORIGIN)) {
+    if (normalizeOrigin(input3.moodleOrigin) !== normalizeOrigin(this.env.MOODLE_ORIGIN)) {
       return problemResponse(403, "MOODLE_ORIGIN_MISMATCH", "Forbidden", "The session candidate belongs to a different Moodle origin.");
     }
     let validation;
     try {
-      validation = await this.dependencies.upstream.validate(input2);
+      validation = await this.dependencies.upstream.validate(input3);
     } catch {
       return problemResponse(503, "MOODLE_UNREACHABLE", "Service Unavailable", "Moodle could not be reached to validate the session candidate.");
     }
@@ -29885,13 +30102,13 @@ var SessionBroker = class {
       return problemResponse(422, "SESSION_IDENTITY_UNKNOWN", "Unprocessable Content", "Moodle did not provide a valid account identity.");
     }
     const result = await this.transaction(async (storage) => {
-      const current = await this.readSession(storage);
-      const currentRevision = current?.revision ?? null;
-      if (currentRevision !== input2.expectedRevision) return null;
-      if (current && current.moodle_user_id !== validation.moodleUserId) return "identity_mismatch";
+      const current2 = await this.readSession(storage);
+      const currentRevision = current2?.revision ?? null;
+      if (currentRevision !== input3.expectedRevision) return null;
+      if (current2 && current2.moodle_user_id !== validation.moodleUserId) return "identity_mismatch";
       const session = {
-        cookie_value: validation.rotatedCookie ?? input2.cookieValue,
-        cookie_name: input2.cookieName,
+        cookie_value: validation.rotatedCookie ?? input3.cookieValue,
+        cookie_name: input3.cookieName,
         revision: (currentRevision ?? 0) + 1,
         sesskey: validation.sesskey,
         moodle_user_id: validation.moodleUserId,
@@ -29931,37 +30148,37 @@ var SessionBroker = class {
     return Response.json({ status: "kept_alive", revision: result.revision, nextAlarmAt: result.next_alarm_at });
   }
   async touchSession() {
-    const current = await this.loadSession();
-    if (!current) return "missing";
-    const cookie = current.cookie_value;
+    const current2 = await this.loadSession();
+    if (!current2) return "missing";
+    const cookie = current2.cookie_value;
     let touched;
     try {
       touched = await this.dependencies.upstream.touch({
         moodleOrigin: this.env.MOODLE_ORIGIN,
-        cookieName: current.cookie_name,
+        cookieName: current2.cookie_name,
         cookieValue: cookie,
-        sesskey: current.sesskey
+        sesskey: current2.sesskey
       });
     } catch {
-      await this.recordFailure(current, "MOODLE_UNREACHABLE");
+      await this.recordFailure(current2, "MOODLE_UNREACHABLE");
       return "unreachable";
     }
     if (touched.alive === null) {
-      await this.recordFailure(current, "MOODLE_UNREACHABLE");
+      await this.recordFailure(current2, "MOODLE_UNREACHABLE");
       return "unreachable";
     }
     if (!touched.alive) {
-      const expired = { ...current, last_error_code: "SESSION_EXPIRED", expires_at: this.now(), next_alarm_at: null };
-      if (await this.putIfCurrent(current, expired)) await this.state.storage.deleteAlarm?.();
+      const expired = { ...current2, last_error_code: "SESSION_EXPIRED", expires_at: this.now(), next_alarm_at: null };
+      if (await this.putIfCurrent(current2, expired)) await this.state.storage.deleteAlarm?.();
       return "expired";
     }
     const now = this.now();
     const nextAlarmAt = nextTouchAt(now, touched.remainingSeconds);
     const nextCookie = touched.rotatedCookie ?? cookie;
     const updated = {
-      ...current,
+      ...current2,
       cookie_value: nextCookie,
-      revision: touched.rotatedCookie ? current.revision + 1 : current.revision,
+      revision: touched.rotatedCookie ? current2.revision + 1 : current2.revision,
       last_verified_at: now,
       last_touch_at: now,
       last_error_code: null,
@@ -29969,27 +30186,27 @@ var SessionBroker = class {
       expires_at: expiresAt(now, touched.remainingSeconds),
       failure_count: 0
     };
-    if (await this.putIfCurrent(current, updated)) {
+    if (await this.putIfCurrent(current2, updated)) {
       await this.state.storage.setAlarm(nextAlarmAt);
       return updated;
     }
     return await this.loadSession() ?? "missing";
   }
-  async recordFailure(current, code) {
-    const failureCount = current.failure_count + 1;
+  async recordFailure(current2, code) {
+    const failureCount = current2.failure_count + 1;
     const nextAlarmAt = this.now() + Math.min(MIN_TOUCH_DELAY_MS * 2 ** (failureCount - 1), MAX_BACKOFF_MS);
     const updated = {
-      ...current,
+      ...current2,
       last_error_code: code,
       next_alarm_at: nextAlarmAt,
       failure_count: failureCount
     };
-    if (await this.putIfCurrent(current, updated)) await this.state.storage.setAlarm(nextAlarmAt);
+    if (await this.putIfCurrent(current2, updated)) await this.state.storage.setAlarm(nextAlarmAt);
   }
   putIfCurrent(expected, updated) {
     return this.transaction(async (storage) => {
-      const current = await this.readSession(storage);
-      if (current?.revision !== expected.revision || current.cookie_value !== expected.cookie_value) return false;
+      const current2 = await this.readSession(storage);
+      if (current2?.revision !== expected.revision || current2.cookie_value !== expected.cookie_value) return false;
       await this.writeSession(storage, updated);
       return true;
     });