CM-60929-fix-review

Author: Ilanlido

cycode/cli/apps/ai_guardrails/__init__.py

@@ -1,5 +1,6 @@
 import typer
 
+from cycode.cli.apps.ai_guardrails.ensure_auth_command import ensure_auth_command
 from cycode.cli.apps.ai_guardrails.install_command import install_command
 from cycode.cli.apps.ai_guardrails.scan.scan_command import scan_command
 from cycode.cli.apps.ai_guardrails.status_command import status_command
@@ -17,3 +18,6 @@
     name='scan',
     short_help='Scan content from AI IDE hooks for secrets (reads JSON from stdin).',
 )(scan_command)
+app.command(hidden=True, name='ensure-auth', short_help='Ensure authentication, triggering auth if needed.')(
+    ensure_auth_command
+)

cycode/cli/apps/ai_guardrails/consts.py

@@ -83,15 +83,15 @@ def _get_claude_code_hooks_dir() -> Path:
 
 # Command used in hooks
 CYCODE_SCAN_PROMPT_COMMAND = 'cycode ai-guardrails scan'
-CYCODE_AUTH_CHECK_COMMAND = "if cycode status 2>&1 | grep -q 'Is authenticated: False'; then cycode auth 2>&1; fi"
+CYCODE_ENSURE_AUTH_COMMAND = 'cycode ai-guardrails ensure-auth'
 
 
 def _get_cursor_hooks_config(async_mode: bool = False) -> dict:
     """Get Cursor-specific hooks configuration."""
     config = IDE_CONFIGS[AIIDEType.CURSOR]
     command = f'{CYCODE_SCAN_PROMPT_COMMAND} &' if async_mode else CYCODE_SCAN_PROMPT_COMMAND
     hooks = {event: [{'command': command}] for event in config.hook_events}
-    hooks['sessionStart'] = [{'command': CYCODE_AUTH_CHECK_COMMAND}]
+    hooks['sessionStart'] = [{'command': CYCODE_ENSURE_AUTH_COMMAND}]
 
     return {
         'version': 1,
@@ -118,7 +118,7 @@ def _get_claude_code_hooks_config(async_mode: bool = False) -> dict:
             'SessionStart': [
                 {
                     'matcher': '',
-                    'hooks': [{'type': 'command', 'command': CYCODE_AUTH_CHECK_COMMAND}],
+                    'hooks': [{'type': 'command', 'command': CYCODE_ENSURE_AUTH_COMMAND}],
                 }
             ],
             'UserPromptSubmit': [

cycode/cli/apps/ai_guardrails/ensure_auth_command.py

@@ -0,0 +1,21 @@
+import typer
+
+from cycode.cli.apps.auth.auth_common import get_authorization_info
+from cycode.cli.apps.auth.auth_manager import AuthManager
+from cycode.cli.exceptions.handle_auth_errors import handle_auth_exception
+from cycode.cli.logger import logger
+
+
+def ensure_auth_command(ctx: typer.Context) -> None:
+    """Ensure the user is authenticated, triggering authentication if needed."""
+    auth_info = get_authorization_info(ctx)
+    if auth_info is not None:
+        logger.debug('Already authenticated')
+        return
+
+    logger.debug('Not authenticated, starting authentication')
+    try:
+        auth_manager = AuthManager()
+        auth_manager.authenticate()
+    except Exception as err:
+        handle_auth_exception(ctx, err)

cycode/cli/apps/ai_guardrails/hooks_manager.py

@@ -62,7 +62,7 @@ def save_hooks_file(hooks_path: Path, hooks_config: dict) -> bool:
         return False
 
 
-_CYCODE_COMMAND_MARKERS = ('cycode ai-guardrails', 'cycode auth')
+_CYCODE_COMMAND_MARKERS = ('cycode ai-guardrails',)
 
 
 def _is_cycode_command(command: str) -> bool:

tests/cli/commands/ai_guardrails/test_hooks_manager.py

@@ -6,7 +6,7 @@
 from pyfakefs.fake_filesystem import FakeFilesystem
 
 from cycode.cli.apps.ai_guardrails.consts import (
-    CYCODE_AUTH_CHECK_COMMAND,
+    CYCODE_ENSURE_AUTH_COMMAND,
     CYCODE_SCAN_PROMPT_COMMAND,
     AIIDEType,
     PolicyMode,
@@ -93,7 +93,7 @@ def test_get_hooks_config_cursor_session_start() -> None:
     assert 'sessionStart' in config['hooks']
     entries = config['hooks']['sessionStart']
     assert len(entries) == 1
-    assert entries[0]['command'] == CYCODE_AUTH_CHECK_COMMAND
+    assert entries[0]['command'] == CYCODE_ENSURE_AUTH_COMMAND
 
 
 def test_get_hooks_config_claude_code_sync() -> None:
@@ -123,7 +123,7 @@ def test_get_hooks_config_claude_code_session_start() -> None:
     assert 'SessionStart' in config['hooks']
     entries = config['hooks']['SessionStart']
     assert len(entries) == 1
-    assert entries[0]['hooks'][0]['command'] == CYCODE_AUTH_CHECK_COMMAND
+    assert entries[0]['hooks'][0]['command'] == CYCODE_ENSURE_AUTH_COMMAND
 
 
 def test_create_policy_file_warn(fs: FakeFilesystem) -> None: