code-agnostic 0.2.0__tar.gz → 0.2.2__tar.gz

{code_agnostic-0.2.0 → code_agnostic-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-agnostic
-Version: 0.2.0
+Version: 0.2.2
 Summary: Centralized hub for LLM coding config: MCP, skills, rules, and agents.
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -97,11 +97,11 @@ code-agnostic apply
 | Rules sync (cross-compiled) | yes | yes | yes |
 | Skills sync | yes | yes | yes |
 | Agents sync | yes | yes | -- |
-| Workspace propagation | yes | yes | yes |
+| Workspace propagation | yes | -- | yes |
 | Import from | yes | yes | yes |
 | Interactive import (TUI) | yes | yes | yes |
 
-Codex does not support agents natively.
+Codex does not support agents natively. Workspace propagation is intentionally disabled for Cursor 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
 
 ## Features
 
@@ -160,7 +160,9 @@ code-agnostic agents list
 
 ### Workspaces
 
-Register workspace directories. Repos inside them get rules, skills, and agents propagated as symlinks.
+Register workspace directories. Repos inside them get rules, skills, and agents propagated as symlinks 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).
 
 ```bash
 code-agnostic workspaces add --name myproject --path ~/code/myproject

{code_agnostic-0.2.0 → code_agnostic-0.2.2}/README.md

@@ -75,11 +75,11 @@ code-agnostic apply
 | Rules sync (cross-compiled) | yes | yes | yes |
 | Skills sync | yes | yes | yes |
 | Agents sync | yes | yes | -- |
-| Workspace propagation | yes | yes | yes |
+| Workspace propagation | yes | -- | yes |
 | Import from | yes | yes | yes |
 | Interactive import (TUI) | yes | yes | yes |
 
-Codex does not support agents natively.
+Codex does not support agents natively. Workspace propagation is intentionally disabled for Cursor 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
 
 ## Features
 
@@ -138,7 +138,9 @@ code-agnostic agents list
 
 ### Workspaces
 
-Register workspace directories. Repos inside them get rules, skills, and agents propagated as symlinks.
+Register workspace directories. Repos inside them get rules, skills, and agents propagated as symlinks 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).
 
 ```bash
 code-agnostic workspaces add --name myproject --path ~/code/myproject

{code_agnostic-0.2.0 → code_agnostic-0.2.2}/code_agnostic/apps/app_id.py

@@ -17,6 +17,7 @@ class AppMetadata:
     toggleable: bool
     importable: bool
     supports_import_agents: bool
+    supports_workspace_propagation: bool
     project_dir_name: str | None = None
 
 
@@ -28,6 +29,7 @@ APP_CATALOG: dict[AppId, AppMetadata] = {
         toggleable=False,
         importable=False,
         supports_import_agents=True,
+        supports_workspace_propagation=False,
         project_dir_name=None,
     ),
     AppId.OPENCODE: AppMetadata(
@@ -37,6 +39,7 @@ APP_CATALOG: dict[AppId, AppMetadata] = {
         toggleable=True,
         importable=True,
         supports_import_agents=True,
+        supports_workspace_propagation=True,
         project_dir_name=".opencode",
     ),
     AppId.CURSOR: AppMetadata(
@@ -46,6 +49,7 @@ APP_CATALOG: dict[AppId, AppMetadata] = {
         toggleable=True,
         importable=True,
         supports_import_agents=True,
+        supports_workspace_propagation=False,
         project_dir_name=".cursor",
     ),
     AppId.CODEX: AppMetadata(
@@ -55,6 +59,7 @@ APP_CATALOG: dict[AppId, AppMetadata] = {
         toggleable=True,
         importable=True,
         supports_import_agents=False,
+        supports_workspace_propagation=True,
         project_dir_name=".codex",
     ),
 }
@@ -74,6 +79,7 @@ def app_ids_by_capability(
     targetable: bool | None = None,
     toggleable: bool | None = None,
     importable: bool | None = None,
+    workspace_propagation: bool | None = None,
 ) -> list[AppId]:
     ids: list[AppId] = []
     for app_id, metadata in APP_CATALOG.items():
@@ -83,5 +89,10 @@ def app_ids_by_capability(
             continue
         if importable is not None and metadata.importable != importable:
             continue
+        if (
+            workspace_propagation is not None
+            and metadata.supports_workspace_propagation != workspace_propagation
+        ):
+            continue
         ids.append(app_id)
     return sorted(ids, key=lambda item: item.value)

{code_agnostic-0.2.0 → code_agnostic-0.2.2}/code_agnostic/git_exclude_service.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 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.core.repository import CoreRepository
 from code_agnostic.utils import read_json_safe, write_json
@@ -46,7 +47,16 @@ class GitExcludeService:
         if not config.get("include_defaults", True):
             return extras
 
-        defaults = [f".{app_name}" for app_name in enabled_apps] + [
+        workspace_apps: list[str] = []
+        for app_name in enabled_apps:
+            try:
+                metadata = app_metadata(app_name)
+            except ValueError:
+                continue
+            if metadata.supports_workspace_propagation:
+                workspace_apps.append(app_name)
+
+        defaults = [f".{app_name}" for app_name in workspace_apps] + [
             AGENTS_FILENAME,
             CLAUDE_FILENAME,
         ]

{code_agnostic-0.2.0 → code_agnostic-0.2.2}/code_agnostic/planner.py

@@ -147,7 +147,7 @@ class SyncPlanner:
 
         for svc in self.app_services:
             meta = app_metadata(svc.app_id)
-            if meta.project_dir_name is None:
+            if meta.project_dir_name is None or not meta.supports_workspace_propagation:
                 continue
 
             ws_project_root = ws_source.root / meta.project_dir_name

{code_agnostic-0.2.0 → code_agnostic-0.2.2}/code_agnostic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-agnostic
-Version: 0.2.0
+Version: 0.2.2
 Summary: Centralized hub for LLM coding config: MCP, skills, rules, and agents.
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -97,11 +97,11 @@ code-agnostic apply
 | Rules sync (cross-compiled) | yes | yes | yes |
 | Skills sync | yes | yes | yes |
 | Agents sync | yes | yes | -- |
-| Workspace propagation | yes | yes | yes |
+| Workspace propagation | yes | -- | yes |
 | Import from | yes | yes | yes |
 | Interactive import (TUI) | yes | yes | yes |
 
-Codex does not support agents natively.
+Codex does not support agents natively. Workspace propagation is intentionally disabled for Cursor 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
 
 ## Features
 
@@ -160,7 +160,9 @@ code-agnostic agents list
 
 ### Workspaces
 
-Register workspace directories. Repos inside them get rules, skills, and agents propagated as symlinks.
+Register workspace directories. Repos inside them get rules, skills, and agents propagated as symlinks 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).
 
 ```bash
 code-agnostic workspaces add --name myproject --path ~/code/myproject

{code_agnostic-0.2.0 → code_agnostic-0.2.2}/pyproject.toml

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

{code_agnostic-0.2.0 → code_agnostic-0.2.2}/tests/test_cli_apply_apps.py

@@ -45,7 +45,7 @@ def test_apply_all_with_cursor_and_codex_writes_both(
     assert (tmp_path / ".codex" / "config.toml").exists()
 
 
-def test_apply_cursor_target_also_applies_workspace_links(
+def test_apply_cursor_target_does_not_apply_workspace_links(
     minimal_shared_config: Path,
     tmp_path: Path,
     core_root: Path,
@@ -79,11 +79,8 @@ def test_apply_cursor_target_also_applies_workspace_links(
     apply_result = cli_runner.invoke(cli, ["apply", "-a", "cursor"])
     assert apply_result.exit_code == 0
 
-    # Cursor compiles rules to .mdc files in .cursor/rules/, then symlinks the dir
-    compiled_rules_dir = ws_config_dir / ".cursor" / "rules"
     repo_rules_link = workspace_root / "service-a" / ".cursor" / "rules"
-    assert repo_rules_link.is_symlink()
-    assert repo_rules_link.resolve() == compiled_rules_dir.resolve()
+    assert not repo_rules_link.exists()
 
 
 def test_apply_cursor_aborts_on_invalid_cursor_json(

{code_agnostic-0.2.0 → code_agnostic-0.2.2}/tests/test_cli_plan.py

@@ -15,7 +15,7 @@ def test_plan_shows_invalid_json_error_for_mcp_base(
     assert "Invalid JSON format" in result.output
 
 
-def test_plan_target_cursor_includes_workspace_actions(
+def test_plan_target_cursor_excludes_workspace_actions(
     minimal_shared_config: Path,
     tmp_path: Path,
     core_root: Path,
@@ -40,7 +40,7 @@ def test_plan_target_cursor_includes_workspace_actions(
     plan_result = cli_runner.invoke(cli, ["plan", "-a", "cursor"])
     assert plan_result.exit_code == 0
     assert "cursor" in plan_result.output
-    assert "workspace config sync" in plan_result.output
+    assert "workspace config sync" not in plan_result.output
 
 
 def test_plan_with_no_apps_enabled(minimal_shared_config: Path, cli_runner) -> None:

{code_agnostic-0.2.0 → code_agnostic-0.2.2}/tests/test_cli_workspaces.py

@@ -151,7 +151,7 @@ def test_workspaces_git_exclude_writes_enabled_apps_and_default_rules(
     assert result.exit_code == 0
     assert "Updated git excludes" in result.output
 
-    expected_entries = [".cursor", "AGENTS.md", "CLAUDE.md"]
+    expected_entries = ["AGENTS.md", "CLAUDE.md"]
     unexpected_entries = [".opencode", ".codex"]
 
     for repo_name in ["repo-a", "repo-b"]:
@@ -194,5 +194,5 @@ def test_workspaces_git_exclude_can_target_single_workspace(
     exclude_a = ws_a / "repo-a" / ".git" / "info" / "exclude"
     exclude_b = ws_b / "repo-b" / ".git" / "info" / "exclude"
 
-    assert ".cursor" in exclude_a.read_text(encoding="utf-8")
+    assert ".cursor" not in exclude_a.read_text(encoding="utf-8")
     assert not exclude_b.exists()

{code_agnostic-0.2.0 → code_agnostic-0.2.2}/tests/test_git_exclude_service.py

@@ -21,7 +21,7 @@ def service_with_workspace(minimal_shared_config: Path, tmp_path: Path):
 
 def test_defaults_only(service_with_workspace) -> None:
     entries = service_with_workspace.compute_entries("myws", ["cursor", "codex"])
-    assert ".cursor" in entries
+    assert ".cursor" not in entries
     assert ".codex" in entries
     assert AGENTS_FILENAME in entries
     assert CLAUDE_FILENAME in entries
@@ -30,7 +30,7 @@ def test_defaults_only(service_with_workspace) -> None:
 def test_custom_patterns_merged(service_with_workspace) -> None:
     service_with_workspace.add_pattern("myws", "*.generated")
     entries = service_with_workspace.compute_entries("myws", ["cursor"])
-    assert ".cursor" in entries
+    assert ".cursor" not in entries
     assert AGENTS_FILENAME in entries
     assert "*.generated" in entries
 

{code_agnostic-0.2.0 → code_agnostic-0.2.2}/tests/test_planner_rules.py

@@ -63,7 +63,9 @@ def test_plan_workspace_no_rules(setup_workspace, enable_app) -> None:
     assert len(rule_actions) == 0
 
 
-def test_plan_rules_compiled_per_app(setup_workspace, enable_app) -> None:
+def test_plan_rules_compiled_only_for_workspace_propagation_apps(
+    setup_workspace, enable_app
+) -> None:
     enable_app("opencode")
     enable_app("cursor")
     ws = setup_workspace
@@ -79,14 +81,14 @@ def test_plan_rules_compiled_per_app(setup_workspace, enable_app) -> None:
     plan = apps.plan_for_target("all")
 
     rule_actions = [a for a in plan.actions if a.kind == ActionKind.WRITE_RULE]
-    # Should have rules compiled for both opencode and cursor
-    assert len(rule_actions) >= 2
+    # Cursor workspace propagation is intentionally disabled.
+    assert len(rule_actions) == 1
 
     # OpenCode should get AGENTS.md
     opencode_rules = [a for a in rule_actions if "opencode" in a.detail]
     assert len(opencode_rules) >= 1
     assert any("AGENTS.md" in a.detail for a in opencode_rules)
 
-    # Cursor should get .mdc file
+    # Cursor should not compile workspace rules.
     cursor_rules = [a for a in rule_actions if "cursor" in a.detail]
-    assert len(cursor_rules) >= 1
+    assert cursor_rules == []

{code_agnostic-0.2.0 → code_agnostic-0.2.2}/tests/test_workspace_config_sync.py

@@ -1,6 +1,5 @@
 """Tests for workspace-level config sync (MCP, skills, agents, rules)."""
 
-import json
 from pathlib import Path
 
 from code_agnostic.apps.codex.config_repository import CodexConfigRepository
@@ -158,7 +157,7 @@ def test_workspace_rules_symlinks_planned_for_each_repo(
 # --- Workspace MCP config sync ---
 
 
-def test_workspace_mcp_sync_to_cursor_project_dirs(
+def test_workspace_mcp_sync_skips_cursor_workspace_propagation(
     minimal_shared_config: Path,
     core_root: Path,
     tmp_path: Path,
@@ -180,28 +179,9 @@ def test_workspace_mcp_sync_to_cursor_project_dirs(
     cursor_root = tmp_path / ".cursor"
     plan = SyncPlanner(core=core, app_services=[_cursor_service(cursor_root)]).build()
 
-    mcp_actions = [
-        a
-        for a in plan.actions
-        if a.app == "workspace"
-        and a.kind in (ActionKind.WRITE_JSON, ActionKind.WRITE_TEXT)
-    ]
-    assert len(mcp_actions) == 1
-    assert mcp_actions[0].workspace == "myws"
-
-    # The MCP config should be rendered once into workspace config dir
-    expected_path = ws_config / ".cursor" / "mcp.json"
-    assert mcp_actions[0].path == expected_path
-
-    # And then symlinked into each repo
-    link_actions = [
-        a
-        for a in plan.actions
-        if a.kind == ActionKind.SYMLINK and a.scope == "ws:cursor:repo_mcp"
-    ]
-    assert len(link_actions) == 1
-    assert link_actions[0].path == workspace_root / "repo-a" / ".cursor" / "mcp.json"
-    assert link_actions[0].source == expected_path
+    workspace_actions = [a for a in plan.actions if a.app == "workspace"]
+    assert workspace_actions == []
+    assert not (ws_config / ".cursor").exists()
 
 
 def test_workspace_mcp_sync_to_codex_project_dirs(
@@ -248,7 +228,7 @@ def test_workspace_mcp_sync_to_codex_project_dirs(
 # --- Workspace skill symlinks ---
 
 
-def test_workspace_skills_symlinked_to_repo_project_dirs(
+def test_workspace_skills_skip_cursor_workspace_propagation(
     minimal_shared_config: Path,
     core_root: Path,
     tmp_path: Path,
@@ -267,33 +247,19 @@ def test_workspace_skills_symlinked_to_repo_project_dirs(
     cursor_root = tmp_path / ".cursor"
     plan = SyncPlanner(core=core, app_services=[_cursor_service(cursor_root)]).build()
 
-    # Workspace skill entry symlinked into workspace project dir
-    ws_entry_actions = [
-        a
-        for a in plan.actions
-        if a.kind == ActionKind.SYMLINK and a.scope == "ws:cursor:skills_entries"
-    ]
-    assert len(ws_entry_actions) == 1
-    assert ws_entry_actions[0].workspace == "myws"
-    assert ws_entry_actions[0].path == ws_config / ".cursor" / "skills" / "my-skill"
-    assert ws_entry_actions[0].source == ws_config / "skills" / "my-skill"
-
-    # Repo links its skills dir to workspace skills dir
-    repo_dir_actions = [
+    cursor_workspace_actions = [
         a
         for a in plan.actions
-        if a.kind == ActionKind.SYMLINK and a.scope == "ws:cursor:repo_skills_dir"
+        if a.scope is not None and a.scope.startswith("ws:cursor:")
     ]
-    assert len(repo_dir_actions) == 1
-    assert repo_dir_actions[0].workspace == "myws"
-    assert repo_dir_actions[0].path == workspace_root / "repo-a" / ".cursor" / "skills"
-    assert repo_dir_actions[0].source == ws_config / ".cursor" / "skills"
+    assert cursor_workspace_actions == []
+    assert not (workspace_root / "repo-a" / ".cursor").exists()
 
 
 # --- Workspace agent symlinks ---
 
 
-def test_workspace_agents_symlinked_to_repo_project_dirs(
+def test_workspace_agents_skip_cursor_workspace_propagation(
     minimal_shared_config: Path,
     core_root: Path,
     tmp_path: Path,
@@ -312,25 +278,13 @@ def test_workspace_agents_symlinked_to_repo_project_dirs(
     cursor_root = tmp_path / ".cursor"
     plan = SyncPlanner(core=core, app_services=[_cursor_service(cursor_root)]).build()
 
-    ws_entry_actions = [
-        a
-        for a in plan.actions
-        if a.kind == ActionKind.SYMLINK and a.scope == "ws:cursor:agents_entries"
-    ]
-    assert len(ws_entry_actions) == 1
-    assert ws_entry_actions[0].workspace == "myws"
-    assert ws_entry_actions[0].path == ws_config / ".cursor" / "agents" / "planner.md"
-    assert ws_entry_actions[0].source == ws_config / "agents" / "planner.md"
-
-    repo_dir_actions = [
+    cursor_workspace_actions = [
         a
         for a in plan.actions
-        if a.kind == ActionKind.SYMLINK and a.scope == "ws:cursor:repo_agents_dir"
+        if a.scope is not None and a.scope.startswith("ws:cursor:")
     ]
-    assert len(repo_dir_actions) == 1
-    assert repo_dir_actions[0].workspace == "myws"
-    assert repo_dir_actions[0].path == workspace_root / "repo-a" / ".cursor" / "agents"
-    assert repo_dir_actions[0].source == ws_config / ".cursor" / "agents"
+    assert cursor_workspace_actions == []
+    assert not (workspace_root / "repo-a" / ".cursor").exists()
 
 
 def test_workspace_agents_not_synced_to_codex(
@@ -379,23 +333,22 @@ def test_executor_persists_workspace_state_separately(
     (ws_config / "rules").mkdir(parents=True, exist_ok=True)
     (ws_config / "rules" / "shared.md").write_text("rules", encoding="utf-8")
 
-    cursor_root = tmp_path / ".cursor"
-    plan = SyncPlanner(core=core, app_services=[_cursor_service(cursor_root)]).build()
+    codex_root = tmp_path / ".codex"
+    plan = SyncPlanner(core=core, app_services=[_codex_service(codex_root)]).build()
 
     applied, failed, failures = SyncExecutor(core=core).execute(plan)
     assert failed == 0
 
-    # Workspace state persisted to workspace state file
-    # Cursor compiles rules to .mdc in .cursor/rules/ and symlinks the dir
+    # Workspace state persisted to workspace state file.
     ws_repo = WorkspaceConfigRepository(root=ws_config)
     ws_state = ws_repo.load_state()
     managed = ws_state["managed_links"]
-    assert "ws:cursor:repo_rules_dir" in managed
-    assert len(managed["ws:cursor:repo_rules_dir"]) == 1
+    assert "rules" in managed
+    assert len(managed["rules"]) == 1
 
     # Global state should not contain workspace links
     global_state = core.load_state()
-    assert "ws:cursor:repo_rules_dir" not in global_state.get("managed_links", {})
+    assert "rules" not in global_state.get("managed_links", {})
 
 
 # --- Full roundtrip with apply ---
@@ -428,12 +381,10 @@ def test_full_workspace_config_roundtrip(
     (ws_config / "agents").mkdir(parents=True)
     (ws_config / "agents" / "ws-agent.md").write_text("a", encoding="utf-8")
 
-    cursor_root = tmp_path / ".cursor"
     plan = SyncPlanner(
         core=core,
         app_services=[
             _opencode_service(core, opencode_root),
-            _cursor_service(cursor_root),
         ],
     ).build()
 
@@ -451,70 +402,21 @@ def test_full_workspace_config_roundtrip(
         assert link.is_symlink()
         assert link.resolve() == compiled_agents.resolve()
 
-    # Check Cursor compiled rules dir (.cursor/rules/ with .mdc files)
-    compiled_cursor_rules = ws_config / ".cursor" / "rules"
-    ws_root_cursor_rules = workspace_root / ".cursor" / "rules"
-    assert ws_root_cursor_rules.is_symlink()
-    assert ws_root_cursor_rules.resolve() == compiled_cursor_rules.resolve()
-
-    for repo_name in ["repo-a", "repo-b"]:
-        repo_rules = workspace_root / repo_name / ".cursor" / "rules"
-        assert repo_rules.is_symlink()
-        assert repo_rules.resolve() == compiled_cursor_rules.resolve()
-
-    # Check MCP config rendered into workspace, then linked into repos
-    ws_cursor_mcp = ws_config / ".cursor" / "mcp.json"
-    assert ws_cursor_mcp.exists()
-    payload = json.loads(ws_cursor_mcp.read_text(encoding="utf-8"))
-    assert "ws-server" in payload.get("mcpServers", {})
-
-    # Workspace root also gets the shared links (for multi-root workspace sessions)
-    ws_root_cursor_mcp = workspace_root / ".cursor" / "mcp.json"
-    assert ws_root_cursor_mcp.is_symlink()
-    assert ws_root_cursor_mcp.resolve() == ws_cursor_mcp.resolve()
-
+    # Cursor workspace propagation is intentionally disabled.
+    assert not (ws_config / ".cursor").exists()
+    assert not (workspace_root / ".cursor").exists()
     for repo_name in ["repo-a", "repo-b"]:
-        cursor_mcp = workspace_root / repo_name / ".cursor" / "mcp.json"
-        assert cursor_mcp.is_symlink()
-        assert cursor_mcp.resolve() == ws_cursor_mcp.resolve()
-
-    # Check skill links in workspace project dir and repo linkage
-    ws_skill_link = ws_config / ".cursor" / "skills" / "ws-skill"
-    assert ws_skill_link.is_symlink()
-
-    ws_root_skill_dir = workspace_root / ".cursor" / "skills"
-    assert ws_root_skill_dir.is_symlink()
-
-    for repo_name in ["repo-a", "repo-b"]:
-        skill_dir = workspace_root / repo_name / ".cursor" / "skills"
-        assert skill_dir.is_symlink()
-        skill_link = skill_dir / "ws-skill"
-        assert skill_link.is_symlink()
-
-    # Check agent links in workspace project dir and repo linkage
-    ws_agent_link = ws_config / ".cursor" / "agents" / "ws-agent.md"
-    assert ws_agent_link.is_symlink()
-
-    ws_root_agent_dir = workspace_root / ".cursor" / "agents"
-    assert ws_root_agent_dir.is_symlink()
-
-    for repo_name in ["repo-a", "repo-b"]:
-        agent_dir = workspace_root / repo_name / ".cursor" / "agents"
-        assert agent_dir.is_symlink()
-        agent_link = agent_dir / "ws-agent.md"
-        assert agent_link.is_symlink()
+        assert not (workspace_root / repo_name / ".cursor").exists()
 
 
 # --- Stale workspace link cleanup ---
 
 
-def test_workspace_stale_rules_cleanup_on_config_removal(
+def test_workspace_rules_not_linked_for_cursor(
     minimal_shared_config: Path,
     core_root: Path,
     tmp_path: Path,
 ) -> None:
-    import shutil
-
     workspace_root = tmp_path / "workspace"
     workspace_root.mkdir()
     (workspace_root / "repo-a" / ".git").mkdir(parents=True)
@@ -530,20 +432,10 @@ def test_workspace_stale_rules_cleanup_on_config_removal(
     plan = SyncPlanner(core=core, app_services=[_cursor_service(cursor_root)]).build()
 
     SyncExecutor(core=core).execute(plan)
-    # Cursor compiles rules to .cursor/rules/ dir and symlinks it into repos
-    link = workspace_root / "repo-a" / ".cursor" / "rules"
-    assert link.is_symlink()
-
-    # Remove rules directory
-    shutil.rmtree(ws_config / "rules")
-
-    plan2 = SyncPlanner(core=core, app_services=[_cursor_service(cursor_root)]).build()
-
-    SyncExecutor(core=core).execute(plan2)
-    assert not link.is_symlink()
+    assert not (workspace_root / "repo-a" / ".cursor" / "rules").exists()
 
 
-def test_workspace_stale_skills_cleanup_when_skills_removed(
+def test_workspace_stale_skills_cleanup_when_skills_removed_for_codex(
     minimal_shared_config: Path,
     core_root: Path,
     tmp_path: Path,
@@ -560,32 +452,32 @@ def test_workspace_stale_skills_cleanup_when_skills_removed(
     (ws_config / "skills" / "my-skill").mkdir(parents=True)
     (ws_config / "skills" / "my-skill" / "SKILL.md").write_text("s", encoding="utf-8")
 
-    cursor_root = tmp_path / ".cursor"
-    plan = SyncPlanner(core=core, app_services=[_cursor_service(cursor_root)]).build()
+    codex_root = tmp_path / ".codex"
+    plan = SyncPlanner(core=core, app_services=[_codex_service(codex_root)]).build()
 
     SyncExecutor(core=core).execute(plan)
-    skill_dir_link = workspace_root / "repo-a" / ".cursor" / "skills"
+    skill_dir_link = workspace_root / "repo-a" / ".codex" / "skills"
     assert skill_dir_link.is_symlink()
 
     # Verify state was persisted with workspace scopes
     ws_repo = WorkspaceConfigRepository(root=ws_config)
     state = ws_repo.load_state()
-    assert "ws:cursor:skills_entries" in state["managed_links"]
-    assert "ws:cursor:repo_skills_dir" in state["managed_links"]
+    assert "ws:codex:skills_entries" in state["managed_links"]
+    assert "ws:codex:repo_skills_dir" in state["managed_links"]
 
     # Remove all skills from workspace config
     import shutil
 
     shutil.rmtree(ws_config / "skills")
 
-    plan2 = SyncPlanner(core=core, app_services=[_cursor_service(cursor_root)]).build()
+    plan2 = SyncPlanner(core=core, app_services=[_codex_service(codex_root)]).build()
 
     # Should have remove actions for stale workspace entry and repo dir link
     remove_actions = [
         a
         for a in plan2.actions
         if a.kind == ActionKind.REMOVE_SYMLINK
-        and a.scope in ("ws:cursor:skills_entries", "ws:cursor:repo_skills_dir")
+        and a.scope in ("ws:codex:skills_entries", "ws:codex:repo_skills_dir")
     ]
     assert len(remove_actions) == 2