awgit 0.1.0__tar.gz → 0.2.0__tar.gz

{awgit-0.1.0 → awgit-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awgit
-Version: 0.1.0
+Version: 0.2.0
 Summary: Aither World-Graph git — semantic version control on top of git: edit-ops keyed on stable node ids, content-addressed bodies, differential sync.
 License: Apache-2.0
 Requires-Python: >=3.10
@@ -52,7 +52,7 @@ what changed, never the snapshot.
 ## Install
 
 ```bash
-pip install awgit            # from PyPI (when published)
+pip install awgit
 # or from source:
 git clone https://github.com/aitherium/awgit && cd awgit
 pip install -e .

{awgit-0.1.0 → awgit-0.2.0}/README.md

@@ -41,7 +41,7 @@ what changed, never the snapshot.
 ## Install
 
 ```bash
-pip install awgit            # from PyPI (when published)
+pip install awgit
 # or from source:
 git clone https://github.com/aitherium/awgit && cd awgit
 pip install -e .

{awgit-0.1.0 → awgit-0.2.0}/awgit/cli.py

@@ -15,6 +15,7 @@ from __future__ import annotations
 
 import argparse
 import os
+import platform
 import subprocess
 import sys
 from pathlib import Path
@@ -28,11 +29,38 @@ from awgit.oplog import OpLog
 
 
 def _actor(args: argparse.Namespace) -> str:
-    return (
-        getattr(args, "actor", None)
-        or os.environ.get("AITHER_ACTOR")
-        or "unknown"
-    )
+    """Who is committing. MUST differ per concurrent agent, or leases are useless.
+
+    Explicit forms win, then one is DERIVED. Deriving is the point: with only
+    ``AITHER_ACTOR`` this returned "unknown", and ``lease-check`` rejects an
+    unknown actor — so turning enforcement on would have blocked every commit on
+    the box until every session remembered to export a variable. A guard that can
+    only be switched on by breaking the machine never gets switched on, and it
+    never was: measured 2026-08-09, ``awgit lease list`` had never returned a
+    single lease while a concurrent session overwrote one file four times, the
+    last overwrite silently reverting a fix already committed to origin.
+
+    ``CLAUDE_CODE_SESSION_ID`` is the right derivation: the harness sets it per
+    session, it is stable for that session's life, and it is inherited by the git
+    hook's subprocess (verified). A per-PID value would NOT do — every ``awgit``
+    invocation is a new process, so a lease taken by one command would not match
+    the next.
+
+    ``user@host`` is the last resort, for humans and other tooling. It is
+    deliberately not what agents get: every session here shares one OS account
+    and one GitHub identity, so a shared actor makes session A's lease cover
+    session B's commit — all of the friction, none of the protection.
+    """
+    explicit = getattr(args, "actor", None) or os.environ.get("AITHER_ACTOR")
+    if explicit:
+        return explicit
+    session = os.environ.get("CLAUDE_CODE_SESSION_ID")
+    if session:
+        return f"claude:{session}"
+    user = os.environ.get("USERNAME") or os.environ.get("USER")
+    if user:
+        return f"{user}@{platform.node() or 'localhost'}"
+    return "unknown"
 
 
 def _cmd_capture(args: argparse.Namespace) -> int:
@@ -119,9 +147,26 @@ def _cmd_lease(args: argparse.Namespace) -> int:
     cmd = args.lease_cmd
     who = _actor(args)
     if cmd == "acquire":
+        targets = list(args.targets or [])
+        if getattr(args, "staged", False):
+            # Lease exactly what the gate will check. Without this, widening
+            # coverage beyond .py (D-1880) would have made a routine commit a
+            # per-file chore, and a gate that heavy gets routed around instead
+            # of satisfied.
+            from awgit.leases import is_guarded
+
+            repo = Path(os.environ.get("VCS_REPO_ROOT", os.getcwd()))
+            targets += [f for f in _staged_files(repo) if is_guarded(f)]
+            targets = sorted(set(targets))
+            if not targets:
+                print("vcs: nothing staged that the gate guards — no leases needed")
+                return 0
+        if not targets:
+            print("vcs: acquire needs targets (or --staged)", file=sys.stderr)
+            return 1
         try:
             leases = registry.acquire(
-                who, args.targets, ttl_sec=args.ttl, reason=args.reason
+                who, targets, ttl_sec=args.ttl, reason=args.reason
             )
         except LeaseConflictError as exc:
             print(f"vcs: {exc}", file=sys.stderr)
@@ -376,7 +421,10 @@ def main(argv: Optional[List[str]] = None) -> int:
     p_lease = sub.add_parser("lease", help="lease registry operations")
     lsub = p_lease.add_subparsers(dest="lease_cmd", required=True)
     p_la = lsub.add_parser("acquire", help="acquire leases for targets")
-    p_la.add_argument("targets", nargs="+")
+    p_la.add_argument("targets", nargs="*")
+    p_la.add_argument("--staged", action="store_true",
+                      help="also lease every STAGED file the gate guards "
+                           "(the one-command way to satisfy the pre-commit gate)")
     p_la.add_argument("--ttl", type=int, default=300)
     p_la.add_argument("--reason", default="")
     p_la.add_argument("--actor", default=None)

{awgit-0.1.0 → awgit-0.2.0}/awgit/leases.py

@@ -243,16 +243,60 @@ class LeaseRegistry:
         return [lz for lz in self._leases.values() if lz.actor == actor]
 
 
+# Files worth guarding: the ones two agents plausibly edit at the same time.
+# Widened from ".py only" on 2026-08-09 (D-1880). The old scope let a `.yml`
+# commit print "lease-check OK" while checking NOTHING, so compose files,
+# workflows, skills and .mcp.json were exactly as clobberable as before the
+# gate existed — and that same day edits to docker-compose.aitheros.yml and
+# concurrent-safe-git/SKILL.md had to be hand-restored after a concurrent
+# overwrite, while the .py the gate did cover was overwritten four times.
+GUARDED_SUFFIXES = (
+    ".py", ".ts", ".tsx", ".js", ".jsx", ".mjs",          # source
+    ".yml", ".yaml", ".toml", ".json", ".ini", ".cfg",    # config
+    ".sh", ".bash", ".ps1", ".psm1",                      # scripts
+    ".md",                                                # rules, skills, docs
+    ".sql", ".proto", ".env",
+)
+# Bulk content nobody races on. Guarding these would make a routine content
+# commit need dozens of leases, and a gate that heavy gets ROUTED AROUND rather
+# than satisfied — the exact failure that produced this repo's per-file-ignores.
+UNGUARDED_PREFIXES = (
+    "AitherOS/apps/AitherVeil/content/",   # blog posts, one author at a time
+    "AitherOS/Library/",                   # generated training/runtime data
+    ".DELIVERABLES/",                      # published artifacts
+    ".RESEARCH/INTAKE/",                   # dossiers
+    "TECH_DEBT_ARCHIVE",                   # frozen
+)
+
+
+def is_guarded(path: str) -> bool:
+    """Does the lease gate care about this path?
+
+    Extension-based with a bulk-content escape, rather than "everything": the
+    trade is deliberate. Covering every path means a 50-file commit needs 50
+    leases; covering none is where this started.
+    """
+    p = (path or "").replace("\\", "/").strip()
+    if not p:
+        return False
+    if p.startswith(UNGUARDED_PREFIXES):
+        return False
+    return p.endswith(GUARDED_SUFFIXES)
+
+
 def coverage_gap(
     changed_files: List[str],
     actor: str,
     data_root: Optional[Path] = None,
 ) -> List[str]:
-    """Changed Python files NOT covered by the actor's active path-leases.
+    """Changed GUARDED files not covered by the actor's active path-leases.
+
+    The pre-commit gate's primitive: a commit touching a guarded file with no
+    active path-lease is an unleased edit — rejected when leases are enforced
+    (VCS_LEASES_ENFORCE=1), recorded as ``leased=false`` otherwise.
 
-    The pre-commit gate's primitive: a commit touching a Python file with no
-    active path-lease is an unleased edit — a visible risk flag when leases
-    are enforced (VCS_LEASES_ENFORCE=1), recorded as ``leased=false`` otherwise.
+    ``awgit lease acquire --staged`` takes leases on exactly this set, so
+    complying is one command rather than a per-file chore.
     """
     registry = LeaseRegistry(data_root=data_root)
     registry.sweep_expired()
@@ -261,4 +305,4 @@ def coverage_gap(
         for lz in registry.active_leases()
         if lz.actor == actor and lz.kind == "path"
     }
-    return [f for f in changed_files if f.endswith(".py") and f not in covered]
+    return [f for f in changed_files if is_guarded(f) and f not in covered]

{awgit-0.1.0 → awgit-0.2.0}/awgit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awgit
-Version: 0.1.0
+Version: 0.2.0
 Summary: Aither World-Graph git — semantic version control on top of git: edit-ops keyed on stable node ids, content-addressed bodies, differential sync.
 License: Apache-2.0
 Requires-Python: >=3.10
@@ -52,7 +52,7 @@ what changed, never the snapshot.
 ## Install
 
 ```bash
-pip install awgit            # from PyPI (when published)
+pip install awgit
 # or from source:
 git clone https://github.com/aitherium/awgit && cd awgit
 pip install -e .

{awgit-0.1.0 → awgit-0.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "awgit"
-version = "0.1.0"
+version = "0.2.0"
 description = "Aither World-Graph git — semantic version control on top of git: edit-ops keyed on stable node ids, content-addressed bodies, differential sync."
 readme = "README.md"
 requires-python = ">=3.10"