code-agnostic 0.5.0__tar.gz → 0.6.0__tar.gz

{code_agnostic-0.5.0 → code_agnostic-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-agnostic
-Version: 0.5.0
+Version: 0.6.0
 Summary: Centralized hub for LLM coding config: MCP, skills, rules, and agents.
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{code_agnostic-0.5.0 → code_agnostic-0.6.0}/code_agnostic/__init__.py

@@ -1,3 +1,3 @@
 __all__ = ["__version__"]
 
-__version__ = "0.5.0"
+__version__ = "0.6.0"

{code_agnostic-0.5.0 → code_agnostic-0.6.0}/code_agnostic/apps/apps_service.py

@@ -201,14 +201,11 @@ class AppsService:
     def _cleanup_global_mcp(
         self, app_id: AppId, managed_mcp: dict[str, Any]
     ) -> list[Action]:
-        scope = app_scope(app_id, "mcp")
-        raw = managed_mcp.get(scope, [])
-        managed = (
-            {item for item in raw if isinstance(item, str)}
-            if isinstance(raw, list)
-            else set()
+        managed = self._names_for_scope(managed_mcp, app_scope(app_id, "mcp"))
+        managed_agents = self._names_for_scope(
+            managed_mcp, app_scope(app_id, "agents_registry")
         )
-        if not managed:
+        if not managed and not managed_agents:
             return []
         try:
             service = create_registered_app_service(app_id)
@@ -216,9 +213,23 @@ class AppsService:
             return []
         if not service.repository.config_path.exists():
             return []
-        # Empty desired + our previously-managed names → prune only our servers,
-        # keep the user's, and clear managed_mcp state (mcp_managed becomes []).
-        return [service.build_action({}, previously_managed=managed)]
+        # Empty desired + our previously-managed names → prune only what we wrote
+        # (MCP servers and agent-registry entries), keep the user's, and clear the
+        # ownership state (managed_entries becomes empty).
+        return [
+            service.build_action(
+                {},
+                previously_managed=managed,
+                previously_managed_agents=managed_agents,
+            )
+        ]
+
+    @staticmethod
+    def _names_for_scope(group: dict[str, Any], scope: str) -> set[str]:
+        raw = group.get(scope, [])
+        if not isinstance(raw, list):
+            return set()
+        return {item for item in raw if isinstance(item, str)}
 
     def list_status_rows(self) -> list[AppStatusRow]:
         apps = self.load_apps()

{code_agnostic-0.5.0 → code_agnostic-0.6.0}/code_agnostic/apps/claude/service.py

@@ -12,7 +12,6 @@ from code_agnostic.apps.common.framework import RegisteredAppConfigService
 from code_agnostic.apps.common.interfaces.mapper import IAppMCPMapper
 from code_agnostic.apps.common.interfaces.repositories import IAppConfigRepository
 from code_agnostic.apps.common.models import MCPServerDTO
-from code_agnostic.errors import InvalidConfigSchemaError
 from code_agnostic.models import Action, ActionKind, ActionStatus
 from code_agnostic.skills.compilers import ClaudeSkillCompiler
 from code_agnostic.skills.parser import parse_skill
@@ -57,12 +56,6 @@ class ClaudeConfigService(RegisteredAppConfigService):
     def mcp_config_key(self) -> str:
         return "mcpServers"
 
-    def validate_config(self, payload: Any) -> None:
-        if not isinstance(payload, dict):
-            raise InvalidConfigSchemaError(
-                self.repository.config_path, "must be a JSON object"
-            )
-
     def build_action_payload(self, payload: dict[str, Any]) -> Any:
         return payload
 

{code_agnostic-0.5.0 → code_agnostic-0.6.0}/code_agnostic/apps/codex/service.py

@@ -16,6 +16,7 @@ from code_agnostic.apps.codex.config_repository import CodexConfigRepository
 from code_agnostic.apps.codex.mapper import CodexMCPMapper
 from code_agnostic.apps.codex.schema_repository import CodexSchemaRepository
 from code_agnostic.apps.common.interfaces.mapper import IAppMCPMapper
+from code_agnostic.apps.common.utils import apply_mcp_servers
 from code_agnostic.apps.common.interfaces.repositories import (
     IAppConfigRepository,
     ISchemaRepository,
@@ -88,7 +89,7 @@ class CodexConfigService(RegisteredAppConfigService):
     def mcp_config_key(self) -> str:
         return "mcp_servers"
 
-    def validate_config(self, payload: Any) -> None:
+    def _validate_schema(self, payload: dict[str, Any]) -> None:
         error = next(iter(self._validator.iter_errors(payload)), None)
         if error is not None:
             raise InvalidConfigSchemaError(
@@ -118,6 +119,7 @@ class CodexConfigService(RegisteredAppConfigService):
         common_servers: dict[str, MCPServerDTO],
         agent_sources: list[Path] | None = None,
         previously_managed: set[str] | None = None,
+        previously_managed_agents: set[str] | None = None,
         *,
         replace_mcp: bool = False,
     ) -> Action:
@@ -144,10 +146,17 @@ class CodexConfigService(RegisteredAppConfigService):
         self.set_mcp_payload(
             merged, desired_mcp, previously_managed, replace=replace_mcp
         )
-        if agent_sources:
-            merged["agents"] = self._merge_agents_payload(
-                merged.get("agents"),
-                self._build_agent_registry(agent_sources),
+        registry = self._build_agent_registry(agent_sources) if agent_sources else {}
+        if replace_mcp:
+            if registry:
+                merged["agents"] = self._merge_agents_payload(
+                    merged.get("agents"), registry
+                )
+        elif registry or previously_managed_agents:
+            # Ownership-aware: prune agent-registry entries we previously wrote
+            # that are gone from the source, keep base-config/user agents.
+            merged["agents"] = apply_mcp_servers(
+                merged.get("agents"), registry, previously_managed_agents
             )
         self.validate_config(merged)
 
@@ -161,7 +170,10 @@ class CodexConfigService(RegisteredAppConfigService):
         )
         if not replace_mcp:
             action.scope = app_scope(self.app_id, "mcp")
-            action.mcp_managed = sorted(desired_mcp)
+            action.managed_entries = {
+                app_scope(self.app_id, "mcp"): sorted(desired_mcp),
+                app_scope(self.app_id, "agents_registry"): sorted(registry),
+            }
         return action
 
     def _merge_agents_payload(

{code_agnostic-0.5.0 → code_agnostic-0.6.0}/code_agnostic/apps/common/interfaces/service.py

@@ -12,6 +12,7 @@ from code_agnostic.apps.common.interfaces.repositories import IAppConfigReposito
 from code_agnostic.apps.common.interfaces.repositories import ISourceRepository
 from code_agnostic.apps.common.models import MCPServerDTO
 from code_agnostic.apps.common.utils import apply_mcp_servers
+from code_agnostic.errors import InvalidConfigSchemaError
 from code_agnostic.apps.common.symlink_planning import (
     load_state_links,
     load_state_paths,
@@ -59,9 +60,24 @@ class IAppConfigService(ABC):
         """Native config key that holds the MCP server map for this editor."""
         raise NotImplementedError
 
-    @abstractmethod
     def validate_config(self, payload: Any) -> None:
-        raise NotImplementedError
+        """Single validation contract for every editor config.
+
+        Empty/absent config is always valid; anything present must be a JSON
+        object; schema-backed editors add their own checks via
+        ``_validate_schema``.
+        """
+        if payload is None or payload == {}:
+            return
+        if not isinstance(payload, dict):
+            raise InvalidConfigSchemaError(
+                self.repository.config_path, "must be a JSON object"
+            )
+        self._validate_schema(payload)
+
+    def _validate_schema(self, payload: dict[str, Any]) -> None:
+        """Editor-specific validation hook. Default: no schema."""
+        return
 
     @abstractmethod
     def build_action_payload(self, payload: dict[str, Any]) -> Any:
@@ -254,6 +270,7 @@ class IAppConfigService(ABC):
         common_servers: dict[str, MCPServerDTO],
         agent_sources: list[Path] | None = None,
         previously_managed: set[str] | None = None,
+        previously_managed_agents: set[str] | None = None,
         *,
         replace_mcp: bool = False,
     ) -> Action:
@@ -280,7 +297,9 @@ class IAppConfigService(ABC):
             # User-shared global config: track which servers we own so a later
             # source removal can be pruned without touching the user's servers.
             action.scope = app_scope(self.app_id, "mcp")
-            action.mcp_managed = sorted(desired_mcp)
+            action.managed_entries = {
+                app_scope(self.app_id, "mcp"): sorted(desired_mcp)
+            }
         return action
 
     def build_plan(
@@ -297,6 +316,9 @@ class IAppConfigService(ABC):
         previously_managed_mcp = self._load_state_names(
             managed_mcp_group, app_scope(self.app_id, "mcp")
         )
+        previously_managed_agents = self._load_state_names(
+            managed_mcp_group, app_scope(self.app_id, "agents_registry")
+        )
 
         skill_actions, skill_skipped = self._build_compiled_group(
             sources=source_repository.list_skill_sources(),
@@ -325,6 +347,7 @@ class IAppConfigService(ABC):
                     common_servers,
                     agent_sources=source_repository.list_agent_sources(),
                     previously_managed=previously_managed_mcp,
+                    previously_managed_agents=previously_managed_agents,
                 ),
                 *skill_actions,
                 *agent_actions,

{code_agnostic-0.5.0 → code_agnostic-0.6.0}/code_agnostic/apps/copilot/service.py

@@ -55,11 +55,7 @@ class CopilotConfigService(RegisteredAppConfigService):
     def mcp_config_key(self) -> str:
         return "mcpServers"
 
-    def validate_config(self, payload: Any) -> None:
-        if not isinstance(payload, dict):
-            raise InvalidConfigSchemaError(
-                self.repository.config_path, "must be a JSON object"
-            )
+    def _validate_schema(self, payload: dict[str, Any]) -> None:
         mcp_servers = payload.get("mcpServers")
         if mcp_servers is not None and not isinstance(mcp_servers, dict):
             raise InvalidConfigSchemaError(

{code_agnostic-0.5.0 → code_agnostic-0.6.0}/code_agnostic/apps/cursor/service.py

@@ -68,9 +68,7 @@ class CursorConfigService(RegisteredAppConfigService):
     def mcp_config_key(self) -> str:
         return "mcpServers"
 
-    def validate_config(self, payload: Any) -> None:
-        if payload == {}:
-            return
+    def _validate_schema(self, payload: dict[str, Any]) -> None:
         error = next(iter(self._validator.iter_errors(payload)), None)
         if error is not None:
             raise InvalidConfigSchemaError(

{code_agnostic-0.5.0 → code_agnostic-0.6.0}/code_agnostic/apps/opencode/service.py

@@ -104,11 +104,7 @@ class OpenCodeConfigService(RegisteredAppConfigService):
     def mcp_config_key(self) -> str:
         return "mcp"
 
-    def validate_config(self, payload: Any) -> None:
-        if not isinstance(payload, dict):
-            raise InvalidConfigSchemaError(
-                self.repository.config_path, "must be a JSON object"
-            )
+    def _validate_schema(self, payload: dict[str, Any]) -> None:
         for error in self._validator.iter_errors(payload):
             if _is_unknown_provider_model_enum_error(error):
                 continue
@@ -141,6 +137,7 @@ class OpenCodeConfigService(RegisteredAppConfigService):
         common_servers: dict[str, MCPServerDTO],
         agent_sources: list[Path] | None = None,
         previously_managed: set[str] | None = None,
+        previously_managed_agents: set[str] | None = None,
         *,
         replace_mcp: bool = False,
     ) -> Action:
@@ -178,7 +175,9 @@ class OpenCodeConfigService(RegisteredAppConfigService):
         )
         if not replace_mcp:
             action.scope = app_scope(self.app_id, "mcp")
-            action.mcp_managed = sorted(desired_mcp)
+            action.managed_entries = {
+                app_scope(self.app_id, "mcp"): sorted(desired_mcp)
+            }
         return action
 
     def _validate_common_mcp(self, common_servers: dict[str, MCPServerDTO]) -> None:

{code_agnostic-0.5.0 → code_agnostic-0.6.0}/code_agnostic/executor.py

@@ -770,12 +770,14 @@ class SyncExecutor:
             if action.scope is None:
                 continue
 
-            if action.mcp_managed is not None:
-                # User-shared MCP config: track the server names we own, never the
-                # shared config file itself (so cleanup prunes our servers only).
-                global_mcp_touched.add(action.scope)
-                if action.mcp_managed:
-                    global_mcp[action.scope] = sorted(set(action.mcp_managed))
+            if action.managed_entries is not None:
+                # User-shared config: track the named entries we own (MCP servers,
+                # agent-registry names, …) by scope — never the shared config file
+                # itself, so cleanup prunes only what we wrote.
+                for entry_scope, names in action.managed_entries.items():
+                    global_mcp_touched.add(entry_scope)
+                    if names:
+                        global_mcp[entry_scope] = sorted(set(names))
                 continue
 
             if action.workspace is not None:

{code_agnostic-0.5.0 → code_agnostic-0.6.0}/code_agnostic/models.py

@@ -74,7 +74,7 @@ class Action:
     scope: str | None = None
     workspace: str | None = None
     project: str | None = None
-    mcp_managed: list[str] | None = None
+    managed_entries: dict[str, list[str]] | None = None
 
 
 @dataclass

{code_agnostic-0.5.0 → code_agnostic-0.6.0}/code_agnostic/planner.py

@@ -291,7 +291,7 @@ class SyncPlanner:
             # Carry global MCP ownership tracking onto the merged Claude action so
             # top-level `mcpServers` orphans still get pruned on later applies.
             project_action.scope = existing_action.scope
-            project_action.mcp_managed = existing_action.mcp_managed
+            project_action.managed_entries = existing_action.managed_entries
         actions = [
             action
             for action in plan.actions

{code_agnostic-0.5.0 → code_agnostic-0.6.0}/code_agnostic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-agnostic
-Version: 0.5.0
+Version: 0.6.0
 Summary: Centralized hub for LLM coding config: MCP, skills, rules, and agents.
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{code_agnostic-0.5.0 → code_agnostic-0.6.0}/code_agnostic.egg-info/SOURCES.txt

@@ -128,6 +128,7 @@ tests/test_cli_agents.py
 tests/test_cli_aliases.py
 tests/test_cli_apply_apps.py
 tests/test_cli_apply_codex.py
+tests/test_cli_apply_codex_agent_cleanup.py
 tests/test_cli_apply_cursor.py
 tests/test_cli_apply_mcp_cleanup.py
 tests/test_cli_apply_target.py

{code_agnostic-0.5.0 → code_agnostic-0.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "code-agnostic"
-version = "0.5.0"
+version = "0.6.0"
 description = "Centralized hub for LLM coding config: MCP, skills, rules, and agents."
 readme = "README.md"
 requires-python = ">=3.10"

code_agnostic-0.6.0/tests/test_cli_apply_codex_agent_cleanup.py

@@ -0,0 +1,71 @@
+"""Codex agent-registry ownership: an agent removed from the source is pruned
+from `[agents.*]` in ~/.codex/config.toml on the next apply, while base-config
+agent settings and user-added entries survive."""
+
+from pathlib import Path
+
+from code_agnostic.__main__ import cli
+
+try:
+    import tomllib
+except ModuleNotFoundError:  # pragma: no cover
+    import tomli as tomllib  # type: ignore
+
+
+def _write_agent(core_root: Path, name: str) -> None:
+    agent = core_root / "agents" / f"{name}.md"
+    agent.parent.mkdir(parents=True, exist_ok=True)
+    agent.write_text(
+        f"---\nname: {name}\ndescription: {name} specialist\n---\n\nDo {name}.\n",
+        encoding="utf-8",
+    )
+
+
+def test_apply_codex_prunes_removed_agent_from_registry(
+    minimal_shared_config: Path,
+    core_root: Path,
+    tmp_path: Path,
+    cli_runner,
+    enable_app,
+) -> None:
+    enable_app("codex")
+    # Base-config agent settings + a user-managed agent entry must be preserved.
+    (core_root / "config" / "codex.base.json").write_text(
+        '{"agents": {"max_depth": 2}}', encoding="utf-8"
+    )
+    (tmp_path / ".codex").mkdir(parents=True, exist_ok=True)
+    (tmp_path / ".codex" / "config.toml").write_text(
+        '[agents.mine]\ndescription = "user agent"\nconfig_file = "agents/mine.toml"\n',
+        encoding="utf-8",
+    )
+    _write_agent(core_root, "planner")
+    _write_agent(core_root, "reviewer")
+
+    assert cli_runner.invoke(cli, ["apply", "-a", "codex"]).exit_code == 0
+    cfg = tomllib.loads(
+        (tmp_path / ".codex" / "config.toml").read_text(encoding="utf-8")
+    )
+    assert cfg["agents"]["max_depth"] == 2
+    assert set(cfg["agents"]) >= {"planner", "reviewer", "mine", "max_depth"}
+
+    state_path = core_root / ".sync-state.json"
+    import json
+
+    state = json.loads(state_path.read_text(encoding="utf-8"))
+    assert state["managed_mcp"]["app:codex:agents_registry"] == ["planner", "reviewer"]
+
+    # Remove reviewer from the source and re-apply.
+    (core_root / "agents" / "reviewer.md").unlink()
+    assert cli_runner.invoke(cli, ["apply", "-a", "codex"]).exit_code == 0
+
+    cfg = tomllib.loads(
+        (tmp_path / ".codex" / "config.toml").read_text(encoding="utf-8")
+    )
+    agents = cfg["agents"]
+    assert "reviewer" not in agents, "our removed agent must be pruned from registry"
+    assert "planner" in agents
+    assert agents["mine"]["description"] == "user agent", "user entry preserved"
+    assert agents["max_depth"] == 2, "base-config agent settings preserved"
+
+    state = json.loads(state_path.read_text(encoding="utf-8"))
+    assert state["managed_mcp"]["app:codex:agents_registry"] == ["planner"]