lee-spec-kit 0.9.7 → 0.9.8

package/dist/index.js

@@ -215,7 +215,7 @@ var koCli = {
   "init.choice.taskAgent.on": "\uC0AC\uC6A9 - \uAC01 Task \uAD6C\uD604\uC744 \uC704\uC784",
   "init.choice.taskAgent.off": "\uC0AC\uC6A9 \uC548 \uD568 - \uBA54\uC778 \uC5D0\uC774\uC804\uD2B8\uAC00 \uC9C1\uC811 \uAD6C\uD604",
   "init.prompt.reviews": "\uB3C5\uB9BD \uAC80\uC218 \uB2E8\uACC4\uB97C \uC120\uD0DD\uD558\uC138\uC694:",
-  "init.prompt.maxReviewRounds": "\uC794\uC5EC \uC704\uD5D8\uC744 \uAE30\uB85D\uD558\uACE0 \uACC4\uC18D\uD558\uAE30 \uC804 \uB9AC\uBDF0 \uC9C0\uC801 \uC790\uB3D9 \uBC18\uC601 \uCD5C\uB300 \uD69F\uC218:",
+  "init.prompt.maxReviewRounds": "\uC794\uC5EC \uC704\uD5D8\uC744 \uAE30\uB85D\uD558\uACE0 \uACC4\uC18D\uD558\uAE30 \uC804 fresh \uB9AC\uBDF0 \uCD5C\uB300 \uC2E4\uD589 \uD69F\uC218:",
   "init.choice.review.plan": "Plan",
   "init.choice.review.task": "Task",
   "init.choice.review.feature": "Feature",
@@ -241,7 +241,7 @@ var koCli = {
   "init.log.workflowLabel": "\uC6CC\uD06C\uD50C\uB85C\uC6B0",
   "init.log.taskAgentLabel": "Task \uAD6C\uD604",
   "init.log.reviewsLabel": "\uAC80\uC218",
-  "init.log.maxReviewRoundsLabel": "\uB9AC\uBDF0 \uC9C0\uC801 \uC790\uB3D9 \uBC18\uC601 \uD69F\uC218",
+  "init.log.maxReviewRoundsLabel": "fresh \uB9AC\uBDF0 \uCD5C\uB300 \uC2E4\uD589 \uD69F\uC218",
   "init.log.completionStrategyLabel": "\uB85C\uCEEC \uD1B5\uD569",
   "init.summary.taskAgent.on": "\uC11C\uBE0C\uC5D0\uC774\uC804\uD2B8",
   "init.summary.taskAgent.off": "\uBA54\uC778 \uC5D0\uC774\uC804\uD2B8",
@@ -531,7 +531,7 @@ var enCli = {
   "init.choice.taskAgent.on": "On - delegate each task implementation",
   "init.choice.taskAgent.off": "Off - implement tasks in the main agent",
   "init.prompt.reviews": "Select independent review gates:",
-  "init.prompt.maxReviewRounds": "Maximum automatic finding remediation rounds before continuing with residual risks:",
+  "init.prompt.maxReviewRounds": "Maximum fresh review rounds before continuing with residual risks:",
   "init.choice.review.plan": "Plan",
   "init.choice.review.task": "Task",
   "init.choice.review.feature": "Feature",
@@ -557,7 +557,7 @@ var enCli = {
   "init.log.workflowLabel": "Workflow",
   "init.log.taskAgentLabel": "Task implementation",
   "init.log.reviewsLabel": "Reviews",
-  "init.log.maxReviewRoundsLabel": "Review remediation rounds",
+  "init.log.maxReviewRoundsLabel": "Maximum fresh review rounds",
   "init.log.completionStrategyLabel": "Local integration",
   "init.summary.taskAgent.on": "subagent",
   "init.summary.taskAgent.off": "main agent",
@@ -1375,13 +1375,13 @@ Before taking the next workflow step:
 13. When \`workflow-stage --json\` returns \`nextAction.category === "plan_review"\` with \`executor === "subagent"\`, delegate a fresh read-only review of \`spec.md\` and \`plan.md\` using the returned model settings and exact \`specHash\` / \`planHash\`; the main agent records the returned reviewRound, evidence, decision, reviewer metadata, and both hashes, and any later spec/plan content change requires a fresh review
 14. When \`workflow-stage --json\` returns \`nextAction.category === "task_execute"\` with \`executor === "subagent"\`, mark exactly the returned \`taskId\` as active and delegate its implementation plus task-scoped verification to a fresh subagent in the returned \`workingDirectory\`, using the returned \`model\`, \`reasoningEffort\`, \`onUnavailable\`, and exact \`workerContract\`; no named execution skill is required
 15. The task implementation worker executes directly: it must follow the approved Verification Contract, must not add unplanned durable tests, and must not run \`workflow-stage\`, spawn another subagent, edit lee-spec-kit docs, change task state, commit, request approvals, or perform remote/destructive actions. It may modify project code and run task-scoped checks only. The main agent inspects the result, synchronizes docs and task state, and owns every commit and workflow transition; official hooks block commits while \`task_execute\` is still active
-16. When \`workflow-stage --json\` returns \`nextAction.category === "task_review"\` with \`executor === "subagent"\`, delegate a fresh read-only review for the returned \`taskId\`, \`baseSha\`, \`targetSha\`, and \`targetTree\`; the main agent records the returned reviewRound and evidence and moves the task from \`REVIEW\` to \`DONE\` only after an approve decision
+16. When \`workflow-stage --json\` returns \`nextAction.category === "task_review"\` with \`executor === "subagent"\`, delegate a fresh read-only review for the returned \`taskId\`, \`baseSha\`, \`targetSha\`, and \`targetTree\`; the main agent records the returned reviewRound and evidence and moves the task from \`REVIEW\` to \`DONE\` after an approve decision or the automatic exhausted-\`changes_requested\` path described below
 17. When \`workflow-stage --json\` returns \`nextAction.category === "pre_pr_review"\` and \`nextAction.executor === "subagent"\`, delegate a fresh read-only Feature review using the returned \`model\`, \`reasoningEffort\`, \`onUnavailable\`, reviewRound, and review target metadata; do not select or require a named review skill
 18. Review subagents return findings without modifying code; the main agent remediates findings and records the actual reviewer metadata, reviewed scope, evidence, decision, and exact hash/SHA/tree target metadata
 19. After delegating to a subagent, wait until it returns a terminal outcome: completed, explicit failure, cancellation, or an approval/user-input request that requires action
 20. While the subagent remains running, use repeated bounded waits, preferably longer waits. A bounded wait that returns no update, a lack of status messages, or a lack of file changes means only that the subagent is still pending; none is evidence of failure or stalled work. Read-only review subagents are expected not to modify files
 21. Do not interrupt, replace, or abandon a running subagent solely because it has been quiet or has not changed files. Stop it only after an explicit user request, a terminal failure/cancellation, or an unrecoverable runtime status
-22. workflow.agentReview.maxRounds counts automatic finding-remediation passes, not the initial review. After those passes are exhausted, keep the latest changes_requested findings as residual risks and automatically complete that Plan/task/Feature review gate without asking the user for a review-approval token; blocked decisions never auto-complete
+22. workflow.agentReview.maxRounds is the maximum number of fresh reviews for each Plan/task/Feature gate. A changes_requested decision on the final allowed review is remediated once, but the changed target is not reviewed again; keep remaining findings and the post-review target change as residual risks and automatically complete the gate without asking the user for a review-approval token. For example, maxRounds=1 means review round 1, remediate once, then continue with no round 2; blocked decisions never auto-complete
 23. For a local workflow, do not report completion directly after implementation approval; follow the exact returned \`local verify\` / \`local merge\` / \`local cleanup\` commands until \`workflow-stage\` proves verification, integration, and cleanup and returns \`done\`; review-fix and \`feature_remediation\` stages explicitly permit scoped fixes
 24. In a \`local-ff\` or \`local-squash\` workflow, keep implementation approval and local merge approval distinct when \`local_merge\` is required: the first accepts the implementation, and the second authorizes the configured integration strategy, post-merge checks, and local cleanup
 
@@ -2139,7 +2139,7 @@ function initCommand(program2) {
     "Review gates: comma-separated plan,task,feature | none"
   ).option(
     "--max-review-rounds <count>",
-    "Automatic review finding remediation rounds before continuing with residual risks (default: 1)"
+    "Maximum fresh review rounds before continuing with residual risks (default: 1)"
   ).option(
     "--completion-strategy <strategy>",
     "Local completion: local-ff | local-squash | none"
@@ -4558,7 +4558,7 @@ function configCommand(program2) {
     "Review gates: comma-separated plan,task,feature | none"
   ).option(
     "--max-review-rounds <count>",
-    "Automatic review finding remediation rounds before continuing with residual risks"
+    "Maximum fresh review rounds before continuing with residual risks"
   ).option(
     "--completion-strategy <strategy>",
     "Local completion: local-ff | local-squash | none"
@@ -8847,8 +8847,8 @@ function resolveMaxReviewRounds(config) {
   const configured = config.workflow?.agentReview?.maxRounds;
   return typeof configured === "number" && Number.isInteger(configured) && configured > 0 ? configured : 1;
 }
-function reviewRemediationLimitReached(config, reviewRound, decisionOutcome) {
-  return decisionOutcome === "changes_requested" && (reviewRound || 1) > resolveMaxReviewRounds(config);
+function reviewRoundLimitReached(config, reviewRound, decisionOutcome) {
+  return decisionOutcome === "changes_requested" && (reviewRound || 1) >= resolveMaxReviewRounds(config);
 }
 function parseWorkflowTaskLine(line, index = -1) {
   const canonical = parseTaskLine(line, index);
@@ -9573,28 +9573,34 @@ function reviewEvidenceSatisfied(config, feature, scope, evidence) {
   });
 }
 function planReviewSatisfied(config, feature, review, target) {
-  return review.status === "done" && reviewEvidenceSatisfied(config, feature, "plan", review.evidence) && (review.decisionOutcome === "approve" || reviewRemediationLimitReached(
+  const reviewLimitReached = reviewRoundLimitReached(
     config,
     review.reviewRound,
     review.decisionOutcome
-  )) && review.reviewedSpecHash === target.specHash && review.reviewedPlanHash === target.planHash;
+  );
+  const targetMatches = review.reviewedSpecHash === target.specHash && review.reviewedPlanHash === target.planHash;
+  return review.status === "done" && reviewEvidenceSatisfied(config, feature, "plan", review.evidence) && (review.decisionOutcome === "approve" && targetMatches || reviewLimitReached && !targetMatches);
 }
 function featureReviewSatisfied(config, feature, tasks, target) {
-  return !!target && tasks.prePrReviewStatus === "done" && reviewEvidenceSatisfied(config, feature, "feature", tasks.prePrEvidence) && !!tasks.prePrDecision && (tasks.prePrDecisionOutcome === "approve" || reviewRemediationLimitReached(
+  const reviewLimitReached = reviewRoundLimitReached(
     config,
     tasks.prePrReviewRound,
     tasks.prePrDecisionOutcome
-  )) && tasks.prePrReviewedHead === target.targetSha && tasks.prePrReviewedTree === target.targetTree;
+  );
+  const targetMatches = !!target && tasks.prePrReviewedHead === target.targetSha && tasks.prePrReviewedTree === target.targetTree;
+  return !!target && tasks.prePrReviewStatus === "done" && reviewEvidenceSatisfied(config, feature, "feature", tasks.prePrEvidence) && !!tasks.prePrDecision && (tasks.prePrDecisionOutcome === "approve" && targetMatches || reviewLimitReached && !targetMatches);
 }
 function taskReviewEvidenceSatisfied(config, feature, task, target) {
-  return !!target && reviewEvidenceSatisfied(config, feature, "task", task.reviewEvidence) && (task.reviewDecisionOutcome === "approve" || reviewRemediationLimitReached(
+  const reviewLimitReached = reviewRoundLimitReached(
     config,
     task.reviewRound,
     task.reviewDecisionOutcome
-  )) && task.reviewedHead === target.targetSha && task.reviewedTree === target.targetTree;
+  );
+  const targetMatches = !!target && task.reviewedHead === target.targetSha && task.reviewedTree === target.targetTree;
+  return !!target && reviewEvidenceSatisfied(config, feature, "task", task.reviewEvidence) && (task.reviewDecisionOutcome === "approve" && targetMatches || reviewLimitReached && !targetMatches);
 }
 function recordedTaskReviewSatisfied(config, feature, projectGitCwd, task, currentTargetSha) {
-  if (!currentTargetSha || !task.reviewedHead || !task.reviewedTree || task.reviewDecisionOutcome !== "approve" && !reviewRemediationLimitReached(
+  if (!currentTargetSha || !task.reviewedHead || !task.reviewedTree || task.reviewDecisionOutcome !== "approve" && !reviewRoundLimitReached(
     config,
     task.reviewRound,
     task.reviewDecisionOutcome
@@ -9605,7 +9611,7 @@ function recordedTaskReviewSatisfied(config, feature, projectGitCwd, task, curre
     ["rev-parse", `${task.reviewedHead}^{tree}`],
     projectGitCwd
   ) || "";
-  return actualTree === task.reviewedTree && isAncestor(projectGitCwd, task.reviewedHead, currentTargetSha);
+  return actualTree === task.reviewedTree && isAncestor(projectGitCwd, task.reviewedHead, currentTargetSha) && (task.reviewDecisionOutcome === "approve" || task.reviewedHead !== currentTargetSha);
 }
 function resolvePreviousTaskReviewBase(config, feature, tasks, task) {
   const taskIndex = tasks.tasks.indexOf(task);
@@ -10009,7 +10015,8 @@ function resolvePlanReviewPayload(config, feature, review, target) {
   const targetMatches = review.reviewedSpecHash === target.specHash && review.reviewedPlanHash === target.planHash;
   const maxReviewRounds = resolveMaxReviewRounds(config);
   const reviewRound = review.reviewRound || 1;
-  const nextReviewRound = !targetMatches && review.decisionOutcome ? reviewRound + 1 : reviewRound;
+  const requestedReviewRound = !targetMatches && review.decisionOutcome ? reviewRound + 1 : reviewRound;
+  const nextReviewRound = Math.min(requestedReviewRound, maxReviewRounds);
   const actionContext = {
     reviewScope: "plan",
     reviewRound: nextReviewRound,
@@ -10019,7 +10026,8 @@ function resolvePlanReviewPayload(config, feature, review, target) {
     docsDirectory: config.docsDir
   };
   if (review.decisionOutcome === "changes_requested") {
-    if (targetMatches) {
+    if (targetMatches && reviewRound <= maxReviewRounds) {
+      const finalReviewRound = reviewRound >= maxReviewRounds;
       return {
         status: "ok",
         reasonCode: "WORKFLOW_STAGE_RESOLVED",
@@ -10028,7 +10036,7 @@ function resolvePlanReviewPayload(config, feature, review, target) {
         stage: "plan_review_fix",
         nextAction: buildAction(
           "plan_review_fix",
-          `Address the independent Plan review findings in spec.md or plan.md, record review round ${reviewRound + 1}, keep implementation blocked, and request a fresh review for the resulting document hashes.`,
+          finalReviewRound ? `Address the independent Plan review findings in spec.md or plan.md, keep review round ${reviewRound}, and do not request another review. The resulting document hash changes will be preserved with the remaining findings as residual risks before automatic Plan promotion.` : `Address the independent Plan review findings in spec.md or plan.md, record review round ${reviewRound + 1}, keep implementation blocked, and request a fresh review for the resulting document hashes.`,
           false,
           null,
           void 0,
@@ -10040,6 +10048,26 @@ function resolvePlanReviewPayload(config, feature, review, target) {
       };
     }
   }
+  if (review.decisionOutcome === "changes_requested" && reviewRound >= maxReviewRounds) {
+    return {
+      status: "ok",
+      reasonCode: "WORKFLOW_STAGE_RESOLVED",
+      docsDir: config.docsDir,
+      featureRef: buildFeatureRef(feature),
+      stage: "plan_review",
+      nextAction: buildAction(
+        "plan_review",
+        `The Plan review round limit was reached at round ${reviewRound}. Do not delegate another review. Repair or record the final-round evidence if needed, preserve the remaining findings and any post-review hash changes as residual risks, and continue through automatic Plan promotion.`,
+        false,
+        null,
+        void 0,
+        { ...actionContext, reviewRound: maxReviewRounds }
+      ),
+      approvalRequired: false,
+      implementationAllowed: false,
+      blockedReasonCode: "PLAN_REVIEW_NOT_APPROVED"
+    };
+  }
   if (targetMatches && review.decisionOutcome === "blocked") {
     return {
       status: "ok",
@@ -10119,11 +10147,11 @@ async function collectWorkflowStage(cwd, selector, component) {
     specContent || "",
     planContent || ""
   );
-  const planReviewAutoCompleted = planReview.status === "done" && reviewEvidenceSatisfied(config, feature, "plan", planReview.evidence) && reviewRemediationLimitReached(
+  const planReviewAutoCompleted = planReview.status === "done" && reviewEvidenceSatisfied(config, feature, "plan", planReview.evidence) && reviewRoundLimitReached(
     config,
     planReview.reviewRound,
     planReview.decisionOutcome
-  ) && planReview.reviewedSpecHash === planReviewTarget.specHash && planReview.reviewedPlanHash === planReviewTarget.planHash;
+  ) && (planReview.reviewedSpecHash !== planReviewTarget.specHash || planReview.reviewedPlanHash !== planReviewTarget.planHash);
   const enforcePlanReview = requirements.planReviewEnabled && (tasks.docStatus !== "approved" || planReview.hasMetadata);
   const issueDraft = parseWorkflowDraftMetadataExtended(issueContent || "");
   const prDraft = parseWorkflowDraftMetadataExtended(prContent || "");
@@ -10181,7 +10209,7 @@ async function collectWorkflowStage(cwd, selector, component) {
       stage: "plan",
       nextAction: buildAction(
         isReviewStage ? "plan_approve" : "plan_write",
-        isReviewStage ? planReviewAutoCompleted ? "The Plan review remediation limit was reached. Preserve the remaining findings as residual risks, promote plan.md from Review to Approved, and continue automatically without asking the user for review approval." : approvalRequired ? "Get user approval and update plan.md status to Approved." : "Promote plan.md from Review to Approved and continue automatically." : "Write or refine plan.md until it is ready for approval.",
+        isReviewStage ? planReviewAutoCompleted ? "The Plan review round limit was reached. Preserve the remaining findings and post-review hash changes as residual risks, promote plan.md from Review to Approved, and continue automatically without asking the user for review approval." : approvalRequired ? "Get user approval and update plan.md status to Approved." : "Promote plan.md from Review to Approved and continue automatically." : "Write or refine plan.md until it is ready for approval.",
         approvalRequired
       ),
       approvalRequired,
@@ -10369,6 +10397,7 @@ async function collectWorkflowStage(cwd, selector, component) {
     const evidenceMatchesTarget = reviewTask.reviewedHead === reviewTarget.targetSha && reviewTask.reviewedTree === reviewTarget.targetTree;
     if (reviewTask.reviewDecisionOutcome === "changes_requested") {
       if (evidenceMatchesTarget && reviewContext.reviewRound <= reviewContext.maxReviewRounds) {
+        const finalReviewRound = reviewContext.reviewRound >= reviewContext.maxReviewRounds;
         return {
           status: "ok",
           reasonCode: "WORKFLOW_STAGE_RESOLVED",
@@ -10377,7 +10406,7 @@ async function collectWorkflowStage(cwd, selector, component) {
           stage: "task_review_fix",
           nextAction: buildAction(
             "task_review_fix",
-            `Address the independent review findings for ${reviewTask.taskId || reviewTask.title}, return the task to REVIEW, commit the new code tip, and request fresh review round ${reviewContext.reviewRound + 1}.`,
+            finalReviewRound ? `Address the independent review findings for ${reviewTask.taskId || reviewTask.title}, return the task to REVIEW, and commit the new code tip without requesting another review. Preserve any remaining findings and the post-review target change as residual risks before automatic task completion.` : `Address the independent review findings for ${reviewTask.taskId || reviewTask.title}, return the task to REVIEW, commit the new code tip, and request fresh review round ${reviewContext.reviewRound + 1}.`,
             false,
             null,
             void 0,
@@ -10410,7 +10439,7 @@ async function collectWorkflowStage(cwd, selector, component) {
       };
     }
     if (taskReviewEvidenceSatisfied(config, feature, reviewTask, reviewTarget)) {
-      const completionSummary = reviewTask.reviewDecisionOutcome === "approve" ? reviewTask.status === "DONE" ? `The independent review approved ${reviewTask.taskId || reviewTask.title} at the current code tree. Commit the review evidence before continuing.` : `The independent review approved ${reviewTask.taskId || reviewTask.title} at the current code tree. Mark the task DONE and commit the review evidence before starting another task.` : reviewTask.status === "DONE" ? `The review remediation limit was reached for ${reviewTask.taskId || reviewTask.title}. Keep the remaining findings as residual risks and commit the review evidence before continuing automatically.` : `The review remediation limit was reached for ${reviewTask.taskId || reviewTask.title}. Keep the remaining findings as residual risks, mark the task DONE, and commit the review evidence before continuing automatically.`;
+      const completionSummary = reviewTask.reviewDecisionOutcome === "approve" ? reviewTask.status === "DONE" ? `The independent review approved ${reviewTask.taskId || reviewTask.title} at the current code tree. Commit the review evidence before continuing.` : `The independent review approved ${reviewTask.taskId || reviewTask.title} at the current code tree. Mark the task DONE and commit the review evidence before starting another task.` : reviewTask.status === "DONE" ? `The review round limit was reached for ${reviewTask.taskId || reviewTask.title}. Keep the remaining findings${evidenceMatchesTarget ? "" : " and any post-review unreviewed target changes"} as residual risks and commit the review evidence before continuing automatically.` : `The review round limit was reached for ${reviewTask.taskId || reviewTask.title}. Keep the remaining findings${evidenceMatchesTarget ? "" : " and any post-review unreviewed target changes"} as residual risks, mark the task DONE, and commit the review evidence before continuing automatically.`;
       return {
         status: "ok",
         reasonCode: "WORKFLOW_STAGE_RESOLVED",
@@ -10430,6 +10459,26 @@ async function collectWorkflowStage(cwd, selector, component) {
         blockedReasonCode: "TASK_REVIEW_NOT_APPROVED"
       };
     }
+    if (reviewTask.reviewDecisionOutcome === "changes_requested" && reviewContext.reviewRound >= reviewContext.maxReviewRounds) {
+      return {
+        status: "ok",
+        reasonCode: "WORKFLOW_STAGE_RESOLVED",
+        docsDir: config.docsDir,
+        featureRef: buildFeatureRef(feature),
+        stage: "task_review",
+        nextAction: buildAction(
+          "task_review",
+          `The review round limit was reached for ${reviewTask.taskId || reviewTask.title} at round ${reviewContext.reviewRound}. Do not delegate another review. Repair or record the final-round evidence if needed and preserve the remaining findings and any post-review target changes as residual risks before completing the task automatically.`,
+          false,
+          null,
+          void 0,
+          reviewContext
+        ),
+        approvalRequired: false,
+        implementationAllowed: false,
+        blockedReasonCode: "TASK_REVIEW_NOT_APPROVED"
+      };
+    }
     return {
       status: "ok",
       reasonCode: "WORKFLOW_STAGE_RESOLVED",
@@ -10438,13 +10487,16 @@ async function collectWorkflowStage(cwd, selector, component) {
       stage: "task_review",
       nextAction: buildAction(
         "task_review",
-        `Delegate fresh read-only review round ${evidenceMatchesTarget ? reviewContext.reviewRound : reviewTask.reviewDecisionOutcome ? reviewContext.reviewRound + 1 : reviewContext.reviewRound} of ${reviewTask.taskId || reviewTask.title} for ${reviewTarget.baseSha}..${reviewTarget.targetSha}. Record Review Round, evidence, decision, reviewer metadata, Reviewed Head, and Reviewed Tree without modifying code.`,
+        `Delegate fresh read-only review round ${evidenceMatchesTarget ? reviewContext.reviewRound : reviewTask.reviewDecisionOutcome ? Math.min(reviewContext.reviewRound + 1, reviewContext.maxReviewRounds) : reviewContext.reviewRound} of ${reviewTask.taskId || reviewTask.title} for ${reviewTarget.baseSha}..${reviewTarget.targetSha}. Record Review Round, evidence, decision, reviewer metadata, Reviewed Head, and Reviewed Tree without modifying code.`,
         false,
         null,
         resolveAgentReviewer(config, "task"),
         {
           ...reviewContext,
-          reviewRound: !evidenceMatchesTarget && reviewTask.reviewDecisionOutcome ? reviewContext.reviewRound + 1 : reviewContext.reviewRound
+          reviewRound: !evidenceMatchesTarget && reviewTask.reviewDecisionOutcome ? Math.min(
+            reviewContext.reviewRound + 1,
+            reviewContext.maxReviewRounds
+          ) : reviewContext.reviewRound
         }
       ),
       approvalRequired: false,
@@ -10554,6 +10606,7 @@ async function collectWorkflowStage(cwd, selector, component) {
     const evidenceMatchesTarget = !!reviewTarget && tasks.prePrReviewedHead === reviewTarget.targetSha && tasks.prePrReviewedTree === reviewTarget.targetTree;
     if (reviewContext && tasks.prePrDecisionOutcome === "changes_requested") {
       if (evidenceMatchesTarget && reviewContext.reviewRound <= reviewContext.maxReviewRounds) {
+        const finalReviewRound = reviewContext.reviewRound >= reviewContext.maxReviewRounds;
         return {
           status: "ok",
           reasonCode: "WORKFLOW_STAGE_RESOLVED",
@@ -10562,7 +10615,7 @@ async function collectWorkflowStage(cwd, selector, component) {
           stage: "feature_review_fix",
           nextAction: buildAction(
             "feature_review_fix",
-            `Address the Feature review findings, commit the remediation, record review round ${reviewContext.reviewRound + 1}, and request a fresh review of the new code tree before implementation approval.`,
+            finalReviewRound ? `Address the Feature review findings and commit the remediation without requesting another review. Preserve any remaining findings and the post-review target change as residual risks before continuing automatically.` : `Address the Feature review findings, commit the remediation, record review round ${reviewContext.reviewRound + 1}, and request a fresh review of the new code tree before implementation approval.`,
             false,
             null,
             void 0,
@@ -10595,7 +10648,12 @@ async function collectWorkflowStage(cwd, selector, component) {
       };
     }
     if (!featureReviewSatisfied(config, feature, tasks, reviewTarget)) {
-      const requestedRound = reviewContext && !evidenceMatchesTarget && tasks.prePrDecisionOutcome ? reviewContext.reviewRound + 1 : reviewContext?.reviewRound;
+      const rawRequestedRound = reviewContext && !evidenceMatchesTarget && tasks.prePrDecisionOutcome ? reviewContext.reviewRound + 1 : reviewContext?.reviewRound;
+      const requestedRound = reviewContext && typeof rawRequestedRound === "number" ? Math.min(
+        rawRequestedRound,
+        reviewContext.maxReviewRounds
+      ) : rawRequestedRound;
+      const reviewLimitExhausted = !!reviewContext && tasks.prePrDecisionOutcome === "changes_requested" && reviewContext.reviewRound >= reviewContext.maxReviewRounds;
       return {
         status: "ok",
         reasonCode: "WORKFLOW_STAGE_RESOLVED",
@@ -10604,10 +10662,10 @@ async function collectWorkflowStage(cwd, selector, component) {
         stage: "pre_pr_review",
         nextAction: buildAction(
           "pre_pr_review",
-          reviewTarget ? `Delegate independent read-only Feature review round ${requestedRound} to a fresh subagent for ${reviewTarget.baseSha}..${reviewTarget.targetSha}. Record Review Round, findings, decision, reviewer metadata, Pre-PR Reviewed Head, and Pre-PR Reviewed Tree as evidence.` : "Create a project commit before requesting the independent Feature review.",
+          reviewLimitExhausted ? `The Feature review round limit was reached at round ${reviewContext.reviewRound}. Do not delegate another review. Repair or record the final-round evidence if needed and preserve the remaining findings and any post-review target changes as residual risks before continuing automatically.` : reviewTarget ? `Delegate independent read-only Feature review round ${requestedRound} to a fresh subagent for ${reviewTarget.baseSha}..${reviewTarget.targetSha}. Record Review Round, findings, decision, reviewer metadata, Pre-PR Reviewed Head, and Pre-PR Reviewed Tree as evidence.` : "Create a project commit before requesting the independent Feature review.",
           false,
           null,
-          reviewTarget ? resolveAgentReviewer(config, "feature") : void 0,
+          reviewTarget && !reviewLimitExhausted ? resolveAgentReviewer(config, "feature") : void 0,
           reviewContext ? { ...reviewContext, reviewRound: requestedRound } : void 0
         ),
         approvalRequired: false,