taskplane 0.22.6 → 0.22.8

package/extensions/task-runner.ts

@@ -2148,6 +2148,9 @@ export default function (pi: ExtensionAPI) {
 
 	// ── review_step Tool (orchestrated mode only) ───────────────────
 
+	/** Per-step code review cycle counter. Reset when reviewer is killed after APPROVE. */
+	const stepCodeReviewCounts = new Map<number, number>();
+
 	/**
 	 * Reset reviewer telemetry fields on state to idle/zero.
 	 * Called after a review completes to clear dashboard metrics.
@@ -2291,6 +2294,30 @@ export default function (pi: ExtensionAPI) {
 				const reviewsDir = join(task.taskFolder, ".reviews");
 				if (!existsSync(reviewsDir)) mkdirSync(reviewsDir, { recursive: true });
 
+				// Per-step code review cycle limit
+				if (reviewType === "code") {
+					const codeCount = (stepCodeReviewCounts.get(stepNum) || 0) + 1;
+					stepCodeReviewCounts.set(stepNum, codeCount);
+					const maxCycles = config.context.max_review_cycles || 2;
+					if (codeCount > maxCycles) {
+						logExecution(statusPath, `Skip code review`,
+							`Step ${stepNum} code review cycle limit reached (${codeCount}/${maxCycles}) — auto-approving`);
+						// Kill reviewer to free context for next step
+						if (state.persistentReviewerKill) {
+							try { state.persistentReviewerKill(); } catch {}
+						}
+						state.persistentReviewerSession = null;
+						state.persistentReviewerKill = null;
+						state.persistentReviewerSignalNum = 0;
+						state.reviewerRespawnCount = 0;
+						stepCodeReviewCounts.delete(stepNum);
+						return {
+							content: [{ type: "text" as const, text: `APPROVE — Code review cycle limit reached (${maxCycles}). Auto-approved to prevent context exhaustion.` }],
+							details: undefined,
+						};
+					}
+				}
+
 				// Low-risk step check (safety net — worker template also skips)
 				if (isLowRiskStep(stepNum, task.steps.length)) {
 					const label = stepNum === 0 ? "Preflight" : "final step";
@@ -2551,17 +2578,19 @@ export default function (pi: ExtensionAPI) {
 					updateWidgets();
 
 					// Extract verdict and build result
-					const { resultText } = processReviewVerdict(
+					const { resultText, verdict } = processReviewVerdict(
 						reviewContent, statusPath, num, reviewType, stepNum, state.reviewCounter,
 					);
 
-					// After code review: kill the persistent reviewer to free context.
-					// The reviewer persists through a plan+code pair for one step,
-					// then gets a fresh session for the next step.
-					if (reviewType === "code") {
-						console.error(`[task-runner] code review complete for step ${stepNum} — killing reviewer for fresh context on next step`);
+					// After code review APPROVE: kill the persistent reviewer to free context.
+					// The reviewer persists through plan+code for one step, and through
+					// REVISE→fix→re-review cycles (it knows what it asked to be fixed).
+					// Only kill on APPROVE — a REVISE means the worker needs to fix and
+					// re-submit, and the same reviewer should evaluate the follow-up.
+					if (reviewType === "code" && (verdict === "APPROVE" || verdict === "UNAVAILABLE")) {
+						console.error(`[task-runner] code review ${verdict} for step ${stepNum} — killing reviewer for fresh context on next step`);
 						logExecution(statusPath, `Reviewer R${num}`,
-							`code review complete — killing persistent reviewer (step ${stepNum} cycle done)`);
+							`code review ${verdict} — killing persistent reviewer (step ${stepNum} cycle done)`);
 						if (state.persistentReviewerKill) {
 							try { state.persistentReviewerKill(); } catch {}
 						}
@@ -2569,6 +2598,7 @@ export default function (pi: ExtensionAPI) {
 						state.persistentReviewerKill = null;
 						state.persistentReviewerSignalNum = 0;
 						state.reviewerRespawnCount = 0;
+						stepCodeReviewCounts.delete(stepNum);
 					}
 
 					state.reviewerStatus = "idle";
@@ -2824,6 +2854,26 @@ export default function (pi: ExtensionAPI) {
 				}
 			}
 
+			// ── Step transition: kill persistent reviewer for fresh context ──
+			// When a step completes, the reviewer's context from that step is stale.
+			// Kill it so the next step gets a clean reviewer session.
+			if (newlyCompleted.length > 0 && state.persistentReviewerSession) {
+				console.error(`[task-runner] step(s) completed — killing reviewer for fresh context`);
+				logExecution(statusPath, "Reviewer cleanup",
+					`killing persistent reviewer on step transition (${newlyCompleted.map(s => `Step ${s.number}`).join(", ")} completed)`);
+				if (state.persistentReviewerKill) {
+					try { state.persistentReviewerKill(); } catch {}
+				}
+				state.persistentReviewerSession = null;
+				state.persistentReviewerKill = null;
+				state.persistentReviewerSignalNum = 0;
+				state.reviewerRespawnCount = 0;
+				// Reset per-step code review counters for completed steps
+				for (const step of newlyCompleted) {
+					stepCodeReviewCounts.delete(step.number);
+				}
+			}
+
 			// Log iteration summary with progress delta and completed steps
 			const completedNames = newlyCompleted.map(s => `Step ${s.number}`).join(", ");
 			if (newlyCompleted.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taskplane",
-  "version": "0.22.6",
+  "version": "0.22.8",
   "description": "AI agent orchestration for pi — parallel task execution with checkpoint discipline",
   "keywords": [
     "pi-package",

package/templates/agents/task-worker.md

@@ -205,7 +205,8 @@ value.
 - **APPROVE** → proceed to next step
 - **RETHINK** → reconsider your plan approach, adjust, then implement
 - **REVISE** → read the review file in `.reviews/` for detailed feedback,
-  address the issues, commit fixes, then proceed
+  address the issues, commit fixes, then **call `review_step` again** for re-review.
+  The same reviewer evaluates whether your fixes address its concerns.
 - **UNAVAILABLE** → reviewer failed, proceed with caution
 
 **Example flow for a Review Level 2 task, Step 3:**
@@ -215,8 +216,9 @@ value.
 4. Implement Step 3
 5. Commit changes
 6. Call `review_step(step=3, type="code", baseline="<saved SHA>")` → get code feedback
-7. If REVISE: fix issues, commit again
-8. Move to Step 4
+7. If REVISE: fix issues, commit, call `review_step(step=3, type="code")` again
+8. Repeat 7 until APPROVE (max 2 code review cycles per step)
+9. Move to Step 4
 
 If the `review_step` tool is not available (e.g., non-orchestrated mode), skip
 this protocol entirely — the task-runner handles reviews externally.