EX-344: fix jira v2

Author: MUlanovych

src/code_review_agent/cli.py

@@ -451,16 +451,6 @@ def assess(
     logging.info("🔍 Gathering data for Jira assessment...")
     commit_messages = git_utils.get_commit_messages(repo_path, base_ref, head_ref)
 
-    logging.info(f"📊 Generated structured diff summary")
-    structured_diff_summary = git_utils.get_structured_diff_summary(repo_path, base_ref, head_ref)
-    
-
-    if "error" in structured_diff_summary:
-        logging.error("Failed to generate structured diff summary. Skipping Jira assessment.")
-        return
-
-
-    logging.info("\n--- Summarizing changes for Jira ---")
 
     # Manual override
     manual_task = os.environ.get("JIRA_TASK_ID")
@@ -500,6 +490,13 @@ def assess(
         logging.info("No task ID found; skipping relevance assessment.")
         return
 
+    logging.info("📊 Generating structured diff summary...")
+    structured_diff_summary = git_utils.get_structured_diff_summary(repo_path, base_ref, head_ref)
+
+    if "error" in structured_diff_summary:
+        logging.error("Failed to generate structured diff summary. Skipping Jira assessment.")
+        return
+
     logging.info("\n--- Summarizing changes for Jira ---")
 
     summary = summarizer.summarize_changes_for_jira(

src/code_review_agent/git_utils.py

@@ -233,27 +233,20 @@ def create_annotated_file(full_content: str, diff_content: str) -> str:
 
 
 def get_structured_diff_summary(repo_path: str, base_ref: str, head_ref: str) -> dict:
-    """Analyzes the diff and returns a structured summary of changes."""
-    summary = {
-        "files_added": [], "files_deleted": [], "files_renamed": [],
-        "files_modified": [], "total_insertions": 0, "total_deletions": 0,
-    }
+    """Analyzes the diff and returns a structured summary using `git diff --numstat`."""
+    summary = { "files_changed": [] }
     try:
         repo = git.Repo(repo_path, search_parent_directories=True)
-        base_commit = repo.commit(base_ref)
-        head_commit = repo.commit(head_ref)
-
-        diff_output = repo.git.diff(base_commit, head_commit, '--numstat')
-
+        diff_output = repo.git.diff(base_ref, head_ref, '--numstat')
         for line in diff_output.splitlines():
             parts = line.split('\t')
             if len(parts) == 3:
                 insertions, deletions, path = parts
-                summary["total_insertions"] += int(insertions)
-                summary["total_deletions"] += int(deletions)
-                if path not in summary["files_modified"]:
-                     summary["files_modified"].append(path)
-        
+                summary["files_changed"].append({
+                    "path": path,
+                    "insertions": int(insertions),
+                    "deletions": int(deletions)
+                })
         return summary
     except Exception as e:
         logger.error(f"Could not get structured diff summary: {e}", exc_info=True)

src/code_review_agent/summarizer.py

@@ -17,8 +17,7 @@ def summarize_changes_for_jira(
     model = llm_config.get('models', {}).get('summarizer', 'google/gemini-pro-1.5')
 
     system_prompt = """
-    You are an expert AI software analyst. Your task is to analyze a structured summary of code changes and produce a high-level summary for a Jira ticket.
-    DO NOT analyze the code itself, only the provided metadata.
+    You are an expert AI software analyst. Your task is to analyze metadata about code changes and produce a high-level summary for a Jira ticket.
     
     CRITICAL OUTPUT FORMATTING RULE:
     Your entire response MUST be a single, valid JSON object that adheres to the `MergeSummary` schema.
@@ -29,19 +28,22 @@ def summarize_changes_for_jira(
     user_prompt = f"""
     Please analyze the following data and provide a structured summary.
 
+    **Jira Task Details:**
+    ```
     {jira_details}
+    ```
 
     **Commit Messages:**
     ```
     {commit_messages}
     ```
 
-    **Structured Summary of Code Changes:**
+    **Structured Summary of Code Changes (file paths, insertions, deletions):**
     ```json
     {diff_summary_text}
     ```
 
-    Based on this metadata, provide your assessment.
+    Based on all this metadata, provide your assessment.
     Return your findings as a raw JSON object string.
     """
 
@@ -54,14 +56,14 @@ def summarize_changes_for_jira(
             ],
             temperature=0
         )
-        
         raw_response_text = response.choices[0].message.content.strip()
 
         try:
             parsed_json = json.loads(raw_response_text, strict=False)
             return MergeSummary(**parsed_json)
         except (json.JSONDecodeError, ValidationError) as e:
             logger.warning(f"Failed to parse summary response. Error: {e}")
+            logger.debug(f"Problematic response was: '{raw_response_text}'")
             return None
 
     except Exception as e: