diff --git a/server/app/mcp_server.py b/server/app/mcp_server.py index 0dfddd4..c14b176 100644 --- a/server/app/mcp_server.py +++ b/server/app/mcp_server.py @@ -8,6 +8,7 @@ from mcp.server.fastmcp import FastMCP from pydantic import Field +from .auth.actor import Actor from .config import Settings from .freshness import build_freshness_report from .git_adapter import CommitRequest, GitAdapter @@ -162,7 +163,11 @@ def _pending(): - return make_pending_change_repository(_settings(), via="mcp") + return make_pending_change_repository( + _settings(), + via="mcp", + default_actor=Actor(kind="agent", via="mcp"), + ) def _git() -> GitAdapter: @@ -355,6 +360,7 @@ version_no, summary=summary or None, via="mcp", + actor=Actor(kind="agent", via="mcp"), ) diff --git a/server/app/pending_changes.py b/server/app/pending_changes.py index e52c75a..81be9bd 100644 --- a/server/app/pending_changes.py +++ b/server/app/pending_changes.py @@ -57,7 +57,9 @@ raise PendingChangeError("Pending change not found") return self._read_file(path) - def create(self, request: ProposedChangeRequest) -> dict[str, Any]: + def create( + self, request: ProposedChangeRequest, actor: Any | None = None + ) -> dict[str, Any]: self._require_file_backend() now = datetime.now(UTC).replace(microsecond=0).isoformat().replace("+00:00", "Z") change = PendingChange( @@ -78,7 +80,7 @@ ) return change.model_dump() - def apply(self, change_id: str) -> dict[str, Any]: + def apply(self, change_id: str, actor: Any | None = None) -> dict[str, Any]: self._require_file_backend() change = self.get(change_id) if change["status"] != "pending": diff --git a/server/app/storage/documents.py b/server/app/storage/documents.py index 83b1b95..c16fb89 100644 --- a/server/app/storage/documents.py +++ b/server/app/storage/documents.py @@ -149,13 +149,16 @@ version_no: int, summary: str | None = None, via: str = "api", + actor: Any | None = None, ) -> dict[str, Any]: with database.session() as session: document = _find_document(session, path) version = _find_version(session, document.id, version_no) raw = version.raw - repository = PostgresPendingChangeRepository(database, settings, via=via) + repository = PostgresPendingChangeRepository( + database, settings, via=via, default_actor=actor + ) change = repository.create( ProposedChangeRequest( kind="doc", @@ -163,6 +166,7 @@ summary=summary or f"Restore {path} to version {version_no}", reason=f"Restore version {version_no}", payload={"content": raw}, - ) + ), + actor=actor, ) - return repository.apply(change["id"]) + return repository.apply(change["id"], actor=actor) diff --git a/server/app/storage/factory.py b/server/app/storage/factory.py index 413bd84..1b1eb5d 100644 --- a/server/app/storage/factory.py +++ b/server/app/storage/factory.py @@ -1,5 +1,6 @@ from __future__ import annotations +from ..auth.actor import Actor from ..config import Settings from ..docs_repository import DocsRepository from ..inventory import InventoryRepository @@ -21,9 +22,16 @@ return InventoryRepository(settings) -def make_pending_change_repository(settings: Settings, via: str = "api"): +def make_pending_change_repository( + settings: Settings, + via: str = "api", + default_actor: Actor | None = None, +): if settings.storage_backend == "db": return PostgresPendingChangeRepository( - Database.from_settings(settings), settings, via=via + Database.from_settings(settings), + settings, + via=via, + default_actor=default_actor, ) return PendingChangeRepository(settings) diff --git a/server/app/storage/pending_changes_db.py b/server/app/storage/pending_changes_db.py index 5585294..a479bf7 100644 --- a/server/app/storage/pending_changes_db.py +++ b/server/app/storage/pending_changes_db.py @@ -9,6 +9,8 @@ from sqlalchemy import func, select from sqlalchemy.orm import Session +from ..auth.actor import Actor +from ..auth.context import current_actor from ..config import Settings from ..docs_repository import DocsRepository from ..markdown import parse_frontmatter @@ -49,6 +51,9 @@ "reason": changeset.reason, "payload": dict(primary.payload or {}), "status": changeset.status, + "actor_kind": changeset.actor_kind, + "actor_name": changeset.actor_name, + "via": changeset.via, "created_at": _iso(changeset.created_at), "updated_at": _iso(changeset.applied_at or changeset.created_at), "applied_at": _iso(changeset.applied_at), @@ -67,10 +72,25 @@ class PostgresPendingChangeRepository: - def __init__(self, database: Database, settings: Settings, via: str = "api") -> None: + def __init__( + self, + database: Database, + settings: Settings, + via: str = "api", + default_actor: Actor | None = None, + ) -> None: self.database = database self.settings = settings self.via = via + self.default_actor = default_actor + + def _resolve_actor(self, actor: Actor | None) -> Actor: + return ( + actor + or self.default_actor + or current_actor.get() + or Actor(kind="agent", via=self.via) + ) def list(self) -> list[dict[str, Any]]: with self.database.session() as session: @@ -92,13 +112,19 @@ raise PendingChangeError("Pending change not found") return _serialize(changeset, items) - def create(self, request: ProposedChangeRequest) -> dict[str, Any]: + def create( + self, request: ProposedChangeRequest, actor: Actor | None = None + ) -> dict[str, Any]: + actor = self._resolve_actor(actor) with self.database.session() as session: with session.begin(): changeset = Changeset( summary=request.summary, reason=request.reason, status="draft", + actor_kind=actor.kind, + actor_name=actor.name, + via=actor.via, ) session.add(changeset) session.flush() @@ -115,9 +141,9 @@ session.add( AuditLog( - actor_kind="agent", - actor_name=None, - via=self.via, + actor_kind=actor.kind, + actor_name=actor.name, + via=actor.via, action="propose", entity_type="changeset", entity_id=str(changeset.id), @@ -130,7 +156,10 @@ ) return _serialize(changeset, [item]) - def apply(self, change_id: str) -> dict[str, Any]: + def apply( + self, change_id: str, actor: Actor | None = None + ) -> dict[str, Any]: + actor = self._resolve_actor(actor) with self.database.session() as session: with session.begin(): changeset = self._changeset(session, change_id) @@ -143,9 +172,9 @@ for item in items: if item.kind == "doc": - self._apply_doc(session, changeset, item) + self._apply_doc(session, changeset, item, actor) elif item.kind == "inventory-item": - self._apply_inventory_item(session, changeset, item) + self._apply_inventory_item(session, changeset, item, actor) else: raise PendingChangeError( "Only doc and inventory-item changes can be applied in the current MVP" @@ -170,9 +199,9 @@ changeset.validation = validation session.add( AuditLog( - actor_kind="agent", - actor_name=None, - via=self.via, + actor_kind=actor.kind, + actor_name=actor.name, + via=actor.via, action="apply", entity_type="changeset", entity_id=str(changeset.id), @@ -185,7 +214,13 @@ ) return _serialize(changeset, items) - def _apply_doc(self, session: Session, changeset: Changeset, item: ChangeItem) -> None: + def _apply_doc( + self, + session: Session, + changeset: Changeset, + item: ChangeItem, + actor: Actor, + ) -> None: target = item.target if not target.endswith(".md") or target.startswith("/") or "\\" in target: raise PendingChangeError("Doc change target must be a Markdown file") @@ -238,15 +273,20 @@ raw=content, body=parsed.body, frontmatter=parsed.frontmatter, - actor_kind="agent", - actor_name=None, - via=self.via, + author_user_id=actor.user_id, + actor_kind=actor.kind, + actor_name=actor.name, + via=actor.via, changeset_id=changeset.id, ) ) def _apply_inventory_item( - self, session: Session, changeset: Changeset, item: ChangeItem + self, + session: Session, + changeset: Changeset, + item: ChangeItem, + actor: Actor, ) -> None: parts = item.target.split("/") if len(parts) != 2 or not parts[0] or not parts[1]: @@ -320,6 +360,10 @@ inventory_item_id=version_item.id, version_no=version_no, data=dict(version_item.data or {}), + author_user_id=actor.user_id, + actor_kind=actor.kind, + actor_name=actor.name, + via=actor.via, changeset_id=changeset.id, ) ) diff --git a/server/app/storage/protocols.py b/server/app/storage/protocols.py index 3c1bb3e..136c8a9 100644 --- a/server/app/storage/protocols.py +++ b/server/app/storage/protocols.py @@ -26,6 +26,6 @@ def get(self, change_id: str) -> dict[str, Any]: ... - def create(self, request: Any) -> dict[str, Any]: ... + def create(self, request: Any, actor: Any = None) -> dict[str, Any]: ... - def apply(self, change_id: str) -> dict[str, Any]: ... + def apply(self, change_id: str, actor: Any = None) -> dict[str, Any]: ...