amfs-adapter-postgres 0.2.24__tar.gz → 0.2.26__tar.gz

{amfs_adapter_postgres-0.2.24 → amfs_adapter_postgres-0.2.26}/PKG-INFO

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

{amfs_adapter_postgres-0.2.24 → amfs_adapter_postgres-0.2.26}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "amfs-adapter-postgres"
-version = "0.2.24"
+version = "0.2.26"
 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.38",
+    "amfs-core>=0.3.39",
     "psycopg[binary]>=3.1,<4",
     "psycopg-pool>=3.1",
 ]

{amfs_adapter_postgres-0.2.24 → amfs_adapter_postgres-0.2.26}/src/amfs_postgres/adapter.py

@@ -1439,6 +1439,16 @@ class PostgresAdapter(AdapterABC):
         # Multi-tenant unique constraints: include account_id so different
         # 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
+        # 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
+        # branch for a procedure key an earlier fix had already written, and
+        # every fix fell back to "writes to main on Ship", which is no canary).
+        #
         # Each DROP+ADD pair runs inside an explicit transaction (BEGIN/COMMIT)
         # so that if ADD fails, the DROP is rolled back and the old constraint
         # stays in place.  The pool uses autocommit=True, so without an
@@ -1447,8 +1457,8 @@ class PostgresAdapter(AdapterABC):
             (
                 "amfs_memory_entries",
                 "uq_entry_version",
-                "UNIQUE (namespace, entity_path, key, version, account_id)",
-                ["namespace", "entity_path", "key", "version", "account_id"],
+                "UNIQUE (namespace, branch, entity_path, key, version, account_id)",
+                ["namespace", "branch", "entity_path", "key", "version", "account_id"],
             ),
             (
                 "amfs_agents",

{amfs_adapter_postgres-0.2.24 → amfs_adapter_postgres-0.2.26}/src/amfs_postgres/schema.sql

@@ -35,6 +35,7 @@ CREATE TABLE IF NOT EXISTS amfs_memory_entries (
     superseded_at TIMESTAMPTZ,
     account_id UUID,
     CONSTRAINT uq_entry_version UNIQUE (namespace, entity_path, key, version, account_id)
+    -- widened to include ``branch`` by the adapter's constraint migration (versions are per branch)
 );
 
 CREATE INDEX IF NOT EXISTS idx_entries_current