merge: integrate feat/backlog-burndown into master
master had advanced 16 commits past feat/backlog-burndown's base, and the two branches independently built four of the same features. Resolved 26 conflicts. Overlap features — kept master's implementation (more complete / production-wired / more robust), dropped the feature branch's parallel constellation: - llama-server health probe: kept master's event-store-backed tps probe; dropped the branch's LlamaLivenessClient (liveness-only, throughput unwired). - event-store probe: kept master's EventStoreHealthProbe; dropped EventStoreLatencyProbe. - brief echo-back gate: kept master's BriefEchoDiff (Jaccard, tolerates rewording); dropped the branch's exact-set-diff BriefEchoComparator/Extractor. - static-first reviewer: kept master's command/exit-code gate (ProcessStaticAnalysisRunner, wired); dropped the branch's structured-finding static_check stage (no-op seam). Its structured-findings model is filed as a follow-up in BACKLOG. Feature-branch net-new work brought in and kept (master had none): - native task tracking (aggregate, agent tools wired into analyst/implementer/reviewer, dependency graph + gates, decompose, REST/CLI, TUI task board) - critique-outcome producer (role-rel §6 — master had deferred it) - stage-level plan checkpointing (C-A2, folded into runPostStageGates) - CLAUDE.md/AGENTS.md L0 standing context - cross-session grants + TUI (grant scopes/revoke, @ picker, session resume browser) Verified: full Gradle compile (all modules + tests) green; tests pass for core:events, core:kernel, infrastructure:workflow, apps:server, apps:cli, testing:integration; tui-go go build + go test green. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -55,3 +55,38 @@ evidence to check.
|
||||
`4e5e4e5`, §5 reviewer narrow-question prompt/needs `3467826`.
|
||||
- **TUI requirements shipped halves** — §2 last-event clock + unknown-event fallback `8b896b5`, §5.1
|
||||
deterministic command-approval parse card `65df3f4`.
|
||||
|
||||
---
|
||||
|
||||
## 2026-06-26 — Merged `feat/backlog-burndown` into `master`
|
||||
|
||||
`master` had advanced 16 commits past where `feat/backlog-burndown` branched, and the two had
|
||||
**independently built four of the same features**. The merge kept **master's** implementation for
|
||||
each overlap (more complete / wired to production / more robust) and dropped the feature branch's
|
||||
parallel constellation:
|
||||
|
||||
- **llama-server health probe** — kept master's event-store-backed tokens/sec probe; dropped the
|
||||
branch's `LlamaLivenessClient`/`HttpLlamaLivenessClient` (liveness-only, throughput unwired).
|
||||
- **event-store probe** — kept master's `EventStoreHealthProbe`; dropped the branch's
|
||||
`EventStoreLatencyProbe`.
|
||||
- **brief echo-back gate** — kept master's `BriefEchoDiff` (Jaccard token-overlap, tolerant of
|
||||
rewording); dropped the branch's `BriefEchoComparator`/`BriefEchoExtractor` (exact set-diff).
|
||||
- **static-first reviewer** — kept master's command/exit-code gate (`StaticAnalysisRunner` +
|
||||
`ProcessStaticAnalysisRunner`, production-wired); dropped the branch's structured-finding
|
||||
`static_check` *stage* (`StaticCheckStageExecutor`, `StaticFinding`, `ContextFeedback` exclusion)
|
||||
which was a no-op pending a production runner. **Its structured-findings model is filed as a
|
||||
follow-up in BACKLOG** so it isn't lost.
|
||||
|
||||
**Net-new feature-branch work brought in and kept** (master had none of these):
|
||||
|
||||
- **Native task tracking** — task aggregate + agent tools (`task_create`/`task_update`/
|
||||
`task_context`/`task_search` wired into analyst/implementer/reviewer), dependency-aware work graph
|
||||
(blockers/ready), claim/cite/scope/stale-write gates, `task_decompose`, REST surface, CLI, git-driven
|
||||
status, markdown export, and the TUI task board (`OverlayTasks`, `T` key).
|
||||
- **Critique-outcome producer (role-rel §6)** — `CritiqueOutcomeCorrelator` +
|
||||
`CritiqueFindingsRecordedEvent`/`CritiqueOutcomeCorrelatedEvent` + the per-model calibration chain
|
||||
(master had explicitly *deferred* §6). Dormant until the reviewer emits structured findings (live-QA).
|
||||
- **Stage-level plan checkpointing (C-A2)** — `emitStageCheckpoint` folded into `runPostStageGates`.
|
||||
- **L0 standing context** — CLAUDE.md / AGENTS.md injected as agent-instruction context entries.
|
||||
- **Cross-session grants + TUI** — PROJECT/GLOBAL grant scopes + revoke, grant viewer, `@` file picker,
|
||||
session resume browser (`OverlaySessions`, `R` key).
|
||||
|
||||
Reference in New Issue
Block a user