chore: merge executor worktree (worktree-agent-ad0b098c151ab9e3f)

backend/api/cloud.py

@@ -32,7 +32,7 @@ from pydantic import BaseModel
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from api.admin import CloudConnectionOut
+from api.schemas import CloudConnectionOut
 from config import settings
 from db.models import CloudConnection, User
 from deps.auth import get_regular_user

backend/api/schemas.py

@@ -0,0 +1,42 @@
+"""Cross-package Pydantic response models.
+
+Models here are used by 2+ API packages and cannot live in a single package
+without creating circular imports (D-10, RESEARCH.md Pitfall 3).
+"""
+from __future__ import annotations
+
+from datetime import datetime
+from typing import Optional
+
+from pydantic import BaseModel, field_validator
+
+
+class CloudConnectionOut(BaseModel):
+    """SEC-08: credentials_enc deliberately excluded from this response model.
+
+    Any admin or user endpoint returning CloudConnection ORM objects MUST use
+    this model to prevent accidental exposure of encrypted credentials.
+    Safe-by-default: whitelist of allowed fields (not blacklist).
+
+    Moved from api/admin.py to eliminate cross-package coupling between
+    api/cloud.py and api/admin.py (D-10, RESEARCH.md Pitfall 3).
+    Used by api/cloud.py and api/admin/ (after plan 08-04 admin split).
+
+    Note: id is declared as str and coerced via validator so UUID ORM values
+    serialize correctly without json_encoders.
+    """
+
+    id: str
+    provider: str
+    display_name: str
+    status: str
+    connected_at: datetime
+    server_url: Optional[str] = None
+    connection_username: Optional[str] = None
+    model_config = {"from_attributes": True}
+
+    @field_validator("id", mode="before")
+    @classmethod
+    def coerce_id_to_str(cls, v) -> str:
+        """Coerce UUID objects to str so the model validates from ORM instances."""
+        return str(v)