@inerrata-corporation/errata 2.0.2-dev.145 → 2.0.2-dev.156

package/errata.mjs

@@ -18572,7 +18572,8 @@ function resolveDesignProblemById(store, id, fixNote, t) {
 }
 function closeDesignProblem(store, problemId, fixNote, t) {
   const p = store.getNode(problemId);
-  if (!p || p.label !== "Problem" || p.attrs["resolvedAt"]) return false;
+  if (!p || p.label !== "Problem") return false;
+  if (p.attrs["resolvedAs"]) return false;
   if (fixNote?.trim() && store.outEdges(problemId, ["SOLVED_BY"]).length === 0) {
     const solId = `dfix_${digest({ problemId, fix: fixNote })}`.slice(0, 56);
     store.mergeNode(
@@ -18580,6 +18581,7 @@ function closeDesignProblem(store, problemId, fixNote, t) {
     );
     mergeEdge(store, problemId, solId, "SOLVED_BY", t);
   }
+  if (p.attrs["resolvedAt"]) return false;
   store.updateNode(problemId, {
     attrs: { ...p.attrs, provisional: false, resolvedAt: t },
     lastUpdatedAt: t
@@ -49707,10 +49709,13 @@ init_src4();
 import { readFileSync as readFileSync10, writeFileSync as writeFileSync10 } from "node:fs";
 var NEG = /n['']t|\b(?:not|never|no|none|neither|nor|unrelated|irrelevant|would|might|could|if)\b/i;
 var CITE_GROUP_RE = /\(((?:[^()\n]|\([^()\n]*\)){1,200})\)/g;
-var HANDLE_RE = /\[([a-z0-9][\w-]{0,40})\]|((?:pat|sol|drc|dcause|dfix|dprob|prob|claim|err)_[0-9a-f]{6,})/gi;
+var HANDLE_RE = /\[([a-z0-9][\w-]{0,80})\]|((?:pat|sol|drc|dcause|dfix|dprob|prob|claim|err)_[0-9a-f]{6,})/gi;
 var FIX_PREFIX = /^\s*fix:(?:#([a-z][\w-]{0,63}))?\s*/i;
 var CONSTRAINT_RE = /\(\s*constraint:\s*([^()\n]{8,}?)\s*\)/gi;
 var CAUSE_PREFIX = /^\s*cause:(?:#([a-z][\w-]{0,63}))?\s*/i;
+var NEST2_UNIT = String.raw`(?:[^()\n]|\((?:[^()\n]|\([^()\n]*\))*\))`;
+var FIX_LONG_RE = new RegExp(String.raw`\(\s*fix:(?:#([a-z][\w-]{0,63}))?\s*(${NEST2_UNIT}{12,}?)\s*\)`, "gi");
+var CAUSE_LONG_RE = new RegExp(String.raw`\(\s*cause:(?:#([a-z][\w-]{0,63}))?\s*(${NEST2_UNIT}{8,}?)\s*\)`, "gi");
 var CAUSE_ARROW = /\s+(?:<-|←)\s+/;
 var ATTEMPT_RE = /\(\s*(tried|failed):(?:#([a-z][\w-]{0,63}))?\s*((?:[^()\n]|\([^()\n]*\)){8,}?)\s*\)/gi;
 var AIDS_PREFIX = /^\s*aids:(?:#([a-z][\w-]{0,63}))?\s*/i;
@@ -49723,7 +49728,7 @@ var DOMAIN_RE = /\(\s*domain:\s*([^()\n]{3,}?)\s*\)/gi;
 var PACKAGE_RE = /\(\s*package:\s*([^()\n]{2,}?)\s*\)/gi;
 var COMPONENT_RE = /\(\s*component:\s*([^()\n]{2,}?)\s*\)/gi;
 var CAUSE_TEXT_MIN = 8;
-var FLAG_RE = /\[([!?])(?:#([a-z][\w-]{0,63})\s+)?\s*([^\]\n]{8,}?)\s*(?:@\s*([^\s\]]+?)(?::(\d+))?\s*)?\]/g;
+var FLAG_RE = /\[([!?])(?:#([a-z][\w-]{0,63})\s+)?\s*((?:\[[^\]\n]*\]|[^\]\n]){8,}?)\s*(?:@\s*([^\s\]]+?)(?::(\d+))?\s*)?\]/g;
 var CONSTRAINT_MIN = 8;
 function clauseBefore(sentence, idx) {
   const win = sentence.slice(Math.max(0, idx - 80), idx);
@@ -49738,6 +49743,17 @@ function fixRationaleBefore(sentence, idx) {
   const clause = m ? win.slice(m.index + 1) : win;
   return clause.replace(/\s+/g, " ").trim();
 }
+function fixRationaleAfter(sentence, endIdx) {
+  const win = sentence.slice(endIdx, endIdx + FIX_RATIONALE_WINDOW).replace(new RegExp(CITE_GROUP_RE.source, "g"), " ").replace(new RegExp(FLAG_RE.source, "g"), " ");
+  const stripped = win.replace(/^[\s—:–,-]+/, "");
+  const m = /^[^.;!?—]*/.exec(stripped);
+  return (m ? m[0] : stripped).replace(/\s+/g, " ").trim();
+}
+function deriveFixRationale(sentence, startIdx, endIdx) {
+  const before = fixRationaleBefore(sentence, startIdx);
+  if (before.length >= FIX_RATIONALE_MIN) return before;
+  return fixRationaleAfter(sentence, endIdx);
+}
 function parseInlineTags(text) {
   const out2 = [];
   const deFenced = text.replace(/```[\s\S]*?```/g, " ");
@@ -49751,9 +49767,11 @@ function parseInlineTags(text) {
       (m) => /\[[!?]|\((?:fix|cause|constraint|tried|failed):|\(\[/.test(m) ? " " : m
     );
     const sfield = sentence.replace(/\s+/g, " ").trim().slice(0, 160);
+    const citeMatched = /* @__PURE__ */ new Set();
     CITE_GROUP_RE.lastIndex = 0;
     let g;
     while ((g = CITE_GROUP_RE.exec(sentence)) !== null) {
+      citeMatched.add(g.index);
       let content = g[1];
       if (/^\s*pattern:/i.test(content)) continue;
       const fixM = FIX_PREFIX.exec(content);
@@ -49807,7 +49825,7 @@ function parseInlineTags(text) {
       if (!isFix && NEG.test(clauseBefore(sentence, g.index))) continue;
       let fixRationale;
       if (isFix) {
-        const r = fixRationaleBefore(sentence, g.index);
+        const r = deriveFixRationale(sentence, g.index, g.index + g[0].length);
         if (r.length >= FIX_RATIONALE_MIN) fixRationale = r;
       }
       HANDLE_RE.lastIndex = 0;
@@ -49832,6 +49850,55 @@ function parseInlineTags(text) {
           out2.push({ kind: "fix", fixRationale: note, sentence: sfield, ...verbThread ? { threadId: verbThread } : {} });
       }
     }
+    for (const pass of [
+      { re: FIX_LONG_RE, isFix: true },
+      { re: CAUSE_LONG_RE, isFix: false }
+    ]) {
+      pass.re.lastIndex = 0;
+      let lm;
+      while ((lm = pass.re.exec(sentence)) !== null) {
+        if (citeMatched.has(lm.index)) continue;
+        const verbThread = lm[1] ?? void 0;
+        const content = lm[2];
+        HANDLE_RE.lastIndex = 0;
+        const h = HANDLE_RE.exec(content);
+        const handle2 = h ? h[1] ?? h[2] : void 0;
+        if (!pass.isFix) {
+          if (handle2) {
+            out2.push({ kind: "triage", handle: handle2, sentence: sfield, ...verbThread ? { threadId: verbThread } : {} });
+          } else {
+            const causeText = content.replace(/\s+/g, " ").trim();
+            if (causeText.length >= CAUSE_TEXT_MIN)
+              out2.push({ kind: "triage", causeText, sentence: sfield, ...verbThread ? { threadId: verbThread } : {} });
+          }
+          continue;
+        }
+        if (handle2) {
+          const inGroup = content.replace(new RegExp(HANDLE_RE.source, "gi"), " ").replace(/\s+/g, " ").trim();
+          const r = inGroup.length >= FIX_RATIONALE_MIN ? inGroup : deriveFixRationale(sentence, lm.index, lm.index + lm[0].length);
+          let emitted = false;
+          HANDLE_RE.lastIndex = 0;
+          let hh;
+          while ((hh = HANDLE_RE.exec(content)) !== null) {
+            const hcap = hh[1] ?? hh[2];
+            if (hcap) {
+              emitted = true;
+              out2.push({
+                kind: "fix",
+                handle: hcap,
+                sentence: sfield,
+                ...r.length >= FIX_RATIONALE_MIN ? { fixRationale: r } : {},
+                ...verbThread ? { threadId: verbThread } : {}
+              });
+            }
+          }
+          if (emitted) continue;
+        }
+        const note = content.replace(/\s+/g, " ").trim();
+        if (note.length >= FIX_RATIONALE_MIN)
+          out2.push({ kind: "fix", fixRationale: note, sentence: sfield, ...verbThread ? { threadId: verbThread } : {} });
+      }
+    }
     FLAG_RE.lastIndex = 0;
     let f;
     while ((f = FLAG_RE.exec(sentence)) !== null) {
@@ -51869,7 +51936,7 @@ function startLoopLagMonitor(thresholdMs = 1e3) {
 }
 
 // src/engine.ts
-var DAEMON_VERSION = true ? "2.0.2-dev.145" : "2.0.0-alpha.0";
+var DAEMON_VERSION = true ? "2.0.2-dev.156" : "2.0.0-alpha.0";
 var IGNORED_PATH = /[\\/](?:\.git|node_modules|\.errata|\.claude|\.codex|\.cursor|\.turbo|\.next|dist|coverage|test-results|playwright-report|__pycache__)(?:[\\/]|$)/;
 var IGNORED_NOISE = /castalia\.db|eventlog\.sqlite|turn-cursors/;
 var GIT_OP_MUTE_MS = 4e3;
@@ -54319,6 +54386,20 @@ async function startMultiDaemon(opts = {}) {
   let serverPending = null;
   const boundaryListeners = [];
   let boundaryFlushing = false;
+  let boundaryFlushStartedAt = 0;
+  let boundaryFlushStage = "";
+  const beginFlush = (stage) => {
+    boundaryFlushing = true;
+    boundaryFlushStartedAt = Date.now();
+    boundaryFlushStage = stage;
+  };
+  const flushStage = (stage) => {
+    boundaryFlushStage = stage;
+  };
+  const endFlush = () => {
+    boundaryFlushing = false;
+    boundaryFlushStage = "";
+  };
   const fireBoundary = () => {
     for (const l of boundaryListeners) {
       try {
@@ -55023,12 +55104,14 @@ async function startMultiDaemon(opts = {}) {
     },
     async sessionBoundaryFlush() {
       if (boundaryFlushing) return { uploaded: 0, written: 0, pruned: 0, skipped: "in-flight" };
-      boundaryFlushing = true;
+      beginFlush("embed");
       try {
         for (const r of records) {
           await r.engine.embedSettled();
         }
+        flushStage("instances");
         const inst = await daemon.syncInstancesPublic();
+        flushStage("skills");
         const skills = await daemon.syncSkillsAll();
         return {
           uploaded: inst.uploaded,
@@ -55037,7 +55120,7 @@ async function startMultiDaemon(opts = {}) {
           ...inst.errors ? { errors: inst.errors } : {}
         };
       } finally {
-        boundaryFlushing = false;
+        endFlush();
       }
     },
     onSessionBoundary(cb) {
@@ -55062,18 +55145,25 @@ async function startMultiDaemon(opts = {}) {
     }
   };
   app.post("/api/sync", async (c) => {
-    if (boundaryFlushing) return c.json({ skipped: "in-flight" }, 409);
-    boundaryFlushing = true;
+    if (boundaryFlushing)
+      return c.json(
+        { skipped: "in-flight", stage: boundaryFlushStage, ageMs: Date.now() - boundaryFlushStartedAt },
+        409
+      );
+    beginFlush("principles");
     try {
       const principles = await daemon.syncPrinciplesPublic();
+      flushStage("triage");
       const triage = await daemon.syncTriagePublic();
+      flushStage("instances");
       const instances = await daemon.syncInstancesPublic();
+      flushStage("edge-backfill");
       const edgeBackfill = await daemon.backfillCausalEdges();
       return c.json({ principles, triage, instances, edgeBackfill });
     } catch (err2) {
       return c.json({ error: err2 instanceof Error ? err2.message : String(err2) }, 500);
     } finally {
-      boundaryFlushing = false;
+      endFlush();
     }
   });
   app.post("/api/tick", async (c) => {
@@ -57900,7 +57990,18 @@ async function cmdSync(arg) {
         signal: AbortSignal.timeout(15 * 6e4)
       });
       if (res.status === 409) {
-        console.log("sync already running: the daemon is mid-drain \u2014 it will finish on its own. Nothing new was started.");
+        const body2 = await res.json().catch(() => null);
+        const ageMs = typeof body2?.ageMs === "number" ? body2.ageMs : 0;
+        const dur = ageMs >= 6e4 ? `${Math.floor(ageMs / 6e4)}m` : `${Math.max(1, Math.round(ageMs / 1e3))}s`;
+        const stage = body2?.stage ? ` \u2014 stage: ${body2.stage}` : "";
+        console.log(
+          ageMs > 0 ? `sync already running: the daemon has been draining for ${dur}${stage}. It will finish on its own; nothing new was started.` : "sync already running: the daemon is mid-drain \u2014 it will finish on its own. Nothing new was started."
+        );
+        if (ageMs > 30 * 6e4) {
+          console.log(
+            "  \u26A0 this pass has run past 30 min \u2014 if daemon.log shows no upload progress it may be stranded (a sleep/resume can do this). Restart with: errata stop && errata start"
+          );
+        }
         return;
       }
       if (!res.ok) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inerrata-corporation/errata",
-  "version": "2.0.2-dev.145",
+  "version": "2.0.2-dev.156",
   "description": "errata - local-first observation engine for AI coding agents",
   "type": "module",
   "bin": {