ofw-mcp 2.8.0 → 2.9.1

package/dist/bundle.js

@@ -38407,7 +38407,7 @@ async function loginWithPassword(username, password) {
 // package.json
 var package_default = {
   name: "ofw-mcp",
-  version: "2.8.0",
+  version: "2.9.1",
   license: "MIT",
   mcpName: "io.github.chrischall/ofw-mcp",
   description: "OurFamilyWizard MCP server for Claude \u2014 developed and maintained by AI (Claude Code)",
@@ -38689,11 +38689,208 @@ var OFWClient = class {
 };
 var client = new OFWClient();
 
+// src/timestamps.ts
+var DEFAULT_DISPLAY_TZ = "America/New_York";
+function isValidTimeZone(tz) {
+  try {
+    new Intl.DateTimeFormat("en-US", { timeZone: tz });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function displayTimeZone() {
+  const configured = readEnvVar("DISPLAY_TZ");
+  if (configured && isValidTimeZone(configured)) return configured;
+  return DEFAULT_DISPLAY_TZ;
+}
+function offsetAt(instant, tz) {
+  const w = wallPartsIn(instant, tz);
+  const asUTC = Date.UTC(w.year, w.month - 1, w.day, w.hour, w.minute, w.second, instant.getUTCMilliseconds());
+  const minutes = Math.round((asUTC - instant.getTime()) / 6e4);
+  const sign = minutes < 0 ? "-" : "+";
+  const abs = Math.abs(minutes);
+  return `${sign}${pad(Math.floor(abs / 60))}:${pad(abs % 60)}`;
+}
+var wallPartsFormatters = /* @__PURE__ */ new Map();
+var displayFormatters = /* @__PURE__ */ new Map();
+function wallPartsFormatter(tz) {
+  let fmt = wallPartsFormatters.get(tz);
+  if (!fmt) {
+    fmt = buildWallPartsFormatter(tz);
+    wallPartsFormatters.set(tz, fmt);
+  }
+  return fmt;
+}
+function wallPartsIn(instant, tz) {
+  const parts = wallPartsFormatter(tz).formatToParts(instant);
+  const out = {};
+  for (const p of parts) {
+    if (p.type !== "literal") out[p.type] = Number(p.value);
+  }
+  return out;
+}
+function buildWallPartsFormatter(tz) {
+  return new Intl.DateTimeFormat("en-US", {
+    timeZone: tz,
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit",
+    // h23 pins midnight to hour 00; without it some ICU builds render hour 24.
+    hourCycle: "h23"
+  });
+}
+function wallTimeToInstant(y, mo, d, h, mi, s, ms, tz) {
+  let guess = Date.UTC(y, mo - 1, d, h, mi, s, ms);
+  for (let i = 0; i < 2; i += 1) {
+    const seen = wallPartsIn(new Date(guess), tz);
+    const seenUTC = Date.UTC(seen.year, seen.month - 1, seen.day, seen.hour, seen.minute, seen.second, ms);
+    const drift = Date.UTC(y, mo - 1, d, h, mi, s, ms) - seenUTC;
+    if (drift === 0) break;
+    guess += drift;
+  }
+  return new Date(guess);
+}
+function pad(n, width = 2) {
+  return String(n).padStart(width, "0");
+}
+function isoWithOffset(instant, tz, offset) {
+  const w = wallPartsIn(instant, tz);
+  const msPart = instant.getUTCMilliseconds();
+  const frac = msPart ? `.${pad(msPart, 3)}` : "";
+  return `${pad(w.year, 4)}-${pad(w.month)}-${pad(w.day)}T${pad(w.hour)}:${pad(w.minute)}:${pad(w.second)}${frac}${offset}`;
+}
+function formatInstant(instant, tz = displayTimeZone()) {
+  const offset = offsetAt(instant, tz);
+  let fmt = displayFormatters.get(tz);
+  if (!fmt) {
+    fmt = new Intl.DateTimeFormat("en-US", {
+      timeZone: tz,
+      weekday: "short",
+      month: "short",
+      day: "numeric",
+      year: "numeric",
+      hour: "numeric",
+      minute: "2-digit",
+      timeZoneName: "short"
+    });
+    displayFormatters.set(tz, fmt);
+  }
+  return { iso: isoWithOffset(instant, tz, offset), display: fmt.format(instant) };
+}
+var TIMESTAMP_KEYS = /* @__PURE__ */ new Set([
+  // OFW: naive local wall-clock from the API.
+  "sentAt",
+  "viewedAt",
+  "modifiedAt",
+  "createdAt",
+  "dueAt",
+  "occurredAt",
+  // OFW: UTC instants we stamp ourselves.
+  "fetchedBodyAt",
+  "fetchedAt",
+  "syncedAt",
+  "downloadedAt",
+  "recordedAt",
+  "expiresAt",
+  // Freshness/sync bookkeeping. These sit in the SAME object as `asOf`, so
+  // omitting them left the freshness block emitting two zones at once — the
+  // exact defect this module exists to remove. Enumerated from a sweep of
+  // emitted field names rather than from the ones a bug report happened to
+  // mention.
+  "asOf",
+  "checkedAt",
+  "lastVerifiedAt",
+  "oldestVerifiedAt",
+  "lastServerSyncAt",
+  "lastSyncAt",
+  // OFW API inner shape: `date: { dateTime }`, `viewed: { dateTime }`.
+  "dateTime",
+  // Generic.
+  "date",
+  "updated",
+  "lastModified",
+  "expirationTime"
+]);
+var ZONE_NAME_KEYS = /* @__PURE__ */ new Set(["timeZone", "timezone"]);
+var RFC3339_WITH_OFFSET = /^(\d{4})-(\d{2})-(\d{2})[T ](\d{2}):(\d{2})(?::(\d{2}))?(?:\.(\d{1,9}))?(Z|[+-]\d{2}:?\d{2})$/;
+var NAIVE_DATE_TIME = /^(\d{4})-(\d{2})-(\d{2})[T ](\d{2}):(\d{2})(?::(\d{2}))?(?:\.(\d{1,9}))?$/;
+var DATE_ONLY = /^\d{4}-\d{2}-\d{2}$/;
+function isRealCalendarDate(p) {
+  const utc = new Date(Date.UTC(p.year, p.month - 1, p.day, p.hour, p.minute, p.second));
+  return utc.getUTCFullYear() === p.year && utc.getUTCMonth() === p.month - 1 && utc.getUTCDate() === p.day && utc.getUTCHours() === p.hour && utc.getUTCMinutes() === p.minute && utc.getUTCSeconds() === p.second;
+}
+function parseTimestampValue(key, value, assumeNaiveIn) {
+  if (typeof value !== "string") return null;
+  const raw = value.trim();
+  if (raw === "" || DATE_ONLY.test(raw)) return null;
+  if (RFC3339_WITH_OFFSET.test(raw)) {
+    const parsed = new Date(raw.replace(" ", "T"));
+    return Number.isNaN(parsed.getTime()) ? null : parsed;
+  }
+  const naive = NAIVE_DATE_TIME.exec(raw);
+  if (naive) {
+    const [, y, mo, d, h, mi, s, frac] = naive;
+    const ms = frac ? Number(frac.padEnd(3, "0").slice(0, 3)) : 0;
+    const parts = {
+      year: Number(y),
+      month: Number(mo),
+      day: Number(d),
+      hour: Number(h),
+      minute: Number(mi),
+      second: Number(s ?? "0")
+    };
+    if (!isRealCalendarDate(parts)) return null;
+    return wallTimeToInstant(
+      parts.year,
+      parts.month,
+      parts.day,
+      parts.hour,
+      parts.minute,
+      parts.second,
+      ms,
+      assumeNaiveIn
+    );
+  }
+  return null;
+}
+function walk(node, tz) {
+  if (Array.isArray(node)) {
+    for (const item of node) walk(item, tz);
+    return node;
+  }
+  if (node === null || typeof node !== "object") return node;
+  const obj = node;
+  for (const key of Object.keys(obj)) {
+    const value = obj[key];
+    if (value !== null && typeof value === "object") {
+      walk(value, tz);
+      continue;
+    }
+    if (ZONE_NAME_KEYS.has(key) || !TIMESTAMP_KEYS.has(key)) continue;
+    const instant = parseTimestampValue(key, value, tz);
+    if (!instant) continue;
+    const { iso, display } = formatInstant(instant, tz);
+    obj[key] = iso;
+    obj[`${key}Display`] = display;
+  }
+  return obj;
+}
+function normalizeTimestampsInValue(value, tz = displayTimeZone()) {
+  if (value === null || typeof value !== "object") return value;
+  return walk(structuredClone(value), tz);
+}
+
 // src/tools/_shared.ts
-var jsonResponse = textResult;
+function jsonResponse(data) {
+  return textResult(normalizeTimestampsInValue(data));
+}
 var textResponse = rawTextResult;
 function jsonErrorResponse(data) {
-  return { ...textResult(data), isError: true };
+  return { ...jsonResponse(data), isError: true };
 }
 var ApiRecipientSchema = external_exports.looseObject({
   // Live OFW payloads key the recipient's id as `userId` (verified against a
@@ -38856,6 +39053,7 @@ async function resolveFolderIds(client2, store) {
   };
   await store.setMeta("drafts_folder_id", ids.drafts);
   await store.setMeta("sent_folder_id", ids.sent);
+  await store.setMeta("inbox_folder_id", ids.inbox);
   return ids;
 }
 var ListItemSchema = external_exports.looseObject({
@@ -39249,6 +39447,9 @@ function getAllowMarkRead() {
 function getFetchUnreadBodies() {
   return parseBoolEnv("OFW_FETCH_UNREAD_BODIES");
 }
+function getAutoRefreshStaleReads() {
+  return parseBoolEnv("OFW_AUTO_REFRESH");
+}
 function getDefaultInlineAttachments() {
   return parseBoolEnv("OFW_INLINE_ATTACHMENTS");
 }
@@ -39394,12 +39595,30 @@ var ServerDraftSchema = external_exports.looseObject({
   subject: external_exports.string().optional(),
   body: external_exports.string().optional(),
   replyToId: external_exports.number().nullable().optional(),
-  recipients: external_exports.array(ApiRecipientSchema).optional()
+  recipients: external_exports.array(ApiRecipientSchema).optional(),
+  // Read for the LIFECYCLE answer (see tools/lifecycle.ts): which folder OFW
+  // itself says this id lives in right now. `existsOnServer` alone cannot
+  // distinguish "still a draft" from "was sent" — a sent draft still exists.
+  // `id` accepts BOTH spellings deliberately. This schema is parsed in
+  // `mode: 'strict'` because it backs the destructive-draft guard, so a
+  // present-but-mistyped field THROWS — and OFW is already inconsistent about
+  // this exact field: the folders listing (`FoldersSchema` in sync.ts) types it
+  // `z.string()`, while message detail has been observed returning a number.
+  // Pinning one spelling here would turn a harmless representation change into
+  // a hard failure of ofw_save_draft / ofw_delete_draft, which is the opposite
+  // of what a strict boundary is for: it exists to stop us acting on a response
+  // we cannot interpret, not to reject one we can. `folderId` is normalized to
+  // a string below, so both spellings compare correctly downstream.
+  folder: external_exports.looseObject({
+    id: external_exports.union([external_exports.string(), external_exports.number()]).optional(),
+    name: external_exports.string().optional()
+  }).nullable().optional(),
+  date: external_exports.looseObject({ dateTime: external_exports.string().optional() }).nullable().optional()
 });
 function isNotFound(e) {
   return e instanceof Error && /OFW API error: 404\b/.test(e.message);
 }
-async function fetchServerDraft(client2, id) {
+async function fetchMessageSnapshot(client2, id) {
   let raw;
   try {
     raw = await client2.request("GET", `/pub/v3/messages/${id}`);
@@ -39416,12 +39635,20 @@ async function fetchServerDraft(client2, id) {
     mode: "strict"
   });
   return {
-    subject: detail.subject ?? "",
-    body: detail.body ?? "",
-    replyToId: detail.replyToId ?? null,
-    recipients: mapRecipients(detail.recipients)
+    content: {
+      subject: detail.subject ?? "",
+      body: detail.body ?? "",
+      replyToId: detail.replyToId ?? null,
+      recipients: mapRecipients(detail.recipients)
+    },
+    folderId: detail.folder?.id === void 0 ? null : String(detail.folder.id),
+    folderName: detail.folder?.name ?? null,
+    dateTime: detail.date?.dateTime ?? null
   };
 }
+async function fetchServerDraft(client2, id) {
+  return (await fetchMessageSnapshot(client2, id))?.content ?? null;
+}
 var SUBSTANTIVE_FIELDS = ["subject", "body", "recipients"];
 function substantiveChanges(changed) {
   return changed.filter((f) => SUBSTANTIVE_FIELDS.includes(f));
@@ -39505,6 +39732,171 @@ function staleDraftPayload(input) {
   };
 }
 
+// src/tools/lifecycle.ts
+var FOLDER_TYPE = {
+  inbox: "INBOX",
+  sent: "SENT_MESSAGES",
+  drafts: "DRAFTS"
+};
+var FOLDER_ID_META_KEY = {
+  inbox: "inbox_folder_id",
+  sent: "sent_folder_id",
+  drafts: "drafts_folder_id"
+};
+var FOLDERS = ["inbox", "sent", "drafts"];
+async function readFolderIdMap(store) {
+  return {
+    inbox: await store.getMeta(FOLDER_ID_META_KEY.inbox),
+    sent: await store.getMeta(FOLDER_ID_META_KEY.sent),
+    drafts: await store.getMeta(FOLDER_ID_META_KEY.drafts)
+  };
+}
+async function persistFolderIds(store, systemFolders) {
+  for (const folder of FOLDERS) {
+    const entry = systemFolders.find((f) => f.folderType === FOLDER_TYPE[folder]);
+    if (entry !== void 0) await store.setMeta(FOLDER_ID_META_KEY[folder], entry.id);
+  }
+}
+async function ensureFolderIdMap(client2, store) {
+  const cached2 = await readFolderIdMap(store);
+  if (cached2.inbox !== null && cached2.sent !== null && cached2.drafts !== null) {
+    return { map: cached2, requests: 0 };
+  }
+  try {
+    const ids = await resolveFolderIds(client2, store);
+    return { map: { inbox: ids.inbox, sent: ids.sent, drafts: ids.drafts }, requests: 1 };
+  } catch {
+    return { map: cached2, requests: 1 };
+  }
+}
+function classifyState(snapshot, map2) {
+  if (snapshot === null) return "deleted";
+  const { folderId } = snapshot;
+  if (folderId === null) return "unknown";
+  if (map2.drafts !== null && folderId === map2.drafts) return "draft";
+  if (map2.sent !== null && folderId === map2.sent) return "sent";
+  if (map2.inbox !== null && folderId === map2.inbox) return "received";
+  return "unknown";
+}
+function probeWouldStamp(cachedDraft, cachedMessage) {
+  if (cachedDraft !== null) return false;
+  if (cachedMessage === null) return true;
+  if (cachedMessage.folder === "sent") return false;
+  return !deriveRead(cachedMessage);
+}
+var SKIP_NOTE = 'Verifying this id requires fetching its detail from OurFamilyWizard, which would mark an unread inbox message as READ and stamp a co-parent-visible "First Viewed" time on the record. Ids already cached as drafts, as sent, or as already-read inbox messages are probed freely because none of those can stamp anything. Run ofw_sync_messages (it walks list pages, not bodies) or pass allowMarkRead:true.';
+function stateNote(state, cachedAsDraft, folderName) {
+  if (state === "deleted") {
+    return cachedAsDraft ? "This draft is in the local cache but NO LONGER EXISTS on OurFamilyWizard \u2014 it was sent or deleted elsewhere. Do not describe it as still unsent." : "Not found on OurFamilyWizard.";
+  }
+  if (state === "sent") {
+    return cachedAsDraft ? "This id is cached as a DRAFT but OurFamilyWizard now has it in Sent \u2014 it was SENT (see sentAt). It is no longer a draft; saying it is still unsent would be false." : "This id is a sent message on OurFamilyWizard.";
+  }
+  if (state === "received") {
+    return cachedAsDraft ? "This id is cached as a draft but OurFamilyWizard has it in the Inbox. Run ofw_sync_messages to reconcile." : "This id is an inbox message on OurFamilyWizard.";
+  }
+  if (state === "unknown") {
+    return `OurFamilyWizard did not report a folder this tool can map${folderName === null ? "" : ` (it reported "${folderName}")`}, so what this id has become is NOT established. Treat it as unverified rather than assuming it is unchanged.`;
+  }
+  return void 0;
+}
+async function probeIds(client2, store, ids, opts) {
+  const draftsById = new Map((await store.getDrafts(ids)).map((d) => [d.id, d]));
+  const messagesById = new Map((await store.getMessages(ids)).map((m) => [m.id, m]));
+  const prepared = ids.map((id) => {
+    const cachedDraft = draftsById.get(id) ?? null;
+    const cachedMessage = cachedDraft === null ? messagesById.get(id) ?? null : null;
+    return {
+      id,
+      cachedDraft,
+      cachedMessage,
+      skip: !opts.allowMarkRead && probeWouldStamp(cachedDraft, cachedMessage)
+    };
+  });
+  let requests = 0;
+  let map2 = { inbox: null, sent: null, drafts: null };
+  if (prepared.some((p) => !p.skip)) {
+    const resolved = await ensureFolderIdMap(client2, store);
+    map2 = resolved.map;
+    requests += resolved.requests;
+  }
+  const keyById = new Map(
+    (await store.getDraftLineageByIds(ids)).map((l) => [l.id, l.draftKey])
+  );
+  const items = [];
+  for (const p of prepared) {
+    if (p.skip) {
+      items.push({ id: p.id, skipped: true, reason: "WOULD_MARK_READ", note: SKIP_NOTE });
+      continue;
+    }
+    const probe = await probeOne(client2, p, map2, keyById.get(p.id) ?? null);
+    requests += probe.requests;
+    items.push(probe.item);
+  }
+  return { items, requests };
+}
+async function probeOne(client2, prepared, map2, draftKey) {
+  const { id, cachedDraft } = prepared;
+  let snapshot;
+  try {
+    snapshot = await fetchMessageSnapshot(client2, id);
+  } catch (e) {
+    return {
+      requests: 1,
+      item: {
+        id,
+        error: "FRESHNESS_CHECK_FAILED",
+        message: e.message,
+        inSync: null,
+        note: "The freshness check itself failed, so nothing is confirmed either way."
+      }
+    };
+  }
+  const state = classifyState(snapshot, map2);
+  const cacheRevision = cachedDraft === null ? null : draftRevision(cachedDraft);
+  const serverRevision = snapshot === null ? null : draftRevision(snapshot.content);
+  const viewedAt = snapshot?.content.recipients.find((r) => r.viewedAt !== null)?.viewedAt ?? null;
+  let inSync;
+  if (cachedDraft === null) inSync = null;
+  else if (snapshot === null) inSync = false;
+  else if (cacheRevision !== serverRevision) inSync = false;
+  else if (state === "draft") inSync = true;
+  else if (state === "unknown") inSync = null;
+  else inSync = false;
+  const notes = [];
+  const stateN = stateNote(state, cachedDraft !== null, snapshot?.folderName ?? null);
+  if (stateN !== void 0) notes.push(stateN);
+  if (snapshot !== null && cachedDraft === null) {
+    notes.push("Not in the drafts cache, so there is no cached copy to compare its content against (inSync is null, not false).");
+  } else if (snapshot !== null && cacheRevision !== serverRevision) {
+    notes.push("Content differs from the cache \u2014 it was edited on OurFamilyWizard since the last sync. Run ofw_sync_messages before reading or writing it.");
+  }
+  return {
+    requests: 1,
+    item: {
+      id,
+      state,
+      folder: snapshot?.folderName ?? null,
+      sentAt: state === "sent" ? snapshot?.dateTime ?? null : null,
+      viewedAt,
+      existsOnServer: snapshot !== null,
+      cacheRevision,
+      serverRevision,
+      inSync,
+      ...draftKey !== null ? { draftKey } : {},
+      ...notes.length > 0 ? { note: notes.join(" ") } : {}
+    }
+  };
+}
+async function resolveDraftKey(store, draftKey) {
+  const chain = await store.getDraftLineage(draftKey);
+  if (chain.length === 0) return null;
+  return { currentId: chain[chain.length - 1].id, ids: chain.map((r) => r.id) };
+}
+function newDraftKey() {
+  return `dk_${crypto.randomUUID()}`;
+}
+
 // src/extract/inflate.ts
 var MAX_DECOMPRESSED_BYTES = 32 * 1024 * 1024;
 var DecompressionLimitError = class extends Error {
@@ -39996,7 +40388,7 @@ function orderedPages(objects) {
   if (rootRef === void 0) return inFileOrder;
   const ordered = [];
   const seen = /* @__PURE__ */ new Set();
-  const walk = (num) => {
+  const walk2 = (num) => {
     if (seen.has(num)) return;
     seen.add(num);
     const obj = objects.get(num);
@@ -40006,9 +40398,9 @@ function orderedPages(objects) {
       return;
     }
     const kids = /\/Kids\s*\[([^\]]*)\]/.exec(obj.body)?.[1];
-    if (kids) for (const kid of refsIn(kids)) walk(kid);
+    if (kids) for (const kid of refsIn(kids)) walk2(kid);
   };
-  walk(rootRef);
+  walk2(rootRef);
   return ordered.length > 0 ? ordered : inFileOrder;
 }
 function streamBytes(bytes, obj) {
@@ -40547,7 +40939,10 @@ var MessageDetailSchema = external_exports.looseObject({
   // 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()
+  // Same union as ServerDraftSchema's, for the same reason — OFW types this id
+  // as a string on the folders listing and a number on message detail. Lenient
+  // here, so a mismatch only warns, but it would warn on EVERY live fetch.
+  folder: external_exports.looseObject({ id: external_exports.union([external_exports.string(), external_exports.number()]) }).optional()
 });
 var DetailFilesSchema = external_exports.looseObject({ files: external_exports.array(external_exports.number()).optional() });
 var FolderCountsSchema = external_exports.looseObject({
@@ -40559,11 +40954,6 @@ var FolderCountsSchema = external_exports.looseObject({
     count: external_exports.number().optional()
   })).optional()
 });
-var FOLDER_TYPE = {
-  inbox: "INBOX",
-  sent: "SENT_MESSAGES",
-  drafts: "DRAFTS"
-};
 var MAX_FRESHNESS_IDS = 25;
 var UploadedFileSchema = external_exports.looseObject({
   fileId: external_exports.number(),
@@ -40586,6 +40976,37 @@ async function draftsFreshness(cache) {
   const cacheStatus = completed === "fresh" && freshness.staleness === "fresh" ? "fresh" : "unverified";
   return { freshness, serverConfirmed: cacheStatus === "fresh", cacheStatus };
 }
+var AUTO_REFRESH_DESC = 'If the result comes back EMPTY from a cache that is not verified-fresh, sync the backing folders first and answer from the refreshed cache instead of refusing. Defaults to the OFW_AUTO_REFRESH env var (false unless set), in which case the call refuses with result:"UNVERIFIED_EMPTY" and names the remedy. Costs OFW requests when it fires.';
+async function guardedCacheRead(o) {
+  let value = await o.read();
+  let refreshed = false;
+  const unverifiable = (v) => o.isEmpty(v) && v.freshness.staleness !== "fresh";
+  if (unverifiable(value) && o.autoRefresh) {
+    await syncAll(o.client, {
+      folders: o.folders,
+      // Same ceiling ofw_sync_messages applies: an automatic refresh must never
+      // stamp unread inbox messages as a side effect of a list read.
+      fetchUnreadBodies: getAllowMarkRead() && getFetchUnreadBodies(),
+      maxRequests: getSyncMaxRequests()
+    }, o.cache);
+    refreshed = true;
+    value = await o.read();
+  }
+  return { value, refreshed, unverifiedEmpty: unverifiable(value) };
+}
+function unverifiedEmptyResponse(input) {
+  const { freshness } = input;
+  const age = freshness.ageSeconds === null ? "it has never been checked against OurFamilyWizard" : `it was last verified ${freshness.ageSeconds < 60 ? `${freshness.ageSeconds} sec` : `${Math.round(freshness.ageSeconds / 60)} min`} ago`;
+  const refreshClause = input.refreshed ? " An automatic refresh ran on this call and did NOT make the result verifiable (the sync paused or skipped this folder), so the refusal stands." : "";
+  return jsonErrorResponse({
+    result: "UNVERIFIED_EMPTY",
+    reason: `No ${input.what} were found, but the backing cache is "${freshness.staleness}" \u2014 ${age}. Refusing to report absence from unverified data: an empty result from a stale cache is indistinguishable from a verified "nothing there", and repeating it as one asserts a false negative about a legal record.${refreshClause}`,
+    remedy: input.remedy,
+    complete: false,
+    freshness,
+    ...input.extra
+  });
+}
 function markReadVerdict(cached2, requested) {
   const ceiling = getAllowMarkRead();
   if (ceiling && (requested ?? true)) return null;
@@ -40613,15 +41034,16 @@ function registerMessageTools(server, client2, cacheProvider, attachmentIO) {
     return jsonResponse({ folders: data, freshness });
   });
   server.registerTool("ofw_list_messages", {
-    description: "List messages from the local OurFamilyWizard cache. Supports filtering by folder, date range, and a substring query on subject+body. Pagination is offset-based but if you know what you want (a date range, a topic), prefer the filters over walking pages \u2014 the cache may have 1000+ messages. Call ofw_sync_messages first if the cache is empty or stale.",
-    annotations: { readOnlyHint: true },
+    description: 'List messages from the local OurFamilyWizard cache. Supports filtering by folder, date range, and a substring query on subject+body. Pagination is offset-based but if you know what you want (a date range, a topic), prefer the filters over walking pages \u2014 the cache may have 1000+ messages. Returns an explicit `complete` boolean describing the RESULT SET: true means "this is every message on OurFamilyWizard matching these filters as of freshness.asOf" \u2014 check it before asserting a count. An empty result from a cache that is not verified-fresh is REFUSED (result:"UNVERIFIED_EMPTY") rather than reported as an absence; pass autoRefresh:true to sync and answer instead.',
+    annotations: { readOnlyHint: false },
     inputSchema: {
       folderId: external_exports.string().describe('Folder name: "inbox", "sent", or "both" (default "both")').optional(),
       page: external_exports.number().int().min(1).describe("Page number (default 1)").optional(),
       size: external_exports.number().int().min(1).describe("Messages per page (default 50)").optional(),
       since: external_exports.string().describe("ISO date or datetime \u2014 only messages with sent_at >= since (inclusive)").optional(),
       until: external_exports.string().describe("ISO date or datetime \u2014 only messages with sent_at < until (exclusive)").optional(),
-      q: external_exports.string().describe("Substring match on subject AND body (case-insensitive). Use to find messages on a specific topic.").optional()
+      q: external_exports.string().describe("Substring match on subject AND body (case-insensitive). Use to find messages on a specific topic.").optional(),
+      autoRefresh: external_exports.boolean().describe(AUTO_REFRESH_DESC).optional()
     }
   }, async (args) => {
     const page = args.page ?? 1;
@@ -40632,29 +41054,58 @@ function registerMessageTools(server, client2, cacheProvider, attachmentIO) {
     else if (folderArg === "sent") folder = "sent";
     else if (folderArg === "both") folder = void 0;
     else {
-      return jsonResponse({
-        messages: [],
-        freshness: await buildFreshness(cacheProvider(), {
-          source: "cache",
-          folders: ["inbox", "sent"]
-        }),
-        note: 'folderId must be "inbox", "sent", or "both". Numeric OFW folder IDs are not supported by the cache. No lookup was performed \u2014 this empty result says nothing about what is in the cache.'
+      return jsonErrorResponse({
+        result: "INVALID_FOLDER",
+        reason: `folderId must be "inbox", "sent", or "both" (got ${JSON.stringify(folderArg)}). Numeric OFW folder IDs are not supported by the cache.`,
+        remedy: "Re-call with folderId omitted (searches both) or set to one of the three accepted names.",
+        complete: false,
+        note: 'No lookup was performed. This says NOTHING about what is in the cache \u2014 do not read it as "no messages".'
       });
     }
     const cache = cacheProvider();
+    const folders = folder === void 0 ? ["inbox", "sent"] : [folder];
     const filter = { folder, since: args.since, until: args.until, q: args.q };
-    const total = await cache.countMessages(filter);
-    const messages = (await cache.listMessages({ ...filter, page, size })).map((m) => withReadState(m));
-    const freshness = await buildFreshness(cache, {
-      source: "cache",
-      folders: folder === void 0 ? ["inbox", "sent"] : [folder]
+    const { value, refreshed, unverifiedEmpty } = await guardedCacheRead({
+      client: client2,
+      cache,
+      folders,
+      autoRefresh: args.autoRefresh ?? getAutoRefreshStaleReads(),
+      isEmpty: (v) => v.total === 0,
+      read: async () => {
+        const total2 = await cache.countMessages(filter);
+        const messages2 = (await cache.listMessages({ ...filter, page, size })).map((m) => withReadState(m));
+        const freshness2 = await buildFreshness(cache, { source: "cache", folders });
+        return { messages: messages2, total: total2, freshness: freshness2 };
+      }
     });
-    const payload = { messages, total, page, size, freshness };
+    if (unverifiedEmpty) {
+      return unverifiedEmptyResponse({
+        what: "messages matching these filters",
+        freshness: value.freshness,
+        refreshed,
+        remedy: `Call ofw_sync_messages(folders:${JSON.stringify(folders)}) and retry, or re-call this tool with autoRefresh:true. ofw_check_freshness is the cheap live alternative when you only need to confirm a specific message.`,
+        extra: { page, size, filters: { folderId: folderArg, since: args.since, until: args.until, q: args.q } }
+      });
+    }
+    const { messages, total, freshness } = value;
+    const fullSlice = page === 1 && messages.length === total;
+    const complete = fullSlice && freshness.staleness === "fresh" && freshness.historyComplete;
+    const payload = { messages, total, page, size, complete, freshness };
+    if (!complete) {
+      payload.completeNote = [
+        !fullSlice ? `this page holds ${messages.length} of ${total} matching cached messages` : null,
+        freshness.staleness !== "fresh" ? `the cache is "${freshness.staleness}", so newer messages may exist on OurFamilyWizard` : null,
+        !freshness.historyComplete ? "older history is still being backfilled, so the cache does not yet hold every message" : null
+      ].filter((r) => r !== null).join("; ").concat(". Do not state a total or an absence from this result without resolving that first.");
+    }
     if (total === 0) {
-      payload.note = "No messages match these filters. If you expected results, check ofw_sync_messages was run, or relax the filters.";
+      payload.note = 'No messages match these filters, and the cache IS verified-fresh for these folders \u2014 so this is a real "nothing matched", not a stale-cache artefact. If you expected results, relax the filters.';
     } else if (page * size < total) {
       payload.note = `Showing ${(page - 1) * size + 1}\u2013${(page - 1) * size + messages.length} of ${total}. Increase 'page' to see more, or narrow with since/until/q.`;
     }
+    if (refreshed) {
+      payload.autoRefreshed = true;
+    }
     return jsonResponse(payload);
   });
   server.registerTool("ofw_get_message", {
@@ -40689,6 +41140,11 @@ function registerMessageTools(server, client2, cacheProvider, attachmentIO) {
         // Concurrency token — pass as expectedRevision to ofw_save_draft /
         // ofw_delete_draft to assert you are editing THIS version.
         revision: draftRevision(draftRow),
+        // Stable logical identity. Survives the create-then-delete id churn of
+        // editing AND the transition to sent — pass it to ofw_status to ask
+        // "what happened to the thing I was working on?". Null when this draft
+        // was never written through this tool (e.g. authored in the web app).
+        draftKey: (await cache.getDraftLineageById(draftRow.id))?.draftKey ?? null,
         cacheStatus,
         // False = this draft's existence and unsent status are remembered from
         // a cache, not confirmed on OFW. Call ofw_check_freshness before
@@ -40844,6 +41300,7 @@ function registerMessageTools(server, client2, cacheProvider, attachmentIO) {
     }, SentDetailSchema, "ofw_send_message");
     let persisted = null;
     let verifyNote = null;
+    let sentDraftKey = null;
     if (newId !== null) {
       verifyNote = verifyWriteLanded("message", { subject, body }, detail);
       persisted = {
@@ -40860,6 +41317,16 @@ function registerMessageTools(server, client2, cacheProvider, attachmentIO) {
         listData: detail
       };
       await cache.upsertMessage(persisted);
+      if (draftRef !== void 0) {
+        const prior = await cache.getDraftLineageById(draftRef);
+        const now = (/* @__PURE__ */ new Date()).toISOString();
+        const key = prior?.draftKey ?? newDraftKey();
+        if (prior === null) {
+          await cache.recordDraftLineage({ id: draftRef, draftKey: key, previousId: null, recordedAt: now });
+        }
+        await cache.recordDraftLineage({ id: newId, draftKey: key, previousId: draftRef, recordedAt: now });
+        sentDraftKey = key;
+      }
       for (const fileId of myFileIDs) {
         const existing = await cache.getAttachment(fileId);
         await cache.upsertAttachmentForMessage({
@@ -40881,7 +41348,7 @@ function registerMessageTools(server, client2, cacheProvider, attachmentIO) {
       await deleteOFWMessages(client2, [draftRef]);
       await cache.deleteDraft(draftRef);
     }
-    const responseObj = persisted ?? raw;
+    const responseObj = persisted === null ? raw : { ...persisted, ...sentDraftKey !== null ? { draftKey: sentDraftKey, previousId: draftRef } : {} };
     const text = responseObj ? JSON.stringify(responseObj, null, 2) : "Message sent successfully.";
     const notes = [rewriteNote, verifyNote, unconfirmedNote].filter((n) => n !== null).join("\n\n");
     return textResponse(notes ? `${notes}
@@ -40946,35 +41413,65 @@ ${JSON.stringify(
     };
   }
   server.registerTool("ofw_list_drafts", {
-    description: "List draft messages from the local OurFamilyWizard cache. Call ofw_sync_messages first if the cache is empty.",
-    annotations: { readOnlyHint: true },
+    description: 'List draft messages from the local OurFamilyWizard cache. Returns an explicit `complete` boolean describing the RESULT SET: true means "these are ALL the drafts on OurFamilyWizard as of freshness.asOf" \u2014 check it before saying "you have N drafts". Each draft carries its `draftKey` (stable across the create-then-delete churn of editing) when one is known. An empty result from a cache that is not verified-fresh is REFUSED (result:"UNVERIFIED_EMPTY"); pass autoRefresh:true to sync and answer instead. For a live, one-call answer prefer ofw_status(includeDraftInventory:true).',
+    annotations: { readOnlyHint: false },
     inputSchema: {
       page: external_exports.number().int().min(1).describe("Page number (default 1)").optional(),
-      size: external_exports.number().int().min(1).describe("Drafts per page (default 50)").optional()
+      size: external_exports.number().int().min(1).describe("Drafts per page (default 50)").optional(),
+      autoRefresh: external_exports.boolean().describe(AUTO_REFRESH_DESC).optional()
     }
   }, async (args) => {
     const page = args.page ?? 1;
     const size = args.size ?? 50;
     const cache = cacheProvider();
-    const { freshness, serverConfirmed, cacheStatus } = await draftsFreshness(cache);
-    const rows = await cache.listDrafts({ page, size });
-    const drafts = rows.map((d) => ({
-      ...d,
-      revision: draftRevision(d),
-      cacheStatus,
-      serverConfirmed,
-      asOf: freshness.asOf
-    }));
-    if (drafts.length === 0) {
-      return jsonResponse({
-        drafts: [],
-        freshness,
-        note: "No drafts in the local cache. That is NOT proof there are no drafts on OurFamilyWizard \u2014 call ofw_sync_messages to populate, or ofw_check_freshness to confirm."
+    const { value, refreshed, unverifiedEmpty } = await guardedCacheRead({
+      client: client2,
+      cache,
+      folders: ["drafts"],
+      autoRefresh: args.autoRefresh ?? getAutoRefreshStaleReads(),
+      isEmpty: (v) => v.total === 0,
+      read: async () => {
+        const { freshness: freshness2, serverConfirmed: serverConfirmed2, cacheStatus } = await draftsFreshness(cache);
+        const rows = await cache.listDrafts({ page, size });
+        const total2 = await cache.countDrafts();
+        const keyById = new Map(
+          (await cache.getDraftLineageByIds(rows.map((d) => d.id))).map((l) => [l.id, l.draftKey])
+        );
+        const drafts2 = rows.map((d) => ({
+          ...d,
+          revision: draftRevision(d),
+          draftKey: keyById.get(d.id) ?? null,
+          cacheStatus,
+          serverConfirmed: serverConfirmed2,
+          asOf: freshness2.asOf
+        }));
+        return { drafts: drafts2, total: total2, freshness: freshness2, serverConfirmed: serverConfirmed2 };
+      }
+    });
+    if (unverifiedEmpty) {
+      return unverifiedEmptyResponse({
+        what: "drafts",
+        freshness: value.freshness,
+        refreshed,
+        remedy: 'Call ofw_sync_messages(folders:["drafts"]) and retry, re-call with autoRefresh:true, or use ofw_status(includeDraftInventory:true) for a single live answer.',
+        extra: { page, size }
       });
     }
-    const payload = { drafts, freshness };
+    const { drafts, total, freshness, serverConfirmed } = value;
+    const fullSlice = page === 1 && drafts.length === total;
+    const complete = serverConfirmed && fullSlice;
+    const payload = { drafts, total, page, size, complete, freshness };
+    if (!complete) {
+      payload.completeNote = [
+        !fullSlice ? `this page holds ${drafts.length} of ${total} cached drafts` : null,
+        !serverConfirmed ? "the drafts cache has not been confirmed against OurFamilyWizard inside the freshness window" : null
+      ].filter((r) => r !== null).join("; ").concat(". Do NOT state a draft count from this result \u2014 call ofw_status(includeDraftInventory:true) for a live, complete one.");
+    }
     if (!serverConfirmed) {
-      payload.note = 'serverConfirmed:false \u2014 these drafts are remembered from the local cache, NOT confirmed to still exist unsent on OurFamilyWizard right now, and their bodies may be behind the server. Do not state that a draft "is still sitting unsent" on this basis; drafts edited or deleted in the OFW web app bump no timestamp, so the cache cannot detect it on its own. Call ofw_check_freshness (cheap, live) or ofw_sync_messages first. Writes are guarded regardless \u2014 ofw_save_draft and ofw_delete_draft re-check the server and refuse a stale overwrite.';
+      payload.note = 'serverConfirmed:false \u2014 these drafts are remembered from the local cache, NOT confirmed to still exist unsent on OurFamilyWizard right now, and their bodies may be behind the server. Do not state that a draft "is still sitting unsent" on this basis; drafts edited, deleted or SENT in the OFW web app bump no timestamp, so the cache cannot detect it on its own. Call ofw_status / ofw_check_freshness (cheap, live) or ofw_sync_messages first. Writes are guarded regardless \u2014 ofw_save_draft and ofw_delete_draft re-check the server and refuse a stale overwrite.';
+    }
+    if (refreshed) {
+      payload.autoRefreshed = true;
     }
     return jsonResponse(payload);
   });
@@ -41034,6 +41531,7 @@ ${JSON.stringify(
     let replaceNote = null;
     let verifyNote = null;
     let newRevision = null;
+    let draftKey = null;
     const warnings = [];
     if (newId !== null) {
       verifyNote = verifyWriteLanded("draft", { subject: args.subject, body: args.body }, detail);
@@ -41050,6 +41548,29 @@ ${JSON.stringify(
       };
       await cache.upsertDraft(persisted);
       newRevision = draftRevision(persisted);
+      const now = (/* @__PURE__ */ new Date()).toISOString();
+      if (args.messageId !== void 0) {
+        const prior = await cache.getDraftLineageById(args.messageId);
+        if (prior !== null) {
+          draftKey = prior.draftKey;
+        } else {
+          draftKey = newDraftKey();
+          await cache.recordDraftLineage({
+            id: args.messageId,
+            draftKey,
+            previousId: null,
+            recordedAt: now
+          });
+        }
+      } else {
+        draftKey = newDraftKey();
+      }
+      await cache.recordDraftLineage({
+        id: newId,
+        draftKey,
+        previousId: args.messageId ?? null,
+        recordedAt: now
+      });
       if (resolvedReplyTo !== null && effectiveReplyTo !== resolvedReplyTo) {
         const rewrittenFrom = requestedReplyTo !== resolvedReplyTo ? ` (rewritten from ${requestedReplyTo})` : "";
         const outcome = effectiveReplyTo === null ? "OurFamilyWizard did not thread this draft (its inReplyTo/showContext will be empty). The subject and body were saved; only the reply linkage was dropped." : `OurFamilyWizard re-targeted the reply to message ${effectiveReplyTo} instead. The draft IS threaded \u2014 to that message, not the one requested \u2014 and the inReplyTo in this response reflects where it actually landed.`;
@@ -41089,6 +41610,11 @@ ${JSON.stringify(
       ...persisted,
       inReplyTo: persisted.replyToId,
       revision: newRevision,
+      // The id above is volatile — it changes on every edit. `draftKey` is
+      // not: pass it to ofw_status to resolve the chain's CURRENT id, or to
+      // find out that the draft was sent and when.
+      draftKey,
+      previousId: args.messageId ?? null,
       cacheStatus: "fresh",
       serverConfirmed: true,
       ...warnings.length > 0 ? { warnings } : {}
@@ -41126,25 +41652,46 @@ ${text}` : text);
 ${text}` : text);
   });
   server.registerTool("ofw_get_unread_sent", {
-    description: "List sent messages that have not been read by one or more recipients. Reads from local cache; call ofw_sync_messages first if cache is stale.",
-    annotations: { readOnlyHint: true },
+    description: 'List sent messages that have not been read by one or more recipients. Reads from local cache. Returns `complete` describing whether every sent message was scanned. An empty SENT cache that is not verified-fresh is REFUSED (result:"UNVERIFIED_EMPTY") rather than reported as "nothing sent"; pass autoRefresh:true to sync and answer instead.',
+    annotations: { readOnlyHint: false },
     inputSchema: {
       page: external_exports.number().int().min(1).describe("Page (default 1)").optional(),
-      size: external_exports.number().int().min(1).describe("Per page (default 50)").optional()
+      size: external_exports.number().int().min(1).describe("Per page (default 50)").optional(),
+      autoRefresh: external_exports.boolean().describe(AUTO_REFRESH_DESC).optional()
     }
   }, async (args) => {
     const page = args.page ?? 1;
     const size = args.size ?? 50;
     const cache = cacheProvider();
-    const sent = await cache.listMessages({ folder: "sent", page, size });
-    const freshness = await buildFreshness(cache, { source: "cache", folders: ["sent"] });
-    if (sent.length === 0) {
-      return jsonResponse({
-        unread: [],
-        freshness,
-        note: "Sent cache is empty. Call ofw_sync_messages to populate. An empty cache is NOT evidence that no sent messages exist."
+    const { value, refreshed, unverifiedEmpty } = await guardedCacheRead({
+      client: client2,
+      cache,
+      folders: ["sent"],
+      autoRefresh: args.autoRefresh ?? getAutoRefreshStaleReads(),
+      // The guard is about the CACHE being empty, not the verdict. "You have
+      // no sent messages" is an absence claim a stale cache cannot support;
+      // "all of them are read" is a verdict over messages we did see, and it is
+      // labelled by `freshness` and `complete` as before.
+      isEmpty: (v) => v.total === 0,
+      read: async () => {
+        const sent2 = await cache.listMessages({ folder: "sent", page, size });
+        const total2 = await cache.countMessages({ folder: "sent" });
+        const freshness2 = await buildFreshness(cache, { source: "cache", folders: ["sent"] });
+        return { sent: sent2, total: total2, freshness: freshness2 };
+      }
+    });
+    if (unverifiedEmpty) {
+      return unverifiedEmptyResponse({
+        what: "sent messages in the local cache",
+        freshness: value.freshness,
+        refreshed,
+        remedy: 'Call ofw_sync_messages(folders:["sent"]) and retry, or re-call with autoRefresh:true.',
+        extra: { page, size }
       });
     }
+    const { sent, total, freshness } = value;
+    const fullSlice = page === 1 && sent.length === total;
+    const complete = fullSlice && freshness.staleness === "fresh" && freshness.historyComplete;
     const unread = [];
     for (const msg of sent) {
       const unreadBy = msg.recipients.filter((r) => r.viewedAt === null).map((r) => r.name);
@@ -41152,14 +41699,17 @@ ${text}` : text);
         unread.push({ id: msg.id, subject: msg.subject, sentAt: msg.sentAt, unreadBy });
       }
     }
+    const payload = { unread, scanned: sent.length, total, complete, freshness };
+    if (!complete) {
+      payload.completeNote = `This verdict covers the ${sent.length} of ${total} cached sent messages on this page${freshness.staleness === "fresh" ? "" : `, from a cache that is "${freshness.staleness}"`}. It is not a statement about every message you have sent.`;
+    }
     if (unread.length === 0) {
-      return jsonResponse({
-        unread: [],
-        freshness,
-        message: "All scanned sent messages had been read as of the timestamp in `freshness.asOf`. A recipient may have read a message since without the cache hearing about it."
-      });
+      payload.message = "Every sent message scanned had been read as of the timestamp in `freshness.asOf`. A recipient may have read \u2014 or not read \u2014 a message since without the cache hearing about it.";
     }
-    return jsonResponse({ unread, freshness });
+    if (refreshed) {
+      payload.autoRefreshed = true;
+    }
+    return jsonResponse(payload);
   });
   if (allowDrafts) server.registerTool("ofw_upload_attachment", {
     description: `Upload a local file to OurFamilyWizard's "My Files" so it can be attached to a message. Returns the fileId \u2014 pass that to ofw_send_message or ofw_save_draft in myFileIDs to attach it. The file is uploaded as PRIVATE (visible only to you) by default; pass shareClass:"SHARED" to share with co-parents directly via the My Files area.`,
@@ -41316,12 +41866,12 @@ ${text}` : text);
     return jsonResponse({ ...result, freshness });
   });
   server.registerTool("ofw_check_freshness", {
-    description: 'Cheaply confirm whether the local cache still matches OurFamilyWizard, WITHOUT running a full sync. Use this before asserting anything about current state \u2014 especially "draft X is still sitting unsent" \u2014 when a read returned serverConfirmed:false or freshness.staleness other than "fresh". Costs one OFW request for the folder check plus one per messageId. For each folder it returns the live server count next to the cached count; for each id, whether it still exists on OFW and whether its content matches the cache (compared by content revision, because OFW draft timestamps do NOT change when a draft is edited in the web app). Does not fetch bodies into the cache, does not touch attachments, and does not depend on sync state.',
-    annotations: { readOnlyHint: true },
+    description: 'Cheaply confirm whether the local cache still matches OurFamilyWizard, WITHOUT running a full sync. Use this before asserting anything about current state \u2014 especially "draft X is still sitting unsent". Costs one OFW request for the folder check plus one per messageId. For each folder it returns the live server count next to the cached count. For each id it returns a LIVE lifecycle `state` \u2014 "draft" | "sent" | "received" | "deleted" | "unknown" \u2014 alongside `folder`, `sentAt`, `existsOnServer` and a content comparison. `state` is the field that answers "is this still a draft?": a draft that has been SENT still exists on the server, so existsOnServer:true never distinguished the two. A cached draft whose state is no longer "draft" reports inSync:false even when its text is byte-identical. Content is compared by revision hash, because OFW draft timestamps do NOT change when a draft is edited in the web app. Does not fetch bodies into the cache, does not touch attachments, and does not depend on sync state. For draftKeys, or a full live draft inventory, use ofw_status.',
+    annotations: { readOnlyHint: false },
     inputSchema: {
       folders: external_exports.array(external_exports.enum(["inbox", "sent", "drafts"])).min(1).describe("Folders to compare cached vs live counts for. Defaults to all three when messageIds is not given. Must be non-empty if given.").optional(),
-      messageIds: external_exports.array(external_exports.number()).describe(`Specific ids to verify against OFW (max ${MAX_FRESHNESS_IDS}). By default only ids present in the drafts cache are probed \u2014 see allowMarkRead.`).optional(),
-      allowMarkRead: external_exports.boolean().describe("Default false. Probing an id that is NOT a cached draft requires fetching its detail, which marks an unread inbox message as READ on OurFamilyWizard \u2014 an irreversible change to the record. Such ids are skipped unless you set this to true.").optional()
+      messageIds: external_exports.array(external_exports.number()).describe(`Specific ids to verify against OFW (max ${MAX_FRESHNESS_IDS}). Ids cached as drafts, as sent messages, or as already-read inbox messages are probed freely \u2014 none of those can stamp the record. Anything else is skipped \u2014 see allowMarkRead.`).optional(),
+      allowMarkRead: external_exports.boolean().describe('Default false. Probing an id whose cached state cannot rule out an unread INBOX message requires fetching its detail, which marks it READ on OurFamilyWizard and stamps a co-parent-visible "First Viewed" time \u2014 irreversible. Such ids are skipped (reason:"WOULD_MARK_READ") unless you set this to true. The server-wide OFW_ALLOW_MARK_READ=false is a ceiling this cannot raise.').optional()
     }
   }, async (args) => {
     const cache = cacheProvider();
@@ -41339,6 +41889,7 @@ ${text}` : text);
         { label: "ofw-mcp", context: "GET /pub/v1/messageFolders (ofw_check_freshness)" }
       );
       const sys = data.systemFolders ?? [];
+      await persistFolderIds(cache, sys);
       for (const folder of wantFolders) {
         const entry = sys.find((x) => x.folderType === FOLDER_TYPE[folder]);
         const serverCount = entry?.totalCount ?? entry?.messageCount ?? entry?.count ?? null;
@@ -41359,52 +41910,9 @@ ${text}` : text);
         });
       }
     }
-    const items = [];
-    for (const id of ids) {
-      const cachedDraft = await cache.getDraft(id);
-      if (cachedDraft === null && !allowMarkRead) {
-        items.push({
-          id,
-          skipped: true,
-          reason: "NOT_A_CACHED_DRAFT",
-          note: "Not in the drafts cache. Verifying it requires fetching its detail from OFW, which would mark an unread inbox message as READ on OurFamilyWizard. Pass allowMarkRead:true if that is acceptable."
-        });
-        continue;
-      }
-      requestsUsed++;
-      try {
-        const server2 = await fetchServerDraft(client2, id);
-        const cacheRevision = cachedDraft === null ? null : draftRevision(cachedDraft);
-        if (server2 === null) {
-          items.push({
-            id,
-            existsOnServer: false,
-            inSync: false,
-            cacheRevision,
-            serverRevision: null,
-            note: cachedDraft === null ? "Not found on OurFamilyWizard." : "This draft is in the local cache but NO LONGER EXISTS on OurFamilyWizard \u2014 it was sent or deleted elsewhere. Do not describe it as still unsent."
-          });
-          continue;
-        }
-        const serverRevision = draftRevision(server2);
-        items.push({
-          id,
-          existsOnServer: true,
-          cacheRevision,
-          serverRevision,
-          inSync: cacheRevision !== null && cacheRevision === serverRevision,
-          ...cacheRevision === null ? { note: "Exists on OurFamilyWizard but is not in the local cache." } : cacheRevision !== serverRevision ? { note: "Content differs from the cache \u2014 it was edited on OurFamilyWizard since the last sync. Run ofw_sync_messages before reading or writing it." } : {}
-        });
-      } catch (e) {
-        items.push({
-          id,
-          error: "FRESHNESS_CHECK_FAILED",
-          message: e.message,
-          inSync: null,
-          note: "The freshness check itself failed, so nothing is confirmed either way."
-        });
-      }
-    }
+    const probed = await probeIds(client2, cache, ids, { allowMarkRead });
+    requestsUsed += probed.requests;
+    const items = probed.items;
     const payload = {
       checkedAt: (/* @__PURE__ */ new Date()).toISOString(),
       requestsUsed,
@@ -41416,6 +41924,132 @@ ${text}` : text);
     }
     return jsonResponse(payload);
   });
+  server.registerTool("ofw_status", {
+    description: 'ONE live call that answers "where does everything stand?". This is the call that should back any status summary about drafts or specific messages \u2014 never session memory, and never a cached read alone. With no arguments it returns the FULL current draft inventory, verified against OurFamilyWizard. Pass ids and/or draftKeys to get each one\'s live lifecycle `state` ("draft" | "sent" | "received" | "deleted" | "unknown") with `sentAt` and `viewedAt`. A draftKey is the stable identity ofw_save_draft returns: editing a draft mints a new OFW id every time (create-then-delete), so the key is the only way to ask "what happened to the thing I was working on?" \u2014 it resolves to the chain\'s current id and keeps resolving after the draft is SENT (state:"sent" with sentMessageId). The top-level `complete` is true ONLY when every part of this snapshot was verified live; if it is false, do not state a draft count or a lifecycle claim from this payload.',
+    annotations: { readOnlyHint: false },
+    inputSchema: {
+      ids: external_exports.array(external_exports.number()).describe(`Message/draft ids to resolve to a live state (combined with draftKeys, max ${MAX_FRESHNESS_IDS} probes per call).`).optional(),
+      draftKeys: external_exports.array(external_exports.string()).describe("Stable draft keys (from ofw_save_draft / ofw_list_drafts) to resolve to their CURRENT id and state.").optional(),
+      includeDraftInventory: external_exports.boolean().describe("Return the full current draft list, verified against OurFamilyWizard first. Defaults to TRUE when neither ids nor draftKeys is given (so a bare ofw_status() is a complete status snapshot), otherwise false.").optional(),
+      allowMarkRead: external_exports.boolean().describe("Default false. An id whose cached state cannot rule out an unread INBOX message can only be probed by fetching its detail, which marks it READ on OurFamilyWizard \u2014 irreversible and co-parent-visible. Those are skipped unless this is true. Cached drafts, sent messages and already-read messages are always probed. Capped by OFW_ALLOW_MARK_READ.").optional()
+    }
+  }, async (args) => {
+    const cache = cacheProvider();
+    const allowMarkRead = getAllowMarkRead() && (args.allowMarkRead ?? false);
+    const requestedIds = args.ids ?? [];
+    const requestedKeys = args.draftKeys ?? [];
+    const wantInventory = args.includeDraftInventory ?? (requestedIds.length === 0 && requestedKeys.length === 0);
+    const allTargets = [
+      ...requestedIds.map((id) => ({ kind: "id", id })),
+      ...requestedKeys.map((draftKey) => ({ kind: "draftKey", draftKey }))
+    ];
+    const targets = allTargets.slice(0, MAX_FRESHNESS_IDS);
+    const truncated = allTargets.length - targets.length;
+    if (!wantInventory && targets.length === 0) {
+      return jsonErrorResponse({
+        result: "NOTHING_REQUESTED",
+        reason: "ofw_status was called with includeDraftInventory:false and no ids or draftKeys, so nothing was checked.",
+        remedy: "Call ofw_status() with no arguments for the full draft inventory, or pass ids / draftKeys.",
+        complete: false
+      });
+    }
+    let probeRequests = 0;
+    const incomplete = [];
+    let drafts;
+    let inventoryComplete = true;
+    let inventoryFreshness;
+    if (wantInventory) {
+      const sync = await syncAll(client2, {
+        folders: ["drafts"],
+        maxRequests: getSyncMaxRequests()
+      }, cache);
+      inventoryComplete = sync.refreshed.includes("drafts");
+      const { freshness, cacheStatus, serverConfirmed } = await draftsFreshness(cache);
+      inventoryFreshness = freshness;
+      if (!serverConfirmed) inventoryComplete = false;
+      const total = await cache.countDrafts();
+      const rows = await cache.listDrafts({ page: 1, size: Math.max(total, 1) });
+      const keyById = new Map(
+        (await cache.getDraftLineageByIds(rows.map((d) => d.id))).map((l) => [l.id, l.draftKey])
+      );
+      drafts = rows.map((d) => ({
+        id: d.id,
+        draftKey: keyById.get(d.id) ?? null,
+        subject: d.subject,
+        revision: draftRevision(d),
+        modifiedAt: d.modifiedAt,
+        recipients: d.recipients,
+        replyToId: d.replyToId,
+        cacheStatus
+      }));
+      if (!inventoryComplete) {
+        incomplete.push("the drafts folder was not fully verified against OurFamilyWizard on this call (the request budget paused the walk), so this inventory may be missing or misreporting drafts");
+      }
+    }
+    const requested = [];
+    if (targets.length > 0) {
+      const resolved = /* @__PURE__ */ new Map();
+      for (const t of targets) {
+        if (t.kind === "draftKey" && !resolved.has(t.draftKey)) {
+          resolved.set(t.draftKey, await resolveDraftKey(cache, t.draftKey));
+        }
+      }
+      const toProbe = /* @__PURE__ */ new Set();
+      for (const t of targets) {
+        if (t.kind === "id") toProbe.add(t.id);
+        else {
+          const chain = resolved.get(t.draftKey);
+          if (chain !== null && chain !== void 0) toProbe.add(chain.currentId);
+        }
+      }
+      const probed = await probeIds(client2, cache, [...toProbe], { allowMarkRead });
+      probeRequests += probed.requests;
+      const probes = new Map(probed.items.map((item) => [item.id, item]));
+      for (const t of targets) {
+        if (t.kind === "id") {
+          requested.push(decorate(probes.get(t.id)));
+          continue;
+        }
+        const chain = resolved.get(t.draftKey);
+        if (chain === null || chain === void 0) {
+          requested.push({
+            draftKey: t.draftKey,
+            state: "unknown",
+            error: "UNKNOWN_DRAFT_KEY",
+            note: "This draftKey has never been recorded in the local cache, so it cannot be resolved to a message id. Draft keys are minted by ofw_save_draft; a cache rebuilt or opened on another machine will not know an older key."
+          });
+          continue;
+        }
+        requested.push({
+          draftKey: t.draftKey,
+          currentId: chain.currentId,
+          previousIds: chain.ids.slice(0, -1),
+          ...decorate(probes.get(chain.currentId))
+        });
+      }
+      for (const entry of requested) {
+        if (entry.skipped === true || entry.error !== void 0 || entry.state === "unknown") {
+          incomplete.push(`id/key ${String(entry.draftKey ?? entry.id)} could not be resolved to a confirmed live state`);
+        }
+      }
+    }
+    if (truncated > 0) {
+      incomplete.push(`${truncated} of ${allTargets.length} requested ids/draftKeys were not probed (per-call cap of ${MAX_FRESHNESS_IDS})`);
+    }
+    const complete = incomplete.length === 0;
+    return jsonResponse({
+      checkedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      probeRequests,
+      ...drafts !== void 0 ? { drafts, draftCount: drafts.length, draftInventoryComplete: inventoryComplete } : {},
+      ...requested.length > 0 ? { requested } : {},
+      complete,
+      ...complete ? {} : { incompleteReasons: incomplete, note: "complete:false \u2014 this snapshot is NOT a verified statement of current state. Do not report a draft count or say whether something was sent from it; resolve the reasons above (usually by calling ofw_sync_messages, or re-calling with allowMarkRead:true) and ask again." },
+      ...inventoryFreshness !== void 0 ? { freshness: inventoryFreshness } : {}
+    });
+  });
+}
+function decorate(item) {
+  return item.state === "sent" ? { ...item, sentMessageId: item.id } : { ...item };
 }
 async function deleteOFWMessages(client2, ids) {
   const form = new FormData();
@@ -41679,6 +42313,14 @@ function draftFromDb(r) {
     listData: JSON.parse(r.list_data_json)
   };
 }
+function lineageFromDb(r) {
+  return {
+    id: r.id,
+    draftKey: r.draft_key,
+    previousId: r.previous_id,
+    recordedAt: r.recorded_at
+  };
+}
 function attachmentFromDb(r) {
   return {
     fileId: r.file_id,
@@ -41734,6 +42376,17 @@ var SCHEMA_STATEMENTS = [
      key TEXT PRIMARY KEY,
      value TEXT NOT NULL
    )`,
+  // v3: draft identity chain. One row per OFW id, all the ids of one logical
+  // document sharing a `draft_key`. Survives ofw_save_draft's create-then-delete
+  // replacement AND the transition to a sent message, so "what happened to the
+  // draft I was editing?" is answerable without guessing which id is current.
+  `CREATE TABLE IF NOT EXISTS draft_lineage (
+     id INTEGER PRIMARY KEY,
+     draft_key TEXT NOT NULL,
+     previous_id INTEGER,
+     recorded_at TEXT NOT NULL
+   )`,
+  `CREATE INDEX IF NOT EXISTS idx_draft_lineage_key ON draft_lineage(draft_key, recorded_at, id)`,
   // v2: attachments table. Idempotent — IF NOT EXISTS.
   `CREATE TABLE IF NOT EXISTS attachments (
      file_id INTEGER PRIMARY KEY,
@@ -41752,7 +42405,7 @@ var MIGRATIONS = [
   // Resumable deep-sync cursor. Absent/NULL → SyncState.resumePage null.
   "ALTER TABLE sync_state ADD COLUMN resume_page INTEGER"
 ];
-var SCHEMA_VERSION = "2";
+var SCHEMA_VERSION = "3";
 function buildMessageFilter(opts) {
   const wheres = [];
   const params = [];
@@ -41937,6 +42590,10 @@ var OFWCacheCore = class {
     );
     return rows.map(draftFromDb);
   }
+  countDrafts() {
+    const r = this.db.get("SELECT COUNT(*) as n FROM drafts", []);
+    return r?.n ?? 0;
+  }
   deleteDraft(id) {
     this.db.run("DELETE FROM drafts WHERE id = ?", [id]);
   }
@@ -41944,6 +42601,57 @@ var OFWCacheCore = class {
     const rows = this.db.all("SELECT id FROM drafts", []);
     return rows.map((r) => r.id);
   }
+  /**
+   * Link an id into a draft's identity chain. Upserts on id: re-recording the
+   * same id (e.g. a retried save) rewrites its link rather than duplicating it,
+   * so `getDraftLineage` can never report one id twice.
+   */
+  recordDraftLineage(row) {
+    this.db.run(
+      `INSERT INTO draft_lineage (id, draft_key, previous_id, recorded_at) VALUES (?, ?, ?, ?)
+       ON CONFLICT(id) DO UPDATE SET
+         draft_key=excluded.draft_key,
+         previous_id=excluded.previous_id,
+         recorded_at=excluded.recorded_at`,
+      [
+        row.id,
+        requireString("draft_lineage.draftKey", row.draftKey),
+        nullish3(row.previousId),
+        requireString("draft_lineage.recordedAt", row.recordedAt)
+      ]
+    );
+  }
+  getDraftLineageById(id) {
+    const r = this.db.get("SELECT * FROM draft_lineage WHERE id = ?", [id]);
+    return r ? lineageFromDb(r) : null;
+  }
+  /**
+   * Batch read — one query for a whole page of drafts. On the Durable Object
+   * backend each cache call is a subrequest, so a per-draft lookup would spend
+   * the caller's sync budget on bookkeeping.
+   */
+  getDraftLineageByIds(ids) {
+    if (ids.length === 0) return [];
+    const placeholders = ids.map(() => "?").join(", ");
+    const rows = this.db.all(
+      `SELECT * FROM draft_lineage WHERE id IN (${placeholders})`,
+      ids
+    );
+    return rows.map(lineageFromDb);
+  }
+  /**
+   * Every link in one chain, OLDEST FIRST — so the last element is the chain's
+   * current id. Ordered by recorded_at then id: two links written inside the
+   * same millisecond tie-break on id, and OFW mints ids monotonically, so the
+   * newer replacement always sorts last.
+   */
+  getDraftLineage(draftKey) {
+    const rows = this.db.all(
+      "SELECT * FROM draft_lineage WHERE draft_key = ? ORDER BY recorded_at ASC, id ASC",
+      [draftKey]
+    );
+    return rows.map(lineageFromDb);
+  }
   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;
@@ -42079,12 +42787,27 @@ var LocalCacheStore = class {
   async listDrafts(opts) {
     return this.core.listDrafts(opts);
   }
+  async countDrafts() {
+    return this.core.countDrafts();
+  }
   async deleteDraft(id) {
     this.core.deleteDraft(id);
   }
   async listDraftIds() {
     return this.core.listDraftIds();
   }
+  async recordDraftLineage(row) {
+    this.core.recordDraftLineage(row);
+  }
+  async getDraftLineageById(id) {
+    return this.core.getDraftLineageById(id);
+  }
+  async getDraftLineageByIds(ids) {
+    return this.core.getDraftLineageByIds(ids);
+  }
+  async getDraftLineage(draftKey) {
+    return this.core.getDraftLineage(draftKey);
+  }
   async getSyncState(folder) {
     return this.core.getSyncState(folder);
   }
@@ -42188,7 +42911,7 @@ var nodeCacheProvider = () => nodeCache ??= OFWCache.open(getCacheDbPath());
 var nodeAttachmentIO = new NodeAttachmentIO();
 await runMcp({
   name: "ofw",
-  version: "2.8.0",
+  version: "2.9.1",
   // x-release-please-version
   deps: client,
   tools: [