CM-61376: Address review feedback

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: mateusz-sterczewski

cycode/cli/apps/activation_manager.py

@@ -13,7 +13,21 @@
 _CLI_CLIENT_NAME = 'cli'
 
 
-def try_report_activation(
+def _get_client_and_version(
+    plugin_app_name: Optional[str], plugin_app_version: Optional[str]
+) -> tuple[str, str]:
+    return plugin_app_name or _CLI_CLIENT_NAME, plugin_app_version or __version__
+
+
+def should_report_cli_activation(
+    plugin_app_name: Optional[str] = None,
+    plugin_app_version: Optional[str] = None,
+) -> bool:
+    client, version = _get_client_and_version(plugin_app_name, plugin_app_version)
+    return configuration_manager.get_last_reported_activation_version(client) != version
+
+
+def report_cli_activation(
     cycode_client: 'CycodeClientBase',
     plugin_app_name: Optional[str] = None,
     plugin_app_version: Optional[str] = None,
@@ -23,8 +37,7 @@ def try_report_activation(
     Failures are swallowed — activation tracking is non-critical.
     """
     try:
-        client = plugin_app_name or _CLI_CLIENT_NAME
-        version = plugin_app_version or __version__
+        client, version = _get_client_and_version(plugin_app_name, plugin_app_version)
 
         if configuration_manager.get_last_reported_activation_version(client) == version:
             return

cycode/cli/apps/auth/auth_command.py

@@ -1,9 +1,11 @@
 import typer
 
+from cycode.cli.apps.activation_manager import should_report_cli_activation, report_cli_activation
 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
 from cycode.cli.models import CliResult
+from cycode.cli.utils.get_api_client import get_scan_cycode_client
 
 
 def auth_command(ctx: typer.Context) -> None:
@@ -23,6 +25,12 @@ def auth_command(ctx: typer.Context) -> None:
         auth_manager = AuthManager()
         auth_manager.authenticate()
 
+        plugin_app_name = ctx.obj.get('plugin_app_name')
+        plugin_app_version = ctx.obj.get('plugin_app_version')
+        if should_report_cli_activation(plugin_app_name, plugin_app_version):
+            scan_client = get_scan_cycode_client(ctx)
+            report_cli_activation(scan_client.scan_cycode_client, plugin_app_name, plugin_app_version)
+
         result = CliResult(success=True, message='Successfully logged into cycode')
         printer.print_result(result)
     except Exception as err:

cycode/cli/apps/scan/scan_command.py

@@ -5,7 +5,6 @@
 import click
 import typer
 
-from cycode.cli.apps.activation_manager import try_report_activation
 from cycode.cli.apps.sca_options import (
     GradleAllSubProjectsOption,
     MavenSettingsFileOption,
@@ -141,10 +140,6 @@ def scan_command(
     scan_client = get_scan_cycode_client(ctx)
     ctx.obj['client'] = scan_client
 
-    plugin_app_name = ctx.obj.get('plugin_app_name')
-    plugin_app_version = ctx.obj.get('plugin_app_version')
-    try_report_activation(scan_client.scan_cycode_client, plugin_app_name, plugin_app_version)
-
     # Get remote URL from current working directory
     remote_url = _try_get_git_remote_url(os.getcwd())
 

cycode/cli/apps/status/get_cli_status.py

@@ -2,6 +2,7 @@
 from typing import TYPE_CHECKING
 
 from cycode import __version__
+from cycode.cli.apps.activation_manager import should_report_cli_activation, report_cli_activation
 from cycode.cli.apps.auth.auth_common import get_authorization_info
 from cycode.cli.apps.status.models import CliStatus, CliSupportedModulesStatus
 from cycode.cli.consts import PROGRAM_NAME
@@ -22,7 +23,11 @@ def get_cli_status(ctx: 'Context') -> CliStatus:
     supported_modules_status = CliSupportedModulesStatus()
     if is_authenticated:
         try:
+            plugin_app_name = ctx.obj.get('plugin_app_name')
+            plugin_app_version = ctx.obj.get('plugin_app_version')
             client = get_scan_cycode_client(ctx)
+            if should_report_cli_activation(plugin_app_name, plugin_app_version):
+                report_cli_activation(client.scan_cycode_client, plugin_app_name, plugin_app_version)
             supported_modules_preferences = client.get_supported_modules_preferences()
 
             supported_modules_status.secret_scanning = supported_modules_preferences.secret_scanning