@specforge/canary-cli 0.2.17 → 0.2.18

package/node_modules/@specforge/api-types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@specforge/api-types",
-  "version": "0.4.17",
+  "version": "0.4.18",
   "description": "Catch-all type contracts for SpecForge: entity types, store interfaces, derived views, and API-surface helpers that are not lifecycle session-types and not spec-domain types.",
   "type": "module",
   "main": "dist/index.js",

package/node_modules/@specforge/report-types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@specforge/report-types",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "SpecForge status/analytic report types (specification/epic status, implementation/time/blockers). Embeds the canonical spec-domain entities (spec-types) + Project (api-types).",
   "type": "module",
   "main": "dist/index.js",

package/node_modules/@specforge/session-types/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.4.15 — 2026-08-30
+
+- MB.46 progress-honest-finalize-gate: progress becomes the hard finalize gate (stop stamping Ticket.progress=100, persist the real score); a `fulfills` discriminated link on WorkSessionFileChange lets an approved cross-path deviation satisfy a sub-declared step/file in both the `file-action-coverage` gate and the progress dimensions (fileId = a TicketFileId, additional-file allowed); the CWS git commit-diff injection (base recovered from a per-worktree CLI local registry, D3b) backstops the honest file gate in-memory; and the MCP tooling + proactive/reactive guidance (both tool catalogs, remediation-map, composeNotFinishedBlock, nextFileDirective, orientation) drive the agent to declare and re-declare `fulfills`. Closes 624db98f.
+
 ## 0.4.14 — 2026-08-23
 
 - MB.36 — the file-graph (file-provenance/file-conflict/import-freeze) moves into ticket_expansion, validated repo-aware against the current git worktree (grep double-call + stash) and re-run in cross_validation as a safety net; create_dependencies/delete_dependencies become a native band in ticket_expansion (no rollback); cross_validation becomes the dependency-parallelization pass with a full dependency-tree render + parallelism directive in its guidance; the mcp-handler action boundary forwards existingFiles and injects [] for web origin. webapp bugfixes: a "New Spec" button on the project dashboard (projects/{id}); the /projects grid now refreshes after creating a project (invalidate the accessible key); a "New spec" affordance in the sidebar when a project is expanded.

package/node_modules/@specforge/session-types/dist/index.d.ts

@@ -43,5 +43,5 @@ export * from './stores/work-session-action-store.js';
 export * from './stores/implementation-record-event-store.js';
 export * from './stores/discovery-store.js';
 export * from './stores/working-context-store.js';
-export { ImplementationSessionSchema, WorkSessionSchema, WorkSessionAcceptanceCheckSchema, WorkSessionImplStepCompletionSchema, WorkSessionFileChangeSchema, WorkSessionTestResultSchema, WorkSessionResolutionSchema, WorkSessionActionSchema, DiscoverySchema, ImplementationRecordEventSchema, ParsedGitEvidenceSchema, } from './schema/index.js';
+export { ImplementationSessionSchema, WorkSessionSchema, WorkSessionAcceptanceCheckSchema, WorkSessionImplStepCompletionSchema, WorkSessionFileChangeSchema, FileChangeFulfillsSchema, WorkSessionTestResultSchema, WorkSessionResolutionSchema, WorkSessionActionSchema, DiscoverySchema, ImplementationRecordEventSchema, ParsedGitEvidenceSchema, } from './schema/index.js';
 //# sourceMappingURL=index.d.ts.map

package/node_modules/@specforge/session-types/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sCAAsC,CAAC;AACrD,cAAc,wCAAwC,CAAC;AACvD,cAAc,yCAAyC,CAAC;AACxD,cAAc,+CAA+C,CAAC;AAC9D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,0CAA0C,CAAC;AACzD,cAAc,kCAAkC,CAAC;AACjD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oCAAoC,CAAC;AACnD,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,qCAAqC,CAAC;AACpD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4CAA4C,CAAC;AAC3D,cAAc,gDAAgD,CAAC;AAC/D,cAAc,uCAAuC,CAAC;AACtD,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AACrD,cAAc,kCAAkC,CAAC;AACjD,cAAc,wBAAwB,CAAC;AACvC,cAAc,0CAA0C,CAAC;AACzD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kCAAkC,CAAC;AAEjD,cAAc,oCAAoC,CAAC;AACnD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,6CAA6C,CAAC;AAC5D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,oDAAoD,CAAC;AACnE,cAAc,mDAAmD,CAAC;AAClE,cAAc,oCAAoC,CAAC;AACnD,cAAc,0CAA0C,CAAC;AACzD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iDAAiD,CAAC;AAChE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,qDAAqD,CAAC;AACpE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,uCAAuC,CAAC;AACtD,cAAc,+CAA+C,CAAC;AAC9D,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mCAAmC,CAAC;AAElD,OAAO,EACL,2BAA2B,EAC3B,iBAAiB,EACjB,gCAAgC,EAChC,mCAAmC,EACnC,2BAA2B,EAC3B,2BAA2B,EAC3B,2BAA2B,EAC3B,uBAAuB,EACvB,eAAe,EACf,+BAA+B,EAC/B,uBAAuB,GACxB,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sCAAsC,CAAC;AACrD,cAAc,wCAAwC,CAAC;AACvD,cAAc,yCAAyC,CAAC;AACxD,cAAc,+CAA+C,CAAC;AAC9D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,0CAA0C,CAAC;AACzD,cAAc,kCAAkC,CAAC;AACjD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oCAAoC,CAAC;AACnD,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,qCAAqC,CAAC;AACpD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4CAA4C,CAAC;AAC3D,cAAc,gDAAgD,CAAC;AAC/D,cAAc,uCAAuC,CAAC;AACtD,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AACrD,cAAc,kCAAkC,CAAC;AACjD,cAAc,wBAAwB,CAAC;AACvC,cAAc,0CAA0C,CAAC;AACzD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kCAAkC,CAAC;AAEjD,cAAc,oCAAoC,CAAC;AACnD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,6CAA6C,CAAC;AAC5D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,oDAAoD,CAAC;AACnE,cAAc,mDAAmD,CAAC;AAClE,cAAc,oCAAoC,CAAC;AACnD,cAAc,0CAA0C,CAAC;AACzD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iDAAiD,CAAC;AAChE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,qDAAqD,CAAC;AACpE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,uCAAuC,CAAC;AACtD,cAAc,+CAA+C,CAAC;AAC9D,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mCAAmC,CAAC;AAElD,OAAO,EACL,2BAA2B,EAC3B,iBAAiB,EACjB,gCAAgC,EAChC,mCAAmC,EACnC,2BAA2B,EAC3B,wBAAwB,EACxB,2BAA2B,EAC3B,2BAA2B,EAC3B,uBAAuB,EACvB,eAAe,EACf,+BAA+B,EAC/B,uBAAuB,GACxB,MAAM,mBAAmB,CAAC"}

package/node_modules/@specforge/session-types/dist/index.js

@@ -43,5 +43,5 @@ export * from './stores/work-session-action-store.js';
 export * from './stores/implementation-record-event-store.js';
 export * from './stores/discovery-store.js';
 export * from './stores/working-context-store.js';
-export { ImplementationSessionSchema, WorkSessionSchema, WorkSessionAcceptanceCheckSchema, WorkSessionImplStepCompletionSchema, WorkSessionFileChangeSchema, WorkSessionTestResultSchema, WorkSessionResolutionSchema, WorkSessionActionSchema, DiscoverySchema, ImplementationRecordEventSchema, ParsedGitEvidenceSchema, } from './schema/index.js';
+export { ImplementationSessionSchema, WorkSessionSchema, WorkSessionAcceptanceCheckSchema, WorkSessionImplStepCompletionSchema, WorkSessionFileChangeSchema, FileChangeFulfillsSchema, WorkSessionTestResultSchema, WorkSessionResolutionSchema, WorkSessionActionSchema, DiscoverySchema, ImplementationRecordEventSchema, ParsedGitEvidenceSchema, } from './schema/index.js';
 //# sourceMappingURL=index.js.map

package/node_modules/@specforge/session-types/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sCAAsC,CAAC;AACrD,cAAc,wCAAwC,CAAC;AACvD,cAAc,yCAAyC,CAAC;AACxD,cAAc,+CAA+C,CAAC;AAC9D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,0CAA0C,CAAC;AACzD,cAAc,kCAAkC,CAAC;AACjD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oCAAoC,CAAC;AACnD,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,qCAAqC,CAAC;AACpD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4CAA4C,CAAC;AAC3D,cAAc,gDAAgD,CAAC;AAC/D,cAAc,uCAAuC,CAAC;AACtD,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AACrD,cAAc,kCAAkC,CAAC;AACjD,cAAc,wBAAwB,CAAC;AACvC,cAAc,0CAA0C,CAAC;AACzD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kCAAkC,CAAC;AAEjD,cAAc,oCAAoC,CAAC;AACnD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,6CAA6C,CAAC;AAC5D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,oDAAoD,CAAC;AACnE,cAAc,mDAAmD,CAAC;AAClE,cAAc,oCAAoC,CAAC;AACnD,cAAc,0CAA0C,CAAC;AACzD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iDAAiD,CAAC;AAChE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,qDAAqD,CAAC;AACpE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,uCAAuC,CAAC;AACtD,cAAc,+CAA+C,CAAC;AAC9D,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mCAAmC,CAAC;AAElD,OAAO,EACL,2BAA2B,EAC3B,iBAAiB,EACjB,gCAAgC,EAChC,mCAAmC,EACnC,2BAA2B,EAC3B,2BAA2B,EAC3B,2BAA2B,EAC3B,uBAAuB,EACvB,eAAe,EACf,+BAA+B,EAC/B,uBAAuB,GACxB,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sCAAsC,CAAC;AACrD,cAAc,wCAAwC,CAAC;AACvD,cAAc,yCAAyC,CAAC;AACxD,cAAc,+CAA+C,CAAC;AAC9D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,0CAA0C,CAAC;AACzD,cAAc,kCAAkC,CAAC;AACjD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oCAAoC,CAAC;AACnD,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,qCAAqC,CAAC;AACpD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4CAA4C,CAAC;AAC3D,cAAc,gDAAgD,CAAC;AAC/D,cAAc,uCAAuC,CAAC;AACtD,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AACrD,cAAc,kCAAkC,CAAC;AACjD,cAAc,wBAAwB,CAAC;AACvC,cAAc,0CAA0C,CAAC;AACzD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kCAAkC,CAAC;AAEjD,cAAc,oCAAoC,CAAC;AACnD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,6CAA6C,CAAC;AAC5D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,oDAAoD,CAAC;AACnE,cAAc,mDAAmD,CAAC;AAClE,cAAc,oCAAoC,CAAC;AACnD,cAAc,0CAA0C,CAAC;AACzD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iDAAiD,CAAC;AAChE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,qDAAqD,CAAC;AACpE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,uCAAuC,CAAC;AACtD,cAAc,+CAA+C,CAAC;AAC9D,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mCAAmC,CAAC;AAElD,OAAO,EACL,2BAA2B,EAC3B,iBAAiB,EACjB,gCAAgC,EAChC,mCAAmC,EACnC,2BAA2B,EAC3B,wBAAwB,EACxB,2BAA2B,EAC3B,2BAA2B,EAC3B,uBAAuB,EACvB,eAAe,EACf,+BAA+B,EAC/B,uBAAuB,GACxB,MAAM,mBAAmB,CAAC"}

package/node_modules/@specforge/session-types/dist/runtime/implementation-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"implementation-config.d.ts","sourceRoot":"","sources":["../../src/runtime/implementation-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,sCAAsC,EAAG,0BAAmC,CAAC;AAE1F,eAAO,MAAM,8CAA8C,IAAI,CAAC;AAEhE,eAAO,MAAM,mCAAmC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+B9C,CAAC;AACH,MAAM,MAAM,6BAA6B,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mCAAmC,CAAC,CAAC;AAEhG;;;;;;;;;GASG;AACH,eAAO,MAAM,4CAA4C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAoD,CAAC;AAC9G,MAAM,MAAM,sCAAsC,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,4CAA4C,CAAC,CAAC;AAKlH,eAAO,MAAM,iCAAiC,EAAE,6BAsB/C,CAAC"}
+{"version":3,"file":"implementation-config.d.ts","sourceRoot":"","sources":["../../src/runtime/implementation-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,sCAAsC,EAAG,0BAAmC,CAAC;AAE1F,eAAO,MAAM,8CAA8C,IAAI,CAAC;AAEhE,eAAO,MAAM,mCAAmC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+B9C,CAAC;AACH,MAAM,MAAM,6BAA6B,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mCAAmC,CAAC,CAAC;AAEhG;;;;;;;;;GASG;AACH,eAAO,MAAM,4CAA4C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAoD,CAAC;AAC9G,MAAM,MAAM,sCAAsC,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,4CAA4C,CAAC,CAAC;AAKlH,eAAO,MAAM,iCAAiC,EAAE,6BAwB/C,CAAC"}

package/node_modules/@specforge/session-types/dist/runtime/implementation-config.js

@@ -83,7 +83,9 @@ export const IMPLEMENTATION_LIFECYCLE_DEFAULTS = {
     // MB.14.5 — step-file UNIFIED weights. The step↔file links (MB.14.1) merge the old
     // separate `steps` (.40) + `files` (.15) dimensions into one step-file dimension
     // (`steps`: 0.55): the assay `computeImplStepProgress` now requires a step's linked
-    // files recorded `matched`, so `files` carries 0. The 4-key struct shape is KEPT
+    // files SATISFIED — recorded `matched` OR an approved same-path deviation (MB.46.1),
+    // or an approved+`fulfills`-linked deviation (MB.46.2) — so `files` carries 0. The
+    // 4-key struct shape is KEPT
     // (the assay `ProgressWeightsSchema` is `.strict()` on {steps,ac,tests,files}).
     // DECIDED (c): 0.55 is the DEFAULT; MB.14.7 makes these user-configurable.
     weights: {

package/node_modules/@specforge/session-types/dist/runtime/implementation-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"implementation-config.js","sourceRoot":"","sources":["../../src/runtime/implementation-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,MAAM,sCAAsC,GAAG,0BAAmC,CAAC;AAC1F,+EAA+E;AAC/E,MAAM,CAAC,MAAM,8CAA8C,GAAG,CAAC,CAAC;AAEhE,MAAM,CAAC,MAAM,mCAAmC,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1D,gFAAgF;IAChF,gFAAgF;IAChF,6DAA6D;IAC7D,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;IAC5B,iFAAiF;IACjF,6EAA6E;IAC7E,cAAc,EAAE,CAAC,CAAC,OAAO,EAAE;IAC3B,2CAA2C;IAC3C,uEAAuE;IACvE,wEAAwE;IACxE,2CAA2C;IAC3C,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,mFAAmF;IACnF,+DAA+D;IAC/D,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC;QACd,UAAU,EAAE,CAAC,CAAC,OAAO,EAAE;QACvB,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE;QACjB,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE;QACjB,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE;KAClB,CAAC;IACF,+EAA+E;IAC/E,kFAAkF;IAClF,+EAA+E;IAC/E,kCAAkC;IAClC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC;QAChB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;QACjB,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;QACd,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;QACjB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;KAClB,CAAC;CACH,CAAC,CAAC;AAGH;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,4CAA4C,GAAG,mCAAmC,CAAC,WAAW,EAAE,CAAC;AAG9G,8EAA8E;AAC9E,oFAAoF;AACpF,8EAA8E;AAC9E,MAAM,CAAC,MAAM,iCAAiC,GAAkC;IAC9E,UAAU,EAAE,CAAC;IACb,cAAc,EAAE,KAAK;IACrB,aAAa,EAAE,OAAO;IACtB,KAAK,EAAE;QACL,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;KACX;IACD,mFAAmF;IACnF,iFAAiF;IACjF,oFAAoF;IACpF,iFAAiF;IACjF,gFAAgF;IAChF,2EAA2E;IAC3E,OAAO,EAAE;QACP,KAAK,EAAE,IAAI;QACX,EAAE,EAAE,GAAG;QACP,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,CAAC;KACT;CACF,CAAC"}
+{"version":3,"file":"implementation-config.js","sourceRoot":"","sources":["../../src/runtime/implementation-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,MAAM,sCAAsC,GAAG,0BAAmC,CAAC;AAC1F,+EAA+E;AAC/E,MAAM,CAAC,MAAM,8CAA8C,GAAG,CAAC,CAAC;AAEhE,MAAM,CAAC,MAAM,mCAAmC,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1D,gFAAgF;IAChF,gFAAgF;IAChF,6DAA6D;IAC7D,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;IAC5B,iFAAiF;IACjF,6EAA6E;IAC7E,cAAc,EAAE,CAAC,CAAC,OAAO,EAAE;IAC3B,2CAA2C;IAC3C,uEAAuE;IACvE,wEAAwE;IACxE,2CAA2C;IAC3C,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,mFAAmF;IACnF,+DAA+D;IAC/D,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC;QACd,UAAU,EAAE,CAAC,CAAC,OAAO,EAAE;QACvB,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE;QACjB,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE;QACjB,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE;KAClB,CAAC;IACF,+EAA+E;IAC/E,kFAAkF;IAClF,+EAA+E;IAC/E,kCAAkC;IAClC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC;QAChB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;QACjB,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;QACd,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;QACjB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;KAClB,CAAC;CACH,CAAC,CAAC;AAGH;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,4CAA4C,GAAG,mCAAmC,CAAC,WAAW,EAAE,CAAC;AAG9G,8EAA8E;AAC9E,oFAAoF;AACpF,8EAA8E;AAC9E,MAAM,CAAC,MAAM,iCAAiC,GAAkC;IAC9E,UAAU,EAAE,CAAC;IACb,cAAc,EAAE,KAAK;IACrB,aAAa,EAAE,OAAO;IACtB,KAAK,EAAE;QACL,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;KACX;IACD,mFAAmF;IACnF,iFAAiF;IACjF,oFAAoF;IACpF,qFAAqF;IACrF,mFAAmF;IACnF,6BAA6B;IAC7B,gFAAgF;IAChF,2EAA2E;IAC3E,OAAO,EAAE;QACP,KAAK,EAAE,IAAI;QACX,EAAE,EAAE,GAAG;QACP,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,CAAC;KACT;CACF,CAAC"}

package/node_modules/@specforge/session-types/dist/runtime/lifecycle-contract.d.ts

@@ -1,4 +1,4 @@
-import type { PlanningPhase, PlanningSessionStatus, WorkPhase, WorkSessionStatus } from './enums.js';
+import type { ExpectedAction, PlanningPhase, PlanningSessionStatus, WorkPhase, WorkSessionStatus } from './enums.js';
 import type { PlanningOperationName } from './planning-operations.js';
 import type { WritePlan } from './write-plan.js';
 export type LifecycleEvent = 'start_planning_session' | 'action_planning_session' | 'complete_planning_session';
@@ -271,6 +271,16 @@ export interface StartWorkSessionPayload {
     userId?: string;
     worktreePath?: string;
     branch?: string;
+    /**
+     * MB.46 (F2 / D3) — the base commit the agent's worktree is at when the session
+     * starts (`git rev-parse HEAD`), injected by the MCP-local (MB.46.4). SWS
+     * persists it once onto `WorkSession.baseCommitSha` (the resume path never
+     * overwrites — MB.46.5) as the two-dot anchor for the CWS commit diff. Absent
+     * for a non-git caller (the Lambda has no worktree). The CLI also stashes this
+     * base in its own local per-worktree registry (D3b) — that local copy, not a
+     * server read-back, is what the CWS diff functionally uses.
+     */
+    baseCommitSha?: string;
     /**
      * Clean-git-workspace status injected by the MCP-local (M23). `false` = the
      * agent's worktree has uncommitted changes → SWS denies (`git_dirty`,
@@ -314,6 +324,22 @@ export interface CompleteWorkSessionPayload {
      * satisfies the git-evidence gate when a `commitSha` is not available.
      */
     gitEvidence?: Record<string, unknown>;
+    /**
+     * MB.46 (F2 / B-estreito) — the REAL set of files changed since the session
+     * base, derived by the MCP-local from `git diff --name-status
+     * <baseCommitSha>..HEAD` (MB.46.4) and injected as a batch. The CWS reconciles
+     * each entry against the plan and projects them IN MEMORY only into the set the
+     * assay scores (MB.46.5) — a git-caught path the agent never reported surfaces
+     * as an unjustified `extra`, failing the `file-action-coverage` gate (the honest
+     * backstop). It PERSISTS nothing: the agent remains the sole persister of file
+     * rows (via `add_file_change_justification`). `action` mirrors the plan's
+     * expected-action vocabulary (git A/M/D/R → create/modify/delete; a rename
+     * surfaces as a create of the new path). Absent for a non-git caller.
+     */
+    localFileChanges?: {
+        path: string;
+        action: ExpectedAction;
+    }[];
 }
 /**
  * Payload-carrying dispatch union accepted by the work lifecycle (the work

package/node_modules/@specforge/session-types/dist/runtime/lifecycle-contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lifecycle-contract.d.ts","sourceRoot":"","sources":["../../src/runtime/lifecycle-contract.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lifecycle-contract.d.ts","sourceRoot":"","sources":["../../src/runtime/lifecycle-contract.ts"],"names":[],"mappings":"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"}

package/node_modules/@specforge/session-types/dist/runtime/work-session-file-change.d.ts

@@ -1,4 +1,10 @@
 import type { z } from 'zod';
-import type { WorkSessionFileChangeSchema } from '../schema/work-session-file-change.js';
+import type { WorkSessionFileChangeSchema, FileChangeFulfillsSchema } from '../schema/work-session-file-change.js';
 export type WorkSessionFileChange = z.infer<typeof WorkSessionFileChangeSchema>;
+/**
+ * MB.46 (D1 v2) — the agent-declared `fulfills` link carried on a
+ * `WorkSessionFileChange` (discriminated on `kind`: `step` carries the declared
+ * `fileId` it replaces; `acceptance_criterion`/`test` carry only the plan item id).
+ */
+export type FileChangeFulfills = z.infer<typeof FileChangeFulfillsSchema>;
 //# sourceMappingURL=work-session-file-change.d.ts.map

package/node_modules/@specforge/session-types/dist/runtime/work-session-file-change.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"work-session-file-change.d.ts","sourceRoot":"","sources":["../../src/runtime/work-session-file-change.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,uCAAuC,CAAC;AAEzF,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAC"}
+{"version":3,"file":"work-session-file-change.d.ts","sourceRoot":"","sources":["../../src/runtime/work-session-file-change.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,EACV,2BAA2B,EAC3B,wBAAwB,EACzB,MAAM,uCAAuC,CAAC;AAE/C,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAEhF;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC"}

package/node_modules/@specforge/session-types/dist/schema/index.d.ts

@@ -2,7 +2,7 @@ export { ImplementationSessionSchema } from './implementation-session.js';
 export { WorkSessionSchema } from './work-session.js';
 export { WorkSessionAcceptanceCheckSchema } from './work-session-acceptance-check.js';
 export { WorkSessionImplStepCompletionSchema } from './work-session-impl-step-completion.js';
-export { WorkSessionFileChangeSchema } from './work-session-file-change.js';
+export { WorkSessionFileChangeSchema, FileChangeFulfillsSchema } from './work-session-file-change.js';
 export { WorkSessionTestResultSchema } from './work-session-test-result.js';
 export { WorkSessionResolutionSchema } from './work-session-resolution.js';
 export { WorkSessionActionSchema } from './work-session-action.js';

package/node_modules/@specforge/session-types/dist/schema/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/schema/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,EAAE,mCAAmC,EAAE,MAAM,wCAAwC,CAAC;AAC7F,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/schema/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,EAAE,mCAAmC,EAAE,MAAM,wCAAwC,CAAC;AAC7F,OAAO,EAAE,2BAA2B,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACtG,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC"}

package/node_modules/@specforge/session-types/dist/schema/index.js

@@ -2,7 +2,7 @@ export { ImplementationSessionSchema } from './implementation-session.js';
 export { WorkSessionSchema } from './work-session.js';
 export { WorkSessionAcceptanceCheckSchema } from './work-session-acceptance-check.js';
 export { WorkSessionImplStepCompletionSchema } from './work-session-impl-step-completion.js';
-export { WorkSessionFileChangeSchema } from './work-session-file-change.js';
+export { WorkSessionFileChangeSchema, FileChangeFulfillsSchema } from './work-session-file-change.js';
 export { WorkSessionTestResultSchema } from './work-session-test-result.js';
 export { WorkSessionResolutionSchema } from './work-session-resolution.js';
 export { WorkSessionActionSchema } from './work-session-action.js';

package/node_modules/@specforge/session-types/dist/schema/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/schema/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,EAAE,mCAAmC,EAAE,MAAM,wCAAwC,CAAC;AAC7F,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/schema/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,EAAE,mCAAmC,EAAE,MAAM,wCAAwC,CAAC;AAC7F,OAAO,EAAE,2BAA2B,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACtG,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC"}

package/node_modules/@specforge/session-types/dist/schema/work-session-file-change.d.ts

@@ -1,4 +1,50 @@
 import { z } from 'zod';
+/**
+ * MB.46 (D1 v2) — the agent-declared LINK from an `extra`/`mismatched` file change
+ * to the plan item it fulfils, declared at justification time (MB.46.9) and honoured
+ * by the assay progress+gate after human approval (MB.46.2). A discriminated union
+ * on `kind`:
+ *   - `step`  — the deviation Q REPLACES the declared file `fileId` (a **TicketFileId**
+ *     = `fileChangeRef.id`) of step `id`. This SUPPRESSES the missing/unsatisfied
+ *     declared file at that file's path (the deadlock fix, keyed per-file so a sibling
+ *     P2 not produced still fails). `fileId` may be an ADDITIONAL declared file
+ *     (declared in another step, or `referenced` without a step) — not only the step's.
+ *   - `acceptance_criterion` / `test` — the extra is a REBUTTAL that exists to satisfy
+ *     that AC/test (an honest reason for the approved extra). It does NOT suppress any
+ *     declared-file missing and does NOT count progress; `id` is the AC entity id / the
+ *     test's testType respectively.
+ */
+export declare const FileChangeFulfillsSchema: z.ZodDiscriminatedUnion<"kind", [z.ZodObject<{
+    kind: z.ZodLiteral<"step">;
+    id: z.ZodString;
+    fileId: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    id: string;
+    kind: "step";
+    fileId: string;
+}, {
+    id: string;
+    kind: "step";
+    fileId: string;
+}>, z.ZodObject<{
+    kind: z.ZodLiteral<"acceptance_criterion">;
+    id: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    id: string;
+    kind: "acceptance_criterion";
+}, {
+    id: string;
+    kind: "acceptance_criterion";
+}>, z.ZodObject<{
+    kind: z.ZodLiteral<"test">;
+    id: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    id: string;
+    kind: "test";
+}, {
+    id: string;
+    kind: "test";
+}>]>;
 export declare const WorkSessionFileChangeSchema: z.ZodObject<{
     id: z.ZodString;
     workSessionId: z.ZodString;
@@ -9,6 +55,37 @@ export declare const WorkSessionFileChangeSchema: z.ZodObject<{
     actualAction: z.ZodOptional<z.ZodEnum<["created", "modified", "deleted", "referenced", "absent"]>>;
     status: z.ZodEnum<["matched", "missing", "mismatched", "extra"]>;
     justification: z.ZodOptional<z.ZodString>;
+    fulfills: z.ZodOptional<z.ZodDiscriminatedUnion<"kind", [z.ZodObject<{
+        kind: z.ZodLiteral<"step">;
+        id: z.ZodString;
+        fileId: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        id: string;
+        kind: "step";
+        fileId: string;
+    }, {
+        id: string;
+        kind: "step";
+        fileId: string;
+    }>, z.ZodObject<{
+        kind: z.ZodLiteral<"acceptance_criterion">;
+        id: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        id: string;
+        kind: "acceptance_criterion";
+    }, {
+        id: string;
+        kind: "acceptance_criterion";
+    }>, z.ZodObject<{
+        kind: z.ZodLiteral<"test">;
+        id: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        id: string;
+        kind: "test";
+    }, {
+        id: string;
+        kind: "test";
+    }>]>>;
     notes: z.ZodOptional<z.ZodString>;
     lineCount: z.ZodOptional<z.ZodNumber>;
     recordedAt: z.ZodString;
@@ -24,6 +101,17 @@ export declare const WorkSessionFileChangeSchema: z.ZodObject<{
     notes?: string | undefined;
     actualAction?: "created" | "modified" | "deleted" | "referenced" | "absent" | undefined;
     justification?: string | undefined;
+    fulfills?: {
+        id: string;
+        kind: "step";
+        fileId: string;
+    } | {
+        id: string;
+        kind: "acceptance_criterion";
+    } | {
+        id: string;
+        kind: "test";
+    } | undefined;
     lineCount?: number | undefined;
 }, {
     status: "matched" | "missing" | "mismatched" | "extra";
@@ -37,6 +125,17 @@ export declare const WorkSessionFileChangeSchema: z.ZodObject<{
     notes?: string | undefined;
     actualAction?: "created" | "modified" | "deleted" | "referenced" | "absent" | undefined;
     justification?: string | undefined;
+    fulfills?: {
+        id: string;
+        kind: "step";
+        fileId: string;
+    } | {
+        id: string;
+        kind: "acceptance_criterion";
+    } | {
+        id: string;
+        kind: "test";
+    } | undefined;
     lineCount?: number | undefined;
 }>;
 //# sourceMappingURL=work-session-file-change.d.ts.map

package/node_modules/@specforge/session-types/dist/schema/work-session-file-change.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"work-session-file-change.d.ts","sourceRoot":"","sources":["../../src/schema/work-session-file-change.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwBtC,CAAC"}
+{"version":3,"file":"work-session-file-change.d.ts","sourceRoot":"","sources":["../../src/schema/work-session-file-change.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAcnC,CAAC;AAEH,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8BtC,CAAC"}

package/node_modules/@specforge/session-types/dist/schema/work-session-file-change.js

@@ -1,5 +1,35 @@
 import { z } from 'zod';
 import { EXPECTED_ACTIONS, ACTUAL_ACTIONS, FILE_CHANGE_STATUSES, } from '../runtime/enums.js';
+/**
+ * MB.46 (D1 v2) — the agent-declared LINK from an `extra`/`mismatched` file change
+ * to the plan item it fulfils, declared at justification time (MB.46.9) and honoured
+ * by the assay progress+gate after human approval (MB.46.2). A discriminated union
+ * on `kind`:
+ *   - `step`  — the deviation Q REPLACES the declared file `fileId` (a **TicketFileId**
+ *     = `fileChangeRef.id`) of step `id`. This SUPPRESSES the missing/unsatisfied
+ *     declared file at that file's path (the deadlock fix, keyed per-file so a sibling
+ *     P2 not produced still fails). `fileId` may be an ADDITIONAL declared file
+ *     (declared in another step, or `referenced` without a step) — not only the step's.
+ *   - `acceptance_criterion` / `test` — the extra is a REBUTTAL that exists to satisfy
+ *     that AC/test (an honest reason for the approved extra). It does NOT suppress any
+ *     declared-file missing and does NOT count progress; `id` is the AC entity id / the
+ *     test's testType respectively.
+ */
+export const FileChangeFulfillsSchema = z.discriminatedUnion('kind', [
+    z.object({
+        kind: z.literal('step'),
+        id: z.string().min(1),
+        fileId: z.string().min(1),
+    }),
+    z.object({
+        kind: z.literal('acceptance_criterion'),
+        id: z.string().min(1),
+    }),
+    z.object({
+        kind: z.literal('test'),
+        id: z.string().min(1),
+    }),
+]);
 export const WorkSessionFileChangeSchema = z.object({
     id: z.string(),
     workSessionId: z.string(),
@@ -10,6 +40,12 @@ export const WorkSessionFileChangeSchema = z.object({
     actualAction: z.enum(ACTUAL_ACTIONS).optional(),
     status: z.enum(FILE_CHANGE_STATUSES),
     justification: z.string().optional(),
+    // MB.46 (D1 v2) — the agent-declared link from an `extra`/`mismatched` deviation to
+    // the plan item it fulfils (step+fileId | acceptance_criterion | test). Written by
+    // `add_file_change_justification` (MB.46.9); honoured by the assay progress+gate
+    // (MB.46.2). Persisted as ONE `a.json()` column (the runtime value is a nested
+    // discriminated object; the generic `relatedPut` spread writes it raw).
+    fulfills: FileChangeFulfillsSchema.optional(),
     // justificationApproved REMOVED (M17.4): the verdict is no longer persisted on
     // the file-change row. It lives on the `WorkSessionResolution` (M15.8 — source of
     // truth) and is HYDRATED per `(targetType='file_change', targetId)` onto the

package/node_modules/@specforge/session-types/dist/schema/work-session-file-change.js.map

@@ -1 +1 @@
-{"version":3,"file":"work-session-file-change.js","sourceRoot":"","sources":["../../src/schema/work-session-file-change.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC;IAClD,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;IACzB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IAErB,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/B,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC;IACxC,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE;IAC/C,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC;IAEpC,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACpC,+EAA+E;IAC/E,kFAAkF;IAClF,6EAA6E;IAC7E,+EAA+E;IAC/E,yFAAyF;IACzF,oEAAoE;IAEpE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;IACpD,4FAA4F;IAC5F,6EAA6E;IAC7E,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAClC,CAAC,CAAC"}
+{"version":3,"file":"work-session-file-change.js","sourceRoot":"","sources":["../../src/schema/work-session-file-change.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAE7B;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE;IACnE,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;QACvB,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACrB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;KAC1B,CAAC;IACF,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC;QACvC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;KACtB,CAAC;IACF,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;QACvB,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;KACtB,CAAC;CACH,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC;IAClD,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;IACzB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IAErB,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/B,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC;IACxC,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE;IAC/C,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC;IAEpC,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACpC,oFAAoF;IACpF,mFAAmF;IACnF,iFAAiF;IACjF,+EAA+E;IAC/E,wEAAwE;IACxE,QAAQ,EAAE,wBAAwB,CAAC,QAAQ,EAAE;IAC7C,+EAA+E;IAC/E,kFAAkF;IAClF,6EAA6E;IAC7E,+EAA+E;IAC/E,yFAAyF;IACzF,oEAAoE;IAEpE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;IACpD,4FAA4F;IAC5F,6EAA6E;IAC7E,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAClC,CAAC,CAAC"}

package/node_modules/@specforge/session-types/dist/schema/work-session.d.ts

@@ -107,6 +107,21 @@ export declare const WorkSessionSchema: z.ZodObject<{
         insertions: z.ZodOptional<z.ZodNumber>;
         deletions: z.ZodOptional<z.ZodNumber>;
     }, z.ZodTypeAny, "passthrough">>>;
+    /**
+     * MB.46 (F2 / D3) — the base commit the WorkSession forked from, captured
+     * `git rev-parse HEAD` at SWS start and set once (the resume path never
+     * overwrites an existing base — MB.46.5). It is the two-dot anchor for the
+     * commit diff `git diff --name-status <baseCommitSha>..HEAD` the MCP-local runs
+     * at CWS to derive the REAL set of changed files (MB.46.4).
+     *
+     * ⚠ PROVENANCE-ONLY server-side (D3b): the FUNCTIONAL base of the CWS diff comes
+     * from the CLI's LOCAL per-worktree registry (survives resume in a fresh
+     * process), NOT a server read-back. This column + its store round-trip are the
+     * persistence-parity guard against the MB.1 silent-drop, not a functional
+     * consumer. The live Amplify column is added by MB.46.3 (`resource.ts`
+     * `WorkSession.baseCommitSha: a.string()`).
+     */
+    baseCommitSha: z.ZodOptional<z.ZodString>;
     /**
      * Coherence score (0–100) — the change-INDICATOR the assay computes (M17.4):
      * `((1 − pctFilesJustified) + (1 − pctTestsJustified)) / 2`, present dims only. It
@@ -163,6 +178,7 @@ export declare const WorkSessionSchema: z.ZodObject<{
         insertions: z.ZodOptional<z.ZodNumber>;
         deletions: z.ZodOptional<z.ZodNumber>;
     }, z.ZodTypeAny, "passthrough"> | undefined;
+    baseCommitSha?: string | undefined;
     coherenceScore?: number | undefined;
     actualMinutes?: number | undefined;
 }, {
@@ -197,6 +213,7 @@ export declare const WorkSessionSchema: z.ZodObject<{
         insertions: z.ZodOptional<z.ZodNumber>;
         deletions: z.ZodOptional<z.ZodNumber>;
     }, z.ZodTypeAny, "passthrough"> | undefined;
+    baseCommitSha?: string | undefined;
     coherenceScore?: number | undefined;
     actualMinutes?: number | undefined;
 }>;

package/node_modules/@specforge/session-types/dist/schema/work-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"work-session.d.ts","sourceRoot":"","sources":["../../src/schema/work-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB;;;GAGG;AACH,eAAO,MAAM,iBAAiB;;;;IAK5B;;;;;;;OAOG;;IAGH;;;;;OAKG;;;;;IAOH;;;;;;;OAOG;;;IAIH;;;;;;;;;OASG;;IAGH;;;;;;OAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAIH;;;;;;;;OAQG;;IAGH;;;;;;;;;;;OAWG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGH,CAAC"}
+{"version":3,"file":"work-session.d.ts","sourceRoot":"","sources":["../../src/schema/work-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB;;;GAGG;AACH,eAAO,MAAM,iBAAiB;;;;IAK5B;;;;;;;OAOG;;IAGH;;;;;OAKG;;;;;IAOH;;;;;;;OAOG;;;IAIH;;;;;;;;;OASG;;IAGH;;;;;;OAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAIH;;;;;;;;;;;;;OAaG;;IAGH;;;;;;;;OAQG;;IAGH;;;;;;;;;;;OAWG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGH,CAAC"}

package/node_modules/@specforge/session-types/dist/schema/work-session.js

@@ -58,6 +58,21 @@ export const WorkSessionSchema = z.object({
      */
     commitSha: z.string().optional(),
     gitEvidence: ParsedGitEvidenceSchema.optional(),
+    /**
+     * MB.46 (F2 / D3) — the base commit the WorkSession forked from, captured
+     * `git rev-parse HEAD` at SWS start and set once (the resume path never
+     * overwrites an existing base — MB.46.5). It is the two-dot anchor for the
+     * commit diff `git diff --name-status <baseCommitSha>..HEAD` the MCP-local runs
+     * at CWS to derive the REAL set of changed files (MB.46.4).
+     *
+     * ⚠ PROVENANCE-ONLY server-side (D3b): the FUNCTIONAL base of the CWS diff comes
+     * from the CLI's LOCAL per-worktree registry (survives resume in a fresh
+     * process), NOT a server read-back. This column + its store round-trip are the
+     * persistence-parity guard against the MB.1 silent-drop, not a functional
+     * consumer. The live Amplify column is added by MB.46.3 (`resource.ts`
+     * `WorkSession.baseCommitSha: a.string()`).
+     */
+    baseCommitSha: z.string().optional(),
     /**
      * Coherence score (0–100) — the change-INDICATOR the assay computes (M17.4):
      * `((1 − pctFilesJustified) + (1 − pctTestsJustified)) / 2`, present dims only. It

package/node_modules/@specforge/session-types/dist/schema/work-session.js.map

@@ -1 +1 @@
-{"version":3,"file":"work-session.js","sourceRoot":"","sources":["../../src/schema/work-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAEnE;;;GAGG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACxC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IAErB;;;;;;;OAOG;IACH,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAEtC;;;;;OAKG;IACH,uBAAuB,EAAE,CAAC,CAAC,MAAM,EAAE;IAEnC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC;IACrC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAChC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAE7C;;;;;;;OAOG;IACH,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACnC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAE7B;;;;;;;;;OASG;IACH,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAElC;;;;;;OAMG;IACH,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAChC,WAAW,EAAE,uBAAuB,CAAC,QAAQ,EAAE;IAE/C;;;;;;;;OAQG;IACH,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAErC;;;;;;;;;;;OAWG;IACH,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;IACxD,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;CACtD,CAAC,CAAC"}
+{"version":3,"file":"work-session.js","sourceRoot":"","sources":["../../src/schema/work-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAEnE;;;GAGG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACxC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IAErB;;;;;;;OAOG;IACH,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAEtC;;;;;OAKG;IACH,uBAAuB,EAAE,CAAC,CAAC,MAAM,EAAE;IAEnC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC;IACrC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAChC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAE7C;;;;;;;OAOG;IACH,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACnC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAE7B;;;;;;;;;OASG;IACH,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAElC;;;;;;OAMG;IACH,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAChC,WAAW,EAAE,uBAAuB,CAAC,QAAQ,EAAE;IAE/C;;;;;;;;;;;;;OAaG;IACH,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAEpC;;;;;;;;OAQG;IACH,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAErC;;;;;;;;;;;OAWG;IACH,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;IACxD,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;CACtD,CAAC,CAAC"}

package/node_modules/@specforge/session-types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@specforge/session-types",
-  "version": "0.4.14",
+  "version": "0.4.15",
   "description": "Session type definitions for SpecForge work/planning/review sessions.",
   "type": "module",
   "main": "dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@specforge/canary-cli",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "description": "MCP server for SpecForge - AI agent integration",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,10 +18,10 @@
     "minimatch": "^10.1.1",
     "ora": "^8.2.0",
     "zod": "^3.25.0",
-    "@specforge/api-types": "0.4.17",
-    "@specforge/spec-types": "0.4.17",
-    "@specforge/session-types": "0.4.14",
-    "@specforge/report-types": "0.4.9"
+    "@specforge/api-types": "0.4.18",
+    "@specforge/session-types": "0.4.15",
+    "@specforge/report-types": "0.4.10",
+    "@specforge/spec-types": "0.4.17"
   },
   "devDependencies": {
     "@types/inquirer": "^9.0.9",
@@ -33,7 +33,7 @@
     "tsx": "^4.7.0",
     "typescript": "^5.0.0",
     "vitest": "4.0.18",
-    "@specforge/lifecycle": "0.3.23"
+    "@specforge/lifecycle": "0.3.24"
   },
   "engines": {
     "node": ">=18.0.0"
@@ -61,7 +61,7 @@
     "@specforge/session-types",
     "@specforge/report-types"
   ],
-  "gitHead": "64fe3cf4657914ccecc2c26c67c09d6890597a0a",
+  "gitHead": "5a53696e799f2b204816c6e3345b79891bafdff7",
   "scripts": {
     "build": "tsup && tsc --emitDeclarationOnly --outDir dist",
     "typecheck": "tsc --noEmit",

package/src/cli/templates/agents/content/core/sfag-orchestrator.ts

@@ -117,6 +117,16 @@ This is how implementation runs. Internalize it before dispatching anything.
 - **Respect the DAG.** Only \`ready\` (dependency-free) tickets are dispatchable. When a worker completes
   a ticket, the readiness cascade unblocks its dependents (\`pending → ready\`); you then dispatch the
   newly-ready ones. Never dispatch a ticket whose dependencies aren't \`done\`.
+- **Merge a completed wave into the integration branch BEFORE dispatching the next wave.** Each worker
+  forks its worktree from the shared integration branch (the base every \`git worktree add\` branches
+  from). After the tickets of a wave finalize (\`→ done\`), you MUST **merge their branches into the
+  integration branch** before you create the worktrees for the newly-\`ready\` dependents. Why: a
+  dependent needs the files the dependency produced — if you dispatch it while the integration branch is
+  still stale, its worktree forks from a base that is MISSING those files, and its build/imports break.
+  Merging first means the next wave's worktree forks from the UPDATED base (dependencies included), and
+  the new worker's captured base commit (the SWS HEAD it diffs against at complete_work_session) is that
+  merged HEAD — so \`git diff base..HEAD\` captures only that worker's own work, not the dependencies'.
+  **Never dispatch a dependent before the base has loaded the dependency's changes.**
 - **No review coordination.** The review lifecycle is dormant — there is no reviewer to wait on, no
   approval/dismissal gate to coordinate. A worker self-completes through the CWS gates. Do NOT wait for
   a review step; it does not exist in the work chain.
@@ -191,7 +201,10 @@ not a tool you can call.
 Loop until the spec is done:
 1. Poll \`get_implementation_status({ status: "active" })\` + \`get_next_actionable_tickets(...)\`.
 2. For every worker slot free (under the concurrency bound), dispatch the next \`ready\` ticket.
-3. When a ticket finalizes \`→ done\`, the cascade unblocks its dependents — dispatch those next.
+3. When a ticket finalizes \`→ done\`, the cascade unblocks its dependents — but **merge the completed
+   ticket's branch into the integration branch FIRST**, THEN dispatch those dependents. Their worktrees
+   must fork from the merged base so they carry the files the dependency produced; a dependent dispatched
+   against a stale base breaks on missing imports.
 4. Send anything \`blocked\`/\`paused\` to \`sfag-work-resolver\`; re-dispatch once it's \`ready\` again
    (SWS re-attaches the paused WorkSession and applies the human's resolution).
 When every spec ticket is \`done\`, the last CWS finalizes the ImplementationSession and the spec → done.
@@ -268,6 +281,9 @@ sfag-ticket-implementer (ticket C, worktree C) ─┘   poll get_implementation_
 - ❌ Don't launch a worker without a spec. If no spec, HALT and hand planning to the main agent.
 - ❌ Don't try to create a spec, and don't delegate spec creation to any subagent. Planning is main-conversation-only.
 - ❌ Don't dispatch a ticket out of dependency order. Only \`ready\` (dependency-free) tickets are dispatchable.
+- ❌ Don't dispatch a dependent before merging its dependencies' completed branches into the integration
+  branch. Its worktree would fork from a stale base missing the dependency's files, breaking imports/builds,
+  and its diffed base commit would measure the wrong file set.
 - ❌ Don't run workers in the same worktree, and don't dispatch a worker without giving it its own
   worktree path to pass to SWS/CWS. Concurrent sessions sharing a worktree are DENIED
   (\`concurrent_worktree\`) and their git evidence would otherwise be the launcher's, not the worker's.

package/src/cli/templates/agents/content/core/sfag-ticket-implementer.ts

@@ -211,15 +211,24 @@ action_work_session({ ticketId, action: {
 }})
 \`\`\`
 Any **extra or divergent** file (not in the planned set) needs a justification, or it
-costs coherence:
+costs coherence. When you justify one, VERIFY what plan item it fulfils and set
+\`fulfills\` (both \`kind\` and \`id\` are required): if the file **replaces a declared file**
+of a step, link it with \`{kind:"step", id:<step id>, fileId:<the declared fileChangeId>}\`
+— that link is what UNBLOCKS the finalize when the plan under-declared the file; if it
+exists to satisfy an **acceptance criterion or a test**, use
+\`{kind:"acceptance_criterion"|"test", id}\`:
 \`\`\`
 action_work_session({ ticketId, action: {
   action: "add_file_change_justification", workSessionId,
   expectedPath: "src/util/hash.ts", expectedAction: "create",
-  justification: "Extracted the hashing helper the AC requires; shared by the service."
+  justification: "Produced this instead of the declared src/util/crypto.ts; same role.",
+  fulfills: { kind: "step", id: "<step id>", fileId: "<declared fileChangeId>" }
 }})
 \`\`\`
-Use \`amend_file_change_justification\` to replace one after a rejection.
+A deviation that replaces a declared file WITHOUT a \`fulfills.step\` holds the finalize,
+and coherence reads low because the plan under-declared it — that is expected and honest.
+Use \`amend_file_change_justification\` to replace one after a rejection (re-declare the
+corrected \`fulfills\` — the amend OVERRIDES the prior link).
 
 ### 3d. Acceptance criteria (AC)