Merge pull request #1424 from re-cinq/1286-merge-deliverable-state

refactor(state): merge internal/deliverable into state.OutcomeRecord

Author: nextlevelshit

.agents/pipelines/audit-duplicates.yaml

@@ -71,11 +71,9 @@ steps:
 
         4. **Routing** (internal/suggest/ vs internal/pipeline/routing.go): Both may route user intent to pipeline selection. Compare how each determines which pipeline to run. Check for duplicated scoring logic, keyword matching, or heuristic functions.
 
-        5. **State tracking** (internal/state/ vs internal/deliverable/): Both may track pipeline run status and outcomes. Compare their data models, storage mechanisms, and query patterns. Identify whether they track the same lifecycle events or serve different granularities of state.
+        5. **Template variables** (internal/pipeline/context.go ProjectVars vs internal/manifest/types.go ProjectVars): Check whether both define or populate project template variables. Identify whether the same variable names are resolved in two different places, which could lead to inconsistent values.
 
-        6. **Template variables** (internal/pipeline/context.go ProjectVars vs internal/manifest/types.go ProjectVars): Check whether both define or populate project template variables. Identify whether the same variable names are resolved in two different places, which could lead to inconsistent values.
-
-        7. **Discovery of additional overlaps**: Beyond the known suspects, scan for:
+        6. **Discovery of additional overlaps**: Beyond the known suspects, scan for:
            - Functions with identical or near-identical signatures across different packages.
            - Types that model the same domain concept under different names.
            - Utility functions (string manipulation, file I/O helpers, error wrapping) duplicated across packages rather than centralized.

.golangci.yml

@@ -32,7 +32,6 @@ linters:
             - "**/internal/adapter/**"
             - "**/internal/contract/**"
             - "**/internal/relay/**"
-            - "**/internal/deliverable/**"
             - "**/internal/preflight/**"
             - "**/internal/recovery/**"
             - "**/internal/skill/**"
@@ -90,8 +89,6 @@ linters:
               desc: "Layer violation: Infrastructure must not import Domain (ADR-003)"
             - pkg: "github.com/recinq/wave/internal/relay"
               desc: "Layer violation: Infrastructure must not import Domain (ADR-003)"
-            - pkg: "github.com/recinq/wave/internal/deliverable"
-              desc: "Layer violation: Infrastructure must not import Domain (ADR-003)"
             - pkg: "github.com/recinq/wave/internal/preflight"
               desc: "Layer violation: Infrastructure must not import Domain (ADR-003)"
             - pkg: "github.com/recinq/wave/internal/recovery"

cmd/wave/commands/resume.go

@@ -241,9 +241,9 @@ func runResume(opts ResumeOptions, debug bool) error {
 
 	executor := pipeline.NewDefaultPipelineExecutor(runner, execOpts...)
 
-	// Connect deliverable tracker to progress display.
+	// Connect outcome tracker to progress display.
 	if btpd, ok := progressDisplay.(*display.BubbleTeaProgressDisplay); ok {
-		btpd.SetDeliverableTracker(executor.GetDeliverableTracker())
+		btpd.SetOutcomeTracker(executor.GetOutcomeTracker())
 	}
 
 	// Transition new run record to running.
@@ -335,7 +335,7 @@ func runResume(opts ResumeOptions, debug bool) error {
 	}
 
 	if opts.Output.Format == OutputFormatJSON {
-		tracker := executor.GetDeliverableTracker()
+		tracker := executor.GetOutcomeTracker()
 		outcome := display.BuildOutcome(tracker, p.Metadata.Name, resumeRunID, true, elapsed, executor.GetTotalTokens(), "", nil)
 		outJSON := outcome.ToOutcomesJSON()
 		emitter.Emit(event.Event{

cmd/wave/commands/run.go

@@ -519,9 +519,9 @@ func runRun(opts RunOptions, debug bool) error {
 
 	executor := pipeline.NewDefaultPipelineExecutor(runner, execOpts...)
 
-	// Connect deliverable tracker to progress display
+	// Connect outcome tracker to progress display
 	if btpd, ok := progressDisplay.(*display.BubbleTeaProgressDisplay); ok {
-		btpd.SetDeliverableTracker(executor.GetDeliverableTracker())
+		btpd.SetOutcomeTracker(executor.GetOutcomeTracker())
 	}
 
 	if opts.Continuous {
@@ -716,8 +716,8 @@ func runRun(opts RunOptions, debug bool) error {
 			fmt.Fprintf(os.Stderr, "\n  ✓ Pipeline '%s' completed successfully (%.1fs)\n",
 				p.Metadata.Name, elapsed.Seconds())
 		}
-		// Build structured outcome summary from deliverable tracker
-		tracker := executor.GetDeliverableTracker()
+		// Build structured outcome summary from outcome tracker
+		tracker := executor.GetOutcomeTracker()
 		outcome := display.BuildOutcome(tracker, p.Metadata.Name, runID, true, elapsed, totalTokens, "", nil)
 		summary := display.RenderOutcomeSummary(outcome, opts.Output.Verbose, display.NewFormatter())
 		if summary != "" {
@@ -736,7 +736,7 @@ func runRun(opts RunOptions, debug bool) error {
 
 	// For JSON output mode, emit structured outcomes in the final completion event
 	if opts.Output.Format == OutputFormatJSON {
-		tracker := executor.GetDeliverableTracker()
+		tracker := executor.GetOutcomeTracker()
 		outcome := display.BuildOutcome(tracker, p.Metadata.Name, runID, true, elapsed, executor.GetTotalTokens(), "", nil)
 		outJSON := outcome.ToOutcomesJSON()
 		emitter.Emit(event.Event{

docs/adr/003-layered-architecture.md

@@ -11,8 +11,8 @@ Accepted (Phase 1 — depguard rules live; package count drifted upward)
 Landed:
 - `depguard` rules in `.golangci.yml` enforce two layer constraints:
   - `no-presentation-reverse` blocks `display`, `tui`, `webui`, `onboarding` from being imported by domain or infrastructure code.
-  - `infrastructure-no-domain` blocks `pipeline`, `adapter`, `contract`, `relay`, `deliverable`, `preflight`, `recovery`, `skill`, `defaults`, `suggest`, `doctor` from being imported by infrastructure.
-- Verified import constraints: `display` → `event`/`pathfmt`/`deliverable` only; `pipeline` does not import `display`/`tui`.
+  - `infrastructure-no-domain` blocks `pipeline`, `adapter`, `contract`, `relay`, `preflight`, `recovery`, `skill`, `defaults`, `suggest`, `doctor` from being imported by infrastructure.
+- Verified import constraints: `display` → `event`/`pathfmt`/`state` only; `pipeline` does not import `display`/`tui`.
 
 Drift since the original ADR was drafted:
 - `internal/` package count grew from 25 to 39 (additions include `attention`, `bench`, `classify`, `continuous`, `cost`, `fileutil`, `hooks`, `humanize`, `ontology`, `retro`, `sandbox`, `scope`, `testutil`, `timeouts`, `tools`).
@@ -21,7 +21,7 @@ Drift since the original ADR was drafted:
 
 ## Context
 
-Wave's `internal/` directory contains 25 packages that have grown organically during rapid prototyping (v0.15.0 → v0.84.1). While the separation between presentation and backend is already reasonably clean — `display/` imports only `event/`, `pathfmt/`, and `deliverable/`; `pipeline/` does not import `display/` or `tui/` — some areas have accumulated cross-layer coupling that warrants formal documentation and enforcement.
+Wave's `internal/` directory contains 25 packages that have grown organically during rapid prototyping (v0.15.0 → v0.84.1). While the separation between presentation and backend is already reasonably clean — `display/` imports only `event/`, `pathfmt/`, and `state/`; `pipeline/` does not import `display/` or `tui/` — some areas have accumulated cross-layer coupling that warrants formal documentation and enforcement.
 
 ### Current State
 
@@ -33,16 +33,15 @@ An audit of the codebase reveals the following import relationships among intern
 | `audit` | (none) |
 | `contract` | `pathfmt` |
 | `defaults` | `manifest`, `pipeline` |
-| `deliverable` | `pathfmt` |
-| `display` | `deliverable`, `event`, `pathfmt` |
+| `display` | `event`, `pathfmt`, `state` |
 | `doctor` | `forge`, `github`, `manifest`, `onboarding`, `pipeline` |
 | `event` | (none) |
 | `forge` | (none) |
 | `github` | (none) |
 | `manifest` | `skill` |
 | `onboarding` | `manifest`, `skill`, `tui` |
 | `pathfmt` | (none) |
-| `pipeline` | `adapter`, `audit`, `contract`, `deliverable`, `event`, `forge`, `manifest`, `preflight`, `recovery`, `relay`, `security`, `skill`, `state`, `workspace`, `worktree` |
+| `pipeline` | `adapter`, `audit`, `contract`, `event`, `forge`, `manifest`, `preflight`, `recovery`, `relay`, `security`, `skill`, `state`, `workspace`, `worktree` |
 | `preflight` | `skill` |
 | `recovery` | `contract`, `pathfmt`, `preflight`, `security` |
 | `relay` | (none) |
@@ -88,7 +87,6 @@ Adopt a four-layer architectural model for Wave's internal packages and enforce
 | `adapter` | Subprocess execution and adapter management |
 | `contract` | Output validation (JSON schema, TypeScript, test suites) |
 | `relay` | Context compaction and summarization |
-| `deliverable` | Pipeline deliverable tracking and output |
 | `preflight` | Pipeline dependency validation and auto-install |
 | `recovery` | Pipeline recovery hints and error guidance |
 | `skill` | Skill discovery, provisioning, and command management |

docs/architecture-audit.md

@@ -14,7 +14,6 @@ Wave's `internal/` directory contains **25 Go packages** totaling ~48,655 lines
 | `audit` | 133 | 709 | Audit logging with credential scrubbing |
 | `contract` | 4,030 | 3,498 | Output validation (JSON schema, TypeScript, test suites, markdown spec) |
 | `defaults` | 209 | 529 | Embedded default personas, pipelines, and contracts |
-| `deliverable` | 513 | 222 | Pipeline deliverable tracking and output formatting |
 | `display` | 5,294 | 5,605 | Terminal progress display and formatting |
 | `doctor` | 2,474 | 2,500 | Project health checking and optimization |
 | `event` | 200 | 642 | Progress event emission and monitoring (producer/consumer) |
@@ -46,16 +45,15 @@ Each row shows which internal packages are imported.
 | `audit` | *(none)* | 0 |
 | `contract` | `pathfmt` | 1 |
 | `defaults` | `manifest`, `pipeline` | 2 |
-| `deliverable` | `pathfmt` | 1 |
-| `display` | `deliverable`, `event`, `pathfmt` | 3 |
+| `display` | `event`, `pathfmt`, `state` | 3 |
 | `doctor` | `forge`, `github`, `manifest`, `onboarding`, `pipeline` | 5 |
 | `event` | *(none)* | 0 |
 | `forge` | *(none)* | 0 |
 | `github` | *(none)* | 0 |
 | `manifest` | `skill` | 1 |
 | `onboarding` | `manifest`, `skill`, `tui` | 3 |
 | `pathfmt` | *(none)* | 0 |
-| `pipeline` | `adapter`, `audit`, `contract`, `deliverable`, `event`, `forge`, `manifest`, `preflight`, `recovery`, `relay`, `security`, `skill`, `state`, `workspace`, `worktree` | 15 |
+| `pipeline` | `adapter`, `audit`, `contract`, `event`, `forge`, `manifest`, `preflight`, `recovery`, `relay`, `security`, `skill`, `state`, `workspace`, `worktree` | 14 |
 | `preflight` | `skill` | 1 |
 | `recovery` | `contract`, `pathfmt`, `preflight`, `security` | 4 |
 | `relay` | *(none)* | 0 |
@@ -75,7 +73,7 @@ Each row shows which internal packages are imported.
 | `manifest` | `defaults`, `doctor`, `onboarding`, `pipeline`, `tui`, `webui` | 6 |
 | `skill` | `manifest`, `onboarding`, `pipeline`, `preflight` | 4 |
 | `event` | `display`, `pipeline`, `tui`, `webui` | 4 |
-| `pathfmt` | `contract`, `deliverable`, `display`, `recovery`, `tui` | 5 |
+| `pathfmt` | `contract`, `display`, `recovery`, `state`, `tui` | 5 |
 | `pipeline` | `defaults`, `doctor`, `tui`, `webui` | 4 |
 | `forge` | `doctor`, `pipeline`, `suggest`, `tui` | 4 |
 | `state` | `pipeline`, `tui`, `webui` | 3 |
@@ -85,7 +83,6 @@ Each row shows which internal packages are imported.
 | `github` | `adapter`, `doctor`, `tui` | 3 |
 | `contract` | `pipeline`, `recovery` | 2 |
 | `workspace` | `pipeline`, `webui` | 2 |
-| `deliverable` | `display`, `pipeline` | 2 |
 | `audit` | `pipeline`, `webui` | 2 |
 | `preflight` | `pipeline`, `recovery` | 2 |
 | `doctor` | `suggest` | 1 |
@@ -219,7 +216,6 @@ Test-to-production ratio varies significantly:
 | `workspace` | 3.3:1 | Well-tested |
 | `tui` | 0.9:1 | Could use more test coverage |
 | `webui` | 0.4:1 | Low test coverage |
-| `deliverable` | 0.4:1 | Low test coverage |
 
 ## ADR-003 Discrepancies Found
 

docs/changelog.md

@@ -39,12 +39,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Unified forge-specific pipelines into forge-agnostic pipelines with template variables
 - `github_api_seconds` → `forge_api_seconds` in timeout configuration
 - All hardcoded timeout values replaced with configurable constants via `internal/timeouts`
+- `state.OutcomeRecord` extended with `Description`, `Metadata`, and typed `OutcomeType` (migration #24); new `state.OutcomeTracker` replaces `deliverable.Tracker` with persistence-on-add (#1286)
+- `executor.GetDeliverableTracker()` → `executor.GetOutcomeTracker()`; `BubbleTeaProgressDisplay.SetDeliverableTracker` → `SetOutcomeTracker` (#1286)
 
 ### Removed
 - Deprecated pipeline name resolution (`ResolveDeprecatedName`) — no backward-compat shims pre-1.0.0
 - Timeout constant re-exports from `manifest` package
 - Stale multiplatform pipeline tests referencing non-existent gl-*/gt-* YAML files
 - Nonexistent `timeout` and `retry` persona fields from custom-personas guide
+- `internal/deliverable` package — merged into `state.OutcomeRecord` and `state.OutcomeTracker`. Single outcome model backed by SQLite with persistence-on-add (#1286)
 
 ## [0.69.0] - 2026-03-10
 

docs/scope/wave-scope.md

@@ -55,7 +55,6 @@
 | `audit` | 388 | Audit logging and credential scrubbing | Active |
 | `scope` | 604 | Persona token scope validation | Active |
 | `cost` | 237 | Cost ledger and budget enforcement | Active |
-| `deliverable` | 513 | Pipeline deliverable tracking | Active |
 | `retro` | 659 | Run retrospective generation | Active |
 | `pathfmt` | 22 | Path formatting utilities | Active |
 | `timeouts` | 29 | Timeout constants | Active |

internal/defaults/pipelines/audit-duplicates.yaml

@@ -70,11 +70,9 @@ steps:
 
         4. **Routing** (internal/suggest/ vs internal/pipeline/routing.go): Both may route user intent to pipeline selection. Compare how each determines which pipeline to run. Check for duplicated scoring logic, keyword matching, or heuristic functions.
 
-        5. **State tracking** (internal/state/ vs internal/deliverable/): Both may track pipeline run status and outcomes. Compare their data models, storage mechanisms, and query patterns. Identify whether they track the same lifecycle events or serve different granularities of state.
+        5. **Template variables** (internal/pipeline/context.go ProjectVars vs internal/manifest/types.go ProjectVars): Check whether both define or populate project template variables. Identify whether the same variable names are resolved in two different places, which could lead to inconsistent values.
 
-        6. **Template variables** (internal/pipeline/context.go ProjectVars vs internal/manifest/types.go ProjectVars): Check whether both define or populate project template variables. Identify whether the same variable names are resolved in two different places, which could lead to inconsistent values.
-
-        7. **Discovery of additional overlaps**: Beyond the known suspects, scan for:
+        6. **Discovery of additional overlaps**: Beyond the known suspects, scan for:
            - Functions with identical or near-identical signatures across different packages.
            - Types that model the same domain concept under different names.
            - Utility functions (string manipulation, file I/O helpers, error wrapping) duplicated across packages rather than centralized.