code-agnostic 0.4.0__tar.gz → 0.5.1__tar.gz

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/PKG-INFO

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

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/code_agnostic/__init__.py

@@ -1,3 +1,3 @@
 __all__ = ["__version__"]
 
-__version__ = "0.4.0"
+__version__ = "0.5.1"

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/code_agnostic/agents/claude.py

@@ -6,7 +6,7 @@ import re
 from pathlib import Path
 from typing import Any
 
-import yaml  # type: ignore[import-untyped]
+import yaml
 
 from code_agnostic.agents.models import Agent
 

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/code_agnostic/agents/codex.py

@@ -7,9 +7,9 @@ from pathlib import Path
 from typing import Any
 
 try:
-    import tomllib
+    import tomllib  # type: ignore[import-not-found]
 except ModuleNotFoundError:  # pragma: no cover
-    import tomli as tomllib  # type: ignore
+    import tomli as tomllib
 
 import tomlkit
 

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/code_agnostic/agents/parser.py

@@ -83,7 +83,7 @@ def parse_agent(path: Path) -> Agent:
 
 
 def serialize_agent(agent: Agent, *, target_app: str | None = None) -> str:
-    fm: dict = {}
+    fm: dict[str, Any] = {}
     if agent.metadata.name:
         fm["name"] = agent.metadata.name
     if agent.metadata.description:
@@ -105,7 +105,7 @@ def serialize_agent(agent: Agent, *, target_app: str | None = None) -> str:
     if nickname_candidates:
         fm["nickname_candidates"] = list(nickname_candidates)
 
-    tools: dict = {}
+    tools: dict[str, Any] = {}
     if agent.metadata.tools.read is not True:
         tools["read"] = agent.metadata.tools.read
     if agent.metadata.tools.write is not True:

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/code_agnostic/apps/apps_service.py

@@ -7,7 +7,6 @@ from code_agnostic.apps.common.framework import (
     list_registered_app_services,
 )
 from code_agnostic.apps.common.interfaces.service import IAppConfigService
-from code_agnostic.apps.common.interfaces.repositories import ISourceRepository
 from code_agnostic.apps.common.symlink_planning import (
     load_state_links,
     load_state_paths,
@@ -15,6 +14,7 @@ from code_agnostic.apps.common.symlink_planning import (
     plan_stale_group,
 )
 from code_agnostic.core.project_repository import ProjectConfigRepository
+from code_agnostic.core.repository import CoreRepository
 from code_agnostic.core.workspace_repository import WorkspaceConfigRepository
 from code_agnostic.executor import SyncExecutor
 from code_agnostic.models import Action, AppStatusRow, AppSyncStatus, SyncPlan
@@ -24,7 +24,7 @@ from code_agnostic.utils import read_json_safe, write_json
 
 
 class AppsService:
-    def __init__(self, core_repository: ISourceRepository) -> None:
+    def __init__(self, core_repository: CoreRepository) -> None:
         self.core_repository = core_repository
 
     @property

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/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.4.0 → code_agnostic-0.5.1}/code_agnostic/apps/codex/config_repository.py

@@ -3,9 +3,9 @@ from pathlib import Path
 from typing import Any
 
 try:
-    import tomllib
+    import tomllib  # type: ignore[import-not-found]
 except ModuleNotFoundError:  # pragma: no cover
-    import tomli as tomllib  # type: ignore
+    import tomli as tomllib
 
 import tomlkit
 

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/code_agnostic/apps/codex/service.py

@@ -88,7 +88,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(

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/code_agnostic/apps/common/framework.py

@@ -20,12 +20,12 @@ class AppServiceRegistryMeta(ABCMeta):
         bases: tuple[type, ...],
         namespace: dict[str, Any],
         **kwargs: Any,
-    ):
+    ) -> "AppServiceRegistryMeta":
         cls = super().__new__(mcls, name, bases, namespace, **kwargs)
         app_id = getattr(cls, "APP_ID", None)
         is_abstract = bool(getattr(cls, "__abstractmethods__", False))
         if app_id is not None and not is_abstract:
-            mcls._registry[app_id] = cast(type["RegisteredAppConfigService"], cls)  # type: ignore[assignment]
+            mcls._registry[app_id] = cast(type["RegisteredAppConfigService"], cls)
         return cls
 
 

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/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:

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/code_agnostic/apps/common/schema.py

@@ -51,6 +51,6 @@ class JsonSchemaRepository(ISchemaRepository):
         now = time.time()
         if cached and now - cached[0] < self.ttl_seconds:
             return cached[1]
-        schema = json.loads(path.read_text(encoding="utf-8"))
+        schema: dict[str, Any] = json.loads(path.read_text(encoding="utf-8"))
         _SCHEMA_CACHE[key] = (now, schema)
         return schema

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/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.4.0 → code_agnostic-0.5.1}/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.4.0 → code_agnostic-0.5.1}/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

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/code_agnostic/cli/aliases.py

@@ -14,7 +14,9 @@ class AliasedGroup(click.Group):
     def get_command(self, ctx: click.Context, cmd_name: str) -> click.Command | None:
         return super().get_command(ctx, self.ALIASES.get(cmd_name, cmd_name))
 
-    def resolve_command(self, ctx: click.Context, args: list[str]):
+    def resolve_command(
+        self, ctx: click.Context, args: list[str]
+    ) -> tuple[str | None, click.Command | None, list[str]]:
         if args and args[0] in self.ALIASES:
             args[0] = self.ALIASES[args[0]]
         return super().resolve_command(ctx, args)

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/code_agnostic/cli/commands/workspaces.py

@@ -1,6 +1,7 @@
 """Workspaces group commands."""
 
 from pathlib import Path
+from typing import Any
 
 import click
 from rich.console import Console
@@ -63,7 +64,7 @@ def workspaces_list(obj: dict[str, str]) -> None:
     core = CoreRepository()
     workspace_service = WorkspaceService()
 
-    overview: list[dict] = []
+    overview: list[dict[str, Any]] = []
     try:
         workspaces = core.load_workspaces()
     except SyncAppError as exc:

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/code_agnostic/cli/helpers.py

@@ -7,7 +7,12 @@ import click
 from code_agnostic.apps.apps_service import AppsService
 from code_agnostic.core.repository import CoreRepository
 from code_agnostic.errors import SyncAppError
-from code_agnostic.models import ActionStatus, EditorStatusRow, EditorSyncStatus
+from code_agnostic.models import (
+    ActionStatus,
+    EditorStatusRow,
+    EditorSyncStatus,
+    SyncPlan,
+)
 
 
 def _workspace_entries_by_name(core: CoreRepository) -> dict[str, dict[str, str]]:
@@ -64,7 +69,9 @@ def reject_symlinked_source_dir(path: Path, resource_type: str) -> None:
         )
 
 
-def status_row_for_app(app_name: str, plan, apps: AppsService) -> EditorStatusRow:
+def status_row_for_app(
+    app_name: str, plan: SyncPlan, apps: AppsService
+) -> EditorStatusRow:
     if not apps.is_enabled(app_name):
         return EditorStatusRow(
             name=app_name,

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/code_agnostic/cli/options.py

@@ -1,6 +1,7 @@
 """Shared option decorators for CLI commands."""
 
 from collections.abc import Callable
+from typing import Any
 
 import click
 
@@ -38,7 +39,9 @@ def _import_source_values() -> list[str]:
     ]
 
 
-def app_option(required: bool = False) -> Callable:
+def app_option(
+    required: bool = False,
+) -> Callable[[Callable[..., Any]], Callable[..., Any]]:
     return click.option(
         "-a",
         "--app",
@@ -49,7 +52,9 @@ def app_option(required: bool = False) -> Callable:
     )
 
 
-def manageable_app_option(required: bool = True) -> Callable:
+def manageable_app_option(
+    required: bool = True,
+) -> Callable[[Callable[..., Any]], Callable[..., Any]]:
     return click.option(
         "-a",
         "--app",
@@ -59,7 +64,9 @@ def manageable_app_option(required: bool = True) -> Callable:
     )
 
 
-def import_app_option(required: bool = True) -> Callable:
+def import_app_option(
+    required: bool = True,
+) -> Callable[[Callable[..., Any]], Callable[..., Any]]:
     return click.option(
         "-a",
         "--app",
@@ -69,7 +76,9 @@ def import_app_option(required: bool = True) -> Callable:
     )
 
 
-def workspace_option(required: bool = False) -> Callable:
+def workspace_option(
+    required: bool = False,
+) -> Callable[[Callable[..., Any]], Callable[..., Any]]:
     return click.option(
         "-w",
         "--workspace",
@@ -79,7 +88,9 @@ def workspace_option(required: bool = False) -> Callable:
     )
 
 
-def project_option(required: bool = False) -> Callable:
+def project_option(
+    required: bool = False,
+) -> Callable[[Callable[..., Any]], Callable[..., Any]]:
     return click.option(
         "--project",
         required=required,
@@ -88,5 +99,5 @@ def project_option(required: bool = False) -> Callable:
     )
 
 
-def verbose_option() -> Callable:
+def verbose_option() -> Callable[[Callable[..., Any]], Callable[..., Any]]:
     return click.option("-v", "--verbose", is_flag=True, default=False)

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/code_agnostic/executor.py

@@ -7,13 +7,13 @@ from pathlib import Path
 from typing import Any
 from typing import Protocol
 
-from code_agnostic.apps.common.interfaces.repositories import ISourceRepository
 from code_agnostic.constants import (
     SYNC_REVISIONS_DIRNAME,
     SYNC_STAGING_DIRNAME,
     SYNC_STATE_FILENAME,
 )
 from code_agnostic.core.project_repository import ProjectConfigRepository
+from code_agnostic.core.repository import CoreRepository
 from code_agnostic.core.workspace_repository import WorkspaceConfigRepository
 from code_agnostic.models import Action, ActionKind, ActionStatus, SyncPlan
 from code_agnostic.utils import write_json
@@ -21,7 +21,7 @@ from code_agnostic.utils import write_json
 
 @dataclass
 class ExecutionContext:
-    core: ISourceRepository
+    core: CoreRepository
 
 
 @dataclass(frozen=True)
@@ -189,7 +189,7 @@ class WriteRuleHandler:
 
 
 class SyncExecutor:
-    def __init__(self, core: ISourceRepository) -> None:
+    def __init__(self, core: CoreRepository) -> None:
         self.context = ExecutionContext(core=core)
         self.handlers: dict[ActionKind, ActionHandler] = {
             ActionKind.WRITE_JSON: WriteJsonHandler(),
@@ -421,12 +421,12 @@ class SyncExecutor:
         if workspace is not None and project is not None:
             raise ValueError("Choose only one scope: workspace or project.")
 
-        if workspace is None and project is None:
-            root = self.context.core.root
-        elif workspace is not None:
+        if workspace is not None:
             root = self.context.core.workspace_config_dir(workspace)
-        else:
+        elif project is not None:
             root = self.context.core.project_config_dir(project)
+        else:
+            root = self.context.core.root
 
         revision_record = self._build_revision_record(
             root=root, workspace=workspace, project=project, revision_id="restore"

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/code_agnostic/imports/adapters.py

@@ -1,5 +1,6 @@
 from dataclasses import dataclass
 from pathlib import Path
+from typing import Any, cast
 
 from code_agnostic.apps.app_id import AppId
 from code_agnostic.apps.codex.config_repository import CodexConfigRepository
@@ -24,8 +25,11 @@ class ImportAdapter:
     mapper: IAppMCPMapper
     config_repository: object
 
-    def load_mcp_payload(self) -> dict:
-        return self.config_repository.load_mcp_payload()  # type: ignore[attr-defined]
+    def load_mcp_payload(self) -> dict[str, Any]:
+        return cast(
+            "dict[str, Any]",
+            self.config_repository.load_mcp_payload(),  # type: ignore[attr-defined]
+        )
 
 
 def create_import_adapter(app: str, source_root: Path | None = None) -> ImportAdapter:

{code_agnostic-0.4.0 → code_agnostic-0.5.1}/code_agnostic/imports/service.py

@@ -1,4 +1,5 @@
 from pathlib import Path
+from typing import Any
 
 from code_agnostic.agents.codex import normalize_codex_agent_filename, parse_codex_agent
 from code_agnostic.agents.parser import serialize_agent
@@ -8,7 +9,7 @@ from code_agnostic.apps.common.models import MCPServerDTO
 from code_agnostic.apps.common.utils import common_mcp_to_dto, dto_to_common_mcp
 from code_agnostic.core.repository import CoreRepository
 from code_agnostic.errors import InvalidConfigSchemaError, InvalidJsonFormatError
-from code_agnostic.imports.adapters import create_import_adapter
+from code_agnostic.imports.adapters import ImportAdapter, create_import_adapter
 from code_agnostic.imports.filesystem import (
     content_equal,
     copy_path,
@@ -261,7 +262,9 @@ class ImportService:
             unsupported.append(ImportSection.AGENTS)
         return unsupported
 
-    def _plan_mcp(self, adapter, conflict_policy: ConflictPolicy):
+    def _plan_mcp(
+        self, adapter: ImportAdapter, conflict_policy: ConflictPolicy
+    ) -> tuple[list[ImportAction], list[str], list[str]]:
         actions: list[ImportAction] = []
         errors: list[str] = []
         skipped: list[str] = []
@@ -272,7 +275,7 @@ class ImportService:
             return actions, [str(exc)], skipped
 
         if not source_dto:
-            source_config = adapter.config_repository.config_path
+            source_config = adapter.config_repository.config_path  # type: ignore[attr-defined]
             if source_config.exists():
                 skipped.append(
                     f"No MCP servers found in source config: {source_config}"
@@ -368,7 +371,7 @@ class ImportService:
             else:
                 skipped.append(f"MCP server skipped due to conflict: {name}")
 
-        normalized_payload = {}
+        normalized_payload: dict[str, Any] = {}
         existing_schema = existing_payload.get("$schema")
         if isinstance(existing_schema, str) and existing_schema:
             normalized_payload["$schema"] = existing_schema
@@ -399,7 +402,7 @@ class ImportService:
         target_dir: Path,
         conflict_policy: ConflictPolicy,
         follow_symlinks: bool,
-    ):
+    ) -> tuple[list[ImportAction], list[str], list[str]]:
         actions: list[ImportAction] = []
         errors: list[str] = []
         skipped: list[str] = []
@@ -518,10 +521,10 @@ class ImportService:
 
     def _plan_codex_agents(
         self,
-        adapter,
+        adapter: ImportAdapter,
         conflict_policy: ConflictPolicy,
         follow_symlinks: bool,
-    ):
+    ) -> tuple[list[ImportAction], list[str], list[str]]:
         actions: list[ImportAction] = []
         errors: list[str] = []
         skipped: list[str] = []
@@ -584,10 +587,10 @@ class ImportService:
 
     def _plan_copilot_agents(
         self,
-        adapter,
+        adapter: ImportAdapter,
         conflict_policy: ConflictPolicy,
         follow_symlinks: bool,
-    ):
+    ) -> tuple[list[ImportAction], list[str], list[str]]:
         actions: list[ImportAction] = []
         errors: list[str] = []
         skipped: list[str] = []
@@ -707,7 +710,7 @@ class ImportService:
         section: ImportSection,
         detail_name: str,
         target: Path,
-        payload: dict,
+        payload: dict[str, Any],
         conflict_policy: ConflictPolicy,
     ) -> tuple[ImportAction, str | None, str | None]:
         existing_payload, existing_error = read_json_safe(target)