Lightweight containerized prosody tooling + moved auth scripts + xmpp reconnect/auth stabilization

core/tests/test_codex_commands_phase1.py

@@ -123,10 +123,17 @@ class CodexCommandExecutionTests(TestCase):
         self.assertTrue(results[0].ok)
         run = CodexRun.objects.order_by("-created_at").first()
         self.assertIsNotNone(run)
-        self.assertEqual("queued", run.status)
+        self.assertEqual("waiting_approval", run.status)
         event = ExternalSyncEvent.objects.order_by("-created_at").first()
-        self.assertEqual("pending", event.status)
+        self.assertEqual("waiting_approval", event.status)
         self.assertEqual("default", str((event.payload or {}).get("provider_payload", {}).get("mode") or ""))
+        self.assertTrue(
+            CodexPermissionRequest.objects.filter(
+                user=self.user,
+                codex_run=run,
+                status="pending",
+            ).exists()
+        )
 
     def test_plan_requires_reply_anchor(self):
         trigger = self._msg("#codex plan# #1")
@@ -145,6 +152,14 @@ class CodexCommandExecutionTests(TestCase):
         self.assertEqual("reply_required_for_codex_plan", results[0].error)
 
     def test_approve_command_queues_resume_event(self):
+        waiting_event = ExternalSyncEvent.objects.create(
+            user=self.user,
+            task=self.task,
+            provider="codex_cli",
+            status="waiting_approval",
+            payload={},
+            error="",
+        )
         run = CodexRun.objects.create(
             user=self.user,
             task=self.task,
@@ -158,6 +173,7 @@ class CodexCommandExecutionTests(TestCase):
         req = CodexPermissionRequest.objects.create(
             user=self.user,
             codex_run=run,
+            external_sync_event=waiting_event,
             approval_key="ak-123",
             summary="Need approval",
             requested_permissions={"items": ["write"]},
@@ -186,8 +202,69 @@ class CodexCommandExecutionTests(TestCase):
         self.assertTrue(results[0].ok)
         req.refresh_from_db()
         run.refresh_from_db()
+        waiting_event.refresh_from_db()
         self.assertEqual("approved", req.status)
         self.assertEqual("approved_waiting_resume", run.status)
+        self.assertEqual("ok", waiting_event.status)
         self.assertTrue(
             ExternalSyncEvent.objects.filter(idempotency_key="codex_approval:ak-123:approved", status="pending").exists()
         )
+
+    def test_approve_pre_submit_request_queues_original_action(self):
+        waiting_event = ExternalSyncEvent.objects.create(
+            user=self.user,
+            task=self.task,
+            provider="codex_cli",
+            status="waiting_approval",
+            payload={},
+            error="",
+        )
+        run = CodexRun.objects.create(
+            user=self.user,
+            task=self.task,
+            project=self.project,
+            source_service="web",
+            source_channel="web-chan-1",
+            status="waiting_approval",
+            request_payload={"action": "append_update", "provider_payload": {"task_id": str(self.task.id)}},
+            result_payload={},
+        )
+        CodexPermissionRequest.objects.create(
+            user=self.user,
+            codex_run=run,
+            external_sync_event=waiting_event,
+            approval_key="pre-ak-1",
+            summary="pre submit",
+            requested_permissions={"type": "pre_submit"},
+            resume_payload={
+                "gate_type": "pre_submit",
+                "action": "append_update",
+                "provider_payload": {"task_id": str(self.task.id), "mode": "default"},
+                "idempotency_key": "codex_cmd:resume:1",
+            },
+            status="pending",
+        )
+        CommandChannelBinding.objects.get_or_create(
+            profile=self.profile,
+            direction="ingress",
+            service="web",
+            channel_identifier="approver-chan",
+            defaults={"enabled": True},
+        )
+        trigger = self._msg(".codex approve pre-ak-1", source_chat_id="approver-chan")
+        results = async_to_sync(process_inbound_message)(
+            CommandContext(
+                service="web",
+                channel_identifier="approver-chan",
+                message_id=str(trigger.id),
+                user_id=self.user.id,
+                message_text=str(trigger.text),
+                payload={},
+            )
+        )
+        self.assertEqual(1, len(results))
+        self.assertTrue(results[0].ok)
+        resume = ExternalSyncEvent.objects.filter(idempotency_key="codex_cmd:resume:1").first()
+        self.assertIsNotNone(resume)
+        self.assertEqual("pending", resume.status)
+        self.assertEqual("append_update", str((resume.payload or {}).get("action") or ""))