amfs-adapter-postgres 0.2.30__tar.gz → 0.2.32__tar.gz

{amfs_adapter_postgres-0.2.30 → amfs_adapter_postgres-0.2.32}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.5
 Name: amfs-adapter-postgres
-Version: 0.2.30
+Version: 0.2.32
 Summary: AMFS Postgres adapter with back-propagation triggers
 License-Expression: Apache-2.0
 Requires-Python: >=3.11
-Requires-Dist: amfs-core>=0.3.42
+Requires-Dist: amfs-core>=0.3.43
 Requires-Dist: psycopg-pool>=3.1
 Requires-Dist: psycopg[binary]<4,>=3.1

{amfs_adapter_postgres-0.2.30 → amfs_adapter_postgres-0.2.32}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "amfs-adapter-postgres"
-version = "0.2.30"
+version = "0.2.32"
 description = "AMFS Postgres adapter with back-propagation triggers"
 requires-python = ">=3.11"
 license = "Apache-2.0"
 dependencies = [
     # 0.3.14 adds the capture fields this adapter now persists and selects back,
     # tool_calls among them.
-    "amfs-core>=0.3.42",
+    "amfs-core>=0.3.43",
     "psycopg[binary]>=3.1,<4",
     "psycopg-pool>=3.1",
 ]

{amfs_adapter_postgres-0.2.30 → amfs_adapter_postgres-0.2.32}/src/amfs_postgres/adapter.py

@@ -1454,9 +1454,11 @@ class PostgresAdapter(AdapterABC):
         # tenants can have entries/agents/branches/tags with the same names.
         #
         # ``uq_entry_version`` also includes ``branch``: versions are numbered
-        # per branch — ``write`` reads the newest row on *its* branch and adds
-        # one, ``merge_branch`` renumbers onto the parent — so the same
-        # (entity, key, version) legitimately exists on main and on every
+        # per branch — ``write`` reads the newest row on *its* branch, or for a
+        # key the branch has not touched the parent's live row (the same row
+        # ``read`` returns, so the engine and the adapter agree on the next
+        # number), and adds one; ``merge_branch`` renumbers onto the parent —
+        # so the same (entity, key, version) legitimately exists on every
         # branch that has written the key. Without ``branch`` in the constraint
         # the first write of an existing key on a fresh branch raised
         # ``UniqueViolation`` (seen 2026-09-22: the repair loop could not open a
@@ -1791,6 +1793,34 @@ class PostgresAdapter(AdapterABC):
         """
         return branch_scope_sql(branch, self._parent_branch(cur, branch))
 
+    def _parent_live_row(self, cur: Any, branch: str, entity_path: str, key: str) -> Any:
+        """The parent's live row for a key *branch* has not written, as
+        ``read`` resolves it — or ``None``.
+
+        ``write`` numbers a branch's first version of an inherited key from
+        this row, so the version the engine computed from the overlay read
+        (parent's ``n``, next ``n + 1``) is the one the branch stores. Reading
+        the parent's ``n`` and then insisting on ``1`` is how the repair loop
+        lost every branch for a key main already held (2026-09-26: the first
+        regime-shift fixes the repair agent drafted all fell back to "writes
+        to main on Ship" with ``expected 9, found 0``). Not locked: the parent
+        row is a baseline, not the row being superseded."""
+        parent = self._parent_branch(cur, branch)
+        if parent is None:
+            return None
+        cur.execute(
+            f"""
+            SELECT version, value, confidence{_EVIDENCE_SELECT if self._has_evidence_cols else ""}{", validators" if self._has_validators_col else ""}
+            FROM amfs_memory_entries
+            WHERE namespace = %s AND branch = %s
+              AND entity_path = %s AND key = %s
+              AND superseded_at IS NULL
+            ORDER BY version DESC LIMIT 1
+            """,
+            (self._namespace, parent, entity_path, key),
+        )
+        return cur.fetchone()
+
     def read(
         self,
         entity_path: str,
@@ -1886,6 +1916,9 @@ class PostgresAdapter(AdapterABC):
                         (self._namespace, branch, entry.entity_path, entry.key),
                     )
                     row = cur.fetchone()
+                    own_row = row is not None
+                    if row is None and branch != "main":
+                        row = self._parent_live_row(cur, branch, entry.entity_path, entry.key)
                     current_version = row["version"] if row else 0
                     new_version = current_version + 1
                     if row and self._has_evidence_cols:
@@ -1899,7 +1932,7 @@ class PostgresAdapter(AdapterABC):
                             current_version,
                         )
 
-                    if row:
+                    if own_row:
                         cur.execute(
                             """
                             UPDATE amfs_memory_entries

{amfs_adapter_postgres-0.2.30 → amfs_adapter_postgres-0.2.32}/src/amfs_postgres/async_adapter.py

@@ -283,6 +283,27 @@ class AsyncPostgresAdapter:
         see exactly what a sync ``list`` or ``search`` on the branch sees."""
         return branch_scope_sql(branch, await self._parent_branch(cur, branch))
 
+    async def _parent_live_row(self, cur: Any, branch: str, entity_path: str, key: str) -> Any:
+        """The parent's live row for a key *branch* has not written, as
+        ``read`` resolves it — or ``None``. ``write`` numbers a branch's first
+        version of an inherited key from it, matching the version the engine
+        computed from the overlay read; see ``PostgresAdapter._parent_live_row``."""
+        parent = await self._parent_branch(cur, branch)
+        if parent is None:
+            return None
+        await cur.execute(
+            f"""
+            SELECT version, value, confidence{_EVIDENCE_SELECT if self._has_evidence_cols else ""}
+            FROM amfs_memory_entries
+            WHERE namespace = %s AND branch = %s
+              AND entity_path = %s AND key = %s
+              AND superseded_at IS NULL
+            ORDER BY version DESC LIMIT 1
+            """,
+            (self._namespace, parent, entity_path, key),
+        )
+        return await cur.fetchone()
+
     # ──────────────────────────────────────────────────────────────
     # 1. read
     # ──────────────────────────────────────────────────────────────
@@ -357,6 +378,11 @@ class AsyncPostgresAdapter:
                         (self._namespace, branch, entry.entity_path, entry.key),
                     )
                     row = await cur.fetchone()
+                    own_row = row is not None
+                    if row is None and branch != "main":
+                        row = await self._parent_live_row(
+                            cur, branch, entry.entity_path, entry.key
+                        )
                     current_version = row["version"] if row else 0
                     new_version = current_version + 1
                     if row and self._has_evidence_cols:
@@ -370,7 +396,7 @@ class AsyncPostgresAdapter:
                             current_version,
                         )
 
-                    if row:
+                    if own_row:
                         await cur.execute(
                             """
                             UPDATE amfs_memory_entries