@chrischall/office-outlook-mcp 0.3.5 → 0.4.1

package/dist/bundle.js

@@ -23737,10 +23737,10 @@ function scanXMcpHeaderDeclarations(inputSchema) {
       if (!RFC9110_TOKEN.test(raw)) return `${pathName(path)}: x-mcp-header '${raw}' is not a valid RFC 9110 token (no spaces, control characters or HTTP delimiters)`;
       const type = typeof schema.type === "string" ? schema.type : void 0;
       if (type === void 0 || !PERMITTED_X_MCP_HEADER_TYPES.has(type)) return `${pathName(path)}: x-mcp-header is only permitted on primitive-typed properties (string, integer, boolean); got ${type ?? "<none>"}`;
-      const lower = raw.toLowerCase();
-      const prior = seenLower.get(lower);
+      const lower2 = raw.toLowerCase();
+      const prior = seenLower.get(lower2);
       if (prior !== void 0) return `x-mcp-header '${raw}' is not case-insensitively unique (also declared as '${prior}')`;
-      seenLower.set(lower, raw);
+      seenLower.set(lower2, raw);
       declarations.push({
         path,
         headerName: raw,
@@ -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",
@@ -35904,7 +35991,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 +36228,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 +36250,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 +36338,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 +36366,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 +36592,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 +36673,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 +36699,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 +36826,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 +36859,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 +36952,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 +36992,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 +37004,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 +37048,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 +37070,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 +37148,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 +37173,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 +37268,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 +37326,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 +37336,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 +37359,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 +37371,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 +37380,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 +37419,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.
@@ -37063,6 +37484,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 +37505,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 +37540,7 @@ var init_auth = __esm({
     init_config();
     init_errors3();
     init_http();
+    init_cancel();
     init_cached_token();
     init_es256();
   }
@@ -37148,7 +37571,7 @@ var init_version = __esm({
   "src/version.ts"() {
     "use strict";
     PACKAGE_NAME = "office-outlook-mcp";
-    VERSION = "0.3.5";
+    VERSION = "0.4.1";
   }
 });
 
@@ -44875,7 +45298,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 +46367,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 +46386,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 +46451,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 +47587,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 +47600,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 +47629,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 +47677,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 +48040,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 +48522,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 = {
@@ -48347,7 +48772,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 +48782,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 } : {}
     });
   }
   /**
@@ -48387,6 +48814,22 @@ var OutlookClient = class {
     }
     return this.get(target.pathname.slice(prefix.length) + target.search, opts);
   }
+  /**
+   * POST a read-only query — `findmeetingtimes`, `getschedule` — that changes
+   * nothing in the mailbox. Kept apart from `write` so a reader can tell the
+   * two apart at the call site, and because these take `Prefer` (notably
+   * `outlook.timezone`, without which every returned slot is UTC).
+   */
+  async post(path, body, opts = {}) {
+    this.#requireConfigured();
+    return this.#client().fetchJson("POST", path, {
+      body,
+      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
+    });
+  }
   /**
    * The single write path. Everything mutating goes through here so auth and
    * error shaping stay in one place.
@@ -48429,6 +48872,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;
@@ -48487,7 +48931,11 @@ function fullEvent(e) {
     Attendees: e.Attendees?.map(
       (a) => pruned({ Who: addr(a), Response: a.Status?.Response })
     ),
-    OnlineMeetingUrl: e.OnlineMeetingUrl,
+    // The Teams link lives under OnlineMeeting; OnlineMeetingUrl is empty on
+    // every live Teams meeting checked.
+    JoinUrl: e.OnlineMeeting?.JoinUrl || e.OnlineMeetingUrl || void 0,
+    // Kept beside JoinUrl so a consumer of the old field still finds it.
+    OnlineMeetingUrl: e.OnlineMeetingUrl || void 0,
     Preview: e.BodyPreview?.trim() || void 0,
     WebLink: e.WebLink
   });
@@ -48497,7 +48945,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) {
@@ -48531,7 +48981,9 @@ 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 : [];
@@ -48550,7 +49002,6 @@ function mailboxUntrusted(payload) {
 }
 
 // src/tools/mail.ts
-var VIEWS2 = ["compact", "full", "raw"];
 var WELL_KNOWN = [
   "inbox",
   "drafts",
@@ -48562,14 +49013,6 @@ 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);
 }
@@ -48577,19 +49020,22 @@ 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"));
@@ -48599,7 +49045,7 @@ function registerMailTools(server, client2) {
     "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 },
+      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")'),
@@ -48631,7 +49077,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);
@@ -48644,7 +49091,7 @@ function registerMailTools(server, client2) {
     "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 },
+      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"),
@@ -48664,7 +49111,7 @@ function registerMailTools(server, client2) {
     "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
@@ -48674,9 +49121,8 @@ 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));
     }
@@ -48688,8 +49134,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 {
@@ -48697,27 +49144,44 @@ 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,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))}`);
+var EVENT_SELECT = "Id,Subject,Start,End,Location,Organizer,IsAllDay,IsCancelled,ShowAs,OnlineMeetingUrl,OnlineMeeting,BodyPreview";
+function dateTimeTimeZone(value, zone) {
+  if (/(Z|[+-]\d{2}:?\d{2})$/i.test(value)) {
+    const d = new Date(value);
+    if (!Number.isNaN(d.getTime())) {
+      return { DateTime: d.toISOString().replace(/\.\d{3}Z$/, ""), TimeZone: "UTC" };
+    }
+  }
+  return { DateTime: value, TimeZone: zone };
+}
+function assertWindow(start, end) {
+  const a = Date.parse(start);
+  const b = Date.parse(end);
+  if (!Number.isNaN(a) && !Number.isNaN(b) && b <= a) {
+    throw new McpToolError(`The window ends (${end}) before it starts (${start}).`, {
+      hint: "`end` must be later than `start`."
+    });
   }
-  return parts.length ? `?${parts.join("&")}` : "";
 }
+function trimTime(dt) {
+  return dt?.replace(/\.0+$/, "");
+}
+var attendeeList = (what) => external_exports.array(external_exports.string().min(3)).describe(`Email addresses of ${what}`);
 function registerCalendarTools(server, client2) {
   server.registerTool(
     "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)"),
@@ -48734,14 +49198,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);
@@ -48754,7 +49221,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"),
@@ -48776,31 +49243,136 @@ 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));
     }
   );
+  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, openWorldHint: true },
+      inputSchema: external_exports.object({
+        view: viewParam(VIEWS2),
+        attendees: attendeeList("required attendees").min(1),
+        optionalAttendees: attendeeList("optional attendees").optional(),
+        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"),
+        timeZone: external_exports.string().optional().describe('Windows time-zone name, e.g. "Eastern Standard Time". Defaults to the MAILBOX time zone.'),
+        maxCandidates: external_exports.number().int().min(1).max(50).optional().describe("Max suggestions (default 10)"),
+        workingHoursOnly: external_exports.boolean().optional().describe("Only suggest times inside working hours (default true). false searches around the clock."),
+        minimumAttendeePercentage: external_exports.number().min(0).max(100).optional().describe("Lowest confidence (0-100) a slot needs to be suggested. Lower it to see slots where not everyone is free."),
+        isOrganizerOptional: external_exports.boolean().optional().describe("true when the signed-in user need not attend, so their own calendar is ignored")
+      })
+    },
+    async (args) => {
+      assertWindow(args.start, args.end);
+      const zone = args.timeZone ?? await mailboxTimeZone(client2) ?? "UTC";
+      const body = {
+        Attendees: [
+          ...args.attendees.map((Address) => ({ Type: "Required", EmailAddress: { Address } })),
+          ...(args.optionalAttendees ?? []).map((Address) => ({
+            Type: "Optional",
+            EmailAddress: { Address }
+          }))
+        ],
+        TimeConstraint: {
+          ActivityDomain: args.workingHoursOnly === false ? "Unrestricted" : "Work",
+          Timeslots: [
+            { Start: dateTimeTimeZone(args.start, zone), End: dateTimeTimeZone(args.end, zone) }
+          ]
+        },
+        MeetingDuration: `PT${args.durationMinutes}M`,
+        MaxCandidates: args.maxCandidates ?? 10,
+        ReturnSuggestionReasons: true,
+        ...args.minimumAttendeePercentage !== void 0 ? { MinimumAttendeePercentage: args.minimumAttendeePercentage } : {},
+        ...args.isOrganizerOptional !== void 0 ? { IsOrganizerOptional: args.isOrganizerOptional } : {}
+      };
+      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
+      }));
+      return mailboxUntrusted({
+        timeZone: zone,
+        count: suggestions.length,
+        suggestions,
+        // Outlook explains an empty result ("AttendeesUnavailable", ...); an
+        // empty list without it reads as "nobody is ever free".
+        ...data?.EmptySuggestionsReason ? { emptySuggestionsReason: data.EmptySuggestionsReason } : {}
+      });
+    }
+  );
+  server.registerTool(
+    "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, openWorldHint: true },
+      inputSchema: external_exports.object({
+        view: viewParam(VIEWS2),
+        people: attendeeList("people (or rooms) to look up").min(1).max(100),
+        start: external_exports.string().min(1).describe("Window start, e.g. 2026-10-12T09:00:00"),
+        end: external_exports.string().min(1).describe("Window end, e.g. 2026-10-12T17:00:00"),
+        timeZone: external_exports.string().optional().describe('Windows time-zone name, e.g. "Eastern Standard Time". Defaults to the MAILBOX time zone.'),
+        intervalMinutes: external_exports.number().int().min(5).max(1440).optional().describe("Slot size for the raw view's AvailabilityView string (default 30)")
+      })
+    },
+    async ({ view, people, start, end, timeZone, intervalMinutes }) => {
+      assertWindow(start, end);
+      const zone = timeZone ?? await mailboxTimeZone(client2) ?? "UTC";
+      const data = await client2.post(
+        "/me/calendar/getschedule",
+        {
+          Schedules: people,
+          StartTime: dateTimeTimeZone(start, zone),
+          EndTime: dateTimeTimeZone(end, zone),
+          AvailabilityViewInterval: intervalMinutes ?? 30
+        },
+        { prefer: `outlook.timezone="${zone}"` }
+      );
+      if (resolveView(view, VIEWS2) === "raw") return mailboxUntrusted(data);
+      const schedules = (data?.value ?? []).map(
+        (p) => (
+          // An unresolvable address must not read as "free all day".
+          p.Error !== void 0 && p.Error !== null ? { Who: p.ScheduleId, Error: p.Error } : {
+            Who: p.ScheduleId,
+            Busy: (p.ScheduleItems ?? []).map((i) => ({
+              Start: trimTime(i.Start?.DateTime),
+              End: trimTime(i.End?.DateTime),
+              Status: i.Status,
+              ...i.Subject ? { Subject: i.Subject } : {},
+              ...i.Location ? { Location: i.Location } : {}
+            }))
+          }
+        )
+      );
+      return mailboxUntrusted({ timeZone: zone, schedules });
+    }
+  );
 }
 
 // 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);
@@ -48810,7 +49382,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")))
@@ -48819,7 +49391,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")))
@@ -48828,7 +49400,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)"),
@@ -48840,13 +49412,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"));
     }
@@ -48855,7 +49430,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)"),
@@ -48866,10 +49441,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"));
     }
@@ -48878,7 +49456,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)"),
@@ -48889,10 +49467,13 @@ 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"));
     }
@@ -48912,12 +49493,52 @@ function messageBody(subject, body, html) {
     Body: { ContentType: html === true ? "HTML" : "Text", Content: body }
   };
 }
+var TEAMS = { IsOnlineMeeting: true, OnlineMeetingProvider: "TeamsForBusiness" };
+var teamsMeetingParam = external_exports.boolean().optional().describe("Attach a Microsoft Teams meeting (default true). false leaves it off.");
+var EVENT_STATE_SELECT = "Id,Subject,IsOrganizer,Start,End,Location,Attendees,IsOnlineMeeting,OnlineMeetingProvider,OnlineMeeting";
+function attendee(Address, Type) {
+  return { Type, EmailAddress: { Address } };
+}
+var lower = (a) => a.EmailAddress?.Address?.toLowerCase();
+function joinUrlOf(e) {
+  return e?.OnlineMeeting?.JoinUrl || void 0;
+}
+function isTeams(e) {
+  return e.IsOnlineMeeting === true && e.OnlineMeetingProvider === "TeamsForBusiness";
+}
+function dateTimeTimeZone2(value, zone) {
+  if (/(Z|[+-]\d{2}:?\d{2})$/i.test(value)) {
+    const d = new Date(value);
+    if (!Number.isNaN(d.getTime())) {
+      return { DateTime: d.toISOString().replace(/\.\d{3}Z$/, ""), TimeZone: "UTC" };
+    }
+  }
+  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 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+$/, "");
 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,
@@ -48951,7 +49572,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 });
     }
   );
@@ -48959,7 +49581,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,
@@ -48998,7 +49620,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"),
@@ -49033,7 +49655,7 @@ function registerWriteTools(server, client2) {
     "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")'),
@@ -49071,8 +49693,8 @@ function registerWriteTools(server, client2) {
   server.registerTool(
     "outlook_create_event",
     {
-      description: 'Create a calendar event. `timeZone` takes a WINDOWS zone name such as "Eastern Standard Time", not an IANA name. Attendees are emailed an invitation. ' + CONFIRM_FLOW_SENTENCE + " " + CONFIRM_INJECTION_RULE,
-      annotations: { readOnlyHint: false, destructiveHint: false },
+      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 + " " + TIMEOUT_SENTENCE + " " + CONFIRM_INJECTION_RULE,
+      annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
       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"),
@@ -49080,42 +49702,176 @@ function registerWriteTools(server, client2) {
         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,
+        attendees: recipientList.describe("Required attendees' email addresses"),
+        optionalAttendees: recipientList.describe("Optional attendees' email addresses"),
+        teamsMeeting: teamsMeetingParam,
         confirmToken: confirmTokenParam
       })
     },
-    async ({ subject, start, end, timeZone, location, body, attendees, confirmToken }, ctx) => {
-      const tz = timeZone ?? await mailboxTimeZone(client2) ?? "UTC";
+    async ({ subject, start, end, timeZone, location, body, attendees, optionalAttendees, teamsMeeting, confirmToken }, ctx) => {
+      const wantTeams = teamsMeeting !== false;
+      const allAttendees = [
+        ...(attendees ?? []).map((a) => attendee(a, "Required")),
+        ...(optionalAttendees ?? []).map((a) => attendee(a, "Optional"))
+      ];
+      const tz = timeZone ?? await mailboxTimeZone(client2, { required: true }) ?? "UTC";
       const payload = {
         Subject: subject,
         Start: { DateTime: start, TimeZone: tz },
         End: { DateTime: end, TimeZone: tz },
         ...location ? { Location: { DisplayName: location } } : {},
         ...body ? { Body: { ContentType: "Text", Content: body } } : {},
-        ...attendees?.length ? {
-          Attendees: attendees.map((Address) => ({
-            EmailAddress: { Address },
-            Type: "Required"
-          }))
-        } : {}
+        ...allAttendees.length ? { Attendees: allAttendees } : {},
+        ...wantTeams ? TEAMS : {}
       };
       const gate = await confirmWrite(ctx, {
         tool: "outlook_create_event",
         action: "calendar.create_event",
         message: "Review and confirm this event (attendees are emailed an invitation):",
-        summary: `Create event "${subject}" ${start} to ${end} (${tz})`,
+        summary: `Create ${wantTeams ? "Teams meeting" : "event"} "${subject}" ${start} to ${end} (${tz})`,
         // One signed-in mailbox per server process.
         account: void 0,
         request: { method: "POST", path: "/me/events", body: payload },
         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)"
       );
-      return minifiedResult({ created: true, Id: created?.Id, WebLink: created?.WebLink });
+      if (!write.ok) return write.result;
+      const created = write.value;
+      let joinUrl = joinUrlOf(created);
+      if (wantTeams && !joinUrl && created?.Id) {
+        const after = await client2.get(
+          `/me/events/${encodeURIComponent(created.Id)}?$select=OnlineMeeting`
+        );
+        joinUrl = joinUrlOf(after);
+      }
+      return minifiedResult({
+        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." } : {}
+      });
+    }
+  );
+  server.registerTool(
+    "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: 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"),
+        start: external_exports.string().optional().describe("New start, ISO 8601 local time e.g. 2026-09-22T15:00:00"),
+        end: external_exports.string().optional().describe("New end. Omit when moving `start` to keep the current length."),
+        timeZone: external_exports.string().optional().describe("Windows time-zone name for start/end. Defaults to the MAILBOX time zone."),
+        location: external_exports.string().optional().describe("New location display name"),
+        body: external_exports.string().optional().describe("New description (replaces the existing one)"),
+        addAttendees: recipientList.describe("Required attendees to add"),
+        addOptionalAttendees: recipientList.describe("Optional attendees to add"),
+        removeAttendees: recipientList.describe("Attendees to remove"),
+        teamsMeeting: teamsMeetingParam,
+        confirmToken: confirmTokenParam
+      })
+    },
+    async (args, ctx) => {
+      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}"`
+      });
+      const current = await readEvent(tz);
+      if (current?.IsOrganizer === false) {
+        throw new McpToolError("Only the organizer can update this meeting.", {
+          hint: "You are an attendee. Changing your copy would not reach the organizer or anyone else; ask the organizer, or propose a new time from Outlook."
+        });
+      }
+      const payload = {};
+      if (args.subject !== void 0) payload.Subject = args.subject;
+      if (args.location !== void 0) payload.Location = { DisplayName: args.location };
+      if (args.body !== void 0) payload.Body = { ContentType: "Text", Content: args.body };
+      if (args.start !== void 0 || args.end !== void 0) {
+        const start = args.start !== void 0 ? dateTimeTimeZone2(args.start, tz) : void 0;
+        let end = args.end !== void 0 ? dateTimeTimeZone2(args.end, tz) : void 0;
+        if (start && !end && current?.Start?.DateTime && current?.End?.DateTime) {
+          const length = naiveMs(current.End.DateTime) - naiveMs(current.Start.DateTime);
+          end = { DateTime: fromNaiveMs(naiveMs(start.DateTime) + length), TimeZone: start.TimeZone };
+        }
+        if (args.start !== void 0 && args.end !== void 0 && start?.TimeZone !== end?.TimeZone) {
+          throw new McpToolError("`start` and `end` are in different zones.", {
+            hint: "Give both the same way: both local wall-clock times, or both with Z or an offset."
+          });
+        }
+        const startIn = start ?? (end && end.TimeZone !== tz ? (await readEvent(end.TimeZone))?.Start : current?.Start);
+        if (end && startIn?.DateTime && naiveMs(end.DateTime) <= naiveMs(startIn.DateTime)) {
+          throw new McpToolError("The meeting would end before it starts.", {
+            hint: "`end` must be later than `start`."
+          });
+        }
+        if (start) payload.Start = start;
+        if (end) payload.End = end;
+      }
+      const adding = [
+        ...(args.addAttendees ?? []).map((a) => attendee(a, "Required")),
+        ...(args.addOptionalAttendees ?? []).map((a) => attendee(a, "Optional"))
+      ];
+      const removing = new Set((args.removeAttendees ?? []).map((a) => a.toLowerCase()));
+      if (adding.length || removing.size) {
+        const next = (current?.Attendees ?? []).filter((a) => !removing.has(lower(a) ?? "")).map(({ Type, EmailAddress }) => ({ Type, EmailAddress }));
+        for (const a of adding) {
+          if (!next.some((n) => lower(n) === lower(a))) next.push(a);
+        }
+        payload.Attendees = next;
+      }
+      const addTeams = args.teamsMeeting !== false && !(current && isTeams(current));
+      if (addTeams) Object.assign(payload, TEAMS);
+      if (Object.keys(payload).length === 0) {
+        throw new McpToolError("Nothing to update.", {
+          hint: "Pass at least one of subject, start, end, location, body, or attendee changes."
+        });
+      }
+      const gate = await confirmWrite(ctx, {
+        tool: "outlook_update_event",
+        action: "calendar.update_event",
+        message: "Review and confirm this change (attendees are sent an updated invitation):",
+        summary: `Update "${current?.Subject ?? args.id}": ${Object.keys(payload).join(", ")}`,
+        // One signed-in mailbox per server process.
+        account: void 0,
+        target: args.id,
+        request: { method: "PATCH", path, body: payload },
+        confirmToken: args.confirmToken
+      });
+      if (gate) return gate;
+      await client2.write("PATCH", path, payload);
+      const writtenZone = (payload.Start ?? payload.End)?.TimeZone ?? tz;
+      const after = await readEvent(writtenZone);
+      const unchanged = [];
+      if (payload.Subject !== void 0 && after?.Subject !== payload.Subject) unchanged.push("Subject");
+      for (const key of ["Start", "End"]) {
+        const want = payload[key];
+        if (want && trimTime2(after?.[key]?.DateTime) !== trimTime2(want.DateTime)) unchanged.push(key);
+      }
+      if (payload.Location !== void 0 && after?.Location?.DisplayName !== args.location) {
+        unchanged.push("Location");
+      }
+      if (payload.Attendees !== void 0) {
+        const want = payload.Attendees.map(lower).sort().join();
+        const got = (after?.Attendees ?? []).map(lower).sort().join();
+        if (want !== got) unchanged.push("Attendees");
+      }
+      const joinUrl = joinUrlOf(after);
+      if (addTeams && !joinUrl) unchanged.push("Teams meeting");
+      return minifiedResult({
+        updated: unchanged.length === 0,
+        Id: after?.Id ?? args.id,
+        changed: Object.keys(payload),
+        ...joinUrl ? { JoinUrl: joinUrl } : {},
+        ...unchanged.length ? { warning: `Outlook accepted the update but these did not change: ${unchanged.join(", ")}.` } : {}
+      });
     }
   );
 }