CM-58022-added mcp server name

removed cycode marker
add ai-guardrails scan type

Author: Ilanlido

cycode/cli/apps/ai_guardrails/consts.py

@@ -56,11 +56,8 @@ def _get_cursor_hooks_dir() -> Path:
 # Default IDE
 DEFAULT_IDE = AIIDEType.CURSOR
 
-# Marker to identify Cycode hooks
-CYCODE_MARKER = 'cycode_guardrails'
-
 # Command used in hooks
-CYCODE_SCAN_PROMPT_COMMAND = 'cycode scan prompt'
+CYCODE_SCAN_PROMPT_COMMAND = 'cycode ai-guardrails scan'
 
 
 def get_hooks_config(ide: AIIDEType) -> dict:
@@ -78,5 +75,4 @@ def get_hooks_config(ide: AIIDEType) -> dict:
     return {
         'version': 1,
         'hooks': hooks,
-        CYCODE_MARKER: True,
     }

cycode/cli/apps/ai_guardrails/hooks_manager.py

@@ -10,7 +10,6 @@
 from typing import Optional
 
 from cycode.cli.apps.ai_guardrails.consts import (
-    CYCODE_MARKER,
     CYCODE_SCAN_PROMPT_COMMAND,
     DEFAULT_IDE,
     IDE_CONFIGS,
@@ -100,9 +99,6 @@ def install_hooks(
         for entry in entries:
             existing['hooks'][event].append(entry)
 
-    # Add marker
-    existing[CYCODE_MARKER] = True
-
     # Save
     if save_hooks_file(hooks_path, existing):
         return True, f'AI guardrails hooks installed: {hooks_path}'
@@ -140,11 +136,6 @@ def uninstall_hooks(
         if not existing['hooks'][event]:
             del existing['hooks'][event]
 
-    # Remove marker
-    if CYCODE_MARKER in existing:
-        del existing[CYCODE_MARKER]
-        modified = True
-
     if not modified:
         return True, 'No Cycode hooks found to remove'
 
@@ -190,17 +181,20 @@ def get_hooks_status(scope: str = 'user', repo_path: Optional[Path] = None, ide:
     if existing is None:
         return status
 
-    status['cycode_installed'] = existing.get(CYCODE_MARKER, False)
-
     # Check each hook event for this IDE
     ide_config = IDE_CONFIGS[ide]
+    has_cycode_hooks = False
     for event in ide_config.hook_events:
         entries = existing.get('hooks', {}).get(event, [])
         cycode_entries = [e for e in entries if is_cycode_hook_entry(e)]
+        if cycode_entries:
+            has_cycode_hooks = True
         status['hooks'][event] = {
             'total_entries': len(entries),
             'cycode_entries': len(cycode_entries),
             'enabled': len(cycode_entries) > 0,
         }
 
+    status['cycode_installed'] = has_cycode_hooks
+
     return status

cycode/cli/apps/ai_guardrails/scan/handlers.py

@@ -248,6 +248,8 @@ def _setup_scan_context(ctx: typer.Context) -> typer.Context:
     # Set up minimal required context
     ctx.obj['progress_bar'] = DummyProgressBar([ScanProgressBarSection])
     ctx.obj['sync'] = True  # Synchronous scan
+    ctx.obj['scan_type'] = ScanTypeOption.SECRET # AI guardrails always scans for secrets
+    ctx.obj['severity_threshold'] = SeverityOption.INFO  # Report all severities
 
     # Set command name for scan logic
     ctx.info_name = 'ai-guardrails'

cycode/cli/apps/ai_guardrails/scan/payload.py

@@ -24,6 +24,7 @@ class AIHookPayload:
     # Event-specific data
     prompt: Optional[str] = None  # For prompt events
     file_path: Optional[str] = None  # For file_read events
+    mcp_server_name: Optional[str] = None  # For mcp_execution events
     mcp_tool_name: Optional[str] = None  # For mcp_execution events
     mcp_arguments: Optional[dict] = None  # For mcp_execution events
 
@@ -47,6 +48,7 @@ def from_cursor_payload(cls, payload: dict) -> 'AIHookPayload':
             ide_version=payload.get('cursor_version'),
             prompt=payload.get('prompt', ''),
             file_path=payload.get('file_path') or payload.get('path'),
+            mcp_server_name=payload.get('command'),  # MCP server name
             mcp_tool_name=payload.get('tool_name') or payload.get('tool'),
             mcp_arguments=payload.get('arguments') or payload.get('tool_input') or payload.get('input'),
         )

cycode/cli/apps/scan/code_scanner.py

@@ -91,7 +91,7 @@ def _should_use_sync_flow(command_scan_type: str, scan_type: str, sync_option: b
     if not sync_option and scan_type != consts.IAC_SCAN_TYPE:
         return False
 
-    if command_scan_type not in {'path', 'repository', 'prompt'}:
+    if command_scan_type not in {'path', 'repository', 'ai-guardrails'}:
         return False
 
     if scan_type == consts.IAC_SCAN_TYPE:

cycode/cyclient/ai_security_manager_client.py

@@ -75,6 +75,7 @@ def create_event(
             'generation_id': payload.generation_id,
             'block_reason': block_reason,
             'cli_scan_id': scan_id,
+            'mcp_server_name': payload.mcp_server_name,
             'mcp_tool_name': payload.mcp_tool_name,
         }
 

tests/cli/commands/ai_guardrails/scan/test_payload.py

@@ -50,15 +50,17 @@ def test_from_cursor_payload_mcp_execution_event() -> None:
     cursor_payload = {
         'hook_event_name': 'beforeMCPExecution',
         'conversation_id': 'conv-123',
-        'tool_name': 'execute_command',
-        'arguments': {'command': 'ls -la', 'secret': 'password123'},
+        'command': 'GitLab',
+        'tool_name': 'discussion_list',
+        'arguments': {'resource_type': 'merge_request', 'parent_id': 'organization/repo', 'resource_id': '4'},
     }
 
     unified = AIHookPayload.from_cursor_payload(cursor_payload)
 
     assert unified.event_name == AiHookEventType.MCP_EXECUTION
-    assert unified.mcp_tool_name == 'execute_command'
-    assert unified.mcp_arguments == {'command': 'ls -la', 'secret': 'password123'}
+    assert unified.mcp_server_name == 'GitLab'
+    assert unified.mcp_tool_name == 'discussion_list'
+    assert unified.mcp_arguments == {'resource_type': 'merge_request', 'parent_id': 'organization/repo', 'resource_id': '4'}
 
 
 def test_from_cursor_payload_with_alternative_field_names() -> None: