@mcoda/core 0.1.27 → 0.1.28

package/dist/services/planning/TaskSufficiencyService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TaskSufficiencyService.d.ts","sourceRoot":"","sources":["../../../src/services/planning/TaskSufficiencyService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAiC,MAAM,WAAW,CAAC;AAE/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AA6EnD,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,mBAAmB,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,6BAA6B;IAC5C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,aAAa,EAAE;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,UAAU,EAAE,6BAA6B,EAAE,CAAC;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,KAAK,mBAAmB,GAAG;IACzB,aAAa,EAAE,mBAAmB,CAAC;IACnC,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAuJF,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IACpD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IACxC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAU;IAC5C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAU;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsB;gBAG9C,SAAS,EAAE,mBAAmB,EAC9B,IAAI,EAAE,mBAAmB,EACzB,SAAS,GAAE;QAAE,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,OAAO,CAAA;KAAO;WAS9D,MAAM,CAAC,SAAS,EAAE,mBAAmB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAU9E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YASd,gBAAgB;YA4BhB,iBAAiB;YAmCjB,cAAc;YAcd,mBAAmB;IAwEjC,OAAO,CAAC,gBAAgB;IA2BxB,OAAO,CAAC,aAAa;IA+BrB,OAAO,CAAC,cAAc;YA8BR,iBAAiB;YAyGjB,cAAc;YAkHd,oBAAoB;IAkB5B,QAAQ,CAAC,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,0BAA0B,CAAC;CAmU1F"}
+{"version":3,"file":"TaskSufficiencyService.d.ts","sourceRoot":"","sources":["../../../src/services/planning/TaskSufficiencyService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAiC,MAAM,WAAW,CAAC;AAE/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAmGnD,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,mBAAmB,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,6BAA6B;IAC5C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,aAAa,EAAE;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,UAAU,EAAE,6BAA6B,EAAE,CAAC;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,KAAK,mBAAmB,GAAG;IACzB,aAAa,EAAE,mBAAmB,CAAC;IACnC,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAsNF,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IACpD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IACxC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAU;IAC5C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAU;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsB;gBAG9C,SAAS,EAAE,mBAAmB,EAC9B,IAAI,EAAE,mBAAmB,EACzB,SAAS,GAAE;QAAE,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,OAAO,CAAA;KAAO;WAS9D,MAAM,CAAC,SAAS,EAAE,mBAAmB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAU9E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YASd,gBAAgB;YA4BhB,iBAAiB;YAmCjB,cAAc;YAcd,mBAAmB;IAwEjC,OAAO,CAAC,gBAAgB;IA2BxB,OAAO,CAAC,aAAa;IA+BrB,OAAO,CAAC,cAAc;YA2BR,iBAAiB;YAyGjB,cAAc;YAkId,oBAAoB;IAkB5B,QAAQ,CAAC,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,0BAA0B,CAAC;CA2U1F"}

package/dist/services/planning/TaskSufficiencyService.js

@@ -6,16 +6,17 @@ import { JobService } from "../jobs/JobService.js";
 import { createEpicKeyGenerator, createStoryKeyGenerator, createTaskKeyGenerator } from "./KeyHelpers.js";
 const DEFAULT_MAX_ITERATIONS = 5;
 const DEFAULT_MAX_TASKS_PER_ITERATION = 24;
-const DEFAULT_MIN_COVERAGE_RATIO = 0.96;
+const DEFAULT_MIN_COVERAGE_RATIO = 1;
 const SDS_SCAN_MAX_FILES = 120;
 const SDS_HEADING_LIMIT = 200;
 const SDS_FOLDER_LIMIT = 240;
-const GAP_BUNDLE_SIZE = 4;
+const GAP_BUNDLE_MAX_ANCHORS = 3;
+const COVERAGE_HEURISTICS_VERSION = 2;
 const REPORT_FILE_NAME = "task-sufficiency-report.json";
 const ignoredDirs = new Set([".git", "node_modules", "dist", "build", ".mcoda", ".docdex"]);
 const sdsFilenamePattern = /(sds|software[-_ ]design|system[-_ ]design|design[-_ ]spec)/i;
 const sdsContentPattern = /(software design specification|system design specification|^#\s*sds\b)/im;
-const nonImplementationHeadingPattern = /\b(revision history|table of contents|purpose|scope|definitions?|abbreviations?|glossary|references?|appendix|document control|authors?)\b/i;
+const nonImplementationHeadingPattern = /\b(software design specification|system design specification|\bsds\b|revision history|table of contents|purpose|scope|definitions?|abbreviations?|glossary|references?|appendix|document control|authors?)\b/i;
 const likelyImplementationHeadingPattern = /\b(architecture|entity|entities|service|services|module|modules|component|components|pipeline|workflow|api|endpoint|schema|model|feature|store|database|ingestion|training|inference|ui|frontend|backend|ops|observability|security|deployment|solver|integration|testing|validation|contract|index|mapping|registry|cache|queue|event|job|task|migration|controller|router|policy)\b/i;
 const repoRootSegments = new Set([
     "apps",
@@ -43,6 +44,27 @@ const repoRootSegments = new Set([
     "web",
 ]);
 const headingNoiseTokens = new Set(["and", "for", "from", "into", "the", "with"]);
+const coverageStopTokens = new Set([
+    "about",
+    "across",
+    "after",
+    "before",
+    "between",
+    "from",
+    "into",
+    "over",
+    "under",
+    "using",
+    "with",
+    "without",
+    "into",
+    "onto",
+    "the",
+    "and",
+    "for",
+    "of",
+    "to",
+]);
 const normalizeText = (value) => value
     .toLowerCase()
     .replace(/[`*_]/g, " ")
@@ -123,13 +145,32 @@ const deriveFolderDomain = (entry) => {
 const extractMarkdownHeadings = (content, limit) => {
     if (!content)
         return [];
-    const matches = [...content.matchAll(/^\s{0,3}#{1,6}\s+(.+?)\s*$/gm)];
+    const lines = content.split(/\r?\n/);
     const headings = [];
-    for (const match of matches) {
-        const heading = match[1]?.replace(/#+$/, "").trim();
-        if (!heading)
+    for (let index = 0; index < lines.length; index += 1) {
+        const line = lines[index]?.trim() ?? "";
+        if (!line)
             continue;
-        headings.push(heading);
+        const hashHeading = line.match(/^#{1,6}\s+(.+)$/);
+        if (hashHeading) {
+            const heading = hashHeading[1]?.replace(/#+$/, "").trim();
+            if (heading)
+                headings.push(heading);
+        }
+        else if (index + 1 < lines.length &&
+            /^[=-]{3,}\s*$/.test((lines[index + 1] ?? "").trim()) &&
+            !line.startsWith("-") &&
+            !line.startsWith("*")) {
+            headings.push(line);
+        }
+        else {
+            const numberedHeading = line.match(/^(\d+(?:\.\d+)+)\s+(.+)$/);
+            if (numberedHeading) {
+                const heading = `${numberedHeading[1]} ${numberedHeading[2]}`.trim();
+                if (/[a-z]/i.test(heading))
+                    headings.push(heading);
+            }
+        }
         if (headings.length >= limit)
             break;
     }
@@ -158,39 +199,73 @@ const extractFolderEntries = (content, limit) => {
     }
     return unique(candidates).slice(0, limit);
 };
+const tokenizeCoverageSignal = (value) => unique(value
+    .split(/\s+/)
+    .map((token) => token.replace(/[^a-z0-9._-]+/g, ""))
+    .filter((token) => token.length >= 3 && !coverageStopTokens.has(token)));
+const buildBigrams = (tokens) => {
+    const bigrams = [];
+    for (let index = 0; index < tokens.length - 1; index += 1) {
+        const left = tokens[index];
+        const right = tokens[index + 1];
+        if (!left || !right)
+            continue;
+        bigrams.push(`${left} ${right}`);
+    }
+    return unique(bigrams);
+};
 const headingCovered = (corpus, heading) => {
-    const normalized = normalizeText(heading);
+    const normalized = normalizeText(normalizeHeadingCandidate(heading));
     if (!normalized)
         return true;
     if (corpus.includes(normalized))
         return true;
-    const tokens = normalized
-        .split(/\s+/)
-        .filter((token) => token.length >= 4)
-        .slice(0, 8);
+    const tokens = tokenizeCoverageSignal(normalized).slice(0, 10);
     if (tokens.length === 0)
         return true;
     const hitCount = tokens.filter((token) => corpus.includes(token)).length;
-    const minHits = Math.min(2, tokens.length);
-    return hitCount >= minHits;
+    const requiredHits = tokens.length <= 2
+        ? tokens.length
+        : tokens.length <= 4
+            ? 2
+            : Math.min(4, Math.ceil(tokens.length * 0.6));
+    if (hitCount < requiredHits)
+        return false;
+    if (tokens.length >= 3) {
+        const longestToken = tokens.reduce((longest, token) => (token.length > longest.length ? token : longest), "");
+        if (longestToken.length >= 6 && !corpus.includes(longestToken))
+            return false;
+    }
+    const bigrams = buildBigrams(tokens);
+    if (tokens.length >= 3 && bigrams.length > 0 && !bigrams.some((bigram) => corpus.includes(bigram))) {
+        return false;
+    }
+    return true;
 };
 const folderEntryCovered = (corpus, entry) => {
-    const normalized = normalizeText(entry).replace(/\s+/g, "");
-    if (!normalized)
+    const normalizedEntry = normalizeFolderEntry(entry)?.toLowerCase().replace(/\/+/g, "/");
+    if (!normalizedEntry)
         return true;
-    if (corpus.includes(normalized))
+    const corpusTight = corpus.replace(/\s+/g, "");
+    if (corpusTight.includes(normalizedEntry.replace(/\s+/g, "")))
         return true;
-    const segments = normalized.split("/").filter(Boolean);
+    const segments = normalizedEntry
+        .split("/")
+        .map((segment) => segment.trim().replace(/[^a-z0-9._-]+/g, ""))
+        .filter(Boolean);
     if (segments.length === 0)
         return true;
-    const leaf = segments[segments.length - 1];
-    const parent = segments.length > 1 ? segments[segments.length - 2] : undefined;
-    if (leaf && corpus.includes(leaf)) {
-        if (!parent)
-            return true;
-        return corpus.includes(parent);
+    const tailSegments = unique(segments.slice(Math.max(0, segments.length - 3)));
+    const hitCount = tailSegments.filter((segment) => corpus.includes(segment)).length;
+    const requiredHits = tailSegments.length <= 1 ? 1 : Math.min(2, tailSegments.length);
+    if (hitCount < requiredHits)
+        return false;
+    if (tailSegments.length >= 2) {
+        const hasStrongTokenMatch = tailSegments.some((segment) => segment.length >= 5 && corpus.includes(segment));
+        if (!hasStrongTokenMatch)
+            return false;
     }
-    return false;
+    return true;
 };
 const readJsonSafe = (raw, fallback) => {
     if (typeof raw !== "string" || raw.trim().length === 0)
@@ -417,33 +492,33 @@ export class TaskSufficiencyService {
         return items;
     }
     bundleGapItems(gapItems, limit) {
-        const groups = new Map();
-        const orderedKeys = [];
-        for (const item of gapItems) {
-            const key = `${item.domain}:${item.kind}`;
-            if (!groups.has(key)) {
-                groups.set(key, []);
-                orderedKeys.push(key);
-            }
-            groups.get(key)?.push(item);
-        }
         const bundles = [];
-        for (const key of orderedKeys) {
-            const group = groups.get(key) ?? [];
-            for (let index = 0; index < group.length; index += GAP_BUNDLE_SIZE) {
-                if (bundles.length >= limit)
-                    return bundles;
-                const chunk = group.slice(index, index + GAP_BUNDLE_SIZE);
-                const kinds = new Set(chunk.map((item) => item.kind));
-                bundles.push({
-                    kind: kinds.size > 1 ? "mixed" : chunk[0]?.kind ?? "section",
-                    domain: chunk[0]?.domain ?? "coverage",
-                    values: chunk.map((item) => item.value),
-                    normalizedAnchors: chunk.map((item) => item.normalizedAnchor),
-                });
+        const activeByDomain = new Map();
+        for (const item of gapItems.slice(0, limit)) {
+            const domainKey = item.domain;
+            let bundle = activeByDomain.get(domainKey);
+            if (!bundle || bundle.values.length >= GAP_BUNDLE_MAX_ANCHORS) {
+                bundle = {
+                    kind: item.kind,
+                    domain: item.domain,
+                    values: [],
+                    normalizedAnchors: [],
+                };
+                bundles.push(bundle);
+                activeByDomain.set(domainKey, bundle);
+            }
+            else if (bundle.kind !== item.kind) {
+                bundle.kind = "mixed";
             }
+            if (!bundle.values.includes(item.value))
+                bundle.values.push(item.value);
+            if (!bundle.normalizedAnchors.includes(item.normalizedAnchor)) {
+                bundle.normalizedAnchors.push(item.normalizedAnchor);
+            }
+            if (bundles.length >= limit)
+                break;
         }
-        return bundles;
+        return bundles.slice(0, limit);
     }
     async ensureTargetStory(project) {
         const db = this.workspaceRepo.getDb();
@@ -530,45 +605,59 @@ export class TaskSufficiencyService {
         const taskKeyGen = createTaskKeyGenerator(params.storyKey, existingTaskKeys);
         const now = new Date().toISOString();
         const taskInserts = params.gapBundles.map((bundle, index) => {
-            const domainLabel = bundle.domain.replace(/[-_]+/g, " ").trim();
-            const titlePrefix = bundle.kind === "section"
-                ? "Close SDS section coverage"
-                : bundle.kind === "folder"
-                    ? "Materialize SDS structure coverage"
-                    : "Close SDS coverage bundle";
-            const title = `${titlePrefix}: ${domainLabel || "implementation scope"}`.slice(0, 180);
+            const target = bundle.values[0] ?? "SDS coverage gap";
+            const scopeCount = bundle.values.length;
+            const domainLabel = bundle.domain.replace(/[-_]+/g, " ").trim() || "coverage";
+            const titlePrefix = bundle.kind === "folder"
+                ? "Implement SDS path"
+                : bundle.kind === "mixed"
+                    ? "Implement SDS bundle"
+                    : "Implement SDS section";
+            const title = scopeCount <= 1
+                ? `${titlePrefix}: ${target}`.slice(0, 180)
+                : `Implement SDS ${domainLabel} coverage bundle (${scopeCount} anchors)`.slice(0, 180);
             const objective = bundle.kind === "folder"
-                ? `Create or update implementation artifacts for ${bundle.values.length} SDS folder-tree requirement(s).`
-                : `Implement missing functionality for ${bundle.values.length} SDS section requirement(s).`;
+                ? scopeCount <= 1
+                    ? `Create or update production code under the SDS folder-tree path \`${target}\`.`
+                    : `Create or update production code for ${scopeCount} related SDS folder-tree paths in the ${domainLabel} domain.`
+                : bundle.kind === "mixed"
+                    ? `Implement a cohesive capability slice covering both SDS sections and folder targets in the ${domainLabel} domain.`
+                    : scopeCount <= 1
+                        ? `Implement the missing production functionality described by SDS section \`${target}\`.`
+                        : `Implement ${scopeCount} related SDS section requirements in the ${domainLabel} domain.`;
             const scopeLines = bundle.values.map((value) => `- ${value}`);
             const anchorLines = bundle.normalizedAnchors.map((anchor) => `- ${anchor}`);
             const description = [
-                `## Objective`,
+                "## Objective",
                 objective,
-                ``,
-                `## Context`,
+                "",
+                "## Context",
                 `- Generated by task-sufficiency-audit iteration ${params.iteration}.`,
                 `- Coverage domain: ${bundle.domain}`,
-                ``,
-                `## Anchor Scope`,
+                `- Scope kind: ${bundle.kind}`,
+                "",
+                "## Anchor Scope",
                 ...scopeLines,
-                ``,
-                `## Anchor Keys`,
+                "",
+                "## Anchor Keys",
                 ...anchorLines,
-                ``,
-                `## Implementation Plan`,
-                `- Implement production code for this bundle before adding follow-up docs-only changes.`,
-                `- Update module wiring/contracts touched by these anchors.`,
-                `- Ensure each anchor has deterministic evidence (tests or checks).`,
-                ``,
-                `## Testing`,
-                `- Add or update tests that validate each listed anchor scope.`,
-                `- Keep regression suites green after applying this bundle.`,
-                ``,
-                `## Definition of Done`,
-                `- All anchor scope items in this bundle are represented in implementation code.`,
-                `- Validation evidence exists for every anchor key listed above.`,
+                "",
+                "## Implementation Plan",
+                "- Phase 1: add or update contracts/interfaces used by this scope.",
+                "- Phase 2: implement production logic for each anchor item (no docs-only closure).",
+                "- Phase 3: wire dependencies and startup/runtime integration points affected by this scope.",
+                "- Keep implementation traceable to anchor keys in commit and test evidence.",
+                "",
+                "## Testing",
+                "- Add or update targeted unit/component/integration/API coverage for all listed anchors.",
+                "- Execute the smallest deterministic test scope that proves the behavior.",
+                "",
+                "## Definition of Done",
+                "- All anchor scope items in this bundle are represented in working code.",
+                "- Validation evidence exists and maps back to each anchor key.",
             ].join("\n");
+            const storyPointsBase = bundle.kind === "folder" ? 1 : 2;
+            const storyPoints = Math.min(8, Math.max(2, storyPointsBase + scopeCount + (bundle.kind === "mixed" ? 1 : 0)));
             return {
                 projectId: params.project.id,
                 epicId: params.epicId,
@@ -578,13 +667,14 @@ export class TaskSufficiencyService {
                 description,
                 type: "feature",
                 status: "not_started",
-                storyPoints: Math.min(5, Math.max(2, bundle.normalizedAnchors.length)),
+                storyPoints,
                 priority: params.maxPriority + index + 1,
                 metadata: {
                     sufficiencyAudit: {
                         source: "task-sufficiency-audit",
                         kind: bundle.kind,
                         domain: bundle.domain,
+                        scopeCount,
                         values: bundle.values,
                         anchor: bundle.normalizedAnchors[0],
                         anchors: bundle.normalizedAnchors,
@@ -670,8 +760,9 @@ export class TaskSufficiencyService {
             if (skippedHeadingSignals > 0 || skippedFolderSignals > 0) {
                 warnings.push(`Filtered non-actionable SDS signals (headings=${skippedHeadingSignals}, folders=${skippedFolderSignals}) before remediation.`);
             }
-            if (sectionHeadings.length === 0 && folderEntries.length === 0) {
-                warnings.push("No actionable implementation signals detected from SDS headings/folder tree after filtering; audit will report coverage only.");
+            const noActionableSignals = sectionHeadings.length === 0 && folderEntries.length === 0;
+            if (noActionableSignals) {
+                warnings.push("No actionable implementation signals detected from SDS headings/folder tree after filtering.");
             }
             await this.jobService.writeCheckpoint(job.id, {
                 stage: "sds_loaded",
@@ -687,6 +778,9 @@ export class TaskSufficiencyService {
                     docs: sdsDocs.map((doc) => path.relative(request.workspace.workspaceRoot, doc.path)),
                 },
             });
+            if (noActionableSignals) {
+                throw new Error("task-sufficiency-audit could not derive actionable SDS implementation signals after filtering. Expand SDS implementation headings/folder tree and retry.");
+            }
             const iterations = [];
             let totalTasksAdded = 0;
             const totalTasksUpdated = 0;
@@ -720,7 +814,7 @@ export class TaskSufficiencyService {
                     });
                     break;
                 }
-                const gapItems = this.buildGapItems(coverage, snapshot.existingAnchors, maxTasksPerIteration * GAP_BUNDLE_SIZE);
+                const gapItems = this.buildGapItems(coverage, snapshot.existingAnchors, maxTasksPerIteration);
                 const gapBundles = this.bundleGapItems(gapItems, maxTasksPerIteration);
                 if (gapBundles.length === 0) {
                     warnings.push(`Iteration ${iteration}: unresolved SDS gaps remain but no insertable gap items were identified.`);
@@ -812,6 +906,7 @@ export class TaskSufficiencyService {
                 projectKey: request.projectKey,
                 sourceCommand,
                 generatedAt: new Date().toISOString(),
+                coverageHeuristicsVersion: COVERAGE_HEURISTICS_VERSION,
                 dryRun,
                 maxIterations,
                 maxTasksPerIteration,

package/dist/services/review/CodeReviewService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CodeReviewService.d.ts","sourceRoot":"","sources":["../../../src/services/review/CodeReviewService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CodeReviewService.d.ts","sourceRoot":"","sources":["../../../src/services/review/CodeReviewService.ts"],"names":[],"mappings":"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"}

package/dist/services/review/CodeReviewService.js

@@ -207,6 +207,90 @@ const normalizeSlugList = (input) => {
     }
     return Array.from(cleaned);
 };
+const isRecord = (value) => Boolean(value && typeof value === "object" && !Array.isArray(value));
+const normalizeFailoverEvents = (value) => {
+    if (!Array.isArray(value))
+        return [];
+    const events = [];
+    for (const entry of value) {
+        if (!isRecord(entry))
+            continue;
+        if (typeof entry.type !== "string" || entry.type.trim().length === 0)
+            continue;
+        events.push({ ...entry });
+    }
+    return events;
+};
+const mergeFailoverEvents = (left, right) => {
+    if (!left.length)
+        return right;
+    if (!right.length)
+        return left;
+    const seen = new Set();
+    const merged = [];
+    const signature = (event) => [
+        event.type ?? "",
+        event.fromAgentId ?? "",
+        event.toAgentId ?? "",
+        event.at ?? "",
+        event.until ?? "",
+        event.durationMs ?? "",
+    ].join("|");
+    for (const event of [...left, ...right]) {
+        const key = signature(event);
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        merged.push(event);
+    }
+    return merged;
+};
+const mergeInvocationMetadata = (current, incoming) => {
+    if (!current && !incoming)
+        return undefined;
+    if (!incoming)
+        return current;
+    if (!current)
+        return { ...incoming };
+    const merged = { ...current, ...incoming };
+    const currentEvents = normalizeFailoverEvents(current.failoverEvents);
+    const incomingEvents = normalizeFailoverEvents(incoming.failoverEvents);
+    if (currentEvents.length > 0 || incomingEvents.length > 0) {
+        merged.failoverEvents = mergeFailoverEvents(currentEvents, incomingEvents);
+    }
+    return merged;
+};
+const summarizeFailoverEvent = (event) => {
+    const type = String(event.type ?? "unknown");
+    if (type === "switch_agent") {
+        const from = typeof event.fromAgentId === "string" ? event.fromAgentId : "unknown";
+        const to = typeof event.toAgentId === "string" ? event.toAgentId : "unknown";
+        return `switch_agent ${from} -> ${to}`;
+    }
+    if (type === "sleep_until_reset") {
+        const duration = typeof event.durationMs === "number" && Number.isFinite(event.durationMs)
+            ? `${Math.round(event.durationMs / 1000)}s`
+            : "unknown duration";
+        const until = typeof event.until === "string" ? event.until : "unknown";
+        return `sleep_until_reset ${duration} (until ${until})`;
+    }
+    if (type === "stream_restart_after_limit") {
+        const from = typeof event.fromAgentId === "string" ? event.fromAgentId : "unknown";
+        return `stream_restart_after_limit from ${from}`;
+    }
+    return type;
+};
+const resolveFailoverAgentId = (events, fallbackAgentId) => {
+    for (let index = events.length - 1; index >= 0; index -= 1) {
+        const event = events[index];
+        if (event?.type !== "switch_agent")
+            continue;
+        if (typeof event.toAgentId === "string" && event.toAgentId.trim().length > 0) {
+            return event.toAgentId;
+        }
+    }
+    return fallbackAgentId;
+};
 const normalizePath = (value) => value
     .replace(/\\/g, "/")
     .replace(/^\.\//, "")
@@ -1990,6 +2074,45 @@ export class CodeReviewService {
                         metadata: { commandName: "code-review", phase, action: phase, attempt },
                     });
                 };
+                const logFailoverEvents = async (events) => {
+                    if (!events.length)
+                        return;
+                    for (const event of events) {
+                        await this.deps.workspaceRepo.insertTaskLog({
+                            taskRunId: taskRun.id,
+                            sequence: this.sequenceForTask(taskRun.id),
+                            timestamp: new Date().toISOString(),
+                            source: "agent_failover",
+                            message: `Agent failover: ${summarizeFailoverEvent(event)}`,
+                            details: event,
+                        });
+                    }
+                };
+                const resolveUsageAgent = async (fallback, events) => {
+                    const usageAgentId = resolveFailoverAgentId(events, fallback.id);
+                    if (usageAgentId === fallback.id)
+                        return fallback;
+                    const resolver = this.deps.agentService?.resolveAgent;
+                    if (typeof resolver !== "function")
+                        return fallback;
+                    try {
+                        const resolved = await resolver.call(this.deps.agentService, usageAgentId);
+                        return {
+                            id: resolved.id,
+                            defaultModel: typeof resolved.defaultModel === "string" ? resolved.defaultModel : fallback.defaultModel,
+                        };
+                    }
+                    catch (error) {
+                        await this.deps.workspaceRepo.insertTaskLog({
+                            taskRunId: taskRun.id,
+                            sequence: this.sequenceForTask(taskRun.id),
+                            timestamp: new Date().toISOString(),
+                            source: "agent_failover",
+                            message: `Unable to resolve failover agent (${usageAgentId}) for usage accounting: ${error instanceof Error ? error.message : String(error)}`,
+                        });
+                        return fallback;
+                    }
+                };
                 agentOutput = "";
                 let durationSeconds = 0;
                 let lastStreamMeta;
@@ -2002,7 +2125,7 @@ export class CodeReviewService {
                     if (useStream && this.deps.agentService.invokeStream) {
                         const stream = await withAbort(this.deps.agentService.invokeStream(agentToUse.id, {
                             input: prompt,
-                            metadata: { taskKey: task.key, retry: logSource === "agent_retry" },
+                            metadata: { command: "code-review", taskKey: task.key, retry: logSource === "agent_retry" },
                         }));
                         while (true) {
                             abortIfSignaled();
@@ -2011,7 +2134,7 @@ export class CodeReviewService {
                                 break;
                             const chunk = value;
                             output += chunk.output ?? "";
-                            metadata = chunk.metadata ?? metadata;
+                            metadata = mergeInvocationMetadata(metadata, chunk.metadata);
                             await this.deps.workspaceRepo.insertTaskLog({
                                 taskRunId: taskRun.id,
                                 sequence: this.sequenceForTask(taskRun.id),
@@ -2024,10 +2147,10 @@ export class CodeReviewService {
                     else {
                         const response = await withAbort(this.deps.agentService.invoke(agentToUse.id, {
                             input: prompt,
-                            metadata: { taskKey: task.key, retry: logSource === "agent_retry" },
+                            metadata: { command: "code-review", taskKey: task.key, retry: logSource === "agent_retry" },
                         }));
                         output = response.output ?? "";
-                        metadata = response.metadata;
+                        metadata = mergeInvocationMetadata(metadata, response.metadata);
                         await this.deps.workspaceRepo.insertTaskLog({
                             taskRunId: taskRun.id,
                             sequence: this.sequenceForTask(taskRun.id),
@@ -2074,7 +2197,15 @@ export class CodeReviewService {
                         model: (lastStreamMeta.model ?? lastStreamMeta.model_name ?? null),
                     }
                     : undefined;
-                await recordUsage("review_main", prompt, agentOutput, durationSeconds, tokenMetaMain, agentUsedForOutput, outputAttempt);
+                const mainFailoverEvents = normalizeFailoverEvents(lastStreamMeta?.failoverEvents);
+                await logFailoverEvents(mainFailoverEvents);
+                const usageAgentForOutput = await resolveUsageAgent({
+                    id: agentUsedForOutput.id,
+                    defaultModel: typeof agentUsedForOutput?.defaultModel === "string"
+                        ? agentUsedForOutput.defaultModel
+                        : undefined,
+                }, mainFailoverEvents);
+                await recordUsage("review_main", prompt, agentOutput, durationSeconds, tokenMetaMain, usageAgentForOutput, outputAttempt);
                 const primaryOutput = agentOutput;
                 let retryOutput;
                 let retryAgentUsed;
@@ -2126,7 +2257,10 @@ export class CodeReviewService {
                             message: `Retrying with JSON-only agent override: ${retryAgentUsed.slug ?? retryAgentUsed.id}`,
                         });
                     }
-                    const retryResp = await withAbort(this.deps.agentService.invoke(retryAgentUsed.id, { input: retryPrompt, metadata: { taskKey: task.key, retry: true } }));
+                    const retryResp = await withAbort(this.deps.agentService.invoke(retryAgentUsed.id, {
+                        input: retryPrompt,
+                        metadata: { command: "code-review", taskKey: task.key, retry: true },
+                    }));
                     retryOutput = retryResp.output ?? "";
                     const retryDuration = Math.round(((Date.now() - retryStarted) / 1000) * 1000) / 1000;
                     await this.deps.workspaceRepo.insertTaskLog({
@@ -2150,7 +2284,15 @@ export class CodeReviewService {
                             model: (retryResp.metadata.model ?? retryResp.metadata.model_name ?? null),
                         }
                         : undefined;
-                    await recordUsage("review_retry", retryPrompt, retryOutput, retryDuration, retryTokenMeta, retryAgentUsed, 2);
+                    const retryFailoverEvents = normalizeFailoverEvents(retryResp.metadata?.failoverEvents);
+                    await logFailoverEvents(retryFailoverEvents);
+                    const retryUsageAgent = await resolveUsageAgent({
+                        id: retryAgentUsed.id,
+                        defaultModel: typeof retryAgentUsed?.defaultModel === "string"
+                            ? retryAgentUsed.defaultModel
+                            : undefined,
+                    }, retryFailoverEvents);
+                    await recordUsage("review_retry", retryPrompt, retryOutput, retryDuration, retryTokenMeta, retryUsageAgent, 2);
                     normalization = normalizeReviewOutput(retryOutput);
                     parsed = normalization.result;
                     validationError = validateReviewOutput(parsed, { requireCommentSlugs });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcoda/core",
-  "version": "0.1.27",
+  "version": "0.1.28",
   "description": "Core services and APIs for the mcoda CLI.",
   "type": "module",
   "main": "dist/index.js",
@@ -32,11 +32,11 @@
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
     "yaml": "^2.4.2",
-    "@mcoda/shared": "0.1.27",
-    "@mcoda/db": "0.1.27",
-    "@mcoda/generators": "0.1.27",
-    "@mcoda/integrations": "0.1.27",
-    "@mcoda/agents": "0.1.27"
+    "@mcoda/shared": "0.1.28",
+    "@mcoda/generators": "0.1.28",
+    "@mcoda/db": "0.1.28",
+    "@mcoda/agents": "0.1.28",
+    "@mcoda/integrations": "0.1.28"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",