Merge remote-tracking branch 'origin/release_candidate_v1_0_9' into AIML-125-external-agent-generate-fixes-add-claude-PR-support

# Conflicts:
#	src/git_handler.py
#	test/test_git_handler.py

Author: dougj-contrast

README.md

@@ -83,7 +83,7 @@ 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}")
-        
+
         # 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}")

docs/claude_code.md

@@ -23,4 +23,4 @@
 class CodingAgents(Enum):
     SMARTFIX = "SMARTFIX"
     GITHUB_COPILOT = "GITHUB_COPILOT"
-    CLAUDE_CODE = "CLAUDE_CODE"
+    CLAUDE_CODE = "CLAUDE_CODE"

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

@@ -171,7 +171,13 @@ def _get_coding_agent(self) -> str:
             CodingAgents[coding_agent.upper()]
             return coding_agent.upper()
         except (KeyError, ValueError):
-            _log_config_message(f"Warning: Invalid CODING_AGENT '{coding_agent}'. Must be one of {[agent.name for agent in CodingAgents]}. Defaulting to '{CodingAgents.SMARTFIX.name}'.", is_warning=True)
+            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]:

docs/github_copilot.md

@@ -715,7 +715,7 @@ def reset_issue(issue_number: int, remediation_label: str) -> bool:
         if config.CODING_AGENT == CodingAgents.CLAUDE_CODE.name:
             debug_log("Claude code agent detected need to add a comment and tag @claude for reprocessing")
             # Add a comment to the existing issue to notify @claude to reprocess
-            comment:str = f"@claude reprocess this issue with the new remediation label: `{remediation_label}` and attempt a fix."
+            comment: str = f"@claude reprocess this issue with the new remediation label: `{remediation_label}` and attempt a fix."
             comment_command = [
                 "gh", "issue", "comment",
                 str(issue_number),
@@ -803,7 +803,7 @@ def find_open_pr_for_issue(issue_number: int) -> dict:
             ]
 
             pr_list_output = run_command(claude_pr_list_command, env=gh_env, check=False)
-            
+
             if not pr_list_output or pr_list_output.strip() == "[]":
                 debug_log(f"No open PRs found for issue #{issue_number} with either Copilot or Claude branch pattern")
                 return None

docs/smartfix_coding_agent.md

@@ -83,7 +83,7 @@ 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}")
-        
+
         # 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}")