code-agnostic 0.3.8__tar.gz → 0.3.9__tar.gz

{code_agnostic-0.3.8 → code_agnostic-0.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-agnostic
-Version: 0.3.8
+Version: 0.3.9
 Summary: Centralized hub for LLM coding config: MCP, skills, rules, and agents.
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -19,8 +19,6 @@ Requires-Dist: pytest-asyncio>=0.23; extra == "dev"
 Requires-Dist: jsonschema>=4.0; extra == "dev"
 Requires-Dist: ruff>=0.8.0; extra == "dev"
 Requires-Dist: mypy>=1.11; extra == "dev"
-Requires-Dist: types-jsonschema>=4.0; extra == "dev"
-Requires-Dist: types-PyYAML>=6.0; extra == "dev"
 Dynamic: license-file
 
 # code-agnostic
@@ -117,15 +115,19 @@ code-agnostic apply
 | Native repo config include for workspace `AGENTS.md` | yes | -- | -- | -- |
 | Repo/subdir gets shared workspace instructions today | yes | -- | yes | yes |
 | Nested `AGENTS.md` discovery | -- | yes | yes | -- |
-| Workspace propagation | yes | yes | yes | yes |
+| Workspace propagation | yes | -- | yes | yes |
 | Import from | yes | yes | yes | yes |
 | Interactive import (TUI) | yes | yes | yes | yes |
 
-Cursor workspace propagation writes repo-local MCP, skills, and agents when those resources exist in the workspace source config.
+`yes` means the resource type is synced for that editor. Some metadata is still
+target-specific or lossy; run `code-agnostic explain-lossiness` to see fields
+that are omitted or rejected for a selected target.
+
+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. Codex repos receive workspace instructions through a generated `AGENTS.override.md`, which is added to each repo's `.git/info/exclude`. Claude Code receives workspace instructions through generated `CLAUDE.local.md` files, never by editing committed `CLAUDE.md`.
 
-Cursor documents `AGENTS.md` support in project roots and subdirectories. `code-agnostic` does not copy or link the shared workspace `AGENTS.md` into child repos; Cursor will load repo-local or nested `AGENTS.md` files that already exist in the opened project. Codex documents nested `AGENTS.md` discovery, but not a native config include for an extra workspace file.
+Cursor documents `AGENTS.md` support in project roots and subdirectories. `code-agnostic` still disables Cursor workspace propagation, so it does not copy or link the shared workspace `AGENTS.md` into child repos; Cursor will load repo-local or nested `AGENTS.md` files that already exist in the opened project. Codex documents nested `AGENTS.md` discovery, but not a native config include for an extra workspace file.
 
 ## Features
 
@@ -162,19 +164,31 @@ Env vars without a value (`--env GITHUB_TOKEN`) are stored as `${GITHUB_TOKEN}`
 
 ### Rules with metadata
 
-Rules live in `rules/` as markdown files with optional YAML frontmatter:
+New rules should use bundle directories with schema-validated metadata and a
+separate prompt body:
 
-```markdown
----
+```text
+rules/python-style/
+├── meta.yaml
+└── prompt.md
+```
+
+```yaml
+# rules/python-style/meta.yaml
+spec_version: v1
+kind: rule
 description: "Python coding standards"
 globs: ["*.py"]
 always_apply: false
----
+```
 
+```markdown
+<!-- rules/python-style/prompt.md -->
 Always use type hints. Prefer dataclasses over dicts.
 ```
 
 Cross-compiled per editor: Cursor gets `.mdc` files with native frontmatter, OpenCode/Codex get `AGENTS.md` sections.
+Legacy single-file rule markdown with YAML frontmatter remains supported for migration.
 
 ```bash
 code-agnostic rules list
@@ -183,7 +197,10 @@ code-agnostic rules remove --name python-style
 
 ### Skills and agents
 
-Canonical YAML frontmatter format, cross-compiled per editor. Install or edit skills in the `code-agnostic` source of truth, then run `plan` / `apply`; do not hand-copy generated skills into `.codex`, `.cursor`, or OpenCode directories.
+Use bundle directories for new skills and agents, then let `code-agnostic`
+cross-compile them per editor. Install or edit skills in the `code-agnostic`
+source of truth, then run `plan` / `apply`; do not hand-copy generated skills
+into `.codex`, `.cursor`, `.agents`, or OpenCode directories.
 
 ```bash
 code-agnostic skills list
@@ -213,9 +230,9 @@ That command should copy the skill into the source of truth and then run the nor
 
 ### Workspaces
 
-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`. Claude receives generated `CLAUDE.local.md` files and project MCP entries in `~/.claude.json["projects"][absolute_repo_path]["mcpServers"]`. Repo-local app config, skills, and agents are propagated for OpenCode, Cursor, Codex, and Claude.
+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`. Claude receives generated `CLAUDE.local.md` files and project MCP entries in `~/.claude.json["projects"][absolute_repo_path]["mcpServers"]`. Repo-local app config, skills, and agents are propagated for OpenCode, Codex, and Claude.
 
-Cursor propagation intentionally stays to repo-local MCP, skills, and agents; it does not copy the shared workspace `AGENTS.md` into child repos.
+`.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).
 
 ```bash
 code-agnostic workspaces add --name myproject --path ~/code/myproject
@@ -264,7 +281,7 @@ The compiler migration is documented in:
 
 - [x] Plan/apply/status sync engine
 - [x] MCP server sync across editors
-- [x] Skills and agents sync (symlink-based)
+- [x] Skills and agents sync across editors
 - [x] Workspace propagation into git repos
 - [x] Import from existing editor configs
 - [x] Consistent CLI with named flags and aliases

{code_agnostic-0.3.8 → code_agnostic-0.3.9}/README.md

@@ -92,15 +92,19 @@ code-agnostic apply
 | Native repo config include for workspace `AGENTS.md` | yes | -- | -- | -- |
 | Repo/subdir gets shared workspace instructions today | yes | -- | yes | yes |
 | Nested `AGENTS.md` discovery | -- | yes | yes | -- |
-| Workspace propagation | yes | yes | yes | yes |
+| Workspace propagation | yes | -- | yes | yes |
 | Import from | yes | yes | yes | yes |
 | Interactive import (TUI) | yes | yes | yes | yes |
 
-Cursor workspace propagation writes repo-local MCP, skills, and agents when those resources exist in the workspace source config.
+`yes` means the resource type is synced for that editor. Some metadata is still
+target-specific or lossy; run `code-agnostic explain-lossiness` to see fields
+that are omitted or rejected for a selected target.
+
+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. Codex repos receive workspace instructions through a generated `AGENTS.override.md`, which is added to each repo's `.git/info/exclude`. Claude Code receives workspace instructions through generated `CLAUDE.local.md` files, never by editing committed `CLAUDE.md`.
 
-Cursor documents `AGENTS.md` support in project roots and subdirectories. `code-agnostic` does not copy or link the shared workspace `AGENTS.md` into child repos; Cursor will load repo-local or nested `AGENTS.md` files that already exist in the opened project. Codex documents nested `AGENTS.md` discovery, but not a native config include for an extra workspace file.
+Cursor documents `AGENTS.md` support in project roots and subdirectories. `code-agnostic` still disables Cursor workspace propagation, so it does not copy or link the shared workspace `AGENTS.md` into child repos; Cursor will load repo-local or nested `AGENTS.md` files that already exist in the opened project. Codex documents nested `AGENTS.md` discovery, but not a native config include for an extra workspace file.
 
 ## Features
 
@@ -137,19 +141,31 @@ Env vars without a value (`--env GITHUB_TOKEN`) are stored as `${GITHUB_TOKEN}`
 
 ### Rules with metadata
 
-Rules live in `rules/` as markdown files with optional YAML frontmatter:
+New rules should use bundle directories with schema-validated metadata and a
+separate prompt body:
 
-```markdown
----
+```text
+rules/python-style/
+├── meta.yaml
+└── prompt.md
+```
+
+```yaml
+# rules/python-style/meta.yaml
+spec_version: v1
+kind: rule
 description: "Python coding standards"
 globs: ["*.py"]
 always_apply: false
----
+```
 
+```markdown
+<!-- rules/python-style/prompt.md -->
 Always use type hints. Prefer dataclasses over dicts.
 ```
 
 Cross-compiled per editor: Cursor gets `.mdc` files with native frontmatter, OpenCode/Codex get `AGENTS.md` sections.
+Legacy single-file rule markdown with YAML frontmatter remains supported for migration.
 
 ```bash
 code-agnostic rules list
@@ -158,7 +174,10 @@ code-agnostic rules remove --name python-style
 
 ### Skills and agents
 
-Canonical YAML frontmatter format, cross-compiled per editor. Install or edit skills in the `code-agnostic` source of truth, then run `plan` / `apply`; do not hand-copy generated skills into `.codex`, `.cursor`, or OpenCode directories.
+Use bundle directories for new skills and agents, then let `code-agnostic`
+cross-compile them per editor. Install or edit skills in the `code-agnostic`
+source of truth, then run `plan` / `apply`; do not hand-copy generated skills
+into `.codex`, `.cursor`, `.agents`, or OpenCode directories.
 
 ```bash
 code-agnostic skills list
@@ -188,9 +207,9 @@ That command should copy the skill into the source of truth and then run the nor
 
 ### Workspaces
 
-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`. Claude receives generated `CLAUDE.local.md` files and project MCP entries in `~/.claude.json["projects"][absolute_repo_path]["mcpServers"]`. Repo-local app config, skills, and agents are propagated for OpenCode, Cursor, Codex, and Claude.
+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`. Claude receives generated `CLAUDE.local.md` files and project MCP entries in `~/.claude.json["projects"][absolute_repo_path]["mcpServers"]`. Repo-local app config, skills, and agents are propagated for OpenCode, Codex, and Claude.
 
-Cursor propagation intentionally stays to repo-local MCP, skills, and agents; it does not copy the shared workspace `AGENTS.md` into child repos.
+`.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).
 
 ```bash
 code-agnostic workspaces add --name myproject --path ~/code/myproject
@@ -239,7 +258,7 @@ The compiler migration is documented in:
 
 - [x] Plan/apply/status sync engine
 - [x] MCP server sync across editors
-- [x] Skills and agents sync (symlink-based)
+- [x] Skills and agents sync across editors
 - [x] Workspace propagation into git repos
 - [x] Import from existing editor configs
 - [x] Consistent CLI with named flags and aliases

{code_agnostic-0.3.8 → code_agnostic-0.3.9}/code_agnostic/__init__.py

@@ -1,3 +1,3 @@
 __all__ = ["__version__"]
 
-__version__ = "0.3.8"
+__version__ = "0.3.9"

{code_agnostic-0.3.8 → code_agnostic-0.3.9}/code_agnostic/agents/codex.py

@@ -69,13 +69,10 @@ def serialize_codex_agent(agent: Agent) -> str:
     description = agent.metadata.description or agent.metadata.name or agent.name
 
     doc = tomlkit.document()
-    doc.add("name", tomlkit.item(agent.metadata.name or agent.name))
-    doc.add("description", tomlkit.item(description))
+    doc.add("name", agent.metadata.name or agent.name)
+    doc.add("description", description)
     if agent.metadata.nickname_candidates:
-        doc.add(
-            "nickname_candidates",
-            tomlkit.item(list(agent.metadata.nickname_candidates)),
-        )
+        doc.add("nickname_candidates", list(agent.metadata.nickname_candidates))
     model = agent.metadata.effective_value("codex", "model")
     if model:
         doc.add("model", model)

{code_agnostic-0.3.8 → code_agnostic-0.3.9}/code_agnostic/apps/app_id.py

@@ -63,7 +63,7 @@ APP_CATALOG: dict[AppId, AppMetadata] = {
         toggleable=True,
         importable=True,
         supports_import_agents=True,
-        supports_workspace_propagation=True,
+        supports_workspace_propagation=False,
         project_dir_name=CURSOR_PROJECT_DIRNAME,
         config_filename=CURSOR_CONFIG_FILENAME,
     ),

{code_agnostic-0.3.8 → code_agnostic-0.3.9}/code_agnostic/apps/claude/service.py

@@ -8,6 +8,10 @@ from code_agnostic.agents.parser import parse_agent
 from code_agnostic.apps.app_id import AppId, app_label
 from code_agnostic.apps.claude.config_repository import ClaudeConfigRepository
 from code_agnostic.apps.claude.mapper import ClaudeMCPMapper
+from code_agnostic.apps.common.compiled_planning import (
+    find_replaceable_symlink_ancestor,
+    plan_owned_compiled_text_action,
+)
 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
@@ -131,7 +135,7 @@ class ClaudeConfigService(RegisteredAppConfigService):
         removable_links: list[Path],
     ) -> tuple[list[Action], list[Path], list[str]]:
         compiler = ClaudeSkillCompiler()
-        return self._plan_compiled_text_actions(
+        return self._plan_owned_text_actions(
             sources=sources,
             target_dir=target_dir,
             scope=scope,
@@ -169,7 +173,7 @@ class ClaudeConfigService(RegisteredAppConfigService):
             agent = parse_agent(source)
             return claude_agent_target_path(target_dir, agent), compiler.compile(agent)
 
-        return self._plan_compiled_text_actions(
+        return self._plan_owned_text_actions(
             sources=sources,
             target_dir=target_dir,
             scope=scope,
@@ -182,3 +186,63 @@ class ClaudeConfigService(RegisteredAppConfigService):
             update_detail="update compiled claude agent",
             conflict_message="Claude agent sync skipped (conflict): {target}",
         )
+
+    def _plan_owned_text_actions(
+        self,
+        *,
+        sources: list[Path],
+        target_dir: Path,
+        scope: str,
+        app: str,
+        managed_paths: list[Path],
+        removable_links: list[Path],
+        compile_source,
+        create_detail: str,
+        noop_detail: str,
+        update_detail: str,
+        conflict_message: str,
+    ) -> tuple[list[Action], list[Path], list[str]]:
+        managed_path_set = {path.resolve(strict=False) for path in managed_paths}
+        removable_link_set = {path.resolve(strict=False) for path in removable_links}
+        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_owned_compiled_text_action(
+                target=target,
+                payload=payload,
+                managed_paths=managed_path_set,
+                removable_link_paths=removable_link_set,
+                managed_root=target_dir,
+                scope=scope,
+                app=app,
+                create_detail=create_detail,
+                noop_detail=noop_detail,
+                update_detail=update_detail,
+            )
+            actions.append(action)
+            if action.status == ActionStatus.CONFLICT:
+                skipped.append(conflict_message.format(target=target))
+
+        return actions, desired_paths, skipped

{code_agnostic-0.3.8 → code_agnostic-0.3.9}/code_agnostic/apps/codex/schema.json

@@ -102,6 +102,14 @@
       "additionalProperties": false,
       "description": "Config values for a single app/connector.",
       "properties": {
+        "approvals_reviewer": {
+          "allOf": [
+            {
+              "$ref": "#/definitions/ApprovalsReviewer"
+            }
+          ],
+          "description": "Reviewer for approval prompts from this app, overriding the thread default."
+        },
         "default_tools_approval_mode": {
           "allOf": [
             {

code_agnostic-0.3.9/code_agnostic/apps/common/compiled_planning.py

@@ -0,0 +1,197 @@
+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], managed_root: Path | None
+) -> tuple[bool, bool]:
+    current = target
+    found_symlink = False
+    while True:
+        in_managed_root = managed_root is None or (
+            current == managed_root or current.is_relative_to(managed_root)
+        )
+        if current.is_symlink() and in_managed_root:
+            found_symlink = True
+            current_key = current.resolve(strict=False)
+            if current_key in removable_link_paths:
+                return True, True
+        if current.parent == current:
+            return found_symlink, False
+        current = current.parent
+
+
+def plan_compiled_text_action(
+    *,
+    target: Path,
+    payload: str,
+    managed_paths: set[Path],
+    removable_link_paths: set[Path] | None = None,
+    managed_root: Path | None = None,
+    scope: str,
+    app: str,
+    create_detail: str,
+    noop_detail: str,
+    update_detail: str,
+    conflict_detail: str = "non-managed path exists",
+) -> Action:
+    removable = removable_link_paths or set()
+    has_symlink_ancestor, is_removable_ancestor = _symlink_ancestor_state(
+        target, removable, managed_root
+    )
+
+    if has_symlink_ancestor and not is_removable_ancestor:
+        return Action(
+            kind=ActionKind.WRITE_TEXT,
+            path=target,
+            status=ActionStatus.CONFLICT,
+            detail=conflict_detail,
+            payload=payload,
+            app=app,
+            scope=scope,
+        )
+
+    if has_symlink_ancestor and is_removable_ancestor:
+        if target.is_file():
+            existing = target.read_text(encoding="utf-8")
+            if existing == payload:
+                return Action(
+                    kind=ActionKind.WRITE_TEXT,
+                    path=target,
+                    status=ActionStatus.NOOP,
+                    detail=noop_detail,
+                    payload=payload,
+                    app=app,
+                    scope=scope,
+                )
+            return Action(
+                kind=ActionKind.WRITE_TEXT,
+                path=target,
+                status=ActionStatus.UPDATE,
+                detail=update_detail,
+                payload=payload,
+                app=app,
+                scope=scope,
+            )
+        return Action(
+            kind=ActionKind.WRITE_TEXT,
+            path=target,
+            status=ActionStatus.CREATE,
+            detail=create_detail,
+            payload=payload,
+            app=app,
+            scope=scope,
+        )
+
+    if not target.exists() and not target.is_symlink():
+        return Action(
+            kind=ActionKind.WRITE_TEXT,
+            path=target,
+            status=ActionStatus.CREATE,
+            detail=create_detail,
+            payload=payload,
+            app=app,
+            scope=scope,
+        )
+
+    if target.is_file():
+        existing = target.read_text(encoding="utf-8")
+        if existing == payload:
+            return Action(
+                kind=ActionKind.WRITE_TEXT,
+                path=target,
+                status=ActionStatus.NOOP,
+                detail=noop_detail,
+                payload=payload,
+                app=app,
+                scope=scope,
+            )
+        return Action(
+            kind=ActionKind.WRITE_TEXT,
+            path=target,
+            status=ActionStatus.UPDATE,
+            detail=update_detail,
+            payload=payload,
+            app=app,
+            scope=scope,
+        )
+
+    return Action(
+        kind=ActionKind.WRITE_TEXT,
+        path=target,
+        status=ActionStatus.CONFLICT,
+        detail=conflict_detail,
+        payload=payload,
+        app=app,
+        scope=scope,
+    )
+
+
+def plan_owned_compiled_text_action(
+    *,
+    target: Path,
+    payload: str,
+    managed_paths: set[Path],
+    removable_link_paths: set[Path] | None = None,
+    managed_root: Path | None = None,
+    scope: str,
+    app: str,
+    create_detail: str,
+    noop_detail: str,
+    update_detail: str,
+    conflict_detail: str = "non-managed path exists",
+) -> Action:
+    target_key = target.resolve(strict=False)
+    removable = removable_link_paths or set()
+    has_symlink_ancestor, is_removable_ancestor = _symlink_ancestor_state(
+        target, removable, managed_root
+    )
+
+    if target_key in managed_paths or is_removable_ancestor:
+        return plan_compiled_text_action(
+            target=target,
+            payload=payload,
+            managed_paths=managed_paths,
+            removable_link_paths=removable,
+            managed_root=managed_root,
+            scope=scope,
+            app=app,
+            create_detail=create_detail,
+            noop_detail=noop_detail,
+            update_detail=update_detail,
+            conflict_detail=conflict_detail,
+        )
+
+    if not target.exists() and not target.is_symlink() and not has_symlink_ancestor:
+        return Action(
+            kind=ActionKind.WRITE_TEXT,
+            path=target,
+            status=ActionStatus.CREATE,
+            detail=create_detail,
+            payload=payload,
+            app=app,
+            scope=scope,
+        )
+
+    return Action(
+        kind=ActionKind.WRITE_TEXT,
+        path=target,
+        status=ActionStatus.CONFLICT,
+        detail=conflict_detail,
+        payload=payload,
+        app=app,
+        scope=scope,
+    )

{code_agnostic-0.3.8 → code_agnostic-0.3.9}/code_agnostic/apps/common/interfaces/repositories.py

@@ -20,16 +20,6 @@ class IAppConfigRepository(ABC):
     def config_path(self) -> Path:
         raise NotImplementedError
 
-    @property
-    @abstractmethod
-    def skills_dir(self) -> Path:
-        raise NotImplementedError
-
-    @property
-    @abstractmethod
-    def agents_dir(self) -> Path:
-        raise NotImplementedError
-
     @abstractmethod
     def load_config(self) -> dict[str, Any]:
         raise NotImplementedError

{code_agnostic-0.3.8 → code_agnostic-0.3.9}/code_agnostic/apps/common/interfaces/service.py

@@ -6,6 +6,7 @@ from typing import Any
 from code_agnostic.apps.app_id import AppId, app_scope
 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
@@ -17,12 +18,6 @@ from code_agnostic.apps.common.symlink_planning import (
     plan_stale_files_group,
     plan_stale_group,
 )
-from code_agnostic.generated_artifacts import (
-    ArtifactKind,
-    GeneratedArtifact,
-    OwnershipPolicy,
-    plan_generated_artifact,
-)
 from code_agnostic.models import Action, ActionKind, ActionStatus, SyncPlan
 
 
@@ -97,10 +92,7 @@ class IAppConfigService(ABC):
         raise NotImplementedError
 
     def agent_action_removable_links(self, removable_links: list[Path]) -> list[Path]:
-        return removable_links
-
-    def compiled_resource_ownership_policy(self) -> OwnershipPolicy:
-        return OwnershipPolicy.OWNED_ONLY
+        return []
 
     @staticmethod
     def _normalize_managed_group(value: Any) -> dict[str, Any]:
@@ -127,18 +119,14 @@ class IAppConfigService(ABC):
         desired_paths: list[Path] = []
         skipped: list[str] = []
         scheduled_removals: set[Path] = set()
-        ownership = self.compiled_resource_ownership_policy()
 
         for source in sources:
             target, payload = compile_source(source)
             desired_paths.append(target)
             replaceable_symlink = find_replaceable_symlink_ancestor(target, target_dir)
-            can_replace_symlink = replaceable_symlink is not None and (
-                ownership != OwnershipPolicy.OWNED_ONLY
-                or replaceable_symlink.resolve(strict=False) in removable_link_set
-            )
-            if replaceable_symlink is not None and (
-                can_replace_symlink and replaceable_symlink not in scheduled_removals
+            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))
@@ -152,21 +140,17 @@ class IAppConfigService(ABC):
                         scope=scope,
                     )
                 )
-            action = plan_generated_artifact(
-                GeneratedArtifact(
-                    path=target,
-                    kind=ArtifactKind.TEXT,
-                    payload=payload,
-                    ownership=ownership,
-                    managed_root=target_dir,
-                    scope=scope,
-                    app=app,
-                    create_detail=create_detail,
-                    noop_detail=noop_detail,
-                    update_detail=update_detail,
-                ),
+            action = plan_compiled_text_action(
+                target=target,
+                payload=payload,
                 managed_paths=managed_path_set,
                 removable_link_paths=removable_link_set,
+                managed_root=target_dir,
+                scope=scope,
+                app=app,
+                create_detail=create_detail,
+                noop_detail=noop_detail,
+                update_detail=update_detail,
             )
             actions.append(action)
             if action.status == ActionStatus.CONFLICT: