@wrongstack/sdd 1.0.27 → 1.0.29

package/dist/conflict-resolver.d.ts

@@ -7,10 +7,15 @@ interface ConflictFileIO {
 /**
  * Resolve every standard git conflict hunk in `text` by keeping `side`. Handles
  * both 2-way (`<<<<<<< / ======= / >>>>>>>`) and diff3 (`||||||| base`) markers.
- * Returns the rewritten text (markers removed).
+ * Returns the rewritten text (markers removed). A hunk that never closes is not
+ * guessed at: the input comes back unchanged, so the marker check refuses it.
  */
 export declare function resolveConflictText(text: string, side: ConflictSide): string;
-/** True when `text` still contains a git conflict marker line. */
+/**
+ * True when `text` still contains a git conflict marker line. A bare `=======`
+ * is not counted: without a `<<<<<<<` it cannot be told apart from a setext
+ * heading underline (core's WorktreeManager check draws the same line).
+ */
 export declare function hasConflictMarkers(text: string): boolean;
 /**
  * Build a `conflictResolver` that keeps `side` of every hunk in each conflicted

package/dist/index.js

@@ -5905,42 +5905,40 @@ var defaultFileIO = {
     await writeFile(path7, content, "utf8");
   }
 };
-var START = "<<<<<<<";
-var BASE = "|||||||";
-var SEP = "=======";
-var END = ">>>>>>>";
+var START_LINE = /^(<{7,})(?: |\r?$)/;
+var LABELLED_MARKER_LINE = /^(?:<{7,}|\|{7,}|>{7,})(?: |\r?$)/;
+var ANY_MARKER_LINE = /^(?:<{7,}|\|{7,}|>{7,})(?: |\r?$)|^={7,}\r?$/;
+function isMarker(line, char, size) {
+  for (let i = 0; i < size; i++) if (line[i] !== char) return false;
+  const rest = line.slice(size).replace(/\r$/, "");
+  return char === "=" ? rest === "" : rest === "" || rest.startsWith(" ");
+}
 function resolveConflictText(text, side) {
   const out = [];
   let state = "normal";
+  let size = 0;
   for (const line of text.split("\n")) {
-    const marker = line.slice(0, 7);
-    if (state === "normal" && marker === START) {
-      state = "ours";
-      continue;
-    }
-    if (state !== "normal" && marker === BASE) {
-      state = "base";
-      continue;
-    }
-    if (state !== "normal" && marker === SEP) {
-      state = "theirs";
-      continue;
-    }
-    if (state !== "normal" && marker === END) {
-      state = "normal";
+    if (state === "normal") {
+      const start = START_LINE.exec(line);
+      if (start) {
+        size = start[1].length;
+        state = "ours";
+      } else {
+        out.push(line);
+      }
       continue;
     }
-    if (state === "normal") out.push(line);
+    if (isMarker(line, "|", size)) state = "base";
+    else if (isMarker(line, "=", size)) state = "theirs";
+    else if (isMarker(line, ">", size)) state = "normal";
     else if (state === "ours" && side === "base") out.push(line);
     else if (state === "theirs" && side === "incoming") out.push(line);
   }
+  if (state !== "normal") return text;
   return out.join("\n");
 }
 function hasConflictMarkers(text) {
-  return text.split("\n").some((l) => {
-    const m = l.slice(0, 7);
-    return m === START || m === SEP || m === END || m === BASE;
-  });
+  return text.split("\n").some((l) => LABELLED_MARKER_LINE.test(l));
 }
 function makePreferSideConflictResolver(side, io = defaultFileIO) {
   return async function conflictResolver(info) {
@@ -5969,10 +5967,7 @@ function unfence(text) {
   return m?.[1] !== void 0 ? m[1] : text.trim();
 }
 function nonMarkerLineCount(text) {
-  return text.split("\n").filter((l) => {
-    const m = l.slice(0, 7);
-    return m !== START && m !== SEP && m !== END && m !== BASE;
-  }).length;
+  return text.split("\n").filter((l) => !ANY_MARKER_LINE.test(l)).length;
 }
 function makeLlmConflictResolver(opts) {
   const minFraction = opts.minRetainedFraction ?? 0.5;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrongstack/sdd",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "license": "MIT",
   "description": "WrongStack Spec-Driven Development engine — standalone package extracted from @wrongstack/core. Task graph generation, tracking, execution, lifecycle management, and AI-driven spec building for SDD workflows.",
   "repository": {
@@ -27,10 +27,10 @@
     "!dist/**/*.map"
   ],
   "dependencies": {
-    "@wrongstack/core": "1.0.27",
-    "@wrongstack/kanban": "1.0.27",
-    "@wrongstack/primitives": "1.0.27",
-    "@wrongstack/requirement-intake": "1.0.27"
+    "@wrongstack/core": "1.0.29",
+    "@wrongstack/kanban": "1.0.29",
+    "@wrongstack/primitives": "1.0.29",
+    "@wrongstack/requirement-intake": "1.0.29"
   },
   "devDependencies": {
     "@types/node": "^26.5.1",