infinitecampus-mcp 3.1.9 → 3.2.1

package/dist/bundle.js

@@ -91,6 +91,7 @@ var require_util = __commonJS({
     exports.explicitlyAborted = explicitlyAborted2;
     exports.prefixIssues = prefixIssues2;
     exports.unwrapMessage = unwrapMessage2;
+    exports.sizeCaps = sizeCaps2;
     exports.attachSchema = attachSchema2;
     exports.finalizeIssue = finalizeIssue2;
     exports.getSizableOrigin = getSizableOrigin2;
@@ -625,6 +626,18 @@ var require_util = __commonJS({
     function unwrapMessage2(message) {
       return typeof message === "string" ? message : message?.message;
     }
+    function sizeCaps2(defChecks) {
+      const caps = [];
+      for (const ch of defChecks ?? []) {
+        const d = ch._zod.def;
+        if (!/_(length|size)$|_equals$/.test(d.check))
+          break;
+        const max = d.maximum ?? d.length ?? d.size;
+        if (max >= 0)
+          caps.push([max, ch]);
+      }
+      return caps;
+    }
     function attachSchema2(issues, start, inst) {
       var _a3;
       for (let i = start; i < issues.length; i++) {
@@ -2289,7 +2302,7 @@ var require_versions = __commonJS({
     exports.version = {
       major: 4,
       minor: 6,
-      patch: 5
+      patch: 7
     };
     (function() {
       var keys = Object.getOwnPropertyNames(exports);
@@ -3123,6 +3136,31 @@ var require_schemas = __commonJS({
         return payload;
       };
     });
+    function capSize2(inst, size) {
+      const caps = util.sizeCaps(inst._zod.def.checks);
+      if (!caps.length)
+        return;
+      const cap = Math.min(...caps.map((c) => c[0]));
+      const parse3 = inst._zod.parse;
+      inst._zod.parse = (payload, ctx) => {
+        const n = size(payload.value);
+        if (n > cap && !ctx?.skipChecks && ctx?.direction !== "backward") {
+          for (const [max, ch] of util.sizeCaps(inst._zod.def.checks)) {
+            if (n > max && ch._zod.def.when(payload)) {
+              const start = payload.issues.length;
+              ch._zod.check(payload);
+              payload.issues[start].continue = false;
+              util.attachSchema(payload.issues, start, inst);
+              return payload;
+            }
+          }
+        }
+        return parse3(payload, ctx);
+      };
+    }
+    var arraySize2 = (input2) => Array.isArray(input2) ? input2.length : -1;
+    var mapSize2 = (input2) => input2 instanceof Map ? input2.size : -1;
+    var setSize2 = (input2) => input2 instanceof Set ? input2.size : -1;
     function handleArrayResult2(result, final, index) {
       if (result.issues.length) {
         final.issues.push(...util.prefixIssues(index, result.issues));
@@ -3166,6 +3204,7 @@ var require_schemas = __commonJS({
         }
         return payload;
       };
+      capSize2(inst, arraySize2);
     });
     function handlePropertyResult2(result, final, key, input2, optin, optout) {
       const isPresent = key in input2;
@@ -4122,6 +4161,7 @@ var require_schemas = __commonJS({
           return Promise.all(proms).then(() => payload);
         return payload;
       };
+      capSize2(inst, mapSize2);
     });
     function handleMapResult2(keyResult, valueResult, final, key, input2, inst, ctx) {
       if (keyResult.issues.length) {
@@ -4188,6 +4228,7 @@ var require_schemas = __commonJS({
           return Promise.all(proms).then(() => payload);
         return payload;
       };
+      capSize2(inst, setSize2);
     });
     function handleSetResult2(result, final) {
       if (result.issues.length) {
@@ -16292,9 +16333,15 @@ ${code}
       doc.write(`}`);
       return outputVar;
     }
+    function generateSizeGate2(doc, schema, size) {
+      for (const [max, check2] of util.sizeCaps(schema._zod.def.checks)) {
+        doc.write(`if (${size} > ${numericOperand2(max, check2._zod.def.check)}) return INVALID;`);
+      }
+    }
     function generateArrayCheck2(doc, ctx, schema, accessor, buildsValue = true) {
       const def = schema._zod.def;
       doc.write(`if (!Array.isArray(${accessor})) return INVALID;`);
+      generateSizeGate2(doc, schema, `${accessor}.length`);
       const outputVar = buildsValue ? newVar2(ctx) : null;
       const iVar = newVar2(ctx);
       const elemVar = newVar2(ctx);
@@ -16694,6 +16741,7 @@ ${code}
     function generateMapCheck2(doc, ctx, schema, accessor) {
       const def = schema._zod.def;
       doc.write(`if (!(${accessor} instanceof Map)) return INVALID;`);
+      generateSizeGate2(doc, schema, `${accessor}.size`);
       const outputVar = newVar2(ctx);
       const kVar = newVar2(ctx);
       const valVar = newVar2(ctx);
@@ -16710,6 +16758,7 @@ ${code}
     function generateSetCheck2(doc, ctx, schema, accessor) {
       const def = schema._zod.def;
       doc.write(`if (!(${accessor} instanceof Set)) return INVALID;`);
+      generateSizeGate2(doc, schema, `${accessor}.size`);
       const outputVar = newVar2(ctx);
       const valVar = newVar2(ctx);
       doc.write(`const ${outputVar} = new Set();`);
@@ -27078,7 +27127,7 @@ function declaredDialect(schema, remedy) {
   throw new Error(`JSON Schema declares an unsupported dialect ("$schema": "${schema.$schema.slice(0, 200)}"). The default validator supports JSON Schema 2020-12, 2019-09, draft-07, and draft-06; ${remedy}`);
 }
 
-// node_modules/@modelcontextprotocol/core/dist/auth-BNDyLTqp.mjs
+// node_modules/@modelcontextprotocol/server/node_modules/@modelcontextprotocol/core/dist/auth-BNDyLTqp.mjs
 var z = __toESM(require_v4(), 1);
 var LATEST_PROTOCOL_VERSION = "2025-11-25";
 var SUPPORTED_PROTOCOL_VERSIONS = [
@@ -41871,7 +41920,7 @@ var API_KEY_RE = new RegExp([
   // webhook signing secret (Stripe-style)
 ].map((p) => `\\b${p}`).join("|"), "g");
 var GOOGLE_OAUTH_TOKEN_RE = /(?<![A-Za-z0-9+/])(?:ya29\.|1\/\/)[A-Za-z0-9._-]{8,}/g;
-var QUERY_SECRET_RE = new RegExp(`([?&](?:(?:access|refresh|id|auth|session|csrf|xsrf)[_-]?token|client[_-]?secret|api[_-]?secret|api[_-]?key|password|passwd|signature|token|key|sig|(?:code[_-]?)?verifier|(?:php|j)?sess(?:ion)?[_-]?id|sid|x[-_]${HEADER_NAME_RUN}?(?:api[-_]?key|token|secret|auth)${HEADER_NAME_RUN})=)[^&#\\s"'<>\`]+`, "gi");
+var QUERY_SECRET_RE = new RegExp(`([?&#;](?:(?:access|refresh|id|auth|session|csrf|xsrf|api)[_-]?token|client[_-]?secret|api[_-]?secret|api[_-]?key|password|passwd|signature|secret|token|auth|key|sig|(?:code[_-]?)?verifier|(?:php|j)?sess(?:ion)?[_-]?id|sid|x[-_]${HEADER_NAME_RUN}?(?:api[-_]?key|token|secret|auth)${HEADER_NAME_RUN})=)[^&#\\s"'<>\`]+`, "gi");
 var OAUTH_CODE_RE = /([?&]code=)(?=[^&#\s"'<>`]{16,})[^&#\s"'<>`]+/gi;
 var FORM_PASSWORD_RE = /((?:^|[\s,;:"'(\[{])(?:password|passwd)=)[^&#\s"'<>`]+/gim;
 var HEADER_SECRET_RE = new RegExp(`(\\b(?:x[-_]${HEADER_NAME_RUN}?(?:api[-_]?key|token|secret|auth)${HEADER_NAME_RUN}|api[-_]?key)\\s*:\\s*)[^\\s,;"'<>\`]+`, "gi");
@@ -41882,6 +41931,8 @@ var JSON_SECRET_KEYS = [
   "api[_-]?secret",
   "(?:x[_-])?api[_-]?key",
   "private[_-]?key",
+  "aws[_-]?secret[_-]?access[_-]?key",
+  // fleet-audit#1297
   "code[_-]?verifier",
   // PKCE; a bare `verifier` key is too generic for JSON
   `x[_-]${HEADER_NAME_RUN}?(?:api[_-]?key|token|secret|auth)${HEADER_NAME_RUN}`,
@@ -42579,6 +42630,7 @@ __export(util_exports, {
   required: () => required,
   safeExtend: () => safeExtend,
   shallowClone: () => shallowClone,
+  sizeCaps: () => sizeCaps,
   slugify: () => slugify,
   stringifyPrimitive: () => stringifyPrimitive,
   toZod: () => toZod,
@@ -43098,6 +43150,18 @@ function prefixIssues(path, issues) {
 function unwrapMessage(message) {
   return typeof message === "string" ? message : message?.message;
 }
+function sizeCaps(defChecks) {
+  const caps = [];
+  for (const ch of defChecks ?? []) {
+    const d = ch._zod.def;
+    if (!/_(length|size)$|_equals$/.test(d.check))
+      break;
+    const max = d.maximum ?? d.length ?? d.size;
+    if (max >= 0)
+      caps.push([max, ch]);
+  }
+  return caps;
+}
 function attachSchema(issues, start, inst) {
   var _a3;
   for (let i = start; i < issues.length; i++) {
@@ -44518,7 +44582,7 @@ ${content.join("\n")}
 var version = {
   major: 4,
   minor: 6,
-  patch: 5
+  patch: 7
 };
 
 // node_modules/zod/v4/core/schemas.js
@@ -45274,6 +45338,31 @@ var $ZodDate = /* @__PURE__ */ $constructor("$ZodDate", (inst, def) => {
     return payload;
   };
 });
+function capSize(inst, size) {
+  const caps = sizeCaps(inst._zod.def.checks);
+  if (!caps.length)
+    return;
+  const cap = Math.min(...caps.map((c) => c[0]));
+  const parse3 = inst._zod.parse;
+  inst._zod.parse = (payload, ctx) => {
+    const n = size(payload.value);
+    if (n > cap && !ctx?.skipChecks && ctx?.direction !== "backward") {
+      for (const [max, ch] of sizeCaps(inst._zod.def.checks)) {
+        if (n > max && ch._zod.def.when(payload)) {
+          const start = payload.issues.length;
+          ch._zod.check(payload);
+          payload.issues[start].continue = false;
+          attachSchema(payload.issues, start, inst);
+          return payload;
+        }
+      }
+    }
+    return parse3(payload, ctx);
+  };
+}
+var arraySize = (input2) => Array.isArray(input2) ? input2.length : -1;
+var mapSize = (input2) => input2 instanceof Map ? input2.size : -1;
+var setSize = (input2) => input2 instanceof Set ? input2.size : -1;
 function handleArrayResult(result, final, index) {
   if (result.issues.length) {
     final.issues.push(...prefixIssues(index, result.issues));
@@ -45317,6 +45406,7 @@ var $ZodArray = /* @__PURE__ */ $constructor("$ZodArray", (inst, def) => {
     }
     return payload;
   };
+  capSize(inst, arraySize);
 });
 function handlePropertyResult(result, final, key, input2, optin, optout) {
   const isPresent = key in input2;
@@ -46273,6 +46363,7 @@ var $ZodMap = /* @__PURE__ */ $constructor("$ZodMap", (inst, def) => {
       return Promise.all(proms).then(() => payload);
     return payload;
   };
+  capSize(inst, mapSize);
 });
 function handleMapResult(keyResult, valueResult, final, key, input2, inst, ctx) {
   if (keyResult.issues.length) {
@@ -46339,6 +46430,7 @@ var $ZodSet = /* @__PURE__ */ $constructor("$ZodSet", (inst, def) => {
       return Promise.all(proms).then(() => payload);
     return payload;
   };
+  capSize(inst, setSize);
 });
 function handleSetResult(result, final) {
   if (result.issues.length) {
@@ -55869,9 +55961,15 @@ function generateNullableCheck(doc, ctx, schema, accessor, buildsValue = true) {
   doc.write(`}`);
   return outputVar;
 }
+function generateSizeGate(doc, schema, size) {
+  for (const [max, check2] of sizeCaps(schema._zod.def.checks)) {
+    doc.write(`if (${size} > ${numericOperand(max, check2._zod.def.check)}) return INVALID;`);
+  }
+}
 function generateArrayCheck(doc, ctx, schema, accessor, buildsValue = true) {
   const def = schema._zod.def;
   doc.write(`if (!Array.isArray(${accessor})) return INVALID;`);
+  generateSizeGate(doc, schema, `${accessor}.length`);
   const outputVar = buildsValue ? newVar(ctx) : null;
   const iVar = newVar(ctx);
   const elemVar = newVar(ctx);
@@ -56271,6 +56369,7 @@ function literalPropertyKey(ctx, key) {
 function generateMapCheck(doc, ctx, schema, accessor) {
   const def = schema._zod.def;
   doc.write(`if (!(${accessor} instanceof Map)) return INVALID;`);
+  generateSizeGate(doc, schema, `${accessor}.size`);
   const outputVar = newVar(ctx);
   const kVar = newVar(ctx);
   const valVar = newVar(ctx);
@@ -56287,6 +56386,7 @@ function generateMapCheck(doc, ctx, schema, accessor) {
 function generateSetCheck(doc, ctx, schema, accessor) {
   const def = schema._zod.def;
   doc.write(`if (!(${accessor} instanceof Set)) return INVALID;`);
+  generateSizeGate(doc, schema, `${accessor}.size`);
   const outputVar = newVar(ctx);
   const valVar = newVar(ctx);
   doc.write(`const ${outputVar} = new Set();`);
@@ -62094,10 +62194,63 @@ function codePointOr(code, raw) {
   return String.fromCodePoint(code);
 }
 
+// node_modules/@chrischall/mcp-utils/dist/internal/tags.js
+function replaceTags(html, replacement) {
+  let out = "";
+  let i = 0;
+  for (; ; ) {
+    const lt = html.indexOf("<", i);
+    if (lt < 0)
+      break;
+    const gt = html.indexOf(">", lt + 1);
+    if (gt < 0)
+      break;
+    if (gt === lt + 1) {
+      out += html.slice(i, lt + 1);
+      i = lt + 1;
+      continue;
+    }
+    out += html.slice(i, lt) + replacement;
+    i = gt + 1;
+  }
+  return out + html.slice(i);
+}
+
 // node_modules/@chrischall/mcp-utils/dist/scrape/index.js
+var NAMED_ENTITIES = {
+  nbsp: " ",
+  lt: "<",
+  gt: ">",
+  quot: '"',
+  apos: "'"
+};
+function decodeHtmlEntities(text) {
+  return text.replace(/&#(\d+);/g, (whole, d) => codePointOr(Number(d), whole)).replace(/&#x([0-9a-fA-F]+);/g, (whole, h) => codePointOr(parseInt(h, 16), whole)).replace(/&(nbsp|lt|gt|quot|apos);/gi, (whole, name) => {
+    return NAMED_ENTITIES[name.toLowerCase()] ?? whole;
+  }).replace(/&amp;/gi, "&");
+}
 var NEXT_DATA_MAX_CHARS = 16 * 1024 * 1024;
 function isCloudflareChallenge(html) {
-  return /_cf_chl_opt/.test(html) || /<title[^>]*>\s*Just a moment/i.test(html);
+  return html.includes("_cf_chl_opt") || hasJustAMomentTitle(html);
+}
+var JUST_A_MOMENT = "just a moment";
+function hasJustAMomentTitle(html) {
+  const lower = asciiLower(html);
+  let i = 0;
+  for (; ; ) {
+    const open3 = lower.indexOf("<title", i);
+    if (open3 < 0)
+      return false;
+    const gt = lower.indexOf(">", open3 + 6);
+    if (gt < 0)
+      return false;
+    let j = gt + 1;
+    while (j < lower.length && /\s/.test(lower[j]))
+      j++;
+    if (lower.startsWith(JUST_A_MOMENT, j))
+      return true;
+    i = gt + 1;
+  }
 }
 
 // node_modules/@chrischall/mcp-utils/dist/http/index.js
@@ -62231,6 +62384,55 @@ function splitSetCookie(header) {
   return header.split(/,(?=\s*[^;,\s]+\s*=)/).map((s) => s.trim()).filter((s) => s.length > 0);
 }
 
+// node_modules/@chrischall/mcp-utils/dist/dates/index.js
+var ISO_DATE = /^(\d{4})-(\d{2})-(\d{2})$/;
+var pad2 = (n) => String(n).padStart(2, "0");
+var USER_TIME_ZONE_ENV = "MCP_USER_TZ";
+function isValidTimeZone(timeZone) {
+  if (!timeZone)
+    return false;
+  try {
+    new Intl.DateTimeFormat("en-US", { timeZone });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function resolveUserTimeZone(opts = {}) {
+  if (opts.timeZone !== void 0)
+    return opts.timeZone;
+  const fromEnv = readEnvVar(USER_TIME_ZONE_ENV, { env: opts.env });
+  return fromEnv !== void 0 && isValidTimeZone(fromEnv) ? fromEnv : void 0;
+}
+function todayIso(nowOrOpts) {
+  const opts = nowOrOpts instanceof Date ? { now: nowOrOpts } : nowOrOpts ?? {};
+  const now = opts.now ?? /* @__PURE__ */ new Date();
+  const timeZone = resolveUserTimeZone(opts);
+  if (timeZone === void 0) {
+    return `${now.getFullYear()}-${pad2(now.getMonth() + 1)}-${pad2(now.getDate())}`;
+  }
+  if (!isValidTimeZone(timeZone))
+    throw new RangeError(`Invalid IANA time zone: ${timeZone}`);
+  const parts = new Intl.DateTimeFormat("en-CA", {
+    timeZone,
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit"
+  }).formatToParts(now);
+  const part = (type) => parts.find((p) => p.type === type)?.value ?? "";
+  return `${part("year")}-${part("month")}-${part("day")}`;
+}
+function toIsoDateUtc(d) {
+  return `${d.getUTCFullYear()}-${pad2(d.getUTCMonth() + 1)}-${pad2(d.getUTCDate())}`;
+}
+function shiftIsoDate(date5, days) {
+  const m = ISO_DATE.exec(date5.trim());
+  if (!m)
+    return date5.trim();
+  const shifted = new Date(Date.UTC(Number(m[1]), Number(m[2]) - 1, Number(m[3]) + days));
+  return toIsoDateUtc(shifted);
+}
+
 // node_modules/@chrischall/mcp-utils/dist/zod/index.js
 var PositiveInt = external_exports.number().int().positive();
 var NonNegInt = external_exports.number().int().nonnegative();
@@ -68700,7 +68902,7 @@ function resolveDownloadDir(env = process.env) {
 // package.json
 var package_default = {
   name: "infinitecampus-mcp",
-  version: "3.1.9",
+  version: "3.2.1",
   mcpName: "io.github.chrischall/infinitecampus-mcp",
   description: "Infinite Campus (Campus Parent) MCP server \u2014 multi-district, read-only (plus local document download)",
   author: "Claude Code (AI) <https://www.anthropic.com/claude>",
@@ -68745,7 +68947,7 @@ var package_default = {
     typecheck: "tsc -p tsconfig.json --noEmit"
   },
   dependencies: {
-    "@chrischall/mcp-utils": "^3.0.0",
+    "@chrischall/mcp-utils": "^3.0.3",
     "@fetchproxy/bootstrap": "^3.6.0",
     "@fetchproxy/server": "^3.6.0",
     "@modelcontextprotocol/server": "^2.3.0",
@@ -69427,6 +69629,10 @@ var ICClient = class {
   // linkedDistrictName → primaryDistrictName
   primaryName;
   featuresCache = /* @__PURE__ */ new Map();
+  /** Campus version per district, read once. A failed read is dropped, to be retried after VERSION_RETRY_MS. */
+  versions = /* @__PURE__ */ new Map();
+  /** When each district's last version read failed — see VERSION_RETRY_MS. */
+  versionFailedAt = /* @__PURE__ */ new Map();
   /**
    * True when the primary account has empty creds (fetchproxy mode). The
    * client uses pre-loaded cookies in place of the `verify.jsp` POST and
@@ -69597,7 +69803,37 @@ var ICClient = class {
   async request(district, path, opts = {}) {
     const account2 = await this.resolveAccount(district);
     await this.managers.get(account2.name).ensure();
-    return this.doRequest(account2, path, opts);
+    try {
+      return await this.doRequest(account2, path, opts);
+    } catch (e) {
+      if (e instanceof PortalUnreachableError) e.setCampusVersion(await this.campusVersion(account2.name));
+      throw e;
+    }
+  }
+  /**
+   * The district's Campus version (e.g. "2635.16"), or null when it cannot be
+   * read. DIAGNOSTIC ONLY — nothing chooses behaviour by it. The only place IC
+   * states it is the parent login page footer ("Version:Campus-2635.16"),
+   * which needs no session, so this works in fetchproxy mode too and never
+   * touches a district's cookies.
+   */
+  campusVersion(district) {
+    const account2 = this.accounts.get(district);
+    if (!account2) return Promise.resolve(null);
+    const failedAt = this.versionFailedAt.get(account2.name);
+    if (failedAt !== void 0 && Date.now() - failedAt < VERSION_RETRY_MS) return Promise.resolve(null);
+    let pending = this.versions.get(account2.name);
+    if (!pending) {
+      pending = fetchCampusVersion(account2).then((v) => {
+        if (v === null) {
+          this.versions.delete(account2.name);
+          this.versionFailedAt.set(account2.name, Date.now());
+        }
+        return v;
+      });
+      this.versions.set(account2.name, pending);
+    }
+    return pending;
   }
   /**
    * The account for `district`, running CUPS discovery once on a miss.
@@ -69973,7 +70209,30 @@ var PortalUnreachableError = class extends Error {
   }
   district;
   status;
+  /** The district's Campus version, when it could be read — for bug reports. */
+  campusVersion;
+  setCampusVersion(version2) {
+    if (version2 === null) return;
+    this.campusVersion = version2;
+    this.message += ` [Campus ${version2}]`;
+  }
 };
+function parseCampusVersion(html) {
+  return /Version:\s*Campus-([0-9][\w.-]*)/.exec(html)?.[1] ?? null;
+}
+async function fetchCampusVersion(account2) {
+  try {
+    const res = await icFetch(
+      `${account2.baseUrl}/campus/portal/parents/${encodeURIComponent(account2.district)}.jsp`,
+      {},
+      VERSION_TIMEOUT_MS
+    );
+    if (!res.ok) return null;
+    return parseCampusVersion(await res.text());
+  } catch {
+    return null;
+  }
+}
 var SessionExpiredError = class extends Error {
   constructor(district) {
     super(`Session expired for district '${district}' after re-login retry`);
@@ -69995,6 +70254,8 @@ var DocumentOriginNotAllowedError = class extends Error {
   allowedOrigin;
 };
 var REQUEST_TIMEOUT_MS = 3e4;
+var VERSION_TIMEOUT_MS = 5e3;
+var VERSION_RETRY_MS = 5 * 60 * 1e3;
 var DOWNLOAD_TIMEOUT_MS = 12e4;
 var MAX_DOWNLOAD_BYTES = 50 * 1024 * 1024;
 function icFetch(url4, init = {}, timeoutMs = REQUEST_TIMEOUT_MS) {
@@ -70119,12 +70380,19 @@ function registerHealthcheckTools(server, state) {
       const detail = {
         base_url: state.account.baseUrl,
         configured_district: state.account.district,
-        auth_source: state.source ?? "unknown"
+        auth_source: state.source ?? "unknown",
+        // Read off the login page, so it needs no session and is reported
+        // even when discovery cannot run. Diagnostic only (#253).
+        campus_version: await state.client.campusVersion(state.account.name)
       };
       try {
         await state.client.ensureDiscovery();
         const districts = state.client.listDistricts();
-        detail.districts = districts.map((d) => ({ name: d.name, linked: d.linked }));
+        detail.districts = await Promise.all(districts.map(async (d) => ({
+          name: d.name,
+          linked: d.linked,
+          campus_version: await state.client.campusVersion(d.name)
+        })));
         const linked = districts.filter((d) => d.linked).map((d) => d.name);
         detail.configured_district_is_linked = districts.some(
           (d) => d.name === state.account.district && d.linked
@@ -70189,8 +70457,8 @@ var argsSchema3 = external_exports.object({
   district: external_exports.string(),
   studentId: external_exports.string(),
   courseId: external_exports.string().describe("sectionID (optional, from ic_get_schedule). The endpoint supports server-side filtering by sectionID only.").optional(),
-  since: external_exports.string().describe("YYYY-MM-DD; filters dueDate >= since (client-side)").optional(),
-  until: external_exports.string().describe("YYYY-MM-DD; filters dueDate <= until (client-side)").optional(),
+  since: IsoDate.describe("YYYY-MM-DD; filters dueDate >= since (client-side)").optional(),
+  until: IsoDate.describe("YYYY-MM-DD; filters dueDate <= until (client-side)").optional(),
   missingOnly: external_exports.boolean().describe("Only return assignments flagged missing by the teacher").optional()
 });
 function registerAssignmentTools(server, client) {
@@ -70277,8 +70545,8 @@ function toArray(value) {
 var argsSchema5 = external_exports.object({
   district: external_exports.string(),
   studentId: external_exports.string(),
-  since: external_exports.string().describe("YYYY-MM-DD").optional(),
-  until: external_exports.string().describe("YYYY-MM-DD").optional()
+  since: IsoDate.describe("YYYY-MM-DD").optional(),
+  until: IsoDate.describe("YYYY-MM-DD").optional()
 });
 function inRange(date5, since, until) {
   if (typeof date5 !== "string") return true;
@@ -70349,8 +70617,8 @@ function registerAttendanceTools(server, client) {
 var argsSchema6 = external_exports.object({
   district: external_exports.string(),
   studentId: external_exports.string(),
-  since: external_exports.string().optional(),
-  until: external_exports.string().optional()
+  since: IsoDate.describe("YYYY-MM-DD").optional(),
+  until: IsoDate.describe("YYYY-MM-DD").optional()
 });
 function registerBehaviorTools(server, client) {
   server.registerTool("ic_list_behavior", {
@@ -70380,8 +70648,8 @@ function registerBehaviorTools(server, client) {
 var argsSchema7 = external_exports.object({
   district: external_exports.string(),
   studentId: external_exports.string(),
-  since: external_exports.string().optional(),
-  until: external_exports.string().optional()
+  since: IsoDate.describe("YYYY-MM-DD").optional(),
+  until: IsoDate.describe("YYYY-MM-DD").optional()
 });
 var EMPTY_FOOD = { balance: null, transactions: [] };
 function registerFoodServiceTools(server, client) {
@@ -70417,25 +70685,11 @@ function registerFoodServiceTools(server, client) {
 }
 
 // node_modules/@chrischall/mcp-utils/dist/html/index.js
-var NAMED_ENTITIES = {
-  nbsp: " ",
-  amp: "&",
-  lt: "<",
-  gt: ">",
-  quot: '"',
-  apos: "'"
-};
 function extractPlainTextFromHtml(html) {
   if (!html)
     return "";
   let text = stripElementContent(stripElementContent(html, "script"), "style");
-  text = text.replace(/<[^>]+>/g, " ");
-  text = text.replace(/&#(\d+);/g, (whole, d) => codePointOr(Number(d), whole));
-  text = text.replace(/&#x([0-9a-fA-F]+);/g, (whole, h) => codePointOr(parseInt(h, 16), whole));
-  text = text.replace(/&([a-zA-Z]+);/g, (whole, name) => {
-    const decoded = NAMED_ENTITIES[name.toLowerCase()];
-    return decoded ?? whole;
-  });
+  text = decodeHtmlEntities(replaceTags(text, " "));
   return text.replace(/\s+/g, " ").trim();
 }
 function stripElementContent(html, tag) {
@@ -70637,15 +70891,70 @@ function registerDocumentTools(server, client) {
 }
 
 // src/tools/calendar.ts
+function isRouteFailure(e) {
+  return e instanceof PortalUnreachableError || is404(e);
+}
+var preferDayRoute = /* @__PURE__ */ new WeakMap();
+async function fetchDayRoute(client, district, calendarID, route) {
+  if (route === "instructionalDay") {
+    return toArray(await client.request(
+      district,
+      `/campus/resources/calendar/instructionalDay?calendarID=${calendarID}`
+    ));
+  }
+  const all = toArray(await client.request(
+    district,
+    `/campus/resources/calendar/day?calendarID=${calendarID}`
+  ));
+  return all.filter((d) => d.isInstructionalDay);
+}
+async function fetchInstructionalDays(client, district, calendarID) {
+  let preferred = preferDayRoute.get(client);
+  if (!preferred) preferDayRoute.set(client, preferred = /* @__PURE__ */ new Set());
+  const routes = preferred.has(district) ? ["day", "instructionalDay"] : ["instructionalDay", "day"];
+  for (const route of routes) {
+    try {
+      const days = await fetchDayRoute(client, district, calendarID, route);
+      if (route === "day") preferred.add(district);
+      else preferred.delete(district);
+      return days;
+    } catch (e) {
+      if (!isRouteFailure(e)) throw e;
+    }
+  }
+  return null;
+}
+async function fetchDayEvents(client, district, personID) {
+  let groups;
+  try {
+    groups = toArray(await client.request(
+      district,
+      `/campus/resources/portal/dayEvent/byEnrollment?personID=${encodeURIComponent(personID)}`
+    ));
+  } catch (e) {
+    if (!isRouteFailure(e)) throw e;
+    groups = [];
+  }
+  const byCalendar = /* @__PURE__ */ new Map();
+  for (const ev of groups.flatMap((g) => toArray(g.events))) {
+    let byDate = byCalendar.get(ev.calendarID);
+    if (!byDate) byCalendar.set(ev.calendarID, byDate = /* @__PURE__ */ new Map());
+    byDate.set(ev.date, [...byDate.get(ev.date) ?? [], ev]);
+  }
+  return byCalendar;
+}
+function joinLabels(labels) {
+  return [...new Set(labels.filter((l) => !!l))].join("; ");
+}
 var argsSchema8 = external_exports.object({
   district: external_exports.string(),
   studentId: external_exports.string().describe("Student personID from ic_list_students"),
-  since: external_exports.string().describe("YYYY-MM-DD; include only days on or after this date").optional(),
-  until: external_exports.string().describe("YYYY-MM-DD; include only days on or before this date").optional()
+  since: IsoDate.describe("YYYY-MM-DD; include only days on or after this date").optional(),
+  until: IsoDate.describe("YYYY-MM-DD; include only days on or before this date").optional()
 });
 function registerCalendarTools(server, client) {
   server.registerTool("ic_list_school_days", {
-    description: "List a student's school days (instructional calendar) grouped by term. Returns one entry per enrollment, with term boundaries (Q1-Q4 start/end dates) and the school days inside each term \u2014 including comments like 'Teacher Workday' or 'Spring Break'. Use since/until to narrow the range.",
+    description: "List a student's school days (instructional calendar) grouped by term. Returns one entry per enrollment, with term boundaries (Q1-Q4 start/end dates) and the school days inside each term \u2014 a day carries comments when the calendar labels it (e.g. 'Early Release Day'). Each enrollment also lists its labelled daysOff (e.g. 'Holiday', 'Teacher Work Day', 'Spring Break'), including breaks that fall between terms. Use since/until to narrow the range. An enrollment whose day list the district won't serve comes back with warning 'SchoolDaysUnavailable' (plus campusVersion when known), its terms and days off, and no school days.",
     annotations: { readOnlyHint: true, openWorldHint: true },
     inputSchema: external_exports.object({ ...argsSchema8.shape, view: viewArg() })
   }, async (rawArgs) => {
@@ -70653,18 +70962,18 @@ function registerCalendarTools(server, client) {
     const student = await findStudent(client, args.district, args.studentId);
     if (!student) return studentNotFound(args.studentId);
     const result = [];
-    for (const enr of student.enrollments ?? []) {
-      const [termsRaw, daysRaw] = await Promise.all([
+    const enrollments = student.enrollments ?? [];
+    const events = enrollments.length > 0 ? await fetchDayEvents(client, args.district, args.studentId) : /* @__PURE__ */ new Map();
+    for (const enr of enrollments) {
+      const [termsRaw, days] = await Promise.all([
         client.request(args.district, `/campus/resources/term?structureID=${enr.structureID}`),
-        client.request(args.district, `/campus/resources/calendar/instructionalDay?calendarID=${enr.calendarID}`)
+        fetchInstructionalDays(client, args.district, enr.calendarID)
       ]);
       const terms = toArray(termsRaw);
-      const days = toArray(daysRaw);
-      const filteredDays = days.filter((d) => {
-        if (args.since && d.date < args.since) return false;
-        if (args.until && d.date > args.until) return false;
-        return true;
-      });
+      const inRange2 = (date5) => !(args.since && date5 < args.since) && !(args.until && date5 > args.until);
+      const filteredDays = (days ?? []).filter((d) => inRange2(d.date));
+      const calendarEvents = events.get(enr.calendarID) ?? /* @__PURE__ */ new Map();
+      const daysOff = [...calendarEvents.entries()].filter(([date5, evs]) => inRange2(date5) && evs.some((e) => e.instruction === false)).map(([date5, evs]) => ({ date: date5, comments: joinLabels(evs.map((e) => e.name)) })).sort((a, b) => a.date.localeCompare(b.date));
       const enrollmentTerms = terms.filter((t) => t.structureID === enr.structureID).sort((a, b) => a.seq - b.seq);
       const trimmedTerms = enrollmentTerms.map((t) => ({
         termID: t.termID,
@@ -70673,16 +70982,21 @@ function registerCalendarTools(server, client) {
         endDate: t.endDate,
         days: filteredDays.filter((d) => d.date >= t.startDate && d.date <= t.endDate).map((d) => {
           const out = { date: d.date, requiresAttendance: d.requiresAttendance };
-          if (d.comments) out.comments = d.comments;
+          const comments = joinLabels([d.comments, ...(calendarEvents.get(d.date) ?? []).map((e) => e.name)]);
+          if (comments) out.comments = comments;
           return out;
         })
-      })).filter((t) => t.days.length > 0 || !args.since && !args.until);
+      })).filter((t) => days === null ? !(args.since && t.endDate < args.since) && !(args.until && t.startDate > args.until) : t.days.length > 0 || !args.since && !args.until);
+      const campusVersion = days === null ? await client.campusVersion(args.district) : null;
       result.push({
         enrollmentID: enr.enrollmentID,
         calendarID: enr.calendarID,
         structureID: enr.structureID,
         calendarName: enr.calendarName,
-        terms: trimmedTerms
+        ...days === null ? { warning: "SchoolDaysUnavailable" } : {},
+        ...campusVersion ? { campusVersion } : {},
+        terms: trimmedTerms,
+        ...daysOff.length > 0 ? { daysOff } : {}
       });
     }
     return viewResponse(rawArgs.view, result);
@@ -70693,8 +71007,8 @@ function registerCalendarTools(server, client) {
 var argsSchema9 = external_exports.object({
   district: external_exports.string(),
   studentId: external_exports.string().describe("Student personID from ic_list_students"),
-  since: external_exports.string().describe("YYYY-MM-DD; include only events on or after this date").optional(),
-  until: external_exports.string().describe("YYYY-MM-DD; include only events on or before this date").optional(),
+  since: IsoDate.describe("YYYY-MM-DD; include only events on or after this date").optional(),
+  until: IsoDate.describe("YYYY-MM-DD; include only events on or before this date").optional(),
   excusedOnly: external_exports.boolean().describe("Only include events with excuse=E").optional()
 });
 var EVENT_KEYS = [
@@ -70788,7 +71102,7 @@ function registerAttendanceEventsTools(server, client) {
 var argsSchema10 = external_exports.object({
   district: external_exports.string(),
   studentId: external_exports.string(),
-  since: external_exports.string().describe("YYYY-MM-DD; defaults to 14 days ago. Passed to the endpoint as an ISO timestamp (modifiedDate filter).").optional()
+  since: IsoDate.describe("YYYY-MM-DD; defaults to 14 days ago. Passed to the endpoint as an ISO timestamp (modifiedDate filter).").optional()
 });
 var KEYS = [
   "assignmentName",
@@ -70806,10 +71120,8 @@ var KEYS = [
   "feedback",
   "comments"
 ];
-function defaultSinceDate(now) {
-  const d = new Date(now);
-  d.setUTCDate(d.getUTCDate() - 14);
-  return d.toISOString().substring(0, 10);
+function defaultSinceDate() {
+  return shiftIsoDate(todayIso(), -14);
 }
 function registerRecentGradesTools(server, client) {
   server.registerTool("ic_list_recent_grades", {
@@ -70818,7 +71130,7 @@ function registerRecentGradesTools(server, client) {
     inputSchema: external_exports.object({ ...argsSchema10.shape, view: viewArg() })
   }, async (rawArgs) => {
     const args = argsSchema10.parse(rawArgs);
-    const sinceDate = args.since ?? defaultSinceDate(/* @__PURE__ */ new Date());
+    const sinceDate = args.since ?? defaultSinceDate();
     const modifiedDate = `${sinceDate}T00:00:00`;
     const raw = await client.request(
       args.district,
@@ -71034,7 +71346,7 @@ try {
 }
 var COMMON = {
   name: "infinitecampus",
-  version: "3.1.9"
+  version: "3.2.1"
   // x-release-please-version
 };
 var healthState = { account, source, configError, client: null };