Merge pull request #63 from Contrast-Security-OSS/release_candidate_v1_0_9

Release candidate v1 0 9

Author: JacobMagesHaskinsContrast

README.md

@@ -90,7 +90,7 @@ inputs:
     required: false
     default: 'true'
   coding_agent:
-    description: 'Specifies the coding agent to use for generating fixes. Allowed values: SMARTFIX, GITHUB_COPILOT.'
+    description: 'Specifies the coding agent to use for generating fixes. Allowed values: SMARTFIX, GITHUB_COPILOT, CLAUDE_CODE.'
     required: false
     default: 'SMARTFIX'
 

action.yml

@@ -52,8 +52,8 @@
 try:
     from google.adk.agents import Agent
     from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
-    from src.extensions.smartfix_litellm import SmartFixLiteLlm
-    from src.extensions.smartfix_llm_agent import SmartFixLlmAgent
+    from src.smartfix.extensions.smartfix_litellm import SmartFixLiteLlm
+    from src.smartfix.extensions.smartfix_llm_agent import SmartFixLlmAgent
     from google.adk.runners import Runner
     from google.adk.sessions import InMemorySessionService
     from google.adk.tools.mcp_tool.mcp_toolset import MCPToolset, StdioServerParameters, StdioConnectionParams

docs/claude_code.md

@@ -72,8 +72,8 @@ def _extract_remediation_info(pull_request: dict) -> tuple:
     # Extract remediation ID from branch name or PR labels
     remediation_id = None
 
-    # Check if this is a branch created by external agent (e.g., GitHub Copilot)
-    if branch_name.startswith("copilot/fix"):
+    # Check if this is a branch created by external agent (e.g., GitHub Copilot or Claude Code)
+    if branch_name.startswith("copilot/fix") or branch_name.startswith("claude/issue-"):
         debug_log("Branch appears to be created by external agent. Extracting remediation ID from PR labels.")
         remediation_id = extract_remediation_id_from_labels(labels)
         # Extract GitHub issue number from branch name
@@ -83,14 +83,18 @@ def _extract_remediation_info(pull_request: dict) -> tuple:
             debug_log(f"Extracted external issue number from branch name: {issue_number}")
         else:
             debug_log(f"Could not extract issue number from branch name: {branch_name}")
-        telemetry_handler.update_telemetry("additionalAttributes.codingAgent", "EXTERNAL-COPILOT")
+
+        # Set the external coding agent in telemetry based on branch prefix
+        coding_agent = "EXTERNAL-CLAUDE-CODE" if branch_name.startswith("claude/") else "EXTERNAL-COPILOT"
+        debug_log(f"Determined external coding agent to be: {coding_agent}")
+        telemetry_handler.update_telemetry("additionalAttributes.codingAgent", coding_agent)
     else:
         # Use original method for branches created by SmartFix
         remediation_id = extract_remediation_id_from_branch(branch_name)
         telemetry_handler.update_telemetry("additionalAttributes.codingAgent", "INTERNAL-SMARTFIX")
 
     if not remediation_id:
-        if branch_name.startswith("copilot/fix"):
+        if branch_name.startswith("copilot/fix") or branch_name.startswith("claude/issue-"):
             log(f"Error: Could not extract remediation ID from PR labels for external agent branch: {branch_name}", is_error=True)
         else:
             log(f"Error: Could not extract remediation ID from branch name: {branch_name}", is_error=True)

contrast-ai-smartfix.yml.template renamed to docs/contrast-ai-smartfix.yml.template

@@ -0,0 +1,26 @@
+# -
+# #%L
+# Contrast AI SmartFix
+# %%
+# Copyright (C) 2025 Contrast Security, Inc.
+# %%
+# Contact: [email protected]
+# License: Commercial
+# NOTICE: This Software and the patented inventions embodied within may only be
+# used as part of Contrast Security's commercial offerings. Even though it is
+# made available through public repositories, use of this Software is subject to
+# the applicable End User Licensing Agreement found at
+# https://www.contrastsecurity.com/enduser-terms-0317a or as otherwise agreed
+# between Contrast Security and the End User. The Software may not be reverse
+# engineered, modified, repackaged, sold, redistributed or otherwise used in a
+# way not consistent with the End User License Agreement.
+# #L%
+#
+
+from enum import Enum
+
+
+class CodingAgents(Enum):
+    SMARTFIX = "SMARTFIX"
+    GITHUB_COPILOT = "GITHUB_COPILOT"
+    CLAUDE_CODE = "CLAUDE_CODE"

docs/github_copilot.md

@@ -22,6 +22,7 @@
 import json
 from pathlib import Path
 from typing import Optional, Any, Dict, List
+from src.coding_agents import CodingAgents
 
 
 def _log_config_message(message: str, is_error: bool = False, is_warning: bool = False):
@@ -65,7 +66,7 @@ def __init__(self, env: Dict[str, str] = os.environ, testing: bool = False):
 
         # --- AI Agent Configuration ---
         self.CODING_AGENT = self._get_coding_agent()
-        is_smartfix_coding_agent = self.CODING_AGENT == "SMARTFIX"
+        is_smartfix_coding_agent = self.CODING_AGENT == CodingAgents.SMARTFIX.name
 
         default_agent_model = ""
         if is_smartfix_coding_agent:
@@ -165,11 +166,19 @@ def _check_contrast_config_values_exist(self):
 
     def _get_coding_agent(self) -> str:
         coding_agent = self._get_env_var("CODING_AGENT", required=False, default="SMARTFIX")
-        valid_agents = ["SMARTFIX", "GITHUB_COPILOT"]
-        if coding_agent.upper() not in valid_agents:
-            _log_config_message(f"Warning: Invalid CODING_AGENT '{coding_agent}'. Must be one of {valid_agents}. Defaulting to 'SMARTFIX'.", is_warning=True)
-            return "SMARTFIX"
-        return coding_agent.upper()
+        try:
+            # Try to convert string to Enum
+            CodingAgents[coding_agent.upper()]
+            return coding_agent.upper()
+        except (KeyError, ValueError):
+            agent_names = [agent.name for agent in CodingAgents]
+            default_name = CodingAgents.SMARTFIX.name
+            _log_config_message(
+                f"Warning: Invalid CODING_AGENT '{coding_agent}'. Must be one of {agent_names}. "
+                f"Defaulting to '{default_name}'.",
+                is_warning=True
+            )
+            return CodingAgents.SMARTFIX.name
 
     def _parse_and_validate_severities(self, json_str: Optional[str]) -> List[str]:
         default_severities = ["CRITICAL", "HIGH"]