johno/gastown
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(witness): run convoy check regardless of cleanup status

Browse Source 
Move convoy check to run after verifyCommitOnMain succeeds, before the
cleanup_status switch. This ensures convoys can close when tracked work
is merged, even if polecat cleanup is blocked (has_uncommitted, etc.).

Previously the convoy check only ran after successful nuke, meaning
blocked polecats would prevent convoy completion detection.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
furiosa
2026-01-21 10:16:27 -08:00
committed by John Ogle
parent fd39b99f0e
commit 76c652337d
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
internal/witness/handlers.go
View File

@@ -247,6 +247,17 @@ func HandleMerged(workDir, rigName string, msg *mail.Message) *HandlerResult {
return result
}
// Redundant convoy observer: check if completed issue is tracked by a convoy.
// Run this after verifyCommitOnMain succeeds, regardless of cleanup status.
// The work is confirmed merged at this point, so convoys tracking this issue
// can potentially close even if polecat cleanup is blocked.
if onMain && payload.IssueID != "" {
townRoot, _ := workspace.Find(workDir)
if townRoot != "" {
convoy.CheckConvoysForIssue(townRoot, payload.IssueID, "witness", nil)
}
}
// ZFC #10: Check cleanup_status before allowing nuke
// This prevents work loss when MERGED signal arrives for stale MRs or
// when polecat has new unpushed work since the MR was created.
@@ -265,14 +276,6 @@ func HandleMerged(workDir, rigName string, msg *mail.Message) *HandlerResult {
result.Handled = true
result.WispCreated = wispID
result.Action = fmt.Sprintf("auto-nuked %s (cleanup_status=clean, wisp=%s)", payload.PolecatName, wispID)
// Redundant convoy observer: check if completed issue is tracked by a convoy
if payload.IssueID != "" {
townRoot, _ := workspace.Find(workDir)
if townRoot != "" {
convoy.CheckConvoysForIssue(townRoot, payload.IssueID, "witness", nil)
}
}
}
case "has_uncommitted":
@@ -308,14 +311,6 @@ func HandleMerged(workDir, rigName string, msg *mail.Message) *HandlerResult {
result.Handled = true
result.WispCreated = wispID
result.Action = fmt.Sprintf("auto-nuked %s (commit on main, cleanup_status=%s, wisp=%s)", payload.PolecatName, cleanupStatus, wispID)
// Redundant convoy observer: check if completed issue is tracked by a convoy
if payload.IssueID != "" {
townRoot, _ := workspace.Find(workDir)
if townRoot != "" {
convoy.CheckConvoysForIssue(townRoot, payload.IssueID, "witness", nil)
}
}
}
}