CM-71972: Collect user-scope skills for every IDE, not just Claude Code

Codex, Copilot and Cursor each get get_skills() reading their own skills
directory, honoring $CODEX_HOME and $COPILOT_HOME the way the rest of those
integrations do. collect_all_skills already sweeps every registered IDE and
dedupes by path, so nothing else changes and an IDE with no skills directory
simply contributes none.

The session-start tests now isolate the home directory instead of stubbing
collect_all_skills, so the two skill tests exercise the real sweep against
files they create rather than asserting against a mock.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

Author: Altruistus

cycode/cli/apps/ai_guardrails/ides/codex.py

@@ -20,7 +20,7 @@
     resolve_cached_plugin_dir,
     walk_enabled_plugins,
 )
-from cycode.cli.apps.ai_guardrails.ides._skill_utils import walk_plugin_skills
+from cycode.cli.apps.ai_guardrails.ides._skill_utils import walk_plugin_skills, walk_skill_dirs
 from cycode.cli.apps.ai_guardrails.ides.base import IDE, DecisionAction, HookDecision
 from cycode.cli.apps.ai_guardrails.scan.payload import AIHookPayload
 from cycode.cli.apps.ai_guardrails.scan.types import AiHookEventType
@@ -54,6 +54,11 @@ def _codex_home() -> Path:
     return Path.home() / _CONFIG_DIR_NAME
 
 
+def _codex_skills_dir() -> Path:
+    """User-scope Codex skills directory (honors ``$CODEX_HOME``)."""
+    return _codex_home() / 'skills'
+
+
 def _codex_config_toml_path(scope: str, repo_path: Optional[Path] = None) -> Path:
     """Return the Codex ``config.toml`` path for the given scope."""
     if scope == 'repo' and repo_path:
@@ -311,3 +316,6 @@ def get_session_context(self) -> tuple[Optional[dict], dict]:
         global_config_file = build_global_config_file(config_path, config.get('mcp_servers'))
         enriched_plugins = _resolve_codex_plugins(config)
         return global_config_file, enriched_plugins
+
+    def get_skills(self) -> list[dict]:
+        return walk_skill_dirs(_codex_skills_dir())

cycode/cli/apps/ai_guardrails/ides/copilot.py

@@ -37,7 +37,7 @@
     load_plugin_json,
     walk_enabled_plugins,
 )
-from cycode.cli.apps.ai_guardrails.ides._skill_utils import walk_plugin_skills
+from cycode.cli.apps.ai_guardrails.ides._skill_utils import walk_plugin_skills, walk_skill_dirs
 from cycode.cli.apps.ai_guardrails.ides.base import IDE, DecisionAction, HookDecision
 from cycode.cli.apps.ai_guardrails.scan.payload import AIHookPayload
 from cycode.cli.apps.ai_guardrails.scan.types import AiHookEventType
@@ -106,6 +106,11 @@ def _copilot_home() -> Path:
     return Path.home() / '.copilot'
 
 
+def _copilot_skills_dir() -> Path:
+    """User-scope Copilot skills directory (honors ``$COPILOT_HOME``)."""
+    return _copilot_home() / 'skills'
+
+
 def _vscode_agent_plugins_dir() -> Path:
     # Resolved at call time (not a module-level Path constant): on py<=3.10 a Path
     # instance binds its filesystem accessor at creation, which breaks fake-fs tests
@@ -488,3 +493,6 @@ def get_session_context(self) -> tuple[Optional[dict], dict]:
             build_global_config_file(_vscode_mcp_config_path(), config.get('servers')) if config else None
         )
         return global_config_file, _collect_installed_plugins()
+
+    def get_skills(self) -> list[dict]:
+        return walk_skill_dirs(_copilot_skills_dir())

cycode/cli/apps/ai_guardrails/ides/cursor.py

@@ -7,6 +7,7 @@
 
 from cycode.cli.apps.ai_guardrails.consts import CYCODE_SCAN_PROMPT_COMMAND, CYCODE_SESSION_START_COMMAND
 from cycode.cli.apps.ai_guardrails.ides._plugin_utils import build_global_config_file
+from cycode.cli.apps.ai_guardrails.ides._skill_utils import walk_skill_dirs
 from cycode.cli.apps.ai_guardrails.ides.base import IDE, DecisionAction, HookDecision
 from cycode.cli.apps.ai_guardrails.scan.payload import AIHookPayload
 from cycode.cli.apps.ai_guardrails.scan.types import AiHookEventType
@@ -45,6 +46,11 @@ def _cursor_mcp_config_path() -> Path:
     return Path.home() / '.cursor' / _MCP_CONFIG_FILENAME
 
 
+def _cursor_skills_dir() -> Path:
+    """User-scope Cursor skills directory (``~/.cursor/skills``, all platforms)."""
+    return Path.home() / '.cursor' / 'skills'
+
+
 def _load_cursor_mcp_config(config_path: Optional[Path] = None) -> Optional[dict]:
     """Load and parse `~/.cursor/mcp.json`. Returns None if missing/invalid."""
     path = config_path or _cursor_mcp_config_path()
@@ -125,3 +131,6 @@ def get_session_context(self) -> tuple[Optional[dict], dict]:
         config_path = _cursor_mcp_config_path()
         global_config_file = build_global_config_file(config_path, config.get('mcpServers'))
         return global_config_file, {}
+
+    def get_skills(self) -> list[dict]:
+        return walk_skill_dirs(_cursor_skills_dir())

tests/cli/commands/ai_guardrails/ides/test_codex.py

@@ -392,3 +392,20 @@ def test_read_codex_plugin_collects_plugin_skills(fs: FakeFilesystem) -> None:
     entry, _ = _read_codex_plugin(plugin_dir)
 
     assert [s['path'] for s in entry['skill_files']] == [str(skill_file)]
+
+
+# skills
+
+
+def test_get_skills_reads_user_scope_skills(fs: FakeFilesystem) -> None:
+    body = '---\nname: dummy-skill\ndescription: Dummy.\n---\n\nDo it.\n'
+    skill_file = Path.home() / '.codex' / 'skills' / 'dummy-skill' / 'SKILL.md'
+    fs.create_file(skill_file, contents=body)
+
+    skills = Codex().get_skills()
+
+    assert skills == [{'path': str(skill_file), 'content': body}]
+
+
+def test_get_skills_no_skills_dir_returns_empty(fs: FakeFilesystem) -> None:
+    assert Codex().get_skills() == []

tests/cli/commands/ai_guardrails/ides/test_copilot.py

@@ -515,3 +515,20 @@ def test_read_copilot_plugin_collects_plugin_skills(fs: FakeFilesystem) -> None:
     entry, _ = _read_copilot_plugin(plugin_dir)
 
     assert [s['path'] for s in entry['skill_files']] == [str(skill_file)]
+
+
+# skills
+
+
+def test_get_skills_reads_user_scope_skills(fs: FakeFilesystem) -> None:
+    body = '---\nname: dummy-skill\ndescription: Dummy.\n---\n\nDo it.\n'
+    skill_file = Path.home() / '.copilot' / 'skills' / 'dummy-skill' / 'SKILL.md'
+    fs.create_file(skill_file, contents=body)
+
+    skills = Copilot().get_skills()
+
+    assert skills == [{'path': str(skill_file), 'content': body}]
+
+
+def test_get_skills_no_skills_dir_returns_empty(fs: FakeFilesystem) -> None:
+    assert Copilot().get_skills() == []

tests/cli/commands/ai_guardrails/ides/test_cursor.py

@@ -5,6 +5,8 @@
 from typing import Any
 from unittest.mock import patch
 
+from pyfakefs.fake_filesystem import FakeFilesystem
+
 from cycode.cli.apps.ai_guardrails.ides.base import HookDecision
 from cycode.cli.apps.ai_guardrails.ides.cursor import Cursor
 from cycode.cli.apps.ai_guardrails.scan.types import AiHookEventType
@@ -153,3 +155,20 @@ def test_session_context_no_config_returns_empty() -> None:
         global_config_file, plugins = Cursor().get_session_context()
     assert global_config_file is None
     assert plugins == {}
+
+
+# skills
+
+
+def test_get_skills_reads_user_scope_skills(fs: FakeFilesystem) -> None:
+    body = '---\nname: dummy-skill\ndescription: Dummy.\n---\n\nDo it.\n'
+    skill_file = Path.home() / '.cursor' / 'skills' / 'dummy-skill' / 'SKILL.md'
+    fs.create_file(skill_file, contents=body)
+
+    skills = Cursor().get_skills()
+
+    assert skills == [{'path': str(skill_file), 'content': body}]
+
+
+def test_get_skills_no_skills_dir_returns_empty(fs: FakeFilesystem) -> None:
+    assert Cursor().get_skills() == []

tests/cli/commands/ai_guardrails/test_session_start_command.py

@@ -32,14 +32,26 @@ def _isolated_session_context_cache(tmp_path: Path, monkeypatch: pytest.MonkeyPa
 
 
 @pytest.fixture(autouse=True)
-def _no_local_skills(monkeypatch: pytest.MonkeyPatch) -> None:
-    """Keep the skills sweep away from the developer's real ~/.claude/skills.
+def _isolated_home(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> Path:
+    """Point every home-relative lookup at a scratch directory.
 
-    Unlike the MCP collectors, which these tests stub per IDE, the skills sweep walks the
-    filesystem directly - so without this every assertion would depend on whoever ran it.
-    A test that cares about skills overrides ``collect_all_skills`` itself.
+    The skills sweep walks the filesystem rather than going through a collector these tests
+    stub, so without this it would read the real ~/.claude/skills of whoever ran it.
     """
-    monkeypatch.setattr(_session_start_mod, 'collect_all_skills', list)
+    home = tmp_path / 'home'
+    home.mkdir()
+    monkeypatch.setattr(Path, 'home', lambda: home)
+
+    return home
+
+
+def _write_claude_skill(home: Path, name: str, content: str) -> Path:
+    """Create a user-scope Claude Code skill under the isolated home and return its path."""
+    skill_file = home / '.claude' / 'skills' / name / 'SKILL.md'
+    skill_file.parent.mkdir(parents=True, exist_ok=True)
+    skill_file.write_text(content, encoding='utf-8')
+
+    return skill_file
 
 
 # Auth tests
@@ -620,16 +632,16 @@ def test_reports_skill_files(
     mock_collect: MagicMock,
     mock_load_config: MagicMock,
     mock_ctx: MagicMock,
-    monkeypatch: pytest.MonkeyPatch,
+    _isolated_home: Path,
 ) -> None:
     """User-scope skills ride alongside the MCP inventory in the same report."""
     mock_get_auth.return_value = MagicMock(tenant_id='tenant-1')
     mock_ai_client = MagicMock()
     mock_get_client.return_value = mock_ai_client
     mock_collect.return_value = ({}, {})
-    skill_path = '/home/u/.claude/skills/dummy-skill/SKILL.md'
-    skills = [{'path': skill_path, 'content': '---\nname: dummy-skill\n---\nBody.\n'}]
-    monkeypatch.setattr(_session_start_mod, 'collect_all_skills', lambda: skills)
+    content = '---\nname: dummy-skill\n---\nBody.\n'
+    skill_file = _write_claude_skill(_isolated_home, 'dummy-skill', content)
+    skills = [{'path': str(skill_file), 'content': content}]
 
     payload = {'session_id': 'session-123'}
 
@@ -659,17 +671,16 @@ def test_editing_a_skill_re_reports(
     mock_collect: MagicMock,
     mock_load_config: MagicMock,
     mock_ctx: MagicMock,
-    monkeypatch: pytest.MonkeyPatch,
+    _isolated_home: Path,
 ) -> None:
     """Skill bodies are part of the dedup digest, so an edit sends a fresh report."""
     mock_get_auth.return_value = MagicMock(tenant_id='tenant-1')
     mock_ai_client = MagicMock()
     mock_get_client.return_value = mock_ai_client
     mock_collect.return_value = ({}, {})
-    path = '/home/u/.claude/skills/dummy-skill/SKILL.md'
     payload = json.dumps({'session_id': 'session-123'})
 
-    monkeypatch.setattr(_session_start_mod, 'collect_all_skills', lambda: [{'path': path, 'content': 'first'}])
+    _write_claude_skill(_isolated_home, 'dummy-skill', 'first')
     with patch('sys.stdin', new=StringIO(payload)):
         session_start_command(mock_ctx, ide='claude-code')
 
@@ -678,7 +689,7 @@ def test_editing_a_skill_re_reports(
         session_start_command(mock_ctx, ide='claude-code')
     assert mock_ai_client.report_session_context.call_count == 1
 
-    monkeypatch.setattr(_session_start_mod, 'collect_all_skills', lambda: [{'path': path, 'content': 'edited'}])
+    _write_claude_skill(_isolated_home, 'dummy-skill', 'edited')
     with patch('sys.stdin', new=StringIO(payload)):
         session_start_command(mock_ctx, ide='claude-code')
     assert mock_ai_client.report_session_context.call_count == 2