ci(workflows): Support running analysis on pull request comments

Enables issue analysis workflow to trigger on comments posted to pull requests. This is done by removing the `!github.event.issue.pull_request` check from the GHA issue analysis workflow definition, since GitHub models PR comments under the `issue_comment` event. The fix implementation workflow remains restricted to issues to prevent PR-on-PR loops and permission issues.

- Update scripts/run_antigravity.py to include comments and review comments in JSON payloads fetched by helper tools.
- Update adk-issue and adk-issue-analyze skills to prevent routing conflicts when /adk-issue-analyze is explicitly requested.
- Update branch validation in issue-fix workflow to fail if the agent does not successfully create and checkout fix/issue-<number>.
- Update adk-issue-fix skill branch template to match expected GHA workflow fallback pattern.

Change-Id: I34405266bb6b11cc4ad18878ef932bb46677c89d

Author: boyangsvl

.agents/skills/adk-issue-analyze/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: adk-issue-analyze
-description: Analyze and triage a GitHub issue for the adk-python repository. Use this skill to retrieve issue details, inspect the codebase, evaluate legitimacy, check for existing PRs, and produce a structured analysis report.
+description: Analyze and triage a GitHub issue for the adk-python repository. Use this skill to retrieve issue details, inspect the codebase, evaluate legitimacy, check for existing PRs, and produce a structured analysis report. Triggers on "/adk-issue-analyze" commands. This skill is strictly read-only and must be used whenever the "/adk-issue-analyze" command is explicitly called.
 ---
 
 # ADK Issue Triage & Analysis (Read-Only)

.agents/skills/adk-issue-fix/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: adk-issue-fix
-description: Implement a bug fix or feature for a GitHub issue in the adk-python repository. Use this skill after the triage/analysis is complete and approved. It creates a new branch, implements code changes, adds tests, and updates relevant documentation/samples.
+description: Implement a bug fix or feature for a GitHub issue in the adk-python repository. Use this skill after the triage/analysis is complete and approved. It creates a new branch, implements code changes, adds tests, and updates relevant documentation/samples. Triggers on "/adk-issue-fix" commands.
 ---
 
 # ADK Issue Fix Implementation
@@ -9,19 +9,28 @@ This skill provides a structured workflow for implementing bug fixes or new feat
 
 ## Implementation Steps
 
-### 1. Base the Branch on Remote HEAD & Create Branch
+### 1. Check for Existing Pull Requests (Entry Gate)
+- **Check linked pull requests**: Before creating a branch or implementing changes, check if the issue is already linked to any pull requests by querying the issue details:
+  ```bash
+  gh issue view <issue_number> --repo google/adk-python --json closedByPullRequestsReferences
+  ```
+- **Refuse to Proceed**: If the `closedByPullRequestsReferences` list is not empty (which indicates that there are already pull requests linked to this issue):
+  - **Stop immediately**: You MUST refuse to proceed with the fix implementation.
+  - **Output details**: Report the linked PR details (PR number, URL) to the user and terminate the skill execution.
+
+### 2. Base the Branch on Remote HEAD & Create Branch
 - **Do NOT commit the changes**: Leave them uncommitted in the workspace so the user can review and iterate on them.
 - **Base the branch on remote HEAD**: When creating the new branch, ensure it is based on the remote tracking branch HEAD (`origin/main`), not the current local branch. For example:
   ```bash
-  git checkout -b fix/<issue_number>-<desc> origin/main
+  git checkout -b fix/issue-<issue_number> origin/main
   ```
 
-### 2. Implement the Fix
+### 3. Implement the Fix
 - Modify the necessary source files implementing clean, robust logic following `adk-style` and `adk-architecture`.
 
-### 3. Add or Update Unittests
+### 4. Add or Update Unittests
 - Write comprehensive unit tests to verify the behavior and prevent regressions. Refer to the testing patterns in the testing guides.
 
-### 4. Update Documentation & Samples
+### 5. Update Documentation & Samples
 - Update `/docs/design` and `/docs/guides` if applicable to the changes.
 - Update `/contributing/samples` if applicable to demonstrate the new capability or updated behavior.

.agents/skills/adk-issue/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: adk-issue
-description: Orchestrate analyzing and triaging GitHub issues for the adk-python repository. Use this skill when a user provides a GitHub issue number or link. It coordinates triage analysis via `adk-issue-analyze` and implementation via `adk-issue-fix`. Triggers on "analyze issue", "issue #", "github issue", "github.com/google/adk-python/issues/".
+description: Orchestrate analyzing, triaging, and resolving GitHub issues for the adk-python repository. Use this skill when a user provides a GitHub issue number or link to perform both analysis and implementation. It coordinates triage analysis via `adk-issue-analyze` and implementation via `adk-issue-fix`. Triggers on "analyze issue", "issue #", "github issue", "github.com/google/adk-python/issues/". Do NOT trigger or use this skill when the prompt explicitly requests the "/adk-issue-analyze" command (use the read-only "adk-issue-analyze" skill instead).
 ---
 
 # ADK Issue Resolution Orchestrator

.github/workflows/issue-analyze.yml

@@ -33,7 +33,6 @@ jobs:
         github.event_name == 'issues' ||
         github.event_name == 'workflow_dispatch' ||
         (github.event_name == 'issue_comment' &&
-         !github.event.issue.pull_request &&
          startsWith(github.event.comment.body, '/adk-issue-analyze') && (
            github.event.comment.author_association == 'OWNER' ||
            github.event.comment.author_association == 'MEMBER' ||

.github/workflows/issue-fix.yml

@@ -0,0 +1,122 @@
+# 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
+#
+#     http://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.
+
+name: ADK Issue Fix Implementation
+
+on:
+  issue_comment:
+    types: [created]
+  workflow_dispatch:
+    inputs:
+      issue_url:
+        description: 'The URL of the GitHub issue to fix'
+        required: true
+        type: string
+
+jobs:
+  issue-fix:
+    if: >-
+      github.repository == 'google/adk-python' && (
+        github.event_name == 'workflow_dispatch' ||
+        (github.event_name == 'issue_comment' &&
+         !github.event.issue.pull_request &&
+         startsWith(github.event.comment.body, '/adk-issue-fix') && (
+           github.event.comment.author_association == 'OWNER' ||
+           github.event.comment.author_association == 'MEMBER' ||
+           github.event.comment.author_association == 'COLLABORATOR'
+         ))
+      )
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      contents: write
+      pull-requests: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          token: ${{ secrets.ADK_TRIAGE_AGENT }}
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.11'
+
+      - name: Authenticate to Google Cloud
+        id: auth
+        uses: 'google-github-actions/auth@v3'
+        with:
+          credentials_json: '${{ secrets.ADK_GCP_SA_KEY }}'
+
+      - name: Install Google Antigravity SDK
+        run: pip install google-antigravity
+
+      - name: Run Antigravity Fix
+        env:
+          GITHUB_TOKEN: ${{ secrets.ADK_TRIAGE_AGENT }}
+          GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
+        run: |
+          python scripts/run_antigravity.py "/adk-issue-fix ${{ github.event.issue.html_url || inputs.issue_url }}"
+
+      - name: Check for changes and create Pull Request
+        env:
+          GITHUB_TOKEN: ${{ secrets.ADK_TRIAGE_AGENT }}
+          GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
+        run: |
+          if [ -n "$(git status --porcelain)" ]; then
+            echo "Changes detected in workspace. Committing and creating Pull Request..."
+
+            # Setup git configs
+            git config --local user.name "adk-bot"
+            git config --local user.email "adk-bot@google.com"
+
+            # Extract issue number and export it for python
+            ISSUE_URL="${{ github.event.issue.html_url || inputs.issue_url }}"
+            export ISSUE_NUMBER=$(echo "$ISSUE_URL" | grep -oP '/issues/\K[0-9]+')
+
+            # Determine branch name to push
+            CURRENT_BRANCH=$(git branch --show-current)
+            EXPECTED_BRANCH="fix/issue-${ISSUE_NUMBER}"
+            if [ "$CURRENT_BRANCH" != "$EXPECTED_BRANCH" ]; then
+              echo "Error: Current branch is '$CURRENT_BRANCH', but expected '$EXPECTED_BRANCH'."
+              echo "The Antigravity Agent was expected to create and checkout '$EXPECTED_BRANCH'."
+              exit 1
+            fi
+            BRANCH_NAME="$CURRENT_BRANCH"
+
+            # Run Antigravity to stage and commit changes with autogenerated message
+            python scripts/run_antigravity.py "Analyze the unstaged changes in the workspace, stage all of them, and commit them using git. Generate a highly precise conventional commit message based on the diff."
+
+            # Append the closes tag using Python to avoid relying on LLM formatting
+            python -c "import os, subprocess; msg = subprocess.check_output(['git', 'log', '-1', '--pretty=%B'], text=True); tag = 'closes https://github.com/google/adk-python/issues/' + os.environ['ISSUE_NUMBER']; subprocess.run(['git', 'commit', '--amend', '-m', msg.strip() + '\n\n' + tag], check=True) if tag not in msg else None"
+
+            # Push the branch to the bot fork
+            git remote add fork https://x-access-token:${{ secrets.ADK_TRIAGE_AGENT }}@github.com/adk-bot/adk-python.git
+            git push fork "$BRANCH_NAME" --force
+
+            # Retrieve the commit message of the last commit
+            COMMIT_MSG=$(git log -1 --pretty=%B)
+
+            # Create PR from the bot fork to the main repository
+            gh pr create \
+              --repo google/adk-python \
+              --title "fix(issue): fix issue #${ISSUE_NUMBER}" \
+              --body "$COMMIT_MSG" \
+              --head "adk-bot:$BRANCH_NAME" \
+              --base "main"
+          else
+            echo "No changes made by the agent. Skipping PR creation."
+          fi

AGENTS.md

@@ -16,11 +16,11 @@ For all matters regarding ADK development, please use the appropriate skill:
   - Read `.agents/skills/adk-sample-creator/SKILL.md` for full instructions.
 - **`adk-review`**: Use this skill to review local changes for errors, style compliance, unintended outcomes, and to check if associated design docs, guides, samples, or tests need updates.
   - Read `.agents/skills/adk-review/SKILL.md` for full instructions.
-- **`adk-issue`**: Use this skill when analyzing, triaging, and resolving GitHub issues for the adk-python repository. It orchestrates the process by delegating to `adk-issue-analyze` and `adk-issue-fix`.
+- **`adk-issue`**: Use this skill when analyzing, triaging, and resolving GitHub issues for the adk-python repository (orchestrating both triage and fix implementation). Do NOT use this skill if the "/adk-issue-analyze" command is explicitly requested.
   - Read `.agents/skills/adk-issue/SKILL.md` for full instructions.
-- **`adk-issue-analyze`**: Use this skill to fetch, inspect, and analyze a GitHub issue to verify legitimacy, existing PRs, and recommend a fix in a structured report.
+- **`adk-issue-analyze`**: Use this skill to fetch, inspect, and analyze a GitHub issue in a strictly read-only manner. Use this skill when the "/adk-issue-analyze" command is explicitly called.
   - Read `.agents/skills/adk-issue-analyze/SKILL.md` for full instructions.
-- **`adk-issue-fix`**: Use this skill to implement the code changes, unit tests, and documentation updates for an approved GitHub issue fix.
+- **`adk-issue-fix`**: Use this skill to implement the code changes, unit tests, and documentation updates for an approved GitHub issue fix. Use this skill when the "/adk-issue-fix" command is explicitly called.
   - Read `.agents/skills/adk-issue-fix/SKILL.md` for full instructions.
 - **`adk-pr-triage`**: Use this skill when triaging and analyzing GitHub pull requests (PRs) to evaluate their objectives, legitimacy, value, and alignment with ADK's architectural, styling, and testing principles.
   - Read `.agents/skills/adk-pr-triage/SKILL.md` for full instructions.

scripts/run_antigravity.py

@@ -16,8 +16,10 @@
 
 import argparse
 import asyncio
+import json
 import os
 import shlex
+import subprocess
 import sys
 from typing import Any
 
@@ -82,8 +84,6 @@ def fetch_github_issue(issue_number: int) -> str:
   Args:
     issue_number: The issue number (e.g. 5949).
   """
-  import subprocess
-
   # Use curl to fetch the issue details.
   # This supports running it outside of the gh CLI environment (e.g. without login/remotes setup).
   cmd = [
@@ -93,17 +93,40 @@ def fetch_github_issue(issue_number: int) -> str:
   token = os.environ.get("GITHUB_TOKEN")
   if token:
     cmd.extend(["-H", f"Authorization: token {token}"])
-  cmd.append(
+
+  issue_cmd = cmd + [
       f"https://api.github.com/repos/google/adk-python/issues/{issue_number}"
-  )
+  ]
+  comments_cmd = cmd + [
+      f"https://api.github.com/repos/google/adk-python/issues/{issue_number}/comments"
+  ]
 
   try:
-    res = subprocess.run(cmd, capture_output=True, text=True, check=False)
+    res = subprocess.run(issue_cmd, capture_output=True, text=True, check=False)
     if res.returncode != 0:
       return (
           f"Error: Failed to fetch issue {issue_number}: {res.stderr.strip()}"
       )
-    return res.stdout.strip()
+
+    try:
+      issue_data = json.loads(res.stdout.strip())
+    except json.JSONDecodeError as e:
+      return (
+          f"Error: Failed to parse issue JSON response: {e}. Output:"
+          f" {res.stdout.strip()}"
+      )
+
+    res_comments = subprocess.run(
+        comments_cmd, capture_output=True, text=True, check=False
+    )
+    if res_comments.returncode == 0:
+      try:
+        comments_data = json.loads(res_comments.stdout.strip())
+        issue_data["comments_data"] = comments_data
+      except json.JSONDecodeError:
+        pass
+
+    return json.dumps(issue_data, indent=2)
   except Exception as e:
     return f"Error: Failed to run curl command: {e}"
 
@@ -114,8 +137,6 @@ def fetch_github_pr(pr_number: int) -> str:
   Args:
     pr_number: The PR number (e.g. 5956).
   """
-  import subprocess
-
   # Use curl to fetch the PR details.
   # This supports running it outside of the gh CLI environment (e.g. without login/remotes setup).
   cmd = [
@@ -125,15 +146,53 @@ def fetch_github_pr(pr_number: int) -> str:
   token = os.environ.get("GITHUB_TOKEN")
   if token:
     cmd.extend(["-H", f"Authorization: token {token}"])
-  cmd.append(
+
+  pr_cmd = cmd + [
       f"https://api.github.com/repos/google/adk-python/pulls/{pr_number}"
-  )
+  ]
+  issue_comments_cmd = cmd + [
+      f"https://api.github.com/repos/google/adk-python/issues/{pr_number}/comments"
+  ]
+  review_comments_cmd = cmd + [
+      f"https://api.github.com/repos/google/adk-python/pulls/{pr_number}/comments"
+  ]
 
   try:
-    res = subprocess.run(cmd, capture_output=True, text=True, check=False)
+    res = subprocess.run(pr_cmd, capture_output=True, text=True, check=False)
     if res.returncode != 0:
       return f"Error: Failed to fetch PR {pr_number}: {res.stderr.strip()}"
-    return res.stdout.strip()
+
+    try:
+      pr_data = json.loads(res.stdout.strip())
+    except json.JSONDecodeError as e:
+      return (
+          f"Error: Failed to parse PR JSON response: {e}. Output:"
+          f" {res.stdout.strip()}"
+      )
+
+    # Fetch issue-level comments
+    res_issue_comments = subprocess.run(
+        issue_comments_cmd, capture_output=True, text=True, check=False
+    )
+    if res_issue_comments.returncode == 0:
+      try:
+        pr_data["comments_data"] = json.loads(res_issue_comments.stdout.strip())
+      except json.JSONDecodeError:
+        pass
+
+    # Fetch review/inline comments
+    res_review_comments = subprocess.run(
+        review_comments_cmd, capture_output=True, text=True, check=False
+    )
+    if res_review_comments.returncode == 0:
+      try:
+        pr_data["review_comments_data"] = json.loads(
+            res_review_comments.stdout.strip()
+        )
+      except json.JSONDecodeError:
+        pass
+
+    return json.dumps(pr_data, indent=2)
   except Exception as e:
     return f"Error: Failed to run curl command: {e}"