@smilintux/skcapstone 0.9.0 → 0.12.5

package/src/skcapstone/emotion_tracker.py

@@ -392,8 +392,8 @@ class EmotionTracker:
                 if item.get("timestamp", "") >= cutoff:
                     try:
                         entries.append(EmotionEntry(**item))
-                    except Exception:
-                        pass
+                    except Exception as exc:
+                        logger.warning("Failed to parse emotion log entry: %s", exc)
             return entries
         except Exception as exc:
             logger.debug("Failed to load emotion log: %s", exc)

package/src/skcapstone/export.py

@@ -235,7 +235,8 @@ def _read_agent_name(home: Path) -> str:
                 name = data.get("name") or data.get("agent_name")
                 if name:
                     return str(name)
-            except Exception:
+            except Exception as e:
+                logger.warning("export.py: %s", e)
                 continue
     return "unknown"
 
@@ -423,8 +424,8 @@ def _import_conversations(
                 existing_data = json.loads(peer_file.read_text(encoding="utf-8"))
                 if isinstance(existing_data, list):
                     existing_messages = existing_data
-            except Exception:
-                pass
+            except Exception as exc:
+                logger.warning("Failed to read existing conversation for peer %s: %s", peer, exc)
 
         # Deduplicate by (role, content, timestamp) tuple
         existing_keys = {

package/src/skcapstone/fuse_mount.py

@@ -15,11 +15,11 @@ Virtual directory layout::
     ├── identity/
     │   ├── card.json       — CapAuth identity card
     │   └── fingerprint.txt — PGP fingerprint
-    ├── inbox/              — SKComm incoming messages (read-only)
-    ├── outbox/             — Write here to send via SKComm
+    ├── inbox/              — SKComms incoming messages (read-only)
+    ├── outbox/             — Write here to send via SKComms
     └── coordination/       — Task board files (.json)
 
-Writing to ``/outbox/<agent_name>.msg`` enqueues a message via SKComm.
+Writing to ``/outbox/<agent_name>.msg`` enqueues a message via SKComms.
 
 Dependencies (optional):
     pip install skcapstone[fuse]  # pulls in fusepy
@@ -31,6 +31,7 @@ import errno
 import json
 import logging
 import os
+import platform
 import stat
 import subprocess
 import sys
@@ -314,7 +315,7 @@ def _build_fingerprint_txt(agent_home: Path) -> bytes:
 
 
 def _list_inbox(agent_home: Path) -> List[str]:
-    """List files in the SKComm inbox.
+    """List files in the SKComms inbox.
 
     Args:
         agent_home: Agent home directory.
@@ -329,7 +330,7 @@ def _list_inbox(agent_home: Path) -> List[str]:
 
 
 def _read_inbox_file(agent_home: Path, filename: str) -> Optional[bytes]:
-    """Read a message from the SKComm inbox.
+    """Read a message from the SKComms inbox.
 
     Args:
         agent_home: Agent home directory.
@@ -416,12 +417,12 @@ def _read_coordination_task(agent_home: Path, filename: str) -> Optional[bytes]:
 
 
 # ---------------------------------------------------------------------------
-# SKComm send helper
+# SKComms send helper
 # ---------------------------------------------------------------------------
 
 
-def _send_via_skcomm(agent_home: Path, recipient: str, message: str) -> bool:
-    """Send a message via SKComm by writing to the outbox directory.
+def _send_via_skcomms(agent_home: Path, recipient: str, message: str) -> bool:
+    """Send a message via SKComms by writing to the outbox directory.
 
     Attempts to use the skcapstone CLI for delivery. Falls back to writing
     an envelope JSON file in the outbox directory.
@@ -497,7 +498,7 @@ class SovereignFS:
 
     Exposes agent memories, identity, inbox, outbox, and coordination tasks
     as a read-mostly virtual filesystem. Writing to ``/outbox/<agent>.msg``
-    delivers a message via SKComm.
+    delivers a message via SKComms.
 
     This class is designed to be used with ``fusepy``:
 
@@ -513,7 +514,9 @@ class SovereignFS:
 
     def __init__(self, agent_home: Path) -> None:
         self._home = agent_home
-        agent_name = os.environ.get("SKCAPSTONE_AGENT", "lumina")
+        from . import active_agent_name
+
+        agent_name = os.environ.get("SKCAPSTONE_AGENT") or active_agent_name()
         self._memory_dir = agent_home / "agents" / agent_name / "memory"
         # Buffer for outbox writes: maps virtual path → bytes written so far
         self._outbox_buffers: Dict[str, bytes] = {}
@@ -829,7 +832,7 @@ class SovereignFS:
         return 0
 
     def flush(self, path: str, fh: int) -> int:
-        """Flush an outbox file buffer, delivering the message via SKComm.
+        """Flush an outbox file buffer, delivering the message via SKComms.
 
         Called when an outbox file handle is closed. The accumulated buffer
         is interpreted as the message body; the filename (without ``.msg``)
@@ -861,7 +864,7 @@ class SovereignFS:
             return 0
 
         if message:
-            _send_via_skcomm(self._home, recipient, message)
+            _send_via_skcomms(self._home, recipient, message)
 
         # Clear buffer after sending
         self._outbox_buffers.pop(path, None)
@@ -1001,16 +1004,17 @@ class FUSEDaemon:
         mount_str = str(self._mount_point)
 
         # Linux: parse /proc/mounts
-        proc_mounts = Path("/proc/mounts")
-        if proc_mounts.exists():
-            try:
-                for line in proc_mounts.read_text(encoding="utf-8").splitlines():
-                    parts = line.split()
-                    if len(parts) >= 2 and parts[1] == mount_str:
-                        return True
-            except OSError as exc:
-                logger.warning("Failed to read /proc/mounts: %s", exc)
-            return False
+        if platform.system() == "Linux":
+            proc_mounts = Path("/proc/mounts")
+            if proc_mounts.exists():
+                try:
+                    for line in proc_mounts.read_text(encoding="utf-8").splitlines():
+                        parts = line.split()
+                        if len(parts) >= 2 and parts[1] == mount_str:
+                            return True
+                except OSError as exc:
+                    logger.warning("Failed to read /proc/mounts: %s", exc)
+                return False
 
         # macOS / other: use mount command
         try:
@@ -1113,8 +1117,13 @@ class FUSEDaemon:
 
         mount_str = str(self._mount_point)
 
-        # Linux: fusermount
-        for cmd in (["fusermount", "-u", mount_str], ["umount", mount_str]):
+        # On Linux try fusermount first, then umount; on macOS skip fusermount
+        if platform.system() == "Linux":
+            unmount_cmds = [["fusermount", "-u", mount_str], ["umount", mount_str]]
+        else:
+            unmount_cmds = [["umount", mount_str]]
+
+        for cmd in unmount_cmds:
             try:
                 result = subprocess.run(cmd, capture_output=True, text=True, timeout=10)
                 if result.returncode == 0:
@@ -1130,7 +1139,8 @@ class FUSEDaemon:
             except (FileNotFoundError, subprocess.TimeoutExpired, OSError) as exc:
                 logger.debug("Unmount command %s failed: %s", cmd, exc)
 
-        logger.error("Could not unmount %s — try: fusermount -u %s", mount_str, mount_str)
+        hint = "fusermount -u" if platform.system() == "Linux" else "umount"
+        logger.error("Could not unmount %s — try: %s %s", mount_str, hint, mount_str)
         return False
 
     def status(self) -> Dict[str, Any]:

package/src/skcapstone/gui_installer.py

@@ -399,7 +399,7 @@ class InstallerApp:
         """Execute Path 1 (fresh) or Path 2 (join) install steps."""
         # Install pip packages
         self._log("Installing software packages...")
-        packages = ["capauth", "skmemory", "skcomm", "cloud9-protocol"]
+        packages = ["capauth", "skmemory", "skcomms", "cloud9"]
         try:
             result = subprocess.run(
                 [sys.executable, "-m", "pip", "install", *packages],
@@ -453,7 +453,7 @@ class InstallerApp:
     def _run_update(self) -> None:
         """Execute Path 3 update steps."""
         self._log("Updating software packages...")
-        packages = ["capauth", "skmemory", "skcomm", "cloud9-protocol", "skcapstone"]
+        packages = ["capauth", "skmemory", "skcomms", "cloud9", "skcapstone"]
         try:
             result = subprocess.run(
                 [sys.executable, "-m", "pip", "install", "--upgrade", *packages],

package/src/skcapstone/heartbeat.py

@@ -398,27 +398,30 @@ class HeartbeatBeacon:
             mem = psutil.virtual_memory()
             mem_used_mb = (mem.total - mem.available) // (1024 * 1024)
         except ImportError:
-            # Fallback: /proc on Linux
-            try:
-                loadavg = Path("/proc/loadavg")
-                if loadavg.exists():
-                    parts = loadavg.read_text().split()
-                    cpu_load = round(float(parts[0]), 2)
-            except Exception as exc:
-                logger.debug("CPU load fallback failed: %s", exc)
-            try:
-                meminfo = Path("/proc/meminfo")
-                if meminfo.exists():
-                    info: dict[str, int] = {}
-                    for line in meminfo.read_text().splitlines():
-                        parts = line.split()
-                        if len(parts) >= 2:
-                            info[parts[0].rstrip(":")] = int(parts[1])
-                    total_kb = info.get("MemTotal", 0)
-                    avail_kb = info.get("MemAvailable", 0)
-                    mem_used_mb = (total_kb - avail_kb) // 1024
-            except Exception as exc:
-                logger.debug("Memory fallback failed: %s", exc)
+            # Fallback: /proc on Linux only
+            if platform.system() == "Linux":
+                try:
+                    loadavg = Path("/proc/loadavg")
+                    if loadavg.exists():
+                        parts = loadavg.read_text().split()
+                        cpu_load = round(float(parts[0]), 2)
+                except Exception as exc:
+                    logger.debug("CPU load fallback failed: %s", exc)
+                try:
+                    meminfo = Path("/proc/meminfo")
+                    if meminfo.exists():
+                        info: dict[str, int] = {}
+                        for line in meminfo.read_text().splitlines():
+                            parts = line.split()
+                            if len(parts) >= 2:
+                                info[parts[0].rstrip(":")] = int(parts[1])
+                        total_kb = info.get("MemTotal", 0)
+                        avail_kb = info.get("MemAvailable", 0)
+                        mem_used_mb = (total_kb - avail_kb) // 1024
+                except Exception as exc:
+                    logger.debug("Memory fallback failed: %s", exc)
+            else:
+                logger.debug("psutil not available and not on Linux; skipping CPU/mem detection")
         except Exception as exc:
             logger.debug("CPU/mem detection failed: %s", exc)
 
@@ -439,14 +442,15 @@ class HeartbeatBeacon:
                 mem_total = mem.total // (1024 * 1024)
                 mem_avail = mem.available // (1024 * 1024)
             except ImportError:
-                # Fallback: read from /proc/meminfo on Linux
-                meminfo = Path("/proc/meminfo")
-                if meminfo.exists():
-                    for line in meminfo.read_text().splitlines():
-                        if line.startswith("MemTotal:"):
-                            mem_total = int(line.split()[1]) // 1024
-                        elif line.startswith("MemAvailable:"):
-                            mem_avail = int(line.split()[1]) // 1024
+                # Fallback: read from /proc/meminfo on Linux only
+                if platform.system() == "Linux":
+                    meminfo = Path("/proc/meminfo")
+                    if meminfo.exists():
+                        for line in meminfo.read_text().splitlines():
+                            if line.startswith("MemTotal:"):
+                                mem_total = int(line.split()[1]) // 1024
+                            elif line.startswith("MemAvailable:"):
+                                mem_avail = int(line.split()[1]) // 1024
 
             gpu_available = False
             gpu_name = ""
@@ -506,7 +510,7 @@ class HeartbeatBeacon:
             ("skcapstone", "skcapstone"),
             ("skmemory", "skmemory"),
             ("skchat", "skchat"),
-            ("skcomm", "skcomm"),
+            ("skcomms", "skcomms"),
             ("capauth", "capauth"),
             ("cloud9", "cloud9"),
         ]

package/src/skcapstone/housekeeping.py

@@ -2,9 +2,9 @@
 Housekeeping — storage pruning for the sovereign agent.
 
 Prunes stale files that accumulate in the agent profile:
-- ACK files in ~/.skcomm/acks/ (age-based, 24h default)
+- ACK files in ~/.skcomms/acks/ (age-based, 24h default)
 - Delivered envelopes in ~/.skcapstone/sync/comms/outbox/ (age-based, 48h)
-- Seed snapshots in ~/.skcapstone/sync/sync/outbox/ (count-based, keep 10)
+- Seed snapshots in ~/.skcapstone/sync/outbox/ (count-based, keep 10)
 
 These directories grow unbounded and can bloat a ~15MB profile to 300MB+.
 Run via daemon loop (hourly) or CLI: ``skcapstone housekeeping [--dry-run]``.
@@ -26,20 +26,20 @@ DEFAULT_COMMS_MAX_AGE_HOURS = 48
 DEFAULT_SEEDS_KEEP_PER_AGENT = 10
 
 
-def prune_acks(skcomm_home: Path, max_age_hours: int = DEFAULT_ACK_MAX_AGE_HOURS) -> int:
+def prune_acks(skcomms_home: Path, max_age_hours: int = DEFAULT_ACK_MAX_AGE_HOURS) -> int:
     """Remove ACK files older than max_age_hours.
 
-    ACK files in ~/.skcomm/acks/ confirm message delivery but are never
+    ACK files in ~/.skcomms/acks/ confirm message delivery but are never
     read after initial processing. They accumulate indefinitely.
 
     Args:
-        skcomm_home: Path to ~/.skcomm.
+        skcomms_home: Path to ~/.skcomms.
         max_age_hours: Delete ACKs older than this. Default 24.
 
     Returns:
         Number of files deleted.
     """
-    acks_dir = skcomm_home / "acks"
+    acks_dir = skcomms_home / "acks"
     if not acks_dir.is_dir():
         return 0
 
@@ -114,7 +114,7 @@ def prune_seeds(
 ) -> int:
     """Keep only the most recent seeds per agent, delete the rest.
 
-    Seed files in ~/.skcapstone/sync/sync/outbox/ are named like
+    Seed files in ~/.skcapstone/sync/outbox/ are named like
     ``<agent>-<timestamp>.json.gpg`` or ``<agent>-<timestamp>.json``.
     A new seed is pushed every 5 minutes by the daemon, so they
     accumulate quickly.
@@ -163,14 +163,14 @@ def prune_seeds(
 
 def run_housekeeping(
     skcapstone_home: Optional[Path] = None,
-    skcomm_home: Optional[Path] = None,
+    skcomms_home: Optional[Path] = None,
     dry_run: bool = False,
 ) -> dict:
     """Run all housekeeping tasks.
 
     Args:
         skcapstone_home: Path to ~/.skcapstone. Defaults to AGENT_HOME.
-        skcomm_home: Path to ~/.skcomm. Defaults to ~/.skcomm.
+        skcomms_home: Path to ~/.skcomms. Defaults to ~/.skcomms.
         dry_run: If True, report what would be deleted without deleting.
 
     Returns:
@@ -180,16 +180,16 @@ def run_housekeeping(
 
     if skcapstone_home is None:
         skcapstone_home = Path(AGENT_HOME).expanduser()
-    if skcomm_home is None:
-        skcomm_home = Path("~/.skcomm").expanduser()
+    if skcomms_home is None:
+        skcomms_home = Path("~/.skcomms").expanduser()
 
     results: dict[str, dict] = {}
 
     # Measure sizes before pruning
     targets = {
-        "acks": skcomm_home / "acks",
+        "acks": skcomms_home / "acks",
         "comms_outbox": skcapstone_home / "sync" / "comms" / "outbox",
-        "seed_outbox": skcapstone_home / "sync" / "sync" / "outbox",
+        "seed_outbox": skcapstone_home / "sync" / "outbox",
     }
 
     for key, path in targets.items():
@@ -214,7 +214,7 @@ def run_housekeeping(
         return results
 
     # Actually prune
-    results["acks"]["deleted"] = prune_acks(skcomm_home)
+    results["acks"]["deleted"] = prune_acks(skcomms_home)
     results["comms_outbox"]["deleted"] = prune_comms_outbox(skcapstone_home / "sync")
     results["seed_outbox"]["deleted"] = prune_seeds(targets["seed_outbox"])