threadnote 1.7.1 → 1.7.2

package/dist/mcp_server.cjs

@@ -37023,7 +37023,12 @@ async function loadPendingReindexes(config2, state) {
       }
       const entry = item;
       if (typeof entry.path === "string" && typeof entry.relativePath === "string" && (entry.status === "added" || entry.status === "removed" || entry.status === "modified")) {
-        changes.push({ path: entry.path, relativePath: entry.relativePath, status: entry.status });
+        changes.push({
+          path: entry.path,
+          previousContent: typeof entry.previousContent === "string" ? entry.previousContent : void 0,
+          relativePath: entry.relativePath,
+          status: entry.status
+        });
       }
     }
     if (changes.length > 0) {
@@ -39092,7 +39097,7 @@ async function applyChangesToOpenViking(config2, team, changes, options = {}) {
       const currentContent = await readExistingMemoryContent(config2, ov, uri);
       if (currentContent !== void 0) {
         if (change.status === "added") {
-          if (currentContent === content) {
+          if (sharedMemoryContentsEquivalent(currentContent, content)) {
             continue;
           }
           throw new Error(
@@ -39131,12 +39136,18 @@ function assertInboundPreviousContentMatches(change, uri, currentContent) {
     );
   }
   const expectedContent = prepareSharedInboundContent(uri, change.previousContent);
-  if (currentContent !== expectedContent) {
+  if (!sharedMemoryContentsEquivalent(currentContent, expectedContent)) {
     throw new Error(
       `Refusing to apply inbound shared change for ${uri}: local OpenViking content differs from the previous shared version. Inspect and resolve the local edit first.`
     );
   }
 }
+function sharedMemoryContentsEquivalent(left, right) {
+  return normalizeSharedMemoryComparisonContent(left) === normalizeSharedMemoryComparisonContent(right);
+}
+function normalizeSharedMemoryComparisonContent(content) {
+  return content.replace(/\r\n?/g, "\n").replace(/\n$/, "");
+}
 function mergeChanges(...lists) {
   const map2 = /* @__PURE__ */ new Map();
   for (const list of lists) {

package/dist/threadnote.cjs

@@ -8808,7 +8808,12 @@ async function loadPendingReindexes(config, state) {
       }
       const entry = item;
       if (typeof entry.path === "string" && typeof entry.relativePath === "string" && (entry.status === "added" || entry.status === "removed" || entry.status === "modified")) {
-        changes.push({ path: entry.path, relativePath: entry.relativePath, status: entry.status });
+        changes.push({
+          path: entry.path,
+          previousContent: typeof entry.previousContent === "string" ? entry.previousContent : void 0,
+          relativePath: entry.relativePath,
+          status: entry.status
+        });
       }
     }
     if (changes.length > 0) {
@@ -11395,7 +11400,7 @@ async function applyChangesToOpenViking(config, team, changes, options = {}) {
       const currentContent = await readExistingMemoryContent(config, ov, uri);
       if (currentContent !== void 0) {
         if (change.status === "added") {
-          if (currentContent === content) {
+          if (sharedMemoryContentsEquivalent(currentContent, content)) {
             continue;
           }
           throw new Error(
@@ -11434,12 +11439,18 @@ function assertInboundPreviousContentMatches(change, uri, currentContent) {
     );
   }
   const expectedContent = prepareSharedInboundContent(uri, change.previousContent);
-  if (currentContent !== expectedContent) {
+  if (!sharedMemoryContentsEquivalent(currentContent, expectedContent)) {
     throw new Error(
       `Refusing to apply inbound shared change for ${uri}: local OpenViking content differs from the previous shared version. Inspect and resolve the local edit first.`
     );
   }
 }
+function sharedMemoryContentsEquivalent(left, right) {
+  return normalizeSharedMemoryComparisonContent(left) === normalizeSharedMemoryComparisonContent(right);
+}
+function normalizeSharedMemoryComparisonContent(content) {
+  return content.replace(/\r\n?/g, "\n").replace(/\n$/, "");
+}
 function mergeChanges(...lists) {
   const map = /* @__PURE__ */ new Map();
   for (const list of lists) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "threadnote",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "type": "commonjs",
   "main": "dist/threadnote.cjs",
   "description": "Shared local context and handoffs for development agents",