@pmelab/gtd 65.0.0 → 66.0.0

package/src/wire/BeatDocument.ts

@@ -33,6 +33,7 @@ const dispatchFieldsOf = (
 ): {
   readonly session: DemandSession | undefined
   readonly validate: string | undefined
+  readonly fresh: string | null
   readonly skills: readonly string[] | undefined
   readonly access: StepAccess | undefined
   readonly pin: PinMark | undefined
@@ -40,6 +41,7 @@ const dispatchFieldsOf = (
   const none = {
     session: undefined,
     validate: undefined,
+    fresh: null,
     skills: undefined,
     access: undefined,
     pin: undefined,
@@ -50,6 +52,7 @@ const dispatchFieldsOf = (
         ...none,
         session: demand.session,
         validate: demand.validate,
+        fresh: demand.fresh,
         skills: demand.skills,
         access: demand.access,
       }
@@ -75,6 +78,8 @@ export interface BeatDocument {
   readonly model: string | undefined
   readonly system: string | undefined
   readonly validate: string | undefined
+  /** A validator retry with `session.resume`: the original prompt plus the correction, for a driver that starts a new session. `null` otherwise. */
+  readonly fresh: string | null
   /** On a pin or unpin beat only: what its script does to `.gtd/process.gtdpin`. */
   readonly pin: PinMark | undefined
   readonly log: string
@@ -96,13 +101,13 @@ export interface BeatDocument {
 }
 
 /**
- * Flatten a `Demand` plus its `BeatStatus` into the single 26-key document
+ * Flatten a `Demand` plus its `BeatStatus` into the single 27-key document
  * `gtd next --json` emits — the ONLY place the two are joined. `cost`/
  * `costByModel` are omitted together, exactly when no cost was recorded
  * (`cost <= 0`).
  */
 export const beatDocument = (demand: Demand, status: BeatStatus): BeatDocument => {
-  const { session, validate, skills, access, pin } = dispatchFieldsOf(demand)
+  const { session, validate, fresh, skills, access, pin } = dispatchFieldsOf(demand)
   const hasCost = status.cost > 0
   return {
     schema: WIRE_SCHEMA,
@@ -114,6 +119,7 @@ export const beatDocument = (demand: Demand, status: BeatStatus): BeatDocument =
     model: status.model,
     system: status.system,
     validate,
+    fresh,
     pin,
     log: status.log,
     state: status.state,

package/src/wire/Demand.ts

@@ -96,6 +96,7 @@ export type Demand =
       readonly content: string
       readonly session: DemandSession | undefined
       readonly validate: string | undefined
+      readonly fresh: string | null
       readonly skills: readonly string[] | undefined
       readonly access: StepAccess
     }
@@ -115,8 +116,9 @@ export const demandOf = (input: {
   readonly kind: BeatKind
   readonly session?: DemandSession
   readonly validate?: string
+  readonly fresh?: string | null
 }): Demand => {
-  const { rendered, kind, session, validate } = input
+  const { rendered, kind, session, validate, fresh = null } = input
   const content =
     kind === "stalled"
       ? stallDiagnosis(rendered.state, rendered.actor, rendered.failure, rendered.blocked)
@@ -124,7 +126,7 @@ export const demandOf = (input: {
   const skills =
     rendered.skills !== undefined && rendered.skills.length > 0 ? rendered.skills : undefined
   const access = rendered.access ?? { read: null, write: null }
-  if (kind === "prompt") return { kind, content, session, validate, skills, access }
+  if (kind === "prompt") return { kind, content, session, validate, fresh, skills, access }
   if (kind === "script" && rendered.pin !== undefined) return { kind, content, pin: rendered.pin }
   return { kind, content }
 }

package/src/wire/golden/1/beat-capture.json

@@ -6,6 +6,7 @@
   "initial": false,
   "model": "opus",
   "system": "You are a careful senior engineer.",
+  "fresh": null,
   "log": ".git/gtd-loop.log",
   "state": "build.fixing",
   "actor": "agent",

package/src/wire/golden/1/beat-message.json

@@ -6,6 +6,7 @@
   "initial": false,
   "model": "opus",
   "system": "You are a careful senior engineer.",
+  "fresh": null,
   "log": ".git/gtd-loop.log",
   "state": "build.fixing",
   "actor": "agent",

package/src/wire/golden/1/beat-prompt.json

@@ -11,6 +11,7 @@
   "model": "opus",
   "system": "You are a careful senior engineer.",
   "validate": "gtd check qa 'TODO.md'",
+  "fresh": null,
   "log": ".git/gtd-loop.log",
   "state": "build.fixing",
   "actor": "agent",

package/src/wire/golden/1/beat-script.json

@@ -6,6 +6,7 @@
   "initial": false,
   "model": "opus",
   "system": "You are a careful senior engineer.",
+  "fresh": null,
   "log": ".git/gtd-loop.log",
   "state": "build.fixing",
   "actor": "agent",

package/src/wire/golden/1/beat-stalled.json

@@ -6,6 +6,7 @@
   "initial": false,
   "model": "opus",
   "system": "You are a careful senior engineer.",
+  "fresh": null,
   "log": ".git/gtd-loop.log",
   "state": "build.fixing",
   "actor": "agent",

package/src/workflow/Workflow.ts

@@ -42,6 +42,8 @@ export interface StepDef {
   readonly requireRevert?: boolean
   readonly allowEmpty?: boolean
   readonly keep?: boolean
+  /** A validator retry: the step's original prompt, `content` being the correction. */
+  readonly original?: string
   readonly onFail?: "rest"
   readonly acceptClean?: boolean
   readonly approve?: boolean

package/src/workflow-kit/index.test.ts

@@ -5,6 +5,7 @@ describe("@pmelab/gtd/workflow-kit", () => {
   it("publishes its helpers by name", () => {
     expect(Object.keys(kit).sort()).toEqual(
       [
+        "assertionErrors",
         "assertionLines",
         "escalation",
         "fixFindings",

package/src/workflow-kit/index.ts

@@ -23,6 +23,7 @@ export {
 } from "./quality.js"
 export {
   assertionLines,
+  assertionErrors,
   removedAssertions,
   type Assertion,
   type RemovedAssertions,

package/src/workflow-kit/scenarios.ts

@@ -68,3 +68,11 @@ export const removedAssertions = (changes: readonly Change[]): readonly RemovedA
       return { path: c.path, lines }
     })
     .filter((r) => r.lines.length > 0)
+
+/** Validator form of `removedAssertions`: lists each lost line by path and scenario, or `undefined` when none. */
+export const assertionErrors = (changes: readonly Change[]): string | undefined => {
+  const lost = removedAssertions(changes)
+  if (lost.length === 0) return undefined
+  const lines = lost.flatMap((r) => r.lines.map((a) => `  - ${r.path}: ${a.scenario}: ${a.line}`))
+  return `Restore the assertions these .feature files lost:\n${lines.join("\n")}`
+}