@chrischall/office-outlook-mcp 0.8.1 → 0.8.3

package/.claude-plugin/marketplace.json

@@ -7,7 +7,7 @@
   },
   "metadata": {
     "description": "MCP server for Outlook / Microsoft 365 — mail, calendar, contacts and tasks via natural language",
-    "version": "0.8.1"
+    "version": "0.8.3"
   },
   "plugins": [
     {
@@ -15,7 +15,7 @@
       "displayName": "Outlook (Microsoft 365)",
       "source": "./",
       "description": "MCP server for Outlook / Microsoft 365 — triage unread mail, reply, answer meeting invites and schedule meetings, plus folders, calendar, contacts and tasks, with confirmation before anything is sent",
-      "version": "0.8.1",
+      "version": "0.8.3",
       "author": {
         "name": "Chris Hall"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "office-outlook-mcp",
   "displayName": "Outlook (Microsoft 365)",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "Outlook / Microsoft 365 for Claude — triage unread mail, reply, answer meeting invites and schedule meetings, plus folders, calendar, contacts and tasks, with confirmation before anything is sent, using your signed-in browser session",
   "author": {
     "name": "Chris Hall",

package/README.md

@@ -54,6 +54,23 @@ npm i -g @fetchproxy/cli
 The first capture prints a 6-digit pair code to approve in the ContextMint
 Bridge popup; the grant persists.
 
+### Pairing
+
+The server declares **one** host to the bridge — `outlook.cloud.microsoft`, or
+`OUTLOOK_WEB_HOST` — and the same scope on every capture, so once approved it
+neither re-pairs nor asks for wider grants. The bridge keeps one relay tab on
+that host open (it reuses yours if you already have Outlook open).
+
+Before 0.8.2 it also declared `outlook.office.com`. A signed-in tab there
+redirects to `outlook.cloud.microsoft`, so the bridge opened another background
+tab on every capture. Upgrading changes the declared domain set, so the bridge
+asks to pair **once** more.
+
+If you run the bridge in more than one browser or browser profile, each one is a
+different extension identity, and the server trusts only the one it paired
+with. Keep the bridge enabled in the browser you pair with (or re-pair
+deliberately with `FETCHPROXY_TRUST_NEW_EXTENSION=1` after switching browsers).
+
 ### Install in opencode
 
 opencode reads MCP servers from `opencode.json` (project) or
@@ -100,7 +117,8 @@ Everything is optional — with nothing set, the server captures from the browse
 | `OUTLOOK_DISABLE_FETCHPROXY` | `1` to disable browser capture, requiring `OUTLOOK_ACCESS_TOKEN`. |
 | `OUTLOOK_API_BASE` | Override the REST base URL. Defaults to `https://outlook.office.com/api/v2.0`. |
 | `OUTLOOK_WS_PORT` | fetchproxy concentrator port. Defaults to `37149`, the fleet-wide shared port. |
-| `OUTLOOK_CAPTURE_TIMEOUT` | Seconds to wait for the tab to make a readable request. Bounds the WHOLE capture, both declared hosts included. Defaults to `30`. |
+| `OUTLOOK_WEB_HOST` | Which Outlook Web host your signed-in tab is on: `outlook.cloud.microsoft` (default) or `outlook.office.com` for a tenant still on the legacy app. Only this one host is declared to the bridge — see [Pairing](#pairing). |
+| `OUTLOOK_CAPTURE_TIMEOUT` | Seconds to wait for the tab to make a readable request. Defaults to `30`. |
 | `OUTLOOK_TOKEN_CACHE` | `false` to stop caching the token between runs. |
 | `OUTLOOK_TOKEN_FILE` | Path to the cached token. Defaults to `~/.office-outlook-mcp/token.json`. |
 | `OUTLOOK_OUTPUT_DIR` | Absolute directory `outlook_export_messages` and `outlook_export_events` write into. Defaults to `~/Downloads/office-outlook-mcp`. When set, a per-call `dest` must be inside it. See [Bulk export](#bulk-export). |

package/dist/auth-fetchproxy.js

@@ -15,8 +15,9 @@
  *     domain), but the token it carries has `aud: https://outlook.office.com`;
  *   - that token authenticates plain server-side requests to
  *     `outlook.office.com/api/v2.0` with no bridge involved;
- *   - older tenants still serve the app from `outlook.office.com`, so both
- *     hosts are declared and captured, under ONE overall window.
+ *   - older tenants still serve the app from `outlook.office.com`; those set
+ *     `OUTLOOK_WEB_HOST=outlook.office.com`. Only ONE host is ever declared —
+ *     see `captureHost` for why.
  *
  * We do NOT try to mint a token by calling an endpoint ourselves. There is no
  * such endpoint reachable from the page's origin — the token comes from MSAL's
@@ -24,19 +25,10 @@
  * cannot drive. Capture is the only path, which is why a failed capture is a
  * hard error with actionable guidance rather than a fallback.
  */
-import { captureBearerHeader } from '@chrischall/mcp-utils/fetchproxy';
-import { readPortEnv, readTtlMsEnv } from '@chrischall/mcp-utils';
+import { captureBearerHeader, createFetchproxyTransport } from '@chrischall/mcp-utils/fetchproxy';
+import { readEnvVar, readPortEnv, readTtlMsEnv } from '@chrischall/mcp-utils';
 import { PACKAGE_NAME, VERSION } from './version.js';
-/**
- * `raceCaptures` settles the per-host attempts under ONE overall deadline:
- * `Promise.any` alone is not enough, because the bridge serializes the two
- * hosts behind its single connection, so the wait was the sum rather than the
- * max — measured live at 14.4s for a 5s window and 36s for a 20s one. At the
- * 30s default that lands past the 60s request timeout an MCP client uses by
- * default. Re-exported (it is mcp-utils', lifted from here) for the test that
- * pins that bound.
- */
-export { raceCaptures, stripBearer } from '@chrischall/mcp-utils/fetchproxy';
+export { stripBearer } from '@chrischall/mcp-utils/fetchproxy';
 /**
  * The fetchproxy concentrator port.
  *
@@ -51,42 +43,49 @@ export { raceCaptures, stripBearer } from '@chrischall/mcp-utils/fetchproxy';
  * instead of handing `NaN` to the server.
  */
 const DEFAULT_WS_PORT = 37_149;
-export function getWsPort() {
-    return readPortEnv('OUTLOOK_WS_PORT', DEFAULT_WS_PORT);
+export function getWsPort(env = process.env) {
+    return readPortEnv('OUTLOOK_WS_PORT', DEFAULT_WS_PORT, { env });
 }
-/** New Outlook Web. This is where a current tenant's tab actually lives. */
-const CAPTURE_DECL_CLOUD = {
-    host: 'outlook.cloud.microsoft',
-    path: '/*',
-    headerName: 'authorization',
-};
-/** Legacy host, still serving the app for tenants not yet migrated. */
-const CAPTURE_DECL_OFFICE = {
-    host: 'outlook.office.com',
-    path: '/*',
-    headerName: 'authorization',
-};
 /**
- * The hosts a token may be captured from — the two Outlook Web origins.
+ * The two Outlook Web origins a signed-in tab can be on: the new one first,
+ * then the legacy one still serving tenants not yet migrated.
  *
- * Exported so the trust boundary below can be derived from them rather than
- * restated.
+ * Only one is ever DECLARED to the bridge (`captureHost`). Both stay listed
+ * for validating `OUTLOOK_WEB_HOST` and for a hosted registration's egress.
  */
-export const CAPTURE_HOSTS = [CAPTURE_DECL_CLOUD.host, CAPTURE_DECL_OFFICE.host];
+export const OUTLOOK_WEB_HOSTS = ['outlook.cloud.microsoft', 'outlook.office.com'];
 /**
- * The extension's trust boundary: exactly the hosts we capture from.
+ * The ONE host to capture from and declare to the bridge: `OUTLOOK_WEB_HOST`,
+ * or `outlook.cloud.microsoft` by default.
  *
- * These were the apex domains `cloud.microsoft` and `office.com`, which the
- * extension reads as "any subdomain of either" — the whole of Microsoft 365
- * granted to read one header off two known hosts. It is also what sent the
- * pairing flow to `m365.cloud.microsoft/chat`, a tab nothing here needs.
+ * This declared both hosts until 0.8.1, and the bridge opens a background
+ * relay tab for every declared domain that has no tab open, after every hello.
+ * A signed-in `outlook.office.com` tab redirects to `outlook.cloud.microsoft`,
+ * so no tab ever matched the second domain and each capture opened another
+ * one. The second capture also ran after the first (the bridge serializes
+ * them), so a capture from the legacy host waited out the other host's window
+ * first.
  *
- * Narrowing costs nothing: the capture declarations were always these two
- * hosts, and every API call the server makes afterwards is a plain server-side
- * `fetch` that the bridge never sees. Verified live 2026-09-20 — capture still
- * succeeded, and an already-paired extension did not ask to re-pair.
+ * Declaring one host fixes both. It is also the smallest scope the bridge can
+ * be asked for, and the same on every hello, so it never offers a grant again.
+ * Changing the host changes the domain set, which the bridge re-pairs on — a
+ * one-time approval.
+ *
+ * An unrecognised value throws rather than falling back: capturing from the
+ * wrong host just times out, with nothing saying why.
  */
-export const TRUST_DOMAINS = [...CAPTURE_HOSTS];
+export function captureHost(env = process.env) {
+    const raw = readEnvVar('OUTLOOK_WEB_HOST', { env });
+    if (raw === undefined)
+        return OUTLOOK_WEB_HOSTS[0];
+    const host = raw.trim().toLowerCase();
+    const known = OUTLOOK_WEB_HOSTS.find((h) => h === host);
+    if (known === undefined) {
+        throw new Error(`OUTLOOK_WEB_HOST=${JSON.stringify(raw)} is not an Outlook Web host. Use ` +
+            `${OUTLOOK_WEB_HOSTS.join(' or ')} — whichever your signed-in Outlook tab is on — or unset it.`);
+    }
+    return known;
+}
 /**
  * How long to wait for the page to make a request we can read.
  *
@@ -96,16 +95,19 @@ export const TRUST_DOMAINS = [...CAPTURE_HOSTS];
  * long enough that ordinary polling or a user glance lands inside it, short
  * enough that an idle tab does not hang a tool call for minutes.
  */
-const CAPTURE_TIMEOUT_MS = readTtlMsEnv('OUTLOOK_CAPTURE_TIMEOUT', 30_000);
+const DEFAULT_CAPTURE_WINDOW_MS = 30_000;
 /**
- * Capture an Outlook access token from the user's signed-in browser tab.
- *
- * Both hosts are attempted: whichever the tab is actually on answers first, and
- * the other simply never resolves. The bridge serializes them, so the pair is
- * held to one deadline by `raceCaptures` rather than to one deadline each.
- * Returns the bare token (no `Bearer ` prefix).
+ * Build the capture transport through this module's import binding, so the
+ * test can stand in for the bridge. mcp-utils' own default calls its internal
+ * reference, which a module mock cannot reach.
+ */
+const createCaptureTransport = (opts) => createFetchproxyTransport(opts);
+/**
+ * Capture an Outlook access token from the user's signed-in browser tab on
+ * `captureHost(env)`. Returns the bare token (no `Bearer ` prefix).
  */
-export async function captureTokenViaFetchproxy() {
+export async function captureTokenViaFetchproxy(env = process.env) {
+    const host = captureHost(env);
     // `captureBearerHeader` declares only `capture_request_header` beside the
     // `fetch` base verb, derives the bridge deadline from the window (window +
     // 15 s, never under 30 s) so a raised window is not cut off early, starts the
@@ -114,15 +116,21 @@ export async function captureTokenViaFetchproxy() {
     // header too short to be a token (real ones are ~5 KB of JWT), and closes
     // the transport whatever happened.
     return captureBearerHeader({
-        captures: [CAPTURE_DECL_CLOUD, CAPTURE_DECL_OFFICE],
-        domains: TRUST_DOMAINS,
-        windowMs: CAPTURE_TIMEOUT_MS,
-        port: getWsPort(),
+        captures: [{ host, path: '/*', headerName: 'authorization' }],
+        // Exactly the host captured from: every API call afterwards is a plain
+        // server-side `fetch` the bridge never sees. (The apex `cloud.microsoft` /
+        // `office.com` once declared here granted the whole of Microsoft 365.)
+        domains: [host],
+        // Read per capture, not at import, so the env this server was given wins.
+        windowMs: readTtlMsEnv('OUTLOOK_CAPTURE_TIMEOUT', DEFAULT_CAPTURE_WINDOW_MS, { env }),
+        port: getWsPort(env),
         serverName: PACKAGE_NAME,
         version: VERSION,
         what: 'an Outlook token',
-        guidance: 'Open a signed-in Outlook tab (outlook.cloud.microsoft or ' +
-            'outlook.office.com), leave it in the foreground for a moment so the ' +
-            'page makes a request, and retry.',
+        guidance: `Open a signed-in Outlook tab on ${host}, leave it in the foreground for a ` +
+            'moment so the page makes a request, and retry. If your Outlook is on the ' +
+            `other host (${OUTLOOK_WEB_HOSTS.filter((h) => h !== host).join(', ')}), set ` +
+            'OUTLOOK_WEB_HOST to it.',
+        createTransport: createCaptureTransport,
     });
 }

package/dist/bundle.js

@@ -39086,7 +39086,7 @@ var init_version = __esm({
   "src/version.ts"() {
     "use strict";
     PACKAGE_NAME = "office-outlook-mcp";
-    VERSION = "0.8.1";
+    VERSION = "0.8.3";
   }
 });
 
@@ -43398,7 +43398,7 @@ var require_websocket = __commonJS({
     var http = __require("http");
     var net = __require("net");
     var tls = __require("tls");
-    var { randomBytes: randomBytes8, createHash: createHash5 } = __require("crypto");
+    var { randomBytes: randomBytes8, createHash: createHash6 } = __require("crypto");
     var { Duplex, Readable } = __require("stream");
     var { URL: URL2 } = __require("url");
     var PerMessageDeflate2 = require_permessage_deflate();
@@ -44079,7 +44079,7 @@ var require_websocket = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash5("sha1").update(key + GUID).digest("base64");
+        const digest = createHash6("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -44448,7 +44448,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter = __require("events");
     var http = __require("http");
     var { Duplex } = __require("stream");
-    var { createHash: createHash5 } = __require("crypto");
+    var { createHash: createHash6 } = __require("crypto");
     var extension2 = require_extension();
     var PerMessageDeflate2 = require_permessage_deflate();
     var subprotocol2 = require_subprotocol();
@@ -44755,7 +44755,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest = createHash5("sha1").update(key + GUID).digest("base64");
+        const digest = createHash6("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -49515,29 +49515,46 @@ var init_fetchproxy = __esm({
 // src/auth-fetchproxy.ts
 var auth_fetchproxy_exports = {};
 __export(auth_fetchproxy_exports, {
-  CAPTURE_HOSTS: () => CAPTURE_HOSTS,
-  TRUST_DOMAINS: () => TRUST_DOMAINS,
+  OUTLOOK_WEB_HOSTS: () => OUTLOOK_WEB_HOSTS,
+  captureHost: () => captureHost,
   captureTokenViaFetchproxy: () => captureTokenViaFetchproxy,
   getWsPort: () => getWsPort,
-  raceCaptures: () => raceCaptures,
   stripBearer: () => stripBearer
 });
-function getWsPort() {
-  return readPortEnv("OUTLOOK_WS_PORT", DEFAULT_WS_PORT);
+function getWsPort(env = process.env) {
+  return readPortEnv("OUTLOOK_WS_PORT", DEFAULT_WS_PORT, { env });
+}
+function captureHost(env = process.env) {
+  const raw = readEnvVar("OUTLOOK_WEB_HOST", { env });
+  if (raw === void 0) return OUTLOOK_WEB_HOSTS[0];
+  const host = raw.trim().toLowerCase();
+  const known = OUTLOOK_WEB_HOSTS.find((h) => h === host);
+  if (known === void 0) {
+    throw new Error(
+      `OUTLOOK_WEB_HOST=${JSON.stringify(raw)} is not an Outlook Web host. Use ${OUTLOOK_WEB_HOSTS.join(" or ")} \u2014 whichever your signed-in Outlook tab is on \u2014 or unset it.`
+    );
+  }
+  return known;
 }
-async function captureTokenViaFetchproxy() {
+async function captureTokenViaFetchproxy(env = process.env) {
+  const host = captureHost(env);
   return captureBearerHeader({
-    captures: [CAPTURE_DECL_CLOUD, CAPTURE_DECL_OFFICE],
-    domains: TRUST_DOMAINS,
-    windowMs: CAPTURE_TIMEOUT_MS,
-    port: getWsPort(),
+    captures: [{ host, path: "/*", headerName: "authorization" }],
+    // Exactly the host captured from: every API call afterwards is a plain
+    // server-side `fetch` the bridge never sees. (The apex `cloud.microsoft` /
+    // `office.com` once declared here granted the whole of Microsoft 365.)
+    domains: [host],
+    // Read per capture, not at import, so the env this server was given wins.
+    windowMs: readTtlMsEnv("OUTLOOK_CAPTURE_TIMEOUT", DEFAULT_CAPTURE_WINDOW_MS, { env }),
+    port: getWsPort(env),
     serverName: PACKAGE_NAME,
     version: VERSION,
     what: "an Outlook token",
-    guidance: "Open a signed-in Outlook tab (outlook.cloud.microsoft or outlook.office.com), leave it in the foreground for a moment so the page makes a request, and retry."
+    guidance: `Open a signed-in Outlook tab on ${host}, leave it in the foreground for a moment so the page makes a request, and retry. If your Outlook is on the other host (${OUTLOOK_WEB_HOSTS.filter((h) => h !== host).join(", ")}), set OUTLOOK_WEB_HOST to it.`,
+    createTransport: createCaptureTransport
   });
 }
-var DEFAULT_WS_PORT, CAPTURE_DECL_CLOUD, CAPTURE_DECL_OFFICE, CAPTURE_HOSTS, TRUST_DOMAINS, CAPTURE_TIMEOUT_MS;
+var DEFAULT_WS_PORT, OUTLOOK_WEB_HOSTS, DEFAULT_CAPTURE_WINDOW_MS, createCaptureTransport;
 var init_auth_fetchproxy = __esm({
   "src/auth-fetchproxy.ts"() {
     "use strict";
@@ -49546,19 +49563,9 @@ var init_auth_fetchproxy = __esm({
     init_version();
     init_fetchproxy();
     DEFAULT_WS_PORT = 37149;
-    CAPTURE_DECL_CLOUD = {
-      host: "outlook.cloud.microsoft",
-      path: "/*",
-      headerName: "authorization"
-    };
-    CAPTURE_DECL_OFFICE = {
-      host: "outlook.office.com",
-      path: "/*",
-      headerName: "authorization"
-    };
-    CAPTURE_HOSTS = [CAPTURE_DECL_CLOUD.host, CAPTURE_DECL_OFFICE.host];
-    TRUST_DOMAINS = [...CAPTURE_HOSTS];
-    CAPTURE_TIMEOUT_MS = readTtlMsEnv("OUTLOOK_CAPTURE_TIMEOUT", 3e4);
+    OUTLOOK_WEB_HOSTS = ["outlook.cloud.microsoft", "outlook.office.com"];
+    DEFAULT_CAPTURE_WINDOW_MS = 3e4;
+    createCaptureTransport = (opts) => createFetchproxyTransport(opts);
   }
 });
 
@@ -50596,6 +50603,7 @@ function isMeetingMessage(m) {
 // src/tools/_paging.ts
 init_zod();
 init_dist2();
+import { createHash as createHash4 } from "node:crypto";
 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."
 );
@@ -50611,6 +50619,10 @@ function plainCollection(data) {
   if (next) out.nextLink = next;
   return out;
 }
+var MAX_KEY_LENGTH = 16;
+function idKey(id) {
+  return id.length <= MAX_KEY_LENGTH ? id : createHash4("sha256").update(id).digest("base64url").slice(0, 12);
+}
 var fromParam = external_exports.string().min(1).optional().describe(
   'Page oldest first from this point: an ISO 8601 UTC time (e.g. "2026-10-01T00:00:00Z"; one with no zone is read as UTC), or a previous result\'s `next_from` passed unchanged. The result always carries `next_from` and `has_more`.'
 );
@@ -50656,24 +50668,24 @@ function decodeFrom(from) {
   if (ms === void 0 || !Array.isArray(p?.ids) || !p.ids.every((id) => typeof id === "string")) {
     throw new McpToolError("`from` is neither an ISO 8601 time nor a next_from token.", { hint: FROM_HINT });
   }
-  return { t: utcLiteral(ms), ids: p.ids };
+  return { t: utcLiteral(ms), ids: [...new Set(p.ids.map(idKey))] };
 }
 function fromQuery(pos, limit) {
   return { bound: `ReceivedDateTime ge ${pos.t}`, top: Math.min(limit + pos.ids.length, MAX_TOP) };
 }
 function fromPage(rows, pos, limit, apiHasMore) {
-  const seen = new Set(pos.ids);
-  const fresh = rows.filter((r) => r.Id === void 0 || !seen.has(r.Id));
+  const seen = new Set(pos.ids.map(idKey));
+  const fresh = rows.filter((r) => r.Id === void 0 || !seen.has(idKey(r.Id)));
   const kept = fresh.slice(0, limit);
   const next = nextPosition(kept, pos);
   return { rows: kept, next_from: encodeFrom(next), has_more: fresh.length > limit || apiHasMore };
 }
 function nextPosition(rows, pos) {
-  const dated = rows.map((r) => ({ id: r.Id, ms: r.ReceivedDateTime ? Date.parse(r.ReceivedDateTime) : NaN })).filter((r) => r.id !== void 0 && !Number.isNaN(r.ms));
+  const dated = rows.map((r) => ({ id: r.Id === void 0 ? void 0 : idKey(r.Id), ms: r.ReceivedDateTime ? Date.parse(r.ReceivedDateTime) : NaN })).filter((r) => r.id !== void 0 && !Number.isNaN(r.ms));
   if (dated.length === 0) return pos;
   const newest = Math.max(...dated.map((r) => r.ms));
   const tied = dated.filter((r) => r.ms === newest).map((r) => r.id);
-  const carried = newest === Date.parse(pos.t) ? pos.ids.filter((id) => !tied.includes(id)) : [];
+  const carried = newest === Date.parse(pos.t) ? pos.ids.map(idKey).filter((id) => !tied.includes(id)) : [];
   return { t: utcLiteral(newest), ids: [...carried, ...tied] };
 }
 
@@ -52374,7 +52386,7 @@ function registerHealthcheckTool(server, client2) {
 // src/tools/export.ts
 init_zod();
 init_dist2();
-import { createHash as createHash4 } from "node:crypto";
+import { createHash as createHash5 } from "node:crypto";
 import { readdirSync as readdirSync2, readFileSync as readFileSync4, rmdirSync, unlinkSync as unlinkSync5 } from "node:fs";
 import { join as join11 } from "node:path";
 
@@ -52384,7 +52396,7 @@ init_errors3();
 import { createHmac as createHmac4 } from "node:crypto";
 var BLOB_DEFAULT_TTL_MS = 60 * 60 * 1e3;
 var BLOB_MAX_TTL_MS = 24 * 60 * 60 * 1e3;
-var MAX_KEY_LENGTH = 1024;
+var MAX_KEY_LENGTH2 = 1024;
 var SAFE_SEGMENT = /^[A-Za-z0-9._~-]+$/;
 function configError(reason) {
   return new McpToolError(`MCP_BLOB_BASE_URL is not usable: ${reason}.`, {
@@ -52417,8 +52429,8 @@ function badInput(message) {
 function encodeKey(key) {
   if (typeof key !== "string" || key.length === 0)
     throw badInput("Blob key must be a non-empty string.");
-  if (key.length > MAX_KEY_LENGTH)
-    throw badInput(`Blob key is longer than ${MAX_KEY_LENGTH} characters.`);
+  if (key.length > MAX_KEY_LENGTH2)
+    throw badInput(`Blob key is longer than ${MAX_KEY_LENGTH2} characters.`);
   const segments = key.split("/");
   for (const seg of segments) {
     if (seg === "" || seg === "." || seg === ".." || !SAFE_SEGMENT.test(seg)) {
@@ -53075,6 +53087,7 @@ var eventArgsSchema = external_exports.object({
   attachments: external_exports.boolean().optional()
 });
 var positionSchema = external_exports.union([
+  external_exports.object({ at: external_exports.object({ t: external_exports.string().min(1), ids: external_exports.array(external_exports.string()) }) }),
   external_exports.object({ from: external_exports.string().min(1) }),
   external_exports.object({ link: external_exports.string().min(1).optional(), offset: external_exports.number().int().min(0).max(MAX_TOP2) })
 ]);
@@ -53285,7 +53298,7 @@ async function linkBatch(pos, limit, first, follow, keep = () => true) {
   return end;
 }
 function shortId(id) {
-  return createHash4("sha256").update(id).digest("hex").slice(0, 16);
+  return createHash5("sha256").update(id).digest("hex").slice(0, 16);
 }
 function uniqueName(name, used) {
   let candidate = name;
@@ -53676,11 +53689,11 @@ function registerExportTools(server, client2, opts = {}) {
       const folder = args.search !== void 0 ? "all" : args.folder ?? "inbox";
       const path = folder === "all" ? "/me/messages" : `/me/mailfolders/${encodeURIComponent(folder)}/messages`;
       const perPage = args.attachments === true ? Math.min(pageSize, ATTACHMENT_PAGE_SIZE) : pageSize;
-      const pos = resumed?.pos ?? (args.search !== void 0 ? { offset: 0 } : { from: encodeFrom({ t: since ?? EPOCH, ids: [] }) });
-      if ("from" in pos) decodeFrom(pos.from);
+      const stored = resumed?.pos;
+      const pos = stored === void 0 ? args.search !== void 0 ? { offset: 0 } : { at: { t: since ?? EPOCH, ids: [] } } : "from" in stored ? { at: decodeFrom(stored.from) } : "at" in stored ? { at: decodeFrom(encodeFrom(stored.at)) } : stored;
       const fetch2 = async (p, remaining) => {
-        if ("from" in p) {
-          const at = decodeFrom(p.from);
+        if ("at" in p) {
+          const { at } = p;
           const limit = Math.min(remaining, perPage);
           const { bound, top } = fromQuery(at, limit);
           const filter = until ? `${bound} and ReceivedDateTime lt ${until}` : bound;
@@ -53697,7 +53710,7 @@ function registerExportTools(server, client2, opts = {}) {
               posAfter: () => p
             };
           }
-          if (page.has_more && page.next_from === p.from) {
+          if (page.has_more && page.next_from === encodeFrom(at)) {
             return {
               rows: page.rows,
               pos: p,
@@ -53708,10 +53721,10 @@ function registerExportTools(server, client2, opts = {}) {
           }
           return {
             rows: page.rows,
-            pos: { from: page.next_from },
+            pos: { at: decodeFrom(page.next_from) },
             hasMore: page.has_more,
             // The first n rows are fresh and ascending, so the keyset position after them is computed the same way.
-            posAfter: (n) => n >= page.rows.length ? { from: page.next_from } : { from: fromPage(page.rows.slice(0, n), at, n, true).next_from }
+            posAfter: (n) => n >= page.rows.length ? { at: decodeFrom(page.next_from) } : { at: decodeFrom(fromPage(page.rows.slice(0, n), at, n, true).next_from) }
           };
         }
         return linkBatch(
@@ -53799,8 +53812,9 @@ function registerExportTools(server, client2, opts = {}) {
       }
       const prefer = args.time_zone ? `outlook.timezone="${args.time_zone}"` : void 0;
       const path = args.calendar !== void 0 ? `/me/calendars/${encodeURIComponent(args.calendar)}/calendarview` : "/me/calendarview";
-      const pos = resumed?.pos ?? { offset: 0 };
-      if ("from" in pos) throw new McpToolError("`cursor` is not a valid export cursor for this tool.");
+      const stored = resumed?.pos ?? { offset: 0 };
+      if (!("offset" in stored)) throw new McpToolError("`cursor` is not a valid export cursor for this tool.");
+      const pos = stored;
       const fetch2 = (p, remaining) => linkBatch(
         p,
         remaining,

package/dist/tools/_paging.js

@@ -1,3 +1,4 @@
+import { createHash } from 'node:crypto';
 import { z } from 'zod';
 import { McpToolError } from '@chrischall/mcp-utils';
 import { stripOData } from '../view.js';
@@ -38,6 +39,19 @@ export function plainCollection(data) {
         out.nextLink = next;
     return out;
 }
+/** An Id this short is kept as is (a key, or a test fixture); a real Outlook Id is ~150 characters. */
+const MAX_KEY_LENGTH = 16;
+/**
+ * The key a position keeps for a message Id: the Id itself when short, else
+ * 12 base64url characters (72 bits) of its SHA-256. Keys only tell apart the
+ * messages tied at ONE instant, so a collision is not a practical concern,
+ * and a burst of messages in one second costs ~15 characters each in the token
+ * rather than a whole Id. A token from an earlier release, carrying whole Ids,
+ * is re-keyed on read.
+ */
+export function idKey(id) {
+    return id.length <= MAX_KEY_LENGTH ? id : createHash('sha256').update(id).digest('base64url').slice(0, 12);
+}
 export const fromParam = z
     .string()
     .min(1)
@@ -104,7 +118,7 @@ export function decodeFrom(from) {
         !p.ids.every((id) => typeof id === 'string')) {
         throw new McpToolError('`from` is neither an ISO 8601 time nor a next_from token.', { hint: FROM_HINT });
     }
-    return { t: utcLiteral(ms), ids: p.ids };
+    return { t: utcLiteral(ms), ids: [...new Set(p.ids.map(idKey))] };
 }
 /**
  * The `$filter` date bound and `$top` for a page from `pos`. The bound is
@@ -121,21 +135,21 @@ export function fromQuery(pos, limit) {
  * or the API has another page.
  */
 export function fromPage(rows, pos, limit, apiHasMore) {
-    const seen = new Set(pos.ids);
-    const fresh = rows.filter((r) => r.Id === undefined || !seen.has(r.Id));
+    const seen = new Set(pos.ids.map(idKey));
+    const fresh = rows.filter((r) => r.Id === undefined || !seen.has(idKey(r.Id)));
     const kept = fresh.slice(0, limit);
     const next = nextPosition(kept, pos);
     return { rows: kept, next_from: encodeFrom(next), has_more: fresh.length > limit || apiHasMore };
 }
 function nextPosition(rows, pos) {
     const dated = rows
-        .map((r) => ({ id: r.Id, ms: r.ReceivedDateTime ? Date.parse(r.ReceivedDateTime) : NaN }))
+        .map((r) => ({ id: r.Id === undefined ? undefined : idKey(r.Id), ms: r.ReceivedDateTime ? Date.parse(r.ReceivedDateTime) : NaN }))
         .filter((r) => r.id !== undefined && !Number.isNaN(r.ms));
     if (dated.length === 0)
         return pos;
     const newest = Math.max(...dated.map((r) => r.ms));
     const tied = dated.filter((r) => r.ms === newest).map((r) => r.id);
     // The position did not move: earlier ties at this instant stay excluded.
-    const carried = newest === Date.parse(pos.t) ? pos.ids.filter((id) => !tied.includes(id)) : [];
+    const carried = newest === Date.parse(pos.t) ? pos.ids.map(idKey).filter((id) => !tied.includes(id)) : [];
     return { t: utcLiteral(newest), ids: [...carried, ...tied] };
 }

package/dist/tools/export.js

@@ -158,8 +158,15 @@ const eventArgsSchema = z.object({
     format: z.enum(['jsonl', 'markdown']),
     attachments: z.boolean().optional(),
 });
-/** Where the next part starts: a keyset position, or a nextLink page + rows consumed from it. */
+/**
+ * Where the next part starts: a keyset position, or a nextLink page + rows
+ * consumed from it. The keyset position is kept as plain `{ t, ids }` (`at`):
+ * the cursor is base64'd as a whole, so a nested `next_from` token would be
+ * encoded twice. `from` (that nested token) is still read from cursors an
+ * earlier release handed out.
+ */
 const positionSchema = z.union([
+    z.object({ at: z.object({ t: z.string().min(1), ids: z.array(z.string()) }) }),
     z.object({ from: z.string().min(1) }),
     z.object({ link: z.string().min(1).optional(), offset: z.number().int().min(0).max(MAX_TOP) }),
 ]);
@@ -877,12 +884,20 @@ export function registerExportTools(server, client, opts = {}) {
         const folder = args.search !== undefined ? 'all' : (args.folder ?? 'inbox');
         const path = folder === 'all' ? '/me/messages' : `/me/mailfolders/${encodeURIComponent(folder)}/messages`;
         const perPage = args.attachments === true ? Math.min(pageSize, ATTACHMENT_PAGE_SIZE) : pageSize;
-        const pos = resumed?.pos ?? (args.search !== undefined ? { offset: 0 } : { from: encodeFrom({ t: since ?? EPOCH, ids: [] }) });
-        if ('from' in pos)
-            decodeFrom(pos.from); // validate a cursor's position before any work
+        const stored = resumed?.pos;
+        // Validate (and normalise) a cursor's keyset position before any work; read an older cursor's nested token.
+        const pos = stored === undefined
+            ? args.search !== undefined
+                ? { offset: 0 }
+                : { at: { t: since ?? EPOCH, ids: [] } }
+            : 'from' in stored
+                ? { at: decodeFrom(stored.from) }
+                : 'at' in stored
+                    ? { at: decodeFrom(encodeFrom(stored.at)) }
+                    : stored;
         const fetch = async (p, remaining) => {
-            if ('from' in p) {
-                const at = decodeFrom(p.from);
+            if ('at' in p) {
+                const { at } = p;
                 const limit = Math.min(remaining, perPage);
                 const { bound, top } = fromQuery(at, limit);
                 const filter = until ? `${bound} and ReceivedDateTime lt ${until}` : bound;
@@ -900,7 +915,7 @@ export function registerExportTools(server, client, opts = {}) {
                         posAfter: () => p,
                     };
                 }
-                if (page.has_more && page.next_from === p.from) {
+                if (page.has_more && page.next_from === encodeFrom(at)) {
                     // No row carried a usable ReceivedDateTime, so the position did not
                     // move; asking again would return (and duplicate) the same page forever.
                     return {
@@ -913,10 +928,12 @@ export function registerExportTools(server, client, opts = {}) {
                 }
                 return {
                     rows: page.rows,
-                    pos: { from: page.next_from },
+                    pos: { at: decodeFrom(page.next_from) },
                     hasMore: page.has_more,
                     // The first n rows are fresh and ascending, so the keyset position after them is computed the same way.
-                    posAfter: (n) => n >= page.rows.length ? { from: page.next_from } : { from: fromPage(page.rows.slice(0, n), at, n, true).next_from },
+                    posAfter: (n) => n >= page.rows.length
+                        ? { at: decodeFrom(page.next_from) }
+                        : { at: decodeFrom(fromPage(page.rows.slice(0, n), at, n, true).next_from) },
                 };
             }
             return linkBatch(p, remaining, () => with429Retry(() => client.get(path, {
@@ -1010,9 +1027,10 @@ export function registerExportTools(server, client, opts = {}) {
         }
         const prefer = args.time_zone ? `outlook.timezone="${args.time_zone}"` : undefined;
         const path = args.calendar !== undefined ? `/me/calendars/${encodeURIComponent(args.calendar)}/calendarview` : '/me/calendarview';
-        const pos = resumed?.pos ?? { offset: 0 };
-        if ('from' in pos)
+        const stored = resumed?.pos ?? { offset: 0 };
+        if (!('offset' in stored))
             throw new McpToolError('`cursor` is not a valid export cursor for this tool.');
+        const pos = stored;
         const fetch = (p, remaining) => linkBatch(p, remaining, () => with429Retry(() => client.get(path, {
             text: true,
             ...(prefer ? { prefer } : {}),

package/dist/version.js

@@ -10,4 +10,4 @@
  * line below and nowhere else — not even in prose.
  */
 export const PACKAGE_NAME = 'office-outlook-mcp';
-export const VERSION = '0.8.1'; // x-release-please-version
+export const VERSION = '0.8.3'; // x-release-please-version

package/mint.yaml

@@ -55,6 +55,12 @@ env:
       fetchproxy concentrator port used for token capture. Defaults to 37149,
       the fleet-wide shared port. Name this variable in the registration's
       bridgePortEnv for a bridged deployment.
+  - name: OUTLOOK_WEB_HOST
+    required: false
+    help: >-
+      Which Outlook Web host the signed-in tab is on: outlook.cloud.microsoft
+      (default) or outlook.office.com for a tenant still on the legacy app.
+      Only this one host is declared to the browser bridge.
   - name: OUTLOOK_CAPTURE_TIMEOUT
     required: false
     help: >-
@@ -79,10 +85,10 @@ state:
     re-captures from the browser — and on a scale-to-zero machine that means
     re-prompting the user to approve pairing, constantly.
 egress:
-  # outlook.office.com is the only host the API client fetches. The two
-  # Outlook Web hosts the token is captured from are allowed too, so a hosted
-  # registration is not blocked on either — outlook.cloud.microsoft is where a
-  # current tenant's tab lives.
+  # outlook.office.com is the only host the API client fetches. Both Outlook
+  # Web hosts a token can be captured from (OUTLOOK_WEB_HOST picks one) are
+  # allowed, so a hosted registration is not blocked on either —
+  # outlook.cloud.microsoft is where a current tenant's tab lives.
   allow:
     - outlook.cloud.microsoft
     - outlook.office.com

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrischall/office-outlook-mcp",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "mcpName": "io.github.chrischall/office-outlook-mcp",
   "description": "Outlook / Microsoft 365 MCP server for Claude — developed and maintained by AI (Claude Code)",
   "author": "Claude Code (AI) <https://www.anthropic.com/claude>",

package/server.json

@@ -6,12 +6,12 @@
     "url": "https://github.com/chrischall/office-outlook-mcp",
     "source": "github"
   },
-  "version": "0.8.1",
+  "version": "0.8.3",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "@chrischall/office-outlook-mcp",
-      "version": "0.8.1",
+      "version": "0.8.3",
       "transport": {
         "type": "stdio"
       },
@@ -41,6 +41,12 @@
           "isRequired": false,
           "format": "string"
         },
+        {
+          "name": "OUTLOOK_WEB_HOST",
+          "description": "Which Outlook Web host your signed-in tab is on: outlook.cloud.microsoft (default) or outlook.office.com for a tenant still on the legacy app. Only this one host is declared to the browser bridge.",
+          "isRequired": false,
+          "format": "string"
+        },
         {
           "name": "OUTLOOK_CAPTURE_TIMEOUT",
           "description": "Seconds to wait for the Outlook tab to make a request we can read a token from. Defaults to 30.",

package/skills/outlook-fpx/SKILL.md

@@ -13,14 +13,19 @@ token** (~25h lifetime) — every actual request is a plain server-side `curl`.
 
 ```sh
 npm i -g @fetchproxy/cli                      # provides `fpx`
-fpx profile add outlook --domain outlook.cloud.microsoft \
-                        --domain outlook.office.com
+fpx profile add outlook --domain outlook.cloud.microsoft
 fpx profile declare outlook \
   --capture-header authorization@outlook.cloud.microsoft \
-  --capture-header authorization@outlook.office.com \
   --allow-download
 ```
 
+Declare **one** host, the one your signed-in Outlook tab is on. A tenant still
+on the legacy app uses `outlook.office.com` in both lines and exports
+`OUTLOOK_CAPTURE_HOST=outlook.office.com`. Don't declare both: the bridge opens a
+background tab for every declared domain with no tab open, and because a
+signed-in `outlook.office.com` tab redirects to `outlook.cloud.microsoft`, it
+opens another one on every capture.
+
 Declare **all** scopes before the first pairing — widening them later forces the
 user to re-approve. The first `fpx` call prints a 6-digit pair code to approve in
 the ContextMint Bridge extension popup; the grant then persists.