fix: resolve merge conflicts and lint issues

- Merge origin/main changes (flattened buy/sell commands, --doc flag, aliases)
- Fix spinner placement for buy/sell commands
- Fix duplicate alias key 'p' in canonical subcommands
- Remove unused mypy ignore comments in spot_client.py
- Fix nested with statements in tests

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

tests/test_trade_service.py

@@ -57,9 +57,11 @@ class TradeServiceTestCase(unittest.TestCase):
         self.assertEqual(client.calls[0]["timeInForce"], "GTC")
 
     def test_spot_market_buy_requires_quote(self):
-        with patch.object(trade_service, "audit_event", return_value=None):
-            with self.assertRaisesRegex(RuntimeError, "requires --quote"):
-                trade_service.execute_spot_trade(
+        with (
+            patch.object(trade_service, "audit_event", return_value=None),
+            self.assertRaisesRegex(RuntimeError, "requires --quote"),
+        ):
+            trade_service.execute_spot_trade(
                     {"trading": {"dry_run_default": False}},
                     side="buy",
                     symbol="BTCUSDT",
@@ -72,9 +74,11 @@ class TradeServiceTestCase(unittest.TestCase):
                 )
 
     def test_spot_market_buy_rejects_qty(self):
-        with patch.object(trade_service, "audit_event", return_value=None):
-            with self.assertRaisesRegex(RuntimeError, "accepts --quote only"):
-                trade_service.execute_spot_trade(
+        with (
+            patch.object(trade_service, "audit_event", return_value=None),
+            self.assertRaisesRegex(RuntimeError, "accepts --quote only"),
+        ):
+            trade_service.execute_spot_trade(
                     {"trading": {"dry_run_default": False}},
                     side="buy",
                     symbol="BTCUSDT",
@@ -87,9 +91,11 @@ class TradeServiceTestCase(unittest.TestCase):
                 )
 
     def test_spot_market_sell_rejects_quote(self):
-        with patch.object(trade_service, "audit_event", return_value=None):
-            with self.assertRaisesRegex(RuntimeError, "accepts --qty only"):
-                trade_service.execute_spot_trade(
+        with (
+            patch.object(trade_service, "audit_event", return_value=None),
+            self.assertRaisesRegex(RuntimeError, "accepts --qty only"),
+        ):
+            trade_service.execute_spot_trade(
                     {"trading": {"dry_run_default": False}},
                     side="sell",
                     symbol="BTCUSDT",