diff --git a/CHANGELOG.md b/CHANGELOG.md index 1113481..22841aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project follows [Semantic Versioning](https://semver.org/spec/v2.0.0.ht ## [Unreleased] +## [2.1.0] - 2026-08-15 + ### Added - Add reviewed `pull --plan FILE` and `pull --apply-plan FILE` workflows for @@ -186,7 +188,8 @@ and this project follows [Semantic Versioning](https://semver.org/spec/v2.0.0.ht - Add opt-in GitHub workflow integration and managed Memory Bank blocks. - Add Go install, Homebrew, and platform-specific release artifacts. -[Unreleased]: https://github.com/dapi/memory-bank-cli/compare/v2.0.1...HEAD +[Unreleased]: https://github.com/dapi/memory-bank-cli/compare/v2.1.0...HEAD +[2.1.0]: https://github.com/dapi/memory-bank-cli/compare/v2.0.1...v2.1.0 [2.0.1]: https://github.com/dapi/memory-bank-cli/compare/v2.0.0...v2.0.1 [2.0.0]: https://github.com/dapi/memory-bank-cli/compare/v1.8.1...v2.0.0 [1.8.1]: https://github.com/dapi/memory-bank-cli/compare/v1.8.0...v1.8.1 diff --git a/memory-bank/features/FT-054-ai-assisted-human-approved-pull-resolution/brief.md b/memory-bank/features/FT-054-ai-assisted-human-approved-pull-resolution/brief.md index c90d04d..eeac234 100644 --- a/memory-bank/features/FT-054-ai-assisted-human-approved-pull-resolution/brief.md +++ b/memory-bank/features/FT-054-ai-assisted-human-approved-pull-resolution/brief.md @@ -7,7 +7,7 @@ derived_from: - ../../flows/feature.md - https://github.com/dapi/memory-bank-cli/issues/54 status: active -delivery_status: in_progress +delivery_status: done audience: humans_and_agents --- diff --git a/memory-bank/features/FT-054-ai-assisted-human-approved-pull-resolution/decision-log.md b/memory-bank/features/FT-054-ai-assisted-human-approved-pull-resolution/decision-log.md index 96cac2d..212131b 100644 --- a/memory-bank/features/FT-054-ai-assisted-human-approved-pull-resolution/decision-log.md +++ b/memory-bank/features/FT-054-ai-assisted-human-approved-pull-resolution/decision-log.md @@ -26,7 +26,7 @@ solution. This ledger records why those decisions were accepted. | `DEC-03` | accepted | Use a trusted-local authorization model rather than cryptographic reviewer identity. | The user approved this boundary on 2026-08-15. The CLI can prove state/result integrity but cannot distinguish a human from another process on the same account without an external authority. | No signing keys, reviewer registry or credential lifecycle; review remains visible in Git/user workflow. | | `DEC-04` | accepted | Recover historical base from `.lock.template.source_ref` and verify the Git blob against `BaseDigest`/`BaseMode`. | The immutable source identity and base digest already exist; the upstream fetch contains reachable history. | No lock-history sidecar or protected receipt registry. Missing/mismatched history disables merge only. | | `DEC-05` | accepted | Use deterministic non-overlapping line merge and include its exact result in the reviewed plan. | This allows mechanical assistance without claiming semantic correctness. | Apply recomputes exact bytes/mode; overlap keeps merge unavailable. | -| `DEC-06` | pending | Refresh issue #54 with the final implementation/PR/release carrier. | Feature Flow requires a current tracker route. | Complete during publication. | +| `DEC-06` | accepted | Route issue #54 through the final implementation and release carrier. | PR #56 passed all required checks, merged as `b9ec3a2`, and closed issue #54. | Release `v2.1.0` carries the versioned changelog and installable binaries. | ## Open Questions diff --git a/memory-bank/features/FT-054-ai-assisted-human-approved-pull-resolution/feature-review-report.md b/memory-bank/features/FT-054-ai-assisted-human-approved-pull-resolution/feature-review-report.md index 40f7a59..2d0a196 100644 --- a/memory-bank/features/FT-054-ai-assisted-human-approved-pull-resolution/feature-review-report.md +++ b/memory-bank/features/FT-054-ai-assisted-human-approved-pull-resolution/feature-review-report.md @@ -324,3 +324,28 @@ published. - **Status:** `implementation_complete_pending_ci`. - **Critical/important findings remaining:** none in the implementation; publication routing and release evidence remain pending. + +## Cycle 12 + +### Review summary + +PR #56 passed `Validate`, `Local init/update E2E` and `Stable downstream +smoke`, merged to `main` as `b9ec3a2`, and closed issue #54. The feature +lifecycle is complete and the implementation plan is archived. Release +`v2.1.0` is the selected minor version because the change adds backward- +compatible public plan/apply commands. + +### Critical and important findings + +None. + +### Human gate + +No. The user authorized implementation and release; publication continues +through the tag-triggered release workflow. + +## Final Report + +- **Status:** `done_pending_release_workflow`. +- **Critical/important findings remaining:** none. +- **Release carrier:** `v2.1.0` from this versioned changelog commit. diff --git a/memory-bank/features/FT-054-ai-assisted-human-approved-pull-resolution/implementation-plan.md b/memory-bank/features/FT-054-ai-assisted-human-approved-pull-resolution/implementation-plan.md index 44e2ef8..cfdcb61 100644 --- a/memory-bank/features/FT-054-ai-assisted-human-approved-pull-resolution/implementation-plan.md +++ b/memory-bank/features/FT-054-ai-assisted-human-approved-pull-resolution/implementation-plan.md @@ -6,7 +6,7 @@ purpose: "Execution plan for the accepted trusted-local resolution workflow." derived_from: - brief.md - design.md -status: active +status: archived audience: humans_and_agents must_not_define: - ft_054_scope diff --git a/memory-bank/features/README.md b/memory-bank/features/README.md index 32ff062..eab0b99 100644 --- a/memory-bank/features/README.md +++ b/memory-bank/features/README.md @@ -27,7 +27,7 @@ audience: humans_and_agents - [FT-023: Push Upstream Publication](FT-023-push-upstream-publication/README.md) — completed package for issue #23's managed-only, failure-safe upstream publication through a dedicated branch and PR. - [FT-026: Ignore Project-Local Source Root](FT-026-ignore-project-local-source-root/README.md) — in-progress package for issue #26's target-template selection alongside a locked project-local copy. - [FT-051: Separate CLI Self-Update](FT-051-separate-cli-self-update/README.md) — in-progress package for issue #51 with an accepted self-update delivery contract and completed review cycles. -- [FT-054: AI-Assisted, Human-Approved Pull Resolution](FT-054-ai-assisted-human-approved-pull-resolution/README.md) — in-progress trusted-local plan/apply delivery for issue #54, with Git-verified historical bases and explicit reviewed adapted-file actions. +- [FT-054: AI-Assisted, Human-Approved Pull Resolution](FT-054-ai-assisted-human-approved-pull-resolution/README.md) — completed trusted-local plan/apply delivery for issue #54, with Git-verified historical bases and explicit reviewed adapted-file actions. ## Rules