ofw-mcp 2.7.0 → 2.7.1

package/.claude-plugin/marketplace.json

@@ -6,7 +6,7 @@
   },
   "metadata": {
     "description": "OurFamilyWizard tools for Claude Code",
-    "version": "2.7.0"
+    "version": "2.7.1"
   },
   "plugins": [
     {
@@ -14,7 +14,7 @@
       "displayName": "OurFamilyWizard",
       "source": "./",
       "description": "OurFamilyWizard co-parenting tools for Claude — messages, calendar, expenses, and journal via MCP",
-      "version": "2.7.0",
+      "version": "2.7.1",
       "author": {
         "name": "Chris Chall"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "ofw",
   "displayName": "OurFamilyWizard",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "OurFamilyWizard co-parenting tools for Claude — messages, calendar, expenses, and journal via MCP",
   "author": {
     "name": "Chris Chall"

package/dist/bundle.js

@@ -38407,7 +38407,7 @@ async function loginWithPassword(username, password) {
 // package.json
 var package_default = {
   name: "ofw-mcp",
-  version: "2.7.0",
+  version: "2.7.1",
   license: "MIT",
   mcpName: "io.github.chrischall/ofw-mcp",
   description: "OurFamilyWizard MCP server for Claude \u2014 developed and maintained by AI (Claude Code)",
@@ -38449,13 +38449,13 @@ var package_default = {
     zod: "^4.4.3"
   },
   devDependencies: {
-    "@chrischall/mcp-connector": "^1.0.0",
+    "@chrischall/mcp-connector": "^1.1.1",
     "@cloudflare/vitest-pool-workers": "^0.18.4",
     "@cloudflare/workers-oauth-provider": "^0.8.1",
     "@cloudflare/workers-types": "^5.20260708.1",
     "@types/node": "^26.0.0",
     "@vitest/coverage-v8": "^4.1.7",
-    agents: "^0.17.3",
+    agents: "^0.19.0",
     esbuild: "^0.28.0",
     typescript: "^7.0.2",
     vitest: "^4.1.7",
@@ -39408,6 +39408,10 @@ async function fetchServerDraft(client2, id) {
     recipients: mapRecipients(detail.recipients)
   };
 }
+var SUBSTANTIVE_FIELDS = ["subject", "body", "recipients"];
+function substantiveChanges(changed) {
+  return changed.filter((f) => SUBSTANTIVE_FIELDS.includes(f));
+}
 function diffFields(a, b) {
   const changed = [];
   if (a.subject !== b.subject) changed.push("subject");
@@ -39431,6 +39435,17 @@ function checkDraftFreshness(input) {
     if (expectedRevision === actual) {
       return { verdict: "FRESH", reason: "expectedRevision matches the live server draft.", changedFields: [] };
     }
+    if (cached2 !== null && draftRevision(cached2) === expectedRevision) {
+      const changedFields2 = diffFields(server, cached2);
+      if (substantiveChanges(changedFields2).length === 0) {
+        return {
+          verdict: "FRESH",
+          reason: `Only connector-authored metadata (${changedFields2.join(", ")}) changed since you read the draft; its subject, body and recipients are unchanged, so this is not a conflict.`,
+          changedFields: changedFields2,
+          metadataOnly: true
+        };
+      }
+    }
     return {
       verdict: "STALE",
       reason: `expectedRevision ${expectedRevision} does not match the live server draft (${actual}) \u2014 it changed after you read it.`,
@@ -39448,6 +39463,14 @@ function checkDraftFreshness(input) {
   if (changedFields.length === 0) {
     return { verdict: "FRESH", reason: "The cached draft matches the live server draft.", changedFields: [] };
   }
+  if (substantiveChanges(changedFields).length === 0) {
+    return {
+      verdict: "FRESH",
+      reason: `Only connector-authored metadata (${changedFields.join(", ")}) differs from the cached copy; subject, body and recipients match, so this is not a conflict.`,
+      changedFields,
+      metadataOnly: true
+    };
+  }
   return {
     verdict: "STALE",
     reason: `The draft on OurFamilyWizard differs from the cached copy (${changedFields.join(", ")}) \u2014 it was edited outside this tool.`,
@@ -39570,7 +39593,9 @@ var SavedDraftDetailSchema = external_exports.looseObject({
   body: external_exports.string().optional(),
   date: DateSchema.optional(),
   replyToId: external_exports.number().nullable().optional(),
-  recipients: external_exports.array(ApiRecipientSchema).optional()
+  recipients: external_exports.array(ApiRecipientSchema).optional(),
+  // Read to audit whether requested myFileIDs actually attached (Defect 3).
+  files: external_exports.array(external_exports.number()).optional()
 });
 var MessageDetailSchema = external_exports.looseObject({
   id: external_exports.number(),
@@ -39935,7 +39960,10 @@ ${text}` : text);
       };
     }
     const verdict = checkDraftFreshness({ server: server2, cached: cached2, expectedRevision });
-    if (verdict.verdict === "FRESH") return { ok: true, note: null };
+    if (verdict.verdict === "FRESH") {
+      const note = verdict.metadataOnly ? `NOTE: draft ${draftId} was treated as current for this ${action}. Since you read it, OurFamilyWizard normalized connector-authored metadata (${verdict.changedFields.join(", ")}); the subject, body and recipients are unchanged, so this is not a conflict.` : null;
+      return { ok: true, note };
+    }
     if (force) {
       console.error(`[ofw-mcp] WARNING: force:true overrode a ${verdict.verdict} verdict on draft ${draftId} (${action}). ${verdict.reason}`);
       const echoed = server2 === null ? "The draft no longer existed on OurFamilyWizard." : `The server version that was overwritten is preserved below under "overwrittenServerDraft".`;
@@ -39995,7 +40023,7 @@ ${JSON.stringify(
     return jsonResponse(payload);
   });
   if (allowDrafts) server.registerTool("ofw_save_draft", {
-    description: "Save a message as a draft in OurFamilyWizard. Recipients are optional. Pass messageId to replace an existing draft \u2014 note that under the hood this creates a NEW draft and deletes the old one (OFW's update-in-place endpoint silently no-ops while echoing the posted body, so we don't use it); the response.id will be the NEW id, not the messageId you passed, and the change is documented in a transparency NOTE in the response. If replyToId is provided, the cache may rewrite it to the latest reply in the thread (note included in response). Attach files by passing their fileIds (from ofw_upload_attachment) in myFileIDs. After saving, the tool re-fetches the draft from OFW to populate the local cache from authoritative server state. SAFETY: because replacing DESTROYS the old draft rather than merging, passing messageId first re-reads that draft from OFW and REFUSES the write if it changed since you read it (drafts edited in the OFW web app do not bump any timestamp, so the local cache can be silently behind). The refusal returns the current server body under serverBody \u2014 merge your edit into it and retry with expectedRevision.",
+    description: "Save a message as a draft in OurFamilyWizard. Recipients are optional. Pass messageId to replace an existing draft \u2014 note that under the hood this creates a NEW draft and deletes the old one (OFW's update-in-place endpoint silently no-ops while echoing the posted body, so we don't use it); the response.id will be the NEW id, not the messageId you passed, and the change is documented in a transparency NOTE in the response that also lists which fields (subject/body/recipients/replyToId/attachments) were carried over. If replyToId is provided, the cache may rewrite it to the latest reply in the thread (note included in response). Attach files by passing their fileIds (from ofw_upload_attachment) in myFileIDs. After saving, the tool re-fetches the draft from OFW to populate the local cache from authoritative server state, and the returned `revision` reflects that authoritative state (so it will match on your next edit). FIELD PRESERVATION: the response echoes the effective threading (replyToId/inReplyTo) and, whenever OFW did not carry over a requested replyToId, recipient or attachment, a `warnings[]` entry naming what was dropped \u2014 never a silent null. SAFETY: because replacing DESTROYS the old draft rather than merging, passing messageId first re-reads that draft from OFW and REFUSES the write if its subject/body/recipients changed since you read it (drafts edited in the OFW web app do not bump any timestamp, so the local cache can be silently behind). A pure replyToId normalization by OFW is NOT treated as a conflict. The refusal returns the current server body under serverBody \u2014 merge your edit into it and retry with expectedRevision.",
     annotations: { readOnlyHint: false },
     inputSchema: {
       subject: external_exports.string().describe("Message subject"),
@@ -40050,32 +40078,67 @@ ${JSON.stringify(
     let replaceNote = null;
     let verifyNote = null;
     let newRevision = null;
+    const warnings = [];
     if (newId !== null) {
       verifyNote = verifyWriteLanded("draft", { subject: args.subject, body: args.body }, detail);
+      const effectiveReplyTo = detail.replyToId ?? null;
+      const storedRecipients = mapRecipients(detail.recipients);
       persisted = {
         id: newId,
         subject: detail.subject ?? args.subject,
         body: detail.body ?? "",
-        recipients: mapRecipients(detail.recipients),
-        replyToId: detail.replyToId ?? resolvedReplyTo,
+        recipients: storedRecipients,
+        replyToId: effectiveReplyTo,
         modifiedAt: detail.date?.dateTime ?? (/* @__PURE__ */ new Date()).toISOString(),
         listData: detail
       };
       await cache.upsertDraft(persisted);
       newRevision = draftRevision(persisted);
+      if (resolvedReplyTo !== null && effectiveReplyTo !== resolvedReplyTo) {
+        const rewrittenFrom = requestedReplyTo !== resolvedReplyTo ? ` (rewritten from ${requestedReplyTo})` : "";
+        warnings.push(
+          `replyToId was requested as ${resolvedReplyTo}${rewrittenFrom} but the saved draft came back with replyToId ${effectiveReplyTo === null ? "null" : effectiveReplyTo} \u2014 OurFamilyWizard did not thread this draft (its inReplyTo/showContext will be empty). The subject and body were saved; only the reply linkage was dropped. If threading matters, verify on ourfamilywizard.com.`
+        );
+      }
+      if (args.recipientIds !== void 0 && Array.isArray(detail.recipients)) {
+        const requested = [...new Set(args.recipientIds)].sort((a, b) => a - b);
+        const stored = [...new Set(storedRecipients.map((r) => r.userId))].sort((a, b) => a - b);
+        if (requested.join(",") !== stored.join(",")) {
+          warnings.push(
+            `recipientIds were requested as [${requested.join(", ")}] but the saved draft has [${stored.join(", ")}]. Verify the recipients on ourfamilywizard.com.`
+          );
+        }
+      }
+      if (myFileIDs.length > 0 && Array.isArray(detail.files)) {
+        const storedFiles = new Set(detail.files);
+        const missing = myFileIDs.filter((id) => !storedFiles.has(id));
+        if (missing.length > 0) {
+          warnings.push(
+            `Attachment fileId(s) ${missing.join(", ")} were requested in myFileIDs but are not attached to the saved draft. Re-upload or re-attach if needed.`
+          );
+        }
+      }
       if (args.messageId !== void 0 && args.messageId !== newId) {
         try {
           await deleteOFWMessages(client2, [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.)`;
+          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.) Fields carried over to the new draft: subject, body, recipients (${persisted.recipients.length}), replyToId (${persisted.replyToId === null ? "none" : persisted.replyToId}), attachments (${myFileIDs.length}).${warnings.length > 0 ? " See warnings above for any field OurFamilyWizard did not carry over." : ""}`;
         } catch (e) {
           replaceNote = `WARNING: New draft ${newId} was created successfully, but the old draft ${args.messageId} could NOT be deleted: ${e.message}. BOTH drafts now exist on OurFamilyWizard and nothing was lost. Verify ${newId} reads correctly, then remove ${args.messageId} with ofw_delete_draft.`;
         }
       }
     }
-    const responseObj = persisted !== null ? { ...persisted, revision: newRevision, cacheStatus: "fresh", serverConfirmed: true } : raw;
+    const responseObj = persisted !== null ? {
+      ...persisted,
+      inReplyTo: persisted.replyToId,
+      revision: newRevision,
+      cacheStatus: "fresh",
+      serverConfirmed: true,
+      ...warnings.length > 0 ? { warnings } : {}
+    } : raw;
     const text = responseObj ? JSON.stringify(responseObj, null, 2) : "Draft saved.";
-    const notes = [forceNote, rewriteNote, verifyNote, replaceNote].filter((n) => n !== null).join("\n\n");
+    const warnNote = warnings.length > 0 ? `WARNING: ${warnings.join("\n\n")}` : null;
+    const notes = [forceNote, rewriteNote, verifyNote, warnNote, replaceNote].filter((n) => n !== null).join("\n\n");
     return textResponse(notes ? `${notes}
 
 ${text}` : text);
@@ -41165,7 +41228,7 @@ var nodeCacheProvider = () => nodeCache ??= OFWCache.open(getCacheDbPath());
 var nodeAttachmentIO = new NodeAttachmentIO();
 await runMcp({
   name: "ofw",
-  version: "2.7.0",
+  version: "2.7.1",
   // x-release-please-version
   deps: client,
   tools: [

package/dist/index.js

@@ -35,7 +35,7 @@ const nodeAttachmentIO = new NodeAttachmentIO();
 // always succeeds before any credential check runs.
 await runMcp({
     name: 'ofw',
-    version: '2.7.0', // x-release-please-version
+    version: '2.7.1', // x-release-please-version
     deps: client,
     tools: [
         registerUserTools,

package/dist/tools/draft-freshness.js

@@ -77,6 +77,22 @@ export async function fetchServerDraft(client, id) {
         recipients: mapRecipients(detail.recipients),
     };
 }
+/**
+ * The fields whose divergence constitutes a REAL conflict — the actual message
+ * content a caller would lose if we overwrote a copy edited elsewhere. Anything
+ * NOT listed here (currently only `replyToId`) is connector/server-authored
+ * metadata: OFW normalizes `replyToId` after a draft is saved (dropping it, or
+ * re-targeting it to the thread tip), which is the connector's own mutation
+ * surfacing later — not third-party interference. A divergence in metadata
+ * alone must never refuse the write, or the guard manufactures a false STALE
+ * for a change the caller did not make. See issue thread on save/edit round
+ * trips.
+ */
+const SUBSTANTIVE_FIELDS = ['subject', 'body', 'recipients'];
+/** The substantive subset of a changed-field list (drops metadata like replyToId). */
+function substantiveChanges(changed) {
+    return changed.filter((f) => SUBSTANTIVE_FIELDS.includes(f));
+}
 function diffFields(a, b) {
     const changed = [];
     if (a.subject !== b.subject)
@@ -102,8 +118,17 @@ function diffFields(a, b) {
  *  2. No token supplied → the cached base must match the server EXACTLY. This
  *     is the safe default: "no token" never means "force".
  *
- * Everything else — server ahead of cache, no cached base to compare, draft
- * gone from the server — refuses.
+ * In BOTH modes the conflict decision turns on the SUBSTANTIVE fields
+ * (subject/body/recipients), not on any revision delta. When the only thing
+ * that moved is connector/server-authored metadata — `replyToId` normalized
+ * after the save — the content is intact, so it is FRESH (with `metadataOnly`
+ * set) rather than STALE. That is the connector's own mutation resurfacing, not
+ * a third party editing the draft; refusing it would be a false positive that
+ * trains callers to distrust the guard. The fail-safe direction is untouched:
+ * the moment subject, body or recipients differ, it still refuses.
+ *
+ * Everything else — server ahead of cache on real content, no cached base to
+ * compare, draft gone from the server — refuses.
  */
 export function checkDraftFreshness(input) {
     const { server, cached, expectedRevision } = input;
@@ -119,6 +144,20 @@ export function checkDraftFreshness(input) {
         if (expectedRevision === actual) {
             return { verdict: 'FRESH', reason: 'expectedRevision matches the live server draft.', changedFields: [] };
         }
+        // Token mismatch. When the caller's token is the one WE cached, we can name
+        // exactly what drifted — and if that is metadata alone, it is our own
+        // post-save normalization, not a conflict.
+        if (cached !== null && draftRevision(cached) === expectedRevision) {
+            const changedFields = diffFields(server, cached);
+            if (substantiveChanges(changedFields).length === 0) {
+                return {
+                    verdict: 'FRESH',
+                    reason: `Only connector-authored metadata (${changedFields.join(', ')}) changed since you read the draft; its subject, body and recipients are unchanged, so this is not a conflict.`,
+                    changedFields,
+                    metadataOnly: true,
+                };
+            }
+        }
         return {
             verdict: 'STALE',
             reason: `expectedRevision ${expectedRevision} does not match the live server draft (${actual}) — it changed after you read it.`,
@@ -136,6 +175,14 @@ export function checkDraftFreshness(input) {
     if (changedFields.length === 0) {
         return { verdict: 'FRESH', reason: 'The cached draft matches the live server draft.', changedFields: [] };
     }
+    if (substantiveChanges(changedFields).length === 0) {
+        return {
+            verdict: 'FRESH',
+            reason: `Only connector-authored metadata (${changedFields.join(', ')}) differs from the cached copy; subject, body and recipients match, so this is not a conflict.`,
+            changedFields,
+            metadataOnly: true,
+        };
+    }
     return {
         verdict: 'STALE',
         reason: `The draft on OurFamilyWizard differs from the cached copy (${changedFields.join(', ')}) — it was edited outside this tool.`,

package/dist/tools/messages.js

@@ -28,6 +28,8 @@ const SavedDraftDetailSchema = z.looseObject({
     date: DateSchema.optional(),
     replyToId: z.number().nullable().optional(),
     recipients: z.array(ApiRecipientSchema).optional(),
+    // Read to audit whether requested myFileIDs actually attached (Defect 3).
+    files: z.array(z.number()).optional(),
 });
 // ofw_get_message's uncached detail fetch — lenient: a mismatch warns to
 // stderr and the existing ?? fallbacks keep the tool serving.
@@ -497,8 +499,15 @@ export function registerMessageTools(server, client, cacheProvider, attachmentIO
             };
         }
         const verdict = checkDraftFreshness({ server, cached, expectedRevision });
-        if (verdict.verdict === 'FRESH')
-            return { ok: true, note: null };
+        if (verdict.verdict === 'FRESH') {
+            // A metadata-only "conflict" is the connector's own post-save replyToId
+            // normalization catching up — safe to proceed, but say so rather than
+            // pretending nothing moved.
+            const note = verdict.metadataOnly
+                ? `NOTE: draft ${draftId} was treated as current for this ${action}. Since you read it, OurFamilyWizard normalized connector-authored metadata (${verdict.changedFields.join(', ')}); the subject, body and recipients are unchanged, so this is not a conflict.`
+                : null;
+            return { ok: true, note };
+        }
         if (force) {
             // Loud, and the overwritten content rides along in the response so it is
             // recoverable from the tool result itself.
@@ -560,7 +569,7 @@ export function registerMessageTools(server, client, cacheProvider, attachmentIO
     });
     if (allowDrafts)
         server.registerTool('ofw_save_draft', {
-            description: 'Save a message as a draft in OurFamilyWizard. Recipients are optional. Pass messageId to replace an existing draft — note that under the hood this creates a NEW draft and deletes the old one (OFW\'s update-in-place endpoint silently no-ops while echoing the posted body, so we don\'t use it); the response.id will be the NEW id, not the messageId you passed, and the change is documented in a transparency NOTE in the response. If replyToId is provided, the cache may rewrite it to the latest reply in the thread (note included in response). Attach files by passing their fileIds (from ofw_upload_attachment) in myFileIDs. After saving, the tool re-fetches the draft from OFW to populate the local cache from authoritative server state. SAFETY: because replacing DESTROYS the old draft rather than merging, passing messageId first re-reads that draft from OFW and REFUSES the write if it changed since you read it (drafts edited in the OFW web app do not bump any timestamp, so the local cache can be silently behind). The refusal returns the current server body under serverBody — merge your edit into it and retry with expectedRevision.',
+            description: 'Save a message as a draft in OurFamilyWizard. Recipients are optional. Pass messageId to replace an existing draft — note that under the hood this creates a NEW draft and deletes the old one (OFW\'s update-in-place endpoint silently no-ops while echoing the posted body, so we don\'t use it); the response.id will be the NEW id, not the messageId you passed, and the change is documented in a transparency NOTE in the response that also lists which fields (subject/body/recipients/replyToId/attachments) were carried over. If replyToId is provided, the cache may rewrite it to the latest reply in the thread (note included in response). Attach files by passing their fileIds (from ofw_upload_attachment) in myFileIDs. After saving, the tool re-fetches the draft from OFW to populate the local cache from authoritative server state, and the returned `revision` reflects that authoritative state (so it will match on your next edit). FIELD PRESERVATION: the response echoes the effective threading (replyToId/inReplyTo) and, whenever OFW did not carry over a requested replyToId, recipient or attachment, a `warnings[]` entry naming what was dropped — never a silent null. SAFETY: because replacing DESTROYS the old draft rather than merging, passing messageId first re-reads that draft from OFW and REFUSES the write if its subject/body/recipients changed since you read it (drafts edited in the OFW web app do not bump any timestamp, so the local cache can be silently behind). A pure replyToId normalization by OFW is NOT treated as a conflict. The refusal returns the current server body under serverBody — merge your edit into it and retry with expectedRevision.',
             annotations: { readOnlyHint: false },
             inputSchema: {
                 subject: z.string().describe('Message subject'),
@@ -619,26 +628,63 @@ export function registerMessageTools(server, client, cacheProvider, attachmentIO
             let replaceNote = null;
             let verifyNote = null;
             let newRevision = null;
+            // Fields accepted on the write that the saved draft must carry — or their
+            // loss must be reported. Never a silent drop (Defect 3).
+            const warnings = [];
             if (newId !== null) {
                 verifyNote = verifyWriteLanded('draft', { subject: args.subject, body: args.body }, detail);
+                // Trust the re-fetched server detail as the source of truth for the stored
+                // replyToId — NOT `resolvedReplyTo` (what we intended to post). OFW
+                // normalizes/drops threading after a save, and masking that with our own
+                // intent (the old `detail.replyToId ?? resolvedReplyTo`) both returned a
+                // revision that was stale on arrival (Defect 1) and hid a dropped reply
+                // link (Defect 3). `?? null` keeps a genuinely-echoed value and reflects a
+                // null/absent one honestly.
+                const effectiveReplyTo = detail.replyToId ?? null;
+                const storedRecipients = mapRecipients(detail.recipients);
                 persisted = {
                     id: newId,
                     subject: detail.subject ?? args.subject,
                     body: detail.body ?? '',
-                    recipients: mapRecipients(detail.recipients),
-                    replyToId: detail.replyToId ?? resolvedReplyTo,
+                    recipients: storedRecipients,
+                    replyToId: effectiveReplyTo,
                     modifiedAt: detail.date?.dateTime ?? new Date().toISOString(),
                     listData: detail,
                 };
                 await cache.upsertDraft(persisted);
+                // The revision is now computed from the server-authoritative detail, so it
+                // is the value a subsequent read/verify will observe (Defect 1).
                 newRevision = draftRevision(persisted);
+                // Audit every field the caller supplied against what actually landed, so a
+                // silent normalization becomes a visible warning rather than a surprise.
+                if (resolvedReplyTo !== null && effectiveReplyTo !== resolvedReplyTo) {
+                    const rewrittenFrom = requestedReplyTo !== resolvedReplyTo ? ` (rewritten from ${requestedReplyTo})` : '';
+                    warnings.push(`replyToId was requested as ${resolvedReplyTo}${rewrittenFrom} but the saved draft came back with replyToId ${effectiveReplyTo === null ? 'null' : effectiveReplyTo} — OurFamilyWizard did not thread this draft (its inReplyTo/showContext will be empty). The subject and body were saved; only the reply linkage was dropped. If threading matters, verify on ourfamilywizard.com.`);
+                }
+                // Only warn on recipients/attachments when the detail actually reported
+                // them — an omitted array is "not echoed", not "dropped", and crying wolf
+                // there would desensitize the caller to the real drops.
+                if (args.recipientIds !== undefined && Array.isArray(detail.recipients)) {
+                    const requested = [...new Set(args.recipientIds)].sort((a, b) => a - b);
+                    const stored = [...new Set(storedRecipients.map((r) => r.userId))].sort((a, b) => a - b);
+                    if (requested.join(',') !== stored.join(',')) {
+                        warnings.push(`recipientIds were requested as [${requested.join(', ')}] but the saved draft has [${stored.join(', ')}]. Verify the recipients on ourfamilywizard.com.`);
+                    }
+                }
+                if (myFileIDs.length > 0 && Array.isArray(detail.files)) {
+                    const storedFiles = new Set(detail.files);
+                    const missing = myFileIDs.filter((id) => !storedFiles.has(id));
+                    if (missing.length > 0) {
+                        warnings.push(`Attachment fileId(s) ${missing.join(', ')} were requested in myFileIDs but are not attached to the saved draft. Re-upload or re-attach if needed.`);
+                    }
+                }
                 // Replace-path: caller passed messageId, so they want the old draft
                 // gone. Delete it after the new one is safely created+cached.
                 if (args.messageId !== undefined && args.messageId !== newId) {
                     try {
                         await deleteOFWMessages(client, [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.)`;
+                        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.) Fields carried over to the new draft: subject, body, recipients (${persisted.recipients.length}), replyToId (${persisted.replyToId === null ? 'none' : persisted.replyToId}), attachments (${myFileIDs.length}).${warnings.length > 0 ? ' See warnings above for any field OurFamilyWizard did not carry over.' : ''}`;
                     }
                     catch (e) {
                         // Partial-failure safety: the new draft is already created and
@@ -650,12 +696,24 @@ export function registerMessageTools(server, client, cacheProvider, attachmentIO
             }
             // The draft was just re-fetched from OFW by postMessageAndRefetch, so this
             // one row IS server-confirmed regardless of the drafts folder's overall
-            // cache freshness.
+            // cache freshness. `inReplyTo` echoes the effective threading alongside the
+            // volatile `id`, and `warnings` names any requested field that did not land.
             const responseObj = persisted !== null
-                ? { ...persisted, revision: newRevision, cacheStatus: 'fresh', serverConfirmed: true }
+                ? {
+                    ...persisted,
+                    inReplyTo: persisted.replyToId,
+                    revision: newRevision,
+                    cacheStatus: 'fresh',
+                    serverConfirmed: true,
+                    ...(warnings.length > 0 ? { warnings } : {}),
+                }
                 : raw;
             const text = responseObj ? JSON.stringify(responseObj, null, 2) : 'Draft saved.';
-            const notes = [forceNote, rewriteNote, verifyNote, replaceNote].filter((n) => n !== null).join('\n\n');
+            const warnNote = warnings.length > 0
+                ? `WARNING: ${warnings.join('\n\n')}`
+                : null;
+            const notes = [forceNote, rewriteNote, verifyNote, warnNote, replaceNote]
+                .filter((n) => n !== null).join('\n\n');
             return textResponse(notes ? `${notes}\n\n${text}` : text);
         });
     if (allowDrafts)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ofw-mcp",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "license": "MIT",
   "mcpName": "io.github.chrischall/ofw-mcp",
   "description": "OurFamilyWizard MCP server for Claude — developed and maintained by AI (Claude Code)",
@@ -42,13 +42,13 @@
     "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@chrischall/mcp-connector": "^1.0.0",
+    "@chrischall/mcp-connector": "^1.1.1",
     "@cloudflare/vitest-pool-workers": "^0.18.4",
     "@cloudflare/workers-oauth-provider": "^0.8.1",
     "@cloudflare/workers-types": "^5.20260708.1",
     "@types/node": "^26.0.0",
     "@vitest/coverage-v8": "^4.1.7",
-    "agents": "^0.17.3",
+    "agents": "^0.19.0",
     "esbuild": "^0.28.0",
     "typescript": "^7.0.2",
     "vitest": "^4.1.7",

package/server.json

@@ -6,12 +6,12 @@
     "url": "https://github.com/chrischall/ofw-mcp",
     "source": "github"
   },
-  "version": "2.7.0",
+  "version": "2.7.1",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "ofw-mcp",
-      "version": "2.7.0",
+      "version": "2.7.1",
       "transport": {
         "type": "stdio"
       },