brainlayer 1.5.72__tar.gz → 1.5.74__tar.gz

{brainlayer-1.5.72 → brainlayer-1.5.74}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: brainlayer
-Version: 1.5.72
+Version: 1.5.74
 Summary: Persistent local memory for AI agents — 16 BrainBar MCP tools, semantic search, knowledge graph, SQLite
 Project-URL: Homepage, https://brainlayer.etanheyman.com
 Project-URL: Repository, https://github.com/EtanHey/brainlayer

{brainlayer-1.5.72 → brainlayer-1.5.74}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "brainlayer"
-version = "1.5.72"
+version = "1.5.74"
 description = "Persistent local memory for AI agents — 16 BrainBar MCP tools, semantic search, knowledge graph, SQLite"
 license = {text = "Apache-2.0"}
 readme = "README.md"

{brainlayer-1.5.72 → brainlayer-1.5.74}/server.json

@@ -3,7 +3,7 @@
   "name": "io.github.etanhey/brainlayer",
   "title": "BrainLayer",
   "description": "Persistent local memory for AI agents \u2014 semantic search, knowledge graph, and 16 BrainBar MCP tools with ToolAnnotations over SQLite.",
-  "version": "1.5.72",
+  "version": "1.5.74",
   "websiteUrl": "https://brainlayer.etanheyman.com",
   "repository": {
     "url": "https://github.com/EtanHey/brainlayer",
@@ -14,7 +14,7 @@
       "registryType": "pypi",
       "registryBaseUrl": "https://pypi.org",
       "identifier": "brainlayer",
-      "version": "1.5.72",
+      "version": "1.5.74",
       "runtimeHint": "pipx",
       "transport": {
         "type": "stdio"

{brainlayer-1.5.72 → brainlayer-1.5.74}/src/brainlayer/__init__.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-__version__ = "1.5.72"
+__version__ = "1.5.74"
 # Git sha the distributed package was built from; stamped by the release build, None in a source tree.
 # scripts/sprint_gate.py reads it in "keg" mode to prove the served package is the code under test.
 # No runtime `str | None` annotation: launchd/install.sh imports this under /usr/bin/python3 (3.9).

brainlayer-1.5.74/src/brainlayer/_build.py

@@ -0,0 +1 @@
+BUILD_SHA = "d64d5a5486a7cc5013cef9135e615fdfc22c076f"

{brainlayer-1.5.72 → brainlayer-1.5.74}/src/brainlayer/backup_daily.py

@@ -86,6 +86,7 @@ SNAPSHOT_RECEIPT_RESERVE_SECONDS = 60
 BACKUP_LOCAL_MAX_AGE_HOURS_ENV = "BRAINLAYER_BACKUP_LOCAL_MAX_AGE_HOURS"
 BACKUP_REUSE_VERIFIED_MAX_AGE_HOURS_ENV = "BRAINLAYER_BACKUP_REUSE_VERIFIED_MAX_AGE_HOURS"
 BACKUP_SUPERVISED_CHILD_ENV = "BRAINLAYER_BACKUP_SUPERVISED_CHILD"
+BACKUP_INVOCATION_ENV = "BRAINLAYER_BACKUP_INVOCATION_ID"
 BACKUP_SQLITE_CHECK_TIMEOUT_ENV = "BRAINLAYER_BACKUP_SQLITE_CHECK_TIMEOUT_SECONDS"
 BACKUP_DRIVE_RETENTION_ENV = "BRAINLAYER_BACKUP_DRIVE_RETENTION"
 DRIVE_UPLOAD_DEADLINE_FLOOR_ENV = "BRAINLAYER_DRIVE_UPLOAD_DEADLINE_FLOOR_SECONDS"
@@ -2924,6 +2925,9 @@ def run_backup(
         "retention_deleted": [],
         "local_gzip_retention_deleted": [],
     }
+    invocation = os.environ.get(BACKUP_INVOCATION_ENV, "")
+    if re.fullmatch(r"[0-9a-f]{32}", invocation):
+        result["backup_invocation_id"] = invocation  # This body runs only after staging-lock admission.
 
     def record_reclamation_status(status: str, error: str | None) -> None:
         result["attempt_reclamation"] = status

{brainlayer-1.5.72 → brainlayer-1.5.74}/src/brainlayer/maintenance_calendar.py

@@ -7,6 +7,7 @@ import math
 import os
 import signal
 import time
+import uuid
 from contextlib import ExitStack, asynccontextmanager
 from dataclasses import dataclass, field, replace
 from functools import partial
@@ -14,6 +15,7 @@ from pathlib import Path
 
 from . import maintenance_control
 from .backup_daily import (
+    BACKUP_INVOCATION_ENV,
     DEFAULT_SNAPSHOT_TIMEOUT_SECONDS,
     SNAPSHOT_RECEIPT_RESERVE_SECONDS,
     default_snapshot_timeout_seconds,
@@ -222,7 +224,12 @@ async def _execute_step(
             raise RuntimeError("calendar child birth unknown")
         custody.record(child.pid, birth)
         os.write(guard.stdin.fileno(), f"+{child.pid}\n".encode())
-        record(directory, event="spawn", step=step.name, pid=child.pid)
+        identity = (
+            {"backup_invocation_id": env[BACKUP_INVOCATION_ENV]}
+            if step.name == "backup-daily" and env.get(BACKUP_INVOCATION_ENV)
+            else {}
+        )
+        record(directory, event="spawn", step=step.name, pid=child.pid, **identity)
         os.write(gate, b"R")
         budget, held, clock = backup_deadline(step), False, time.monotonic
         if deadline is not None:
@@ -264,9 +271,26 @@ async def _window(directory, step, now_fn, sleep_fn, stop):
     return not stop.is_set() and 4 <= now_fn().hour < 6
 
 
-def finish(directory, state, step, code, date, defer_after, missed=False, stopped=False, *, reason=None, replaces=None):
+def finish(
+    directory,
+    state,
+    step,
+    code,
+    date,
+    defer_after,
+    missed=False,
+    stopped=False,
+    *,
+    reason=None,
+    replaces=None,
+    backup_invocation_id=None,
+):
     status = "stopped" if stopped else "deferred" if code == 75 else "ok" if code == 0 else "failed"
-    detail = {key: value for key, value in dict(reason=reason, replaces=replaces).items() if value is not None}
+    detail = {
+        key: value
+        for key, value in dict(reason=reason, replaces=replaces, backup_invocation_id=backup_invocation_id).items()
+        if value is not None
+    }
     record(directory, event="finished", step=step.name, status=status, returncode=code, **detail)
     key = KEYS.get(step.name)
     notice = None
@@ -478,12 +502,14 @@ async def run_calendar(
             BRAINLAYER_SUPERVISOR_SOCKET=str(client.path),
         )
         env.pop("BRAINLAYER_BACKUP_SUPERVISED_CHILD", None)
+        env.pop(BACKUP_INVOCATION_ENV, None)
         for step in steps:
             active_step = step.name
             if stop.is_set():
                 record(directory, event="finished", step=step.name, status="skipped", returncode=None)
                 continue
             code, missed, reason, step_failed = 1, False, None, False
+            invocation = uuid.uuid4().hex if step.name == "backup-daily" else None
             try:
                 bounded = step
                 if step.name == "index":
@@ -511,6 +537,7 @@ async def run_calendar(
                                 BRAINLAYER_LAUNCHD_SERVICE=_service_name(step),
                                 XPC_SERVICE_NAME=f"com.brainlayer.{_service_name(step)}",
                             )
+                            | ({BACKUP_INVOCATION_ENV: invocation} if invocation else {})
                         )
                         try:
                             async with step_hold(client, guard, child_env, step, now_fn) as held_env:
@@ -567,6 +594,7 @@ async def run_calendar(
                 stopped,
                 reason=reason,
                 replaces="maintenance-nightly" if weekly_substitution and step.name == "maintenance-weekly" else None,
+                backup_invocation_id=invocation,
             )
         active_step = None
         if all(results.get(n) == "ok" for n in ("maintenance-weekly", "decay", "repair-fts")):

{brainlayer-1.5.72 → brainlayer-1.5.74}/src/brainlayer/observability_backup.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
 
 import json
+import math
 import os
+import re
 import subprocess
 from datetime import UTC, datetime
 from pathlib import Path
-from typing import Any, Callable, Mapping
+from typing import Any, Callable, Mapping, Sequence
 
 from brainlayer import backup_daily, jsonl_backup
 from brainlayer.backup_daily import _backup_log_path
@@ -173,8 +175,69 @@ def _db_snapshot_freshness(snapshot: dict[str, Any] | None, now: datetime) -> tu
     return "fresh", None
 
 
-def _local_snapshot(records: list[dict[str, Any]]) -> dict[str, Any] | None:
-    real = [r for r in records if r.get("backup_log_provenance") == "real"]
+def _read_calendar(path: Path) -> tuple[list[dict[str, Any]], str, int]:
+    """Retain complete evidence; a damaged append is a barrier, never an invisible join."""
+    try:
+        lines = path.read_bytes().splitlines(keepends=True)
+    except FileNotFoundError:
+        return [], "missing", 0
+    except OSError:
+        return [], "malformed", 0
+    records, skipped = [], 0
+    for line in lines:
+        try:
+            row = json.loads(line)
+            if not line.endswith(b"\n") or not isinstance(row, dict):
+                raise ValueError("incomplete calendar record")
+        except ValueError:
+            records.append({"event": "journal-gap"})
+            skipped += 1
+        else:
+            records.append(row)
+    return records, "read" if len(records) > skipped else "malformed" if lines else "empty", skipped
+
+
+def _terminal_upload_error(local: dict[str, Any], calendar: Sequence[dict[str, Any]]) -> str | None:
+    """Only an admitted receipt's unique invocation can bind a terminal result."""
+    invocation = local.get("backup_invocation_id")
+    if not isinstance(invocation, str) or not re.fullmatch(r"[0-9a-f]{32}", invocation):
+        return None  # Legacy timestamps prove no ownership, including lock-losing contenders.
+    started, seen = None, False
+    outcome = None
+    for row in calendar:
+        if row.get("event") in {"runner", "journal-gap"} and started is not None and outcome is None:
+            return None
+        if row.get("backup_invocation_id") != invocation:
+            continue
+        if row.get("step") != "backup-daily":
+            return None
+        ts = row.get("ts")
+        if type(ts) not in (int, float) or not math.isfinite(ts):
+            return None
+        if row.get("event") == "spawn":
+            if seen:
+                return None
+            started, seen = ts, True
+        elif row.get("event") == "finished":
+            status, code = row.get("status"), row.get("returncode")
+            if (
+                started is None
+                or outcome is not None
+                or ts < started
+                or status not in {"stopped", "failed", "ok"}
+                or type(code) is not int
+            ):
+                return None
+            outcome = f"Backup daily {status}, exit {code}; upload incomplete (no verified completion receipt)"
+    return outcome
+
+
+def _local_snapshot(records: list[dict[str, Any]], *, calendar: Sequence[dict[str, Any]] = ()) -> dict[str, Any] | None:
+    real = [
+        r
+        for r in records
+        if r.get("backup_log_provenance") == "real" and r.get("error_type") != "BackupAlreadyRunningError"
+    ]
     latest = {r["snapshot"]: r for r in real if isinstance(r.get("snapshot"), str)}
     # Cleanup receipts for older copies cannot replace the newest snapshot's display.
     local = max(
@@ -188,14 +251,19 @@ def _local_snapshot(records: list[dict[str, Any]]) -> dict[str, Any] | None:
         (r for r in reversed(list(latest.values())) if r.get("upload_state") in {"failed", "abandoned"}), None
     )
     error = failed or (real[-1] if real and (real[-1].get("error") or real[-1].get("verification_error")) else {})
+    terminal_error = (
+        _terminal_upload_error(local, calendar)
+        if local.get("upload_state") in {"pending", "in_progress"} and not local.get("uploaded")
+        else None
+    )
     created = backup_daily._snapshot_created_time(local)
     return {
         "last_at": created.astimezone(UTC).isoformat().replace("+00:00", "Z") if created else None,
         "destination": Path(local["snapshot"]).name,
         "local_verified": local.get("local_verified") is True,
         "uploaded": local.get("uploaded") is True,
-        "upload_state": local.get("upload_state", "pending"),
-        "upload_error": error.get("error") or error.get("verification_error"),
+        "upload_state": "failed" if terminal_error else local.get("upload_state", "pending"),
+        "upload_error": terminal_error or error.get("error") or error.get("verification_error"),
         "local_integrity": local.get("local_integrity"),
         "local_integrity_pragma": local.get("local_integrity_pragma"),
     }
@@ -379,6 +447,19 @@ def build_backups_section(
         max_age_seconds=DEFAULT_JSONL_BACKUP_MAX_AGE_SECONDS,
     )
     snapshot, error_type, all_daily_errors = _daily_snapshot(daily_records)
+    local_snapshot = _local_snapshot(daily_records)
+    if local_snapshot is not None and local_snapshot["upload_state"] in {"pending", "in_progress"}:
+        control = Path(
+            env.get("BRAINLAYER_SUPERVISOR_SOCKET") or Path.home() / ".local/share/brainlayer/supervisor/control.sock"
+        ).expanduser()
+        calendar_path = control.parent / "calendar/runs.jsonl"
+        calendar, calendar_status, skipped = _read_calendar(calendar_path)
+        calendar_input = record_input(calendar_path, status=calendar_status, rows_or_bytes=None, skipped_lines=skipped)
+        inputs.append(calendar_input)
+        if calendar_input.get("status") == "future":
+            return _unmeasurable(f"input mtime is later than generated_at: {calendar_input['path']}", inputs)
+        if calendar_status == "read":
+            local_snapshot = _local_snapshot(daily_records, calendar=calendar)
     if error_type == "drive_credentials_missing" and _drive_token_is_usable(backup_daily.DEFAULT_TOKEN_PATH):
         error_type = "drive_credentials_restored_backup_pending"
     if error_type is None and health_issue is not None and health.state in {"invalid", "stale", "failed"}:
@@ -446,6 +527,6 @@ def build_backups_section(
             "disabled_dir_present": disabled_present,
         },
         "db_snapshot": snapshot,
-        **({"local_snapshot": _local_snapshot(daily_records)} if _local_snapshot(daily_records) is not None else {}),
+        **({"local_snapshot": local_snapshot} if local_snapshot is not None else {}),
         "error_type": error_type,
     }

brainlayer-1.5.72/src/brainlayer/_build.py

@@ -1 +0,0 @@
-BUILD_SHA = "bfd456ed149a3b573153318a684f8e4fbc6babb8"