@hanna84/mcp-writing 1.11.8 → 1.13.0

package/CHANGELOG.md

@@ -4,11 +4,31 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v1.13.0](https://github.com/hannasdev/mcp-writing.git
+/compare/v1.12.0...v1.13.0)
+
+- feat(scrivener-direct): add ambiguity warning taxonomy for beta merge [`#69`](https://github.com/hannasdev/mcp-writing.git
+/pull/69)
+
+#### [v1.12.0](https://github.com/hannasdev/mcp-writing.git
+/compare/v1.11.8...v1.12.0)
+
+> 24 April 2026
+
+- feat(scrivener-direct): ownership enforcement (PR-3a) [`#68`](https://github.com/hannasdev/mcp-writing.git
+/pull/68)
+- Release 1.12.0 [`e249edd`](https://github.com/hannasdev/mcp-writing.git
+/commit/e249edd1df6b1f77253200296057fe1cb468d2d0)
+
 #### [v1.11.8](https://github.com/hannasdev/mcp-writing.git
 /compare/v1.11.7...v1.11.8)
 
+> 24 April 2026
+
 - chore(deps): remove unused fast-xml-parser and bump @xmldom/xmldom [`#67`](https://github.com/hannasdev/mcp-writing.git
 /pull/67)
+- Release 1.11.8 [`7329eb4`](https://github.com/hannasdev/mcp-writing.git
+/commit/7329eb4107bb0ac1889d58446604381a47370133)
 
 #### [v1.11.7](https://github.com/hannasdev/mcp-writing.git
 /compare/v1.11.6...v1.11.7)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanna84/mcp-writing",
-  "version": "1.11.8",
+  "version": "1.13.0",
   "description": "MCP service for AI-assisted reasoning and editing on long-form fiction projects",
   "type": "module",
   "main": "index.js",

package/scrivener-direct.js

@@ -100,6 +100,21 @@ function moveFileIfNeeded(fromPath, toPath) {
   return { moved: true };
 }
 
+// Fields that are exclusively owned by the stable Scrivener sync-folder importer.
+// The beta merge must never write these fields, even additively, because the
+// importer derives them from the source filename and project structure in ways
+// the beta merge path cannot reliably replicate (e.g. scene_id slug, timeline
+// position from file sequence, external identity).
+export const IMPORTER_AUTHORITATIVE_FIELDS = Object.freeze([
+  "scene_id",
+  "external_source",
+  "external_id",
+  "title",
+  "timeline_position",
+]);
+
+const IMPORTER_AUTHORITATIVE_FIELD_SET = new Set(IMPORTER_AUTHORITATIVE_FIELDS);
+
 const KNOWN_CUSTOM_FIELD_IDS = new Set([
   "savethecat!",
   "causality",
@@ -111,6 +126,73 @@ const KNOWN_CUSTOM_FIELD_IDS = new Set([
 ]);
 
 const MAX_RETURNED_WARNINGS = 25;
+const STRUCTURE_MAPPING_FIELDS = new Set(["part", "chapter", "chapter_title"]);
+
+function normalizeComparisonValue(key, value) {
+  if ((key === "tags" || key === "scene_functions") && Array.isArray(value)) {
+    return [...new Set(value.map(item => String(item)))].sort();
+  }
+  return value;
+}
+
+function valuesEquivalentForMerge(key, a, b) {
+  return JSON.stringify(normalizeComparisonValue(key, a)) === JSON.stringify(normalizeComparisonValue(key, b));
+}
+
+function collectAmbiguityWarnings(existing, mergeData, { file, uuid }) {
+  const out = [];
+
+  const externalSource = existing?.external_source;
+  if (externalSource !== undefined && externalSource !== null && externalSource !== "scrivener") {
+    out.push({
+      code: "ambiguous_identity_tie",
+      message: "Existing sidecar identity source conflicts with Scrivener mapping; keeping existing sidecar identity.",
+      reason: "external_source_conflict",
+      external_source: String(externalSource),
+      file,
+      uuid,
+    });
+  }
+  if (externalSource === "scrivener" && (existing?.external_id === undefined || existing?.external_id === null || String(existing.external_id).trim() === "")) {
+    out.push({
+      code: "ambiguous_identity_tie",
+      message: "Existing sidecar identity is marked as Scrivener but missing external_id; keeping existing sidecar identity.",
+      reason: "missing_external_id",
+      file,
+      uuid,
+    });
+  }
+
+  for (const [key, scrivenerValue] of Object.entries(mergeData)) {
+    if (!Object.hasOwn(existing, key)) continue;
+    if (valuesEquivalentForMerge(key, existing[key], scrivenerValue)) continue;
+
+    if (STRUCTURE_MAPPING_FIELDS.has(key)) {
+      out.push({
+        code: "ambiguous_structure_mapping",
+        message: `Existing sidecar field '${key}' conflicts with Scrivener-derived structure; keeping existing value.`,
+        field: key,
+        existing_value: existing[key],
+        scrivener_value: scrivenerValue,
+        file,
+        uuid,
+      });
+      continue;
+    }
+
+    out.push({
+      code: "ambiguous_metadata_mapping",
+      message: `Existing sidecar field '${key}' conflicts with Scrivener metadata; keeping existing value.`,
+      field: key,
+      existing_value: existing[key],
+      scrivener_value: scrivenerValue,
+      file,
+      uuid,
+    });
+  }
+
+  return out;
+}
 
 function recordWarning(summary, warning) {
   if (!summary[warning.code]) {
@@ -122,7 +204,21 @@ function recordWarning(summary, warning) {
 
   if (entry.examples.length < 5) {
     const example = { message: warning.message };
-    for (const key of ["file", "sync_number", "field_id", "value", "uuid", "from_path", "to_path", "moved_to"]) {
+    for (const key of [
+      "file",
+      "sync_number",
+      "field",
+      "field_id",
+      "value",
+      "reason",
+      "external_source",
+      "existing_value",
+      "scrivener_value",
+      "uuid",
+      "from_path",
+      "to_path",
+      "moved_to",
+    ]) {
       if (warning[key] !== undefined && warning[key] !== null) {
         example[key] = warning[key];
       }
@@ -222,8 +318,13 @@ function buildMergeDataFromProject(projectData, uuid) {
 export function mergeSidecarData(existing, mergeData) {
   const merged = { ...existing };
   const newKeys = [];
+  const blockedKeys = [];
 
   for (const [key, value] of Object.entries(mergeData)) {
+    if (IMPORTER_AUTHORITATIVE_FIELD_SET.has(key)) {
+      blockedKeys.push(key);
+      continue;
+    }
     if (!(key in merged)) {
       merged[key] = value;
       newKeys.push(key);
@@ -234,6 +335,7 @@ export function mergeSidecarData(existing, mergeData) {
     merged,
     changed: newKeys.length > 0,
     newKeys,
+    blockedKeys,
   };
 }
 
@@ -479,6 +581,11 @@ export function mergeScrivenerProjectMetadata({
       throw new Error(`Invalid sidecar YAML mapping at ${sidecarPath}`);
     }
     const existing = existingRaw ?? {};
+    const ambiguityWarnings = collectAmbiguityWarnings(existing, mergeData, { file: filename, uuid });
+    for (const warning of ambiguityWarnings) {
+      warningsTruncated = pushWarning(warnings, warningSummary, warning) || warningsTruncated;
+    }
+
     const { merged, changed, newKeys } = mergeSidecarData(existing, mergeData);
     const effective = changed ? merged : existing;
     const targetDir = sceneContainerDir(