CM-65100-address-review

Author: RoniCycode

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

@@ -44,8 +44,8 @@ def walk_enabled_plugins(
     is_enabled: Callable[[Any], bool],
     locate_dir: Callable[[str, str], Optional[Path]],
     read_plugin: Callable[[Path], tuple[dict, dict]],
-) -> tuple[dict, dict]:
-    """Iterate enabled plugins; merge their MCP servers and metadata.
+) -> dict:
+    """Iterate enabled plugins and build their inventory metadata.
 
     Args:
         plugin_entries: ``{<plugin>@<marketplace>: settings}`` map from the IDE config.
@@ -55,13 +55,13 @@ def walk_enabled_plugins(
             filesystem path or None if it can't be resolved.
         read_plugin: given the plugin path, returns ``(entry_fields, servers)``:
             ``entry_fields`` are extra metadata to attach to the inventory entry
-            (name/version/description/...), ``servers`` are MCP servers contributed.
+            (name/version/description/...); ``servers`` are the plugin's MCP
+            servers, which ``read_plugin`` uses to derive that metadata.
 
-    Returns ``(merged_mcp_servers, enriched_plugins)``. Plugin keys without
-    ``@`` (or that fail to resolve to a directory) still appear in the
-    inventory with just ``{'enabled': True}`` so we don't silently drop them.
+    Returns ``enriched_plugins``. Plugin keys without ``@`` (or that fail to
+    resolve to a directory) still appear in the inventory with just
+    ``{'enabled': True}`` so we don't silently drop them.
     """
-    merged_mcp: dict = {}
     enriched: dict = {}
 
     for plugin_key, settings in plugin_entries.items():
@@ -79,8 +79,7 @@ def walk_enabled_plugins(
         if plugin_dir is None:
             continue
 
-        plugin_fields, servers = read_plugin(plugin_dir)
+        plugin_fields, _ = read_plugin(plugin_dir)
         entry.update(plugin_fields)
-        merged_mcp.update(servers)
 
-    return merged_mcp, enriched
+    return enriched

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

@@ -198,7 +198,7 @@ def _read_claude_plugin(plugin_dir: Path) -> tuple[dict, dict]:
     return entry, servers
 
 
-def resolve_plugins(settings: dict) -> tuple[dict, dict]:
+def resolve_plugins(settings: dict) -> dict:
     """Walk Claude Code's ``enabledPlugins`` via the shared plugin walker.
 
     Each enabled plugin's marketplace is resolved through
@@ -366,9 +366,6 @@ def get_session_context(self) -> tuple[Optional[dict], dict]:
         global_config_file = build_global_config_file(_CLAUDE_CONFIG_PATH, get_mcp_servers(config)) if config else None
 
         settings = load_claude_settings()
-        if settings:
-            _, enriched_plugins = resolve_plugins(settings)
-        else:
-            enriched_plugins = {}
+        enriched_plugins = resolve_plugins(settings) if settings else {}
 
         return global_config_file, enriched_plugins

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

@@ -145,7 +145,7 @@ def _read_codex_plugin(plugin_dir: Path) -> tuple[dict, dict]:
     return entry, servers
 
 
-def _resolve_codex_plugins(config: dict) -> tuple[dict, dict]:
+def _resolve_codex_plugins(config: dict) -> dict:
     """Walk enabled ``[plugins."<plugin>@<marketplace>"]`` entries."""
     return walk_enabled_plugins(
         plugin_entries=config.get('plugins') or {},
@@ -311,7 +311,7 @@ def get_session_context(self) -> tuple[Optional[dict], dict]:
         # Codex stores MCP servers under `[mcp_servers.<name>]`; the global config
         # file becomes its own session-context file. Plugins (via
         # `[plugins."<plugin>@<marketplace>"]`) carry their own config files.
-        config_path = _codex_home() / _CONFIG_TOML_NAME
+        config_path = _codex_config_toml_path('user')
         global_config_file = build_global_config_file(config_path, config.get('mcp_servers'))
-        _, enriched_plugins = _resolve_codex_plugins(config)
+        enriched_plugins = _resolve_codex_plugins(config)
         return global_config_file, enriched_plugins

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

@@ -40,9 +40,14 @@ def _user_hooks_dir() -> Path:
     return Path.home() / '.config' / 'Cursor'
 
 
+def _cursor_mcp_config_path() -> Path:
+    """User-scope Cursor MCP config path (``~/.cursor/mcp.json``, all platforms)."""
+    return Path.home() / '.cursor' / _MCP_CONFIG_FILENAME
+
+
 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 (Path.home() / '.cursor' / _MCP_CONFIG_FILENAME)
+    path = config_path or _cursor_mcp_config_path()
     if not path.exists():
         logger.debug('Cursor MCP config file not found, %s', {'path': str(path)})
         return None
@@ -118,6 +123,6 @@ def get_session_context(self) -> tuple[Optional[dict], dict]:
         config = _load_cursor_mcp_config()
         if not config:
             return None, {}
-        config_path = Path.home() / '.cursor' / _MCP_CONFIG_FILENAME
+        config_path = _cursor_mcp_config_path()
         global_config_file = build_global_config_file(config_path, config.get('mcpServers'))
         return global_config_file, {}

cycode/cli/apps/ai_guardrails/session_start_command.py

@@ -1,6 +1,6 @@
 """Handle AI guardrails session start: auth, conversation creation, session context."""
 
-import getpass
+import os
 import platform
 import socket
 import sys
@@ -26,7 +26,7 @@
 def _get_logged_in_user() -> Optional[str]:
     """Best-effort OS account name (whoami). None if it can't be resolved."""
     try:
-        return getpass.getuser()
+        return os.getlogin()
     except Exception:
         return None