cdx-manager 0.21.4 → 0.21.6

package/src/status_view.py

@@ -74,6 +74,17 @@ def _format_credits(value, empty="n/a"):
         return str(value)
 
 
+def _auth_type_label(row):
+    """`setup-token`, or with its remaining days once renewal is due."""
+    from .claude_credentials import SETUP_TOKEN_WARN_DAYS
+
+    label = row.get("auth_type") or "-"
+    days = row.get("auth_expires_in_days")
+    if days is None or days > SETUP_TOKEN_WARN_DAYS:
+        return label, False
+    return (f"{label} expired" if days < 0 else f"{label} {days}d"), True
+
+
 def _format_status_rows(rows, use_color=False, small=False):
     active_rows = [r for r in rows if r.get("enabled", True) is not False]
     def positive(value):
@@ -90,18 +101,19 @@ def _format_status_rows(rows, use_color=False, small=False):
     credits_visible = any(r.get("credits") is not None for r in active_rows)
     has_provider = len({r["provider"] for r in rows}) > 1 and not small
     has_label = any(r.get("label") for r in rows) and not small
+    type_visible = any(r.get("auth_type") for r in active_rows) and not small
     if small:
         headers = ["SESSION", "STATUS", "OK", "5H", "WEEK"] + [name for name, visible in zip(["RESETS", "RESET 5H", "RESET WEEK"], reset_visible) if visible]
     elif has_provider:
         headers = ["SESSION", "PROV."]
         if has_label:
             headers.append("LABEL")
-        headers += ["STATUS", "AUTH", "OK", "5H", "WEEK"] + (["BLOCK"] if block_visible else []) + (["CR"] if credits_visible else []) + [name for name, visible in zip(["RESETS", "RESET 5H", "RESET WEEK"], reset_visible) if visible] + ["UPDATED"]
+        headers += ["STATUS", "AUTH"] + (["TYPE"] if type_visible else []) + ["OK", "5H", "WEEK"] + (["BLOCK"] if block_visible else []) + (["CR"] if credits_visible else []) + [name for name, visible in zip(["RESETS", "RESET 5H", "RESET WEEK"], reset_visible) if visible] + ["UPDATED"]
     else:
         headers = ["SESSION"]
         if has_label:
             headers.append("LABEL")
-        headers += ["STATUS", "AUTH", "OK", "5H", "WEEK"] + (["BLOCK"] if block_visible else []) + (["CR"] if credits_visible else []) + [name for name, visible in zip(["RESETS", "RESET 5H", "RESET WEEK"], reset_visible) if visible] + ["UPDATED"]
+        headers += ["STATUS", "AUTH"] + (["TYPE"] if type_visible else []) + ["OK", "5H", "WEEK"] + (["BLOCK"] if block_visible else []) + (["CR"] if credits_visible else []) + [name for name, visible in zip(["RESETS", "RESET 5H", "RESET WEEK"], reset_visible) if visible] + ["UPDATED"]
     if not rows:
         if small:
             return "SESSION  STATUS  OK  5H  WEEK  RESETS  RESET 5H  RESET WEEK\nNo saved sessions yet."
@@ -130,6 +142,9 @@ def _format_status_rows(rows, use_color=False, small=False):
             auth = _format_auth_status(r)
             auth_color = "32" if auth == "logged" else "31" if auth == "logged out" else "2"
             base.append(_style(auth, auth_color, use_color))
+            if type_visible:
+                label, warn = _auth_type_label(r)
+                base.append(_style(label, "33" if warn else "2", use_color))
         if r.get("enabled", True) is False:
             usage_columns = [_style("-", "2", use_color)] * 6
         else:
@@ -365,6 +380,7 @@ def _format_status_detail(row, use_color=False):
         f"{_style('Provider:', '1', use_color)} {row.get('provider') or 'n/a'}",
         f"{_style('Status:', '1', use_color)} {_style(row.get('status') or ('enabled' if row.get('enabled', True) else 'disabled'), '2' if row.get('enabled', True) is False else '32', use_color)}",
         f"{_style('Auth:', '1', use_color)} {_style(auth, auth_color, use_color)}",
+        *([f"{_style('Auth type:', '1', use_color)} {_auth_type_label(row)[0]}"] if row.get("auth_type") else []),
         f"{_style('Available:', '1', use_color)} {_style_pct(row.get('available_pct'), use_color)}",
         f"{_style('5h left:', '1', use_color)} {_style_pct(row.get('remaining_5h_pct'), use_color)}",
         f"{_style('Week left:', '1', use_color)} {_style_pct(row.get('remaining_week_pct'), use_color)}",

package/src/tray_events.py

@@ -24,6 +24,8 @@ import json
 import os
 import time
 
+from .errors import CdxError
+
 SCHEMA_VERSION = 1
 # The tray heartbeats once per poll: 30s native, 60s across WSL. This window has
 # to clear the slowest of those with room for a late tick, or a live tray reads
@@ -130,12 +132,13 @@ def publish(base_dir, title, message, kind="complete", now=None, event_id=None,
         path = events_path(base_dir)
         os.makedirs(os.path.dirname(path), exist_ok=True)
         line = json.dumps(event, ensure_ascii=False) + "\n"
-        # O_APPEND makes this atomic against other hooks firing at the same
-        # instant, which a read-modify-write of a JSON array would not be.
-        with open(path, "a", encoding="utf-8") as handle:
+        # O_APPEND keeps concurrent hooks apart; the lock keeps this append
+        # out of acknowledge()'s read-and-replace, which would otherwise
+        # overwrite it and lose the notification.
+        with _spool_lock(path), open(path, "a", encoding="utf-8") as handle:
             handle.write(line)
         return True
-    except OSError:
+    except (OSError, CdxError):
         return False
 
 
@@ -171,6 +174,11 @@ def read_events(base_dir, include_acknowledged=False):
     return events[-MAX_SPOOLED_EVENTS:]
 
 
+# A hook must never stall an agent's turn on this lock; giving up only means
+# the alert is delivered directly instead.
+SPOOL_LOCK_TIMEOUT_SECONDS = 2
+
+
 def acknowledge(base_dir, ids, now=None):
     """Mark events consumed, idempotently, and compact when it is worth it.
 
@@ -183,6 +191,17 @@ def acknowledge(base_dir, ids, now=None):
     if not wanted:
         return {"acknowledged": 0, "compacted": False}
 
+    with _spool_lock(events_path(base_dir)):
+        return _acknowledge_locked(base_dir, wanted, now)
+
+
+def _spool_lock(path):
+    from .run_registry import _registry_lock
+
+    return _registry_lock(path, timeout_seconds=SPOOL_LOCK_TIMEOUT_SECONDS, label="tray events")
+
+
+def _acknowledge_locked(base_dir, wanted, now):
     try:
         with open(events_path(base_dir), encoding="utf-8") as handle:
             lines = handle.readlines()

package/src/tray_instance.py

@@ -6,9 +6,10 @@ per-user temporary directory, then `cdx-tray/companion.pid`.
 """
 import os
 import platform
-import subprocess
 import tempfile
 
+from .session_helpers import _process_is_running
+
 
 def lock_path(env=None):
     env = os.environ if env is None else env
@@ -20,20 +21,8 @@ def lock_path(env=None):
 
 
 def _is_alive(pid):
-    if platform.system() == "Windows":
-        result = subprocess.run(
-            ["tasklist", "/fi", f"PID eq {pid}", "/nh"],
-            capture_output=True, text=True, check=False,
-        )
-        return str(pid) in result.stdout
-    try:
-        os.kill(pid, 0)
-    except (ProcessLookupError, ValueError):
-        return False
-    except PermissionError:
-        # Alive, owned by someone else. Still a reason not to start a second.
-        return True
-    return True
+    # Alive includes owned by someone else: still a reason not to start a second.
+    return _process_is_running(pid)
 
 
 def companion_instance(env=None):

package/src/tray_logics.py

@@ -88,7 +88,7 @@ def _status(env=None, runner=None, executable=None, directories=None):
         try:
             completed = (runner or subprocess.run)(
                 [executable, "status", "--format", "json"], capture_output=True,
-                text=True, timeout=ADAPTER_TIMEOUT_SECONDS, check=False, **({"cwd": root} if root else {}),
+                text=True, encoding="utf-8", errors="replace", timeout=ADAPTER_TIMEOUT_SECONDS, check=False, **({"cwd": root} if root else {}),
             )
             payload = json.loads(completed.stdout) if getattr(completed, "returncode", 1) == 0 else None
         except (OSError, subprocess.SubprocessError, TypeError, ValueError):

package/src/update_all.py

@@ -33,7 +33,7 @@ def _which(command, env):
 def _run(command, env, runner=None, timeout=15):
     runner = runner or subprocess.run
     try:
-        result = runner(command, env=env, capture_output=True, text=True, check=False, timeout=timeout)
+        result = runner(command, env=env, capture_output=True, text=True, encoding="utf-8", errors="replace", check=False, timeout=timeout)
     except (OSError, subprocess.TimeoutExpired) as error:
         return {"returncode": 1, "stdout": "", "stderr": str(error)}
     if isinstance(result, dict):

package/src/update_check.py

@@ -143,7 +143,7 @@ def _installed_logics_manager_version(env=None, runner=None):
         result = runner(
             [executable, "--version"],
             capture_output=True,
-            text=True,
+            text=True, encoding="utf-8", errors="replace",
             timeout=2,
             env=env,
         )

package/src/update_manager.py

@@ -43,7 +43,7 @@ def _is_git_dirty(package_root):
         result = subprocess.run(
             ["git", "-C", str(package_root), "status", "--porcelain"],
             capture_output=True,
-            text=True,
+            text=True, encoding="utf-8", errors="replace",
             check=False,
         )
     except FileNotFoundError as error:
@@ -216,7 +216,11 @@ def _version_check_env(env):
     source = env or os.environ
     allowed = {
         key: source[key]
-        for key in ("PATH", "PATHEXT", "SystemRoot", "COMSPEC", "WINDIR")
+        # The home variables let the child find its home directory: without
+        # USERPROFILE, Windows Python's Path.home() raises and `cdx -v` prints
+        # a traceback instead of the version.
+        for key in ("PATH", "PATHEXT", "SystemRoot", "COMSPEC", "WINDIR",
+                    "HOME", "USERPROFILE", "HOMEDRIVE", "HOMEPATH", "CDX_HOME")
         if source.get(key)
     }
     return allowed
@@ -244,7 +248,7 @@ def verify_updated_command(target_version, runner=None, env=None):
             env=_version_check_env(env),
             check=False,
             capture_output=True,
-            text=True,
+            text=True, encoding="utf-8", errors="replace",
         )
     except OSError as error:
         return {