Skip to content

fix(shim): disambiguate claim tool from item(action=claim) in denial messages - #385

Merged
getappz merged 1 commit into
masterfrom
task/424
Aug 4, 2026
Merged

fix(shim): disambiguate claim tool from item(action=claim) in denial messages#385
getappz merged 1 commit into
masterfrom
task/424

Conversation

@getappz

@getappz getappz commented Aug 4, 2026

Copy link
Copy Markdown
Owner

Auto-opened on item done for 9GKcV18rG8FdKWjc1eCVx.

Summary by CodeRabbit

  • Documentation
    • Clarified that standalone claims provide path-scoped locks only and do not create worktrees, branches, or directories.
    • Updated guidance to use the item claim workflow when an isolated worktree is needed.
    • Improved protected-branch and worktree denial messages with clearer next steps.

…ry denial message

Three independent vents reported the same failure: mcp__flare__claim
(a path-scoped write lock for the scope-check, nothing more) and
item(action=claim) (the one that actually provisions a worktree) share
the word claim, so agents called the wrong one, got a scope lock with
no worktree, then hit the git shim's worktree-add denial pointing back
at a blocked command -- one report says this forced a full fallback to
branch-only isolation for an 8-task plan.

- claim's own tool description now says up front it does not provision
  a worktree and names item(action=claim) as the one that does
- the worktree-add and protected-branch-checkout denials now name
  item(action=claim) directly instead of the ambiguous 'claim flow'
- the scope-check's OutOfTree denial (you hold a claim but aren't in
  its worktree) now explains why -- the claim was likely acquired
  through the standalone tool -- instead of pointing at git worktree
  add, which is itself blocked
@coderabbitai

coderabbitai Bot commented Aug 4, 2026

Copy link
Copy Markdown

Review Change Stack

📝 Walkthrough

Walkthrough

The changes update Git denial messages and MCP claim tool descriptions. They distinguish path-scoped locks from worktree provisioning and direct worktree claims to item(action="claim").

Changes

Claim and worktree guidance

Layer / File(s) Summary
Git denial guidance
crates/flare-git-core/src/classify.rs, src/cli/git.rs
Git denial messages now explain that standalone claims do not provision worktrees and direct users to the item claim workflow.
Claim tool descriptions
src/mcp_server.rs, src/mcp_server/builtin_tools.rs
MCP claim descriptions now document path-scoped locks, supported actions, and worktree provisioning through item(action="claim").

Estimated code review effort: 1 (Trivial) | ~5 minutes

Possibly related PRs

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Description check ⚠️ Warning The description contains only an automation note and omits the required summary, test plan, and reviewer notes. Add the required Summary, Test plan, and Notes for reviewers sections with relevant details and test results.
✅ Passed checks (4 passed)
Check name Status Explanation
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.
Title check ✅ Passed The title clearly identifies the main change: separating the standalone claim tool from item(action=claim) in denial messages.
✨ Finishing Touches 💡 1
🛠️ Fix failing CI checks 💡
  • Create stacked PR
  • Commit on current branch
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch task/424

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

@getappz getappz changed the title Fix claim-tool naming collision: mcp__flare__claim vs item(action=claim) fix(shim): disambiguate claim tool from item(action=claim) in denial messages Aug 4, 2026
@getappz
getappz merged commit d1f4607 into master Aug 4, 2026
16 of 18 checks passed
@getappz
getappz deleted the task/424 branch August 4, 2026 07:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant