fix: move own tasks with changes requested back to In Progress

Author: vinimcorrea

README.md

@@ -36,7 +36,7 @@ Your PR sits in **In Review** for two days because nobody noticed it. A teammate
 - 👤 **Mine**: your tasks grouped by status (In Progress, In Review, Reviewed), each with its linked PRs. *User Stories* that have sub-issues are hidden: you follow them through their sub-issues.
 - 🗂️ **Your layout**: click a section header to fold it, and drag headers to put the status you care about first (or right-click → *Move Up* / *Move Down*).
 - 👀 **Reviewing**: the tasks you are reviewing for teammates, split into *Your turn* and *Waiting on the author*, with a notification when a re-review is requested.
-- 🚚 **Moves the card for you**: approve and the card goes to the next status (e.g. *Reviewed*); request changes and it goes back to *In Progress* and you're unassigned. Toggle it with *Move Cards After My Review*. When all the PRs of one of your own tasks are merged, it goes to *Ready to Verify* from whatever earlier column it is in (*Move My Merged Tasks to Ready to Verify*). The same goes for a *User Story* split into sub-issues: once all its sub-issues are closed or in *Ready to Verify* (or later), the story moves to *Ready to Verify* too.
+- 🚚 **Moves the card for you**: approve and the card goes to the next status (e.g. *Reviewed*); request changes and it goes back to *In Progress* and you're unassigned. Your own tasks follow the same rule: when a reviewer requests changes, the card goes back to *In Progress*, even if it was moved to *Reviewed* (that column is only for approved work). Toggle it with *Move Cards After My Review*. When all the PRs of one of your own tasks are merged, it goes to *Ready to Verify* from whatever earlier column it is in (*Move My Merged Tasks to Ready to Verify*). The same goes for a *User Story* split into sub-issues: once all its sub-issues are closed or in *Ready to Verify* (or later), the story moves to *Ready to Verify* too.
 - 🔍 **Review state at a glance**: *awaiting review*, *being reviewed*, *changes requested*, *approved*, *merged*, plus the reviewers and CI status (✅ ❌ ⏳).
 - 🙋 **Needs reviewer**: teammates' tasks in review with no second assignee, and an **Assign me** button that adds you as the reviewer without opening GitHub (the task then moves to *Reviewing*).
 - 🔁 **Re-request review**: when your PR has *changes requested* and you've pushed the fixes, the card shows a **Re-request review** button (also in the right-click menu). It asks those reviewers to look again, moves the card back to the review status and re-assigns them if they were unassigned.

Sources/GitHubFloat/Model.swift

@@ -714,6 +714,34 @@ final class Store: ObservableObject {
         statusOptions.first { $0.name.caseInsensitiveCompare(name) == .orderedSame }
     }
 
+    /// Your own task with changes requested goes back to In Progress (Reviewed is only for approved work),
+    /// even if it sits in the review status or was moved to Reviewed by hand. Handled once per review.
+    private func applyChangesRequested(_ tasks: [BoardTask]) {
+        guard settings.autoMove, let board, let target = option(named: "In Progress"), let targetId = target.id else { return }
+        for t in tasks where [settings.reviewStatus, statusAfterReview].contains(t.status) {
+            let requests = t.prs.filter { $0.stage == .changesRequested }.flatMap(\.reviewers).filter { $0.state == "CHANGES_REQUESTED" }
+            guard let latest = requests.max(by: { ($0.submittedAt ?? .distantPast) < ($1.submittedAt ?? .distantPast) }) else { continue }
+            let key = "changes:\(t.id)@\(latest.submittedAt?.timeIntervalSince1970 ?? 0)"
+            guard !handledVerdicts.contains(key) else { continue }
+            handledVerdicts.insert(key)
+            Task { [weak self] in
+                guard let self else { return }
+                do {
+                    try await client.setStatus(projectId: board.projectId, itemId: t.id, fieldId: board.statusFieldId, optionId: targetId)
+                    if settings.notifications {
+                        Notifier.shared.post(.init(title: "Changes requested · \(t.repo.map { "\($0)#\(t.number ?? 0)" } ?? "Draft")",
+                                                   body: "\(t.title)\nMoved back to \(target.name)",
+                                                   url: t.prs.first?.url ?? t.url, id: "changes-\(t.id)", kind: .info), sound: false)
+                    }
+                } catch {
+                    handledVerdicts.remove(key)
+                    self.error = "Could not move \(t.title): \(error.localizedDescription)"
+                }
+                await self.refresh()
+            }
+        }
+    }
+
     /// Moves cards you just reviewed: approved -> the status after review, changes requested -> In Progress + unassign you.
     /// Only reviews submitted after the card entered the review status count, so older verdicts never move cards back.
     private func applyVerdicts(_ tasks: [BoardTask], viewer: String) {
@@ -767,6 +795,7 @@ final class Store: ObservableObject {
         let shown = settings.shownStatuses
         let assigned = shown.isEmpty ? fetched : fetched.filter { shown.contains($0.status) }
         applyVerdicts(assigned.filter { $0.isReviewing(by: snap.viewer) }, viewer: snap.viewer)
+        applyChangesRequested(assigned.filter { !$0.isReviewing(by: snap.viewer) })
         let newMine = assigned.filter { !$0.isReviewing(by: snap.viewer) && (settings.statuses.isEmpty || settings.statuses.contains($0.status)) }
         // Reviewing = others' work assigned to you, until you approve / request changes or its PRs are merged or closed.
         let newReviewing = assigned

Sources/GitHubFloat/main.swift

@@ -811,7 +811,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate, NSWind
 
         let autoMove = item("Move Cards After My Review", #selector(toggleAutoMove), key: "")
         autoMove.state = settings.autoMove ? .on : .off
-        autoMove.toolTip = "Approve → next status after review. Request changes → In Progress and you're unassigned."
+        autoMove.toolTip = "Approve → next status after review. Request changes → In Progress and you're unassigned. Your own tasks with changes requested also go back to In Progress."
         menu.addItem(autoMove)
         let autoMerged = item("Move My Merged Tasks to \(settings.mergedStatus)", #selector(toggleAutoMoveMerged), key: "")
         autoMerged.state = settings.autoMoveMerged ? .on : .off