@davesheffer/hunch 1.41.1 → 1.41.3

package/dist/integrations/providers.js

@@ -26,6 +26,27 @@ import { renderHunchSection, stripManagedSection, upsertSection, updateClaudeMd
 import { headFileContent, isGitCleanPath } from "../extractors/git.js";
 import { parseJsonc } from "../core/jsonc.js";
 import { parse as parseToml } from "smol-toml";
+/** JSONC comments are user prose. A parsed object cannot retain their position,
+ * so refuse a write rather than reserialize the file without them. */
+function hasJsoncComments(raw) {
+    let inString = false;
+    for (let i = 0; i < raw.length; i++) {
+        const char = raw[i];
+        if (inString) {
+            if (char === "\\")
+                i++;
+            else if (char === '"')
+                inString = false;
+        }
+        else if (char === '"') {
+            inString = true;
+        }
+        else if (char === "/" && (raw[i + 1] === "/" || raw[i + 1] === "*")) {
+            return true;
+        }
+    }
+    return false;
+}
 /** Read a JSON/JSONC object. Returns {} only for an ABSENT or empty file. A
  *  non-empty file we cannot parse THROWS — overwriting it would silently wipe the
  *  user's other MCP servers. */
@@ -35,15 +56,21 @@ function readJsonObj(file) {
     const raw = readFileSync(file, "utf8");
     if (!raw.trim())
         return {};
+    let value;
     try {
         const v = parseJsonc(raw);
         if (v && typeof v === "object" && !Array.isArray(v))
-            return v;
-        throw new Error("not a JSON object");
+            value = v;
+        else
+            throw new Error("not a JSON object");
     }
     catch (e) {
         throw new Error(`refusing to overwrite ${file}: could not parse it (${e.message}). Fix or remove it, then re-run.`);
     }
+    if (hasJsoncComments(raw)) {
+        throw new Error(`refusing to edit ${file}: JSONC comments cannot be preserved by this writer. Edit the Hunch entry manually or remove the comments, then re-run.`);
+    }
+    return value;
 }
 /** Render a string as a TOML value: a literal '…' when safe (no escaping needed —
  *  ideal for Windows backslash paths), else a basic "…" with escapes. */

package/dist/store/changeLedger.js

@@ -170,8 +170,14 @@ export function mergeLedgers(base, ours, theirs) {
         seen.set(k, e);
         order.push(e);
     } };
-    for (const e of base?.events ?? [])
-        add(e);
+    const ourIdentities = new Set(ours.events.map(eventIdentity));
+    const theirIdentities = new Set(theirs.events.map(eventIdentity));
+    // Base is a merge ancestor, not a source of history both clones have compacted away.
+    for (const e of base?.events ?? []) {
+        const key = eventIdentity(e);
+        if (ourIdentities.has(key) || theirIdentities.has(key) || (e.seq > ours.floor_seq && e.seq > theirs.floor_seq))
+            add(e);
+    }
     for (const e of ours.events)
         add(e);
     for (const e of theirs.events)
@@ -180,7 +186,6 @@ export function mergeLedgers(base, ours, theirs) {
     // side 1 iff theirs holds it and neither ours nor base does. Deciding by object identity
     // (`includes`) would instead put anything ours compacted away — base's object, which `add`
     // keeps — after its same-`at` siblings and silently reorder a batch both sides already had.
-    const ourIdentities = new Set(ours.events.map(eventIdentity));
     const baseIdentities = new Set((base?.events ?? []).map(eventIdentity));
     const theirsOnly = (e) => {
         const k = eventIdentity(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@davesheffer/hunch",
-  "version": "1.41.1",
+  "version": "1.41.3",
   "mcpName": "io.github.davesheffer/hunch",
   "license": "Apache-2.0",
   "author": "Dave Sheffer <dave.sheffer1@gmail.com>",

package/server.json

@@ -7,13 +7,13 @@
     "source": "github"
   },
   "websiteUrl": "https://www.hunchmemory.com",
-  "version": "1.41.1",
+  "version": "1.41.3",
   "packages": [
     {
       "registryType": "npm",
       "registryBaseUrl": "https://registry.npmjs.org",
       "identifier": "@davesheffer/hunch",
-      "version": "1.41.1",
+      "version": "1.41.3",
       "runtimeHint": "npx",
       "packageArguments": [
         {