@pmelab/gtd 41.0.0 → 42.0.0

package/src/workflows/feature/refactor-review.feature

@@ -78,7 +78,7 @@ Feature: the refactor slice is reviewed on its own before the feature is impleme
       """
     And step "refactor.health.check" changes nothing
     And step "refactor.closing" runs its script
-    And step "refactor.build.review.reviewing" writes ".gtd/REVIEW.md" with:
+    And step "refactor.build.review.composing" writes ".gtd/REVIEW.md" with:
       """
       # Review: abc1234
 
@@ -171,7 +171,7 @@ Feature: the refactor slice is reviewed on its own before the feature is impleme
       """
     And step "refactor.health.check" changes nothing
     And step "refactor.closing" runs its script
-    And step "refactor.build.review.reviewing" writes ".gtd/REVIEW.md" with:
+    And step "refactor.build.review.composing" writes ".gtd/REVIEW.md" with:
       """
       # Review: abc1234
 
@@ -191,8 +191,8 @@ Feature: the refactor slice is reviewed on its own before the feature is impleme
     And the commit subjects end with:
       """
       gtd(check): refactor.closing → refactor.build.quality.correctness.reviewing
-      gtd(agent): refactor.build.quality.correctness.reviewing → refactor.build.review.reviewing
-      gtd(agent): refactor.build.review.reviewing → refactor.build.review.await-review
+      gtd(agent): refactor.build.quality.correctness.reviewing → refactor.build.review.composing
+      gtd(check): refactor.build.review.composing → refactor.build.review.await-review
       """
 
 
@@ -263,7 +263,7 @@ Feature: the refactor slice is reviewed on its own before the feature is impleme
         """
       And step "refactor.health.check" changes nothing
       And step "refactor.closing" runs its script
-      And step "refactor.build.review.reviewing" writes ".gtd/REVIEW.md" with:
+      And step "refactor.build.review.composing" writes ".gtd/REVIEW.md" with:
         """
         # Review: abc1234
 
@@ -345,91 +345,10 @@ Feature: the refactor slice is reviewed on its own before the feature is impleme
         gtd(check): refactor.deriving → refactor.building
         gtd(agent): refactor.building → refactor.health.check
         gtd(check): refactor.health.check → refactor.closing
-        gtd(check): refactor.closing → refactor.build.review.reviewing
-        gtd(agent): refactor.build.review.reviewing → refactor.build.review.await-review
+        gtd(check): refactor.closing → refactor.build.review.composing
+        gtd(check): refactor.build.review.composing → refactor.build.review.await-review
         """
 
-    Scenario: the refactor review says the whole refactor on its second round
-      Given step "refactor.build.review.reviewing" is prompted with "it covers the whole refactor since it started, on every round"
-      And step "implement.building" writes "src/calc.ts" with:
-        """
-        export const op = (a: number, b: number, sign: number) => a + sign * b
-        export const add = (a: number, b: number) => op(a, b, 1)
-        export const subtract = (a: number, b: number) => op(a, b, -1)
-        """
-      And step "implement.building" writes "src/acceptance.test.ts" with:
-        """
-        it("[AC-1] holds", () => {})
-        """
-      And step "implement.health.check" changes nothing
-      And step "implement.closing" runs its script
-      And judge step "implement.coverage" answers:
-        """
-        [{"id":"AC-1","answer":"yes","p":0.9}]
-        """
-      When the process is driven
-      Then the process rests at "refactor.build.review.await-review"
-      Given a file ".gtd/REVIEW.md" with:
-        """
-        # Review: abc1234
-
-        <!-- base: 0000000 -->
-
-        ## calc
-
-        - [ ] ./src/calc.ts#1-2
-          add built on the shared op[^why]
-
-        [^why]:
-            - H: name the helper `combine`
-        """
-      And step "refactor.build.review.collecting" writes ".gtd/REFACTOR.md" with:
-        """
-        Name the shared helper `combine`.
-        """
-      And step "refactor.build.review.collecting" writes ".gtd/REVIEW.md" with:
-        """
-        # Review: abc1234
-
-        <!-- base: 0000000 -->
-
-        ## calc
-
-        - [ ] ./src/calc.ts#1-2
-          add built on the shared op[^why]
-
-        [^why]:
-            - H: name the helper `combine`
-            - A: noted in the refactor package.
-        """
-      When gtd lands
-      And the process is driven
-      Then the process rests at "refactor.build.review.await-review"
-      Given a file ".gtd/REVIEW.md" with:
-        """
-        # Review: abc1234
-
-        <!-- base: 0000000 -->
-
-        ## calc
-
-        - [ ] ./src/calc.ts#1-2
-          add built on the shared op
-        """
-      And step "refactor.re-unwind" runs its script
-      And step "refactor.deriving" runs its script
-      And step "refactor.building" writes "src/calc.ts" with:
-        """
-        export const combine = (a: number, b: number, sign: number) => a + sign * b
-        export const add = (a: number, b: number) => combine(a, b, 1)
-        """
-      When gtd lands
-      And the process is driven
-      Then the process rests at "refactor.build.review.await-review"
-      When gtd lands
-      And the process is driven
-      Then the process rests at "build.review.reviewing"
-
     Scenario: a question answered at the refactor review reaches the re-derived package as ### Answered Questions
       When the process is driven
       Then the process rests at "refactor.build.review.await-review"
@@ -515,8 +434,8 @@ Feature: the refactor slice is reviewed on its own before the feature is impleme
         gtd(check): refactor.deriving → refactor.building
         gtd(agent): refactor.building → refactor.health.check
         gtd(check): refactor.health.check → refactor.closing
-        gtd(check): refactor.closing → refactor.build.review.reviewing
-        gtd(agent): refactor.build.review.reviewing → refactor.build.review.await-review
+        gtd(check): refactor.closing → refactor.build.review.composing
+        gtd(check): refactor.build.review.composing → refactor.build.review.await-review
         """
 
     Scenario: an edit note the collecting turn leaves out refuses the landing and never signs off
@@ -727,7 +646,7 @@ Feature: the refactor slice is reviewed on its own before the feature is impleme
         """
       When gtd lands
       And the process is driven
-      Then the process rests at "build.review.reviewing"
+      Then the process rests at "build.review.composing"
       And "src/calc.ts" contains "subtract"
 
     Scenario: a praise-only one-shot footnote signs off and the feature slice follows
@@ -769,7 +688,7 @@ Feature: the refactor slice is reviewed on its own before the feature is impleme
         """
       When gtd lands
       And the process is driven
-      Then the process rests at "build.review.reviewing"
+      Then the process rests at "build.review.composing"
       And "src/calc.ts" contains "subtract"
 
     Scenario: a one-shot footnote judged edit that collecting leaves out refuses naming its anchor
@@ -1084,7 +1003,7 @@ Feature: the refactor slice is reviewed on its own before the feature is impleme
         """
       When gtd lands
       And the process is driven
-      Then the process rests at "build.review.reviewing"
+      Then the process rests at "build.review.composing"
       And "src/calc.ts" contains "subtract"
 
     Scenario: a praise-only refactor review still signs off and the feature slice follows
@@ -1119,7 +1038,7 @@ Feature: the refactor slice is reviewed on its own before the feature is impleme
         """
       When gtd lands
       And the process is driven
-      Then the process rests at "build.review.reviewing"
+      Then the process rests at "build.review.composing"
       And "src/calc.ts" contains "subtract"
 
     Scenario: a nit fix in the refactor slice that changes a non-stray is refused, though a glob stray widens the write access
@@ -1184,8 +1103,8 @@ Feature: the refactor slice is reviewed on its own before the feature is impleme
       Then the process rests at "refactor.build.review.await-review"
       And the commit subjects end with:
         """
-        gtd(check): refactor.closing → refactor.build.review.reviewing
-        gtd(agent): refactor.build.review.reviewing → refactor.build.review.await-review
+        gtd(check): refactor.closing → refactor.build.review.composing
+        gtd(check): refactor.build.review.composing → refactor.build.review.await-review
         """
 
   Rule: with a quality lens on both slices
@@ -1256,7 +1175,7 @@ Feature: the refactor slice is reviewed on its own before the feature is impleme
         """
       And step "refactor.health.check" changes nothing
       And step "refactor.closing" runs its script
-      And step "refactor.build.review.reviewing" writes ".gtd/REVIEW.md" with:
+      And step "refactor.build.review.composing" writes ".gtd/REVIEW.md" with:
         """
         # Review: abc1234
 
@@ -1309,11 +1228,11 @@ Feature: the refactor slice is reviewed on its own before the feature is impleme
       And the resting step's content contains the hash of the commit "gtd(check): refactor.build.review.closing → implement.building"
       Given step "build.quality.correctness.reviewing" changes nothing
       When the process is driven
-      Then the process rests at "build.review.reviewing"
+      Then the process rests at "build.review.composing"
       And the commit subjects end with:
         """
         gtd(check): implement.closing → build.quality.correctness.reviewing
-        gtd(agent): build.quality.correctness.reviewing → build.review.reviewing
+        gtd(agent): build.quality.correctness.reviewing → build.review.composing
         """
 
   Rule: a refactor package never carries a test file, and demoted headings stop at ######
@@ -1463,7 +1382,7 @@ Feature: the refactor slice is reviewed on its own before the feature is impleme
         """
       And step "refactor.health.check" changes nothing
       And step "refactor.closing" runs its script
-      And step "refactor.build.review.reviewing" writes ".gtd/REVIEW.md" with:
+      And step "refactor.build.review.composing" writes ".gtd/REVIEW.md" with:
         """
         # Review: abc1234
 

package/src/workflows/feature/refactor.test.ts

@@ -781,8 +781,6 @@ interface ReviewedScript {
   /** The collecting turn writes no package. */
   readonly silentCollect?: boolean
   readonly collected?: string
-  /** The note the first `review.reviewing` turn writes; later ones write `add`. */
-  readonly firstReviewNote?: string
 }
 
 /** Runs `reviewedRefactor` against a scripted context; a third await-review stops the run. */
@@ -797,7 +795,6 @@ const driveReviewed = async (
   const files = new Map<string, string>()
   let last = ""
   let awaits = 0
-  let reviews = 0
   let reds = script.reds ?? 0
   let checking = false
   let pending: boolean | Error = false
@@ -823,9 +820,7 @@ const driveReviewed = async (
     ...Object.fromEntries(lensEffects),
     deriving: () => void files.set(REFACTOR_PACKAGE, "package"),
     closing: () => void files.delete(REFACTOR_PACKAGE),
-    "review.reviewing": () => {
-      files.set(REVIEW, reviewDoc(reviews++ === 0 ? (script.firstReviewNote ?? "add") : "add"))
-    },
+    "review.composing": () => void files.set(REVIEW, reviewDoc("add")),
     "review.closing": () => void files.delete(REVIEW),
     "review.collecting": () => {
       if (!script.silentCollect)
@@ -846,6 +841,14 @@ const driveReviewed = async (
           if (request.kind === "restart") return Promise.resolve()
           record(request)
           effects[request.name]?.()
+          // Every lens finding is mechanical, so the fix turn runs.
+          if (request.kind === "judge" && request.name === "quality.triage")
+            return Promise.resolve({
+              answers: Object.fromEntries(
+                request.questions.map((q) => [q.id, { answer: "mechanical", p: 0.9 }]),
+              ),
+              truncated: [],
+            })
           return Promise.resolve(
             request.kind === "judge" ? { answers: script.answers ?? {}, truncated: [] } : undefined,
           )
@@ -926,7 +929,7 @@ describe("reviewedRefactor", () => {
       "refactor.build.quality.correctness.reviewing",
       "refactor.build.quality.ponytail-review.reviewing",
       "refactor.build.quality.conventions.reviewing",
-      "refactor.build.review.reviewing",
+      "refactor.build.review.composing",
       "refactor.build.review.await-review",
       "refactor.build.review.closing",
     ])
@@ -934,8 +937,8 @@ describe("reviewedRefactor", () => {
 
   it("reviews from HEAD at scope entry", async () => {
     const h = await driveReviewed(shape())
-    const reviewing = h.steps.find((s) => s.kind === "agent" && s.name === "review.reviewing")
-    expect(reviewing?.kind === "agent" ? reviewing.prompt : "").toContain("base: c0")
+    const composing = h.steps.find((s) => s.kind === "run" && s.name === "review.composing")
+    expect(composing?.kind === "run" ? composing.body : "").toContain("<!-- base: c0 -->")
   })
 
   it("names the entry commit in every lens prompt, on the first lap and after a feedback lap", async () => {
@@ -1192,10 +1195,6 @@ describe("reviewedRefactor's tail prompts", () => {
   it.each([
     ["refactor.build.fix", { findings: true, reds: 2 }],
     ["refactor.build.fix.quality.fixing", { findings: true }],
-    [
-      "refactor.build.review.fix.risks.fixing",
-      { firstReviewNote: "Risk: drops the carry", notes: [undefined] },
-    ],
     [
       "refactor.build.review.fix.nits.fixing",
       { notes: ["nit"], answers: { "note-1": { answer: "nit", p: 0.9 } } },
@@ -1211,17 +1210,3 @@ describe("reviewedRefactor's tail prompts", () => {
     },
   )
 })
-
-describe("reviewedRefactor's review lap wording", () => {
-  it("says the whole refactor since it started on the first and the second round", async () => {
-    const h = await driveReviewed(shape(), { notes: ["add — rename it", undefined] })
-    const prompts = h.steps.flatMap((s) =>
-      s.kind === "agent" && s.name === "review.reviewing" ? [s.prompt] : [],
-    )
-    expect(prompts).toHaveLength(2)
-    for (const prompt of prompts) {
-      expect(prompt).toContain("it covers the whole refactor since it started, on every round")
-      expect(prompt).not.toContain("only what is new since the previous review")
-    }
-  })
-})

package/src/workflows/feature/refactor.ts

@@ -389,7 +389,6 @@ export const reviewedRefactor = async (
         fixAccess: strayAccess(p.strays),
         lensBase: entry,
         rules: t.refactorRules(p.strays, p.pattern),
-        lap: "refactor",
       })
       if (outcome.verdict === "signoff") return true
       await reUnwind(outcome)

package/src/workflows/feature/review-gate.feature

@@ -57,7 +57,7 @@ Feature: a feature process ends at the human review
       """
       [{"id":"AC-1","answer":"yes","p":0.9}]
       """
-    And step "build.review.reviewing" writes ".gtd/REVIEW.md" with:
+    And step "build.review.composing" writes ".gtd/REVIEW.md" with:
       """
       # Review: abc1234
 
@@ -78,8 +78,8 @@ Feature: a feature process ends at the human review
     And the commit subjects end with:
       """
       gtd(judge): implement.coverage → implement.closing
-      gtd(check): implement.closing → build.review.reviewing
-      gtd(agent): build.review.reviewing → build.review.await-review
+      gtd(check): implement.closing → build.review.composing
+      gtd(check): build.review.composing → build.review.await-review
       """
 
   Scenario: a sign-off ends the process at idle
@@ -102,7 +102,7 @@ Feature: a feature process ends at the human review
     And ".gtd/REVIEW.md" does not exist
     And the commit subjects end with:
       """
-      gtd(agent): build.review.reviewing → build.review.await-review
+      gtd(check): build.review.composing → build.review.await-review
       gtd(human): build.review.await-review → build.review.closing
       gtd(check): build.review.closing → idle
       """
@@ -214,8 +214,8 @@ Feature: a feature process ends at the human review
         gtd(agent): implement.building → implement.health.check
         gtd(check): implement.health.check → implement.coverage
         gtd(judge): implement.coverage → implement.closing
-        gtd(check): implement.closing → build.review.reviewing
-        gtd(agent): build.review.reviewing → build.review.await-review
+        gtd(check): implement.closing → build.review.composing
+        gtd(check): build.review.composing → build.review.await-review
         """
 
     Scenario: a design numbering new behaviour at or below an earlier ID is refused

package/src/workflows/feature/review.test.ts

@@ -48,7 +48,7 @@ interface Drive {
   readonly vars?: Readonly<Record<string, string>>
   /** The REVIEW.md the human leaves; defaults to `notes` laid over the baseline. */
   readonly after?: string
-  /** The REVIEW.md each `review.reviewing` turn writes, in order; also raises the review-turn stop to one past the last. */
+  /** The REVIEW.md each `review.composing` turn writes, in order; also raises the review-turn stop to one past the last. */
   readonly reviewDocs?: readonly (string | undefined)[]
   /** Let the run pass the second gate, stopping at the first range read after it. */
   readonly passSecondGate?: boolean
@@ -95,7 +95,7 @@ const drive = async (d: Drive): Promise<Run> => {
   let awaits = 0
   let reviews = 0
   const effects: Record<string, () => void> = {
-    "review.reviewing": () => {
+    "review.composing": () => {
       const docs = d.reviewDocs
       if (++reviews > (docs?.length ?? 0) + (docs === undefined ? 1 : 0)) throw new Stop()
       const written = docs?.[reviews - 1]
@@ -116,6 +116,7 @@ const drive = async (d: Drive): Promise<Run> => {
       gateMessages.push(request.options.message ?? "")
     }
     if (request.kind === "agent") prompts.set(request.name, request.prompt)
+    if (request.kind === "run") prompts.set(request.name, request.body)
     if (request.kind === "judge") asked.push(...request.questions)
   }
   const context = fixtureContext(
@@ -184,10 +185,10 @@ describe("the risk-fix pass", () => {
   it("a marked risk is fixed, kept green, re-reviewed, then rests at the gate", async () => {
     const run = await drive({ notes: [], reviewDocs: [risky, clean] })
     expect(run.log.slice(0, 5)).toEqual([
-      "review.reviewing",
+      "review.composing",
       "review.fix.risks.fixing",
       "health.check",
-      "review.reviewing",
+      "review.composing",
       "review.await-review",
     ])
     expect(run.prompts.get("review.fix.risks.fixing")).toContain("risk-1")
@@ -199,10 +200,10 @@ describe("the risk-fix pass", () => {
     const run = await drive({ notes: [], reviewDocs: [risky, risky] })
     expect(run.log.filter((n) => n === "review.fix.risks.fixing")).toHaveLength(1)
     expect(run.log.slice(0, 5)).toEqual([
-      "review.reviewing",
+      "review.composing",
       "review.fix.risks.fixing",
       "health.check",
-      "review.reviewing",
+      "review.composing",
       "review.await-review",
     ])
   })
@@ -232,7 +233,7 @@ describe("the risk-fix pass", () => {
   it("no marker means no fix-risks step", async () => {
     const run = await drive({ notes: [], reviewDocs: [clean] })
     expect(run.log).not.toContain("review.fix.risks.fixing")
-    expect(run.log[0]).toBe("review.reviewing")
+    expect(run.log[0]).toBe("review.composing")
     expect(run.log[1]).toBe("review.await-review")
   })
 
@@ -243,16 +244,16 @@ describe("the risk-fix pass", () => {
       reviewDocs: [undefined, risky, clean],
     })
     expect(run.log).toEqual([
-      "review.reviewing",
+      "review.composing",
       "review.await-review",
       "review.triage",
       "review.fix.nits.fixing",
       "health.check",
       "review.closing",
-      "review.reviewing",
+      "review.composing",
       "review.fix.risks.fixing",
       "health.check",
-      "review.reviewing",
+      "review.composing",
       "review.await-review",
     ])
   })
@@ -265,7 +266,7 @@ describe("the guard", () => {
   it("runs right after the risk-fix turn", async () => {
     const run = await drive({ notes: [], reviewDocs: [risky, clean], guarded: true })
     expect(run.log.slice(0, 4)).toEqual([
-      "review.reviewing",
+      "review.composing",
       "review.fix.risks.fixing",
       "guard",
       "health.check",
@@ -443,7 +444,7 @@ describe("review verdict routing", () => {
   it("an unanswered note counts as edit", async () => {
     const run = await drive({ notes: ["add — typo", "sub", "mul"], answers: {} })
     expect(run.log).toEqual([
-      "review.reviewing",
+      "review.composing",
       "review.await-review",
       "review.triage",
       "review.closing",
@@ -478,7 +479,7 @@ describe("review verdict routing", () => {
   it("only praise closes and signs off with no agent turn", async () => {
     const run = await drive({ notes, answers: { "note-1": verdict("praise") } })
     expect(run.log).toEqual([
-      "review.reviewing",
+      "review.composing",
       "review.await-review",
       "review.triage",
       "review.closing",
@@ -492,7 +493,7 @@ describe("review verdict routing", () => {
       answers: { "note-1": verdict("question"), "note-2": verdict("question") },
     })
     expect(run.log).toEqual([
-      "review.reviewing",
+      "review.composing",
       "review.await-review",
       "review.triage",
       "review.answer-review-questions",
@@ -508,17 +509,17 @@ describe("review verdict routing", () => {
       answers: { "note-1": verdict("question"), "note-2": verdict("nit") },
     })
     expect(run.log).toEqual([
-      "review.reviewing",
+      "review.composing",
       "review.await-review",
       "review.triage",
       "review.answer-review-questions",
       "review.fix.nits.fixing",
       "health.check",
       "review.closing",
-      "review.reviewing",
+      "review.composing",
     ])
     expect(run.prompts.get("review.fix.nits.fixing")).not.toContain("why?")
-    expect(run.prompts.get("review.reviewing")).toContain("Carry-over: commit `c4`")
+    expect(run.prompts.get("review.composing")).toContain("git show 'c4:.gtd/REVIEW.md'")
     expect(run.result).toBe("stopped")
   })
 
@@ -527,7 +528,8 @@ describe("review verdict routing", () => {
       notes: ["add — typo", "sub", "mul"],
       answers: { "note-1": verdict("nit") },
     })
-    expect(run.prompts.get("review.reviewing")).not.toContain("Carry-over")
+    expect(run.prompts.get("review.composing")).not.toContain("git show")
+    expect(run.prompts.get("review.composing")).toContain("## Fixed from your notes")
   })
 
   it("edits run after questions and nits, and the capture names only the edits and the answering commit", async () => {
@@ -536,7 +538,7 @@ describe("review verdict routing", () => {
       answers: { "note-2": verdict("question"), "note-3": verdict("nit") },
     })
     expect(run.log).toEqual([
-      "review.reviewing",
+      "review.composing",
       "review.await-review",
       "review.triage",
       "review.answer-review-questions",
@@ -556,7 +558,7 @@ describe("review verdict routing", () => {
   it("a noted round with no extractable note collects as one edit, without judging", async () => {
     const run = await drive({ notes: [], after: BEFORE + "\nSome stray prose.\n" })
     expect(run.log).toEqual([
-      "review.reviewing",
+      "review.composing",
       "review.await-review",
       "review.closing",
       "review.collecting",
@@ -679,7 +681,7 @@ describe("severity routing", () => {
       answers: { "note-1": verdict("edit"), ...sev("note-1", could) },
     })
     expect(run.log).toEqual([
-      "review.reviewing",
+      "review.composing",
       "review.await-review",
       "review.triage",
       "review.defer",
@@ -771,7 +773,7 @@ describe("severity routing", () => {
       passSecondGate: true,
     })
     expect(run.log).toEqual([
-      "review.reviewing",
+      "review.composing",
       "review.await-review",
       "review.triage",
       "review.answer-review-questions",
@@ -807,7 +809,7 @@ describe("BuildTailOptions.lensBase", () => {
             if (request.kind === "restart") return Promise.resolve()
             if (request.kind === "agent" && request.name.startsWith("quality."))
               prompts.push(request.prompt)
-            if (request.name === "review.reviewing") throw new Stop()
+            if (request.name === "review.composing") throw new Stop()
             return Promise.resolve()
           },
           pushScope: () => undefined,
@@ -1048,10 +1050,12 @@ describe("buildTail without rules", () => {
             if (request.kind === "agent") prompts.set(request.name, request.prompt)
             if (request.name === "health.check") checks++
             if (request.name === "fix.quality.fixing") files.delete(".gtd/QUALITY.md")
-            if (request.name === "review.reviewing" || request.name === "health.stop")
+            if (request.name === "review.composing" || request.name === "health.stop")
               throw new Stop()
             return Promise.resolve(
-              request.kind === "judge" ? { answers: {}, truncated: [] } : undefined,
+              request.kind === "judge"
+                ? { answers: { Q1: { answer: "mechanical", p: 0.9 } }, truncated: [] }
+                : undefined,
             )
           },
           pushScope: () => undefined,