feat(checkpoint): add checkpointing and rollback #445

Merged

CoreRasurae merged 1 commit from feature/m6-checkpoint into master 2026-03-02 10:46:16 +00:00

Conversation 3 Commits 1 Files changed 20 +3069 -6

CoreRasurae commented 2026-02-25 22:23:37 +00:00

Member

Copy link

Summary

Implements the checkpoint and rollback subsystem for plan execution safety, including domain models, database persistence, CLI commands, and correction flow integration.

Changes

• Checkpoint domain model: Checkpoint with ULID ID, plan association, sandbox reference, and metadata (reason, source tool, phase). CheckpointRetentionPolicy for auto-prune. RollbackResult for operation outcomes.
• Database layer: CheckpointModel ORM mapping and CheckpointRepository with CRUD + prune operations
• CheckpointService: Full checkpoint lifecycle management with creation, rollback, listing, and retention enforcement
• CLI command: plan rollback <plan_id> <checkpoint_id> with output showing restored file counts and changed paths
• Correction integration: Wired into CorrectionService for revert flow reuse
• Safety guards: Rollback rejected when plan is applied or sandbox is missing
• BDD Tests: 20 Behave scenarios for checkpoint/rollback behavior
• Robot Tests: 10 integration test cases
• ASV Benchmarks: Rollback latency benchmarks
• Documentation: Reference documentation at docs/reference/checkpointing.md

Motivation

Checkpointing enables safe, reversible plan execution by capturing sandbox state at key points. The rollback capability allows recovering from failed execution steps without losing earlier progress, and integrates with the correction flow for targeted decision reversal.

Key Design Decisions

• Checkpoint IDs use ULIDs for sortable, unique identification
• Retention policy with auto-prune prevents unbounded checkpoint accumulation
• Git-worktree snapshots capture commit hash for efficient storage and restore
• Rollback guards enforce state safety (no rollback on applied plans)

Closes #206

## Summary Implements the checkpoint and rollback subsystem for plan execution safety, including domain models, database persistence, CLI commands, and correction flow integration. ### Changes - **Checkpoint domain model**: `Checkpoint` with ULID ID, plan association, sandbox reference, and metadata (reason, source tool, phase). `CheckpointRetentionPolicy` for auto-prune. `RollbackResult` for operation outcomes. - **Database layer**: `CheckpointModel` ORM mapping and `CheckpointRepository` with CRUD + prune operations - **CheckpointService**: Full checkpoint lifecycle management with creation, rollback, listing, and retention enforcement - **CLI command**: `plan rollback <plan_id> <checkpoint_id>` with output showing restored file counts and changed paths - **Correction integration**: Wired into `CorrectionService` for revert flow reuse - **Safety guards**: Rollback rejected when plan is applied or sandbox is missing - **BDD Tests**: 20 Behave scenarios for checkpoint/rollback behavior - **Robot Tests**: 10 integration test cases - **ASV Benchmarks**: Rollback latency benchmarks - **Documentation**: Reference documentation at `docs/reference/checkpointing.md` ### Motivation Checkpointing enables safe, reversible plan execution by capturing sandbox state at key points. The rollback capability allows recovering from failed execution steps without losing earlier progress, and integrates with the correction flow for targeted decision reversal. ### Key Design Decisions - Checkpoint IDs use ULIDs for sortable, unique identification - Retention policy with auto-prune prevents unbounded checkpoint accumulation - Git-worktree snapshots capture commit hash for efficient storage and restore - Rollback guards enforce state safety (no rollback on applied plans) Closes #206

CoreRasurae added this to the v3.5.0 milestone 2026-02-25 22:23:56 +00:00

CoreRasurae added the

Type

Feature

label 2026-02-25 22:23:57 +00:00

CoreRasurae referenced this pull request 2026-02-25 22:24:34 +00:00

feat(checkpoint): add checkpointing and rollback #206

CoreRasurae force-pushed feature/m6-checkpoint from 5427f8983a to 25fc4229f8 2026-02-27 16:21:26 +00:00 Compare

brent.edwards reviewed 2026-02-27 20:30:10 +00:00

brent.edwards left a comment

Copy link

I asked GPT-5.2 Codex to do a review, but it was garbage. Trying again.

I asked GPT-5.2 Codex to do a review, but it was garbage. Trying again.

brent.edwards reviewed 2026-02-27 21:40:00 +00:00

brent.edwards left a comment

Copy link

Review Summary (commit 25fc4229f822d2fca2aa5)

Scoped to the checkpointing/rollback commit. The core models and service shape look good, but there are blockers around migration lineage and the rollback guard wiring that make the CLI path unusable in practice.

CI status isn’t visible via the API on my side. Please confirm required checks per docs/development/ci-cd.md are green (lint, typecheck, security, quality, unit_tests, integration_tests, coverage, build, docker).

Findings

P0:blocker — Alembic migration chain is broken. m6_001_checkpoint_metadata_table.py uses down_revision = "c3_001_actor_registry", but the repo only has c3_001_actor_registry_columns.py. This will fail migrations.

• File: alembic/versions/m6_001_checkpoint_metadata_table.py

P1:must-fix — plan rollback will always fail with “sandbox is missing.” CheckpointService guards rely on in‑memory register_sandbox, but the DI container provides a new service instance per call (providers.Factory), and the CLI never registers sandbox refs. There’s no persistent sandbox registry lookup either, so rollback cannot succeed for real usage.

• Files: src/cleveragents/application/services/checkpoint_service.py, src/cleveragents/application/container.py, src/cleveragents/cli/commands/plan.py

P1:must-fix — The “plan already applied” guard is also in‑memory and never set in production flows. Even if the sandbox guard were fixed, applied plans could be rolled back unless you wire this to lifecycle state in the DB.

• File: src/cleveragents/application/services/checkpoint_service.py

P2:should-fix — Docs claim CorrectionService can delegate rollback to CheckpointService, but the service never calls it. Either implement delegation or remove/adjust the doc claim to avoid misleading behavior.

• Files: src/cleveragents/application/services/correction_service.py, docs/reference/checkpointing.md

P3:should-fix — Retention policy defaults are documented but create_checkpoint() only prunes if a policy is explicitly passed. Consider defaulting to DEFAULT_RETENTION_POLICY to match docs.

• Files: src/cleveragents/application/services/checkpoint_service.py, docs/reference/checkpointing.md

Positive Notes

• Domain model and audit metadata are clear and align with the spec.
• Repository + DI wiring is consistent with ADR-007 patterns.
• CLI output envelope follows the spec for rollback responses.

## Review Summary (commit 25fc4229f822d2fca2aa5) Scoped to the checkpointing/rollback commit. The core models and service shape look good, but there are blockers around migration lineage and the rollback guard wiring that make the CLI path unusable in practice. CI status isn’t visible via the API on my side. Please confirm required checks per `docs/development/ci-cd.md` are green (lint, typecheck, security, quality, unit_tests, integration_tests, coverage, build, docker). ## Findings **P0:blocker** — Alembic migration chain is broken. `m6_001_checkpoint_metadata_table.py` uses `down_revision = "c3_001_actor_registry"`, but the repo only has `c3_001_actor_registry_columns.py`. This will fail migrations. - File: `alembic/versions/m6_001_checkpoint_metadata_table.py` **P1:must-fix** — `plan rollback` will always fail with “sandbox is missing.” `CheckpointService` guards rely on in‑memory `register_sandbox`, but the DI container provides a **new** service instance per call (`providers.Factory`), and the CLI never registers sandbox refs. There’s no persistent sandbox registry lookup either, so rollback cannot succeed for real usage. - Files: `src/cleveragents/application/services/checkpoint_service.py`, `src/cleveragents/application/container.py`, `src/cleveragents/cli/commands/plan.py` **P1:must-fix** — The “plan already applied” guard is also in‑memory and never set in production flows. Even if the sandbox guard were fixed, applied plans could be rolled back unless you wire this to lifecycle state in the DB. - File: `src/cleveragents/application/services/checkpoint_service.py` **P2:should-fix** — Docs claim CorrectionService can delegate rollback to CheckpointService, but the service never calls it. Either implement delegation or remove/adjust the doc claim to avoid misleading behavior. - Files: `src/cleveragents/application/services/correction_service.py`, `docs/reference/checkpointing.md` **P3:should-fix** — Retention policy defaults are documented but `create_checkpoint()` only prunes if a policy is explicitly passed. Consider defaulting to `DEFAULT_RETENTION_POLICY` to match docs. - Files: `src/cleveragents/application/services/checkpoint_service.py`, `docs/reference/checkpointing.md` ## Positive Notes - Domain model and audit metadata are clear and align with the spec. - Repository + DI wiring is consistent with ADR-007 patterns. - CLI output envelope follows the spec for rollback responses.

CoreRasurae force-pushed feature/m6-checkpoint from 25fc4229f8 to 830b29e4ae 2026-02-28 00:21:42 +00:00 Compare

brent.edwards approved these changes 2026-02-28 00:33:39 +00:00

Dismissed

brent.edwards left a comment

Copy link

Approved.

Approved.

freemo added the

Points

13

Priority

Medium

State

Verified

labels 2026-03-01 04:36:12 +00:00

CoreRasurae force-pushed feature/m6-checkpoint from 830b29e4ae to 8cb008478e 2026-03-01 10:25:02 +00:00 Compare

CoreRasurae dismissed brent.edwards's review 2026-03-01 10:25:02 +00:00

Reason:

New commits pushed, approval review dismissed automatically according to repository settings

CoreRasurae scheduled this pull request to auto merge when all checks succeed 2026-03-01 10:25:39 +00:00

CoreRasurae canceled auto merging this pull request when all checks succeed 2026-03-01 10:25:54 +00:00

CoreRasurae scheduled this pull request to auto merge when all checks succeed 2026-03-01 10:26:03 +00:00

CoreRasurae force-pushed feature/m6-checkpoint from 8cb008478e to b5371e53f5 2026-03-01 11:28:32 +00:00 Compare

CoreRasurae force-pushed feature/m6-checkpoint from b5371e53f5 to 32775fceb6 2026-03-01 15:38:58 +00:00 Compare

CoreRasurae force-pushed feature/m6-checkpoint from 32775fceb6 to f6bd6ce7e1 2026-03-01 23:35:10 +00:00 Compare

CoreRasurae force-pushed feature/m6-checkpoint from f6bd6ce7e1 to 81c09acc53 2026-03-01 23:36:15 +00:00 Compare

CoreRasurae force-pushed feature/m6-checkpoint from 81c09acc53 to 86e245c585 2026-03-02 10:23:25 +00:00 Compare

CoreRasurae merged commit 86e245c585 into master 2026-03-02 10:46:16 +00:00

CoreRasurae deleted branch feature/m6-checkpoint 2026-03-02 10:46:17 +00:00

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

auto/needs-reevaluation

Controller deferred this PR; awaiting Phase 6+ scope-evaluator or operator re-enablement.

  

controller-managed

Auto-agents controller manages this PR/issue (see tools/controller/deploy/RUNBOOK.md). Remove this label to abandon controller management.

  

auto/blocked-by-deps

PR blocked by an open issue dependency. Operator must close the dep (or remove the dependency link) before the merge driver can act. Auto-cleared by merge_drive when no open deps remain.

  

auto/ci-timeout

Most recent merge cycle hit CI timeout. Driver excludes this PR while last merge_cycle row is < 30 min old; label persists thereafter as visible history.

  

auto/claimed-implementer

Currently being processed by an implementer worker.

  

auto/claimed-merge

Currently being processed by the merge driver.

  

auto/claimed-reviewer

Currently being processed by a reviewer worker.

  

auto/driver-down

Merge driver heartbeat stale; pipeline halted. Closed automatically on next clean tick.

  

auto/invariant-violation

Detected master commit violating the strict merge invariant. Tracked as an issue (not a PR label); kept here for label completeness.

  

auto/last-attempt-tier-0

In-cycle escalation: most recent attempt ran at the Tier 0 slot (`tier-0`). Slot's model defined in .opencode/models/tiers.yaml.

  

auto/last-attempt-tier-1

In-cycle escalation: most recent attempt ran at the Tier 1 slot (`tier-1`). Slot's model defined in .opencode/models/tiers.yaml.

  

auto/last-attempt-tier-2

In-cycle escalation: most recent attempt ran at the Tier 2 slot (`tier-2`). Slot's model defined in .opencode/models/tiers.yaml. Gated behind IMPLEMENTER_ESCALATION_TIER2_ENABLED.

  

auto/last-attempt-tier-min

In-cycle escalation: most recent attempt ran at the Tier -1 slot (`tier-min`). Slot's model defined in .opencode/models/tiers.yaml. Suffix is ``-min`` (not ``--1``) so the Forgejo UI reads naturally.

  

Automation Tracking

Tracking issues used by the AI Automation system for agents to communicate and report.

  

auto/needs-conflict-resolution

Rebase conflict needs LLM conflict-resolver.

  

auto/needs-implementer

Failing CI needs implementer attention.

  

auto/postmortem

Documenting a driver incident or rollback.

  

auto/ready-to-merge

Reviewer has APPROVED this PR and no later REQUEST_CHANGES is outstanding. The merge driver requires this label to even consider a PR for merging. Set by the reviewer worker on APPROVE; cleared on REQUEST_CHANGES.

  

auto/restart-throttled

Train repeatedly lost master-tempo races. Driver excludes via merge_cycle until cooldown elapses; label persists as visible history.

  

auto/revert

Revert PR backing out an invariant violation. Fast-tracked through the merge driver.

  

auto/sentinel

Sentinel PR duplicated from upstream into a personal fork by tools/duplicate_prs_to_fork.py for pipeline testing. Lives only in the fork; the canonical pipeline never sees it.

  

auto/stale-inactivity

No implementer activity for N days. Flagged for human review. Auto-cleared on next push to head branch.

  

auto/unstable

Repeatedly fails on current master (>= 3 ci-fail-on-rebased-sha releases in 12 h). Excluded from driver until human triage.

  

Blocked

A ticket in a blocked state and unable to complete until some other task is completed first.

  

Bounty

$100

A bounty of $100 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$1000

A bounty of $1000 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$10000

A bounty of $10000 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$20

A bounty of $20 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$2000

A bounty of $2000 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$250

A bounty of $250 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$50

A bounty of $50 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$500

A bounty of $500 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$5000

A bounty of $5000 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$750

A bounty of $750 for any open-source contributor who provides a MR that solves this issue

  

MoSCoW

Could have

Could have feature in order to satisfy the epic/legendary.

  

MoSCoW

Must have

Must have feature in order to satisfy the epic/legendary.

  

MoSCoW

Should have

Should have feature in order to satisfy the epic/legendary.

  

Needs Feedback

There are questions in the ticket that can not be completed until the project owner provides clarity.

  

Points

1

1 man-hours worth of work for an expert with no learning curve.

  

Points

13

13 man-hours worth of work for an expert with no learning curve.

  

Points

2

2 man-hours worth of work for an expert with no learning curve.

  

Points

21

21 man-hours worth of work for an expert with no learning curve.

  

Points

3

3 man-hours worth of work for an expert with no learning curve.

  

Points

34

34 man-hours worth of work for an expert with no learning curve.

  

Points

5

5 man-hours worth of work for an expert with no learning curve.

  

Points

55

55 man-hours worth of work for an expert with no learning curve.

  

Points

8

8 man-hours worth of work for an expert with no learning curve.

  

Points

88

88 man-hours worth of work for an expert with no learning curve.

  

Priority

Backlog

This ticket has backlogged priority and is not to be worked on yet

  

Priority

CI Blocker

Critical priority issue that blocks CI/CD pipeline and prevents PR merges

  

Priority

Critical

The priority is critical

  

Priority

High

The priority is high

  

Priority

Low

The priority is low

  

Priority

Medium

The priority is medium

  

Signed-off: Owner

When an epic or legendary is in review it must be signed off by owner, tech lead, and scrum master before being marked as completed.

  

Signed-off: Scrum Master

When an epic or legendary is in review it must be signed off by owner, tech lead, and scrum master before being marked as completed.

  

Signed-off: Tech Lead

When an epic or legendary is in review it must be signed off by owner, tech lead, and scrum master before being marked as completed.

  

Spike

A ticket for learning a tool or technology that is needed to be able to do future planning and design.

  

State

Completed

The ticket has been fully implemented, completed, and merged with the source code. This label should only be applied once a ticket is closed.

  

State

Duplicate

A ticket that represents the same content as an existing ticket.

  

State

In Progress

A ticket that is actively being developed.

  

State

In Review

A ticket that has had some code completed to implement but is waiting to pass peer review and is not yet merged in.

  

State

Paused

This ticket's work started but wasn't finished. It's on hold (likely in a feature branch) and will be resumed later, either due to a blocker or a delay.

  

State

Unverified

All new tickets start in this state. A developer may set it to show the ticket is unverified. This means we haven't agreed to work on it. It will either move to a verified state or be closed as wontdo.

  

State

Verified

The issue has been verified by a developer as legitimate. It will be worked on and verified tickets are now considered part of the backlog.

  

State

Wont Do

This ticket has been decided it wont be done. This may mean the bug has been determined to not be real (cant verify) or the feature is one we have decided we dont want to adopt.

  

Type

Automation

Any edits or discussion about the AI automated coding system.

  

Type

Bug

Something that doesnt work as intended.

  

Type

Discussion

Anytime a ticket represents a discussion about a subject and doesnt fall into one of the other categories.

  

Type

Documentation

An error or improvement needed in the documentation.

  

Type

Epic

Any first tier epic. That is, an epic which contains only issues as children and will not have sub-epics.

  

Type

Feature

Some new functionality not present.

  

Type

Legendary

A type of Epic which will contain other Epics.

  

Type

Refactor

A code change that restructures existing code without changing its external behavior.

  

Type

Support

Someone needs help using the project.

  

Type

Task

A generic task that doesnt fit into the other type categories.

  

Type

Testing

Work exclusively focusing on fixing or expanding testing.

No labels

auto/needs-reevaluation

controller-managed

auto/blocked-by-deps

auto/ci-timeout

auto/claimed-implementer

auto/claimed-merge

auto/claimed-reviewer

auto/driver-down

auto/invariant-violation

auto/last-attempt-tier-0

auto/last-attempt-tier-1

auto/last-attempt-tier-2

auto/last-attempt-tier-min

Automation Tracking

auto/needs-conflict-resolution

auto/needs-implementer

auto/postmortem

auto/ready-to-merge

auto/restart-throttled

auto/revert

auto/sentinel

auto/stale-inactivity

auto/unstable

Blocked

Bounty

$100

Bounty

$1000

Bounty

$10000

Bounty

$20

Bounty

$2000

Bounty

$250

Bounty

$50

Bounty

$500

Bounty

$5000

Bounty

$750

MoSCoW

Could have

MoSCoW

Must have

MoSCoW

Should have

Needs Feedback

Points

1

Points

13

Points

2

Points

21

Points

3

Points

34

Points

5

Points

55

Points

8

Points

88

Priority

Backlog

Priority

CI Blocker

Priority

Critical

Priority

High

Priority

Low

Priority

Medium

Signed-off: Owner

Signed-off: Scrum Master

Signed-off: Tech Lead

Spike

State

Completed

State

Duplicate

State

In Progress

State

In Review

State

Paused

State

Unverified

State

Verified

State

Wont Do

Type

Automation

Type

Bug

Type

Discussion

Type

Documentation

Type

Epic

Type

Feature

Type

Legendary

Type

Refactor

Type

Support

Type

Task

Type

Testing

Milestone

Clear milestone

No items

No milestone

v3.5.0

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

cleveragents/cleveragents-core!445

No description provided.