diff --git a/.github/scripts/apply-issue-labels.cjs b/.github/scripts/apply-issue-labels.cjs index 03c11403fed..f875a7ed389 100644 --- a/.github/scripts/apply-issue-labels.cjs +++ b/.github/scripts/apply-issue-labels.cjs @@ -85,14 +85,51 @@ module.exports = async ({ github, context, core }) => { continue; } - const labelsToAdd = entry.labels_to_add || []; - labelsToAdd.push('status/bot-triaged'); - + let labelsToAdd = entry.labels_to_add || []; let labelsToRemove = entry.labels_to_remove || []; + labelsToRemove.push('status/need-triage'); - // Deduplicate array + + if (labelsToAdd.includes('status/manual-triage')) { + // If the AI flagged it for manual triage, remove bot-triaged if it exists + labelsToRemove.push('status/bot-triaged'); + // Ensure we don't accidentally try to add bot-triaged if the AI returned it + labelsToAdd = labelsToAdd.filter((l) => l !== 'status/bot-triaged'); + } else { + // Standard successful bot triage + labelsToAdd.push('status/bot-triaged'); + } + + // Deduplicate arrays + labelsToAdd = [...new Set(labelsToAdd)]; labelsToRemove = [...new Set(labelsToRemove)]; + // Enforce mutually exclusive area labels + const areaLabelsToAdd = labelsToAdd.filter((l) => l.startsWith('area/')); + if (areaLabelsToAdd.length > 1) { + core.warning( + `Issue #${issueNumber} has multiple area labels to add: ${areaLabelsToAdd.join(', ')}. Keeping only the first one.`, + ); + const firstArea = areaLabelsToAdd[0]; + labelsToAdd = labelsToAdd.filter( + (l) => !l.startsWith('area/') || l === firstArea, + ); + } + + // Enforce mutually exclusive priority labels + const priorityLabelsToAdd = labelsToAdd.filter((l) => + l.startsWith('priority/'), + ); + if (priorityLabelsToAdd.length > 1) { + core.warning( + `Issue #${issueNumber} has multiple priority labels to add: ${priorityLabelsToAdd.join(', ')}. Keeping only the first one.`, + ); + const firstPriority = priorityLabelsToAdd[0]; + labelsToAdd = labelsToAdd.filter( + (l) => !l.startsWith('priority/') || l === firstPriority, + ); + } + if (labelsToAdd.length > 0) { await github.rest.issues.addLabels({ owner: context.repo.owner, diff --git a/.github/scripts/find-conflicting-labels.cjs b/.github/scripts/find-conflicting-labels.cjs new file mode 100644 index 00000000000..35b5e64e5ac --- /dev/null +++ b/.github/scripts/find-conflicting-labels.cjs @@ -0,0 +1,60 @@ +/** + * @license + * Copyright 2026 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +const fs = require('node:fs'); + +module.exports = async ({ github, context, core }) => { + core.info('Fetching open issues to check for conflicting labels...'); + + const issues = await github.paginate(github.rest.issues.listForRepo, { + owner: context.repo.owner, + repo: context.repo.repo, + state: 'open', + per_page: 100, + }); + + const conflictingLabelIssues = []; + + for (const issue of issues) { + if (issue.pull_request) continue; + + const areaLabels = issue.labels + .filter((l) => l.name && l.name.startsWith('area/')) + .map((l) => l.name); + + const priorityLabels = issue.labels + .filter((l) => l.name && l.name.startsWith('priority/')) + .map((l) => l.name); + + if (areaLabels.length > 1 || priorityLabels.length > 1) { + let message = `Issue #${issue.number} has conflicting labels:`; + if (areaLabels.length > 1) + message += ` multiple areas (${areaLabels.join(', ')}).`; + if (priorityLabels.length > 1) + message += ` multiple priorities (${priorityLabels.join(', ')}).`; + + core.info(message); + + conflictingLabelIssues.push({ + number: issue.number, + title: issue.title, + body: issue.body || '', + }); + } + } + + // Limit to 50 to avoid overwhelming the AI in a single run + const issuesToProcess = conflictingLabelIssues.slice(0, 50); + + fs.writeFileSync( + 'conflicting_labels_issues.json', + JSON.stringify(issuesToProcess, null, 2), + ); + + core.info( + `Found ${conflictingLabelIssues.length} issues with conflicting labels. Wrote ${issuesToProcess.length} to conflicting_labels_issues.json`, + ); +}; diff --git a/.github/workflows/gemini-scheduled-issue-triage.yml b/.github/workflows/gemini-scheduled-issue-triage.yml index 6c8f10dcb78..6413f7c157e 100644 --- a/.github/workflows/gemini-scheduled-issue-triage.yml +++ b/.github/workflows/gemini-scheduled-issue-triage.yml @@ -61,6 +61,16 @@ jobs: const syncIssueTypes = require('./.github/scripts/sync-issue-types.cjs'); await syncIssueTypes({ github, context, core }); + - name: 'Find Issues with Conflicting Labels' + if: |- + ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }} + uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea' + with: + github-token: '${{ steps.generate_token.outputs.token }}' + script: |- + const findConflictingLabels = require('./.github/scripts/find-conflicting-labels.cjs'); + await findConflictingLabels({ github, context, core }); + - name: 'Find untriaged issues' if: |- ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }} @@ -81,22 +91,31 @@ jobs: echo '🏷️ Finding issues missing priority labels...' gh issue list --repo "${GITHUB_REPOSITORY}" \ - --search 'is:open is:issue -label:status/bot-triaged -label:priority/p0 -label:priority/p1 -label:priority/p2 -label:priority/p3 -label:priority/unknown' --limit 50 --json number,title,body > no_priority_issues.json + --search 'is:open is:issue -label:priority/p0 -label:priority/p1 -label:priority/p2 -label:priority/p3 -label:priority/unknown' --limit 50 --json number,title,body > no_priority_issues.json echo '📏 Finding issues missing effort labels...' gh issue list --repo "${GITHUB_REPOSITORY}" \ - --search 'is:open is:issue -label:status/bot-triaged -label:effort/small -label:effort/medium -label:effort/large label:area/core,area/extensions,area/site,area/non-interactive' --limit 20 --json number,title,body > no_effort_issues.json + --search 'is:open is:issue -label:effort/small -label:effort/medium -label:effort/large label:area/core,area/extensions,area/site,area/non-interactive' --limit 5 --json number,title,body > no_effort_issues.json + + echo '🔄 Merging and deduplicating standard triage issues...' + if [ ! -f conflicting_labels_issues.json ]; then echo "[]" > conflicting_labels_issues.json; fi + jq -c -s 'add | unique_by(.number)' no_area_issues.json no_kind_issues.json no_priority_issues.json conflicting_labels_issues.json > standard_issues_to_triage.json - echo '🔄 Merging and deduplicating issues...' - jq -c -s 'add | unique_by(.number)' no_area_issues.json no_kind_issues.json no_priority_issues.json no_effort_issues.json no_type_issues.json > issues_to_triage.json + echo '📏 Deduplicating effort issues...' + jq -c -s 'add | unique_by(.number)' no_effort_issues.json > effort_issues_to_triage.json - ISSUE_COUNT="$(jq 'length' issues_to_triage.json)" - if [ "$ISSUE_COUNT" -gt 0 ]; then + STANDARD_COUNT="$(jq 'length' standard_issues_to_triage.json)" + EFFORT_COUNT="$(jq 'length' effort_issues_to_triage.json)" + if [ "$STANDARD_COUNT" -gt 0 ] || [ "$EFFORT_COUNT" -gt 0 ]; then echo "has_issues=true" >> "${GITHUB_OUTPUT}" + echo "has_standard_issues=$([ "$STANDARD_COUNT" -gt 0 ] && echo 'true' || echo 'false')" >> "${GITHUB_OUTPUT}" + echo "has_effort_issues=$([ "$EFFORT_COUNT" -gt 0 ] && echo 'true' || echo 'false')" >> "${GITHUB_OUTPUT}" else echo "has_issues=false" >> "${GITHUB_OUTPUT}" + echo "has_standard_issues=false" >> "${GITHUB_OUTPUT}" + echo "has_effort_issues=false" >> "${GITHUB_OUTPUT}" fi - echo "✅ Found ${ISSUE_COUNT} unique issues to triage! 🎯" + echo "✅ Found ${STANDARD_COUNT} standard issues and ${EFFORT_COUNT} effort issues to triage! 🎯" - name: 'Create Gemini CLI Experiments Override' if: |- @@ -129,11 +148,11 @@ jobs: core.info(`Found ${labelNames.length} labels: ${labelNames.join(', ')}`); return labelNames; - - name: 'Run Gemini Issue Analysis' + - name: 'Run Standard Triage Analysis' if: |- - steps.get_issue_from_event.outputs.has_issues == 'true' || steps.find_issues.outputs.has_issues == 'true' + steps.get_issue_from_event.outputs.has_issues == 'true' || steps.find_issues.outputs.has_standard_issues == 'true' uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31' # ratchet:google-github-actions/run-gemini-cli@v0 - id: 'gemini_issue_analysis' + id: 'gemini_standard_issue_analysis' env: GITHUB_TOKEN: '' # Do not pass any auth token here since this runs on untrusted inputs REPOSITORY: '${{ github.repository }}' @@ -154,8 +173,6 @@ jobs: "maxSessionTurns": 25, "coreTools": [ "run_shell_command(echo)", - "grep_search", - "glob", "read_file" ], "telemetry": { @@ -173,28 +190,27 @@ jobs: ## Steps 1. You are only able to use the echo and read_file commands. Review the available labels in the environment variable: "${AVAILABLE_LABELS}". - 2. Use the read_file tool to read the file "issues_to_triage.json" which contains the JSON array of issues to triage. + 2. Use the read_file tool to read the file "standard_issues_to_triage.json" which contains the JSON array of issues to triage. 3. Review the issue title, body and any comments provided in the JSON file. - 4. Identify the most relevant labels from the existing labels, specifically focusing on area/*, kind/*, priority/*, and effort/*. + 4. Identify the most relevant labels from the existing labels, specifically focusing on area/*, kind/*, and priority/*. 5. Label Policy: - If the issue already has a kind/ label, do not change it. - - If the issue already has a priority/ label, do not change it. - - If the issue already has an area/ label, do not change it. - - If the issue already has an effort/ label, do not change it. - - If the issue is missing an effort/ label AND its area is area/core, area/extensions, area/site, or area/non-interactive, you must evaluate the architectural complexity to determine the effort level. You MUST NOT guess the root cause. You MUST actively use your codebase search tools (grep_search and glob) to search for keywords from the issue and explore the codebase. You must identify the specific files and components involved before deciding the effort. Do NOT evaluate or assign an effort/ label to issues in any other areas (such as area/agent). + - If the issue has exactly ONE priority/ label, do not change it. + - If the issue is missing a priority/ label, OR if the issue currently has MULTIPLE priority/ labels, you must evaluate the issue's impact to determine exactly ONE priority level (priority/p0, priority/p1, priority/p2, priority/p3, or priority/unknown) based the guidelines. If you are fixing an issue with multiple priority/ labels, put the correct one in `labels_to_add` and put all the incorrect ones in `labels_to_remove`. + - If the issue has exactly ONE area/ label, do not change it. + - If the issue is missing an area/ label, OR if the issue currently has MULTIPLE area/ labels, select exactly ONE area/ label that best fits the issue. Issues MUST NOT have multiple area/ labels. If you are fixing an issue with multiple area/ labels, put the correct one in `labels_to_add` and put all the incorrect ones in `labels_to_remove`. - If any of these are missing, select exactly ONE appropriate label for the missing category. 6. Identify other applicable labels based on the issue content, such as status/*, help wanted, good first issue, etc. 7. Give me a single short explanation about why you are selecting each label in the process. 8. Output a JSON array of objects, each containing the issue number - and the labels to add and remove, along with an explanation. If you assigned an effort/ label, you MUST also include an effort_analysis field. This effort_analysis must be highly detailed, technical, and empirical. It MUST NOT contain vague guesses (e.g., avoid words like "likely points to" or "possibly"). You must explicitly cite the specific file paths and architectural mechanisms you discovered using your search tools, explain the root cause, and then explicitly state how that complexity maps to the chosen effort level guidelines. For example: + and the labels to add and remove, along with an explanation. For example: ``` [ { "issue_number": 123, - "labels_to_add": ["area/core", "kind/bug", "priority/p2", "effort/small"], + "labels_to_add": ["area/core", "kind/bug", "priority/p2"], "labels_to_remove": ["status/need-triage"], - "explanation": "This issue is a UI bug that needs to be addressed with medium priority.", - "effort_analysis": "The `vscode-ide-companion` extension indiscriminately tracks active text editors via `vscode.window.onDidChangeActiveTextEditor` in `open-files-manager.ts`. When a user opens `.vscode/settings.json`, its content is sent to the CLI's context. The fix is highly localized to the VS Code companion extension's event listener. It involves adding a simple conditional check to exclude specific configuration files from the active editor tracking logic, which is a trivial logic adjustment with a clear root cause." + "explanation": "This issue is a UI bug that needs to be addressed with medium priority." } ] ``` @@ -213,11 +229,104 @@ jobs: - Do not add comments or modify the issue content. - Do not remove the following labels maintainer, help wanted or good first issue. - Triage only the current issue. - - Identify only one area/ label. + - Identify exactly ONE area/ label. Do NOT assign multiple area/ labels to a single issue. - Identify only one kind/ label (Do not apply kind/duplicate or kind/parent-issue) - - Identify only one priority/ label. + - Identify exactly ONE priority/ label. Do NOT assign multiple priority/ labels to a single issue. - Once you categorize the issue if it needs information bump down the priority by 1 eg.. a p0 would become a p1 a p1 would become a p2. P2 and P3 can stay as is in this scenario. + Categorization Guidelines (Priority): + P0 - Urgent Blocking Issues: + - Definition: Critical failures breaking core functionality for a large portion of users. Examples: CLI fails to launch globally, core commands (gemini run) crash on valid input, unhandled promise rejections on boot, critical security vulnerability. + - Note: You must apply status/manual-triage instead of priority/p0. + P1 - Critical but Workable: + - Definition: Severe issues without a reasonable workaround, significantly degrading the developer experience but not globally blocking. Examples: Specific tools failing consistently (e.g., `web_search` returns 500s), persistent PTY streaming hangs, memory leaks leading to OOM after short use. + P2 - Significant Issues: + - Definition: Affect some workflows but a clear workaround exists, or non-critical bugs. Examples: Theme flickering, confusing error messages, minor UI misalignment, failing to read deeply nested config files correctly. + P3 - Minor/Enhancements: + - Definition: Trivial bugs, typos, documentation requests, or feature requests. + + Categorization Guidelines (Kind): + kind/bug: The issue is describing an unexpected behavior or failure in the application. + kind/enhancement: The issue is describing a feature request or an improvement to an existing feature. + kind/question: The issue is asking a question about how to use the CLI or about a specific feature. + + Categorization Guidelines (Area): + area/agent: The "brain" of the CLI. Core agent logic, model quality, tool/function calling, memory, web search, generated code quality, sub-agents. + area/core: The fundamental CLI app. UI/UX, installation, OS compatibility, performance, command parsing, theming, flickering. + area/documentation: Website docs, READMEs, inline help text. + area/enterprise: Telemetry, Policy, Quota / Licensing + area/extensions: Gemini CLI extensions capability + area/non-interactive: GitHub Actions, SDK, 3P Integrations, Shell Scripting, Command line automation + area/platform: Platform specific behavior + area/security: Authentication, authorization, privacy, data leaks, credential storage. + + - name: 'Stop Telemetry Collector' + if: |- + steps.find_issues.outputs.has_effort_issues == 'true' + run: 'docker rm -f gemini-telemetry-collector || true' + + - name: 'Run Effort Triage Analysis' + if: |- + steps.find_issues.outputs.has_effort_issues == 'true' + uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31' # ratchet:google-github-actions/run-gemini-cli@v0 + id: 'gemini_effort_issue_analysis' + env: + GITHUB_TOKEN: '' # Do not pass any auth token here since this runs on untrusted inputs + REPOSITORY: '${{ github.repository }}' + AVAILABLE_LABELS: '${{ steps.get_labels.outputs.available_labels }}' + GEMINI_CLI_TRUST_WORKSPACE: 'true' + GEMINI_EXP: 'gemini_exp.json' + GEMINI_STRICT_TELEMETRY_LIMITS: 'true' + with: + gcp_workload_identity_provider: '${{ vars.GCP_WIF_PROVIDER }}' + gcp_project_id: '${{ vars.GOOGLE_CLOUD_PROJECT }}' + gcp_location: '${{ vars.GOOGLE_CLOUD_LOCATION }}' + gcp_service_account: '${{ vars.SERVICE_ACCOUNT_EMAIL }}' + gemini_api_key: '${{ secrets.GEMINI_API_KEY }}' + use_vertex_ai: '${{ vars.GOOGLE_GENAI_USE_VERTEXAI }}' + use_gemini_code_assist: '${{ vars.GOOGLE_GENAI_USE_GCA }}' + settings: |- + { + "maxSessionTurns": 25, + "coreTools": [ + "run_shell_command(echo)", + "grep_search", + "glob", + "read_file" + ], + "telemetry": { + "enabled": true, + "target": "gcp" + } + } + prompt: |- + ## Role + + You are an expert software architect. Analyze the provided GitHub issues and assign the correct `effort/*` label based on the codebase complexity. + + ## Steps + + 1. Use the read_file tool to read "effort_issues_to_triage.json". + 2. For each issue in the array: + - You must evaluate the architectural complexity to determine the effort level. You MUST NOT guess the root cause. You MUST actively use your codebase search tools (grep_search and glob) to search for keywords from the issue and explore the codebase. You must identify the specific files and components involved before deciding the effort. + 3. Output a JSON array of objects, each containing the issue number and the effort label to add, along with an explanation and an effort_analysis field. This effort_analysis must be highly detailed, technical, and empirical. It MUST NOT contain vague guesses (e.g., avoid words like "likely points to" or "possibly"). You must explicitly cite the specific file paths and architectural mechanisms you discovered using your search tools, explain the root cause, and then explicitly state how that complexity maps to the chosen effort level guidelines. For example: + ``` + [ + { + "issue_number": 123, + "labels_to_add": ["effort/small"], + "explanation": "This is a simple logic fix.", + "effort_analysis": "The `vscode-ide-companion` extension indiscriminately tracks active text editors via `vscode.window.onDidChangeActiveTextEditor` in `open-files-manager.ts`. When a user opens `.vscode/settings.json`, its content is sent to the CLI's context. The fix is highly localized to the VS Code companion extension's event listener. It involves adding a simple conditional check to exclude specific configuration files from the active editor tracking logic, which is a trivial logic adjustment with a clear root cause." + } + ] + ``` + + ## Guidelines + + - Output only valid JSON format + - Do not include any explanation or additional text, just the JSON + - Triage only the current issue. + Categorization Guidelines (Effort): effort/small (1 day or less): - Trivial Logic & Config: Schema updates (Zod), feature flag toggles, adding missing fields to package.json or settings.json. @@ -272,13 +381,29 @@ jobs: - This product is designed to use different models eg.. using pro, downgrading to flash etc. - When users report that they dont expect the model to change those would be categorized as feature requests. - - name: 'Apply Labels to Issues' + - name: 'Apply Standard Labels to Issues' + if: |- + ${{ steps.gemini_standard_issue_analysis.outcome == 'success' && + steps.gemini_standard_issue_analysis.outputs.summary != '[]' && + steps.gemini_standard_issue_analysis.outputs.summary != '' }} + env: + REPOSITORY: '${{ github.repository }}' + LABELS_OUTPUT: '${{ steps.gemini_standard_issue_analysis.outputs.summary }}' + uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea' + with: + github-token: '${{ steps.generate_token.outputs.token }}' + script: |- + const applyLabels = require('./.github/scripts/apply-issue-labels.cjs'); + await applyLabels({ github, context, core }); + + - name: 'Apply Effort Labels to Issues' if: |- - ${{ steps.gemini_issue_analysis.outcome == 'success' && - steps.gemini_issue_analysis.outputs.summary != '[]' }} + ${{ steps.gemini_effort_issue_analysis.outcome == 'success' && + steps.gemini_effort_issue_analysis.outputs.summary != '[]' && + steps.gemini_effort_issue_analysis.outputs.summary != '' }} env: REPOSITORY: '${{ github.repository }}' - LABELS_OUTPUT: '${{ steps.gemini_issue_analysis.outputs.summary }}' + LABELS_OUTPUT: '${{ steps.gemini_effort_issue_analysis.outputs.summary }}' uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea' with: github-token: '${{ steps.generate_token.outputs.token }}'