lorebase-keeper 0.3.0__tar.gz → 0.4.0__tar.gz

lorebase_keeper-0.4.0/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2026 Antonio Antenore
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

lorebase_keeper-0.4.0/PKG-INFO

@@ -0,0 +1,53 @@
+Metadata-Version: 2.5
+Name: lorebase-keeper
+Version: 0.4.0
+Summary: Lorebase Keeper: REST API service
+Project-URL: Homepage, https://github.com/aantenore/lorebase
+Project-URL: Documentation, https://aantenore.github.io/lorebase/
+Project-URL: Repository, https://github.com/aantenore/lorebase
+Project-URL: Changelog, https://github.com/aantenore/lorebase/blob/main/CHANGELOG.md
+Project-URL: Issues, https://github.com/aantenore/lorebase/issues
+Author: Antonio Antenore
+License-Expression: Apache-2.0
+License-File: LICENSE
+Keywords: knowledge-graph,mcp,ontology,postgres,versioning
+Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Database
+Requires-Python: >=3.12
+Requires-Dist: asyncpg>=0.29
+Requires-Dist: fastapi>=0.115
+Requires-Dist: httpx>=0.27
+Requires-Dist: lorebase-core<0.5,>=0.4
+Requires-Dist: lorebase-platform<0.5,>=0.4
+Requires-Dist: lorebase-store<0.5,>=0.4
+Requires-Dist: opentelemetry-api>=1.25
+Requires-Dist: pgvector>=0.3
+Requires-Dist: pydantic>=2.7
+Requires-Dist: pyjwt[crypto]>=2.8
+Requires-Dist: python-multipart>=0.0.9
+Requires-Dist: uvicorn>=0.30
+Provides-Extra: mssql
+Requires-Dist: pymssql>=2.3; extra == 'mssql'
+Provides-Extra: mysql
+Requires-Dist: asyncmy>=0.2.10; extra == 'mysql'
+Provides-Extra: parquet
+Requires-Dist: pyarrow>=15; extra == 'parquet'
+Description-Content-Type: text/markdown
+
+# lorebase-keeper
+
+Part of [Lorebase](https://github.com/aantenore/lorebase), an open-source ontology platform: a versioned, governed knowledge graph on Postgres with git-like branching and three-way merge.
+
+Keeper, the REST API service of Lorebase: schema, records, branches, merges, Proposals, search and the read API agents use.
+
+```sh
+uv tool install lorebase-keeper    # or: pip install lorebase-keeper
+lorebase-keeper --help
+```
+
+Documentation: [Deployment](https://aantenore.github.io/lorebase/deployment/) and the [documentation site](https://aantenore.github.io/lorebase/). License: Apache-2.0.

lorebase_keeper-0.4.0/README.md

@@ -0,0 +1,12 @@
+# lorebase-keeper
+
+Part of [Lorebase](https://github.com/aantenore/lorebase), an open-source ontology platform: a versioned, governed knowledge graph on Postgres with git-like branching and three-way merge.
+
+Keeper, the REST API service of Lorebase: schema, records, branches, merges, Proposals, search and the read API agents use.
+
+```sh
+uv tool install lorebase-keeper    # or: pip install lorebase-keeper
+lorebase-keeper --help
+```
+
+Documentation: [Deployment](https://aantenore.github.io/lorebase/deployment/) and the [documentation site](https://aantenore.github.io/lorebase/). License: Apache-2.0.

{lorebase_keeper-0.3.0 → lorebase_keeper-0.4.0}/pyproject.toml

@@ -1,12 +1,26 @@
 [project]
 name = "lorebase-keeper"
-version = "0.3.0"
+version = "0.4.0"
 description = "Lorebase Keeper: REST API service"
 requires-python = ">=3.12"
+readme = "README.md"
+license = "Apache-2.0"
+license-files = ["LICENSE"]
+authors = [{ name = "Antonio Antenore" }]
+keywords = ["ontology", "knowledge-graph", "mcp", "postgres", "versioning"]
+classifiers = [
+  "Development Status :: 2 - Pre-Alpha",
+  "Intended Audience :: Developers",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.12",
+  "Topic :: Database",
+]
 dependencies = [
-  "lorebase-core>=0.3,<0.4",
-  "lorebase-store>=0.3,<0.4",
-  "lorebase-platform>=0.3,<0.4",
+  "lorebase-core>=0.4,<0.5",
+  "lorebase-store>=0.4,<0.5",
+  "lorebase-platform>=0.4,<0.5",
   "fastapi>=0.115",
   "uvicorn>=0.30",
   "pydantic>=2.7",
@@ -26,8 +40,15 @@ mssql = ["pymssql>=2.3"]  # SQL Server sources of POST schema:infer
 [project.scripts]
 lorebase-keeper = "lorebase_keeper.__main__:main"
 
+[project.urls]
+Homepage = "https://github.com/aantenore/lorebase"
+Documentation = "https://aantenore.github.io/lorebase/"
+Repository = "https://github.com/aantenore/lorebase"
+Changelog = "https://github.com/aantenore/lorebase/blob/main/CHANGELOG.md"
+Issues = "https://github.com/aantenore/lorebase/issues"
+
 [build-system]
-requires = ["hatchling"]
+requires = ["hatchling>=1.27"]
 build-backend = "hatchling.build"
 
 [tool.hatch.build.targets.wheel]

lorebase_keeper-0.4.0/src/lorebase_keeper/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.4.0"

{lorebase_keeper-0.3.0 → lorebase_keeper-0.4.0}/src/lorebase_keeper/reading/records.py

@@ -9,7 +9,7 @@ snapshot of the Revision (`reading.snapshots`) for everything else.
 from __future__ import annotations
 
 from collections import defaultdict
-from collections.abc import Mapping, Sequence
+from collections.abc import Awaitable, Callable, Mapping, Sequence
 from dataclasses import dataclass
 from typing import Any
 
@@ -52,6 +52,7 @@ from lorebase_keeper.reading.tree import TreeReader
 from lorebase_keeper.reading.views import (
     AggregateCount,
     AggregateOut,
+    ConflictInProgressOut,
     LineageOut,
     LinkCountOut,
     LinkOut,
@@ -66,7 +67,7 @@ from lorebase_keeper.tracing.explain import explain
 from lorebase_store.indexes import plan_indexes
 from lorebase_store.materialize.rows import record_title, split_link_key
 from lorebase_store.reads import hydrate_records, links_to_record
-from lorebase_store.repositories import ProvenanceRepository
+from lorebase_store.repositories import ConflictRepository, ProvenanceRepository
 
 
 @dataclass(frozen=True, slots=True)
@@ -177,6 +178,50 @@ async def get_record(
     return record, fetched
 
 
+async def conflicts_in_progress(
+    session: AsyncSession,
+    point: ReadPoint,
+    kind: Kind,
+    key: str,
+    *,
+    may_read_source: Callable[[str], Awaitable[bool]],
+) -> list[ConflictInProgressOut]:
+    """The open Conflicts about the Record `(kind, key)` in the open Proposals into the branch
+    read (one lookup by element in the index of unresolved Conflicts).
+
+    An entry tells that a Proposal exists and what it contests, so it is listed only to a
+    caller who may read that Proposal (`may_read_source` tells for its source branch; the
+    target branch is the one read) and the Attribute's values: a Conflict about an Attribute
+    the caller's schema leaves out or whose values the caller sees masked is dropped.
+    """
+    rows = await ConflictRepository(session, point.domain.id).pending(
+        point.branch, kind_partition(kind.id), key
+    )
+    pending: list[ConflictInProgressOut] = []
+    readable: dict[str, bool] = {}
+    for row in rows:
+        name: str | None = None
+        if row.attribute_id is not None:
+            attribute = kind.attributes.get(row.attribute_id)
+            if attribute is None or point.masking.hidden(attribute, [kind.id]):
+                continue
+            name = attribute.api_name
+        if row.source_ref not in readable:
+            readable[row.source_ref] = await may_read_source(row.source_ref)
+        if not readable[row.source_ref]:
+            continue
+        pending.append(
+            ConflictInProgressOut(
+                proposal_id=row.proposal_id,
+                conflict_id=row.fingerprint,
+                code=row.code,
+                attribute=name,
+                competing_hash=row.competing_hash,
+            )
+        )
+    return pending
+
+
 async def link_counts(
     session: AsyncSession,
     runtime: ReadRuntime,

{lorebase_keeper-0.3.0 → lorebase_keeper-0.4.0}/src/lorebase_keeper/reading/sensitivity.py

@@ -862,8 +862,9 @@ def mask_conflict(
     payload: Mapping[str, Any], schema: Schema | None, masking: Masking
 ) -> dict[str, Any]:
     """A stored Conflict with the values the caller may not read masked: the three versions
-    of a sensitive Attribute (with the message and details, which may quote them), or the
-    sensitive entries of whole value maps."""
+    of a sensitive Attribute (with the message and details, which may quote them, and the
+    provenance of the sides, which says who changed the value, from which Source and when),
+    or the sensitive entries of whole value maps."""
     out = dict(payload)
     located = _element_attributes(schema, str(payload.get("partition", "")))
     if located is None:
@@ -874,6 +875,7 @@ def mask_conflict(
                 out[name] = masking.masked
         out["message"] = "The versions of a sensitive Attribute differ."
         out["details"] = {}
+        out.pop("provenance", None)
         return out
     if payload.get("attribute") is None:
         attributes, kinds = located

{lorebase_keeper-0.3.0 → lorebase_keeper-0.4.0}/src/lorebase_keeper/reading/views.py

@@ -40,6 +40,24 @@ class LineageOut(BaseModel):
     at: datetime | None = None
 
 
+class ConflictInProgressOut(BaseModel):
+    """A Conflict about a Record that waits for a decision in an open Proposal into the branch
+    read: the value served is the one already merged, and a competing change is pending."""
+
+    proposal_id: str = Field(description="The open Proposal whose merge has the Conflict.")
+    conflict_id: str = Field(description="The Conflict id (its fingerprint) in that Proposal.")
+    code: str = Field(description="Conflict code, such as `DV1`.")
+    attribute: str | None = Field(
+        default=None,
+        description="Api name of the contested Attribute; null when the whole Record is "
+        "contested (deleted on one side and changed on the other).",
+    )
+    competing_hash: str | None = Field(
+        default=None,
+        description="Hash of the competing Record on the Proposal's source side.",
+    )
+
+
 class RecordOut(BaseModel):
     """A Record with values keyed by Attribute api name."""
 
@@ -56,6 +74,12 @@ class RecordOut(BaseModel):
 
 class RecordResponse(Served):
     record: RecordOut
+    conflict_in_progress: list[ConflictInProgressOut] | None = Field(
+        default=None,
+        description="Open Conflicts about the Record in Proposals into the branch read; set "
+        "by `conflicts=true` on a read of one Record at the branch head (empty when nothing "
+        "is pending), null otherwise.",
+    )
 
 
 class RecordPage(Served):

{lorebase_keeper-0.3.0 → lorebase_keeper-0.4.0}/src/lorebase_keeper/routes/proposals.py

@@ -265,14 +265,45 @@ class AttemptOut(BaseModel):
     auto_resolutions: list[dict[str, Any]]
 
 
+class SideProvenanceOut(BaseModel):
+    """Who or what last changed the Attribute of a Conflict on one side, and when."""
+
+    provenance_id: str = Field(description="Provenance entry of the change.")
+    at: datetime = Field(description="When the change was made.")
+    actor: str | None = Field(default=None, description="Who wrote the provenance entry.")
+    origin: str | None = Field(
+        default=None, description="Origin type: `source_sync`, `operation`, `extraction`, ..."
+    )
+    source: str | None = Field(default=None, description="Source id, for a Source sync.")
+    principal: str | None = Field(default=None, description="Principal, for an Operation.")
+    labels: list[str] = Field(
+        default_factory=list, description="Origin labels an `authority` ranking matches."
+    )
+
+
+class ConflictProvenanceOut(BaseModel):
+    """The provenance of the two competing sides; null for a side of unknown Lineage."""
+
+    ours: SideProvenanceOut | None = None
+    theirs: SideProvenanceOut | None = None
+
+
 class ConflictOut(BaseModel):
-    """A Conflict (core `Conflict`) with its id, state and members."""
+    """A Conflict (core `Conflict`) with its id, state and members.
+
+    `provenance` is set on Attribute Conflicts (`DV1`, `DV3`) whose merge knew the Lineage of
+    at least one side, and null otherwise.
+    """
 
     model_config = {"extra": "allow"}
 
     id: str
     status: Literal["open", "resolved"]
     resolution: dict[str, Any] | None = None
+    provenance: ConflictProvenanceOut | None = Field(
+        default=None,
+        description="Who or what changed each side and when; null when the merge did not know it.",
+    )
 
 
 class ConflictsOut(AttemptOut):

{lorebase_keeper-0.3.0 → lorebase_keeper-0.4.0}/src/lorebase_keeper/routes/read.py

@@ -14,6 +14,7 @@ resolved. POST reads carry an `ETag` too.
 from __future__ import annotations
 
 import json
+from collections.abc import Awaitable, Callable
 from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends, Query, Request, Response
@@ -97,8 +98,16 @@ def _mark(response: Response, point: ReadPoint, body: BaseModel) -> None:
 
 
 async def _answer(
-    request: Request, runtime: ReadRuntime, point: ReadPoint, produce: Any, session: AsyncSession
+    request: Request,
+    runtime: ReadRuntime,
+    point: ReadPoint,
+    produce: Any,
+    session: AsyncSession,
+    *,
+    state: str = "",
 ) -> Response:
+    """`state` names what the body depends on that the Revision does not fix (the open
+    Conflicts a read asked for): it joins the cache key and the ETag."""
     return await respond(
         request,
         runtime.cache,
@@ -107,7 +116,7 @@ async def _answer(
         produce=produce,
         time_travel=not point.materialized,
         headers={REVISION_HEADER: point.revision_hex},
-        variant=point.variant,
+        variant="|".join(part for part in (point.variant, state) if part),
         disclose=point.disclosure(session, runtime).send,
     )
 
@@ -245,6 +254,16 @@ async def list_record_links(
     return await _answer(request, runtime, point, produce, session)
 
 
+def _may_read_proposal_source(access: ReadGuard) -> Callable[[str], Awaitable[bool]]:
+    """Whether the caller reads a Proposal whose target branch it reads: `data.read` on the
+    source branch too, or grants narrowed to Kinds (which cover every branch)."""
+
+    async def may(source_ref: str) -> bool:
+        return await access.may(source_ref) or bool(await access.granted_kinds())
+
+    return may
+
+
 @router.get(
     f"{BASE}/kinds/{{kind}}/records/{{key}}",
     summary="Get a Record by key",
@@ -263,22 +282,48 @@ async def get_record(
     at: At = None,
     links: Annotated[bool, Query(description="Add Link counts per Relation.")] = False,
     lineage: Annotated[bool, Query(description="Add the provenance of each value.")] = False,
+    conflicts: Annotated[
+        bool,
+        Query(
+            description="Add `conflict_in_progress`: the open Conflicts about the Record in "
+            "Proposals into the branch read. Branch head only (ignored with `at`)."
+        ),
+    ] = False,
 ) -> Response:
-    """One Record, optionally with its Link counts and the lineage of its values."""
-    if at is None and (
-        unchanged := await unchanged_head(session, runtime, access, request, branch=branch)
+    """One Record, optionally with its Link counts, the lineage of its values and the
+    Conflicts about it that wait for a decision.
+
+    While a merge is stuck on a Conflict nothing is committed, so the Record keeps the value
+    already merged. `conflicts=true` lists the Conflicts of open Proposals into the branch
+    that touch the Record (Proposal, Conflict, Attribute, hash of the competing Record). They
+    change without a new Revision, so such a read is not answered from the head Revision
+    alone: the pending Conflicts are looked up on every request and are part of its `ETag`.
+    """
+    watch = conflicts and at is None
+    if (
+        at is None
+        and not watch
+        and (unchanged := await unchanged_head(session, runtime, access, request, branch=branch))
     ):
         return unchanged
     point = await resolve_point(session, runtime, access, branch=branch, at=at)
     found = records.require_kind(point, kind)
+    pending = (
+        await records.conflicts_in_progress(
+            session, point, found, key, may_read_source=_may_read_proposal_source(access)
+        )
+        if watch
+        else None
+    )
 
     async def produce() -> RecordResponse:
         record, _ = await records.get_record(
             session, runtime, point, found, key, links=links, lineage=lineage
         )
-        return RecordResponse(**served(point), record=record)
+        return RecordResponse(**served(point), record=record, conflict_in_progress=pending)
 
-    return await _answer(request, runtime, point, produce, session)
+    state = fingerprint("conflicts", [p.model_dump() for p in pending]) if pending else ""
+    return await _answer(request, runtime, point, produce, session, state=state)
 
 
 @router.get(

{lorebase_keeper-0.3.0 → lorebase_keeper-0.4.0}/src/lorebase_keeper/services/proposal_reads.py

@@ -206,16 +206,17 @@ class ConflictVisibility:
         return any(i in text for i in self.left_out)
 
     def scrub(self, payload: dict[str, Any]) -> dict[str, Any]:
-        """`payload` without the values of Attributes left out, and without a message or
-        details naming something left out."""
+        """`payload` without the values of Attributes left out, and without a message,
+        details or provenance naming something left out."""
         if not self.left_out:
             return payload
         out = dict(payload)
         for name in (*_CONFLICT_SIDES, "values"):
             out[name] = _without(out.get(name), self.left_out)
-        if self.names_left_out([out.get("message"), out.get("details")]):
+        if self.names_left_out([out.get("message"), out.get("details"), out.get("provenance")]):
             out["message"] = "The versions differ."
             out["details"] = {}
+            out.pop("provenance", None)
         return out
 
 

{lorebase_keeper-0.3.0 → lorebase_keeper-0.4.0}/tests/auth/test_proposal_read_authorization.py

@@ -273,4 +273,18 @@ def test_record_level_conflicts_lose_values_and_messages_left_out() -> None:
     assert scrubbed["theirs"] == {"values": {}}
     assert scrubbed["details"] == {}
     assert supplier.id not in scrubbed["message"]
+    assert "provenance" not in scrubbed
     assert ConflictVisibility(None, UNCLEARED).scrub(payload) == payload
+
+
+def test_provenance_naming_something_left_out_is_dropped() -> None:
+    hidden = "src_01JB8Z00000000000000000042"
+    stamp = {"provenance_id": "prv_1", "at": "2026-03-01T10:00:00+00:00", "source": hidden}
+    payload = {"ours": 1, "theirs": 2, "message": "m", "details": {}}
+    stamped = {**payload, "provenance": {"ours": stamp, "theirs": None}}
+    seen = ConflictVisibility(None, UNCLEARED, frozenset({hidden}))
+    scrubbed = seen.scrub(stamped)
+    assert "provenance" not in scrubbed
+    assert hidden not in str(scrubbed)
+    other = ConflictVisibility(None, UNCLEARED, frozenset({"knd_other"}))
+    assert other.scrub(stamped)["provenance"] == stamped["provenance"]