Update "get comments" skill to also fetch code comments (#3499)

* Move fetching PR comments to a skill

* Update agent skills and guidelines

* Add missing copyright headers

* Update fetch_pr_comments skill to support code comments and improve formatting

Also fixed a bug in push_to_github skill where it referenced a non-existent gradle task.

* chore: fix exit code in fetch_comments.py

* chore: update push skill to run checkCode instead of lintLocalDebug

* chore: fix push skill to use root checkCode task

Author: gino-m

.agent/skills/fetch_pr_comments/SKILL.md

@@ -5,7 +5,7 @@ description: Fetches comments and reviews from the current GitHub Pull Request a
 
 # Fetch PR Comments
 
-This skill allows you to retrieve comments and reviews from the current GitHub Pull Request (PR) associated with the active branch. It converts the data into a readable Markdown format, making it easier to analyze feedback.
+This skill allows you to retrieve comments and reviews from the current GitHub Pull Request (PR) associated with the active branch, or a specific PR by number/URL. It converts the data into a readable Markdown format, including code review comments with file and line context.
 
 ## Usage
 
@@ -14,16 +14,20 @@ To use this skill, run the provided Python script. It requires the GitHub CLI (`
 ### Command
 
 ```bash
+# Fetch comments for the current branch's PR
 python3 .agent/skills/fetch_pr_comments/scripts/fetch_comments.py
+
+# Fetch comments for a specific PR
+python3 .agent/skills/fetch_pr_comments/scripts/fetch_comments.py <PR_NUMBER_OR_URL>
 ```
 
 ### Output
 
 The script outputs Markdown text to stdout, containing:
 - PR Title and URL
-- Threads with resolved/unresolved status
-- Individual comments with author, date, and body
-- Review statuses
+- Reviews (Approved/Changes Requested)
+- General Comments (Pull Request level)
+- Code Comments (Grouped by file and line number)
 
 ## Dependencies
 

.agent/skills/fetch_pr_comments/scripts/fetch_comments.py

@@ -17,6 +17,7 @@
 import json
 import subprocess
 import sys
+import re
 from datetime import datetime
 
 def run_command(command):
@@ -30,12 +31,8 @@ def run_command(command):
         )
         return result.stdout.strip()
     except subprocess.CalledProcessError as e:
-        # Check if it's the specific "no pull requests" error
-        if "no pull requests found" in e.stderr:
+        if "no pull requests found" in e.stderr.lower():
             print("No pull request found for the current branch.", file=sys.stderr)
-            sys.exit(0) # Exit gracefully with 0 or 1? Standard practice is 1 if it failed to do what was asked.
-                        # But for a skill finding "nothing", maybe 0 is okay? 
-                        # Let's stick to 1 but with a clean message.
             sys.exit(1)
 
         print(f"Error running command: {command}", file=sys.stderr)
@@ -49,51 +46,112 @@ def format_date(iso_date):
     except Exception:
         return iso_date
 
+
+def get_repo_owner_name(pr_url):
+    # Expected format: https://github.com/OWNER/REPO/pull/NUMBER
+    match = re.search(r"github\.com/([^/]+)/([^/]+)/pull/\d+", pr_url)
+    if match:
+        return match.group(1), match.group(2)
+    return None, None
+
+def get_code_comments(owner, repo, pr_number):
+    cmd = f"gh api repos/{owner}/{repo}/pulls/{pr_number}/comments --paginate"
+    try:
+        return json.loads(run_command(cmd))
+    except Exception as e:
+        print(f"Warning: Failed to fetch code comments: {e}", file=sys.stderr)
+        return []
+
 def main():
-    # Fetch PR data including comments and reviews
-    cmd = "gh pr view --json title,url,number,state,comments,reviews,latestReviews"
-    
-    # We rely on run_command to handle the subprocess exit
-    json_output = run_command(cmd)
+    # Allow optional PR argument (number or URL)
+    pr_arg = ""
+    if len(sys.argv) > 1:
+        pr_arg = f" {sys.argv[1]}"
+        
+    cmd = f"gh pr view{pr_arg} --json number,title,url,state,comments,reviews,latestReviews"
 
     try:
+        json_output = run_command(cmd)
         pr_data = json.loads(json_output)
-    except json.JSONDecodeError:
-        print("Failed to decode JSON from gh output.", file=sys.stderr)
+    except Exception:
+        # If run_command fails or json decode fails, we exit (mostly handled in run_command)
         sys.exit(1)
+    number = pr_data.get('number')
+    title = pr_data.get('title')
+    url = pr_data.get('url')
+    state = pr_data.get('state')
+    
+    owner, repo = get_repo_owner_name(url)
+    code_comments = []
+    if owner and repo:
+        code_comments = get_code_comments(owner, repo, number)
 
-    print(f"# PR #{pr_data.get('number')}: {pr_data.get('title')}")
-    print(f"**URL:** {pr_data.get('url')}")
-    print(f"**State:** {pr_data.get('state')}\n")
+    # --- Header ---
+    print(f"# PR #{number}: {title}")
+    print(f"**URL:** {url}")
+    print(f"**State:** {state}\n")
 
+    # --- Reviews ---
     print("## Reviews")
     reviews = pr_data.get('latestReviews', [])
     if not reviews:
-        print("No reviews found.")
+        print("No official reviews found.")
     else:
         for review in reviews:
-            state = review.get('state')
+            review_state = review.get('state')
             author = review.get('author', {}).get('login', 'Unknown')
             date = format_date(review.get('submittedAt', ''))
-            print(f"- **{author}**: {state} ({date})")
+            print(f"- **{author}**: {review_state} ({date})")
     print("\n" + "-"*40 + "\n")
 
-    print("## Comments")
-    
-    comments = pr_data.get('comments', [])
-    if not comments:
-        print("No comments found.")
+    # --- General Comments ---
+    print("## General Comments")
+    general_comments = pr_data.get('comments', [])
+    if not general_comments:
+        print("No general comments.")
     else:
-        for comment in comments:
+        for comment in general_comments:
             author = comment.get('author', {}).get('login', 'Unknown')
             body = comment.get('body', '').strip()
             date = format_date(comment.get('createdAt', ''))
-            url = comment.get('url', '')
+            comment_url = comment.get('url', '')
 
             print(f"### {author} at {date}")
-            print(f"[Link]({url})\n")
+            print(f"[Link]({comment_url})\n")
             print(body)
-            print("\n" + "-"*20 + "\n")
+            print("\n")
+    print("-" * 40 + "\n")
+
+    # --- Code Comments ---
+    print("## Code Comments")
+    if not code_comments:
+        print("No code comments.")
+    else:
+        # Group by file path
+        comments_by_file = {}
+        for cc in code_comments:
+            path = cc.get('path', 'Unknown File')
+            if path not in comments_by_file:
+                comments_by_file[path] = []
+            comments_by_file[path].append(cc)
+        
+        for path, comments in comments_by_file.items():
+            print(f"### File: `{path}`\n")
+            # Sort by line number (or position if line is None)
+            comments.sort(key=lambda x: (x.get('line') or x.get('original_line') or 0))
+            
+            for cc in comments:
+                author = cc.get('user', {}).get('login', 'Unknown')
+                body = cc.get('body', '').strip()
+                date = format_date(cc.get('created_at', ''))
+                line = cc.get('line') or cc.get('original_line') or "Outdated"
+                html_url = cc.get('html_url', '')
+                
+                print(f"#### Line {line} - {author} ({date})")
+                print(f"[Link]({html_url})\n")
+                print(body)
+                print("\n")
+            print("-" * 20 + "\n")
 
 if __name__ == "__main__":
     main()

.agent/skills/push_to_github/scripts/push.py

@@ -34,7 +34,7 @@ def main():
 
     # 2. Check Code (Lint/Analysis)
     print("\n2️⃣  Running Code Checks...")
-    run_command("./gradlew :app:checkCode")
+    run_command("./gradlew checkCode")
 
     # 3. Push
     print("\n3️⃣  Pushing to GitHub...")