@christang/keel 5.1.2 → 5.2.1

package/src/core/context.js

@@ -5,7 +5,12 @@
 const fs = require("fs");
 const path = require("path");
 const { spawnSync } = require("child_process");
-const { compileTaskContract, field, parseTasks } = require("./task-contract");
+const {
+  ACCEPTED_REVIEW_STATUSES,
+  compileTaskContract,
+  field,
+  parseTasks,
+} = require("./task-contract");
 
 const NEXT_ACTIONS = new Set([
   "discuss",
@@ -68,8 +73,10 @@ function taskHasCompletionEvidence(record, contract) {
       (match) => match[1]
     )
   );
-  const reviewPassed =
-    /^\s+- Status:\s*(?:pass|passed|complete|completed|ok)\s*$/im.test(evidence);
+  const reviewPassed = new RegExp(
+    `^\\s*-\\s*Status:\\s*(?:${ACCEPTED_REVIEW_STATUSES.join("|")})\\s*$`,
+    "im"
+  ).test(evidence);
   return (
     commandIds.length > 0
     && commandIds.every((commandId) => evidenceIds.has(commandId))

package/src/core/gates.js

@@ -6,10 +6,12 @@ const fs = require("fs");
 const path = require("path");
 const { spawnSync } = require("child_process");
 const {
+  ACCEPTED_REVIEW_STATUSES,
   RED_GREEN_VERIFICATION_STRATEGIES,
   compileTaskContract,
   field,
   isConcrete,
+  isPassingReviewStatus,
   parseTasks,
 } = require("./task-contract");
 const { startGuard } = require("./guard");
@@ -235,7 +237,16 @@ function gitPaths(repo) {
   return status.stdout
     .split(/\r?\n/)
     .filter(Boolean)
-    .map((line) => line.slice(3).trim().replace(/\\/g, "/"));
+    .flatMap((line) => {
+      // A staged rename/copy is one porcelain line, `R  old -> new`; attribute
+      // both endpoints so a rename whose old and new paths are in Touch is not
+      // a false outside-Touch failure. Every other line carries one path.
+      const entry = line.slice(3).trim().replace(/\\/g, "/");
+      const arrow = entry.indexOf(" -> ");
+      return arrow === -1
+        ? [entry]
+        : [entry.slice(0, arrow), entry.slice(arrow + 4)];
+    });
 }
 
 function touchEntries(task, contract = null) {
@@ -376,16 +387,29 @@ function completionChecks(repo, task, contract = null) {
         : [["Findings", reviewFields.Findings]]
     ),
   ];
-  const reviewPassed = /^(?:pass|passed|complete|completed|ok)$/i.test(
-    reviewFields.Status
-  );
+  const reviewPassed = isPassingReviewStatus(reviewFields.Status);
   const reviewProblems = [];
   if (reviewMissing.length > 0 || !reviewPassed) {
+    const details = [];
+    if (!reviewPassed) {
+      const got = isConcrete(reviewFields.Status)
+        ? ` (got "${String(reviewFields.Status).trim()}")`
+        : "";
+      details.push(
+        `Status must be one of ${ACCEPTED_REVIEW_STATUSES.join(", ")}${got}`
+      );
+    }
+    const otherMissing = reviewMissing.filter(([name]) => name !== "Status");
+    if (otherMissing.length > 0) {
+      details.push(
+        "these Review fields need concrete Evidence: "
+          + otherMissing.map(([name]) => name).join(", ")
+      );
+    }
     reviewProblems.push(
       problem(
         "semantic-review",
-        "Current-agent Review requires passing Status, Acceptance check, "
-          + "Scope check, and Findings."
+        `Current-agent Review is incomplete — ${details.join("; ")}.`
       )
     );
   } else if (
@@ -395,8 +419,10 @@ function completionChecks(repo, task, contract = null) {
     problems.push(
       problem(
         "finding-owner",
-        "Review findings require an OpenSpec, archive-evidence, or explicit "
-          + "discard owner; HANDOFF is not an owner."
+        "Review Findings must be `none` or carry a durable owner — a "
+          + "`Discard reason:`/`Discard rationale:` prefix, a `keel/archive/…` "
+          + "path, or an existing `openspec/changes/…` artifact; "
+          + "`keel/HANDOFF.md` is not an owner."
       )
     );
   }
@@ -441,7 +467,9 @@ function expectationProblems(content, tasks) {
     return [
       problem(
         "expectation-coverage",
-        "tasks.md requires an Expectation Coverage section."
+        "tasks.md requires a `## Expectation Coverage` section: one "
+          + "`- E<n>: <expectation> Covered by: <task ids>` line per "
+          + "expectation, or `- None.`."
       ),
     ];
   }
@@ -459,7 +487,9 @@ function expectationProblems(content, tasks) {
     return [
       problem(
         "expectation-coverage",
-        "Expectation Coverage must declare each E<n> closure or `None`."
+        "Expectation Coverage must declare each `E<n>` closure — "
+          + "`- E<n>: <expectation> Covered by: <task ids>`, a `Durable owner:` "
+          + "path, or a `Discard reason:` — or `- None.`."
       ),
     ];
   }

package/src/core/task-contract.js

@@ -97,6 +97,25 @@ const RED_GREEN_VERIFICATION_STRATEGIES = new Set([
   "regression-first",
 ]);
 
+// Single source of truth for the accepted completion Review `Status`
+// vocabulary. Consumed by both the completion gate (src/core/gates.js) and the
+// context "already reviewed" probe (src/core/context.js) so the two never
+// diverge.
+const ACCEPTED_REVIEW_STATUSES = [
+  "pass",
+  "passed",
+  "complete",
+  "completed",
+  "ok",
+  "done",
+];
+
+function isPassingReviewStatus(value) {
+  return ACCEPTED_REVIEW_STATUSES.includes(
+    String(value == null ? "" : value).trim().toLowerCase()
+  );
+}
+
 function verification(task) {
   const compact = fieldValues(task, "Verify");
   const strategyEntry = compact.find((entry) => /^Strategy:\s*/i.test(entry));
@@ -725,11 +744,13 @@ function loadTaskContract(repo, change, taskId) {
 }
 
 module.exports = {
+  ACCEPTED_REVIEW_STATUSES,
   RED_GREEN_VERIFICATION_STRATEGIES,
   SUPPORTED_VERIFICATION_STRATEGIES,
   compileTaskContract,
   field,
   isConcrete,
+  isPassingReviewStatus,
   loadTaskContract,
   parseTasks,
   taskStartContractProblems,