ofw-mcp 2.4.4 → 2.6.3

package/dist/bundle.js

@@ -34931,6 +34931,7 @@ var KNOWN_CAPABILITIES = /* @__PURE__ */ new Set([
   "capture_request_header",
   "capture_redirect",
   "read_indexed_db",
+  "read_dom",
   "download"
 ]);
 
@@ -35232,6 +35233,44 @@ function assertIndexedDbScopesArray(value, label) {
     }
   }
 }
+var DOM_SELECTOR_RE = /^[^-]{1,512}$/;
+var DOM_ATTRIBUTE_RE = /^[A-Za-z_:][A-Za-z0-9_:.\-]{0,127}$/;
+function assertDomSelectorsArray(value, label) {
+  if (!Array.isArray(value)) {
+    throw new ProtocolError(`${label}: expected array, got ${typeof value}`);
+  }
+  const seen = /* @__PURE__ */ new Set();
+  for (let i = 0; i < value.length; i++) {
+    const entry = value[i];
+    assertObject(entry, `${label}[${i}]`);
+    if (entry.name === void 0) {
+      throw new ProtocolError(`${label}[${i}].name: missing`);
+    }
+    if (entry.selector === void 0) {
+      throw new ProtocolError(`${label}[${i}].selector: missing`);
+    }
+    if (typeof entry.name !== "string" || !SCOPE_KEY_RE.test(entry.name)) {
+      throw new ProtocolError(`${label}[${i}].name: invalid ${JSON.stringify(entry.name)}`);
+    }
+    if (typeof entry.selector !== "string" || !DOM_SELECTOR_RE.test(entry.selector)) {
+      throw new ProtocolError(`${label}[${i}].selector: invalid ${JSON.stringify(entry.selector)}`);
+    }
+    if (entry.attribute !== void 0) {
+      if (typeof entry.attribute !== "string" || !DOM_ATTRIBUTE_RE.test(entry.attribute)) {
+        throw new ProtocolError(`${label}[${i}].attribute: invalid ${JSON.stringify(entry.attribute)}`);
+      }
+    }
+    if (seen.has(entry.name)) {
+      throw new ProtocolError(`${label}: duplicate name ${JSON.stringify(entry.name)}`);
+    }
+    seen.add(entry.name);
+    for (const k of Object.keys(entry)) {
+      if (k !== "name" && k !== "selector" && k !== "attribute") {
+        throw new ProtocolError(`${label}[${i}]: unexpected field ${JSON.stringify(k)}`);
+      }
+    }
+  }
+}
 function validateFrame(raw) {
   assertObject(raw, "frame");
   const t = raw.type;
@@ -35307,6 +35346,9 @@ function validateHello(raw) {
     if (raw.sessionStoragePointers !== void 0) {
       assertStoragePointersArray(raw.sessionStoragePointers, "hello.sessionStoragePointers", raw.sessionStorageKeys);
     }
+    if (raw.domSelectors !== void 0) {
+      assertDomSelectorsArray(raw.domSelectors, "hello.domSelectors");
+    }
     assertBase64(raw.identityX25519Pub, "hello.identityX25519Pub");
     assertBase64(raw.identityEd25519Pub, "hello.identityEd25519Pub");
     assertBase64(raw.sessionNonce, "hello.sessionNonce");
@@ -35541,6 +35583,21 @@ function validateInnerRequest(raw) {
     }
     return raw;
   }
+  if (raw.op === "read_dom") {
+    assertObject(raw.init, "inner.init");
+    if (raw.init.origin === void 0)
+      throw new ProtocolError("inner.init.origin: missing");
+    if (raw.init.names === void 0)
+      throw new ProtocolError("inner.init.names: missing");
+    assertHttpsOriginOnly(raw.init.origin, "inner.init.origin");
+    assertNonEmptyKeyArray(raw.init.names, "inner.init.names");
+    for (const k of Object.keys(raw.init)) {
+      if (k !== "origin" && k !== "names") {
+        throw new ProtocolError(`inner.init: unexpected field ${JSON.stringify(k)} on read_dom`);
+      }
+    }
+    return raw;
+  }
   if (raw.op === "download") {
     assertObject(raw.init, "inner.init");
     if (raw.init.url === void 0) {
@@ -35566,7 +35623,7 @@ function validateInnerRequest(raw) {
     }
     return raw;
   }
-  throw new ProtocolError(`inner.op: must be one of "fetch", "read_cookies", "read_local_storage", "read_session_storage", "capture_request_header", "capture_redirect", "read_indexed_db", "download"; got ${JSON.stringify(raw.op)}`);
+  throw new ProtocolError(`inner.op: must be one of "fetch", "read_cookies", "read_local_storage", "read_session_storage", "capture_request_header", "capture_redirect", "read_indexed_db", "read_dom", "download"; got ${JSON.stringify(raw.op)}`);
 }
 function assertNonEmptyKeyArray(value, label) {
   if (!Array.isArray(value)) {
@@ -35651,6 +35708,13 @@ function validateInnerResponse(raw) {
       assertObject(raw.values, "inner.values");
       return raw;
     }
+    if (op === "read_dom") {
+      if (raw.values === void 0) {
+        throw new ProtocolError("inner.values: missing on read_dom response");
+      }
+      assertStringMap(raw.values, "inner.values");
+      return raw;
+    }
     if (op === "download") {
       assertObject(raw.value, "inner.value");
       assertString(raw.value.path, "inner.value.path");
@@ -35990,6 +36054,13 @@ async function buildServerHello(opts) {
       jsonPointer: d.jsonPointer
     }));
   }
+  if (opts.domSelectors && opts.domSelectors.length > 0) {
+    hello.domSelectors = opts.domSelectors.map((d) => ({
+      name: d.name,
+      selector: d.selector,
+      ...d.attribute !== void 0 ? { attribute: d.attribute } : {}
+    }));
+  }
   return hello;
 }
 
@@ -36079,7 +36150,8 @@ async function startHost(opts) {
     captureHeaders: opts.ownCaptureHeaders,
     indexedDbScopes: opts.ownIndexedDbScopes,
     localStoragePointers: opts.ownLocalStoragePointers,
-    sessionStoragePointers: opts.ownSessionStoragePointers
+    sessionStoragePointers: opts.ownSessionStoragePointers,
+    domSelectors: opts.ownDomSelectors
   });
   const ownSessionNonce = fromB64(ownHello.sessionNonce);
   let extensionWs = null;
@@ -36314,6 +36386,7 @@ async function startPeer(opts) {
     sessionStorageKeys: opts.sessionStorageKeys,
     captureHeaders: opts.captureHeaders,
     indexedDbScopes: opts.indexedDbScopes,
+    domSelectors: opts.domSelectors,
     localStoragePointers: opts.localStoragePointers,
     sessionStoragePointers: opts.sessionStoragePointers
   });
@@ -36721,6 +36794,11 @@ var FetchproxyServer = class {
         key: d.key,
         jsonPointer: d.jsonPointer
       })),
+      domSelectors: (opts.domSelectors ?? []).map((d) => ({
+        name: d.name,
+        selector: d.selector,
+        ...d.attribute !== void 0 ? { attribute: d.attribute } : {}
+      })),
       // 0.8.0+: timer + lazy-revive default to ON. Every realty MCP
       // adapter was about to set these to the same numbers anyway; the
       // back-door is `0` (explicit opt-out) if a caller genuinely wants
@@ -36841,6 +36919,7 @@ var FetchproxyServer = class {
         ownIndexedDbScopes: this.opts.indexedDbScopes,
         ownLocalStoragePointers: this.opts.localStoragePointers,
         ownSessionStoragePointers: this.opts.sessionStoragePointers,
+        ownDomSelectors: this.opts.domSelectors,
         onPairCode: this.opts.onPairCode
       });
       this.hostHandle.onOwnInner((inner) => this.onInner(inner));
@@ -36868,7 +36947,8 @@ var FetchproxyServer = class {
         captureHeaders: this.opts.captureHeaders,
         indexedDbScopes: this.opts.indexedDbScopes,
         localStoragePointers: this.opts.localStoragePointers,
-        sessionStoragePointers: this.opts.sessionStoragePointers
+        sessionStoragePointers: this.opts.sessionStoragePointers,
+        domSelectors: this.opts.domSelectors
       });
       this.peerHandle.onInner((inner) => this.onInner(inner));
       this.peerHandle.onRenegotiate(() => {
@@ -37843,6 +37923,46 @@ var FetchproxyServer = class {
     await this.sendInnerFrame(inner);
     return this._withVerbTimeout(pending, this.pendingIdb, id, origin);
   }
+  /**
+   * 1.4.0+: read declared DOM values from the user's signed-in tab.
+   * Requires `'read_dom'` in capabilities AND every requested `name` to
+   * match a declared `domSelectors` entry. The extension reads each
+   * declared selector from the matched tab's DOM (isolated-world
+   * `querySelector`, value or attribute) — no page-JS execution.
+   *
+   * Returns a `Record<string, string>` of `name → value`, with names
+   * whose element (or attribute) was absent omitted. Throws
+   * `FetchproxyProtocolError` on bridge failures and a plain `Error` on
+   * developer mistakes (undeclared capability, undeclared name).
+   */
+  async readDom(opts) {
+    if (!this.opts.capabilities.includes("read_dom")) {
+      throw new Error('FetchproxyServer.readDom(): MCP did not declare "read_dom" in capabilities');
+    }
+    await this.ensureConnected();
+    this.throwIfPendingPair();
+    if (!Array.isArray(opts.names) || opts.names.length === 0) {
+      throw new Error("FetchproxyServer.readDom: opts.names must be a non-empty array");
+    }
+    this.assertScopeSubset(opts.names, this.opts.domSelectors.map((d) => d.name), "domSelectors");
+    if (opts.subdomain !== void 0)
+      assertSubdomainLabel(opts.subdomain);
+    const baseDomain = this.resolveBaseDomain(opts.domain);
+    const host = opts.subdomain ? `${opts.subdomain}.${baseDomain}` : baseDomain;
+    const origin = `https://${host}`;
+    const id = this.nextRequestId++;
+    const inner = {
+      type: "request",
+      id,
+      op: "read_dom",
+      init: { origin, names: [...opts.names] }
+    };
+    const pending = new Promise((resolve2, reject) => {
+      this.pendingStorage.set(id, { resolve: resolve2, reject });
+    });
+    await this.sendInnerFrame(inner);
+    return this._withVerbTimeout(pending, this.pendingStorage, id, origin);
+  }
   assertScopeSubset(requested, declared, label) {
     const undeclared = undeclaredKeys(requested, declared);
     if (undeclared.length > 0) {
@@ -37914,7 +38034,7 @@ var FetchproxyServer = class {
     if (storageCb) {
       this.pendingStorage.delete(inner.id);
       if (inner.ok) {
-        if ((inner.op === "read_local_storage" || inner.op === "read_session_storage") && inner.values) {
+        if ((inner.op === "read_local_storage" || inner.op === "read_session_storage" || inner.op === "read_dom") && inner.values) {
           storageCb.resolve({ ...inner.values });
         } else {
           storageCb.reject(new FetchproxyProtocolError(`unexpected ${String(inner.op)} response on storage awaiter`));
@@ -38272,8 +38392,13 @@ async function loginWithPassword(username, password) {
   }
   const contentType = response.headers.get("content-type") ?? "";
   if (!contentType.includes("application/json")) {
+    if (contentType.includes("text/html")) {
+      throw new Error(
+        "OFW login failed \u2014 your OurFamilyWizard email or password was not accepted. Check them and try again."
+      );
+    }
     const body = await response.text();
-    throw new Error(`OFW login returned unexpected response (${contentType}): ${body.substring(0, 200)}`);
+    throw new Error(`OFW login returned unexpected response (${contentType || "no content-type"}): ${body.substring(0, 200)}`);
   }
   const data = await response.json();
   return {
@@ -38285,7 +38410,7 @@ async function loginWithPassword(username, password) {
 // package.json
 var package_default = {
   name: "ofw-mcp",
-  version: "2.4.4",
+  version: "2.6.3",
   license: "MIT",
   mcpName: "io.github.chrischall/ofw-mcp",
   description: "OurFamilyWizard MCP server for Claude \u2014 developed and maintained by AI (Claude Code)",
@@ -38314,21 +38439,30 @@ var package_default = {
     dev: "node --env-file=.env dist/index.js",
     test: "vitest run",
     "test:coverage": "vitest run --coverage",
-    "test:watch": "vitest"
+    "test:watch": "vitest",
+    "worker:dev": "wrangler dev",
+    "worker:deploy": "wrangler deploy",
+    "worker:test": "vitest run --config vitest.workers.config.ts"
   },
   dependencies: {
-    "@chrischall/mcp-utils": "^0.12.0",
+    "@chrischall/mcp-utils": "^0.13.0",
     "@fetchproxy/bootstrap": "^1.3.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
     dotenv: "^17.4.2",
     zod: "^4.4.3"
   },
   devDependencies: {
+    "@chrischall/mcp-connector": "^0.1.0",
+    "@cloudflare/vitest-pool-workers": "^0.18.4",
+    "@cloudflare/workers-oauth-provider": "^0.0.11",
+    "@cloudflare/workers-types": "^5.20260708.1",
     "@types/node": "^26.0.0",
     "@vitest/coverage-v8": "^4.1.7",
+    agents: "^0.17.3",
     esbuild: "^0.28.0",
-    typescript: "^6.0.3",
-    vitest: "^4.1.7"
+    typescript: "^7.0.2",
+    vitest: "^4.1.7",
+    wrangler: "^4.110.0"
   }
 };
 
@@ -38394,8 +38528,11 @@ async function resolveAuth() {
 }
 
 // src/client.ts
-var __dirname = dirname(fileURLToPath(import.meta.url));
-await loadDotenvSafely({ path: join3(__dirname, "..", ".env") });
+try {
+  const dir = dirname(fileURLToPath(import.meta.url));
+  await loadDotenvSafely({ path: join3(dir, "..", ".env") });
+} catch {
+}
 function parseContentDispositionFilename(cd) {
   const extMatch = /filename\*=(?:UTF-8'')?([^;]+)/i.exec(cd);
   if (extMatch) {
@@ -38428,6 +38565,16 @@ var OFWClient = class {
   // already-expired placeholder token so the first request drives the refresh
   // callback — i.e. the original "log in on first request" behavior.
   tokenManager;
+  // Optional injected auth resolver. When set, the refresh callback uses it
+  // instead of the module-level global `resolveAuth` (env-var → fetchproxy
+  // priority). A hosted per-user deployment injects its own resolver so each
+  // request carries that user's credentials — see the Cloudflare Worker
+  // deployment. Left undefined by the stdio path, which falls back to the
+  // global resolver, keeping that behaviour byte-for-byte identical.
+  authResolver;
+  constructor(opts) {
+    this.authResolver = opts?.resolveAuth;
+  }
   getTokenManager() {
     if (!this.tokenManager) {
       this.tokenManager = new TokenManager({
@@ -38439,7 +38586,7 @@ var OFWClient = class {
         // path uses (the 401-replay covers a wrong guess). We re-arm the
         // sentinel so the manager can refresh again later.
         refresh: async () => {
-          const { token, expiresAt } = await resolveAuth();
+          const { token, expiresAt } = await (this.authResolver ?? resolveAuth)();
           return {
             accessToken: token,
             refreshToken: OFW_REFRESH_SENTINEL,
@@ -38553,11 +38700,14 @@ var ApiRecipientSchema = external_exports.looseObject({
   viewed: external_exports.looseObject({ dateTime: external_exports.string() }).nullable().optional()
 });
 function mapRecipients(items) {
-  return (items ?? []).map((r) => ({
-    userId: r.user?.id ?? 0,
-    name: r.user?.name ?? "",
-    viewedAt: r.viewed?.dateTime ?? null
-  }));
+  return (items ?? []).map((r) => {
+    const dt = r.viewed?.dateTime;
+    const viewedAt = typeof dt === "string" && !dt.startsWith("1970-01-01") ? dt : null;
+    return { userId: r.user?.id ?? 0, name: r.user?.name ?? "", viewedAt };
+  });
+}
+function hasRealView(recipients) {
+  return recipients.some((r) => r.viewedAt !== null && !r.viewedAt.startsWith("1970-01-01"));
 }
 var expandPath2 = expandPath;
 function verifyWriteLanded(kind, sent, persisted) {
@@ -38609,390 +38759,6 @@ function registerUserTools(server, client2) {
   });
 }
 
-// src/cache.ts
-import { DatabaseSync } from "node:sqlite";
-import { mkdirSync, chmodSync, existsSync } from "node:fs";
-import { dirname as dirname2 } from "node:path";
-
-// src/config.ts
-import { createHash } from "node:crypto";
-import { homedir as homedir3 } from "node:os";
-import { join as join4 } from "node:path";
-function readCacheIdentity() {
-  return readEnvVar("OFW_CACHE_IDENTITY") ?? readEnvVar("OFW_USERNAME") ?? "_default";
-}
-function getCacheDir() {
-  const override = process.env.OFW_CACHE_DIR;
-  if (override && override.trim().length > 0) return override.trim();
-  return join4(homedir3(), ".cache", "ofw-mcp");
-}
-function getCacheDbPath() {
-  const identity = readCacheIdentity();
-  const hash2 = createHash("sha256").update(identity).digest("hex").slice(0, 16);
-  return join4(getCacheDir(), `${hash2}.db`);
-}
-function getAttachmentsDir() {
-  const override = process.env.OFW_ATTACHMENTS_DIR;
-  if (override && override.trim().length > 0) return override.trim();
-  return join4(homedir3(), "Downloads", "ofw-mcp");
-}
-function getWriteMode() {
-  const raw = process.env.OFW_WRITE_MODE;
-  if (typeof raw !== "string" || raw.trim().length === 0) return "all";
-  const mode = raw.trim().toLowerCase();
-  if (mode === "none" || mode === "drafts" || mode === "all") return mode;
-  console.error(
-    `[ofw-mcp] Unrecognized OFW_WRITE_MODE "${raw.trim()}" \u2014 failing closed to "none" (no write tools registered). Valid values: none, drafts, all.`
-  );
-  return "none";
-}
-function getDefaultInlineAttachments() {
-  return parseBoolEnv("OFW_INLINE_ATTACHMENTS");
-}
-
-// src/cache.ts
-var instance = null;
-var SCHEMA_V1 = `
-CREATE TABLE IF NOT EXISTS messages (
-  id INTEGER PRIMARY KEY,
-  folder TEXT NOT NULL,
-  subject TEXT NOT NULL,
-  from_user TEXT NOT NULL,
-  sent_at TEXT NOT NULL,
-  recipients_json TEXT NOT NULL,
-  body TEXT,
-  fetched_body_at TEXT,
-  reply_to_id INTEGER,
-  chain_root_id INTEGER,
-  list_data_json TEXT NOT NULL,
-  last_seen_at TEXT NOT NULL
-);
-CREATE INDEX IF NOT EXISTS idx_messages_folder_sent_at ON messages(folder, sent_at DESC);
-CREATE INDEX IF NOT EXISTS idx_messages_chain_root ON messages(chain_root_id);
-
-CREATE TABLE IF NOT EXISTS drafts (
-  id INTEGER PRIMARY KEY,
-  subject TEXT NOT NULL,
-  body TEXT NOT NULL,
-  recipients_json TEXT NOT NULL,
-  reply_to_id INTEGER,
-  modified_at TEXT NOT NULL,
-  list_data_json TEXT NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS sync_state (
-  folder TEXT PRIMARY KEY,
-  last_sync_at TEXT NOT NULL,
-  newest_id INTEGER
-);
-
-CREATE TABLE IF NOT EXISTS meta (
-  key TEXT PRIMARY KEY,
-  value TEXT NOT NULL
-);
-`;
-var SCHEMA_V2 = `
-CREATE TABLE IF NOT EXISTS attachments (
-  file_id INTEGER PRIMARY KEY,
-  file_name TEXT NOT NULL,
-  label TEXT NOT NULL,
-  mime_type TEXT NOT NULL,
-  size_bytes INTEGER,
-  metadata_json TEXT NOT NULL,
-  message_ids_json TEXT NOT NULL,  -- JSON array of message ids that reference this file
-  downloaded_path TEXT,             -- absolute path on disk if/when downloaded
-  downloaded_at TEXT,
-  fetched_metadata_at TEXT NOT NULL
-);
-`;
-function migrate(db) {
-  db.exec(SCHEMA_V1);
-  db.exec(SCHEMA_V2);
-  db.prepare(
-    "INSERT INTO meta(key, value) VALUES(?, ?) ON CONFLICT(key) DO UPDATE SET value=excluded.value"
-  ).run("schema_version", "2");
-}
-function enforceCachePermissions(dbPath) {
-  chmodSync(dirname2(dbPath), 448);
-  chmodSync(dbPath, 384);
-  for (const sibling of [`${dbPath}-wal`, `${dbPath}-shm`]) {
-    if (existsSync(sibling)) chmodSync(sibling, 384);
-  }
-}
-function openCache() {
-  if (instance) return instance;
-  const path = getCacheDbPath();
-  mkdirSync(dirname2(path), { recursive: true });
-  const db = new DatabaseSync(path);
-  enforceCachePermissions(path);
-  db.exec("PRAGMA journal_mode = WAL");
-  db.exec("PRAGMA foreign_keys = ON");
-  migrate(db);
-  enforceCachePermissions(path);
-  instance = { db };
-  return instance;
-}
-function rowFromDb(r) {
-  return {
-    id: r.id,
-    folder: r.folder,
-    subject: r.subject,
-    fromUser: r.from_user,
-    sentAt: r.sent_at,
-    recipients: JSON.parse(r.recipients_json),
-    body: r.body,
-    fetchedBodyAt: r.fetched_body_at,
-    replyToId: r.reply_to_id,
-    chainRootId: r.chain_root_id,
-    listData: JSON.parse(r.list_data_json)
-  };
-}
-function nullish3(v) {
-  return v === void 0 ? null : v;
-}
-function requireString(field, v) {
-  if (typeof v === "string") return v;
-  throw new Error(`cache: ${field} is required (got ${v === void 0 ? "undefined" : "null"})`);
-}
-function upsertMessage(row) {
-  const { db } = openCache();
-  db.prepare(
-    `INSERT INTO messages (
-       id, folder, subject, from_user, sent_at, recipients_json,
-       body, fetched_body_at, reply_to_id, chain_root_id, list_data_json, last_seen_at
-     ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-     ON CONFLICT(id) DO UPDATE SET
-       folder=excluded.folder,
-       subject=excluded.subject,
-       from_user=excluded.from_user,
-       sent_at=excluded.sent_at,
-       recipients_json=excluded.recipients_json,
-       body=excluded.body,
-       fetched_body_at=excluded.fetched_body_at,
-       reply_to_id=excluded.reply_to_id,
-       chain_root_id=excluded.chain_root_id,
-       list_data_json=excluded.list_data_json,
-       last_seen_at=excluded.last_seen_at`
-  ).run(
-    row.id,
-    requireString("messages.folder", row.folder),
-    requireString("messages.subject", row.subject),
-    requireString("messages.fromUser", row.fromUser),
-    requireString("messages.sentAt", row.sentAt),
-    JSON.stringify(row.recipients ?? []),
-    nullish3(row.body),
-    nullish3(row.fetchedBodyAt),
-    nullish3(row.replyToId),
-    nullish3(row.chainRootId),
-    JSON.stringify(row.listData ?? null),
-    (/* @__PURE__ */ new Date()).toISOString()
-  );
-}
-function getMessage(id) {
-  const { db } = openCache();
-  const r = db.prepare("SELECT * FROM messages WHERE id = ?").get(id);
-  return r ? rowFromDb(r) : null;
-}
-function deleteMessage(id) {
-  const { db } = openCache();
-  db.prepare("DELETE FROM messages WHERE id = ?").run(id);
-}
-function buildMessageFilter(opts) {
-  const wheres = [];
-  const params = [];
-  if (opts.folder !== void 0) {
-    wheres.push("folder = ?");
-    params.push(opts.folder);
-  }
-  if (opts.since !== void 0) {
-    wheres.push("sent_at >= ?");
-    params.push(opts.since);
-  }
-  if (opts.until !== void 0) {
-    wheres.push("sent_at < ?");
-    params.push(opts.until);
-  }
-  if (opts.q !== void 0 && opts.q.length > 0) {
-    const pattern = `%${opts.q}%`;
-    wheres.push("(subject LIKE ? OR body LIKE ?)");
-    params.push(pattern, pattern);
-  }
-  return {
-    where: wheres.length > 0 ? `WHERE ${wheres.join(" AND ")}` : "",
-    params
-  };
-}
-function listMessages(opts) {
-  const { db } = openCache();
-  const { where, params } = buildMessageFilter(opts);
-  const offset = (opts.page - 1) * opts.size;
-  const rows = db.prepare(
-    `SELECT * FROM messages ${where}
-     ORDER BY sent_at DESC, id DESC
-     LIMIT ? OFFSET ?`
-  ).all(...params, opts.size, offset);
-  return rows.map(rowFromDb);
-}
-function countMessages(opts) {
-  const { db } = openCache();
-  const { where, params } = buildMessageFilter(opts);
-  const r = db.prepare(`SELECT COUNT(*) as n FROM messages ${where}`).get(...params);
-  return r?.n ?? 0;
-}
-function draftFromDb(r) {
-  return {
-    id: r.id,
-    subject: r.subject,
-    body: r.body,
-    recipients: JSON.parse(r.recipients_json),
-    replyToId: r.reply_to_id,
-    modifiedAt: r.modified_at,
-    listData: JSON.parse(r.list_data_json)
-  };
-}
-function upsertDraft(row) {
-  const { db } = openCache();
-  db.prepare(
-    `INSERT INTO drafts (id, subject, body, recipients_json, reply_to_id, modified_at, list_data_json)
-     VALUES (?, ?, ?, ?, ?, ?, ?)
-     ON CONFLICT(id) DO UPDATE SET
-       subject=excluded.subject,
-       body=excluded.body,
-       recipients_json=excluded.recipients_json,
-       reply_to_id=excluded.reply_to_id,
-       modified_at=excluded.modified_at,
-       list_data_json=excluded.list_data_json`
-  ).run(
-    row.id,
-    requireString("drafts.subject", row.subject),
-    requireString("drafts.body", row.body),
-    JSON.stringify(row.recipients ?? []),
-    nullish3(row.replyToId),
-    requireString("drafts.modifiedAt", row.modifiedAt),
-    JSON.stringify(row.listData ?? null)
-  );
-}
-function getDraft(id) {
-  const { db } = openCache();
-  const r = db.prepare("SELECT * FROM drafts WHERE id = ?").get(id);
-  return r ? draftFromDb(r) : null;
-}
-function listDrafts(opts) {
-  const { db } = openCache();
-  const offset = (opts.page - 1) * opts.size;
-  const rows = db.prepare(
-    "SELECT * FROM drafts ORDER BY modified_at DESC, id DESC LIMIT ? OFFSET ?"
-  ).all(opts.size, offset);
-  return rows.map(draftFromDb);
-}
-function deleteDraft(id) {
-  const { db } = openCache();
-  db.prepare("DELETE FROM drafts WHERE id = ?").run(id);
-}
-function listDraftIds() {
-  const { db } = openCache();
-  const rows = db.prepare("SELECT id FROM drafts").all();
-  return rows.map((r) => r.id);
-}
-function setSyncState(folder, state) {
-  const { db } = openCache();
-  db.prepare(
-    `INSERT INTO sync_state (folder, last_sync_at, newest_id) VALUES (?, ?, ?)
-     ON CONFLICT(folder) DO UPDATE SET
-       last_sync_at = excluded.last_sync_at,
-       newest_id = excluded.newest_id`
-  ).run(folder, state.lastSyncAt, state.newestId);
-}
-function setMeta(key, value) {
-  const { db } = openCache();
-  db.prepare(
-    "INSERT INTO meta (key, value) VALUES (?, ?) ON CONFLICT(key) DO UPDATE SET value=excluded.value"
-  ).run(key, value);
-}
-function findLatestReplyTip(replyToId) {
-  const { db } = openCache();
-  const parent = db.prepare(
-    "SELECT id, folder, chain_root_id FROM messages WHERE id = ?"
-  ).get(replyToId);
-  if (!parent) return replyToId;
-  const chainRoot = parent.chain_root_id ?? parent.id;
-  const tip = db.prepare(
-    `SELECT id FROM messages
-     WHERE folder = 'sent' AND chain_root_id = ?
-     ORDER BY id DESC LIMIT 1`
-  ).get(chainRoot);
-  return tip ? tip.id : replyToId;
-}
-function attachmentFromDb(r) {
-  return {
-    fileId: r.file_id,
-    fileName: r.file_name,
-    label: r.label,
-    mimeType: r.mime_type,
-    sizeBytes: r.size_bytes,
-    metadata: JSON.parse(r.metadata_json),
-    messageIds: JSON.parse(r.message_ids_json),
-    downloadedPath: r.downloaded_path,
-    downloadedAt: r.downloaded_at
-  };
-}
-function getAttachment(fileId) {
-  const { db } = openCache();
-  const r = db.prepare("SELECT * FROM attachments WHERE file_id = ?").get(fileId);
-  return r ? attachmentFromDb(r) : null;
-}
-function listAttachmentsForMessage(messageId) {
-  const { db } = openCache();
-  const rows = db.prepare(
-    `SELECT * FROM attachments
-     WHERE EXISTS (SELECT 1 FROM json_each(message_ids_json) WHERE value = ?)
-     ORDER BY file_id`
-  ).all(messageId);
-  return rows.map(attachmentFromDb);
-}
-function upsertAttachmentForMessage(input) {
-  const { db } = openCache();
-  const existing = db.prepare("SELECT message_ids_json FROM attachments WHERE file_id = ?").get(input.fileId);
-  const prior = existing ? JSON.parse(existing.message_ids_json) : [];
-  let messageIds;
-  if (input.messageId === 0) {
-    messageIds = prior;
-  } else if (prior.includes(input.messageId)) {
-    messageIds = prior;
-  } else {
-    messageIds = [...prior, input.messageId];
-  }
-  db.prepare(
-    `INSERT INTO attachments (
-       file_id, file_name, label, mime_type, size_bytes,
-       metadata_json, message_ids_json, fetched_metadata_at
-     ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-     ON CONFLICT(file_id) DO UPDATE SET
-       file_name=excluded.file_name,
-       label=excluded.label,
-       mime_type=excluded.mime_type,
-       size_bytes=excluded.size_bytes,
-       metadata_json=excluded.metadata_json,
-       message_ids_json=excluded.message_ids_json,
-       fetched_metadata_at=excluded.fetched_metadata_at`
-  ).run(
-    input.fileId,
-    requireString("attachments.fileName", input.fileName),
-    requireString("attachments.label", input.label),
-    requireString("attachments.mimeType", input.mimeType),
-    nullish3(input.sizeBytes),
-    JSON.stringify(input.metadata ?? null),
-    JSON.stringify(messageIds),
-    (/* @__PURE__ */ new Date()).toISOString()
-  );
-}
-function markAttachmentDownloaded(fileId, path) {
-  const { db } = openCache();
-  db.prepare(
-    "UPDATE attachments SET downloaded_path = ?, downloaded_at = ? WHERE file_id = ?"
-  ).run(path, (/* @__PURE__ */ new Date()).toISOString(), fileId);
-}
-
 // src/sync.ts
 var FileMetaSchema = external_exports.looseObject({
   fileId: external_exports.number(),
@@ -39002,13 +38768,13 @@ var FileMetaSchema = external_exports.looseObject({
   // MIME
   fileSize: external_exports.number().optional()
 });
-async function fetchAttachmentMeta(client2, fileId, messageId) {
+async function fetchAttachmentMeta(client2, fileId, messageId, store) {
   const meta3 = parseLenient(
     FileMetaSchema,
     await client2.request("GET", `/pub/v1/myfiles/${fileId}`),
     { label: "ofw-mcp", context: "GET /pub/v1/myfiles/{fileId}" }
   );
-  upsertAttachmentForMessage({
+  await store.upsertAttachmentForMessage({
     fileId: meta3.fileId ?? fileId,
     fileName: meta3.fileName ?? `file-${fileId}`,
     label: meta3.label ?? meta3.fileName ?? `file-${fileId}`,
@@ -39018,13 +38784,33 @@ async function fetchAttachmentMeta(client2, fileId, messageId) {
     messageId
   });
 }
-async function fetchAttachmentMetaForMessage(client2, messageId, fileIds) {
-  await Promise.allSettled(fileIds.map((fid) => fetchAttachmentMeta(client2, fid, messageId)));
+async function fetchAttachmentMetaForMessage(client2, messageId, fileIds, store) {
+  await Promise.allSettled(fileIds.map((fid) => fetchAttachmentMeta(client2, fid, messageId, store)));
+}
+function makeBudget(max) {
+  let remaining = max;
+  return {
+    take() {
+      if (remaining <= 0) return false;
+      remaining -= 1;
+      return true;
+    }
+  };
+}
+async function fetchAttachmentMetaBudgeted(client2, messageId, fileIds, store, budget) {
+  const affordable = [];
+  for (const fid of fileIds) {
+    if (!budget.take()) break;
+    affordable.push(fid);
+  }
+  if (affordable.length > 0) {
+    await fetchAttachmentMetaForMessage(client2, messageId, affordable, store);
+  }
 }
 var FoldersSchema = external_exports.looseObject({
   systemFolders: external_exports.array(external_exports.looseObject({ id: external_exports.string(), folderType: external_exports.string() })).optional()
 });
-async function resolveFolderIds(client2) {
+async function resolveFolderIds(client2, store) {
   const data = parseLenient(
     FoldersSchema,
     await client2.request("GET", "/pub/v1/messageFolders?includeFolderCounts=true"),
@@ -39041,7 +38827,8 @@ async function resolveFolderIds(client2) {
     sent: find("SENT_MESSAGES"),
     drafts: find("DRAFTS")
   };
-  setMeta("drafts_folder_id", ids.drafts);
+  await store.setMeta("drafts_folder_id", ids.drafts);
+  await store.setMeta("sent_folder_id", ids.sent);
   return ids;
 }
 var ListItemSchema = external_exports.looseObject({
@@ -39055,14 +38842,22 @@ var ListItemSchema = external_exports.looseObject({
 var ListResponseSchema = external_exports.looseObject({ data: external_exports.array(ListItemSchema).optional() });
 var DetailResponseSchema = external_exports.looseObject({
   body: external_exports.string().optional(),
-  files: external_exports.array(external_exports.number()).optional()
+  files: external_exports.array(external_exports.number()).optional(),
+  // The detail endpoint carries the REAL recipient view timestamps (the list
+  // endpoint only has an epoch placeholder) — used by the view-status refresh.
+  recipients: external_exports.array(ApiRecipientSchema).optional()
 });
-async function syncMessageFolder(client2, folder, folderId, opts) {
-  let page = 1;
-  let synced = 0;
+var maxId = (a, b) => a === null ? b : b === null ? a : Math.max(a, b);
+async function walkPages(client2, folder, folderId, opts, store) {
+  const budget = opts.budget;
+  let page = opts.startPage;
   let newestId = null;
+  let synced = 0;
   const unread = [];
   while (true) {
+    if (!budget.take()) {
+      return { synced, unread, newestId, done: false, nextPage: page };
+    }
     const path = `/pub/v3/messages?folders=${encodeURIComponent(folderId)}&page=${page}&size=50&sort=date&sortDirection=desc`;
     const list = parseLenient(
       ListResponseSchema,
@@ -39070,19 +38865,46 @@ async function syncMessageFolder(client2, folder, folderId, opts) {
       { label: "ofw-mcp", context: `GET /pub/v3/messages?folders={${folder}}` }
     );
     const items = list.data ?? [];
-    if (items.length === 0) break;
+    if (items.length === 0) {
+      return { synced, unread, newestId, done: true, nextPage: null };
+    }
+    const existingById = new Map(
+      (await store.getMessages(items.map((it) => it.id))).map((row) => [row.id, row])
+    );
+    const toUpsert = [];
     let pageHadNewItem = false;
+    let pageBudgetHit = false;
     for (const item of items) {
       if (newestId === null || item.id > newestId) newestId = item.id;
-      const existing = getMessage(item.id);
-      if (existing) continue;
+      const existing = existingById.get(item.id);
+      if (existing) {
+        if (folder === "sent" && item.showNeverViewed === false && !hasRealView(existing.recipients)) {
+          if (!budget.take()) {
+            pageBudgetHit = true;
+            break;
+          }
+          const detail = parseLenient(
+            DetailResponseSchema,
+            await client2.request("GET", `/pub/v3/messages/${item.id}`),
+            { label: "ofw-mcp", context: "GET /pub/v3/messages/{id} (view-status refresh)" }
+          );
+          toUpsert.push({ ...existing, recipients: mapRecipients(detail.recipients), listData: item });
+          synced++;
+        }
+        continue;
+      }
       pageHadNewItem = true;
       const isInboxUnread = folder === "inbox" && item.showNeverViewed === true;
       const shouldFetchBody = !isInboxUnread || opts.fetchUnreadBodies;
       let body = null;
       let fetchedBodyAt = null;
       let detailFileIds = [];
+      let detailRecipients;
       if (shouldFetchBody) {
+        if (!budget.take()) {
+          pageBudgetHit = true;
+          break;
+        }
         const detail = parseLenient(
           DetailResponseSchema,
           await client2.request("GET", `/pub/v3/messages/${item.id}`),
@@ -39090,6 +38912,7 @@ async function syncMessageFolder(client2, folder, folderId, opts) {
         );
         body = detail.body ?? "";
         fetchedBodyAt = (/* @__PURE__ */ new Date()).toISOString();
+        detailRecipients = detail.recipients;
         if (Array.isArray(detail.files) && detail.files.length > 0) {
           detailFileIds = detail.files;
         }
@@ -39107,27 +38930,72 @@ async function syncMessageFolder(client2, folder, folderId, opts) {
         subject: item.subject ?? "(no subject)",
         fromUser: item.from?.name ?? "",
         sentAt: item.date?.dateTime ?? (/* @__PURE__ */ new Date()).toISOString(),
-        recipients: mapRecipients(item.recipients),
+        recipients: mapRecipients(detailRecipients ?? item.recipients),
         body,
         fetchedBodyAt,
         replyToId: null,
         chainRootId: null,
         listData: item
       };
-      upsertMessage(row);
+      toUpsert.push(row);
       synced++;
       if (detailFileIds.length > 0) {
-        await fetchAttachmentMetaForMessage(client2, item.id, detailFileIds);
+        await fetchAttachmentMetaBudgeted(client2, item.id, detailFileIds, store, budget);
       }
     }
-    if (!opts.deep && !pageHadNewItem) break;
+    await store.upsertMessages(toUpsert);
+    if (pageBudgetHit) {
+      return { synced, unread, newestId, done: false, nextPage: page };
+    }
+    if (opts.stopAtCachedPage && !pageHadNewItem) {
+      return { synced, unread, newestId, done: true, nextPage: page };
+    }
     page++;
   }
-  setSyncState(folder, {
+}
+async function syncMessageFolder(client2, folder, folderId, opts, store) {
+  const budget = opts.budget ?? makeBudget(Number.POSITIVE_INFINITY);
+  const saved = await store.getSyncState(folder);
+  const savedResume = saved?.resumePage ?? null;
+  const fwd = await walkPages(client2, folder, folderId, {
+    startPage: 1,
+    stopAtCachedPage: true,
+    fetchUnreadBodies: opts.fetchUnreadBodies,
+    budget
+  }, store);
+  let synced = fwd.synced;
+  const unread = [...fwd.unread];
+  let newestId = maxId(saved?.newestId ?? null, fwd.newestId);
+  let done;
+  let resumePage;
+  if (!fwd.done) {
+    done = false;
+    resumePage = savedResume === null ? fwd.nextPage : Math.min(fwd.nextPage, savedResume);
+  } else if (fwd.nextPage === null) {
+    done = true;
+    resumePage = null;
+  } else if (savedResume === null && !opts.deep) {
+    done = true;
+    resumePage = null;
+  } else {
+    const bf = await walkPages(client2, folder, folderId, {
+      startPage: savedResume ?? fwd.nextPage,
+      stopAtCachedPage: false,
+      fetchUnreadBodies: opts.fetchUnreadBodies,
+      budget
+    }, store);
+    synced += bf.synced;
+    unread.push(...bf.unread);
+    newestId = maxId(newestId, bf.newestId);
+    done = bf.done;
+    resumePage = bf.done ? null : bf.nextPage;
+  }
+  await store.setSyncState(folder, {
     lastSyncAt: (/* @__PURE__ */ new Date()).toISOString(),
-    newestId
+    newestId,
+    resumePage
   });
-  return { synced, unread };
+  return { synced, unread, done };
 }
 var DraftListItemSchema = external_exports.looseObject({
   id: external_exports.number(),
@@ -39141,10 +39009,12 @@ var DraftDetailSchema = external_exports.looseObject({
   body: external_exports.string().optional(),
   subject: external_exports.string().optional()
 });
-async function syncDrafts(client2, draftsFolderId) {
+async function syncDrafts(client2, draftsFolderId, store, budget) {
+  const b = budget ?? makeBudget(Number.POSITIVE_INFINITY);
   const items = [];
   let page = 1;
   while (true) {
+    if (!b.take()) return { synced: 0, done: false };
     const path = `/pub/v3/messages?folders=${encodeURIComponent(draftsFolderId)}&page=${page}&size=50&sort=date&sortDirection=desc`;
     const list = parseLenient(
       DraftListResponseSchema,
@@ -39156,81 +39026,149 @@ async function syncDrafts(client2, draftsFolderId) {
     if (pageItems.length < 50) break;
     page++;
   }
-  const seenIds = /* @__PURE__ */ new Set();
-  let synced = 0;
+  const rows = [];
   for (const item of items) {
-    seenIds.add(item.id);
-    const modifiedAt = item.date?.dateTime ?? (/* @__PURE__ */ new Date()).toISOString();
-    const existing = getDraft(item.id);
+    if (!b.take()) return { synced: 0, done: false };
     const detail = parseLenient(
       DraftDetailSchema,
       await client2.request("GET", `/pub/v3/messages/${item.id}`),
       { label: "ofw-mcp", context: "GET /pub/v3/messages/{id} (drafts sync)" }
     );
-    const row = {
+    rows.push({
       id: item.id,
       subject: detail.subject ?? item.subject ?? "(no subject)",
       body: detail.body ?? "",
       recipients: mapRecipients(item.recipients),
       replyToId: item.replyToId ?? null,
-      modifiedAt,
+      modifiedAt: item.date?.dateTime ?? (/* @__PURE__ */ new Date()).toISOString(),
       listData: item
-    };
-    upsertDraft(row);
-    if (getMessage(item.id)) deleteMessage(item.id);
+    });
+  }
+  const ids = items.map((it) => it.id);
+  const existingById = new Map((await store.getDrafts(ids)).map((d) => [d.id, d]));
+  await store.upsertDrafts(rows);
+  for (const stale of await store.getMessages(ids)) {
+    await store.deleteMessage(stale.id);
+  }
+  let synced = 0;
+  for (const row of rows) {
+    const existing = existingById.get(row.id);
     if (!existing || existing.body !== row.body || existing.subject !== row.subject || existing.replyToId !== row.replyToId) {
       synced++;
     }
   }
-  for (const id of listDraftIds()) {
-    if (!seenIds.has(id)) deleteDraft(id);
+  const seenIds = new Set(ids);
+  for (const id of await store.listDraftIds()) {
+    if (!seenIds.has(id)) await store.deleteDraft(id);
   }
-  return { synced };
+  return { synced, done: true };
 }
-async function syncAll(client2, opts) {
+async function syncAll(client2, opts, store) {
   const folders = opts.folders ?? ["inbox", "sent", "drafts"];
-  const ids = await resolveFolderIds(client2);
+  const budget = makeBudget(opts.maxRequests ?? Number.POSITIVE_INFINITY);
+  budget.take();
+  const ids = await resolveFolderIds(client2, store);
   const synced = {};
   let unreadInbox = [];
+  let done = true;
   for (const folder of folders) {
     if (folder === "inbox") {
       const r = await syncMessageFolder(client2, "inbox", ids.inbox, {
         fetchUnreadBodies: opts.fetchUnreadBodies ?? false,
-        deep: opts.deep ?? false
-      });
+        deep: opts.deep ?? false,
+        budget
+      }, store);
       synced.inbox = r.synced;
       unreadInbox = r.unread;
+      if (!r.done) done = false;
     } else if (folder === "sent") {
       const r = await syncMessageFolder(client2, "sent", ids.sent, {
         fetchUnreadBodies: false,
-        deep: opts.deep ?? false
-      });
+        deep: opts.deep ?? false,
+        budget
+      }, store);
       synced.sent = r.synced;
+      if (!r.done) done = false;
     } else if (folder === "drafts") {
-      const r = await syncDrafts(client2, ids.drafts);
+      const r = await syncDrafts(client2, ids.drafts, store, budget);
       synced.drafts = r.synced;
+      if (!r.done) done = false;
     }
   }
-  const note = unreadInbox.length > 0 ? `${unreadInbox.length} unread inbox messages cached without bodies. Call ofw_get_message(id) to read them \u2014 this will mark them as read on OFW.` : void 0;
-  return { synced, unreadInbox, ...note ? { note } : {} };
+  const notes = [];
+  if (unreadInbox.length > 0) {
+    notes.push(`${unreadInbox.length} unread inbox messages cached without bodies. Call ofw_get_message(id) to read them \u2014 this will mark them as read on OFW.`);
+  }
+  if (!done) {
+    notes.push("Paused after the request budget to stay within the hosting limit; more pages remain \u2014 call ofw_sync_messages again with the same arguments to resume where it left off and continue the backfill.");
+  }
+  const note = notes.length > 0 ? notes.join("\n\n") : void 0;
+  return { synced, unreadInbox, done, ...note ? { note } : {} };
 }
 
-// src/tools/messages.ts
-import { mkdirSync as mkdirSync2, readFileSync, statSync, writeFileSync } from "node:fs";
-import { basename, dirname as dirname3, extname, join as join5 } from "node:path";
-var DateSchema = external_exports.looseObject({ dateTime: external_exports.string() });
-var SentDetailSchema = external_exports.looseObject({
-  subject: external_exports.string().optional(),
-  body: external_exports.string().optional(),
-  date: DateSchema.optional(),
-  from: external_exports.looseObject({ name: external_exports.string().optional() }).optional(),
-  recipients: external_exports.array(ApiRecipientSchema).optional()
-});
-var SavedDraftDetailSchema = external_exports.looseObject({
-  subject: external_exports.string().optional(),
-  body: external_exports.string().optional(),
-  date: DateSchema.optional(),
-  replyToId: external_exports.number().nullable().optional(),
+// src/config.ts
+import { createHash } from "node:crypto";
+import { homedir as homedir3 } from "node:os";
+import { join as join4 } from "node:path";
+function readCacheIdentity() {
+  return readEnvVar("OFW_CACHE_IDENTITY") ?? readEnvVar("OFW_USERNAME") ?? "_default";
+}
+function getCacheDir() {
+  const override = process.env.OFW_CACHE_DIR;
+  if (override && override.trim().length > 0) return override.trim();
+  return join4(homedir3(), ".cache", "ofw-mcp");
+}
+function getCacheDbPath() {
+  const identity = readCacheIdentity();
+  const hash2 = createHash("sha256").update(identity).digest("hex").slice(0, 16);
+  return join4(getCacheDir(), `${hash2}.db`);
+}
+function getAttachmentsDir() {
+  const override = process.env.OFW_ATTACHMENTS_DIR;
+  if (override && override.trim().length > 0) return override.trim();
+  return join4(homedir3(), "Downloads", "ofw-mcp");
+}
+function getWriteMode() {
+  const raw = process.env.OFW_WRITE_MODE;
+  if (typeof raw !== "string" || raw.trim().length === 0) return "all";
+  const mode = raw.trim().toLowerCase();
+  if (mode === "none" || mode === "drafts" || mode === "all") return mode;
+  console.error(
+    `[ofw-mcp] Unrecognized OFW_WRITE_MODE "${raw.trim()}" \u2014 failing closed to "none" (no write tools registered). Valid values: none, drafts, all.`
+  );
+  return "none";
+}
+function getCalendarWritesAllowed() {
+  const mode = getWriteMode();
+  if (mode === "all") return true;
+  return mode === "drafts" && parseBoolEnv("OFW_CALENDAR_WRITES");
+}
+function getDefaultInlineAttachments() {
+  return parseBoolEnv("OFW_INLINE_ATTACHMENTS");
+}
+function getSyncMaxRequests() {
+  const raw = readEnvVar("OFW_SYNC_MAX_REQUESTS");
+  if (raw === void 0) return Number.POSITIVE_INFINITY;
+  const n = Number(raw);
+  if (!Number.isInteger(n) || n <= 0) return Number.POSITIVE_INFINITY;
+  return n;
+}
+
+// src/tools/messages.ts
+import { basename, join as join5 } from "node:path";
+var DateSchema = external_exports.looseObject({ dateTime: external_exports.string() });
+var SentDetailSchema = external_exports.looseObject({
+  subject: external_exports.string().optional(),
+  body: external_exports.string().optional(),
+  date: DateSchema.optional(),
+  from: external_exports.looseObject({ name: external_exports.string().optional() }).optional(),
+  recipients: external_exports.array(ApiRecipientSchema).optional()
+});
+var SavedDraftDetailSchema = external_exports.looseObject({
+  subject: external_exports.string().optional(),
+  body: external_exports.string().optional(),
+  date: DateSchema.optional(),
+  replyToId: external_exports.number().nullable().optional(),
   recipients: external_exports.array(ApiRecipientSchema).optional()
 });
 var MessageDetailSchema = external_exports.looseObject({
@@ -39240,7 +39178,11 @@ var MessageDetailSchema = external_exports.looseObject({
   date: DateSchema,
   from: external_exports.looseObject({ name: external_exports.string().optional() }).optional(),
   files: external_exports.array(external_exports.number()).optional(),
-  recipients: external_exports.array(ApiRecipientSchema).optional()
+  recipients: external_exports.array(ApiRecipientSchema).optional(),
+  // The detail payload carries its own owning folder ({id, name}). We read the
+  // id to label a live-fetched message sent-vs-inbox instead of blindly
+  // defaulting to inbox — see the folder derivation in ofw_get_message.
+  folder: external_exports.looseObject({ id: external_exports.number() }).optional()
 });
 var DetailFilesSchema = external_exports.looseObject({ files: external_exports.array(external_exports.number()).optional() });
 var UploadedFileSchema = external_exports.looseObject({
@@ -39251,33 +39193,6 @@ var UploadedFileSchema = external_exports.looseObject({
   sizeInBytes: external_exports.number().optional(),
   shareClass: external_exports.string().optional()
 });
-var MIME_BY_EXT = {
-  ".pdf": "application/pdf",
-  ".png": "image/png",
-  ".jpg": "image/jpeg",
-  ".jpeg": "image/jpeg",
-  ".gif": "image/gif",
-  ".webp": "image/webp",
-  ".heic": "image/heic",
-  ".txt": "text/plain",
-  ".md": "text/markdown",
-  ".csv": "text/csv",
-  ".html": "text/html",
-  ".htm": "text/html",
-  ".json": "application/json",
-  ".xml": "application/xml",
-  ".doc": "application/msword",
-  ".docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-  ".xls": "application/vnd.ms-excel",
-  ".xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-  ".ppt": "application/vnd.ms-powerpoint",
-  ".pptx": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-  ".zip": "application/zip",
-  ".ics": "text/calendar"
-};
-function mimeFromName(name) {
-  return MIME_BY_EXT[extname(name).toLowerCase()] ?? "application/octet-stream";
-}
 function listDataHintsAtFiles(listData) {
   if (typeof listData !== "object" || listData === null) return false;
   const ld = listData;
@@ -39285,7 +39200,7 @@ function listDataHintsAtFiles(listData) {
   if (Array.isArray(ld.files)) return ld.files.length > 0;
   return false;
 }
-function registerMessageTools(server, client2) {
+function registerMessageTools(server, client2, cacheProvider, attachmentIO) {
   const writeMode = getWriteMode();
   const allowSend = writeMode === "all";
   const allowDrafts = writeMode !== "none";
@@ -39321,9 +39236,10 @@ function registerMessageTools(server, client2) {
         note: 'folderId must be "inbox", "sent", or "both". Numeric OFW folder IDs are not supported by the cache.'
       });
     }
+    const cache = cacheProvider();
     const filter = { folder, since: args.since, until: args.until, q: args.q };
-    const total = countMessages(filter);
-    const messages = listMessages({ ...filter, page, size });
+    const total = await cache.countMessages(filter);
+    const messages = await cache.listMessages({ ...filter, page, size });
     const payload = { messages, total, page, size };
     if (total === 0) {
       payload.note = "No messages match these filters. If you expected results, check ofw_sync_messages was run, or relax the filters.";
@@ -39340,7 +39256,8 @@ function registerMessageTools(server, client2) {
     }
   }, async (args) => {
     const id = Number(args.messageId);
-    const draftRow = getDraft(id);
+    const cache = cacheProvider();
+    const draftRow = await cache.getDraft(id);
     if (draftRow !== null) {
       return jsonResponse({
         id: draftRow.id,
@@ -39360,10 +39277,28 @@ function registerMessageTools(server, client2) {
         attachments: []
       });
     }
-    const cached2 = getMessage(id);
+    const cached2 = await cache.getMessage(id);
     if (cached2 && cached2.body !== null) {
-      let attachments2 = listAttachmentsForMessage(id);
-      if (attachments2.length === 0 && listDataHintsAtFiles(cached2.listData)) {
+      let row2 = cached2;
+      if (cached2.folder === "sent" && !hasRealView(cached2.recipients)) {
+        try {
+          const detail2 = parseLenient(
+            MessageDetailSchema,
+            await client2.request("GET", `/pub/v3/messages/${id}`),
+            { label: "ofw-mcp", context: "GET /pub/v3/messages/{id} (view-status refresh)" }
+          );
+          const recipients = mapRecipients(detail2.recipients);
+          row2 = {
+            ...cached2,
+            recipients,
+            listData: { ...cached2.listData, showNeverViewed: !hasRealView(recipients) }
+          };
+          await cache.upsertMessage(row2);
+        } catch {
+        }
+      }
+      let attachments2 = await cache.listAttachmentsForMessage(id);
+      if (attachments2.length === 0 && listDataHintsAtFiles(row2.listData)) {
         try {
           const detail2 = parseLenient(
             DetailFilesSchema,
@@ -39371,20 +39306,26 @@ function registerMessageTools(server, client2) {
             { label: "ofw-mcp", context: "GET /pub/v3/messages/{id} (attachment backfill)" }
           );
           if (Array.isArray(detail2.files) && detail2.files.length > 0) {
-            await fetchAttachmentMetaForMessage(client2, id, detail2.files);
-            attachments2 = listAttachmentsForMessage(id);
+            await fetchAttachmentMetaForMessage(client2, id, detail2.files, cache);
+            attachments2 = await cache.listAttachmentsForMessage(id);
           }
         } catch {
         }
       }
-      return jsonResponse({ ...cached2, attachments: attachments2 });
+      return jsonResponse({ ...row2, attachments: attachments2 });
     }
     const detail = parseLenient(
       MessageDetailSchema,
       await client2.request("GET", `/pub/v3/messages/${encodeURIComponent(args.messageId)}`),
       { label: "ofw-mcp", context: "GET /pub/v3/messages/{id} (ofw_get_message)" }
     );
-    const folder = cached2?.folder ?? "inbox";
+    let folder = cached2?.folder ?? "inbox";
+    if (!cached2) {
+      const sentFolderId = await cache.getMeta("sent_folder_id");
+      if (sentFolderId !== null && detail.folder?.id != null && String(detail.folder.id) === sentFolderId) {
+        folder = "sent";
+      }
+    }
     const row = {
       id: detail.id,
       folder,
@@ -39398,11 +39339,11 @@ function registerMessageTools(server, client2) {
       chainRootId: cached2?.chainRootId ?? null,
       listData: cached2?.listData ?? detail
     };
-    upsertMessage(row);
+    await cache.upsertMessage(row);
     if (Array.isArray(detail.files) && detail.files.length > 0) {
-      await fetchAttachmentMetaForMessage(client2, detail.id, detail.files);
+      await fetchAttachmentMetaForMessage(client2, detail.id, detail.files, cache);
     }
-    const attachments = listAttachmentsForMessage(detail.id);
+    const attachments = await cache.listAttachmentsForMessage(detail.id);
     return jsonResponse({ ...row, attachments });
   });
   if (allowSend) server.registerTool("ofw_send_message", {
@@ -39422,6 +39363,7 @@ function registerMessageTools(server, client2) {
       throw new Error(`messageId (${args.messageId}) and draftId (${args.draftId}) refer to different drafts; pass only one.`);
     }
     const draftRef = args.messageId ?? args.draftId;
+    const cache = cacheProvider();
     let subject = args.subject;
     let body = args.body;
     let recipientIds = args.recipientIds;
@@ -39430,7 +39372,7 @@ function registerMessageTools(server, client2) {
     let draftFound = false;
     if (draftRef !== void 0) {
       draftLookupAttempted = true;
-      const draft = getDraft(draftRef);
+      const draft = await cache.getDraft(draftRef);
       if (draft !== null) {
         draftFound = true;
         subject = subject ?? draft.subject;
@@ -39459,11 +39401,11 @@ function registerMessageTools(server, client2) {
     let chainRootId = null;
     let rewriteNote = null;
     if (requestedReplyTo !== null) {
-      resolvedReplyTo = findLatestReplyTip(requestedReplyTo);
+      resolvedReplyTo = await cache.findLatestReplyTip(requestedReplyTo);
       if (resolvedReplyTo !== requestedReplyTo) {
         rewriteNote = `replyToId rewritten from ${requestedReplyTo} to ${resolvedReplyTo} (later reply in same thread found in sent cache).`;
       }
-      const parent = getMessage(resolvedReplyTo);
+      const parent = await cache.getMessage(resolvedReplyTo);
       chainRootId = parent?.chainRootId ?? parent?.id ?? requestedReplyTo;
     }
     const myFileIDs = args.myFileIDs ?? [];
@@ -39493,10 +39435,10 @@ function registerMessageTools(server, client2) {
         chainRootId,
         listData: detail
       };
-      upsertMessage(persisted);
+      await cache.upsertMessage(persisted);
       for (const fileId of myFileIDs) {
-        const existing = getAttachment(fileId);
-        upsertAttachmentForMessage({
+        const existing = await cache.getAttachment(fileId);
+        await cache.upsertAttachmentForMessage({
           fileId,
           fileName: existing?.fileName ?? `file-${fileId}`,
           label: existing?.label ?? existing?.fileName ?? `file-${fileId}`,
@@ -39513,7 +39455,7 @@ function registerMessageTools(server, client2) {
       unconfirmedNote = `WARNING: OFW's send response did not include a message id, so the send could not be confirmed. ${draftClause} ourfamilywizard.com to see whether the message went out before retrying.`;
     } else if (draftRef !== void 0) {
       await deleteOFWMessages(client2, [draftRef]);
-      deleteDraft(draftRef);
+      await cache.deleteDraft(draftRef);
     }
     const responseObj = persisted ?? raw;
     const text = responseObj ? JSON.stringify(responseObj, null, 2) : "Message sent successfully.";
@@ -39532,7 +39474,7 @@ ${text}` : text);
   }, async (args) => {
     const page = args.page ?? 1;
     const size = args.size ?? 50;
-    const drafts = listDrafts({ page, size });
+    const drafts = await cacheProvider().listDrafts({ page, size });
     const payload = drafts.length === 0 ? { drafts: [], note: "Cache empty. Call ofw_sync_messages to populate." } : { drafts };
     return jsonResponse(payload);
   });
@@ -39548,11 +39490,12 @@ ${text}` : text);
       myFileIDs: external_exports.array(external_exports.number()).describe("Attachment file ids (from ofw_upload_attachment)").optional()
     }
   }, async (args) => {
+    const cache = cacheProvider();
     const requestedReplyTo = args.replyToId ?? null;
     let resolvedReplyTo = requestedReplyTo;
     let rewriteNote = null;
     if (requestedReplyTo !== null) {
-      resolvedReplyTo = findLatestReplyTip(requestedReplyTo);
+      resolvedReplyTo = await cache.findLatestReplyTip(requestedReplyTo);
       if (resolvedReplyTo !== requestedReplyTo) {
         rewriteNote = `replyToId rewritten from ${requestedReplyTo} to ${resolvedReplyTo} (later reply in same thread found in sent cache).`;
       }
@@ -39587,11 +39530,11 @@ ${text}` : text);
         modifiedAt: detail.date?.dateTime ?? (/* @__PURE__ */ new Date()).toISOString(),
         listData: detail
       };
-      upsertDraft(persisted);
+      await cache.upsertDraft(persisted);
       if (args.messageId !== void 0 && args.messageId !== newId) {
         try {
           await deleteOFWMessages(client2, [args.messageId]);
-          deleteDraft(args.messageId);
+          await cache.deleteDraft(args.messageId);
           replaceNote = `NOTE: ofw_save_draft replaced draft ${args.messageId} via create-then-delete. The new draft id is ${newId}; the old draft has been deleted. (OFW's update-in-place endpoint silently no-ops on subsequent updates, so we never use it. If you cached the old id anywhere, replace it with the new one.)`;
         } catch (e) {
           replaceNote = `WARNING: New draft ${newId} created successfully, but failed to delete the old draft (${args.messageId}): ${e.message}. You may want to clean it up manually with ofw_delete_draft.`;
@@ -39613,7 +39556,7 @@ ${text}` : text);
     }
   }, async (args) => {
     const data = await deleteOFWMessages(client2, [args.messageId]);
-    deleteDraft(args.messageId);
+    await cacheProvider().deleteDraft(args.messageId);
     return data ? jsonResponse(data) : textResponse("Draft deleted.");
   });
   server.registerTool("ofw_get_unread_sent", {
@@ -39626,7 +39569,7 @@ ${text}` : text);
   }, async (args) => {
     const page = args.page ?? 1;
     const size = args.size ?? 50;
-    const sent = listMessages({ folder: "sent", page, size });
+    const sent = await cacheProvider().listMessages({ folder: "sent", page, size });
     if (sent.length === 0) {
       return jsonResponse({ note: "Sent cache is empty. Call ofw_sync_messages to populate." });
     }
@@ -39652,13 +39595,9 @@ ${text}` : text);
       description: external_exports.string().describe("Description shown in OFW My Files (default: filename)").optional()
     }
   }, async (args) => {
-    const abs = expandPath2(args.path);
-    const stat = statSync(abs);
-    if (!stat.isFile()) throw new Error(`Not a file: ${abs}`);
-    const fileName = basename(abs);
-    const mime = mimeFromName(fileName);
+    const { blob, fileName, mimeType: mime, sizeBytes } = await attachmentIO.resolveUpload(args.path);
     const form = new FormData();
-    form.append("file", await fileBlob(abs, { type: mime }), fileName);
+    form.append("file", blob, fileName);
     form.append("source", "message");
     form.append("description", args.description ?? fileName);
     form.append("label", args.label ?? fileName);
@@ -39669,12 +39608,12 @@ ${text}` : text);
       await client2.request("POST", "/pub/v3/myfiles/multipart", form),
       { label: "ofw-mcp", context: "POST /pub/v3/myfiles/multipart (ofw_upload_attachment)", mode: "strict" }
     );
-    upsertAttachmentForMessage({
+    await cacheProvider().upsertAttachmentForMessage({
       fileId: meta3.fileId,
       fileName: meta3.fileName ?? fileName,
       label: meta3.label ?? args.label ?? fileName,
       mimeType: meta3.fileType ?? mime,
-      sizeBytes: typeof meta3.sizeInBytes === "number" ? meta3.sizeInBytes : stat.size,
+      sizeBytes: typeof meta3.sizeInBytes === "number" ? meta3.sizeInBytes : sizeBytes,
       metadata: meta3,
       messageId: 0
     });
@@ -39682,7 +39621,7 @@ ${text}` : text);
       fileId: meta3.fileId,
       fileName: meta3.fileName ?? fileName,
       mimeType: meta3.fileType ?? mime,
-      sizeBytes: meta3.sizeInBytes ?? stat.size,
+      sizeBytes: meta3.sizeInBytes ?? sizeBytes,
       shareClass: meta3.shareClass ?? args.shareClass ?? "PRIVATE",
       note: "Pass this fileId to ofw_send_message or ofw_save_draft in myFileIDs to attach it."
     });
@@ -39698,11 +39637,12 @@ ${text}` : text);
     }
   }, async (args) => {
     const fileId = args.fileId;
+    const cache = cacheProvider();
     const inline = args.inline ?? getDefaultInlineAttachments();
-    let cached2 = getAttachment(fileId);
+    let cached2 = await cache.getAttachment(fileId);
     if (!cached2) {
-      await fetchAttachmentMeta(client2, fileId, 0);
-      cached2 = getAttachment(fileId);
+      await fetchAttachmentMeta(client2, fileId, 0, cache);
+      cached2 = await cache.getAttachment(fileId);
       if (!cached2) throw new Error(`failed to fetch metadata for fileId ${fileId}`);
     }
     if (inline) {
@@ -39710,10 +39650,7 @@ ${text}` : text);
       let mimeType = cached2.mimeType;
       let fileName = cached2.fileName;
       if (cached2.downloadedPath) {
-        try {
-          bytes = readFileSync(cached2.downloadedPath);
-        } catch {
-        }
+        bytes = attachmentIO.readDownloaded(cached2.downloadedPath);
       }
       if (bytes === null) {
         const response2 = await client2.requestBinary("GET", `/pub/v1/myfiles/${fileId}/data`);
@@ -39758,9 +39695,8 @@ ${text}` : text);
       });
     }
     const response = await client2.requestBinary("GET", `/pub/v1/myfiles/${fileId}/data`);
-    mkdirSync2(dirname3(dest), { recursive: true });
-    writeFileSync(dest, response.body);
-    markAttachmentDownloaded(fileId, dest);
+    attachmentIO.writeDownload(dest, response.body);
+    await cache.markAttachmentDownloaded(fileId, dest);
     return jsonResponse({
       fileId,
       path: dest,
@@ -39770,19 +39706,21 @@ ${text}` : text);
     });
   });
   server.registerTool("ofw_sync_messages", {
-    description: "Sync messages from OurFamilyWizard into the local cache. Returns counts per folder and a list of unread inbox messages whose bodies were NOT fetched (to avoid mark-as-read on OFW). Call ofw_get_message(id) on those to read them. Pass deep:true to walk all OFW pages instead of stopping at the first all-cached page (use to backfill suspected gaps).",
+    description: "Sync messages from OurFamilyWizard into the local cache. Returns counts per folder and a list of unread inbox messages whose bodies were NOT fetched (to avoid mark-as-read on OFW). Call ofw_get_message(id) on those to read them. EVERY call re-checks the newest page first, so new messages are picked up promptly even while an old-history backfill is still running; only then does it spend what is left of its budget advancing that backfill. Pass deep:true to walk all OFW pages instead of stopping at the first all-cached page (use to backfill suspected gaps). Sync is BOUNDED and RESUMABLE: on hosted deployments a per-call OFW-request budget (env OFW_SYNC_MAX_REQUESTS, or the maxRequests argument) caps how far one call walks; when the budget is hit the response reports done:false with a note \u2014 call again with the SAME arguments to resume. done:false means older history is still being backfilled; it does NOT mean recent messages are missing. Local installs are unbounded by default (done is always true).",
     annotations: { readOnlyHint: false },
     inputSchema: {
       folders: external_exports.array(external_exports.enum(["inbox", "sent", "drafts"])).describe("Folders to sync (default: all three)").optional(),
       fetchUnreadBodies: external_exports.boolean().describe("If true, also fetch bodies for unread inbox messages (will mark them as read on OFW). Default false.").optional(),
-      deep: external_exports.boolean().describe("If true, walk every OFW page until empty regardless of cache state. Use to backfill gaps. Default false.").optional()
+      deep: external_exports.boolean().describe("If true, walk every OFW page until empty regardless of cache state. Use to backfill gaps. Default false.").optional(),
+      maxRequests: external_exports.number().int().min(1).describe("Maximum OFW requests this single call may make before pausing. When hit, the response reports done:false \u2014 call again with the same arguments to continue. Omit to use the server default (OFW_SYNC_MAX_REQUESTS, or unbounded on local installs).").optional()
     }
   }, async (args) => {
     const result = await syncAll(client2, {
       folders: args.folders,
       fetchUnreadBodies: args.fetchUnreadBodies,
-      deep: args.deep
-    });
+      deep: args.deep,
+      maxRequests: args.maxRequests ?? getSyncMaxRequests()
+    }, cacheProvider());
     return jsonResponse(result);
   });
 }
@@ -39793,8 +39731,87 @@ async function deleteOFWMessages(client2, ids) {
 }
 
 // src/tools/calendar.ts
+var ofwDate = external_exports.looseObject({ dateTime: external_exports.string() });
+var userRef = external_exports.looseObject({ userId: external_exports.number() });
+var eventDetailSchema = external_exports.looseObject({
+  eventRecurrenceId: external_exports.number(),
+  title: external_exports.string(),
+  allDay: external_exports.boolean(),
+  publicFlag: external_exports.boolean(),
+  startDate: ofwDate,
+  endDate: ofwDate,
+  location: external_exports.string().nullish(),
+  notes: external_exports.string().nullish(),
+  reminderMinutes: external_exports.number().nullish(),
+  children: external_exports.array(userRef).nullish(),
+  eventParent: userRef.nullish(),
+  dropOffParent: userRef.nullish(),
+  pickUpParent: userRef.nullish()
+});
+var eventWriteFields = {
+  startDate: external_exports.string().describe("Start date YYYY-MM-DD"),
+  endDate: external_exports.string().describe("End date YYYY-MM-DD (default: startDate)").optional(),
+  startTime: external_exports.string().describe("Start time HH:mm, 24-hour (required unless allDay)").optional(),
+  endTime: external_exports.string().describe("End time HH:mm, 24-hour (required unless allDay)").optional(),
+  allDay: external_exports.boolean().optional(),
+  privateEvent: external_exports.boolean().describe("true = visible only to you; default false = shared with co-parent").optional(),
+  location: external_exports.string().optional(),
+  notes: external_exports.string().optional(),
+  reminderMinutes: external_exports.number().int().min(0).optional(),
+  children: external_exports.array(external_exports.number()).describe("Child userIds to tag (see ofw_get_profile)").optional(),
+  eventParentId: external_exports.number().describe("userId of the parent the event is 'for'").optional(),
+  dropOffParentId: external_exports.number().describe("userId of the drop-off parent").optional(),
+  pickUpParentId: external_exports.number().describe("userId of the pick-up parent").optional()
+};
+function buildEventPayload(a) {
+  const allDay = a.allDay ?? false;
+  if (!allDay && (!a.startTime || !a.endTime)) {
+    throw new Error("startTime and endTime (HH:mm) are required unless allDay is true");
+  }
+  const payload = {
+    title: a.title,
+    startDate: a.startDate,
+    endDate: a.endDate ?? a.startDate,
+    // The web form always sends times; for all-day events it uses 01:00/02:00
+    // placeholders that OFW ignores.
+    startTime: a.startTime ?? "01:00",
+    endTime: a.endTime ?? "02:00",
+    allDay,
+    publicFlag: !(a.privateEvent ?? false)
+  };
+  if (a.location) payload.location = a.location;
+  if (a.notes) payload.notes = a.notes;
+  if (a.reminderMinutes !== void 0) payload.reminderMinutes = String(a.reminderMinutes);
+  if (a.children !== void 0) payload.children = a.children;
+  if (a.eventParentId !== void 0) payload.eventParentId = String(a.eventParentId);
+  if (a.dropOffParentId !== void 0) payload.dropOffParentId = String(a.dropOffParentId);
+  if (a.pickUpParentId !== void 0) payload.pickUpParentId = String(a.pickUpParentId);
+  return payload;
+}
+function detailToWriteArgs(d) {
+  const [startDate, startClock] = d.startDate.dateTime.split("T");
+  const [endDate, endClock] = d.endDate.dateTime.split("T");
+  return {
+    title: d.title,
+    startDate,
+    endDate,
+    startTime: (startClock ?? "01:00:00").slice(0, 5),
+    endTime: (endClock ?? "02:00:00").slice(0, 5),
+    allDay: d.allDay,
+    privateEvent: !d.publicFlag,
+    location: d.location ?? void 0,
+    notes: d.notes ?? void 0,
+    reminderMinutes: d.reminderMinutes ?? void 0,
+    // Untagged (nullish or empty) → undefined, so the merged PUT omits the
+    // field (omission preserves; only a CALLER-supplied [] should clear).
+    children: d.children?.length ? d.children.map((c) => c.userId) : void 0,
+    eventParentId: d.eventParent?.userId,
+    dropOffParentId: d.dropOffParent?.userId,
+    pickUpParentId: d.pickUpParent?.userId
+  };
+}
 function registerCalendarTools(server, client2) {
-  const allowWrites = getWriteMode() === "all";
+  const allowWrites = getCalendarWritesAllowed();
   server.registerTool("ofw_list_events", {
     description: "List OurFamilyWizard calendar events in a date range",
     annotations: { readOnlyHint: true },
@@ -39812,51 +39829,62 @@ function registerCalendarTools(server, client2) {
     return jsonResponse(data);
   });
   if (allowWrites) server.registerTool("ofw_create_event", {
-    description: "Create a calendar event in OurFamilyWizard",
+    description: "Create a calendar event in OurFamilyWizard. Unless privateEvent is true, the event is immediately visible to the co-parent \u2014 there is no draft stage.",
     annotations: { destructiveHint: false },
     inputSchema: {
       title: external_exports.string(),
-      startDate: external_exports.string().describe("ISO datetime string"),
-      endDate: external_exports.string().describe("ISO datetime string"),
-      allDay: external_exports.boolean().optional(),
-      location: external_exports.string().optional(),
-      reminder: external_exports.string().describe('Reminder setting (e.g. "1 hour before")').optional(),
-      privateEvent: external_exports.boolean().optional(),
-      eventFor: external_exports.string().describe("neither | parent1 | parent2").optional(),
-      dropOffParent: external_exports.string().optional(),
-      pickUpParent: external_exports.string().optional(),
-      children: external_exports.array(external_exports.number()).describe("Array of child IDs").optional()
+      ...eventWriteFields
     }
   }, async (args) => {
-    const data = await client2.request("POST", "/pub/v1/calendar/events", args);
-    return jsonResponse(data);
+    const raw = await client2.request("POST", "/pub/v3/events", buildEventPayload(args));
+    const event = parseLenient(eventDetailSchema, raw, { label: "ofw-mcp", context: "POST /pub/v3/events", mode: "strict" });
+    return jsonResponse({
+      note: `Event created. Use eventRecurrenceId ${event.eventRecurrenceId} as eventId for ofw_update_event/ofw_delete_event.`,
+      event
+    });
   });
   if (allowWrites) server.registerTool("ofw_update_event", {
-    description: "Update an existing OurFamilyWizard calendar event",
+    description: "Update an existing OurFamilyWizard calendar event. Fetches the event, applies the given changes, and writes the merged result back (OFW has no partial update).",
     annotations: { destructiveHint: true },
     inputSchema: {
-      eventId: external_exports.string(),
+      eventId: external_exports.string().describe("Event id \u2014 the `id` from ofw_list_events / eventRecurrenceId from ofw_create_event"),
       title: external_exports.string().optional(),
-      startDate: external_exports.string().optional(),
-      endDate: external_exports.string().optional(),
-      allDay: external_exports.boolean().optional(),
-      location: external_exports.string().optional(),
-      reminder: external_exports.string().optional(),
-      privateEvent: external_exports.boolean().optional()
+      startDate: eventWriteFields.startDate.optional(),
+      endDate: eventWriteFields.endDate,
+      startTime: eventWriteFields.startTime,
+      endTime: eventWriteFields.endTime,
+      allDay: eventWriteFields.allDay,
+      privateEvent: eventWriteFields.privateEvent,
+      location: eventWriteFields.location,
+      notes: eventWriteFields.notes,
+      reminderMinutes: eventWriteFields.reminderMinutes,
+      children: external_exports.array(external_exports.number()).describe("Child userIds to tag; pass [] to remove all child tags (omit to keep current tags)").optional(),
+      eventParentId: eventWriteFields.eventParentId,
+      dropOffParentId: eventWriteFields.dropOffParentId,
+      pickUpParentId: eventWriteFields.pickUpParentId
     }
   }, async (args) => {
-    const { eventId, ...updateData } = args;
-    const data = await client2.request("PUT", `/pub/v1/calendar/events/${encodeURIComponent(eventId)}`, updateData);
-    return jsonResponse(data);
+    const { eventId, ...changes } = args;
+    const id = encodeURIComponent(eventId);
+    const rawDetail = await client2.request("GET", `/pub/v3/events/${id}`);
+    const current = parseLenient(eventDetailSchema, rawDetail, { label: "ofw-mcp", context: `GET /pub/v3/events/${eventId}`, mode: "strict" });
+    const defined = Object.fromEntries(Object.entries(changes).filter(([, v]) => v !== void 0));
+    const merged = { ...detailToWriteArgs(current), ...defined };
+    await client2.request("PUT", `/pub/v3/events/${id}`, buildEventPayload(merged));
+    const rawAfter = await client2.request("GET", `/pub/v3/events/${id}`);
+    const event = parseLenient(eventDetailSchema, rawAfter, { label: "ofw-mcp", context: `GET /pub/v3/events/${eventId} (post-update)`, mode: "strict" });
+    return jsonResponse({ note: "Event updated; returning re-fetched event state.", event });
   });
   if (allowWrites) server.registerTool("ofw_delete_event", {
     description: "Delete an OurFamilyWizard calendar event",
     annotations: { destructiveHint: true },
     inputSchema: {
-      eventId: external_exports.string().describe("Event ID to delete")
+      eventId: external_exports.string().describe("Event id \u2014 the `id` from ofw_list_events / eventRecurrenceId from ofw_create_event"),
+      includeFuture: external_exports.boolean().describe("For repeating events: also delete future occurrences (default false)").optional()
     }
   }, async (args) => {
-    await client2.request("DELETE", `/pub/v1/calendar/events/${encodeURIComponent(args.eventId)}`);
+    const includeFuture = args.includeFuture ?? false;
+    await client2.request("DELETE", `/pub/v3/events/${encodeURIComponent(args.eventId)}?includeFuture=${includeFuture}`);
     return textResponse(`Event ${args.eventId} deleted`);
   });
 }
@@ -39926,6 +39954,584 @@ function registerJournalTools(server, client2) {
   });
 }
 
+// src/cache/node.ts
+import { DatabaseSync } from "node:sqlite";
+import { mkdirSync, chmodSync, existsSync } from "node:fs";
+import { dirname as dirname2 } from "node:path";
+
+// src/cache/store.ts
+function rowFromDb(r) {
+  return {
+    id: r.id,
+    folder: r.folder,
+    subject: r.subject,
+    fromUser: r.from_user,
+    sentAt: r.sent_at,
+    recipients: JSON.parse(r.recipients_json),
+    body: r.body,
+    fetchedBodyAt: r.fetched_body_at,
+    replyToId: r.reply_to_id,
+    chainRootId: r.chain_root_id,
+    listData: JSON.parse(r.list_data_json)
+  };
+}
+function draftFromDb(r) {
+  return {
+    id: r.id,
+    subject: r.subject,
+    body: r.body,
+    recipients: JSON.parse(r.recipients_json),
+    replyToId: r.reply_to_id,
+    modifiedAt: r.modified_at,
+    listData: JSON.parse(r.list_data_json)
+  };
+}
+function attachmentFromDb(r) {
+  return {
+    fileId: r.file_id,
+    fileName: r.file_name,
+    label: r.label,
+    mimeType: r.mime_type,
+    sizeBytes: r.size_bytes,
+    metadata: JSON.parse(r.metadata_json),
+    messageIds: JSON.parse(r.message_ids_json),
+    downloadedPath: r.downloaded_path,
+    downloadedAt: r.downloaded_at
+  };
+}
+function nullish3(v) {
+  return v === void 0 ? null : v;
+}
+function requireString(field, v) {
+  if (typeof v === "string") return v;
+  throw new Error(`cache: ${field} is required (got ${v === void 0 ? "undefined" : "null"})`);
+}
+var SCHEMA_STATEMENTS = [
+  `CREATE TABLE IF NOT EXISTS messages (
+     id INTEGER PRIMARY KEY,
+     folder TEXT NOT NULL,
+     subject TEXT NOT NULL,
+     from_user TEXT NOT NULL,
+     sent_at TEXT NOT NULL,
+     recipients_json TEXT NOT NULL,
+     body TEXT,
+     fetched_body_at TEXT,
+     reply_to_id INTEGER,
+     chain_root_id INTEGER,
+     list_data_json TEXT NOT NULL,
+     last_seen_at TEXT NOT NULL
+   )`,
+  `CREATE INDEX IF NOT EXISTS idx_messages_folder_sent_at ON messages(folder, sent_at DESC)`,
+  `CREATE INDEX IF NOT EXISTS idx_messages_chain_root ON messages(chain_root_id)`,
+  `CREATE TABLE IF NOT EXISTS drafts (
+     id INTEGER PRIMARY KEY,
+     subject TEXT NOT NULL,
+     body TEXT NOT NULL,
+     recipients_json TEXT NOT NULL,
+     reply_to_id INTEGER,
+     modified_at TEXT NOT NULL,
+     list_data_json TEXT NOT NULL
+   )`,
+  `CREATE TABLE IF NOT EXISTS sync_state (
+     folder TEXT PRIMARY KEY,
+     last_sync_at TEXT NOT NULL,
+     newest_id INTEGER
+   )`,
+  `CREATE TABLE IF NOT EXISTS meta (
+     key TEXT PRIMARY KEY,
+     value TEXT NOT NULL
+   )`,
+  // v2: attachments table. Idempotent — IF NOT EXISTS.
+  `CREATE TABLE IF NOT EXISTS attachments (
+     file_id INTEGER PRIMARY KEY,
+     file_name TEXT NOT NULL,
+     label TEXT NOT NULL,
+     mime_type TEXT NOT NULL,
+     size_bytes INTEGER,
+     metadata_json TEXT NOT NULL,
+     message_ids_json TEXT NOT NULL,
+     downloaded_path TEXT,
+     downloaded_at TEXT,
+     fetched_metadata_at TEXT NOT NULL
+   )`
+];
+var MIGRATIONS = [
+  // Resumable deep-sync cursor. Absent/NULL → SyncState.resumePage null.
+  "ALTER TABLE sync_state ADD COLUMN resume_page INTEGER"
+];
+var SCHEMA_VERSION = "2";
+function buildMessageFilter(opts) {
+  const wheres = [];
+  const params = [];
+  if (opts.folder !== void 0) {
+    wheres.push("folder = ?");
+    params.push(opts.folder);
+  }
+  if (opts.since !== void 0) {
+    wheres.push("sent_at >= ?");
+    params.push(opts.since);
+  }
+  if (opts.until !== void 0) {
+    wheres.push("sent_at < ?");
+    params.push(opts.until);
+  }
+  if (opts.q !== void 0 && opts.q.length > 0) {
+    const pattern = `%${opts.q}%`;
+    wheres.push("(subject LIKE ? OR body LIKE ?)");
+    params.push(pattern, pattern);
+  }
+  return {
+    where: wheres.length > 0 ? `WHERE ${wheres.join(" AND ")}` : "",
+    params
+  };
+}
+var OFWCacheCore = class {
+  constructor(db) {
+    this.db = db;
+    for (const stmt of SCHEMA_STATEMENTS) this.db.execScript(stmt);
+    for (const stmt of MIGRATIONS) {
+      try {
+        this.db.execScript(stmt);
+      } catch {
+      }
+    }
+    this.db.run(
+      "INSERT INTO meta(key, value) VALUES(?, ?) ON CONFLICT(key) DO UPDATE SET value=excluded.value",
+      ["schema_version", SCHEMA_VERSION]
+    );
+  }
+  db;
+  upsertMessage(row) {
+    this.db.run(
+      `INSERT INTO messages (
+         id, folder, subject, from_user, sent_at, recipients_json,
+         body, fetched_body_at, reply_to_id, chain_root_id, list_data_json, last_seen_at
+       ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+       ON CONFLICT(id) DO UPDATE SET
+         folder=excluded.folder,
+         subject=excluded.subject,
+         from_user=excluded.from_user,
+         sent_at=excluded.sent_at,
+         recipients_json=excluded.recipients_json,
+         body=excluded.body,
+         fetched_body_at=excluded.fetched_body_at,
+         reply_to_id=excluded.reply_to_id,
+         chain_root_id=excluded.chain_root_id,
+         list_data_json=excluded.list_data_json,
+         last_seen_at=excluded.last_seen_at`,
+      [
+        row.id,
+        requireString("messages.folder", row.folder),
+        requireString("messages.subject", row.subject),
+        requireString("messages.fromUser", row.fromUser),
+        requireString("messages.sentAt", row.sentAt),
+        JSON.stringify(row.recipients ?? []),
+        nullish3(row.body),
+        nullish3(row.fetchedBodyAt),
+        nullish3(row.replyToId),
+        nullish3(row.chainRootId),
+        JSON.stringify(row.listData ?? null),
+        (/* @__PURE__ */ new Date()).toISOString()
+      ]
+    );
+  }
+  /**
+   * Batch upsert every row in a single transaction — one round-trip's worth of
+   * work (crucial on the Durable Object backend, where each RPC is a subrequest).
+   * Empty array is a no-op (no transaction opened).
+   */
+  upsertMessages(rows) {
+    if (rows.length === 0) return;
+    this.db.transaction(() => {
+      for (const row of rows) this.upsertMessage(row);
+    });
+  }
+  getMessage(id) {
+    const r = this.db.get("SELECT * FROM messages WHERE id = ?", [id]);
+    return r ? rowFromDb(r) : null;
+  }
+  /**
+   * Batch read: one `SELECT ... WHERE id IN (...)` returning the present rows
+   * (absent ids are simply omitted — order is not guaranteed). Empty ids returns
+   * `[]` without querying.
+   */
+  getMessages(ids) {
+    if (ids.length === 0) return [];
+    const placeholders = ids.map(() => "?").join(", ");
+    const rows = this.db.all(
+      `SELECT * FROM messages WHERE id IN (${placeholders})`,
+      ids
+    );
+    return rows.map(rowFromDb);
+  }
+  /**
+   * Remove a row from the `messages` table. Used by syncDrafts to evict
+   * stale rows that were cached when a draft was previously read through
+   * `ofw_get_message` (which would have wrongly classified it as `inbox`)
+   * — the drafts table is the authoritative source for that id now.
+   */
+  deleteMessage(id) {
+    this.db.run("DELETE FROM messages WHERE id = ?", [id]);
+  }
+  listMessages(opts) {
+    const { where, params } = buildMessageFilter(opts);
+    const offset = (opts.page - 1) * opts.size;
+    const rows = this.db.all(
+      `SELECT * FROM messages ${where}
+       ORDER BY sent_at DESC, id DESC
+       LIMIT ? OFFSET ?`,
+      [...params, opts.size, offset]
+    );
+    return rows.map(rowFromDb);
+  }
+  countMessages(opts) {
+    const { where, params } = buildMessageFilter(opts);
+    const r = this.db.get(`SELECT COUNT(*) as n FROM messages ${where}`, params);
+    return r?.n ?? 0;
+  }
+  upsertDraft(row) {
+    this.db.run(
+      `INSERT INTO drafts (id, subject, body, recipients_json, reply_to_id, modified_at, list_data_json)
+       VALUES (?, ?, ?, ?, ?, ?, ?)
+       ON CONFLICT(id) DO UPDATE SET
+         subject=excluded.subject,
+         body=excluded.body,
+         recipients_json=excluded.recipients_json,
+         reply_to_id=excluded.reply_to_id,
+         modified_at=excluded.modified_at,
+         list_data_json=excluded.list_data_json`,
+      [
+        row.id,
+        requireString("drafts.subject", row.subject),
+        requireString("drafts.body", row.body),
+        JSON.stringify(row.recipients ?? []),
+        nullish3(row.replyToId),
+        requireString("drafts.modifiedAt", row.modifiedAt),
+        JSON.stringify(row.listData ?? null)
+      ]
+    );
+  }
+  /** Batch upsert every draft in a single transaction. Empty array is a no-op. */
+  upsertDrafts(rows) {
+    if (rows.length === 0) return;
+    this.db.transaction(() => {
+      for (const row of rows) this.upsertDraft(row);
+    });
+  }
+  getDraft(id) {
+    const r = this.db.get("SELECT * FROM drafts WHERE id = ?", [id]);
+    return r ? draftFromDb(r) : null;
+  }
+  /**
+   * Batch read: one `SELECT ... WHERE id IN (...)` returning the present drafts
+   * (absent ids omitted — order not guaranteed). Empty ids returns `[]` without
+   * querying.
+   */
+  getDrafts(ids) {
+    if (ids.length === 0) return [];
+    const placeholders = ids.map(() => "?").join(", ");
+    const rows = this.db.all(
+      `SELECT * FROM drafts WHERE id IN (${placeholders})`,
+      ids
+    );
+    return rows.map(draftFromDb);
+  }
+  listDrafts(opts) {
+    const offset = (opts.page - 1) * opts.size;
+    const rows = this.db.all(
+      "SELECT * FROM drafts ORDER BY modified_at DESC, id DESC LIMIT ? OFFSET ?",
+      [opts.size, offset]
+    );
+    return rows.map(draftFromDb);
+  }
+  deleteDraft(id) {
+    this.db.run("DELETE FROM drafts WHERE id = ?", [id]);
+  }
+  listDraftIds() {
+    const rows = this.db.all("SELECT id FROM drafts", []);
+    return rows.map((r) => r.id);
+  }
+  getSyncState(folder) {
+    const r = this.db.get("SELECT last_sync_at, newest_id, resume_page FROM sync_state WHERE folder = ?", [folder]);
+    if (!r) return null;
+    return { lastSyncAt: r.last_sync_at, newestId: r.newest_id, resumePage: r.resume_page ?? null };
+  }
+  setSyncState(folder, state) {
+    this.db.run(
+      `INSERT INTO sync_state (folder, last_sync_at, newest_id, resume_page) VALUES (?, ?, ?, ?)
+       ON CONFLICT(folder) DO UPDATE SET
+         last_sync_at = excluded.last_sync_at,
+         newest_id = excluded.newest_id,
+         resume_page = excluded.resume_page`,
+      [folder, state.lastSyncAt, nullish3(state.newestId), nullish3(state.resumePage)]
+    );
+  }
+  getMeta(key) {
+    const r = this.db.get("SELECT value FROM meta WHERE key = ?", [key]);
+    return r ? r.value : null;
+  }
+  setMeta(key, value) {
+    this.db.run(
+      "INSERT INTO meta (key, value) VALUES (?, ?) ON CONFLICT(key) DO UPDATE SET value=excluded.value",
+      [key, value]
+    );
+  }
+  findLatestReplyTip(replyToId) {
+    const parent = this.db.get("SELECT id, folder, chain_root_id FROM messages WHERE id = ?", [replyToId]);
+    if (!parent) return replyToId;
+    const chainRoot = parent.chain_root_id ?? parent.id;
+    const tip = this.db.get(
+      `SELECT id FROM messages
+       WHERE folder = 'sent' AND chain_root_id = ?
+       ORDER BY id DESC LIMIT 1`,
+      [chainRoot]
+    );
+    return tip ? tip.id : replyToId;
+  }
+  getAttachment(fileId) {
+    const r = this.db.get("SELECT * FROM attachments WHERE file_id = ?", [fileId]);
+    return r ? attachmentFromDb(r) : null;
+  }
+  listAttachmentsForMessage(messageId) {
+    const rows = this.db.all(
+      `SELECT * FROM attachments
+       WHERE EXISTS (SELECT 1 FROM json_each(message_ids_json) WHERE value = ?)
+       ORDER BY file_id`,
+      [messageId]
+    );
+    return rows.map(attachmentFromDb);
+  }
+  upsertAttachmentForMessage(input) {
+    const existing = this.db.get("SELECT message_ids_json FROM attachments WHERE file_id = ?", [input.fileId]);
+    const prior = existing ? JSON.parse(existing.message_ids_json) : [];
+    let messageIds;
+    if (input.messageId === 0) {
+      messageIds = prior;
+    } else if (prior.includes(input.messageId)) {
+      messageIds = prior;
+    } else {
+      messageIds = [...prior, input.messageId];
+    }
+    this.db.run(
+      `INSERT INTO attachments (
+         file_id, file_name, label, mime_type, size_bytes,
+         metadata_json, message_ids_json, fetched_metadata_at
+       ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+       ON CONFLICT(file_id) DO UPDATE SET
+         file_name=excluded.file_name,
+         label=excluded.label,
+         mime_type=excluded.mime_type,
+         size_bytes=excluded.size_bytes,
+         metadata_json=excluded.metadata_json,
+         message_ids_json=excluded.message_ids_json,
+         fetched_metadata_at=excluded.fetched_metadata_at`,
+      [
+        input.fileId,
+        requireString("attachments.fileName", input.fileName),
+        requireString("attachments.label", input.label),
+        requireString("attachments.mimeType", input.mimeType),
+        nullish3(input.sizeBytes),
+        JSON.stringify(input.metadata ?? null),
+        JSON.stringify(messageIds),
+        (/* @__PURE__ */ new Date()).toISOString()
+      ]
+    );
+  }
+  markAttachmentDownloaded(fileId, path) {
+    this.db.run("UPDATE attachments SET downloaded_path = ?, downloaded_at = ? WHERE file_id = ?", [
+      path,
+      (/* @__PURE__ */ new Date()).toISOString(),
+      fileId
+    ]);
+  }
+};
+var LocalCacheStore = class {
+  constructor(core) {
+    this.core = core;
+  }
+  core;
+  async upsertMessage(row) {
+    this.core.upsertMessage(row);
+  }
+  async upsertMessages(rows) {
+    this.core.upsertMessages(rows);
+  }
+  async getMessage(id) {
+    return this.core.getMessage(id);
+  }
+  async getMessages(ids) {
+    return this.core.getMessages(ids);
+  }
+  async deleteMessage(id) {
+    this.core.deleteMessage(id);
+  }
+  async listMessages(opts) {
+    return this.core.listMessages(opts);
+  }
+  async countMessages(opts) {
+    return this.core.countMessages(opts);
+  }
+  async upsertDraft(row) {
+    this.core.upsertDraft(row);
+  }
+  async upsertDrafts(rows) {
+    this.core.upsertDrafts(rows);
+  }
+  async getDraft(id) {
+    return this.core.getDraft(id);
+  }
+  async getDrafts(ids) {
+    return this.core.getDrafts(ids);
+  }
+  async listDrafts(opts) {
+    return this.core.listDrafts(opts);
+  }
+  async deleteDraft(id) {
+    this.core.deleteDraft(id);
+  }
+  async listDraftIds() {
+    return this.core.listDraftIds();
+  }
+  async getSyncState(folder) {
+    return this.core.getSyncState(folder);
+  }
+  async setSyncState(folder, state) {
+    this.core.setSyncState(folder, state);
+  }
+  async getMeta(key) {
+    return this.core.getMeta(key);
+  }
+  async setMeta(key, value) {
+    this.core.setMeta(key, value);
+  }
+  async findLatestReplyTip(replyToId) {
+    return this.core.findLatestReplyTip(replyToId);
+  }
+  async getAttachment(fileId) {
+    return this.core.getAttachment(fileId);
+  }
+  async listAttachmentsForMessage(messageId) {
+    return this.core.listAttachmentsForMessage(messageId);
+  }
+  async upsertAttachmentForMessage(input) {
+    this.core.upsertAttachmentForMessage(input);
+  }
+  async markAttachmentDownloaded(fileId, path) {
+    this.core.markAttachmentDownloaded(fileId, path);
+  }
+};
+
+// src/cache/node.ts
+var NodeSqlDriver = class {
+  constructor(db) {
+    this.db = db;
+  }
+  db;
+  execScript(sql) {
+    this.db.exec(sql);
+  }
+  run(sql, params) {
+    this.db.prepare(sql).run(...params);
+  }
+  get(sql, params) {
+    return this.db.prepare(sql).get(...params);
+  }
+  all(sql, params) {
+    return this.db.prepare(sql).all(...params);
+  }
+  transaction(fn) {
+    this.db.exec("BEGIN");
+    try {
+      fn();
+      this.db.exec("COMMIT");
+    } catch (e) {
+      this.db.exec("ROLLBACK");
+      throw e;
+    }
+  }
+};
+function enforceCachePermissions(dbPath) {
+  chmodSync(dirname2(dbPath), 448);
+  chmodSync(dbPath, 384);
+  for (const sibling of [`${dbPath}-wal`, `${dbPath}-shm`]) {
+    if (existsSync(sibling)) chmodSync(sibling, 384);
+  }
+}
+var OFWCache = class _OFWCache extends LocalCacheStore {
+  constructor(db, core) {
+    super(core);
+    this.db = db;
+  }
+  db;
+  static open(path) {
+    const memory = path === ":memory:";
+    if (!memory) mkdirSync(dirname2(path), { recursive: true });
+    const db = new DatabaseSync(path);
+    if (!memory) enforceCachePermissions(path);
+    db.exec("PRAGMA journal_mode = WAL");
+    db.exec("PRAGMA foreign_keys = ON");
+    const core = new OFWCacheCore(new NodeSqlDriver(db));
+    if (!memory) enforceCachePermissions(path);
+    return new _OFWCache(db, core);
+  }
+  close() {
+    this.db.close();
+  }
+};
+
+// src/tools/attachments.ts
+import { readFileSync, statSync, mkdirSync as mkdirSync2, writeFileSync } from "node:fs";
+import { basename as basename2, dirname as dirname3, extname } from "node:path";
+var MIME_BY_EXT = {
+  ".pdf": "application/pdf",
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".gif": "image/gif",
+  ".webp": "image/webp",
+  ".heic": "image/heic",
+  ".txt": "text/plain",
+  ".md": "text/markdown",
+  ".csv": "text/csv",
+  ".html": "text/html",
+  ".htm": "text/html",
+  ".json": "application/json",
+  ".xml": "application/xml",
+  ".doc": "application/msword",
+  ".docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+  ".xls": "application/vnd.ms-excel",
+  ".xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+  ".ppt": "application/vnd.ms-powerpoint",
+  ".pptx": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+  ".zip": "application/zip",
+  ".ics": "text/calendar"
+};
+function mimeFromName(name) {
+  return MIME_BY_EXT[extname(name).toLowerCase()] ?? "application/octet-stream";
+}
+var NodeAttachmentIO = class {
+  async resolveUpload(path) {
+    const abs = expandPath(path);
+    const stat = statSync(abs);
+    if (!stat.isFile()) throw new Error(`Not a file: ${abs}`);
+    const fileName = basename2(abs);
+    const mimeType = mimeFromName(fileName);
+    const blob = await fileBlob(abs, { type: mimeType });
+    return { blob, fileName, mimeType, sizeBytes: stat.size };
+  }
+  readDownloaded(path) {
+    try {
+      return readFileSync(path);
+    } catch {
+      return null;
+    }
+  }
+  writeDownload(dest, bytes) {
+    mkdirSync2(dirname3(dest), { recursive: true });
+    writeFileSync(dest, bytes);
+  }
+};
+
 // src/index.ts
 var originalEmit = process.emit.bind(process);
 process.emit = function(event, ...args) {
@@ -39937,14 +40543,17 @@ process.emit = function(event, ...args) {
   }
   return originalEmit(event, ...args);
 };
+var nodeCache;
+var nodeCacheProvider = () => nodeCache ??= OFWCache.open(getCacheDbPath());
+var nodeAttachmentIO = new NodeAttachmentIO();
 await runMcp({
   name: "ofw",
-  version: "2.4.4",
+  version: "2.6.3",
   // x-release-please-version
   deps: client,
   tools: [
     registerUserTools,
-    registerMessageTools,
+    (server, deps) => registerMessageTools(server, deps, nodeCacheProvider, nodeAttachmentIO),
     registerCalendarTools,
     registerExpenseTools,
     registerJournalTools