@milehimikey/em 1.19.5 → 1.19.7

package/dist/cli.js

@@ -89,9 +89,9 @@ import { listModelCommits } from "./cli/changelog-git.js";
 import { buildChangelogDoc } from "./cli/changelogBuild.js";
 import { runRevise } from "./cli/revise.js";
 import { runDefer, runDeferFromIssue } from "./cli/defer.js";
-import { runSliceConform } from "./cli/sliceConform.js";
+import { runSliceConform, resolveFindingsForReport, findingsFilesOf, unruledAcrossFiles } from "./cli/sliceConform.js";
 import { checkPrdTriage, buildCheckPrdTriageJson, renderPrdTriageMarkdown, validatePrdTriage } from "./cli/prdTriage.js";
-import { checkFindingsFile, buildCheckFindingsJson, lookupFindingsBesideReport, unruledFindingsInScope, FINDING_LOCI } from "./cli/findings.js";
+import { checkFindingsFile, buildCheckFindingsJson, FINDING_LOCI } from "./cli/findings.js";
 import { STATE_FILE_NAME, PHASES, isPhase, loadStateFile, parseState, setPhase, setConformance, setModelVersion, setCertified, setEmVersion, setReview, isValidDateString, modelPathMismatch, } from "./cli/stateFile.js";
 import { findCertifiedVersion, latestModelVersionNumber, modelVersionDrift, runCertifyModelVersion, runModelVersionBump, } from "./cli/modelVersion.js";
 import { STARTER_EM, starterEmFor, scaffoldReadme, scaffoldStateFile, scaffoldConstitution } from "./templates.js";
@@ -960,6 +960,9 @@ function reviseAction(commandName) {
         if (result.advisory && result.advisory.unruledFindingsCount > 0) {
             console.error(`warn: revising "${sliceKey}" with ${result.advisory.unruledFindingsCount} unruled conformance finding(s) on the shipped version`);
         }
+        if (result.advisory && result.advisory.findingsFilesScanned === 0) {
+            console.error(`note: no conformance findings file (conformance/<date>[-<name>]-findings.json) was found beside the model — unruled findings on "${sliceKey}" could not be checked`);
+        }
         const what = result.kind === "shipped"
             ? `v${result.newVersion - 1} stays shipped; v${result.newVersion} opened as draft`
             : result.kind === "unshipped"
@@ -1084,7 +1087,7 @@ slice
     "Idempotent on the same (version, --at) pair; a different --at simply overwrites (a " +
     "later re-certification is normal — there's no way for em to tell 'later' from 'earlier' " +
     "for an arbitrary revision string, so there's no --force to reach for). Refuses when the " +
-    "newest conformance/*-findings.json matching --at still has an unruled finding in scope " +
+    "conformance/<date>[-<name>]-findings.json file matching --at still has an unruled finding in scope " +
     "for this slice; --skip-findings-check overrides with a loud notice.")
     .argument("<file>", "input .em file")
     .argument("<slice-key>", "slice export key (kebab-case)")
@@ -1119,9 +1122,12 @@ slice
         console.error(`notice: --skip-findings-check — certifying "${sliceKey}" with ${result.skippedFindingsCheck.length} ` +
             `unruled conformance finding(s) still in scope (id ${result.skippedFindingsCheck.join(", ")})`);
     }
-    console.log(result.changed
+    const noFindingsNote = result.findingsFiles.length === 0
+        ? ` — note: no conformance findings file matches --at ${opts.at} (conformance/<date>[-<name>]-findings.json with that revision), so the findings check had nothing to read`
+        : ` — findings: ${result.findingsFiles.join(", ")}`;
+    console.log((result.changed
         ? `certified: ${result.path} (conformedVersion: ${result.version}, conformedAt: ${opts.at}, conformedOn: ${on})`
-        : `already certified (no-op): ${result.path}`);
+        : `already certified (no-op): ${result.path}`) + noFindingsNote);
 });
 program
     .command("changelog")
@@ -1222,9 +1228,10 @@ state
     .command("set-conformance")
     .description("rewrite Last conformance: (and Last updated:) in the exact format reference/conform.md " +
     "parses. Refuses (MIL-214) while any `implemented` slice has an unruled conformance " +
-    "finding in the findings JSON beside --report (a `slice: null` finding blocks every " +
+    "finding in the findings JSON beside --report, or, when that is absent, in every findings " +
+    "file at the report's own revision (a `slice: null` finding blocks every " +
     "slice); --partial records the marker with a ` (partial)` suffix instead, with a loud " +
-    "notice. Without a findings JSON beside --report: warns once and records the marker as " +
+    "notice. Without a findings JSON beside --report and none at the report's revision: warns once and records the marker as " +
     "given (migration path for a report predating `em conform-findings`)")
     .argument("<revision>", "target-repo revision just diffed against")
     .argument("[dir]", STATE_DIR_HELP, ".")
@@ -1260,28 +1267,31 @@ state
             compiledForCertify = { model: compiled.model, refs: compiled.refs, source: compiled.source };
         }
     }
-    let unruled = [];
-    const lookup = lookupFindingsBesideReport(modelDir, opts.report);
-    if (lookup.kind === "invalid") {
-        console.error(`em state set-conformance: ${lookup.message}`);
+    let unruledTotal = 0;
+    let unruledDescribe = "";
+    const resolved = resolveFindingsForReport(modelDir, opts.report, revision);
+    if (resolved.kind === "invalid") {
+        console.error(`em state set-conformance: ${resolved.message}`);
         process.exit(1);
     }
-    else if (lookup.kind === "absent") {
-        console.error(`warn: no findings JSON found beside ${opts.report} — recording the marker without verifying every ` +
+    else if (resolved.kind === "none") {
+        console.error(`warn: no findings JSON found beside ${opts.report} (and no same-revision file) — recording the marker without verifying every ` +
             "finding is ruled (migration path for a report written before `em conform-findings`)");
     }
     else {
-        unruled = unruledFindingsInScope(lookup.doc.findings, inScope);
+        const counted = unruledAcrossFiles(findingsFilesOf(resolved), inScope);
+        unruledTotal = counted.total;
+        unruledDescribe = counted.describe;
     }
     const partialFlag = opts.partial === true;
-    if (unruled.length > 0 && !partialFlag) {
-        console.error(`em state set-conformance: ${unruled.length} unruled conformance finding(s) among implemented slices ` +
-            `(id ${unruled.map((f) => f.id).join(", ")}) — rule on them (\`em conform-supersede --locus --by\`) or pass --partial`);
+    if (unruledTotal > 0 && !partialFlag) {
+        console.error(`em state set-conformance: ${unruledTotal} unruled conformance finding(s) among implemented slices ` +
+            `in ${unruledDescribe} — rule on them (\`em conform-supersede --locus --by\`) or pass --partial`);
         process.exit(1);
     }
-    const recordPartial = partialFlag && unruled.length > 0;
+    const recordPartial = partialFlag && unruledTotal > 0;
     if (recordPartial) {
-        console.error(`notice: conformance marker recorded as PARTIAL — ${unruled.length} finding(s) unruled`);
+        console.error(`notice: conformance marker recorded as PARTIAL — ${unruledTotal} finding(s) unruled`);
     }
     const today = localIsoDate();
     // MIL-218 ruling D: a FULL (non-`--partial`) marker also certifies the current design
@@ -1296,7 +1306,8 @@ state
     // is where that problem gets its own diagnostic.
     let certifiedVersion = null;
     if (!recordPartial && compiledForCertify) {
-        const findingsPath = lookup.kind === "found" ? lookup.path : null;
+        const readFiles = findingsFilesOf(resolved);
+        const findingsPath = readFiles ? readFiles.map((f) => f.path).join(", ") : null;
         const certifyResult = runCertifyModelVersion(modelDir, compiledForCertify.model, compiledForCertify.refs, compiledForCertify.source, revision, today, opts.report, findingsPath);
         if (!certifyResult.ok) {
             console.error(`em state set-conformance: ${certifyResult.message}`);
@@ -1511,7 +1522,8 @@ program
     "report; idempotent on the same --as-of/--findings/--on stamp; refuses if the report " +
     "doesn't exist. --locus/--by (MIL-214, both required together) additionally record the " +
     "ruling itself — locus/resolvedBy/resolvedOn — on the findings named by --findings in the " +
-    "sibling conformance/<date>-findings.json, when one exists (warns once and stamps the " +
+    "sibling conformance/<date>-findings.json, when one exists (refuses, naming them, when only " +
+    "other findings files exist at the report's revision; warns once and stamps the " +
     "banner only when it doesn't — the migration path for a report predating em conform-findings)")
     .argument("<file>", "input .em file (used only to resolve the report path's base directory)")
     .argument("<report-path>", "path to the conformance report, relative to the model's directory")