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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: collab-runtime
-Version: 0.9.2
+Version: 0.9.3
 Summary: Collaborative file locking runtime
 Author-email: KirilMT <kiril.mt95@gmail.com>
 License-Expression: MIT

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

@@ -230,9 +230,11 @@ def load_runtime_supabase_config(project_root: str) -> dict[str, Any]:
             val = os.getenv(name)
         return val
 
+    from .env_secrets import effective_anon_key, effective_service_role_key
+
     url = pick("SUPABASE_URL") or ""
-    anon = pick("SUPABASE_ANON_KEY") or ""
-    service = pick("SUPABASE_SERVICE_ROLE_KEY") or None
+    anon = effective_anon_key(pick("SUPABASE_ANON_KEY")) or ""
+    service = effective_service_role_key(pick("SUPABASE_SERVICE_ROLE_KEY"))
     user = _resolve_developer_name(project_root, file_vals)
     from . import agent_identity
 

collab_runtime-0.9.3/collab/env_secrets.py

@@ -0,0 +1,45 @@
+"""Resolve effective Supabase credentials from environment variables."""
+
+from __future__ import annotations
+
+import os
+import re
+from typing import Optional
+
+# Placeholder patterns copied from scripts/setup.ps1 (Test-IsPlaceholderValue).
+_PLACEHOLDER_ENV_RE = re.compile(
+    r"^(?:your[_-]|your[_-]?project|example|CHANGE_ME|change[_-]?me|"
+    r"replace[_-]?me|TODO|<team-)",
+    re.IGNORECASE,
+)
+
+
+def is_placeholder_env_value(value: Optional[str]) -> bool:
+    """Return True when *value* is unset or still a template placeholder."""
+    if value is None:
+        return True
+    stripped = value.strip()
+    if not stripped:
+        return True
+    return bool(_PLACEHOLDER_ENV_RE.match(stripped))
+
+
+def effective_env_secret(value: Optional[str]) -> Optional[str]:
+    """Return a usable secret or None when *value* is blank/placeholder."""
+    if is_placeholder_env_value(value):
+        return None
+    return value.strip() if value else None
+
+
+def effective_service_role_key(raw: Optional[str] = None) -> Optional[str]:
+    """Service role key for API calls, or None when placeholder/unset."""
+    if raw is None:
+        raw = os.getenv("SUPABASE_SERVICE_ROLE_KEY")
+    return effective_env_secret(raw)
+
+
+def effective_anon_key(raw: Optional[str] = None) -> Optional[str]:
+    """Anon key for API calls, or None when placeholder/unset."""
+    if raw is None:
+        raw = os.getenv("SUPABASE_ANON_KEY")
+    return effective_env_secret(raw)

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

@@ -28,7 +28,8 @@ from typing import Any, Callable, Optional, Protocol, cast
 
 from dotenv import load_dotenv
 
-from . import agent_identity, platform_probe, safe_subprocess
+from . import agent_identity, path_filter, platform_probe, safe_subprocess
+from .env_secrets import effective_anon_key, effective_service_role_key
 
 # NOTE: do NOT import collab-local modules before the runtime root and sys.path
 # setup is complete. The import for `logging_config` is moved
@@ -487,21 +488,13 @@ def _min_auto_lock_hold_seconds() -> int:
 
 
 def _should_ignore_path(path: str) -> bool:
-    """Return True for paths the watcher should skip."""
-    norm = path.replace("\\", "/")
-    if "/.git/" in norm or norm.startswith(".git/"):
-        return True
-    # Ignore runtime instance folders: they are environment artifacts and
-    # should not produce collaborative file locks.
-    if (
-        norm == "instance"
-        or norm.startswith("instance/")
-        or norm.endswith("/instance")
-        or "/instance/" in norm
-    ):
-        return True
-    # Do not ignore runtime-relative project paths here.
-    return False
+    """Return True for paths the watcher should skip.
+
+    Delegates to :func:`collab.path_filter.should_ignore_lock_path`, which also
+    honors ``COLLAB_LOCK_IGNORE`` and a project ``.collabignore`` so transient
+    scratch files never produce short-lived locks (#170).
+    """
+    return path_filter.should_ignore_lock_path(path, _PROJECT_ROOT)
 
 
 def _color(text: str, color: str) -> str:
@@ -734,6 +727,19 @@ def _process_new_files(client, branch: str, new_files: set[str]) -> None:
                     data[0].get("agent_label"),
                     data[0].get("agent_kind"),
                 )
+                # #172: a conflict against your OWN developer id is never a
+                # cross-developer merge risk. Under sticky attribution (#169) this
+                # only happens for same-developer CROSS-AGENT edits, which the
+                # per-poll watcher would otherwise spam as WARNING + desktop
+                # notification. Log it once at DEBUG and skip the notification.
+                if str(owner) == DEVELOPER_ID:
+                    logger.debug(
+                        "Self-lock on %s held by %s (same developer) — "
+                        "no cross-developer conflict; not renewing this poll.",
+                        fp,
+                        owner_display,
+                    )
+                    continue
                 _active_conflicts.add(fp)
                 msg = (
                     f"CONFLICT: {fp} is locked by {owner_display} -- "
@@ -901,8 +907,8 @@ def _start_dashboard_server() -> str | None:
 
     injected = {
         "url": SUPABASE_URL or "",
-        "anonKey": SUPABASE_ANON_KEY or "",
-        "serviceKey": SUPABASE_SERVICE_ROLE_KEY or None,
+        "anonKey": effective_anon_key(SUPABASE_ANON_KEY) or "",
+        "serviceKey": effective_service_role_key(SUPABASE_SERVICE_ROLE_KEY),
         "user": DEVELOPER_ID or "",
     }
     url, _html_path = prepare_dashboard_server(
@@ -1441,11 +1447,10 @@ def _graceful_shutdown() -> None:
     _shutdown_done = True
 
     dev_id = DEVELOPER_ID
-    if dev_id and SUPABASE_URL and SUPABASE_ANON_KEY and create_client is not None:
+    anon_key = effective_anon_key(SUPABASE_ANON_KEY)
+    if dev_id and SUPABASE_URL and anon_key and create_client is not None:
         try:
-            client = cast(Callable[..., Any], create_client)(
-                SUPABASE_URL, SUPABASE_ANON_KEY
-            )
+            client = cast(Callable[..., Any], create_client)(SUPABASE_URL, anon_key)
 
             # Determine which files are still in progress
             # (dirty OR committed-but-unpushed)
@@ -1913,7 +1918,7 @@ def main() -> None:
     )
     args = parser.parse_args()
 
-    if not SUPABASE_URL or not SUPABASE_ANON_KEY:
+    if not SUPABASE_URL or not effective_anon_key(SUPABASE_ANON_KEY):
         logger.error(
             "Missing SUPABASE_URL or SUPABASE_ANON_KEY in .env.\n"
             "See .env.example for setup."
@@ -2047,7 +2052,9 @@ def main() -> None:
         sys.exit(1)
     # static analyzers may still treat create_client as Optional; cast for
     # their sake so they recognize the value is callable beyond this point.
-    client = cast(Callable[..., Any], create_client)(SUPABASE_URL, SUPABASE_ANON_KEY)
+    client = cast(Callable[..., Any], create_client)(
+        SUPABASE_URL, effective_anon_key(SUPABASE_ANON_KEY)
+    )
 
     # Start local dashboard server for a clickable URL
     dashboard_url = _start_dashboard_server()