agentplane 0.3.10 → 0.3.11

package/dist/runtime/incidents/resolve.js

@@ -1,8 +1,12 @@
-const INCIDENTS_HEADER = [
+const STRUCTURED_INCIDENTS_HEADER = [
     "# Policy Incidents Log",
     "",
     "This is the single file for incident-derived and situational policy rules.",
 ].join("\n");
+const COMPACT_INCIDENTS_HEADER = [
+    "# Policy Incidents Log",
+    "- Append-only. Required fields: `id`, `date`, `scope`, `failure`, `rule`, `evidence`, `enforcement`, `state`; optional: `tags`, `match`, `advice`, `source_task`, `fixability`.",
+].join("\n");
 function normalizeLines(text) {
     return text.replaceAll("\r\n", "\n").split("\n");
 }
@@ -50,12 +54,26 @@ function parseCsvList(value) {
         .map((item) => item.trim())
         .filter(Boolean));
 }
+function incidentField(key, value) {
+    return [key, value];
+}
 function parseBoolean(value) {
     const normalized = String(value ?? "")
         .trim()
         .toLowerCase();
     return normalized === "true" || normalized === "yes" || normalized === "y" || normalized === "1";
 }
+function parseFixability(value) {
+    const normalized = String(value ?? "")
+        .trim()
+        .toLowerCase()
+        .replaceAll(/[\s_-]+/g, "");
+    if (normalized === "external")
+        return "external";
+    if (normalized === "repofixable" || normalized === "internal")
+        return "repo-fixable";
+    return null;
+}
 function parseEntryState(value) {
     return value === "open" || value === "promoted" ? value : "stabilized";
 }
@@ -66,21 +84,94 @@ function appendFieldValue(record, key, value, joiner = " ") {
     }
     record[key] = `${record[key]}${joiner}${value.trim()}`.trim();
 }
-function buildIncidentFingerprint(entry) {
+function deriveSourceTask(explicitSourceTask, evidence) {
+    const direct = String(explicitSourceTask ?? "").trim();
+    if (direct)
+        return direct;
+    const match = /\btasks?\s+([A-Za-z0-9-]+)/iu.exec(String(evidence ?? ""));
+    return match?.[1]?.trim() ?? null;
+}
+function buildIncidentSignature(entry) {
     return [
-        entry.sourceTask ?? "",
         normalizeSearchText(entry.scope),
         normalizeSearchText(entry.failure),
         normalizeSearchText(entry.rule),
     ].join("|");
 }
+function buildIncidentFingerprint(entry) {
+    return [entry.sourceTask ?? "", buildIncidentSignature(entry)].join("|");
+}
 function buildMatchTerms(opts) {
     const scopeTokens = tokenize(opts.scope);
-    return dedupeCaseInsensitive([...opts.explicitMatch, ...opts.tags, ...scopeTokens]).slice(0, 12);
+    const extraTokens = (opts.extraText ?? []).flatMap((value) => tokenize(value));
+    return dedupeCaseInsensitive([
+        ...opts.explicitMatch,
+        ...opts.tags,
+        ...scopeTokens,
+        ...extraTokens,
+    ]).slice(0, 16);
+}
+function parseDateOnly(value) {
+    if (!/^\d{4}-\d{2}-\d{2}$/.test(value))
+        return null;
+    const parsed = Date.parse(`${value}T00:00:00.000Z`);
+    return Number.isFinite(parsed) ? parsed : null;
+}
+function occursWithinDays(date, now, days) {
+    const timestamp = parseDateOnly(date);
+    if (timestamp === null)
+        return false;
+    const delta = now.getTime() - timestamp;
+    if (delta < 0)
+        return false;
+    return delta <= days * 24 * 60 * 60 * 1000;
+}
+function entryStateRank(state) {
+    if (state === "promoted")
+        return 2;
+    if (state === "stabilized")
+        return 1;
+    return 0;
+}
+function compareIncidentAdviceMatch(left, right) {
+    if (right.score !== left.score)
+        return right.score - left.score;
+    const rightState = entryStateRank(right.entry.state);
+    const leftState = entryStateRank(left.entry.state);
+    if (rightState !== leftState)
+        return rightState - leftState;
+    return right.entry.date.localeCompare(left.entry.date);
+}
+function summarizeTaskScope(scope, title) {
+    const lines = normalizeLines(scope ?? "");
+    for (const line of lines) {
+        const trimmed = line.trim();
+        if (!trimmed)
+            continue;
+        let candidate = trimmed.replace(/^-+\s*/, "");
+        candidate = candidate.replace(/^in scope:\s*/i, "").trim();
+        if (!candidate || /^out of scope:/i.test(candidate))
+            continue;
+        return candidate;
+    }
+    return title.trim();
+}
+function buildDerivedIncidentRule(scope) {
+    return `Analogous ${scope} work MUST review and apply the recorded external incident advice before retrying.`;
+}
+function resolveIncidentState(opts) {
+    const signature = buildIncidentSignature(opts.entry);
+    const similarEntries = opts.registry.entries.filter((candidate) => buildIncidentSignature(candidate) === signature);
+    if (similarEntries.some((candidate) => candidate.state === "promoted" ||
+        candidate.state === "stabilized" ||
+        occursWithinDays(candidate.date, opts.now, 30))) {
+        return "stabilized";
+    }
+    return "open";
 }
 export function createIncidentRegistrySkeleton() {
     return [
-        INCIDENTS_HEADER,
+        STRUCTURED_INCIDENTS_HEADER,
         "",
         "## Entry contract",
         "",
@@ -88,7 +179,9 @@ export function createIncidentRegistrySkeleton() {
         "- Every entry MUST include: `id`, `date`, `scope`, `failure`, `rule`, `evidence`, `enforcement`, `state`.",
         "- New machine-matched entries SHOULD also include: `tags`, `match`, `advice`, `source_task`, `fixability`.",
         "- `rule` MUST be concrete and testable (`MUST` / `MUST NOT`).",
-        "- `fixability: external` means the issue cannot be removed by changing only repository code and should instead stay as reusable operational advice.",
+        "- `fixability: external` means the issue cannot be removed by changing only repository code and should stay as reusable operational advice.",
+        "- `fixability: repo-fixable` means the issue can be removed by repository code changes and should still be captured as reusable incident advice when explicitly marked.",
+        "- First auto-promoted reusable incidents normally enter as `open` and still participate in targeted advice lookup; recurring equivalent incidents can append later `stabilized` entries.",
         "- `state` values: `open`, `stabilized`, `promoted`.",
         "",
         "## Entry template",
@@ -104,7 +197,7 @@ export function createIncidentRegistrySkeleton() {
         "- evidence: `<task ids / logs / links>`",
         "- enforcement: `<CI|test|lint|script|manual>`",
         "- source_task: `<task id>`",
-        "- fixability: `<external>`",
+        "- fixability: `<external|repo-fixable>`",
         "- state: `<open|stabilized|promoted>`",
         "",
         "## Entries",
@@ -114,7 +207,6 @@ export function createIncidentRegistrySkeleton() {
 export function parseIncidentRegistry(text) {
     const lines = normalizeLines(text);
     const entries = [];
-    let inEntries = false;
     let currentFields = null;
     let currentLine = 0;
     let currentKey = null;
@@ -122,7 +214,7 @@ export function parseIncidentRegistry(text) {
         if (!currentFields)
             return;
         const id = currentFields.id?.trim();
-        if (!id) {
+        if (!id || !/^INC-\d{8}-\d+$/u.test(id)) {
             currentFields = null;
             currentKey = null;
             currentLine = 0;
@@ -133,6 +225,7 @@ export function parseIncidentRegistry(text) {
         const rule = currentFields.rule?.trim() ?? "";
         const evidence = currentFields.evidence?.trim() ?? "";
         const enforcement = currentFields.enforcement?.trim() ?? "manual";
+        const sourceTask = deriveSourceTask(currentFields.source_task, evidence);
         entries.push({
             id,
             date: currentFields.date?.trim() ?? "",
@@ -145,8 +238,8 @@ export function parseIncidentRegistry(text) {
             tags: parseCsvList(currentFields.tags),
             match: parseCsvList(currentFields.match),
             advice: currentFields.advice?.trim() || null,
-            sourceTask: currentFields.source_task?.trim() || null,
-            fixability: currentFields.fixability?.trim().toLowerCase() === "external" ? "external" : null,
+            sourceTask,
+            fixability: parseFixability(currentFields.fixability),
             rawFields: { ...currentFields },
             line: currentLine,
         });
@@ -156,23 +249,21 @@ export function parseIncidentRegistry(text) {
     };
     for (const [index, line] of lines.entries()) {
         const trimmed = line.trim();
-        if (!inEntries) {
-            if (trimmed === "## Entries")
-                inEntries = true;
-            continue;
-        }
-        if (/^##\s+/.test(trimmed))
-            break;
-        const idMatch = /^- id:\s*(.+?)\s*$/.exec(trimmed);
-        if (idMatch) {
+        const inlineFields = parseInlineIncidentEntry(trimmed);
+        if (inlineFields) {
             flush();
-            currentFields = { id: idMatch[1] ?? "" };
-            currentKey = "id";
+            currentFields = { ...inlineFields };
+            const keys = Object.keys(inlineFields);
+            currentKey = keys.at(-1) ?? "id";
             currentLine = index + 1;
             continue;
         }
         if (!currentFields)
             continue;
+        if (/^##\s+/.test(trimmed)) {
+            flush();
+            continue;
+        }
         const fieldMatch = /^\s{2}([a-z_]+):\s*(.*?)\s*$/.exec(line);
         if (fieldMatch) {
             currentKey = String(fieldMatch[1] ?? "").trim();
@@ -191,32 +282,151 @@ export function parseIncidentRegistry(text) {
     return { entries };
 }
 export function formatIncidentRegistryEntry(entry) {
+    return formatIncidentRegistryEntryForStyle(entry, "structured");
+}
+function parseInlineIncidentEntry(trimmedLine) {
+    if (!trimmedLine.startsWith("- "))
+        return null;
+    const body = trimmedLine.slice(2).trim();
+    if (!body)
+        return null;
+    const segments = body.split(/\s+\|\s+(?=[a-z_]+:\s*)/u);
+    const fields = {};
+    for (const segment of segments) {
+        const match = /^([a-z_]+):\s*(.*?)\s*$/.exec(segment.trim());
+        if (!match)
+            return null;
+        const key = String(match[1] ?? "").trim();
+        if (!key)
+            return null;
+        fields[key] = match[2] ?? "";
+    }
+    return fields.id ? fields : null;
+}
+function formatIncidentRegistryEntryForStyle(entry, style) {
+    const compactFields = [
+        incidentField("id", entry.id),
+        incidentField("date", entry.date),
+        incidentField("scope", entry.scope),
+        ...(entry.tags.length > 0 ? [incidentField("tags", entry.tags.join(", "))] : []),
+        ...(entry.match.length > 0 ? [incidentField("match", entry.match.join(", "))] : []),
+        incidentField("failure", entry.failure),
+        ...(entry.advice ? [incidentField("advice", entry.advice)] : []),
+        incidentField("rule", entry.rule),
+        incidentField("evidence", entry.evidence),
+        incidentField("enforcement", entry.enforcement),
+        ...(entry.fixability ? [incidentField("fixability", entry.fixability)] : []),
+        incidentField("state", entry.state),
+    ];
+    if (style === "compact") {
+        return `- ${compactFields.map(([key, value]) => `${key}: ${value}`).join(" | ")}`;
+    }
+    const structuredFields = [
+        incidentField("id", entry.id),
+        incidentField("date", entry.date),
+        incidentField("scope", entry.scope),
+        ...(entry.tags.length > 0 ? [incidentField("tags", entry.tags.join(", "))] : []),
+        ...(entry.match.length > 0 ? [incidentField("match", entry.match.join(", "))] : []),
+        incidentField("failure", entry.failure),
+        ...(entry.advice ? [incidentField("advice", entry.advice)] : []),
+        incidentField("rule", entry.rule),
+        incidentField("evidence", entry.evidence),
+        incidentField("enforcement", entry.enforcement),
+        ...(entry.sourceTask ? [incidentField("source_task", entry.sourceTask)] : []),
+        ...(entry.fixability ? [incidentField("fixability", entry.fixability)] : []),
+        incidentField("state", entry.state),
+    ];
     return [
-        `- id: ${entry.id}`,
-        `  date: ${entry.date}`,
-        `  scope: ${entry.scope}`,
-        ...(entry.tags.length > 0 ? [`  tags: ${entry.tags.join(", ")}`] : []),
-        ...(entry.match.length > 0 ? [`  match: ${entry.match.join(", ")}`] : []),
-        `  failure: ${entry.failure}`,
-        ...(entry.advice ? [`  advice: ${entry.advice}`] : []),
-        `  rule: ${entry.rule}`,
-        `  evidence: ${entry.evidence}`,
-        `  enforcement: ${entry.enforcement}`,
-        ...(entry.sourceTask ? [`  source_task: ${entry.sourceTask}`] : []),
-        ...(entry.fixability ? [`  fixability: ${entry.fixability}`] : []),
-        `  state: ${entry.state}`,
+        `- ${structuredFields[0]?.[0]}: ${structuredFields[0]?.[1] ?? ""}`,
+        ...structuredFields.slice(1).map(([key, value]) => `  ${key}: ${value}`),
     ].join("\n");
 }
+function detectRegistryStyle(text) {
+    return /(^|\n)## Entries\s*$/mu.test(text) || /(^|\n)## Entry contract\s*$/mu.test(text)
+        ? "structured"
+        : "compact";
+}
+function entryRichness(entry) {
+    return [
+        entry.sourceTask ? 4 : 0,
+        entry.advice ? 3 : 0,
+        entry.tags.length,
+        entry.match.length,
+        entry.fixability ? 1 : 0,
+        entry.evidence.length > 0 ? 1 : 0,
+    ].reduce((sum, item) => sum + item, 0);
+}
+function nextIncidentIdForDate(dateStamp, usedIds, nextByDate) {
+    let next = nextByDate.get(dateStamp) ?? 0;
+    do {
+        next += 1;
+    } while (usedIds.has(`INC-${dateStamp}-${String(next).padStart(2, "0")}`));
+    nextByDate.set(dateStamp, next);
+    return `INC-${dateStamp}-${String(next).padStart(2, "0")}`;
+}
+function normalizeIncidentRegistryEntries(entries) {
+    const byFingerprint = new Map();
+    const orderedFingerprints = [];
+    for (const entry of entries) {
+        const fingerprint = buildIncidentFingerprint(entry);
+        const existing = byFingerprint.get(fingerprint);
+        if (!existing) {
+            byFingerprint.set(fingerprint, { ...entry });
+            orderedFingerprints.push(fingerprint);
+            continue;
+        }
+        if (entryRichness(entry) >= entryRichness(existing)) {
+            byFingerprint.set(fingerprint, { ...entry });
+        }
+    }
+    const normalized = orderedFingerprints.map((fingerprint) => byFingerprint.get(fingerprint));
+    const usedIds = new Set();
+    const nextByDate = new Map();
+    for (const entry of normalized) {
+        const match = /^INC-(\d{8})-(\d+)$/u.exec(entry.id);
+        if (!match)
+            continue;
+        const [, dateStamp, seqRaw] = match;
+        const seq = Number.parseInt(seqRaw ?? "", 10);
+        if (!Number.isInteger(seq))
+            continue;
+        const existing = nextByDate.get(dateStamp) ?? 0;
+        if (seq > existing)
+            nextByDate.set(dateStamp, seq);
+    }
+    return normalized.map((entry) => {
+        const dateStamp = /^\d{4}-\d{2}-\d{2}$/u.test(entry.date)
+            ? entry.date.replaceAll("-", "")
+            : "00000000";
+        const nextId = usedIds.has(entry.id)
+            ? nextIncidentIdForDate(dateStamp, usedIds, nextByDate)
+            : entry.id;
+        usedIds.add(nextId);
+        return nextId === entry.id ? entry : { ...entry, id: nextId };
+    });
+}
+function renderIncidentRegistryDocument(entries, style) {
+    const header = style === "structured" ? createIncidentRegistrySkeleton().trimEnd() : COMPACT_INCIDENTS_HEADER;
+    if (entries.length === 0)
+        return `${header}\n`;
+    const separator = style === "structured" ? "\n\n" : "\n";
+    return `${header}\n${entries.map((entry) => formatIncidentRegistryEntryForStyle(entry, style)).join(separator)}\n`;
+}
 export function appendIncidentRegistryEntries(currentText, entries) {
     if (entries.length === 0)
         return currentText;
-    const base = currentText.trim().length > 0
-        ? currentText.trimEnd()
-        : createIncidentRegistrySkeleton().trimEnd();
-    const suffix = entries.map((entry) => formatIncidentRegistryEntry(entry)).join("\n\n");
-    return `${base}\n\n${suffix}\n`;
+    const baseText = currentText.trim().length > 0 ? currentText : createIncidentRegistrySkeleton();
+    const style = detectRegistryStyle(baseText);
+    const existing = parseIncidentRegistry(baseText);
+    const merged = normalizeIncidentRegistryEntries([...existing.entries, ...entries]);
+    return renderIncidentRegistryDocument(merged, style);
 }
 export function extractIncidentCandidatesFromFindings(findings) {
+    return parseIncidentFindingBlocks(findings)
+        .filter((candidate) => candidate.shouldPromote)
+        .map(({ shouldPromote: _shouldPromote, ...candidate }) => candidate);
+}
+function parseIncidentFindingBlocks(findings) {
     const lines = normalizeLines(findings);
     const candidates = [];
     let currentFields = null;
@@ -225,13 +435,11 @@ export function extractIncidentCandidatesFromFindings(findings) {
     const flush = () => {
         if (!currentFields)
             return;
-        const promotion = currentFields.promotion?.trim() ?? "";
-        if (promotion.toLowerCase() !== "incident-candidate") {
-            currentFields = null;
-            currentKey = null;
-            currentLine = 0;
-            return;
-        }
+        const promotion = currentFields.promotion?.trim() || null;
+        const fixability = parseFixability(currentFields.fixability);
+        const incidentExternal = parseBoolean(currentFields.incidentexternal) || fixability === "external";
+        const incidentInternal = parseBoolean(currentFields.incidentinternal) || fixability === "repo-fixable";
+        const shouldPromote = promotion?.toLowerCase() === "incident-candidate" || incidentExternal || incidentInternal;
         const observation = currentFields.observation?.trim() ?? "";
         if (!observation) {
             currentFields = null;
@@ -249,7 +457,10 @@ export function extractIncidentCandidatesFromFindings(findings) {
             incidentAdvice: currentFields.incidentadvice?.trim() || null,
             incidentTags: parseCsvList(currentFields.incidenttags),
             incidentMatch: parseCsvList(currentFields.incidentmatch),
-            incidentExternal: parseBoolean(currentFields.incidentexternal),
+            incidentExternal,
+            incidentInternal,
+            fixability,
+            shouldPromote,
             line: currentLine,
             rawFields: { ...currentFields },
         });
@@ -313,47 +524,69 @@ function nextIncidentId(entries, now) {
 }
 function buildPromotionIssues(candidate) {
     const missingFields = [];
-    if (!candidate.incidentExternal)
-        missingFields.push("IncidentExternal: true");
-    if (!candidate.incidentScope)
-        missingFields.push("IncidentScope");
-    if (!candidate.incidentRule)
-        missingFields.push("IncidentRule");
-    if (!candidate.incidentAdvice)
-        missingFields.push("IncidentAdvice");
+    if (!candidate.incidentExternal && !candidate.incidentInternal && candidate.fixability === null) {
+        missingFields.push("Fixability: external or IncidentExternal: true");
+    }
+    if (!candidate.incidentAdvice && !candidate.resolution) {
+        missingFields.push("Resolution or IncidentAdvice");
+    }
     return missingFields.length > 0 ? { candidate, missingFields } : null;
 }
 function buildIncidentRegistryEntry(opts) {
     const date = opts.now.toISOString().slice(0, 10);
+    const scope = opts.candidate.incidentScope ?? summarizeTaskScope(opts.task.scope, opts.task.title);
     const tags = dedupeCaseInsensitive([
         ...opts.candidate.incidentTags,
         ...opts.task.tags.map((tag) => tag.trim()),
     ]);
+    const advice = opts.candidate.incidentAdvice ?? opts.candidate.resolution ?? opts.candidate.observation;
+    const rule = opts.candidate.incidentRule ?? buildDerivedIncidentRule(scope);
+    const state = resolveIncidentState({
+        registry: opts.registry,
+        entry: {
+            scope,
+            failure: opts.candidate.observation,
+            rule,
+        },
+        now: opts.now,
+    });
     const match = buildMatchTerms({
-        scope: opts.candidate.incidentScope ?? opts.task.title,
+        scope,
         tags,
         explicitMatch: opts.candidate.incidentMatch,
+        extraText: [opts.task.title, opts.task.description, advice],
     });
     return {
-        id: nextIncidentId(opts.existingEntries, opts.now),
+        id: nextIncidentId(opts.registry.entries, opts.now),
         date,
-        scope: opts.candidate.incidentScope ?? opts.task.title,
+        scope,
         failure: opts.candidate.observation,
-        rule: opts.candidate.incidentRule ?? "",
+        rule,
         evidence: `task ${opts.task.id}${opts.task.commitHash ? `; commit ${opts.task.commitHash.slice(0, 12)}` : ""}`,
         enforcement: "manual",
-        state: "stabilized",
+        state,
         tags,
         match,
-        advice: opts.candidate.incidentAdvice,
+        advice,
         sourceTask: opts.task.id,
-        fixability: "external",
+        fixability: opts.candidate.fixability ?? (opts.candidate.incidentInternal ? "repo-fixable" : "external"),
         rawFields: {},
         line: 0,
     };
 }
 export function planIncidentCollection(opts) {
-    const candidates = extractIncidentCandidatesFromFindings(opts.findings);
+    const parsed = parseIncidentFindingBlocks(opts.findings);
+    const candidates = parsed
+        .filter((candidate) => candidate.shouldPromote)
+        .map(({ shouldPromote: _shouldPromote, ...candidate }) => candidate);
+    const skipped = parsed
+        .filter((candidate) => !candidate.shouldPromote)
+        .map(({ observation, line, rawFields }) => ({
+        observation,
+        line,
+        reason: "not_marked_external_or_promotable",
+        rawFields,
+    }));
     const issues = [];
     const promotable = [];
     const duplicates = [];
@@ -369,7 +602,10 @@ export function planIncidentCollection(opts) {
             task: opts.task,
             candidate,
             now,
-            existingEntries: [...opts.registry.entries, ...promotable.map((item) => item.entry)],
+            registry: parseIncidentRegistry(appendIncidentRegistryEntries(createIncidentRegistrySkeleton(), [
+                ...opts.registry.entries,
+                ...promotable.map((item) => item.entry),
+            ])),
         });
         const fingerprint = buildIncidentFingerprint(entry);
         const draft = { candidate, entry, fingerprint };
@@ -380,7 +616,15 @@ export function planIncidentCollection(opts) {
         seenFingerprints.add(fingerprint);
         promotable.push(draft);
     }
-    return { candidates, promotable, duplicates, issues };
+    return {
+        candidates,
+        skipped,
+        promotable,
+        duplicates,
+        issues,
+        findingsTextPresent: opts.findings.trim().length > 0,
+        structuredFindingCount: parsed.length,
+    };
 }
 export function buildIncidentAdviceQueryFromTask(opts) {
     return {
@@ -397,10 +641,8 @@ export function resolveIncidentAdviceMatches(opts) {
     const haystack = [opts.query.title, opts.query.description, opts.query.scope ?? ""].join(" ");
     const normalizedHaystack = normalizeSearchText(haystack);
     const queryTokens = new Set([...tokenize(haystack), ...tagSet]);
-    const matches = [];
+    const matchesBySignature = new Map();
     for (const entry of opts.registry.entries) {
-        if (entry.state === "open")
-            continue;
         const matchedTags = entry.tags.filter((tag) => tagSet.has(tag.trim().toLowerCase()));
         const matchedTerms = entry.match.filter((term) => queryTokens.has(term.trim().toLowerCase()) ||
             normalizedHaystack.includes(normalizeSearchText(term)));
@@ -409,12 +651,16 @@ export function resolveIncidentAdviceMatches(opts) {
         const score = matchedTags.length * 5 + matchedTerms.length * 2 + (scopeMatched ? 3 : 0);
         if (score <= 0)
             continue;
-        matches.push({ entry, score, matchedTags, matchedTerms, scopeMatched });
+        const match = { entry, score, matchedTags, matchedTerms, scopeMatched };
+        const signature = buildIncidentSignature(entry);
+        const existing = matchesBySignature.get(signature);
+        if (!existing || compareIncidentAdviceMatch(match, existing) < 0) {
+            matchesBySignature.set(signature, match);
+        }
     }
+    const matches = [...matchesBySignature.values()];
     matches.sort((left, right) => {
-        if (right.score !== left.score)
-            return right.score - left.score;
-        return right.entry.date.localeCompare(left.entry.date);
+        return compareIncidentAdviceMatch(left, right);
     });
     return matches.slice(0, limit);
 }

package/dist/runtime/incidents/types.d.ts

@@ -12,7 +12,7 @@ export type IncidentRegistryEntry = {
     match: string[];
     advice: string | null;
     sourceTask: string | null;
-    fixability: "external" | null;
+    fixability: "external" | "repo-fixable" | null;
     rawFields: Record<string, string>;
     line: number;
 };
@@ -23,20 +23,29 @@ export type IncidentFindingCandidate = {
     observation: string;
     impact: string | null;
     resolution: string | null;
-    promotion: string;
+    promotion: string | null;
     incidentScope: string | null;
     incidentRule: string | null;
     incidentAdvice: string | null;
     incidentTags: string[];
     incidentMatch: string[];
     incidentExternal: boolean;
+    incidentInternal: boolean;
+    fixability: "external" | "repo-fixable" | null;
     line: number;
     rawFields: Record<string, string>;
 };
+export type IncidentSkippedFinding = {
+    observation: string;
+    line: number;
+    reason: "not_marked_external_or_promotable";
+    rawFields: Record<string, string>;
+};
 export type IncidentPromotionTaskContext = {
     id: string;
     title: string;
     description: string;
+    scope?: string | null;
     tags: string[];
     commitHash?: string | null;
 };
@@ -51,9 +60,12 @@ export type IncidentPromotionIssue = {
 };
 export type IncidentCollectionPlan = {
     candidates: IncidentFindingCandidate[];
+    skipped: IncidentSkippedFinding[];
     promotable: IncidentPromotionDraft[];
     duplicates: IncidentPromotionDraft[];
     issues: IncidentPromotionIssue[];
+    findingsTextPresent: boolean;
+    structuredFindingCount: number;
 };
 export type IncidentAdviceQuery = {
     taskId?: string;

package/dist/runtime/incidents/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/runtime/incidents/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,0BAA0B,GAAG,MAAM,GAAG,YAAY,GAAG,UAAU,CAAC;AAE5E,MAAM,MAAM,qBAAqB,GAAG;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,0BAA0B,CAAC;IAClC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,qBAAqB,EAAE,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,wBAAwB,CAAC;IACpC,KAAK,EAAE,qBAAqB,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,wBAAwB,CAAC;IACpC,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,EAAE,wBAAwB,EAAE,CAAC;IACvC,UAAU,EAAE,sBAAsB,EAAE,CAAC;IACrC,UAAU,EAAE,sBAAsB,EAAE,CAAC;IACrC,MAAM,EAAE,sBAAsB,EAAE,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,qBAAqB,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/runtime/incidents/types.ts"],"names":[],"mappings":"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"}

package/dist/shared/env.d.ts

@@ -1,3 +1,4 @@
 export declare function parseDotEnv(text: string): Record<string, string>;
+export declare function isDotEnvLoadedKey(key: string, env?: NodeJS.ProcessEnv): boolean;
 export declare function loadDotEnv(rootDir: string): Promise<void>;
 //# sourceMappingURL=env.d.ts.map

package/dist/shared/env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/shared/env.ts"],"names":[],"mappings":"AAGA,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA4BhE;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAc/D"}
+{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/shared/env.ts"],"names":[],"mappings":"AAKA,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA4BhE;AAmBD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAE5F;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB/D"}