@chrischall/pickuppatrol-mcp 1.0.0 → 1.0.2

package/.claude-plugin/marketplace.json

@@ -6,7 +6,7 @@
   },
   "metadata": {
     "description": "PickUp Patrol school-dismissal tools for Claude Code",
-    "version": "1.0.0"
+    "version": "1.0.2"
   },
   "plugins": [
     {
@@ -14,7 +14,7 @@
       "displayName": "PickUp Patrol",
       "source": "./",
       "description": "Read and change your children's school dismissal plans in PickUp Patrol — defaults, day-by-day changes and school cutoff times — via MCP",
-      "version": "1.0.0",
+      "version": "1.0.2",
       "author": {
         "name": "Chris Chall"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "pickuppatrol",
   "displayName": "PickUp Patrol",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Read and change your children's school dismissal plans in PickUp Patrol — defaults, day-by-day changes and school cutoff times — via MCP",
   "author": {
     "name": "Chris Chall"

package/dist/auth.d.ts

@@ -1,6 +1,8 @@
 import type { ResponseStatus } from './types.js';
 export declare const BASE_URL = "https://app.pickuppatrol.net";
 export declare const BASE_PATH = "/api/json/reply";
+/** Upper bound on any one request to PickUp Patrol, sign-in included. */
+export declare const REQUEST_TIMEOUT_MS = 30000;
 /** Minimal `fetch` seam so tests never open a socket. */
 export type FetchLike = (url: string, init?: RequestInit) => Promise<Response>;
 /**
@@ -23,6 +25,8 @@ export interface AuthOptions {
     username?: string;
     password?: string;
     fetchImpl?: FetchLike;
+    /** Sign-in timeout; defaults to `REQUEST_TIMEOUT_MS`. A test seam. */
+    timeoutMs?: number;
 }
 /**
  * Pull the most useful message out of a ServiceStack error envelope. Field
@@ -39,6 +43,7 @@ export declare class PickUpPatrolAuth {
     private readonly password;
     private readonly configError;
     private readonly fetchImpl;
+    private readonly timeoutMs;
     private session;
     private inFlight;
     private permanentError;
@@ -57,6 +62,13 @@ export declare class PickUpPatrolAuth {
      * once and the call replayed exactly once — never more, so a server that
      * answers 401 unconditionally cannot turn into a login loop against the
      * account.
+     *
+     * If the session minted for the replay is rejected too, the sign-in is
+     * "succeeding" without producing a usable session — in practice a
+     * two-factor account. The login-time check cannot see that (Azure's
+     * ARRAffinity cookie means the jar is never empty), so this is where it is
+     * caught, and it is cached as permanent: otherwise every later call would
+     * spend two more sign-ins against the account.
      */
     withAuth(call: (session: PupSession) => Promise<Response>): Promise<Response>;
     private login;

package/dist/auth.js

@@ -1,6 +1,8 @@
 import { readEnvVar, McpToolError, CookieJar } from '@chrischall/mcp-utils';
 export const BASE_URL = 'https://app.pickuppatrol.net';
 export const BASE_PATH = '/api/json/reply';
+/** Upper bound on any one request to PickUp Patrol, sign-in included. */
+export const REQUEST_TIMEOUT_MS = 30_000;
 /**
  * Pull the most useful message out of a ServiceStack error envelope. Field
  * errors are more specific than the top-level message, so they win.
@@ -21,6 +23,7 @@ export class PickUpPatrolAuth {
     password;
     configError;
     fetchImpl;
+    timeoutMs;
     session = null;
     inFlight = null;
     permanentError = null;
@@ -43,6 +46,7 @@ export class PickUpPatrolAuth {
             this.configError = null;
         }
         this.fetchImpl = opts.fetchImpl ?? ((url, init) => fetch(url, init));
+        this.timeoutMs = opts.timeoutMs ?? REQUEST_TIMEOUT_MS;
     }
     /** True once a login has succeeded — used by the healthcheck tool. */
     get isAuthenticated() {
@@ -80,27 +84,64 @@ export class PickUpPatrolAuth {
      * once and the call replayed exactly once — never more, so a server that
      * answers 401 unconditionally cannot turn into a login loop against the
      * account.
+     *
+     * If the session minted for the replay is rejected too, the sign-in is
+     * "succeeding" without producing a usable session — in practice a
+     * two-factor account. The login-time check cannot see that (Azure's
+     * ARRAffinity cookie means the jar is never empty), so this is where it is
+     * caught, and it is cached as permanent: otherwise every later call would
+     * spend two more sign-ins against the account.
      */
     async withAuth(call) {
         const first = await call(await this.ensure());
         if (first.status !== 401)
             return first;
         this.invalidate();
-        return call(await this.ensure());
+        const replay = await call(await this.ensure());
+        if (replay.status !== 401)
+            return replay;
+        this.invalidate();
+        this.permanentError = new McpToolError('PickUp Patrol accepted the sign-in but rejected the session it just issued', {
+            hint: 'This usually means the account has two-factor authentication enabled, which this server does not yet complete. Sign in at https://app.pickuppatrol.net/ to check, then restart the server.',
+        });
+        throw this.permanentError;
     }
     async login() {
-        const res = await this.fetchImpl(`${BASE_URL}${BASE_PATH}/Authenticate`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json', Accept: 'application/json' },
-            body: JSON.stringify({
-                provider: 'credentials',
-                UserName: this.username,
-                Password: this.password,
-                RememberMe: true,
-            }),
-            redirect: 'manual',
-        });
-        const body = (await res.json().catch(() => null));
+        // Bounded like every other request. `ensure()` shares this promise with
+        // every concurrent and later caller until it settles, so an unanswered
+        // sign-in would otherwise stall every tool — the healthcheck included —
+        // for as long as undici's own ~300s default. The signal also covers the
+        // body read below.
+        const signal = AbortSignal.timeout(this.timeoutMs);
+        let res;
+        let body;
+        try {
+            res = await this.fetchImpl(`${BASE_URL}${BASE_PATH}/Authenticate`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json', Accept: 'application/json' },
+                body: JSON.stringify({
+                    provider: 'credentials',
+                    UserName: this.username,
+                    Password: this.password,
+                    RememberMe: true,
+                }),
+                redirect: 'manual',
+                signal,
+            });
+            body = (await res.json().catch((err) => {
+                if (signal.aborted)
+                    throw err;
+                return null;
+            }));
+        }
+        catch (err) {
+            // Transient: a timeout says nothing about the credentials, so it is
+            // never cached as permanentError and the next call signs in afresh.
+            if (signal.aborted) {
+                throw new McpToolError(`PickUp Patrol did not answer the sign-in within ${this.timeoutMs / 1000}s`, { hint: 'The service may be slow or down. Try again shortly.' });
+            }
+            throw err;
+        }
         if (!res.ok) {
             const detail = describeResponseStatus(body?.ResponseStatus);
             const code = body?.ResponseStatus?.ErrorCode ?? '';
@@ -119,8 +160,9 @@ export class PickUpPatrolAuth {
             throw error;
         }
         // Two-factor accounts return a session that is not yet usable; the SPA
-        // routes them to /two-factor. Surface that plainly rather than letting
-        // every subsequent read fail with an opaque 401.
+        // routes them to /two-factor. A login with no token and no cookie at all
+        // is caught here; the live deployment always sets ARRAffinity, though, so
+        // the usual two-factor signal is the rejected fresh session in withAuth().
         const cookieHeader = collectCookieHeader(res);
         const bearerToken = body?.BearerToken ?? null;
         if (!bearerToken && !cookieHeader) {

package/dist/bundle.js

@@ -23302,6 +23302,20 @@ var require_v4 = __commonJS({
   }
 });
 
+// node_modules/@chrischall/mcp-utils/dist/cancel/index.js
+import { AsyncLocalStorage } from "node:async_hooks";
+var storage = new AsyncLocalStorage();
+function withCallSignal(signal, fn, request) {
+  return signal ? storage.run({ signal, ...request ? { request } : {} }, fn) : fn();
+}
+
+// node_modules/@chrischall/mcp-utils/dist/caller/index.js
+import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
+var storage2 = new AsyncLocalStorage2();
+function withCallerCapabilities(capabilities, fn) {
+  return capabilities ? storage2.run(capabilities, fn) : fn();
+}
+
 // node_modules/@modelcontextprotocol/server/dist/chunk-Br0eD_fh.mjs
 var __create2 = Object.create;
 var __defProp2 = Object.defineProperty;
@@ -37977,13 +37991,28 @@ var API_KEY_RE = new RegExp([
   "whsec_[A-Za-z0-9]{16,}\\b"
   // webhook signing secret (Stripe-style)
 ].map((p) => `\\b${p}`).join("|"), "g");
-var QUERY_SECRET_RE = /([?&](?:access_token|refresh_token|client_secret|api_?key|signature|token|key|sig)=)[^&#\s"'<>`]+/gi;
+var QUERY_SECRET_RE = /([?&](?:(?:access|refresh|id|auth|session|csrf|xsrf)[_-]?token|client[_-]?secret|api[_-]?secret|api[_-]?key|password|passwd|signature|token|key|sig)=)[^&#\s"'<>`]+/gi;
+var OAUTH_CODE_RE = /([?&]code=)(?=[^&#\s"'<>`]{16,})[^&#\s"'<>`]+/gi;
+var FORM_PASSWORD_RE = /((?:^|[\s,;:"'(\[{])(?:password|passwd)=)[^&#\s"'<>`]+/gim;
+var HEADER_SECRET_RE = /(\b(?:x[-_][a-z0-9_-]*?(?:api[-_]?key|token|secret|auth)[a-z0-9_-]*|api[-_]?key)\s*:\s*)[^\s,;"'<>`]+/gi;
 var AWS_SIGV4_RE = /([?&]X-Amz-(?:Signature|Security-Token|Credential)=)[^&#\s"'<>`]+/gi;
-var JSON_SECRET_KEYS = "access_token|refresh_token|client_secret|api_?key|password|passwd|secret|token";
-var JSON_SECRET_DQ_RE = new RegExp(`("(?:${JSON_SECRET_KEYS})"\\s*:\\s*")[^"]*(")`, "gi");
-var JSON_SECRET_SQ_RE = new RegExp(`('(?:${JSON_SECRET_KEYS})'\\s*:\\s*')[^']*(')`, "gi");
+var JSON_SECRET_KEYS = [
+  "(?:access|refresh|id|auth|session|bearer|csrf|xsrf)[_-]?token",
+  "client[_-]?secret",
+  "api[_-]?secret",
+  "(?:x[_-])?api[_-]?key",
+  "private[_-]?key",
+  "x[_-][a-z0-9_-]*?(?:api[_-]?key|token|secret|auth)[a-z0-9_-]*",
+  "(?:proxy-)?authorization",
+  "password",
+  "passwd",
+  "secret",
+  "token"
+].join("|");
+var JSON_SECRET_DQ_RE = new RegExp(`("(?:${JSON_SECRET_KEYS})"\\s*:\\s*")(?:[^"\\\\]|\\\\.)*(")`, "gi");
+var JSON_SECRET_SQ_RE = new RegExp(`('(?:${JSON_SECRET_KEYS})'\\s*:\\s*')(?:[^'\\\\]|\\\\.)*(')`, "gi");
 function redactSecrets(text) {
-  return text.replace(BEARER_RE, "$1[REDACTED]").replace(BASIC_AUTH_RE, "$1[REDACTED]").replace(SET_COOKIE_RE, "$1$2=[REDACTED]").replace(COOKIE_HEADER_RE, (_m, prefix, pairs) => `${prefix}${pairs.replace(/=[^;,\s]*/g, "=[REDACTED]")}`).replace(API_KEY_RE, "[REDACTED]").replace(QUERY_SECRET_RE, "$1[REDACTED]").replace(AWS_SIGV4_RE, "$1[REDACTED]").replace(JSON_SECRET_DQ_RE, "$1[REDACTED]$2").replace(JSON_SECRET_SQ_RE, "$1[REDACTED]$2").replace(JWT_RE, "[REDACTED]");
+  return text.replace(BEARER_RE, "$1[REDACTED]").replace(BASIC_AUTH_RE, "$1[REDACTED]").replace(SET_COOKIE_RE, "$1$2=[REDACTED]").replace(COOKIE_HEADER_RE, (_m, prefix, pairs) => `${prefix}${pairs.replace(/=[^;,\s]*/g, "=[REDACTED]")}`).replace(API_KEY_RE, "[REDACTED]").replace(HEADER_SECRET_RE, "$1[REDACTED]").replace(QUERY_SECRET_RE, "$1[REDACTED]").replace(OAUTH_CODE_RE, "$1[REDACTED]").replace(FORM_PASSWORD_RE, "$1[REDACTED]").replace(AWS_SIGV4_RE, "$1[REDACTED]").replace(JSON_SECRET_DQ_RE, "$1[REDACTED]$2").replace(JSON_SECRET_SQ_RE, "$1[REDACTED]$2").replace(JWT_RE, "[REDACTED]");
 }
 function messageOf(err) {
   if (err instanceof Error)
@@ -57690,17 +57719,73 @@ Hint: ${err.hint}`);
   }
   throw err;
 }
+function mcpRequestFrom(args) {
+  const ctx = args.at(-1);
+  if (typeof ctx !== "object" || ctx === null)
+    return void 0;
+  const req = ctx.mcpReq;
+  if (typeof req !== "object" || req === null)
+    return void 0;
+  return typeof req.notify === "function" ? req : void 0;
+}
+function callSignalFrom(args) {
+  const ctx = args.at(-1);
+  if (typeof ctx !== "object" || ctx === null)
+    return void 0;
+  const req = ctx.mcpReq;
+  if (typeof req !== "object" || req === null)
+    return void 0;
+  const signal = req.signal;
+  return signal instanceof AbortSignal ? signal : void 0;
+}
+function declaredCapabilitiesFrom(server) {
+  const inner = server.server;
+  if (typeof inner !== "object" || inner === null)
+    return void 0;
+  const read = inner.getClientCapabilities;
+  if (typeof read !== "function")
+    return void 0;
+  try {
+    const declared = read.call(inner);
+    return typeof declared === "object" && declared !== null ? declared : void 0;
+  } catch {
+    return void 0;
+  }
+}
 function surfaceToolHints(server) {
   const register2 = server.registerTool.bind(server);
-  server.registerTool = (name, config2, cb) => register2(name, config2, (...args) => {
-    let result;
-    try {
-      result = cb(...args);
-    } catch (err) {
-      return hintResultOrRethrow(err);
-    }
-    return result instanceof Promise ? result.catch(hintResultOrRethrow) : result;
-  });
+  server.registerTool = (name, config2, cb) => register2(name, config2, (...args) => (
+    // THE CALLER'S CANCELLATION, made ambient for the whole handler
+    // (`cancel/index.ts`). The SDK delivers it and the fleet ignored it:
+    // measured against @modelcontextprotocol/server 2.0.0, a cancelled
+    // call aborts `ctx.mcpReq.signal` with the caller's reason and the
+    // handler runs to completion regardless — so the HTTP request stays
+    // in flight, the child keeps burning metered CPU, and the upstream
+    // keeps being hit for somebody who has gone. claude.ai sent 101
+    // cancellations in the week to 2026-09-20.
+    //
+    // Here because this is the one wrapper every tool already passes
+    // through: threading the signal by hand would mean editing several
+    // hundred handlers and missing exactly the ones nobody edits.
+    withCallSignal(callSignalFrom(args), () => (
+      // WHAT THE CALLER CAN DO, made ambient for the same reason and in
+      // the same place (`caller/index.ts`). Only the 2025-era half needs
+      // the wrapper — a 2026-07-28 request answers for itself off its own
+      // envelope — but a guarded tool that cannot tell whether the caller
+      // can be shown a prompt returns one the SDK then refuses to deliver,
+      // and that refusal reaches the caller as an unexplained protocol
+      // error it had no chance to catch.
+      withCallerCapabilities(declaredCapabilitiesFrom(server), () => {
+        let result;
+        try {
+          result = cb(...args);
+        } catch (err) {
+          return hintResultOrRethrow(err);
+        }
+        return result instanceof Promise ? result.catch(hintResultOrRethrow) : result;
+      })
+    ), mcpRequestFrom(args))
+  ));
 }
 async function createMcpServer(opts) {
   const server = new McpServer({ name: opts.name, version: opts.version }, { supportedProtocolVersions: [...SERVER_PROTOCOL_VERSIONS] });
@@ -57715,13 +57800,47 @@ async function createMcpServer(opts) {
   }
   return server;
 }
+var DEFAULT_SHUTDOWN_TIMEOUT_MS = 5e3;
+var DEFAULT_REPEAT_SIGNAL_GRACE_MS = 500;
 function withGracefulShutdown(target, opts = {}) {
   const shouldExit = opts.exit ?? true;
+  if (opts.timeoutMs !== void 0 && !(Number.isFinite(opts.timeoutMs) && opts.timeoutMs > 0)) {
+    throw new RangeError("withGracefulShutdown: timeoutMs must be a finite number greater than 0.");
+  }
+  const timeoutMs = opts.timeoutMs ?? DEFAULT_SHUTDOWN_TIMEOUT_MS;
+  if (opts.repeatSignalGraceMs !== void 0 && !(Number.isFinite(opts.repeatSignalGraceMs) && opts.repeatSignalGraceMs >= 0)) {
+    throw new RangeError("withGracefulShutdown: repeatSignalGraceMs must be a finite number >= 0.");
+  }
+  const repeatGraceMs = opts.repeatSignalGraceMs ?? DEFAULT_REPEAT_SIGNAL_GRACE_MS;
   let shuttingDown = false;
+  let firstSignalAt = 0;
+  let exited = false;
+  const exitOnce = () => {
+    if (exited)
+      return;
+    exited = true;
+    process.exit(0);
+  };
   const handler = (signal) => {
-    if (shuttingDown)
+    if (shuttingDown) {
+      if (Date.now() - firstSignalAt < repeatGraceMs)
+        return;
+      if (shouldExit) {
+        console.error(`[mcp-utils] second ${signal} during shutdown \u2014 exiting now`);
+        exitOnce();
+      }
       return;
+    }
     shuttingDown = true;
+    firstSignalAt = Date.now();
+    let timer;
+    if (shouldExit) {
+      timer = setTimeout(() => {
+        console.error(`[mcp-utils] graceful shutdown on ${signal} did not finish in ${timeoutMs}ms \u2014 exiting`);
+        exitOnce();
+      }, timeoutMs);
+      timer.unref?.();
+    }
     void (async () => {
       try {
         if (opts.onSignal)
@@ -57730,8 +57849,10 @@ function withGracefulShutdown(target, opts = {}) {
       } catch (err) {
         console.error(`[mcp-utils] error during graceful shutdown on ${signal}: ${err instanceof Error ? err.message : String(err)}`);
       } finally {
+        if (timer !== void 0)
+          clearTimeout(timer);
         if (shouldExit)
-          process.exit(0);
+          exitOnce();
       }
     })();
   };
@@ -57902,6 +58023,7 @@ import { fileURLToPath } from "url";
 // src/auth.ts
 var BASE_URL = "https://app.pickuppatrol.net";
 var BASE_PATH = "/api/json/reply";
+var REQUEST_TIMEOUT_MS = 3e4;
 function describeResponseStatus(status) {
   if (!status) return null;
   const fieldError = status.Errors?.find((e) => e?.Message);
@@ -57912,6 +58034,7 @@ var PickUpPatrolAuth = class {
   password;
   configError;
   fetchImpl;
+  timeoutMs;
   session = null;
   inFlight = null;
   permanentError = null;
@@ -57933,6 +58056,7 @@ var PickUpPatrolAuth = class {
       this.configError = null;
     }
     this.fetchImpl = opts.fetchImpl ?? ((url4, init) => fetch(url4, init));
+    this.timeoutMs = opts.timeoutMs ?? REQUEST_TIMEOUT_MS;
   }
   /** True once a login has succeeded — used by the healthcheck tool. */
   get isAuthenticated() {
@@ -57964,26 +58088,59 @@ var PickUpPatrolAuth = class {
    * once and the call replayed exactly once — never more, so a server that
    * answers 401 unconditionally cannot turn into a login loop against the
    * account.
+   *
+   * If the session minted for the replay is rejected too, the sign-in is
+   * "succeeding" without producing a usable session — in practice a
+   * two-factor account. The login-time check cannot see that (Azure's
+   * ARRAffinity cookie means the jar is never empty), so this is where it is
+   * caught, and it is cached as permanent: otherwise every later call would
+   * spend two more sign-ins against the account.
    */
   async withAuth(call) {
     const first = await call(await this.ensure());
     if (first.status !== 401) return first;
     this.invalidate();
-    return call(await this.ensure());
+    const replay = await call(await this.ensure());
+    if (replay.status !== 401) return replay;
+    this.invalidate();
+    this.permanentError = new McpToolError(
+      "PickUp Patrol accepted the sign-in but rejected the session it just issued",
+      {
+        hint: "This usually means the account has two-factor authentication enabled, which this server does not yet complete. Sign in at https://app.pickuppatrol.net/ to check, then restart the server."
+      }
+    );
+    throw this.permanentError;
   }
   async login() {
-    const res = await this.fetchImpl(`${BASE_URL}${BASE_PATH}/Authenticate`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json", Accept: "application/json" },
-      body: JSON.stringify({
-        provider: "credentials",
-        UserName: this.username,
-        Password: this.password,
-        RememberMe: true
-      }),
-      redirect: "manual"
-    });
-    const body = await res.json().catch(() => null);
+    const signal = AbortSignal.timeout(this.timeoutMs);
+    let res;
+    let body;
+    try {
+      res = await this.fetchImpl(`${BASE_URL}${BASE_PATH}/Authenticate`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json", Accept: "application/json" },
+        body: JSON.stringify({
+          provider: "credentials",
+          UserName: this.username,
+          Password: this.password,
+          RememberMe: true
+        }),
+        redirect: "manual",
+        signal
+      });
+      body = await res.json().catch((err) => {
+        if (signal.aborted) throw err;
+        return null;
+      });
+    } catch (err) {
+      if (signal.aborted) {
+        throw new McpToolError(
+          `PickUp Patrol did not answer the sign-in within ${this.timeoutMs / 1e3}s`,
+          { hint: "The service may be slow or down. Try again shortly." }
+        );
+      }
+      throw err;
+    }
     if (!res.ok) {
       const detail = describeResponseStatus(body?.ResponseStatus);
       const code = body?.ResponseStatus?.ErrorCode ?? "";
@@ -58024,7 +58181,6 @@ try {
   await loadDotenvSafely({ path: join(dir, "..", ".env"), override: false });
 } catch {
 }
-var REQUEST_TIMEOUT_MS = 3e4;
 var PickUpPatrolClient = class {
   auth;
   fetchImpl;
@@ -58069,7 +58225,9 @@ var PickUpPatrolClient = class {
       throw new McpToolError(
         `PickUp Patrol ${dto} failed (HTTP ${res.status})${detail ? `: ${detail}` : ""}`,
         {
-          hint: res.status === 401 || res.status === 403 ? "The session was rejected. Check PICKUPPATROL_USERNAME and PICKUPPATROL_PASSWORD." : void 0
+          // A 401 never gets here: withAuth() re-signs-in once and turns a
+          // second 401 into a permanent unusable-session error.
+          hint: res.status === 403 ? "The session was rejected. Check PICKUPPATROL_USERNAME and PICKUPPATROL_PASSWORD." : void 0
         }
       );
     }
@@ -58158,7 +58316,7 @@ var PickUpPatrolClient = class {
 var client = new PickUpPatrolClient();
 
 // src/version.ts
-var VERSION = "1.0.0";
+var VERSION = "1.0.2";
 
 // src/dates.ts
 var WEEKDAY_NAMES = [
@@ -58517,8 +58675,27 @@ function previewUnlessConfirmed(confirm, action, method, dto, body) {
 }
 
 // src/tools/plans.ts
-function proofsMatch(a, b) {
-  return a.transportationId === b.transportationId && (a.note ?? "").trim() === (b.note ?? "").trim();
+function normalizeTimeOfDay(time3) {
+  const trimmed = time3.trim();
+  const pad = (n) => (n ?? "0").padStart(2, "0");
+  const duration3 = /^PT(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)(?:\.\d+)?S)?$/.exec(trimmed);
+  if (duration3 && trimmed !== "PT") return `${pad(duration3[1])}:${pad(duration3[2])}:${pad(duration3[3])}`;
+  const clock = /(?:^|T)(\d{1,2}):(\d{2})(?::(\d{2}))?/.exec(trimmed);
+  if (clock) return `${pad(clock[1])}:${pad(clock[2])}:${pad(clock[3])}`;
+  return trimmed;
+}
+function proofsMatch(actual, expected) {
+  if (actual.transportationId !== expected.transportationId) return false;
+  if ((actual.note ?? "").trim() !== (expected.note ?? "").trim()) return false;
+  if (expected.earlyDismissalTime !== void 0) {
+    const want = expected.earlyDismissalTime === null ? "" : normalizeTimeOfDay(expected.earlyDismissalTime);
+    const got = actual.earlyDismissalTime ? normalizeTimeOfDay(actual.earlyDismissalTime) : "";
+    if (want !== got) return false;
+  }
+  if (expected.carNumber !== void 0) {
+    if ((actual.carNumber ?? "").trim() !== (expected.carNumber ?? "").trim()) return false;
+  }
+  return true;
 }
 function expectedPlanState(requested) {
   return requested.transportationId === null ? { transportationId: null, note: null } : requested;
@@ -58591,14 +58768,18 @@ function registerPlanTools(server, client2) {
       await client2.updatePlans(plans);
       const expected = expectedPlanState({
         transportationId: transportation_id,
-        note: plans[0]?.Note ?? null
+        note: plans[0]?.Note ?? null,
+        earlyDismissalTime: plans[0]?.EarlyDismissalTime,
+        carNumber: plans[0]?.CarNumber
       });
       const verification = await Promise.all(
         dates.map(async (date5) => {
           const after = await client2.getPlanEdit(date5, student_id);
           const actual = {
             transportationId: after.TransportationId ?? null,
-            note: after.Note ?? null
+            note: after.Note ?? null,
+            earlyDismissalTime: after.EarlyDismissalTime ?? null,
+            carNumber: after.CarNumber ?? null
           };
           return {
             date: date5,
@@ -58737,13 +58918,21 @@ function registerDefaultPlanTools(server, client2) {
       if (gate) return gate;
       await client2.updateStudent(payload);
       const after = await client2.getStudent(student_id);
-      const sentNote = payload.DefaultPlans?.find((p) => p.DayId === dayIds[0])?.Note ?? null;
+      const sent = payload.DefaultPlans?.find((p) => p.DayId === dayIds[0]);
       const unchanged = [...new Set(dayIds)].filter((dayId) => {
         const plan = (after.DefaultPlans ?? []).find((p) => p.DayId === dayId);
         if (plan === void 0) return true;
         return !proofsMatch(
-          { transportationId: plan.TransportationId ?? null, note: plan.Note ?? null },
-          { transportationId: transportation.TransportationId, note: sentNote }
+          {
+            transportationId: plan.TransportationId ?? null,
+            note: plan.Note ?? null,
+            earlyDismissalTime: plan.EarlyDismissalTime ?? null
+          },
+          {
+            transportationId: transportation.TransportationId,
+            note: sent?.Note ?? null,
+            earlyDismissalTime: sent?.EarlyDismissalTime ?? void 0
+          }
         );
       });
       return minifiedResult({

package/dist/client.js

@@ -1,7 +1,7 @@
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { loadDotenvSafely, McpToolError, buildQueryString } from '@chrischall/mcp-utils';
-import { PickUpPatrolAuth, BASE_URL, BASE_PATH, describeResponseStatus } from './auth.js';
+import { PickUpPatrolAuth, BASE_URL, BASE_PATH, REQUEST_TIMEOUT_MS, describeResponseStatus, } from './auth.js';
 // Load .env for local dev; silently skip when dotenv is unavailable (the mcpb
 // bundle externalises it). The try/catch guards a runtime where
 // `import.meta.url` is undefined and `fileURLToPath` would throw at module
@@ -13,7 +13,6 @@ try {
 catch {
     /* non-Node runtime: no .env to load */
 }
-const REQUEST_TIMEOUT_MS = 30_000;
 /**
  * Thin typed client over PickUp Patrol's ServiceStack API.
  *
@@ -68,7 +67,9 @@ export class PickUpPatrolClient {
                 detail = null;
             }
             throw new McpToolError(`PickUp Patrol ${dto} failed (HTTP ${res.status})${detail ? `: ${detail}` : ''}`, {
-                hint: res.status === 401 || res.status === 403
+                // A 401 never gets here: withAuth() re-signs-in once and turns a
+                // second 401 into a permanent unusable-session error.
+                hint: res.status === 403
                     ? 'The session was rejected. Check PICKUPPATROL_USERNAME and PICKUPPATROL_PASSWORD.'
                     : undefined,
             });

package/dist/tools/defaults.js

@@ -131,12 +131,22 @@ export function registerDefaultPlanTools(server, client) {
         // the comparison entirely: it advances by itself, which would make every
         // write look successful.
         const after = await client.getStudent(student_id);
-        const sentNote = payload.DefaultPlans?.find((p) => p.DayId === dayIds[0])?.Note ?? null;
+        // The early-dismissal time is part of the proof when one was sent: a
+        // time-only change keeps the option and note identical.
+        const sent = payload.DefaultPlans?.find((p) => p.DayId === dayIds[0]);
         const unchanged = [...new Set(dayIds)].filter((dayId) => {
             const plan = (after.DefaultPlans ?? []).find((p) => p.DayId === dayId);
             if (plan === undefined)
                 return true;
-            return !proofsMatch({ transportationId: plan.TransportationId ?? null, note: plan.Note ?? null }, { transportationId: transportation.TransportationId, note: sentNote });
+            return !proofsMatch({
+                transportationId: plan.TransportationId ?? null,
+                note: plan.Note ?? null,
+                earlyDismissalTime: plan.EarlyDismissalTime ?? null,
+            }, {
+                transportationId: transportation.TransportationId,
+                note: sent?.Note ?? null,
+                earlyDismissalTime: sent?.EarlyDismissalTime ?? undefined,
+            });
         });
         return minifiedResult({
             action,

package/dist/tools/plans.d.ts

@@ -1,13 +1,34 @@
 import type { McpServer } from '@modelcontextprotocol/server';
 import type { PickUpPatrolClient } from '../client.js';
 import type { Transportation } from '../types.js';
-/** The fields whose change proves a plan write actually landed. */
+/**
+ * The fields whose change proves a plan write actually landed.
+ *
+ * `earlyDismissalTime` and `carNumber` are part of the proof whenever the
+ * write sent them: moving an early dismissal from 14:30 to 13:00 keeps the
+ * option and note identical, so without the time a silently dropped write
+ * would read back as verified. Left `undefined` on the expected side, they
+ * are not compared — the write did not carry them.
+ */
 export interface PlanProof {
     transportationId: number | null;
     note: string | null;
+    earlyDismissalTime?: string | null | undefined;
+    carNumber?: string | null | undefined;
 }
-/** Compare two proofs, ignoring whitespace the service may normalise off a note. */
-export declare function proofsMatch(a: PlanProof, b: PlanProof): boolean;
+/**
+ * Reduce a time of day to `HH:MM:SS` so a read-back can be compared with what
+ * was sent. Accepts `H:MM`, `HH:MM:SS`, an ISO date-time, and the XSD duration
+ * ServiceStack uses for a `TimeSpan` (`PT13H30M`). Anything unrecognised is
+ * returned trimmed, so it can only ever compare unequal — a false "unchanged"
+ * is recoverable, a false "verified" is not.
+ */
+export declare function normalizeTimeOfDay(time: string): string;
+/**
+ * Compare a read-back proof with the expected one, ignoring whitespace the
+ * service may normalise off a note or car number.
+ */
+export declare function proofsMatch(actual: PlanProof, expected: PlanProof): boolean;
 /**
  * What `GetPlanEdit` should report once a write has landed.
  *

package/dist/tools/plans.js

@@ -3,9 +3,44 @@ import { McpToolError, minifiedResult } from '@chrischall/mcp-utils';
 import { buildPlanUpdates } from '../plans.js';
 import { weekdayOf } from '../dates.js';
 import { previewUnlessConfirmed, schemaConfirm } from './_confirm.js';
-/** Compare two proofs, ignoring whitespace the service may normalise off a note. */
-export function proofsMatch(a, b) {
-    return a.transportationId === b.transportationId && (a.note ?? '').trim() === (b.note ?? '').trim();
+/**
+ * Reduce a time of day to `HH:MM:SS` so a read-back can be compared with what
+ * was sent. Accepts `H:MM`, `HH:MM:SS`, an ISO date-time, and the XSD duration
+ * ServiceStack uses for a `TimeSpan` (`PT13H30M`). Anything unrecognised is
+ * returned trimmed, so it can only ever compare unequal — a false "unchanged"
+ * is recoverable, a false "verified" is not.
+ */
+export function normalizeTimeOfDay(time) {
+    const trimmed = time.trim();
+    const pad = (n) => (n ?? '0').padStart(2, '0');
+    const duration = /^PT(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)(?:\.\d+)?S)?$/.exec(trimmed);
+    if (duration && trimmed !== 'PT')
+        return `${pad(duration[1])}:${pad(duration[2])}:${pad(duration[3])}`;
+    const clock = /(?:^|T)(\d{1,2}):(\d{2})(?::(\d{2}))?/.exec(trimmed);
+    if (clock)
+        return `${pad(clock[1])}:${pad(clock[2])}:${pad(clock[3])}`;
+    return trimmed;
+}
+/**
+ * Compare a read-back proof with the expected one, ignoring whitespace the
+ * service may normalise off a note or car number.
+ */
+export function proofsMatch(actual, expected) {
+    if (actual.transportationId !== expected.transportationId)
+        return false;
+    if ((actual.note ?? '').trim() !== (expected.note ?? '').trim())
+        return false;
+    if (expected.earlyDismissalTime !== undefined) {
+        const want = expected.earlyDismissalTime === null ? '' : normalizeTimeOfDay(expected.earlyDismissalTime);
+        const got = actual.earlyDismissalTime ? normalizeTimeOfDay(actual.earlyDismissalTime) : '';
+        if (want !== got)
+            return false;
+    }
+    if (expected.carNumber !== undefined) {
+        if ((actual.carNumber ?? '').trim() !== (expected.carNumber ?? '').trim())
+            return false;
+    }
+    return true;
 }
 /**
  * What `GetPlanEdit` should report once a write has landed.
@@ -104,7 +139,8 @@ export function registerPlanTools(server, client) {
             return gate;
         await client.updatePlans(plans);
         // A 2xx is not proof the change persisted — re-read each date and
-        // compare the one field that proves it. ModifiedDate is deliberately not
+        // compare the fields that prove it (option, note, and the time / car
+        // number when sent). ModifiedDate is deliberately not
         // compared: it advances on its own, which would make every write look
         // successful.
         // One expectation for the whole call: every date in a single UpdatePlans
@@ -112,12 +148,16 @@ export function registerPlanTools(server, client) {
         const expected = expectedPlanState({
             transportationId: transportation_id,
             note: plans[0]?.Note ?? null,
+            earlyDismissalTime: plans[0]?.EarlyDismissalTime,
+            carNumber: plans[0]?.CarNumber,
         });
         const verification = await Promise.all(dates.map(async (date) => {
             const after = await client.getPlanEdit(date, student_id);
             const actual = {
                 transportationId: after.TransportationId ?? null,
                 note: after.Note ?? null,
+                earlyDismissalTime: after.EarlyDismissalTime ?? null,
+                carNumber: after.CarNumber ?? null,
             };
             return {
                 date,

package/dist/version.d.ts

@@ -7,4 +7,4 @@
  * annotation, so there is exactly one line to keep in sync and
  * `versionSyncTest` has exactly one line to check.
  */
-export declare const VERSION = "1.0.0";
+export declare const VERSION = "1.0.2";

package/dist/version.js

@@ -7,4 +7,4 @@
  * annotation, so there is exactly one line to keep in sync and
  * `versionSyncTest` has exactly one line to check.
  */
-export const VERSION = '1.0.0'; // x-release-please-version
+export const VERSION = '1.0.2'; // x-release-please-version

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrischall/pickuppatrol-mcp",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "license": "MIT",
   "mcpName": "io.github.chrischall/pickuppatrol-mcp",
   "description": "PickUp Patrol MCP server for Claude — developed and maintained by AI (Claude Code)",
@@ -57,10 +57,10 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@chrischall/mcp-utils": "^1.0.0",
+    "@chrischall/mcp-utils": "^2.4.0",
     "@modelcontextprotocol/server": "^2.0.0",
     "dotenv": "^17.4.0",
-    "zod": "^4.6.2"
+    "zod": "^4.6.5"
   },
   "devDependencies": {
     "@modelcontextprotocol/client": "^2.0.0",

package/server.json

@@ -6,12 +6,12 @@
     "url": "https://github.com/chrischall/pickuppatrol-mcp",
     "source": "github"
   },
-  "version": "1.0.0",
+  "version": "1.0.2",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "@chrischall/pickuppatrol-mcp",
-      "version": "1.0.0",
+      "version": "1.0.2",
       "transport": {
         "type": "stdio"
       }