@pmelab/gtd 24.3.0 → 25.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmelab/gtd",
-  "version": "24.3.0",
+  "version": "25.0.0",
   "private": false,
   "description": "Git-aware CLI that emits the next prompt for an autonomous coding agent based on the current repository state",
   "bin": {
@@ -106,7 +106,6 @@
     "watch": "tsdown --watch",
     "bench:replay": "node scripts/bench-replay.mjs",
     "test": "turbo run format:check typecheck lint lint:sh lint:boundaries test:unit test:workflows test:e2e:inmem test:e2e:live test:web analyze",
-    "test:fast": "turbo run format:check typecheck lint lint:sh lint:boundaries test:unit test:workflows test:web analyze",
     "test:unit": "vitest run --project unit",
     "test:workflows": "vitest run --project workflows",
     "test:watch": "vitest",

package/src/cli/Program.test.ts

@@ -17,7 +17,7 @@ vi.mock("node:os", async (importOriginal) => ({
 
 import { runCli, type Command } from "./index.js"
 import { EXIT_USAGE_ERROR, stallDiagnosis, noopText, WIRE_SCHEMA } from "../wire/index.js"
-import { formatFinding, needsOf, runCommand, SelectorUsageError } from "./Program.js"
+import { needsOf, runCommand, SelectorUsageError } from "./Program.js"
 import { InMemRepo, makeCapturingCliIo, testLayers, applyEmittedScript } from "../testkit/index.js"
 import {
   commitAll,
@@ -28,6 +28,7 @@ import {
 } from "../emit/index.js"
 import { HISTORY_REF } from "../platform/index.js"
 import { CONFIG_SCAFFOLD } from "../install/index.js"
+import { contentHash } from "../workflow/index.js"
 
 const run = async (
   repo: InMemRepo,
@@ -102,7 +103,7 @@ export const defaults = { greeting: "hello" }
     expect(exitCode).toBe(0)
     expect(stdout).toContain(
       commitAll(
-        "gtd(human): working\n\nGtd-Workflow: hotfix\nGtd-Var: greeting=hello\nGtd-Format: 1",
+        `gtd(human): working\n\nGtd-Workflow: hotfix\nGtd-Var: greeting=hello\nGtd-Config: ${contentHash(WORKFLOW)} gtd.config.ts\nGtd-Format: 1`,
       ),
     )
     expect(repo.commitHistory()).toHaveLength(before)
@@ -958,12 +959,6 @@ describe("gtd check <mode> <file>", () => {
     )
   })
 
-  it("a line-carrying finding with no range prints '<file>:<line>: <message>' — the flat-shape fallback no built-in format reaches", async () => {
-    expect(formatFinding("FAKE.md", { message: "positioned but rangeless", line: 4 })).toBe(
-      "FAKE.md:5: positioned but rangeless",
-    )
-  })
-
   it("an absent file exits 0 with no output", async () => {
     const repo = bareRepo()
     const { stdout, exitCode } = await run(repo, "check", "qa", ".gtd/TODO.md")

package/src/cli/Program.ts

@@ -66,7 +66,7 @@ import {
   openThreads,
   parseCodeThreads,
   unansweredQuestions,
-  type SteeringFinding,
+  formatFinding,
   type SteeringFormat,
 } from "../steering/index.js"
 import {
@@ -851,13 +851,6 @@ const runValidateCommand = (out: ArtifactOut): Effect.Effect<void, Error, Comman
     )
   })
 
-/** `file:line:col: message` — the shape editors and grep already jump on. Stored 0-based, printed 1-based. A finding with a `line` but no `range`, or none at all, degrades to the shorter forms. */
-export const formatFinding = (file: string, finding: SteeringFinding): string => {
-  if (finding.line === undefined) return finding.message
-  const col = finding.range !== undefined ? `:${finding.range.start.character + 1}` : ""
-  return `${file}:${finding.line + 1}${col}: ${finding.message}`
-}
-
 /**
  * Runs `<mode>`'s parser over `<file>`, exiting non-zero on any finding.
  * Resolves no workflow state and reads no config — this is what a seeded

package/src/edge/Edge.test.ts

@@ -22,6 +22,7 @@ import { GTD_VERSION } from "../install/index.js"
 import { processHistoryRef } from "../platform/index.js"
 import { GitService, Workspace, type GitOperations, type WorkspaceOps } from "../platform/index.js"
 import { formatCommitMessage, type CommitSpec } from "../replay/index.js"
+import { contentHash } from "../workflow/index.js"
 import {
   fakeGitOperations,
   InMemRepo,
@@ -201,7 +202,7 @@ describe("currentRun", () => {
     const before = headOf(repo)
     const opening = await enter(repo, "side")
     expect(repo.lastCommitMessage()).toBe(
-      "gtd(human): fixing\n\nGtd-Workflow: side\nGtd-Var: base=\nGtd-Var: reviewer=nobody\nGtd-Format: 1",
+      `gtd(human): fixing\n\nGtd-Workflow: side\nGtd-Var: base=\nGtd-Var: reviewer=nobody\nGtd-Config: ${contentHash(LINEAR)} gtd.config.ts\nGtd-Format: 1`,
     )
     const fixed = await land(repo, { "fix.txt": "x\n" })
     const run = await provide(currentRun, repo)
@@ -233,7 +234,9 @@ export const again = async () => {
     const repo = repoWith(STARTS_AT_INITIAL)
     const before = headOf(repo)
     const opening = await enter(repo, "again")
-    expect(repo.lastCommitMessage()).toBe("gtd(human): idle\n\nGtd-Workflow: again\nGtd-Format: 1")
+    expect(repo.lastCommitMessage()).toBe(
+      `gtd(human): idle\n\nGtd-Workflow: again\nGtd-Config: ${contentHash(STARTS_AT_INITIAL)} gtd.config.ts\nGtd-Format: 1`,
+    )
     const fixed = await land(repo, { "fix.txt": "x\n" })
     const run = await provide(currentRun, repo)
     expect(run.workflow).toBe("again")

package/src/edge/Edge.ts

@@ -12,7 +12,6 @@ import {
   ConfigDiscovery,
   ConfigService,
   changedConfigFiles,
-  configFingerprint,
   contentHash,
   multilineSetting,
   resolveVars,
@@ -972,7 +971,7 @@ export const restAt = (
           }))
         : []
     const memory = memoryOf(outcome.trace, run)
-    const configNow = configFingerprint(config.workflowFiles, host.root)
+    const configNow = config.fingerprint
     // Only the current rest warns, so a command must read it once — a second
     // read warns twice. An earlier ref (restore's tip) would warn about a
     // process the command is not acting on.
@@ -1320,7 +1319,7 @@ const differingConfigPaths = (
   git: GitService["Type"],
   workspace: Workspace["Type"],
   root: string,
-  config: { readonly workflowFiles: readonly string[] },
+  config: { readonly fingerprint: ConfigFingerprint },
   run: ProcessRun,
   hash: string,
 ) =>
@@ -1328,7 +1327,7 @@ const differingConfigPaths = (
     const differing: string[] = []
     for (const path of inRepoConfigPaths(
       root,
-      config.workflowFiles,
+      Object.keys(config.fingerprint),
       run.pinnedConfig?.files ?? {},
     )) {
       const atTip = yield* Effect.orElseSucceed(git.readFileAtRef(hash, path), () => undefined)

package/src/emit/index.ts

@@ -1,6 +1,7 @@
 export {
   type EmitStep,
   fileExistsGuard,
+  withFileVar,
   commandForFile,
   binaryGuard,
   failurePromptWrapper,

package/src/flows/scripts.ts

@@ -118,3 +118,9 @@ export const moveScript = (from: string, to: string): string =>
     `mv -- ${quote(from)} ${quote(to)}`,
     "",
   ].join("\n")
+
+/** Write `path` as committed at `ref` to `to`. */
+export const showScript = (ref: string, path: string, to: string): string =>
+  ["#!/usr/bin/env sh", "set -e", `git show ${quote(`${ref}:${path}`)} > ${quote(to)}`, ""].join(
+    "\n",
+  )

package/src/platform/Git.test.ts

@@ -39,12 +39,9 @@ describe("resolvedRefOrCorrupted", () => {
   })
 })
 
-/**
- * `GitScript.ts`'s bash builders, run through real `bash` against a real git
- * repo — the Live tier only, since the in-memory fake's root has no shell to
- * execute against. Asserts the same 9 writer postconditions as the contract
- * above, driven via the emitted script instead of the `GitOperations` port.
- */
-describe("GitScript", () => {
-  runGitScriptContract()
-})
+/** `GitScript.ts`'s builders as a driver runs them: real `sh` against the in-memory twin. */
+for (const makeTier of gitTiers) {
+  describe(`GitScript [${makeTier().name}]`, () => {
+    runGitScriptContract(makeTier)
+  })
+}

package/src/replay/Replay.ts

@@ -260,7 +260,8 @@ export const replay = async (input: ReplayInput): Promise<ReplayOutcome> => {
   const treeAt = (hash: string): TreeView | undefined =>
     hash === input.episode.base.hash
       ? input.episode.base.tree
-      : commits.find((c) => c.hash === hash)?.tree
+      : (commits.find((c) => c.hash === hash)?.tree ??
+        (hash === input.start ? input.startTree : undefined))
 
   let cursor = 0
   let pendingUsed = false

package/src/steering/FORMATS.md

@@ -47,7 +47,7 @@ Breaking — committed files, or files an older gtd must read, are affected:
   questions, options, chunks, hunks, ticks, threads or notes.
 - A writer (a tick, a note, a reply) produces text an older gtd cannot read.
 - Renaming or removing a marker: `## Open Questions`, `_your answer_`,
-  `# Review:`, `<!-- base: -->`, `Risk:`, `H:` / `A:`.
+  `# Review:`, `<!-- base: -->`, `Risk:`, a leading `! `, `H:` / `A:`.
 
 ## Format changes bump `Gtd-Format`
 

package/src/steering/SteeringFormat.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest"
-import { steeringFormatFor } from "./index.js"
+import { formatFinding, steeringFormatFor } from "./index.js"
 import type { SteeringFinding, SteeringFormat } from "./SteeringFormat.js"
 
 const QA_FORMAT = steeringFormatFor("qa")!
@@ -89,3 +89,11 @@ describe("SteeringFinding range invariants", () => {
     assertRangeInvariants(findings)
   })
 })
+
+describe("formatFinding", () => {
+  it("a line-carrying finding with no range prints '<file>:<line>: <message>' — the flat-shape fallback no built-in format reaches", () => {
+    expect(formatFinding("FAKE.md", { message: "positioned but rangeless", line: 4 })).toBe(
+      "FAKE.md:5: positioned but rangeless",
+    )
+  })
+})

package/src/steering/SteeringFormat.ts

@@ -41,6 +41,13 @@ export interface SteeringFinding {
   }
 }
 
+/** `file:line:col: message` — the shape editors and grep already jump on. Stored 0-based, printed 1-based. A finding with a `line` but no `range`, or none at all, degrades to the shorter forms. */
+export const formatFinding = (file: string, finding: SteeringFinding): string => {
+  if (finding.line === undefined) return finding.message
+  const col = finding.range !== undefined ? `:${finding.range.start.character + 1}` : ""
+  return `${file}:${finding.line + 1}${col}: ${finding.message}`
+}
+
 /** A hunk pointer's document-link target: `range` covers the pointer token itself; `line` is 0-based, so a `#42` suffix resolves down by one and a bare `./path` lands at 0. */
 export interface SteeringLink {
   readonly range: {

package/src/steering/contract.test.ts

@@ -174,6 +174,7 @@ describe("review notes, the review → fix hand-off", () => {
         anchor: "Parser accepts CRLF",
         before: "**Line endings are normalized before the split.**",
         text: "**Line endings are normalized before the split.** Also normalize in the writer.",
+        forced: false,
       },
       {
         id: "note-2",
@@ -181,6 +182,7 @@ describe("review notes, the review → fix hand-off", () => {
         anchor: "Parser accepts CRLF ./src/parse.ts#30-31",
         before: "Risk: a lone `\\r` is still kept as content",
         text: "Risk: a lone `\\r` is still kept as content. Treat it as a line break too.",
+        forced: false,
       },
       {
         id: "note-3",
@@ -188,6 +190,7 @@ describe("review notes, the review → fix hand-off", () => {
         anchor: "- [x] ./src/parse.test.ts#1-40 — one case per line ending[^fn1]",
         before: "",
         text: "Add a mixed-endings case.",
+        forced: false,
       },
     ])
   })

package/src/steering/index.ts

@@ -5,6 +5,7 @@ import type {
   SteeringOutlineNode,
   SteeringPointer,
 } from "./SteeringFormat.js"
+export { formatFinding } from "./SteeringFormat.js"
 import { qaDescriptor } from "./qa.js"
 import { reviewDescriptor } from "./review.js"
 export { reviewNotes, reviewRisks, type ReviewNote } from "./review.js"

package/src/steering/review.test.ts

@@ -1733,6 +1733,7 @@ describe("reviewNotes", async () => {
         anchor: "Chunk one ./src/a.ts#1-3",
         before: "",
         text: "rename this",
+        forced: false,
       },
     ])
   })
@@ -1753,6 +1754,7 @@ describe("reviewNotes", async () => {
         anchor: "- [ ] ./src/a.ts#1-3[^n1]",
         before: "",
         text: "please split",
+        forced: false,
       },
     ])
   })
@@ -1774,6 +1776,34 @@ describe("reviewNotes", async () => {
     expect(reviewNotes(answered, more).map((n) => n.kind)).toEqual(["footnote"])
   })
 
+  it("a leading ! forces a pointer note and keeps its text", () => {
+    const [n] = reviewNotes(base, base.replace("#1-3", "#1-3 !  rename this"))
+    expect(n).toMatchObject({ kind: "pointer", text: "! rename this", forced: true })
+  })
+
+  it("a leading ! forces a footnote note", () => {
+    const after = base.replace("#1-3", "#1-3[^n1]") + "\n[^n1]: ! please split\n"
+    expect(reviewNotes(base, after)[0]).toMatchObject({ text: "! please split", forced: true })
+  })
+
+  it("a leading ! forces chunk prose", () => {
+    const [n] = reviewNotes(base, doc("! Prose is wrong."))
+    expect(n).toMatchObject({ kind: "chunk", text: "! Prose is wrong.", forced: true })
+  })
+
+  it("a ! glued to the next word is not a marker", () => {
+    const [n] = reviewNotes(base, base.replace("#1-3", "#1-3 != should be ==="))
+    expect(n).toMatchObject({ text: "!= should be ===", forced: false })
+  })
+
+  it("a mid-text ! or a ! in the pointer path does not force", () => {
+    const [n] = reviewNotes(base, base.replace("#1-3", "#1-3 rename this!"))
+    expect(n).toMatchObject({ text: "rename this!", forced: false })
+    const [m] = reviewNotes(base, base.replace("./src/a.ts#1-3", "./src/a!b.ts#1-3 x"))
+    expect(m).toMatchObject({ forced: false })
+    expect(m!.anchor).toContain("a!b.ts")
+  })
+
   it("ids run in document order", () => {
     const after = base.replace("#1-3", "#1-3 a[^n1]") + "\n[^n1]: b\n"
     expect(reviewNotes(base, after).map((n) => [n.id, n.kind])).toEqual([

package/src/steering/review.ts

@@ -1085,12 +1085,14 @@ export interface ReviewNote {
   readonly before: string
   /** The human's text. */
   readonly text: string
+  /** The human opened `text` with `! ` (kept in `text`; the feature review strips it). */
+  readonly forced?: boolean
 }
 
 const pointerLabel = (f: ReviewFile): string =>
   `${f.path}${f.line === undefined ? "" : `#${f.line}${f.rangeEnd === undefined ? "" : `-${f.rangeEnd}`}`}`
 
-type Found = { line: number; note: Omit<ReviewNote, "id"> }
+type Found = { line: number; note: Omit<ReviewNote, "id" | "forced"> }
 
 const chunkNote = (chunk: Changeset, prior: Changeset | undefined): Found[] =>
   chunk.description === (prior?.description ?? "")
@@ -1162,7 +1164,11 @@ export const reviewNotes = (before: string, after: string): readonly ReviewNote[
     }),
     ...footnoteNotes(before, after),
   ]
-  return found.sort((a, b) => a.line - b.line).map((f, i) => ({ id: `note-${i + 1}`, ...f.note }))
+  return found
+    .sort((a, b) => a.line - b.line)
+    .map((f, i) => {
+      return { id: `note-${i + 1}`, ...f.note, forced: /^!(\s|$)/.test(f.note.text) }
+    })
 }
 
 /** Pointer notes the reviewer opened with `Risk:`, in document order — the ones the workflow fixes before the human gate. */

package/src/testkit/EmittedScriptRecognizer.test.ts

@@ -42,7 +42,7 @@ describe("applyEmittedScript — the 8 GitScript builders", () => {
     const result = applyEmittedScript(repo, NO_COMMANDS, commitAll("gtd(agent): building"))
     twin.commitAllWithPrefix("gtd(agent): building")
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(snapshot(repo)).toEqual(snapshot(twin))
   })
 
@@ -60,7 +60,7 @@ describe("applyEmittedScript — the 8 GitScript builders", () => {
 
     const result = applyEmittedScript(repo, NO_COMMANDS, commitAll(message))
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(repo.lastCommitMessage()).toBe(message)
   })
 
@@ -77,7 +77,7 @@ describe("applyEmittedScript — the 8 GitScript builders", () => {
     const result = applyEmittedScript(repo, NO_COMMANDS, commitAsIs("gtd(agent): as-is"))
     twin.commitAsIs("gtd(agent): as-is")
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(snapshot(repo)).toEqual(snapshot(twin))
   })
 
@@ -97,7 +97,7 @@ describe("applyEmittedScript — the 8 GitScript builders", () => {
     const result = applyEmittedScript(repo, NO_COMMANDS, softResetTo(first))
     twin.softResetTo(first)
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(snapshot(repo)).toEqual(snapshot(twin))
     expect(repo.resolveRef("HEAD")).toBe(first)
   })
@@ -118,7 +118,7 @@ describe("applyEmittedScript — the 8 GitScript builders", () => {
     const result = applyEmittedScript(repo, NO_COMMANDS, mixedResetTo(first))
     twin.mixedResetTo(first)
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(snapshot(repo)).toEqual(snapshot(twin))
   })
 
@@ -138,7 +138,7 @@ describe("applyEmittedScript — the 8 GitScript builders", () => {
     const result = applyEmittedScript(repo, NO_COMMANDS, hardResetTo(first))
     twin.hardResetTo(first)
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(snapshot(repo)).toEqual(snapshot(twin))
     expect(repo.hasPath("b.txt")).toBe(false)
   })
@@ -158,7 +158,7 @@ describe("applyEmittedScript — the 8 GitScript builders", () => {
     const result = applyEmittedScript(repo, NO_COMMANDS, discardPending())
     twin.discardPending()
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(snapshot(repo)).toEqual(snapshot(twin))
     expect(repo.readFile("a.txt")).toBe("1")
     expect(repo.hasPath("untracked.txt")).toBe(false)
@@ -176,7 +176,7 @@ describe("applyEmittedScript — the 8 GitScript builders", () => {
     const result = applyEmittedScript(repo, NO_COMMANDS, updateRef("refs/gtd/base", hash))
     twin.updateRef("refs/gtd/base", hash)
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(repo.resolveRef("refs/gtd/base")).toBe(hash)
     expect(snapshot(repo)).toEqual(snapshot(twin))
   })
@@ -194,7 +194,7 @@ describe("applyEmittedScript — the 8 GitScript builders", () => {
     const result = applyEmittedScript(repo, NO_COMMANDS, deleteRef("refs/gtd/base"))
     twin.deleteRef("refs/gtd/base")
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(repo.resolveRef("refs/gtd/base")).toBeNull()
     expect(snapshot(repo)).toEqual(snapshot(twin))
   })
@@ -210,7 +210,7 @@ describe("applyEmittedScript — gtd check <mode> <file>", () => {
 
     const result = applyEmittedScript(repo, NO_COMMANDS, "gtd check qa '.gtd/TODO.md'")
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
   })
 
   it("fails on invalid qa-mode content (a bare ### heading with no question text)", () => {
@@ -220,7 +220,7 @@ describe("applyEmittedScript — gtd check <mode> <file>", () => {
     const result = applyEmittedScript(repo, NO_COMMANDS, "gtd check qa '.gtd/TODO.md'")
 
     expect(result.ok).toBe(false)
-    expect(result.error).toContain("gtd check qa")
+    expect(result.output).toContain('.gtd/TODO.md is not valid under mode "qa"')
   })
 })
 
@@ -231,7 +231,7 @@ describe("applyEmittedScript — Emit.ts's fileExistsGuard", () => {
 
     const result = applyEmittedScript(repo, NO_COMMANDS, fileExistsGuard(".gtd/PLAN.md"))
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
   })
 
   it("stops the whole script (successfully) when the file is absent — unlike every other guard, it does not fail", () => {
@@ -240,7 +240,7 @@ describe("applyEmittedScript — Emit.ts's fileExistsGuard", () => {
     const script = [fileExistsGuard(".gtd/PLAN.md"), "gtd check qa '.gtd/PLAN.md'"].join("\n\n")
     const result = applyEmittedScript(repo, NO_COMMANDS, script)
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
   })
 
   it("a subsequent block after the guard trips is never applied", () => {
@@ -262,7 +262,7 @@ describe("applyEmittedScript — ModeContradiction.ts's skip notice", () => {
 
     const result = applyEmittedScript(repo, NO_COMMANDS, modeContradictionSkipNotice("adr"))
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
   })
 })
 
@@ -284,7 +284,7 @@ describe("applyEmittedScript — ModeContradiction.ts's contradiction round-trip
 
     const result = applyEmittedScript(repo, commands, block)
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(repo.readFile(samplePath)).toBeUndefined()
   })
 
@@ -359,7 +359,7 @@ describe("applyEmittedScript — the scripted-command table", () => {
 
     const result = applyEmittedScript(repo, commands, "./run-check.sh")
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
   })
 
   it("an 'exit' hit with a non-zero status fails the script", () => {
@@ -370,8 +370,7 @@ describe("applyEmittedScript — the scripted-command table", () => {
 
     const result = applyEmittedScript(repo, commands, "./run-check.sh")
 
-    expect(result.ok).toBe(false)
-    expect(result.error).toContain("./run-check.sh")
+    expect(result).toMatchObject({ ok: false, status: 1, output: "boom\n" })
   })
 
   it("a 'rewrite' hit mutates the repo's file", () => {
@@ -383,7 +382,7 @@ describe("applyEmittedScript — the scripted-command table", () => {
 
     const result = applyEmittedScript(repo, commands, "./format-feedback.sh")
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(repo.readFile("FEEDBACK.md")).toBe("new")
   })
 })
@@ -434,7 +433,7 @@ describe("applyEmittedScript — a tripped precondition stops the script", () =>
 
     const result = applyEmittedScript(repo, NO_COMMANDS, script)
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(repo.lastCommitMessage()).toBe("gtd(agent): lands")
   })
 })
@@ -455,7 +454,7 @@ describe("applyEmittedScript — a realistic assembled multi-block script", () =
 
     const result = applyEmittedScript(repo, NO_COMMANDS, script)
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(repo.lastCommitMessage()).toBe("gtd(agent): second")
     expect(repo.resolveRef("refs/gtd/base")).toBe(first)
   })
@@ -479,7 +478,7 @@ describe("applyEmittedScript — a realistic src/emit/Emit.ts-assembled script",
     const result = applyEmittedScript(repo, NO_COMMANDS, required)
     twin.commitAllWithPrefix("gtd(agent): building")
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(snapshot(repo)).toEqual(snapshot(twin))
   })
 
@@ -505,7 +504,7 @@ describe("applyEmittedScript — a realistic src/emit/Emit.ts-assembled script",
     const { required } = emitScripts(steps)
     const result = applyEmittedScript(repo, NO_COMMANDS, required)
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(repo.resolveRef("refs/worktree/gtd/history")).toBe(tip)
     expect(repo.lastCommitMessage()).toBe("chore: squashed")
     expect(repo.hasPath(".gtd/TODO.md")).toBe(false)
@@ -520,7 +519,7 @@ describe("applyEmittedScript — outcome blocks are inert (no git effect to miss
 
     const result = applyEmittedScript(repo, NO_COMMANDS, transitionOutcome("idle", "working"))
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(snapshot(repo)).toEqual(before)
   })
 
@@ -531,7 +530,7 @@ describe("applyEmittedScript — outcome blocks are inert (no git effect to miss
 
     const result = applyEmittedScript(repo, NO_COMMANDS, commitOutcome("gtd(agent): x"))
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(snapshot(repo)).toEqual(before)
   })
 
@@ -553,7 +552,7 @@ describe("applyEmittedScript — outcome blocks are inert (no git effect to miss
     const result = applyEmittedScript(repo, NO_COMMANDS, required)
     twin.commitAllWithPrefix("gtd(agent): building")
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(snapshot(repo)).toEqual(snapshot(twin))
   })
 
@@ -567,7 +566,7 @@ describe("applyEmittedScript — outcome blocks are inert (no git effect to miss
     ])
     const result = applyEmittedScript(repo, NO_COMMANDS, required)
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(snapshot(repo)).toEqual(before)
   })
 })
@@ -583,7 +582,7 @@ describe("applyEmittedScript — Emit.ts's combinedScript (the whole stdout of a
     const script = combinedScript(required, "")
     const result = applyEmittedScript(repo, NO_COMMANDS, script)
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(repo.lastCommitMessage()).toBe("gtd(human): idle")
   })
 
@@ -605,7 +604,7 @@ describe("applyEmittedScript — Emit.ts's combinedScript (the whole stdout of a
 
     const result = applyEmittedScript(repo, NO_COMMANDS, script)
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(repo.lastCommitMessage()).toBe("gtd(human): idle")
     expect(repo.resolveRef("refs/gtd/marker")).toBe(repo.resolveRef("HEAD"))
   })
@@ -625,7 +624,7 @@ describe("applyEmittedScript — Emit.ts's combinedScript (the whole stdout of a
 
     const result = applyEmittedScript(repo, NO_COMMANDS, script)
 
-    expect(result).toEqual({ ok: true })
+    expect(result).toMatchObject({ ok: true })
     expect(repo.lastCommitMessage()).toBe("gtd(human): idle")
   })