@de-otio/epimethian-mcp 5.3.2 → 5.4.0

package/dist/cli/index.js

@@ -49324,7 +49324,7 @@ async function getPage(pageId, includeBody) {
 async function createPage(spaceId, title, body, parentId, clientLabel) {
   const cfg = await getConfig();
   const pageBody = stripAttributionFooter(toStorageFormat(body));
-  const epimethianTag = `Epimethian v${"5.3.2"}`;
+  const epimethianTag = `Epimethian v${"5.4.0"}`;
   const versionMsg = cfg.attribution && clientLabel ? `Created by ${clientLabel} (via ${epimethianTag})` : `Created by ${epimethianTag}`;
   const payload = {
     title,
@@ -49349,7 +49349,7 @@ async function createPage(spaceId, title, body, parentId, clientLabel) {
 async function updatePage(pageId, opts) {
   const cfg = await getConfig();
   const newVersion = opts.version + 1;
-  const epimethianTag = `Epimethian v${"5.3.2"}`;
+  const epimethianTag = `Epimethian v${"5.4.0"}`;
   const effectiveClient = cfg.attribution ? opts.clientLabel : void 0;
   let versionMessage;
   if (opts.versionMessage && effectiveClient)
@@ -49360,14 +49360,14 @@ async function updatePage(pageId, opts) {
     versionMessage = `Updated by ${effectiveClient} (via ${epimethianTag})`;
   else
     versionMessage = `Updated by ${epimethianTag}`;
+  const pageBody = opts.body ? stripAttributionFooter(toStorageFormat(opts.body)) : void 0;
   const payload = {
     id: pageId,
     status: "current",
     title: opts.title,
     version: { number: newVersion, message: versionMessage }
   };
-  if (opts.body) {
-    const pageBody = stripAttributionFooter(toStorageFormat(opts.body));
+  if (pageBody !== void 0) {
     payload.body = {
       representation: "storage",
       value: pageBody
@@ -49386,8 +49386,7 @@ async function updatePage(pageId, opts) {
     throw err;
   }
   const page = PageSchema.parse(raw);
-  if (opts.body) {
-    const pageBody = stripAttributionFooter(toStorageFormat(opts.body));
+  if (pageBody !== void 0) {
     pageCache.set(pageId, newVersion, pageBody);
   }
   try {
@@ -49763,9 +49762,11 @@ function sanitizeCommentBody(body) {
   }
   return stripped;
 }
-var HTML_TAG_RE = /<[a-z][a-z0-9]*(?::[a-z][a-z0-9-]*)?[\s>\/]/i;
+var HTML_TAG_RE = /<\/?[a-z][a-z0-9]*(?::[a-z][a-z0-9-]*)?[\s>\/]/i;
+var HTML_ENTITY_RE = /&(?:[a-zA-Z]+|#x?[0-9a-fA-F]+);/;
 function toStorageFormat(body) {
-  return HTML_TAG_RE.test(body) ? body : `<p>${body}</p>`;
+  if (HTML_TAG_RE.test(body) || HTML_ENTITY_RE.test(body)) return body;
+  return `<p>${body}</p>`;
 }
 function extractHeadings(storageHtml) {
   const headingRe = /<h([1-6])[^>]*>(.*?)<\/h\1>/gi;
@@ -49946,7 +49947,8 @@ function toMarkdownView(storageHtml) {
   return markdown;
 }
 function looksLikeMarkdown(body) {
-  if (/<ac:/i.test(body) || /<ri:/i.test(body)) {
+  const withoutCodeBlocks = body.replace(/^(`{3,})[^\n]*\n[\s\S]*?^\1\s*$/gm, "");
+  if (/<ac:/i.test(withoutCodeBlocks) || /<ri:/i.test(withoutCodeBlocks)) {
     return false;
   }
   const STRONG_MARKDOWN_SIGNALS = [
@@ -49973,7 +49975,11 @@ function looksLikeMarkdown(body) {
     /\*\*[^*]+\*\*/
     // inline bold **text**
   ];
-  return STRONG_MARKDOWN_SIGNALS.some((re) => re.test(body));
+  if (STRONG_MARKDOWN_SIGNALS.some((re) => re.test(body))) {
+    return true;
+  }
+  const trimmed = body.trimStart();
+  return !/^<[a-zA-Z]/i.test(trimmed);
 }
 async function formatPage(page, optionsOrIncludeBody) {
   const options2 = typeof optionsOrIncludeBody === "boolean" ? { includeBody: optionsOrIncludeBody } : optionsOrIncludeBody;
@@ -56724,7 +56730,10 @@ function planUpdate(params) {
   } = params;
   if (replaceBody) {
     const newStorage2 = markdownToStorage(callerMarkdown, converterOptions);
-    return { newStorage: newStorage2, deletedTokens: [] };
+    const { sidecar: sidecar2 } = tokeniseStorage(currentStorage);
+    const droppedCount = Object.keys(sidecar2).length;
+    const versionMessage2 = droppedCount > 0 ? `Wholesale rewrite (replace_body): dropped ${droppedCount} preserved element(s)` : void 0;
+    return { newStorage: newStorage2, deletedTokens: [], versionMessage: versionMessage2 };
   }
   const { canonical, sidecar } = tokeniseStorage(currentStorage);
   const diff = diffTokens(canonical, callerMarkdown, sidecar);
@@ -56752,22 +56761,34 @@ function planUpdate(params) {
 }
 
 // src/server/converter/content-safety-guards.ts
-var SHRINKAGE_GUARD_MIN_OLD_LEN = 500;
+var MACRO_LOSS_NOT_CONFIRMED = "MACRO_LOSS_NOT_CONFIRMED";
+var TABLE_LOSS_NOT_CONFIRMED = "TABLE_LOSS_NOT_CONFIRMED";
+var SHRINKAGE_GUARD_MIN_OLD_LEN = 200;
 var SHRINKAGE_GUARD_MAX_RATIO = 0.5;
 var STRUCTURE_GUARD_MIN_OLD_HEADINGS = 3;
 var STRUCTURE_GUARD_MAX_RATIO = 0.5;
-var EMPTY_BODY_MIN_OLD_LEN = 500;
-var EMPTY_BODY_MIN_TEXT_LEN = 100;
+var EMPTY_BODY_MIN_OLD_LEN = 100;
+var EMPTY_BODY_MIN_TEXT_LEN = 3;
 var HEADING_RE = /<h[1-6][^>]*>/gi;
 function countHeadings(storage) {
   const cleaned = storage.replace(/<ac:plain-text-body>[\s\S]*?<\/ac:plain-text-body>/g, "").replace(/<!--[\s\S]*?-->/g, "");
   return (cleaned.match(HEADING_RE) || []).length;
 }
+var STRUCTURED_MACRO_RE = /<ac:structured-macro[\s>]/gi;
+function countMacros(storage) {
+  const cleaned = storage.replace(/<ac:plain-text-body>[\s\S]*?<\/ac:plain-text-body>/g, "").replace(/<!--[\s\S]*?-->/g, "");
+  return (cleaned.match(STRUCTURED_MACRO_RE) || []).length;
+}
+var TABLE_RE = /<table[\s>]/gi;
+function countTables(storage) {
+  const cleaned = storage.replace(/<ac:plain-text-body>[\s\S]*?<\/ac:plain-text-body>/g, "").replace(/<!--[\s\S]*?-->/g, "");
+  return (cleaned.match(TABLE_RE) || []).length;
+}
 function extractTextContent(storage) {
-  return storage.replace(/<!--[\s\S]*?-->/g, "").replace(/<[^>]*>/g, "").replace(/&[a-zA-Z]+;/g, " ").replace(/&#x?[0-9a-fA-F]+;/g, " ").trim();
+  return storage.replace(/<!--[\s\S]*?-->/g, "").replace(/<[^>]*>/g, "").replace(/&nbsp;/gi, " ").replace(/&[a-zA-Z]+;/g, "_").replace(/&#x?[0-9a-fA-F]+;/g, "_").trim();
 }
 function enforceContentSafetyGuards(input) {
-  const { oldStorage, newStorage, confirmShrinkage, confirmStructureLoss } = input;
+  const { oldStorage, newStorage, confirmShrinkage, confirmStructureLoss, confirmDeletions } = input;
   const oldLen = oldStorage.length;
   const newLen = newStorage.length;
   if (oldLen > SHRINKAGE_GUARD_MIN_OLD_LEN && newLen < oldLen * SHRINKAGE_GUARD_MAX_RATIO && !confirmShrinkage) {
@@ -56792,6 +56813,22 @@ function enforceContentSafetyGuards(input) {
       EMPTY_BODY_REJECTED
     );
   }
+  const oldMacros = countMacros(oldStorage);
+  const newMacros = countMacros(newStorage);
+  if (oldMacros > 0 && newMacros === 0 && !confirmShrinkage && !confirmDeletions) {
+    throw new ConverterError(
+      `All ${oldMacros} Confluence macro(s) would be removed from the page. This may indicate accidental content loss (e.g. a lossy markdown round-trip). Re-submit with confirm_shrinkage: true if this is intentional.`,
+      MACRO_LOSS_NOT_CONFIRMED
+    );
+  }
+  const oldTables = countTables(oldStorage);
+  const newTables = countTables(newStorage);
+  if (oldTables > 0 && newTables === 0 && !confirmStructureLoss && !confirmDeletions) {
+    throw new ConverterError(
+      `All ${oldTables} table(s) would be removed from the page. This may indicate accidental content loss. Re-submit with confirm_structure_loss: true if this is intentional.`,
+      TABLE_LOSS_NOT_CONFIRMED
+    );
+  }
 }
 
 // src/server/converter/storage-to-md.ts
@@ -56822,8 +56859,12 @@ function storageToMarkdown(storage) {
 // src/server/mutation-log.ts
 var import_node_fs = require("node:fs");
 var import_node_path2 = require("node:path");
+var import_node_crypto2 = require("node:crypto");
 var MAX_LOG_AGE_MS = 30 * 24 * 60 * 60 * 1e3;
 var MAX_ERROR_LEN = 200;
+function bodyHash(body) {
+  return (0, import_node_crypto2.createHash)("sha256").update(body).digest("hex").slice(0, 16);
+}
 var logPath = null;
 var logFd = null;
 function sanitizeErrorMessage(err) {
@@ -56890,7 +56931,7 @@ function errorRecord(operation, pageId, err, extra) {
 var import_promises2 = require("node:fs/promises");
 var import_node_path3 = require("node:path");
 var import_node_os2 = require("node:os");
-var import_node_crypto2 = require("node:crypto");
+var import_node_crypto3 = require("node:crypto");
 var import_node_child_process2 = require("node:child_process");
 var import_node_util = require("node:util");
 var execFileAsync = (0, import_node_util.promisify)(import_node_child_process2.execFile);
@@ -56933,7 +56974,7 @@ async function writeCheckState(state) {
   const data = JSON.stringify(state, null, 2) + "\n";
   const tmpFile = (0, import_node_path3.join)(
     CONFIG_DIR2,
-    `.update-check.${(0, import_node_crypto2.randomBytes)(4).toString("hex")}.tmp`
+    `.update-check.${(0, import_node_crypto3.randomBytes)(4).toString("hex")}.tmp`
   );
   await (0, import_promises2.writeFile)(tmpFile, data, { mode: 384 });
   await (0, import_promises2.rename)(tmpFile, UPDATE_CHECK_FILE);
@@ -57207,11 +57248,16 @@ function registerTools(server, config3) {
       throw new Error("Combined body exceeds 2MB limit");
     }
     const newBody = position === "prepend" ? contentStorage + sep + currentStorage : currentStorage + sep + contentStorage;
+    enforceContentSafetyGuards({
+      oldStorage: currentStorage,
+      newStorage: newBody
+    });
     const { page, newVersion } = await updatePage(page_id, {
       title: currentPage.title,
       body: newBody,
       version: version2,
       versionMessage: opts.versionMessage,
+      previousBody: currentStorage,
       clientLabel: getClientLabel(server)
     });
     return { page, newVersion, oldLen: currentStorage.length, newLen: newBody.length };
@@ -57260,7 +57306,9 @@ function registerTools(server, config3) {
           operation: "create_page",
           pageId: page.id,
           newVersion: page.version?.number ?? 1,
-          newBodyLen: finalBody.length
+          newBodyLen: finalBody.length,
+          newBodyHash: bodyHash(finalBody),
+          clientLabel: getClientLabel(server)
         });
         return toolResult(await formatPage(page, false) + echo);
       } catch (err) {
@@ -57423,7 +57471,11 @@ ${truncated}`);
             oldStorage: currentStorage,
             newStorage: finalStorage,
             confirmShrinkage: confirm_shrinkage,
-            confirmStructureLoss: confirm_structure_loss
+            confirmStructureLoss: confirm_structure_loss,
+            // confirm_deletions and replace_body both indicate the caller
+            // has acknowledged macro/element removal — bypass the macro
+            // and table loss guards, but NOT the shrinkage/structure guards.
+            confirmDeletions: confirm_deletions || replace_body
           });
         }
         const { page, newVersion } = await updatePage(page_id, {
@@ -57442,6 +57494,9 @@ ${truncated}`);
           newVersion,
           oldBodyLen: currentStorage.length,
           newBodyLen: finalStorage?.length ?? currentStorage.length,
+          oldBodyHash: bodyHash(currentStorage),
+          newBodyHash: finalStorage ? bodyHash(finalStorage) : void 0,
+          clientLabel: getClientLabel(server),
           replaceBody: replace_body || void 0
         });
         const bodyReport = finalStorage !== void 0 ? `body: ${currentStorage.length}\u2192${finalStorage.length} chars` : `title only, body unchanged`;
@@ -57517,6 +57572,10 @@ ${truncated}`);
             `Section "${section}" not found. Use headings_only to see available sections.`
           );
         }
+        enforceContentSafetyGuards({
+          oldStorage: fullBody,
+          newStorage: newFullBody
+        });
         const { page: updated, newVersion } = await updatePage(page_id, {
           title: page.title,
           body: newFullBody,
@@ -57532,7 +57591,10 @@ ${truncated}`);
           oldVersion: version2,
           newVersion,
           oldBodyLen: fullBody.length,
-          newBodyLen: newFullBody.length
+          newBodyLen: newFullBody.length,
+          oldBodyHash: bodyHash(fullBody),
+          newBodyHash: bodyHash(newFullBody),
+          clientLabel: getClientLabel(server)
         });
         return toolResult(
           `Updated section "${section}" in: ${updated.title} (ID: ${updated.id}, version: ${newVersion})` + echo
@@ -57923,17 +57985,35 @@ ${truncated}`);
         const existingBody = current.body?.storage?.value ?? current.body?.value ?? "";
         const newBody = append ? `${existingBody}
 ${macro}` : macro;
+        enforceContentSafetyGuards({
+          oldStorage: existingBody,
+          newStorage: newBody
+        });
         const { page, newVersion } = await updatePage(page_id, {
           title: current.title,
           body: newBody,
           version: current.version?.number ?? 0,
           versionMessage: `Added diagram: ${filename}`,
+          previousBody: existingBody,
+          clientLabel: getClientLabel(server)
+        });
+        logMutation({
+          timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+          operation: "update_page",
+          pageId: page_id,
+          oldVersion: current.version?.number ?? 0,
+          newVersion,
+          oldBodyLen: existingBody.length,
+          newBodyLen: newBody.length,
+          oldBodyHash: bodyHash(existingBody),
+          newBodyHash: bodyHash(newBody),
           clientLabel: getClientLabel(server)
         });
         return toolResult(
           `Diagram "${filename}" added to page ${page.title} (ID: ${page.id}, version: ${newVersion})` + echo
         );
       } catch (err) {
+        logMutation(errorRecord("update_page", page_id, err));
         return toolError(err);
       }
     }
@@ -58448,6 +58528,7 @@ ${result.diff}${truncNote}` + echo
           body: historical.rawBody,
           version: current_version,
           versionMessage: version_message ?? `Revert to version ${target_version}`,
+          previousBody: currentStorage,
           clientLabel: getClientLabel(server)
         });
         logMutation({
@@ -58457,7 +58538,10 @@ ${result.diff}${truncNote}` + echo
           oldVersion: current_version,
           newVersion,
           oldBodyLen: currentStorage.length,
-          newBodyLen: historical.rawBody.length
+          newBodyLen: historical.rawBody.length,
+          oldBodyHash: bodyHash(currentStorage),
+          newBodyHash: bodyHash(historical.rawBody),
+          clientLabel: getClientLabel(server)
         });
         return toolResult(
           `Reverted: ${page.title} (ID: ${page.id}, v${target_version}\u2192v${newVersion}, body: ${currentStorage.length}\u2192${historical.rawBody.length} chars)` + echo
@@ -58540,7 +58624,7 @@ ${lines.join("\n")}${echo2}`
       inputSchema: {}
     },
     async () => {
-      let text2 = `epimethian-mcp v${"5.3.2"}`;
+      let text2 = `epimethian-mcp v${"5.4.0"}`;
       try {
         const pending = await getPendingUpdate();
         if (pending) {
@@ -58570,7 +58654,7 @@ ${pending.type === "major" ? "Major" : "Minor"} update available: v${pending.cur
         const pending = await getPendingUpdate();
         if (!pending) {
           return toolResult(
-            `epimethian-mcp v${"5.3.2"} is already up to date.`
+            `epimethian-mcp v${"5.4.0"} is already up to date.`
           );
         }
         const output = await performUpgrade(pending.latest);
@@ -58598,12 +58682,12 @@ async function main() {
   const serverName = config3.profile ? `confluence-${config3.profile}` : "confluence";
   const server = new McpServer({
     name: serverName,
-    version: "5.3.2"
+    version: "5.4.0"
   });
   registerTools(server, config3);
   const transport = new StdioServerTransport();
   await server.connect(transport);
-  checkForUpdates("5.3.2").catch(() => {
+  checkForUpdates("5.4.0").catch(() => {
   });
 }