Merge branch 'google-gemini:main' into main

Author: DavidAPierce

.github/workflows/gemini-scheduled-stale-issue-closer.yml

@@ -79,8 +79,14 @@ jobs:
                 continue;
               }
 
-              // Skip if it has a maintainer label
-              if (issue.labels.some(label => label.name.toLowerCase().includes('maintainer'))) {
+              // Skip if it has a maintainer, help wanted, or Public Roadmap label
+              const rawLabels = issue.labels.map((l) => l.name);
+              const lowercaseLabels = rawLabels.map((l) => l.toLowerCase());
+              if (
+                lowercaseLabels.some((l) => l.includes('maintainer')) ||
+                lowercaseLabels.includes('help wanted') ||
+                rawLabels.includes('🗓️ Public Roadmap')
+              ) {
                 continue;
               }
 

.github/workflows/gemini-scheduled-stale-pr-closer.yml

@@ -0,0 +1,205 @@
+name: 'Gemini Scheduled Stale PR Closer'
+
+on:
+  schedule:
+    - cron: '0 2 * * *' # Every day at 2 AM UTC
+  pull_request:
+    types: ['opened', 'edited']
+  workflow_dispatch:
+    inputs:
+      dry_run:
+        description: 'Run in dry-run mode'
+        required: false
+        default: false
+        type: 'boolean'
+
+jobs:
+  close-stale-prs:
+    if: "github.repository == 'google-gemini/gemini-cli'"
+    runs-on: 'ubuntu-latest'
+    permissions:
+      pull-requests: 'write'
+      issues: 'write'
+    steps:
+      - name: 'Generate GitHub App Token'
+        id: 'generate_token'
+        uses: 'actions/create-github-app-token@v1'
+        with:
+          app-id: '${{ secrets.APP_ID }}'
+          private-key: '${{ secrets.PRIVATE_KEY }}'
+          owner: '${{ github.repository_owner }}'
+          repositories: 'gemini-cli'
+
+      - name: 'Process Stale PRs'
+        uses: 'actions/github-script@v7'
+        env:
+          DRY_RUN: '${{ inputs.dry_run }}'
+        with:
+          github-token: '${{ steps.generate_token.outputs.token }}'
+          script: |
+            const dryRun = process.env.DRY_RUN === 'true';
+            const thirtyDaysAgo = new Date();
+            thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30);
+
+            // 1. Fetch maintainers for verification
+            let maintainerLogins = new Set();
+            try {
+              const members = await github.paginate(github.rest.teams.listMembersInOrg, {
+                org: context.repo.owner,
+                team_slug: 'gemini-cli-maintainers'
+              });
+              maintainerLogins = new Set(members.map(m => m.login));
+            } catch (e) {
+              core.warning('Failed to fetch team members');
+            }
+
+            const isMaintainer = (login, assoc) => {
+              if (maintainerLogins.size > 0) return maintainerLogins.has(login);
+              return ['OWNER', 'MEMBER', 'COLLABORATOR'].includes(assoc);
+            };
+
+            // 2. Determine which PRs to check
+            let prs = [];
+            if (context.eventName === 'pull_request') {
+              const { data: pr } = await github.rest.pulls.get({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: context.payload.pull_request.number
+              });
+              prs = [pr];
+            } else {
+              prs = await github.paginate(github.rest.pulls.list, {
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                state: 'open',
+                per_page: 100
+              });
+            }
+
+            for (const pr of prs) {
+              const maintainerPr = isMaintainer(pr.user.login, pr.author_association);
+              const isBot = pr.user.type === 'Bot' || pr.user.login.endsWith('[bot]');
+
+              // Detection Logic for Linked Issues
+              // Check 1: Official GitHub "Closing Issue" link (GraphQL)
+              const linkedIssueQuery = `query($owner:String!, $repo:String!, $number:Int!) {
+                repository(owner:$owner, name:$repo) {
+                  pullRequest(number:$number) {
+                    closingIssuesReferences(first: 1) { totalCount }
+                  }
+                }
+              }`;
+
+              let hasClosingLink = false;
+              try {
+                const res = await github.graphql(linkedIssueQuery, {
+                  owner: context.repo.owner, repo: context.repo.repo, number: pr.number
+                });
+                hasClosingLink = res.repository.pullRequest.closingIssuesReferences.totalCount > 0;
+              } catch (e) {}
+
+              // Check 2: Regex for mentions (e.g., "Related to #123", "Part of #123", "#123")
+              // We check for # followed by numbers or direct URLs to issues.
+              const body = pr.body || '';
+              const mentionRegex = /(?:#|https:\/\/github\.com\/[^\/]+\/[^\/]+\/issues\/)(\d+)/i;
+              const hasMentionLink = mentionRegex.test(body);
+
+              const hasLinkedIssue = hasClosingLink || hasMentionLink;
+
+              // Logic for Closed PRs (Auto-Reopen)
+              if (pr.state === 'closed' && context.eventName === 'pull_request' && context.payload.action === 'edited') {
+                if (hasLinkedIssue) {
+                  core.info(`PR #${pr.number} now has a linked issue. Reopening.`);
+                  if (!dryRun) {
+                    await github.rest.pulls.update({
+                      owner: context.repo.owner,
+                      repo: context.repo.repo,
+                      pull_number: pr.number,
+                      state: 'open'
+                    });
+                    await github.rest.issues.createComment({
+                      owner: context.repo.owner,
+                      repo: context.repo.repo,
+                      issue_number: pr.number,
+                      body: "Thank you for linking an issue! This pull request has been automatically reopened."
+                    });
+                  }
+                }
+                continue;
+              }
+
+              // Logic for Open PRs (Immediate Closure)
+              if (pr.state === 'open' && !maintainerPr && !hasLinkedIssue && !isBot) {
+                core.info(`PR #${pr.number} is missing a linked issue. Closing.`);
+                if (!dryRun) {
+                  await github.rest.issues.createComment({
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    issue_number: pr.number,
+                    body: "Hi there! Thank you for your contribution to Gemini CLI. \n\nTo improve our contribution process and better track changes, we now require all pull requests to be associated with an existing issue, as announced in our [recent discussion](https://github.com/google-gemini/gemini-cli/discussions/16706) and as detailed in our [CONTRIBUTING.md](https://github.com/google-gemini/gemini-cli/blob/main/CONTRIBUTING.md#1-link-to-an-existing-issue).\n\nThis pull request is being closed because it is not currently linked to an issue. **Once you have updated the description of this PR to link an issue (e.g., by adding `Fixes #123` or `Related to #123`), it will be automatically reopened.**\n\n**How to link an issue:**\nAdd a keyword followed by the issue number (e.g., `Fixes #123`) in the description of your pull request. For more details on supported keywords and how linking works, please refer to the [GitHub Documentation on linking pull requests to issues](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).\n\nThank you for your understanding and for being a part of our community!"
+                  });
+                  await github.rest.pulls.update({
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    pull_number: pr.number,
+                    state: 'closed'
+                  });
+                }
+                continue;
+              }
+
+              // Staleness check (Scheduled runs only)
+              if (pr.state === 'open' && context.eventName !== 'pull_request') {
+                const labels = pr.labels.map(l => l.name.toLowerCase());
+                if (labels.includes('help wanted') || labels.includes('🔒 maintainer only')) continue;
+
+                let lastActivity = new Date(0);
+                try {
+                  const reviews = await github.paginate(github.rest.pulls.listReviews, {
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    pull_number: pr.number
+                  });
+                  for (const r of reviews) {
+                    if (isMaintainer(r.user.login, r.author_association)) {
+                      const d = new Date(r.submitted_at || r.updated_at);
+                      if (d > lastActivity) lastActivity = d;
+                    }
+                  }
+                  const comments = await github.paginate(github.rest.issues.listComments, {
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    issue_number: pr.number
+                  });
+                  for (const c of comments) {
+                    if (isMaintainer(c.user.login, c.author_association)) {
+                      const d = new Date(c.updated_at);
+                      if (d > lastActivity) lastActivity = d;
+                    }
+                  }
+                } catch (e) {}
+
+                if (maintainerPr) {
+                  const d = new Date(pr.created_at);
+                  if (d > lastActivity) lastActivity = d;
+                }
+
+                if (lastActivity < thirtyDaysAgo) {
+                  core.info(`PR #${pr.number} is stale.`);
+                  if (!dryRun) {
+                    await github.rest.issues.createComment({
+                      owner: context.repo.owner,
+                      repo: context.repo.repo,
+                      issue_number: pr.number,
+                      body: "Hi there! Thank you for your contribution to Gemini CLI. We really appreciate the time and effort you've put into this pull request.\n\nTo keep our backlog manageable and ensure we're focusing on current priorities, we are closing pull requests that haven't seen maintainer activity for 30 days. Currently, the team is prioritizing work associated with **🔒 maintainer only** or **help wanted** issues.\n\nIf you believe this change is still critical, please feel free to comment with updated details. Otherwise, we encourage contributors to focus on open issues labeled as **help wanted**. Thank you for your understanding!"
+                    });
+                    await github.rest.pulls.update({
+                      owner: context.repo.owner,
+                      repo: context.repo.repo,
+                      pull_number: pr.number,
+                      state: 'closed'
+                    });
+                  }
+                }
+              }
+            }

.github/workflows/label-enforcer.yml

@@ -40,5 +40,5 @@ jobs:
             If this is still relevant, you are welcome to reopen or leave a comment. Thanks for contributing!
           days-before-stale: 60
           days-before-close: 14
-          exempt-issue-labels: 'pinned,security'
-          exempt-pr-labels: 'pinned,security'
+          exempt-issue-labels: 'pinned,security,🔒 maintainer only,help wanted,🗓️ Public Roadmap'
+          exempt-pr-labels: 'pinned,security,🔒 maintainer only,help wanted,🗓️ Public Roadmap'

.github/workflows/stale.yml

@@ -62,6 +62,14 @@ powerful tool for developers.
 - **Imports:** Use specific imports and avoid restricted relative imports
   between packages (enforced by ESLint).
 
+## Testing Conventions
+
+- **Environment Variables:** When testing code that depends on environment
+  variables, use `vi.stubEnv('NAME', 'value')` in `beforeEach` and
+  `vi.unstubAllEnvs()` in `afterEach`. Avoid modifying `process.env` directly as
+  it can lead to test leakage and is less reliable. To "unset" a variable, use
+  an empty string `vi.stubEnv('NAME', '')`.
+
 ## Documentation
 
 - Suggest documentation updates when code changes render existing documentation

GEMINI.md

@@ -55,6 +55,23 @@ npm install -g @google/gemini-cli
 brew install gemini-cli
 ```
 
+#### Install globally with MacPorts (macOS)
+
+```bash
+sudo port install gemini-cli
+```
+
+#### Install with Anaconda (for restricted environments)
+
+```bash
+# Create and activate a new environment
+conda create -y -n gemini_env -c conda-forge nodejs
+conda activate gemini_env
+
+# Install Gemini CLI globally via npm (inside the environment)
+npm install -g @google/gemini-cli
+```
+
 ## Release Cadence and Tags
 
 See [Releases](./docs/releases.md) for more details.