@pmelab/gtd 54.0.0 → 56.0.0

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

@@ -14,8 +14,6 @@ import {
   naivePass,
   acceptanceFault,
   naiveAcceptance,
-  requireAcceptance,
-  requireAcceptanceKept,
   seamBuild,
   type SeamOutcome,
 } from "./seam.js"
@@ -108,71 +106,24 @@ describe("naivePass", () => {
   })
 })
 
-describe("naiveAcceptance and requireAcceptance", () => {
-  const requirements =
-    "# R\n\n## Impact\n\n- the module\n\n## Acceptance Criteria\n\n- AC-1: adds.\n- AC-2: subtracts.\n"
-  const file = (path: string, before: string | undefined, after: string): Change => ({
-    path,
-    status: before === undefined ? "added" : "modified",
-    before,
-    after,
-  })
-  const install = (since: Change[] = []) =>
-    installContext({
-      ...fixtureContext({}),
-      matches: globMatches,
-      read: (path: string) => (path === ".gtd/REQUIREMENTS.md" ? requirements : undefined),
-      changesSince: () => since,
-      changes: () => since,
-      refuse: (message: string) => {
-        throw new Error(message)
-      },
-    } as unknown as FlowContext)
-
-  it("takes the IDs the pass's tests name on an added line, and only those test files", () => {
-    install()
+describe("naiveAcceptance", () => {
+  it("carries every test file the pass added or changed, named or not", () => {
+    installContext({ ...fixtureContext({}), matches: globMatches } as unknown as FlowContext)
     expect(
       naiveAcceptance(
         tip(
-          file("src/a.test.ts", 'it("[AC-2] old")', 'it("[AC-2] old")\nit("[AC-1] adds")'),
-          file("src/b.test.ts", undefined, 'it("helper")'),
-          file("src/calc.ts", "x", "AC-2"),
+          change("src/a.test.ts", "modified"),
+          change("tests/b.feature", "added"),
+          change("src/gone.test.ts", "deleted"),
+          change("src/calc.ts", "modified"),
+          change(".gtd/x.test.ts", "added"),
         ),
       ),
-    ).toEqual({ hash: "abc", tests: ["src/a.test.ts"], ids: ["AC-1"] })
-  })
-
-  it("refuses a rebuild whose tests leave out an ID, naming the naive tests to carry over", () => {
-    install([file("src/calc.test.ts", undefined, 'it("[AC-1] adds")')])
-    expect(() =>
-      requireAcceptance({ hash: "abc", tests: ["src/a.test.ts"], ids: ["AC-1", "AC-2"] }, "c0"),
-    ).toThrow(
-      /^gtd land: rebuild-acceptance: .*leave out AC-2 — .*git show abc -- 'src\/a\.test\.ts'/,
-    )
-  })
-
-  it("refuses a fix turn that itself drops a carried ID, never one that leaves it alone", () => {
-    const acceptance = { hash: "abc", tests: [], ids: ["AC-1"] }
-    install([file("src/calc.test.ts", 'it("[AC-1] adds")', 'it("adds")')])
-    expect(() => requireAcceptanceKept(acceptance)).toThrow(/drops AC-1/)
-    install([file("src/calc.ts", "a", "b")])
-    expect(() => requireAcceptanceKept(acceptance)).not.toThrow()
-  })
-
-  it("passes a rebuild whose tests name every ID, wherever they live", () => {
-    install([
-      file("tests/x.test.ts", undefined, 'it("[AC-1] adds")'),
-      file("tests/y.feature", "", "Scenario: [AC-2] subtracts"),
-    ])
-    expect(() =>
-      requireAcceptance({ hash: "abc", tests: ["src/a.test.ts"], ids: ["AC-1", "AC-2"] }, "c0"),
-    ).not.toThrow()
+    ).toEqual({ hash: "abc", tests: ["src/a.test.ts", "tests/b.feature"] })
   })
 })
 
 describe("acceptanceFault", () => {
-  const requirements =
-    "# R\n\n## Impact\n\n- the module\n\n## Acceptance Criteria\n\n- AC-1: adds.\n- AC-2: subtracts.\n"
   const file = (path: string, status: Change["status"], after: string): Change => ({
     path,
     status,
@@ -180,30 +131,10 @@ describe("acceptanceFault", () => {
     after,
   })
   const refusal = (...changes: Change[]): string | undefined => {
-    installContext({
-      ...fixtureContext({}),
-      matches: globMatches,
-      read: (path: string) => (path === ".gtd/REQUIREMENTS.md" ? requirements : undefined),
-    } as unknown as FlowContext)
-    return acceptanceFault(".gtd/REQUIREMENTS.md", tip(...changes))
+    installContext({ ...fixtureContext({}), matches: globMatches } as unknown as FlowContext)
+    return acceptanceFault(tip(...changes))
   }
-  const tagged = 'import { add } from "../src/calc.js"\nit("[AC-1] adds")\nit("[AC-2] subtracts")'
-
-  it("passes when every ID is named in a test the pass wrote", () => {
-    expect(
-      refusal(file("src/calc.ts", "modified", "x"), file("tests/calc.test.ts", "added", tagged)),
-    ).toBe(undefined)
-  })
-
-  it("names every ID no test of the pass mentions", () => {
-    const message = refusal(file("tests/calc.test.ts", "added", 'it("[AC-12] x")'))
-    expect(message).toMatch(/^acceptance-tests: /)
-    expect(message).toContain("AC-1, AC-2")
-  })
-
-  it("does not count an ID in a non-test file", () => {
-    expect(refusal(file("src/calc.ts", "modified", "AC-1 AC-2"))).toContain("AC-1, AC-2")
-  })
+  const tagged = 'import { add } from "../src/calc.js"\nit("adds")'
 
   it("refuses a test importing a file the pass added, resolved from the test's directory", () => {
     const message = refusal(
@@ -224,17 +155,6 @@ describe("acceptanceFault", () => {
     ).toContain("acceptance-internals")
   })
 
-  it("counts only the lines the pass added: an ID an earlier feature left does not", () => {
-    const old = 'it("[AC-1] old")\nit("[AC-2] old")'
-    const message = refusal({
-      path: "tests/calc.test.ts",
-      status: "modified",
-      before: old,
-      after: `${old}\nit("[AC-2] new")`,
-    })
-    expect(message).toContain("names AC-1 —")
-  })
-
   it("refuses a bare . or .. import of an added index", () => {
     expect(
       refusal(
@@ -424,7 +344,7 @@ describe("seamBuild", () => {
       reference: "abc",
       base: "after-refactor",
       refactored: true,
-      rebuild: { note: "Seam: a shared op", acceptance: { hash: "abc", tests: [], ids: [] } },
+      rebuild: { note: "Seam: a shared op", acceptance: { hash: "abc", tests: [] } },
     })
     expect(h.names.indexOf("seam.note")).toBe(h.names.indexOf("seam.judge") + 1)
     expect(h.names.indexOf("refactor.deriving")).toBe(h.names.indexOf("seam.note") + 1)
@@ -440,7 +360,7 @@ describe("seamBuild", () => {
     expect(h.outcome).toEqual({
       reference: "abc",
       base: "c-base",
-      rebuild: { acceptance: { hash: "abc", tests: [], ids: [] } },
+      rebuild: { acceptance: { hash: "abc", tests: ["src/a.test.ts"] } },
     })
     expect(h.names).not.toContain("seam.by-hand")
     expect(h.names.some((n) => n.startsWith("refactor"))).toBe(false)
@@ -466,7 +386,7 @@ describe("seamBuild", () => {
     expect(h.outcome).toEqual({
       reference: "abc",
       base: "c-base",
-      rebuild: { acceptance: { hash: "abc", tests: [], ids: [] } },
+      rebuild: { acceptance: { hash: "abc", tests: [] } },
     })
   })
 })
@@ -543,19 +463,17 @@ describe("implement", () => {
         reference: "abc",
         rebuild: {
           note: "# Note\n\nSeam: a shared op",
-          acceptance: { hash: "abc", tests: ["src/a.test.ts"], ids: ["AC-1"] },
+          acceptance: { hash: "abc", tests: ["src/a.test.ts"] },
         },
-        // The fixture's turn carries no test, so the acceptance guard refuses it after the prompt.
-      }).catch(() => undefined),
+      }),
     )
     expect(prompt).toContain("  > Seam: a shared op")
-    expect(prompt).toContain("acceptance tests for AC-1")
     expect(prompt).toContain("git show abc -- 'src/a.test.ts'")
   })
 
-  it("a rebuild whose naive tests named no ID asks to carry nothing over", async () => {
+  it("a rebuild whose naive pass wrote no test asks to carry nothing over", async () => {
     const prompt = await building("abc", undefined, undefined, () =>
-      implement({ reference: "abc", rebuild: { acceptance: { hash: "abc", tests: [], ids: [] } } }),
+      implement({ reference: "abc", rebuild: { acceptance: { hash: "abc", tests: [] } } }),
     )
     expect(prompt).not.toContain("Carry over")
     expect(prompt).not.toContain("refactor note")

package/src/workflows/feature/seam.ts

@@ -3,7 +3,6 @@ import {
   agent,
   applyScript,
   changes,
-  changesSince,
   check,
   codeChanges,
   env,
@@ -92,43 +91,19 @@ const reaches = (imports: ReturnType<typeof importsOf>, added: string): boolean
     imports.some(({ path, tail }) => name === path || (tail && name.endsWith(`/${path}`))),
   )
 
-const named = (id: string, text: string): boolean =>
-  new RegExp(`(?<![\\w-])${id}(?!\\d)`).test(text)
-
-/** The lines `change` added: an ID an earlier change left in the file does not count. */
-const addedLines = (change: Change): string => {
-  const before = new Set((change.before ?? "").split("\n"))
-  return change
-    .after!.split("\n")
-    .filter((line) => !before.has(line))
-    .join("\n")
-}
-
 const acceptanceTests = (changes: readonly Change[]): readonly Change[] =>
   changes.filter((c) => c.after !== undefined && isCode(c.path) && isTestFile(c.path))
 
-const idsOf = (file: string): string[] => criterionIds(read(file) ?? "")
-
-// One rule for both gates, so a naive test carried over verbatim always satisfies the rebuild's.
-const unnamed = (ids: readonly string[], tests: readonly Change[]): string[] => {
-  const lines = tests.map(addedLines)
-  return ids.filter((id) => !lines.some((text) => named(id, text)))
-}
-
 /**
- * Why `tip`'s tests fall short, or `undefined`: a criterion ID of `file` no
- * test line of the pass names, or a test importing a file the pass added —
- * naive structure a reset and refactor replaces, which the tests must survive.
+ * Why `tip`'s tests fall short, or `undefined`: a test importing a file the
+ * pass added — naive structure a reset and refactor replaces, which the tests
+ * must survive.
  */
-export const acceptanceFault = (file: string, tip: KeptTip): string | undefined => {
-  const tests = acceptanceTests(tip.changes)
-  const untested = unnamed(idsOf(file), tests)
-  if (untested.length > 0)
-    return `acceptance-tests: no test of the naive pass names ${untested.join(", ")} — write a behaviour-level test for each criterion with its ID in the test or scenario name, e.g. "[${untested[0]}] …"`
+export const acceptanceFault = (tip: KeptTip): string | undefined => {
   const added = tip.changes
     .filter((c) => c.status === "added" && isCode(c.path) && !isTestFile(c.path))
     .map((c) => c.path)
-  const reaching = tests
+  const reaching = acceptanceTests(tip.changes)
     .filter((test) => holdsCallSites(test.path))
     .flatMap((test) => {
       const imports = importsOf(test)
@@ -141,48 +116,11 @@ export const acceptanceFault = (file: string, tip: KeptTip): string | undefined
   return undefined
 }
 
-/** What a rebuild carries over from the naive pass `tip`: the IDs its tests name, and those test files. */
-export const naiveAcceptance = (tip: KeptTip): t.Acceptance => {
-  const ids = idsOf(REQUIREMENTS)
-  const perTest = acceptanceTests(tip.changes).map((c) => {
-    const lines = addedLines(c)
-    return { path: c.path, ids: ids.filter((id) => named(id, lines)) }
-  })
-  return {
-    hash: tip.hash,
-    tests: perTest.filter((c) => c.ids.length > 0).map((c) => c.path),
-    ids: ids.filter((id) => perTest.some((c) => c.ids.includes(id))),
-  }
-}
-
-/**
- * Refuse a rebuild whose test changes since `since` leave out an ID the naive
- * pass's tests named. A skipped test still counts: the gate reads text, never runs it.
- */
-export const requireAcceptance = (acceptance: t.Acceptance, since: string): void => {
-  const missing = unnamed(acceptance.ids, acceptanceTests(changesSince(since)))
-  if (missing.length === 0) return
-  refuse(
-    `gtd land: rebuild-acceptance: the rebuild's tests leave out ${missing.join(", ")} — carry over the naive pass's acceptance tests (\`git show ${acceptance.hash} -- ${acceptance.tests.map(quote).join(" ")}\`), each with its ID in the test or scenario name`,
-  )
-}
-
-/**
- * Refuse a fix turn that, on its own, drops an ID the naive pass's tests named
- * from a test file. Turn-local, so a person's edit at an escalation rest never
- * wedges later fix turns.
- */
-export const requireAcceptanceKept = (acceptance: t.Acceptance): void => {
-  const dropped = acceptance.ids.filter((id) =>
-    changes()
-      .filter((c) => isCode(c.path) && isTestFile(c.path))
-      .some((c) => named(id, c.before ?? "") && !named(id, c.after ?? "")),
-  )
-  if (dropped.length === 0) return
-  refuse(
-    `gtd land: rebuild-acceptance: this turn drops ${dropped.join(", ")} from the tests — the naive pass's acceptance tests stay; fix the code, not them`,
-  )
-}
+/** What a rebuild carries over from the naive pass `tip`: every test file it added or changed. */
+export const naiveAcceptance = (tip: KeptTip): t.Acceptance => ({
+  hash: tip.hash,
+  tests: acceptanceTests(tip.changes).map((c) => c.path),
+})
 
 const restore = (path: string): string =>
   `if git cat-file -e ${quote(`HEAD:${path}`)} 2>/dev/null; then git checkout -q HEAD -- ${quote(path)}; else rm -f -- ${quote(path)}; fi`
@@ -243,12 +181,6 @@ const applied = async (tip: string): Promise<boolean> => {
   return !wrote(FEEDBACK) && codeChanges().length > 0
 }
 
-/** `carried` limited to the criteria `.gtd/REQUIREMENTS.md` lists now; a file listing none narrows nothing. */
-const settled = (carried: readonly string[]): readonly string[] => {
-  const listed = idsOf(REQUIREMENTS)
-  return listed.length === 0 ? carried : carried.filter((id) => listed.includes(id))
-}
-
 const build = async (options: ImplementOptions): Promise<void> => {
   await t.agentWithSkills(
     "building",
@@ -290,19 +222,11 @@ export async function implement(
 /** `implement`, resolving with the criterion IDs the requirements listed when it closed. */
 export const implementing = (options: ImplementOptions): Promise<readonly string[]> =>
   scope("implement", async () => {
-    const since = head()
-    const acceptance = options.rebuild?.acceptance
     const built = options.naive === undefined || !(await applied(options.naive))
     if (built) await build(options)
     else requireCriteriaFrozen(REQUIREMENTS)
-    // Only the criteria the requirements still list.
-    if (built && acceptance !== undefined)
-      requireAcceptance({ ...acceptance, ids: settled(acceptance.ids) }, since)
-    // Fix turns are held to the carried tests too: deleting a red one must not buy a green suite.
-    const keepsTests =
-      built && acceptance !== undefined ? () => requireAcceptanceKept(acceptance) : undefined
-    await green(keepsTests)
-    await prototypeTest(keepsTests)
+    await green()
+    await prototypeTest()
     const ids = criterionIds(read(REQUIREMENTS) ?? "")
     await run("closing", removeScript([REQUIREMENTS, REFACTOR_NOTE, PROTOTYPE]), {
       label: "Closing out the implementation",
@@ -360,7 +284,7 @@ interface Vetting {
 
 /** Sends a pass whose tests fall short or run red back (`undefined`: it goes on, an overruled one as it is). */
 const vetted = async (tip: KeptTip, vetting: Vetting): Promise<Verdict | undefined> => {
-  const fault = vetting.waived ? undefined : acceptanceFault(REQUIREMENTS, tip)
+  const fault = vetting.waived ? undefined : acceptanceFault(tip)
   if (fault !== undefined) {
     const verdict = await vetting.again({ fault, hash: tip.hash })
     if (verdict.kind !== "overruled") return verdict

package/src/workflows/feature/standards.feature

@@ -1,8 +1,8 @@
 @inmem
 Feature: the review learns standards from the human's answers
 
-  A won't-fix tick or an own answer at the review gate is a candidate
-  standard. A judge asks whether it is reusable; above `standardMinP` it is
+  A won't-fix tick or an own answer at the review gate — on a note the human
+  added with its own answer boxes — is a candidate standard. A judge asks whether it is reusable; above `standardMinP` it is
   kept in `.gtd/STANDARDS.md` with no further question, and every later agent
   turn — lenses and coder alike — is told to follow it. One that contradicts
   a standard already kept becomes a note in `.gtd/REVIEW.md` the review cannot
@@ -12,7 +12,7 @@ Feature: the review learns standards from the human's answers
   Background:
     Given the shipped workflows, as gtd install scaffolds them
     And an environment variable "GTD_PROTOTYPEROUNDS" set to "0"
-    And an environment variable "GTD_QUALITYREVIEWS" set to "correctness"
+    And an environment variable "GTD_QUALITYREVIEWS" set to ""
     And an environment variable "GTD_FLAGMODE" set to "false"
     And a file "src/calc.ts" with:
       """
@@ -59,15 +59,6 @@ Feature: the review learns standards from the human's answers
     And step "implement.applying" runs its script
     And step "implement.health.check" changes nothing
     And step "implement.closing" runs its script
-    And step "build.quality.correctness.reviewing" writes ".gtd/QUALITY.md" with:
-      """
-      # Quality
-
-      ## subtract has no class
-
-      Calculators read better as classes.
-      """
-    And step "build.quality.sorting" runs its script
     And step "build.review.reviewing" writes ".gtd/REVIEW.md" with:
       """
       # Review: abc1234
@@ -78,29 +69,7 @@ Feature: the review learns standards from the human's answers
 
       - [ ] ./src/calc.ts#2-2 — subtract(a, b)
       """
-    And step "build.review.reviewing", when prompted with "- `## subtract has no class`", writes ".gtd/REVIEW.md" with:
-      """
-      # Review: abc1234
-
-      <!-- base: 0000000 -->
-
-      ## Subtract
-
-      - [ ] ./src/calc.ts#2-2 — subtract(a, b)
-
-      ## subtract has no class
-
-      - [ ] ./src/calc.ts#2-2 — a plain function
-      """
     And step "build.review.carrying" runs its script
-    And judge step "build.review.ranking" answers:
-      """
-      []
-      """
-    And judge step "build.quality.triage" answers:
-      """
-      [{"id":"Q1","answer":"design","p":0.9}]
-      """
     And step "build.review.closing" runs its script
     And step "build.review.standards.recording" runs its script
     And step "build.review.standards.raising" runs its script
@@ -111,6 +80,18 @@ Feature: the review learns standards from the human's answers
       [{"id":"standard-1","answer":"yes","p":0.9}]
       """
     When the process is driven
+    And ".gtd/REVIEW.md" gets appended:
+      """
+      ## subtract has no class
+
+      Calculators read better as classes.
+
+      Tick exactly one:
+
+      - [ ] fix as suggested
+      - [ ] won't fix
+      - [ ] _your answer_
+      """
     And the text "- [ ] won't fix" in ".gtd/REVIEW.md" is replaced with "- [x] won't fix"
     And gtd lands
     And the process is driven
@@ -143,6 +124,18 @@ Feature: the review learns standards from the human's answers
       """
     And step "build.health.check" changes nothing
     When the process is driven
+    And ".gtd/REVIEW.md" gets appended:
+      """
+      ## subtract has no class
+
+      Calculators read better as classes.
+
+      Tick exactly one:
+
+      - [ ] fix as suggested
+      - [ ] won't fix
+      - [ ] _your answer_
+      """
     And the text "- [ ] _your answer_" in ".gtd/REVIEW.md" is replaced with "- [x] Calculators are plain functions."
     And gtd lands
     And the process is driven
@@ -162,6 +155,18 @@ Feature: the review learns standards from the human's answers
       [{"id":"standard-1","answer":"yes","p":0.6}]
       """
     When the process is driven
+    And ".gtd/REVIEW.md" gets appended:
+      """
+      ## subtract has no class
+
+      Calculators read better as classes.
+
+      Tick exactly one:
+
+      - [ ] fix as suggested
+      - [ ] won't fix
+      - [ ] _your answer_
+      """
     And the text "- [ ] won't fix" in ".gtd/REVIEW.md" is replaced with "- [x] won't fix"
     And gtd lands
     And the process is driven
@@ -210,6 +215,18 @@ Feature: the review learns standards from the human's answers
       [{"id":"answer-1","answer":"praise","p":0.9}]
       """
     When the process is driven
+    And ".gtd/REVIEW.md" gets appended:
+      """
+      ## subtract has no class
+
+      Calculators read better as classes.
+
+      Tick exactly one:
+
+      - [ ] fix as suggested
+      - [ ] won't fix
+      - [ ] _your answer_
+      """
     And the text "- [ ] _your answer_" in ".gtd/REVIEW.md" is replaced with "- [x] Calculators are plain functions."
     And gtd lands
     And the process is driven
@@ -267,6 +284,18 @@ Feature: the review learns standards from the human's answers
       [{"id":"standard-1","answer":"yes","p":0.9},{"id":"standard-1.contradicts-1","answer":"yes","p":0.8}]
       """
     When the process is driven
+    And ".gtd/REVIEW.md" gets appended:
+      """
+      ## subtract has no class
+
+      Calculators read better as classes.
+
+      Tick exactly one:
+
+      - [ ] fix as suggested
+      - [ ] won't fix
+      - [ ] _your answer_
+      """
     And the text "- [ ] won't fix" in ".gtd/REVIEW.md" is replaced with "- [x] won't fix"
     And gtd lands
     And the process is driven
@@ -303,6 +332,18 @@ Feature: the review learns standards from the human's answers
       [{"id":"standard-1","answer":"yes","p":0.9},{"id":"standard-1.contradicts-1","answer":"yes","p":0.8}]
       """
     When the process is driven
+    And ".gtd/REVIEW.md" gets appended:
+      """
+      ## subtract has no class
+
+      Calculators read better as classes.
+
+      Tick exactly one:
+
+      - [ ] fix as suggested
+      - [ ] won't fix
+      - [ ] _your answer_
+      """
     And the text "- [ ] won't fix" in ".gtd/REVIEW.md" is replaced with "- [x] won't fix"
     And gtd lands
     And the process is driven

package/src/workflows/fix/fix-lens-origin.feature

@@ -1,9 +1,8 @@
 @inmem
-Feature: each finding the reviewer is handed names the lens that wrote it
+Feature: each finding at the finding gate names the lens that wrote it
 
   Lenses append to `.gtd/QUALITY.md` in turn, so a finding belongs to the lens
-  whose turn added it — even when two lenses give findings the same title,
-  which the review then tells apart by a numbered suffix.
+  whose turn added it — even when two lenses give findings the same title.
 
   Background:
     Given the shipped workflows, as gtd install scaffolds them
@@ -62,7 +61,7 @@ Feature: each finding the reviewer is handed names the lens that wrote it
 
       From tests.
       """
-    And step "build.quality.sorting" runs its script
+    And step "build.quality.gating" runs its script
     And step "build.quality.closing" runs its script
     And step "build.review.reviewing" writes ".gtd/REVIEW.md" with:
       """
@@ -84,8 +83,8 @@ Feature: each finding the reviewer is handed names the lens that wrote it
       """
     When gtd opens door "fix"
     And the process is driven
-    Then the process rests at "build.review.await-review"
-    And ".gtd/REVIEW.md" contains:
+    Then the process rests at "build.quality.gate"
+    And ".gtd/QUALITY.md" contains:
       """
       ## sum is untested
 
@@ -93,9 +92,23 @@ Feature: each finding the reviewer is handed names the lens that wrote it
 
       From correctness.
 
-      ## sum is untested (2)
+      - [ ] fix
+
+      ## sum is untested
 
       _From lens tests._
 
       From tests.
+
+      - [ ] fix
+      """
+    When gtd lands
+    And the process is driven
+    Then the process rests at "build.review.await-review"
+    And ".gtd/REVIEW.md" contains:
+      """
+      Dropped at the finding gate:
+
+      - sum is untested (lens correctness)
+      - sum is untested (lens tests)
       """