From 377a22df210bb10c25d0e0eb353fa27abe8078d6 Mon Sep 17 00:00:00 2001
From: Teknium <127238744+teknium1@users.noreply.github.com>
Date: Thu, 3 Sep 2026 00:05:14 -0700
Subject: [PATCH] refactor(tools): org client walrus guards; _mirror_root
 handles org-level root

---
 tools/skills_sync_client.py     | 11 ++++-------
 tools/skills_sync_client_org.py | 22 ++++++++++------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/tools/skills_sync_client.py b/tools/skills_sync_client.py
index 32442e1bd7..354d1316a0 100644
--- a/tools/skills_sync_client.py
+++ b/tools/skills_sync_client.py
@@ -124,8 +124,7 @@ def _skills_dir() -> Path:
     return get_hermes_home() / "skills"
 
 
-def _org_dir() -> Path:
-    """Local mirror root for org skills (read-only by convention)."""
+def _org_dir() -> Path:  # local mirror root for org skills (read-only by convention)
     return _skills_dir() / ORG_DIR_NAME
 
 
@@ -300,8 +299,7 @@ def snapshot_profile(skill_names: List[str], *, max_object_bytes: int = DEFAULT_
     skill_tree_map: Dict[str, str] = {}
     root: Dict[str, Any] = {}
     for name in sorted(set(skill_names)):
-        rel = _skill_rel_path(name)
-        skill_dir = _find_skill_dir(name)
+        rel, skill_dir = _skill_rel_path(name), _find_skill_dir(name)
         if rel is None or skill_dir is None:
             continue
         try:
@@ -324,9 +322,8 @@ def _personal_client(identity: Optional[Dict[str, Any]], client: Optional[SyncCl
                      ) -> Tuple[Dict[str, Any], Optional[SyncClient]]:
     """Identity + client for a personal sync op; ``client`` is None when no base URL is configured."""
     identity = identity if identity is not None else resolve_identity()
-    if client is None:
-        base = resolve_sync_base_url()
-        client = SyncClient(base, identity["api_key"]) if base else None
+    if client is None and (base := resolve_sync_base_url()):
+        client = SyncClient(base, identity["api_key"])
     return identity, client
 
 
diff --git a/tools/skills_sync_client_org.py b/tools/skills_sync_client_org.py
index 8ac49ad851..936d915693 100644
--- a/tools/skills_sync_client_org.py
+++ b/tools/skills_sync_client_org.py
@@ -39,14 +39,14 @@ def org_head_ref(org_id: str) -> str:
 def resolve_org_identity() -> Dict[str, Any]:
     """``resolve_identity()`` + ``org_id``/``org_role``; SyncInertError without an ``org_role`` claim
     (personal org / old issuer): org sync unavailable, NOT an error."""
-    from tools.skills_sync_client import SyncInertError, resolve_identity
-    identity = resolve_identity()
+    ssc = _ssc()
+    identity = ssc.resolve_identity()
     claims = identity.get("claims") or {}
     org_id, org_role = claims.get("org_id"), claims.get("org_role")
     if not org_id:
-        raise SyncInertError("no organisation associated with this account")
+        raise ssc.SyncInertError("no organisation associated with this account")
     if not isinstance(org_role, str) or not org_role:
-        raise SyncInertError("this account isn't a member of a shared organisation")
+        raise ssc.SyncInertError("this account isn't a member of a shared organisation")
     identity.update(org_id=str(org_id), org_role=org_role)
     return identity
 
@@ -57,8 +57,7 @@ def _org_client(identity: Optional[Dict[str, Any]], client: Optional[SyncClient]
     ssc = _ssc()
     identity = identity or resolve_org_identity()
     if client is None:
-        base_url = ssc.resolve_sync_base_url()
-        if not base_url:
+        if not (base_url := ssc.resolve_sync_base_url()):
             raise ssc.SyncInertError("no sync base URL configured")
         client = SyncClient(base_url, identity["api_key"])
     caps, max_bytes = checked_capabilities(client)
@@ -73,8 +72,9 @@ def _read_org_head(client: SyncClient, org_id: str) -> Optional[str]:
 
 
 # Local mirror sidecars
-def _mirror_root(org_id: str) -> Path:
-    return _ssc()._org_dir() / org_id
+def _mirror_root(org_id: Optional[str]) -> Path:
+    """``<_org_dir>/<org_id>``; the org-level ``_org/`` root itself when *org_id* is None."""
+    return _ssc()._org_dir() / org_id if org_id else _ssc()._org_dir()
 
 
 def _write_sidecar(what: str, path_fn: Callable[[], Path], text: str) -> None:
@@ -105,7 +105,7 @@ def _skill_dir_fingerprint(path: Path) -> str:
 def _sidecar_path(org_id: Optional[str], const: str) -> Path:
     """``<mirror>/<agent.skill_utils.<const>>`` (org-level when org_id is None)."""
     import agent.skill_utils as sku
-    return (_mirror_root(org_id) if org_id else _ssc()._org_dir()) / getattr(sku, const)
+    return _mirror_root(org_id) / getattr(sku, const)
 
 
 def _read_org_baseline(org_id: str) -> Dict[str, Any]:
@@ -146,11 +146,9 @@ def _clear_active_org_marker() -> None:
 def org_skill_is_locally_modified(skill_rel_path: str, org_id: str) -> bool:
     """Local copy differs from upstream's fingerprint. No baseline (pre-existing mirror) => unmodified."""
     dest = _mirror_root(org_id) / PurePosixPath(skill_rel_path)
-    if not dest.is_dir():
-        return False
     entry = _read_org_baseline(org_id).get(skill_rel_path) or {}
     recorded = entry.get("fingerprint") if isinstance(entry, dict) else entry
-    return bool(recorded) and _skill_dir_fingerprint(dest) != recorded
+    return dest.is_dir() and bool(recorded) and _skill_dir_fingerprint(dest) != recorded
 
 
 def _active_org_id() -> Optional[str]: