feat: Add field-name sorting to aggregate views

Aggregate views can now sort by the grouping field in addition to Count and Amount:
- Merchant view: Merchant → Count → Amount → Merchant
- Category view: Category → Count → Amount → Category
- Group view: Group → Count → Amount → Group
- Account view: Account → Count → Amount → Account

Also added:
- Current category display in recategorize modal (consistency with merchant edit)
- SortMode.GROUP enum value
- Simplified sort cycling logic using view-to-field mapping

Tests:
- Updated 5 existing tests to match new 3-field cycle
- Added test for field sort preservation
- All 653 tests pass

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: wesm

moneyflow/app_controller.py

@@ -212,8 +212,15 @@ def _prepare_aggregate_view(self, view_mode: ViewMode):
 
         # Apply sorting
         sort_col = self.state.sort_by.value
+
+        # Map sort field to actual column name in aggregation DataFrame
         if sort_col == "amount":
             sort_col = "total"  # Aggregations use "total" not "amount"
+        elif sort_col in ["merchant", "category", "group", "account"]:
+            # Use the grouping field name (e.g., "merchant" column in merchant aggregation)
+            sort_col = field_name
+        # else: "count" stays as "count"
+
         descending = ViewPresenter.should_sort_descending(sort_col, self.state.sort_direction)
         if not agg.is_empty():
             agg = agg.sort(sort_col, descending=descending)
@@ -231,8 +238,8 @@ def switch_to_merchant_view(self):
         self.state.selected_category = None
         self.state.selected_group = None
         self.state.selected_account = None
-        # Reset sort to valid field for aggregate views
-        if self.state.sort_by not in [SortMode.COUNT, SortMode.AMOUNT]:
+        # Reset sort to valid field for aggregate views (now includes field name)
+        if self.state.sort_by not in [SortMode.MERCHANT, SortMode.COUNT, SortMode.AMOUNT]:
             self.state.sort_by = SortMode.AMOUNT
         self.refresh_view()
 
@@ -243,7 +250,7 @@ def switch_to_category_view(self):
         self.state.selected_category = None
         self.state.selected_group = None
         self.state.selected_account = None
-        if self.state.sort_by not in [SortMode.COUNT, SortMode.AMOUNT]:
+        if self.state.sort_by not in [SortMode.CATEGORY, SortMode.COUNT, SortMode.AMOUNT]:
             self.state.sort_by = SortMode.AMOUNT
         self.refresh_view()
 
@@ -254,7 +261,7 @@ def switch_to_group_view(self):
         self.state.selected_category = None
         self.state.selected_group = None
         self.state.selected_account = None
-        if self.state.sort_by not in [SortMode.COUNT, SortMode.AMOUNT]:
+        if self.state.sort_by not in [SortMode.GROUP, SortMode.COUNT, SortMode.AMOUNT]:
             self.state.sort_by = SortMode.AMOUNT
         self.refresh_view()
 
@@ -265,7 +272,7 @@ def switch_to_account_view(self):
         self.state.selected_category = None
         self.state.selected_group = None
         self.state.selected_account = None
-        if self.state.sort_by not in [SortMode.COUNT, SortMode.AMOUNT]:
+        if self.state.sort_by not in [SortMode.ACCOUNT, SortMode.COUNT, SortMode.AMOUNT]:
             self.state.sort_by = SortMode.AMOUNT
         self.refresh_view()
 
@@ -544,8 +551,9 @@ def get_next_sort_field(
         Detail view cycles through 5 fields:
             Date → Merchant → Category → Account → Amount → Date (loop)
 
-        Aggregate views toggle between 2 fields:
-            Count ↔ Amount
+        Aggregate views cycle through 3 fields:
+            Name → Count → Amount → Name (loop)
+            where Name is the grouping field (Merchant/Category/Group/Account)
         """
         if view_mode == ViewMode.DETAIL:
             # 5-field cycle for transaction detail view
@@ -560,11 +568,26 @@ def get_next_sort_field(
             else:  # AMOUNT or anything else
                 return (SortMode.DATE, "Date")
         else:
-            # Aggregate views toggle between count and amount
-            if current_sort == SortMode.COUNT:
+            # Aggregate views cycle: Field name → Count → Amount → Field name
+            # Map view mode to its field SortMode
+            view_to_field_sort = {
+                ViewMode.MERCHANT: (SortMode.MERCHANT, "Merchant"),
+                ViewMode.CATEGORY: (SortMode.CATEGORY, "Category"),
+                ViewMode.GROUP: (SortMode.GROUP, "Group"),
+                ViewMode.ACCOUNT: (SortMode.ACCOUNT, "Account"),
+            }
+
+            field_sort, field_name = view_to_field_sort.get(
+                view_mode, (SortMode.COUNT, "Count")
+            )
+
+            # Cycle through: Field → Count → Amount → Field
+            if current_sort == field_sort:
+                return (SortMode.COUNT, "Count")
+            elif current_sort == SortMode.COUNT:
                 return (SortMode.AMOUNT, "Amount")
             else:
-                return (SortMode.COUNT, "Count")
+                return (field_sort, field_name)
 
     def _get_action_hints(self) -> str:
         """Get action hints text based on current view mode."""

moneyflow/state.py

@@ -33,6 +33,7 @@ class SortMode(Enum):
     DATE = "date"
     MERCHANT = "merchant"
     CATEGORY = "category"
+    GROUP = "group"
     ACCOUNT = "account"
 
 

tests/test_app_controller.py

@@ -753,47 +753,58 @@ async def test_detail_view_full_cycle(self, controller):
             assert current == expected_sort
             assert display == expected_display
 
-    async def test_merchant_view_count_to_amount(self, controller):
-        """Merchant view: Count → Amount."""
+    async def test_merchant_view_full_cycle(self, controller):
+        """Merchant view: Merchant → Count → Amount → Merchant (3-field cycle)."""
+        # Merchant → Count
+        new_sort, display = controller.get_next_sort_field(ViewMode.MERCHANT, SortMode.MERCHANT)
+        assert new_sort == SortMode.COUNT
+        assert display == "Count"
+
+        # Count → Amount
         new_sort, display = controller.get_next_sort_field(ViewMode.MERCHANT, SortMode.COUNT)
         assert new_sort == SortMode.AMOUNT
         assert display == "Amount"
 
-    async def test_merchant_view_amount_to_count(self, controller):
-        """Merchant view: Amount → Count (toggle back)."""
+        # Amount → Merchant (completes cycle)
         new_sort, display = controller.get_next_sort_field(ViewMode.MERCHANT, SortMode.AMOUNT)
+        assert new_sort == SortMode.MERCHANT
+        assert display == "Merchant"
+
+    async def test_category_view_full_cycle(self, controller):
+        """Category view: Category → Count → Amount → Category."""
+        new_sort, _ = controller.get_next_sort_field(ViewMode.CATEGORY, SortMode.CATEGORY)
         assert new_sort == SortMode.COUNT
-        assert display == "Count"
 
-    async def test_category_view_toggles_like_merchant(self, controller):
-        """Category view uses same toggle as merchant view."""
-        # Count → Amount
         new_sort, _ = controller.get_next_sort_field(ViewMode.CATEGORY, SortMode.COUNT)
         assert new_sort == SortMode.AMOUNT
 
-        # Amount → Count
-        new_sort, _ = controller.get_next_sort_field(ViewMode.CATEGORY, SortMode.AMOUNT)
+        new_sort, display = controller.get_next_sort_field(ViewMode.CATEGORY, SortMode.AMOUNT)
+        assert new_sort == SortMode.CATEGORY
+        assert display == "Category"
+
+    async def test_group_view_full_cycle(self, controller):
+        """Group view: Group → Count → Amount → Group."""
+        new_sort, _ = controller.get_next_sort_field(ViewMode.GROUP, SortMode.GROUP)
         assert new_sort == SortMode.COUNT
 
-    async def test_group_view_toggles_like_merchant(self, controller):
-        """Group view uses same toggle as merchant view."""
         new_sort, _ = controller.get_next_sort_field(ViewMode.GROUP, SortMode.COUNT)
         assert new_sort == SortMode.AMOUNT
 
-    async def test_account_view_toggles_like_merchant(self, controller):
-        """Account view uses same toggle as merchant view."""
+        new_sort, display = controller.get_next_sort_field(ViewMode.GROUP, SortMode.AMOUNT)
+        assert new_sort == SortMode.GROUP
+        assert display == "Group"
+
+    async def test_account_view_full_cycle(self, controller):
+        """Account view: Account → Count → Amount → Account."""
+        new_sort, _ = controller.get_next_sort_field(ViewMode.ACCOUNT, SortMode.ACCOUNT)
+        assert new_sort == SortMode.COUNT
+
         new_sort, _ = controller.get_next_sort_field(ViewMode.ACCOUNT, SortMode.COUNT)
         assert new_sort == SortMode.AMOUNT
 
-    async def test_aggregate_views_count_amount_bidirectional(self, controller):
-        """Aggregate views toggle bidirectionally between count and amount."""
-        for view_mode in [ViewMode.MERCHANT, ViewMode.CATEGORY, ViewMode.GROUP, ViewMode.ACCOUNT]:
-            # Count → Amount → Count (should get back to count)
-            sort1, _ = controller.get_next_sort_field(view_mode, SortMode.COUNT)
-            assert sort1 == SortMode.AMOUNT
-
-            sort2, _ = controller.get_next_sort_field(view_mode, sort1)
-            assert sort2 == SortMode.COUNT
+        new_sort, display = controller.get_next_sort_field(ViewMode.ACCOUNT, SortMode.AMOUNT)
+        assert new_sort == SortMode.ACCOUNT
+        assert display == "Account"
 
 
 class TestViewModeSwitching:
@@ -893,6 +904,15 @@ async def test_aggregate_view_preserves_valid_sort(self, controller, mock_view):
         # COUNT is valid for aggregates, should be preserved
         assert controller.state.sort_by == SortMode.COUNT
 
+    async def test_aggregate_view_preserves_field_sort(self, controller, mock_view):
+        """Test that field name sort is preserved when switching aggregate views."""
+        controller.state.sort_by = SortMode.MERCHANT
+
+        controller.switch_to_merchant_view()
+
+        # MERCHANT is valid for merchant view, should be preserved
+        assert controller.state.sort_by == SortMode.MERCHANT
+
     async def test_cycle_grouping_returns_view_name(self, controller, mock_view):
         """Test cycle_grouping returns view name and refreshes."""
         controller.state.view_mode = ViewMode.MERCHANT