Fix all integrations

core/tests/test_xmpp_approval_commands.py

@@ -5,7 +5,11 @@ from unittest.mock import MagicMock
 from asgiref.sync import async_to_sync
 from django.test import TestCase
 
-from core.clients.xmpp import XMPPComponent
+from core.gateway.builtin import (
+    gateway_help_lines,
+    handle_approval_command,
+    handle_tasks_command,
+)
 from core.models import (
     CodexPermissionRequest,
     CodexRun,
@@ -16,19 +20,6 @@ from core.models import (
 )
 
 
-class _ApprovalProbe:
-    _resolve_request_provider = XMPPComponent._resolve_request_provider
-    _approval_event_prefix = XMPPComponent._approval_event_prefix
-    _APPROVAL_PROVIDER_COMMANDS = XMPPComponent._APPROVAL_PROVIDER_COMMANDS
-    _ACTION_TO_STATUS = XMPPComponent._ACTION_TO_STATUS
-    _apply_approval_decision = XMPPComponent._apply_approval_decision
-    _approval_list_pending = XMPPComponent._approval_list_pending
-    _approval_status = XMPPComponent._approval_status
-    _handle_approval_command = XMPPComponent._handle_approval_command
-    _gateway_help_lines = XMPPComponent._gateway_help_lines
-    _handle_tasks_command = XMPPComponent._handle_tasks_command
-
-
 class XMPPGatewayApprovalCommandTests(TestCase):
     def setUp(self):
         self.user = User.objects.create_user(
@@ -43,7 +34,7 @@ class XMPPGatewayApprovalCommandTests(TestCase):
             epic=None,
             title="Approve me",
             source_service="xmpp",
-            source_channel="jews.zm.is",
+            source_channel="component.example.test",
             reference_code="77",
             status_snapshot="open",
         )
@@ -60,7 +51,7 @@ class XMPPGatewayApprovalCommandTests(TestCase):
             task=self.task,
             project=self.project,
             source_service="xmpp",
-            source_channel="jews.zm.is",
+            source_channel="component.example.test",
             status="waiting_approval",
             request_payload={
                 "action": "append_update",
@@ -78,8 +69,7 @@ class XMPPGatewayApprovalCommandTests(TestCase):
             resume_payload={},
             status="pending",
         )
-        self.probe = _ApprovalProbe()
-        self.probe.log = MagicMock()
+        self.probe = MagicMock()
 
     def _run_command(self, text: str) -> list[str]:
         messages = []
@@ -87,11 +77,9 @@ class XMPPGatewayApprovalCommandTests(TestCase):
         def _sym(value):
             messages.append(str(value))
 
-        handled = async_to_sync(XMPPComponent._handle_approval_command)(
-            self.probe,
+        handled = async_to_sync(handle_approval_command)(
             self.user,
             text,
-            "xmpp-approval-user@zm.is/mobile",
             _sym,
         )
         self.assertTrue(handled)
@@ -140,12 +128,11 @@ class XMPPGatewayTasksCommandTests(TestCase):
             epic=None,
             title="Ship CLI",
             source_service="xmpp",
-            source_channel="jews.zm.is",
+            source_channel="component.example.test",
             reference_code="12",
             status_snapshot="open",
         )
-        self.probe = _ApprovalProbe()
-        self.probe.log = MagicMock()
+        self.probe = MagicMock()
 
     def _run_tasks(self, text: str) -> list[str]:
         messages = []
@@ -153,8 +140,7 @@ class XMPPGatewayTasksCommandTests(TestCase):
         def _sym(value):
             messages.append(str(value))
 
-        handled = async_to_sync(XMPPComponent._handle_tasks_command)(
-            self.probe,
+        handled = async_to_sync(handle_tasks_command)(
             self.user,
             text,
             _sym,
@@ -164,14 +150,18 @@ class XMPPGatewayTasksCommandTests(TestCase):
         return messages
 
     def test_help_contains_approval_and_tasks_sections(self):
-        lines = self.probe._gateway_help_lines()
+        lines = gateway_help_lines()
         text = "\n".join(lines)
         self.assertIn(".approval list-pending", text)
         self.assertIn(".tasks list", text)
+        self.assertIn(".tasks add", text)
+        self.assertIn(".l", text)
 
     def test_tasks_list_show_complete_and_undo(self):
         rows = self._run_tasks(".tasks list open 10")
         self.assertIn("#12", "\n".join(rows))
+        rows = self._run_tasks(".l")
+        self.assertIn("#12", "\n".join(rows))
         rows = self._run_tasks(".tasks show #12")
         self.assertIn("status: open", "\n".join(rows))
         rows = self._run_tasks(".tasks complete #12")
@@ -181,3 +171,24 @@ class XMPPGatewayTasksCommandTests(TestCase):
         rows = self._run_tasks(".tasks undo #12")
         self.assertIn("removed #12", "\n".join(rows))
         self.assertFalse(DerivedTask.objects.filter(id=self.task.id).exists())
+
+    def test_tasks_add_creates_task_in_named_project(self):
+        rows = []
+        handled = async_to_sync(handle_tasks_command)(
+            self.user,
+            ".tasks add Task Project :: Wire XMPP manual task create",
+            lambda value: rows.append(str(value)),
+            service="xmpp",
+            channel_identifier="component.example.test",
+            sender_identifier="operator@example.test",
+        )
+        self.assertTrue(handled)
+        self.assertTrue(any("created #" in row.lower() for row in rows))
+        created = DerivedTask.objects.filter(
+            user=self.user,
+            project=self.project,
+            title="Wire XMPP manual task create",
+            source_service="xmpp",
+            source_channel="component.example.test",
+        ).first()
+        self.assertIsNotNone(created)