Improve agentic coding skills (#3497)

* Move fetching PR comments to a skill

* Update agent skills and guidelines

* Add missing copyright headers

Author: gino-m

.agent/skills/fetch_pr_comments/SKILL.md

@@ -0,0 +1,31 @@
+---
+name: Fetch PR Comments
+description: Fetches comments and reviews from the current GitHub Pull Request and formats them as Markdown.
+---
+
+# 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.
+
+## Usage
+
+To use this skill, run the provided Python script. It requires the GitHub CLI (`gh`) to be installed and authenticated.
+
+### Command
+
+```bash
+python3 .agent/skills/fetch_pr_comments/scripts/fetch_comments.py
+```
+
+### 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
+
+## Dependencies
+
+- `gh` (GitHub CLI) must be installed and in your PATH.
+- `python3` must be available.

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

@@ -0,0 +1,99 @@
+#
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import json
+import subprocess
+import sys
+from datetime import datetime
+
+def run_command(command):
+    try:
+        result = subprocess.run(
+            command,
+            check=True,
+            capture_output=True,
+            text=True,
+            shell=True
+        )
+        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:
+            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)
+        print(f"Stderr: {e.stderr}", file=sys.stderr)
+        sys.exit(1)
+
+def format_date(iso_date):
+    try:
+        dt = datetime.fromisoformat(iso_date.replace("Z", "+00:00"))
+        return dt.strftime("%Y-%m-%d %H:%M")
+    except Exception:
+        return iso_date
+
+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)
+    
+    try:
+        pr_data = json.loads(json_output)
+    except json.JSONDecodeError:
+        print("Failed to decode JSON from gh output.", file=sys.stderr)
+        sys.exit(1)
+
+    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")
+
+    print("## Reviews")
+    reviews = pr_data.get('latestReviews', [])
+    if not reviews:
+        print("No reviews found.")
+    else:
+        for review in reviews:
+            state = review.get('state')
+            author = review.get('author', {}).get('login', 'Unknown')
+            date = format_date(review.get('submittedAt', ''))
+            print(f"- **{author}**: {state} ({date})")
+    print("\n" + "-"*40 + "\n")
+
+    print("## Comments")
+    
+    comments = pr_data.get('comments', [])
+    if not comments:
+        print("No comments found.")
+    else:
+        for comment in comments:
+            author = comment.get('author', {}).get('login', 'Unknown')
+            body = comment.get('body', '').strip()
+            date = format_date(comment.get('createdAt', ''))
+            url = comment.get('url', '')
+            
+            print(f"### {author} at {date}")
+            print(f"[Link]({url})\n")
+            print(body)
+            print("\n" + "-"*20 + "\n")
+
+if __name__ == "__main__":
+    main()

.agent/skills/prepare_commit/SKILL.md

@@ -0,0 +1,20 @@
+---
+name: Prepare Commit
+description: Prepares the codebase for a commit by formatting code and helping identify temporary comments.
+---
+
+# Prepare Commit
+
+Use this skill **before every commit** to ensure your code is formatted and clean.
+
+## Usage
+
+This skill performs the following:
+1.  Runs standard formatting (`ktfmtFormat`).
+2.  (Optional/Manual) Reminds you to check for temporary comments.
+
+### Command
+
+```bash
+python3 .agent/skills/prepare_commit/scripts/prepare.py
+```

.agent/skills/prepare_commit/scripts/prepare.py

@@ -0,0 +1,36 @@
+#
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import subprocess
+import sys
+
+def run_command(command):
+    print(f"Running: {command}")
+    try:
+        subprocess.run(command, check=True, shell=True)
+    except subprocess.CalledProcessError:
+        print(f"Error running {command}")
+        sys.exit(1)
+
+def main():
+    print("🎨 Formatting code with ktfmt...")
+    run_command("./gradlew ktfmtFormat")
+    
+    print("\n✅ Formatting complete.")
+    print("⚠️  REMINDER: Please check for any temporary comments or debug code before committing.")
+
+if __name__ == "__main__":
+    main()

.agent/skills/push_to_github/SKILL.md

@@ -0,0 +1,20 @@
+---
+name: Push to GitHub
+description: Runs all necessary checks (lint, tests) and pushes to GitHub. Use this as the final safety gate.
+---
+
+# Push to GitHub
+
+Use this skill **when you are ready to push** your changes to the remote repository. It acts as a safety gate to prevent breaking CI.
+
+## Usage
+
+1.  Verifies changes (Unit Tests).
+2.  Runs code checks (Lint/CheckCode).
+3.  Pushes to the current branch.
+
+### Command
+
+```bash
+python3 .agent/skills/push_to_github/scripts/push.py
+```

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

@@ -0,0 +1,46 @@
+#
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import subprocess
+import sys
+
+def run_command(command):
+    print(f"Running: {command}")
+    try:
+        subprocess.run(command, check=True, shell=True)
+    except subprocess.CalledProcessError:
+        print(f"❌ Command failed: {command}")
+        sys.exit(1)
+
+def main():
+    print("🚧 Starting Pre-Push Checks...")
+    
+    # 1. Verify (Tests)
+    print("\n1️⃣  Running Unit Tests...")
+    run_command("./gradlew :app:testLocalDebugUnitTest")
+    
+    # 2. Check Code (Lint/Analysis)
+    print("\n2️⃣  Running Code Checks...")
+    run_command("./gradlew :app:checkCode")
+    
+    # 3. Push
+    print("\n3️⃣  Pushing to GitHub...")
+    run_command("git push")
+    
+    print("\n✅ Successfully pushed to GitHub!")
+
+if __name__ == "__main__":
+    main()

.agent/skills/verify_changes/SKILL.md

@@ -0,0 +1,18 @@
+---
+name: Verify Changes
+description: Runs unit tests to quickly verify changes during the development loop.
+---
+
+# Verify Changes
+
+Use this skill **after each meaningful change** to verify you haven't broken existing functionality.
+
+## Usage
+
+Runs the local unit tests for the debug variant.
+
+### Command
+
+```bash
+python3 .agent/skills/verify_changes/scripts/verify.py
+```

.agent/skills/verify_changes/scripts/verify.py

@@ -0,0 +1,34 @@
+#
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import subprocess
+import sys
+
+def run_command(command):
+    print(f"Running: {command}")
+    try:
+        subprocess.run(command, check=True, shell=True)
+    except subprocess.CalledProcessError:
+        print(f"Error running {command}")
+        sys.exit(1)
+
+def main():
+    print("🧪 Running local unit tests...")
+    run_command("./gradlew :app:testLocalDebugUnitTest")
+    print("\n✅ Verified.")
+
+if __name__ == "__main__":
+    main()

.gitignore

@@ -2,6 +2,7 @@
 **/google-services.json
 secrets.properties
 !app/src/debug/local/google-services.json
+!.agent
 !.gitignore
 !gradle/
 
@@ -50,3 +51,4 @@ captures/
 
 # Ctags
 **/tags
+GEMINI.md

GEMINI.md

@@ -2,24 +2,15 @@
 
 These rules apply to all interactions in this project.
 
-1. Limit File Access: Restrict file system read/write operations ONLY to files explicitly provided or mentioned in the current request. ABSOLUTELY DO NOT access files in other directories (e.g., /etc, ~, /usr).
-2. Confirm Dangerous Commands: If the intended command is potentially destructive (e.g., rm, mv, sudo, systemctl), you MUST explicitly preface the command proposal with a warning: 'WARNING: POTENTIALLY DESTRUCTIVE ACTION REQUIRED.'
-3. Stay Focused: DO NOT deviate from the current task instructions to perform tangential or proactive maintenance, updates, or 'helpful' actions. Only address the explicit request.
-
-When making changes to the code:
-
-1. Ensure all new files have the standard copyright header with the current year.
-2. Add unit tests of all new or changed behaviors and remove obsolete unit tests for removed behaviors.
-3. Run and fix all unit tests with `./gradlew :app:testLocalDebugUnitTest`.
-
-Before pushing changes:
-
-1. Remove any commented out code or temporary comments added in the process of debugging and authoring new or changed code.
-2. Run `./gradlew ktfmtFormat` to fix lint errors.
-3. Run checks with `./gradlew :app:checkCode` and fix all errors and warnings.
-
-When asked to resolve pending comments:
-
-1. Get the current PR number using `gh pr view $(git branch --show-current) --json number`.
-2. Fetch comments with `gh api -H "Accept: application/vnd.github.v3.full+json" /repos/google/ground-android/pulls/<PR number>/comments` to get the pending comments.
-3. Resolve the pending comments.
+1. Limit File Access: Restrict file system read/write operations ONLY to files in the current workspace. ABSOLUTELY DO NOT access files in other directories (e.g., /etc, ~, /usr).
+2. Confirm Dangerous Commands: If the intended command is potentially destructive (e.g., rm, mv, sudo, systemctl), you MUST explicitly preface the command proposal with a warning: "WARNING: POTENTIALLY DESTRUCTIVE ACTION REQUIRED."
+3. Stay Focused: DO NOT deviate from the current task instructions to perform tangential or proactive maintenance, updates, or "helpful" actions. Only address the explicit request.
+4. Ensure all new files have the standard copyright header with the current year.
+5. Add or update unit tests for all new or changed behaviors. Remove unit tests for code which has been removed.
+6. Run `verify_changes` skill to ensure tests pass.
+
+When asked to push changes to GitHub:
+
+1. **Prepare**: Run `prepare_commit` skill to format code and remove temp comments.
+2. **Verify**: Run `verify_changes` skill after meaningful changes.
+3. **Push**: Run `push_to_github` skill to finalize checks and push.