collab-runtime 0.9.0__tar.gz → 0.9.2__tar.gz

{collab_runtime-0.9.0/collab_runtime.egg-info → collab_runtime-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: collab-runtime
-Version: 0.9.0
+Version: 0.9.2
 Summary: Collaborative file locking runtime
 Author-email: KirilMT <kiril.mt95@gmail.com>
 License-Expression: MIT
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Version Control
-Requires-Python: >=3.10
+Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: python-dotenv>=1.2.2
@@ -21,6 +21,7 @@ Requires-Dist: supabase>=2.30.0
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: psutil>=5.9.8
 Requires-Dist: plyer>=2.1.0
+Requires-Dist: tomli>=2.0.0
 Dynamic: license-file
 
 # collab-runtime — Collaborative File Locking

{collab_runtime-0.9.0 → collab_runtime-0.9.2}/collab/dashboard_server.py

@@ -17,12 +17,13 @@ import re
 import tempfile
 import threading
 import time
-import tomllib
 import urllib.parse
 import zipfile
 from pathlib import Path
 from typing import Any, Callable, Iterable, Optional, Sequence, Tuple
 
+import tomli as tomllib
+
 logger = logging.getLogger(__name__)
 
 DASHBOARD_TEMP_PREFIX = ".collab-dashboard-"

{collab_runtime-0.9.0 → collab_runtime-0.9.2}/collab/live_locks_watcher.py

@@ -781,26 +781,8 @@ def _process_releases(client, released: set[str]) -> None:
 
     Extracted so tests can simulate exceptions when removing locks from the local-owned
     set without running the entire main loop.
-
-    Enforces a minimum hold time to avoid rapid acquire/release cycles when git status
-    is transient.
     """
     for fp in released:
-        # Enforce minimum lock hold time: skip files whose lock was acquired
-        # too recently to avoid thrashing when git status fluctuates.
-        acquired = _lock_acquired_at.get(fp)
-        if acquired is not None:
-            age = (datetime.now() - acquired).total_seconds()
-            if age < _min_auto_lock_hold_seconds():
-                logger.debug(
-                    "⏳ [KEPT] %s — lock is only %ds old "
-                    "(< %ds minimum); deferring auto-release",
-                    fp,
-                    int(age),
-                    _min_auto_lock_hold_seconds(),
-                )
-                continue
-
         # Was this file in conflict?
         if fp in _active_conflicts:
             _active_conflicts.discard(fp)
@@ -1205,25 +1187,10 @@ def _reconcile_on_startup(client) -> None:
                 msg = f"[RESUMED] {fp} - lock re-adopted from this machine"
                 logger.info(_color(msg, Fore.GREEN) if _HAS_COLORAMA else msg)
         else:
-            # File is clean — but skip if the lock was acquired too recently.
-            # This prevents the watcher from releasing locks it just acquired
-            # during the same reconciliation pass (e.g. when git status is
-            # transient).
-            acquired = _lock_acquired_at.get(fp)
-            if acquired is not None:
-                age = (datetime.now() - acquired).total_seconds()
-                if age < _min_auto_lock_hold_seconds():
-                    logger.debug(
-                        "⏳ [KEPT] %s — lock is only %ds old "
-                        "(< %ds minimum); skipping auto-release",
-                        fp,
-                        int(age),
-                        _min_auto_lock_hold_seconds(),
-                    )
-                    # Keep the lock in _local_owned_locks so the main loop
-                    # continues to track it for eventual release.
-                    _local_owned_locks.add(fp)
-                    continue
+            # File is clean — release immediately.
+            # Unlike agent locks, the developer's own watcher has authoritative
+            # knowledge of the working tree. Delaying here would leave
+            # post-merge / post-pull files locked (#150, #151).
 
             # File is clean - stale lock, release it
             try:
@@ -1522,22 +1489,6 @@ def _graceful_shutdown() -> None:
                         msg = f"[KEPT] {fp} - still has local edits, lock preserved"
                         logger.debug(_color(msg, Fore.GREEN) if _HAS_COLORAMA else msg)
                     else:
-                        # Enforce minimum hold time even during shutdown:
-                        # keep locks that were acquired too recently.
-                        acquired = _lock_acquired_at.get(fp)
-                        if acquired is not None:
-                            age = (datetime.now() - acquired).total_seconds()
-                            if age < _min_auto_lock_hold_seconds():
-                                n_kept += 1
-                                logger.debug(
-                                    "⏳ [KEPT] %s — lock is only %ds old "
-                                    "(< %ds minimum); preserving",
-                                    fp,
-                                    int(age),
-                                    _min_auto_lock_hold_seconds(),
-                                )
-                                continue
-
                         try:
                             _scope_agent(
                                 client.table("file_locks")
@@ -1571,21 +1522,6 @@ def _graceful_shutdown() -> None:
                         ]
                         for fp in db_locks:
                             if fp and fp not in still_dirty:
-                                # Enforce minimum hold time
-                                acquired = _lock_acquired_at.get(fp)
-                                if acquired is not None:
-                                    age = (datetime.now() - acquired).total_seconds()
-                                    if age < _min_auto_lock_hold_seconds():
-                                        n_kept += 1
-                                        logger.debug(
-                                            "⏳ [KEPT] %s — lock is only %ds old "
-                                            "(< %ds minimum); preserving",
-                                            fp,
-                                            int(age),
-                                            _min_auto_lock_hold_seconds(),
-                                        )
-                                        continue
-
                                 _scope_agent(
                                     client.table("file_locks")
                                     .delete()

{collab_runtime-0.9.0 → collab_runtime-0.9.2}/collab/lock_client.py

@@ -3633,46 +3633,20 @@ class LockClient:
         if any([n_released, n_newly_locked, n_readopted, n_refreshed, n_multi]):
             logger.debug("Starting lock reconciliation...")
 
-        # Process stale locks — but skip any that were acquired too recently.
-        # This prevents the watcher from releasing locks it just acquired during
-        # the same reconciliation pass (e.g. when git status is transient).
+        # Process stale locks — release immediately because git status
+        # confirms the file is clean.  Unlike agent locks (dev_other_stale),
+        # the developer's own watcher has authoritative knowledge of the
+        # working tree.  Delaying here (e.g. via a minimum hold time) would
+        # leave post-merge / post-pull files locked for minutes (#150, #151).
         if stale:
-            truly_stale = set()
-            for fp in stale:
-                lock = lock_map.get(fp, {})
-                acquired_str = lock.get("acquired_at")
-                if acquired_str:
-                    try:
-                        acq_dt = (
-                            datetime.fromisoformat(acquired_str)
-                            .astimezone()
-                            .replace(tzinfo=None)
-                        )
-                        age = (_safe_now() - acq_dt).total_seconds()
-                        if age < _min_auto_lock_hold_seconds():
-                            kept_young.add(fp)
-                            logger.debug(
-                                "⏳ [KEPT] %s — lock is only %ds old "
-                                "(< %ds minimum); skipping auto-release",
-                                fp,
-                                int(age),
-                                _min_auto_lock_hold_seconds(),
-                            )
-                            continue
-                    except (ValueError, TypeError):
-                        pass
-                truly_stale.add(fp)
-
-            if truly_stale:
-                for fp in sorted(truly_stale):
-                    logger.info(
-                        "🔓 [STALE-RELEASED] %s — locked but file is now clean,"
-                        " releasing",
-                        fp,
-                    )
-                self.release_multiple(list(truly_stale))
-                # Only count actually-released stale locks in the summary
-                n_released = len(truly_stale)
+            for fp in sorted(stale):
+                logger.info(
+                    "🔓 [STALE-RELEASED] %s — locked but file is now clean,"
+                    " releasing",
+                    fp,
+                )
+            self.release_multiple(list(stale))
+            n_released = len(stale)
 
         # Process RESUMED locks: use direct table update (preserves acquired_at)
         # This prevents the timer from resetting when switching IDEs

{collab_runtime-0.9.0 → collab_runtime-0.9.2}/collab/overlap.py

@@ -308,6 +308,11 @@ def merge_tree_conflicts(
             conflicted.add(line.strip())
         # rc==1 with nothing parseable -> inconclusive; fall back to file-level.
         return frozenset(conflicted) if conflicted else None
+    # rc != 0,1: the merge-tree command itself failed (e.g. rc=128 "refusing to
+    # merge unrelated histories" in a shallow clone, or unsupported git version).
+    logger.debug(
+        "merge-tree exited rc=%d for %s..%s; inconclusive", rc, head_ref, other_ref
+    )
     return None
 
 
@@ -376,6 +381,24 @@ def fetch_pr_ref(
             "Fetched SHA %s != expected %s for PR #%d", fetched_sha, head_sha, pr_number
         )
         # Still usable (the ref exists), but log the discrepancy.
+
+    # If the checkout is shallow (e.g. actions/checkout@v4 default fetch-depth: 1),
+    # unshallow now so that git merge-tree can find the merge base.  Without this,
+    # merge-tree exits rc=128 ("refusing to merge unrelated histories") and
+    # merge_tree_conflicts returns None (inconclusive).
+    rc_shallow, shallow_out = capture(["rev-parse", "--is-shallow-repository"])
+    if rc_shallow == 0 and shallow_out.strip() == "true":
+        logger.debug("Shallow clone detected; unshallowing from %s", remote)
+        rc_unshallow, _ = capture(["fetch", "--unshallow", remote])
+        if rc_unshallow != 0:
+            # Best-effort fallback: deepen history so merge-tree has a
+            # reasonable chance of finding the merge base.
+            logger.debug(
+                "--unshallow failed (rc=%d); trying --deepen=50 as fallback",
+                rc_unshallow,
+            )
+            capture(["fetch", "--deepen=50", remote])
+
     return local_ref
 
 

{collab_runtime-0.9.0 → collab_runtime-0.9.2}/collab/safe_subprocess.py

@@ -272,7 +272,7 @@ def capture(
     sp = get_subprocess()
     safe_argv = validate_argv(argv, policy=policy)
     kwargs: dict[str, Any] = {
-        "stderr": sp.DEVNULL,
+        "stderr": sp.PIPE,
         "timeout": timeout,
         "cwd": cwd,
     }

{collab_runtime-0.9.0 → collab_runtime-0.9.2/collab_runtime.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: collab-runtime
-Version: 0.9.0
+Version: 0.9.2
 Summary: Collaborative file locking runtime
 Author-email: KirilMT <kiril.mt95@gmail.com>
 License-Expression: MIT
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Version Control
-Requires-Python: >=3.10
+Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: python-dotenv>=1.2.2
@@ -21,6 +21,7 @@ Requires-Dist: supabase>=2.30.0
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: psutil>=5.9.8
 Requires-Dist: plyer>=2.1.0
+Requires-Dist: tomli>=2.0.0
 Dynamic: license-file
 
 # collab-runtime — Collaborative File Locking

{collab_runtime-0.9.0 → collab_runtime-0.9.2}/collab_runtime.egg-info/requires.txt

@@ -3,3 +3,4 @@ supabase>=2.30.0
 httpx>=0.28.1
 psutil>=5.9.8
 plyer>=2.1.0
+tomli>=2.0.0

{collab_runtime-0.9.0 → collab_runtime-0.9.2}/pyproject.toml

@@ -4,11 +4,11 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "collab-runtime"
-version = "0.9.0"
+version = "0.9.2"
 description = "Collaborative file locking runtime"
 readme = "docs/pypi/README.md"
 license = "MIT"
-requires-python = ">=3.10"
+requires-python = ">=3.10,<3.14"
 authors = [
   { name = "KirilMT", email = "kiril.mt95@gmail.com" }
 ]
@@ -28,7 +28,8 @@ dependencies = [
   "supabase>=2.30.0",
   "httpx>=0.28.1",
   "psutil>=5.9.8",
-  "plyer>=2.1.0"
+  "plyer>=2.1.0",
+  "tomli>=2.0.0",
 ]
 
 [project.scripts]