@clearlydev/nx-archweave 0.3.0 → 0.3.1

package/dist/bin/review-verdict.js

@@ -84,7 +84,7 @@ function normalizeFinding(raw) {
 // ../review-policy/dist/renderers/render-review-comment.js
 var COPY = {
   en: {
-    terminationBanner: (maxRounds) => `> \u26A0\uFE0F **Automated review ended.** The maximum of ${maxRounds} review rounds has been reached with blocking findings (P0/P1) still open. Human review is required.`,
+    terminationBanner: (maxRounds) => `> \u26A0\uFE0F **Automated review ended.** The maximum of ${maxRounds} review rounds has been reached with blocking findings (P0/P1) still open. Later pushes aren't reviewed by AI, so review them yourself before merging.`,
     verdictLines: {
       BLOCK: "**Verdict: BLOCK** \u2014 P0/P1 findings must be resolved before this change can merge.",
       CHANGES_RECOMMENDED: "**Verdict: CHANGES_RECOMMENDED** \u2014 P2 findings should be addressed.",
@@ -106,7 +106,7 @@ var COPY = {
     }
   },
   ko: {
-    terminationBanner: (maxRounds) => `> \u26A0\uFE0F **\uC790\uB3D9 \uB9AC\uBDF0 \uC885\uB8CC.** \uCD5C\uB300 ${maxRounds}\uD68C\uC758 \uB9AC\uBDF0 \uB77C\uC6B4\uB4DC\uC5D0 \uB3C4\uB2EC\uD588\uC9C0\uB9CC \uBCD1\uD569\uC744 \uB9C9\uB294 finding(P0/P1)\uC774 \uB0A8\uC544 \uC788\uC2B5\uB2C8\uB2E4. \uC0AC\uB78C\uC758 \uB9AC\uBDF0\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.`,
+    terminationBanner: (maxRounds) => `> \u26A0\uFE0F **\uC790\uB3D9 \uB9AC\uBDF0 \uC885\uB8CC.** \uCD5C\uB300 ${maxRounds}\uD68C\uC758 \uB9AC\uBDF0 \uB77C\uC6B4\uB4DC\uC5D0 \uB3C4\uB2EC\uD588\uC9C0\uB9CC \uBCD1\uD569\uC744 \uB9C9\uB294 finding(P0/P1)\uC774 \uB0A8\uC544 \uC788\uC2B5\uB2C8\uB2E4. \uC774\uD6C4 push\uB294 AI\uAC00 \uB9AC\uBDF0\uD558\uC9C0 \uC54A\uC73C\uB2C8, \uBCD1\uD569 \uC804\uC5D0 \uC9C1\uC811 \uB9AC\uBDF0\uD558\uC138\uC694.`,
     verdictLines: {
       BLOCK: "**\uD310\uC815: BLOCK** \u2014 \uBCD1\uD569 \uC804\uC5D0 P0/P1 finding\uC744 \uD574\uACB0\uD574\uC57C \uD569\uB2C8\uB2E4.",
       CHANGES_RECOMMENDED: "**\uD310\uC815: CHANGES_RECOMMENDED** \u2014 P2 finding\uC744 \uD574\uACB0\uD558\uB294 \uAC83\uC744 \uAD8C\uC7A5\uD569\uB2C8\uB2E4.",
@@ -200,6 +200,14 @@ var ROUND_MARKER = "<!-- archweave-review-round -->";
 function collectRounds(comments) {
   return comments.filter((c) => c.body.includes(ROUND_MARKER) && !c.body.includes(VERDICT_MARKER)).map((c, index) => ({ round: index + 1, id: c.id, extraction: extractFindingsBlock(c.body) }));
 }
+var LINE_DRIFT = 3;
+function sameDefect(a, b) {
+  if (a.file !== b.file)
+    return false;
+  const aEnd = a.lineRange.end ?? a.lineRange.start;
+  const bEnd = b.lineRange.end ?? b.lineRange.start;
+  return a.lineRange.start <= bEnd + LINE_DRIFT && b.lineRange.start <= aEnd + LINE_DRIFT;
+}
 function computeRoundHistory(rounds) {
   const parsed = rounds.filter((r) => r.extraction.status === "ok");
   const history = [];
@@ -209,10 +217,10 @@ function computeRoundHistory(rounds) {
       history.push({ round: parsed[i].round, fixedFindingKeys: [], remainingFindingKeys: [...keys] });
       continue;
     }
-    const previous = new Set(parsed[i - 1].extraction.findings.map(findingKey));
+    const current = parsed[i].extraction.findings;
     history.push({
       round: parsed[i].round,
-      fixedFindingKeys: [...previous].filter((key) => !keys.has(key)),
+      fixedFindingKeys: parsed[i - 1].extraction.findings.filter((finding) => !current.some((now) => sameDefect(finding, now))).map(findingKey),
       remainingFindingKeys: [...keys]
     });
   }
@@ -252,12 +260,20 @@ var realWriteOutput = (path, text) => appendFileSync(path, text);
 function outputModePath(env) {
   return env["ARCHWEAVE_VERDICT_OUTPUT"] === "github-output" && env["GITHUB_OUTPUT"] ? env["GITHUB_OUTPUT"] : void 0;
 }
-function renderStepOutputs(commentBody, previousId, blocked) {
+function renderStepOutputs(commentBody, previousId, blocked, reason) {
   let delimiter;
   do
     delimiter = `ARCHWEAVE_${randomBytes(8).toString("hex")}`;
   while (commentBody.split("\n").includes(delimiter));
-  return [`comment-body<<${delimiter}`, commentBody, delimiter, `previous-comment-id=${previousId ?? ""}`, `blocked=${blocked}`, ""].join("\n");
+  return [
+    `comment-body<<${delimiter}`,
+    commentBody,
+    delimiter,
+    `previous-comment-id=${previousId ?? ""}`,
+    `blocked=${blocked}`,
+    `block-reason=${blocked ? reason ?? "" : ""}`,
+    ""
+  ].join("\n");
 }
 var UNREAD_COMMENTS_ERROR = "::error title=Review verdict not computed::Could not read PR comments, so the verdict could not be computed. Re-run the failed jobs to retry. If it fails again, check that the review job has pull-requests: read.";
 function runReviewVerdictBin(env, exec, writeOutput = realWriteOutput) {
@@ -298,7 +314,8 @@ function runReviewVerdictBin(env, exec, writeOutput = realWriteOutput) {
   const settled = !failedReview && (result.kind === "no-round" || result.kind === "unparseable");
   const blocked = failedReview || result.kind === "verdict" && result.exitCode !== 0;
   if (outputPath !== void 0) {
-    writeOutput(outputPath, renderStepOutputs(result.commentBody, previous?.id, blocked));
+    const reason = result.kind === "no-summary" ? "no-summary" : result.kind === "unparseable" ? "unreadable" : "block";
+    writeOutput(outputPath, renderStepOutputs(result.commentBody, previous?.id, blocked, reason));
   } else {
     const payload = JSON.stringify({ body: result.commentBody });
     const updated = previous !== void 0 && exec("gh", ["api", "-X", "PATCH", `repos/${repo}/issues/comments/${previous.id}`, "--input", "-"], payload).status === 0;

package/dist/generators/add-review/generator.js

@@ -347,10 +347,17 @@ function renderVerdictGateStep(maxRounds, locale) {
 }
 function renderBlockStep() {
   return [
-    "- name: Fail on a blocking verdict",
+    "- name: Fail the review check",
     "  if: steps.verdict.outputs.blocked == 'true'",
+    "  env:",
+    "    BLOCK_REASON: ${{ steps.verdict.outputs.block-reason }}",
     "  run: |",
-    '    echo "The review check failed: the verdict is BLOCK, or the AI review left no readable summary. See the verdict comment on this pull request."',
+    '    case "$BLOCK_REASON" in',
+    '      block) echo "The AI verdict is BLOCK: fix the P0/P1 findings in the verdict comment and push." ;;',
+    '      no-summary) echo "The AI review posted no summary for this commit, so there is no verdict. Re-run all jobs to review it again, or review it yourself." ;;',
+    '      unreadable) echo "The AI review summary has no readable findings block, so there is no verdict. Re-run all jobs to review it again, or review it yourself." ;;',
+    '      *) echo "The review check failed. See the verdict comment on this pull request." ;;',
+    "    esac",
     "    exit 1"
   ].join("\n");
 }
@@ -547,7 +554,7 @@ function renderDeniedToolsStep() {
     '    [ -f "$EXECUTION_FILE" ] || exit 0',
     `    stop_token="archweave-$(od -An -N16 -tx1 /dev/urandom | tr -d ' \\n')"`,
     '    echo "::stop-commands::$stop_token"',
-    `    jq -c '.[] | select(.type == "result") | .permission_denials[]? | {tool: .tool_name, command: ((.tool_input.command // "") | tostring | .[0:200])}' "$EXECUTION_FILE" || echo "Could not read the execution file."`,
+    `    jq -c '.[] | select(.type == "result") | ((.permission_denials[]? | {tool: .tool_name, command: ((.tool_input.command // "") | tostring | .[0:200])}), (select(.is_error == true) | {error: ((.result // "") | tostring | .[0:300])}))' "$EXECUTION_FILE" || echo "Could not read the execution file."`,
     '    echo "::$stop_token::"'
   ].join("\n");
 }

package/dist/generators/doctor/generator.js

@@ -490,10 +490,17 @@ function renderVerdictGateStep(maxRounds, locale) {
 }
 function renderBlockStep() {
   return [
-    "- name: Fail on a blocking verdict",
+    "- name: Fail the review check",
     "  if: steps.verdict.outputs.blocked == 'true'",
+    "  env:",
+    "    BLOCK_REASON: ${{ steps.verdict.outputs.block-reason }}",
     "  run: |",
-    '    echo "The review check failed: the verdict is BLOCK, or the AI review left no readable summary. See the verdict comment on this pull request."',
+    '    case "$BLOCK_REASON" in',
+    '      block) echo "The AI verdict is BLOCK: fix the P0/P1 findings in the verdict comment and push." ;;',
+    '      no-summary) echo "The AI review posted no summary for this commit, so there is no verdict. Re-run all jobs to review it again, or review it yourself." ;;',
+    '      unreadable) echo "The AI review summary has no readable findings block, so there is no verdict. Re-run all jobs to review it again, or review it yourself." ;;',
+    '      *) echo "The review check failed. See the verdict comment on this pull request." ;;',
+    "    esac",
     "    exit 1"
   ].join("\n");
 }
@@ -690,7 +697,7 @@ function renderDeniedToolsStep() {
     '    [ -f "$EXECUTION_FILE" ] || exit 0',
     `    stop_token="archweave-$(od -An -N16 -tx1 /dev/urandom | tr -d ' \\n')"`,
     '    echo "::stop-commands::$stop_token"',
-    `    jq -c '.[] | select(.type == "result") | .permission_denials[]? | {tool: .tool_name, command: ((.tool_input.command // "") | tostring | .[0:200])}' "$EXECUTION_FILE" || echo "Could not read the execution file."`,
+    `    jq -c '.[] | select(.type == "result") | ((.permission_denials[]? | {tool: .tool_name, command: ((.tool_input.command // "") | tostring | .[0:200])}), (select(.is_error == true) | {error: ((.result // "") | tostring | .[0:300])}))' "$EXECUTION_FILE" || echo "Could not read the execution file."`,
     '    echo "::$stop_token::"'
   ].join("\n");
 }

package/dist/generators/init/generator.js

@@ -442,10 +442,17 @@ function renderVerdictGateStep(maxRounds, locale) {
 }
 function renderBlockStep() {
   return [
-    "- name: Fail on a blocking verdict",
+    "- name: Fail the review check",
     "  if: steps.verdict.outputs.blocked == 'true'",
+    "  env:",
+    "    BLOCK_REASON: ${{ steps.verdict.outputs.block-reason }}",
     "  run: |",
-    '    echo "The review check failed: the verdict is BLOCK, or the AI review left no readable summary. See the verdict comment on this pull request."',
+    '    case "$BLOCK_REASON" in',
+    '      block) echo "The AI verdict is BLOCK: fix the P0/P1 findings in the verdict comment and push." ;;',
+    '      no-summary) echo "The AI review posted no summary for this commit, so there is no verdict. Re-run all jobs to review it again, or review it yourself." ;;',
+    '      unreadable) echo "The AI review summary has no readable findings block, so there is no verdict. Re-run all jobs to review it again, or review it yourself." ;;',
+    '      *) echo "The review check failed. See the verdict comment on this pull request." ;;',
+    "    esac",
     "    exit 1"
   ].join("\n");
 }
@@ -642,7 +649,7 @@ function renderDeniedToolsStep() {
     '    [ -f "$EXECUTION_FILE" ] || exit 0',
     `    stop_token="archweave-$(od -An -N16 -tx1 /dev/urandom | tr -d ' \\n')"`,
     '    echo "::stop-commands::$stop_token"',
-    `    jq -c '.[] | select(.type == "result") | .permission_denials[]? | {tool: .tool_name, command: ((.tool_input.command // "") | tostring | .[0:200])}' "$EXECUTION_FILE" || echo "Could not read the execution file."`,
+    `    jq -c '.[] | select(.type == "result") | ((.permission_denials[]? | {tool: .tool_name, command: ((.tool_input.command // "") | tostring | .[0:200])}), (select(.is_error == true) | {error: ((.result // "") | tostring | .[0:300])}))' "$EXECUTION_FILE" || echo "Could not read the execution file."`,
     '    echo "::$stop_token::"'
   ].join("\n");
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@clearlydev/nx-archweave",
-  "version": "0.3.0",
-  "description": "Nx generators that make a workspace ready to work on in one preset: an FSD Lite lint rule, frontend/backend boundaries, AI agent rules, GitHub templates, and optional AI PR review with the provider you choose (Claude supported; Gemini, GPT and Cursor in beta)",
+  "version": "0.3.1",
+  "description": "Nx generators for an FSD Lite lint rule, frontend/backend boundaries, AI agent rules, GitHub templates and optional AI PR review",
   "license": "MIT",
   "author": "clearlydev (https://github.com/clearlydev)",
   "engines": {