Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions .changeset/fix-kanban-merge-button.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
"@aoagents/ao-web": patch
---

fix: pass onMerge callback to AttentionZone in kanban view and parse merge error responses

The merge button on kanban session cards was a no-op because `onMerge` was not passed
to the `AttentionZone` component. The optional chain `onMerge?.()` silently did nothing.
Also improved the error toast to show human-readable blocker messages instead of raw JSON.
14 changes: 13 additions & 1 deletion packages/web/src/components/Dashboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,18 @@ function DashboardInner({
if (!res.ok) {
const text = await res.text();
console.error(`Failed to merge PR #${prNumber}:`, text);
showToast(`Merge failed: ${text}`, "error");
let message = "Merge failed";
try {
const body = JSON.parse(text);
if (body.blockers?.length) {
message = `Merge blocked: ${body.blockers.join(", ")}`;
} else if (body.error) {
message = body.error;
}
} catch {
message = text || message;
}
showToast(message, "error");
return;
} else {
showToast(`PR #${prNumber} merged`, "success");
Expand Down Expand Up @@ -721,6 +732,7 @@ function DashboardInner({
level={level}
sessions={grouped[level]}
onKill={handleKill}
onMerge={handleMerge}
onRestore={handleRestore}
compactMobile={isMobile}
collapsed={isMobile && collapsedZones.has(level)}
Expand Down