[getappz]

Fixes item #37 (flagged by CodeRabbit reviewing PR #179): item::claim_done released the claim lease and moved the item to completed in one transaction; push_and_open_pr then ran after that transaction committed, outside the backend DB lock. In the window between release and the push/PR finishing, another agent could claim() the same now-completed item, silently reassigning item.assignee_agent mid-flight.

Fix

Split item::claim_done into item::mark_completed (state transition only — verifies the caller still holds the claim, does not touch the ledger) plus a deferred claim::done call in the done MCP arm that only runs after push_and_open_pr has been attempted (success or soft-fail, it never blocks). The lease stays held for the entire publish window, so a concurrent claim() correctly returns Held instead of Acquired.

Added ClaimLedger::is_owner (checks current ownership without mutating the claim row) to support the split.

Tests

• mark_completed_moves_to_completed_state_and_a_later_release_makes_it_reclaimable — proves a concurrent claim is rejected (Held) while the lease is still held post-mark_completed, and only becomes Acquired after the lease is actually released
• mark_completed_is_a_noop_when_owner_does_not_hold_the_claim
• Updated heartbeat_release_done_are_owner_scoped for the new split call sequence

432/432 tests pass, clippy clean (-D warnings -A unsafe_code -A clippy::pedantic), fmt clean.

Summary by CodeRabbit

• New Features
  • Added ownership checks when marking items as completed.
  • Items can now transition to the completed state without releasing their claim lease immediately.
  • The “done” workflow refreshes the claim lease before the pull request workflow, and releases afterward.
• Bug Fixes
  • Non-owners can no longer complete or release another owner’s claimed item.
  • Prevented concurrent claims from succeeding while completion is in progress, ensuring correct reclaim behavior after completion is finalized.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 416ae18c-ca24-48da-847d-0ce956fa0b22

📥 Commits

Reviewing files that changed from the base of the PR and between 4ae22c3 and ba8055e.

📒 Files selected for processing (1)

• src/mcp_server.rs

🚧 Files skipped from review as they are similar to previous changes (1)

• src/mcp_server.rs

---

📝 Walkthrough

Walkthrough

The PR adds claim ownership checks, replaces claim_done with mark_completed, preserves the lease during completion, and defers lease release in the MCP done flow until after PR handling.

Changes

Completion and claim lease flow

Layer / File(s)	Summary
Claim ownership lookup crates/agentflare-db-kit/src/claim.rs, crates/agentflare-backend/src/claim.rs	Adds ledger and backend helpers that determine whether an owner holds an item claim.
Owned completion without lease release crates/agentflare-backend/src/item.rs	Adds mark_completed, which transitions an owned item to completed while retaining the claim, with tests covering ownership and later release.
Deferred MCP lease release src/mcp_server.rs	The done action completes the item, refreshes the lease, handles PR publication, and releases the claim afterward.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Possibly related PRs

• getappz/agentflare#141: Introduces the owner-scoped claim ledger lifecycle used by this change.
• getappz/agentflare#165: Adds the claim, heartbeat, release, and done infrastructure used by the completion flow.
• getappz/agentflare#179: Refactors MCP done handling around PR creation and database locking.

Suggested labels: rust

Sequence Diagram(s)

sequenceDiagram
  participant MCP_item_tool
  participant mark_completed
  participant push_and_open_pr
  participant claim_done
  MCP_item_tool->>mark_completed: Mark item completed
  mark_completed-->>MCP_item_tool: Completion result
  MCP_item_tool->>push_and_open_pr: Push changes and open PR
  push_and_open_pr-->>MCP_item_tool: PR result
  MCP_item_tool->>claim_done: Release claim lease

Loading

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title is concise and accurately describes the main change: deferring claim release until after push_and_open_pr.
Description check	✅ Passed	The description clearly explains the change, rationale, and testing, though it doesn't fully follow the repo's template headings.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

✨ Finishing Touches

📝 Generate docstrings

• Create stacked PR
• Commit on current branch

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch task/37

---

_{Comment @coderabbitai help to get the list of available commands.}

[coderabbitai]

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)

src/mcp_server.rs (1)

2635-2675: 🩺 Stability & Availability | 🟠 Major | ⚡ Quick win

Keep the claim lease alive through publish, and surface release failures.

• push_and_open_pr can run long enough for the claim to expire before claim::done runs.
• claim::done(...) is discarded; log or handle false/errors so an owner mismatch or DB failure doesn't disappear.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@src/mcp_server.rs` around lines 2635 - 2675, The completion flow around
push_and_open_pr must refresh or otherwise keep the claim lease alive throughout
publishing, then surface any claim::done failure instead of discarding it.
Update the done-claim release block to handle both false results and database
errors with appropriate logging or propagation, preserving the existing owner
and timestamp semantics.

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Outside diff comments:
In `@src/mcp_server.rs`:
- Around line 2635-2675: The completion flow around push_and_open_pr must
refresh or otherwise keep the claim lease alive throughout publishing, then
surface any claim::done failure instead of discarding it. Update the done-claim
release block to handle both false results and database errors with appropriate
logging or propagation, preserving the existing owner and timestamp semantics.

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: a24fd575-3ea4-4abd-a393-c12d27c940b0

📥 Commits

Reviewing files that changed from the base of the PR and between 184a560 and 4ae22c3.

📒 Files selected for processing (4)

• crates/agentflare-backend/src/claim.rs
• crates/agentflare-backend/src/item.rs
• crates/agentflare-db-kit/src/claim.rs
• src/mcp_server.rs