Merge branch 'main' into feat/code-review-integration

Signed-off-by: cynthialong0-0 <82900738+cynthialong0-0@users.noreply.github.com>

Author: cynthialong0-0

.github/commands/gemini-invoke.toml

@@ -82,7 +82,7 @@ Begin every task by building a complete picture of the situation.
       Please review this plan. To approve, comment `@gemini-cli /approve` on this issue. To make changes, comment changes needed.
       ```
 
-3. **Post the Plan**: You MUST use `add_issue_comment` to post your plan. The workflow should end only after this tool call has been successfully formulated.
+3. **Post the Plan**: You MUST use `add_issue_comment` to post your plan. The workflow should end only after this tool call has been successfully formulated. Do not wait for human approval or check for comments; exit immediately after posting.
 
 -----
 

.github/commands/gemini-scheduled-triage.toml

@@ -85,9 +85,15 @@ Iterate through each issue object. For each issue:
 
 ### Step 5: Construct and Write Output
 
-Assemble the results into a single JSON array, formatted as a string, according to the **Output Specification** below. Finally, execute the command to write this string to the output file, ensuring the JSON is enclosed in single quotes to prevent shell interpretation.
-
-- Use the shell command to write: `echo 'TRIAGED_ISSUES=...' > "$GITHUB_ENV"` (Replace `...` with the final, minified JSON array string).
+Assemble the results into a single JSON array, formatted as a string, according to the **Output Specification** below. Finally, execute the command to write this string to the output file.
+
+- Use the shell command to write using a heredoc to prevent quote escaping issues:
+  ```bash
+  cat << 'EOF' >> "$GITHUB_ENV"
+  TRIAGED_ISSUES=...
+  EOF
+  ```
+  (Replace `...` with the final, minified JSON array string).
 
 ## Output Specification
 

.github/workflows/evals-nightly.yml

@@ -1,5 +1,8 @@
 name: 'Nightly Evaluations'
 
+permissions:
+  contents: 'read'
+
 on:
   schedule:
     - cron: '0 1 * * *' # 1 AM UTC
@@ -11,15 +14,27 @@ on:
         default: '1'
 
 jobs:
+  list-evals:
+    runs-on: 'ubuntu-22.04'
+    outputs:
+      matrix: '${{ steps.set-matrix.outputs.matrix }}'
+    steps:
+      - name: 'Checkout code'
+        uses: 'actions/checkout@v4' # ratchet:exclude
+      - id: 'set-matrix'
+        run: |
+          FILES=$(find evals -maxdepth 1 -name "*.eval.ts" | sort | jq -R -s -c 'split("\n")[:-1]')
+          echo "matrix=${FILES}" >> "$GITHUB_OUTPUT"
+
   evaluate:
+    needs: 'list-evals'
     runs-on: 'ubuntu-22.04'
-    permissions:
-      contents: 'read'
     strategy:
       fail-fast: false
       matrix:
-        model: ['gemini-3-pro-preview', 'gemini-3-flash-preview']
-    name: 'Evaluate ${{ matrix.model }}'
+        model: ['gemini-3-flash-preview']
+        eval-file: '${{ fromJson(needs.list-evals.outputs.matrix) }}'
+    name: 'Evaluate ${{ matrix.eval-file }} (${{ matrix.model }})'
 
     steps:
       - name: 'Checkout code'
@@ -32,12 +47,14 @@ jobs:
           cache: 'npm'
 
       - name: 'Install dependencies'
+        # Retry logic for transient network or package retrieval failures
         run: |
           npm ci || (sleep 10 && npm ci) || (sleep 30 && npm ci)
 
       - name: 'Install Gemini CLI'
+        # Retry logic for transient network or package retrieval failures
         run: |
-          npm install -g @google/gemini-cli@0.29.7 || (sleep 10 && npm install -g @google/gemini-cli@0.29.7) || (sleep 30 && npm install -g @google/gemini-cli@0.29.7)
+          npm install -g @google/gemini-cli@latest || (sleep 10 && npm install -g @google/gemini-cli@latest) || (sleep 30 && npm install -g @google/gemini-cli@latest)
 
       - name: 'Run Evaluations'
         id: 'run_evals'
@@ -46,16 +63,42 @@ jobs:
           GOOGLE_API_KEY: '${{ secrets.GOOGLE_API_KEY }}'
           GEMINI_MODEL: '${{ matrix.model }}'
         run: |
-          npm run test:evals -- --reporter=json --outputFile=eval-results-${{ matrix.model }}.json || true
+          BASE_NAME=$(basename "${{ matrix.eval-file }}" .eval.ts)
+          npm run test:evals -- "${{ matrix.eval-file }}" --reporter=json --outputFile="eval-results-${{ matrix.model }}-${BASE_NAME}.json"
 
       - name: 'Upload Results'
         if: 'always()'
         uses: 'actions/upload-artifact@v4' # ratchet:exclude
         with:
-          name: 'eval-results-${{ matrix.model }}'
-          path: 'eval-results-${{ matrix.model }}.json'
+          name: 'eval-results-${{ matrix.model }}-${{ strategy.job-index }}'
+          path: 'eval-results-${{ matrix.model }}-*.json'
 
-      - name: 'Job Summary'
-        if: 'always()'
+  report:
+    needs: 'evaluate'
+    if: 'always()'
+    runs-on: 'ubuntu-22.04'
+    steps:
+      - name: 'Checkout code'
+        uses: 'actions/checkout@v4' # ratchet:exclude
+
+      - name: 'Set up Node.js'
+        uses: 'actions/setup-node@v4' # ratchet:exclude
+        with:
+          node-version: '20'
+          cache: 'npm'
+
+      - name: 'Install dependencies'
+        # Retry logic for transient network or package retrieval failures
+        run: |
+          npm ci || (sleep 10 && npm ci) || (sleep 30 && npm ci)
+
+      - name: 'Download Results'
+        uses: 'actions/download-artifact@v4' # ratchet:exclude
+        with:
+          path: 'eval-results'
+          pattern: 'eval-results-*'
+          merge-multiple: true
+
+      - name: 'Aggregate All Results'
         run: |
-          npx tsx scripts/aggregate_evals.ts "eval-results-${{ matrix.model }}.json" >> "$GITHUB_STEP_SUMMARY"
+          npx tsx scripts/aggregate_evals.ts eval-results/*.json >> "$GITHUB_STEP_SUMMARY"

.github/workflows/gemini-plan-execute.yml

@@ -67,7 +67,7 @@ jobs:
           use_gemini_code_assist: '${{ vars.GOOGLE_GENAI_USE_GCA }}'
           use_vertex_ai: '${{ vars.GOOGLE_GENAI_USE_VERTEXAI }}'
           upload_artifacts: '${{ vars.UPLOAD_ARTIFACTS }}'
-          workflow_name: 'gemini-invoke'
+          workflow_name: 'gemini-plan-execute'
           settings: |-
             {
               "model": {

README.md

@@ -181,10 +181,10 @@ go to the [Gemini Assistant workflow documentation](./examples/workflows/gemini-
     For more details, see the documentation on [settings files](https://github.com/google-gemini/gemini-cli/blob/main/docs/get-started/configuration.md#settings-files).
 
 -   <a name="__input_use_gemini_code_assist"></a><a href="#user-content-__input_use_gemini_code_assist"><code>use_gemini_code_assist</code></a>: _(Optional, default: `false`)_ Whether to use Code Assist for Gemini model access instead of the default Gemini API key.
-    For more information, see the [Gemini CLI documentation](https://github.com/google-gemini/gemini-cli/blob/main/docs/cli/authentication.md).
+    For more information, see the [Gemini CLI documentation](https://github.com/google-gemini/gemini-cli/blob/main/docs/get-started/authentication.md).
 
 -   <a name="__input_use_vertex_ai"></a><a href="#user-content-__input_use_vertex_ai"><code>use_vertex_ai</code></a>: _(Optional, default: `false`)_ Whether to use Vertex AI for Gemini model access instead of the default Gemini API key.
-    For more information, see the [Gemini CLI documentation](https://github.com/google-gemini/gemini-cli/blob/main/docs/cli/authentication.md).
+    For more information, see the [Gemini CLI documentation](https://github.com/google-gemini/gemini-cli/blob/main/docs/get-started/authentication.md).
 
 -   <a name="__input_extensions"></a><a href="#user-content-__input_extensions"><code>extensions</code></a>: _(Optional)_ A list of Gemini CLI extensions to install.
 

action.yml

@@ -67,13 +67,13 @@ inputs:
   use_gemini_code_assist:
     description: |-
       Whether to use Code Assist for Gemini model access instead of the default Gemini API key.
-      For more information, see the [Gemini CLI documentation](https://github.com/google-gemini/gemini-cli/blob/main/docs/cli/authentication.md).
+      For more information, see the [Gemini CLI documentation](https://github.com/google-gemini/gemini-cli/blob/main/docs/get-started/authentication.md).
     required: false
     default: 'false'
   use_vertex_ai:
     description: |-
       Whether to use Vertex AI for Gemini model access instead of the default Gemini API key.
-      For more information, see the [Gemini CLI documentation](https://github.com/google-gemini/gemini-cli/blob/main/docs/cli/authentication.md).
+      For more information, see the [Gemini CLI documentation](https://github.com/google-gemini/gemini-cli/blob/main/docs/get-started/authentication.md).
     required: false
     default: 'false'
   extensions:

evals/data/gemini-assistant.json

@@ -3,7 +3,7 @@
     "id": "fix-typo",
     "inputs": {
       "TITLE": "Fix typo in utils.js",
-      "DESCRIPTION": "There is a typo in the helper function name.",
+      "DESCRIPTION": "There is a typo in the helper function name. It should be 'newName' instead of 'oldName'.",
       "EVENT_NAME": "issues",
       "IS_PULL_REQUEST": "false",
       "ISSUE_NUMBER": "10",

evals/gemini-assistant.eval.ts

@@ -18,6 +18,7 @@ describe('Gemini Assistant Workflow', () => {
     it.concurrent(`should propose a relevant plan: ${item.id}`, async () => {
       const rig = new TestRig(`assistant-${item.id}`);
       try {
+        rig.setupMockMcp();
         rig.initGit();
         rig.createFile(
           'utils.js',

evals/gemini-scheduled-triage.eval.ts

@@ -16,7 +16,7 @@ const dataset: ScheduledTriageCase[] = JSON.parse(
 
 describe('Scheduled Triage Workflow', () => {
   for (const item of dataset) {
-    it.concurrent(`should batch triage issues: ${item.id}`, async () => {
+    it(`should batch triage issues: ${item.id}`, async () => {
       const rig = new TestRig(`scheduled-triage-${item.id}`);
       try {
         mkdirSync(join(rig.testDir, '.gemini/commands'), { recursive: true });
@@ -37,6 +37,12 @@ describe('Scheduled Triage Workflow', () => {
         const triagedLine = content
           .split('\n')
           .find((l) => l.startsWith('TRIAGED_ISSUES='));
+
+        if (!triagedLine) {
+          console.error(
+            `Failed to find TRIAGED_ISSUES in env file. stdout: ${stdout}`,
+          );
+        }
         expect(triagedLine).toBeDefined();
 
         const jsonStr = triagedLine!.split('=', 2)[1];

evals/issue-fixer.eval.ts

@@ -26,7 +26,48 @@ describe('Issue Fixer Workflow', () => {
         );
         rig.createFile(
           'package.json',
-          '{"name": "test", "dependencies": {"lodash": "4.17.0"}}',
+          '{"name": "test", "scripts": {"test": "echo \\"tests passed\\" && exit 0"}, "dependencies": {"lodash": "4.17.0"}}',
+        );
+        rig.createFile(
+          'src/db/search.js',
+          'export function searchUser(db, name) {\n  const query = "SELECT * FROM users WHERE name = \'" + name + "\'";\n  return db.query(query);\n}\n',
+        );
+        rig.createFile(
+          'src/index.js',
+          'function calculate(a, b) {\n  return a + b;\n}\n\nfunction login(username, password) {\n  if (password === "forgot password") throw new Error("crash");\n  return true;\n}\n',
+        );
+        rig.createFile(
+          'src/async.js',
+          "async function fetchData() {\n  return await api.get('/data');\n}\n",
+        );
+        rig.createFile(
+          'src/ui/Component.tsx',
+          "import React from 'react';\nexport const Component = () => {\n  return <div>UI</div>;\n}\n",
+        );
+        rig.createFile(
+          'src/utils/validation.ts',
+          'export const validate = () => true;\n',
+        );
+        rig.createFile(
+          'src/UserForm.tsx',
+          "import React from 'react';\nexport const UserForm = () => {\n  const isValid = true;\n  return <form>User</form>;\n}\n",
+        );
+        rig.createFile(
+          'src/OrderForm.tsx',
+          "import React from 'react';\nexport const OrderForm = () => {\n  const isValid = true;\n  return <form>Order</form>;\n}\n",
+        );
+        rig.createFile(
+          'test/UserProfile.test.js',
+          'describe("UserProfile", () => {\n  it("should load data", async () => {\n    // Flaky network call\n  });\n});\n',
+        );
+
+        rig.createFile(
+          'src/CheckoutWizard.tsx',
+          'import React, { useState } from "react";\nexport const CheckoutWizard = () => {\n  const [step, setStep] = useState(0);\n  const nextStep = async () => {\n    await new Promise(r => setTimeout(r, 100));\n    setStep(s => s + 1);\n  };\n  return <button onClick={nextStep}>Next</button>;\n};\n',
+        );
+        rig.createFile(
+          'scripts/deploy.js',
+          'const fs = require("fs");\nif (fs.exists("dist")) {\n  console.log("Deploying...");\n}\n',
         );
 
         mkdirSync(join(rig.testDir, '.gemini/commands'), { recursive: true });