@chrischall/office-outlook-mcp 0.4.0 → 0.5.0

package/dist/bundle.js

@@ -35334,6 +35334,30 @@ var init_dist = __esm({
 });
 
 // node_modules/@chrischall/mcp-utils/dist/errors/index.js
+function firstDeclared(err, read) {
+  let cur = err;
+  for (let depth = 0; depth < DECLARATION_CAUSE_DEPTH && cur !== null && typeof cur === "object"; depth++) {
+    const found = read(cur);
+    if (found !== void 0)
+      return found;
+    cur = cur.cause;
+  }
+  return void 0;
+}
+function errorStatusOf(err) {
+  return firstDeclared(err, (link2) => {
+    const e = link2;
+    if (typeof e.status === "number")
+      return e.status;
+    return typeof e.statusCode === "number" ? e.statusCode : void 0;
+  });
+}
+function errorKindOf(err) {
+  return firstDeclared(err, (link2) => {
+    const k = link2.kind;
+    return typeof k === "string" && MCP_TOOL_ERROR_KINDS.has(k) ? k : void 0;
+  });
+}
 function redactJsonCookie(quote) {
   const stringRe = quote === '"' ? DQ_STRING_RE : SQ_STRING_RE;
   return (_m, prefix, key, value) => {
@@ -35361,21 +35385,82 @@ function messageOf(err) {
     return err.message;
   return String(err);
 }
-var DEFAULT_ERROR_MESSAGE_MAX, McpToolError, HEADER_NAME_RUN, BEARER_RE, JWT_RE, BASIC_AUTH_RE, SET_COOKIE_RE, COOKIE_HEADER_RE, API_KEY_RE, GOOGLE_OAUTH_TOKEN_RE, QUERY_SECRET_RE, OAUTH_CODE_RE, FORM_PASSWORD_RE, HEADER_SECRET_RE, AWS_SIGV4_RE, JSON_SECRET_KEYS, JSON_SECRET_DQ_RE, JSON_SECRET_SQ_RE, JSON_SECRET_NUM_RE, JSON_COOKIE_DQ_RE, JSON_COOKIE_SQ_RE, DQ_STRING_RE, SQ_STRING_RE, ERROR_REDACTION_INPUT_MAX;
+var DEFAULT_ERROR_MESSAGE_MAX, MCP_TOOL_ERROR_KINDS, McpToolError, DECLARATION_CAUSE_DEPTH, UPSTREAM_BODY_PHRASE, UpstreamFormatError, HEADER_NAME_RUN, BEARER_RE, JWT_RE, BASIC_AUTH_RE, SET_COOKIE_RE, COOKIE_HEADER_RE, API_KEY_RE, GOOGLE_OAUTH_TOKEN_RE, QUERY_SECRET_RE, OAUTH_CODE_RE, FORM_PASSWORD_RE, HEADER_SECRET_RE, AWS_SIGV4_RE, JSON_SECRET_KEYS, JSON_SECRET_DQ_RE, JSON_SECRET_SQ_RE, JSON_SECRET_NUM_RE, JSON_COOKIE_DQ_RE, JSON_COOKIE_SQ_RE, DQ_STRING_RE, SQ_STRING_RE, ERROR_REDACTION_INPUT_MAX;
 var init_errors3 = __esm({
   "node_modules/@chrischall/mcp-utils/dist/errors/index.js"() {
     DEFAULT_ERROR_MESSAGE_MAX = 500;
+    MCP_TOOL_ERROR_KINDS = /* @__PURE__ */ new Set([
+      "no_credential",
+      "credential_rejected",
+      "edge_blocked",
+      "session_expired",
+      "verification_pending",
+      "timeout",
+      "http",
+      "transport",
+      "too_large",
+      "unknown"
+    ]);
     McpToolError = class extends Error {
       /** Actionable remediation text, when one applies. */
       hint;
+      /** The upstream HTTP status this failure came from, when known. */
+      status;
+      /** What kind of failure this is, when the thrower knows. */
+      kind;
       constructor(message, opts) {
         super(message, opts?.cause !== void 0 ? { cause: opts.cause } : void 0);
         this.name = "McpToolError";
         if (opts?.hint !== void 0)
           this.hint = opts.hint;
+        if (opts?.status !== void 0)
+          this.status = opts.status;
+        if (opts?.kind !== void 0)
+          this.kind = opts.kind;
         Object.setPrototypeOf(this, new.target.prototype);
       }
     };
+    DECLARATION_CAUSE_DEPTH = 4;
+    UPSTREAM_BODY_PHRASE = {
+      "non-json": "a non-JSON response",
+      empty: "an empty body",
+      null: "null",
+      array: "an array",
+      object: "an object",
+      string: "a string",
+      number: "a number",
+      boolean: "a boolean"
+    };
+    UpstreamFormatError = class extends McpToolError {
+      /** What the body turned out to be. */
+      received;
+      /** The shape the caller required, when it required one. */
+      expected;
+      /** The response `Content-Type`, when known. (`status` is the base class's.) */
+      contentType;
+      constructor(details) {
+        const service = details.service ?? "The upstream service";
+        const request = details.method !== void 0 && details.path !== void 0 ? `${details.method.toUpperCase()} ${details.path}` : void 0;
+        const meta3 = [
+          details.status !== void 0 ? `HTTP ${details.status}` : void 0,
+          details.contentType || void 0
+        ].filter((p) => p !== void 0);
+        const what = details.expected !== void 0 ? `${UPSTREAM_BODY_PHRASE[details.received]} where a JSON ${details.expected} was expected` + (request ? ` for ${request}` : "") : `${UPSTREAM_BODY_PHRASE[details.received]}` + (request ? ` to ${request}` : "");
+        const message = `${service} returned ${what}${meta3.length > 0 ? ` (${meta3.join(", ")})` : ""}.`;
+        const hint = details.received === "non-json" ? "The service answered with something other than JSON, usually a sign-in page or interstitial, or its API has changed. Check the session, then retry." : "The service answered with a body of the wrong shape: the resource may be missing or its API may have changed.";
+        super(truncateErrorMessage(message), {
+          hint,
+          cause: details.cause,
+          ...details.status !== void 0 ? { status: details.status } : {}
+        });
+        this.name = "UpstreamFormatError";
+        this.received = details.received;
+        if (details.expected !== void 0)
+          this.expected = details.expected;
+        if (details.contentType)
+          this.contentType = details.contentType;
+      }
+    };
     HEADER_NAME_RUN = "[a-z0-9_-]{0,40}";
     BEARER_RE = /(bearer\s+)[A-Za-z0-9._~+/=-]{8,}/gi;
     JWT_RE = /(?<![A-Za-z0-9_-])[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{8,}(?![A-Za-z0-9_-])/g;
@@ -35397,7 +35482,7 @@ var init_errors3 = __esm({
       // webhook signing secret (Stripe-style)
     ].map((p) => `\\b${p}`).join("|"), "g");
     GOOGLE_OAUTH_TOKEN_RE = /(?<![A-Za-z0-9+/])(?:ya29\.|1\/\/)[A-Za-z0-9._-]{8,}/g;
-    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|(?:php|j)?sess(?:ion)?[_-]?id|sid|x[-_]${HEADER_NAME_RUN}?(?:api[-_]?key|token|secret|auth)${HEADER_NAME_RUN})=)[^&#\\s"'<>\`]+`, "gi");
+    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");
     OAUTH_CODE_RE = /([?&]code=)(?=[^&#\s"'<>`]{16,})[^&#\s"'<>`]+/gi;
     FORM_PASSWORD_RE = /((?:^|[\s,;:"'(\[{])(?:password|passwd)=)[^&#\s"'<>`]+/gim;
     HEADER_SECRET_RE = new RegExp(`(\\b(?:x[-_]${HEADER_NAME_RUN}?(?:api[-_]?key|token|secret|auth)${HEADER_NAME_RUN}|api[-_]?key)\\s*:\\s*)[^\\s,;"'<>\`]+`, "gi");
@@ -35408,6 +35493,8 @@ var init_errors3 = __esm({
       "api[_-]?secret",
       "(?:x[_-])?api[_-]?key",
       "private[_-]?key",
+      "code[_-]?verifier",
+      // PKCE; a bare `verifier` key is too generic for JSON
       `x[_-]${HEADER_NAME_RUN}?(?:api[_-]?key|token|secret|auth)${HEADER_NAME_RUN}`,
       // bounded like HEADER_SECRET_RE
       "(?:proxy-)?authorization",
@@ -35529,6 +35616,11 @@ function textResult(data) {
     content: [{ type: "text", text: JSON.stringify(data, null, 2) }]
   };
 }
+function imageResult(base643, mimeType) {
+  return {
+    content: [{ type: "image", data: base643, mimeType }]
+  };
+}
 function errorResult(message) {
   return {
     content: [{ type: "text", text: redactSecrets(message) }],
@@ -35904,7 +35996,7 @@ function readEnvVar(key, opts = {}) {
   if (typeof raw === "string") {
     const trimmed = raw.trim();
     if (trimmed.length > 0 && trimmed !== "undefined" && trimmed !== "null" && !PLACEHOLDER_RE.test(trimmed)) {
-      return trimmed;
+      return opts.trim === false ? raw : trimmed;
     }
   }
   return opts.default;
@@ -36141,12 +36233,19 @@ function boundArgs(args) {
 }
 function confirmationFromEnv(options) {
   const { tool, account, confirmToken, subject, instruction, args, env = process.env, spent: callerSpent, ...rest } = options;
+  if (args === void 0 || args === null) {
+    throw new TypeError(`confirmationFromEnv: ${tool} passed no args; pass the tool's validated arguments ({} for a tool with none).`);
+  }
   const spent = callerSpent ?? spentTokenStoreFromEnv(env);
   const mode = readConfirmMode(env);
   const ttlSeconds = readConfirmTtl(env);
   const elicitationOff = readConfirmElicitation(env) === "off";
-  const bound = args === void 0 ? void 0 : boundArgs(args);
-  const bindingAdded = bound === void 0 || rest.binding ? rest : { ...rest, binding: { key: confirmKeyFromEnv(env), args: bound, ttlSeconds: ttlSeconds ?? DEFAULT_TTL_SECONDS2 } };
+  const bound = boundArgs(args);
+  const elicitationBound = account === void 0 ? { args: bound } : { account, args: bound };
+  const bindingAdded = rest.binding ? rest : {
+    ...rest,
+    binding: { key: confirmKeyFromEnv(env), args: elicitationBound, ttlSeconds: ttlSeconds ?? DEFAULT_TTL_SECONDS2 }
+  };
   const confirmation = elicitationOff ? { ...bindingAdded, elicitation: false } : bindingAdded;
   if (mode === "refuse" || ttlSeconds === void 0) {
     const reason = mode === "refuse" ? REFUSE_HINT : BAD_TTL_HINT;
@@ -36156,7 +36255,7 @@ function confirmationFromEnv(options) {
       unsupportedNote: confirmation.unsupportedNote ? `${confirmation.unsupportedNote} ${hint}` : hint
     };
   }
-  const boundSubject = bound === void 0 ? subject : async () => {
+  const boundSubject = async () => {
     const read = await subject();
     if ("content" in read)
       return read;
@@ -36244,7 +36343,7 @@ async function confirmWrite(ctx, options) {
     ...options.unsupportedNote === void 0 ? {} : { unsupportedNote: options.unsupportedNote },
     ...options.confirmationLabel === void 0 ? {} : { confirmationLabel: options.confirmationLabel },
     tool,
-    ...account === void 0 ? {} : { account },
+    account,
     confirmToken,
     args: bound,
     subject: () => ({ target, ...revision === void 0 ? {} : { revision }, payload: bound, preview }),
@@ -36272,12 +36371,14 @@ var init_merge_write = __esm({
 
 // node_modules/@chrischall/mcp-utils/dist/server/index.js
 function hintResultOrRethrow(err) {
+  if (err instanceof ProtocolError && err.code === ProtocolErrorCode.UrlElicitationRequired)
+    throw err;
   if (err instanceof McpToolError && err.hint) {
     return errorResult(`${err.message}
 
 Hint: ${err.hint}`);
   }
-  throw err;
+  return errorResult(messageOf(err));
 }
 function mcpRequestFrom(args) {
   const ctx = args.at(-1);
@@ -36496,6 +36597,7 @@ var init_write = __esm({
 var init_output = __esm({
   "node_modules/@chrischall/mcp-utils/dist/fs/output.js"() {
     init_config();
+    init_errors3();
     init_confine();
     init_write();
   }
@@ -36576,6 +36678,7 @@ var init_scrape = __esm({
 // node_modules/@chrischall/mcp-utils/dist/http/throttle.js
 var init_throttle = __esm({
   "node_modules/@chrischall/mcp-utils/dist/http/throttle.js"() {
+    init_cancel();
   }
 });
 
@@ -36601,6 +36704,113 @@ var init_net_atoms = __esm({
   }
 });
 
+// node_modules/@chrischall/mcp-utils/dist/http/body-limit.js
+async function readBytesCapped(res, maxBytes, service, bounded) {
+  if (maxBytes !== void 0) {
+    const declared = Number(res.headers.get("content-length") ?? NaN);
+    if (Number.isFinite(declared) && declared > maxBytes) {
+      cancelStream(res.body);
+      throw new ResponseTooLargeError(service, maxBytes);
+    }
+  }
+  if (!res.body)
+    return new Uint8Array(0);
+  const reader = res.body.getReader();
+  const chunks = [];
+  let total = 0;
+  try {
+    for (; ; ) {
+      const { done, value } = await bounded(reader.read());
+      if (done)
+        break;
+      total += value.byteLength;
+      if (maxBytes !== void 0 && total > maxBytes)
+        throw new ResponseTooLargeError(service, maxBytes);
+      chunks.push(value);
+    }
+  } catch (err) {
+    reader.cancel().catch(() => {
+    });
+    throw err;
+  }
+  const out = new Uint8Array(total);
+  let offset = 0;
+  for (const c of chunks) {
+    out.set(c, offset);
+    offset += c.byteLength;
+  }
+  return out;
+}
+function cancelStream(body) {
+  try {
+    body?.cancel().catch(() => {
+    });
+  } catch {
+  }
+}
+var ResponseTooLargeError;
+var init_body_limit = __esm({
+  "node_modules/@chrischall/mcp-utils/dist/http/body-limit.js"() {
+    init_errors3();
+    ResponseTooLargeError = class extends McpToolError {
+      maxBytes;
+      constructor(service, maxBytes) {
+        super(`Response from ${service} is larger than the ${maxBytes}-byte limit.`, {
+          hint: "Raise maxBytes (or the client's maxResponseBytes) if a response this large is expected.",
+          kind: "too_large"
+        });
+        this.name = "ResponseTooLargeError";
+        this.maxBytes = maxBytes;
+      }
+    };
+  }
+});
+
+// node_modules/@chrischall/mcp-utils/dist/http/fetch-bounded.js
+var init_fetch_bounded = __esm({
+  "node_modules/@chrischall/mcp-utils/dist/http/fetch-bounded.js"() {
+    init_cancel();
+    init_errors3();
+    init_body_limit();
+    init_http();
+  }
+});
+
+// node_modules/@chrischall/mcp-utils/dist/http/url-safety.js
+function isDotSegment(segment) {
+  const s = segment.replace(/%2e/gi, ".");
+  return s === "." || s === "..";
+}
+function pathPartOf(path) {
+  const end = path.search(/[?#]/);
+  return end === -1 ? path : path.slice(0, end);
+}
+function findPathHazard(path) {
+  const pathPart = pathPartOf(path);
+  if (/[\x00-\x1f\x7f]/.test(pathPart))
+    return "control character";
+  if (pathPart.endsWith(" "))
+    return "trailing space";
+  if (pathPart.includes("\\"))
+    return "backslash";
+  if (pathPart.split("/").some(isDotSegment))
+    return "dot segment";
+  return void 0;
+}
+var RedirectRefusedError;
+var init_url_safety = __esm({
+  "node_modules/@chrischall/mcp-utils/dist/http/url-safety.js"() {
+    init_errors3();
+    init_config();
+    RedirectRefusedError = class extends McpToolError {
+      constructor(message) {
+        super(message);
+        this.name = "RedirectRefusedError";
+      }
+    };
+  }
+});
+
 // node_modules/@chrischall/mcp-utils/dist/internal/retry-after.js
 function retryAfterToMs(header, now = Date.now()) {
   if (header == null)
@@ -36621,6 +36831,14 @@ var init_retry_after = __esm({
 });
 
 // node_modules/@chrischall/mcp-utils/dist/http/index.js
+function cancelBody(res) {
+  try {
+    const body = res.body;
+    body?.cancel?.()?.catch(() => {
+    });
+  } catch {
+  }
+}
 function headerOf(headers, name) {
   if (headers === void 0)
     return void 0;
@@ -36646,6 +36864,49 @@ function detectEdgeBlock(input2) {
   }
   return null;
 }
+function jsonKind(value) {
+  if (value === null)
+    return "null";
+  if (Array.isArray(value))
+    return "array";
+  return typeof value;
+}
+function parseJsonBody(text, opts = {}) {
+  const contentType = opts.contentType ?? headerOf(opts.headers, "content-type");
+  const details = {
+    service: opts.service,
+    method: opts.method,
+    path: opts.path,
+    status: opts.status,
+    contentType,
+    expected: opts.expect
+  };
+  if (text.trim().length === 0) {
+    if (opts.expect === void 0)
+      return void 0;
+    throw new UpstreamFormatError({ ...details, received: "empty" });
+  }
+  let value;
+  try {
+    value = JSON.parse(text);
+  } catch (cause) {
+    const edge = detectEdgeBlock({ body: text, headers: opts.headers, status: opts.status });
+    if (edge) {
+      throw new EdgeBlockedError(opts.status ?? 200, edge.vendor, {
+        service: opts.service ?? "the upstream service",
+        method: opts.method,
+        path: opts.path
+      });
+    }
+    throw new UpstreamFormatError({ ...details, expected: void 0, received: "non-json", cause });
+  }
+  if (opts.expect !== void 0) {
+    const kind = jsonKind(value);
+    if (kind !== opts.expect)
+      throw new UpstreamFormatError({ ...details, received: kind });
+  }
+  return value;
+}
 function httpError(res, text, method, path, service) {
   const edge = detectEdgeBlock({ body: text, headers: res.headers, status: res.status });
   if (edge)
@@ -36696,13 +36957,26 @@ function createApiClient(opts) {
   const sleep3 = opts.sleep ?? defaultSleep;
   const unauthorized = () => opts.onUnauthorized ? opts.onUnauthorized() : new UnauthorizedError(service);
   const retryStatuses = retry.statuses ?? [429];
-  const timeoutMs = opts.timeout;
+  const timeoutMs = opts.timeout === false ? 0 : opts.timeout ?? DEFAULT_REQUEST_TIMEOUT_MS;
+  const redirectMode = opts.redirect;
+  const maxRedirects = opts.maxRedirects ?? DEFAULT_MAX_REDIRECTS;
+  const reportWriteOutcome = opts.writeOutcomeUnknown !== false;
+  const defaultMaxBytes = checkMaxBytes("maxResponseBytes", opts.maxResponseBytes);
+  if (!Number.isSafeInteger(maxRedirects) || maxRedirects < 0) {
+    throw new TypeError(`createApiClient: maxRedirects must be a non-negative integer, got ${String(maxRedirects)}.`);
+  }
   const authHeader = (token) => !token ? {} : opts.tokenHeader ? { [opts.tokenHeader]: token } : { Authorization: `Bearer ${token}` };
+  const transportFailures = /* @__PURE__ */ new WeakSet();
+  const markTransportFailure = (err) => {
+    if (typeof err === "object" && err !== null && err.name !== "AbortError") {
+      transportFailures.add(err);
+    }
+  };
   async function withTimeout(run) {
-    if (timeoutMs == null || timeoutMs <= 0) {
+    if (timeoutMs <= 0) {
       const res2 = await run(withAmbientCancellation(void 0));
       return { res: res2, done: () => {
-      }, expired: void 0 };
+      }, expired: void 0, timedOut: () => false };
     }
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), timeoutMs);
@@ -36723,16 +36997,11 @@ function createApiClient(opts) {
     });
     expired.catch(() => {
     });
-    return { res, done: () => clearTimeout(timer), expired };
+    return { res, done: () => clearTimeout(timer), expired, timedOut: () => controller.signal.aborted };
   }
   function discard(attempt) {
     attempt.done();
-    try {
-      const body = attempt.res.body;
-      body?.cancel?.()?.catch(() => {
-      });
-    } catch {
-    }
+    cancelBody(attempt.res);
   }
   async function readBody(attempt, read) {
     try {
@@ -36740,15 +37009,40 @@ function createApiClient(opts) {
         return await read(attempt.res);
       return await Promise.race([read(attempt.res), attempt.expired]);
     } catch (err) {
-      if (err instanceof RequestTimeoutError) {
-        attempt.res.body?.cancel().catch(() => {
-        });
+      const timeout = err instanceof RequestTimeoutError || err instanceof Error && err.name === "AbortError" && attempt.timedOut();
+      if (timeout) {
+        cancelBody(attempt.res);
+        throw err instanceof RequestTimeoutError ? err : new RequestTimeoutError(service, timeoutMs);
       }
+      if (!(err instanceof ResponseTooLargeError))
+        markTransportFailure(err);
       throw err;
     } finally {
       attempt.done();
     }
   }
+  function readBytes(attempt, maxBytes) {
+    if (maxBytes === void 0)
+      return readBody(attempt, async (r) => new Uint8Array(await r.arrayBuffer()));
+    const race = (p) => attempt.expired ? Promise.race([p, attempt.expired]) : p;
+    return readBody(attempt, (r) => readBytesCapped(r, maxBytes, service, race));
+  }
+  async function readText(attempt, maxBytes) {
+    if (maxBytes === void 0)
+      return readBody(attempt, (r) => r.text());
+    return new TextDecoder().decode(await readBytes(attempt, maxBytes));
+  }
+  function readErrorText(attempt, maxBytes) {
+    return readText(attempt, maxBytes).catch((err) => {
+      if (err instanceof ResponseTooLargeError)
+        return "";
+      throw err;
+    });
+  }
+  function scanText(attempt, maxBytes) {
+    return readText(attempt, maxBytes).catch(() => "");
+  }
+  const capOf = (opt) => opt.maxBytes !== void 0 ? checkMaxBytes("maxBytes", opt.maxBytes) : defaultMaxBytes;
   const baseParts = (() => {
     try {
       const u = new URL(base);
@@ -36759,6 +37053,14 @@ function createApiClient(opts) {
   })();
   const baseOrigin = baseParts?.origin;
   function resolveUrl(path, query) {
+    const hazard = findPathHazard(path);
+    if (hazard !== void 0) {
+      throw new Error(
+        // Quote only the path part: this fires on hostile input, and the
+        // query may carry values that do not belong in a log line.
+        `Refusing request to ${service}: path ${JSON.stringify(path.split(/[?#]/, 1)[0])} contains a ${hazard}, which URL normalisation would rewrite. Build paths with apiPath\`...\` so each value is one encoded segment.`
+      );
+    }
     const url2 = `${base}${path}${query}`;
     if (baseOrigin === void 0)
       return url2;
@@ -36773,23 +37075,66 @@ function createApiClient(opts) {
     }
     return url2;
   }
-  async function send(method, path, opt) {
+  function sameOriginHop(location, from) {
+    let next;
+    try {
+      next = new URL(location, from);
+    } catch {
+      throw new RedirectRefusedError(`Refusing redirect from ${service}: the Location header is not a valid URL.`);
+    }
+    if (baseOrigin === void 0 || next.origin !== baseOrigin || next.username !== baseParts?.username || next.password !== baseParts?.password) {
+      throw new RedirectRefusedError(`Refusing redirect from ${service} to ${next.origin}: it leaves the base origin ${baseOrigin ?? "(unparseable)"}, and following it would re-send the credential there.`);
+    }
+    return next.href;
+  }
+  async function send(method, path, opt, dispatch) {
     const { body: reqBody, contentType } = encodeBody(opt);
     const query = opt.query ? buildQueryString(opt.query) : "";
     const url2 = resolveUrl(path, query);
     const bodyInit = reqBody !== void 0 ? { body: reqBody } : {};
-    const fetchWith = (token, signal) => doFetch(url2, {
-      method,
-      headers: {
-        Accept: "application/json",
-        ...contentType !== void 0 ? { "Content-Type": contentType } : {},
-        ...opts.baseHeaders,
-        ...authHeader(token || void 0),
-        ...opt.headers
-      },
-      ...signal ? { signal } : {},
-      ...bodyInit
-    });
+    const fetchHop = (hopUrl, hopMethod, withBody, token, signal) => {
+      if (!signal?.aborted)
+        dispatch.sent = true;
+      return doFetch(hopUrl, {
+        method: hopMethod,
+        headers: {
+          Accept: "application/json",
+          ...withBody && contentType !== void 0 ? { "Content-Type": contentType } : {},
+          ...opts.baseHeaders,
+          ...authHeader(token || void 0),
+          ...opt.headers
+        },
+        ...signal ? { signal } : {},
+        ...redirectMode !== void 0 ? { redirect: redirectMode === "same-origin" ? "manual" : redirectMode } : {},
+        ...withBody ? bodyInit : {}
+      }).catch((err) => {
+        markTransportFailure(err);
+        throw err;
+      });
+    };
+    const fetchWith = async (token, signal) => {
+      if (redirectMode !== "same-origin")
+        return fetchHop(url2, method, true, token, signal);
+      let hopUrl = url2;
+      let hopMethod = method;
+      let withBody = true;
+      for (let hops = 0; ; hops += 1) {
+        const res = await fetchHop(hopUrl, hopMethod, withBody, token, signal);
+        const location = REDIRECT_STATUSES.has(res.status) ? responseHeader(res, "location") : void 0;
+        if (location === void 0 || location === null)
+          return res;
+        cancelBody(res);
+        if (hops >= maxRedirects) {
+          throw new RedirectRefusedError(`Refusing request to ${service}: too many redirects (more than ${maxRedirects}).`);
+        }
+        hopUrl = sameOriginHop(location, hopUrl);
+        if (res.status === 303 || (res.status === 301 || res.status === 302) && hopMethod === "POST") {
+          if (hopMethod !== "HEAD")
+            hopMethod = "GET";
+          withBody = false;
+        }
+      }
+    };
     const once = () => withTimeout((signal) => opts.tokenManager ? opts.tokenManager.withAuth((token) => fetchWith(token, signal)) : (async () => fetchWith(await opts.getToken?.() || void 0, signal))());
     let attempt = 0;
     for (; ; ) {
@@ -36808,20 +37153,20 @@ function createApiClient(opts) {
       return current;
     }
   }
-  async function unauthorizedOrEdge(attempt, method, path) {
+  async function unauthorizedOrEdge(attempt, method, path, maxBytes) {
     const res = attempt.res;
     let text = "";
     if (/json/i.test(responseHeader(res, "content-type") ?? "")) {
       discard(attempt);
     } else {
-      text = await readBody(attempt, (r) => r.text()).catch(() => "");
+      text = await scanText(attempt, maxBytes);
     }
     const edge = detectEdgeBlock({ body: text, headers: res.headers, status: res.status });
     if (edge)
       return new EdgeBlockedError(res.status, edge.vendor, { service, method, path });
     return unauthorized();
   }
-  async function rateLimitedError(attempt, method, path) {
+  async function rateLimitedError(attempt, method, path, maxBytes) {
     const res = attempt.res;
     const retryAfter = responseHeader(res, "retry-after");
     const retryAfterMs = retryAfterToMs(retryAfter);
@@ -36833,61 +37178,92 @@ function createApiClient(opts) {
     if (/json/i.test(responseHeader(res, "content-type") ?? "")) {
       discard(attempt);
     } else {
-      text = await readBody(attempt, (r) => r.text()).catch(() => "");
+      text = await scanText(attempt, maxBytes);
     }
     const edgeBlock = detectEdgeBlock({ body: text, headers: res.headers, status: res.status });
     return opts.onRateLimited({ status: res.status, retryAfter, retryAfterMs, edgeBlock, method, path });
   }
-  async function fetchJson(method, path, opt = {}) {
-    const attempt = await send(method, path, opt);
+  async function guardWrite(method, opt, call) {
+    const dispatch = { sent: false };
+    try {
+      return await call(dispatch);
+    } catch (err) {
+      const write = reportWriteOutcome && opt.idempotent !== true && !SAFE_METHODS.has(method.toUpperCase());
+      if (!write || !dispatch.sent)
+        throw err;
+      if (err instanceof RequestTimeoutError) {
+        throw new WriteOutcomeUnknownError(service, method, {
+          timeoutMs: err.timeoutMs,
+          cause: err,
+          hint: opts.writeOutcomeHint
+        });
+      }
+      if (typeof err === "object" && err !== null && transportFailures.has(err)) {
+        throw new WriteOutcomeUnknownError(service, method, { cause: err, hint: opts.writeOutcomeHint });
+      }
+      throw err;
+    }
+  }
+  const fetchJson = (method, path, opt = {}) => guardWrite(method, opt, (dispatch) => fetchJsonOnce(method, path, opt, dispatch));
+  const fetchHtml = (method, path, opt = {}) => guardWrite(method, opt, (dispatch) => fetchHtmlOnce(method, path, opt, dispatch));
+  const fetchRaw = (method, path, opt = {}) => guardWrite(method, opt, (dispatch) => fetchRawOnce(method, path, opt, dispatch));
+  async function fetchJsonOnce(method, path, opt, dispatch) {
+    const maxBytes = capOf(opt);
+    const attempt = await send(method, path, opt, dispatch);
     const res = attempt.res;
     if (res.status === 401)
-      throw await unauthorizedOrEdge(attempt, method, path);
+      throw await unauthorizedOrEdge(attempt, method, path, maxBytes);
     if (res.status === 429)
-      throw await rateLimitedError(attempt, method, path);
+      throw await rateLimitedError(attempt, method, path, maxBytes);
     if (res.status === 204) {
       discard(attempt);
-      return void 0;
+      return parseJsonBody("", { expect: opt.expect, service, method, path, status: 204 });
     }
-    const text = await readBody(attempt, (r) => r.text());
     if (!res.ok) {
-      throw httpError(res, text, method, path, service);
+      throw httpError(res, await readErrorText(attempt, maxBytes), method, path, service);
     }
-    if (text.length === 0)
-      return void 0;
-    return JSON.parse(text);
+    const text = await readText(attempt, maxBytes);
+    return parseJsonBody(text, {
+      expect: opt.expect,
+      service,
+      method,
+      path,
+      status: res.status,
+      headers: res.headers
+    });
   }
-  async function fetchHtml(method, path, opt = {}) {
+  async function fetchHtmlOnce(method, path, opt, dispatch) {
+    const maxBytes = capOf(opt);
     const headers = { Accept: "text/html,*/*", ...opt.headers };
-    const attempt = await send(method, path, { ...opt, headers });
+    const attempt = await send(method, path, { ...opt, headers }, dispatch);
     const res = attempt.res;
     if (res.status === 401)
-      throw await unauthorizedOrEdge(attempt, method, path);
+      throw await unauthorizedOrEdge(attempt, method, path, maxBytes);
     if (res.status === 429)
-      throw await rateLimitedError(attempt, method, path);
-    const text = await readBody(attempt, (r) => r.text());
+      throw await rateLimitedError(attempt, method, path, maxBytes);
     if (!res.ok) {
-      throw httpError(res, text, method, path, service);
+      throw httpError(res, await readErrorText(attempt, maxBytes), method, path, service);
     }
-    return text;
+    return readText(attempt, maxBytes);
   }
-  async function fetchRaw(method, path, opt = {}) {
+  async function fetchRawOnce(method, path, opt, dispatch) {
+    const maxBytes = capOf(opt);
     const headers = { Accept: "*/*", ...opt.headers };
-    const attempt = await send(method, path, { ...opt, headers });
+    const attempt = await send(method, path, { ...opt, headers }, dispatch);
     const res = attempt.res;
     if (res.status === 401)
-      throw await unauthorizedOrEdge(attempt, method, path);
+      throw await unauthorizedOrEdge(attempt, method, path, maxBytes);
     if (res.status === 429)
-      throw await rateLimitedError(attempt, method, path);
+      throw await rateLimitedError(attempt, method, path, maxBytes);
     if (!res.ok) {
-      const text = await readBody(attempt, (r) => r.text()).catch((err) => {
+      const text = await readText(attempt, maxBytes).catch((err) => {
         if (err instanceof RequestTimeoutError)
           throw err;
         return "";
       });
       throw httpError(res, text, method, path, service);
     }
-    const bytes = new Uint8Array(await readBody(attempt, (r) => r.arrayBuffer()));
+    const bytes = await readBytes(attempt, maxBytes);
     return {
       status: res.status,
       contentType: responseHeader(res, "content-type"),
@@ -36897,6 +37273,14 @@ function createApiClient(opts) {
   }
   return { fetchJson, fetchHtml, fetchRaw };
 }
+function checkMaxBytes(name, value) {
+  if (value === void 0)
+    return void 0;
+  if (typeof value !== "number" || Number.isNaN(value) || value < 0) {
+    throw new TypeError(`createApiClient: ${name} must be a non-negative number, got ${String(value)}.`);
+  }
+  return value === Infinity ? void 0 : value;
+}
 function buildQueryString(params) {
   const parts = [];
   for (const [key, value] of Object.entries(params)) {
@@ -36947,7 +37331,7 @@ function decodeJwtExp(token) {
   }
   return exp;
 }
-var DEFAULT_RETRY, defaultSleep, UnauthorizedError, RateLimitedError, RequestTimeoutError, ApiError, EdgeBlockedError, EDGE_BLOCK_SCAN_MAX, EDGE_BLOCK_MARKERS;
+var DEFAULT_RETRY, defaultSleep, DEFAULT_REQUEST_TIMEOUT_MS, DEFAULT_MAX_REDIRECTS, REDIRECT_STATUSES, UnauthorizedError, RateLimitedError, RequestTimeoutError, DEFAULT_WRITE_OUTCOME_HINT, WriteOutcomeUnknownError, SAFE_METHODS, ApiError, EdgeBlockedError, EDGE_BLOCK_SCAN_MAX, EDGE_BLOCK_MARKERS;
 var init_http = __esm({
   "node_modules/@chrischall/mcp-utils/dist/http/index.js"() {
     init_headers();
@@ -36957,12 +37341,21 @@ var init_http = __esm({
     init_throttle();
     init_response_cache();
     init_net_atoms();
+    init_fetch_bounded();
+    init_url_safety();
+    init_body_limit();
     init_net_atoms();
+    init_url_safety();
     init_retry_after();
     DEFAULT_RETRY = { count: 1, delayMs: 2e3 };
     defaultSleep = (ms) => new Promise((r) => setTimeout(r, ms));
+    DEFAULT_REQUEST_TIMEOUT_MS = 3e4;
+    DEFAULT_MAX_REDIRECTS = 5;
+    REDIRECT_STATUSES = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
     UnauthorizedError = class extends Error {
       status = 401;
+      /** Always `'credential_rejected'` unless a subclass says otherwise. */
+      kind = "credential_rejected";
       constructor(service) {
         super(`Unauthorized (401) from ${service} \u2014 the token is missing, invalid, or expired.`);
         this.name = "UnauthorizedError";
@@ -36971,6 +37364,8 @@ var init_http = __esm({
     };
     RateLimitedError = class extends Error {
       status = 429;
+      /** `'http'`: the far side answered, with a 429 (see `status`). */
+      kind = "http";
       retryAfterMs;
       constructor(service, retryAfterMs) {
         super(`Rate limited (429) by ${service} after retries.`);
@@ -36981,6 +37376,8 @@ var init_http = __esm({
     };
     RequestTimeoutError = class extends Error {
       timeoutMs;
+      /** Always `'timeout'` unless a subclass says otherwise. */
+      kind = "timeout";
       constructor(service, timeoutMs) {
         super(`Request to ${service} timed out after ${timeoutMs}ms.`);
         this.name = "RequestTimeoutError";
@@ -36988,6 +37385,33 @@ var init_http = __esm({
         Object.setPrototypeOf(this, new.target.prototype);
       }
     };
+    DEFAULT_WRITE_OUTCOME_HINT = "The write may have happened \u2014 check before retrying; do not resend blindly.";
+    WriteOutcomeUnknownError = class extends McpToolError {
+      /** Always `true`: whether the write happened is not known. */
+      outcomeUnknown = true;
+      /** Always `false`: never replay this request without checking first. */
+      retrySafe = false;
+      /** `true` when the request's timeout expired; `false` for a dropped connection or broken body. */
+      timedOut;
+      /** The timeout that expired, when {@link timedOut}. */
+      timeoutMs;
+      /** The request method, upper-cased. */
+      method;
+      constructor(service, method, opts = {}) {
+        const verb = method.toUpperCase();
+        const what = opts.timeoutMs !== void 0 ? `${verb} to ${service} timed out after ${opts.timeoutMs}ms` : `${verb} to ${service} failed: ${truncateErrorMessage(messageOf(opts.cause), 200)}`;
+        super(`${what} \u2014 the write may already have been applied (outcome is unknown).`, {
+          hint: opts.hint ?? DEFAULT_WRITE_OUTCOME_HINT,
+          cause: opts.cause,
+          kind: opts.timeoutMs !== void 0 ? "timeout" : "transport"
+        });
+        this.name = "WriteOutcomeUnknownError";
+        this.timedOut = opts.timeoutMs !== void 0;
+        this.timeoutMs = opts.timeoutMs;
+        this.method = verb;
+      }
+    };
+    SAFE_METHODS = /* @__PURE__ */ new Set(["GET", "HEAD", "OPTIONS", "TRACE"]);
     ApiError = class extends Error {
       status;
       constructor(status, message) {
@@ -37000,6 +37424,8 @@ var init_http = __esm({
     EdgeBlockedError = class extends ApiError {
       /** Which edge refused the request, e.g. `'CloudFront'` or `'Cloudflare'`. */
       vendor;
+      /** Always `'edge_blocked'`: the credential was never judged. */
+      kind = "edge_blocked";
       /**
        * @param where The service the request was for, and — when the thrower knows
        *   it — the method and path, which the message names.
@@ -37053,6 +37479,18 @@ var init_verify_after_write = __esm({
 });
 
 // node_modules/@chrischall/mcp-utils/dist/concurrency/index.js
+async function mapWithConcurrency(items, limit, fn) {
+  const results = new Array(items.length);
+  let next = 0;
+  const poolSize = Math.min(Math.max(limit, 1), items.length);
+  await Promise.all(Array.from({ length: poolSize }, async () => {
+    while (next < items.length) {
+      const i = next++;
+      results[i] = await fn(items[i], i);
+    }
+  }));
+  return results;
+}
 var init_concurrency = __esm({
   "node_modules/@chrischall/mcp-utils/dist/concurrency/index.js"() {
     init_single_flight();
@@ -37063,6 +37501,7 @@ var init_concurrency = __esm({
 // node_modules/@chrischall/mcp-utils/dist/dates/index.js
 var init_dates = __esm({
   "node_modules/@chrischall/mcp-utils/dist/dates/index.js"() {
+    init_config();
   }
 });
 
@@ -37083,7 +37522,7 @@ var init_zod2 = __esm({
     NonNegInt = external_exports.number().int().nonnegative();
     NonEmptyString = external_exports.string().min(1);
     IsoDate = external_exports.iso.date();
-    IsoTime = external_exports.string().regex(/^([01]?\d|2[0-3]):[0-5]\d$/, "must be HH:MM (24h), e.g. 19:30");
+    IsoTime = external_exports.string().regex(/^([01]?\d|2[0-3]):[0-5]\d$/, "must be HH:MM (24h), e.g. 19:30").overwrite((v) => v.padStart(5, "0"));
     NumericIdString = external_exports.string().regex(/^\d+$/, "must be a numeric id (digits only)").describe("A numeric id string (digits only), safe to interpolate into a URL path.");
     SafePathSegment = external_exports.string().min(1).regex(/^[^/?#\s]+$/, 'must not contain "/", "?", "#", or whitespace').refine((v) => !v.includes(".."), 'must not contain ".."').describe('A single URL path segment, safe to interpolate: no "/", "..", "?", "#", or whitespace.');
     schemaOrigin = external_exports.string().optional().describe("Portal origin (e.g. https://<vendor>.example.co) selecting which active session to use. Optional when only one session is active.");
@@ -37118,6 +37557,7 @@ var init_auth = __esm({
     init_config();
     init_errors3();
     init_http();
+    init_cancel();
     init_cached_token();
     init_es256();
   }
@@ -37148,7 +37588,7 @@ var init_version = __esm({
   "src/version.ts"() {
     "use strict";
     PACKAGE_NAME = "office-outlook-mcp";
-    VERSION = "0.4.0";
+    VERSION = "0.5.0";
   }
 });
 
@@ -44875,7 +45315,7 @@ function assertUrlInDomains(field, url2, domains) {
   const declared = domains.map((d) => JSON.stringify(d)).join(", ");
   throw new Error(`FetchproxyServer: ${field} host "${host}" is outside declared domains [${declared}] \u2014 must be one of them or a subdomain`);
 }
-function parseJsonBody(response) {
+function parseJsonBody2(response) {
   if (response.status === 204 || response.body.trim() === "")
     return null;
   return JSON.parse(response.body);
@@ -45944,7 +46384,7 @@ var init_ws_server = __esm({
        */
       async getJson(path, opts = {}) {
         const response = await this.get(path, this.applyJsonDefaults(opts));
-        return parseJsonBody(response);
+        return parseJsonBody2(response);
       }
       /**
        * POST a JSON body and parse the response body as JSON. The body is
@@ -45963,7 +46403,7 @@ var init_ws_server = __esm({
           headers,
           body: body === void 0 ? void 0 : JSON.stringify(body)
         });
-        return parseJsonBody(response);
+        return parseJsonBody2(response);
       }
       /**
        * GET a path and return the response body as a string. Throws
@@ -46028,7 +46468,7 @@ var init_ws_server = __esm({
         };
         let data;
         try {
-          data = parseJsonBody(response);
+          data = parseJsonBody2(response);
         } catch (e) {
           throw new Error(`fetchproxy ${method} ${path} \u2014 response was not JSON: ${e instanceof Error ? e.message : String(e)}`);
         }
@@ -47164,15 +47604,12 @@ var init_dist4 = __esm({
 });
 
 // node_modules/@chrischall/mcp-utils/dist/healthcheck/index.js
-function statusOf2(err) {
-  if (typeof err !== "object" || err === null)
-    return void 0;
-  const s = err.status ?? err.statusCode;
-  return typeof s === "number" ? s : void 0;
-}
 function isArm(kind) {
   return kind !== void 0 && CREDENTIAL_ARMS.has(kind);
 }
+function fromSource(source) {
+  return source !== null ? ` from '${source}'` : "";
+}
 function credentialHint(arm, prefix, hostLabel, source) {
   switch (arm) {
     case "ok":
@@ -47180,15 +47617,15 @@ function credentialHint(arm, prefix, hostLabel, source) {
     case "no_credential":
       return `No credential resolved. Nothing was available to authenticate with \u2014 sign in and reconnect the connector so ${prefix} receives a token, or set the documented environment variable.`;
     case "credential_rejected":
-      return `${hostLabel} rejected the credential from '${source}'. It is present but no longer valid \u2014 most often expired or revoked upstream. Re-authenticate and reconnect; retrying will not fix it.`;
+      return `${hostLabel} rejected the credential${fromSource(source)}. It is present but no longer valid \u2014 most often expired or revoked upstream. Re-authenticate and reconnect; retrying will not fix it.`;
     case "edge_blocked":
       return `${hostLabel} refused the request at its CDN/WAF before it reached the API, so the credential${source !== null ? ` from '${source}'` : ""} was never judged \u2014 re-signing in or rotating it will not help. This is usually a block on this host's IP address or request fingerprint: route through the ContextMint Bridge if this connector supports it, or retry later from a different network.`;
     case "session_expired":
-      return `The credential from '${source}' is configured, but no session is live \u2014 ${hostLabel} served a sign-in page rather than the data. Sign in again; a cookie-session portal expires these on its own, so this recurs between uses.`;
+      return `The credential${fromSource(source)} is configured, but no session is live \u2014 ${hostLabel} served a sign-in page rather than the data. Sign in again; a cookie-session portal expires these on its own, so this recurs between uses.`;
     case "verification_pending":
       return `${hostLabel} is holding the sign-in on a second factor rather than refusing it. Supply the verification code the ACCOUNT HOLDER received \u2014 the credential itself is not the problem, so changing it will not help.`;
     case "timeout":
-      return `The credential from '${source}' resolved, but ${hostLabel} did not answer in time. Usually transient \u2014 retry. If it persists, ${hostLabel} is slow or unreachable from here.`;
+      return `${source !== null ? `The credential from '${source}' resolved, but ` : ""}${hostLabel} did not answer in time. Usually transient \u2014 retry. If it persists, ${hostLabel} is slow or unreachable from here.`;
     case "http":
       return `${hostLabel} answered with an error status that is not an auth rejection. That is USUALLY a ${hostLabel}-side problem rather than an auth one \u2014 but a 404 here more often means the probe path is wrong than that ${hostLabel} is broken, so check error.message and probe.url before concluding anything about the credential.`;
     case "transport":
@@ -47209,7 +47646,8 @@ async function runCredentialHealthcheck(args) {
     state = await resolveCredential();
   } catch (e) {
     const edge = edgeBlockOf(e);
-    const classified = classifyThrown?.(e) ?? (edge !== null ? { kind: "edge_blocked", detail: { vendor: edge.vendor } } : void 0);
+    const declared = errorKindOf(e);
+    const classified = classifyThrown?.(e) ?? (edge !== null ? { kind: "edge_blocked", detail: { vendor: edge.vendor } } : declared !== void 0 ? { kind: declared } : void 0);
     const result2 = {
       ok: false,
       // Still false, and still no source: a classification explains WHY
@@ -47256,10 +47694,11 @@ async function runCredentialHealthcheck(args) {
   try {
     await probeFn();
   } catch (e) {
-    status = statusOf2(e);
+    status = errorStatusOf(e);
     const aborted2 = e instanceof Error && e.name === "AbortError";
     const edge = edgeBlockOf(e);
-    arm = edge !== null ? "edge_blocked" : status === 401 || status === 403 ? "credential_rejected" : status !== void 0 ? "http" : aborted2 || /timeout|timed out|ETIMEDOUT/i.test(messageOf(e)) ? "timeout" : /fetch failed|ENOTFOUND|ECONNREFUSED|ECONNRESET|network/i.test(messageOf(e)) ? "transport" : "unknown";
+    const declared = errorKindOf(e);
+    arm = edge !== null ? "edge_blocked" : declared !== void 0 ? declared : status === 401 || status === 403 ? "credential_rejected" : status !== void 0 ? "http" : aborted2 || /timeout|timed out|ETIMEDOUT/i.test(messageOf(e)) ? "timeout" : /fetch failed|ENOTFOUND|ECONNREFUSED|ECONNRESET|network/i.test(messageOf(e)) ? "transport" : "unknown";
     let kind = arm;
     let detail = edge !== null ? { vendor: edge.vendor } : void 0;
     const custom2 = classifyThrown?.(e);
@@ -47618,6 +48057,7 @@ init_dist2();
 // node_modules/@chrischall/mcp-utils/dist/session/index.js
 init_response();
 init_config();
+init_errors3();
 init_http();
 init_edge_block();
 import { existsSync as existsSync3, readFileSync as readFileSync3, mkdirSync as mkdirSync4, chmodSync as chmodSync2, renameSync as renameSync2, unlinkSync as unlinkSync4 } from "node:fs";
@@ -48099,7 +48539,9 @@ var TokenManager = class {
   /** Spend `rt`, then install and persist what comes back. */
   async exchange(rt) {
     if (rt === void 0) {
-      throw new Error("TokenManager: cannot refresh \u2014 no refresh token is available.");
+      throw new McpToolError("TokenManager: cannot refresh \u2014 no refresh token is available.", {
+        kind: "no_credential"
+      });
     }
     const tok = await this.refreshFn(rt);
     this.tokens = {
@@ -48238,6 +48680,10 @@ function toBearerTokens(accessToken) {
   }
   return { accessToken, refreshToken: RECAPTURE_SENTINEL, expiresAt };
 }
+function isCredentialFailure(e) {
+  const kind = errorKindOf(e);
+  return kind === "no_credential" || kind === "credential_rejected" || errorStatusOf(e) === 401;
+}
 var OutlookClient = class {
   #baseUrl;
   /**
@@ -48265,7 +48711,8 @@ var OutlookClient = class {
       this.#configError = new McpToolError(
         "No Outlook credential is configured.",
         {
-          hint: "Set OUTLOOK_ACCESS_TOKEN, or unset OUTLOOK_DISABLE_FETCHPROXY so the token can be captured from a signed-in Outlook browser tab."
+          hint: "Set OUTLOOK_ACCESS_TOKEN, or unset OUTLOOK_DISABLE_FETCHPROXY so the token can be captured from a signed-in Outlook browser tab.",
+          kind: "no_credential"
         }
       );
     }
@@ -48296,7 +48743,9 @@ var OutlookClient = class {
       refresh: async () => {
         if (direct !== void 0) {
           throw new McpToolError("OUTLOOK_ACCESS_TOKEN was rejected by Outlook.", {
-            hint: "A directly-supplied token cannot be refreshed automatically. Replace OUTLOOK_ACCESS_TOKEN with a current one, or unset it to capture from a signed-in Outlook browser tab instead."
+            hint: "A directly-supplied token cannot be refreshed automatically. Replace OUTLOOK_ACCESS_TOKEN with a current one, or unset it to capture from a signed-in Outlook browser tab instead.",
+            status: 401,
+            kind: "credential_rejected"
           });
         }
         return toBearerTokens(await this.#capture());
@@ -48335,7 +48784,9 @@ var OutlookClient = class {
       timeout: 6e4,
       baseHeaders: { Accept: "application/json" },
       onUnauthorized: () => new McpToolError("Outlook rejected the access token (401).", {
-        hint: "The token has expired or been revoked. Open a signed-in Outlook tab and retry \u2014 the next call re-captures automatically."
+        hint: "The token has expired or been revoked. Open a signed-in Outlook tab and retry \u2014 the next call re-captures automatically.",
+        status: 401,
+        kind: "credential_rejected"
       })
     });
     return this.#api;
@@ -48347,7 +48798,8 @@ var OutlookClient = class {
    * — measured 9.4x smaller on a real message, and it also normalises a mixed
    * HTML/Text collection to one type. `prefer` sets the `Prefer` header
    * directly, for anything else the API takes there (notably
-   * `outlook.timezone="…"`).
+   * `outlook.timezone="…"`). `query` is serialised by mcp-utils'
+   * `buildQueryString`, which drops `undefined`/empty values.
    */
   async get(path, opts = {}) {
     this.#requireConfigured();
@@ -48356,7 +48808,8 @@ var OutlookClient = class {
       opts.prefer
     ].filter((p) => p !== void 0);
     return this.#client().fetchJson("GET", path, {
-      headers: prefer.length ? { Prefer: prefer.join(", ") } : void 0
+      headers: prefer.length ? { Prefer: prefer.join(", ") } : void 0,
+      ...opts.query ? { query: opts.query } : {}
     });
   }
   /**
@@ -48397,7 +48850,10 @@ var OutlookClient = class {
     this.#requireConfigured();
     return this.#client().fetchJson("POST", path, {
       body,
-      headers: opts.prefer ? { Prefer: opts.prefer } : void 0
+      headers: opts.prefer ? { Prefer: opts.prefer } : void 0,
+      // Read-only: a timeout or dropped connection is safe to retry, so keep
+      // the plain error rather than mcp-utils' WriteOutcomeUnknownError.
+      idempotent: true
     });
   }
   /**
@@ -48442,6 +48898,7 @@ init_dist2();
 
 // src/view.ts
 init_dist2();
+var VIEWS2 = ["compact", "full", "raw"];
 function addr(r) {
   const e = r?.EmailAddress;
   if (!e) return void 0;
@@ -48452,12 +48909,21 @@ function addrs(list) {
   if (!Array.isArray(list) || list.length === 0) return void 0;
   return list.map((r) => addr(r)).filter((s) => s !== void 0);
 }
+var MAX_RECIPIENTS = 20;
+function cappedRecipients(key, list) {
+  if (list === void 0 || list.length <= MAX_RECIPIENTS) return { [key]: list };
+  return {
+    [key]: list.slice(0, MAX_RECIPIENTS),
+    [`${key}Count`]: list.length,
+    [`${key}Truncated`]: true
+  };
+}
 function compactMessage(m) {
   return pruned({
     Id: m.Id,
     Subject: m.Subject,
     From: addr(m.From ?? m.Sender),
-    To: addrs(m.ToRecipients),
+    ...cappedRecipients("To", addrs(m.ToRecipients)),
     Received: m.ReceivedDateTime,
     IsRead: m.IsRead,
     HasAttachments: m.HasAttachments || void 0,
@@ -48470,7 +48936,7 @@ function compactMessage(m) {
 function fullMessage(m) {
   return pruned({
     ...compactMessage(m),
-    Cc: addrs(m.CcRecipients),
+    ...cappedRecipients("Cc", addrs(m.CcRecipients)),
     Sent: m.SentDateTime,
     Importance: m.Importance,
     IsDraft: m.IsDraft,
@@ -48489,14 +48955,19 @@ function compactEvent(e) {
     TimeZone: e.Start?.TimeZone,
     Location: e.Location?.DisplayName || void 0,
     Organizer: addr(e.Organizer),
-    IsAllDay: e.IsAllDay || void 0,
-    IsCancelled: e.IsCancelled || void 0
+    IsAllDay: e.IsAllDay,
+    IsCancelled: e.IsCancelled,
+    IsOrganizer: e.IsOrganizer,
+    MyResponse: e.ResponseStatus?.Response,
+    ResponseRequested: e.ResponseRequested,
+    Type: e.Type,
+    ShowAs: e.ShowAs
   });
 }
 function fullEvent(e) {
   return pruned({
     ...compactEvent(e),
-    ShowAs: e.ShowAs,
+    SeriesMasterId: e.SeriesMasterId,
     Attendees: e.Attendees?.map(
       (a) => pruned({ Who: addr(a), Response: a.Status?.Response })
     ),
@@ -48514,7 +48985,9 @@ function compactFolder(f) {
     Id: f.Id,
     Name: f.DisplayName,
     Unread: f.UnreadItemCount,
-    Total: f.TotalItemCount
+    Total: f.TotalItemCount,
+    // Listings are one level deep; a non-zero count says there is more below.
+    Children: f.ChildFolderCount
   });
 }
 function stripOData(o) {
@@ -48542,13 +49015,26 @@ function projectCollection(payload, project, label) {
   });
 }
 
+// src/tools/_invite.ts
+var EVENT_EXPAND = "Microsoft.OutlookServices.EventMessage/Event";
+function resolvedEvent(e) {
+  return e?.Id ? e : void 0;
+}
+var INVITE_GONE = "the meeting is no longer on your calendar (already declined, cancelled, or deleted), so there is nothing to respond to";
+var MEETING_MESSAGE_TYPE = "Microsoft.OutlookServices.EventMessage/MeetingMessageType";
+function isMeetingMessage(m) {
+  return !!m?.MeetingMessageType || (m?.["@odata.type"] ?? "").includes("EventMessage");
+}
+
 // src/tools/_paging.ts
 init_zod();
 var nextLinkParam = external_exports.string().min(1).optional().describe(
   "Continue a previous listing: pass its `nextLink` value unchanged to fetch the next page. When set, the paging/filter arguments are taken from the link and ignored here."
 );
 function fetchPage(client2, nextLink, path, opts = {}) {
-  return nextLink !== void 0 ? client2.getAbsolute(nextLink, opts) : client2.get(path, opts);
+  if (nextLink === void 0) return client2.get(path, opts);
+  const { query: _ignored, ...headerOpts } = opts;
+  return client2.getAbsolute(nextLink, headerOpts);
 }
 function plainCollection(data) {
   const items = Array.isArray(data?.value) ? data.value : [];
@@ -48567,7 +49053,6 @@ function mailboxUntrusted(payload) {
 }
 
 // src/tools/mail.ts
-var VIEWS2 = ["compact", "full", "raw"];
 var WELL_KNOWN = [
   "inbox",
   "drafts",
@@ -48579,34 +49064,114 @@ var WELL_KNOWN = [
   "clutter"
 ];
 var LIST_SELECT = "Id,Subject,From,ToRecipients,ReceivedDateTime,IsRead,HasAttachments,BodyPreview";
-function qs(params) {
-  const parts = [];
-  for (const [k, v] of Object.entries(params)) {
-    if (v === void 0 || v === "") continue;
-    parts.push(`${k}=${encodeURIComponent(String(v))}`);
-  }
-  return parts.length ? `?${parts.join("&")}` : "";
-}
 function folderSegment(folder) {
   return encodeURIComponent(folder);
 }
+var UNREAD_SELECT = [
+  "Id",
+  "Subject",
+  "From",
+  "ToRecipients",
+  "CcRecipients",
+  "ReceivedDateTime",
+  "Importance",
+  "HasAttachments",
+  "Categories",
+  "Flag",
+  "ConversationId",
+  MEETING_MESSAGE_TYPE
+].join(",");
+var BODY_CONCURRENCY = 4;
+function triageKind(m) {
+  switch (m.MeetingMessageType) {
+    case "MeetingRequest":
+      return "meetingRequest";
+    case "MeetingCancelled":
+      return "meetingCancelled";
+    case "MeetingAccepted":
+    case "MeetingTenativelyAccepted":
+    // sic — Outlook's spelling
+    case "MeetingTentativelyAccepted":
+    case "MeetingDeclined":
+      return "meetingResponse";
+  }
+  const type = m["@odata.type"] ?? "";
+  if (!type.includes("EventMessage")) return "mail";
+  if (/Request$/.test(type)) return "meetingRequest";
+  if (/Cancel/.test(type)) return "meetingCancelled";
+  return "meetingResponse";
+}
+function triageEvent(e) {
+  return stripUndefined({
+    id: e.Id,
+    subject: e.Subject,
+    start: e.Start?.DateTime,
+    end: e.End?.DateTime,
+    timeZone: e.Start?.TimeZone,
+    location: e.Location?.DisplayName || void 0,
+    organizer: addr(e.Organizer),
+    responseStatus: e.ResponseStatus?.Response,
+    isCancelled: e.IsCancelled
+  });
+}
+var INVITE_UNRESOLVED_HINT = `This invite's ${INVITE_GONE}.`;
+function truncateChars(text, max) {
+  const end = /[\uD800-\uDBFF]/.test(text.charAt(max - 1)) ? max - 1 : max;
+  return text.slice(0, end);
+}
+function stripUndefined(o) {
+  return Object.fromEntries(Object.entries(o).filter(([, v]) => v !== void 0));
+}
+var ATTACHMENT_META_SELECT = "Id,Name,ContentType,Size,IsInline";
+var MAX_INLINE_BYTES = 5 * 1024 * 1024;
+var MAX_TEXT_BYTES = 200 * 1024;
+var TEXT_TYPE = /^text\/|^application\/(json|xml|csv|ics|calendar)\b|\+(json|xml)$/i;
+var TEXT_EXT = /\.(txt|csv|tsv|json|xml|ics|md|log|html?)$/i;
+function attachmentKind(a) {
+  const type = a["@odata.type"] ?? "";
+  if (/ItemAttachment$/.test(type)) return "item";
+  if (/ReferenceAttachment$/.test(type)) return "reference";
+  return "file";
+}
+function isImage(contentType) {
+  return /^image\//i.test(contentType) && !/svg/i.test(contentType);
+}
+function isText(contentType, name) {
+  return TEXT_TYPE.test(contentType) || /svg/i.test(contentType) || TEXT_EXT.test(name);
+}
+function base64DecodedLength(b64) {
+  const padding = b64.endsWith("==") ? 2 : b64.endsWith("=") ? 1 : 0;
+  return Math.floor(b64.length * 3 / 4) - padding;
+}
+function utf8Boundary(buf, max) {
+  if (buf.length <= max) return buf.length;
+  let end = max;
+  while (end > 0 && (buf[end] & 192) === 128) end--;
+  return end;
+}
+function sinceLiteral(hours) {
+  return new Date(Date.now() - hours * 36e5).toISOString().replace(/\.\d{3}Z$/, "Z");
+}
 function registerMailTools(server, client2) {
   server.registerTool(
     "outlook_list_folders",
     {
-      description: "List mail folders with unread and total counts. Use this to discover folder ids before listing messages; the well-known names (" + WELL_KNOWN.join(", ") + ") can be used directly without a lookup.",
-      annotations: { readOnlyHint: true },
+      description: "List mail folders with unread and total counts. Use this to discover folder ids before listing messages; the well-known names (" + WELL_KNOWN.join(", ") + ") can be used directly without a lookup. Lists ONE level: top-level folders by default, or the child folders of `parent`. A folder with `Children` > 0 has subfolders \u2014 list them with `parent` set to its Id.",
+      annotations: { readOnlyHint: true, openWorldHint: true },
       inputSchema: external_exports.object({
         view: viewParam(VIEWS2),
+        parent: external_exports.string().min(1).optional().describe("List the child folders of this folder (id or well-known name). Omit for the top level."),
         limit: external_exports.number().int().min(1).max(200).optional().describe("Max folders (default 50)"),
         nextLink: nextLinkParam
       })
     },
-    async ({ view, limit, nextLink }) => {
+    async ({ view, parent, limit, nextLink }) => {
+      const base = parent !== void 0 ? `/me/mailfolders/${folderSegment(parent)}/childfolders` : "/me/mailfolders";
       const data = await fetchPage(
         client2,
         nextLink,
-        `/me/mailfolders${qs({ $top: limit ?? 50 })}`
+        base,
+        { query: { $top: limit ?? 50 } }
       );
       if (resolveView(view, VIEWS2) === "raw") return minifiedResult(data);
       return minifiedResult(projectCollection(data, compactFolder, "mail folder"));
@@ -48615,8 +49180,8 @@ function registerMailTools(server, client2) {
   server.registerTool(
     "outlook_list_messages",
     {
-      description: "List messages in a folder, newest first. Defaults to the inbox. Use `unreadOnly` for a triage view. Bodies are NOT included \u2014 call outlook_get_message for one. Note `search` and `unreadOnly` cannot be combined on a first-page request (the API rejects $search with $filter); pass `search` alone to search the whole mailbox. When following a `nextLink`, both are ignored, so echoing them back is harmless. " + UNTRUSTED_DESCRIPTION_SUFFIX,
-      annotations: { readOnlyHint: true },
+      description: 'List messages in a folder, newest first. Defaults to the inbox. Use `unreadOnly` for a triage view. Bodies are NOT included \u2014 call outlook_get_message for one. Note `search` and `unreadOnly` cannot be combined on a first-page request (the API rejects $search with $filter); pass `search` alone to search the whole mailbox. When following a `nextLink`, both are ignored, so echoing them back is harmless. Each message\'s To list (and Cc, in the full view) holds at most 20 addresses; a longer list adds ToCount/ToTruncated (CcCount/CcTruncated) with the full count \u2014 pass view:"raw" for every address. ' + UNTRUSTED_DESCRIPTION_SUFFIX,
+      annotations: { readOnlyHint: true, openWorldHint: true },
       inputSchema: external_exports.object({
         view: viewParam(VIEWS2),
         folder: external_exports.string().optional().describe('Folder id or well-known name (default "inbox")'),
@@ -48648,7 +49213,8 @@ function registerMailTools(server, client2) {
       const data = await fetchPage(
         client2,
         nextLink,
-        `${base}${qs(params)}`
+        base,
+        { query: params }
       );
       const v = resolveView(view, VIEWS2);
       if (v === "raw") return mailboxUntrusted(data);
@@ -48660,8 +49226,8 @@ function registerMailTools(server, client2) {
   server.registerTool(
     "outlook_get_message",
     {
-      description: `Get one message including its body. The body is requested as plain text rather than HTML (measured ~9x smaller and far easier to read); pass view:"raw" to get Outlook's untouched record. ` + UNTRUSTED_DESCRIPTION_SUFFIX,
-      annotations: { readOnlyHint: true },
+      description: `Get one message including its body. The body is requested as plain text rather than HTML (measured ~9x smaller and far easier to read); pass view:"raw" to get Outlook's untouched record. To and Cc list at most 20 addresses; a longer list adds ToCount/ToTruncated (CcCount/CcTruncated) with the full count \u2014 view:"raw" returns every address. ` + UNTRUSTED_DESCRIPTION_SUFFIX,
+      annotations: { readOnlyHint: true, openWorldHint: true },
       inputSchema: external_exports.object({
         view: viewParam(VIEWS2),
         id: external_exports.string().min(1).describe("Message Id from outlook_list_messages"),
@@ -48677,11 +49243,96 @@ function registerMailTools(server, client2) {
       return mailboxUntrusted(v === "full" ? fullMessage(data) : compactMessage(data));
     }
   );
+  server.registerTool(
+    "outlook_get_unread",
+    {
+      description: 'Triage batch: the unread messages in a folder (default inbox), newest first, each WITH its plain-text body (truncated to `maxBodyChars`) in one call \u2014 no follow-up outlook_get_message needed. Every item has a `kind`: "mail", "meetingRequest", "meetingCancelled" or "meetingResponse" (a reply to an invite you sent). Requests and cancellations also carry `event` (id, time, organizer, your current `responseStatus`) so the invite can be answered by its event id (when the meeting is no longer on your calendar \u2014 already declined, cancelled or deleted \u2014 the item has a `hint` instead and there is nothing to respond to). `to`/`cc` list at most 20 addresses; a longer list adds `toCount`/`ccCount` and `toTruncated`/`ccTruncated`. This does NOT mark anything read. Processing loop: read the batch \u2192 act on each item (reply, respond to the invite, file, flag \u2014 or leave it) \u2192 call outlook_mark_read on the ids you handled, so the next call returns only what is still new. Follow `nextLink` for more. ' + UNTRUSTED_DESCRIPTION_SUFFIX,
+      annotations: { readOnlyHint: true, openWorldHint: true },
+      inputSchema: external_exports.object({
+        folder: external_exports.string().min(1).optional().describe('Folder id or well-known name (default "inbox")'),
+        limit: external_exports.number().int().min(1).max(50).optional().describe("Max messages (default 25, max 50)"),
+        sinceHours: external_exports.number().positive().max(24 * 365).optional().describe("Only mail received in the last N hours"),
+        includeBody: external_exports.boolean().optional().describe("Fetch each plain-text body (default true). Invite events are resolved either way."),
+        maxBodyChars: external_exports.number().int().min(100).max(1e5).optional().describe("Truncate each body to this many characters (default 4000); `bodyTruncated` marks a cut"),
+        nextLink: nextLinkParam
+      })
+    },
+    async ({ folder, limit, sinceHours, includeBody, maxBodyChars, nextLink }) => {
+      const filter = [
+        sinceHours !== void 0 ? `ReceivedDateTime ge ${sinceLiteral(sinceHours)}` : void 0,
+        "IsRead eq false"
+      ].filter((c) => c !== void 0).join(" and ");
+      const data = await fetchPage(
+        client2,
+        nextLink,
+        `/me/mailfolders/${folderSegment(folder ?? "inbox")}/messages`,
+        {
+          query: {
+            $top: limit ?? 25,
+            $select: UNREAD_SELECT,
+            $filter: filter,
+            $orderby: "ReceivedDateTime desc"
+          }
+        }
+      );
+      const rows = Array.isArray(data?.value) ? data.value : [];
+      const wantBody = includeBody !== false;
+      const cap = maxBodyChars ?? 4e3;
+      const items = await mapWithConcurrency(rows, BODY_CONCURRENCY, async (m) => {
+        const kind = triageKind(m);
+        const item = stripUndefined({
+          id: m.Id,
+          kind,
+          receivedAt: m.ReceivedDateTime,
+          from: addr(m.From ?? m.Sender),
+          ...cappedRecipients("to", addrs(m.ToRecipients)),
+          ...cappedRecipients("cc", addrs(m.CcRecipients)),
+          subject: m.Subject,
+          importance: m.Importance,
+          hasAttachments: m.HasAttachments || void 0,
+          categories: m.Categories?.length ? m.Categories : void 0,
+          flag: m.Flag?.FlagStatus,
+          conversationId: m.ConversationId
+        });
+        const wantEvent = kind === "meetingRequest" || kind === "meetingCancelled";
+        if (!wantBody && !wantEvent || m.Id === void 0) return item;
+        try {
+          const one = await client2.get(
+            `/me/messages/${encodeURIComponent(m.Id)}`,
+            {
+              text: wantBody,
+              query: {
+                $select: wantBody ? "Id,Body" : "Id",
+                $expand: wantEvent ? EVENT_EXPAND : void 0
+              }
+            }
+          );
+          if (wantBody) {
+            const text = (one.Body?.Content ?? "").trim();
+            item.body = text.length > cap ? truncateChars(text, cap) : text;
+            if (text.length > cap) item.bodyTruncated = true;
+          }
+          if (wantEvent) {
+            const event = resolvedEvent(one.Event);
+            if (event) item.event = triageEvent(event);
+            else item.hint = INVITE_UNRESOLVED_HINT;
+          }
+        } catch (e) {
+          item.error = e instanceof Error ? e.message : String(e);
+        }
+        return item;
+      });
+      const out = { count: items.length, items };
+      const next = data?.["@odata.nextLink"];
+      if (next) out.nextLink = next;
+      return mailboxUntrusted(out);
+    }
+  );
   server.registerTool(
     "outlook_list_attachments",
     {
       description: "List a message's attachments (name, size, content type). Metadata only \u2014 this deliberately does not download bytes.",
-      annotations: { readOnlyHint: true },
+      annotations: { readOnlyHint: true, openWorldHint: true },
       inputSchema: external_exports.object({
         id: external_exports.string().min(1).describe("Message Id"),
         nextLink: nextLinkParam
@@ -48691,13 +49342,76 @@ function registerMailTools(server, client2) {
       const data = await fetchPage(
         client2,
         nextLink,
-        `/me/messages/${encodeURIComponent(id)}/attachments${qs({
-          $select: "Id,Name,Size,ContentType"
-        })}`
+        `/me/messages/${encodeURIComponent(id)}/attachments`,
+        { query: { $select: "Id,Name,Size,ContentType" } }
       );
       return minifiedResult(plainCollection(data));
     }
   );
+  server.registerTool(
+    "outlook_get_attachment",
+    {
+      description: "Get one attachment's content (ids from outlook_list_attachments). An image comes back as image content the model can see; a text-like file (text/*, JSON, CSV, XML, .ics) is decoded to `text`, capped at 200 KB (`textTruncated` marks a cut). Any other binary (PDF, Office, archives) and anything over 5 MB is returned as metadata only \u2014 its bytes are not inlined. An attached Outlook item (a forwarded email or event) or a cloud-file link has no bytes to return; the result says which. " + UNTRUSTED_DESCRIPTION_SUFFIX,
+      annotations: { readOnlyHint: true, openWorldHint: true },
+      inputSchema: external_exports.object({
+        messageId: external_exports.string().min(1).describe("Message Id"),
+        attachmentId: external_exports.string().min(1).describe("Attachment Id from outlook_list_attachments")
+      })
+    },
+    async ({ messageId, attachmentId }) => {
+      const path = `/me/messages/${encodeURIComponent(messageId)}/attachments/${encodeURIComponent(attachmentId)}`;
+      const meta3 = await client2.get(path, { query: { $select: ATTACHMENT_META_SELECT } });
+      const kind = attachmentKind(meta3);
+      const contentType = meta3.ContentType ?? "";
+      const name = meta3.Name ?? "";
+      const out = stripUndefined({
+        messageId,
+        attachmentId,
+        name: meta3.Name,
+        contentType: meta3.ContentType ?? void 0,
+        size: meta3.Size,
+        isInline: meta3.IsInline || void 0,
+        kind,
+        inlined: false
+      });
+      if (kind === "item") {
+        out.hint = "This is an attached Outlook item (an email, event or contact), not a file, so it has no bytes to return. Ask the sender for it, or open the parent message in Outlook.";
+        return mailboxUntrusted(out);
+      }
+      if (kind === "reference") {
+        out.hint = "This is a link to a cloud file (OneDrive/SharePoint), not a file stored in the message, so there are no bytes to return.";
+        return mailboxUntrusted(out);
+      }
+      const image = isImage(contentType);
+      if (!image && !isText(contentType, name)) {
+        out.hint = "Binary content is not inlined: only images and text-like files are returned. Open it in Outlook to read it.";
+        return mailboxUntrusted(out);
+      }
+      if ((meta3.Size ?? 0) > MAX_INLINE_BYTES) {
+        out.hint = "Content is not inlined above 5 MB. Open it in Outlook to read it.";
+        return mailboxUntrusted(out);
+      }
+      const full = await client2.get(path);
+      const bytes = full.ContentBytes;
+      if (typeof bytes !== "string" || bytes.length === 0) {
+        out.hint = "Outlook returned no content for this attachment.";
+        return mailboxUntrusted(out);
+      }
+      if (base64DecodedLength(bytes) > MAX_INLINE_BYTES) {
+        out.hint = "Content is not inlined above 5 MB. Open it in Outlook to read it.";
+        return mailboxUntrusted(out);
+      }
+      const buf = Buffer.from(bytes, "base64");
+      out.inlined = true;
+      if (image) {
+        const env = mailboxUntrusted(out);
+        return { ...env, content: [...env.content, ...imageResult(bytes, contentType).content] };
+      }
+      out.text = buf.subarray(0, utf8Boundary(buf, MAX_TEXT_BYTES)).toString("utf8");
+      if (buf.length > MAX_TEXT_BYTES) out.textTruncated = true;
+      return mailboxUntrusted(out);
+    }
+  );
 }
 
 // src/tools/calendar.ts
@@ -48705,8 +49419,9 @@ init_zod();
 init_dist2();
 
 // src/timezone.ts
+init_dist2();
 var zoneByClient = /* @__PURE__ */ new WeakMap();
-async function mailboxTimeZone(client2) {
+async function mailboxTimeZone(client2, opts = {}) {
   const cached2 = zoneByClient.get(client2);
   if (cached2) return cached2;
   try {
@@ -48714,21 +49429,16 @@ async function mailboxTimeZone(client2) {
     const zone = settings?.TimeZone?.trim() || void 0;
     if (zone) zoneByClient.set(client2, zone);
     return zone;
-  } catch {
-    return void 0;
+  } catch (e) {
+    if (!opts.required) return void 0;
+    throw new McpToolError("Could not read the mailbox's time zone, so the event time is ambiguous.", {
+      hint: `Retry, or pass \`timeZone\` explicitly (a Windows zone name such as "Eastern Standard Time"). Cause: ${e instanceof Error ? e.message : String(e)}`
+    });
   }
 }
 
 // src/tools/calendar.ts
-var EVENT_SELECT = "Id,Subject,Start,End,Location,Organizer,IsAllDay,IsCancelled,ShowAs,OnlineMeetingUrl,OnlineMeeting,BodyPreview";
-function qs2(params) {
-  const parts = [];
-  for (const [k, v] of Object.entries(params)) {
-    if (v === void 0 || v === "") continue;
-    parts.push(`${k}=${encodeURIComponent(String(v))}`);
-  }
-  return parts.length ? `?${parts.join("&")}` : "";
-}
+var EVENT_SELECT = "Id,Subject,Start,End,Location,Organizer,IsAllDay,IsCancelled,ShowAs,OnlineMeetingUrl,OnlineMeeting,BodyPreview,IsOrganizer,ResponseStatus,ResponseRequested,Type,SeriesMasterId";
 function dateTimeTimeZone(value, zone) {
   if (/(Z|[+-]\d{2}:?\d{2})$/i.test(value)) {
     const d = new Date(value);
@@ -48756,7 +49466,7 @@ function registerCalendarTools(server, client2) {
     "outlook_list_events",
     {
       description: 'List calendar events in a date window. This uses the calendar VIEW, which expands recurring series into their individual occurrences \u2014 the right tool for "what is on my schedule". Times are returned in `timeZone` when given. ' + UNTRUSTED_DESCRIPTION_SUFFIX,
-      annotations: { readOnlyHint: true },
+      annotations: { readOnlyHint: true, openWorldHint: true },
       inputSchema: external_exports.object({
         view: viewParam(VIEWS2),
         start: external_exports.string().min(1).describe("Window start, ISO 8601 (e.g. 2026-09-20T00:00:00Z)"),
@@ -48773,14 +49483,17 @@ function registerCalendarTools(server, client2) {
       const data = await fetchPage(
         client2,
         nextLink,
-        `/me/calendarview${qs2({
-          startDateTime: start,
-          endDateTime: end,
-          $select: EVENT_SELECT,
-          $orderby: "Start/DateTime",
-          $top: limit ?? 50
-        })}`,
-        zone ? { prefer: `outlook.timezone="${zone}"` } : {}
+        "/me/calendarview",
+        {
+          query: {
+            startDateTime: start,
+            endDateTime: end,
+            $select: EVENT_SELECT,
+            $orderby: "Start/DateTime",
+            $top: limit ?? 50
+          },
+          ...zone ? { prefer: `outlook.timezone="${zone}"` } : {}
+        }
       );
       const v = resolveView(view, VIEWS2);
       if (v === "raw") return mailboxUntrusted(data);
@@ -48793,7 +49506,7 @@ function registerCalendarTools(server, client2) {
     "outlook_get_event",
     {
       description: "Get one calendar event in full, including attendees and their responses. " + UNTRUSTED_DESCRIPTION_SUFFIX,
-      annotations: { readOnlyHint: true },
+      annotations: { readOnlyHint: true, openWorldHint: true },
       inputSchema: external_exports.object({
         view: viewParam(VIEWS2),
         id: external_exports.string().min(1).describe("Event Id from outlook_list_events"),
@@ -48815,14 +49528,14 @@ function registerCalendarTools(server, client2) {
     "outlook_list_calendars",
     {
       description: "List the calendars in the mailbox, for picking one to read or write against.",
-      annotations: { readOnlyHint: true },
+      annotations: { readOnlyHint: true, openWorldHint: true },
       inputSchema: external_exports.object({
         view: viewParam(VIEWS2),
         nextLink: nextLinkParam
       })
     },
     async ({ view, nextLink }) => {
-      const data = await fetchPage(client2, nextLink, `/me/calendars${qs2({ $select: "Id,Name,Color,CanEdit,Owner" })}`);
+      const data = await fetchPage(client2, nextLink, "/me/calendars", { query: { $select: "Id,Name,Color,CanEdit,Owner" } });
       if (resolveView(view, VIEWS2) === "raw") return minifiedResult(data);
       return minifiedResult(plainCollection(data));
     }
@@ -48830,12 +49543,13 @@ function registerCalendarTools(server, client2) {
   server.registerTool(
     "outlook_find_meeting_times",
     {
-      description: "Find times when people can meet \u2014 Outlook's Scheduling Assistant. Give the attendees, a search window and a duration; Outlook checks everyone's free/busy (and the signed-in user's, as organizer) and returns ranked candidate slots with each attendee's availability. By default only working hours are searched. Use this to answer \"when can X and Y meet?\"; then book with outlook_create_event. `start`/`end` are local wall-clock times in `timeZone` (default: the mailbox zone), and returned slots are in that zone too. " + UNTRUSTED_DESCRIPTION_SUFFIX,
-      annotations: { readOnlyHint: true },
+      description: "Find times when people can meet \u2014 Outlook's Scheduling Assistant. Give the attendees, a search window and a duration; Outlook checks everyone's free/busy (and the signed-in user's, as organizer) and returns ranked candidate slots with each attendee's availability. By default only working hours are searched. Use this to answer \"when can X and Y meet?\"; then book with outlook_create_event \u2014 each suggestion carries `createEventArgs` (times, zone and attendees; `subject` too when given here) to pass to it as-is. `start`/`end` are local wall-clock times in `timeZone` (default: the mailbox zone), and returned slots are in that zone too. view: 'raw' returns Outlook's response as-is, without `createEventArgs`. " + UNTRUSTED_DESCRIPTION_SUFFIX,
+      annotations: { readOnlyHint: true, openWorldHint: true },
       inputSchema: external_exports.object({
         view: viewParam(VIEWS2),
         attendees: attendeeList("required attendees").min(1),
         optionalAttendees: attendeeList("optional attendees").optional(),
+        subject: external_exports.string().optional().describe("Meeting title, carried into each suggestion's createEventArgs; not sent to Outlook"),
         start: external_exports.string().min(1).describe("Earliest the meeting may start, e.g. 2026-10-12T09:00:00"),
         end: external_exports.string().min(1).describe("Latest the meeting may end, e.g. 2026-10-16T17:00:00"),
         durationMinutes: external_exports.number().int().min(5).max(1440).describe("Meeting length in minutes"),
@@ -48871,19 +49585,37 @@ function registerCalendarTools(server, client2) {
       };
       const data = await client2.post("/me/findmeetingtimes", body, { prefer: `outlook.timezone="${zone}"` });
       if (resolveView(args.view, VIEWS2) === "raw") return mailboxUntrusted(data);
-      const suggestions = (data?.MeetingTimeSuggestions ?? []).map((s) => ({
-        Start: trimTime(s.MeetingTimeSlot?.Start?.DateTime),
-        End: trimTime(s.MeetingTimeSlot?.End?.DateTime),
-        Confidence: s.Confidence,
-        Organizer: s.OrganizerAvailability,
-        Attendees: Object.fromEntries(
-          (s.AttendeeAvailability ?? []).map((a) => [
-            a.Attendee?.EmailAddress?.Address ?? a.Attendee?.EmailAddress?.Name ?? "?",
-            a.Availability
-          ])
-        ),
-        Reason: s.SuggestionReason
-      }));
+      const suggestions = (data?.MeetingTimeSuggestions ?? []).map((s) => {
+        const start = trimTime(s.MeetingTimeSlot?.Start?.DateTime);
+        const end = trimTime(s.MeetingTimeSlot?.End?.DateTime);
+        return {
+          Start: start,
+          End: end,
+          Confidence: s.Confidence,
+          Organizer: s.OrganizerAvailability,
+          Attendees: Object.fromEntries(
+            (s.AttendeeAvailability ?? []).map((a) => [
+              a.Attendee?.EmailAddress?.Address ?? a.Attendee?.EmailAddress?.Name ?? "?",
+              a.Availability
+            ])
+          ),
+          Reason: s.SuggestionReason,
+          // outlook_create_event's input for this slot, so booking it is a
+          // straight hand-off. The slot came back in `zone` (the Prefer header),
+          // which is also the zone create reads wall-clock times in. A slot
+          // without times cannot be booked, so it gets no args.
+          ...start && end ? {
+            createEventArgs: {
+              ...args.subject !== void 0 ? { subject: args.subject } : {},
+              start,
+              end,
+              timeZone: zone,
+              attendees: args.attendees,
+              ...args.optionalAttendees?.length ? { optionalAttendees: args.optionalAttendees } : {}
+            }
+          } : {}
+        };
+      });
       return mailboxUntrusted({
         timeZone: zone,
         count: suggestions.length,
@@ -48898,7 +49630,7 @@ function registerCalendarTools(server, client2) {
     "outlook_get_schedule",
     {
       description: "Get people's free/busy blocks for a time window \u2014 the grid view of Outlook's Scheduling Assistant. Returns each person's busy, tentative and out-of-office items (with subject and location where their calendar shares them). Use outlook_find_meeting_times to have Outlook pick slots instead. `start`/`end` are local wall-clock times in `timeZone` (default: the mailbox zone). " + UNTRUSTED_DESCRIPTION_SUFFIX,
-      annotations: { readOnlyHint: true },
+      annotations: { readOnlyHint: true, openWorldHint: true },
       inputSchema: external_exports.object({
         view: viewParam(VIEWS2),
         people: attendeeList("people (or rooms) to look up").min(1).max(100),
@@ -48945,14 +49677,6 @@ function registerCalendarTools(server, client2) {
 // src/tools/directory.ts
 init_zod();
 init_dist2();
-function qs3(params) {
-  const parts = [];
-  for (const [k, v] of Object.entries(params)) {
-    if (v === void 0 || v === "") continue;
-    parts.push(`${k}=${encodeURIComponent(String(v))}`);
-  }
-  return parts.length ? `?${parts.join("&")}` : "";
-}
 function collection(data, raw) {
   if (raw) return data;
   return plainCollection(data);
@@ -48962,7 +49686,7 @@ function registerDirectoryTools(server, client2) {
     "outlook_get_profile",
     {
       description: "Get the signed-in mailbox's identity (email address, display name, alias). The cheapest call that proves the credential works.",
-      annotations: { readOnlyHint: true },
+      annotations: { readOnlyHint: true, openWorldHint: true },
       inputSchema: external_exports.object({})
     },
     async () => minifiedResult(stripOData(await client2.get("/me")))
@@ -48971,7 +49695,7 @@ function registerDirectoryTools(server, client2) {
     "outlook_get_mailbox_settings",
     {
       description: "Get mailbox settings: time zone, working hours, language, and automatic-replies (out-of-office) configuration.",
-      annotations: { readOnlyHint: true },
+      annotations: { readOnlyHint: true, openWorldHint: true },
       inputSchema: external_exports.object({})
     },
     async () => minifiedResult(stripOData(await client2.get("/me/MailboxSettings")))
@@ -48980,7 +49704,7 @@ function registerDirectoryTools(server, client2) {
     "outlook_list_contacts",
     {
       description: "List saved contacts from the mailbox address book.",
-      annotations: { readOnlyHint: true },
+      annotations: { readOnlyHint: true, openWorldHint: true },
       inputSchema: external_exports.object({
         view: viewParam(VIEWS2),
         limit: external_exports.number().int().min(1).max(200).optional().describe("Max contacts (default 50)"),
@@ -48992,13 +49716,16 @@ function registerDirectoryTools(server, client2) {
       const data = await fetchPage(
         client2,
         nextLink,
-        `/me/contacts${qs3({
-          $top: limit ?? 50,
-          $skip: skip,
-          // `MobilePhone1`, not `MobilePhone`: the latter is the Graph name and
-          // the v2.0 Contact type rejects it outright with a 400.
-          $select: "Id,DisplayName,EmailAddresses,CompanyName,JobTitle,MobilePhone1"
-        })}`
+        "/me/contacts",
+        {
+          query: {
+            $top: limit ?? 50,
+            $skip: skip,
+            // `MobilePhone1`, not `MobilePhone`: the latter is the Graph name and
+            // the v2.0 Contact type rejects it outright with a 400.
+            $select: "Id,DisplayName,EmailAddresses,CompanyName,JobTitle,MobilePhone1"
+          }
+        }
       );
       return minifiedResult(collection(data, resolveView(view, VIEWS2) === "raw"));
     }
@@ -49007,7 +49734,7 @@ function registerDirectoryTools(server, client2) {
     "outlook_list_people",
     {
       description: 'List people ranked by relevance to the user \u2014 colleagues and frequent correspondents, drawn from mail traffic rather than the saved address book. Better than outlook_list_contacts for resolving "who is X" in a work mailbox.',
-      annotations: { readOnlyHint: true },
+      annotations: { readOnlyHint: true, openWorldHint: true },
       inputSchema: external_exports.object({
         view: viewParam(VIEWS2),
         limit: external_exports.number().int().min(1).max(100).optional().describe("Max people (default 25)"),
@@ -49018,10 +49745,13 @@ function registerDirectoryTools(server, client2) {
       const data = await fetchPage(
         client2,
         nextLink,
-        `/me/people${qs3({
-          $top: limit ?? 25,
-          $select: "Id,DisplayName,ScoredEmailAddresses,JobTitle,CompanyName"
-        })}`
+        "/me/people",
+        {
+          query: {
+            $top: limit ?? 25,
+            $select: "Id,DisplayName,ScoredEmailAddresses,JobTitle,CompanyName"
+          }
+        }
       );
       return minifiedResult(collection(data, resolveView(view, VIEWS2) === "raw"));
     }
@@ -49030,7 +49760,7 @@ function registerDirectoryTools(server, client2) {
     "outlook_list_tasks",
     {
       description: "List Outlook tasks with status and due dates.",
-      annotations: { readOnlyHint: true },
+      annotations: { readOnlyHint: true, openWorldHint: true },
       inputSchema: external_exports.object({
         view: viewParam(VIEWS2),
         limit: external_exports.number().int().min(1).max(200).optional().describe("Max tasks (default 50)"),
@@ -49041,14 +49771,32 @@ function registerDirectoryTools(server, client2) {
       const data = await fetchPage(
         client2,
         nextLink,
-        `/me/tasks${qs3({
-          $top: limit ?? 50,
-          $select: "Id,Subject,Status,Importance,DueDateTime,CompletedDateTime"
-        })}`
+        "/me/tasks",
+        {
+          query: {
+            $top: limit ?? 50,
+            $select: "Id,Subject,Status,Importance,DueDateTime,CompletedDateTime"
+          }
+        }
       );
       return minifiedResult(collection(data, resolveView(view, VIEWS2) === "raw"));
     }
   );
+  server.registerTool(
+    "outlook_list_categories",
+    {
+      description: "List the mailbox's categories (the master list) with their colours \u2014 the names outlook_update_message can add or remove.",
+      annotations: { readOnlyHint: true, openWorldHint: true },
+      inputSchema: external_exports.object({})
+    },
+    async () => {
+      const data = await client2.get(
+        "/me/outlook/masterCategories"
+      );
+      const categories = (data?.value ?? []).map((c) => ({ name: c.DisplayName, color: c.Color }));
+      return minifiedResult({ count: categories.length, categories });
+    }
+  );
 }
 
 // src/tools/writes.ts
@@ -49086,15 +49834,93 @@ function dateTimeTimeZone2(value, zone) {
   }
   return { DateTime: value, TimeZone: zone };
 }
+var TIMEOUT_SENTENCE = 'If Outlook does not answer in time (or the connection drops) the result has status "unknown": the write may well have gone through, so check before retrying \u2014 never resend blindly.';
+async function writeOrUnknown(run, checkWhere) {
+  try {
+    return { ok: true, value: await run() };
+  } catch (e) {
+    if (!(e instanceof WriteOutcomeUnknownError)) throw e;
+    return {
+      ok: false,
+      result: minifiedResult({
+        status: "unknown",
+        warning: `Outlook did not confirm this write (${e.timedOut ? "it did not answer in time" : "the connection dropped"}), so it may already have happened. Check ${checkWhere} before retrying; do not resend blindly.`
+      })
+    };
+  }
+}
+var INVITE_EVENT_SELECT = "Id,Subject,IsOrganizer,IsCancelled,Start,End,Organizer,ResponseStatus";
+var DELETE_EVENT_SELECT = "Id,Subject,IsOrganizer,IsCancelled,ResponseStatus,Type,SeriesMasterId,Start,End,Organizer,Attendees";
+var INVITE_RESPONSES = {
+  accept: { verb: "accept", status: "Accepted" },
+  tentative: { verb: "tentativelyaccept", status: "TentativelyAccepted" },
+  decline: { verb: "decline", status: "Declined" }
+};
 var naiveMs = (dt) => Date.parse(`${dt.replace(/\.\d+$/, "")}Z`);
 var fromNaiveMs = (ms) => new Date(ms).toISOString().replace(/\.\d{3}Z$/, "");
 var trimTime2 = (dt) => dt?.replace(/\.\d+$/, "");
+var REPLY_MODES = {
+  reply: { send: "reply", draft: "createreply", prefix: "RE: " },
+  replyAll: { send: "replyall", draft: "createreplyall", prefix: "RE: " },
+  forward: { send: "forward", draft: "createforward", prefix: "FW: " }
+};
+function addresses(...lists) {
+  const seen = /* @__PURE__ */ new Map();
+  for (const a of lists.flat()) {
+    const v = a?.EmailAddress?.Address;
+    if (v && !seen.has(v.toLowerCase())) seen.set(v.toLowerCase(), v);
+  }
+  return [...seen.values()];
+}
+var escapeHtml = (t) => t.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+function bodyWithComment(body, comment) {
+  const existing = body?.Content ?? "";
+  if (body?.ContentType?.toLowerCase() !== "html") {
+    return { ContentType: "Text", Content: existing ? `${comment}
+
+${existing}` : comment };
+  }
+  const block = `<div>${escapeHtml(comment).replace(/\r?\n/g, "<br>")}</div><br>`;
+  const open2 = /<body[^>]*>/i.exec(existing);
+  const Content = open2 ? existing.slice(0, open2.index + open2[0].length) + block + existing.slice(open2.index + open2[0].length) : block + existing;
+  return { ContentType: "HTML", Content };
+}
+var FLAG_STATUS = { flagged: "Flagged", complete: "Complete", none: "NotFlagged" };
+var UPDATE_CONCURRENCY = 4;
+var sameCategories = (a, b) => [...a ?? []].map((c) => c.toLowerCase()).sort().join("\n") === [...b ?? []].map((c) => c.toLowerCase()).sort().join("\n");
+function editCategories(current, add, remove) {
+  const gone = new Set(remove.map((c) => c.toLowerCase()));
+  const next = (current ?? []).filter((c) => !gone.has(c.toLowerCase()));
+  for (const c of add) {
+    if (!next.some((n) => n.toLowerCase() === c.toLowerCase())) next.push(c);
+  }
+  return next;
+}
+function unchangedFields(payload, after) {
+  const out = [];
+  if (payload.IsRead !== void 0 && after.IsRead !== payload.IsRead) out.push("IsRead");
+  if (payload.Flag && after.Flag?.FlagStatus !== payload.Flag.FlagStatus) out.push("Flag");
+  if (payload.Categories && !sameCategories(after.Categories, payload.Categories)) out.push("Categories");
+  return out;
+}
+var createEventInput = external_exports.object({
+  subject: external_exports.string().describe("Event title"),
+  start: external_exports.string().min(1).describe("Start, ISO 8601 local time e.g. 2026-09-22T15:00:00"),
+  end: external_exports.string().min(1).describe("End, ISO 8601 local time"),
+  timeZone: external_exports.string().optional().describe("Windows time-zone name. Defaults to the MAILBOX time zone."),
+  location: external_exports.string().optional().describe("Location display name"),
+  body: external_exports.string().optional().describe("Event description"),
+  attendees: recipientList.describe("Required attendees' email addresses"),
+  optionalAttendees: recipientList.describe("Optional attendees' email addresses"),
+  teamsMeeting: teamsMeetingParam,
+  confirmToken: confirmTokenParam
+});
 function registerWriteTools(server, client2) {
   server.registerTool(
     "outlook_send_mail",
     {
-      description: "Send an email from the signed-in mailbox. " + CONFIRM_FLOW_SENTENCE + " The preview shows exactly what would be sent. " + CONFIRM_INJECTION_RULE,
-      annotations: { readOnlyHint: false, destructiveHint: true },
+      description: "Send an email from the signed-in mailbox. " + CONFIRM_FLOW_SENTENCE + " The preview shows exactly what would be sent. " + TIMEOUT_SENTENCE + " " + CONFIRM_INJECTION_RULE,
+      annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
       inputSchema: external_exports.object({
         to: recipientList,
         cc: recipientList,
@@ -49128,7 +49954,8 @@ function registerWriteTools(server, client2) {
         confirmToken
       });
       if (gate) return gate;
-      await client2.write("POST", "/me/sendmail", payload);
+      const sent = await writeOrUnknown(() => client2.write("POST", "/me/sendmail", payload), "Sent Items");
+      if (!sent.ok) return sent.result;
       return minifiedResult({ sent: true, subject, recipients: recipients || null });
     }
   );
@@ -49136,7 +49963,7 @@ function registerWriteTools(server, client2) {
     "outlook_create_draft",
     {
       description: "Create a draft message in the Drafts folder without sending it. Returns the created draft, which can be reviewed and sent from Outlook. " + CONFIRM_FLOW_SENTENCE,
-      annotations: { readOnlyHint: false, destructiveHint: false },
+      annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
       inputSchema: external_exports.object({
         to: recipientList,
         cc: recipientList,
@@ -49175,7 +50002,7 @@ function registerWriteTools(server, client2) {
     "outlook_mark_read",
     {
       description: "Mark a message read or unread. The result is verified by re-reading the message \u2014 a 2xx alone is not proof it persisted. " + CONFIRM_FLOW_SENTENCE,
-      annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: true },
+      annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: true, openWorldHint: true },
       inputSchema: external_exports.object({
         id: external_exports.string().min(1).describe("Message Id"),
         isRead: external_exports.boolean().describe("true to mark read, false to mark unread"),
@@ -49206,11 +50033,90 @@ function registerWriteTools(server, client2) {
       });
     }
   );
+  server.registerTool(
+    "outlook_update_message",
+    {
+      description: 'Flag, categorise and/or mark read up to 50 messages at once \u2014 the filing step of the triage loop (outlook_get_unread \u2192 act \u2192 update). `flag`: "flagged", "complete" or "none". `categories` replaces a message\'s categories; `addCategories`/`removeCategories` edit each message\'s current list instead (names from outlook_list_categories). Duplicate ids are collapsed, so each message is written once. Each id gets its own result `{ id, ok, error? }`, verified against what Outlook stored; one failure does not stop the rest, but a rejected or missing credential fails the whole call. Only your mailbox changes \u2014 nobody is notified. ' + CONFIRM_FLOW_SENTENCE,
+      annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: true, openWorldHint: true },
+      inputSchema: external_exports.object({
+        messageIds: external_exports.array(external_exports.string().min(1)).min(1).max(50).describe("Message Ids (1 to 50)"),
+        flag: external_exports.enum(["flagged", "complete", "none"]).optional().describe("Follow-up flag to set"),
+        categories: external_exports.array(external_exports.string().min(1)).optional().describe("Replace the categories with exactly these ([] clears them)"),
+        addCategories: external_exports.array(external_exports.string().min(1)).optional().describe("Categories to add"),
+        removeCategories: external_exports.array(external_exports.string().min(1)).optional().describe("Categories to remove"),
+        isRead: external_exports.boolean().optional().describe("true to mark read, false to mark unread"),
+        confirmToken: confirmTokenParam
+      })
+    },
+    async ({ messageIds, flag, categories, addCategories, removeCategories, isRead, confirmToken }, ctx) => {
+      const add = addCategories ?? [];
+      const remove = removeCategories ?? [];
+      const editing = add.length > 0 || remove.length > 0;
+      if (categories !== void 0 && editing) {
+        throw new McpToolError("Pass `categories` or `addCategories`/`removeCategories`, not both.", {
+          hint: "`categories` replaces the whole list; the add/remove pair edits the current one."
+        });
+      }
+      const fixed = {
+        ...isRead !== void 0 ? { IsRead: isRead } : {},
+        ...flag ? { Flag: { FlagStatus: FLAG_STATUS[flag] } } : {},
+        ...categories !== void 0 ? { Categories: categories } : {}
+      };
+      if (Object.keys(fixed).length === 0 && !editing) {
+        throw new McpToolError("Nothing to update.", {
+          hint: "Pass at least one of flag, isRead, categories, addCategories or removeCategories."
+        });
+      }
+      const ids = [...new Set(messageIds)];
+      const pathOf = (id) => `/me/messages/${encodeURIComponent(id)}`;
+      const changes = [
+        ...flag ? [`flag ${flag}`] : [],
+        ...isRead !== void 0 ? [isRead ? "mark read" : "mark unread"] : [],
+        ...categories !== void 0 ? [`set categories [${categories.join(", ")}]`] : [],
+        ...add.length ? [`add categories [${add.join(", ")}]`] : [],
+        ...remove.length ? [`remove categories [${remove.join(", ")}]`] : []
+      ];
+      const gate = await confirmWrite(ctx, {
+        tool: "outlook_update_message",
+        action: "mail.update",
+        message: "Review and confirm this change:",
+        summary: `Update ${ids.length} message${ids.length === 1 ? "" : "s"}: ${changes.join("; ")}`,
+        // One signed-in mailbox per server process.
+        account: void 0,
+        target: ids.join(","),
+        request: {
+          method: "PATCH",
+          path: ids.length === 1 ? pathOf(ids[0]) : "/me/messages/{id}",
+          body: editing ? { ...fixed, Categories: `(each message's current categories${add.length ? ` + ${add.join(", ")}` : ""}${remove.length ? ` - ${remove.join(", ")}` : ""})` } : fixed
+        },
+        confirmToken
+      });
+      if (gate) return gate;
+      const results = await mapWithConcurrency(ids, UPDATE_CONCURRENCY, async (id) => {
+        try {
+          const payload = { ...fixed };
+          if (editing) {
+            const current = await client2.get(`${pathOf(id)}?$select=Categories`);
+            payload.Categories = editCategories(current?.Categories, add, remove);
+          }
+          const echoed = await client2.write("PATCH", pathOf(id), payload);
+          const after = echoed && typeof echoed === "object" ? echoed : await client2.get(`${pathOf(id)}?$select=IsRead,Flag,Categories`) ?? {};
+          const unchanged = unchangedFields(payload, after);
+          return unchanged.length ? { id, ok: false, error: `Outlook accepted the write but these did not change: ${unchanged.join(", ")}.` } : { id, ok: true };
+        } catch (e) {
+          if (isCredentialFailure(e)) throw e;
+          return { id, ok: false, error: e instanceof Error ? e.message : String(e) };
+        }
+      });
+      const updated = results.filter((r) => r.ok).length;
+      return minifiedResult({ updated, failed: results.length - updated, results });
+    }
+  );
   server.registerTool(
     "outlook_move_message",
     {
       description: 'Move a message to another folder (e.g. "archive", "deleteditems", or a folder id from outlook_list_folders). Moving assigns a NEW message id, which is returned. ' + CONFIRM_FLOW_SENTENCE,
-      annotations: { readOnlyHint: false, destructiveHint: false },
+      annotations: { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
       inputSchema: external_exports.object({
         id: external_exports.string().min(1).describe("Message Id"),
         destination: external_exports.string().min(1).describe('Destination folder id or well-known name (e.g. "archive")'),
@@ -49248,20 +50154,9 @@ function registerWriteTools(server, client2) {
   server.registerTool(
     "outlook_create_event",
     {
-      description: 'Create a calendar event or meeting. A Microsoft Teams meeting is attached by default (`teamsMeeting: false` to skip) and its join link is returned. `timeZone` takes a WINDOWS zone name such as "Eastern Standard Time", not an IANA name. Attendees are emailed an invitation. To pick a time first, use outlook_find_meeting_times. ' + CONFIRM_FLOW_SENTENCE + " " + CONFIRM_INJECTION_RULE,
-      annotations: { readOnlyHint: false, destructiveHint: false },
-      inputSchema: external_exports.object({
-        subject: external_exports.string().describe("Event title"),
-        start: external_exports.string().min(1).describe("Start, ISO 8601 local time e.g. 2026-09-22T15:00:00"),
-        end: external_exports.string().min(1).describe("End, ISO 8601 local time"),
-        timeZone: external_exports.string().optional().describe("Windows time-zone name. Defaults to the MAILBOX time zone."),
-        location: external_exports.string().optional().describe("Location display name"),
-        body: external_exports.string().optional().describe("Event description"),
-        attendees: recipientList.describe("Required attendees' email addresses"),
-        optionalAttendees: recipientList.describe("Optional attendees' email addresses"),
-        teamsMeeting: teamsMeetingParam,
-        confirmToken: confirmTokenParam
-      })
+      description: 'Create a calendar event or meeting. A Microsoft Teams meeting is attached by default (`teamsMeeting: false` to skip) and its join link is returned. `timeZone` takes a WINDOWS zone name such as "Eastern Standard Time", not an IANA name. Attendees are emailed an invitation. To pick a time first, use outlook_find_meeting_times: each suggestion it returns carries `createEventArgs` that can be passed here as-is (add `subject` if the search did not set one). ' + CONFIRM_FLOW_SENTENCE + " " + TIMEOUT_SENTENCE + " " + CONFIRM_INJECTION_RULE,
+      annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
+      inputSchema: createEventInput
     },
     async ({ subject, start, end, timeZone, location, body, attendees, optionalAttendees, teamsMeeting, confirmToken }, ctx) => {
       const wantTeams = teamsMeeting !== false;
@@ -49269,7 +50164,7 @@ function registerWriteTools(server, client2) {
         ...(attendees ?? []).map((a) => attendee(a, "Required")),
         ...(optionalAttendees ?? []).map((a) => attendee(a, "Optional"))
       ];
-      const tz = timeZone ?? await mailboxTimeZone(client2) ?? "UTC";
+      const tz = timeZone ?? await mailboxTimeZone(client2, { required: true }) ?? "UTC";
       const payload = {
         Subject: subject,
         Start: { DateTime: start, TimeZone: tz },
@@ -49290,11 +50185,12 @@ function registerWriteTools(server, client2) {
         confirmToken
       });
       if (gate) return gate;
-      const created = await client2.write(
-        "POST",
-        "/me/events",
-        payload
+      const write = await writeOrUnknown(
+        () => client2.write("POST", "/me/events", payload),
+        "the calendar (outlook_list_events)"
       );
+      if (!write.ok) return write.result;
+      const created = write.value;
       let joinUrl = joinUrlOf(created);
       if (wantTeams && !joinUrl && created?.Id) {
         const after = await client2.get(
@@ -49306,6 +50202,7 @@ function registerWriteTools(server, client2) {
         created: true,
         Id: created?.Id,
         WebLink: created?.WebLink,
+        TimeZone: tz,
         ...joinUrl ? { JoinUrl: joinUrl } : {},
         ...wantTeams && !joinUrl ? { warning: "The event was created, but Outlook returned no Teams join link." } : {}
       });
@@ -49315,7 +50212,7 @@ function registerWriteTools(server, client2) {
     "outlook_update_event",
     {
       description: "Update a meeting you organize: retitle, move, relocate, edit the description, or add/remove attendees. Moving only `start` keeps the meeting's length. A Microsoft Teams meeting is added if the event lacks one (`teamsMeeting: false` to skip). Attendees are sent an updated invitation. Only the organizer can update a meeting \u2014 an attendee's edit would change their own copy alone, so it is refused. The result is verified by re-reading the event. " + CONFIRM_FLOW_SENTENCE + " " + CONFIRM_INJECTION_RULE,
-      annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: true },
+      annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: true, openWorldHint: true },
       inputSchema: external_exports.object({
         id: external_exports.string().min(1).describe("Event Id from outlook_list_events or outlook_get_event"),
         subject: external_exports.string().optional().describe("New title"),
@@ -49332,7 +50229,7 @@ function registerWriteTools(server, client2) {
       })
     },
     async (args, ctx) => {
-      const tz = args.timeZone ?? await mailboxTimeZone(client2) ?? "UTC";
+      const tz = args.timeZone ?? await mailboxTimeZone(client2, { required: true }) ?? "UTC";
       const path = `/me/events/${encodeURIComponent(args.id)}`;
       const readEvent = (zone) => client2.get(`${path}?$select=${EVENT_STATE_SELECT}`, {
         prefer: `outlook.timezone="${zone}"`
@@ -49427,6 +50324,282 @@ function registerWriteTools(server, client2) {
       });
     }
   );
+  server.registerTool(
+    "outlook_respond_to_invite",
+    {
+      description: "Accept, tentatively accept or decline a meeting invitation. Pass the invite's `messageId` (from outlook_get_unread, which marks it kind \"meetingRequest\") or the event's `eventId` \u2014 exactly one. The organizer is sent your response unless `sendResponse: false`, in which case only your calendar changes and no confirmation is asked. Cancelled meetings and meetings you organize are refused. The result is verified by re-reading the event's response status; a declined meeting may leave your calendar entirely. " + CONFIRM_FLOW_SENTENCE + " " + TIMEOUT_SENTENCE + " " + CONFIRM_INJECTION_RULE,
+      annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: true, openWorldHint: true },
+      inputSchema: external_exports.object({
+        messageId: external_exports.string().min(1).optional().describe("Id of the invite message (resolved to its event). Give this or eventId."),
+        eventId: external_exports.string().min(1).optional().describe("Event Id. Give this or messageId."),
+        response: external_exports.enum(["accept", "tentative", "decline"]).describe("Your answer"),
+        comment: external_exports.string().optional().describe("Note to the organizer sent with the response"),
+        sendResponse: external_exports.boolean().optional().describe("Tell the organizer (default true). false changes only your calendar."),
+        confirmToken: confirmTokenParam
+      })
+    },
+    async ({ messageId, eventId, response, comment, sendResponse, confirmToken }, ctx) => {
+      if (messageId === void 0 === (eventId === void 0)) {
+        throw new McpToolError("Pass exactly one of messageId or eventId.", {
+          hint: "messageId is the invite in your inbox; eventId is the meeting on your calendar."
+        });
+      }
+      let event;
+      if (messageId !== void 0) {
+        const msg = await client2.get(
+          `/me/messages/${encodeURIComponent(messageId)}`,
+          { query: { $select: `Id,${MEETING_MESSAGE_TYPE}`, $expand: EVENT_EXPAND } }
+        );
+        event = resolvedEvent(msg?.Event);
+        if (!event) {
+          if (isMeetingMessage(msg)) {
+            throw new McpToolError(
+              "This invite's meeting is no longer on your calendar (already declined, cancelled or deleted) \u2014 there is nothing to respond to.",
+              { hint: "Mark the invite read or file it; answering it again is not possible." }
+            );
+          }
+          throw new McpToolError("That message is not a meeting invite.", {
+            hint: 'Only messages outlook_get_unread marks kind "meetingRequest" carry an event to answer.'
+          });
+        }
+      } else {
+        event = await client2.get(
+          `/me/events/${encodeURIComponent(eventId)}?$select=${INVITE_EVENT_SELECT}`
+        );
+      }
+      const id = event?.Id ?? eventId;
+      if (event?.IsCancelled === true) {
+        throw new McpToolError("This meeting has been cancelled; there is nothing to respond to.", {
+          hint: "Remove it from your calendar with outlook_delete_event if it is still shown."
+        });
+      }
+      if (event?.IsOrganizer === true || event?.ResponseStatus?.Response === "Organizer") {
+        throw new McpToolError("You organize this meeting, so you cannot respond to it.", {
+          hint: "To change or call it off, use outlook_update_event or Outlook itself."
+        });
+      }
+      const { verb, status } = INVITE_RESPONSES[response];
+      const notify = sendResponse !== false;
+      if (!notify && comment) {
+        throw new McpToolError("A comment can only go with a response the organizer receives.", {
+          hint: "Drop the comment, or leave sendResponse at its default (true) so the organizer gets both."
+        });
+      }
+      const path = `/me/events/${encodeURIComponent(id)}/${verb}`;
+      const payload = { ...comment ? { Comment: comment } : {}, SendResponse: notify };
+      if (notify) {
+        const when = `${trimTime2(event?.Start?.DateTime) ?? "?"} to ${trimTime2(event?.End?.DateTime) ?? "?"}${event?.Start?.TimeZone ? ` (${event.Start.TimeZone})` : ""}`;
+        const organizer = event?.Organizer?.EmailAddress?.Address ?? "the organizer";
+        const gate = await confirmWrite(ctx, {
+          tool: "outlook_respond_to_invite",
+          action: "calendar.respond_to_invite",
+          message: "Review and confirm this response (the organizer is notified):",
+          summary: `${response === "tentative" ? "Tentatively accept" : response === "accept" ? "Accept" : "Decline"} "${event?.Subject ?? id}" ${when}, organized by ${organizer}` + (comment ? `, with comment: "${comment}"` : ""),
+          // One signed-in mailbox per server process.
+          account: void 0,
+          target: id,
+          request: { method: "POST", path, body: payload },
+          confirmToken
+        });
+        if (gate) return gate;
+      }
+      const write = await writeOrUnknown(
+        () => client2.write("POST", path, payload),
+        "the event's response (outlook_get_event)"
+      );
+      if (!write.ok) return write.result;
+      let after;
+      try {
+        after = await client2.get(
+          `/me/events/${encodeURIComponent(id)}?$select=ResponseStatus`
+        );
+      } catch (e) {
+        if (response === "decline" && errorStatusOf(e) === 404) {
+          return minifiedResult({
+            responded: true,
+            eventId: id,
+            response: status,
+            sentResponse: notify,
+            note: "The declined meeting is no longer on your calendar."
+          });
+        }
+        return minifiedResult({
+          responded: null,
+          eventId: id,
+          sentResponse: notify,
+          warning: `Outlook accepted the response but re-reading the event failed (${e instanceof Error ? e.message : String(e)}), so it is unverified.`
+        });
+      }
+      const got = after?.ResponseStatus?.Response;
+      return minifiedResult({
+        responded: got === status,
+        eventId: id,
+        response: got,
+        sentResponse: notify,
+        ...got === status ? {} : { warning: `Outlook accepted the response but the status did not change (still ${got ?? "unknown"}).` }
+      });
+    }
+  );
+  server.registerTool(
+    "outlook_delete_event",
+    {
+      description: `Delete a calendar event. An occurrence's id deletes only that occurrence; a series master's id (Type "SeriesMaster" in outlook_get_event) deletes the WHOLE series. Only the organizer can delete a meeting \u2014 for an invite you received, decline it with outlook_respond_to_invite instead (a meeting the organizer already cancelled can be removed here). Deleting a meeting that has attendees sends each of them a cancellation, so it is confirmed first; your own appointment with no attendees, or a cancelled meeting, is removed without asking because only your calendar changes. The result is verified by re-reading the event. ` + CONFIRM_FLOW_SENTENCE + " " + TIMEOUT_SENTENCE + " " + CONFIRM_INJECTION_RULE,
+      annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: true, openWorldHint: true },
+      inputSchema: external_exports.object({
+        id: external_exports.string().min(1).describe("Event Id from outlook_list_events or outlook_get_event (an occurrence, or a series master)"),
+        confirmToken: confirmTokenParam
+      })
+    },
+    async ({ id, confirmToken }, ctx) => {
+      const path = `/me/events/${encodeURIComponent(id)}`;
+      const zone = await mailboxTimeZone(client2);
+      const event = await client2.get(
+        `${path}?$select=${DELETE_EVENT_SELECT}`,
+        zone ? { prefer: `outlook.timezone="${zone}"` } : {}
+      );
+      const organizer = event?.IsOrganizer === true || event?.ResponseStatus?.Response === "Organizer";
+      const cancelled = event?.IsCancelled === true;
+      if (!organizer && !cancelled) {
+        throw new McpToolError("Only the organizer can delete this meeting.", {
+          hint: 'You are an attendee: deleting your copy would not tell the organizer. To drop it, decline with outlook_respond_to_invite (response: "decline"), which also removes it from your calendar.'
+        });
+      }
+      const scope = event?.Type === "SeriesMaster" ? "the whole series (every occurrence)" : event?.Type === "Occurrence" || event?.Type === "Exception" ? "only this occurrence (the rest of the series stays)" : "this event";
+      const attendeeCount = event?.Attendees?.length ?? 0;
+      const notifies = organizer && !cancelled && attendeeCount > 0;
+      if (notifies) {
+        const when = `${trimTime2(event?.Start?.DateTime) ?? "?"} to ${trimTime2(event?.End?.DateTime) ?? "?"}${event?.Start?.TimeZone ? ` (${event.Start.TimeZone})` : ""}`;
+        const gate = await confirmWrite(ctx, {
+          tool: "outlook_delete_event",
+          action: "calendar.delete_event",
+          message: "Review and confirm this deletion (every attendee is sent a cancellation):",
+          summary: `Delete "${event?.Subject ?? id}" ${when} \u2014 ${scope}; ${attendeeCount} attendee${attendeeCount === 1 ? "" : "s"} will be sent a cancellation`,
+          // One signed-in mailbox per server process.
+          account: void 0,
+          target: id,
+          request: { method: "DELETE", path },
+          preview: { scope, attendees: attendeeCount },
+          confirmToken
+        });
+        if (gate) return gate;
+      }
+      const write = await writeOrUnknown(
+        () => client2.write("DELETE", path),
+        "the calendar (outlook_get_event)"
+      );
+      if (!write.ok) return write.result;
+      const base = { Id: id, Subject: event?.Subject, scope, cancellationSent: notifies };
+      let after;
+      try {
+        after = await client2.get(`${path}?$select=Id`);
+      } catch (e) {
+        if (errorStatusOf(e) === 404) return minifiedResult({ deleted: true, ...base });
+        return minifiedResult({
+          deleted: null,
+          ...base,
+          warning: `Outlook accepted the delete but re-reading the event failed (${e instanceof Error ? e.message : String(e)}), so it is unverified.`
+        });
+      }
+      return minifiedResult({
+        deleted: false,
+        ...base,
+        warning: `Outlook accepted the delete but the event is still on the calendar${after?.Id ? ` (${after.Id})` : ""}.`
+      });
+    }
+  );
+  server.registerTool(
+    "outlook_reply",
+    {
+      description: "Reply, reply-all or forward a message, with `comment` as your new text above the quoted original. Outlook picks the recipients for reply (the sender, or its Reply-To) and reply-all (sender plus the original To and Cc, minus you); a forward needs `to`. `draftOnly: true` leaves the reply in Drafts and returns its id, sending nothing and asking no confirmation; otherwise it is sent at once. " + CONFIRM_FLOW_SENTENCE + " The preview shows the recipients, subject and comment. " + TIMEOUT_SENTENCE + " " + CONFIRM_INJECTION_RULE + " " + UNTRUSTED_DESCRIPTION_SUFFIX,
+      annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
+      inputSchema: external_exports.object({
+        messageId: external_exports.string().min(1).describe("Id of the message to answer or forward"),
+        mode: external_exports.enum(["reply", "replyAll", "forward"]).describe("reply (sender only), replyAll, or forward"),
+        comment: external_exports.string().describe("Your text, placed above the quoted original"),
+        to: recipientList.describe("Forward recipients' email addresses (forward only, required there)"),
+        draftOnly: external_exports.boolean().optional().describe("Save to Drafts instead of sending (default false)"),
+        confirmToken: confirmTokenParam
+      })
+    },
+    async ({ messageId, mode, comment, to, draftOnly, confirmToken }, ctx) => {
+      if (mode === "forward" && !to?.length) {
+        throw new McpToolError("A forward needs at least one recipient.", {
+          hint: "Pass `to` with the addresses to forward to."
+        });
+      }
+      if (mode !== "forward" && to?.length) {
+        throw new McpToolError("`to` applies only to a forward.", {
+          hint: 'A reply goes where Outlook computes; use mode "forward" to send it somewhere else, or outlook_send_mail.'
+        });
+      }
+      const { send, draft, prefix } = REPLY_MODES[mode];
+      const base = `/me/messages/${encodeURIComponent(messageId)}`;
+      const forwardTo = mode === "forward" ? { ToRecipients: toRecipients(to) } : {};
+      if (draftOnly === true) {
+        const create = await writeOrUnknown(
+          () => client2.write(
+            "POST",
+            `${base}/${draft}`,
+            {}
+          ),
+          "Drafts"
+        );
+        if (!create.ok) return create.result;
+        const created = create.value;
+        if (!created?.Id) {
+          throw new McpToolError("Outlook did not return the draft it created.", {
+            hint: "Check the Drafts folder before trying again."
+          });
+        }
+        try {
+          await client2.write("PATCH", `/me/messages/${encodeURIComponent(created.Id)}`, {
+            Body: bodyWithComment(created.Body, comment),
+            ...forwardTo
+          });
+        } catch (e) {
+          return minifiedResult({
+            drafted: true,
+            mode,
+            draftId: created.Id,
+            WebLink: created.WebLink,
+            warning: `The draft was created but adding your comment${mode === "forward" ? " and recipients" : ""} failed (${e instanceof Error ? e.message : String(e)}). Edit it in Drafts, or delete it before trying again.`
+          });
+        }
+        return minifiedResult({ drafted: true, mode, draftId: created.Id, WebLink: created.WebLink });
+      }
+      const orig = await client2.get(base, {
+        query: { $select: "Subject,From,ReplyTo,ToRecipients,CcRecipients" }
+      });
+      const sender = orig?.ReplyTo?.length ? orig.ReplyTo : orig?.From ? [orig.From] : [];
+      const recipients = mode === "forward" ? { to: to ?? [], cc: [] } : mode === "replyAll" ? { to: addresses(sender, orig?.ToRecipients), cc: addresses(orig?.CcRecipients) } : { to: addresses(sender), cc: [] };
+      const subject = `${prefix}${orig?.Subject ?? ""}`;
+      const path = `${base}/${send}`;
+      const payload = { Comment: comment, ...forwardTo };
+      const everyone = [...recipients.to, ...recipients.cc.map((c) => `cc ${c}`)];
+      const who = everyone.length > MAX_RECIPIENTS ? `${everyone.slice(0, MAX_RECIPIENTS).join(", ")} and ${(everyone.length - MAX_RECIPIENTS).toLocaleString("en-US")} more` : everyone.join(", ");
+      const gate = await confirmWrite(ctx, {
+        tool: "outlook_reply",
+        action: `mail.${send}`,
+        message: "Review and confirm this email before it is sent:",
+        summary: `${mode === "forward" ? "Forward" : mode === "replyAll" ? "Reply all" : "Reply"} "${subject}" to ${who || "(no recipients)"}${mode === "replyAll" ? " (Outlook leaves out your own address)" : ""}, with comment: "${comment}"`,
+        // One signed-in mailbox per server process.
+        account: void 0,
+        target: messageId,
+        request: { method: "POST", path, body: payload },
+        confirmToken
+      });
+      if (gate) return gate;
+      const sent = await writeOrUnknown(() => client2.write("POST", path, payload), "Sent Items");
+      if (!sent.ok) return sent.result;
+      return mailboxUntrusted({
+        sent: true,
+        mode,
+        subject,
+        ...cappedRecipients("to", recipients.to),
+        ...cappedRecipients("cc", recipients.cc)
+      });
+    }
+  );
 }
 
 // src/tools/healthcheck.ts