Skip to content

fix(item): surface a real diagnostic when claim's worktree resolution returns None #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
getappz merged 1 commit into from
Aug 22, 2026
Merged

fix(item): surface a real diagnostic when claim's worktree resolution returns None #586

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/mcp_server/item.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,15 @@ impl AgentflareMcp {
Some(Err(e)) => {
resp["worktree_error"] = serde_json::Value::String(e);
}
None => {}
// Only reachable when `item::get` fails to read the item
// back right after this same claim acquired it —
// `resolve_target_branch` is infallible, so this arm
// isn't reached for any other reason.
None => {
resp["worktree_error"] = serde_json::Value::String(
"item record could not be read back after claim".to_string(),
);
}
}
// Non-fatal like `worktree_error` above -- work can still
// proceed against the worktree's prior (unrebased) base
Expand Down
Loading