@smilintux/skcapstone 0.6.2 → 0.6.3

package/src/skcapstone/trust_graph.py

@@ -117,6 +117,8 @@ def build_trust_graph(home: Path) -> TrustGraph:
 
 def _add_self_node(home: Path, graph: TrustGraph) -> None:
     """Add the local agent as the central node."""
+    manifest_data: dict[str, Any] = {}
+
     identity_file = home / "identity" / "identity.json"
     if identity_file.exists():
         try:
@@ -130,20 +132,53 @@ def _add_self_node(home: Path, graph: TrustGraph) -> None:
                 fingerprint=data.get("fingerprint"),
                 metadata={"capauth_managed": data.get("capauth_managed", False)},
             ))
-            return
         except (json.JSONDecodeError, OSError):
             pass
 
     manifest = home / "manifest.json"
     if manifest.exists():
         try:
-            data = json.loads(manifest.read_text(encoding="utf-8"))
-            name = data.get("name", "self")
-            graph.agent_name = name
-            graph.add_node(TrustNode(id=name, label=name, node_type="agent"))
+            manifest_data = json.loads(manifest.read_text(encoding="utf-8"))
+            if not graph.nodes:
+                name = manifest_data.get("name", "self")
+                graph.agent_name = name
+                graph.add_node(TrustNode(id=name, label=name, node_type="agent"))
         except (json.JSONDecodeError, OSError):
             pass
 
+    _add_operator_edge(manifest_data, graph)
+
+
+def _add_operator_edge(manifest_data: dict[str, Any], graph: TrustGraph) -> None:
+    """Add an explicit human-operator relationship from manifest metadata."""
+    operator = manifest_data.get("operator")
+    if not isinstance(operator, dict):
+        return
+
+    name = str(operator.get("name", "")).strip()
+    if not name or not graph.agent_name:
+        return
+
+    node_id = str(operator.get("fingerprint", "")).strip() or f"operator:{name}"
+    graph.add_node(TrustNode(
+        id=node_id,
+        label=name,
+        node_type="peer",
+        fingerprint=str(operator.get("fingerprint", "")).strip() or None,
+        metadata={
+            "relationship": operator.get("relationship", "human-operator"),
+            "entity_type": operator.get("entity_type", "human"),
+            "source": operator.get("source", "manifest"),
+        },
+    ))
+    graph.add_edge(TrustEdge(
+        source=graph.agent_name,
+        target=node_id,
+        edge_type="operator",
+        label=operator.get("relationship", "human-operator"),
+        strength=1.0,
+    ))
+
 
 def _add_token_edges(home: Path, graph: TrustGraph) -> None:
     """Add edges from capability token issuance (issuer trusts subject)."""

package/src/skcapstone/unified_search.py

@@ -15,6 +15,7 @@ from __future__ import annotations
 
 import json
 import logging
+import os
 import re
 from dataclasses import dataclass, field
 from datetime import datetime, timezone
@@ -140,8 +141,16 @@ def _search_memories(
         List of SearchResult objects from the memory store.
     """
     results: list[SearchResult] = []
-    agent_name = os.environ.get("SKCAPSTONE_AGENT", "lumina")
-    mem_dir = home / "agents" / agent_name / "memory"
+    from . import active_agent_name
+
+    agent_name = os.environ.get("SKCAPSTONE_AGENT") or active_agent_name()
+    if home.parent.name == "agents":
+        # home is already an agent-specific dir (e.g. ~/.skcapstone/agents/lumina)
+        mem_dir = home / "memory"
+    elif agent_name:
+        mem_dir = home / "agents" / agent_name / "memory"
+    else:
+        mem_dir = home / "memory"
     if not mem_dir.exists():
         return results
 

package/systemd/skcapstone.service

@@ -16,20 +16,18 @@ MemoryMax=4G
 # Keep Ollama models warm for 5 minutes between requests
 Environment=PYTHONUNBUFFERED=1
 Environment=OLLAMA_KEEP_ALIVE=5m
+Environment=SKAGENT=lumina
 Environment=SKCAPSTONE_AGENT=lumina
+Environment=SKMEMORY_AGENT=lumina
 # Journal logging
 StandardOutput=journal
 StandardError=journal
 SyslogIdentifier=skcapstone
 
-# Security hardening
+# Security hardening (relaxed — ProtectHome=read-only breaks if any
+# ReadWritePaths dir is missing on the host)
 NoNewPrivileges=true
-ProtectSystem=strict
-ProtectHome=read-only
-ReadWritePaths=%h/.skcapstone %h/.skenv %h/.capauth %h/.cloud9 %h/.skcomm %h/.skchat
 PrivateTmp=true
-ProtectKernelTunables=true
-ProtectControlGroups=true
 
 [Install]
 WantedBy=default.target

package/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/.skenv/bin/skcapstone daemon start --agent %i --foreground
+ExecStop=%h/.skenv/bin/skcapstone daemon stop --agent %i
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
 RestartSec=10
@@ -31,20 +31,19 @@ WatchdogSec=300
 # resolve the correct per-agent home even before the CLI flag is processed.
 Environment=PYTHONUNBUFFERED=1
 Environment=OLLAMA_KEEP_ALIVE=5m
+Environment=SKAGENT=%i
 Environment=SKCAPSTONE_AGENT=%i
+Environment=SKMEMORY_AGENT=%i
+Environment=PATH=%h/.skenv/bin:/usr/local/bin:/usr/bin:/bin
 # Journal logging — logs appear under skcapstone@<instance>
 StandardOutput=journal
 StandardError=journal
 SyslogIdentifier=skcapstone@%i
 
-# Security hardening (same as single-agent unit)
+# Security hardening (relaxed — ProtectHome=read-only breaks if any
+# ReadWritePaths dir is missing on the host)
 NoNewPrivileges=true
-ProtectSystem=strict
-ProtectHome=read-only
-ReadWritePaths=%h/.skcapstone %h/.skmemory %h/.capauth %h/.cloud9 %h/.skcomm %h/.skchat
 PrivateTmp=true
-ProtectKernelTunables=true
-ProtectControlGroups=true
 
 [Install]
 WantedBy=default.target

package/systemd/skcomm-heartbeat.service

@@ -5,8 +5,8 @@ After=network-online.target
 
 [Service]
 Type=oneshot
-ExecStart=skcomm heartbeat --no-emit
-ExecStart=skcomm heartbeat
+ExecStart=%h/.skenv/bin/skcomm heartbeat --no-emit
+ExecStart=%h/.skenv/bin/skcomm heartbeat
 Nice=19
 
 NoNewPrivileges=true
@@ -16,3 +16,6 @@ ReadWritePaths=%h/.skcapstone %h/.skcomm
 PrivateTmp=true
 
 Environment=PYTHONUNBUFFERED=1
+Environment=SKAGENT=lumina
+Environment=SKCAPSTONE_AGENT=lumina
+Environment=PATH=%h/.skenv/bin:/usr/local/bin:/usr/bin:/bin

package/tests/conftest.py

@@ -19,6 +19,27 @@ from pathlib import Path
 import pytest
 
 
+@pytest.fixture(autouse=True)
+def _isolate_agent_env(monkeypatch):
+    """Prevent host SKCAPSTONE_AGENT / SKMEMORY_AGENT from leaking into unit tests.
+
+    The profile-aware runtime reads both the env var and the module-level
+    skcapstone.SKCAPSTONE_AGENT (set at import time).  We clear both so that
+    _memory_dir() falls back to the flat "home/memory" layout expected by
+    tests that use the tmp_agent_home fixture.
+    Tests that need a specific agent should override explicitly via monkeypatch.
+    """
+    monkeypatch.delenv("SKCAPSTONE_AGENT", raising=False)
+    monkeypatch.delenv("SKMEMORY_AGENT", raising=False)
+    import skcapstone
+    monkeypatch.setattr(skcapstone, "SKCAPSTONE_AGENT", "")
+    # _detect_active_agent() scans ~/.skcapstone/agents/ even when the env var
+    # is cleared, returning a real agent name that routes memory writes to the
+    # wrong directory.  Stub it out so tests using tmp directories get the flat
+    # "home/memory" layout they expect.
+    monkeypatch.setattr(skcapstone, "_detect_active_agent", lambda root=None: None)
+
+
 @pytest.fixture
 def tmp_agent_home(tmp_path: Path) -> Path:
     """Provide a temporary agent home directory for testing."""

package/tests/test_agent_home_scaffold.py

@@ -0,0 +1,34 @@
+"""Tests for fresh agent-home scaffolding."""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+from unittest.mock import patch
+
+from skcapstone.migrate_multi_agent import create_agent_home
+
+
+class TestCreateAgentHome:
+    def test_manifest_includes_human_operator_when_available(self, tmp_path: Path):
+        """New agent homes persist the linked human operator in manifest.json."""
+        with patch(
+            "skcapstone.migrate_multi_agent.discover_human_operator",
+            return_value={"name": "Casey", "fingerprint": "FP123", "relationship": "human-operator"},
+        ):
+            result = create_agent_home(tmp_path, "teddy")
+
+        manifest = json.loads((tmp_path / "agents" / "teddy" / "manifest.json").read_text())
+        assert result["agent_name"] == "teddy"
+        assert manifest["name"] == "teddy"
+        assert manifest["operator"]["name"] == "Casey"
+        assert manifest["operator"]["fingerprint"] == "FP123"
+
+    def test_manifest_omits_operator_when_none_available(self, tmp_path: Path):
+        """New agent homes still create a valid manifest when no operator exists yet."""
+        with patch("skcapstone.migrate_multi_agent.discover_human_operator", return_value=None):
+            create_agent_home(tmp_path, "lumina")
+
+        manifest = json.loads((tmp_path / "agents" / "lumina" / "manifest.json").read_text())
+        assert manifest["name"] == "lumina"
+        assert "operator" not in manifest

package/tests/test_backup.py

@@ -237,7 +237,8 @@ class TestBackupManifest:
     def test_manifest_defaults(self) -> None:
         """Manifest has sensible defaults."""
         m = BackupManifest()
-        assert m.version == "0.9.0"
+        import skcapstone
+        assert m.version == skcapstone.__version__
         assert m.files == {}
         assert m.total_size == 0
 

package/tests/test_mcp_server.py

@@ -76,14 +76,15 @@ class TestToolListing:
     async def test_list_tools_returns_all(self):
         """list_tools returns all registered tools."""
         tools = await list_tools()
-        assert len(tools) == 68
+        assert len(tools) == 122
 
     @pytest.mark.asyncio
     async def test_tool_names(self):
         """All required tool names are registered."""
         tools = await list_tools()
         names = {t.name for t in tools}
-        expected = {
+        # Verify all known core tools are registered; exact set may grow with new modules.
+        core_expected = {
             "agent_status",
             "memory_store",
             "memory_search",
@@ -98,7 +99,6 @@ class TestToolListing:
             "coord_create",
             "ritual",
             "soul_show",
-            "journal_write",
             "journal_read",
             "anchor_show",
             "germination",
@@ -122,48 +122,93 @@ class TestToolListing:
             "skchat_inbox",
             "skchat_group_create",
             "skchat_group_send",
-            # Heartbeat
             "heartbeat_pulse",
             "heartbeat_peers",
             "heartbeat_health",
             "heartbeat_find_capable",
-            # File transfer
             "file_send",
             "file_receive",
             "file_list",
             "file_status",
-            # Pub/sub
             "pubsub_publish",
             "pubsub_subscribe",
             "pubsub_poll",
             "pubsub_topics",
-            # Memory fortress
             "fortress_verify",
             "fortress_seal_existing",
             "fortress_status",
-            # Memory promoter
             "promoter_sweep",
             "promoter_history",
-            # KMS
             "kms_status",
             "kms_list_keys",
             "kms_rotate",
-            # SKSeed (Logic Kernel)
             "skseed_collide",
             "skseed_audit",
             "skseed_philosopher",
             "skseed_truth_check",
             "skseed_alignment",
-            # Model Router
             "model_route",
-            # Consciousness
             "consciousness_status",
             "consciousness_test",
-            # Notifications & pub/sub stats
             "send_notification",
             "pubsub_stats",
+            # Newer tools added post-v0.3
+            "brain_first_check",
+            "capauth_secret_get",
+            "capauth_status",
+            "capauth_verify",
+            "chat_history",
+            "chat_send",
+            "comm_notify",
+            "comm_status",
+            "deploy_status",
+            "did_identity_card",
+            "did_policy",
+            "did_publish",
+            "did_show",
+            "did_verify_peer",
+            "emotion_trend",
+            "gtd_capture",
+            "gtd_clarify",
+            "gtd_done",
+            "gtd_inbox",
+            "gtd_move",
+            "gtd_next",
+            "gtd_projects",
+            "gtd_review",
+            "gtd_status",
+            "gtd_waiting",
+            "itil_cab_vote",
+            "itil_change_propose",
+            "itil_change_update",
+            "itil_incident_create",
+            "itil_incident_list",
+            "itil_incident_update",
+            "itil_kedb_search",
+            "itil_problem_create",
+            "itil_problem_update",
+            "itil_status",
+            "run_ansible_playbook",
+            "security_audit_log",
+            "security_status",
+            "skstacks_secret_get",
+            "skstacks_secret_set",
+            "soul_registry_publish",
+            "soul_registry_search",
+            "telegram_catchup",
+            "telegram_chats",
+            "telegram_import",
+            "telegram_import_api",
+            "telegram_poll",
+            "telegram_send",
+            "telegram_setup",
+            "telegram_soul_swap",
+            "trust_febs",
+            "trust_rehydrate",
+            "trust_status",
+            "version_check",
         }
-        assert names == expected
+        assert core_expected.issubset(names)
 
     @pytest.mark.asyncio
     async def test_tool_schemas_valid(self):
@@ -709,7 +754,7 @@ class TestSKChatTools:
     @pytest.mark.asyncio
     async def test_skchat_send_requires_params(self):
         """skchat_send without recipient/message returns error."""
-        with patch("skcapstone.mcp_tools.chat_tools._get_skchat_identity", return_value="capauth:test@local"):
+        with patch("skcapstone.mcp_server._get_skchat_identity", return_value="capauth:test@local"):
             result = await call_tool("skchat_send", {})
         parsed = _extract_json(result)
         assert "error" in parsed
@@ -717,7 +762,7 @@ class TestSKChatTools:
     @pytest.mark.asyncio
     async def test_skchat_send_requires_message(self):
         """skchat_send with only recipient returns error."""
-        with patch("skcapstone.mcp_tools.chat_tools._get_skchat_identity", return_value="capauth:test@local"):
+        with patch("skcapstone.mcp_server._get_skchat_identity", return_value="capauth:test@local"):
             result = await call_tool("skchat_send", {"recipient": "lumina"})
         parsed = _extract_json(result)
         assert "error" in parsed
@@ -734,8 +779,8 @@ class TestSKChatTools:
         })()
 
         with (
-            patch("skcapstone.mcp_tools.chat_tools._get_skchat_identity", return_value="capauth:opus@local"),
-            patch("skcapstone.mcp_tools.chat_tools._resolve_recipient", return_value="capauth:lumina@local"),
+            patch("skcapstone.mcp_server._get_skchat_identity", return_value="capauth:opus@local"),
+            patch("skcapstone.mcp_server._resolve_recipient", return_value="capauth:lumina@local"),
             patch("skchat.agent_comm.AgentMessenger.from_identity", return_value=mock_messenger),
         ):
             result = await call_tool(
@@ -760,8 +805,8 @@ class TestSKChatTools:
         mock_messenger = type("M", (), {"send": lambda self, **kw: capture_send(**kw)})()
 
         with (
-            patch("skcapstone.mcp_tools.chat_tools._get_skchat_identity", return_value="capauth:opus@local"),
-            patch("skcapstone.mcp_tools.chat_tools._resolve_recipient", return_value="capauth:jarvis@local"),
+            patch("skcapstone.mcp_server._get_skchat_identity", return_value="capauth:opus@local"),
+            patch("skcapstone.mcp_server._resolve_recipient", return_value="capauth:jarvis@local"),
             patch("skchat.agent_comm.AgentMessenger.from_identity", return_value=mock_messenger),
         ):
             result = await call_tool(
@@ -797,7 +842,7 @@ class TestSKChatTools:
         })()
 
         with (
-            patch("skcapstone.mcp_tools.chat_tools._get_skchat_identity", return_value="capauth:opus@local"),
+            patch("skcapstone.mcp_server._get_skchat_identity", return_value="capauth:opus@local"),
             patch("skchat.agent_comm.AgentMessenger.from_identity", return_value=mock_messenger),
         ):
             result = await call_tool("skchat_inbox", {})
@@ -830,7 +875,7 @@ class TestSKChatTools:
         })()
 
         with (
-            patch("skcapstone.mcp_tools.chat_tools._get_skchat_identity", return_value="capauth:opus@local"),
+            patch("skcapstone.mcp_server._get_skchat_identity", return_value="capauth:opus@local"),
             patch("skchat.agent_comm.AgentMessenger.from_identity", return_value=mock_messenger),
         ):
             result = await call_tool("skchat_inbox", {"limit": 10})
@@ -850,7 +895,7 @@ class TestSKChatTools:
         })()
 
         with (
-            patch("skcapstone.mcp_tools.chat_tools._get_skchat_identity", return_value="capauth:opus@local"),
+            patch("skcapstone.mcp_server._get_skchat_identity", return_value="capauth:opus@local"),
             patch("skchat.agent_comm.AgentMessenger.from_identity", return_value=mock_messenger),
         ):
             result = await call_tool("skchat_inbox", {"message_type": "finding"})
@@ -861,7 +906,7 @@ class TestSKChatTools:
     @pytest.mark.asyncio
     async def test_skchat_group_create_requires_name(self):
         """skchat_group_create without name returns error."""
-        with patch("skcapstone.mcp_tools.chat_tools._get_skchat_identity", return_value="capauth:opus@local"):
+        with patch("skcapstone.mcp_server._get_skchat_identity", return_value="capauth:opus@local"):
             result = await call_tool("skchat_group_create", {})
         parsed = _extract_json(result)
         assert "error" in parsed
@@ -874,8 +919,8 @@ class TestSKChatTools:
         })()
 
         with (
-            patch("skcapstone.mcp_tools.chat_tools._get_skchat_identity", return_value="capauth:opus@local"),
-            patch("skcapstone.mcp_tools.chat_tools._get_skchat_history", return_value=mock_history),
+            patch("skcapstone.mcp_server._get_skchat_identity", return_value="capauth:opus@local"),
+            patch("skcapstone.mcp_server._get_skchat_history", return_value=mock_history),
         ):
             result = await call_tool(
                 "skchat_group_create",
@@ -895,9 +940,9 @@ class TestSKChatTools:
         })()
 
         with (
-            patch("skcapstone.mcp_tools.chat_tools._get_skchat_identity", return_value="capauth:opus@local"),
-            patch("skcapstone.mcp_tools.chat_tools._get_skchat_history", return_value=mock_history),
-            patch("skcapstone.mcp_tools.chat_tools._resolve_recipient", side_effect=lambda n: f"capauth:{n}@local"),
+            patch("skcapstone.mcp_server._get_skchat_identity", return_value="capauth:opus@local"),
+            patch("skcapstone.mcp_server._get_skchat_history", return_value=mock_history),
+            patch("skcapstone.mcp_server._resolve_recipient", side_effect=lambda n: f"capauth:{n}@local"),
         ):
             result = await call_tool(
                 "skchat_group_create",
@@ -922,7 +967,7 @@ class TestSKChatTools:
             "get_thread": lambda self, gid: None,
         })()
 
-        with patch("skcapstone.mcp_tools.chat_tools._get_skchat_history", return_value=mock_history):
+        with patch("skcapstone.mcp_server._get_skchat_history", return_value=mock_history):
             result = await call_tool(
                 "skchat_group_send",
                 {"group_id": "nonexistent", "message": "Hello"},
@@ -938,7 +983,7 @@ class TestSKChatTools:
             "get_thread": lambda self, gid: {"title": "Just a thread"},
         })()
 
-        with patch("skcapstone.mcp_tools.chat_tools._get_skchat_history", return_value=mock_history):
+        with patch("skcapstone.mcp_server._get_skchat_history", return_value=mock_history):
             result = await call_tool(
                 "skchat_group_send",
                 {"group_id": "thread-123", "message": "Hello"},
@@ -982,8 +1027,8 @@ class TestSKChatTools:
         })()
 
         with (
-            patch("skcapstone.mcp_tools.chat_tools._get_skchat_identity", return_value="capauth:opus@local"),
-            patch("skcapstone.mcp_tools.chat_tools._get_skchat_history", return_value=mock_history),
+            patch("skcapstone.mcp_server._get_skchat_identity", return_value="capauth:opus@local"),
+            patch("skcapstone.mcp_server._get_skchat_history", return_value=mock_history),
         ):
             result = await call_tool(
                 "skchat_group_send",

package/tests/test_multi_agent.py

@@ -2,7 +2,7 @@
 
 Covers:
 - Per-agent home directory resolution (opus → agents/opus/, jarvis → agents/jarvis/)
-- Per-agent port assignment (opus=7777, jarvis=7778, unknown → next available)
+- Default daemon port behavior under the profile-agnostic runtime
 - Default (no-agent) mode keeps backward-compatible home and port
 - SKCAPSTONE_AGENT env var propagation
 - DaemonConfig accepts distinct homes and ports for simultaneous agents
@@ -13,7 +13,6 @@ Covers:
 
 from __future__ import annotations
 
-import json
 import os
 from pathlib import Path
 from unittest.mock import MagicMock, patch
@@ -84,17 +83,19 @@ class TestResolveAgentHome:
 
 
 class TestResolveAgentPort:
-    def test_opus_gets_7777(self):
-        """opus always gets port 7777."""
+    def test_known_agent_uses_registered_default_port(self):
+        """Known agents use the registered default daemon port."""
+        from skcapstone import AGENT_PORTS, DEFAULT_PORT
         from skcapstone.cli.daemon import _resolve_agent_port
 
-        assert _resolve_agent_port("opus", None) == 7777
+        assert _resolve_agent_port("opus", None) == AGENT_PORTS["opus"] == DEFAULT_PORT
 
-    def test_jarvis_gets_7778(self):
-        """jarvis always gets port 7778."""
+    def test_second_known_agent_uses_registered_default_port(self):
+        """Jarvis also uses the registered default daemon port."""
+        from skcapstone import AGENT_PORTS, DEFAULT_PORT
         from skcapstone.cli.daemon import _resolve_agent_port
 
-        assert _resolve_agent_port("jarvis", None) == 7778
+        assert _resolve_agent_port("jarvis", None) == AGENT_PORTS["jarvis"] == DEFAULT_PORT
 
     def test_explicit_port_overrides_agent_default(self):
         """Explicit --port always wins over the agent default."""
@@ -103,11 +104,12 @@ class TestResolveAgentPort:
         assert _resolve_agent_port("opus", 9999) == 9999
         assert _resolve_agent_port("jarvis", 8000) == 8000
 
-    def test_no_agent_defaults_to_7777(self):
-        """Single-agent / no-flag mode uses 7777."""
+    def test_no_agent_defaults_to_default_port(self):
+        """Single-agent / no-flag mode uses the package default port."""
+        from skcapstone import DEFAULT_PORT
         from skcapstone.cli.daemon import _resolve_agent_port
 
-        assert _resolve_agent_port(None, None) == 7777
+        assert _resolve_agent_port(None, None) == DEFAULT_PORT
 
     def test_unknown_agent_gets_next_port(self):
         """An agent not in AGENT_PORTS gets max(ports)+1."""
@@ -118,11 +120,11 @@ class TestResolveAgentPort:
         result = _resolve_agent_port("brandnew", None)
         assert result == expected
 
-    def test_opus_and_jarvis_ports_differ(self):
-        """Opus and Jarvis must listen on different ports."""
+    def test_explicit_ports_can_differ_for_isolated_agents(self):
+        """Simultaneous agent daemons can still isolate by explicit port."""
         from skcapstone.cli.daemon import _resolve_agent_port
 
-        assert _resolve_agent_port("opus", None) != _resolve_agent_port("jarvis", None)
+        assert _resolve_agent_port("opus", 7777) != _resolve_agent_port("jarvis", 7778)
 
 
 # ---------------------------------------------------------------------------
@@ -132,22 +134,22 @@ class TestResolveAgentPort:
 
 class TestAgentPortsRegistry:
     def test_opus_registered(self):
-        from skcapstone import AGENT_PORTS
+        from skcapstone import AGENT_PORTS, DEFAULT_PORT
 
         assert "opus" in AGENT_PORTS
-        assert AGENT_PORTS["opus"] == 7777
+        assert AGENT_PORTS["opus"] == DEFAULT_PORT
 
     def test_jarvis_registered(self):
-        from skcapstone import AGENT_PORTS
+        from skcapstone import AGENT_PORTS, DEFAULT_PORT
 
         assert "jarvis" in AGENT_PORTS
-        assert AGENT_PORTS["jarvis"] == 7778
+        assert AGENT_PORTS["jarvis"] == DEFAULT_PORT
 
-    def test_all_ports_unique(self):
+    def test_all_ports_are_ints(self):
         from skcapstone import AGENT_PORTS
 
-        ports = list(AGENT_PORTS.values())
-        assert len(ports) == len(set(ports)), "Duplicate ports in AGENT_PORTS"
+        assert AGENT_PORTS
+        assert all(isinstance(port, int) for port in AGENT_PORTS.values())
 
 
 # ---------------------------------------------------------------------------
@@ -220,8 +222,7 @@ class TestDaemonConfigMultiAgent:
 
         assert opus_cfg.home != jarvis_cfg.home
         assert opus_cfg.port != jarvis_cfg.port
-        assert opus_cfg.port == 7777
-        assert jarvis_cfg.port == 7778
+
 
     def test_log_files_are_in_respective_homes(self, tmp_path: Path):
         """Each agent's log file lives under its own home."""
@@ -244,24 +245,25 @@ class TestDaemonConfigMultiAgent:
 
 
 class TestAgentHomeEnvVar:
-    def test_env_var_produces_agents_subdir(self, monkeypatch):
-        """SKCAPSTONE_AGENT=opus → AGENT_HOME includes agents/opus."""
+    def test_env_var_keeps_shared_root_and_agent_home_resolves_subdir(self, monkeypatch):
+        """SKCAPSTONE_AGENT keeps AGENT_HOME at root and agent_home() resolves the agent subdir."""
         import importlib
 
         monkeypatch.setenv("SKCAPSTONE_AGENT", "opus")
-        monkeypatch.setenv("SKCAPSTONE_ROOT", "/tmp/sk")
+        monkeypatch.setenv("SKCAPSTONE_HOME", "/tmp/sk")
 
         import skcapstone as pkg
         importlib.reload(pkg)
 
-        assert "agents/opus" in pkg.AGENT_HOME or "agents\\opus" in pkg.AGENT_HOME
+        assert pkg.AGENT_HOME == "/tmp/sk"
+        assert "agents/opus" in str(pkg.agent_home("opus")) or "agents\\opus" in str(pkg.agent_home("opus"))
 
     def test_no_env_var_uses_root_directly(self, monkeypatch):
-        """Without SKCAPSTONE_AGENT, AGENT_HOME == SKCAPSTONE_ROOT."""
+        """Without SKCAPSTONE_AGENT, AGENT_HOME stays at the shared root."""
         import importlib
 
         monkeypatch.delenv("SKCAPSTONE_AGENT", raising=False)
-        monkeypatch.setenv("SKCAPSTONE_ROOT", "/tmp/sk")
+        monkeypatch.setenv("SKCAPSTONE_HOME", "/tmp/sk")
 
         import skcapstone as pkg
         importlib.reload(pkg)