@wrongstack/sdd 1.0.26 → 1.0.28

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

@@ -2049,10 +2049,10 @@ var AISpecBuilder = class {
           return;
         }
         const fsp7 = await import("node:fs/promises");
-        const path6 = await import("node:path");
+        const path7 = await import("node:path");
         const { atomicWrite: atomicWrite4 } = await import("@wrongstack/core/utils");
         const sessionPath = expectDefined2(this.sessionPath);
-        await fsp7.mkdir(path6.dirname(sessionPath), { recursive: true });
+        await fsp7.mkdir(path7.dirname(sessionPath), { recursive: true });
         await atomicWrite4(sessionPath, JSON.stringify(snapshot, null, 2));
       } catch (error) {
         console.warn(
@@ -5083,15 +5083,15 @@ function computeCriticalPath(graph, _topoOrder, blockedByMap) {
       maxId = id;
     }
   }
-  const path6 = [];
+  const path7 = [];
   let current = maxId;
   const visited = /* @__PURE__ */ new Set();
   while (current && !visited.has(current)) {
     visited.add(current);
-    path6.unshift(current);
+    path7.unshift(current);
     current = prev.get(current) ?? null;
   }
-  return path6;
+  return path7;
 }
 function computeParallelGroups(graph, blockedByMap) {
   const groups = [];
@@ -5312,6 +5312,14 @@ var SpecVersioning = class {
 };
 
 // src/auto-executor.ts
+function asDependentFirstGraph(graph) {
+  return {
+    ...graph,
+    edges: graph.edges.map(
+      (edge) => edge.type === "depends_on" ? { ...edge, from: edge.to, to: edge.from } : edge
+    )
+  };
+}
 var AutoExecutor = class {
   opts;
   stopped = false;
@@ -5328,7 +5336,7 @@ var AutoExecutor = class {
     this.stopped = false;
     this.retryMap.clear();
     const startTime = Date.now();
-    const critical = analyzeCriticalPath(graph);
+    const critical = analyzeCriticalPath(asDependentFirstGraph(graph));
     let completed = 0;
     let failed = 0;
     const skipped = 0;
@@ -5501,6 +5509,7 @@ var SddSupervisor = class {
     const canSplit = Boolean(this.opts.generateSubtasks);
     const decision = await this.opts.brain.decide({
       id: `sdd-supervisor-${task.id}-${attempts}`,
+      sessionId: this.opts.sessionId,
       source: "system",
       question: `SDD task "${task.title}" exhausted its retries. How should the run proceed?`,
       context: `Error: ${error}
@@ -5539,6 +5548,28 @@ Supervisor rescues already used: ${attempts}`,
 
 // src/verify-task.ts
 import { spawn } from "node:child_process";
+import { accessSync } from "node:fs";
+import * as path6 from "node:path";
+import { buildWin32CmdShimInvocation } from "@wrongstack/core/utils";
+function win32BatchTarget(executable) {
+  if (/\.(?:cmd|bat)$/i.test(executable)) return executable;
+  if (/[\\/]/.test(executable) || path6.extname(executable)) return void 0;
+  const exts = (process.env["PATHEXT"] ?? ".COM;.EXE;.BAT;.CMD").toLowerCase().split(";");
+  for (const dir of (process.env["PATH"] ?? "").split(path6.delimiter)) {
+    if (!dir) continue;
+    for (const ext of exts) {
+      if (!ext) continue;
+      const full = path6.join(dir, `${executable}${ext}`);
+      try {
+        accessSync(full);
+      } catch {
+        continue;
+      }
+      return ext === ".cmd" || ext === ".bat" ? full : void 0;
+    }
+  }
+  return void 0;
+}
 function tokenizeCommand(command) {
   const trimmed = command.trim();
   if (!trimmed) return void 0;
@@ -5675,12 +5706,22 @@ function makeCommandVerifier(options = {}) {
       return { ok: false, reason: `verification command is malformed: ${rawCommand}` };
     }
     const [executable, ...args] = argv;
+    const batch = process.platform === "win32" ? win32BatchTarget(executable) : void 0;
+    let shim;
+    if (batch) {
+      try {
+        shim = buildWin32CmdShimInvocation(batch, args);
+      } catch (err) {
+        return { ok: false, reason: `verification command refused: ${String(err)}` };
+      }
+    }
     return await new Promise((resolve3) => {
-      const child = spawn(executable, args, {
+      const child = spawn(shim?.command ?? executable, shim?.args ?? args, {
         cwd: info.cwd,
         shell: false,
         windowsHide: true,
-        stdio: "ignore"
+        stdio: "ignore",
+        ...shim ? { windowsVerbatimArguments: shim.windowsVerbatimArguments } : {}
       });
       let timedOut = false;
       const timer = setTimeout(() => {
@@ -5856,56 +5897,54 @@ async function decomposeNonAtomicTasks(opts) {
 
 // src/conflict-resolver.ts
 import { readFile as readFile6, writeFile } from "node:fs/promises";
-import { isAbsolute as isAbsolute3, join as join6 } from "node:path";
+import { isAbsolute as isAbsolute3, join as join7 } from "node:path";
 import { readBundledInstructionText as readBundledInstructionText2, renderInstructionTemplate as renderInstructionTemplate2 } from "@wrongstack/core/utils";
 var defaultFileIO = {
-  read: (path6) => readFile6(path6, "utf8"),
-  write: async (path6, content) => {
-    await writeFile(path6, content, "utf8");
+  read: (path7) => readFile6(path7, "utf8"),
+  write: async (path7, content) => {
+    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) {
     if (info.conflictFiles.length === 0) return false;
     for (const rel of info.conflictFiles) {
-      const abs = isAbsolute3(rel) ? rel : join6(info.cwd, rel);
+      const abs = isAbsolute3(rel) ? rel : join7(info.cwd, rel);
       let content;
       try {
         content = await io.read(abs);
@@ -5928,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;
@@ -5939,7 +5975,7 @@ function makeLlmConflictResolver(opts) {
   return async function conflictResolver(info) {
     if (info.conflictFiles.length === 0) return false;
     for (const rel of info.conflictFiles) {
-      const abs = isAbsolute3(rel) ? rel : join6(info.cwd, rel);
+      const abs = isAbsolute3(rel) ? rel : join7(info.cwd, rel);
       let content;
       try {
         content = await io.read(abs);

package/dist/sdd-supervisor.d.ts

@@ -4,6 +4,8 @@ import type { SddSubtaskSpec, SddSupervisorVerdict } from './sdd-parallel-run.js
 export interface SddSupervisorOptions {
     /** Decision authority (policy/LLM/human). Reuse the session's TOKENS.BrainArbiter. */
     brain: BrainArbiter;
+    /** Session that started this run, retained when another tab becomes foreground. */
+    sessionId?: string | undefined;
     /**
      * Models to rotate through on a `reassign` verdict (e.g. the run's fallback
      * chain). Omit to drop the reassign option entirely.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrongstack/sdd",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "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.26",
-    "@wrongstack/kanban": "1.0.26",
-    "@wrongstack/primitives": "1.0.26",
-    "@wrongstack/requirement-intake": "1.0.26"
+    "@wrongstack/core": "1.0.28",
+    "@wrongstack/kanban": "1.0.28",
+    "@wrongstack/primitives": "1.0.28",
+    "@wrongstack/requirement-intake": "1.0.28"
   },
   "devDependencies": {
     "@types/node": "^26.5.1",