Merge branch 'main' into CM-68642-sca-dependency-path-missing-in-cli-ui

Author: omer-roth

cycode/cli/apps/ai_guardrails/hooks_manager.py

@@ -22,15 +22,22 @@
 
 _CYCODE_COMMAND_MARKERS = ('cycode ai-guardrails',)
 
+# Command-carrying fields of a flat hook entry. Copilot entries use per-OS
+# `bash`/`powershell` fields instead of `command`.
+_COMMAND_FIELDS = ('command', 'bash', 'powershell')
+
 
 def _is_cycode_command(command: str) -> bool:
     return any(marker in command for marker in _CYCODE_COMMAND_MARKERS)
 
 
+def _has_cycode_command_field(entry: dict) -> bool:
+    return any(_is_cycode_command(entry.get(field, '')) for field in _COMMAND_FIELDS)
+
+
 def is_cycode_hook_entry(entry: dict) -> bool:
     """True if any hook inside ``entry`` is owned by Cycode."""
-    command = entry.get('command', '')
-    if _is_cycode_command(command):
+    if _has_cycode_command_field(entry):
         return True
 
     for hook in entry.get('hooks', []):
@@ -47,9 +54,9 @@ def _strip_cycode_from_entry(entry: dict) -> Optional[dict]:
     every nested hook was Cycode). Non-Cycode hooks co-located in the same
     entry are preserved.
     """
-    # Cursor format: the entry itself IS a single hook command.
-    if 'command' in entry and 'hooks' not in entry:
-        return None if _is_cycode_command(entry.get('command', '')) else entry
+    # Cursor/Copilot format: the entry itself IS a single hook command.
+    if 'hooks' not in entry and any(field in entry for field in _COMMAND_FIELDS):
+        return None if _has_cycode_command_field(entry) else entry
 
     # Claude Code / Codex format: nested `hooks` list inside the entry.
     nested = entry.get('hooks')

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

@@ -10,11 +10,12 @@
 from cycode.cli.apps.ai_guardrails.ides.base import IDE
 from cycode.cli.apps.ai_guardrails.ides.claude_code import ClaudeCode
 from cycode.cli.apps.ai_guardrails.ides.codex import Codex
+from cycode.cli.apps.ai_guardrails.ides.copilot import Copilot
 from cycode.cli.apps.ai_guardrails.ides.cursor import Cursor
 
 # Single source of truth: name → singleton instance.
 # `--ide` choices and install/uninstall/status iteration both derive from this.
-IDES: dict[str, IDE] = {ide.name: ide for ide in (Cursor(), ClaudeCode(), Codex())}
+IDES: dict[str, IDE] = {ide.name: ide for ide in (Cursor(), ClaudeCode(), Codex(), Copilot())}
 
 # Default IDE used when `--ide` is omitted. Kept here so the value is colocated
 # with the registry; no module outside `ides/` needs to know which IDE wins.

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

@@ -14,6 +14,7 @@
 JSON response shape that the IDE expects on stdout.
 """
 
+import platform
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from enum import Enum
@@ -24,6 +25,24 @@
 from cycode.cli.apps.ai_guardrails.scan.types import AiHookEventType
 
 
+def shell_background_suffix(async_mode: bool) -> str:
+    """`' &'` when backgrounding is requested and the platform's shell supports it.
+
+    Only valid for hooks whose runner is stdin-safe under backgrounding (zsh keeps
+    a backgrounded command's stdin; verified for Cursor/Codex). bash/sh reattach it
+    to /dev/null, silently emptying the payload — hooks that run under bash (e.g.
+    Copilot's `bash` field) must add an explicit `<&0` redirect instead.
+
+    Windows gets no suffix: depending on the IDE, hooks may run under cmd (where a
+    trailing `&` is a no-op separator) or Windows PowerShell (where it's a parse
+    error that would fail the hook). Until the CLI can self-detach in report mode,
+    Windows hooks run synchronously.
+    """
+    if not async_mode or platform.system() == 'Windows':
+        return ''
+    return ' &'
+
+
 class DecisionAction(str, Enum):
     """Canonical decision action returned by event handlers."""
 
@@ -138,6 +157,15 @@ def matches_payload(self, raw_payload: dict) -> bool:
         event (e.g. Cursor reading Claude Code hooks from ~/.claude/settings.json).
         """
 
+    def is_synthetic_prompt(self, raw_payload: dict) -> bool:
+        """Return True when a prompt event carries IDE/harness-generated content
+        rather than text the user typed.
+
+        Synthetic prompts are skipped without scanning or telemetry.
+        Default: False. Override for IDEs that inject synthetic user turns.
+        """
+        return False
+
     @abstractmethod
     def parse_hook_payload(self, raw_payload: dict) -> AIHookPayload:
         """Normalize a raw stdin payload into the canonical ``AIHookPayload``."""

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

@@ -22,6 +22,10 @@
 
 _CLAUDE_CODE_EVENT_NAMES = frozenset({'UserPromptSubmit', 'PreToolUse'})
 
+# When a fork/subagent completes, the harness injects its result into the parent
+# session as a synthetic user turn, which fires UserPromptSubmit.
+_SYNTHETIC_PROMPT_PREFIXES = ('<task-notification>',)
+
 _USER_HOOKS_DIR = Path.home() / '.claude'
 _HOOKS_FILE_NAME = 'settings.json'
 _REPO_SUBDIR = '.claude'
@@ -278,7 +282,17 @@ def render_hooks_config(self, async_mode: bool = False) -> dict:
         }
 
     def matches_payload(self, raw_payload: dict) -> bool:
-        return raw_payload.get('hook_event_name', '') in _CLAUDE_CODE_EVENT_NAMES
+        # transcript_path is a documented Claude Code common field, present on every
+        # hook event. VS Code Copilot emits near-identical payloads (same event names,
+        # snake_case fields) without it — requiring it keeps those from being
+        # processed as Claude Code events.
+        return raw_payload.get('hook_event_name', '') in _CLAUDE_CODE_EVENT_NAMES and 'transcript_path' in raw_payload
+
+    def is_synthetic_prompt(self, raw_payload: dict) -> bool:
+        if raw_payload.get('hook_event_name') != 'UserPromptSubmit':
+            return False
+        prompt = raw_payload.get('prompt') or ''
+        return prompt.lstrip().startswith(_SYNTHETIC_PROMPT_PREFIXES)
 
     def parse_hook_payload(self, raw_payload: dict) -> AIHookPayload:
         hook_event_name = raw_payload.get('hook_event_name', '')

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.base import IDE, DecisionAction, HookDecision
+from cycode.cli.apps.ai_guardrails.ides.base import IDE, DecisionAction, HookDecision, shell_background_suffix
 from cycode.cli.apps.ai_guardrails.scan.payload import AIHookPayload
 from cycode.cli.apps.ai_guardrails.scan.types import AiHookEventType
 from cycode.cli.utils.jwt_utils import decode_jwt_unverified
@@ -191,10 +191,9 @@ def settings_path(self, scope: str, repo_path: Optional[Path] = None) -> Path:
 
     def render_hooks_config(self, async_mode: bool = False) -> dict:
         # Codex's TOML `async: true` flag is unimplemented; shell-background via
-        # `&` is the working mechanism. SessionStart stays sync so the
-        # conversation context is registered before any scan hook fires.
-        bg = ' &' if async_mode else ''
-        scan_cmd = f'{_SCAN_COMMAND}{bg}'
+        # `&` is the working mechanism (unix only). SessionStart stays sync so
+        # the conversation context is registered before any scan hook fires.
+        scan_cmd = f'{_SCAN_COMMAND}{shell_background_suffix(async_mode)}'
         return {
             'hooks': {
                 'SessionStart': [