@smilintux/skcapstone 0.5.8 → 0.5.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smilintux/skcapstone",
-  "version": "0.5.8",
+  "version": "0.5.10",
   "description": "SKCapstone - The sovereign agent framework. CapAuth identity, Cloud 9 trust, SKMemory persistence.",
   "main": "index.js",
   "types": "index.d.ts",

package/src/skcapstone/cli/daemon.py

@@ -314,22 +314,25 @@ def register_daemon_commands(main: click.Group) -> None:
             console.print()
 
         elif platform.system() == "Linux":
-            from ..systemd import install_service, systemd_available
+            from ..systemd import install_service, systemd_available, SERVICE_NAME
 
             if not systemd_available():
                 console.print("[red]systemd user session not available.[/]")
                 console.print("[dim]This command requires a Linux system with systemd.[/]")
                 raise SystemExit(1)
 
-            console.print("\n[cyan]Installing skcapstone systemd service...[/]")
-            result = install_service(start=start)
+            console.print(f"\n[cyan]Installing skcapstone systemd service for agent '{effective_agent}'...[/]")
+            result = install_service(agent_name=effective_agent, start=start)
+            svc_name = result.get("service_name", SERVICE_NAME)
 
             if result["installed"]:
-                console.print("[green]  Unit files installed.[/]")
+                console.print(f"[green]  Unit files installed ({svc_name}).[/]")
             if result["enabled"]:
-                console.print("[green]  Service enabled at login.[/]")
+                console.print(f"[green]  Service enabled at login.[/]")
             if result.get("started"):
-                console.print("[green]  Service started.[/]")
+                console.print(f"[green]  Service started.[/]")
+            else:
+                console.print(f"[dim]  Start: systemctl --user start {svc_name}[/]")
             console.print()
 
             if not result["installed"]:

package/src/skcapstone/data/systemd/skcapstone.service

@@ -6,8 +6,8 @@ Wants=network-online.target
 
 [Service]
 Type=simple
-ExecStart=%h/.skenv/bin/skcapstone daemon start --foreground
-ExecStop=%h/.skenv/bin/skcapstone daemon stop
+ExecStart=%h/.local/bin/skcapstone daemon start --foreground
+ExecStop=%h/.local/bin/skcapstone daemon stop
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
 RestartSec=10
@@ -16,7 +16,8 @@ MemoryMax=4G
 # Keep Ollama models warm for 5 minutes between requests
 Environment=PYTHONUNBUFFERED=1
 Environment=OLLAMA_KEEP_ALIVE=5m
-Environment=SKCAPSTONE_AGENT=lumina
+Environment=SKCAPSTONE_AGENT=sovereign
+Environment=SKCAPSTONE_HOME=%h/.skcapstone
 # Journal logging
 StandardOutput=journal
 StandardError=journal
@@ -26,7 +27,7 @@ SyslogIdentifier=skcapstone
 NoNewPrivileges=true
 ProtectSystem=strict
 ProtectHome=read-only
-ReadWritePaths=%h/.skcapstone %h/.skenv %h/.capauth %h/.cloud9 %h/.skcomm %h/.skchat
+ReadWritePaths=%h/.skcapstone %h/.skenv %h/.local %h/.config %h/.capauth %h/.cloud9 %h/.skcomm %h/.skchat
 PrivateTmp=true
 ProtectKernelTunables=true
 ProtectControlGroups=true

package/src/skcapstone/data/systemd/skcapstone@.service

@@ -20,8 +20,8 @@ Wants=network-online.target
 
 [Service]
 Type=notify
-ExecStart=skcapstone daemon start --agent %i --foreground
-ExecStop=skcapstone daemon stop --agent %i
+ExecStart=%h/.local/bin/skcapstone daemon start --agent %i --foreground
+ExecStop=%h/.local/bin/skcapstone daemon stop --agent %i
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
 RestartSec=10
@@ -41,7 +41,7 @@ SyslogIdentifier=skcapstone@%i
 NoNewPrivileges=true
 ProtectSystem=strict
 ProtectHome=read-only
-ReadWritePaths=%h/.skcapstone %h/.skmemory %h/.capauth %h/.cloud9 %h/.skcomm %h/.skchat
+ReadWritePaths=%h/.skcapstone %h/.skmemory %h/.local %h/.config %h/.capauth %h/.cloud9 %h/.skcomm %h/.skchat
 PrivateTmp=true
 ProtectKernelTunables=true
 ProtectControlGroups=true

package/src/skcapstone/onboard.py

@@ -1008,7 +1008,7 @@ def _step_autostart_service(agent_name: str = "sovereign") -> bool:
     system = platform.system()
 
     if system == "Linux":
-        return _step_systemd_service_linux()
+        return _step_systemd_service_linux(agent_name)
     elif system == "Darwin":
         return _step_launchd_service_macos(agent_name)
     else:
@@ -1019,8 +1019,17 @@ def _step_autostart_service(agent_name: str = "sovereign") -> bool:
         return False
 
 
-def _step_systemd_service_linux() -> bool:
-    """Install systemd user service (Linux only)."""
+def _step_systemd_service_linux(agent_name: str = "sovereign") -> bool:
+    """Install systemd user service for an agent (Linux only).
+
+    Uses the template unit ``skcapstone@.service`` so each agent
+    gets its own independent service instance. Multiple agents can
+    run simultaneously on the same machine.
+
+    Args:
+        agent_name: Agent slug from onboarding (e.g. "jarvis").
+    """
+    service_name = f"skcapstone@{agent_name}.service"
     if not click.confirm("  Install systemd user service for auto-start at login?", default=False):
         click.echo(
             click.style("  ↷ ", fg="bright_black")
@@ -1036,12 +1045,15 @@ def _step_systemd_service_linux() -> bool:
             click.echo(click.style("    ", fg="bright_black") + "Try: systemctl --user status")
             return False
 
-        result = install_service(enable=True, start=False)
+        result = install_service(agent_name=agent_name, enable=True, start=False)
         if result.get("installed"):
-            click.echo(click.style("  ✓ ", fg="green") + "Systemd service installed")
+            click.echo(click.style("  ✓ ", fg="green") + f"Systemd service installed")
             if result.get("enabled"):
-                click.echo(click.style("  ✓ ", fg="green") + "Service enabled — auto-starts at login")
-            click.echo(click.style("    ", fg="bright_black") + "Start now: systemctl --user start skcapstone")
+                click.echo(click.style("  ✓ ", fg="green") + f"Service enabled — auto-starts at login")
+            click.echo(
+                click.style("    ", fg="bright_black")
+                + f"Start now: systemctl --user start {service_name}"
+            )
             return True
         else:
             click.echo(click.style("  ✗ ", fg="red") + "Service install failed")

package/src/skcapstone/pillars/consciousness.py

@@ -28,7 +28,11 @@ def initialize_consciousness(home: Path) -> ConsciousnessState:
         ConsciousnessState with current status.
     """
     agent_name = os.environ.get("SKCAPSTONE_AGENT", "lumina")
-    whisper_dir = home / "agents" / agent_name / "skwhisper"
+    # home may be the agent dir (~/.skcapstone/agents/jarvis/) or the
+    # shared root (~/.skcapstone/). Check for skwhisper/ directly first.
+    whisper_dir = home / "skwhisper"
+    if not whisper_dir.exists():
+        whisper_dir = home / "agents" / agent_name / "skwhisper"
 
     state = ConsciousnessState()
 
@@ -81,11 +85,16 @@ def initialize_consciousness(home: Path) -> ConsciousnessState:
             pass
 
     # Check if consciousness daemon is running (systemd)
-    # Accept either the legacy skwhisper service or the skcapstone service
+    # Check template instance (skcapstone@<agent>), legacy single-agent, and skwhisper
     try:
         import subprocess
 
-        for service_name in ("skcapstone", "skwhisper"):
+        service_candidates = [
+            f"skcapstone@{agent_name}",  # multi-agent template unit
+            "skcapstone",                 # legacy single-agent unit
+            "skwhisper",                  # standalone skwhisper daemon
+        ]
+        for service_name in service_candidates:
             result = subprocess.run(
                 ["systemctl", "--user", "is-active", service_name],
                 capture_output=True,

package/src/skcapstone/systemd.py

@@ -121,24 +121,32 @@ def systemd_available() -> bool:
 
 
 def install_service(
+    agent_name: Optional[str] = None,
     unit_dir: Optional[Path] = None,
     source_dir: Optional[Path] = None,
     enable: bool = True,
     start: bool = True,
 ) -> dict:
-    """Install the skcapstone systemd user service.
+    """Install the skcapstone systemd user service for an agent.
 
-    Copies unit files to ~/.config/systemd/user/, reloads the
-    daemon, and optionally enables + starts the service.
+    When *agent_name* is provided, installs the template unit
+    ``skcapstone@.service`` and enables ``skcapstone@<agent>.service``.
+    This supports multiple agents running as independent services on
+    the same machine.
+
+    When *agent_name* is None, falls back to the single-agent
+    ``skcapstone.service`` unit for backwards compatibility.
 
     Args:
+        agent_name: Agent name (e.g. "jarvis"). Uses template unit.
         unit_dir: Target directory for unit files.
         source_dir: Directory containing the .service/.socket files.
         enable: Whether to enable the service at login.
         start: Whether to start the service immediately.
 
     Returns:
-        dict: Result with 'installed', 'enabled', 'started' bools.
+        dict: Result with 'installed', 'enabled', 'started' bools
+              and 'service_name' for the installed unit.
     """
     _require_linux()
     target = unit_dir or SYSTEMD_USER_DIR
@@ -146,15 +154,41 @@ def install_service(
 
     target.mkdir(parents=True, exist_ok=True)
 
-    result = {"installed": False, "enabled": False, "started": False, "timers_enabled": False}
-
-    service_src = source / SERVICE_NAME
-    if not service_src.exists():
-        logger.error("Service unit not found: %s", service_src)
-        return result
-
-    copied = 0
+    result = {
+        "installed": False,
+        "enabled": False,
+        "started": False,
+        "timers_enabled": False,
+        "service_name": "",
+    }
+
+    # Determine which unit to use
+    if agent_name:
+        # Multi-agent: use template unit skcapstone@.service
+        template_name = "skcapstone@.service"
+        instance_name = f"skcapstone@{agent_name}.service"
+        template_src = source / template_name
+        if not template_src.exists():
+            logger.error("Template unit not found: %s", template_src)
+            return result
+        shutil.copy2(template_src, target / template_name)
+        service_unit = instance_name
+        result["service_name"] = instance_name
+    else:
+        # Single-agent fallback
+        service_src = source / SERVICE_NAME
+        if not service_src.exists():
+            logger.error("Service unit not found: %s", service_src)
+            return result
+        shutil.copy2(service_src, target / SERVICE_NAME)
+        service_unit = SERVICE_NAME
+        result["service_name"] = SERVICE_NAME
+
+    # Copy ancillary units (socket, timers, etc.)
+    copied = 1  # already copied the main unit
     for unit_name in ALL_UNITS:
+        if unit_name == SERVICE_NAME:
+            continue  # already handled above
         src = source / unit_name
         if src.exists():
             shutil.copy2(src, target / unit_name)
@@ -162,10 +196,10 @@ def install_service(
 
     _systemctl("daemon-reload")
     result["installed"] = True
-    logger.info("Installed %d unit file(s) to %s", copied, target)
+    logger.info("Installed %d unit file(s) to %s (service: %s)", copied, target, service_unit)
 
     if enable:
-        r = _systemctl("enable", SERVICE_NAME)
+        r = _systemctl("enable", service_unit)
         result["enabled"] = r.returncode == 0
 
         timers_ok = True
@@ -177,7 +211,7 @@ def install_service(
         result["timers_enabled"] = timers_ok
 
     if start:
-        r = _systemctl("start", SERVICE_NAME)
+        r = _systemctl("start", service_unit)
         result["started"] = r.returncode == 0
 
         for timer in TIMER_UNITS: