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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-agnostic
-Version: 0.3.7
+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
@@ -119,6 +119,10 @@ code-agnostic apply
 | Import from | yes | yes | yes | yes |
 | Interactive import (TUI) | yes | yes | yes | yes |
 
+`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`.
@@ -160,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
@@ -181,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
@@ -262,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.7 → code_agnostic-0.3.9}/README.md

@@ -96,6 +96,10 @@ code-agnostic apply
 | Import from | yes | yes | yes | yes |
 | Interactive import (TUI) | yes | yes | yes | yes |
 
+`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`.
@@ -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
@@ -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.7 → code_agnostic-0.3.9}/code_agnostic/__init__.py

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

{code_agnostic-0.3.7 → 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.7 → code_agnostic-0.3.9}/code_agnostic/apps/opencode/schema.json

@@ -57,7 +57,7 @@
             },
             "branch": {
               "type": "string",
-              "description": "Branch or ref Scout should clone and inspect"
+              "description": "Branch or ref to clone and inspect"
             }
           },
           "required": [
@@ -154,12 +154,6 @@
             "websearch": {
               "$ref": "#/$defs/PermissionActionConfig"
             },
-            "repo_clone": {
-              "$ref": "#/$defs/PermissionRuleConfig"
-            },
-            "repo_overview": {
-              "$ref": "#/$defs/PermissionRuleConfig"
-            },
             "lsp": {
               "$ref": "#/$defs/PermissionRuleConfig"
             },
@@ -961,9 +955,6 @@
             "explore": {
               "$ref": "#/$defs/AgentConfig"
             },
-            "scout": {
-              "$ref": "#/$defs/AgentConfig"
-            },
             "title": {
               "$ref": "#/$defs/AgentConfig"
             },

{code_agnostic-0.3.7 → code_agnostic-0.3.9}/code_agnostic/cli/commands/workspaces.py

@@ -15,7 +15,7 @@ from code_agnostic.tui import SyncConsoleUI
 from code_agnostic.workspaces import WorkspaceService
 
 
-@click.group(help="Manage workspace roots for repo rule propagation.")
+@click.group(help="Manage workspace roots for repo-local sync.")
 def workspaces() -> None:
     pass
 
@@ -39,8 +39,8 @@ def workspaces_add(obj: dict[str, str], name: str, path: Path) -> None:
     ui.render_workspace_saved(name, str(path.expanduser().resolve()))
 
 
-@workspaces.command("remove", help="Remove a workspace from config by name.")
-@click.option("--name", required=True, help="Workspace name to remove.")
+@workspaces.command("remove", help="Unregister a workspace by name.")
+@click.option("--name", required=True, help="Workspace name to unregister.")
 @click.pass_obj
 def workspaces_remove(obj: dict[str, str], name: str) -> None:
     ui = SyncConsoleUI(Console())

{code_agnostic-0.3.7 → code_agnostic-0.3.9}/code_agnostic/imports/service.py

@@ -292,7 +292,11 @@ class ImportService:
             else:
                 skipped.append(f"MCP server skipped due to conflict: {name}")
 
-        normalized_payload = {"mcpServers": dto_to_common_mcp(merged)}
+        normalized_payload = {}
+        existing_schema = existing_payload.get("$schema")
+        if isinstance(existing_schema, str) and existing_schema:
+            normalized_payload["$schema"] = existing_schema
+        normalized_payload["mcpServers"] = dto_to_common_mcp(merged)
         actions.append(
             ImportAction(
                 section=ImportSection.MCP,

{code_agnostic-0.3.7 → code_agnostic-0.3.9}/code_agnostic/lossiness.py

@@ -211,6 +211,36 @@ class LossinessExplainer:
                         reason="target does not support agent sandbox_mode",
                     )
                 )
+            if agent.metadata.tools.read is not True:
+                findings.extend(
+                    self._findings_for_targets(
+                        resource_path=resource_path,
+                        property_name="tools.read",
+                        targets=("codex",),
+                        app=app,
+                        reason="target does not support agent read permissions",
+                    )
+                )
+            if agent.metadata.tools.write is not True:
+                findings.extend(
+                    self._findings_for_targets(
+                        resource_path=resource_path,
+                        property_name="tools.write",
+                        targets=("codex",),
+                        app=app,
+                        reason="target does not support agent write permissions",
+                    )
+                )
+            if agent.metadata.tools.mcp:
+                findings.extend(
+                    self._findings_for_targets(
+                        resource_path=resource_path,
+                        property_name="tools.mcp",
+                        targets=("codex",),
+                        app=app,
+                        reason="target does not support agent MCP permissions",
+                    )
+                )
 
         return findings
 

{code_agnostic-0.3.7 → code_agnostic-0.3.9}/code_agnostic/status.py

@@ -12,11 +12,15 @@ from code_agnostic.constants import (
 )
 from code_agnostic.core.workspace_repository import WorkspaceConfigRepository
 from code_agnostic.models import (
+    Action,
+    ActionStatus,
     RepoSyncStatus,
     WorkspaceRepoStatusRow,
     WorkspaceStatusRow,
     WorkspaceSyncStatus,
 )
+from code_agnostic.planner import SyncPlanner
+from code_agnostic.utils import is_under
 from code_agnostic.workspaces import WorkspaceService
 
 
@@ -30,6 +34,7 @@ class StatusService:
         app_services: list[IAppConfigService] | None = None,
     ) -> list[WorkspaceStatusRow]:
         status_rows: list[WorkspaceStatusRow] = []
+        workspace_actions = self._workspace_actions(source_repo, app_services)
 
         for workspace in source_repo.load_workspaces():
             workspace_name = workspace["name"]
@@ -75,7 +80,18 @@ class StatusService:
                     app_metas.append(meta)
 
             repo_rows = [
-                self._repo_sync_status(repo, ws_source, app_metas) for repo in repos
+                self._repo_sync_status(
+                    repo,
+                    ws_source,
+                    app_metas,
+                    workspace_actions=[
+                        action
+                        for action in workspace_actions
+                        if action.workspace == workspace_name
+                        and is_under(action.path, repo)
+                    ],
+                )
+                for repo in repos
             ]
 
             detail = "all git repos synced"
@@ -98,14 +114,32 @@ class StatusService:
 
         return status_rows
 
+    @staticmethod
+    def _workspace_actions(
+        source_repo: ISourceRepository,
+        app_services: list[IAppConfigService] | None,
+    ) -> list[Action]:
+        if not app_services:
+            return []
+        plan = SyncPlanner(core=source_repo, app_services=app_services).build()
+        return [action for action in plan.actions if action.workspace is not None]
+
     @staticmethod
     def _repo_sync_status(
         repo_path: Path,
         ws_source: WorkspaceConfigRepository,
         app_metas: list[AppMetadata] | None = None,
+        workspace_actions: list[Action] | None = None,
     ) -> WorkspaceRepoStatusRow:
         issues: list[str] = []
 
+        if workspace_actions is not None:
+            for action in workspace_actions:
+                if action.status == ActionStatus.NOOP:
+                    continue
+                issues.append(StatusService._repo_action_issue(action, repo_path))
+            return StatusService._repo_status_row(repo_path, issues)
+
         # Check workspace-managed config files in repo project dirs.
         # Workspace rendering creates regular files (not symlinks) in
         # ws_source.root/<project_dir_name>/..., and repos get the same.
@@ -165,19 +199,46 @@ class StatusService:
                         f"missing or mismatched {meta.app_id.value} agents link"
                     )
 
+        return StatusService._repo_status_row(repo_path, issues)
+
+    @staticmethod
+    def _repo_status_row(repo_path: Path, issues: list[str]) -> WorkspaceRepoStatusRow:
         if not issues:
             return WorkspaceRepoStatusRow(
                 repo=repo_path.name,
                 status=RepoSyncStatus.SYNCED,
                 detail="linked",
             )
-
         return WorkspaceRepoStatusRow(
             repo=repo_path.name,
             status=RepoSyncStatus.NEEDS_SYNC,
             detail="; ".join(issues),
         )
 
+    @staticmethod
+    def _repo_action_issue(action: Action, repo_path: Path) -> str:
+        rel_path = StatusService._relative_repo_path(action.path, repo_path)
+        if action.status == ActionStatus.CREATE:
+            return f"missing {rel_path}"
+        if action.status in {ActionStatus.UPDATE, ActionStatus.FIX}:
+            return f"mismatched {rel_path}"
+        if action.status == ActionStatus.CONFLICT:
+            return f"conflict at {rel_path}"
+        if action.status == ActionStatus.REMOVE:
+            return f"stale {rel_path}"
+        return f"{action.status.value} {rel_path}"
+
+    @staticmethod
+    def _relative_repo_path(path: Path, repo_path: Path) -> str:
+        try:
+            return (
+                path.resolve(strict=False)
+                .relative_to(repo_path.resolve(strict=False))
+                .as_posix()
+            )
+        except ValueError:
+            return path.as_posix()
+
 
 def _claude_project_mcp_exists(repo_path: Path) -> bool:
     payload, error = read_json_safe(Path.home() / CLAUDE_CONFIG_FILENAME)

{code_agnostic-0.3.7 → code_agnostic-0.3.9}/code_agnostic/tui/renderers.py

@@ -1,6 +1,10 @@
 from rich.console import Console
 
-from code_agnostic.imports.models import ImportApplyResult, ImportPlan
+from code_agnostic.imports.models import (
+    ImportActionStatus,
+    ImportApplyResult,
+    ImportPlan,
+)
 from code_agnostic.models import (
     AppStatusRow,
     EditorStatusRow,
@@ -148,7 +152,7 @@ class SyncConsoleUI:
     def render_workspace_saved(
         self, name: str, path: str, removed: bool = False
     ) -> None:
-        verb = "removed" if removed else "added"
+        verb = "unregistered" if removed else "added"
         border_style = UIStyle.YELLOW.value if removed else UIStyle.GREEN.value
         self.console.print(
             UISection.note(
@@ -330,6 +334,60 @@ class SyncConsoleUI:
                 UISection.note("skipped", skipped_text, style=UIStyle.YELLOW.value)
             )
 
+        next_steps = self._import_next_steps(plan, mode)
+        if next_steps:
+            self.console.print(
+                UISection.note("next", next_steps, style=UIStyle.DIM.value)
+            )
+
+    @staticmethod
+    def _import_next_steps(plan: ImportPlan, mode: str) -> str | None:
+        parts = mode.split(":", 2)
+        if len(parts) != 3:
+            return None
+
+        _, command, target = parts
+        target_flag = f" -a {target}" if target else ""
+        conflict_items = [*plan.errors, *plan.skipped]
+        has_conflict = any("conflict" in item.lower() for item in conflict_items)
+
+        if command == "apply":
+            return None
+
+        if plan.errors:
+            lines = [
+                "Fix the errors above, then rerun the import preview.",
+                f"- code-agnostic import plan{target_flag}",
+            ]
+            if has_conflict:
+                lines.append(
+                    "For conflicts, choose --on-conflict overwrite or --on-conflict fail."
+                )
+            return "\n".join(lines)
+
+        has_writes = any(
+            action.status in {ImportActionStatus.CREATE, ImportActionStatus.UPDATE}
+            for action in plan.actions
+        )
+        if has_writes:
+            lines = [
+                "Review the imported items. If they match what you expect, write them to the hub.",
+                f"- code-agnostic import apply{target_flag}",
+            ]
+            if has_conflict:
+                lines.append(
+                    "Skipped conflicts will stay unchanged unless you rerun with --on-conflict overwrite."
+                )
+            return "\n".join(lines)
+
+        if has_conflict:
+            return (
+                "Skipped conflicts were left unchanged.\n"
+                f"- code-agnostic import plan{target_flag} --on-conflict overwrite"
+            )
+
+        return "No import changes needed.\n- code-agnostic validate"
+
     def render_import_apply_result(self, result: ImportApplyResult) -> None:
         self.render_apply_result(
             applied=result.applied,

{code_agnostic-0.3.7 → code_agnostic-0.3.9}/code_agnostic/utils.py

@@ -21,10 +21,10 @@ def read_json_safe(path: Path) -> tuple[Any | None, str | None]:
 
 
 def write_json(path: Path, payload: Any) -> None:
+    rendered = json.dumps(payload, indent=2, sort_keys=False) + "\n"
     path.parent.mkdir(parents=True, exist_ok=True)
     with path.open("w", encoding="utf-8") as handle:
-        json.dump(payload, handle, indent=2, sort_keys=False)
-        handle.write("\n")
+        handle.write(rendered)
 
 
 def merge_dict_overlay(

{code_agnostic-0.3.7 → code_agnostic-0.3.9}/code_agnostic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-agnostic
-Version: 0.3.7
+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
@@ -119,6 +119,10 @@ code-agnostic apply
 | Import from | yes | yes | yes | yes |
 | Interactive import (TUI) | yes | yes | yes | yes |
 
+`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`.
@@ -160,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
@@ -181,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
@@ -262,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.7 → code_agnostic-0.3.9}/pyproject.toml

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

{code_agnostic-0.3.7 → code_agnostic-0.3.9}/tests/test_cli_aliases.py

@@ -49,4 +49,4 @@ def test_workspace_alias_remove(
     cli_runner.invoke(cli, ["workspace", "add", "--name", "myws", "--path", str(ws)])
     result = cli_runner.invoke(cli, ["workspace", "remove", "--name", "myws"])
     assert result.exit_code == 0
-    assert "Workspace removed" in result.output
+    assert "Workspace unregistered" in result.output

{code_agnostic-0.3.7 → code_agnostic-0.3.9}/tests/test_cli_explain_lossiness.py

@@ -126,6 +126,38 @@ def test_explain_lossiness_reports_skill_tool_mappings(
     ]
 
 
+def test_explain_lossiness_reports_codex_agent_tool_mappings(
+    minimal_shared_config: Path,
+    core_root: Path,
+    cli_runner,
+) -> None:
+    agent_dir = core_root / "agents" / "reviewer"
+    agent_dir.mkdir(parents=True)
+    (agent_dir / "meta.yaml").write_text(
+        "spec_version: v1\n"
+        "kind: agent\n"
+        "name: reviewer\n"
+        "tools:\n"
+        "  read: false\n"
+        "  write: false\n"
+        "  mcp:\n"
+        "    - server: github\n"
+        "      tool: create_review\n",
+        encoding="utf-8",
+    )
+    (agent_dir / "prompt.md").write_text("Review code.\n", encoding="utf-8")
+
+    result = cli_runner.invoke(cli, ["explain-lossiness", "--app", "codex"])
+
+    assert result.exit_code == 0
+    assert result.output.splitlines() == [
+        "resource_path\tapp\tproperty\tstatus\treason",
+        "agents/reviewer\tcodex\ttools.mcp\tignored\ttarget does not support agent MCP permissions",
+        "agents/reviewer\tcodex\ttools.read\tignored\ttarget does not support agent read permissions",
+        "agents/reviewer\tcodex\ttools.write\tignored\ttarget does not support agent write permissions",
+    ]
+
+
 def test_explain_lossiness_reports_workspace_paths(
     minimal_shared_config: Path,
     core_root: Path,

{code_agnostic-0.3.7 → code_agnostic-0.3.9}/tests/test_cli_flags.py

@@ -99,7 +99,7 @@ def test_workspaces_remove_with_named_flag(
     cli_runner.invoke(cli, ["workspaces", "add", "--name", "myws", "--path", str(ws)])
     result = cli_runner.invoke(cli, ["workspaces", "remove", "--name", "myws"])
     assert result.exit_code == 0
-    assert "Workspace removed" in result.output
+    assert "Workspace unregistered" in result.output
 
 
 def test_workspaces_git_exclude_with_workspace_flag(

{code_agnostic-0.3.7 → code_agnostic-0.3.9}/tests/test_cli_import.py

@@ -60,6 +60,7 @@ def test_import_plan_codex_shows_sections(cli_runner, tmp_path: Path) -> None:
     assert "mcp" in result.output
     assert "skills" in result.output
     assert "agents" in result.output
+    assert "code-agnostic import apply -a codex" in result.output
 
 
 def test_import_apply_codex_imports_mcp_skills_and_agents(
@@ -257,6 +258,30 @@ def test_import_apply_conflict_policy_fail(cli_runner, tmp_path: Path) -> None:
     assert "conflict" in result.output.lower()
 
 
+def test_import_plan_conflict_skip_shows_overwrite_next_step(
+    cli_runner, tmp_path: Path
+) -> None:
+    _write_codex_source(
+        tmp_path / ".codex",
+        {"demo": {"command": "uvx"}},
+        with_skill=False,
+    )
+    core_mcp_path = tmp_path / ".config" / "code-agnostic" / "config" / "mcp.base.json"
+    core_mcp_path.parent.mkdir(parents=True, exist_ok=True)
+    core_mcp_path.write_text(
+        json.dumps({"mcpServers": {"demo": {"url": "https://existing"}}}),
+        encoding="utf-8",
+    )
+
+    result = cli_runner.invoke(
+        cli, ["import", "plan", "-a", "codex", "--include", "mcp"]
+    )
+
+    assert result.exit_code == 0
+    assert "Skipped conflicts were left unchanged." in result.output
+    assert "code-agnostic import plan -a codex --on-conflict overwrite" in result.output
+
+
 def test_import_plan_default_view_shows_app_labels(cli_runner, tmp_path: Path) -> None:
     _write_codex_source(tmp_path / ".codex", {"demo": {"command": "uvx"}})