feat(resource): implement ResourceHandler sandbox and checkpoint methods #1067

Merged

hamza.khyari merged 1 commit from feature/resource-handler-sandbox into master 2026-03-27 11:08:54 +00:00

Conversation 2 Commits 1 Files changed 12 +1149 -10

hamza.khyari commented 2026-03-19 04:16:54 +00:00

Member

Copy link

Summary

• Extend the ResourceHandler protocol with four sandbox/lifecycle methods: create_sandbox, create_checkpoint, rollback_to, and project_access
• Add frozen dataclass result types (SandboxResult, CheckpointResult, RollbackResult, AccessResult) to the handler protocol
• Implement checkpoint/rollback for GitCheckoutHandler (git tag / git checkout) and FsDirectoryHandler (shutil.copytree snapshot / clear-and-restore)
• Default create_sandbox delegates to SandboxManager (idempotent — returns existing sandbox on second call)
• Default project_access delegates to PermissionService (local mode = always permit)
• 8 Behave scenarios + 2 Robot integration tests covering the full checkpoint -> modify -> rollback cycle

Details

Protocol Extension (protocol.py)

• SandboxResult — sandbox_id, sandbox_path, strategy, created (idempotency flag), message
• CheckpointResult — checkpoint_id, plan_id, timestamp, snapshot_path, message
• RollbackResult — success, checkpoint_id, restored_files, message
• AccessResult — permitted, principal, action, scope, reason

Base Handler (_base.py)

• create_sandbox(): delegates to SandboxManager.get_or_create_sandbox(), checks for existing sandbox first (idempotent)
• project_access(): delegates to PermissionService.check_permission(), falls back to local-mode permit
• create_checkpoint() / rollback_to(): raise NotImplementedError (subclasses override)
• _resolve_strategy_str() helper extracted for DRY strategy resolution

Handler Implementations

• GitCheckoutHandler: create_checkpoint via git tag checkpoint-{plan_id}-{timestamp}, rollback_to via git checkout {tag} -- . with restored file count from git diff --name-only
• FsDirectoryHandler: create_checkpoint via shutil.copytree to temp snapshot dir, rollback_to via clear sandbox + copy snapshot back. In-process _checkpoints ClassVar store.
• DatabaseResourceHandler: inherits NotImplementedError stubs (no savepoint infrastructure exists)

Tests

• 8 Behave scenarios: sandbox creation (+ idempotency), checkpoint/rollback cycle for FsDirectory and GitCheckout, project_access in local mode, NotImplementedError defaults for Database handler
• 2 Robot integration tests: full checkpoint -> modify -> rollback cycle on real temp directories and git repos

ISSUES CLOSED: #836

## Summary - Extend the `ResourceHandler` protocol with four sandbox/lifecycle methods: `create_sandbox`, `create_checkpoint`, `rollback_to`, and `project_access` - Add frozen dataclass result types (`SandboxResult`, `CheckpointResult`, `RollbackResult`, `AccessResult`) to the handler protocol - Implement checkpoint/rollback for `GitCheckoutHandler` (git tag / git checkout) and `FsDirectoryHandler` (shutil.copytree snapshot / clear-and-restore) - Default `create_sandbox` delegates to `SandboxManager` (idempotent — returns existing sandbox on second call) - Default `project_access` delegates to `PermissionService` (local mode = always permit) - 8 Behave scenarios + 2 Robot integration tests covering the full checkpoint -> modify -> rollback cycle ## Details ### Protocol Extension (`protocol.py`) - `SandboxResult` — `sandbox_id`, `sandbox_path`, `strategy`, `created` (idempotency flag), `message` - `CheckpointResult` — `checkpoint_id`, `plan_id`, `timestamp`, `snapshot_path`, `message` - `RollbackResult` — `success`, `checkpoint_id`, `restored_files`, `message` - `AccessResult` — `permitted`, `principal`, `action`, `scope`, `reason` ### Base Handler (`_base.py`) - `create_sandbox()`: delegates to `SandboxManager.get_or_create_sandbox()`, checks for existing sandbox first (idempotent) - `project_access()`: delegates to `PermissionService.check_permission()`, falls back to local-mode permit - `create_checkpoint()` / `rollback_to()`: raise `NotImplementedError` (subclasses override) - `_resolve_strategy_str()` helper extracted for DRY strategy resolution ### Handler Implementations - **GitCheckoutHandler**: `create_checkpoint` via `git tag checkpoint-{plan_id}-{timestamp}`, `rollback_to` via `git checkout {tag} -- .` with restored file count from `git diff --name-only` - **FsDirectoryHandler**: `create_checkpoint` via `shutil.copytree` to temp snapshot dir, `rollback_to` via clear sandbox + copy snapshot back. In-process `_checkpoints` ClassVar store. - **DatabaseResourceHandler**: inherits `NotImplementedError` stubs (no savepoint infrastructure exists) ### Tests - 8 Behave scenarios: sandbox creation (+ idempotency), checkpoint/rollback cycle for FsDirectory and GitCheckout, project_access in local mode, NotImplementedError defaults for Database handler - 2 Robot integration tests: full checkpoint -> modify -> rollback cycle on real temp directories and git repos ISSUES CLOSED: #836

hamza.khyari added the

State

In Review

Type

Feature

Priority

Backlog

Spike

labels 2026-03-19 04:17:06 +00:00

hamza.khyari added this to the v3.6.0 milestone 2026-03-19 04:17:07 +00:00

hamza.khyari added

Priority

Low

MoSCoW

Could have

and removed

Priority

Backlog

Spike

labels 2026-03-19 04:17:24 +00:00

freemo requested reviews from freemo, CoreRasurae 2026-03-19 05:20:21 +00:00

hamza.khyari self-assigned this 2026-03-19 12:54:47 +00:00

freemo commented 2026-03-23 03:42:16 +00:00

Owner

Copy link

Day 43 Review — Rebase Required

This PR has merge conflicts with master and cannot be merged in its current state. This is one of 9 Hamza PRs in the resource/LSP domain (v3.5.0-v3.6.0) that all have conflicts. These PRs likely share a common dependency chain and should be rebased sequentially.

@hamza.khyari: Please rebase onto current master. If multiple PRs depend on each other, start with the base PR in the chain and work upward.

Rebase priority: HIGH — these PRs represent significant feature work that is blocked by merge conflicts. Every day they remain conflicted is a day they cannot be reviewed or merged.

**Day 43 Review — Rebase Required** This PR has merge conflicts with `master` and cannot be merged in its current state. This is one of 9 Hamza PRs in the resource/LSP domain (v3.5.0-v3.6.0) that all have conflicts. These PRs likely share a common dependency chain and should be rebased sequentially. @hamza.khyari: Please rebase onto current `master`. If multiple PRs depend on each other, start with the base PR in the chain and work upward. **Rebase priority**: HIGH — these PRs represent significant feature work that is blocked by merge conflicts. Every day they remain conflicted is a day they cannot be reviewed or merged.

freemo approved these changes 2026-03-24 15:29:25 +00:00

Dismissed

freemo left a comment

Copy link

Review: APPROVED

ResourceHandler sandbox and checkpoint methods implementation. Feature follows project conventions.

## Review: APPROVED ResourceHandler sandbox and checkpoint methods implementation. Feature follows project conventions.

hamza.khyari force-pushed feature/resource-handler-sandbox from e9ed73d148 to f8f85b1bc3 2026-03-25 12:10:01 +00:00 Compare

hamza.khyari dismissed freemo's review 2026-03-25 12:10:01 +00:00

Reason:

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

hamza.khyari removed the

MoSCoW

Could have

Priority

Low

labels 2026-03-25 12:10:15 +00:00

hamza.khyari force-pushed feature/resource-handler-sandbox from f8f85b1bc3 to c7518a265e 2026-03-25 12:25:15 +00:00 Compare

hamza.khyari force-pushed feature/resource-handler-sandbox from c7518a265e to 8b1a2add0d 2026-03-26 12:03:00 +00:00 Compare

hamza.khyari force-pushed feature/resource-handler-sandbox from 8b1a2add0d to 7bb77aee5c 2026-03-27 10:50:18 +00:00 Compare

hamza.khyari merged commit 83f671f9ec into master 2026-03-27 11:08:54 +00:00

hamza.khyari referenced this pull request from a commit 2026-03-27 11:08:54 +00:00

Merge pull request 'feat(resource): implement ResourceHandler sandbox and checkpoint methods' (#1067) from feature/resource-handler-sandbox into master

hamza.khyari deleted branch feature/resource-handler-sandbox 2026-03-27 11:09:13 +00:00

hamza.khyari referenced this pull request 2026-04-08 12:59:23 +00:00

feat(plan): implement spec-aligned git worktree apply with merge, summary, and cleanup #4454

HAL9000 referenced this pull request 2026-04-08 17:37:22 +00:00

Proposal: update specification — ResourceHandler protocol signatures and result types #4616

Sign in to join this conversation.

Reviewers

No reviewers

CoreRasurae

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.6.0

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

hamza.khyari

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!1067

No description provided.