@miller-tech/uap 2.21.3 → 2.36.4

package/tools/agents/UAP/cli.py

@@ -25,12 +25,21 @@ from datetime import datetime, timedelta
 from pathlib import Path
 from typing import Optional
 
+# Same dir as this script when run directly (python3 cli.py) or imported.
+sys.path.insert(0, str(Path(__file__).resolve().parent))
+from paths import main_checkout_root
+
 
 class UAPCLI:
     """Universal Agent Protocol CLI."""
 
     def __init__(self):
-        self.project_root = Path(__file__).parent.parent.parent
+        # The data layer is SHARED across worktrees: resolve the MAIN
+        # checkout root (git-common-dir works even from a linked worktree)
+        # instead of the file's own checkout — which, pre-reorg, also
+        # resolved one level short (to tools/, pointing at a nonexistent
+        # tools/agents/data/).
+        self.project_root = main_checkout_root(Path(__file__))
         self.db_path = self.project_root / "agents/data/memory/short_term.db"
         self.coord_db_path = (
             self.project_root / "agents/data/coordination/coordination.db"
@@ -200,8 +209,10 @@ class UAPCLI:
             try:
                 with open(pkg_path, "r") as f:
                     return json.load(f).get("version", "0.0.0")
-            except Exception:
-                pass
+            except Exception as exc:
+                # Loud, never silent — a failed version read degrades to
+                # "unknown", it doesn't vanish (repo posture).
+                print(f"[uap] package.json unreadable ({exc}); version unknown", file=sys.stderr)
         return "0.0.0"
 
     def _run_verification_tests(

package/tools/agents/UAP/paths.py

@@ -0,0 +1,50 @@
+"""Shared path resolution for the tools/agents python surfaces.
+
+The agent data layer (memory + coordination DBs) is SHARED across worktrees
+and lives at the MAIN checkout root. `git rev-parse --git-common-dir` points
+at the shared .git even from a linked worktree (the same resolution the
+session-start hook uses for the coordination DB), so both the CLI and the
+compliance suite find ONE data layer no matter which checkout hosts the
+file — fixing two stale-root bugs at once: the pre-reorg depth arithmetic
+(which resolved to `tools/`, pointing the suite at a nonexistent
+`tools/agents/data/`) and worktree blindness (a worktree copy of this file
+used to look for data inside the worktree, where none exists).
+"""
+
+from pathlib import Path
+import subprocess
+import sys
+
+
+def main_checkout_root(file_path: Path) -> Path:
+    """Resolve the MAIN checkout root from any file inside the repo
+    (main checkout or linked worktree). Falls back to walking UP from the
+    file to the nearest directory containing .git — the file's own
+    directory never holds the data layer, so that degraded root is the
+    honest last resort, announced on stderr either way."""
+    suite_root = file_path.resolve()
+    try:
+        r = subprocess.run(
+            ["git", "-C", str(suite_root.parent), "rev-parse", "--git-common-dir"],
+            capture_output=True,
+            text=True,
+        )
+        if r.returncode == 0 and r.stdout.strip():
+            gcd = Path(r.stdout.strip())
+            if not gcd.is_absolute():
+                gcd = suite_root.parent / gcd
+            return gcd.parent.resolve()
+        print(
+            "[paths] git reports no checkout here; walking up to the nearest .git",
+            file=sys.stderr,
+        )
+    except Exception as exc:
+        print(
+            f"[paths] git root resolution failed ({exc}); walking up to the nearest .git",
+            file=sys.stderr,
+        )
+    probe = suite_root.parent
+    for candidate in [probe, *probe.parents]:
+        if (candidate / ".git").exists():
+            return candidate
+    return suite_root.parent