code-agnostic 0.3.3__tar.gz → 0.3.4__tar.gz

{code_agnostic-0.3.3 → code_agnostic-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-agnostic
-Version: 0.3.3
+Version: 0.3.4
 Summary: Centralized hub for LLM coding config: MCP, skills, rules, and agents.
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -102,7 +102,7 @@ code-agnostic apply
 | Agents sync | yes | yes | yes |
 | Workspace root `AGENTS.md` link | yes | yes | yes |
 | Native repo config include for workspace `AGENTS.md` | yes | -- | -- |
-| Repo/subdir gets shared workspace `AGENTS.md` today | yes | -- | -- |
+| Repo/subdir gets shared workspace `AGENTS.md` today | yes | -- | yes |
 | Root-level `AGENTS.md` discovery only | -- | yes | yes |
 | Workspace propagation | yes | -- | yes |
 | Import from | yes | yes | yes |
@@ -110,9 +110,9 @@ code-agnostic apply
 
 Cursor workspace propagation is intentionally disabled to avoid duplicate MCP initialization in multi-root workspaces: https://forum.cursor.com/t/mcp-multi-root-workspace-causes-duplicate-mcp-server-initialization-4x-createclient-actions/144003
 
-OpenCode workspace configs include the shared workspace `AGENTS.md` natively via `instructions`, so repos under the workspace get both repo-local and shared workspace instructions.
+OpenCode workspace configs include the shared workspace `AGENTS.md` natively via `instructions`, so repos under the workspace get both repo-local and shared workspace instructions. Codex repos receive workspace instructions through a generated `AGENTS.override.md`, which is added to each repo's `.git/info/exclude`.
 
-Cursor documents `AGENTS.md` as a root-level project file. Codex documents `AGENTS.md` discovery, but not a native config include for an extra workspace file. In practice that means subdirectories and repos opened below the workspace root will not reliably get the shared workspace `AGENTS.md` today for Cursor or Codex.
+Cursor documents `AGENTS.md` as a root-level project file. Codex documents `AGENTS.md` discovery, but not a native config include for an extra workspace file. In practice that means subdirectories and repos opened below the workspace root will not reliably get the shared workspace `AGENTS.md` today for Cursor.
 
 ## Features
 
@@ -171,7 +171,7 @@ code-agnostic agents list
 
 ### Workspaces
 
-Register workspace directories. Workspace rules are compiled into a canonical `AGENTS.md` and symlinked to the workspace root. Repos keep their own repo-specific `AGENTS.md`. OpenCode workspace configs also reference the shared workspace file through `instructions`, so a repo can load both its own `AGENTS.md` and the workspace-level one. Repo-local app config, skills, and agents are propagated for OpenCode and Codex.
+Register workspace directories. Workspace rules are compiled into a canonical `AGENTS.md` at the workspace root. Repos keep their own repo-specific `AGENTS.md`; Codex receives the workspace rules through generated, git-excluded `AGENTS.override.md` files, while OpenCode workspace configs reference the shared workspace file through `instructions`. Repo-local app config, skills, and agents are propagated for OpenCode and Codex.
 
 `.cursor` workspace propagation is intentionally disabled to avoid duplicate MCP initialization when opening multi-root workspaces in Cursor (related issue: https://forum.cursor.com/t/mcp-multi-root-workspace-causes-duplicate-mcp-server-initialization-4x-createclient-actions/144003).
 

{code_agnostic-0.3.3 → code_agnostic-0.3.4}/README.md

@@ -79,7 +79,7 @@ code-agnostic apply
 | Agents sync | yes | yes | yes |
 | Workspace root `AGENTS.md` link | yes | yes | yes |
 | Native repo config include for workspace `AGENTS.md` | yes | -- | -- |
-| Repo/subdir gets shared workspace `AGENTS.md` today | yes | -- | -- |
+| Repo/subdir gets shared workspace `AGENTS.md` today | yes | -- | yes |
 | Root-level `AGENTS.md` discovery only | -- | yes | yes |
 | Workspace propagation | yes | -- | yes |
 | Import from | yes | yes | yes |
@@ -87,9 +87,9 @@ code-agnostic apply
 
 Cursor workspace propagation is intentionally disabled to avoid duplicate MCP initialization in multi-root workspaces: https://forum.cursor.com/t/mcp-multi-root-workspace-causes-duplicate-mcp-server-initialization-4x-createclient-actions/144003
 
-OpenCode workspace configs include the shared workspace `AGENTS.md` natively via `instructions`, so repos under the workspace get both repo-local and shared workspace instructions.
+OpenCode workspace configs include the shared workspace `AGENTS.md` natively via `instructions`, so repos under the workspace get both repo-local and shared workspace instructions. Codex repos receive workspace instructions through a generated `AGENTS.override.md`, which is added to each repo's `.git/info/exclude`.
 
-Cursor documents `AGENTS.md` as a root-level project file. Codex documents `AGENTS.md` discovery, but not a native config include for an extra workspace file. In practice that means subdirectories and repos opened below the workspace root will not reliably get the shared workspace `AGENTS.md` today for Cursor or Codex.
+Cursor documents `AGENTS.md` as a root-level project file. Codex documents `AGENTS.md` discovery, but not a native config include for an extra workspace file. In practice that means subdirectories and repos opened below the workspace root will not reliably get the shared workspace `AGENTS.md` today for Cursor.
 
 ## Features
 
@@ -148,7 +148,7 @@ code-agnostic agents list
 
 ### Workspaces
 
-Register workspace directories. Workspace rules are compiled into a canonical `AGENTS.md` and symlinked to the workspace root. Repos keep their own repo-specific `AGENTS.md`. OpenCode workspace configs also reference the shared workspace file through `instructions`, so a repo can load both its own `AGENTS.md` and the workspace-level one. Repo-local app config, skills, and agents are propagated for OpenCode and Codex.
+Register workspace directories. Workspace rules are compiled into a canonical `AGENTS.md` at the workspace root. Repos keep their own repo-specific `AGENTS.md`; Codex receives the workspace rules through generated, git-excluded `AGENTS.override.md` files, while OpenCode workspace configs reference the shared workspace file through `instructions`. Repo-local app config, skills, and agents are propagated for OpenCode and Codex.
 
 `.cursor` workspace propagation is intentionally disabled to avoid duplicate MCP initialization when opening multi-root workspaces in Cursor (related issue: https://forum.cursor.com/t/mcp-multi-root-workspace-causes-duplicate-mcp-server-initialization-4x-createclient-actions/144003).
 

{code_agnostic-0.3.3 → code_agnostic-0.3.4}/code_agnostic/apps/codex/schema.json

@@ -56,32 +56,49 @@
       },
       "description": "Per-tool approval settings for a single MCP server tool."
     },
+    "McpServerOAuthConfig": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "client_id": { "type": "string" }
+      },
+      "description": "OAuth client settings used when Codex launches an MCP OAuth flow."
+    },
     "RawMcpServerConfig": {
       "type": "object",
       "additionalProperties": false,
       "properties": {
         "args": { "type": "array", "items": { "type": "string" } },
-        "bearer_token": { "type": "string" },
         "bearer_token_env_var": { "type": "string" },
         "command": { "type": "string" },
         "cwd": { "type": "string" },
+        "default_tools_approval_mode": {
+          "allOf": [{ "$ref": "#/definitions/AppToolApproval" }],
+          "default": null
+        },
         "disabled_tools": { "type": "array", "items": { "type": "string" } },
         "enabled": { "type": "boolean" },
         "enabled_tools": { "type": "array", "items": { "type": "string" } },
         "env": { "type": "object", "additionalProperties": { "type": "string" } },
         "env_http_headers": { "type": "object", "additionalProperties": { "type": "string" } },
         "env_vars": { "type": "array", "items": { "type": "string" } },
+        "experimental_environment": { "type": "string" },
         "http_headers": { "type": "object", "additionalProperties": { "type": "string" } },
         "name": {
           "type": "string",
           "default": null,
           "description": "Legacy display-name field accepted for backward compatibility."
         },
+        "oauth": {
+          "allOf": [{ "$ref": "#/definitions/McpServerOAuthConfig" }],
+          "default": null
+        },
         "oauth_resource": { "type": "string", "default": null },
         "required": { "type": "boolean" },
         "scopes": { "type": "array", "items": { "type": "string" } },
         "startup_timeout_ms": { "type": "integer", "minimum": 0 },
         "startup_timeout_sec": { "type": "number" },
+        "supports_parallel_tool_calls": { "type": "boolean" },
         "tool_timeout_sec": { "type": "number" },
         "tools": {
           "type": "object",

{code_agnostic-0.3.3 → code_agnostic-0.3.4}/code_agnostic/apps/codex/service.py

@@ -26,7 +26,7 @@ from code_agnostic.errors import (
     InvalidJsonFormatError,
 )
 from code_agnostic.models import Action, ActionKind, ActionStatus
-from code_agnostic.utils import read_json_safe
+from code_agnostic.utils import merge_dict_overlay, read_json_safe
 from code_agnostic.skills.compilers import CodexSkillCompiler
 from code_agnostic.skills.parser import parse_skill
 
@@ -134,6 +134,10 @@ class CodexConfigService(RegisteredAppConfigService):
                     merged.get("agents"), value
                 )
                 continue
+            current = merged.get(key)
+            if isinstance(current, dict) and isinstance(value, dict):
+                merged[key] = merge_dict_overlay(current, value)
+                continue
             merged[key] = deepcopy(value)
         self.set_mcp_payload(merged, desired_mcp)
         if agent_sources:
@@ -196,6 +200,7 @@ class CodexConfigService(RegisteredAppConfigService):
         compiler = CodexSkillCompiler()
         return self._plan_compiled_text_actions(
             sources=sources,
+            target_dir=target_dir,
             scope=scope,
             app=app,
             managed_paths=managed_paths,
@@ -244,6 +249,7 @@ class CodexConfigService(RegisteredAppConfigService):
 
         return self._plan_compiled_text_actions(
             sources=sources,
+            target_dir=target_dir,
             scope=scope,
             app=app,
             managed_paths=managed_paths,

{code_agnostic-0.3.3 → code_agnostic-0.3.4}/code_agnostic/apps/common/compiled_planning.py

@@ -3,6 +3,18 @@ from pathlib import Path
 from code_agnostic.models import Action, ActionKind, ActionStatus
 
 
+def find_replaceable_symlink_ancestor(target: Path, managed_root: Path) -> Path | None:
+    current = target
+    while True:
+        if current.is_symlink() and (
+            current == managed_root or current.is_relative_to(managed_root)
+        ):
+            return current
+        if current.parent == current:
+            return None
+        current = current.parent
+
+
 def _symlink_ancestor_state(
     target: Path, removable_link_paths: set[Path]
 ) -> tuple[bool, bool]:

{code_agnostic-0.3.3 → code_agnostic-0.3.4}/code_agnostic/apps/common/interfaces/service.py

@@ -4,7 +4,10 @@ from pathlib import Path
 from typing import Any
 
 from code_agnostic.apps.app_id import AppId, app_scope
-from code_agnostic.apps.common.compiled_planning import plan_compiled_text_action
+from code_agnostic.apps.common.compiled_planning import (
+    find_replaceable_symlink_ancestor,
+    plan_compiled_text_action,
+)
 from code_agnostic.apps.common.interfaces.mapper import IAppMCPMapper
 from code_agnostic.apps.common.interfaces.repositories import IAppConfigRepository
 from code_agnostic.apps.common.interfaces.repositories import ISourceRepository
@@ -99,6 +102,7 @@ class IAppConfigService(ABC):
         self,
         *,
         sources: list[Path],
+        target_dir: Path,
         scope: str,
         app: str,
         managed_paths: list[Path],
@@ -114,10 +118,28 @@ class IAppConfigService(ABC):
         actions: list[Action] = []
         desired_paths: list[Path] = []
         skipped: list[str] = []
+        scheduled_removals: set[Path] = set()
 
         for source in sources:
             target, payload = compile_source(source)
             desired_paths.append(target)
+            replaceable_symlink = find_replaceable_symlink_ancestor(target, target_dir)
+            if (
+                replaceable_symlink is not None
+                and replaceable_symlink not in scheduled_removals
+            ):
+                scheduled_removals.add(replaceable_symlink)
+                removable_link_set.add(replaceable_symlink.resolve(strict=False))
+                actions.append(
+                    Action(
+                        kind=ActionKind.REMOVE_SYMLINK,
+                        path=replaceable_symlink,
+                        status=ActionStatus.REMOVE,
+                        detail=f"replace compiled {scope} symlink",
+                        app=app,
+                        scope=scope,
+                    )
+                )
             action = plan_compiled_text_action(
                 target=target,
                 payload=payload,

{code_agnostic-0.3.3 → code_agnostic-0.3.4}/code_agnostic/apps/common/utils.py

@@ -1,6 +1,52 @@
 from typing import Any
 
+from code_agnostic.apps.app_id import AppId, app_ids_by_capability
 from code_agnostic.apps.common.models import MCPAuthDTO, MCPServerDTO, MCPServerType
+from code_agnostic.constants import (
+    MCP_APP_EXCLUDE_PREFIX,
+    MCP_APP_INCLUDE_PREFIX,
+    MCP_APP_TARGET_SEPARATOR,
+)
+
+
+_TARGETABLE_APP_NAMES = {
+    app_id.value for app_id in app_ids_by_capability(targetable=True)
+}
+
+
+def _split_app_targeted_key(key: str) -> tuple[str, str, str] | None:
+    if not key or key[0] not in (MCP_APP_INCLUDE_PREFIX, MCP_APP_EXCLUDE_PREFIX):
+        return None
+
+    marker = key[0]
+    remainder = key[1:]
+    app_name, separator, server_name = remainder.partition(MCP_APP_TARGET_SEPARATOR)
+    if (
+        separator != MCP_APP_TARGET_SEPARATOR
+        or not server_name
+        or app_name not in _TARGETABLE_APP_NAMES
+    ):
+        return None
+    return marker, app_name, server_name
+
+
+def mcp_servers_for_app(
+    mcp_servers: dict[str, Any], app_id: AppId | str
+) -> dict[str, Any]:
+    target = app_id.value if isinstance(app_id, AppId) else app_id
+    filtered: dict[str, Any] = {}
+    for name, raw in mcp_servers.items():
+        targeted = _split_app_targeted_key(name)
+        if targeted is None:
+            filtered[name] = raw
+            continue
+
+        marker, app_name, server_name = targeted
+        if marker == MCP_APP_INCLUDE_PREFIX and app_name == target:
+            filtered[server_name] = raw
+        elif marker == MCP_APP_EXCLUDE_PREFIX and app_name != target:
+            filtered[server_name] = raw
+    return filtered
 
 
 def _coerce_timeout_ms(value: Any) -> int | None:

{code_agnostic-0.3.3 → code_agnostic-0.3.4}/code_agnostic/apps/cursor/service.py

@@ -115,6 +115,7 @@ class CursorConfigService(RegisteredAppConfigService):
         compiler = CursorSkillCompiler()
         return self._plan_compiled_text_actions(
             sources=sources,
+            target_dir=target_dir,
             scope=scope,
             app=app,
             managed_paths=managed_paths,
@@ -147,6 +148,7 @@ class CursorConfigService(RegisteredAppConfigService):
         compiler = CursorAgentCompiler()
         return self._plan_compiled_text_actions(
             sources=sources,
+            target_dir=target_dir,
             scope=scope,
             app=app,
             managed_paths=managed_paths,

{code_agnostic-0.3.3 → code_agnostic-0.3.4}/code_agnostic/apps/opencode/config_repository.py

@@ -9,7 +9,7 @@ from code_agnostic.constants import (
     SKILLS_DIRNAME,
 )
 from code_agnostic.errors import InvalidConfigSchemaError, InvalidJsonFormatError
-from code_agnostic.utils import read_json_safe, write_json
+from code_agnostic.utils import merge_dict_overlay, read_json_safe, write_json
 
 
 class OpenCodeConfigRepository(IAppConfigRepository):
@@ -69,6 +69,10 @@ class OpenCodeConfigRepository(IAppConfigRepository):
         for key, value in base.items():
             if key == "permission" and isinstance(value, list):
                 continue
+            current = merged.get(key)
+            if isinstance(current, dict) and isinstance(value, dict):
+                merged[key] = merge_dict_overlay(current, value)
+                continue
             merged[key] = deepcopy(value)
         merged["mcp"] = deepcopy(mapped_mcp)
         return merged
@@ -101,5 +105,3 @@ class OpenCodeConfigRepository(IAppConfigRepository):
 
         if tools:
             merged["tools"] = tools
-
-        merged.pop("permission", None)

{code_agnostic-0.3.3 → code_agnostic-0.3.4}/code_agnostic/apps/opencode/service.py

@@ -26,6 +26,29 @@ from code_agnostic.skills.compilers import OpenCodeSkillCompiler
 from code_agnostic.skills.parser import parse_skill
 
 
+def _is_unknown_provider_model_enum_error(error: Any) -> bool:
+    if error.validator != "enum":
+        return False
+    model = error.instance
+    if not isinstance(model, str) or "/" not in model:
+        return False
+
+    known_models = error.validator_value
+    if not isinstance(known_models, list):
+        return False
+
+    known_providers = {
+        item.split("/", 1)[0]
+        for item in known_models
+        if isinstance(item, str) and "/" in item
+    }
+    if not known_providers:
+        return False
+
+    provider = model.split("/", 1)[0]
+    return provider not in known_providers
+
+
 class OpenCodeConfigService(RegisteredAppConfigService):
     APP_ID = AppId.OPENCODE
     APP_LABEL = app_label(APP_ID)
@@ -82,8 +105,9 @@ class OpenCodeConfigService(RegisteredAppConfigService):
             raise InvalidConfigSchemaError(
                 self.repository.config_path, "must be a JSON object"
             )
-        error = next(iter(self._validator.iter_errors(payload)), None)
-        if error is not None:
+        for error in self._validator.iter_errors(payload):
+            if _is_unknown_provider_model_enum_error(error):
+                continue
             raise InvalidConfigSchemaError(
                 self.repository.config_path, format_schema_error(error)
             )
@@ -149,6 +173,7 @@ class OpenCodeConfigService(RegisteredAppConfigService):
         compiler = OpenCodeSkillCompiler()
         return self._plan_compiled_text_actions(
             sources=sources,
+            target_dir=target_dir,
             scope=scope,
             app=app,
             managed_paths=managed_paths,
@@ -181,6 +206,7 @@ class OpenCodeConfigService(RegisteredAppConfigService):
         compiler = OpenCodeAgentCompiler()
         return self._plan_compiled_text_actions(
             sources=sources,
+            target_dir=target_dir,
             scope=scope,
             app=app,
             managed_paths=managed_paths,

{code_agnostic-0.3.3 → code_agnostic-0.3.4}/code_agnostic/constants.py

@@ -2,6 +2,7 @@ from typing import Final
 
 
 AGENTS_FILENAME: Final[str] = "AGENTS.md"
+CODEX_AGENTS_OVERRIDE_FILENAME: Final[str] = "AGENTS.override.md"
 CLAUDE_FILENAME: Final[str] = "CLAUDE.md"
 GIT_DIRNAME: Final[str] = ".git"
 SYNC_STATE_FILENAME: Final[str] = ".sync-state.json"
@@ -20,6 +21,11 @@ OPENCODE_CONFIG_FILENAME: Final[str] = "opencode.json"
 CURSOR_CONFIG_FILENAME: Final[str] = "mcp.json"
 CODEX_CONFIG_FILENAME: Final[str] = "config.toml"
 
+MCP_SERVERS_KEY: Final[str] = "mcpServers"
+MCP_APP_INCLUDE_PREFIX: Final[str] = "@"
+MCP_APP_EXCLUDE_PREFIX: Final[str] = "!"
+MCP_APP_TARGET_SEPARATOR: Final[str] = "-"
+
 WORKSPACE_IGNORED_DIRS: Final[tuple[str, ...]] = (
     "node_modules",
     ".venv",

{code_agnostic-0.3.3 → code_agnostic-0.3.4}/code_agnostic/git_exclude_service.py

@@ -6,7 +6,11 @@ from pathlib import Path
 from typing import Any
 
 from code_agnostic.apps.app_id import app_metadata
-from code_agnostic.constants import AGENTS_FILENAME, CLAUDE_FILENAME
+from code_agnostic.constants import (
+    AGENTS_FILENAME,
+    CLAUDE_FILENAME,
+    CODEX_AGENTS_OVERRIDE_FILENAME,
+)
 from code_agnostic.core.repository import CoreRepository
 from code_agnostic.utils import read_json_safe, write_json
 
@@ -58,6 +62,7 @@ class GitExcludeService:
 
         defaults = [f".{app_name}" for app_name in workspace_apps] + [
             AGENTS_FILENAME,
+            CODEX_AGENTS_OVERRIDE_FILENAME,
             CLAUDE_FILENAME,
         ]
         return defaults + extras