chore(release): v0.1.19

.allstar/branch_protection.yaml

@@ -1 +0,0 @@
-action: 'log'

.gcp/release-docker.yaml

@@ -22,15 +22,19 @@ steps:
     id: 'Determine Docker Image Tag'
     entrypoint: 'bash'
     args:
-      - '-c'
-      - |-
+      - -c
+      - |
         SHELL_TAG_NAME="$TAG_NAME"
         FINAL_TAG="$SHORT_SHA" # Default to SHA
-        if [[ "$$SHELL_TAG_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.-]+)?$ ]]; then
-          echo "Release detected."
+        if [[ "$$SHELL_TAG_NAME" == *"-nightly"* ]]; then
+          echo "Nightly release detected."
+          FINAL_TAG="$${SHELL_TAG_NAME#v}"
+        # Also escape the variable in the regex match
+        elif [[ "$$SHELL_TAG_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+          echo "Official release detected."
           FINAL_TAG="$${SHELL_TAG_NAME#v}"
         else
-          echo "Development release detected. Using commit SHA as tag."
+          echo "Development/RC release detected. Using commit SHA as tag."
         fi
         echo "Determined image tag: $$FINAL_TAG"
         echo "$$FINAL_TAG" > /workspace/image_tag.txt
@@ -40,8 +44,8 @@ steps:
     id: 'Build sandbox Docker image'
     entrypoint: 'bash'
     args:
-      - '-c'
-      - |-
+      - -c
+      - |
         export GEMINI_SANDBOX_IMAGE_TAG=$$(cat /workspace/image_tag.txt)
         echo "Using Docker image tag for build: $$GEMINI_SANDBOX_IMAGE_TAG"
         npm run build:sandbox -- --output-file /workspace/final_image_uri.txt
@@ -53,8 +57,8 @@ steps:
     id: 'Publish sandbox Docker image'
     entrypoint: 'bash'
     args:
-      - '-c'
-      - |-
+      - -c
+      - |
         set -e
         FINAL_IMAGE_URI=$$(cat /workspace/final_image_uri.txt)
 
@@ -64,7 +68,7 @@ steps:
       - 'GEMINI_SANDBOX=$_CONTAINER_TOOL'
 
 options:
-  defaultLogsBucketBehavior: 'REGIONAL_USER_OWNED_BUCKET'
+  defaultLogsBucketBehavior: REGIONAL_USER_OWNED_BUCKET
   dynamicSubstitutions: true
 
 substitutions:

.gemini/commands/find-docs.toml

@@ -1,30 +0,0 @@
-description = "Find relevant documentation and output GitHub URLs."
-
-prompt = """
-## Mission: Find Relevant Documentation
-
-Your task is to find documentation files relevant to the user's question within the current git repository and provide a list of GitHub URLs to view them.
-
-### Workflow:
-
-1.  **Identify Repository Details**:
-    *   You may use shell commands like `git` or `gh` to get the remote URL of the repository.
-    *   From the remote URL, parse and construct the base GitHub URL (e.g., `https://github.com/user/repo`). You must handle both HTTPS (`https://github.com/user/repo.git`) and SSH (`git@github.com:user/repo.git`) formats.
-    *   Determine the default branch name. You can assume `main` for this purpose, as it is the most common.
-
-2.  **Search for Documentation**:
-    *   First, perform a targeted search across the repository for documentation files (e.g., `.md`, `.mdx`) that seem directly related to the user's question.
-    *   If this initial search yields no relevant results, and a `docs/` directory exists, read the content of all files within the `docs/` directory to find relevant information.
-    *   If you still can't find a direct match, broaden your search to include related concepts and synonyms of the keywords in the user's question.
-    *   For each file you identify as potentially relevant, read its content to confirm it addresses the user's query.
-
-3.  **Construct and Output URLs**:
-    *   For each file you identify as relevant, construct the full GitHub URL by combining the base URL, branch, and file path. **Do not use shell commands for this step.**
-    *   The URL format should be: `{BASE_GITHUB_URL}/blob/{BRANCH_NAME}/{PATH_TO_FILE_FROM_REPO_ROOT}`.
-    *   Present the final list to the user as a markdown list. Each item in the list should be the URL to the document, followed by a short summary of its content.
-    *   If, after all search attempts, you cannot find any relevant documentation, ask the user clarifying questions to better understand their needs. Do not return any URLs in this case.
-
-### QUESTION:
-
-{{args}}
-"""

.gemini/commands/github/cleanup-back-to-main.toml

@@ -1,13 +0,0 @@
-description = "Go back to main and clean up the branch."
-
-prompt = """
-I'm done with the work on this branch, and I'm ready to go back to main and clean up.
-
-Here is the workflow I'd like you to follow:
-
-1.  **Get Current Branch:** First, I need you to get the name of the current branch and save it.
-2.  **Branch Check:** Check if the current branch is `main`. If it is, I need you to stop and let me know.
-3.  **Go to Main:** Next, I need you to checkout the main branch.
-4.  **Pull Latest:** Once you are on the main branch, I need you to pull down the latest changes to make sure I'm up to date.
-5.  **Branch Cleanup:** Finally, I need you to delete the branch that you noted in the first step.
-"""

.gemini/commands/oncall/pr-review.toml

@@ -1,47 +0,0 @@
-description = "Review a specific pull request"
-
-prompt = """
-## Mission: Comprehensive Pull Request Review
-
-Today, our mission is to meticulously review community pull requests (PRs) for this project. We will proceed systematically, evaluating each candidate PR for its quality, adherence to standards, and readiness for merging.
-
-### Workflow:
-
-1.  **PR Preparation & Initial Assessment**:
-    * **You will check out the designated PR {{args}}** into a temporary branch.
-    * **Execute the preflight checks (`npm run preflight`)**. This includes building, linting, and running all unit tests.
-    * Analyze the output of these preflight checks, noting any failures, warnings, or linting issues.
-
-2.  **In-Depth Code Review**:
-    * **Your primary role is to conduct a thorough and in-depth code review** of the changes introduced in the PR. Focus your analysis on the following criteria:
-        * **Correctness**: Does the code achieve its stated purpose without bugs or logical errors?
-        * **Maintainability**: Is the code clean, well-structured, and easy to understand and modify in the future? Consider factors like code clarity, modularity, and adherence to established design patterns.
-        * **Readability**: Is the code well-commented (where necessary) and consistently formatted according to our project's coding style guidelines?
-        * **Efficiency**: Are there any obvious performance bottlenecks or resource inefficiencies introduced by the changes?
-        * **Security**: Are there any potential security vulnerabilities or insecure coding practices?
-        * **Edge Cases and Error Handling**: Does the code appropriately handle edge cases and potential errors?
-        * **Testability**: Is the new or modified code adequately covered by tests (even if preflight checks pass)? Suggest additional test cases that would improve coverage or robustness.
-    * Based on your analysis, you will determine if the PR is **safe to merge**.
-
-3.  **Reviewing Previous Feedback**:
-    * **Access and examine the PR's history** to identify any **outstanding requests or unresolved comments from previous reviews**. Incorporate these into your current review and explicitly highlight if they have been adequately addressed in the current state of the PR.
-
-4.  **Decision and Output Generation**:
-    * **If the PR is deemed safe to merge** (after your comprehensive review and considering previous feedback):
-        * Draft a **friendly, concise, and professional approval message**.
-        * **The approval message should:**
-            * Clearly state that the PR is approved.
-            * Briefly acknowledge the quality or value of the contribution (e.g., "Great work on X feature!" or "Appreciate the fix for Y issue!").
-            * **Do NOT mention the preflight checks or unit testing**, as these are internal processes.
-            * Be suitable for public display on GitHub.
-    * **If the PR is NOT safe to merge**:
-        * Provide a **clear, constructive, and detailed summary of the issues found**.
-        * Suggest **specific actionable changes** required for the PR to become merge-ready.
-        * Ensure the feedback is professional and encourages the contributor.
-
-### Post-PR Action:
-
-* After providing your review and decision for the current PR, I will wait for you to perform any manual testing you wish to do. Please let me know when you are finished.
-* Once you have confirmed that you are done, I will switch to the `main` branch, clean up the local branch, and perform a pull to ensure we are synchronized with the latest upstream changes for the next review.
-
-"""

.gemini/config.yaml

@@ -3,7 +3,7 @@
 have_fun: false
 code_review:
   disable: false
-  comment_severity_threshold: 'HIGH'
+  comment_severity_threshold: HIGH
   max_review_comments: -1
   pull_request_opened:
     help: false

.github/CODEOWNERS

@@ -1,13 +1,7 @@
-# By default, require reviews from the maintainers for all files.
-* @google-gemini/gemini-cli-maintainers
+# By default, require reviews from the release approvers for all files.
+* @google-gemini/gemini-cli-askmode-approvers
 
-# Require reviews from the release approvers for critical files.
+# The following files don't need reviews from the release approvers.
 # These patterns override the rule above.
-/package.json @google-gemini/gemini-cli-askmode-approvers
-/package-lock.json @google-gemini/gemini-cli-askmode-approvers
-/GEMINI.md @google-gemini/gemini-cli-askmode-approvers
-/SECURITY.md @google-gemini/gemini-cli-askmode-approvers
-/LICENSE @google-gemini/gemini-cli-askmode-approvers
-/.github/workflows/ @google-gemini/gemini-cli-askmode-approvers
-/packages/cli/package.json @google-gemini/gemini-cli-askmode-approvers
-/packages/core/package.json @google-gemini/gemini-cli-askmode-approvers
+**/*.md
+/docs/

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,45 +1,40 @@
-name: 'Bug Report'
-description: 'Report a bug to help us improve Gemini CLI'
-labels:
-  - 'kind/bug'
-  - 'status/need-triage'
+name: Bug Report
+description: Report a bug to help us improve Gemini CLI
+labels: ['kind/bug', 'status/need-triage']
 body:
-  - type: 'markdown'
+  - type: markdown
     attributes:
-      value: |-
-        > [!IMPORTANT]
+      value: |
+        > [!IMPORTANT]  
         > Thanks for taking the time to fill out this bug report!
         >
         > Please search **[existing issues](https://github.com/google-gemini/gemini-cli/issues)** to see if an issue already exists for the bug you encountered.
 
-  - type: 'textarea'
-    id: 'problem'
+  - type: textarea
+    id: problem
     attributes:
-      label: 'What happened?'
-      description: 'A clear and concise description of what the bug is.'
+      label: What happened?
+      description: A clear and concise description of what the bug is.
     validations:
       required: true
 
-  - type: 'textarea'
-    id: 'expected'
+  - type: textarea
+    id: expected
     attributes:
-      label: 'What did you expect to happen?'
+      label: What did you expect to happen?
     validations:
       required: true
 
-  - type: 'textarea'
-    id: 'info'
+  - type: textarea
+    id: info
     attributes:
-      label: 'Client information'
-      description: 'Please paste the full text from the `/about` command run from Gemini CLI. Also include which platform (macOS, Windows, Linux).'
-      value: |-
+      label: Client information
+      description: Please paste the full text from the `/about` command run from Gemini CLI. Also include which platform (macOS, Windows, Linux).
+      value: |
         <details>
-        <summary>Client Information</summary>
-
-        Run `gemini` to enter the interactive CLI, then run the `/about` command.
 
         ```console
-        > /about
+        $ gemini /about
         # paste output here
         ```
 
@@ -47,14 +42,14 @@ body:
     validations:
       required: true
 
-  - type: 'textarea'
-    id: 'login-info'
+  - type: textarea
+    id: login-info
     attributes:
-      label: 'Login information'
-      description: 'Describe how you are logging in (e.g., Google Account, API key).'
+      label: Login information
+      description: Describe how you are logging in (e.g., Google Account, API key).
 
-  - type: 'textarea'
-    id: 'additional-context'
+  - type: textarea
+    id: additional-context
     attributes:
-      label: 'Anything else we need to know?'
-      description: 'Add any other context about the problem here.'
+      label: Anything else we need to know?
+      description: Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,35 +1,33 @@
-name: 'Feature Request'
-description: 'Suggest an idea for this project'
-labels:
-  - 'kind/enhancement'
-  - 'status/need-triage'
+name: Feature Request
+description: Suggest an idea for this project
+labels: ['kind/enhancement', 'status/need-triage']
 body:
-  - type: 'markdown'
+  - type: markdown
     attributes:
-      value: |-
-        > [!IMPORTANT]
+      value: |
+        > [!IMPORTANT]  
         > Thanks for taking the time to suggest an enhancement!
         >
         > Please search **[existing issues](https://github.com/google-gemini/gemini-cli/issues)** to see if a similar feature has already been requested.
 
-  - type: 'textarea'
-    id: 'feature'
+  - type: textarea
+    id: feature
     attributes:
-      label: 'What would you like to be added?'
-      description: 'A clear and concise description of the enhancement.'
+      label: What would you like to be added?
+      description: A clear and concise description of the enhancement.
     validations:
       required: true
 
-  - type: 'textarea'
-    id: 'rationale'
+  - type: textarea
+    id: rationale
     attributes:
-      label: 'Why is this needed?'
-      description: 'A clear and concise description of why this enhancement is needed.'
+      label: Why is this needed?
+      description: A clear and concise description of why this enhancement is needed.
     validations:
       required: true
 
-  - type: 'textarea'
-    id: 'additional-context'
+  - type: textarea
+    id: additional-context
     attributes:
-      label: 'Additional context'
-      description: 'Add any other context or screenshots about the feature request here.'
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.

.github/actions/create-pull-request/action.yml

@@ -1,54 +0,0 @@
-name: 'Create and Merge Pull Request'
-description: 'Creates a pull request and merges it automatically.'
-
-inputs:
-  branch-name:
-    description: 'The name of the branch to create the PR from.'
-    required: true
-  pr-title:
-    description: 'The title of the pull request.'
-    required: true
-  pr-body:
-    description: 'The body of the pull request.'
-    required: true
-  base-branch:
-    description: 'The branch to merge into.'
-    required: true
-    default: 'main'
-  github-token:
-    description: 'The GitHub token to use for creating the pull request.'
-    required: true
-  dry-run:
-    description: 'Whether to run in dry-run mode.'
-    required: false
-    default: 'false'
-  working-directory:
-    description: 'The working directory to run the commands in.'
-    required: false
-    default: '.'
-
-runs:
-  using: 'composite'
-  steps:
-    - name: '📝 Print Inputs'
-      shell: 'bash'
-      run: 'echo "${{ toJSON(inputs) }}"'
-    - name: 'Create and Approve Pull Request'
-      if: "inputs.dry-run != 'true'"
-      env:
-        GH_TOKEN: '${{ inputs.github-token }}'
-      shell: 'bash'
-      working-directory: '${{ inputs.working-directory }}'
-      run: |
-        set -e
-        if ! git ls-remote --exit-code --heads origin "${{ inputs.branch-name }}"; then
-          echo "::error::Branch '${{ inputs.branch-name }}' does not exist on the remote repository."
-          exit 1
-        fi
-        PR_URL=$(gh pr create \
-          --title "${{ inputs.pr-title }}" \
-          --body "${{ inputs.pr-body }}" \
-          --base "${{ inputs.base-branch }}" \
-          --head "${{ inputs.branch-name }}" \
-          --fill)
-        gh pr merge "$PR_URL" --auto --squash

.github/actions/post-coverage-comment/action.yml

@@ -27,91 +27,79 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    - name: '📝 Print Inputs'
-      shell: 'bash'
-      run: 'echo "${{ toJSON(inputs) }}"'
-    - name: 'Prepare Coverage Comment'
-      id: 'prep_coverage_comment'
-      shell: 'bash'
-      env:
-        CLI_JSON_FILE: '${{ inputs.cli_json_file }}'
-        CORE_JSON_FILE: '${{ inputs.core_json_file }}'
-        CLI_FULL_TEXT_SUMMARY_FILE: '${{ inputs.cli_full_text_summary_file }}'
-        CORE_FULL_TEXT_SUMMARY_FILE: '${{ inputs.core_full_text_summary_file }}'
-        COMMENT_FILE: 'coverage-comment.md'
-        NODE_VERSION: '${{ inputs.node_version }}'
-        OS: '${{ inputs.os }}'
-      run: |-
+    - name: Prepare Coverage Comment
+      id: prep_coverage_comment
+      shell: bash
+      run: |
+        cli_json_file="${{ inputs.cli_json_file }}"
+        core_json_file="${{ inputs.core_json_file }}"
+        cli_full_text_summary_file="${{ inputs.cli_full_text_summary_file }}"
+        core_full_text_summary_file="${{ inputs.core_full_text_summary_file }}"
+        comment_file="coverage-comment.md"
+
         # Extract percentages using jq for the main table
-        if [ -f "${CLI_JSON_FILE}" ]; then
-          cli_lines_pct="$(jq -r '.total.lines.pct' "${CLI_JSON_FILE}")"
-          cli_statements_pct="$(jq -r '.total.statements.pct' "${CLI_JSON_FILE}")"
-          cli_functions_pct="$(jq -r '.total.functions.pct' "${CLI_JSON_FILE}")"
-          cli_branches_pct="$(jq -r '.total.branches.pct' "${CLI_JSON_FILE}")"
+        if [ -f "$cli_json_file" ]; then
+          cli_lines_pct=$(jq -r '.total.lines.pct' "$cli_json_file")
+          cli_statements_pct=$(jq -r '.total.statements.pct' "$cli_json_file")
+          cli_functions_pct=$(jq -r '.total.functions.pct' "$cli_json_file")
+          cli_branches_pct=$(jq -r '.total.branches.pct' "$cli_json_file")
         else
-          cli_lines_pct="N/A"
-          cli_statements_pct="N/A"
-          cli_functions_pct="N/A"
-          cli_branches_pct="N/A"
-          echo "CLI coverage-summary.json not found at: ${CLI_JSON_FILE}" >&2 # Error to stderr
+          cli_lines_pct="N/A"; cli_statements_pct="N/A"; cli_functions_pct="N/A"; cli_branches_pct="N/A"
+          echo "CLI coverage-summary.json not found at: $cli_json_file" >&2 # Error to stderr
         fi
 
-        if [ -f "${CORE_JSON_FILE}" ]; then
-          core_lines_pct="$(jq -r '.total.lines.pct' "${CORE_JSON_FILE}")"
-          core_statements_pct="$(jq -r '.total.statements.pct' "${CORE_JSON_FILE}")"
-          core_functions_pct="$(jq -r '.total.functions.pct' "${CORE_JSON_FILE}")"
-          core_branches_pct="$(jq -r '.total.branches.pct' "${CORE_JSON_FILE}")"
+        if [ -f "$core_json_file" ]; then
+          core_lines_pct=$(jq -r '.total.lines.pct' "$core_json_file")
+          core_statements_pct=$(jq -r '.total.statements.pct' "$core_json_file")
+          core_functions_pct=$(jq -r '.total.functions.pct' "$core_json_file")
+          core_branches_pct=$(jq -r '.total.branches.pct' "$core_json_file")
         else
-          core_lines_pct="N/A"
-          core_statements_pct="N/A"
-          core_functions_pct="N/A"
-          core_branches_pct="N/A"
-          echo "Core coverage-summary.json not found at: ${CORE_JSON_FILE}" >&2 # Error to stderr
+          core_lines_pct="N/A"; core_statements_pct="N/A"; core_functions_pct="N/A"; core_branches_pct="N/A"
+          echo "Core coverage-summary.json not found at: $core_json_file" >&2 # Error to stderr
         fi
 
-        echo "## Code Coverage Summary" > "${COMMENT_FILE}"
-        echo "" >> "${COMMENT_FILE}"
-        echo "| Package | Lines | Statements | Functions | Branches |" >> "${COMMENT_FILE}"
-        echo "|---|---|---|---|---|" >> "${COMMENT_FILE}"
-        echo "| CLI | ${cli_lines_pct}% | ${cli_statements_pct}% | ${cli_functions_pct}% | ${cli_branches_pct}% |" >> "${COMMENT_FILE}"
-        echo "| Core | ${core_lines_pct}% | ${core_statements_pct}% | ${core_functions_pct}% | ${core_branches_pct}% |" >> "${COMMENT_FILE}"
-        echo "" >> "${COMMENT_FILE}"
+        echo "## Code Coverage Summary" > "$comment_file"
+        echo "" >> "$comment_file"
+        echo "| Package | Lines | Statements | Functions | Branches |" >> "$comment_file"
+        echo "|---|---|---|---|---|" >> "$comment_file"
+        echo "| CLI | ${cli_lines_pct}% | ${cli_statements_pct}% | ${cli_functions_pct}% | ${cli_branches_pct}% |" >> "$comment_file"
+        echo "| Core | ${core_lines_pct}% | ${core_statements_pct}% | ${core_functions_pct}% | ${core_branches_pct}% |" >> "$comment_file"
+        echo "" >> "$comment_file"
 
         # CLI Package - Collapsible Section (with full text summary from file)
-        echo "<details>" >> "${COMMENT_FILE}"
-        echo "<summary>CLI Package - Full Text Report</summary>" >> "${COMMENT_FILE}"
-        echo "" >> "${COMMENT_FILE}"
-        echo '```text' >> "${COMMENT_FILE}"
-        if [ -f "${CLI_FULL_TEXT_SUMMARY_FILE}" ]; then
-          cat "${CLI_FULL_TEXT_SUMMARY_FILE}" >> "${COMMENT_FILE}"
+        echo "<details>" >> "$comment_file"
+        echo "<summary>CLI Package - Full Text Report</summary>" >> "$comment_file"
+        echo "" >> "$comment_file"
+        echo '```text' >> "$comment_file"
+        if [ -f "$cli_full_text_summary_file" ]; then
+          cat "$cli_full_text_summary_file" >> "$comment_file"
         else
-          echo "CLI full-text-summary.txt not found at: ${CLI_FULL_TEXT_SUMMARY_FILE}" >> "${COMMENT_FILE}"
+          echo "CLI full-text-summary.txt not found at: $cli_full_text_summary_file" >> "$comment_file"
         fi
-        echo '```' >> "${COMMENT_FILE}"
-        echo "</details>" >> "${COMMENT_FILE}"
-        echo "" >> "${COMMENT_FILE}"
+        echo '```' >> "$comment_file"
+        echo "</details>" >> "$comment_file"
+        echo "" >> "$comment_file"
 
         # Core Package - Collapsible Section (with full text summary from file)
-        echo "<details>" >> "${COMMENT_FILE}"
-        echo "<summary>Core Package - Full Text Report</summary>" >> "${COMMENT_FILE}"
-        echo "" >> "${COMMENT_FILE}"
-        echo '```text' >> "${COMMENT_FILE}"
-        if [ -f "${CORE_FULL_TEXT_SUMMARY_FILE}" ]; then
-          cat "${CORE_FULL_TEXT_SUMMARY_FILE}" >> "${COMMENT_FILE}"
+        echo "<details>" >> "$comment_file"
+        echo "<summary>Core Package - Full Text Report</summary>" >> "$comment_file"
+        echo "" >> "$comment_file"
+        echo '```text' >> "$comment_file"
+        if [ -f "$core_full_text_summary_file" ]; then
+          cat "$core_full_text_summary_file" >> "$comment_file"
         else
-          echo "Core full-text-summary.txt not found at: ${CORE_FULL_TEXT_SUMMARY_FILE}" >> "${COMMENT_FILE}"
+          echo "Core full-text-summary.txt not found at: $core_full_text_summary_file" >> "$comment_file"
         fi
-        echo '```' >> "${COMMENT_FILE}"
-        echo "</details>" >> "${COMMENT_FILE}"
-        echo "" >> "${COMMENT_FILE}"
+        echo '```' >> "$comment_file"
+        echo "</details>" >> "$comment_file"
+        echo "" >> "$comment_file"
 
-        echo "_For detailed HTML reports, please see the 'coverage-reports-${NODE_VERSION}-${OS}' artifact from the main CI run._" >> "${COMMENT_FILE}"
+        echo "_For detailed HTML reports, please see the 'coverage-reports-${{ inputs.node_version }}-${{ inputs.os }}' artifact from the main CI run._" >> "$comment_file"
 
-    - name: 'Post Coverage Comment'
-      uses: 'thollander/actions-comment-pull-request@65f9e5c9a1f2cd378bd74b2e057c9736982a8e74' # ratchet:thollander/actions-comment-pull-request@v3
-      if: |-
-        ${{ always() }}
+    - name: Post Coverage Comment
+      uses: thollander/actions-comment-pull-request@v3
+      if: always()
       with:
-        file-path: 'coverage-comment.md' # Use the generated file directly
-        comment-tag: 'code-coverage-summary'
-        github-token: '${{ inputs.github_token }}'
+        file-path: coverage-comment.md # Use the generated file directly
+        comment-tag: code-coverage-summary
+        github-token: ${{ inputs.github_token }}

.github/actions/publish-release/action.yml

@@ -1,192 +0,0 @@
-name: 'Publish Release'
-description: 'Builds, prepares, and publishes the gemini-cli packages to npm and creates a GitHub release.'
-
-inputs:
-  release-version:
-    description: 'The version to release (e.g., 0.1.11).'
-    required: true
-  npm-tag:
-    description: 'The npm tag to publish with (e.g., latest, preview, nightly).'
-    required: true
-  wombat-token-core:
-    description: 'The npm token for the @google/gemini-cli-core package.'
-    required: true
-  wombat-token-cli:
-    description: 'The npm token for the @google/gemini-cli package.'
-    required: true
-  github-token:
-    description: 'The GitHub token for creating the release.'
-    required: true
-  dry-run:
-    description: 'Whether to run in dry-run mode.'
-    type: 'string'
-    required: true
-  release-tag:
-    description: 'The release tag for the release (e.g., v0.1.11).'
-    required: true
-  previous-tag:
-    description: 'The previous tag to use for generating release notes.'
-    required: true
-  skip-github-release:
-    description: 'Whether to skip creating a GitHub release.'
-    type: 'boolean'
-    required: false
-    default: false
-  working-directory:
-    description: 'The working directory to run the steps in.'
-    required: false
-    default: '.'
-  force-skip-tests:
-    description: 'Skip tests and validation'
-    required: false
-    default: false
-  skip-branch-cleanup:
-    description: 'Whether to skip cleaning up the release branch.'
-    type: 'boolean'
-    required: false
-    default: false
-  gemini_api_key:
-    description: 'The API key for running integration tests.'
-    required: true
-
-runs:
-  using: 'composite'
-  steps:
-    - name: '📝 Print Inputs'
-      shell: 'bash'
-      run: 'echo "${{ toJSON(inputs) }}"'
-
-    - name: '👤 Configure Git User'
-      working-directory: '${{ inputs.working-directory }}'
-      shell: 'bash'
-      run: |
-        git config user.name "gemini-cli-robot"
-        git config user.email "gemini-cli-robot@google.com"
-
-    - name: '🌿 Create and switch to a release branch'
-      working-directory: '${{ inputs.working-directory }}'
-      id: 'release_branch'
-      shell: 'bash'
-      run: |
-        BRANCH_NAME="release/${{ inputs.release-tag }}"
-        git switch -c "${BRANCH_NAME}"
-        echo "BRANCH_NAME=${BRANCH_NAME}" >> "${GITHUB_OUTPUT}"
-
-    - name: '⬆️ Update package versions'
-      working-directory: '${{ inputs.working-directory }}'
-      shell: 'bash'
-      run: |
-        npm run release:version "${{ inputs.release-version }}"
-
-    - name: '💾 Commit and Conditionally Push package versions'
-      working-directory: '${{ inputs.working-directory }}'
-      shell: 'bash'
-      env:
-        BRANCH_NAME: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
-        DRY_RUN: '${{ inputs.dry-run }}'
-        RELEASE_TAG: '${{ inputs.release-tag }}'
-      run: |-
-        set -e
-        git add package.json package-lock.json packages/*/package.json
-        git commit -m "chore(release): ${RELEASE_TAG}"
-        if [[ "${DRY_RUN}" == "false" ]]; then
-          echo "Pushing release branch to remote..."
-          git push --set-upstream origin "${BRANCH_NAME}" --follow-tags
-        else
-          echo "Dry run enabled. Skipping push."
-        fi
-
-    - name: '🛠️ Build and Prepare Packages'
-      working-directory: '${{ inputs.working-directory }}'
-      shell: 'bash'
-      run: |
-        npm run build:packages
-        npm run prepare:package
-
-    - name: 'Configure npm for publishing'
-      uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020'
-      with:
-        node-version-file: '${{ inputs.working-directory }}/.nvmrc'
-        registry-url: 'https://wombat-dressing-room.appspot.com'
-        scope: '@google'
-
-    - name: '📦 Publish @google/gemini-cli-core'
-      working-directory: '${{ inputs.working-directory }}'
-      env:
-        NODE_AUTH_TOKEN: '${{ inputs.wombat-token-core }}'
-      shell: 'bash'
-      run: |
-        if [ "${{ inputs.dry-run }}" == "true" ]; then
-          npm publish --dry-run --workspace="@google/gemini-cli-core" --no-tag
-        else
-          npm publish --workspace="@google/gemini-cli-core" --no-tag
-        fi
-
-    - name: '🔗 Install latest core package'
-      working-directory: '${{ inputs.working-directory }}'
-      if: "${{ inputs.dry-run != 'true' }}"
-      shell: 'bash'
-      run: |
-        npm install "@google/gemini-cli-core@${{ inputs.release-version }}" \
-        --workspace="@google/gemini-cli" \
-        --save-exact
-
-    - name: '📦 Publish @google/gemini-cli'
-      working-directory: '${{ inputs.working-directory }}'
-      env:
-        NODE_AUTH_TOKEN: '${{ inputs.wombat-token-cli }}'
-      shell: 'bash'
-      run: |
-        if [ "${{ inputs.dry-run }}" == "true" ]; then
-          npm publish --dry-run --workspace="@google/gemini-cli" --no-tag
-        else
-          npm publish --workspace="@google/gemini-cli" --no-tag
-        fi
-
-    - name: '🔬 Verify NPM release by version'
-      uses: './.github/actions/verify-release'
-      if: "${{ inputs.dry-run != 'true' && inputs.force-skip-tests != 'true' }}"
-      with:
-        npm-package: '@google/gemini-cli@${{ inputs.release-version }}'
-        expected-version: '${{ inputs.release-version }}'
-        ref: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
-        gemini_api_key: '${{ inputs.gemini_api_key }}'
-
-    - name: '🏷️ Tag release'
-      uses: './.github/actions/tag-npm-release'
-      if: "${{ inputs.dry-run != 'true' }}"
-      with:
-        channel: '${{ inputs.npm-tag }}'
-        version: '${{ inputs.release-version }}'
-        dry-run: '${{ inputs.dry-run }}'
-        wombat-token-core: '${{ inputs.wombat-token-core }}'
-        wombat-token-cli: '${{ inputs.wombat-token-cli }}'
-
-    - name: '🎁 Bundle'
-      working-directory: '${{ inputs.working-directory }}'
-      shell: 'bash'
-      run: |
-        npm run bundle
-
-    - name: '🎉 Create GitHub Release'
-      working-directory: '${{ inputs.working-directory }}'
-      if: "${{ inputs.dry-run != 'true' && inputs.skip-github-release != 'true' && inputs.npm-tag != 'dev' }}"
-      env:
-        GITHUB_TOKEN: '${{ inputs.github-token }}'
-      shell: 'bash'
-      run: |
-        gh release create "${{ inputs.release-tag }}" \
-          bundle/gemini.js \
-          --target "${{ steps.release_branch.outputs.BRANCH_NAME }}" \
-          --title "Release ${{ inputs.release-tag }}" \
-          --notes-start-tag "${{ inputs.previous-tag }}" \
-          --generate-notes
-
-    - name: '🧹 Clean up release branch'
-      working-directory: '${{ inputs.working-directory }}'
-      if: "${{ inputs.dry-run != 'true' && inputs.skip-branch-cleanup != 'true' }}"
-      continue-on-error: true
-      shell: 'bash'
-      run: |
-        echo "Cleaning up release branch ${{ steps.release_branch.outputs.BRANCH_NAME }}..."
-        git push origin --delete "${{ steps.release_branch.outputs.BRANCH_NAME }}"

.github/actions/push-docker/action.yml

@@ -1,76 +0,0 @@
-name: 'Push to docker'
-description: 'Builds packages and pushes a docker image to GHCR'
-
-inputs:
-  github-actor:
-    description: 'Github actor'
-    required: true
-  github-secret:
-    description: 'Github secret'
-    required: true
-  ref-name:
-    description: 'Github ref name'
-    required: true
-  github-sha:
-    description: 'Github Commit SHA Hash'
-    required: true
-
-runs:
-  using: 'composite'
-  steps:
-    - name: '📝 Print Inputs'
-      shell: 'bash'
-      run: 'echo "${{ toJSON(inputs) }}"'
-    - name: 'Checkout'
-      uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v4
-      with:
-        ref: '${{ inputs.github-sha }}'
-        fetch-depth: 0
-    - name: 'Install Dependencies'
-      shell: 'bash'
-      run: 'npm install'
-    - name: 'Set up Docker Buildx'
-      uses: 'docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435' # ratchet:docker/setup-buildx-action@v3
-    - name: 'build'
-      shell: 'bash'
-      run: 'npm run build'
-    - name: 'pack @google/gemini-cli'
-      shell: 'bash'
-      run: 'npm pack -w @google/gemini-cli --pack-destination ./packages/cli/dist'
-    - name: 'pack @google/gemini-cli-core'
-      shell: 'bash'
-      run: 'npm pack -w @google/gemini-cli-core --pack-destination ./packages/core/dist'
-    - name: 'Log in to GitHub Container Registry'
-      uses: 'docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1' # ratchet:docker/login-action@v3
-      with:
-        registry: 'ghcr.io'
-        username: '${{ inputs.github-actor }}'
-        password: '${{ inputs.github-secret }}'
-    - name: 'Get branch name'
-      id: 'branch_name'
-      shell: 'bash'
-      run: |
-        REF_NAME="${{ inputs.ref-name }}"
-        echo "name=${REF_NAME%/merge}" >> $GITHUB_OUTPUT
-    - name: 'Build and Push the Docker Image'
-      uses: 'docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83' # ratchet:docker/build-push-action@v6
-      with:
-        context: '.'
-        file: './Dockerfile'
-        push: true
-        provenance: false # avoid pushing 3 images to Aritfact Registry
-        tags: |
-          ghcr.io/${{ github.repository }}/cli:${{ steps.branch_name.outputs.name }}
-          ghcr.io/${{ github.repository }}/cli:${{ inputs.github-sha }}
-    - name: 'Create issue on failure'
-      if: |-
-        ${{ failure() }}
-      shell: 'bash'
-      env:
-        GITHUB_TOKEN: '${{ inputs.github-secret }}'
-        DETAILS_URL: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-      run: |-
-        gh issue create \
-          --title "Docker build failed" \
-          --body "The docker build failed. See the full run for details: ${DETAILS_URL}" \
-          --label "kind/bug,release-failure"

.github/actions/push-sandbox/action.yml

@@ -1,94 +0,0 @@
-name: 'Build and push sandbox docker'
-description: 'Pushes sandbox docker image to container registry'
-
-inputs:
-  github-actor:
-    description: 'Github actor'
-    required: true
-  github-secret:
-    description: 'Github secret'
-    required: true
-  dockerhub-username:
-    description: 'Dockerhub username'
-    required: true
-  dockerhub-token:
-    description: 'Dockerhub PAT w/ R+W'
-    required: true
-  github-sha:
-    description: 'Github Commit SHA Hash'
-    required: true
-  github-ref-name:
-    description: 'Github ref name'
-    required: true
-  dry-run:
-    description: 'Whether this is a dry run.'
-    required: true
-    type: 'boolean'
-
-runs:
-  using: 'composite'
-  steps:
-    - name: '📝 Print Inputs'
-      shell: 'bash'
-      run: 'echo "${{ toJSON(inputs) }}"'
-    - name: 'Checkout'
-      uses: 'actions/checkout@v4'
-      with:
-        ref: '${{ inputs.github-sha }}'
-        fetch-depth: 0
-    - name: 'Install Dependencies'
-      shell: 'bash'
-      run: 'npm install'
-    - name: 'npm build'
-      shell: 'bash'
-      run: 'npm run build'
-    - name: 'Set up Docker Buildx'
-      uses: 'docker/setup-buildx-action@v3'
-    - name: 'Log in to GitHub Container Registry'
-      uses: 'docker/login-action@v3'
-      with:
-        registry: 'docker.io'
-        username: '${{ inputs.dockerhub-username }}'
-        password: '${{ inputs.dockerhub-token }}'
-    - name: 'determine image tag'
-      id: 'image_tag'
-      shell: 'bash'
-      run: |-
-        SHELL_TAG_NAME="${{ inputs.github-ref-name }}"
-        FINAL_TAG="${{ inputs.github-sha }}"
-        if [[ "$SHELL_TAG_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.-]+)?$ ]]; then
-          echo "Release detected."
-          FINAL_TAG="${SHELL_TAG_NAME#v}"
-        else
-          echo "Development release detected. Using commit SHA as tag."
-        fi
-        echo "Determined image tag: $FINAL_TAG"
-        echo "FINAL_TAG=$FINAL_TAG" >> $GITHUB_OUTPUT
-    - name: 'build'
-      id: 'docker_build'
-      shell: 'bash'
-      env:
-        GEMINI_SANDBOX_IMAGE_TAG: '${{ steps.image_tag.outputs.FINAL_TAG }}'
-        GEMINI_SANDBOX: 'docker'
-      run: |-
-        npm run build:sandbox -- \
-          --image google/gemini-cli-sandbox:${{ steps.image_tag.outputs.FINAL_TAG }} \
-          --output-file final_image_uri.txt
-        echo "uri=$(cat final_image_uri.txt)" >> $GITHUB_OUTPUT
-    - name: 'publish'
-      shell: 'bash'
-      if: "${{ inputs.dry-run != 'true' }}"
-      run: |-
-        docker push "${{ steps.docker_build.outputs.uri }}"
-    - name: 'Create issue on failure'
-      if: |-
-        ${{ failure() }}
-      shell: 'bash'
-      env:
-        GITHUB_TOKEN: '${{ inputs.github-secret }}'
-        DETAILS_URL: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-      run: |-
-        gh issue create \
-          --title "Docker build failed" \
-          --body "The docker build failed. See the full run for details: ${DETAILS_URL}" \
-          --label "kind/bug,release-failure"

.github/actions/run-tests/action.yml

@@ -1,36 +0,0 @@
-name: 'Run Tests'
-description: 'Runs the preflight checks and integration tests.'
-
-inputs:
-  gemini_api_key:
-    description: 'The API key for running integration tests.'
-    required: true
-  working-directory:
-    description: 'The working directory to run the tests in.'
-    required: false
-    default: '.'
-
-runs:
-  using: 'composite'
-  steps:
-    - name: '📝 Print Inputs'
-      shell: 'bash'
-      run: 'echo "${{ toJSON(inputs) }}"'
-    - name: 'Run Tests'
-      env:
-        GEMINI_API_KEY: '${{ inputs.gemini_api_key }}'
-      working-directory: '${{ inputs.working-directory }}'
-      run: |-
-        echo "::group::Build"
-        npm run build
-        echo "::endgroup::"
-        echo "::group::Unit Tests"
-        npm run test:ci
-        echo "::endgroup::"
-        echo "::group::Integration Tests (no sandbox)"
-        npm run test:integration:sandbox:none
-        echo "::endgroup::"
-        echo "::group::Integration Tests (docker sandbox)"
-        npm run test:integration:sandbox:docker
-        echo "::endgroup::"
-      shell: 'bash'

.github/actions/tag-npm-release/action.yml

@@ -1,57 +0,0 @@
-name: 'Tag an NPM release'
-description: 'Tags a specific npm version to a specific channel.'
-
-inputs:
-  channel:
-    description: 'NPM Channel tag'
-    required: true
-  version:
-    description: 'version'
-    required: true
-  dry-run:
-    description: 'Whether to run in dry-run mode.'
-    required: true
-  wombat-token-core:
-    description: 'The npm token for the wombat @google/gemini-cli-core'
-    required: true
-  wombat-token-cli:
-    description: 'The npm token for wombat @google/gemini-cli'
-
-runs:
-  using: 'composite'
-  steps:
-    - name: '📝 Print Inputs'
-      shell: 'bash'
-      run: 'echo "${{ toJSON(inputs) }}"'
-
-    - name: 'Setup Node.js'
-      uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020'
-      with:
-        node-version-file: '.nvmrc'
-        registry-url: 'https://wombat-dressing-room.appspot.com'
-        scope: '@google'
-
-    - name: 'Change tag for @google/gemini-cli-core'
-      if: |-
-        ${{ inputs.dry-run != 'true' }}
-      env:
-        NODE_AUTH_TOKEN: '${{ inputs.wombat-token-core }}'
-      shell: 'bash'
-      run: |
-        npm dist-tag add @google/gemini-cli-core@${{ inputs.version }} ${{ inputs.channel }}
-
-    - name: 'Change tag for @google/gemini-cli'
-      if: |-
-        ${{ inputs.dry-run != 'true' }}
-      env:
-        NODE_AUTH_TOKEN: '${{ inputs.wombat-token-cli }}'
-      shell: 'bash'
-      run: |
-        npm dist-tag add @google/gemini-cli@${{ inputs.version }} ${{ inputs.channel }}
-
-    - name: 'Log dry run'
-      if: |-
-        ${{ inputs.dry-run == 'true' }}
-      shell: 'bash'
-      run: |
-        echo "Dry run: Would have added tag '${{ inputs.channel }}' to version '${{ inputs.version }}' for @google/gemini-cli and @google/gemini-cli-core."

.github/actions/verify-release/action.yml

@@ -1,64 +0,0 @@
-name: 'Verify an NPM release'
-description: 'Fetches a package from NPM and does some basic smoke tests'
-
-inputs:
-  npm-package:
-    description: 'NPM Package'
-    required: true
-    default: '@google/gemini-cli@latest'
-  expected-version:
-    description: 'Expected version'
-    required: true
-  gemini_api_key:
-    description: 'The API key for running integration tests.'
-    required: true
-  ref:
-    description: 'The branch, tag, or SHA to release from.'
-    required: false
-    type: 'string'
-    default: 'main'
-
-runs:
-  using: 'composite'
-  steps:
-    - name: '📝 Print Inputs'
-      shell: 'bash'
-      run: 'echo "${{ toJSON(inputs) }}"'
-
-    - name: 'Checkout'
-      uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v4
-      with:
-        path: 'verify'
-        ref: '${{ github.event.inputs.ref }}'
-        fetch-depth: 0
-
-    - name: 'Install from NPM'
-      uses: 'nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08' # ratchet:nick-fields/retry@v3
-      with:
-        timeout_seconds: 900
-        retry_wait_seconds: 30
-        max_attempts: 10
-        command: 'cd ./verify && pkg="${{ inputs.npm-package }}" && npm install --prefer-online --no-cache -g "$pkg"'
-
-    - name: 'Basic smoke test'
-      shell: 'bash'
-      working-directory: './verify'
-      run: |-
-        gemini_version=$(gemini --version)
-        if [ "$gemini_version" != "${{ inputs.expected-version }}" ]; then
-          echo "❌ Version mismatch: Got $gemini_version from ${{ inputs.npm-package }}, expected ${{ inputs.expected-version }}"
-          exit 1
-        fi
-
-    - name: 'Install dependencies for integration tests'
-      shell: 'bash'
-      working-directory: './verify'
-      run: 'npm install'
-
-    - name: '🔬 Run integration tests against NPM release'
-      working-directory: './verify'
-      env:
-        GEMINI_API_KEY: '${{ inputs.gemini_api_key }}'
-        INTEGRATION_TEST_USE_INSTALLED_GEMINI: 'true'
-      shell: 'bash'
-      run: 'npm run test:integration:sandbox:none'

.github/dependabot.yml

@@ -1,35 +0,0 @@
-# See https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-version: 2
-updates:
-  - package-ecosystem: 'npm'
-    directory: '/'
-    schedule:
-      interval: 'daily'
-    target-branch: 'main'
-    commit-message:
-      prefix: 'chore(deps)'
-      include: 'scope'
-    reviewers:
-      - 'google-gemini/gemini-cli-askmode-approvers'
-    groups:
-      # Group all non-major updates together.
-      # This is to reduce the number of PRs that need to be reviewed.
-      # Major updates will still be created as separate PRs.
-      npm-minor-patch:
-        applies-to: 'version-updates'
-        update-types:
-          - 'minor'
-          - 'patch'
-    open-pull-requests-limit: 0
-
-  - package-ecosystem: 'github-actions'
-    directory: '/'
-    schedule:
-      interval: 'daily'
-    target-branch: 'main'
-    commit-message:
-      prefix: 'chore(deps)'
-      include: 'scope'
-    reviewers:
-      - 'google-gemini/gemini-cli-askmode-approvers'
-    open-pull-requests-limit: 0

.github/scripts/pr-triage.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -euo pipefail
 
 # Initialize a comma-separated string to hold PR numbers that need a comment
@@ -6,121 +6,147 @@ PRS_NEEDING_COMMENT=""
 
 # Function to process a single PR
 process_pr() {
-    if [[ -z "${GITHUB_REPOSITORY:-}" ]]; then
-        echo "‼️ Missing \$GITHUB_REPOSITORY - this must be run from GitHub Actions"
-        return 1
-    fi
-
-    if [[ -z "${GITHUB_OUTPUT:-}" ]]; then
-        echo "‼️ Missing \$GITHUB_OUTPUT - this must be run from GitHub Actions"
-        return 1
-    fi
-
     local PR_NUMBER=$1
-    echo "🔄 Processing PR #${PR_NUMBER}"
+    echo "🔄 Processing PR #$PR_NUMBER"
 
-    # Get closing issue number with error handling
-    local ISSUE_NUMBER
-    if ! ISSUE_NUMBER=$(gh pr view "${PR_NUMBER}" --repo "${GITHUB_REPOSITORY}" --json closingIssuesReferences -q '.closingIssuesReferences.nodes[0].number' 2>/dev/null); then
-        echo "   ⚠️ Could not fetch closing issue for PR #${PR_NUMBER}"
+    # Get PR body with error handling
+    local PR_BODY
+    if ! PR_BODY=$(gh pr view "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --json body -q .body 2>/dev/null); then
+        echo "   ⚠️ Could not fetch PR #$PR_NUMBER details"
+        return 1
     fi
 
-    if [[ -z "${ISSUE_NUMBER}" ]]; then
-        echo "⚠️  No linked issue found for PR #${PR_NUMBER}, adding status/need-issue label"
-        if ! gh pr edit "${PR_NUMBER}" --repo "${GITHUB_REPOSITORY}" --add-label "status/need-issue" 2>/dev/null; then
+    # Look for issue references using multiple patterns
+    local ISSUE_NUMBER=""
+
+    # Pattern 1: Direct reference like #123
+    if [ -z "$ISSUE_NUMBER" ]; then
+        ISSUE_NUMBER=$(echo "$PR_BODY" | grep -oE '#[0-9]+' | head -1 | sed 's/#//' 2>/dev/null || echo "")
+    fi
+
+    # Pattern 2: Closes/Fixes/Resolves patterns (case-insensitive)
+    if [ -z "$ISSUE_NUMBER" ]; then
+        ISSUE_NUMBER=$(echo "$PR_BODY" | grep -iE '(closes?|fixes?|resolves?) #[0-9]+' | grep -oE '#[0-9]+' | head -1 | sed 's/#//' 2>/dev/null || echo "")
+    fi
+
+    if [ -z "$ISSUE_NUMBER" ]; then
+        echo "⚠️  No linked issue found for PR #$PR_NUMBER, adding status/need-issue label"
+        if ! gh pr edit "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --add-label "status/need-issue" 2>/dev/null; then
             echo "   ⚠️ Failed to add label (may already exist or have permission issues)"
         fi
         # Add PR number to the list
-        if [[ -z "${PRS_NEEDING_COMMENT}" ]]; then
-            PRS_NEEDING_COMMENT="${PR_NUMBER}"
+        if [ -z "$PRS_NEEDING_COMMENT" ]; then
+            PRS_NEEDING_COMMENT="$PR_NUMBER"
         else
-            PRS_NEEDING_COMMENT="${PRS_NEEDING_COMMENT},${PR_NUMBER}"
+            PRS_NEEDING_COMMENT="$PRS_NEEDING_COMMENT,$PR_NUMBER"
         fi
-        echo "needs_comment=true" >> "${GITHUB_OUTPUT}"
+        echo "needs_comment=true" >> $GITHUB_OUTPUT
     else
-        echo "🔗 Found linked issue #${ISSUE_NUMBER}"
+        echo "🔗 Found linked issue #$ISSUE_NUMBER"
 
         # Remove status/need-issue label if present
-        if ! gh pr edit "${PR_NUMBER}" --repo "${GITHUB_REPOSITORY}" --remove-label "status/need-issue" 2>/dev/null; then
+        if ! gh pr edit "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --remove-label "status/need-issue" 2>/dev/null; then
             echo "   status/need-issue label not present or could not be removed"
         fi
 
         # Get issue labels
-        echo "📥 Fetching labels from issue #${ISSUE_NUMBER}"
+        echo "📥 Fetching labels from issue #$ISSUE_NUMBER"
         local ISSUE_LABELS=""
-        if ! ISSUE_LABELS=$(gh issue view "${ISSUE_NUMBER}" --repo "${GITHUB_REPOSITORY}" --json labels -q '.labels[].name' 2>/dev/null | tr '\n' ',' | sed 's/,$//' || echo ""); then
-            echo "   ⚠️ Could not fetch issue #${ISSUE_NUMBER} (may not exist or be in different repo)"
+        if ! ISSUE_LABELS=$(gh issue view "$ISSUE_NUMBER" --repo "$GITHUB_REPOSITORY" --json labels -q '.labels[].name' 2>/dev/null | tr '\n' ',' | sed 's/,$//' || echo ""); then
+            echo "   ⚠️ Could not fetch issue #$ISSUE_NUMBER (may not exist or be in different repo)"
             ISSUE_LABELS=""
         fi
 
         # Get PR labels
-        echo "📥 Fetching labels from PR #${PR_NUMBER}"
+        echo "📥 Fetching labels from PR #$PR_NUMBER"
         local PR_LABELS=""
-        if ! PR_LABELS=$(gh pr view "${PR_NUMBER}" --repo "${GITHUB_REPOSITORY}" --json labels -q '.labels[].name' 2>/dev/null | tr '\n' ',' | sed 's/,$//' || echo ""); then
+        if ! PR_LABELS=$(gh pr view "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --json labels -q '.labels[].name' 2>/dev/null | tr '\n' ',' | sed 's/,$//' || echo ""); then
             echo "   ⚠️ Could not fetch PR labels"
             PR_LABELS=""
         fi
 
-        echo "   Issue labels: ${ISSUE_LABELS}"
-        echo "   PR labels: ${PR_LABELS}"
+        echo "   Issue labels: $ISSUE_LABELS"
+        echo "   PR labels: $PR_LABELS"
 
         # Convert comma-separated strings to arrays
         local ISSUE_LABEL_ARRAY PR_LABEL_ARRAY
-        IFS=',' read -ra ISSUE_LABEL_ARRAY <<< "${ISSUE_LABELS}"
-        IFS=',' read -ra PR_LABEL_ARRAY <<< "${PR_LABELS}"
+        IFS=',' read -ra ISSUE_LABEL_ARRAY <<< "$ISSUE_LABELS"
+        IFS=',' read -ra PR_LABEL_ARRAY <<< "$PR_LABELS"
 
         # Find labels to add (on issue but not on PR)
         local LABELS_TO_ADD=""
         for label in "${ISSUE_LABEL_ARRAY[@]}"; do
-            if [[ -n "${label}" ]] && [[ " ${PR_LABEL_ARRAY[*]} " != *" ${label} "* ]]; then
-                if [[ -z "${LABELS_TO_ADD}" ]]; then
-                    LABELS_TO_ADD="${label}"
+            if [ -n "$label" ] && [[ ! " ${PR_LABEL_ARRAY[*]} " =~ " ${label} " ]]; then
+                if [ -z "$LABELS_TO_ADD" ]; then
+                    LABELS_TO_ADD="$label"
                 else
-                    LABELS_TO_ADD="${LABELS_TO_ADD},${label}"
+                    LABELS_TO_ADD="$LABELS_TO_ADD,$label"
+                fi
+            fi
+        done
+
+        # Find labels to remove (on PR but not on issue)
+        local LABELS_TO_REMOVE=""
+        for label in "${PR_LABEL_ARRAY[@]}"; do
+            if [ -n "$label" ] && [[ ! " ${ISSUE_LABEL_ARRAY[*]} " =~ " ${label} " ]]; then
+                # Don't remove status/need-issue since we already handled it
+                if [ "$label" != "status/need-issue" ]; then
+                    if [ -z "$LABELS_TO_REMOVE" ]; then
+                        LABELS_TO_REMOVE="$label"
+                    else
+                        LABELS_TO_REMOVE="$LABELS_TO_REMOVE,$label"
+                    fi
                 fi
             fi
         done
 
         # Apply label changes
-        if [[ -n "${LABELS_TO_ADD}" ]]; then
-            echo "➕ Adding labels: ${LABELS_TO_ADD}"
-            if ! gh pr edit "${PR_NUMBER}" --repo "${GITHUB_REPOSITORY}" --add-label "${LABELS_TO_ADD}" 2>/dev/null; then
+        if [ -n "$LABELS_TO_ADD" ]; then
+            echo "➕ Adding labels: $LABELS_TO_ADD"
+            if ! gh pr edit "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --add-label "$LABELS_TO_ADD" 2>/dev/null; then
                 echo "   ⚠️ Failed to add some labels"
             fi
         fi
 
-        if [[ -z "${LABELS_TO_ADD}" ]]; then
+        if [ -n "$LABELS_TO_REMOVE" ]; then
+            echo "➖ Removing labels: $LABELS_TO_REMOVE"
+            if ! gh pr edit "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --remove-label "$LABELS_TO_REMOVE" 2>/dev/null; then
+                echo "   ⚠️ Failed to remove some labels"
+            fi
+        fi
+
+        if [ -z "$LABELS_TO_ADD" ] && [ -z "$LABELS_TO_REMOVE" ]; then
             echo "✅ Labels already synchronized"
         fi
-        echo "needs_comment=false" >> "${GITHUB_OUTPUT}"
+        echo "needs_comment=false" >> $GITHUB_OUTPUT
     fi
 }
 
 # If PR_NUMBER is set, process only that PR
-if [[ -n "${PR_NUMBER:-}" ]]; then
-    if ! process_pr "${PR_NUMBER}"; then
-        echo "❌ Failed to process PR #${PR_NUMBER}"
+if [ -n "${PR_NUMBER:-}" ]; then
+    if ! process_pr "$PR_NUMBER"; then
+        echo "❌ Failed to process PR #$PR_NUMBER"
         exit 1
     fi
 else
     # Otherwise, get all open PRs and process them
     # The script logic will determine which ones need issue linking or label sync
     echo "📥 Getting all open pull requests..."
-    if ! PR_NUMBERS=$(gh pr list --repo "${GITHUB_REPOSITORY}" --state open --limit 1000 --json number -q '.[].number' 2>/dev/null); then
+    if ! PR_NUMBERS=$(gh pr list --repo "$GITHUB_REPOSITORY" --state open --limit 1000 --json number -q '.[].number' 2>/dev/null); then
         echo "❌ Failed to fetch PR list"
         exit 1
     fi
-
-    if [[ -z "${PR_NUMBERS}" ]]; then
+    
+    if [ -z "$PR_NUMBERS" ]; then
         echo "✅ No open PRs found"
     else
         # Count the number of PRs
-        PR_COUNT=$(echo "${PR_NUMBERS}" | wc -w | tr -d ' ')
-        echo "📊 Found ${PR_COUNT} open PRs to process"
-
-        for pr_number in ${PR_NUMBERS}; do
-            if ! process_pr "${pr_number}"; then
-                echo "⚠️ Failed to process PR #${pr_number}, continuing with next PR..."
+        PR_COUNT=$(echo "$PR_NUMBERS" | wc -w | tr -d ' ')
+        echo "📊 Found $PR_COUNT open PRs to process"
+        
+        for pr_number in $PR_NUMBERS; do
+            if ! process_pr "$pr_number"; then
+                echo "⚠️ Failed to process PR #$pr_number, continuing with next PR..."
                 continue
             fi
         done
@@ -128,10 +154,10 @@ else
 fi
 
 # Ensure output is always set, even if empty
-if [[ -z "${PRS_NEEDING_COMMENT}" ]]; then
-    echo "prs_needing_comment=[]" >> "${GITHUB_OUTPUT}"
+if [ -z "$PRS_NEEDING_COMMENT" ]; then
+    echo "prs_needing_comment=[]" >> $GITHUB_OUTPUT
 else
-    echo "prs_needing_comment=[${PRS_NEEDING_COMMENT}]" >> "${GITHUB_OUTPUT}"
+    echo "prs_needing_comment=[$PRS_NEEDING_COMMENT]" >> $GITHUB_OUTPUT
 fi
 
-echo "✅ PR triage completed"
+echo "✅ PR triage completed"

.github/workflows/ci.yml

@@ -1,346 +1,161 @@
-name: 'Testing: CI'
+# .github/workflows/ci.yml
+
+name: Gemini CLI CI
 
 on:
   push:
-    branches:
-      - 'main'
-      - 'release/**'
+    branches: [main, release]
   pull_request:
-    branches:
-      - 'main'
-      - 'release/**'
+    branches: [main, release]
   merge_group:
-  workflow_dispatch:
-    inputs:
-      branch_ref:
-        description: 'Branch to run on'
-        required: true
-        default: 'main'
-        type: 'string'
-
-concurrency:
-  group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
-  cancel-in-progress: |-
-    ${{ github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/heads/release/') }}
-
-permissions:
-  checks: 'write'
-  contents: 'read'
-  statuses: 'write'
-
-defaults:
-  run:
-    shell: 'bash'
 
 jobs:
-  merge_queue_skipper:
-    name: 'Merge Queue Skipper'
-    runs-on: 'gemini-cli-ubuntu-16-core'
-    outputs:
-      skip: '${{ steps.merge-queue-ci-skipper.outputs.skip-check }}'
-    steps:
-      - id: 'merge-queue-ci-skipper'
-        uses: 'cariad-tech/merge-queue-ci-skipper@1032489e59437862c90a08a2c92809c903883772' # ratchet:cariad-tech/merge-queue-ci-skipper@main
-        with:
-          secret: '${{ secrets.GITHUB_TOKEN }}'
-
   lint:
-    name: 'Lint'
-    runs-on: 'gemini-cli-ubuntu-16-core'
-    needs: 'merge_queue_skipper'
-    if: "${{needs.merge_queue_skipper.outputs.skip == 'false'}}"
+    name: Lint
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read # For checkout
     steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          ref: '${{ github.event.inputs.branch_ref || github.ref }}'
-          fetch-depth: 1
+      - name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-      - name: 'Set up Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4.4.0
+      - name: Set up Node.js
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'
 
-      - name: 'Install dependencies'
-        run: 'npm ci'
+      - name: Install dependencies
+        run: npm ci
 
-      - name: 'Check lockfile'
-        run: 'npm run check:lockfile'
+      - name: Run formatter check
+        run: |
+          npm run format
+          git diff --exit-code
 
-      - name: 'Install linters'
-        run: 'node scripts/lint.js --setup'
+      - name: Run linter
+        run: npm run lint:ci
 
-      - name: 'Run ESLint'
-        run: 'node scripts/lint.js --eslint'
+      - name: Run linter on integration tests
+        run: npx eslint integration-tests --max-warnings 0
 
-      - name: 'Run actionlint'
-        run: 'node scripts/lint.js --actionlint'
+      - name: Run formatter on integration tests
+        run: |
+          npx prettier --check integration-tests
+          git diff --exit-code
 
-      - name: 'Run shellcheck'
-        run: 'node scripts/lint.js --shellcheck'
+      - name: Build project
+        run: npm run build
 
-      - name: 'Run yamllint'
-        run: 'node scripts/lint.js --yamllint'
+      - name: Run type check
+        run: npm run typecheck
 
-      - name: 'Run Prettier'
-        run: 'node scripts/lint.js --prettier'
-
-  test_linux:
-    name: 'Test (Linux)'
-    runs-on: 'gemini-cli-ubuntu-16-core'
-    needs:
-      - 'lint'
-      - 'merge_queue_skipper'
-    if: "${{needs.merge_queue_skipper.outputs.skip == 'false'}}"
+  test:
+    name: Test
+    runs-on: ${{ matrix.os }}
+    needs: lint
     permissions:
-      contents: 'read'
-      checks: 'write'
-      pull-requests: 'write'
+      contents: read
+      checks: write
+      pull-requests: write
     strategy:
       matrix:
-        node-version:
-          - '20.x'
-          - '22.x'
-          - '24.x'
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        node-version: [20.x, 22.x, 24.x]
     steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
+      - name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-      - name: 'Set up Node.js ${{ matrix.node-version }}'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
+      - name: Set up Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
-          node-version: '${{ matrix.node-version }}'
+          node-version: ${{ matrix.node-version }}
           cache: 'npm'
 
-      - name: 'Build project'
-        run: 'npm run build'
+      - name: Build project
+        run: npm run build
 
-      - name: 'Install dependencies for testing'
-        run: 'npm ci'
+      - name: Install dependencies for testing
+        run: npm ci # Install fresh dependencies using the downloaded package-lock.json
 
-      - name: 'Run tests and generate reports'
+      - name: Run tests and generate reports
+        run: npm run test:ci
         env:
           NO_COLOR: true
-        run: 'npm run test:ci'
 
-      - name: 'Wait for file system sync'
-        run: 'sleep 2'
-
-      - name: 'Publish Test Report (for non-forks)'
-        if: |-
-          ${{ always() && (github.event.pull_request.head.repo.full_name == github.repository) }}
-        uses: 'dorny/test-reporter@dc3a92680fcc15842eef52e8c4606ea7ce6bd3f3' # ratchet:dorny/test-reporter@v2
+      - name: Publish Test Report (for non-forks)
+        if: always() && (github.event.pull_request.head.repo.full_name == github.repository)
+        uses: dorny/test-reporter@dc3a92680fcc15842eef52e8c4606ea7ce6bd3f3 # v2
         with:
-          name: 'Test Results (Node ${{ matrix.node-version }})'
-          path: 'packages/*/junit.xml'
-          reporter: 'java-junit'
+          name: Test Results (Node ${{ matrix.node-version }})
+          path: packages/*/junit.xml
+          reporter: java-junit
           fail-on-error: 'false'
 
-      - name: 'Upload Test Results Artifact (for forks)'
-        if: |-
-          ${{ always() && (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) }}
-        uses: 'actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02' # ratchet:actions/upload-artifact@v4
+      - name: Upload Test Results Artifact (for forks)
+        if: always() && (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         with:
-          name: 'test-results-fork-${{ matrix.node-version }}-${{ runner.os }}'
-          path: 'packages/*/junit.xml'
+          name: test-results-fork-${{ matrix.node-version }}-${{ matrix.os }}
+          path: packages/*/junit.xml
 
-  test_mac:
-    name: 'Test (Mac)'
-    runs-on: '${{ matrix.os }}'
-    needs:
-      - 'lint'
-      - 'merge_queue_skipper'
-    if: "${{needs.merge_queue_skipper.outputs.skip == 'false'}}"
-    permissions:
-      contents: 'read'
-      checks: 'write'
-      pull-requests: 'write'
+      - name: Upload coverage reports
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        if: always()
+        with:
+          name: coverage-reports-${{ matrix.node-version }}-${{ matrix.os }}
+          path: packages/*/coverage
+
+  post_coverage_comment:
+    name: Post Coverage Comment
+    runs-on: ubuntu-latest
+    needs: test
+    if: always() && github.event_name == 'pull_request' && (github.event.pull_request.head.repo.full_name == github.repository)
     continue-on-error: true
+    permissions:
+      contents: read # For checkout
+      pull-requests: write # For commenting
     strategy:
       matrix:
-        os:
-          - 'macos-latest'
-        node-version:
-          - '20.x'
-          - '22.x'
-          - '24.x'
+        # Reduce noise by only posting the comment once
+        os: [ubuntu-latest]
+        node-version: [22.x]
     steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
+      - name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-      - name: 'Set up Node.js ${{ matrix.node-version }}'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
+      - name: Download coverage reports artifact
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
         with:
-          node-version: '${{ matrix.node-version }}'
-          cache: 'npm'
+          name: coverage-reports-${{ matrix.node-version }}-${{ matrix.os }}
+          path: coverage_artifact # Download to a specific directory
 
-      - name: 'Build project'
-        run: 'npm run build'
-
-      - name: 'Install dependencies for testing'
-        run: 'npm ci'
-
-      - name: 'Run tests and generate reports'
-        env:
-          NO_COLOR: true
-        run: 'npm run test:ci -- --coverage.enabled=false'
-
-      - name: 'Wait for file system sync'
-        run: 'sleep 2'
-
-      - name: 'Publish Test Report (for non-forks)'
-        if: |-
-          ${{ always() && (github.event.pull_request.head.repo.full_name == github.repository) }}
-        uses: 'dorny/test-reporter@dc3a92680fcc15842eef52e8c4606ea7ce6bd3f3' # ratchet:dorny/test-reporter@v2
+      - name: Post Coverage Comment using Composite Action
+        uses: ./.github/actions/post-coverage-comment # Path to the composite action directory
         with:
-          name: 'Test Results (Node ${{ matrix.node-version }})'
-          path: 'packages/*/junit.xml'
-          reporter: 'java-junit'
-          fail-on-error: 'false'
-
-      - name: 'Upload Test Results Artifact (for forks)'
-        if: |-
-          ${{ always() && (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) }}
-        uses: 'actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02' # ratchet:actions/upload-artifact@v4
-        with:
-          name: 'test-results-fork-${{ matrix.node-version }}-${{ runner.os }}'
-          path: 'packages/*/junit.xml'
-
-      - name: 'Upload coverage reports'
-        if: |-
-          ${{ always() }}
-        uses: 'actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02' # ratchet:actions/upload-artifact@v4
-        with:
-          name: 'coverage-reports-${{ matrix.node-version }}-${{ matrix.os }}'
-          path: 'packages/*/coverage'
+          cli_json_file: coverage_artifact/cli/coverage/coverage-summary.json
+          core_json_file: coverage_artifact/core/coverage/coverage-summary.json
+          cli_full_text_summary_file: coverage_artifact/cli/coverage/full-text-summary.txt
+          core_full_text_summary_file: coverage_artifact/core/coverage/full-text-summary.txt
+          node_version: ${{ matrix.node-version }}
+          os: ${{ matrix.os }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
 
   codeql:
-    name: 'CodeQL'
-    runs-on: 'gemini-cli-ubuntu-16-core'
-    needs: 'merge_queue_skipper'
-    if: "${{needs.merge_queue_skipper.outputs.skip == 'false'}}"
+    name: CodeQL
+    runs-on: ubuntu-latest
     permissions:
-      actions: 'read'
-      contents: 'read'
-      security-events: 'write'
+      actions: read
+      contents: read
+      security-events: write
     steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3
         with:
-          ref: '${{ github.event.inputs.branch_ref || github.ref }}'
+          languages: javascript
 
-      - name: 'Initialize CodeQL'
-        uses: 'github/codeql-action/init@df559355d593797519d70b90fc8edd5db049e7a2' # ratchet:github/codeql-action/init@v3
-        with:
-          languages: 'javascript'
-
-      - name: 'Perform CodeQL Analysis'
-        uses: 'github/codeql-action/analyze@df559355d593797519d70b90fc8edd5db049e7a2' # ratchet:github/codeql-action/analyze@v3
-
-  # Check for changes in bundle size.
-  bundle_size:
-    name: 'Check Bundle Size'
-    needs: 'merge_queue_skipper'
-    if: "${{github.event_name == 'pull_request' && needs.merge_queue_skipper.outputs.skip == 'false'}}"
-    runs-on: 'gemini-cli-ubuntu-16-core'
-    permissions:
-      contents: 'read' # For checkout
-      pull-requests: 'write' # For commenting
-
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          ref: '${{ github.event.inputs.branch_ref || github.ref }}'
-          fetch-depth: 1
-
-      - uses: 'preactjs/compressed-size-action@946a292cd35bd1088e0d7eb92b69d1a8d5b5d76a'
-        with:
-          repo-token: '${{ secrets.GITHUB_TOKEN }}'
-          pattern: './bundle/**/*.{js,sb}'
-          minimum-change-threshold: '1000'
-          compression: 'none'
-          clean-script: 'clean'
-
-  test_windows:
-    name: 'Slow Test - Win'
-    runs-on: 'gemini-cli-windows-16-core'
-    needs: 'merge_queue_skipper'
-    if: "${{needs.merge_queue_skipper.outputs.skip == 'false'}}"
-    continue-on-error: true
-
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          ref: '${{ github.event.inputs.branch_ref || github.ref }}'
-
-      - name: 'Set up Node.js 20.x'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
-        with:
-          node-version: '20.x'
-          cache: 'npm'
-
-      - name: 'Configure Windows Defender exclusions'
-        run: |
-          Add-MpPreference -ExclusionPath $env:GITHUB_WORKSPACE -Force
-          Add-MpPreference -ExclusionPath "$env:GITHUB_WORKSPACE\node_modules" -Force
-          Add-MpPreference -ExclusionPath "$env:GITHUB_WORKSPACE\packages" -Force
-          Add-MpPreference -ExclusionPath "$env:TEMP" -Force
-        shell: 'pwsh'
-
-      - name: 'Configure npm for Windows performance'
-        run: |
-          npm config set progress false
-          npm config set audit false
-          npm config set fund false
-          npm config set loglevel error
-          npm config set maxsockets 32
-          npm config set registry https://registry.npmjs.org/
-        shell: 'pwsh'
-
-      - name: 'Install dependencies'
-        run: 'npm ci'
-        shell: 'pwsh'
-
-      - name: 'Build project'
-        run: 'npm run build'
-        shell: 'pwsh'
-        env:
-          NODE_OPTIONS: '--max-old-space-size=32768 --max-semi-space-size=256'
-          UV_THREADPOOL_SIZE: '32'
-          NODE_ENV: 'production'
-
-      - name: 'Run tests and generate reports'
-        env:
-          GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
-          NO_COLOR: true
-          NODE_OPTIONS: '--max-old-space-size=32768 --max-semi-space-size=256'
-          UV_THREADPOOL_SIZE: '32'
-          NODE_ENV: 'test'
-        run: 'npm run test:ci -- --coverage.enabled=false'
-        shell: 'pwsh'
-
-  ci:
-    name: 'CI'
-    if: 'always()'
-    needs:
-      - 'lint'
-      - 'test_linux'
-      - 'test_mac'
-      - 'codeql'
-      - 'bundle_size'
-    runs-on: 'gemini-cli-ubuntu-16-core'
-    steps:
-      - name: 'Check all job results'
-        run: |
-          if [[ (${{ needs.lint.result }} != 'success' && ${{ needs.lint.result }} != 'skipped') || \
-               (${{ needs.test_linux.result }} != 'success' && ${{ needs.test_linux.result }} != 'skipped') || \
-               (${{ needs.test_mac.result }} != 'success' && ${{ needs.test_mac.result }} != 'skipped') || \
-               (${{ needs.codeql.result }} != 'success' && ${{ needs.codeql.result }} != 'skipped') || \
-               (${{ needs.bundle_size.result }} != 'success' && ${{ needs.bundle_size.result }} != 'skipped') ]]; then
-            echo "One or more CI jobs failed."
-            exit 1
-          fi
-          echo "All CI jobs passed!"
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3

.github/workflows/community-report.yml

@@ -1,4 +1,4 @@
-name: 'Generate Weekly Community Report 📊'
+name: Generate Weekly Community Report 📊
 
 on:
   schedule:
@@ -12,61 +12,56 @@ on:
 
 jobs:
   generate-report:
-    name: 'Generate Report 📝'
-    if: |-
-      ${{ github.repository == 'google-gemini/gemini-cli' }}
-    runs-on: 'ubuntu-latest'
+    name: Generate Report 📝
+    if: ${{ github.repository == 'google-gemini/gemini-cli' }}
+    runs-on: ubuntu-latest
     permissions:
-      issues: 'write'
-      pull-requests: 'read'
-      discussions: 'read'
-      contents: 'read'
-      id-token: 'write'
+      issues: write
+      pull-requests: read
+      discussions: read
+      contents: read
+      id-token: write
 
     steps:
-      - name: 'Generate GitHub App Token 🔑'
-        id: 'generate_token'
-        uses: 'actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b' # ratchet:actions/create-github-app-token@v2
+      - name: Generate GitHub App Token 🔑
+        id: generate_token
+        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2
         with:
-          app-id: '${{ secrets.APP_ID }}'
-          private-key: '${{ secrets.PRIVATE_KEY }}'
-          permission-issues: 'write'
-          permission-pull-requests: 'read'
-          permission-discussions: 'read'
-          permission-contents: 'read'
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
 
-      - name: 'Generate Report 📜'
-        id: 'report'
+      - name: Generate Report 📜
+        id: report
         env:
-          GH_TOKEN: '${{ steps.generate_token.outputs.token }}'
-          REPO: '${{ github.repository }}'
-          DAYS: '${{ github.event.inputs.days || 7 }}'
-        run: |-
+          GH_TOKEN: ${{ steps.generate_token.outputs.token }}
+          REPO: ${{ github.repository }}
+          DAYS: ${{ github.event.inputs.days || '7' }}
+        run: |
           set -e
 
-          START_DATE="$(date -u -d "$DAYS days ago" +'%Y-%m-%d')"
-          END_DATE="$(date -u +'%Y-%m-%d')"
-          echo "⏳ Generating report for contributions from ${START_DATE} to ${END_DATE}..."
+          START_DATE=$(date -u -d "$DAYS days ago" +'%Y-%m-%d')
+          END_DATE=$(date -u +'%Y-%m-%d')
+          echo "⏳ Generating report for contributions from $START_DATE to $END_DATE..."
 
           declare -A author_is_googler
           check_googler_status() {
-              local author="$1"
-              if [[ "${author}" == *"[bot]" ]]; then
-                  author_is_googler[${author}]=1
+              local author=$1
+              if [[ "$author" == *"[bot]" ]]; then
+                  author_is_googler[$author]=1
                   return 1
               fi
-              if [[ -v "author_is_googler[${author}]" ]]; then
-                  return "${author_is_googler[${author}]}"
+              if [[ -v "author_is_googler[$author]" ]]; then
+                  return ${author_is_googler[$author]}
               fi
 
-              if gh api "orgs/googlers/members/${author}" --silent 2>/dev/null; then
-                  echo "🧑‍💻 ${author} is a Googler."
-                  author_is_googler[${author}]=0
+              if gh api "orgs/googlers/members/$author" --silent 2>/dev/null; then
+                  echo "🧑‍💻 $author is a Googler."
+                  author_is_googler[$author]=0
               else
-                  echo "🌍 ${author} is a community contributor."
-                  author_is_googler[${author}]=1
+                  echo "🌍 $author is a community contributor."
+                  author_is_googler[$author]=1
               fi
-              return "${author_is_googler[${author}]}"
+              return ${author_is_googler[$author]}
           }
 
           googler_issues=0
@@ -75,27 +70,27 @@ jobs:
           non_googler_prs=0
 
           echo "🔎 Fetching issues and pull requests..."
-          ITEMS_JSON="$(gh search issues --repo "${REPO}" "created:>${START_DATE}" --json author,isPullRequest --limit 1000)"
+          ITEMS_JSON=$(gh search issues --repo "$REPO" "created:>$START_DATE" --json author,isPullRequest --limit 1000)
 
           for row in $(echo "${ITEMS_JSON}" | jq -r '.[] | @base64'); do
               _jq() {
-                  echo "${row}" | base64 --decode | jq -r "${1}"
+                  echo ${row} | base64 --decode | jq -r ${1}
               }
-              author="$(_jq '.author.login')"
-              is_pr="$(_jq '.isPullRequest')"
+              author=$(_jq '.author.login')
+              is_pr=$(_jq '.isPullRequest')
 
-              if [[ -z "${author}" || "${author}" == "null" ]]; then
+              if [[ -z "$author" || "$author" == "null" ]]; then
                 continue
               fi
 
-              if check_googler_status "${author}"; then
-                  if [[ "${is_pr}" == "true" ]]; then
+              if check_googler_status "$author"; then
+                  if [[ "$is_pr" == "true" ]]; then
                       ((googler_prs++))
                   else
                       ((googler_issues++))
                   fi
               else
-                  if [[ "${is_pr}" == "true" ]]; then
+                  if [[ "$is_pr" == "true" ]]; then
                       ((non_googler_prs++))
                   else
                       ((non_googler_issues++))
@@ -119,19 +114,19 @@ jobs:
               }
             }
           }'''
-          DISCUSSIONS_JSON="$(gh api graphql -f q="repo:${REPO} created:>${START_DATE}" -f query="${DISCUSSION_QUERY}")"
+          DISCUSSIONS_JSON=$(gh api graphql -f q="repo:$REPO created:>$START_DATE" -f query="$DISCUSSION_QUERY")
 
           for row in $(echo "${DISCUSSIONS_JSON}" | jq -r '.data.search.nodes[] | @base64'); do
               _jq() {
-                  echo "${row}" | base64 --decode | jq -r "${1}"
+                  echo ${row} | base64 --decode | jq -r ${1}
               }
-              author="$(_jq '.author.login')"
+              author=$(_jq '.author.login')
 
-              if [[ -z "${author}" || "${author}" == "null" ]]; then
+              if [[ -z "$author" || "$author" == "null" ]]; then
                 continue
               fi
 
-              if check_googler_status "${author}"; then
+              if check_googler_status "$author"; then
                   ((googler_discussions++))
               else
                   ((non_googler_discussions++))
@@ -139,6 +134,7 @@ jobs:
           done
 
           echo "✍️ Generating report content..."
+          REPORT_TITLE="Community Contribution Report: $START_DATE to $END_DATE"
           TOTAL_ISSUES=$((googler_issues + non_googler_issues))
           TOTAL_PRS=$((googler_prs + non_googler_prs))
           TOTAL_DISCUSSIONS=$((googler_discussions + non_googler_discussions))
@@ -146,7 +142,7 @@ jobs:
           REPORT_BODY=$(cat <<EOF
           ### 💖 Community Contribution Report
 
-          **Period:** ${START_DATE} to ${END_DATE}
+          **Period:** $START_DATE to $END_DATE
 
           | Category | Googlers | Community | Total |
           |---|---:|---:|---:|
@@ -158,29 +154,24 @@ jobs:
           EOF
           )
 
-          echo "report_body<<EOF" >> "${GITHUB_OUTPUT}"
-          echo "${REPORT_BODY}" >> "${GITHUB_OUTPUT}"
-          echo "EOF" >> "${GITHUB_OUTPUT}"
+          echo "report_body<<EOF" >> $GITHUB_OUTPUT
+          echo "$REPORT_BODY" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
 
           echo "📊 Community Contribution Report:"
-          echo "${REPORT_BODY}"
+          echo "$REPORT_BODY"
 
-      - name: '🤖 Get Insights from Report'
-        if: |-
-          ${{ steps.report.outputs.report_body != '' }}
-        uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31' # ratchet:google-github-actions/run-gemini-cli@v0
+      - name: 🤖 Get Insights from Report
+        if: steps.report.outputs.report_body != ''
+        uses: google-gemini/gemini-cli-action@df3f890f003d28c60a2a09d2c29e0126e4d1e2ff
         env:
-          GITHUB_TOKEN: '${{ steps.generate_token.outputs.token }}'
-          REPOSITORY: '${{ github.repository }}'
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
         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: |-
+          version: 0.1.8-rc.0
+          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
+          OTLP_GCP_WIF_PROVIDER: ${{ secrets.OTLP_GCP_WIF_PROVIDER }}
+          OTLP_GOOGLE_CLOUD_PROJECT: ${{ secrets.OTLP_GOOGLE_CLOUD_PROJECT }}
+          settings_json: |
             {
               "coreTools": [
                 "run_shell_command(gh issue list)",
@@ -189,7 +180,7 @@ jobs:
                 "run_shell_command(gh search prs)"
               ]
             }
-          prompt: |-
+          prompt: |
             You are a helpful assistant that analyzes community contribution reports.
             Based on the following report, please provide a brief summary and highlight any interesting trends or potential areas for improvement.
 

.github/workflows/docs-page-action.yml

@@ -1,50 +0,0 @@
-name: 'Deploy GitHub Pages'
-
-on:
-  push:
-    tags: 'v*'
-  workflow_dispatch:
-
-permissions:
-  contents: 'read'
-  pages: 'write'
-  id-token: 'write'
-
-# Allow only one concurrent deployment, skipping runs queued between the run
-# in-progress and latest queued. However, do NOT cancel in-progress runs as we
-# want to allow these production deployments to complete.
-concurrency:
-  group: '${{ github.workflow }}'
-  cancel-in-progress: false
-
-jobs:
-  build:
-    if: |-
-      ${{ !contains(github.ref_name, 'nightly') }}
-    runs-on: 'ubuntu-latest'
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-
-      - name: 'Setup Pages'
-        uses: 'actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b' # ratchet:actions/configure-pages@v5
-
-      - name: 'Build with Jekyll'
-        uses: 'actions/jekyll-build-pages@44a6e6beabd48582f863aeeb6cb2151cc1716697' # ratchet:actions/jekyll-build-pages@v1
-        with:
-          source: './'
-          destination: './_site'
-
-      - name: 'Upload artifact'
-        uses: 'actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa' # ratchet:actions/upload-pages-artifact@v3
-
-  deploy:
-    environment:
-      name: 'github-pages'
-      url: '${{ steps.deployment.outputs.page_url }}'
-    runs-on: 'ubuntu-latest'
-    needs: 'build'
-    steps:
-      - name: 'Deploy to GitHub Pages'
-        id: 'deployment'
-        uses: 'actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e' # ratchet:actions/deploy-pages@v4

.github/workflows/docs-rebuild.yml

@@ -1,17 +0,0 @@
-name: 'Trigger Docs Rebuild'
-on:
-  push:
-    branches:
-      - 'main'
-    paths:
-      - 'docs/**'
-jobs:
-  trigger-rebuild:
-    runs-on: 'ubuntu-latest'
-    steps:
-      - name: 'Trigger rebuild'
-        run: |
-          curl -X POST \
-            -H "Content-Type: application/json" \
-            -d '{}' \
-            "${{ secrets.DOCS_REBUILD_URL }}"

.github/workflows/e2e.yml

@@ -1,245 +1,73 @@
-name: 'Testing: E2E'
+# .github/workflows/e2e.yml
+
+name: E2E Tests
 
 on:
   push:
-    branches:
-      - 'main'
-  # This will run for PRs from the base repository, providing secrets.
-  pull_request:
-    branches:
-      - 'main'
-      - 'release/**'
-  # This will run for PRs from forks when a label is added.
-  pull_request_target:
-    types: ['labeled']
+    branches: [main]
   merge_group:
-  workflow_dispatch:
-    inputs:
-      branch_ref:
-        description: 'Branch to run on'
-        required: true
-        default: 'main'
-        type: 'string'
-
-concurrency:
-  group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
-  cancel-in-progress: |-
-    ${{ github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/heads/release/') }}
 
 jobs:
-  merge_queue_skipper:
-    name: 'Merge Queue Skipper'
-    runs-on: 'gemini-cli-ubuntu-16-core'
-    outputs:
-      skip: '${{ steps.merge-queue-e2e-skipper.outputs.skip-check }}'
-    steps:
-      - id: 'merge-queue-e2e-skipper'
-        uses: 'cariad-tech/merge-queue-ci-skipper@1032489e59437862c90a08a2c92809c903883772' # ratchet:cariad-tech/merge-queue-ci-skipper@main
-        with:
-          secret: '${{ secrets.GITHUB_TOKEN }}'
-
-  e2e_linux:
-    name: 'E2E Test (Linux) - ${{ matrix.sandbox }}'
-    needs: 'merge_queue_skipper'
-    if: |
-      needs.merge_queue_skipper.outputs.skip == 'false' &&
-      (github.event_name == 'push' ||
-      github.event_name == 'merge_group' ||
-      github.event_name == 'workflow_dispatch' ||
-      (github.event.pull_request.head.repo.full_name == github.repository) ||
-      (github.event.label.name == 'maintainer:e2e:ok'))
-    runs-on: 'gemini-cli-ubuntu-16-core'
+  e2e-test-linux:
+    name: E2E Test (Linux) - ${{ matrix.sandbox }}
+    runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
       matrix:
-        sandbox:
-          - 'sandbox:none'
-          - 'sandbox:docker'
-        node-version:
-          - '20.x'
-
+        sandbox: [sandbox:none, sandbox:docker]
+        node-version: [20.x, 22.x, 24.x]
     steps:
-      - name: 'Checkout (fork)'
-        uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
-        if: "github.event_name == 'pull_request_target'"
+      - name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+
+      - name: Set up Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
-          ref: '${{ github.event.pull_request.head.sha }}'
-          repository: '${{ github.event.pull_request.head.repo.full_name }}'
-
-      - name: 'Checkout (internal)'
-        uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
-        if: "github.event_name != 'pull_request_target'"
-        with:
-          ref: '${{ github.event.inputs.branch_ref || github.ref }}'
-
-      - name: 'Set up Node.js ${{ matrix.node-version }}'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions-node@v4
-        with:
-          node-version: '${{ matrix.node-version }}'
-
-      - name: 'Install dependencies'
-        run: 'npm ci'
-
-      - name: 'Build project'
-        run: 'npm run build'
-
-      - name: 'Set up Docker'
-        if: "matrix.sandbox == 'sandbox:docker'"
-        uses: 'docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435' # ratchet:docker/setup-buildx-action@v3
-
-      - name: 'Run E2E tests'
-        env:
-          GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
-          KEEP_OUTPUT: 'true'
-          VERBOSE: 'true'
-        shell: 'bash'
-        run: |
-          if [[ "${{ matrix.sandbox }}" == "sandbox:docker" ]]; then
-            npm run test:integration:sandbox:docker
-          else
-            npm run test:integration:sandbox:none
-          fi
-
-  e2e_mac:
-    name: 'E2E Test (macOS)'
-    needs: 'merge_queue_skipper'
-    if: |
-      needs.merge_queue_skipper.outputs.skip == 'false' &&
-      (github.event_name == 'push' ||
-      github.event_name == 'merge_group' ||
-      github.event_name == 'workflow_dispatch' ||
-      (github.event.pull_request.head.repo.full_name == github.repository) ||
-      (github.event.label.name == 'maintainer:e2e:ok'))
-    runs-on: 'macos-latest'
-    steps:
-      - name: 'Checkout (fork)'
-        uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
-        if: "github.event_name == 'pull_request_target'"
-        with:
-          ref: '${{ github.event.pull_request.head.sha }}'
-          repository: '${{ github.event.pull_request.head.repo.full_name }}'
-
-      - name: 'Checkout (internal)'
-        uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
-        if: "github.event_name != 'pull_request_target'"
-        with:
-          ref: '${{ github.event.inputs.branch_ref || github.ref }}'
-
-      - name: 'Set up Node.js 20.x'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions-node@v4
-        with:
-          node-version: '20.x'
-
-      - name: 'Install dependencies'
-        run: 'npm ci'
-
-      - name: 'Build project'
-        run: 'npm run build'
-
-      - name: 'Fix rollup optional dependencies on macOS'
-        if: "runner.os == 'macOS'"
-        run: |
-          npm cache clean --force
-      - name: 'Run E2E tests (non-Windows)'
-        if: "runner.os != 'Windows'"
-        env:
-          GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
-          KEEP_OUTPUT: 'true'
-          SANDBOX: 'sandbox:none'
-          VERBOSE: 'true'
-        run: 'npm run test:integration:sandbox:none'
-
-  e2e_windows:
-    name: 'Slow E2E - Win'
-    needs: 'merge_queue_skipper'
-    if: |
-      needs.merge_queue_skipper.outputs.skip == 'false' &&
-      (github.event_name == 'push' ||
-      github.event_name == 'merge_group' ||
-      github.event_name == 'workflow_dispatch' ||
-      (github.event.pull_request.head.repo.full_name == github.repository) ||
-      (github.event.label.name == 'maintainer:e2e:ok'))
-    runs-on: 'gemini-cli-windows-16-core'
-    continue-on-error: true
-
-    steps:
-      - name: 'Checkout (fork)'
-        uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
-        if: "github.event_name == 'pull_request_target'"
-        with:
-          ref: '${{ github.event.pull_request.head.sha }}'
-          repository: '${{ github.event.pull_request.head.repo.full_name }}'
-
-      - name: 'Checkout (internal)'
-        uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
-        if: "github.event_name != 'pull_request_target'"
-        with:
-          ref: '${{ github.event.inputs.branch_ref || github.ref }}'
-
-      - name: 'Set up Node.js 20.x'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions-node@v4
-        with:
-          node-version: '20.x'
+          node-version: ${{ matrix.node-version }}
           cache: 'npm'
 
-      - name: 'Configure Windows Defender exclusions'
-        run: |
-          Add-MpPreference -ExclusionPath $env:GITHUB_WORKSPACE -Force
-          Add-MpPreference -ExclusionPath "$env:GITHUB_WORKSPACE\node_modules" -Force
-          Add-MpPreference -ExclusionPath "$env:GITHUB_WORKSPACE\packages" -Force
-          Add-MpPreference -ExclusionPath "$env:TEMP" -Force
-        shell: 'pwsh'
+      - name: Install dependencies
+        run: npm ci
 
-      - name: 'Configure npm for Windows performance'
-        run: |
-          npm config set progress false
-          npm config set audit false
-          npm config set fund false
-          npm config set loglevel error
-          npm config set maxsockets 32
-          npm config set registry https://registry.npmjs.org/
-        shell: 'pwsh'
+      - name: Build project
+        run: npm run build
 
-      - name: 'Install dependencies'
-        run: 'npm ci'
-        shell: 'pwsh'
+      - name: Set up Docker
+        if: matrix.sandbox == 'sandbox:docker'
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
 
-      - name: 'Build project'
-        run: 'npm run build'
-        shell: 'pwsh'
+      - name: Set up Podman
+        if: matrix.sandbox == 'sandbox:podman'
+        uses: redhat-actions/podman-login@4934294ad0449894bcd1e9f191899d7292469603 # v1
+        with:
+          registry: docker.io
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: 'Run E2E tests'
+      - name: Run E2E tests
         env:
-          GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
-          KEEP_OUTPUT: 'true'
-          SANDBOX: 'sandbox:none'
-          VERBOSE: 'true'
-          NODE_OPTIONS: '--max-old-space-size=32768 --max-semi-space-size=256'
-          UV_THREADPOOL_SIZE: '32'
-          NODE_ENV: 'test'
-        shell: 'pwsh'
-        run: 'npm run test:integration:sandbox:none'
+          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
+        run: npm run test:integration:${{ matrix.sandbox }} -- --verbose --keep-output
 
-  e2e:
-    name: 'E2E'
-    if: |
-      always() && (
-        github.event_name == 'push' ||
-        github.event_name == 'merge_group' ||
-        github.event_name == 'workflow_dispatch' ||
-        (github.event.pull_request.head.repo.full_name == github.repository) ||
-        (github.event.label.name == 'maintainer:e2e:ok')
-      )
-    needs:
-      - 'e2e_linux'
-      - 'e2e_mac'
-    runs-on: 'gemini-cli-ubuntu-16-core'
+  e2e-test-macos:
+    name: E2E Test - macOS
+    runs-on: macos-latest
     steps:
-      - name: 'Check E2E test results'
-        run: |
-          if [[ (${{ needs.e2e_linux.result }} != 'success' && ${{ needs.e2e_linux.result }} != 'skipped') || \
-               (${{ needs.e2e_mac.result }} != 'success' && ${{ needs.e2e_mac.result }} != 'skipped') ]]; then
-            echo "One or more E2E jobs failed."
-            exit 1
-          fi
-          echo "All required E2E jobs passed!"
+      - name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        with:
+          node-version: 20.x
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build project
+        run: npm run build
+
+      - name: Run E2E tests
+        env:
+          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
+        run: npm run test:e2e

.github/workflows/eval.yml

@@ -1,48 +0,0 @@
-name: 'Eval'
-
-on:
-  workflow_dispatch:
-
-defaults:
-  run:
-    shell: 'bash'
-
-permissions:
-  contents: 'read'
-  id-token: 'write'
-  packages: 'read'
-
-jobs:
-  eval:
-    name: 'Eval'
-    if: >-
-      github.repository == 'google-gemini/gemini-cli'
-    runs-on: 'ubuntu-latest'
-    container:
-      image: 'ghcr.io/google-gemini/gemini-cli-swe-agent-eval@sha256:cd5edc4afd2245c1f575e791c0859b3c084a86bb3bd9a6762296da5162b35a8f'
-      credentials:
-        username: '${{ github.actor }}'
-        password: '${{ secrets.GITHUB_TOKEN }}'
-      env:
-        GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        DEFAULT_VERTEXAI_PROJECT: '${{ vars.GOOGLE_CLOUD_PROJECT }}'
-        GOOGLE_CLOUD_PROJECT: '${{ vars.GOOGLE_CLOUD_PROJECT }}'
-        GEMINI_API_KEY: '${{ secrets.EVAL_GEMINI_API_KEY }}'
-        GCLI_LOCAL_FILE_TELEMETRY: 'True'
-        EVAL_GCS_BUCKET: '${{ vars.EVAL_GCS_ARTIFACTS_BUCKET }}'
-    steps:
-      - name: 'Authenticate to Google Cloud'
-        id: 'auth'
-        uses: 'google-github-actions/auth@v2' # ratchet:exclude
-        with:
-          project_id: '${{ vars.GOOGLE_CLOUD_PROJECT }}'
-          workload_identity_provider: '${{ vars.GCP_WIF_PROVIDER }}'
-          service_account: '${{ vars.SERVICE_ACCOUNT_EMAIL }}'
-          token_format: 'access_token'
-          access_token_scopes: 'https://www.googleapis.com/auth/cloud-platform'
-
-      - name: 'Run evaluation'
-        working-directory: '/app'
-        run: |
-          poetry run exp_run --experiment-mode=on-demand --branch-or-commit=${{ github.ref_name }} --model-name=gemini-2.5-pro --dataset=swebench_verified --concurrency=15
-          poetry run python agent_prototypes/scripts/parse_gcli_logs_experiment.py --experiment_dir=experiments/adhoc/gcli_temp_exp --gcs-bucket="${EVAL_GCS_BUCKET}" --gcs-path=gh_action_artifacts

.github/workflows/gemini-automated-issue-dedup.yml

@@ -1,262 +0,0 @@
-name: '🏷️ Gemini Automated Issue Deduplication'
-
-on:
-  issues:
-    types:
-      - 'opened'
-      - 'reopened'
-  issue_comment:
-    types:
-      - 'created'
-  workflow_dispatch:
-    inputs:
-      issue_number:
-        description: 'issue number to dedup'
-        required: true
-        type: 'number'
-
-concurrency:
-  group: '${{ github.workflow }}-${{ github.event.issue.number }}'
-  cancel-in-progress: true
-
-defaults:
-  run:
-    shell: 'bash'
-
-jobs:
-  find-duplicates:
-    if: |-
-      github.repository == 'google-gemini/gemini-cli' &&
-      vars.TRIAGE_DEDUPLICATE_ISSUES != '' &&
-      (github.event_name == 'issues' ||
-       github.event_name == 'workflow_dispatch' ||
-       (github.event_name == 'issue_comment' &&
-       contains(github.event.comment.body, '@gemini-cli /deduplicate') &&
-       (github.event.comment.author_association == 'OWNER' ||
-        github.event.comment.author_association == 'MEMBER' ||
-        github.event.comment.author_association == 'COLLABORATOR')))
-    permissions:
-      contents: 'read'
-      id-token: 'write' # Required for WIF, see https://docs.github.com/en/actions/how-tos/secure-your-work/security-harden-deployments/oidc-in-google-cloud-platform#adding-permissions-settings
-      issues: 'read'
-      statuses: 'read'
-      packages: 'read'
-    timeout-minutes: 20
-    runs-on: 'ubuntu-latest'
-    outputs:
-      duplicate_issues_csv: '${{ env.DUPLICATE_ISSUES_CSV }}'
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-
-      - name: 'Log in to GitHub Container Registry'
-        uses: 'docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1' # ratchet:docker/login-action@v3
-        with:
-          registry: 'ghcr.io'
-          username: '${{ github.actor }}'
-          password: '${{ secrets.GITHUB_TOKEN }}'
-
-      - name: 'Find Duplicate Issues'
-        uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31' # ratchet:google-github-actions/run-gemini-cli@v0
-        id: 'gemini_issue_deduplication'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          ISSUE_TITLE: '${{ github.event.issue.title }}'
-          ISSUE_BODY: '${{ github.event.issue.body }}'
-          ISSUE_NUMBER: '${{ github.event.issue.number }}'
-          REPOSITORY: '${{ github.repository }}'
-          FIRESTORE_PROJECT: '${{ vars.FIRESTORE_PROJECT }}'
-        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: |-
-            {
-              "mcpServers": {
-                "issue_deduplication": {
-                  "command": "docker",
-                  "args": [
-                    "run",
-                    "-i",
-                    "--rm",
-                    "--network", "host",
-                    "-e", "GITHUB_TOKEN",
-                    "-e", "GEMINI_API_KEY",
-                    "-e", "DATABASE_TYPE",
-                    "-e", "FIRESTORE_DATABASE_ID",
-                    "-e", "GCP_PROJECT",
-                    "-e", "GOOGLE_APPLICATION_CREDENTIALS=/app/gcp-credentials.json",
-                    "-v", "${GOOGLE_APPLICATION_CREDENTIALS}:/app/gcp-credentials.json",
-                    "ghcr.io/google-gemini/gemini-cli-issue-triage@sha256:e3de1523f6c83aabb3c54b76d08940a2bf42febcb789dd2da6f95169641f94d3"
-                  ],
-                  "env": {
-                    "GITHUB_TOKEN": "${GITHUB_TOKEN}",
-                    "GEMINI_API_KEY": "${{ secrets.GEMINI_API_KEY }}",
-                    "DATABASE_TYPE":"firestore",
-                    "GCP_PROJECT": "${FIRESTORE_PROJECT}",
-                    "FIRESTORE_DATABASE_ID": "(default)",
-                    "GOOGLE_APPLICATION_CREDENTIALS": "${GOOGLE_APPLICATION_CREDENTIALS}"
-                  },
-                  "enabled": true,
-                  "timeout": 600000
-                }
-              },
-              "maxSessionTurns": 25,
-              "coreTools": [
-                "run_shell_command(echo)",
-                "run_shell_command(gh issue view)"
-              ],
-              "telemetry": {
-                "enabled": true,
-                "target": "gcp"
-              }
-            }
-          prompt: |-
-            ## Role
-            You are an issue de-duplication assistant. Your goal is to find
-            duplicate issues for a given issue.
-            ## Steps
-            1.  **Find Potential Duplicates:**
-                - The repository is ${{ github.repository }} and the issue number is ${{ github.event.issue.number }}.
-                - Use the `duplicates` tool with the `repo` and `issue_number` to find potential duplicates for the current issue. Do not use the `threshold` parameter.
-                - If no duplicates are found, you are done.
-                - Print the JSON output from the `duplicates` tool to the logs.
-            2.  **Refine Duplicates List (if necessary):**
-                - If the `duplicates` tool returns between 1 and 14 results, you must refine the list.
-                - For each potential duplicate issue, run `gh issue view <issue-number> --json title,body,comments` to fetch its content.
-                - Also fetch the content of the original issue: `gh issue view "${ISSUE_NUMBER}" --json title,body,comments`.
-                - Carefully analyze the content (title, body, comments) of the original issue and all potential duplicates.
-                - It is very important if the comments on either issue mention that they are not duplicates of each other, to treat them as not duplicates.
-                - Based on your analysis, create a final list containing only the issues you are highly confident are actual duplicates.
-                - If your final list is empty, you are done.
-                - Print to the logs if you omitted any potential duplicates based on your analysis.
-                - If the `duplicates` tool returned 15+ results, use the top 15 matches (based on descending similarity score value) to perform this step.
-            3.  **Output final duplicates list as CSV:**
-                - Convert the list of appropriate duplicate issue numbers into a comma-separated list (CSV). If there are no appropriate duplicates, use the empty string.
-                - Use the "echo" shell command to append the CSV of issue numbers into the filepath referenced by the environment variable "${GITHUB_ENV}":
-                  echo "DUPLICATE_ISSUES_CSV=[DUPLICATE_ISSUES_AS_CSV]" >> "${GITHUB_ENV}"
-            ## Guidelines
-            - Only use the `duplicates` and `run_shell_command` tools.
-            - The `run_shell_command` tool can be used with `gh issue view`.
-            - Do not download or read media files like images, videos, or links. The `--json` flag for `gh issue view` will prevent this.
-            - Do not modify the issue content or status.
-            - Do not add comments or labels.
-            - Reference all shell variables as "${VAR}" (with quotes and braces).
-
-  add-comment-and-label:
-    needs: 'find-duplicates'
-    if: |-
-      github.repository == 'google-gemini/gemini-cli' &&
-      vars.TRIAGE_DEDUPLICATE_ISSUES != '' &&
-      needs.find-duplicates.outputs.duplicate_issues_csv != '' &&
-      (
-       github.event_name == 'issues' ||
-       github.event_name == 'workflow_dispatch' ||
-       (
-        github.event_name == 'issue_comment' &&
-        contains(github.event.comment.body, '@gemini-cli /deduplicate') &&
-        (
-         github.event.comment.author_association == 'OWNER' ||
-         github.event.comment.author_association == 'MEMBER' ||
-         github.event.comment.author_association == 'COLLABORATOR'
-        )
-       )
-      )
-    permissions:
-      issues: 'write'
-    timeout-minutes: 5
-    runs-on: 'ubuntu-latest'
-    steps:
-      - name: 'Generate GitHub App Token'
-        id: 'generate_token'
-        uses: 'actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b' # ratchet:actions/create-github-app-token@v2
-        with:
-          app-id: '${{ secrets.APP_ID }}'
-          private-key: '${{ secrets.PRIVATE_KEY }}'
-          permission-issues: 'write'
-
-      - name: 'Comment and Label Duplicate Issue'
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
-        env:
-          DUPLICATES_OUTPUT: '${{ needs.find-duplicates.outputs.duplicate_issues_csv }}'
-        with:
-          github-token: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}'
-          script: |-
-            const rawCsv = process.env.DUPLICATES_OUTPUT;
-            core.info(`Raw duplicates CSV: ${rawCsv}`);
-            const duplicateIssues = rawCsv.split(',').map(s => s.trim()).filter(s => s);
-
-            if (duplicateIssues.length === 0) {
-              core.info('No duplicate issues found. Nothing to do.');
-              return;
-            }
-
-            const issueNumber = ${{ github.event.issue.number }};
-
-            function formatCommentBody(issues, updated = false) {
-              const header = updated
-                ? 'Found possible duplicate issues (updated):'
-                : 'Found possible duplicate issues:';
-              const issuesList = issues.map(num => `- #${num}`).join('\n');
-              const footer = 'If you believe this is not a duplicate, please remove the `status/possible-duplicate` label.';
-              const magicComment = '<!-- gemini-cli-deduplication -->';
-              return `${header}\n\n${issuesList}\n\n${footer}\n${magicComment}`;
-            }
-
-            const newCommentBody = formatCommentBody(duplicateIssues);
-            const newUpdatedCommentBody = formatCommentBody(duplicateIssues, true);
-
-            const { data: comments } = await github.rest.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: issueNumber,
-            });
-
-            const magicComment = '<!-- gemini-cli-deduplication -->';
-            const existingComment = comments.find(comment =>
-              comment.user.type === 'Bot' && comment.body.includes(magicComment)
-            );
-
-            let commentMade = false;
-
-            if (existingComment) {
-              // To check if lists are same, just compare the formatted bodies without headers.
-              const existingBodyForCompare = existingComment.body.substring(existingComment.body.indexOf('- #'));
-              const newBodyForCompare = newCommentBody.substring(newCommentBody.indexOf('- #'));
-
-              if (existingBodyForCompare.trim() !== newBodyForCompare.trim()) {
-                core.info(`Updating existing comment ${existingComment.id}`);
-                await github.rest.issues.updateComment({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  comment_id: existingComment.id,
-                  body: newUpdatedCommentBody,
-                });
-                commentMade = true;
-              } else {
-                core.info('Existing comment is up-to-date. Nothing to do.');
-              }
-            } else {
-              core.info('Creating new comment.');
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: issueNumber,
-                body: newCommentBody,
-              });
-              commentMade = true;
-            }
-
-            if (commentMade) {
-              core.info('Adding "status/possible-duplicate" label.');
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: issueNumber,
-                labels: ['status/possible-duplicate'],
-              });
-            }

.github/workflows/gemini-automated-issue-triage.yml

@@ -16,7 +16,7 @@ on:
         type: 'number'
 
 concurrency:
-  group: '${{ github.workflow }}-${{ github.event.issue.number || github.event.inputs.issue_number }}'
+  group: '${{ github.workflow }}-${{ github.event.issue.number }}'
   cancel-in-progress: true
 
 defaults:
@@ -29,90 +29,41 @@ permissions:
   issues: 'write'
   statuses: 'write'
   packages: 'read'
-  actions: 'write' # Required for cancelling a workflow run
 
 jobs:
   triage-issue:
-    if: |-
+    if: >
       github.repository == 'google-gemini/gemini-cli' &&
-      (
-        github.event_name == 'workflow_dispatch' ||
-        (
-          (github.event_name == 'issues' || github.event_name == 'issue_comment') &&
-          contains(github.event.issue.labels.*.name, 'status/need-triage') &&
-          (github.event_name != 'issue_comment' || (
-            contains(github.event.comment.body, '@gemini-cli /triage') &&
-            (github.event.comment.author_association == 'OWNER' || github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'COLLABORATOR')
-          ))
-        )
-      )
+      (github.event_name == 'issues' ||
+       github.event_name == 'workflow_dispatch' ||
+       (github.event_name == 'issue_comment' &&
+       contains(github.event.comment.body, '@gemini-cli /triage') &&
+       (github.event.comment.author_association == 'OWNER' ||
+        github.event.comment.author_association == 'MEMBER' ||
+        github.event.comment.author_association == 'COLLABORATOR')))
     timeout-minutes: 5
     runs-on: 'ubuntu-latest'
+
     steps:
-      - name: 'Get issue data for manual trigger'
-        id: 'get_issue_data'
-        if: |-
-          github.event_name == 'workflow_dispatch'
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
-        with:
-          github-token: '${{ secrets.GITHUB_TOKEN }}'
-          script: |
-            const { data: issue } = await github.rest.issues.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: ${{ github.event.inputs.issue_number }},
-            });
-            core.setOutput('title', issue.title);
-            core.setOutput('body', issue.body);
-            core.setOutput('labels', issue.labels.map(label => label.name).join(','));
-            return issue;
-
-      - name: 'Check for triage label on manual trigger'
-        if: |-
-          github.event_name == 'workflow_dispatch' && !contains(steps.get_issue_data.outputs.labels, 'status/need-triage')
-        run: |
-          echo "Issue #${{ github.event.inputs.issue_number }} does not have the 'status/need-triage' label. Stopping workflow."
-          exit 1
-
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
+      - name: 'Checkout repository'
+        uses: 'actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683'
 
       - name: 'Generate GitHub App Token'
         id: 'generate_token'
-        uses: 'actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b' # ratchet:actions/create-github-app-token@v2
+        uses: 'actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e'
         with:
           app-id: '${{ secrets.APP_ID }}'
           private-key: '${{ secrets.PRIVATE_KEY }}'
-          permission-issues: 'write'
 
-      - name: 'Get Repository Labels'
-        id: 'get_labels'
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
-        with:
-          github-token: '${{ steps.generate_token.outputs.token }}'
-          script: |-
-            const { data: labels } = await github.rest.issues.listLabelsForRepo({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-            });
-            const labelNames = labels.map(label => label.name);
-            core.setOutput('available_labels', labelNames.join(','));
-            core.info(`Found ${labelNames.length} labels: ${labelNames.join(', ')}`);
-            return labelNames;
-
-      - name: 'Run Gemini Issue Analysis'
-        uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31' # ratchet:google-github-actions/run-gemini-cli@v0
-        id: 'gemini_issue_analysis'
+      - name: 'Run Gemini Issue Triage'
+        uses: 'google-github-actions/run-gemini-cli@20351b5ea2b4179431f1ae8918a246a0808f8747'
+        id: 'gemini_issue_triage'
         env:
-          GITHUB_TOKEN: '' # Do not pass any auth token here since this runs on untrusted inputs
-          ISSUE_TITLE: >-
-            ${{ github.event_name == 'workflow_dispatch' && steps.get_issue_data.outputs.title || github.event.issue.title }}
-          ISSUE_BODY: >-
-            ${{ github.event_name == 'workflow_dispatch' && steps.get_issue_data.outputs.body || github.event.issue.body }}
-          ISSUE_NUMBER: >-
-            ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.issue_number || github.event.issue.number }}
+          GITHUB_TOKEN: '${{ steps.generate_token.outputs.token }}'
+          ISSUE_TITLE: '${{ github.event.issue.title }}'
+          ISSUE_BODY: '${{ github.event.issue.body }}'
+          ISSUE_NUMBER: '${{ github.event.issue.number }}'
           REPOSITORY: '${{ github.repository }}'
-          AVAILABLE_LABELS: '${{ steps.get_labels.outputs.available_labels }}'
         with:
           gcp_workload_identity_provider: '${{ vars.GCP_WIF_PROVIDER }}'
           gcp_project_id: '${{ vars.GOOGLE_CLOUD_PROJECT }}'
@@ -125,7 +76,10 @@ jobs:
             {
               "maxSessionTurns": 25,
               "coreTools": [
-                "run_shell_command(echo)"
+                "run_shell_command(echo)",
+                "run_shell_command(gh label list)",
+                "run_shell_command(gh issue edit)",
+                "run_shell_command(gh issue list)"
               ],
               "telemetry": {
                 "enabled": true,
@@ -135,52 +89,32 @@ jobs:
           prompt: |-
             ## Role
 
-            You are an issue triage assistant. Analyze the current GitHub issue
-            and identify the most appropriate existing labels by only using the provided data. Use the available
-            tools to gather information; do not ask for information to be
-            provided. Do not remove the following labels titled maintainer,  help wanted or good first issue.
+            You are an issue triage assistant. Analyze the current GitHub issue and apply the most appropriate existing labels. Use the available
+            tools to gather information; do not ask for information to be provided. Do not remove labels titled help wanted or good first issue.
 
             ## Steps
 
-            1. You are only able to use the echo command. Review the available labels in the environment variable: "${AVAILABLE_LABELS}".
+            1. Run: `gh label list --repo ${{ github.repository }} --limit 100` to get all available labels.
             2. Review the issue title and body provided in the environment variables: "${ISSUE_TITLE}" and "${ISSUE_BODY}".
-            3. Select the most relevant labels from the existing labels, focusing on kind/*, area/*, sub-area/* and priority/*. For area/* and kind/* limit yourself to only the single most applicable label in each case.
-            4. If the issue already has area/ label, dont try to change it. Similarly, if the issue already has a kind/ label don't change it. And if the issue already has a priority/ label do not change it for example:
-               If an issue has area/core and kind/bug  you will only add a priority/ label.
-               Instead if an issue has no labels, you will could add one lable of each kind.
-            5. For each issue please check if CLI version is present, this is usually in the output of the /about command and will look like 0.1.5 for anything more than 6 versions older than the most recent should add the status/need-retesting label.
-            6. If you see that the issue doesn't look like it has sufficient information recommend the status/need-information label and leave a comment politely requesting the relevant information, eg.. if repro steps are missing request for repro steps. if version information is missing request for version information into the explanation section below.
-            7. Output the appropriate labels for this issue in JSON format with explanation, for example:
-               ```
-               {"labels_to_set": ["kind/bug", "priority/p0"], "explanation": "This is a critical bug report affecting main functionality"}
-               ```
-            8. If the issue cannot be classified using the available labels, output:
-               ```
-               {"labels_to_set": [], "explanation": "Unable to classify this issue with available labels"}
-               ```
+            3. Ignore any existing priorities or tags on the issue. Just report your findings.
+            4. Select the most relevant labels from the existing labels, focusing on kind/*, area/*, sub-area/* and priority/*. For area/* and kind/* limit yourself to only the single most applicable label in each case. 
+            6. Apply the selected labels to this issue using: `gh issue edit ${{ github.event.issue.number }} --repo ${{ github.repository }} --add-label "label1,label2"`.
+            7. For each issue please check if CLI version is present, this is usually in the output of the /about command  and will look like 0.1.5 for anything more than 6 versions older than the most recent should add the status/need-retesting label.
+            8. If you see that the issue doesn’t look like it has sufficient information recommend the status/need-information label.
             9. Use Area definitions mentioned below to help you narrow down issues.
-            10. If you think an issue might be a Priority/P0 do not apply the priority/p0 label. Instead apply a status/manual-triage label and include a note in your explanation.
-            11. If you are uncertain and have not been able to apply one each of kind/, area/ and priority/ , apply the status/manual-triage label.
 
             ## Guidelines
 
-            - Only use labels that already exist in the repository
-            - Do not add comments or modify the issue content
-            - Triage only the current issue
-            - Identify only one area/ label
-            - Identify only one kind/ label
-            - Identify all applicable sub-area/* and priority/* labels based on the issue content. It's ok to have multiple of these
-            - 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
-            - Reference all shell variables as "${VAR}" (with quotes and braces)
-            - Output only valid JSON format
-            - Do not include any explanation or additional text, just the JSON
-
-            Categorization Guidelines:
+            - Only use labels that already exist in the repository.
+            - Do not add comments or modify the issue content.
+            - Triage only the current issue.
+            - Apply only one area/ label.
+            - Apply only one kind/ label.
+            - Apply all applicable sub-area/* and priority/* labels based on the issue content. It's ok to have multiple of these.
+            - 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: 
             P0: Critical / Blocker
-            - A P0 bug is a catastrophic failure that demands immediate attention.
-            - To be a P0 it means almost all users are running into this issue and it is blocking users from being able to use the product.
-            - You would see this in the form of many comments from different developers on the bug.
-            - It represents a complete showstopper for a significant portion of users or for the development process itself.
+            - A P0 bug is a catastrophic failure that demands immediate attention. It represents a complete showstopper for a significant portion of users or for the development process itself.
             Impact:
             - Blocks development or testing for the entire team.
             - Major security vulnerability that could compromise user data or system integrity.
@@ -189,17 +123,14 @@ jobs:
             Qualifier: Is the main function of the software broken?
             Example: The gemini auth login command fails with an unrecoverable error, preventing any user from authenticating and using the rest of the CLI.
             P1: High
-            - A P1 bug is a serious issue that significantly degrades the user experience or impacts a core feature.
-            - While not a complete blocker, it's a major problem that needs a fast resolution. Feature requests are almost never P1.
-            - Once again this would be affecting many users.
-            - You would see this in the form of comments from different developers on the bug.
+            - A P1 bug is a serious issue that significantly degrades the user experience or impacts a core feature. While not a complete blocker, it's a major problem that needs a fast resolution. Feature requests are almost never P1.
             Impact:
             - A core feature is broken or behaving incorrectly for a large number of users or large number of use cases.
             - Review the bug details and comments to try figure out if this issue affects a large set of use cases or if it's a narrow set of use cases.
             - Severe performance degradation making the application frustratingly slow.
             - No straightforward workaround exists, or the workaround is difficult and non-obvious.
             Qualifier: Is a key feature unusable or giving very wrong results?
-            Example: Gemini CLI enters a loop when making read-many-files tool call. I am unable to break out of the loop and gemini doesn't follow instructions subsequently.
+            Example: The gemini -p "..." command consistently returns a malformed JSON response or an empty result, making the CLI's primary generation feature unreliable.
             P2: Medium
             - A P2 bug is a moderately impactful issue. It's a noticeable problem but doesn't prevent the use of the software's main functionality.
             Impact:
@@ -219,16 +150,16 @@ jobs:
             - If users are talking about issues where the model gets downgraded from pro to flash then i want you to categorize that as a performance issue
             - 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.
             Definition of Areas
-            area/ux:
+            area/ux: 
             - Issues concerning user-facing elements like command usability, interactive features, help docs, and perceived performance.
-            - I am seeing my screen flicker when using Gemini CLI
-            - I am seeing the output malformed
-            - Theme changes aren't taking effect
+            - I am seeing my screen flicker when using Gemini CLI 
+            - I am seeing the output malformed 
+            - Theme changes aren't taking effect 
             - My keyboard inputs arent' being recognzied
-            area/platform:
+            area/platform: 
             - Issues related to installation, packaging, OS compatibility (Windows, macOS, Linux), and the underlying CLI framework.
             area/background: Issues related to long-running background tasks, daemons, and autonomous or proactive agent features.
-            area/models:
+            area/models: 
             - i am not getting a response that is reasonable or expected. this can include things like
             - I am calling a tool and the tool is not performing as expected.
             - i am expecting a tool to be called and it is not getting called ,
@@ -242,10 +173,10 @@ jobs:
             - Memory compression
             - unexpected responses,
             - poor quality of generated code
-            area/tools:
-            - These are primarily issues related to Model Context Protocol
-            - These are issues that mention MCP support
-            - feature requests asking for support for new tools.
+            area/tools: 
+            - These are primarily issues related to Model Context Protocol 
+            - These are issues that mention MCP support 
+            - feature requests asking for support for new tools. 
             area/core: Issues with fundamental components like command parsing, configuration management, session state, and the main API client logic. Introducing multi-modality
             area/contribution: Issues related to improving the developer contribution experience, such as CI/CD pipelines, build scripts, and test automation infrastructure.
             area/authentication: Issues related to user identity, login flows, API key handling, credential storage, and access token management, unable to sign in selecting wrong authentication path etc..
@@ -258,77 +189,162 @@ jobs:
             - other general software performance like, memory usage, CPU consumption, and algorithmic efficiency.
             - Switching models from one to the other unexpectedly.
 
-      - name: 'Apply Labels to Issue'
+      - name: 'Post Issue Triage Failure Comment'
         if: |-
-          ${{ steps.gemini_issue_analysis.outputs.summary != '' }}
-        env:
-          REPOSITORY: '${{ github.repository }}'
-          ISSUE_NUMBER: '${{ github.event.issue.number || github.event.inputs.issue_number }}'
-          LABELS_OUTPUT: '${{ steps.gemini_issue_analysis.outputs.summary }}'
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
-        with:
-          github-token: '${{ steps.generate_token.outputs.token }}'
-          script: |-
-            // Strip code block markers if present
-            const rawLabels = process.env.LABELS_OUTPUT;
-            core.info(`Raw labels JSON: ${rawLabels}`);
-            let parsedLabels;
-            try {
-              const jsonMatch = rawLabels.match(/```json\s*([\s\S]*?)\s*```/);
-              if (!jsonMatch || !jsonMatch[1]) {
-                throw new Error("Could not find a ```json ... ``` block in the output.");
-              }
-              const jsonString = jsonMatch[1].trim();
-              parsedLabels = JSON.parse(jsonString);
-              core.info(`Parsed labels JSON: ${JSON.stringify(parsedLabels)}`);
-            } catch (err) {
-              core.setFailed(`Failed to parse labels JSON from Gemini output: ${err.message}\nRaw output: ${rawLabels}`);
-              return;
-            }
-
-            const issueNumber = parseInt(process.env.ISSUE_NUMBER);
-            const explanation = parsedLabels.explanation || '';
-            const labelsToSet = parsedLabels.labels_to_set || [];
-            labelsToSet.push('status/bot-triaged');
-
-            // Set labels based on triage result
-            if (labelsToSet.length > 0) {
-              await github.rest.issues.setLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: issueNumber,
-                labels: labelsToSet
-              });
-              const explanationInfo = explanation ? ` - ${explanation}` : '';
-              core.info(`Successfully set labels for #${issueNumber}: ${labelsToSet.join(', ')}${explanationInfo}`);
-            } else {
-              // If no labels to set, leave the issue as is
-              const explanationInfo = explanation ? ` - ${explanation}` : '';
-              core.info(`No labels to set for #${issueNumber}, leaving as is${explanationInfo}`);
-            }
-
-            if (explanation) {
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: issueNumber,
-                body: explanation,
-              });
-            }
-
-      - name: 'Post Issue Analysis Failure Comment'
-        if: |-
-          ${{ failure() && steps.gemini_issue_analysis.outcome == 'failure' }}
-        env:
-          ISSUE_NUMBER: '${{ github.event.issue.number || github.event.inputs.issue_number }}'
-          RUN_URL: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
+          ${{ failure() && steps.gemini_issue_triage.outcome == 'failure' }}
         uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
         with:
           github-token: '${{ steps.generate_token.outputs.token }}'
           script: |-
             github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: parseInt(process.env.ISSUE_NUMBER),
-              body: 'There is a problem with the Gemini CLI issue triaging. Please check the [action logs](${process.env.RUN_URL}) for details.'
+              owner: '${{ github.repository }}'.split('/')[0],
+              repo: '${{ github.repository }}'.split('/')[1],
+              issue_number: '${{ github.event.issue.number }}',
+              body: 'There is a problem with the Gemini CLI issue triaging. Please check the [action logs](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) for details.'
             })
+
+  deduplicate-issues:
+    if: >
+      github.repository == 'google-gemini/gemini-cli' &&
+      vars.TRIAGE_DEDUPLICATE_ISSUES != '' &&
+      (github.event_name == 'issues' ||
+       github.event_name == 'workflow_dispatch' ||
+       (github.event_name == 'issue_comment' &&
+       contains(github.event.comment.body, '@gemini-cli /deduplicate') &&
+       (github.event.comment.author_association == 'OWNER' ||
+        github.event.comment.author_association == 'MEMBER' ||
+        github.event.comment.author_association == 'COLLABORATOR')))
+
+    timeout-minutes: 20
+    runs-on: 'ubuntu-latest'
+    steps:
+      - name: 'Checkout repository'
+        uses: 'actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683'
+
+      - name: 'Generate GitHub App Token'
+        id: 'generate_token'
+        uses: 'actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e'
+        with:
+          app-id: '${{ secrets.APP_ID }}'
+          private-key: '${{ secrets.PRIVATE_KEY }}'
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: 'Run Gemini Issue Deduplication'
+        uses: 'google-github-actions/run-gemini-cli@20351b5ea2b4179431f1ae8918a246a0808f8747'
+        id: 'gemini_issue_deduplication'
+        env:
+          GITHUB_TOKEN: '${{ steps.generate_token.outputs.token }}'
+          ISSUE_TITLE: '${{ github.event.issue.title }}'
+          ISSUE_BODY: '${{ github.event.issue.body }}'
+          ISSUE_NUMBER: '${{ github.event.issue.number }}'
+          REPOSITORY: '${{ github.repository }}'
+          FIRESTORE_PROJECT: '${{ vars.FIRESTORE_PROJECT }}'
+        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: |-
+            {
+              "mcpServers": {
+                "issue_deduplication": {
+                  "command": "docker",
+                  "args": [
+                    "run",
+                    "-i",
+                    "--rm",
+                    "--network", "host",
+                    "-e", "GITHUB_TOKEN",
+                    "-e", "GEMINI_API_KEY",
+                    "-e", "DATABASE_TYPE",
+                    "-e", "FIRESTORE_DATABASE_ID",
+                    "-e", "GCP_PROJECT",
+                    "-e", "GOOGLE_APPLICATION_CREDENTIALS=/app/gcp-credentials.json",
+                    "-v", "${GOOGLE_APPLICATION_CREDENTIALS}:/app/gcp-credentials.json",
+                    "ghcr.io/google-gemini/gemini-cli-issue-triage@sha256:e3de1523f6c83aabb3c54b76d08940a2bf42febcb789dd2da6f95169641f94d3"
+                  ],
+                  "env": {
+                    "GITHUB_TOKEN": "${GITHUB_TOKEN}",
+                    "GEMINI_API_KEY": "${{ secrets.GEMINI_API_KEY }}",
+                    "DATABASE_TYPE":"firestore",
+                    "GCP_PROJECT": "${FIRESTORE_PROJECT}",
+                    "FIRESTORE_DATABASE_ID": "(default)",
+                    "GOOGLE_APPLICATION_CREDENTIALS": "${GOOGLE_APPLICATION_CREDENTIALS}"
+                  },
+                  "enabled": true,
+                  "timeout": 600000
+                }
+              },
+              "maxSessionTurns": 25,
+              "coreTools": [
+                "run_shell_command(echo)",
+                "run_shell_command(gh issue comment)",
+                "run_shell_command(gh issue view)",
+                "run_shell_command(gh issue edit)"
+              ],
+              "telemetry": {
+                "enabled": true,
+                "target": "gcp"
+              }
+            }
+          prompt: |-
+            ## Role
+            You are an issue de-duplication assistant. Your goal is to find
+            duplicate issues, label the current issue as a duplicate, and notify
+            the user by commenting on the current issue, while avoiding
+            duplicate comments.
+            ## Steps
+            1.  **Find Potential Duplicates:**
+                - The repository is ${{ github.repository }} and the issue number is ${{ github.event.issue.number }}.
+                - Use the `duplicates` tool with the `repo` and `issue_number` to find potential duplicates for the current issue. Do not use the `threshold` parameter.
+                - If no duplicates are found, you are done.
+                - Print the JSON output from the `duplicates` tool to the logs.
+            2.  **Refine Duplicates List (if necessary):**
+                - If the `duplicates` tool returns between 1 and 14 results, you must refine the list.
+                - For each potential duplicate issue, run `gh issue view <issue-number> --json title,body,comments` to fetch its content.
+                - Also fetch the content of the original issue: `gh issue view "${ISSUE_NUMBER}" --json title,body,comments`.
+                - Carefully analyze the content (title, body, comments) of the original issue and all potential duplicates.
+                - It is very important if the comments on either issue mention that they are not duplicates of each other, to treat them as not duplicates.
+                - Based on your analysis, create a final list containing only the issues you are highly confident are actual duplicates.
+                - If your final list is empty, you are done.
+                - Print to the logs if you omitted any potential duplicates based on your analysis.
+                - If the `duplicates` tool returned 15+ results, use the top 15 matches (based on descending similarity score value) to perform this step.
+            3.  **Format Final Duplicates List:**
+                Format the final list of duplicates into a markdown string.
+                The format should be:
+                "Found possible duplicate issues:\n\n- #${issue_number}\n\nIf you believe this is not a duplicate, please remove the `status/possible-duplicate` label."
+                Add an HTML comment to the end for identification: `<!-- gemini-cli-deduplication -->`
+            4.  **Check for Existing Comment:**
+                - Run `gh issue view "${ISSUE_NUMBER}" --json comments` to get all
+                  comments on the issue.
+                - Look for a comment made by a bot (the author's login often ends in `[bot]`) that contains `<!-- gemini-cli-deduplication -->`.
+                - If you find such a comment, store its `id` and `body`.
+            5.  **Decide Action:**
+                - **If an existing comment is found:**
+                    - Compare the new list of duplicate issues with the list from the existing comment's body.
+                    - If they are the same, do nothing.
+                    - If they are different, edit the existing comment. Use
+                      `gh issue comment "${ISSUE_NUMBER}" --edit-comment <comment-id> --body "..."`.
+                      The new body should be the new list of duplicates, but with the header "Found possible duplicate issues (updated):".
+                - **If no existing comment is found:**
+                    - Create a new comment with the list of duplicates.
+                    - Use `gh issue comment "${ISSUE_NUMBER}" --body "..."`.
+            6.  **Add Duplicate Label:**
+                - If you created or updated a comment in the previous step, add the `duplicate` label to the current issue.
+                - Use `gh issue edit "${ISSUE_NUMBER}" --add-label "status/possible-duplicate"`.
+            ## Guidelines
+            - Only use the `duplicates` and `run_shell_command` tools.
+            - The `run_shell_command` tool can be used with `gh issue view`, `gh issue comment`, and `gh issue edit`.
+            - Do not download or read media files like images, videos, or links. The `--json` flag for `gh issue view` will prevent this.
+            - Do not modify the issue content or status.
+            - Only comment on and label the current issue.
+            - Reference all shell variables as "${VAR}" (with quotes and braces).

.github/workflows/gemini-scheduled-issue-dedup.yml

@@ -1,116 +0,0 @@
-name: '📋 Gemini Scheduled Issue Deduplication'
-
-on:
-  schedule:
-    - cron: '0 * * * *' # Runs every hour
-  workflow_dispatch:
-
-concurrency:
-  group: '${{ github.workflow }}'
-  cancel-in-progress: true
-
-defaults:
-  run:
-    shell: 'bash'
-
-jobs:
-  refresh-embeddings:
-    if: |-
-      ${{ vars.TRIAGE_DEDUPLICATE_ISSUES != '' && github.repository == 'google-gemini/gemini-cli' }}
-    permissions:
-      contents: 'read'
-      id-token: 'write' # Required for WIF, see https://docs.github.com/en/actions/how-tos/secure-your-work/security-harden-deployments/oidc-in-google-cloud-platform#adding-permissions-settings
-      issues: 'read'
-      statuses: 'read'
-      packages: 'read'
-    timeout-minutes: 20
-    runs-on: 'ubuntu-latest'
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-
-      - name: 'Log in to GitHub Container Registry'
-        uses: 'docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1' # ratchet:docker/login-action@v3
-        with:
-          registry: 'ghcr.io'
-          username: '${{ github.actor }}'
-          password: '${{ secrets.GITHUB_TOKEN }}'
-
-      - name: 'Run Gemini Issue Deduplication Refresh'
-        uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31' # ratchet:google-github-actions/run-gemini-cli@v0
-        id: 'gemini_refresh_embeddings'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          ISSUE_TITLE: '${{ github.event.issue.title }}'
-          ISSUE_BODY: '${{ github.event.issue.body }}'
-          ISSUE_NUMBER: '${{ github.event.issue.number }}'
-          REPOSITORY: '${{ github.repository }}'
-          FIRESTORE_PROJECT: '${{ vars.FIRESTORE_PROJECT }}'
-        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: |-
-            {
-              "mcpServers": {
-                "issue_deduplication": {
-                  "command": "docker",
-                  "args": [
-                    "run",
-                    "-i",
-                    "--rm",
-                    "--network", "host",
-                    "-e", "GITHUB_TOKEN",
-                    "-e", "GEMINI_API_KEY",
-                    "-e", "DATABASE_TYPE",
-                    "-e", "FIRESTORE_DATABASE_ID",
-                    "-e", "GCP_PROJECT",
-                    "-e", "GOOGLE_APPLICATION_CREDENTIALS=/app/gcp-credentials.json",
-                    "-v", "${GOOGLE_APPLICATION_CREDENTIALS}:/app/gcp-credentials.json",
-                    "ghcr.io/google-gemini/gemini-cli-issue-triage@sha256:e3de1523f6c83aabb3c54b76d08940a2bf42febcb789dd2da6f95169641f94d3"
-                  ],
-                  "env": {
-                    "GITHUB_TOKEN": "${GITHUB_TOKEN}",
-                    "GEMINI_API_KEY": "${{ secrets.GEMINI_API_KEY }}",
-                    "DATABASE_TYPE":"firestore",
-                    "GCP_PROJECT": "${FIRESTORE_PROJECT}",
-                    "FIRESTORE_DATABASE_ID": "(default)",
-                    "GOOGLE_APPLICATION_CREDENTIALS": "${GOOGLE_APPLICATION_CREDENTIALS}"
-                  },
-                  "enabled": true,
-                  "timeout": 600000
-                }
-              },
-              "maxSessionTurns": 25,
-              "coreTools": [
-                "run_shell_command(echo)"
-              ],
-              "telemetry": {
-                "enabled": true,
-                "target": "gcp"
-              }
-            }
-          prompt: |-
-            ## Role
-
-            You are a database maintenance assistant for a GitHub issue deduplication system.
-
-            ## Goal
-
-            Your sole responsibility is to refresh the embeddings for all open issues in the repository to ensure the deduplication database is up-to-date.
-
-            ## Steps
-
-            1.  **Extract Repository Information:** The repository is ${{ github.repository }}.
-            2.  **Refresh Embeddings:** Call the `refresh` tool with the correct `repo`. Do not use the `force` parameter.
-            3.  **Log Output:** Print the JSON output from the `refresh` tool to the logs.
-
-            ## Guidelines
-
-            - Only use the `refresh` tool.
-            - Do not attempt to find duplicates or modify any issues.
-            - Your only task is to call the `refresh` tool and log its output.

.github/workflows/gemini-scheduled-issue-triage.yml

@@ -14,32 +14,35 @@ defaults:
     shell: 'bash'
 
 permissions:
+  contents: 'read'
   id-token: 'write'
   issues: 'write'
+  statuses: 'write'
+  packages: 'read'
 
 jobs:
   triage-issues:
     timeout-minutes: 10
-    if: |-
-      ${{ github.repository == 'google-gemini/gemini-cli' }}
+    if: ${{ github.repository == 'google-gemini/gemini-cli' }}
     runs-on: 'ubuntu-latest'
+
     steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
+      - name: 'Checkout repository'
+        uses: 'actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683' # ratchet:actions/checkout@v4
 
       - name: 'Generate GitHub App Token'
         id: 'generate_token'
-        uses: 'actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b' # ratchet:actions/create-github-app-token@v2
+        uses: 'actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e' # ratchet:actions/create-github-app-token@v2
         with:
           app-id: '${{ secrets.APP_ID }}'
           private-key: '${{ secrets.PRIVATE_KEY }}'
-          permission-issues: 'write'
 
       - name: 'Find untriaged issues'
         id: 'find_issues'
         env:
           GITHUB_TOKEN: '${{ steps.generate_token.outputs.token }}'
           GITHUB_REPOSITORY: '${{ github.repository }}'
+          GITHUB_OUTPUT: '${{ github.output }}'
         run: |-
           set -euo pipefail
 
@@ -49,7 +52,7 @@ jobs:
 
           echo '🏷️ Finding issues that need triage...'
           NEED_TRIAGE_ISSUES="$(gh issue list --repo "${GITHUB_REPOSITORY}" \
-            --search "is:open is:issue label:\"status/need-triage\""  --limit 1000 --json number,title,body)"
+            --search 'is:open is:issue label:"status/needs-triage"' --json number,title,body)"
 
           echo '🔄 Merging and deduplicating issues...'
           ISSUES="$(echo "${NO_LABEL_ISSUES}" "${NEED_TRIAGE_ISSUES}" | jq -c -s 'add | unique_by(.number)')"
@@ -60,31 +63,15 @@ jobs:
           ISSUE_COUNT="$(echo "${ISSUES}" | jq 'length')"
           echo "✅ Found ${ISSUE_COUNT} issues to triage! 🎯"
 
-      - name: 'Get Repository Labels'
-        id: 'get_labels'
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
-        with:
-          github-token: '${{ steps.generate_token.outputs.token }}'
-          script: |-
-            const { data: labels } = await github.rest.issues.listLabelsForRepo({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-            });
-            const labelNames = labels.map(label => label.name);
-            core.setOutput('available_labels', labelNames.join(','));
-            core.info(`Found ${labelNames.length} labels: ${labelNames.join(', ')}`);
-            return labelNames;
-
-      - name: 'Run Gemini Issue Analysis'
+      - name: 'Run Gemini Issue Triage'
         if: |-
           ${{ steps.find_issues.outputs.issues_to_triage != '[]' }}
-        uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31' # ratchet:google-github-actions/run-gemini-cli@v0
-        id: 'gemini_issue_analysis'
+        uses: 'google-github-actions/run-gemini-cli@20351b5ea2b4179431f1ae8918a246a0808f8747'
+        id: 'gemini_issue_triage'
         env:
-          GITHUB_TOKEN: '' # Do not pass any auth token here since this runs on untrusted inputs
+          GITHUB_TOKEN: '${{ steps.generate_token.outputs.token }}'
           ISSUES_TO_TRIAGE: '${{ steps.find_issues.outputs.issues_to_triage }}'
           REPOSITORY: '${{ github.repository }}'
-          AVAILABLE_LABELS: '${{ steps.get_labels.outputs.available_labels }}'
         with:
           gcp_workload_identity_provider: '${{ vars.GCP_WIF_PROVIDER }}'
           gcp_project_id: '${{ vars.GOOGLE_CLOUD_PROJECT }}'
@@ -97,7 +84,11 @@ jobs:
             {
               "maxSessionTurns": 25,
               "coreTools": [
-                "run_shell_command(echo)"
+                "run_shell_command(echo)",
+                "run_shell_command(gh label list)",
+                "run_shell_command(gh issue edit)",
+                "run_shell_command(gh issue view)",
+                "run_shell_command(gh issue list)"
               ],
               "telemetry": {
                 "enabled": true,
@@ -107,86 +98,68 @@ jobs:
           prompt: |-
             ## Role
 
-            You are an issue triage assistant. Analyze issues and identify
+            You are an issue triage assistant. Analyze issues and apply
             appropriate labels. Use the available tools to gather information;
             do not ask for information to be provided.
 
             ## Steps
 
-            1. You are only able to use the echo command. Review the available labels in the environment variable: "${AVAILABLE_LABELS}".
+            1. Run: `gh label list --repo ${{ github.repository }} --limit 100` to get all available labels.
             2. Check environment variable for issues to triage: $ISSUES_TO_TRIAGE (JSON array of issues)
             3. Review the issue title, body and any comments provided in the environment variables.
-            4. Identify the most relevant labels from the existing labels, focusing on kind/*, area/*, sub-area/* and priority/*.
-            5. If the issue already has area/ label, dont try to change it. Similarly, if the issue already has a kind/ label don't change it. And if the issue already has a priority/ label do not change it for example:
-               If an issue has area/core and kind/bug  you will only add a priority/ label.
-               Instead if an issue has no labels, you will could add one lable of each kind.
-            6. Identify other applicable labels based on the issue content, such as status/*, help wanted, good first issue, etc.
-            7. For area/* and kind/* limit yourself to only the single most applicable label in each case.
-            8. Give me a single short explanation about why you are selecting each label in the process.
-            9. Output a JSON array of objects, each containing the issue number
-               and the labels to add and remove, along with an explanation. For example:
-               ```
-               [
-                 {
-                   "issue_number": 123,
-                   "labels_to_add": ["kind/bug", "priority/p2"],
-                   "labels_to_remove": ["status/need-triage"],
-                   "explanation": "This issue is a bug that needs to be addressed with medium priority."
-                 },
-                 {
-                   "issue_number": 456,
-                   "labels_to_add": ["kind/enhancement"],
-                   "labels_to_remove": [],
-                   "explanation": "This issue is an enhancement request that could improve the user experience."
-                 }
-               ]
-               ```
-              If an issue cannot be classified, do not include it in the output array.
-            10. For each issue please check if CLI version is present, this is usually in the output of the /about command and will look like 0.1.5
+            4. Ignore any existing priorities or tags on the issue.
+            5. Select the most relevant labels from the existing labels, focusing on kind/*, area/*, sub-area/* and priority/*. 
+            6. Get the list of labels already on the issue using `gh issue view ISSUE_NUMBER --repo ${{ github.repository }} --json labels -t '{{range .labels}}{{.name}}{{"\n"}}{{end}}'
+            7. For area/* and kind/* limit yourself to only the single most applicable label in each case. 
+            8. Give me a single short paragraph about why you are selecting each label in the process. use the format Issue ID: , Title, Label applied:, Label removed, ovearll explanation
+            9. Parse the JSON array from step 2 and for EACH INDIVIDUAL issue, apply appropriate labels using separate commands:
+              - `gh issue edit ISSUE_NUMBER --repo ${{ github.repository }} --add-label "label1"`
+              - `gh issue edit ISSUE_NUMBER --repo ${{ github.repository }} --add-label "label2"`
+              - Continue for each label separately
+              - IMPORTANT: Label each issue individually, one command per issue, one label at a time if needed.
+              - Make sure after you apply labels there is only one area/* and one kind/* label per issue.  
+              - To do this look for labels found in step 6 that no longer apply remove them one at a time using 
+              - `gh issue edit ISSUE_NUMBER --repo ${{ github.repository }} --remove-label "label-name1"`
+              - `gh issue edit ISSUE_NUMBER --repo ${{ github.repository }} --remove-label "label-name2"`
+              - IMPORTANT: Remove each label one at a time, one command per issue if needed.
+            10. For each issue please check if CLI version is present, this is usually in the output of the /about command and will look like 0.1.5 
               - Anything more than 6 versions older than the most recent should add the status/need-retesting label
-            11. If you see that the issue doesn't look like it has sufficient information recommend the status/need-information label and leave a comment politely requesting the relevant information, eg.. if repro steps are missing request for repro steps. if version information is missing request for version information into the explanation section below.
-              - After identifying appropriate labels to an issue, add "status/need-triage" label to labels_to_remove in the output.
-            12. If you think an issue might be a Priority/P0 do not apply the priority/p0 label. Instead apply a status/manual-triage label and include a note in your explanation.
-            13. If you are uncertain and have not been able to apply one each of kind/, area/ and priority/ , apply the status/manual-triage label.
+            11. If you see that the issue doesn’t look like it has sufficient information recommend the status/need-information label
+              - After applying appropriate labels to an issue, remove the "status/need-triage" label if present: `gh issue edit ISSUE_NUMBER --repo ${{ github.repository }} --remove-label "status/need-triage"`
+              - Execute one `gh issue edit` command per issue, wait for success before proceeding to the next
+            Process each issue sequentially and confirm each labeling operation before moving to the next issue.
 
             ## Guidelines
 
-            - Output only valid JSON format
-            - Do not include any explanation or additional text, just the JSON
             - Only use labels that already exist in the repository.
               - Do not add comments or modify the issue content.
-              - Do not remove the following labels maintainer, help wanted or good first issue.
+              - Do not remove labels titled help wanted or good first issue.
               - Triage only the current issue.
-              - Identify only one area/ label
-              - Identify only one kind/ label (Do not apply kind/duplicate or kind/parent-issue)
-              - Identify all applicable sub-area/* and priority/* labels based on the issue content. It's ok to have multiple of these.
+              - Apply only one area/ label
+              - Apply only one kind/ label (Do not apply kind/duplicate or kind/parent-issue) 
+              - Apply all applicable sub-area/* and priority/* labels based on the issue content. It's ok to have multiple of these.
               - 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:
+            Categorization Guidelines: 
             P0: Critical / Blocker
-              - A P0 bug is a catastrophic failure that demands immediate attention.
-              - To be a P0 it means almost all users are running into this issue and it is blocking users from being able to use the product.
-              - You would see this in the form of many comments from different developers on the bug.
-              - It represents a complete showstopper for a significant portion of users or for the development process itself.
-            Impact:
+              - A P0 bug is a catastrophic failure that demands immediate attention. It represents a complete showstopper for a significant portion of users or for the development process itself.
+              Impact:
               - Blocks development or testing for the entire team.
               - Major security vulnerability that could compromise user data or system integrity.
               - Causes data loss or corruption with no workaround.
-              - Crashes the application or makes a core feature completely unusable for all or most users in a production environment. Will it cause severe quality degration?
+              - Crashes the application or makes a core feature completely unusable for all or most users in a production environment. Will it cause severe quality degration? 
               - Is it preventing contributors from contributing to the repository or is it a release blocker?
               Qualifier: Is the main function of the software broken?
               Example: The gemini auth login command fails with an unrecoverable error, preventing any user from authenticating and using the rest of the CLI.
             P1: High
-              - A P1 bug is a serious issue that significantly degrades the user experience or impacts a core feature.
-              - While not a complete blocker, it's a major problem that needs a fast resolution. Feature requests are almost never P1.
-              - Once again this would be affecting many users.
-              - You would see this in the form of comments from different developers on the bug.
+              - A P1 bug is a serious issue that significantly degrades the user experience or impacts a core feature. While not a complete blocker, it's a major problem that needs a fast resolution. 
+              - Feature requests are almost never P1.
               Impact:
               - A core feature is broken or behaving incorrectly for a large number of users or large number of use cases.
               - Review the bug details and comments to try figure out if this issue affects a large set of use cases or if it's a narrow set of use cases.
               - Severe performance degradation making the application frustratingly slow.
               - No straightforward workaround exists, or the workaround is difficult and non-obvious.
               Qualifier: Is a key feature unusable or giving very wrong results?
-              Example: Gemini CLI enters a loop when making read-many-files tool call. I am unable to break out of the loop and gemini doesn't follow instructions subsequently.
+              Example: The gemini -p "..." command consistently returns a malformed JSON response or an empty result, making the CLI's primary generation feature unreliable.
             P2: Medium
               - A P2 bug is a moderately impactful issue. It's a noticeable problem but doesn't prevent the use of the software's main functionality.
               Impact:
@@ -202,21 +175,21 @@ jobs:
               - An edge-case bug that is very difficult to reproduce and affects a tiny fraction of users.
               Qualifier: Is it a "nice-to-fix" issue?
               Example: Spelling mistakes etc.
-            Additional Context:
+            Additional Context: 
               - If users are talking about issues where the model gets downgraded from pro to flash then i want you to categorize that as a performance issue
-              - This product is designed to use different models eg.. using pro, downgrading to flash etc.
+              - 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.
             Definition of Areas
-            area/ux:
+            area/ux: 
               - Issues concerning user-facing elements like command usability, interactive features, help docs, and perceived performance.
-              - I am seeing my screen flicker when using Gemini CLI
-              - I am seeing the output malformed
-              - Theme changes aren't taking effect
+              - I am seeing my screen flicker when using Gemini CLI 
+              - I am seeing the output malformed 
+              - Theme changes aren't taking effect 
               - My keyboard inputs arent' being recognzied
-            area/platform:
+            area/platform: 
               - Issues related to installation, packaging, OS compatibility (Windows, macOS, Linux), and the underlying CLI framework.
             area/background: Issues related to long-running background tasks, daemons, and autonomous or proactive agent features.
-            area/models:
+            area/models: 
               - i am not getting a response that is reasonable or expected. this can include things like
               - I am calling a tool and the tool is not performing as expected.
               - i am expecting a tool to be called and it is not getting called ,
@@ -230,21 +203,21 @@ jobs:
               - Memory compression
               - unexpected responses,
               - poor quality of generated code
-            area/tools:
-              - These are primarily issues related to Model Context Protocol
-              - These are issues that mention MCP support
-              - feature requests asking for support for new tools.
-            area/core:
+            area/tools: 
+              - These are primarily issues related to Model Context Protocol 
+              - These are issues that mention MCP support 
+              - feature requests asking for support for new tools. 
+            area/core: 
               - Issues with fundamental components like command parsing, configuration management, session state, and the main API client logic. Introducing multi-modality
-            area/contribution:
+            area/contribution: 
               - Issues related to improving the developer contribution experience, such as CI/CD pipelines, build scripts, and test automation infrastructure.
-            area/authentication:
+            area/authentication: 
               -  Issues related to user identity, login flows, API key handling, credential storage, and access token management, unable to sign in selecting wrong authentication path etc..
-            area/security-privacy:
+            area/security-privacy: 
               - Issues concerning vulnerability patching, dependency security, data sanitization, privacy controls, and preventing unauthorized data access.
-            area/extensibility:
+            area/extensibility: 
               - Issues related to the plugin system, extension APIs, or making the CLI's functionality available in other applications, github actions, ide support etc..
-            area/performance:
+            area/performance: 
               - Issues focused on model performance
               - Issues with running out of capacity,
               - 429 errors etc..
@@ -252,82 +225,104 @@ jobs:
               - other general software performance like, memory usage, CPU consumption, and algorithmic efficiency.
               - Switching models from one to the other unexpectedly.
 
-      - name: 'Apply Labels to Issues'
-        if: |-
-          ${{ steps.gemini_issue_analysis.outcome == 'success' &&
-              steps.gemini_issue_analysis.outputs.summary != '[]' }}
-        env:
-          REPOSITORY: '${{ github.repository }}'
-          LABELS_OUTPUT: '${{ steps.gemini_issue_analysis.outputs.summary }}'
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
+  refresh-embeddings:
+    if: |-
+      ${{ vars.TRIAGE_DEDUPLICATE_ISSUES != '' && github.repository == 'google-gemini/gemini-cli' }}
+    timeout-minutes: 20
+    runs-on: 'ubuntu-latest'
+    steps:
+      - name: 'Checkout repository'
+        uses: 'actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683'
+
+      - name: 'Generate GitHub App Token'
+        id: 'generate_token'
+        uses: 'actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e'
         with:
-          github-token: '${{ steps.generate_token.outputs.token }}'
-          script: |-
-            const rawLabels = process.env.LABELS_OUTPUT;
-            core.info(`Raw labels JSON: ${rawLabels}`);
-            let parsedLabels;
-            try {
-              const jsonMatch = rawLabels.match(/```json\s*([\s\S]*?)\s*```/);
-              if (!jsonMatch || !jsonMatch[1]) {
-                throw new Error("Could not find a ```json ... ``` block in the output.");
-              }
-              const jsonString = jsonMatch[1].trim();
-              parsedLabels = JSON.parse(jsonString);
-              core.info(`Parsed labels JSON: ${JSON.stringify(parsedLabels)}`);
-            } catch (err) {
-              core.setFailed(`Failed to parse labels JSON from Gemini output: ${err.message}\nRaw output: ${rawLabels}`);
-              return;
-            }
+          app-id: '${{ secrets.APP_ID }}'
+          private-key: '${{ secrets.PRIVATE_KEY }}'
 
-            for (const entry of parsedLabels) {
-              const issueNumber = entry.issue_number;
-              if (!issueNumber) {
-                core.info(`Skipping entry with no issue number: ${JSON.stringify(entry)}`);
-                continue;
-              }
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-              const labelsToAdd = entry.labels_to_add || [];
-              labelsToAdd.push('status/bot-triaged');
-
-              if (labelsToAdd.length > 0) {
-                await github.rest.issues.addLabels({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  issue_number: issueNumber,
-                  labels: labelsToAdd
-                });
-                const explanation = entry.explanation ? ` - ${entry.explanation}` : '';
-                core.info(`Successfully added labels for #${issueNumber}: ${labelsToAdd.join(', ')}${explanation}`);
-              }
-
-              if (entry.labels_to_remove && entry.labels_to_remove.length > 0) {
-                for (const label of entry.labels_to_remove) {
-                  try {
-                    await github.rest.issues.removeLabel({
-                      owner: context.repo.owner,
-                      repo: context.repo.repo,
-                      issue_number: issueNumber,
-                      name: label
-                    });
-                  } catch (error) {
-                    if (error.status !== 404) {
-                      throw error;
-                    }
-                  }
+      - name: 'Run Gemini Issue Deduplication Refresh'
+        uses: 'google-github-actions/run-gemini-cli@20351b5ea2b4179431f1ae8918a246a0808f8747'
+        id: 'gemini_refresh_embeddings'
+        env:
+          GITHUB_TOKEN: '${{ steps.generate_token.outputs.token }}'
+          ISSUE_TITLE: '${{ github.event.issue.title }}'
+          ISSUE_BODY: '${{ github.event.issue.body }}'
+          ISSUE_NUMBER: '${{ github.event.issue.number }}'
+          REPOSITORY: '${{ github.repository }}'
+          FIRESTORE_PROJECT: '${{ vars.FIRESTORE_PROJECT }}'
+        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: |-
+            {
+              "mcpServers": {
+                "issue_deduplication": {
+                  "command": "docker",
+                  "args": [
+                    "run",
+                    "-i",
+                    "--rm",
+                    "--network", "host",
+                    "-e", "GITHUB_TOKEN",
+                    "-e", "GEMINI_API_KEY",
+                    "-e", "DATABASE_TYPE",
+                    "-e", "FIRESTORE_DATABASE_ID",
+                    "-e", "GCP_PROJECT",
+                    "-e", "GOOGLE_APPLICATION_CREDENTIALS=/app/gcp-credentials.json",
+                    "-v", "${GOOGLE_APPLICATION_CREDENTIALS}:/app/gcp-credentials.json",
+                    "ghcr.io/google-gemini/gemini-cli-issue-triage@sha256:e3de1523f6c83aabb3c54b76d08940a2bf42febcb789dd2da6f95169641f94d3"
+                  ],
+                  "env": {
+                    "GITHUB_TOKEN": "${GITHUB_TOKEN}",
+                    "GEMINI_API_KEY": "${{ secrets.GEMINI_API_KEY }}",
+                    "DATABASE_TYPE":"firestore",
+                    "GCP_PROJECT": "${FIRESTORE_PROJECT}",
+                    "FIRESTORE_DATABASE_ID": "(default)",
+                    "GOOGLE_APPLICATION_CREDENTIALS": "${GOOGLE_APPLICATION_CREDENTIALS}"
+                  },
+                  "enabled": true,
+                  "timeout": 600000
                 }
-                core.info(`Successfully removed labels for #${issueNumber}: ${entry.labels_to_remove.join(', ')}`);
-              }
-
-              if (entry.explanation) {
-                await github.rest.issues.createComment({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  issue_number: issueNumber,
-                  body: entry.explanation,
-                });
-              }
-
-              if ((!entry.labels_to_add || entry.labels_to_add.length === 0) && (!entry.labels_to_remove || entry.labels_to_remove.length === 0)) {
-                core.info(`No labels to add or remove for #${issueNumber}, leaving as is`);
+              },
+              "maxSessionTurns": 25,
+              "coreTools": [
+                "run_shell_command(echo)"
+              ],
+              "telemetry": {
+                "enabled": true,
+                "target": "gcp"
               }
             }
+          prompt: |-
+            ## Role
+
+            You are a database maintenance assistant for a GitHub issue deduplication system.
+
+            ## Goal
+
+            Your sole responsibility is to refresh the embeddings for all open issues in the repository to ensure the deduplication database is up-to-date.
+
+            ## Steps
+
+            1.  **Extract Repository Information:** The repository is ${{ github.repository }}.
+            2.  **Refresh Embeddings:** Call the `refresh` tool with the correct `repo`. Do not use the `force` parameter.
+            3.  **Log Output:** Print the JSON output from the `refresh` tool to the logs.
+
+            ## Guidelines
+
+            - Only use the `refresh` tool.
+            - Do not attempt to find duplicates or modify any issues.
+            - Your only task is to call the `refresh` tool and log its output.

.github/workflows/gemini-scheduled-pr-triage.yml

@@ -1,41 +1,36 @@
-name: 'Gemini Scheduled PR Triage 🚀'
+name: Gemini Scheduled PR Triage 🚀
 
 on:
   schedule:
     - cron: '*/15 * * * *' # Runs every 15 minutes
-  workflow_dispatch:
+  workflow_dispatch: {}
 
 jobs:
   audit-prs:
     timeout-minutes: 15
-    if: |-
-      ${{ github.repository == 'google-gemini/gemini-cli' }}
+    if: ${{ github.repository == 'google-gemini/gemini-cli' }}
     permissions:
-      contents: 'read'
-      id-token: 'write'
-      issues: 'write'
-      pull-requests: 'write'
-    runs-on: 'ubuntu-latest'
+      contents: read
+      id-token: write
+      issues: write
+      pull-requests: write
+    runs-on: ubuntu-latest
     outputs:
-      prs_needing_comment: '${{ steps.run_triage.outputs.prs_needing_comment }}'
+      prs_needing_comment: ${{ steps.run_triage.outputs.prs_needing_comment }}
     steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
+      - name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-      - name: 'Generate GitHub App Token'
-        id: 'generate_token'
-        uses: 'actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b' # ratchet:actions/create-github-app-token@v2
+      - name: Generate GitHub App Token
+        id: generate_token
+        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2
         with:
-          app-id: '${{ secrets.APP_ID }}'
-          private-key: '${{ secrets.PRIVATE_KEY }}'
-          permission-issues: 'write'
-          permission-pull-requests: 'write'
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
 
-      - name: 'Run PR Triage Script'
-        id: 'run_triage'
-        shell: 'bash'
+      - name: Run PR Triage Script
+        id: run_triage
         env:
-          GITHUB_TOKEN: '${{ steps.generate_token.outputs.token }}'
-          GITHUB_REPOSITORY: '${{ github.repository }}'
-        run: |-
-          ./.github/scripts/pr-triage.sh
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+        run: ./.github/scripts/pr-triage.sh

.github/workflows/gemini-self-assign-issue.yml

@@ -1,99 +0,0 @@
-name: 'Assign Issue on Comment'
-
-on:
-  issue_comment:
-    types:
-      - 'created'
-
-concurrency:
-  group: '${{ github.workflow }}-${{ github.event.issue.number }}'
-  cancel-in-progress: true
-
-defaults:
-  run:
-    shell: 'bash'
-
-permissions:
-  contents: 'read'
-  id-token: 'write'
-  issues: 'write'
-  statuses: 'write'
-  packages: 'read'
-
-jobs:
-  self-assign-issue:
-    if: |-
-      github.repository == 'google-gemini/gemini-cli' &&
-      github.event_name == 'issue_comment' &&
-      contains(github.event.comment.body, '/assign')
-    runs-on: 'ubuntu-latest'
-    steps:
-      - name: 'Generate GitHub App Token'
-        id: 'generate_token'
-        uses: 'actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b'
-        with:
-          app-id: '${{ secrets.APP_ID }}'
-          private-key: '${{ secrets.PRIVATE_KEY }}'
-          # Add 'assignments' write permission
-          permission-issues: 'write'
-
-      - name: 'Assign issue to user'
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
-        with:
-          github-token: '${{ steps.generate_token.outputs.token }}'
-          script: |
-            const issueNumber = context.issue.number;
-            const commenter = context.actor;
-            const owner = context.repo.owner;
-            const repo = context.repo.repo;
-            const MAX_ISSUES_ASSIGNED = 3;
-
-            // Search for open issues already assigned to the commenter in this repo
-            const { data: assignedIssues } = await github.rest.search.issuesAndPullRequests({
-              q: `is:issue repo:${owner}/${repo} assignee:${commenter} is:open`,
-              advanced_search: true
-            });
-
-            if (assignedIssues.total_count >= MAX_ISSUES_ASSIGNED) {
-              await github.rest.issues.createComment({
-                owner: owner,
-                repo: repo,
-                issue_number: issueNumber,
-                body: `👋 @${commenter}! You currently have ${assignedIssues.total_count} issues assigned to you. We have a ${MAX_ISSUES_ASSIGNED} max issues assigned at once policy. Once you close out an existing issue it will open up space to take another. You can also unassign yourself from an existing issue but please work on a hand-off if someone is expecting work on that issue.`
-              });
-              return; // exit
-            }
-
-            // Check if the issue is already assigned
-            const issue = await github.rest.issues.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: issueNumber,
-            });
-
-            if (issue.data.assignees.length > 0) {
-              // Comment that it's already assigned
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: issueNumber,
-                body: `@${commenter} Thanks for taking interest but this issue is already assigned. We'd still love to have you contribute. Check out our [Help Wanted](https://github.com/google-gemini/gemini-cli/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22help%20wanted%22) list for issues where we need some extra attention.`
-              });
-              return;
-            }
-
-            // If not taken, assign the user who commented
-            await github.rest.issues.addAssignees({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: issueNumber,
-              assignees: [commenter]
-            });
-
-            // Post a comment to confirm assignment
-            await github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: issueNumber,
-              body: `👋 @${commenter}, you've been assigned to this issue! Thank you for taking the time to contribute. Make sure to check out our [contributing guidelines](https://github.com/google-gemini/gemini-cli/blob/main/CONTRIBUTING.md).`
-            });

.github/workflows/no-response.yml

@@ -1,33 +1,32 @@
-name: 'No Response'
+name: No Response
 
 # Run as a daily cron at 1:45 AM
 on:
   schedule:
     - cron: '45 1 * * *'
-  workflow_dispatch:
+  workflow_dispatch: {}
 
 jobs:
   no-response:
-    runs-on: 'ubuntu-latest'
-    if: |-
-      ${{ github.repository == 'google-gemini/gemini-cli' }}
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'google-gemini/gemini-cli' }}
     permissions:
-      issues: 'write'
-      pull-requests: 'write'
+      issues: write
+      pull-requests: write
     concurrency:
-      group: '${{ github.workflow }}-no-response'
+      group: ${{ github.workflow }}-no-response
       cancel-in-progress: true
     steps:
-      - uses: 'actions/stale@5bef64f19d7facfb25b37b414482c7164d639639' # ratchet:actions/stale@v9
+      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639
         with:
-          repo-token: '${{ secrets.GITHUB_TOKEN }}'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: -1
           days-before-close: 14
           stale-issue-label: 'status/need-information'
-          close-issue-message: >-
+          close-issue-message: >
             This issue was marked as needing more information and has not received a response in 14 days.
             Closing it for now. If you still face this problem, feel free to reopen with more details. Thank you!
           stale-pr-label: 'status/need-information'
-          close-pr-message: >-
+          close-pr-message: >
             This pull request was marked as needing more information and has had no updates in 14 days.
             Closing it for now. You are welcome to reopen with the required info. Thanks for contributing!

.github/workflows/release-change-tags.yml

@@ -1,56 +0,0 @@
-name: 'Release: Change Tags'
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'The package version to tag (e.g., 0.5.0-preview-2). This version must already exist on the npm registry.'
-        required: true
-        type: 'string'
-      channel:
-        description: 'The npm dist-tag to apply (e.g., latest, preview, nightly).'
-        required: true
-        type: 'choice'
-        options:
-          - 'latest'
-          - 'preview'
-          - 'nightly'
-      ref:
-        description: 'The branch, tag, or SHA to run from.'
-        required: false
-        type: 'string'
-        default: 'main'
-      dry-run:
-        description: 'Whether to run in dry-run mode.'
-        required: false
-        type: 'boolean'
-        default: true
-
-jobs:
-  change-tags:
-    runs-on: 'ubuntu-latest'
-    permissions:
-      packages: 'write'
-      issues: 'write'
-    steps:
-      - name: 'Checkout repository'
-        uses: 'actions/checkout@v4'
-        with:
-          ref: '${{ github.event.inputs.ref }}'
-          fetch-depth: 0
-
-      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020'
-        with:
-          node-version-file: '.nvmrc'
-          registry-url: 'https://wombat-dressing-room.appspot.com'
-          scope: '@google'
-
-      - name: 'Change tag'
-        uses: './.github/actions/tag-npm-release'
-        with:
-          channel: '${{ github.event.inputs.channel }}'
-          version: '${{ github.event.inputs.version }}'
-          dry-run: '${{ github.event.inputs.dry-run }}'
-          wombat-token-core: '${{ secrets.WOMBAT_TOKEN_CORE }}'
-          wombat-token-cli: '${{ secrets.WOMBAT_TOKEN_CLI }}'

.github/workflows/release-manual.yml

@@ -1,114 +0,0 @@
-name: 'Release: Manual'
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'The version to release (e.g., v0.1.11). Must be a valid semver string with a "v" prefix.'
-        required: true
-        type: 'string'
-      ref:
-        description: 'The branch, tag, or SHA to release from.'
-        required: true
-        type: 'string'
-      npm_channel:
-        description: 'The npm channel to publish to.'
-        required: true
-        type: 'choice'
-        options:
-          - 'preview'
-          - 'nightly'
-          - 'latest'
-          - 'dev'
-        default: 'dev'
-      dry_run:
-        description: 'Run a dry-run of the release process; no branches, npm packages or GitHub releases will be created.'
-        required: true
-        type: 'boolean'
-        default: true
-      force_skip_tests:
-        description: 'Select to skip the "Run Tests" step in testing. Prod releases should run tests'
-        required: false
-        type: 'boolean'
-        default: false
-      skip_github_release:
-        description: 'Select to skip creating a GitHub release and create a npm release only.'
-        required: false
-        type: 'boolean'
-        default: false
-
-jobs:
-  release:
-    runs-on: 'self-hosted'
-    permissions:
-      contents: 'write'
-      packages: 'write'
-      issues: 'write'
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          fetch-depth: 0
-
-      - name: 'Checkout Release Code'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          ref: '${{ github.event.inputs.ref }}'
-          path: 'release'
-          fetch-depth: 0
-
-      - name: 'Debug Inputs'
-        run: 'echo "${{ toJSON(inputs) }}"'
-
-      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020'
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-
-      - name: 'Install Dependencies'
-        working-directory: './release'
-        run: 'npm ci'
-
-      - name: 'Prepare Release Info'
-        id: 'release_info'
-        working-directory: './release'
-        run: |
-          RELEASE_VERSION="${{ github.event.inputs.version }}"
-          echo "RELEASE_VERSION=${RELEASE_VERSION#v}" >> "${GITHUB_OUTPUT}"
-          echo "PREVIOUS_TAG=$(git describe --tags --abbrev=0)" >> "${GITHUB_OUTPUT}"
-
-      - name: 'Run Tests'
-        if: "${{github.event.inputs.force_skip_tests != 'true'}}"
-        uses: './.github/actions/run-tests'
-        with:
-          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
-          working-directory: './release'
-
-      - name: 'Publish Release'
-        uses: './.github/actions/publish-release'
-        with:
-          force-skip-tests: '${{ github.event.inputs.force_skip_tests }}'
-          release-version: '${{ steps.release_info.outputs.RELEASE_VERSION }}'
-          release-tag: '${{ github.event.inputs.version }}'
-          npm-tag: '${{ github.event.inputs.npm_channel }}'
-          wombat-token-core: '${{ secrets.WOMBAT_TOKEN_CORE }}'
-          wombat-token-cli: '${{ secrets.WOMBAT_TOKEN_CLI }}'
-          github-token: '${{ secrets.GITHUB_TOKEN }}'
-          dry-run: '${{ github.event.inputs.dry_run }}'
-          previous-tag: '${{ steps.release_info.outputs.PREVIOUS_TAG }}'
-          skip-github-release: '${{ github.event.inputs.skip_github_release }}'
-          working-directory: './release'
-          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
-
-      - name: 'Create Issue on Failure'
-        if: '${{ failure() && github.event.inputs.dry_run == false }}'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          RELEASE_TAG: '${{ github.event.inputs.version }}'
-          DETAILS_URL: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        run: |
-          gh issue create \
-            --title 'Manual Release Failed for ${RELEASE_TAG} on $(date +'%Y-%m-%d')' \
-            --body 'The manual release workflow failed. See the full run for details: ${DETAILS_URL}' \
-            --label 'kind/bug,release-failure,priority/p0'

.github/workflows/release-nightly.yml

@@ -1,128 +0,0 @@
-name: 'Release: Nightly'
-
-on:
-  schedule:
-    - cron: '0 0 * * *'
-  workflow_dispatch:
-    inputs:
-      dry_run:
-        description: 'Run a dry-run of the release process; no branches, npm packages or GitHub releases will be created.'
-        required: true
-        type: 'boolean'
-        default: true
-      force_skip_tests:
-        description: 'Select to skip the "Run Tests" step in testing. Prod releases should run tests'
-        required: false
-        type: 'boolean'
-        default: true
-      ref:
-        description: 'The branch, tag, or SHA to release from.'
-        required: false
-        type: 'string'
-        default: 'main'
-
-jobs:
-  release:
-    runs-on: 'ubuntu-latest'
-    permissions:
-      contents: 'write'
-      packages: 'write'
-      issues: 'write'
-      pull-requests: 'write'
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          fetch-depth: 0
-
-      - name: 'Checkout Release Code'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          ref: '${{ github.event.inputs.ref }}'
-          path: 'release'
-          fetch-depth: 0
-
-      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
-        with:
-          node-version-file: './release/.nvmrc'
-          cache: 'npm'
-
-      - name: 'Install Dependencies'
-        working-directory: './release'
-        run: 'npm ci'
-
-      - name: 'Print Inputs'
-        run: |
-          echo "${{ toJSON(github.event.inputs) }}"
-
-      - name: 'Run Tests'
-        if: "${{github.event.inputs.force_skip_tests == 'false'}}"
-        uses: './.github/actions/run-tests'
-        with:
-          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
-          working-directory: './release'
-
-      - name: 'Get Nightly Version'
-        id: 'nightly_version'
-        working-directory: './release'
-        env:
-          GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        run: |
-          # Calculate the version using the centralized script
-          VERSION_JSON=$(node scripts/get-release-version.js --type=nightly)
-
-          # Extract values for logging and outputs
-          RELEASE_TAG=$(echo "${VERSION_JSON}" | jq -r .releaseTag)
-          RELEASE_VERSION=$(echo "${VERSION_JSON}" | jq -r .releaseVersion)
-          NPM_TAG=$(echo "${VERSION_JSON}" | jq -r .npmTag)
-          PREVIOUS_TAG=$(echo "${VERSION_JSON}" | jq -r .previousReleaseTag)
-
-          # Print calculated values for logging
-          echo "Calculated Release Tag: ${RELEASE_TAG}"
-          echo "Calculated Release Version: ${RELEASE_VERSION}"
-          echo "Calculated Previous Tag: ${PREVIOUS_TAG}"
-
-          # Set outputs for subsequent steps
-          echo "RELEASE_TAG=${RELEASE_TAG}" >> "${GITHUB_OUTPUT}"
-          echo "RELEASE_VERSION=${RELEASE_VERSION}" >> "${GITHUB_OUTPUT}"
-          echo "NPM_TAG=${NPM_TAG}" >> "${GITHUB_OUTPUT}"
-          echo "PREVIOUS_TAG=${PREVIOUS_TAG}" >> "${GITHUB_OUTPUT}"
-
-      - name: 'Publish Release'
-        if: true
-        uses: './.github/actions/publish-release'
-        with:
-          release-version: '${{ steps.nightly_version.outputs.RELEASE_VERSION }}'
-          release-tag: '${{ steps.nightly_version.outputs.RELEASE_TAG }}'
-          npm-tag: '${{ steps.nightly_version.outputs.NPM_TAG }}'
-          wombat-token-core: '${{ secrets.WOMBAT_TOKEN_CORE }}'
-          wombat-token-cli: '${{ secrets.WOMBAT_TOKEN_CLI }}'
-          github-token: '${{ secrets.GITHUB_TOKEN }}'
-          dry-run: '${{ github.event.inputs.dry_run }}'
-          previous-tag: '${{ steps.nightly_version.outputs.PREVIOUS_TAG }}'
-          working-directory: './release'
-          skip-branch-cleanup: true
-          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
-
-      - name: 'Create and Merge Pull Request'
-        uses: './.github/actions/create-pull-request'
-        with:
-          branch-name: 'release/${{ steps.nightly_version.outputs.RELEASE_TAG }}'
-          pr-title: 'chore(release): bump version to ${{ steps.nightly_version.outputs.RELEASE_VERSION }}'
-          pr-body: 'Automated version bump for nightly release.'
-          github-token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
-          dry-run: '${{ github.event.inputs.dry_run }}'
-          working-directory: './release'
-
-      - name: 'Create Issue on Failure'
-        if: "${{ failure() && github.event.inputs.dry_run != 'true' }}"
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          RELEASE_TAG: '${{ steps.nightly_version.outputs.RELEASE_TAG }}'
-          DETAILS_URL: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        run: |
-          gh issue create \
-            --title "Nightly Release Failed for ${RELEASE_TAG} on $(date +'%Y-%m-%d')" \
-            --body "The nightly-release workflow failed. See the full run for details: ${DETAILS_URL}" \
-            --label 'kind/bug,release-failure,priority/p0'

.github/workflows/release-patch-0-from-comment.yml

@@ -1,187 +0,0 @@
-name: 'Release: Patch (0) from Comment'
-
-on:
-  issue_comment:
-    types: ['created']
-
-jobs:
-  slash-command:
-    runs-on: 'ubuntu-latest'
-    # Only run if the comment is from a human user (not automated)
-    if: "github.event.comment.user.type == 'User' && github.event.comment.user.login != 'github-actions[bot]'"
-    permissions:
-      contents: 'write'
-      pull-requests: 'write'
-      actions: 'write'
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          fetch-depth: 1
-
-      - name: 'Slash Command Dispatch'
-        id: 'slash_command'
-        uses: 'peter-evans/slash-command-dispatch@40877f718dce0101edfc7aea2b3800cc192f9ed5'
-        with:
-          token: '${{ secrets.GITHUB_TOKEN }}'
-          commands: 'patch'
-          permission: 'write'
-          issue-type: 'pull-request'
-
-      - name: 'Get PR Status'
-        id: 'pr_status'
-        if: "startsWith(github.event.comment.body, '/patch')"
-        env:
-          GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        run: |
-          gh pr view "${{ github.event.issue.number }}" --json mergeCommit,state > pr_status.json
-          echo "MERGE_COMMIT_SHA=$(jq -r .mergeCommit.oid pr_status.json)" >> "$GITHUB_OUTPUT"
-          echo "STATE=$(jq -r .state pr_status.json)" >> "$GITHUB_OUTPUT"
-
-      - name: 'Dispatch if Merged'
-        if: "steps.pr_status.outputs.STATE == 'MERGED'"
-        id: 'dispatch_patch'
-        uses: 'actions/github-script@00f12e3e20659f42342b1c0226afda7f7c042325'
-        env:
-          COMMENT_BODY: '${{ github.event.comment.body }}'
-        with:
-          github-token: '${{ secrets.GITHUB_TOKEN }}'
-          script: |
-            // Parse the comment body directly to extract channel(s)
-            const commentBody = process.env.COMMENT_BODY;
-            console.log('Comment body:', commentBody);
-
-            let channels = ['stable', 'preview'];  // default to both
-
-            // Parse different formats:
-            // /patch (defaults to both)
-            // /patch both
-            // /patch stable
-            // /patch preview
-            if (commentBody.trim() === '/patch' || commentBody.trim() === '/patch both') {
-              channels = ['stable', 'preview'];
-            } else if (commentBody.trim() === '/patch stable') {
-              channels = ['stable'];
-            } else if (commentBody.trim() === '/patch preview') {
-              channels = ['preview'];
-            } else {
-              // Fallback parsing for legacy formats
-              if (commentBody.includes('channel=preview')) {
-                channels = ['preview'];
-              } else if (commentBody.includes('--channel preview')) {
-                channels = ['preview'];
-              }
-            }
-
-            console.log('Detected channels:', channels);
-
-            const dispatchedRuns = [];
-
-            // Dispatch workflow for each channel
-            for (const channel of channels) {
-              console.log(`Dispatching workflow for channel: ${channel}`);
-
-              const response = await github.rest.actions.createWorkflowDispatch({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                workflow_id: 'release-patch-1-create-pr.yml',
-                ref: 'main',
-                inputs: {
-                  commit: '${{ steps.pr_status.outputs.MERGE_COMMIT_SHA }}',
-                  channel: channel,
-                  original_pr: '${{ github.event.issue.number }}'
-                }
-              });
-
-              dispatchedRuns.push({ channel, response });
-            }
-
-            // Wait a moment for the workflows to be created
-            await new Promise(resolve => setTimeout(resolve, 3000));
-
-            const runs = await github.rest.actions.listWorkflowRuns({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              workflow_id: 'release-patch-1-create-pr.yml',
-              per_page: 20  // Increased to handle multiple runs
-            });
-
-            // Find the recent runs that match our trigger
-            const recentRuns = runs.data.workflow_runs.filter(run =>
-              run.event === 'workflow_dispatch' &&
-              new Date(run.created_at) > new Date(Date.now() - 15000) // Within last 15 seconds
-            ).slice(0, channels.length); // Limit to the number of channels we dispatched
-
-            // Set outputs
-            core.setOutput('dispatched_channels', channels.join(','));
-            core.setOutput('dispatched_run_count', channels.length.toString());
-
-            if (recentRuns.length > 0) {
-              core.setOutput('dispatched_run_urls', recentRuns.map(r => r.html_url).join(','));
-              core.setOutput('dispatched_run_ids', recentRuns.map(r => r.id).join(','));
-            }
-
-      - name: 'Comment on Failure'
-        if: "startsWith(github.event.comment.body, '/patch') && steps.pr_status.outputs.STATE != 'MERGED'"
-        uses: 'peter-evans/create-or-update-comment@67dcc547d311b736a8e6c5c236542148a47adc3d'
-        with:
-          token: '${{ secrets.GITHUB_TOKEN }}'
-          issue-number: '${{ github.event.issue.number }}'
-          body: |
-            :x: The `/patch` command failed. This pull request must be merged before a patch can be created.
-
-      - name: 'Final Status Comment - Success'
-        if: "always() && startsWith(github.event.comment.body, '/patch') && steps.dispatch_patch.outcome == 'success' && steps.dispatch_patch.outputs.dispatched_run_urls"
-        uses: 'peter-evans/create-or-update-comment@67dcc547d311b736a8e6c5c236542148a47adc3d'
-        with:
-          token: '${{ secrets.GITHUB_TOKEN }}'
-          issue-number: '${{ github.event.issue.number }}'
-          body: |
-            ✅ **Patch workflow(s) dispatched successfully!**
-
-            **📋 Details:**
-            - **Channels**: `${{ steps.dispatch_patch.outputs.dispatched_channels }}`
-            - **Commit**: `${{ steps.pr_status.outputs.MERGE_COMMIT_SHA }}`
-            - **Workflows Created**: ${{ steps.dispatch_patch.outputs.dispatched_run_count }}
-
-            **🔗 Track Progress:**
-            - [View patch workflows](https://github.com/${{ github.repository }}/actions/workflows/release-patch-1-create-pr.yml)
-            - [This workflow run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
-
-      - name: 'Final Status Comment - Dispatch Success (No URL)'
-        if: "always() && startsWith(github.event.comment.body, '/patch') && steps.dispatch_patch.outcome == 'success' && !steps.dispatch_patch.outputs.dispatched_run_urls"
-        uses: 'peter-evans/create-or-update-comment@67dcc547d311b736a8e6c5c236542148a47adc3d'
-        with:
-          token: '${{ secrets.GITHUB_TOKEN }}'
-          issue-number: '${{ github.event.issue.number }}'
-          body: |
-            ✅ **Patch workflow(s) dispatched successfully!**
-
-            **📋 Details:**
-            - **Channels**: `${{ steps.dispatch_patch.outputs.dispatched_channels }}`
-            - **Commit**: `${{ steps.pr_status.outputs.MERGE_COMMIT_SHA }}`
-            - **Workflows Created**: ${{ steps.dispatch_patch.outputs.dispatched_run_count }}
-
-            **🔗 Track Progress:**
-            - [View patch workflows](https://github.com/${{ github.repository }}/actions/workflows/release-patch-1-create-pr.yml)
-            - [This workflow run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
-
-      - name: 'Final Status Comment - Failure'
-        if: "always() && startsWith(github.event.comment.body, '/patch') && (steps.dispatch_patch.outcome == 'failure' || steps.dispatch_patch.outcome == 'cancelled')"
-        uses: 'peter-evans/create-or-update-comment@67dcc547d311b736a8e6c5c236542148a47adc3d'
-        with:
-          token: '${{ secrets.GITHUB_TOKEN }}'
-          issue-number: '${{ github.event.issue.number }}'
-          body: |
-            ❌ **Patch workflow dispatch failed!**
-
-            There was an error dispatching the patch creation workflow.
-
-            **🔍 Troubleshooting:**
-            - Check that the PR is properly merged
-            - Verify workflow permissions
-            - Review error logs in the workflow run
-
-            **🔗 Debug Links:**
-            - [This workflow run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
-            - [Patch workflow history](https://github.com/${{ github.repository }}/actions/workflows/release-patch-1-create-pr.yml)

.github/workflows/release-patch-1-create-pr.yml

@@ -1,100 +0,0 @@
-name: 'Release: Patch (1) Create PR'
-
-on:
-  workflow_dispatch:
-    inputs:
-      commit:
-        description: 'The commit SHA to cherry-pick for the patch.'
-        required: true
-        type: 'string'
-      channel:
-        description: 'The release channel to patch.'
-        required: true
-        type: 'choice'
-        options:
-          - 'stable'
-          - 'preview'
-      dry_run:
-        description: 'Whether to run in dry-run mode.'
-        required: false
-        type: 'boolean'
-        default: false
-      ref:
-        description: 'The branch, tag, or SHA to test from.'
-        required: false
-        type: 'string'
-        default: 'main'
-      original_pr:
-        description: 'The original PR number to comment back on.'
-        required: false
-        type: 'string'
-
-jobs:
-  create-patch:
-    runs-on: 'ubuntu-latest'
-    permissions:
-      contents: 'write'
-      pull-requests: 'write'
-      actions: 'write'
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          ref: '${{ github.event.inputs.ref }}'
-          fetch-depth: 0
-
-      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-
-      - name: 'Install Script Dependencies'
-        run: 'npm install yargs'
-
-      - name: 'Configure Git User'
-        run: |-
-          git config user.name "gemini-cli-robot"
-          git config user.email "gemini-cli-robot@google.com"
-          # Configure git to use GITHUB_TOKEN for remote operations (has actions:write for workflow files)
-          git remote set-url origin "https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git"
-
-      - name: 'Create Patch'
-        id: 'create_patch'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          GH_TOKEN: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
-        continue-on-error: true
-        run: |
-          # Capture output and display it in logs using tee
-          {
-            node scripts/releasing/create-patch-pr.js --commit=${{ github.event.inputs.commit }} --channel=${{ github.event.inputs.channel }} --pullRequestNumber=${{ github.event.inputs.original_pr }} --dry-run=${{ github.event.inputs.dry_run }}
-            echo "EXIT_CODE=$?" >> "$GITHUB_OUTPUT"
-          } 2>&1 | tee >(
-            echo "LOG_CONTENT<<EOF" >> "$GITHUB_ENV"
-            cat >> "$GITHUB_ENV"
-            echo "EOF" >> "$GITHUB_ENV"
-          )
-
-      - name: 'Comment on Original PR'
-        if: 'always() && inputs.original_pr'
-        env:
-          GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          ORIGINAL_PR: '${{ github.event.inputs.original_pr }}'
-          EXIT_CODE: '${{ steps.create_patch.outputs.EXIT_CODE }}'
-          COMMIT: '${{ github.event.inputs.commit }}'
-          CHANNEL: '${{ github.event.inputs.channel }}'
-          REPOSITORY: '${{ github.repository }}'
-          GITHUB_RUN_ID: '${{ github.run_id }}'
-          LOG_CONTENT: '${{ env.LOG_CONTENT }}'
-        continue-on-error: true
-        run: |
-          git checkout '${{ github.event.inputs.ref }}'
-          node scripts/releasing/patch-create-comment.js
-
-      - name: 'Fail Workflow if Main Task Failed'
-        if: 'always() && steps.create_patch.outputs.EXIT_CODE != 0'
-        run: |
-          echo "Patch creation failed with exit code: ${{ steps.create_patch.outputs.EXIT_CODE }}"
-          echo "Check the logs above and the comment posted to the original PR for details."
-          exit 1

.github/workflows/release-patch-2-trigger.yml

@@ -1,78 +0,0 @@
-name: 'Release: Patch (2) Trigger'
-
-on:
-  pull_request:
-    types:
-      - 'closed'
-    branches:
-      - 'release/**'
-  workflow_dispatch:
-    inputs:
-      ref:
-        description: 'The head ref of the merged hotfix PR to trigger the release for (e.g. hotfix/v1.2.3/cherry-pick-abc).'
-        required: true
-        type: 'string'
-      workflow_ref:
-        description: 'The ref to checkout the workflow code from.'
-        required: false
-        type: 'string'
-        default: 'main'
-      workflow_id:
-        description: 'The workflow to trigger. Defaults to patch-release.yml'
-        required: false
-        type: 'string'
-        default: 'release-patch-3-release.yml'
-      dry_run:
-        description: 'Whether this is a dry run.'
-        required: false
-        type: 'boolean'
-        default: false
-      force_skip_tests:
-        description: 'Select to skip the "Run Tests" step in testing. Prod releases should run tests'
-        required: false
-        type: 'boolean'
-        default: false
-      test_mode:
-        description: 'Whether or not to run in test mode'
-        required: false
-        type: 'boolean'
-        default: false
-
-jobs:
-  trigger-patch-release:
-    if: "(github.event_name == 'pull_request' && github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'hotfix/')) || github.event_name == 'workflow_dispatch'"
-    runs-on: 'ubuntu-latest'
-    permissions:
-      actions: 'write'
-      contents: 'write'
-      pull-requests: 'write'
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          ref: "${{ github.event.inputs.workflow_ref || 'main' }}"
-          fetch-depth: 1
-
-      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020'
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-
-      - name: 'Install Dependencies'
-        run: 'npm ci'
-
-      - name: 'Trigger Patch Release'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          HEAD_REF: "${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || github.event.inputs.ref }}"
-          PR_BODY: "${{ github.event_name == 'pull_request' && github.event.pull_request.body || '' }}"
-          WORKFLOW_ID: '${{ github.event.inputs.workflow_id }}'
-          GITHUB_REPOSITORY_OWNER: '${{ github.repository_owner }}'
-          GITHUB_REPOSITORY_NAME: '${{ github.event.repository.name }}'
-          GITHUB_EVENT_NAME: '${{ github.event_name }}'
-          GITHUB_EVENT_PAYLOAD: '${{ toJSON(github.event) }}'
-          FORCE_SKIP_TESTS: '${{ github.event.inputs.force_skip_tests }}'
-          TEST_MODE: '${{ github.event.inputs.test_mode }}'
-        run: |
-          node scripts/releasing/patch-trigger.js --dry-run=${{ github.event.inputs.dry_run }}

.github/workflows/release-patch-3-release.yml

@@ -1,220 +0,0 @@
-name: 'Release: Patch (3) Release'
-
-on:
-  workflow_dispatch:
-    inputs:
-      type:
-        description: 'The type of release to perform.'
-        required: true
-        type: 'choice'
-        options:
-          - 'stable'
-          - 'preview'
-      dry_run:
-        description: 'Run a dry-run of the release process; no branches, npm packages or GitHub releases will be created.'
-        required: true
-        type: 'boolean'
-        default: true
-      force_skip_tests:
-        description: 'Select to skip the "Run Tests" step in testing. Prod releases should run tests'
-        required: false
-        type: 'boolean'
-        default: false
-      release_ref:
-        description: 'The branch, tag, or SHA to release from.'
-        required: true
-        type: 'string'
-      original_pr:
-        description: 'The original PR number to comment back on.'
-        required: false
-        type: 'string'
-
-jobs:
-  release:
-    runs-on: 'ubuntu-latest'
-    permissions:
-      contents: 'write'
-      packages: 'write'
-      issues: 'write'
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-
-      - name: 'Checkout Release Code'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          ref: '${{ github.event.inputs.release_ref }}'
-          path: 'release'
-          fetch-depth: 0
-
-      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-
-      - name: 'Install Dependencies'
-        working-directory: './release'
-        run: |-
-          npm ci
-
-      - name: 'Print Inputs'
-        shell: 'bash'
-        run: |-
-          echo "${{ toJSON(inputs) }}"
-
-      - name: 'Get Patch Version'
-        id: 'patch_version'
-        env:
-          GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        run: |
-          # Use the existing get-release-version.js script to calculate patch version
-          # Run from main checkout which has full git history and access to npm
-          PATCH_JSON=$(node scripts/get-release-version.js --type=patch --patch-from=${{ github.event.inputs.type }})
-          echo "Patch version calculation result: ${PATCH_JSON}"
-
-          RELEASE_VERSION=$(echo "${PATCH_JSON}" | jq -r .releaseVersion)
-          RELEASE_TAG=$(echo "${PATCH_JSON}" | jq -r .releaseTag)
-          NPM_TAG=$(echo "${PATCH_JSON}" | jq -r .npmTag)
-          PREVIOUS_TAG=$(echo "${PATCH_JSON}" | jq -r .previousReleaseTag)
-
-          echo "RELEASE_VERSION=${RELEASE_VERSION}" >> "${GITHUB_OUTPUT}"
-          echo "RELEASE_TAG=${RELEASE_TAG}" >> "${GITHUB_OUTPUT}"
-          echo "NPM_TAG=${NPM_TAG}" >> "${GITHUB_OUTPUT}"
-          echo "PREVIOUS_TAG=${PREVIOUS_TAG}" >> "${GITHUB_OUTPUT}"
-
-      - name: 'Verify Version Consistency'
-        env:
-          GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          CHANNEL: '${{ github.event.inputs.type }}'
-        run: |
-          echo "🔍 Verifying no concurrent patch releases have occurred..."
-
-          # Store original calculation for comparison
-          ORIGINAL_RELEASE_VERSION="${{ steps.patch_version.outputs.RELEASE_VERSION }}"
-          ORIGINAL_RELEASE_TAG="${{ steps.patch_version.outputs.RELEASE_TAG }}"
-          ORIGINAL_PREVIOUS_TAG="${{ steps.patch_version.outputs.PREVIOUS_TAG }}"
-
-          echo "Original calculation:"
-          echo "  Release version: ${ORIGINAL_RELEASE_VERSION}"
-          echo "  Release tag: ${ORIGINAL_RELEASE_TAG}"
-          echo "  Previous tag: ${ORIGINAL_PREVIOUS_TAG}"
-
-          # Re-run the same version calculation script
-          echo "Re-calculating version to check for changes..."
-          CURRENT_PATCH_JSON=$(node scripts/get-release-version.js --type=patch --patch-from="${CHANNEL}")
-          CURRENT_RELEASE_VERSION=$(echo "${CURRENT_PATCH_JSON}" | jq -r .releaseVersion)
-          CURRENT_RELEASE_TAG=$(echo "${CURRENT_PATCH_JSON}" | jq -r .releaseTag)
-          CURRENT_PREVIOUS_TAG=$(echo "${CURRENT_PATCH_JSON}" | jq -r .previousReleaseTag)
-
-          echo "Current calculation:"
-          echo "  Release version: ${CURRENT_RELEASE_VERSION}"
-          echo "  Release tag: ${CURRENT_RELEASE_TAG}"
-          echo "  Previous tag: ${CURRENT_PREVIOUS_TAG}"
-
-          # Compare calculations
-          if [[ "${ORIGINAL_RELEASE_VERSION}" != "${CURRENT_RELEASE_VERSION}" ]] || \
-             [[ "${ORIGINAL_RELEASE_TAG}" != "${CURRENT_RELEASE_TAG}" ]] || \
-             [[ "${ORIGINAL_PREVIOUS_TAG}" != "${CURRENT_PREVIOUS_TAG}" ]]; then
-            echo "❌ RACE CONDITION DETECTED: Version calculations have changed!"
-            echo "This indicates another patch release completed while this one was in progress."
-            echo ""
-            echo "Originally planned:  ${ORIGINAL_RELEASE_VERSION} (from ${ORIGINAL_PREVIOUS_TAG})"
-            echo "Should now build:    ${CURRENT_RELEASE_VERSION} (from ${CURRENT_PREVIOUS_TAG})"
-            echo ""
-            echo "# Setting outputs for failure comment"
-            echo "CURRENT_RELEASE_VERSION=${CURRENT_RELEASE_VERSION}" >> "${GITHUB_ENV}"
-            echo "CURRENT_RELEASE_TAG=${CURRENT_RELEASE_TAG}" >> "${GITHUB_ENV}"
-            echo "CURRENT_PREVIOUS_TAG=${CURRENT_PREVIOUS_TAG}" >> "${GITHUB_ENV}"
-            echo "The patch release must be restarted to use the correct version numbers."
-            exit 1
-          fi
-
-          echo "✅ Version calculations unchanged - proceeding with release"
-
-      - name: 'Print Calculated Version'
-        run: |-
-          echo "Patch Release Summary:"
-          echo "  Release Version: ${{ steps.patch_version.outputs.RELEASE_VERSION }}"
-          echo "  Release Tag: ${{ steps.patch_version.outputs.RELEASE_TAG }}"
-          echo "  NPM Tag: ${{ steps.patch_version.outputs.NPM_TAG }}"
-          echo "  Previous Tag: ${{ steps.patch_version.outputs.PREVIOUS_TAG }}"
-
-      - name: 'Run Tests'
-        if: "${{github.event.inputs.force_skip_tests != 'true'}}"
-        uses: './.github/actions/run-tests'
-        with:
-          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
-          working-directory: './release'
-
-      - name: 'Publish Release'
-        uses: './.github/actions/publish-release'
-        with:
-          release-version: '${{ steps.patch_version.outputs.RELEASE_VERSION }}'
-          release-tag: '${{ steps.patch_version.outputs.RELEASE_TAG }}'
-          npm-tag: '${{ steps.patch_version.outputs.NPM_TAG }}'
-          wombat-token-core: '${{ secrets.WOMBAT_TOKEN_CORE }}'
-          wombat-token-cli: '${{ secrets.WOMBAT_TOKEN_CLI }}'
-          github-token: '${{ secrets.GITHUB_TOKEN }}'
-          dry-run: '${{ github.event.inputs.dry_run }}'
-          previous-tag: '${{ steps.patch_version.outputs.PREVIOUS_TAG }}'
-          working-directory: './release'
-          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
-
-      - name: 'Create Issue on Failure'
-        if: '${{ failure() && github.event.inputs.dry_run == false }}'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          RELEASE_TAG: '${{ steps.patch_version.outputs.RELEASE_TAG }}'
-          DETAILS_URL: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        run: |
-          gh issue create \
-            --title 'Patch Release Failed for ${RELEASE_TAG} on $(date +'%Y-%m-%d')' \
-            --body 'The patch-release workflow failed. See the full run for details: ${DETAILS_URL}' \
-            --label 'kind/bug,release-failure,priority/p0'
-
-      - name: 'Comment Success on Original PR'
-        if: '${{ success() && github.event.inputs.original_pr }}'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          ORIGINAL_PR: '${{ github.event.inputs.original_pr }}'
-          SUCCESS: 'true'
-          RELEASE_VERSION: '${{ steps.patch_version.outputs.RELEASE_VERSION }}'
-          RELEASE_TAG: '${{ steps.patch_version.outputs.RELEASE_TAG }}'
-          NPM_TAG: '${{ steps.patch_version.outputs.NPM_TAG }}'
-          CHANNEL: '${{ github.event.inputs.type }}'
-          DRY_RUN: '${{ github.event.inputs.dry_run }}'
-          GITHUB_RUN_ID: '${{ github.run_id }}'
-          GITHUB_REPOSITORY_OWNER: '${{ github.repository_owner }}'
-          GITHUB_REPOSITORY_NAME: '${{ github.event.repository.name }}'
-        run: |
-          node scripts/releasing/patch-comment.js
-
-      - name: 'Comment Failure on Original PR'
-        if: '${{ failure() && github.event.inputs.original_pr }}'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          ORIGINAL_PR: '${{ github.event.inputs.original_pr }}'
-          SUCCESS: 'false'
-          RELEASE_VERSION: '${{ steps.patch_version.outputs.RELEASE_VERSION }}'
-          RELEASE_TAG: '${{ steps.patch_version.outputs.RELEASE_TAG }}'
-          NPM_TAG: '${{ steps.patch_version.outputs.NPM_TAG }}'
-          CHANNEL: '${{ github.event.inputs.type }}'
-          DRY_RUN: '${{ github.event.inputs.dry_run }}'
-          GITHUB_RUN_ID: '${{ github.run_id }}'
-          GITHUB_REPOSITORY_OWNER: '${{ github.repository_owner }}'
-          GITHUB_REPOSITORY_NAME: '${{ github.event.repository.name }}'
-          # Pass current version info for race condition failures
-          CURRENT_RELEASE_VERSION: '${{ env.CURRENT_RELEASE_VERSION }}'
-          CURRENT_RELEASE_TAG: '${{ env.CURRENT_RELEASE_TAG }}'
-          CURRENT_PREVIOUS_TAG: '${{ env.CURRENT_PREVIOUS_TAG }}'
-        run: |
-          # Check if this was a version consistency failure
-          if [[ -n "${CURRENT_RELEASE_VERSION}" ]]; then
-            echo "Detected version race condition failure - posting specific comment with current version info"
-            export RACE_CONDITION_FAILURE=true
-          fi
-          node scripts/releasing/patch-comment.js

.github/workflows/release-promote.yml

@@ -1,357 +0,0 @@
-name: 'Release: Promote'
-
-on:
-  workflow_dispatch:
-    inputs:
-      dry_run:
-        description: 'Run a dry-run of the release process; no branches, npm packages or GitHub releases will be created.'
-        required: true
-        type: 'boolean'
-        default: true
-      force_skip_tests:
-        description: 'Select to skip the "Run Tests" step in testing. Prod releases should run tests'
-        required: false
-        type: 'boolean'
-        default: false
-      ref:
-        description: 'The branch, tag, or SHA to release from.'
-        required: false
-        type: 'string'
-        default: 'main'
-      stable_version_override:
-        description: 'Manually override the stable version number.'
-        required: false
-        type: 'string'
-      preview_version_override:
-        description: 'Manually override the preview version number.'
-        required: false
-        type: 'string'
-
-jobs:
-  calculate-versions:
-    name: 'Calculate Versions and Plan'
-    runs-on: 'ubuntu-latest'
-    outputs:
-      STABLE_VERSION: '${{ steps.versions.outputs.STABLE_VERSION }}'
-      STABLE_SHA: '${{ steps.versions.outputs.STABLE_SHA }}'
-      PREVIOUS_STABLE_TAG: '${{ steps.versions.outputs.PREVIOUS_STABLE_TAG }}'
-      PREVIEW_VERSION: '${{ steps.versions.outputs.PREVIEW_VERSION }}'
-      PREVIEW_SHA: '${{ steps.versions.outputs.PREVIEW_SHA }}'
-      PREVIOUS_PREVIEW_TAG: '${{ steps.versions.outputs.PREVIOUS_PREVIEW_TAG }}'
-      NEXT_NIGHTLY_VERSION: '${{ steps.versions.outputs.NEXT_NIGHTLY_VERSION }}'
-      PREVIOUS_NIGHTLY_TAG: '${{ steps.versions.outputs.PREVIOUS_NIGHTLY_TAG }}'
-
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-
-      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020'
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-
-      - name: 'Install Dependencies'
-        run: 'npm ci'
-
-      - name: 'Print Inputs'
-        shell: 'bash'
-        run: |-
-          echo "${{ toJSON(inputs) }}"
-
-      - name: 'Calculate Versions and SHAs'
-        id: 'versions'
-        env:
-          GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        run: |
-          set -e
-          STABLE_COMMAND="node scripts/get-release-version.js --type=stable ${{ github.event.inputs.stable_version_override && format('--stable_version_override={0}', github.event.inputs.stable_version_override) || '' }}"
-          PREVIEW_COMMAND="node scripts/get-release-version.js --type=preview ${{ github.event.inputs.preview_version_override && format('--preview_version_override={0}', github.event.inputs.preview_version_override) || '' }}"
-          NIGHTLY_COMMAND="node scripts/get-release-version.js --type=promote-nightly"
-          STABLE_JSON=$(${STABLE_COMMAND})
-          PREVIEW_JSON=$(${PREVIEW_COMMAND})
-          NIGHTLY_JSON=$(${NIGHTLY_COMMAND})
-          echo "STABLE_JSON_COMMAND=${STABLE_COMMAND}"
-          echo "PREVIEW_JSON_COMMAND=${PREVIEW_COMMAND}"
-          echo "NIGHTLY_JSON_COMMAND=${NIGHTLY_COMMAND}"
-          echo "STABLE_JSON: ${STABLE_JSON}"
-          echo "PREVIEW_JSON: ${PREVIEW_JSON}"
-          echo "NIGHTLY_JSON: ${NIGHTLY_JSON}"
-          echo "STABLE_VERSION=$(echo "${STABLE_JSON}" | jq -r .releaseVersion)" >> "${GITHUB_OUTPUT}"
-          # shellcheck disable=SC1083
-          echo "STABLE_SHA=$(git rev-parse "$(echo "${PREVIEW_JSON}" | jq -r .previousReleaseTag)"^{commit})" >> "${GITHUB_OUTPUT}"
-          echo "PREVIOUS_STABLE_TAG=$(echo "${STABLE_JSON}" | jq -r .previousReleaseTag)" >> "${GITHUB_OUTPUT}"
-          echo "PREVIEW_VERSION=$(echo "${PREVIEW_JSON}" | jq -r .releaseVersion)" >> "${GITHUB_OUTPUT}"
-          # shellcheck disable=SC1083
-          REF="${{ github.event.inputs.ref }}"
-          SHA=$(git ls-remote origin "$REF" | awk '{print $1}')
-          if [ -z "$SHA" ]; then
-            if [[ "$REF" =~ ^[0-9a-f]{7,40}$ ]]; then
-              SHA="$REF"
-            else
-              echo "::error::Could not resolve ref '$REF' to a commit SHA."
-              exit 1
-            fi
-          fi
-          echo "PREVIEW_SHA=$SHA" >> "${GITHUB_OUTPUT}"
-          echo "PREVIOUS_PREVIEW_TAG=$(echo "${PREVIEW_JSON}" | jq -r .previousReleaseTag)" >> "${GITHUB_OUTPUT}"
-          echo "NEXT_NIGHTLY_VERSION=$(echo "${NIGHTLY_JSON}" | jq -r .releaseVersion)" >> "${GITHUB_OUTPUT}"
-          echo "PREVIOUS_NIGHTLY_TAG=$(echo "${NIGHTLY_JSON}" | jq -r .previousReleaseTag)" >> "${GITHUB_OUTPUT}"
-          CURRENT_NIGHTLY_TAG=$(git describe --tags --abbrev=0 --match="*nightly*")
-          echo "CURRENT_NIGHTLY_TAG=${CURRENT_NIGHTLY_TAG}" >> "${GITHUB_OUTPUT}"
-          echo "NEXT_SHA=$SHA" >> "${GITHUB_OUTPUT}"
-
-      - name: 'Display Pending Updates'
-        run: |
-          echo "Release Plan:"
-          echo "-----------"
-          echo "Stable Release: ${{ steps.versions.outputs.STABLE_VERSION }}"
-          echo "  - Commit: ${{ steps.versions.outputs.STABLE_SHA }}"
-          echo "  - Previous Tag: ${{ steps.versions.outputs.PREVIOUS_STABLE_TAG }}"
-          echo ""
-          echo "Preview Release: ${{ steps.versions.outputs.PREVIEW_VERSION }}"
-          echo "  - Commit: ${{ steps.versions.outputs.PREVIEW_SHA }} (${{ github.event.inputs.ref }})"
-          echo "  - Previous Tag: ${{ steps.versions.outputs.PREVIOUS_PREVIEW_TAG }}"
-          echo ""
-          echo "Next Nightly Release: ${{ steps.versions.outputs.NEXT_NIGHTLY_VERSION }}"
-          echo "  - Commit: ${{ steps.versions.outputs.NEXT_SHA }} (${{ github.event.inputs.ref }})"
-          echo "  - Previous Tag: ${{ steps.versions.outputs.PREVIOUS_NIGHTLY_TAG }}"
-
-  test:
-    name: 'Test ${{ matrix.channel }}'
-    needs: 'calculate-versions'
-    runs-on: 'ubuntu-latest'
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - channel: 'stable'
-            sha: '${{ needs.calculate-versions.outputs.STABLE_SHA }}'
-          - channel: 'preview'
-            sha: '${{ needs.calculate-versions.outputs.PREVIEW_SHA }}'
-          - channel: 'nightly'
-            sha: '${{ github.event.inputs.ref }}'
-    steps:
-      - name: 'Checkout Ref'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          ref: '${{ github.event.inputs.ref }}'
-
-      - name: 'Checkout correct SHA'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          ref: '${{ matrix.sha }}'
-          path: 'release'
-          fetch-depth: 0
-
-      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020'
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-
-      - name: 'Install Dependencies'
-        working-directory: './release'
-        run: 'npm ci'
-
-      - name: 'Run Tests'
-        if: "${{github.event.inputs.force_skip_tests != 'true'}}"
-        uses: './.github/actions/run-tests'
-        with:
-          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
-          working-directory: './release'
-
-  publish-preview:
-    name: 'Publish preview'
-    needs: ['calculate-versions', 'test']
-    runs-on: 'ubuntu-latest'
-    permissions:
-      contents: 'write'
-      packages: 'write'
-      issues: 'write'
-    steps:
-      - name: 'Checkout Ref'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          ref: '${{ github.event.inputs.ref }}'
-
-      - name: 'Checkout correct SHA'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          ref: '${{ needs.calculate-versions.outputs.PREVIEW_SHA }}'
-          path: 'release'
-          fetch-depth: 0
-
-      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020'
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-
-      - name: 'Install Dependencies'
-        working-directory: './release'
-        run: 'npm ci'
-
-      - name: 'Publish Release'
-        uses: './.github/actions/publish-release'
-        with:
-          release-version: '${{ needs.calculate-versions.outputs.PREVIEW_VERSION }}'
-          release-tag: 'v${{ needs.calculate-versions.outputs.PREVIEW_VERSION }}'
-          npm-tag: 'preview'
-          wombat-token-core: '${{ secrets.WOMBAT_TOKEN_CORE }}'
-          wombat-token-cli: '${{ secrets.WOMBAT_TOKEN_CLI }}'
-          github-token: '${{ secrets.GITHUB_TOKEN }}'
-          dry-run: '${{ github.event.inputs.dry_run }}'
-          previous-tag: '${{ needs.calculate-versions.outputs.PREVIOUS_PREVIEW_TAG }}'
-          working-directory: './release'
-          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
-          force-skip-tests: '${{ github.event.inputs.force_skip_tests }}'
-
-      - name: 'Create Issue on Failure'
-        if: '${{ failure() && github.event.inputs.dry_run == false }}'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          RELEASE_TAG: 'v${{ needs.calculate-versions.outputs.PREVIEW_VERSION }}'
-          DETAILS_URL: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        run: |
-          gh issue create \
-            --title 'Promote Release Failed for ${RELEASE_TAG} on $(date +'%Y-%m-%d')' \
-            --body 'The promote-release workflow failed during preview publish. See the full run for details: ${DETAILS_URL}' \
-            --label 'kind/bug,release-failure,priority/p0'
-
-  publish-stable:
-    name: 'Publish stable'
-    needs: ['calculate-versions', 'test', 'publish-preview']
-    runs-on: 'ubuntu-latest'
-    permissions:
-      contents: 'write'
-      packages: 'write'
-      issues: 'write'
-    steps:
-      - name: 'Checkout Ref'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          ref: '${{ github.event.inputs.ref }}'
-
-      - name: 'Checkout correct SHA'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          ref: '${{ needs.calculate-versions.outputs.STABLE_SHA }}'
-          path: 'release'
-          fetch-depth: 0
-
-      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020'
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-
-      - name: 'Install Dependencies'
-        working-directory: './release'
-        run: 'npm ci'
-
-      - name: 'Publish Release'
-        uses: './.github/actions/publish-release'
-        with:
-          release-version: '${{ needs.calculate-versions.outputs.STABLE_VERSION }}'
-          release-tag: 'v${{ needs.calculate-versions.outputs.STABLE_VERSION }}'
-          npm-tag: 'latest'
-          wombat-token-core: '${{ secrets.WOMBAT_TOKEN_CORE }}'
-          wombat-token-cli: '${{ secrets.WOMBAT_TOKEN_CLI }}'
-          github-token: '${{ secrets.GITHUB_TOKEN }}'
-          dry-run: '${{ github.event.inputs.dry_run }}'
-          previous-tag: '${{ needs.calculate-versions.outputs.PREVIOUS_STABLE_TAG }}'
-          working-directory: './release'
-          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
-          force-skip-tests: '${{ github.event.inputs.force_skip_tests }}'
-
-      - name: 'Create Issue on Failure'
-        if: '${{ failure() && github.event.inputs.dry_run == false }}'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          RELEASE_TAG: 'v${{ needs.calculate-versions.outputs.STABLE_VERSION }}'
-          DETAILS_URL: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        run: |
-          gh issue create \
-            --title 'Promote Release Failed for ${RELEASE_TAG} on $(date +'%Y-%m-%d')' \
-            --body 'The promote-release workflow failed during stable publish. See the full run for details: ${DETAILS_URL}' \
-            --label 'kind/bug,release-failure,priority/p0'
-
-  nightly-pr:
-    name: 'Create Nightly PR'
-    needs: ['publish-stable', 'calculate-versions']
-    runs-on: 'ubuntu-latest'
-    permissions:
-      contents: 'write'
-      pull-requests: 'write'
-      issues: 'write'
-    steps:
-      - name: 'Checkout Ref'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          ref: '${{ github.event.inputs.ref }}'
-
-      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020'
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-
-      - name: 'Install Dependencies'
-        run: 'npm ci'
-
-      - name: 'Configure Git User'
-        run: |-
-          git config user.name "gemini-cli-robot"
-          git config user.email "gemini-cli-robot@google.com"
-
-      - name: 'Create and switch to a new branch'
-        id: 'release_branch'
-        run: |
-          BRANCH_NAME="chore/nightly-version-bump-${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}"
-          git switch -c "${BRANCH_NAME}"
-          echo "BRANCH_NAME=${BRANCH_NAME}" >> "${GITHUB_OUTPUT}"
-
-      - name: 'Update package versions'
-        run: 'npm run release:version "${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}"'
-
-      - name: 'Commit and Push package versions'
-        env:
-          BRANCH_NAME: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
-          DRY_RUN: '${{ github.event.inputs.dry_run }}'
-        run: |-
-          git add package.json packages/*/package.json
-          if [ -f package-lock.json ]; then
-            git add package-lock.json
-          fi
-          git commit -m "chore(release): bump version to ${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}"
-          if [[ "${DRY_RUN}" == "false" ]]; then
-            echo "Pushing release branch to remote..."
-            git push --set-upstream origin "${BRANCH_NAME}"
-          else
-            echo "Dry run enabled. Skipping push."
-          fi
-
-      - name: 'Create and Merge Pull Request'
-        uses: './.github/actions/create-pull-request'
-        with:
-          branch-name: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
-          pr-title: 'chore(release): bump version to ${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}'
-          pr-body: 'Automated version bump to prepare for the next nightly release.'
-          github-token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
-          dry-run: '${{ github.event.inputs.dry_run }}'
-
-      - name: 'Create Issue on Failure'
-        if: '${{ failure() && github.event.inputs.dry_run == false }}'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          RELEASE_TAG: 'v${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}'
-          DETAILS_URL: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        run: |
-          gh issue create \
-            --title 'Promote Release Failed for ${RELEASE_TAG} on $(date +'%Y-%m-%d')' \
-            --body 'The promote-release workflow failed during nightly PR creation. See the full run for details: ${DETAILS_URL}' \
-            --label 'kind/bug,release-failure,priority/p0'

.github/workflows/release-rollback.yml

@@ -1,164 +0,0 @@
-name: 'Release: Rollback change'
-
-on:
-  workflow_dispatch:
-    inputs:
-      rollback_origin:
-        description: 'The package version to rollback FROM and delete (e.g., 0.5.0-preview-2)'
-        required: true
-        type: 'string'
-      rollback_destination:
-        description: 'The package version to rollback TO (e.g., 0.5.0-preview-2). This version must already exist on the npm registry.'
-        required: false
-        type: 'string'
-      channel:
-        description: 'The npm dist-tag to apply to rollback_destination (e.g., latest, preview, nightly). REQUIRED IF rollback_destination is set.'
-        required: false
-        type: 'choice'
-        options:
-          - 'latest'
-          - 'preview'
-          - 'nightly'
-          - 'dev'
-        default: 'dev'
-      ref:
-        description: 'The branch, tag, or SHA to run from.'
-        required: false
-        type: 'string'
-        default: 'main'
-      dry-run:
-        description: 'Whether to run in dry-run mode.'
-        required: false
-        type: 'boolean'
-        default: true
-
-jobs:
-  change-tags:
-    runs-on: 'ubuntu-latest'
-    permissions:
-      packages: 'write'
-      issues: 'write'
-    steps:
-      - name: 'Checkout repository'
-        uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v4
-        with:
-          ref: '${{ github.event.inputs.ref }}'
-          fetch-depth: 0
-
-      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020'
-        with:
-          node-version-file: '.nvmrc'
-          registry-url: 'https://wombat-dressing-room.appspot.com'
-          scope: '@google'
-
-      - name: 'Get Origin Version Tag'
-        id: 'origin_tag'
-        shell: 'bash'
-        run: |
-          TAG_VALUE="v${{ github.event.inputs.rollback_origin }}"
-          echo "ORIGIN_TAG=$TAG_VALUE" >> "$GITHUB_OUTPUT"
-
-      - name: 'Get Origin Commit Hash'
-        id: 'origin_hash'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        shell: 'bash'
-        run: |
-          echo "ORIGIN_HASH=$(git rev-parse ${{ steps.origin_tag.outputs.ORIGIN_TAG }})" >> "$GITHUB_OUTPUT"
-
-      - name: 'Change tag'
-        if: "${{ github.event.inputs.rollback_destination != '' }}"
-        uses: './.github/actions/tag-npm-release'
-        with:
-          channel: '${{ github.event.inputs.channel }}'
-          version: '${{ github.event.inputs.rollback_destination }}'
-          dry-run: '${{ github.event.inputs.dry-run }}'
-          wombat-token-core: '${{ secrets.WOMBAT_TOKEN_CORE }}'
-          wombat-token-cli: '${{ secrets.WOMBAT_TOKEN_CLI }}'
-
-      - name: 'Deprecate Cli Npm Package'
-        if: "${{ github.event.inputs.dry-run == 'false' }}"
-        env:
-          NODE_AUTH_TOKEN: '${{ secrets.WOMBAT_TOKEN_CLI }}'
-        shell: 'bash'
-        run: |
-          npm deprecate @google/gemini-cli@${{ github.event.inputs.rollback_origin }} "This version has been rolled back."
-
-      - name: 'Deprecate Core Npm Package'
-        if: "${{ github.event.inputs.dry-run == 'false' }}"
-        env:
-          NODE_AUTH_TOKEN: '${{ secrets.WOMBAT_TOKEN_CORE }}'
-        shell: 'bash'
-        run: |
-          npm deprecate @google/gemini-core@${{ github.event.inputs.rollback_origin }} "This version has been rolled back."
-
-      - name: 'Delete Github Release'
-        if: "${{ github.event.inputs.dry-run == 'false' }}"
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        shell: 'bash'
-        run: |
-          gh release delete '${{ steps.origin_tag.outputs.ORIGIN_TAG }}' --yes
-
-      - name: 'Verify Origin Release Deletion'
-        if: "${{ github.event.inputs.dry-run == 'false' }}"
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        shell: 'bash'
-        run: |
-          TARGET_TAG="${{ steps.origin_tag.outputs.ORIGIN_TAG }}"
-          RELEASE_TAG=$(gh release view "$TARGET_TAG" --json tagName --jq .tagName)
-          if [ "$RELEASE_TAG" = "$TARGET_TAG" ]; then
-            echo '❌ Failed to delete release with tag ${{ steps.origin_tag.outputs.ORIGIN_TAG }}'
-            echo '❌ This means the release was not deleted, and the workflow should fail.'
-            exit 1
-          fi
-
-      - name: 'Add Rollback Tag'
-        id: 'rollback_tag'
-        if: "${{ github.event.inputs.dry-run == 'false' }}"
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        shell: 'bash'
-        run: |
-          ROLLBACK_TAG_NAME="${{ steps.origin_tag.outputs.ORIGIN_TAG }}-rollback"
-          echo "ROLLBACK_TAG=$ROLLBACK_TAG_NAME" >> "$GITHUB_OUTPUT"
-          git tag "$ROLLBACK_TAG_NAME" "${{ steps.origin_hash.outputs.ORIGIN_HASH }}"
-          git push origin --tags
-
-      - name: 'Verify Rollback Tag Added'
-        if: "${{ github.event.inputs.dry-run == 'false' }}"
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        shell: 'bash'
-        run: |
-          TARGET_TAG="${{ steps.rollback_tag.outputs.ROLLBACK_TAG }}"
-          TARGET_HASH="${{ steps.origin_hash.outputs.ORIGIN_HASH }}"
-          ROLLBACK_COMMIT=$(git rev-parse -q --verify "$TARGET_TAG")
-          if [ "$ROLLBACK_COMMIT" != "$TARGET_HASH" ]; then
-            echo '❌ Failed to add tag $TARGET_TAG to commit $TARGET_HASH'
-            echo '❌ This means the tag was not added, and the workflow should fail.'
-            exit 1
-          fi
-
-      - name: 'Log Dry run'
-        if: "${{ github.event.inputs.dry-run == 'true' }}"
-        shell: 'bash'
-        run: |
-          echo "
-          Inputs:
-          - rollback_origin: '${{ github.event.inputs.rollback_origin }}'
-          - rollback_destination: '${{ github.event.inputs.rollback_destination }}'
-          - channel: '${{ github.event.inputs.channel }}'
-          - ref: '${{ github.event.inputs.ref }}'
-
-          Outputs:
-          - ORIGIN_TAG: '${{ steps.origin_tag.outputs.ORIGIN_TAG }}'
-          - ORIGIN_HASH: '${{ steps.origin_hash.outputs.ORIGIN_HASH }}'
-          - ROLLBACK_TAG: '${{ steps.rollback_tag.outputs.ROLLBACK_TAG }}'
-
-          Would have npm deprecate @google/gemini-cli@${{ github.event.inputs.rollback_origin }} and @google/gemini-core@${{ github.event.inputs.rollback_origin }}
-          Would have deleted the github release with tag ${{ steps.origin_tag.outputs.ORIGIN_TAG }}
-          Would have added tag ${{ steps.origin_tag.outputs.ORIGIN_TAG }}-rollback to ${{ steps.origin_hash.outputs.ORIGIN_HASH }}
-          "

.github/workflows/release-sandbox.yml

@@ -1,49 +0,0 @@
-name: 'Release Sandbox'
-
-on:
-  workflow_dispatch:
-    inputs:
-      ref:
-        description: 'The branch, tag, or SHA to release from.'
-        required: false
-        type: 'string'
-        default: 'main'
-      dry-run:
-        description: 'Whether this is a dry run.'
-        required: false
-        type: 'boolean'
-        default: true
-
-jobs:
-  build:
-    runs-on: 'ubuntu-latest'
-    permissions:
-      contents: 'read'
-      packages: 'write'
-      issues: 'write'
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          ref: '${{ github.event.inputs.ref || github.sha }}'
-          fetch-depth: 0
-      - name: 'Push'
-        uses: './.github/actions/push-sandbox'
-        with:
-          dockerhub-username: '${{ secrets.DOCKER_SERVICE_ACCOUNT_NAME }}'
-          dockerhub-token: '${{ secrets.DOCKER_SERVICE_ACCOUNT_KEY }}'
-          github-actor: '${{ github.actor }}'
-          github-secret: '${{ secrets.GITHUB_TOKEN }}'
-          github-sha: '${{ github.sha }}'
-          github-ref-name: '${{github.event.inputs.ref}}'
-          dry-run: '${{ github.event.inputs.dry-run }}'
-      - name: 'Create Issue on Failure'
-        if: '${{ failure() && github.event.inputs.dry-run == false }}'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          DETAILS_URL: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
-        run: |
-          gh issue create \
-            --title 'Sandbox Release Failed on $(date +'%Y-%m-%d')' \
-            --body 'The sandbox-release workflow failed. See the full run for details: ${DETAILS_URL}' \
-            --label 'kind/bug,release-failure,priority/p0'

.github/workflows/release.yml

@@ -0,0 +1,173 @@
+name: Release
+
+on:
+  schedule:
+    # Runs every day at midnight UTC for the nightly release.
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'The version to release (e.g., v0.1.11). Required for manual patch releases.'
+        required: false # Not required for scheduled runs
+        type: string
+      ref:
+        description: 'The branch or ref (full git sha) to release from.'
+        required: true
+        type: string
+        default: 'main'
+      dry_run:
+        description: 'Run a dry-run of the release process; no branches, npm packages or GitHub releases will be created.'
+        required: true
+        type: boolean
+        default: true
+      create_nightly_release:
+        description: 'Auto apply the nightly release tag, input version is ignored.'
+        required: false
+        type: boolean
+        default: false
+      force_skip_tests:
+        description: 'Select to skip the "Run Tests" step in testing. Prod releases should run tests'
+        required: false
+        type: boolean
+        default: false
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    environment:
+      name: production-release
+      url: ${{ github.server_url }}/${{ github.repository }}/releases/tag/${{ steps.version.outputs.RELEASE_TAG }}
+    if: github.repository == 'google-gemini/gemini-cli'
+    permissions:
+      contents: write
+      packages: write
+      id-token: write
+      issues: write # For creating issues on failure
+    outputs:
+      RELEASE_TAG: ${{ steps.version.outputs.RELEASE_TAG }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          ref: ${{ github.sha }}
+          fetch-depth: 0
+
+      - name: Set booleans for simplified logic
+        id: vars
+        run: |
+          is_nightly="false"
+          if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event.inputs.create_nightly_release }}" == "true" ]]; then
+            is_nightly="true"
+          fi
+          echo "is_nightly=${is_nightly}" >> $GITHUB_OUTPUT
+
+          is_dry_run="false"
+          if [[ "${{ github.event.inputs.dry_run }}" == "true" ]]; then
+            is_dry_run="true"
+          fi
+          echo "is_dry_run=${is_dry_run}" >> $GITHUB_OUTPUT
+
+      - name: Setup Node.js
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        with:
+          node-version: '20'
+          cache: 'npm'
+
+      - name: Install Dependencies
+        run: npm ci
+
+      - name: Get the version
+        id: version
+        run: |
+          VERSION_JSON=$(node scripts/get-release-version.js)
+          echo "RELEASE_TAG=$(echo $VERSION_JSON | jq -r .releaseTag)" >> $GITHUB_OUTPUT
+          echo "RELEASE_VERSION=$(echo $VERSION_JSON | jq -r .releaseVersion)" >> $GITHUB_OUTPUT
+          echo "NPM_TAG=$(echo $VERSION_JSON | jq -r .npmTag)" >> $GITHUB_OUTPUT
+        env:
+          IS_NIGHTLY: ${{ steps.vars.outputs.is_nightly }}
+          MANUAL_VERSION: ${{ inputs.version }}
+
+      - name: Run Tests
+        if: github.event.inputs.force_skip_tests != 'true'
+        run: |
+          npm run preflight
+          npm run test:integration:sandbox:none
+          npm run test:integration:sandbox:docker
+        env:
+          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
+
+      - name: Configure Git User
+        run: |
+          git config user.name "gemini-cli-robot"
+          git config user.email "gemini-cli-robot@google.com"
+
+      - name: Create and switch to a release branch
+        id: release_branch
+        run: |
+          BRANCH_NAME="release/${{ steps.version.outputs.RELEASE_TAG }}"
+          git switch -c $BRANCH_NAME
+          echo "BRANCH_NAME=${BRANCH_NAME}" >> $GITHUB_OUTPUT
+
+      - name: Update package versions
+        run: |
+          npm run release:version ${{ steps.version.outputs.RELEASE_VERSION }}
+
+      - name: Commit and Conditionally Push package versions
+        run: |
+          git add package.json package-lock.json packages/*/package.json
+          git commit -m "chore(release): ${{ steps.version.outputs.RELEASE_TAG }}"
+          if [[ "${{ steps.vars.outputs.is_dry_run }}" == "false" ]]; then
+            echo "Pushing release branch to remote..."
+            git push --set-upstream origin ${{ steps.release_branch.outputs.BRANCH_NAME }} --follow-tags
+          else
+            echo "Dry run enabled. Skipping push."
+          fi
+
+      - name: Build and Prepare Packages
+        run: |
+          npm run build:packages
+          npm run prepare:package
+
+      - name: Configure npm for publishing
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        with:
+          node-version: '20'
+          registry-url: 'https://wombat-dressing-room.appspot.com'
+          scope: '@google'
+
+      - name: Publish @google/gemini-cli-core
+        run: npm publish --workspace=@google/gemini-cli-core --tag=${{ steps.version.outputs.NPM_TAG }} ${{ steps.vars.outputs.is_dry_run == 'true' && '--dry-run' || '' }}
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.WOMBAT_TOKEN_CORE }}
+
+      - name: Install latest core package
+        if: steps.vars.outputs.is_dry_run == 'false'
+        run: npm install @google/gemini-cli-core@${{ steps.version.outputs.RELEASE_VERSION }} --workspace=@google/gemini-cli --save-exact
+
+      - name: Publish @google/gemini-cli
+        run: npm publish --workspace=@google/gemini-cli --tag=${{ steps.version.outputs.NPM_TAG }} ${{ steps.vars.outputs.is_dry_run == 'true' && '--dry-run' || '' }}
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.WOMBAT_TOKEN_CLI }}
+
+      - name: Create GitHub Release and Tag
+        if: ${{ steps.vars.outputs.is_dry_run == 'false' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RELEASE_BRANCH: ${{ steps.release_branch.outputs.BRANCH_NAME }}
+        run: |
+          gh release create ${{ steps.version.outputs.RELEASE_TAG }} \
+            bundle/gemini.js \
+            --target "$RELEASE_BRANCH" \
+            --title "Release ${{ steps.version.outputs.RELEASE_TAG }}" \
+            --generate-notes
+
+      - name: Create Issue on Failure
+        if: failure()
+        run: |
+          gh issue create \
+            --title "Release Failed for ${{ steps.version.outputs.RELEASE_TAG || 'N/A' }} on $(date +'%Y-%m-%d')" \
+            --body "The release workflow failed. See the full run for details: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+            --label "kind/bug,release-failure"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/stale.yml

@@ -1,45 +1,38 @@
-name: 'Mark stale issues and pull requests'
+name: Mark stale issues and pull requests
 
 # Run as a daily cron at 1:30 AM
 on:
   schedule:
     - cron: '30 1 * * *'
-  workflow_dispatch:
+  workflow_dispatch: {}
 
 jobs:
   stale:
-    strategy:
-      fail-fast: false
-      matrix:
-        runner:
-          - 'ubuntu-latest' # GitHub-hosted
-          - 'self-hosted' # GHA on GCP runners
-    runs-on: '${{ matrix.runner }}'
-    if: |-
-      ${{ github.repository == 'google-gemini/gemini-cli' }}
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'google-gemini/gemini-cli' }}
     permissions:
-      issues: 'write'
-      pull-requests: 'write'
+      issues: write
+      pull-requests: write
     concurrency:
-      group: '${{ github.workflow }}-stale'
+      group: ${{ github.workflow }}-stale
       cancel-in-progress: true
     steps:
-      - uses: 'actions/stale@5bef64f19d7facfb25b37b414482c7164d639639' # ratchet:actions/stale@v9
+      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639
         with:
-          repo-token: '${{ secrets.GITHUB_TOKEN }}'
-          stale-issue-message: >-
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          stale-issue-message: >
             This issue has been automatically marked as stale due to 60 days of inactivity.
             It will be closed in 14 days if no further activity occurs.
-          stale-pr-message: >-
+          stale-pr-message: >
             This pull request has been automatically marked as stale due to 60 days of inactivity.
             It will be closed in 14 days if no further activity occurs.
-          close-issue-message: >-
+          close-issue-message: >
             This issue has been closed due to 14 additional days of inactivity after being marked as stale.
             If you believe this is still relevant, feel free to comment or reopen the issue. Thank you!
-          close-pr-message: >-
+          close-pr-message: >
             This pull request has been closed due to 14 additional days of inactivity after being marked as stale.
             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
+          exempt-pr-labels: pinned,security

.github/workflows/verify-release.yml

@@ -1,32 +0,0 @@
-name: 'Verify NPM release tag'
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'The expected Gemini binary version that should be released (e.g., 0.5.0-preview-2).'
-        required: true
-        type: 'string'
-      npm-package:
-        description: 'NPM package to verify'
-        required: true
-        type: 'string'
-        default: '@google/gemini-cli@latest'
-      ref:
-        description: 'The branch, tag, or SHA to release from.'
-        required: false
-        type: 'string'
-        default: 'main'
-
-jobs:
-  build:
-    runs-on: 'ubuntu-latest'
-    steps:
-      - uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-      - name: 'Verify release'
-        uses: './.github/actions/verify-release'
-        with:
-          npm-package: '${{github.event.inputs.npm-package}}'
-          expected-version: '${{github.event.inputs.version}}'
-          ref: '${{github.event.inputs.ref}}'
-          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'

.gitignore

@@ -3,21 +3,14 @@
 .env~
 
 # gemini-cli settings
-# We want to keep the .gemini in the root of the repo and ignore any .gemini
-# in subdirectories. In our root .gemini we want to allow for version control
-# for subcommands.
-**/.gemini/
-!/.gemini/
-.gemini/*
-!.gemini/config.yaml
-!.gemini/commands/
+.gemini/
+!gemini/config.yaml
 
 # Note: .gemini-clipboard/ is NOT in gitignore so Gemini can access pasted images
 
 # Dependency directory
 node_modules
 bower_components
-package-lock.json
 
 # Editors
 .idea
@@ -44,12 +37,5 @@ packages/*/coverage/
 
 # Generated files
 packages/cli/src/generated/
-packages/core/src/generated/
 .integration-tests/
 packages/vscode-ide-companion/*.vsix
-
-# GHA credentials
-gha-creds-*.json
-
-# Log files
-patch_output.log

.husky/pre-commit

@@ -1,9 +0,0 @@
-npm run pre-commit || {
-  echo ''
-  echo '===================================================='
-  echo 'pre-commit checks failed. in case of emergency, run:'
-  echo ''
-  echo 'git commit --no-verify'
-  echo '===================================================='
-  exit 1
-}

.prettierignore

@@ -1,20 +0,0 @@
-**/bundle
-**/coverage
-**/dist
-**/.git
-**/node_modules
-.docker
-.DS_Store
-.env
-.gemini/
-.idea
-.integration-tests/
-*.iml
-*.tsbuildinfo
-*.vsix
-bower_components
-eslint.config.js
-**/generated
-gha-creds-*.json
-junit.xml
-Thumbs.db

.vscode/extensions.json

@@ -1,7 +1,3 @@
 {
-  "recommendations": [
-    "vitest.explorer",
-    "esbenp.prettier-vscode",
-    "dbaeumer.vscode-eslint"
-  ]
+  "recommendations": ["vitest.explorer", "esbenp.prettier-vscode"]
 }

.vscode/launch.json

@@ -7,9 +7,22 @@
     {
       "type": "node",
       "request": "launch",
-      "name": "Build & Launch CLI",
+      "name": "Launch CLI",
       "runtimeExecutable": "npm",
-      "runtimeArgs": ["run", "build-and-start"],
+      "runtimeArgs": ["run", "start"],
+      "skipFiles": ["<node_internals>/**"],
+      "cwd": "${workspaceFolder}",
+      "console": "integratedTerminal",
+      "env": {
+        "GEMINI_SANDBOX": "false"
+      }
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Launch E2E",
+      "program": "${workspaceFolder}/integration-tests/run-tests.js",
+      "args": ["--verbose", "--keep-output", "list_directory"],
       "skipFiles": ["<node_internals>/**"],
       "cwd": "${workspaceFolder}",
       "console": "integratedTerminal",
@@ -67,27 +80,6 @@
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen",
       "skipFiles": ["<node_internals>/**"]
-    },
-    {
-      "name": "Debug Integration Test File",
-      "type": "node",
-      "request": "launch",
-      "runtimeExecutable": "npx",
-      "runtimeArgs": [
-        "vitest",
-        "run",
-        "--root",
-        "./integration-tests",
-        "--inspect-brk=9229",
-        "${file}"
-      ],
-      "cwd": "${workspaceFolder}",
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "skipFiles": ["<node_internals>/**"],
-      "env": {
-        "GEMINI_SANDBOX": "false"
-      }
     }
   ],
   "inputs": [

.vscode/settings.json

@@ -12,6 +12,5 @@
   },
   "[javascript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "vitest.disableWorkspaceWarning": true
+  }
 }

.yamllint.yml

@@ -1,89 +0,0 @@
-rules:
-  anchors:
-    forbid-duplicated-anchors: true
-    forbid-undeclared-aliases: true
-    forbid-unused-anchors: true
-
-  braces:
-    forbid: 'non-empty'
-    min-spaces-inside-empty: 0
-    max-spaces-inside-empty: 0
-
-  brackets:
-    min-spaces-inside: 0
-    max-spaces-inside: 0
-    min-spaces-inside-empty: 0
-    max-spaces-inside-empty: 0
-
-  colons:
-    max-spaces-before: 0
-    max-spaces-after: 1
-
-  commas:
-    max-spaces-before: 0
-    min-spaces-after: 1
-    max-spaces-after: 1
-
-  comments:
-    require-starting-space: true
-    ignore-shebangs: true
-    min-spaces-from-content: 1
-
-  comments-indentation: 'disable'
-
-  document-end:
-    present: false
-
-  document-start:
-    present: false
-
-  empty-lines:
-    max: 2
-    max-start: 0
-    max-end: 1
-
-  empty-values:
-    forbid-in-block-mappings: false
-    forbid-in-flow-mappings: true
-
-  float-values:
-    forbid-inf: false
-    forbid-nan: false
-    forbid-scientific-notation: false
-    require-numeral-before-decimal: false
-
-  hyphens:
-    max-spaces-after: 1
-
-  indentation:
-    spaces: 2
-    indent-sequences: true
-    check-multi-line-strings: false
-
-  key-duplicates: {}
-
-  new-line-at-end-of-file: {}
-
-  new-lines:
-    type: 'unix'
-
-  octal-values:
-    forbid-implicit-octal: true
-    forbid-explicit-octal: false
-
-  quoted-strings:
-    quote-type: 'single'
-    required: true
-    allow-quoted-quotes: true
-
-  trailing-spaces: {}
-
-  truthy:
-    allowed-values: ['true', 'false', 'on'] # GitHub Actions uses "on"
-    check-keys: true
-
-ignore:
-  - 'thirdparty/'
-  - 'third_party/'
-  - 'vendor/'
-  - 'node_modules/'

CONTRIBUTING.md

@@ -31,14 +31,6 @@ All submissions, including submissions by project members, require review. We
 use [GitHub pull requests](https://docs.github.com/articles/about-pull-requests)
 for this purpose.
 
-### Self Assigning Issues
-
-If you're looking for an issue to work on, check out our list of issues that are labeled ["help wanted"](https://github.com/google-gemini/gemini-cli/issues?q=is%3Aissue+state%3Aopen+label%3A%22help+wanted%22).
-
-To assign an issue to yourself, simply add a comment with the text `/assign`. The comment must contain only that text and nothing else. This command will assign the issue to you, provided it is not already assigned.
-
-Please note that you can have a maximum of 3 issues assigned to you at any given time.
-
 ### Pull Request Guidelines
 
 To help us review and merge your PRs quickly, please follow these guidelines. PRs that do not meet these standards may be closed.
@@ -144,7 +136,7 @@ To start the Gemini CLI from the source code (after building), run the following
 npm start
 ```
 
-If you'd like to run the source build outside of the gemini-cli folder, you can utilize `npm link path/to/gemini-cli/packages/cli` (see: [docs](https://docs.npmjs.com/cli/v9/commands/npm-link)) or `alias gemini="node path/to/gemini-cli/packages/cli"` to run with `gemini`
+If you'd like to run the source build outside of the gemini-cli folder you can utilize `npm link path/to/gemini-cli/packages/cli` (see: [docs](https://docs.npmjs.com/cli/v9/commands/npm-link)) or `alias gemini="node path/to/gemini-cli/packages/cli"` to run with `gemini`
 
 ### Running Tests
 

Dockerfile

@@ -40,11 +40,11 @@ ENV PATH=$PATH:/usr/local/share/npm-global/bin
 USER node
 
 # install gemini-cli and clean up
-COPY packages/cli/dist/google-gemini-cli-*.tgz /tmp/gemini-cli.tgz
-COPY packages/core/dist/google-gemini-cli-core-*.tgz /tmp/gemini-core.tgz
-RUN npm install -g /tmp/gemini-cli.tgz /tmp/gemini-core.tgz \
+COPY packages/cli/dist/google-gemini-cli-*.tgz /usr/local/share/npm-global/gemini-cli.tgz
+COPY packages/core/dist/google-gemini-cli-core-*.tgz /usr/local/share/npm-global/gemini-core.tgz
+RUN npm install -g /usr/local/share/npm-global/gemini-cli.tgz /usr/local/share/npm-global/gemini-core.tgz \
   && npm cache clean --force \
-  && rm -f /tmp/gemini-{cli,core}.tgz
+  && rm -f /usr/local/share/npm-global/gemini-{cli,core}.tgz
 
 # default entrypoint when none specified
 CMD ["gemini"]

GEMINI.md

@@ -97,17 +97,17 @@ TypeScript's power lies in its ability to provide static type checking, catching
 
 - **Preferring `unknown` over `any`**: When you absolutely cannot determine the type of a value at compile time, and you're tempted to reach for any, consider using unknown instead. unknown is a type-safe counterpart to any. While a variable of type unknown can hold any value, you must perform type narrowing (e.g., using typeof or instanceof checks, or a type assertion) before you can perform any operations on it. This forces you to handle the unknown type explicitly, preventing accidental runtime errors.
 
-  ```ts
+  ```
   function processValue(value: unknown) {
-    if (typeof value === 'string') {
-      // value is now safely a string
-      console.log(value.toUpperCase());
-    } else if (typeof value === 'number') {
-      // value is now safely a number
-      console.log(value * 2);
-    }
-    // Without narrowing, you cannot access properties or methods on 'value'
-    // console.log(value.someProperty); // Error: Object is of type 'unknown'.
+     if (typeof value === 'string') {
+        // value is now safely a string
+        console.log(value.toUpperCase());
+     } else if (typeof value === 'number') {
+        // value is now safely a number
+        console.log(value * 2);
+     }
+     // Without narrowing, you cannot access properties or methods on 'value'
+     // console.log(value.someProperty); // Error: Object is of type 'unknown'.
   }
   ```
 
@@ -115,14 +115,6 @@ TypeScript's power lies in its ability to provide static type checking, catching
   - **Bypassing Type Checking**: Like `any`, type assertions bypass TypeScript's safety checks. If your assertion is incorrect, you introduce a runtime error that TypeScript would not have warned you about.
   - **Code Smell in Testing**: A common scenario where `any` or type assertions might be tempting is when trying to test "private" implementation details (e.g., spying on or stubbing an unexported function within a module). This is a strong indication of a "code smell" in your testing strategy and potentially your code structure. Instead of trying to force access to private internals, consider whether those internal details should be refactored into a separate module with a well-defined public API. This makes them inherently testable without compromising encapsulation.
 
-### Type narrowing `switch` clauses
-
-Use the `checkExhaustive` helper in the default clause of a switch statement.
-This will ensure that all of the possible options within the value or
-enumeration are used.
-
-This helper method can be found in `packages/cli/src/utils/checks.ts`
-
 ### Embracing JavaScript's Array Operators
 
 To further enhance code cleanliness and promote safe functional programming practices, leverage JavaScript's rich set of array operators as much as possible. Methods like `.map()`, `.filter()`, `.reduce()`, `.slice()`, `.sort()`, and others are incredibly powerful for transforming and manipulating data collections in an immutable and declarative way.

LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+  Copyright 2025 Google LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -199,4 +199,4 @@
    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.
+   limitations under the License.

README.md

@@ -1,7 +1,6 @@
 # Gemini CLI
 
 [![Gemini CLI CI](https://github.com/google-gemini/gemini-cli/actions/workflows/ci.yml/badge.svg)](https://github.com/google-gemini/gemini-cli/actions/workflows/ci.yml)
-[![Gemini CLI E2E](https://github.com/google-gemini/gemini-cli/actions/workflows/e2e.yml/badge.svg)](https://github.com/google-gemini/gemini-cli/actions/workflows/e2e.yml)
 [![Version](https://img.shields.io/npm/v/@google/gemini-cli)](https://www.npmjs.com/package/@google/gemini-cli)
 [![License](https://img.shields.io/github/license/google-gemini/gemini-cli)](https://github.com/google-gemini/gemini-cli/blob/main/LICENSE)
 
@@ -46,85 +45,44 @@ brew install gemini-cli
 - Node.js version 20 or higher
 - macOS, Linux, or Windows
 
-## Release Cadence and Tags
-
-See [Releases](./docs/releases.md) for more details.
-
-### Preview
-
-New preview releases will be published each week at UTC 2359 on Tuesdays. These releases will not have been fully vetted and may contain regressions or other outstanding issues. Please help us test and install with `preview` tag.
-
-```bash
-npm install -g @google/gemini-cli@preview
-```
-
-### Stable
-
-- New stable releases will be published each week at UTC 2000 on Tuesdays, this will be the full promotion of last week's `preview` release + any bug fixes and validations. Use `latest` tag.
-
-```bash
-npm install -g @google/gemini-cli@latest
-```
-
-### Nightly
-
-- New releases will be published each week at UTC 0000 each day, This will be all changes from the main branch as represented at time of release. It should be assumed there are pending validations and issues. Use `nightly` tag.
-
-```bash
-npm install -g @google/gemini-cli@nightly
-```
-
 ## 📋 Key Features
 
-### Code Understanding & Generation
+With Gemini CLI you can:
 
-- Query and edit large codebases
-- Generate new apps from PDFs, images, or sketches using multimodal capabilities
-- Debug issues and troubleshoot with natural language
+- **Code Understanding & Generation**
+  - Query and edit large codebases
+  - Generate new apps from PDFs, images, or sketches using multimodal capabilities
+  - Debug issues and troubleshoot with natural language
+- **Automation & Integration**
+  - Automate operational tasks like querying pull requests or handling complex rebases
+  - Use MCP servers to connect new capabilities, including [media generation with Imagen, Veo or Lyria](https://github.com/GoogleCloudPlatform/vertex-ai-creative-studio/tree/main/experiments/mcp-genmedia)
+  - Run non-interactively in scripts for workflow automation
+- **Advanced Capabilities**
+  - Ground your queries with built-in [Google Search](https://ai.google.dev/gemini-api/docs/grounding) for real-time information
+  - Conversation checkpointing to save and resume complex sessions
+  - Custom context files (GEMINI.md) to tailor behavior for your projects
 
-### Automation & Integration
-
-- Automate operational tasks like querying pull requests or handling complex rebases
-- Use MCP servers to connect new capabilities, including [media generation with Imagen, Veo or Lyria](https://github.com/GoogleCloudPlatform/vertex-ai-creative-studio/tree/main/experiments/mcp-genmedia)
-- Run non-interactively in scripts for workflow automation
-
-### Advanced Capabilities
-
-- Ground your queries with built-in [Google Search](https://ai.google.dev/gemini-api/docs/grounding) for real-time information
-- Conversation checkpointing to save and resume complex sessions
-- Custom context files (GEMINI.md) to tailor behavior for your projects
-
-### GitHub Integration
-
-Integrate Gemini CLI directly into your GitHub workflows with [**Gemini CLI GitHub Action**](https://github.com/google-github-actions/run-gemini-cli):
-
-- **Pull Request Reviews**: Automated code review with contextual feedback and suggestions
-- **Issue Triage**: Automated labeling and prioritization of GitHub issues based on content analysis
-- **On-demand Assistance**: Mention `@gemini-cli` in issues and pull requests for help with debugging, explanations, or task delegation
-- **Custom Workflows**: Build automated, scheduled and on-demand workflows tailored to your team's needs
+- **🔗 GitHub Integration**
+  - Use the Gemini CLI GitHub Action for automated PR reviews
+  - Automated issue triage and on-demand AI assistance directly in your repositories
+  - Seamless integration with your GitHub workflows
 
 ## 🔐 Authentication Options
 
 Choose the authentication method that best fits your needs:
 
-### Option 1: Login with Google (OAuth login using your Google Account)
+### Option 1: OAuth login (Using your Google Account)
 
-**✨ Best for:**
-
-- Individual developers.
-- Google AI Pro and AI Ultra subscribers.
-- Anyone who has a Gemini Code Assist license.
-
-_See [quota limits and terms of service](https://cloud.google.com/gemini/docs/quotas) for details._
+**✨ Best for:** Individual developers as well as anyone who has a Gemini Code Assist License. (see [quota limits and terms of service](https://cloud.google.com/gemini/docs/quotas) for details)
 
 **Benefits:**
 
-- **Free tier** with 60 requests/min and 1,000 requests/day
-- **Gemini 2.5 Pro and Flash** with 1M token context window
+- **Free tier**: 60 requests/min and 1,000 requests/day
+- **Gemini 2.5 Pro** with 1M token context window
 - **No API key management** - just sign in with your Google account
-- **Automatic updates** to our latest models
+- **Automatic updates** to latest models
 
-#### Start Gemini CLI, then choose _Login with Google_ and follow the browser authentication flow when prompted
+#### Start Gemini CLI, then choose OAuth and follow the browser authentication flow when prompted
 
 ```bash
 gemini
@@ -197,37 +155,35 @@ gemini -m gemini-2.5-flash
 
 #### Non-interactive mode for scripts
 
-Get a simple text response:
-
 ```bash
 gemini -p "Explain the architecture of this codebase"
 ```
 
-For more advanced scripting, including how to parse JSON and handle errors, use
-the `--output-format json` flag to get structured output:
-
-```bash
-gemini -p "Explain the architecture of this codebase" --output-format json
-```
-
 ### Quick Examples
 
 #### Start a new project
 
-```bash
+````bash
 cd new-project/
 gemini
 > Write me a Discord bot that answers questions using a FAQ.md file I will provide
-```
 
 #### Analyze existing code
-
 ```bash
 git clone https://github.com/google-gemini/gemini-cli
 cd gemini-cli
 gemini
 > Give me a summary of all of the changes that went in yesterday
-```
+````
+
+## 🔗 GitHub Integration
+
+Integrate Gemini CLI directly into your GitHub workflows with the [**Gemini CLI GitHub Action**](https://github.com/google-github-actions/run-gemini-cli). Key features include:
+
+- **Pull Request Reviews**: Automatically review pull requests when they're opened.
+- **Issue Triage**: Automatically triage and label GitHub issues.
+- **On-demand Collaboration**: Mention `@gemini-cli` in issues and pull requests for assistance and task delegation.
+- **Custom Workflows**: Set up your own scheduled tasks and event-driven automations.
 
 ## 📚 Documentation
 
@@ -258,7 +214,7 @@ gemini
 ### Advanced Topics
 
 - [**Architecture Overview**](./docs/architecture.md) - How Gemini CLI works
-- [**IDE Integration**](./docs/ide-integration.md) - VS Code companion
+- [**IDE Integration**](./docs/extension.md) - VS Code companion
 - [**Sandboxing & Security**](./docs/sandbox.md) - Safe execution environments
 - [**Enterprise Deployment**](./docs/deployment.md) - Docker, system-wide config
 - [**Telemetry & Monitoring**](./docs/telemetry.md) - Usage tracking

ROADMAP.md

@@ -24,12 +24,12 @@ Our development is guided by the following principles:
 
 ## How the Roadmap Works
 
-Our roadmap is managed directly through GitHub Issues. See our entry point Roadmap Issue [here](https://github.com/google-gemini/gemini-cli/issues/4191). This approach allows for transparency and gives you a direct way to learn more or get involved with any specific initiative. All our roadmap items will be tagged as Type:`Feature` and Label:`maintainer` for features we are actively working on, or Type:`Task` and Label:`maintainer` for a more detailed list of tasks.
+Our roadmap is managed directly through Github Issues. See our entry point Roadmap Issue [here](https://github.com/google-gemini/gemini-cli/issues/4191). This approach allows for transparency and gives you a direct way to learn more or get involved with any specific initiative. All our roadmap items will be tagged as Type:`Feature` and Label:`maintainer` for features we are actively working on, or Type:`Task` and Label:`maintainer` for a more detailed list of tasks.
 
 Issues are organized to provide key information at a glance:
 
 - **Target Quarter:** `Milestone` denotes the anticipated delivery timeline.
-- **Feature Area:** Labels such as `area/model` or `area/tooling` categorize the work.
+- **Feature Area:** Labels such as `area/model` or `area/tooling` categorizes the work.
 - **Issue Type:** _Workstream_ => _Epics_ => _Features_ => _Tasks|Bugs_
 
 To see what we're working on, you can filter our issues by these dimensions. See all our items [here](https://github.com/orgs/google-gemini/projects/11/views/19)
@@ -39,7 +39,7 @@ To see what we're working on, you can filter our issues by these dimensions. See
 To better organize our efforts, we categorize our work into several key feature areas. These labels are used on our GitHub Issues to help you filter and
 find initiatives that interest you.
 
-- **Authentication:** Secure user access via API keys, Gemini Code Assist login, etc.
+- **Authentication:** Secure user access via API keys, Gemini Code Assist login etc.
 - **Model:** Support new Gemini models, multi-modality, local execution, and performance tuning.
 - **User Experience:** Improve the CLI's usability, performance, interactive features, and documentation.
 - **Tooling:** Built-in tools and the MCP ecosystem.

docs/checkpointing.md

@@ -38,10 +38,8 @@ Add the following key to your `settings.json`:
 
 ```json
 {
-  "general": {
-    "checkpointing": {
-      "enabled": true
-    }
+  "checkpointing": {
+    "enabled": true
   }
 }
 ```

docs/cli/authentication.md

@@ -1,35 +1,30 @@
 # Authentication Setup
 
-Gemini CLI requires you to authenticate with Google's AI services. On initial startup you'll need to configure **one** of the following authentication methods:
+The Gemini CLI requires you to authenticate with Google's AI services. On initial startup you'll need to configure **one** of the following authentication methods:
 
-1.  **Login with Google**
-    1. **Google AI Pro and AI Ultra subscribers**
-       - Use this option to log in with your Google account that you use with Google AI Pro and Ultra.
-       - During initial startup, Gemini CLI will direct you to a webpage for authentication. Once authenticated, your credentials will be cached locally so the web login can be skipped on subsequent runs.
-       - Note that the web login must be done in a browser that can communicate with the machine Gemini CLI is being run from. (Specifically, the browser will be redirected to a localhost URL that Gemini CLI will be listening on.)
-    2. **Gemini Code Assist:**
-       - Use this option to log in with your Google account.
-       - During initial startup, Gemini CLI will direct you to a webpage for authentication. Once authenticated, your credentials will be cached locally so the web login can be skipped on subsequent runs.
-       - Note that the web login must be done in a browser that can communicate with the machine Gemini CLI is being run from. (Specifically, the browser will be redirected to a localhost url that Gemini CLI will be listening on.)
-       - <a id="workspace-gca">Users may have to specify a GOOGLE_CLOUD_PROJECT if:</a>
-         1. You have a Google Workspace account. Google Workspace is a paid service for businesses and organizations that provides a suite of productivity tools, including a custom email domain (e.g. your-name@your-company.com), enhanced security features, and administrative controls. These accounts are often managed by an employer or school.
-         1. You have received a Gemini Code Assist license through the [Google Developer Program](https://developers.google.com/program/plans-and-pricing) (including qualified Google Developer Experts).
-         1. You have been assigned a license to a current Gemini Code Assist standard or enterprise subscription.
-         1. You are using the product outside the [supported regions](https://developers.google.com/gemini-code-assist/resources/available-locations) for free individual usage.
-         1. You are a Google account holder under the age of 18.
-         - If you fall into one of these categories, you must first configure a Google Cloud Project ID to use, [enable the Gemini for Cloud API](https://cloud.google.com/gemini/docs/discover/set-up-gemini#enable-api) and [configure access permissions](https://cloud.google.com/gemini/docs/discover/set-up-gemini#grant-iam).
+1.  **Login with Google (Gemini Code Assist):**
+    - Use this option to log in with your Google account.
+    - During initial startup, Gemini CLI will direct you to a webpage for authentication. Once authenticated, your credentials will be cached locally so the web login can be skipped on subsequent runs.
+    - Note that the web login must be done in a browser that can communicate with the machine Gemini CLI is being run from. (Specifically, the browser will be redirected to a localhost url that Gemini CLI will be listening on).
+    - <a id="workspace-gca">Users may have to specify a GOOGLE_CLOUD_PROJECT if:</a>
+      1. You have a Google Workspace account. Google Workspace is a paid service for businesses and organizations that provides a suite of productivity tools, including a custom email domain (e.g. your-name@your-company.com), enhanced security features, and administrative controls. These accounts are often managed by an employer or school.
+      1. You have received a Gemini Code Assist license through the [Google Developer Program](https://developers.google.com/program/plans-and-pricing) (including qualified Google Developer Experts)
+      1. You have been assigned a license to a current Gemini Code Assist standard or enterprise subscription.
+      1. You are using the product outside the [supported regions](https://developers.google.com/gemini-code-assist/resources/available-locations) for free individual usage.
+      1. You are a Google account holder under the age of 18
+      - If you fall into one of these categories, you must first configure a Google Cloud Project ID to use, [enable the Gemini for Cloud API](https://cloud.google.com/gemini/docs/discover/set-up-gemini#enable-api) and [configure access permissions](https://cloud.google.com/gemini/docs/discover/set-up-gemini#grant-iam).
 
-         You can temporarily set the environment variable in your current shell session using the following command:
+      You can temporarily set the environment variable in your current shell session using the following command:
 
-         ```bash
-         export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
-         ```
-         - For repeated use, you can add the environment variable to your [.env file](#persisting-environment-variables-with-env-files) or your shell's configuration file (like `~/.bashrc`, `~/.zshrc`, or `~/.profile`). For example, the following command adds the environment variable to a `~/.bashrc` file:
+      ```bash
+      export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
+      ```
+      - For repeated use, you can add the environment variable to your [.env file](#persisting-environment-variables-with-env-files) or your shell's configuration file (like `~/.bashrc`, `~/.zshrc`, or `~/.profile`). For example, the following command adds the environment variable to a `~/.bashrc` file:
 
-         ```bash
-         echo 'export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"' >> ~/.bashrc
-         source ~/.bashrc
-         ```
+      ```bash
+      echo 'export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"' >> ~/.bashrc
+      source ~/.bashrc
+      ```
 
 2.  **<a id="gemini-api-key"></a>Gemini API key:**
     - Obtain your API key from Google AI Studio: [https://aistudio.google.com/app/apikey](https://aistudio.google.com/app/apikey)
@@ -50,69 +45,41 @@ Gemini CLI requires you to authenticate with Google's AI services. On initial st
         :warning: Be advised that when you export your API key inside your shell configuration file, any other process executed from the shell can read it.
 
 3.  **Vertex AI:**
-    - **API Key:**
-      - Obtain your Google Cloud API key: [Get an API Key](https://cloud.google.com/vertex-ai/generative-ai/docs/start/api-keys?usertype=newuser)
+    - Obtain your Google Cloud API key: [Get an API Key](https://cloud.google.com/vertex-ai/generative-ai/docs/start/api-keys?usertype=newuser)
       - Set the `GOOGLE_API_KEY` environment variable. In the following methods, replace `YOUR_GOOGLE_API_KEY` with your Vertex AI API key:
-        - You can temporarily set the environment variable in your current shell session using the following command:
+        - You can temporarily set these environment variables in your current shell session using the following commands:
           ```bash
           export GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY"
           ```
-        - For repeated use, you can add the environment variable to your [.env file](#persisting-environment-variables-with-env-files) or your shell's configuration file (like `~/.bashrc`, `~/.zshrc`, or `~/.profile`). For example, the following command adds the environment variable to a `~/.bashrc` file:
-
+        - For repeated use, you can add the environment variables to your [.env file](#persisting-environment-variables-with-env-files) or your shell's configuration file (like `~/.bashrc`, `~/.zshrc`, or `~/.profile`). For example, the following commands add the environment variables to a `~/.bashrc` file:
           ```bash
           echo 'export GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY"' >> ~/.bashrc
           source ~/.bashrc
           ```
+    - To use Application Default Credentials (ADC), use the following command:
+      - Ensure you have a Google Cloud project and have enabled the Vertex AI API.
+        ```bash
+        gcloud auth application-default login
+        ```
+        For more information, see [Set up Application Default Credentials for Google Cloud](https://cloud.google.com/docs/authentication/provide-credentials-adc).
+      - Set the `GOOGLE_CLOUD_PROJECT` and `GOOGLE_CLOUD_LOCATION` environment variables. In the following methods, replace `YOUR_PROJECT_ID` and `YOUR_PROJECT_LOCATION` with the relevant values for your project:
+        - You can temporarily set these environment variables in your current shell session using the following commands:
+          ```bash
+          export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
+          export GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION" # e.g., us-central1
+          ```
+        - For repeated use, you can add the environment variables to your [.env file](#persisting-environment-variables-with-env-files)
+
+        - Alternatively you can export the environment variables from your shell's configuration file (like `~/.bashrc`, `~/.zshrc`, or `~/.profile`). For example, the following commands add the environment variables to a `~/.bashrc` file:
+
+          ```bash
+          echo 'export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"' >> ~/.bashrc
+          echo 'export GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"' >> ~/.bashrc
+          source ~/.bashrc
+          ```
 
           :warning: Be advised that when you export your API key inside your shell configuration file, any other process executed from the shell can read it.
 
-          > **Note:**
-          > If you encounter an error like `"API keys are not supported by this API - Expected OAuth2 access token or other authentication credentials that assert a principal"`, it is likely that your organization has restricted the creation of service account API keys. In this case, please try the [service account JSON key](#service-account-json-key) method described below.
-
-    - **Application Default Credentials (ADC):**
-
-      > **Note:**
-      > If you have previously set the `GOOGLE_API_KEY` or `GEMINI_API_KEY` environment variables, you must unset them to use Application Default Credentials.
-      >
-      > ```bash
-      > unset GOOGLE_API_KEY GEMINI_API_KEY
-      > ```
-      - **Using `gcloud` (for local development):**
-        - Ensure you have a Google Cloud project and have enabled the Vertex AI API.
-        - Log in with your user credentials:
-          ```bash
-          gcloud auth application-default login
-          ```
-          For more information, see [Set up Application Default Credentials for Google Cloud](https://cloud.google.com/docs/authentication/provide-credentials-adc).
-      - **<a id="service-account-json-key"></a>Using a Service Account (for applications or when service account API keys are restricted):**
-        - If you are unable to create an API key due to [organization policies](https://cloud.google.com/vertex-ai/generative-ai/docs/start/api-keys?usertype=existinguser#expandable-2), or if you are running in a non-interactive environment, you can authenticate using a service account key.
-        - [Create a service account and key](https://cloud.google.com/iam/docs/keys-create-delete), and download the JSON key file. The service account will need to be assigned the "Vertex AI User" role.
-        - Set the `GOOGLE_APPLICATION_CREDENTIALS` environment variable to the absolute path of the JSON file.
-          - You can temporarily set the environment variable in your current shell session:
-            ```bash
-            export GOOGLE_APPLICATION_CREDENTIALS="/path/to/your/keyfile.json"
-            ```
-          - For repeated use, you can add the command to your shell's configuration file (e.g., `~/.bashrc`).
-            ```bash
-            echo 'export GOOGLE_APPLICATION_CREDENTIALS="/path/to/your/keyfile.json"' >> ~/.bashrc
-            source ~/.bashrc
-            ```
-            :warning: Be advised that when you export service account credentials inside your shell configuration file, any other process executed from the shell can read it.
-
-      - **Required Environment Variables for ADC:**
-        - When using ADC (either with `gcloud` or a service account), you must also set the `GOOGLE_CLOUD_PROJECT` and `GOOGLE_CLOUD_LOCATION` environment variables. In the following methods, replace `YOUR_PROJECT_ID` and `YOUR_PROJECT_LOCATION` with the relevant values for your project:
-          - You can temporarily set these environment variables in your current shell session using the following commands:
-            ```bash
-            export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
-            export GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION" # e.g., us-central1
-            ```
-          - For repeated use, you can add the environment variables to your [.env file](#persisting-environment-variables-with-env-files) or your shell's configuration file (like `~/.bashrc`, `~/.zshrc`, or `~/.profile`). For example, the following commands add the environment variables to a `~/.bashrc` file:
-            ```bash
-            echo 'export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"' >> ~/.bashrc
-            echo 'export GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"' >> ~/.bashrc
-            source ~/.bashrc
-            ```
-
 4.  **Cloud Shell:**
     - This option is only available when running in a Google Cloud Shell environment.
     - It automatically uses the credentials of the logged-in user in the Cloud Shell environment.
@@ -176,6 +143,3 @@ following authentication methods if available:
       - Ensure the `GOOGLE_CLOUD_PROJECT` and `GOOGLE_CLOUD_LOCATION` environment variables are set.
 
 If none of these environment variables are set in a non-interactive session, the CLI will exit with an error.
-
-For comprehensive guidance on using Gemini CLI programmatically and in
-automation workflows, see the [Headless Mode Guide](../headless.md).

docs/cli/commands.md

@@ -9,7 +9,7 @@ Slash commands provide meta-level control over the CLI itself.
 ### Built-in Commands
 
 - **`/bug`**
-  - **Description:** File an issue about Gemini CLI. By default, the issue is filed within the GitHub repository for Gemini CLI. The string you enter after `/bug` will become the headline for the bug being filed. The default `/bug` behavior can be modified using the `advanced.bugCommand` setting in your `.gemini/settings.json` files.
+  - **Description:** File an issue about Gemini CLI. By default, the issue is filed within the GitHub repository for Gemini CLI. The string you enter after `/bug` will become the headline for the bug being filed. The default `/bug` behavior can be modified using the `bugCommand` setting in your `.gemini/settings.json` files.
 
 - **`/chat`**
   - **Description:** Save and resume conversation history for branching conversation state interactively, or resuming a previous state from a later session.
@@ -18,8 +18,8 @@ Slash commands provide meta-level control over the CLI itself.
       - **Description:** Saves the current conversation history. You must add a `<tag>` for identifying the conversation state.
       - **Usage:** `/chat save <tag>`
       - **Details on Checkpoint Location:** The default locations for saved chat checkpoints are:
-        - Linux/macOS: `~/.gemini/tmp/<project_hash>/`
-        - Windows: `C:\Users\<YourUsername>\.gemini\tmp\<project_hash>\`
+        - Linux/macOS: `~/.config/google-generative-ai/checkpoints/`
+        - Windows: `C:\Users\<YourUsername>\AppData\Roaming\google-generative-ai\checkpoints\`
         - When you run `/chat list`, the CLI only scans these specific directories to find available checkpoints.
         - **Note:** These checkpoints are for manually saving and resuming conversation states. For automatic checkpoints created before file modifications, see the [Checkpointing documentation](../checkpointing.md).
     - **`resume`**
@@ -30,9 +30,6 @@ Slash commands provide meta-level control over the CLI itself.
     - **`delete`**
       - **Description:** Deletes a saved conversation checkpoint.
       - **Usage:** `/chat delete <tag>`
-    - **`share`**
-      - **Description** Writes the current conversation to a provided Markdown or JSON file.
-      - **Usage** `/chat share file.md` or `/chat share file.json`. If no filename is provided, then the CLI will generate one.
 
 - **`/clear`**
   - **Description:** Clear the terminal screen, including the visible session history and scrollback within the CLI. The underlying session data (for history recall) might be preserved depending on the exact implementation, but the visual display is cleared.
@@ -43,9 +40,6 @@ Slash commands provide meta-level control over the CLI itself.
 
 - **`/copy`**
   - **Description:** Copies the last output produced by Gemini CLI to your clipboard, for easy sharing or reuse.
-  - **Note:** This command requires platform-specific clipboard tools to be installed.
-    - On Linux, it requires `xclip` or `xsel`. You can typically install them using your system's package manager.
-    - On macOS, it requires `pbcopy`, and on Windows, it requires `clip`. These tools are typically pre-installed on their respective systems.
 
 - **`/directory`** (or **`/dir`**)
   - **Description:** Manage workspace directories for multi-directory support.
@@ -113,7 +107,6 @@ Slash commands provide meta-level control over the CLI itself.
 
 - [**`/tools`**](../tools/index.md)
   - **Description:** Display a list of tools that are currently available within Gemini CLI.
-  - **Usage:** `/tools [desc]`
   - **Sub-commands:**
     - **`desc`** or **`descriptions`**:
       - **Description:** Show detailed descriptions of each tool, including each tool's name with its full description as provided to the model.
@@ -176,52 +169,23 @@ Your command definition files must be written in the TOML format and use the `.t
 
 #### Handling Arguments
 
-Custom commands support two powerful methods for handling arguments. The CLI automatically chooses the correct method based on the content of your command's `prompt`.
+Custom commands support two powerful, low-friction methods for handling arguments. The CLI automatically chooses the correct method based on the content of your command's `prompt`.
 
-##### 1. Context-Aware Injection with `{{args}}`
+##### 1. Shorthand Injection with `{{args}}`
 
-If your `prompt` contains the special placeholder `{{args}}`, the CLI will replace that placeholder with the text the user typed after the command name.
-
-The behavior of this injection depends on where it is used:
-
-**A. Raw Injection (Outside Shell Commands)**
-
-When used in the main body of the prompt, the arguments are injected exactly as the user typed them.
+If your `prompt` contains the special placeholder `{{args}}`, the CLI will replace that exact placeholder with all the text the user typed after the command name. This is perfect for simple, deterministic commands where you need to inject user input into a specific place in a larger prompt template.
 
 **Example (`git/fix.toml`):**
 
 ```toml
-# Invoked via: /git:fix "Button is misaligned"
+# In: ~/.gemini/commands/git/fix.toml
+# Invoked via: /git:fix "Button is misaligned on mobile"
 
-description = "Generates a fix for a given issue."
-prompt = "Please provide a code fix for the issue described here: {{args}}."
+description = "Generates a fix for a given GitHub issue."
+prompt = "Please analyze the staged git changes and provide a code fix for the issue described here: {{args}}."
 ```
 
-The model receives: `Please provide a code fix for the issue described here: "Button is misaligned".`
-
-**B. Using Arguments in Shell Commands (Inside `!{...}` Blocks)**
-
-When you use `{{args}}` inside a shell injection block (`!{...}`), the arguments are automatically **shell-escaped** before replacement. This allows you to safely pass arguments to shell commands, ensuring the resulting command is syntactically correct and secure while preventing command injection vulnerabilities.
-
-**Example (`/grep-code.toml`):**
-
-```toml
-prompt = """
-Please summarize the findings for the pattern `{{args}}`.
-
-Search Results:
-!{grep -r {{args}} .}
-"""
-```
-
-When you run `/grep-code It's complicated`:
-
-1. The CLI sees `{{args}}` used both outside and inside `!{...}`.
-2. Outside: The first `{{args}}` is replaced raw with `It's complicated`.
-3. Inside: The second `{{args}}` is replaced with the escaped version (e.g., on Linux: `"It's complicated"`).
-4. The command executed is `grep -r "It's complicated" .`.
-5. The CLI prompts you to confirm this exact, secure command before execution.
-6. The final prompt is sent.
+The model will receive the final prompt: `Please analyze the staged git changes and provide a code fix for the issue described here: "Button is misaligned on mobile".`
 
 ##### 2. Default Argument Handling
 
@@ -272,11 +236,14 @@ When a custom command attempts to execute a shell command, Gemini CLI will now p
 
 **How It Works:**
 
-1.  **Inject Commands:** Use the `!{...}` syntax.
-2.  **Argument Substitution:** If `{{args}}` is present inside the block, it is automatically shell-escaped (see [Context-Aware Injection](#1-context-aware-injection-with-args) above).
-3.  **Robust Parsing:** The parser correctly handles complex shell commands that include nested braces, such as JSON payloads. **Note:** The content inside `!{...}` must have balanced braces (`{` and `}`). If you need to execute a command containing unbalanced braces, consider wrapping it in an external script file and calling the script within the `!{...}` block.
-4.  **Security Check and Confirmation:** The CLI performs a security check on the final, resolved command (after arguments are escaped and substituted). A dialog will appear showing the exact command(s) to be executed.
-5.  **Execution and Error Reporting:** The command is executed. If the command fails, the output injected into the prompt will include the error messages (stderr) followed by a status line, e.g., `[Shell command exited with code 1]`. This helps the model understand the context of the failure.
+1.  **Inject Commands:** Use the `!{...}` syntax in your `prompt` to specify where the command should be run and its output injected.
+2.  **Confirm Execution:** When you run the command, a dialog will appear listing the shell commands the prompt wants to execute.
+3.  **Grant Permission:** You can choose to:
+    - **Allow once:** The command(s) will run this one time.
+    - **Allow always for this session:** The command(s) will be added to a temporary allowlist for the current CLI session and will not require confirmation again.
+    - **No:** Cancel the execution of the shell command(s).
+
+The CLI still respects the global `excludeTools` and `coreTools` settings. A command will be blocked without a confirmation prompt if it is explicitly disallowed in your configuration.
 
 **Example (`git/commit.toml`):**
 
@@ -302,41 +269,6 @@ Please generate a Conventional Commit message based on the following git diff:
 
 When you run `/git:commit`, the CLI first executes `git diff --staged`, then replaces `!{git diff --staged}` with the output of that command before sending the final, complete prompt to the model.
 
-##### 4. Injecting File Content with `@{...}`
-
-You can directly embed the content of a file or a directory listing into your prompt using the `@{...}` syntax. This is useful for creating commands that operate on specific files.
-
-**How It Works:**
-
-- **File Injection**: `@{path/to/file.txt}` is replaced by the content of `file.txt`.
-- **Multimodal Support**: If the path points to a supported image (e.g., PNG, JPEG), PDF, audio, or video file, it will be correctly encoded and injected as multimodal input. Other binary files are handled gracefully and skipped.
-- **Directory Listing**: `@{path/to/dir}` is traversed and each file present within the directory and all subdirectories are inserted into the prompt. This respects `.gitignore` and `.geminiignore` if enabled.
-- **Workspace-Aware**: The command searches for the path in the current directory and any other workspace directories. Absolute paths are allowed if they are within the workspace.
-- **Processing Order**: File content injection with `@{...}` is processed _before_ shell commands (`!{...}`) and argument substitution (`{{args}}`).
-- **Parsing**: The parser requires the content inside `@{...}` (the path) to have balanced braces (`{` and `}`).
-
-**Example (`review.toml`):**
-
-This command injects the content of a _fixed_ best practices file (`docs/best-practices.md`) and uses the user's arguments to provide context for the review.
-
-```toml
-# In: <project>/.gemini/commands/review.toml
-# Invoked via: /review FileCommandLoader.ts
-
-description = "Reviews the provided context using a best practice guide."
-prompt = """
-You are an expert code reviewer.
-
-Your task is to review {{args}}.
-
-Use the following best practices when providing your review:
-
-@{docs/best-practices.md}
-"""
-```
-
-When you run `/review FileCommandLoader.ts`, the `@{docs/best-practices.md}` placeholder is replaced by the content of that file, and `{{args}}` is replaced by the text you provided, before the final prompt is sent to the model.
-
 ---
 
 #### Example: A "Pure Function" Refactoring Command
@@ -383,16 +315,6 @@ That's it! You can now run your command in the CLI. First, you might add a file
 
 Gemini CLI will then execute the multi-line prompt defined in your TOML file.
 
-## Input Prompt Shortcuts
-
-These shortcuts apply directly to the input prompt for text manipulation.
-
-- **Undo:**
-  - **Keyboard shortcut:** Press **Ctrl+z** to undo the last action in the input prompt.
-
-- **Redo:**
-  - **Keyboard shortcut:** Press **Ctrl+Shift+Z** to redo the last undone action in the input prompt.
-
 ## At commands (`@`)
 
 At commands are used to include the content of files or directories as part of your prompt to Gemini. These commands include git-aware filtering.
@@ -408,7 +330,7 @@ At commands are used to include the content of files or directories as part of y
     - If a path to a directory is provided, the command attempts to read the content of files within that directory and any subdirectories.
     - Spaces in paths should be escaped with a backslash (e.g., `@My\ Documents/file.txt`).
     - The command uses the `read_many_files` tool internally. The content is fetched and then inserted into your query before being sent to the Gemini model.
-    - **Git-aware filtering:** By default, git-ignored files (like `node_modules/`, `dist/`, `.env`, `.git/`) are excluded. This behavior can be changed via the `context.fileFiltering` settings.
+    - **Git-aware filtering:** By default, git-ignored files (like `node_modules/`, `dist/`, `.env`, `.git/`) are excluded. This behavior can be changed via the `fileFiltering` settings.
     - **File types:** The command is intended for text-based files. While it might attempt to read any file, binary files or very large files might be skipped or truncated by the underlying `read_many_files` tool to ensure performance and relevance. The tool indicates if files were skipped.
   - **Output:** The CLI will show a tool call message indicating that `read_many_files` was used, along with a message detailing the status and the path(s) that were processed.
 

docs/cli/configuration-v1.md

@@ -1,643 +0,0 @@
-# Gemini CLI Configuration
-
-**Note on Deprecated Configuration Format**
-
-This document describes the legacy v1 format for the `settings.json` file. This format is now deprecated.
-
-- The new format will be supported in the stable release starting **[09/10/25]**.
-- Automatic migration from the old format to the new format will begin on **[09/17/25]**.
-
-For details on the new, recommended format, please see the [current Configuration documentation](./configuration.md).
-
-Gemini CLI offers several ways to configure its behavior, including environment variables, command-line arguments, and settings files. This document outlines the different configuration methods and available settings.
-
-## Configuration layers
-
-Configuration is applied in the following order of precedence (lower numbers are overridden by higher numbers):
-
-1.  **Default values:** Hardcoded defaults within the application.
-2.  **System defaults file:** System-wide default settings that can be overridden by other settings files.
-3.  **User settings file:** Global settings for the current user.
-4.  **Project settings file:** Project-specific settings.
-5.  **System settings file:** System-wide settings that override all other settings files.
-6.  **Environment variables:** System-wide or session-specific variables, potentially loaded from `.env` files.
-7.  **Command-line arguments:** Values passed when launching the CLI.
-
-## Settings files
-
-Gemini CLI uses JSON settings files for persistent configuration. There are four locations for these files:
-
-- **System defaults file:**
-  - **Location:** `/etc/gemini-cli/system-defaults.json` (Linux), `C:\ProgramData\gemini-cli\system-defaults.json` (Windows) or `/Library/Application Support/GeminiCli/system-defaults.json` (macOS). The path can be overridden using the `GEMINI_CLI_SYSTEM_DEFAULTS_PATH` environment variable.
-  - **Scope:** Provides a base layer of system-wide default settings. These settings have the lowest precedence and are intended to be overridden by user, project, or system override settings.
-- **User settings file:**
-  - **Location:** `~/.gemini/settings.json` (where `~` is your home directory).
-  - **Scope:** Applies to all Gemini CLI sessions for the current user. User settings override system defaults.
-- **Project settings file:**
-  - **Location:** `.gemini/settings.json` within your project's root directory.
-  - **Scope:** Applies only when running Gemini CLI from that specific project. Project settings override user settings and system defaults.
-- **System settings file:**
-  - **Location:** `/etc/gemini-cli/settings.json` (Linux), `C:\ProgramData\gemini-cli\settings.json` (Windows) or `/Library/Application Support/GeminiCli/settings.json` (macOS). The path can be overridden using the `GEMINI_CLI_SYSTEM_SETTINGS_PATH` environment variable.
-  - **Scope:** Applies to all Gemini CLI sessions on the system, for all users. System settings act as overrides, taking precedence over all other settings files. May be useful for system administrators at enterprises to have controls over users' Gemini CLI setups.
-
-**Note on environment variables in settings:** String values within your `settings.json` files can reference environment variables using either `$VAR_NAME` or `${VAR_NAME}` syntax. These variables will be automatically resolved when the settings are loaded. For example, if you have an environment variable `MY_API_TOKEN`, you could use it in `settings.json` like this: `"apiKey": "$MY_API_TOKEN"`.
-
-> **Note for Enterprise Users:** For guidance on deploying and managing Gemini CLI in a corporate environment, please see the [Enterprise Configuration](./enterprise.md) documentation.
-
-### The `.gemini` directory in your project
-
-In addition to a project settings file, a project's `.gemini` directory can contain other project-specific files related to Gemini CLI's operation, such as:
-
-- [Custom sandbox profiles](#sandboxing) (e.g., `.gemini/sandbox-macos-custom.sb`, `.gemini/sandbox.Dockerfile`).
-
-### Available settings in `settings.json`:
-
-- **`contextFileName`** (string or array of strings):
-  - **Description:** Specifies the filename for context files (e.g., `GEMINI.md`, `AGENTS.md`). Can be a single filename or a list of accepted filenames.
-  - **Default:** `GEMINI.md`
-  - **Example:** `"contextFileName": "AGENTS.md"`
-
-- **`bugCommand`** (object):
-  - **Description:** Overrides the default URL for the `/bug` command.
-  - **Default:** `"urlTemplate": "https://github.com/google-gemini/gemini-cli/issues/new?template=bug_report.yml&title={title}&info={info}"`
-  - **Properties:**
-    - **`urlTemplate`** (string): A URL that can contain `{title}` and `{info}` placeholders.
-  - **Example:**
-    ```json
-    "bugCommand": {
-      "urlTemplate": "https://bug.example.com/new?title={title}&info={info}"
-    }
-    ```
-
-- **`fileFiltering`** (object):
-  - **Description:** Controls git-aware file filtering behavior for @ commands and file discovery tools.
-  - **Default:** `"respectGitIgnore": true, "enableRecursiveFileSearch": true`
-  - **Properties:**
-    - **`respectGitIgnore`** (boolean): Whether to respect .gitignore patterns when discovering files. When set to `true`, git-ignored files (like `node_modules/`, `dist/`, `.env`) are automatically excluded from @ commands and file listing operations.
-    - **`enableRecursiveFileSearch`** (boolean): Whether to enable searching recursively for filenames under the current tree when completing @ prefixes in the prompt.
-    - **`disableFuzzySearch`** (boolean): When `true`, disables the fuzzy search capabilities when searching for files, which can improve performance on projects with a large number of files.
-  - **Example:**
-    ```json
-    "fileFiltering": {
-      "respectGitIgnore": true,
-      "enableRecursiveFileSearch": false,
-      "disableFuzzySearch": true
-    }
-    ```
-
-### Troubleshooting File Search Performance
-
-If you are experiencing performance issues with file searching (e.g., with `@` completions), especially in projects with a very large number of files, here are a few things you can try in order of recommendation:
-
-1.  **Use `.geminiignore`:** Create a `.geminiignore` file in your project root to exclude directories that contain a large number of files that you don't need to reference (e.g., build artifacts, logs, `node_modules`). Reducing the total number of files crawled is the most effective way to improve performance.
-
-2.  **Disable Fuzzy Search:** If ignoring files is not enough, you can disable fuzzy search by setting `disableFuzzySearch` to `true` in your `settings.json` file. This will use a simpler, non-fuzzy matching algorithm, which can be faster.
-
-3.  **Disable Recursive File Search:** As a last resort, you can disable recursive file search entirely by setting `enableRecursiveFileSearch` to `false`. This will be the fastest option as it avoids a recursive crawl of your project. However, it means you will need to type the full path to files when using `@` completions.
-
-- **`coreTools`** (array of strings):
-  - **Description:** Allows you to specify a list of core tool names that should be made available to the model. This can be used to restrict the set of built-in tools. See [Built-in Tools](../core/tools-api.md#built-in-tools) for a list of core tools. You can also specify command-specific restrictions for tools that support it, like the `ShellTool`. For example, `"coreTools": ["ShellTool(ls -l)"]` will only allow the `ls -l` command to be executed.
-  - **Default:** All tools available for use by the Gemini model.
-  - **Example:** `"coreTools": ["ReadFileTool", "GlobTool", "ShellTool(ls)"]`.
-
-- **`allowedTools`** (array of strings):
-  - **Default:** `undefined`
-  - **Description:** A list of tool names that will bypass the confirmation dialog. This is useful for tools that you trust and use frequently. The match semantics are the same as `coreTools`.
-  - **Example:** `"allowedTools": ["ShellTool(git status)"]`.
-
-- **`excludeTools`** (array of strings):
-  - **Description:** Allows you to specify a list of core tool names that should be excluded from the model. A tool listed in both `excludeTools` and `coreTools` is excluded. You can also specify command-specific restrictions for tools that support it, like the `ShellTool`. For example, `"excludeTools": ["ShellTool(rm -rf)"]` will block the `rm -rf` command.
-  - **Default**: No tools excluded.
-  - **Example:** `"excludeTools": ["run_shell_command", "findFiles"]`.
-  - **Security Note:** Command-specific restrictions in
-    `excludeTools` for `run_shell_command` are based on simple string matching and can be easily bypassed. This feature is **not a security mechanism** and should not be relied upon to safely execute untrusted code. It is recommended to use `coreTools` to explicitly select commands
-    that can be executed.
-
-- **`allowMCPServers`** (array of strings):
-  - **Description:** Allows you to specify a list of MCP server names that should be made available to the model. This can be used to restrict the set of MCP servers to connect to. Note that this will be ignored if `--allowed-mcp-server-names` is set.
-  - **Default:** All MCP servers are available for use by the Gemini model.
-  - **Example:** `"allowMCPServers": ["myPythonServer"]`.
-  - **Security Note:** This uses simple string matching on MCP server names, which can be modified. If you're a system administrator looking to prevent users from bypassing this, consider configuring the `mcpServers` at the system settings level such that the user will not be able to configure any MCP servers of their own. This should not be used as an airtight security mechanism.
-
-- **`excludeMCPServers`** (array of strings):
-  - **Description:** Allows you to specify a list of MCP server names that should be excluded from the model. A server listed in both `excludeMCPServers` and `allowMCPServers` is excluded. Note that this will be ignored if `--allowed-mcp-server-names` is set.
-  - **Default**: No MCP servers excluded.
-  - **Example:** `"excludeMCPServers": ["myNodeServer"]`.
-  - **Security Note:** This uses simple string matching on MCP server names, which can be modified. If you're a system administrator looking to prevent users from bypassing this, consider configuring the `mcpServers` at the system settings level such that the user will not be able to configure any MCP servers of their own. This should not be used as an airtight security mechanism.
-
-- **`autoAccept`** (boolean):
-  - **Description:** Controls whether the CLI automatically accepts and executes tool calls that are considered safe (e.g., read-only operations) without explicit user confirmation. If set to `true`, the CLI will bypass the confirmation prompt for tools deemed safe.
-  - **Default:** `false`
-  - **Example:** `"autoAccept": true`
-
-- **`theme`** (string):
-  - **Description:** Sets the visual [theme](./themes.md) for Gemini CLI.
-  - **Default:** `"Default"`
-  - **Example:** `"theme": "GitHub"`
-
-- **`vimMode`** (boolean):
-  - **Description:** Enables or disables vim mode for input editing. When enabled, the input area supports vim-style navigation and editing commands with NORMAL and INSERT modes. The vim mode status is displayed in the footer and persists between sessions.
-  - **Default:** `false`
-  - **Example:** `"vimMode": true`
-
-- **`sandbox`** (boolean or string):
-  - **Description:** Controls whether and how to use sandboxing for tool execution. If set to `true`, Gemini CLI uses a pre-built `gemini-cli-sandbox` Docker image. For more information, see [Sandboxing](#sandboxing).
-  - **Default:** `false`
-  - **Example:** `"sandbox": "docker"`
-
-- **`toolDiscoveryCommand`** (string):
-  - **Description:** Defines a custom shell command for discovering tools from your project. The shell command must return on `stdout` a JSON array of [function declarations](https://ai.google.dev/gemini-api/docs/function-calling#function-declarations). Tool wrappers are optional.
-  - **Default:** Empty
-  - **Example:** `"toolDiscoveryCommand": "bin/get_tools"`
-
-- **`toolCallCommand`** (string):
-  - **Description:** Defines a custom shell command for calling a specific tool that was discovered using `toolDiscoveryCommand`. The shell command must meet the following criteria:
-    - It must take function `name` (exactly as in [function declaration](https://ai.google.dev/gemini-api/docs/function-calling#function-declarations)) as first command line argument.
-    - It must read function arguments as JSON on `stdin`, analogous to [`functionCall.args`](https://cloud.google.com/vertex-ai/generative-ai/docs/model-reference/inference#functioncall).
-    - It must return function output as JSON on `stdout`, analogous to [`functionResponse.response.content`](https://cloud.google.com/vertex-ai/generative-ai/docs/model-reference/inference#functionresponse).
-  - **Default:** Empty
-  - **Example:** `"toolCallCommand": "bin/call_tool"`
-
-- **`mcpServers`** (object):
-  - **Description:** Configures connections to one or more Model-Context Protocol (MCP) servers for discovering and using custom tools. Gemini CLI attempts to connect to each configured MCP server to discover available tools. If multiple MCP servers expose a tool with the same name, the tool names will be prefixed with the server alias you defined in the configuration (e.g., `serverAlias__actualToolName`) to avoid conflicts. Note that the system might strip certain schema properties from MCP tool definitions for compatibility. At least one of `command`, `url`, or `httpUrl` must be provided. If multiple are specified, the order of precedence is `httpUrl`, then `url`, then `command`.
-  - **Default:** Empty
-  - **Properties:**
-    - **`<SERVER_NAME>`** (object): The server parameters for the named server.
-      - `command` (string, optional): The command to execute to start the MCP server via standard I/O.
-      - `args` (array of strings, optional): Arguments to pass to the command.
-      - `env` (object, optional): Environment variables to set for the server process.
-      - `cwd` (string, optional): The working directory in which to start the server.
-      - `url` (string, optional): The URL of an MCP server that uses Server-Sent Events (SSE) for communication.
-      - `httpUrl` (string, optional): The URL of an MCP server that uses streamable HTTP for communication.
-      - `headers` (object, optional): A map of HTTP headers to send with requests to `url` or `httpUrl`.
-      - `timeout` (number, optional): Timeout in milliseconds for requests to this MCP server.
-      - `trust` (boolean, optional): Trust this server and bypass all tool call confirmations.
-      - `description` (string, optional): A brief description of the server, which may be used for display purposes.
-      - `includeTools` (array of strings, optional): List of tool names to include from this MCP server. When specified, only the tools listed here will be available from this server (allowlist behavior). If not specified, all tools from the server are enabled by default.
-      - `excludeTools` (array of strings, optional): List of tool names to exclude from this MCP server. Tools listed here will not be available to the model, even if they are exposed by the server. **Note:** `excludeTools` takes precedence over `includeTools` - if a tool is in both lists, it will be excluded.
-  - **Example:**
-    ```json
-    "mcpServers": {
-      "myPythonServer": {
-        "command": "python",
-        "args": ["mcp_server.py", "--port", "8080"],
-        "cwd": "./mcp_tools/python",
-        "timeout": 5000,
-        "includeTools": ["safe_tool", "file_reader"],
-      },
-      "myNodeServer": {
-        "command": "node",
-        "args": ["mcp_server.js"],
-        "cwd": "./mcp_tools/node",
-        "excludeTools": ["dangerous_tool", "file_deleter"]
-      },
-      "myDockerServer": {
-        "command": "docker",
-        "args": ["run", "-i", "--rm", "-e", "API_KEY", "ghcr.io/foo/bar"],
-        "env": {
-          "API_KEY": "$MY_API_TOKEN"
-        }
-      },
-      "mySseServer": {
-        "url": "http://localhost:8081/events",
-        "headers": {
-          "Authorization": "Bearer $MY_SSE_TOKEN"
-        },
-        "description": "An example SSE-based MCP server."
-      },
-      "myStreamableHttpServer": {
-        "httpUrl": "http://localhost:8082/stream",
-        "headers": {
-          "X-API-Key": "$MY_HTTP_API_KEY"
-        },
-        "description": "An example Streamable HTTP-based MCP server."
-      }
-    }
-    ```
-
-- **`checkpointing`** (object):
-  - **Description:** Configures the checkpointing feature, which allows you to save and restore conversation and file states. See the [Checkpointing documentation](../checkpointing.md) for more details.
-  - **Default:** `{"enabled": false}`
-  - **Properties:**
-    - **`enabled`** (boolean): When `true`, the `/restore` command is available.
-
-- **`preferredEditor`** (string):
-  - **Description:** Specifies the preferred editor to use for viewing diffs.
-  - **Default:** `vscode`
-  - **Example:** `"preferredEditor": "vscode"`
-
-- **`telemetry`** (object)
-  - **Description:** Configures logging and metrics collection for Gemini CLI. For more information, see [Telemetry](../telemetry.md).
-  - **Default:** `{"enabled": false, "target": "local", "otlpEndpoint": "http://localhost:4317", "logPrompts": true}`
-  - **Properties:**
-    - **`enabled`** (boolean): Whether or not telemetry is enabled.
-    - **`target`** (string): The destination for collected telemetry. Supported values are `local` and `gcp`.
-    - **`otlpEndpoint`** (string): The endpoint for the OTLP Exporter.
-    - **`logPrompts`** (boolean): Whether or not to include the content of user prompts in the logs.
-  - **Example:**
-    ```json
-    "telemetry": {
-      "enabled": true,
-      "target": "local",
-      "otlpEndpoint": "http://localhost:16686",
-      "logPrompts": false
-    }
-    ```
-- **`usageStatisticsEnabled`** (boolean):
-  - **Description:** Enables or disables the collection of usage statistics. See [Usage Statistics](#usage-statistics) for more information.
-  - **Default:** `true`
-  - **Example:**
-    ```json
-    "usageStatisticsEnabled": false
-    ```
-
-- **`hideTips`** (boolean):
-  - **Description:** Enables or disables helpful tips in the CLI interface.
-  - **Default:** `false`
-  - **Example:**
-
-    ```json
-    "hideTips": true
-    ```
-
-- **`hideBanner`** (boolean):
-  - **Description:** Enables or disables the startup banner (ASCII art logo) in the CLI interface.
-  - **Default:** `false`
-  - **Example:**
-
-    ```json
-    "hideBanner": true
-    ```
-
-- **`maxSessionTurns`** (number):
-  - **Description:** Sets the maximum number of turns for a session. If the session exceeds this limit, the CLI will stop processing and start a new chat.
-  - **Default:** `-1` (unlimited)
-  - **Example:**
-    ```json
-    "maxSessionTurns": 10
-    ```
-
-- **`summarizeToolOutput`** (object):
-  - **Description:** Enables or disables the summarization of tool output. You can specify the token budget for the summarization using the `tokenBudget` setting.
-  - Note: Currently only the `run_shell_command` tool is supported.
-  - **Default:** `{}` (Disabled by default)
-  - **Example:**
-    ```json
-    "summarizeToolOutput": {
-      "run_shell_command": {
-        "tokenBudget": 2000
-      }
-    }
-    ```
-
-- **`excludedProjectEnvVars`** (array of strings):
-  - **Description:** Specifies environment variables that should be excluded from being loaded from project `.env` files. This prevents project-specific environment variables (like `DEBUG=true`) from interfering with gemini-cli behavior. Variables from `.gemini/.env` files are never excluded.
-  - **Default:** `["DEBUG", "DEBUG_MODE"]`
-  - **Example:**
-    ```json
-    "excludedProjectEnvVars": ["DEBUG", "DEBUG_MODE", "NODE_ENV"]
-    ```
-
-- **`includeDirectories`** (array of strings):
-  - **Description:** Specifies an array of additional absolute or relative paths to include in the workspace context. Missing directories will be skipped with a warning by default. Paths can use `~` to refer to the user's home directory. This setting can be combined with the `--include-directories` command-line flag.
-  - **Default:** `[]`
-  - **Example:**
-    ```json
-    "includeDirectories": [
-      "/path/to/another/project",
-      "../shared-library",
-      "~/common-utils"
-    ]
-    ```
-
-- **`loadMemoryFromIncludeDirectories`** (boolean):
-  - **Description:** Controls the behavior of the `/memory refresh` command. If set to `true`, `GEMINI.md` files should be loaded from all directories that are added. If set to `false`, `GEMINI.md` should only be loaded from the current directory.
-  - **Default:** `false`
-  - **Example:**
-    ```json
-    "loadMemoryFromIncludeDirectories": true
-    ```
-
-- **`chatCompression`** (object):
-  - **Description:** Controls the settings for chat history compression, both automatic and
-    when manually invoked through the /compress command.
-  - **Properties:**
-    - **`contextPercentageThreshold`** (number): A value between 0 and 1 that specifies the token threshold for compression as a percentage of the model's total token limit. For example, a value of `0.6` will trigger compression when the chat history exceeds 60% of the token limit.
-  - **Example:**
-    ```json
-    "chatCompression": {
-      "contextPercentageThreshold": 0.6
-    }
-    ```
-
-- **`showLineNumbers`** (boolean):
-  - **Description:** Controls whether line numbers are displayed in code blocks in the CLI output.
-  - **Default:** `true`
-  - **Example:**
-    ```json
-    "showLineNumbers": false
-    ```
-
-- **`accessibility`** (object):
-  - **Description:** Configures accessibility features for the CLI.
-  - **Properties:**
-    - **`screenReader`** (boolean): Enables screen reader mode, which adjusts the TUI for better compatibility with screen readers. This can also be enabled with the `--screen-reader` command-line flag, which will take precedence over the setting.
-    - **`disableLoadingPhrases`** (boolean): Disables the display of loading phrases during operations.
-  - **Default:** `{"screenReader": false, "disableLoadingPhrases": false}`
-  - **Example:**
-    ```json
-    "accessibility": {
-      "screenReader": true,
-      "disableLoadingPhrases": true
-    }
-    ```
-
-### Example `settings.json`:
-
-```json
-{
-  "theme": "GitHub",
-  "sandbox": "docker",
-  "toolDiscoveryCommand": "bin/get_tools",
-  "toolCallCommand": "bin/call_tool",
-  "mcpServers": {
-    "mainServer": {
-      "command": "bin/mcp_server.py"
-    },
-    "anotherServer": {
-      "command": "node",
-      "args": ["mcp_server.js", "--verbose"]
-    }
-  },
-  "telemetry": {
-    "enabled": true,
-    "target": "local",
-    "otlpEndpoint": "http://localhost:4317",
-    "logPrompts": true
-  },
-  "usageStatisticsEnabled": true,
-  "hideTips": false,
-  "hideBanner": false,
-  "maxSessionTurns": 10,
-  "summarizeToolOutput": {
-    "run_shell_command": {
-      "tokenBudget": 100
-    }
-  },
-  "excludedProjectEnvVars": ["DEBUG", "DEBUG_MODE", "NODE_ENV"],
-  "includeDirectories": ["path/to/dir1", "~/path/to/dir2", "../path/to/dir3"],
-  "loadMemoryFromIncludeDirectories": true
-}
-```
-
-## Shell History
-
-The CLI keeps a history of shell commands you run. To avoid conflicts between different projects, this history is stored in a project-specific directory within your user's home folder.
-
-- **Location:** `~/.gemini/tmp/<project_hash>/shell_history`
-  - `<project_hash>` is a unique identifier generated from your project's root path.
-  - The history is stored in a file named `shell_history`.
-
-## Environment Variables & `.env` Files
-
-Environment variables are a common way to configure applications, especially for sensitive information like API keys or for settings that might change between environments. For authentication setup, see the [Authentication documentation](./authentication.md) which covers all available authentication methods.
-
-The CLI automatically loads environment variables from an `.env` file. The loading order is:
-
-1.  `.env` file in the current working directory.
-2.  If not found, it searches upwards in parent directories until it finds an `.env` file or reaches the project root (identified by a `.git` folder) or the home directory.
-3.  If still not found, it looks for `~/.env` (in the user's home directory).
-
-**Environment Variable Exclusion:** Some environment variables (like `DEBUG` and `DEBUG_MODE`) are automatically excluded from being loaded from project `.env` files to prevent interference with gemini-cli behavior. Variables from `.gemini/.env` files are never excluded. You can customize this behavior using the `excludedProjectEnvVars` setting in your `settings.json` file.
-
-- **`GEMINI_API_KEY`**:
-  - Your API key for the Gemini API.
-  - One of several available [authentication methods](./authentication.md).
-  - Set this in your shell profile (e.g., `~/.bashrc`, `~/.zshrc`) or an `.env` file.
-- **`GEMINI_MODEL`**:
-  - Specifies the default Gemini model to use.
-  - Overrides the hardcoded default
-  - Example: `export GEMINI_MODEL="gemini-2.5-flash"`
-- **`GOOGLE_API_KEY`**:
-  - Your Google Cloud API key.
-  - Required for using Vertex AI in express mode.
-  - Ensure you have the necessary permissions.
-  - Example: `export GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY"`.
-- **`GOOGLE_CLOUD_PROJECT`**:
-  - Your Google Cloud Project ID.
-  - Required for using Code Assist or Vertex AI.
-  - If using Vertex AI, ensure you have the necessary permissions in this project.
-  - **Cloud Shell Note:** When running in a Cloud Shell environment, this variable defaults to a special project allocated for Cloud Shell users. If you have `GOOGLE_CLOUD_PROJECT` set in your global environment in Cloud Shell, it will be overridden by this default. To use a different project in Cloud Shell, you must define `GOOGLE_CLOUD_PROJECT` in a `.env` file.
-  - Example: `export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"`.
-- **`GOOGLE_APPLICATION_CREDENTIALS`** (string):
-  - **Description:** The path to your Google Application Credentials JSON file.
-  - **Example:** `export GOOGLE_APPLICATION_CREDENTIALS="/path/to/your/credentials.json"`
-- **`OTLP_GOOGLE_CLOUD_PROJECT`**:
-  - Your Google Cloud Project ID for Telemetry in Google Cloud
-  - Example: `export OTLP_GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"`.
-- **`GOOGLE_CLOUD_LOCATION`**:
-  - Your Google Cloud Project Location (e.g., us-central1).
-  - Required for using Vertex AI in non express mode.
-  - Example: `export GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"`.
-- **`GEMINI_SANDBOX`**:
-  - Alternative to the `sandbox` setting in `settings.json`.
-  - Accepts `true`, `false`, `docker`, `podman`, or a custom command string.
-- **`SEATBELT_PROFILE`** (macOS specific):
-  - Switches the Seatbelt (`sandbox-exec`) profile on macOS.
-  - `permissive-open`: (Default) Restricts writes to the project folder (and a few other folders, see `packages/cli/src/utils/sandbox-macos-permissive-open.sb`) but allows other operations.
-  - `strict`: Uses a strict profile that declines operations by default.
-  - `<profile_name>`: Uses a custom profile. To define a custom profile, create a file named `sandbox-macos-<profile_name>.sb` in your project's `.gemini/` directory (e.g., `my-project/.gemini/sandbox-macos-custom.sb`).
-- **`DEBUG` or `DEBUG_MODE`** (often used by underlying libraries or the CLI itself):
-  - Set to `true` or `1` to enable verbose debug logging, which can be helpful for troubleshooting.
-  - **Note:** These variables are automatically excluded from project `.env` files by default to prevent interference with gemini-cli behavior. Use `.gemini/.env` files if you need to set these for gemini-cli specifically.
-- **`NO_COLOR`**:
-  - Set to any value to disable all color output in the CLI.
-- **`CLI_TITLE`**:
-  - Set to a string to customize the title of the CLI.
-- **`CODE_ASSIST_ENDPOINT`**:
-  - Specifies the endpoint for the code assist server.
-  - This is useful for development and testing.
-
-## Command-Line Arguments
-
-Arguments passed directly when running the CLI can override other configurations for that specific session.
-
-- **`--model <model_name>`** (**`-m <model_name>`**):
-  - Specifies the Gemini model to use for this session.
-  - Example: `npm start -- --model gemini-1.5-pro-latest`
-- **`--prompt <your_prompt>`** (**`-p <your_prompt>`**):
-  - Used to pass a prompt directly to the command. This invokes Gemini CLI in a non-interactive mode.
-- **`--prompt-interactive <your_prompt>`** (**`-i <your_prompt>`**):
-  - Starts an interactive session with the provided prompt as the initial input.
-  - The prompt is processed within the interactive session, not before it.
-  - Cannot be used when piping input from stdin.
-  - Example: `gemini -i "explain this code"`
-- **`--sandbox`** (**`-s`**):
-  - Enables sandbox mode for this session.
-- **`--sandbox-image`**:
-  - Sets the sandbox image URI.
-- **`--debug`** (**`-d`**):
-  - Enables debug mode for this session, providing more verbose output.
-- **`--all-files`** (**`-a`**):
-  - If set, recursively includes all files within the current directory as context for the prompt.
-- **`--help`** (or **`-h`**):
-  - Displays help information about command-line arguments.
-- **`--show-memory-usage`**:
-  - Displays the current memory usage.
-- **`--yolo`**:
-  - Enables YOLO mode, which automatically approves all tool calls.
-- **`--approval-mode <mode>`**:
-  - Sets the approval mode for tool calls. Available modes:
-    - `default`: Prompt for approval on each tool call (default behavior)
-    - `auto_edit`: Automatically approve edit tools (replace, write_file) while prompting for others
-    - `yolo`: Automatically approve all tool calls (equivalent to `--yolo`)
-  - Cannot be used together with `--yolo`. Use `--approval-mode=yolo` instead of `--yolo` for the new unified approach.
-  - Example: `gemini --approval-mode auto_edit`
-- **`--allowed-tools <tool1,tool2,...>`**:
-  - A comma-separated list of tool names that will bypass the confirmation dialog.
-  - Example: `gemini --allowed-tools "ShellTool(git status)"`
-- **`--telemetry`**:
-  - Enables [telemetry](../telemetry.md).
-- **`--telemetry-target`**:
-  - Sets the telemetry target. See [telemetry](../telemetry.md) for more information.
-- **`--telemetry-otlp-endpoint`**:
-  - Sets the OTLP endpoint for telemetry. See [telemetry](../telemetry.md) for more information.
-- **`--telemetry-otlp-protocol`**:
-  - Sets the OTLP protocol for telemetry (`grpc` or `http`). Defaults to `grpc`. See [telemetry](../telemetry.md) for more information.
-- **`--telemetry-log-prompts`**:
-  - Enables logging of prompts for telemetry. See [telemetry](../telemetry.md) for more information.
-- **`--checkpointing`**:
-  - Enables [checkpointing](../checkpointing.md).
-- **`--extensions <extension_name ...>`** (**`-e <extension_name ...>`**):
-  - Specifies a list of extensions to use for the session. If not provided, all available extensions are used.
-  - Use the special term `gemini -e none` to disable all extensions.
-  - Example: `gemini -e my-extension -e my-other-extension`
-- **`--list-extensions`** (**`-l`**):
-  - Lists all available extensions and exits.
-- **`--proxy`**:
-  - Sets the proxy for the CLI.
-  - Example: `--proxy http://localhost:7890`.
-- **`--include-directories <dir1,dir2,...>`**:
-  - Includes additional directories in the workspace for multi-directory support.
-  - Can be specified multiple times or as comma-separated values.
-  - 5 directories can be added at maximum.
-  - Example: `--include-directories /path/to/project1,/path/to/project2` or `--include-directories /path/to/project1 --include-directories /path/to/project2`
-- **`--screen-reader`**:
-  - Enables screen reader mode for accessibility.
-- **`--version`**:
-  - Displays the version of the CLI.
-
-## Context Files (Hierarchical Instructional Context)
-
-While not strictly configuration for the CLI's _behavior_, context files (defaulting to `GEMINI.md` but configurable via the `contextFileName` setting) are crucial for configuring the _instructional context_ (also referred to as "memory") provided to the Gemini model. This powerful feature allows you to give project-specific instructions, coding style guides, or any relevant background information to the AI, making its responses more tailored and accurate to your needs. The CLI includes UI elements, such as an indicator in the footer showing the number of loaded context files, to keep you informed about the active context.
-
-- **Purpose:** These Markdown files contain instructions, guidelines, or context that you want the Gemini model to be aware of during your interactions. The system is designed to manage this instructional context hierarchically.
-
-### Example Context File Content (e.g., `GEMINI.md`)
-
-Here's a conceptual example of what a context file at the root of a TypeScript project might contain:
-
-```markdown
-# Project: My Awesome TypeScript Library
-
-## General Instructions:
-
-- When generating new TypeScript code, please follow the existing coding style.
-- Ensure all new functions and classes have JSDoc comments.
-- Prefer functional programming paradigms where appropriate.
-- All code should be compatible with TypeScript 5.0 and Node.js 20+.
-
-## Coding Style:
-
-- Use 2 spaces for indentation.
-- Interface names should be prefixed with `I` (e.g., `IUserService`).
-- Private class members should be prefixed with an underscore (`_`).
-- Always use strict equality (`===` and `!==`).
-
-## Specific Component: `src/api/client.ts`
-
-- This file handles all outbound API requests.
-- When adding new API call functions, ensure they include robust error handling and logging.
-- Use the existing `fetchWithRetry` utility for all GET requests.
-
-## Regarding Dependencies:
-
-- Avoid introducing new external dependencies unless absolutely necessary.
-- If a new dependency is required, please state the reason.
-```
-
-This example demonstrates how you can provide general project context, specific coding conventions, and even notes about particular files or components. The more relevant and precise your context files are, the better the AI can assist you. Project-specific context files are highly encouraged to establish conventions and context.
-
-- **Hierarchical Loading and Precedence:** The CLI implements a sophisticated hierarchical memory system by loading context files (e.g., `GEMINI.md`) from several locations. Content from files lower in this list (more specific) typically overrides or supplements content from files higher up (more general). The exact concatenation order and final context can be inspected using the `/memory show` command. The typical loading order is:
-  1.  **Global Context File:**
-      - Location: `~/.gemini/<contextFileName>` (e.g., `~/.gemini/GEMINI.md` in your user home directory).
-      - Scope: Provides default instructions for all your projects.
-  2.  **Project Root & Ancestors Context Files:**
-      - Location: The CLI searches for the configured context file in the current working directory and then in each parent directory up to either the project root (identified by a `.git` folder) or your home directory.
-      - Scope: Provides context relevant to the entire project or a significant portion of it.
-  3.  **Sub-directory Context Files (Contextual/Local):**
-      - Location: The CLI also scans for the configured context file in subdirectories _below_ the current working directory (respecting common ignore patterns like `node_modules`, `.git`, etc.). The breadth of this search is limited to 200 directories by default, but can be configured with a `memoryDiscoveryMaxDirs` field in your `settings.json` file.
-      - Scope: Allows for highly specific instructions relevant to a particular component, module, or subsection of your project.
-- **Concatenation & UI Indication:** The contents of all found context files are concatenated (with separators indicating their origin and path) and provided as part of the system prompt to the Gemini model. The CLI footer displays the count of loaded context files, giving you a quick visual cue about the active instructional context.
-- **Importing Content:** You can modularize your context files by importing other Markdown files using the `@path/to/file.md` syntax. For more details, see the [Memory Import Processor documentation](../core/memport.md).
-- **Commands for Memory Management:**
-  - Use `/memory refresh` to force a re-scan and reload of all context files from all configured locations. This updates the AI's instructional context.
-  - Use `/memory show` to display the combined instructional context currently loaded, allowing you to verify the hierarchy and content being used by the AI.
-  - See the [Commands documentation](./commands.md#memory) for full details on the `/memory` command and its sub-commands (`show` and `refresh`).
-
-By understanding and utilizing these configuration layers and the hierarchical nature of context files, you can effectively manage the AI's memory and tailor the Gemini CLI's responses to your specific needs and projects.
-
-## Sandboxing
-
-The Gemini CLI can execute potentially unsafe operations (like shell commands and file modifications) within a sandboxed environment to protect your system.
-
-Sandboxing is disabled by default, but you can enable it in a few ways:
-
-- Using `--sandbox` or `-s` flag.
-- Setting `GEMINI_SANDBOX` environment variable.
-- Sandbox is enabled when using `--yolo` or `--approval-mode=yolo` by default.
-
-By default, it uses a pre-built `gemini-cli-sandbox` Docker image.
-
-For project-specific sandboxing needs, you can create a custom Dockerfile at `.gemini/sandbox.Dockerfile` in your project's root directory. This Dockerfile can be based on the base sandbox image:
-
-```dockerfile
-FROM gemini-cli-sandbox
-
-# Add your custom dependencies or configurations here
-# For example:
-# RUN apt-get update && apt-get install -y some-package
-# COPY ./my-config /app/my-config
-```
-
-When `.gemini/sandbox.Dockerfile` exists, you can use `BUILD_SANDBOX` environment variable when running Gemini CLI to automatically build the custom sandbox image:
-
-```bash
-BUILD_SANDBOX=1 gemini -s
-```
-
-## Usage Statistics
-
-To help us improve the Gemini CLI, we collect anonymized usage statistics. This data helps us understand how the CLI is used, identify common issues, and prioritize new features.
-
-**What we collect:**
-
-- **Tool Calls:** We log the names of the tools that are called, whether they succeed or fail, and how long they take to execute. We do not collect the arguments passed to the tools or any data returned by them.
-- **API Requests:** We log the Gemini model used for each request, the duration of the request, and whether it was successful. We do not collect the content of the prompts or responses.
-- **Session Information:** We collect information about the configuration of the CLI, such as the enabled tools and the approval mode.
-
-**What we DON'T collect:**
-
-- **Personally Identifiable Information (PII):** We do not collect any personal information, such as your name, email address, or API keys.
-- **Prompt and Response Content:** We do not log the content of your prompts or the responses from the Gemini model.
-- **File Content:** We do not log the content of any files that are read or written by the CLI.
-
-**How to opt out:**
-
-You can opt out of usage statistics collection at any time by setting the `usageStatisticsEnabled` property to `false` in your `settings.json` file:
-
-```json
-{
-  "usageStatisticsEnabled": false
-}
-```

docs/cli/configuration.md

@@ -1,14 +1,5 @@
 # Gemini CLI Configuration
 
-**Note on New Configuration Format**
-
-The format of the `settings.json` file has been updated to a new, more organized structure.
-
-- The new format will be supported in the stable release starting **[09/10/25]**.
-- Automatic migration from the old format to the new format will begin on **[09/17/25]**.
-
-For details on the previous format, please see the [v1 Configuration documentation](./configuration-v1.md).
-
 Gemini CLI offers several ways to configure its behavior, including environment variables, command-line arguments, and settings files. This document outlines the different configuration methods and available settings.
 
 ## Configuration layers
@@ -16,330 +7,295 @@ Gemini CLI offers several ways to configure its behavior, including environment
 Configuration is applied in the following order of precedence (lower numbers are overridden by higher numbers):
 
 1.  **Default values:** Hardcoded defaults within the application.
-2.  **System defaults file:** System-wide default settings that can be overridden by other settings files.
-3.  **User settings file:** Global settings for the current user.
-4.  **Project settings file:** Project-specific settings.
-5.  **System settings file:** System-wide settings that override all other settings files.
-6.  **Environment variables:** System-wide or session-specific variables, potentially loaded from `.env` files.
-7.  **Command-line arguments:** Values passed when launching the CLI.
+2.  **User settings file:** Global settings for the current user.
+3.  **Project settings file:** Project-specific settings.
+4.  **System settings file:** System-wide settings.
+5.  **Environment variables:** System-wide or session-specific variables, potentially loaded from `.env` files.
+6.  **Command-line arguments:** Values passed when launching the CLI.
 
 ## Settings files
 
-Gemini CLI uses JSON settings files for persistent configuration. There are four locations for these files:
+Gemini CLI uses `settings.json` files for persistent configuration. There are three locations for these files:
 
-- **System defaults file:**
-  - **Location:** `/etc/gemini-cli/system-defaults.json` (Linux), `C:\ProgramData\gemini-cli\system-defaults.json` (Windows) or `/Library/Application Support/GeminiCli/system-defaults.json` (macOS). The path can be overridden using the `GEMINI_CLI_SYSTEM_DEFAULTS_PATH` environment variable.
-  - **Scope:** Provides a base layer of system-wide default settings. These settings have the lowest precedence and are intended to be overridden by user, project, or system override settings.
 - **User settings file:**
   - **Location:** `~/.gemini/settings.json` (where `~` is your home directory).
-  - **Scope:** Applies to all Gemini CLI sessions for the current user. User settings override system defaults.
+  - **Scope:** Applies to all Gemini CLI sessions for the current user.
 - **Project settings file:**
   - **Location:** `.gemini/settings.json` within your project's root directory.
-  - **Scope:** Applies only when running Gemini CLI from that specific project. Project settings override user settings and system defaults.
+  - **Scope:** Applies only when running Gemini CLI from that specific project. Project settings override user settings.
 - **System settings file:**
   - **Location:** `/etc/gemini-cli/settings.json` (Linux), `C:\ProgramData\gemini-cli\settings.json` (Windows) or `/Library/Application Support/GeminiCli/settings.json` (macOS). The path can be overridden using the `GEMINI_CLI_SYSTEM_SETTINGS_PATH` environment variable.
-  - **Scope:** Applies to all Gemini CLI sessions on the system, for all users. System settings act as overrides, taking precedence over all other settings files. May be useful for system administrators at enterprises to have controls over users' Gemini CLI setups.
+  - **Scope:** Applies to all Gemini CLI sessions on the system, for all users. System settings override user and project settings. May be useful for system administrators at enterprises to have controls over users' Gemini CLI setups.
 
 **Note on environment variables in settings:** String values within your `settings.json` files can reference environment variables using either `$VAR_NAME` or `${VAR_NAME}` syntax. These variables will be automatically resolved when the settings are loaded. For example, if you have an environment variable `MY_API_TOKEN`, you could use it in `settings.json` like this: `"apiKey": "$MY_API_TOKEN"`.
 
-> **Note for Enterprise Users:** For guidance on deploying and managing Gemini CLI in a corporate environment, please see the [Enterprise Configuration](./enterprise.md) documentation.
-
 ### The `.gemini` directory in your project
 
 In addition to a project settings file, a project's `.gemini` directory can contain other project-specific files related to Gemini CLI's operation, such as:
 
 - [Custom sandbox profiles](#sandboxing) (e.g., `.gemini/sandbox-macos-custom.sb`, `.gemini/sandbox.Dockerfile`).
 
-### Available settings in `settings.json`
+### Available settings in `settings.json`:
 
-Settings are organized into categories. All settings should be placed within their corresponding top-level category object in your `settings.json` file.
+- **`contextFileName`** (string or array of strings):
+  - **Description:** Specifies the filename for context files (e.g., `GEMINI.md`, `AGENTS.md`). Can be a single filename or a list of accepted filenames.
+  - **Default:** `GEMINI.md`
+  - **Example:** `"contextFileName": "AGENTS.md"`
 
-#### `general`
+- **`bugCommand`** (object):
+  - **Description:** Overrides the default URL for the `/bug` command.
+  - **Default:** `"urlTemplate": "https://github.com/google-gemini/gemini-cli/issues/new?template=bug_report.yml&title={title}&info={info}"`
+  - **Properties:**
+    - **`urlTemplate`** (string): A URL that can contain `{title}` and `{info}` placeholders.
+  - **Example:**
+    ```json
+    "bugCommand": {
+      "urlTemplate": "https://bug.example.com/new?title={title}&info={info}"
+    }
+    ```
 
-- **`general.preferredEditor`** (string):
-  - **Description:** The preferred editor to open files in.
-  - **Default:** `undefined`
+- **`fileFiltering`** (object):
+  - **Description:** Controls git-aware file filtering behavior for @ commands and file discovery tools.
+  - **Default:** `"respectGitIgnore": true, "enableRecursiveFileSearch": true`
+  - **Properties:**
+    - **`respectGitIgnore`** (boolean): Whether to respect .gitignore patterns when discovering files. When set to `true`, git-ignored files (like `node_modules/`, `dist/`, `.env`) are automatically excluded from @ commands and file listing operations.
+    - **`enableRecursiveFileSearch`** (boolean): Whether to enable searching recursively for filenames under the current tree when completing @ prefixes in the prompt.
+  - **Example:**
+    ```json
+    "fileFiltering": {
+      "respectGitIgnore": true,
+      "enableRecursiveFileSearch": false
+    }
+    ```
 
-- **`general.vimMode`** (boolean):
-  - **Description:** Enable Vim keybindings.
+- **`coreTools`** (array of strings):
+  - **Description:** Allows you to specify a list of core tool names that should be made available to the model. This can be used to restrict the set of built-in tools. See [Built-in Tools](../core/tools-api.md#built-in-tools) for a list of core tools. You can also specify command-specific restrictions for tools that support it, like the `ShellTool`. For example, `"coreTools": ["ShellTool(ls -l)"]` will only allow the `ls -l` command to be executed.
+  - **Default:** All tools available for use by the Gemini model.
+  - **Example:** `"coreTools": ["ReadFileTool", "GlobTool", "ShellTool(ls)"]`.
+
+- **`excludeTools`** (array of strings):
+  - **Description:** Allows you to specify a list of core tool names that should be excluded from the model. A tool listed in both `excludeTools` and `coreTools` is excluded. You can also specify command-specific restrictions for tools that support it, like the `ShellTool`. For example, `"excludeTools": ["ShellTool(rm -rf)"]` will block the `rm -rf` command.
+  - **Default**: No tools excluded.
+  - **Example:** `"excludeTools": ["run_shell_command", "findFiles"]`.
+  - **Security Note:** Command-specific restrictions in
+    `excludeTools` for `run_shell_command` are based on simple string matching and can be easily bypassed. This feature is **not a security mechanism** and should not be relied upon to safely execute untrusted code. It is recommended to use `coreTools` to explicitly select commands
+    that can be executed.
+
+- **`allowMCPServers`** (array of strings):
+  - **Description:** Allows you to specify a list of MCP server names that should be made available to the model. This can be used to restrict the set of MCP servers to connect to. Note that this will be ignored if `--allowed-mcp-server-names` is set.
+  - **Default:** All MCP servers are available for use by the Gemini model.
+  - **Example:** `"allowMCPServers": ["myPythonServer"]`.
+  - **Security Note:** This uses simple string matching on MCP server names, which can be modified. If you're a system administrator looking to prevent users from bypassing this, consider configuring the `mcpServers` at the system settings level such that the user will not be able to configure any MCP servers of their own. This should not be used as an airtight security mechanism.
+
+- **`excludeMCPServers`** (array of strings):
+  - **Description:** Allows you to specify a list of MCP server names that should be excluded from the model. A server listed in both `excludeMCPServers` and `allowMCPServers` is excluded. Note that this will be ignored if `--allowed-mcp-server-names` is set.
+  - **Default**: No MCP servers excluded.
+  - **Example:** `"excludeMCPServers": ["myNodeServer"]`.
+  - **Security Note:** This uses simple string matching on MCP server names, which can be modified. If you're a system administrator looking to prevent users from bypassing this, consider configuring the `mcpServers` at the system settings level such that the user will not be able to configure any MCP servers of their own. This should not be used as an airtight security mechanism.
+
+- **`autoAccept`** (boolean):
+  - **Description:** Controls whether the CLI automatically accepts and executes tool calls that are considered safe (e.g., read-only operations) without explicit user confirmation. If set to `true`, the CLI will bypass the confirmation prompt for tools deemed safe.
   - **Default:** `false`
+  - **Example:** `"autoAccept": true`
 
-- **`general.disableAutoUpdate`** (boolean):
-  - **Description:** Disable automatic updates.
+- **`theme`** (string):
+  - **Description:** Sets the visual [theme](./themes.md) for Gemini CLI.
+  - **Default:** `"Default"`
+  - **Example:** `"theme": "GitHub"`
+
+- **`vimMode`** (boolean):
+  - **Description:** Enables or disables vim mode for input editing. When enabled, the input area supports vim-style navigation and editing commands with NORMAL and INSERT modes. The vim mode status is displayed in the footer and persists between sessions.
   - **Default:** `false`
+  - **Example:** `"vimMode": true`
 
-- **`general.disableUpdateNag`** (boolean):
-  - **Description:** Disable update notification prompts.
+- **`sandbox`** (boolean or string):
+  - **Description:** Controls whether and how to use sandboxing for tool execution. If set to `true`, Gemini CLI uses a pre-built `gemini-cli-sandbox` Docker image. For more information, see [Sandboxing](#sandboxing).
   - **Default:** `false`
+  - **Example:** `"sandbox": "docker"`
 
-- **`general.checkpointing.enabled`** (boolean):
-  - **Description:** Enable session checkpointing for recovery.
-  - **Default:** `false`
+- **`toolDiscoveryCommand`** (string):
+  - **Description:** Defines a custom shell command for discovering tools from your project. The shell command must return on `stdout` a JSON array of [function declarations](https://ai.google.dev/gemini-api/docs/function-calling#function-declarations). Tool wrappers are optional.
+  - **Default:** Empty
+  - **Example:** `"toolDiscoveryCommand": "bin/get_tools"`
 
-#### `output`
-
-- **`output.format`** (string):
-  - **Description:** The format of the CLI output.
-  - **Default:** `"text"`
-  - **Values:** `"text"`, `"json"`
-
-#### `ui`
-
-- **`ui.theme`** (string):
-  - **Description:** The color theme for the UI. See [Themes](./themes.md) for available options.
-  - **Default:** `undefined`
-
-- **`ui.customThemes`** (object):
-  - **Description:** Custom theme definitions.
-  - **Default:** `{}`
-
-- **`ui.hideWindowTitle`** (boolean):
-  - **Description:** Hide the window title bar.
-  - **Default:** `false`
-
-- **`ui.hideTips`** (boolean):
-  - **Description:** Hide helpful tips in the UI.
-  - **Default:** `false`
-
-- **`ui.hideBanner`** (boolean):
-  - **Description:** Hide the application banner.
-  - **Default:** `false`
-
-- **`ui.hideFooter`** (boolean):
-  - **Description:** Hide the footer from the UI.
-  - **Default:** `false`
-
-- **`ui.showMemoryUsage`** (boolean):
-  - **Description:** Display memory usage information in the UI.
-  - **Default:** `false`
-
-- **`ui.showLineNumbers`** (boolean):
-  - **Description:** Show line numbers in the chat.
-  - **Default:** `false`
-
-- **`ui.showCitations`** (boolean):
-  - **Description:** Show citations for generated text in the chat.
-  - **Default:** `true`
-
-- **`ui.accessibility.disableLoadingPhrases`** (boolean):
-  - **Description:** Disable loading phrases for accessibility.
-  - **Default:** `false`
-
-- **`ui.customWittyPhrases`** (array of strings):
-  - **Description:** A list of custom phrases to display during loading states. When provided, the CLI will cycle through these phrases instead of the default ones.
-  - **Default:** `[]`
-
-#### `ide`
-
-- **`ide.enabled`** (boolean):
-  - **Description:** Enable IDE integration mode.
-  - **Default:** `false`
-
-- **`ide.hasSeenNudge`** (boolean):
-  - **Description:** Whether the user has seen the IDE integration nudge.
-  - **Default:** `false`
-
-#### `privacy`
-
-- **`privacy.usageStatisticsEnabled`** (boolean):
-  - **Description:** Enable collection of usage statistics.
-  - **Default:** `true`
-
-#### `model`
-
-- **`model.name`** (string):
-  - **Description:** The Gemini model to use for conversations.
-  - **Default:** `undefined`
-
-- **`model.maxSessionTurns`** (number):
-  - **Description:** Maximum number of user/model/tool turns to keep in a session. -1 means unlimited.
-  - **Default:** `-1`
-
-- **`model.summarizeToolOutput`** (object):
-  - **Description:** Enables or disables the summarization of tool output. You can specify the token budget for the summarization using the `tokenBudget` setting. Note: Currently only the `run_shell_command` tool is supported. For example `{"run_shell_command": {"tokenBudget": 2000}}`
-  - **Default:** `undefined`
-
-- **`model.chatCompression.contextPercentageThreshold`** (number):
-  - **Description:** Sets the threshold for chat history compression as a percentage of the model's total token limit. This is a value between 0 and 1 that applies to both automatic compression and the manual `/compress` command. For example, a value of `0.6` will trigger compression when the chat history exceeds 60% of the token limit.
-  - **Default:** `0.7`
-
-- **`model.skipNextSpeakerCheck`** (boolean):
-  - **Description:** Skip the next speaker check.
-  - **Default:** `false`
-
-#### `context`
-
-- **`context.fileName`** (string or array of strings):
-  - **Description:** The name of the context file(s).
-  - **Default:** `undefined`
-
-- **`context.importFormat`** (string):
-  - **Description:** The format to use when importing memory.
-  - **Default:** `undefined`
-
-- **`context.discoveryMaxDirs`** (number):
-  - **Description:** Maximum number of directories to search for memory.
-  - **Default:** `200`
-
-- **`context.includeDirectories`** (array):
-  - **Description:** Additional directories to include in the workspace context. Missing directories will be skipped with a warning.
-  - **Default:** `[]`
-
-- **`context.loadFromIncludeDirectories`** (boolean):
-  - **Description:** Controls the behavior of the `/memory refresh` command. If set to `true`, `GEMINI.md` files should be loaded from all directories that are added. If set to `false`, `GEMINI.md` should only be loaded from the current directory.
-  - **Default:** `false`
-
-- **`context.fileFiltering.respectGitIgnore`** (boolean):
-  - **Description:** Respect .gitignore files when searching.
-  - **Default:** `true`
-
-- **`context.fileFiltering.respectGeminiIgnore`** (boolean):
-  - **Description:** Respect .geminiignore files when searching.
-  - **Default:** `true`
-
-- **`context.fileFiltering.enableRecursiveFileSearch`** (boolean):
-  - **Description:** Whether to enable searching recursively for filenames under the current tree when completing `@` prefixes in the prompt.
-  - **Default:** `true`
-
-#### `tools`
-
-- **`tools.sandbox`** (boolean or string):
-  - **Description:** Sandbox execution environment (can be a boolean or a path string).
-  - **Default:** `undefined`
-
-- **`tools.shell.enableInteractiveShell`** (boolean):
-
-  Use `node-pty` for an interactive shell experience. Fallback to `child_process` still applies. Defaults to `false`.
-
-- **`tools.core`** (array of strings):
-  - **Description:** This can be used to restrict the set of built-in tools [with an allowlist](./enterprise.md#restricting-tool-access). See [Built-in Tools](../core/tools-api.md#built-in-tools) for a list of core tools. The match semantics are the same as `tools.allowed`.
-  - **Default:** `undefined`
-
-- **`tools.exclude`** (array of strings):
-  - **Description:** Tool names to exclude from discovery.
-  - **Default:** `undefined`
-
-- **`tools.allowed`** (array of strings):
-  - **Description:** A list of tool names that will bypass the confirmation dialog. This is useful for tools that you trust and use frequently. For example, `["run_shell_command(git)", "run_shell_command(npm test)"]` will skip the confirmation dialog to run any `git` and `npm test` commands. See [Shell Tool command restrictions](../tools/shell.md#command-restrictions) for details on prefix matching, command chaining, etc.
-  - **Default:** `undefined`
-
-- **`tools.discoveryCommand`** (string):
-  - **Description:** Command to run for tool discovery.
-  - **Default:** `undefined`
-
-- **`tools.callCommand`** (string):
-  - **Description:** Defines a custom shell command for calling a specific tool that was discovered using `tools.discoveryCommand`. The shell command must meet the following criteria:
+- **`toolCallCommand`** (string):
+  - **Description:** Defines a custom shell command for calling a specific tool that was discovered using `toolDiscoveryCommand`. The shell command must meet the following criteria:
     - It must take function `name` (exactly as in [function declaration](https://ai.google.dev/gemini-api/docs/function-calling#function-declarations)) as first command line argument.
     - It must read function arguments as JSON on `stdin`, analogous to [`functionCall.args`](https://cloud.google.com/vertex-ai/generative-ai/docs/model-reference/inference#functioncall).
     - It must return function output as JSON on `stdout`, analogous to [`functionResponse.response.content`](https://cloud.google.com/vertex-ai/generative-ai/docs/model-reference/inference#functionresponse).
-  - **Default:** `undefined`
+  - **Default:** Empty
+  - **Example:** `"toolCallCommand": "bin/call_tool"`
 
-#### `mcp`
+- **`mcpServers`** (object):
+  - **Description:** Configures connections to one or more Model-Context Protocol (MCP) servers for discovering and using custom tools. Gemini CLI attempts to connect to each configured MCP server to discover available tools. If multiple MCP servers expose a tool with the same name, the tool names will be prefixed with the server alias you defined in the configuration (e.g., `serverAlias__actualToolName`) to avoid conflicts. Note that the system might strip certain schema properties from MCP tool definitions for compatibility.
+  - **Default:** Empty
+  - **Properties:**
+    - **`<SERVER_NAME>`** (object): The server parameters for the named server.
+      - `command` (string, required): The command to execute to start the MCP server.
+      - `args` (array of strings, optional): Arguments to pass to the command.
+      - `env` (object, optional): Environment variables to set for the server process.
+      - `cwd` (string, optional): The working directory in which to start the server.
+      - `timeout` (number, optional): Timeout in milliseconds for requests to this MCP server.
+      - `trust` (boolean, optional): Trust this server and bypass all tool call confirmations.
+      - `includeTools` (array of strings, optional): List of tool names to include from this MCP server. When specified, only the tools listed here will be available from this server (whitelist behavior). If not specified, all tools from the server are enabled by default.
+      - `excludeTools` (array of strings, optional): List of tool names to exclude from this MCP server. Tools listed here will not be available to the model, even if they are exposed by the server. **Note:** `excludeTools` takes precedence over `includeTools` - if a tool is in both lists, it will be excluded.
+  - **Example:**
+    ```json
+    "mcpServers": {
+      "myPythonServer": {
+        "command": "python",
+        "args": ["mcp_server.py", "--port", "8080"],
+        "cwd": "./mcp_tools/python",
+        "timeout": 5000,
+        "includeTools": ["safe_tool", "file_reader"],
+      },
+      "myNodeServer": {
+        "command": "node",
+        "args": ["mcp_server.js"],
+        "cwd": "./mcp_tools/node",
+        "excludeTools": ["dangerous_tool", "file_deleter"]
+      },
+      "myDockerServer": {
+        "command": "docker",
+        "args": ["run", "-i", "--rm", "-e", "API_KEY", "ghcr.io/foo/bar"],
+        "env": {
+          "API_KEY": "$MY_API_TOKEN"
+        }
+      }
+    }
+    ```
 
-- **`mcp.serverCommand`** (string):
-  - **Description:** Command to start an MCP server.
-  - **Default:** `undefined`
+- **`checkpointing`** (object):
+  - **Description:** Configures the checkpointing feature, which allows you to save and restore conversation and file states. See the [Checkpointing documentation](../checkpointing.md) for more details.
+  - **Default:** `{"enabled": false}`
+  - **Properties:**
+    - **`enabled`** (boolean): When `true`, the `/restore` command is available.
 
-- **`mcp.allowed`** (array of strings):
-  - **Description:** An allowlist of MCP servers to allow.
-  - **Default:** `undefined`
+- **`preferredEditor`** (string):
+  - **Description:** Specifies the preferred editor to use for viewing diffs.
+  - **Default:** `vscode`
+  - **Example:** `"preferredEditor": "vscode"`
 
-- **`mcp.excluded`** (array of strings):
-  - **Description:** A denylist of MCP servers to exclude.
-  - **Default:** `undefined`
+- **`telemetry`** (object)
+  - **Description:** Configures logging and metrics collection for Gemini CLI. For more information, see [Telemetry](../telemetry.md).
+  - **Default:** `{"enabled": false, "target": "local", "otlpEndpoint": "http://localhost:4317", "logPrompts": true}`
+  - **Properties:**
+    - **`enabled`** (boolean): Whether or not telemetry is enabled.
+    - **`target`** (string): The destination for collected telemetry. Supported values are `local` and `gcp`.
+    - **`otlpEndpoint`** (string): The endpoint for the OTLP Exporter.
+    - **`logPrompts`** (boolean): Whether or not to include the content of user prompts in the logs.
+  - **Example:**
+    ```json
+    "telemetry": {
+      "enabled": true,
+      "target": "local",
+      "otlpEndpoint": "http://localhost:16686",
+      "logPrompts": false
+    }
+    ```
+- **`usageStatisticsEnabled`** (boolean):
+  - **Description:** Enables or disables the collection of usage statistics. See [Usage Statistics](#usage-statistics) for more information.
+  - **Default:** `true`
+  - **Example:**
+    ```json
+    "usageStatisticsEnabled": false
+    ```
 
-#### `security`
-
-- **`security.folderTrust.enabled`** (boolean):
-  - **Description:** Setting to track whether Folder trust is enabled.
+- **`hideTips`** (boolean):
+  - **Description:** Enables or disables helpful tips in the CLI interface.
   - **Default:** `false`
+  - **Example:**
 
-- **`security.auth.selectedType`** (string):
-  - **Description:** The currently selected authentication type.
-  - **Default:** `undefined`
+    ```json
+    "hideTips": true
+    ```
 
-- **`security.auth.enforcedType`** (string):
-  - **Description:** The required auth type (useful for enterprises).
-  - **Default:** `undefined`
-
-- **`security.auth.useExternal`** (boolean):
-  - **Description:** Whether to use an external authentication flow.
-  - **Default:** `undefined`
-
-#### `advanced`
-
-- **`advanced.autoConfigureMemory`** (boolean):
-  - **Description:** Automatically configure Node.js memory limits.
+- **`hideBanner`** (boolean):
+  - **Description:** Enables or disables the startup banner (ASCII art logo) in the CLI interface.
   - **Default:** `false`
+  - **Example:**
 
-- **`advanced.dnsResolutionOrder`** (string):
-  - **Description:** The DNS resolution order.
-  - **Default:** `undefined`
+    ```json
+    "hideBanner": true
+    ```
 
-- **`advanced.excludedEnvVars`** (array of strings):
-  - **Description:** Environment variables to exclude from project context.
-  - **Default:** `["DEBUG","DEBUG_MODE"]`
+- **`maxSessionTurns`** (number):
+  - **Description:** Sets the maximum number of turns for a session. If the session exceeds this limit, the CLI will stop processing and start a new chat.
+  - **Default:** `-1` (unlimited)
+  - **Example:**
+    ```json
+    "maxSessionTurns": 10
+    ```
 
-- **`advanced.bugCommand`** (object):
-  - **Description:** Configuration for the bug report command.
-  - **Default:** `undefined`
+- **`summarizeToolOutput`** (object):
+  - **Description:** Enables or disables the summarization of tool output. You can specify the token budget for the summarization using the `tokenBudget` setting.
+  - Note: Currently only the `run_shell_command` tool is supported.
+  - **Default:** `{}` (Disabled by default)
+  - **Example:**
+    ```json
+    "summarizeToolOutput": {
+      "run_shell_command": {
+        "tokenBudget": 2000
+      }
+    }
+    ```
 
-#### `mcpServers`
+- **`excludedProjectEnvVars`** (array of strings):
+  - **Description:** Specifies environment variables that should be excluded from being loaded from project `.env` files. This prevents project-specific environment variables (like `DEBUG=true`) from interfering with gemini-cli behavior. Variables from `.gemini/.env` files are never excluded.
+  - **Default:** `["DEBUG", "DEBUG_MODE"]`
+  - **Example:**
+    ```json
+    "excludedProjectEnvVars": ["DEBUG", "DEBUG_MODE", "NODE_ENV"]
+    ```
 
-Configures connections to one or more Model-Context Protocol (MCP) servers for discovering and using custom tools. Gemini CLI attempts to connect to each configured MCP server to discover available tools. If multiple MCP servers expose a tool with the same name, the tool names will be prefixed with the server alias you defined in the configuration (e.g., `serverAlias__actualToolName`) to avoid conflicts. Note that the system might strip certain schema properties from MCP tool definitions for compatibility. At least one of `command`, `url`, or `httpUrl` must be provided. If multiple are specified, the order of precedence is `httpUrl`, then `url`, then `command`.
+- **`includeDirectories`** (array of strings):
+  - **Description:** Specifies an array of additional absolute or relative paths to include in the workspace context. This allows you to work with files across multiple directories as if they were one. Paths can use `~` to refer to the user's home directory. This setting can be combined with the `--include-directories` command-line flag.
+  - **Default:** `[]`
+  - **Example:**
+    ```json
+    "includeDirectories": [
+      "/path/to/another/project",
+      "../shared-library",
+      "~/common-utils"
+    ]
+    ```
 
-- **`mcpServers.<SERVER_NAME>`** (object): The server parameters for the named server.
-  - `command` (string, optional): The command to execute to start the MCP server via standard I/O.
-  - `args` (array of strings, optional): Arguments to pass to the command.
-  - `env` (object, optional): Environment variables to set for the server process.
-  - `cwd` (string, optional): The working directory in which to start the server.
-  - `url` (string, optional): The URL of an MCP server that uses Server-Sent Events (SSE) for communication.
-  - `httpUrl` (string, optional): The URL of an MCP server that uses streamable HTTP for communication.
-  - `headers` (object, optional): A map of HTTP headers to send with requests to `url` or `httpUrl`.
-  - `timeout` (number, optional): Timeout in milliseconds for requests to this MCP server.
-  - `trust` (boolean, optional): Trust this server and bypass all tool call confirmations.
-  - `description` (string, optional): A brief description of the server, which may be used for display purposes.
-  - `includeTools` (array of strings, optional): List of tool names to include from this MCP server. When specified, only the tools listed here will be available from this server (allowlist behavior). If not specified, all tools from the server are enabled by default.
-  - `excludeTools` (array of strings, optional): List of tool names to exclude from this MCP server. Tools listed here will not be available to the model, even if they are exposed by the server. **Note:** `excludeTools` takes precedence over `includeTools` - if a tool is in both lists, it will be excluded.
+- **`loadMemoryFromIncludeDirectories`** (boolean):
+  - **Description:** Controls the behavior of the `/memory refresh` command. If set to `true`, `GEMINI.md` files should be loaded from all directories that are added. If set to `false`, `GEMINI.md` should only be loaded from the current directory.
+  - **Default:** `false`
+  - **Example:**
+    ```json
+    "loadMemoryFromIncludeDirectories": true
+    ```
 
-#### `telemetry`
+- **`chatCompression`** (object):
+  - **Description:** Controls the settings for chat history compression, both automatic and
+    when manually invoked through the /compress command.
+  - **Properties:**
+    - **`contextPercentageThreshold`** (number): A value between 0 and 1 that specifies the token threshold for compression as a percentage of the model's total token limit. For example, a value of `0.6` will trigger compression when the chat history exceeds 60% of the token limit.
+  - **Example:**
+    ```json
+    "chatCompression": {
+      "contextPercentageThreshold": 0.6
+    }
+    ```
 
-Configures logging and metrics collection for Gemini CLI. For more information, see [Telemetry](../telemetry.md).
+- **`showLineNumbers`** (boolean):
+  - **Description:** Controls whether line numbers are displayed in code blocks in the CLI output.
+  - **Default:** `true`
+  - **Example:**
+    ```json
+    "showLineNumbers": false
+    ```
 
-- **Properties:**
-  - **`enabled`** (boolean): Whether or not telemetry is enabled.
-  - **`target`** (string): The destination for collected telemetry. Supported values are `local` and `gcp`.
-  - **`otlpEndpoint`** (string): The endpoint for the OTLP Exporter.
-  - **`otlpProtocol`** (string): The protocol for the OTLP Exporter (`grpc` or `http`).
-  - **`logPrompts`** (boolean): Whether or not to include the content of user prompts in the logs.
-  - **`outfile`** (string): The file to write telemetry to when `target` is `local`.
-  - **`useCollector`** (boolean): Whether to use an external OTLP collector.
-
-### Example `settings.json`
-
-Here is an example of a `settings.json` file with the nested structure, new as of v0.3.0:
+### Example `settings.json`:
 
 ```json
 {
-  "general": {
-    "vimMode": true,
-    "preferredEditor": "code"
-  },
-  "ui": {
-    "theme": "GitHub",
-    "hideBanner": true,
-    "hideTips": false,
-    "customWittyPhrases": [
-      "You forget a thousand things every day. Make sure this is one of ’em",
-      "Connecting to AGI"
-    ]
-  },
-  "tools": {
-    "sandbox": "docker",
-    "discoveryCommand": "bin/get_tools",
-    "callCommand": "bin/call_tool",
-    "exclude": ["write_file"]
-  },
+  "theme": "GitHub",
+  "sandbox": "docker",
+  "toolDiscoveryCommand": "bin/get_tools",
+  "toolCallCommand": "bin/call_tool",
   "mcpServers": {
     "mainServer": {
       "command": "bin/mcp_server.py"
@@ -355,29 +311,18 @@ Here is an example of a `settings.json` file with the nested structure, new as o
     "otlpEndpoint": "http://localhost:4317",
     "logPrompts": true
   },
-  "privacy": {
-    "usageStatisticsEnabled": true
-  },
-  "model": {
-    "name": "gemini-1.5-pro-latest",
-    "maxSessionTurns": 10,
-    "summarizeToolOutput": {
-      "run_shell_command": {
-        "tokenBudget": 100
-      }
+  "usageStatisticsEnabled": true,
+  "hideTips": false,
+  "hideBanner": false,
+  "maxSessionTurns": 10,
+  "summarizeToolOutput": {
+    "run_shell_command": {
+      "tokenBudget": 100
     }
   },
-  "context": {
-    "fileName": ["CONTEXT.md", "GEMINI.md"],
-    "includeDirectories": ["path/to/dir1", "~/path/to/dir2", "../path/to/dir3"],
-    "loadFromIncludeDirectories": true,
-    "fileFiltering": {
-      "respectGitIgnore": false
-    }
-  },
-  "advanced": {
-    "excludedEnvVars": ["DEBUG", "DEBUG_MODE", "NODE_ENV"]
-  }
+  "excludedProjectEnvVars": ["DEBUG", "DEBUG_MODE", "NODE_ENV"],
+  "includeDirectories": ["path/to/dir1", "~/path/to/dir2", "../path/to/dir3"],
+  "loadMemoryFromIncludeDirectories": true
 }
 ```
 
@@ -391,7 +336,7 @@ The CLI keeps a history of shell commands you run. To avoid conflicts between di
 
 ## Environment Variables & `.env` Files
 
-Environment variables are a common way to configure applications, especially for sensitive information like API keys or for settings that might change between environments. For authentication setup, see the [Authentication documentation](./authentication.md) which covers all available authentication methods.
+Environment variables are a common way to configure applications, especially for sensitive information like API keys or for settings that might change between environments.
 
 The CLI automatically loads environment variables from an `.env` file. The loading order is:
 
@@ -399,11 +344,11 @@ The CLI automatically loads environment variables from an `.env` file. The loadi
 2.  If not found, it searches upwards in parent directories until it finds an `.env` file or reaches the project root (identified by a `.git` folder) or the home directory.
 3.  If still not found, it looks for `~/.env` (in the user's home directory).
 
-**Environment Variable Exclusion:** Some environment variables (like `DEBUG` and `DEBUG_MODE`) are automatically excluded from being loaded from project `.env` files to prevent interference with gemini-cli behavior. Variables from `.gemini/.env` files are never excluded. You can customize this behavior using the `advanced.excludedEnvVars` setting in your `settings.json` file.
+**Environment Variable Exclusion:** Some environment variables (like `DEBUG` and `DEBUG_MODE`) are automatically excluded from being loaded from project `.env` files to prevent interference with gemini-cli behavior. Variables from `.gemini/.env` files are never excluded. You can customize this behavior using the `excludedProjectEnvVars` setting in your `settings.json` file.
 
-- **`GEMINI_API_KEY`**:
+- **`GEMINI_API_KEY`** (Required):
   - Your API key for the Gemini API.
-  - One of several available [authentication methods](./authentication.md).
+  - **Crucial for operation.** The CLI will not function without it.
   - Set this in your shell profile (e.g., `~/.bashrc`, `~/.zshrc`) or an `.env` file.
 - **`GEMINI_MODEL`**:
   - Specifies the default Gemini model to use.
@@ -426,27 +371,6 @@ The CLI automatically loads environment variables from an `.env` file. The loadi
 - **`OTLP_GOOGLE_CLOUD_PROJECT`**:
   - Your Google Cloud Project ID for Telemetry in Google Cloud
   - Example: `export OTLP_GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"`.
-- **`GEMINI_TELEMETRY_ENABLED`**:
-  - Set to `true` or `1` to enable telemetry. Any other value is treated as disabling it.
-  - Overrides the `telemetry.enabled` setting.
-- **`GEMINI_TELEMETRY_TARGET`**:
-  - Sets the telemetry target (`local` or `gcp`).
-  - Overrides the `telemetry.target` setting.
-- **`GEMINI_TELEMETRY_OTLP_ENDPOINT`**:
-  - Sets the OTLP endpoint for telemetry.
-  - Overrides the `telemetry.otlpEndpoint` setting.
-- **`GEMINI_TELEMETRY_OTLP_PROTOCOL`**:
-  - Sets the OTLP protocol (`grpc` or `http`).
-  - Overrides the `telemetry.otlpProtocol` setting.
-- **`GEMINI_TELEMETRY_LOG_PROMPTS`**:
-  - Set to `true` or `1` to enable or disable logging of user prompts. Any other value is treated as disabling it.
-  - Overrides the `telemetry.logPrompts` setting.
-- **`GEMINI_TELEMETRY_OUTFILE`**:
-  - Sets the file path to write telemetry to when the target is `local`.
-  - Overrides the `telemetry.outfile` setting.
-- **`GEMINI_TELEMETRY_USE_COLLECTOR`**:
-  - Set to `true` or `1` to enable or disable using an external OTLP collector. Any other value is treated as disabling it.
-  - Overrides the `telemetry.useCollector` setting.
 - **`GOOGLE_CLOUD_LOCATION`**:
   - Your Google Cloud Project Location (e.g., us-central1).
   - Required for using Vertex AI in non express mode.
@@ -479,18 +403,11 @@ Arguments passed directly when running the CLI can override other configurations
   - Example: `npm start -- --model gemini-1.5-pro-latest`
 - **`--prompt <your_prompt>`** (**`-p <your_prompt>`**):
   - Used to pass a prompt directly to the command. This invokes Gemini CLI in a non-interactive mode.
-  - For scripting examples, use the `--output-format json` flag to get structured output.
 - **`--prompt-interactive <your_prompt>`** (**`-i <your_prompt>`**):
   - Starts an interactive session with the provided prompt as the initial input.
   - The prompt is processed within the interactive session, not before it.
   - Cannot be used when piping input from stdin.
   - Example: `gemini -i "explain this code"`
-- **`--output-format <format>`**:
-  - **Description:** Specifies the format of the CLI output for non-interactive mode.
-  - **Values:**
-    - `text`: (Default) The standard human-readable output.
-    - `json`: A machine-readable JSON output.
-  - **Note:** For structured output and scripting, use the `--output-format json` flag.
 - **`--sandbox`** (**`-s`**):
   - Enables sandbox mode for this session.
 - **`--sandbox-image`**:
@@ -505,24 +422,12 @@ Arguments passed directly when running the CLI can override other configurations
   - Displays the current memory usage.
 - **`--yolo`**:
   - Enables YOLO mode, which automatically approves all tool calls.
-- **`--approval-mode <mode>`**:
-  - Sets the approval mode for tool calls. Available modes:
-    - `default`: Prompt for approval on each tool call (default behavior)
-    - `auto_edit`: Automatically approve edit tools (replace, write_file) while prompting for others
-    - `yolo`: Automatically approve all tool calls (equivalent to `--yolo`)
-  - Cannot be used together with `--yolo`. Use `--approval-mode=yolo` instead of `--yolo` for the new unified approach.
-  - Example: `gemini --approval-mode auto_edit`
-- **`--allowed-tools <tool1,tool2,...>`**:
-  - A comma-separated list of tool names that will bypass the confirmation dialog.
-  - Example: `gemini --allowed-tools "ShellTool(git status)"`
 - **`--telemetry`**:
   - Enables [telemetry](../telemetry.md).
 - **`--telemetry-target`**:
   - Sets the telemetry target. See [telemetry](../telemetry.md) for more information.
 - **`--telemetry-otlp-endpoint`**:
   - Sets the OTLP endpoint for telemetry. See [telemetry](../telemetry.md) for more information.
-- **`--telemetry-otlp-protocol`**:
-  - Sets the OTLP protocol for telemetry (`grpc` or `http`). Defaults to `grpc`. See [telemetry](../telemetry.md) for more information.
 - **`--telemetry-log-prompts`**:
   - Enables logging of prompts for telemetry. See [telemetry](../telemetry.md) for more information.
 - **`--checkpointing`**:
@@ -541,14 +446,12 @@ Arguments passed directly when running the CLI can override other configurations
   - Can be specified multiple times or as comma-separated values.
   - 5 directories can be added at maximum.
   - Example: `--include-directories /path/to/project1,/path/to/project2` or `--include-directories /path/to/project1 --include-directories /path/to/project2`
-- **`--screen-reader`**:
-  - Enables screen reader mode, which adjusts the TUI for better compatibility with screen readers.
 - **`--version`**:
   - Displays the version of the CLI.
 
 ## Context Files (Hierarchical Instructional Context)
 
-While not strictly configuration for the CLI's _behavior_, context files (defaulting to `GEMINI.md` but configurable via the `context.fileName` setting) are crucial for configuring the _instructional context_ (also referred to as "memory") provided to the Gemini model. This powerful feature allows you to give project-specific instructions, coding style guides, or any relevant background information to the AI, making its responses more tailored and accurate to your needs. The CLI includes UI elements, such as an indicator in the footer showing the number of loaded context files, to keep you informed about the active context.
+While not strictly configuration for the CLI's _behavior_, context files (defaulting to `GEMINI.md` but configurable via the `contextFileName` setting) are crucial for configuring the _instructional context_ (also referred to as "memory") provided to the Gemini model. This powerful feature allows you to give project-specific instructions, coding style guides, or any relevant background information to the AI, making its responses more tailored and accurate to your needs. The CLI includes UI elements, such as an indicator in the footer showing the number of loaded context files, to keep you informed about the active context.
 
 - **Purpose:** These Markdown files contain instructions, guidelines, or context that you want the Gemini model to be aware of during your interactions. The system is designed to manage this instructional context hierarchically.
 
@@ -589,13 +492,13 @@ This example demonstrates how you can provide general project context, specific
 
 - **Hierarchical Loading and Precedence:** The CLI implements a sophisticated hierarchical memory system by loading context files (e.g., `GEMINI.md`) from several locations. Content from files lower in this list (more specific) typically overrides or supplements content from files higher up (more general). The exact concatenation order and final context can be inspected using the `/memory show` command. The typical loading order is:
   1.  **Global Context File:**
-      - Location: `~/.gemini/<configured-context-filename>` (e.g., `~/.gemini/GEMINI.md` in your user home directory).
+      - Location: `~/.gemini/<contextFileName>` (e.g., `~/.gemini/GEMINI.md` in your user home directory).
       - Scope: Provides default instructions for all your projects.
   2.  **Project Root & Ancestors Context Files:**
       - Location: The CLI searches for the configured context file in the current working directory and then in each parent directory up to either the project root (identified by a `.git` folder) or your home directory.
       - Scope: Provides context relevant to the entire project or a significant portion of it.
   3.  **Sub-directory Context Files (Contextual/Local):**
-      - Location: The CLI also scans for the configured context file in subdirectories _below_ the current working directory (respecting common ignore patterns like `node_modules`, `.git`, etc.). The breadth of this search is limited to 200 directories by default, but can be configured with the `context.discoveryMaxDirs` setting in your `settings.json` file.
+      - Location: The CLI also scans for the configured context file in subdirectories _below_ the current working directory (respecting common ignore patterns like `node_modules`, `.git`, etc.). The breadth of this search is limited to 200 directories by default, but can be configured with a `memoryDiscoveryMaxDirs` field in your `settings.json` file.
       - Scope: Allows for highly specific instructions relevant to a particular component, module, or subsection of your project.
 - **Concatenation & UI Indication:** The contents of all found context files are concatenated (with separators indicating their origin and path) and provided as part of the system prompt to the Gemini model. The CLI footer displays the count of loaded context files, giving you a quick visual cue about the active instructional context.
 - **Importing Content:** You can modularize your context files by importing other Markdown files using the `@path/to/file.md` syntax. For more details, see the [Memory Import Processor documentation](../core/memport.md).
@@ -614,7 +517,7 @@ Sandboxing is disabled by default, but you can enable it in a few ways:
 
 - Using `--sandbox` or `-s` flag.
 - Setting `GEMINI_SANDBOX` environment variable.
-- Sandbox is enabled when using `--yolo` or `--approval-mode=yolo` by default.
+- Sandbox is enabled in `--yolo` mode by default.
 
 By default, it uses a pre-built `gemini-cli-sandbox` Docker image.
 
@@ -653,12 +556,10 @@ To help us improve the Gemini CLI, we collect anonymized usage statistics. This
 
 **How to opt out:**
 
-You can opt out of usage statistics collection at any time by setting the `usageStatisticsEnabled` property to `false` under the `privacy` category in your `settings.json` file:
+You can opt out of usage statistics collection at any time by setting the `usageStatisticsEnabled` property to `false` in your `settings.json` file:
 
 ```json
 {
-  "privacy": {
-    "usageStatisticsEnabled": false
-  }
+  "usageStatisticsEnabled": false
 }
 ```

docs/cli/enterprise.md

@@ -1,383 +0,0 @@
-# Gemini CLI for the Enterprise
-
-This document outlines configuration patterns and best practices for deploying and managing Gemini CLI in an enterprise environment. By leveraging system-level settings, administrators can enforce security policies, manage tool access, and ensure a consistent experience for all users.
-
-> **A Note on Security:** The patterns described in this document are intended to help administrators create a more controlled and secure environment for using Gemini CLI. However, they should not be considered a foolproof security boundary. A determined user with sufficient privileges on their local machine may still be able to circumvent these configurations. These measures are designed to prevent accidental misuse and enforce corporate policy in a managed environment, not to defend against a malicious actor with local administrative rights.
-
-## Centralized Configuration: The System Settings File
-
-The most powerful tools for enterprise administration are the system-wide settings files. These files allow you to define a baseline configuration (`system-defaults.json`) and a set of overrides (`settings.json`) that apply to all users on a machine. For a complete overview of configuration options, see the [Configuration documentation](./configuration.md).
-
-Settings are merged from four files. The precedence order for single-value settings (like `theme`) is:
-
-1. System Defaults (`system-defaults.json`)
-2. User Settings (`~/.gemini/settings.json`)
-3. Workspace Settings (`<project>/.gemini/settings.json`)
-4. System Overrides (`settings.json`)
-
-This means the System Overrides file has the final say. For settings that are arrays (`includeDirectories`) or objects (`mcpServers`), the values are merged.
-
-**Example of Merging and Precedence:**
-
-Here is how settings from different levels are combined.
-
-- **System Defaults `system-defaults.json`:**
-
-  ```json
-  {
-    "ui": {
-      "theme": "default-corporate-theme"
-    },
-    "context": {
-      "includeDirectories": ["/etc/gemini-cli/common-context"]
-    }
-  }
-  ```
-
-- **User `settings.json` (`~/.gemini/settings.json`):**
-
-  ```json
-  {
-    "ui": {
-      "theme": "user-preferred-dark-theme"
-    },
-    "mcpServers": {
-      "corp-server": {
-        "command": "/usr/local/bin/corp-server-dev"
-      },
-      "user-tool": {
-        "command": "npm start --prefix ~/tools/my-tool"
-      }
-    },
-    "context": {
-      "includeDirectories": ["~/gemini-context"]
-    }
-  }
-  ```
-
-- **Workspace `settings.json` (`<project>/.gemini/settings.json`):**
-
-  ```json
-  {
-    "ui": {
-      "theme": "project-specific-light-theme"
-    },
-    "mcpServers": {
-      "project-tool": {
-        "command": "npm start"
-      }
-    },
-    "context": {
-      "includeDirectories": ["./project-context"]
-    }
-  }
-  ```
-
-- **System Overrides `settings.json`:**
-  ```json
-  {
-    "ui": {
-      "theme": "system-enforced-theme"
-    },
-    "mcpServers": {
-      "corp-server": {
-        "command": "/usr/local/bin/corp-server-prod"
-      }
-    },
-    "context": {
-      "includeDirectories": ["/etc/gemini-cli/global-context"]
-    }
-  }
-  ```
-
-This results in the following merged configuration:
-
-- **Final Merged Configuration:**
-  ```json
-  {
-    "ui": {
-      "theme": "system-enforced-theme"
-    },
-    "mcpServers": {
-      "corp-server": {
-        "command": "/usr/local/bin/corp-server-prod"
-      },
-      "user-tool": {
-        "command": "npm start --prefix ~/tools/my-tool"
-      },
-      "project-tool": {
-        "command": "npm start"
-      }
-    },
-    "context": {
-      "includeDirectories": [
-        "/etc/gemini-cli/common-context",
-        "~/gemini-context",
-        "./project-context",
-        "/etc/gemini-cli/global-context"
-      ]
-    }
-  }
-  ```
-
-**Why:**
-
-- **`theme`**: The value from the system overrides (`system-enforced-theme`) is used, as it has the highest precedence.
-- **`mcpServers`**: The objects are merged. The `corp-server` definition from the system overrides takes precedence over the user's definition. The unique `user-tool` and `project-tool` are included.
-- **`includeDirectories`**: The arrays are concatenated in the order of System Defaults, User, Workspace, and then System Overrides.
-
-- **Location**:
-  - **Linux**: `/etc/gemini-cli/settings.json`
-  - **Windows**: `C:\ProgramData\gemini-cli\settings.json`
-  - **macOS**: `/Library/Application Support/GeminiCli/settings.json`
-  - The path can be overridden using the `GEMINI_CLI_SYSTEM_SETTINGS_PATH` environment variable.
-- **Control**: This file should be managed by system administrators and protected with appropriate file permissions to prevent unauthorized modification by users.
-
-By using the system settings file, you can enforce the security and configuration patterns described below.
-
-## Restricting Tool Access
-
-You can significantly enhance security by controlling which tools the Gemini model can use. This is achieved through the `tools.core` and `tools.exclude` settings. For a list of available tools, see the [Tools documentation](../tools/index.md).
-
-### Allowlisting with `coreTools`
-
-The most secure approach is to explicitly add the tools and commands that users are permitted to execute to an allowlist. This prevents the use of any tool not on the approved list.
-
-**Example:** Allow only safe, read-only file operations and listing files.
-
-```json
-{
-  "tools": {
-    "core": ["ReadFileTool", "GlobTool", "ShellTool(ls)"]
-  }
-}
-```
-
-### Blocklisting with `excludeTools`
-
-Alternatively, you can add specific tools that are considered dangerous in your environment to a blocklist.
-
-**Example:** Prevent the use of the shell tool for removing files.
-
-```json
-{
-  "tools": {
-    "exclude": ["ShellTool(rm -rf)"]
-  }
-}
-```
-
-**Security Note:** Blocklisting with `excludeTools` is less secure than allowlisting with `coreTools`, as it relies on blocking known-bad commands, and clever users may find ways to bypass simple string-based blocks. **Allowlisting is the recommended approach.**
-
-## Managing Custom Tools (MCP Servers)
-
-If your organization uses custom tools via [Model-Context Protocol (MCP) servers](../core/tools-api.md), it is crucial to understand how server configurations are managed to apply security policies effectively.
-
-### How MCP Server Configurations are Merged
-
-Gemini CLI loads `settings.json` files from three levels: System, Workspace, and User. When it comes to the `mcpServers` object, these configurations are **merged**:
-
-1.  **Merging:** The lists of servers from all three levels are combined into a single list.
-2.  **Precedence:** If a server with the **same name** is defined at multiple levels (e.g., a server named `corp-api` exists in both system and user settings), the definition from the highest-precedence level is used. The order of precedence is: **System > Workspace > User**.
-
-This means a user **cannot** override the definition of a server that is already defined in the system-level settings. However, they **can** add new servers with unique names.
-
-### Enforcing a Catalog of Tools
-
-The security of your MCP tool ecosystem depends on a combination of defining the canonical servers and adding their names to an allowlist.
-
-### Restricting Tools Within an MCP Server
-
-For even greater security, especially when dealing with third-party MCP servers, you can restrict which specific tools from a server are exposed to the model. This is done using the `includeTools` and `excludeTools` properties within a server's definition. This allows you to use a subset of tools from a server without allowing potentially dangerous ones.
-
-Following the principle of least privilege, it is highly recommended to use `includeTools` to create an allowlist of only the necessary tools.
-
-**Example:** Only allow the `code-search` and `get-ticket-details` tools from a third-party MCP server, even if the server offers other tools like `delete-ticket`.
-
-```json
-{
-  "mcp": {
-    "allowed": ["third-party-analyzer"]
-  },
-  "mcpServers": {
-    "third-party-analyzer": {
-      "command": "/usr/local/bin/start-3p-analyzer.sh",
-      "includeTools": ["code-search", "get-ticket-details"]
-    }
-  }
-}
-```
-
-#### More Secure Pattern: Define and Add to Allowlist in System Settings
-
-To create a secure, centrally-managed catalog of tools, the system administrator **must** do both of the following in the system-level `settings.json` file:
-
-1.  **Define the full configuration** for every approved server in the `mcpServers` object. This ensures that even if a user defines a server with the same name, the secure system-level definition will take precedence.
-2.  **Add the names** of those servers to an allowlist using the `mcp.allowed` setting. This is a critical security step that prevents users from running any servers that are not on this list. If this setting is omitted, the CLI will merge and allow any server defined by the user.
-
-**Example System `settings.json`:**
-
-1. Add the _names_ of all approved servers to an allowlist.
-   This will prevent users from adding their own servers.
-
-2. Provide the canonical _definition_ for each server on the allowlist.
-
-```json
-{
-  "mcp": {
-    "allowed": ["corp-data-api", "source-code-analyzer"]
-  },
-  "mcpServers": {
-    "corp-data-api": {
-      "command": "/usr/local/bin/start-corp-api.sh",
-      "timeout": 5000
-    },
-    "source-code-analyzer": {
-      "command": "/usr/local/bin/start-analyzer.sh"
-    }
-  }
-}
-```
-
-This pattern is more secure because it uses both definition and an allowlist. Any server a user defines will either be overridden by the system definition (if it has the same name) or blocked because its name is not in the `mcp.allowed` list.
-
-### Less Secure Pattern: Omitting the Allowlist
-
-If the administrator defines the `mcpServers` object but fails to also specify the `mcp.allowed` allowlist, users may add their own servers.
-
-**Example System `settings.json`:**
-
-This configuration defines servers but does not enforce the allowlist.
-The administrator has NOT included the "mcp.allowed" setting.
-
-```json
-{
-  "mcpServers": {
-    "corp-data-api": {
-      "command": "/usr/local/bin/start-corp-api.sh"
-    }
-  }
-}
-```
-
-In this scenario, a user can add their own server in their local `settings.json`. Because there is no `mcp.allowed` list to filter the merged results, the user's server will be added to the list of available tools and allowed to run.
-
-## Enforcing Sandboxing for Security
-
-To mitigate the risk of potentially harmful operations, you can enforce the use of sandboxing for all tool execution. The sandbox isolates tool execution in a containerized environment.
-
-**Example:** Force all tool execution to happen within a Docker sandbox.
-
-```json
-{
-  "tools": {
-    "sandbox": "docker"
-  }
-}
-```
-
-You can also specify a custom, hardened Docker image for the sandbox using the `--sandbox-image` command-line argument or by building a custom `sandbox.Dockerfile` as described in the [Sandboxing documentation](./configuration.md#sandboxing).
-
-## Controlling Network Access via Proxy
-
-In corporate environments with strict network policies, you can configure Gemini CLI to route all outbound traffic through a corporate proxy. This can be set via an environment variable, but it can also be enforced for custom tools via the `mcpServers` configuration.
-
-**Example (for an MCP Server):**
-
-```json
-{
-  "mcpServers": {
-    "proxied-server": {
-      "command": "node",
-      "args": ["mcp_server.js"],
-      "env": {
-        "HTTP_PROXY": "http://proxy.example.com:8080",
-        "HTTPS_PROXY": "http://proxy.example.com:8080"
-      }
-    }
-  }
-}
-```
-
-## Telemetry and Auditing
-
-For auditing and monitoring purposes, you can configure Gemini CLI to send telemetry data to a central location. This allows you to track tool usage and other events. For more information, see the [telemetry documentation](../telemetry.md).
-
-**Example:** Enable telemetry and send it to a local OTLP collector. If `otlpEndpoint` is not specified, it defaults to `http://localhost:4317`.
-
-```json
-{
-  "telemetry": {
-    "enabled": true,
-    "target": "gcp",
-    "logPrompts": false
-  }
-}
-```
-
-**Note:** Ensure that `logPrompts` is set to `false` in an enterprise setting to avoid collecting potentially sensitive information from user prompts.
-
-## Authentication
-
-You can enforce a specific authentication method for all users by setting the `enforcedAuthType` in the system-level `settings.json` file. This prevents users from choosing a different authentication method. See the [Authentication docs](./authentication.md) for more details.
-
-**Example:** Enforce the use of Google login for all users.
-
-```json
-{
-  "enforcedAuthType": "oauth-personal"
-}
-```
-
-If a user has a different authentication method configured, they will be prompted to switch to the enforced method. In non-interactive mode, the CLI will exit with an error if the configured authentication method does not match the enforced one.
-
-## Putting It All Together: Example System `settings.json`
-
-Here is an example of a system `settings.json` file that combines several of the patterns discussed above to create a secure, controlled environment for Gemini CLI.
-
-```json
-{
-  "tools": {
-    "sandbox": "docker",
-    "core": [
-      "ReadFileTool",
-      "GlobTool",
-      "ShellTool(ls)",
-      "ShellTool(cat)",
-      "ShellTool(grep)"
-    ]
-  },
-  "mcp": {
-    "allowed": ["corp-tools"]
-  },
-  "mcpServers": {
-    "corp-tools": {
-      "command": "/opt/gemini-tools/start.sh",
-      "timeout": 5000
-    }
-  },
-  "telemetry": {
-    "enabled": true,
-    "target": "gcp",
-    "otlpEndpoint": "https://telemetry-prod.example.com:4317",
-    "logPrompts": false
-  },
-  "advanced": {
-    "bugCommand": {
-      "urlTemplate": "https://servicedesk.example.com/new-ticket?title={title}&details={info}"
-    }
-  },
-  "privacy": {
-    "usageStatisticsEnabled": false
-  }
-}
-```
-
-This configuration:
-
-- Forces all tool execution into a Docker sandbox.
-- Strictly uses an allowlist for a small set of safe shell commands and file tools.
-- Defines and allows a single corporate MCP server for custom tools.
-- Enables telemetry for auditing, without logging prompt content.
-- Redirects the `/bug` command to an internal ticketing system.
-- Disables general usage statistics collection.

docs/cli/index.md

@@ -7,8 +7,6 @@ Within Gemini CLI, `packages/cli` is the frontend for users to send and receive
 - **[Authentication](./authentication.md):** A guide to setting up authentication with Google's AI services.
 - **[Commands](./commands.md):** A reference for Gemini CLI commands (e.g., `/help`, `/tools`, `/theme`).
 - **[Configuration](./configuration.md):** A guide to tailoring Gemini CLI behavior using configuration files.
-- **[Enterprise](./enterprise.md):** A guide to enterprise configuration.
-- **[Headless Mode](../headless.md):** A comprehensive guide to using Gemini CLI programmatically for scripting and automation.
 - **[Token Caching](./token-caching.md):** Optimize API costs through token caching.
 - **[Themes](./themes.md)**: A guide to customizing the CLI's appearance with different themes.
 - **[Tutorials](tutorials.md)**: A tutorial showing how to use Gemini CLI to automate a development task.
@@ -23,10 +21,8 @@ The following example pipes a command to Gemini CLI from your terminal:
 echo "What is fine tuning?" | gemini
 ```
 
-You can also use the `--prompt` or `-p` flag:
+Gemini CLI executes the command and prints the output to your terminal. Note that you can achieve the same behavior by using the `--prompt` or `-p` flag. For example:
 
 ```bash
 gemini -p "What is fine tuning?"
 ```
-
-For comprehensive documentation on headless usage, scripting, automation, and advanced examples, see the **[Headless Mode](../headless.md)** guide.

docs/cli/themes.md

@@ -28,8 +28,6 @@ Gemini CLI comes with a selection of pre-defined themes, which you can list usin
 3.  Using the arrow keys, select a theme. Some interfaces might offer a live preview or highlight as you select.
 4.  Confirm your selection to apply the theme.
 
-**Note:** If a theme is defined in your `settings.json` file (either by name or by a file path), you must remove the `"theme"` setting from the file before you can change the theme using the `/theme` command.
-
 ### Theme Persistence
 
 Selected themes are saved in Gemini CLI's [configuration](./configuration.md) so your preference is remembered across sessions.
@@ -46,14 +44,25 @@ Add a `customThemes` block to your user, project, or system `settings.json` file
 
 ```json
 {
-  "ui": {
-    "customThemes": {
-      "MyCustomTheme": {
-        "name": "MyCustomTheme",
-        "type": "custom",
-        "Background": "#181818",
-        ...
-      }
+  "customThemes": {
+    "MyCustomTheme": {
+      "name": "MyCustomTheme",
+      "type": "custom",
+      "Background": "#181818",
+      "Foreground": "#F8F8F2",
+      "LightBlue": "#82AAFF",
+      "AccentBlue": "#61AFEF",
+      "AccentPurple": "#C678DD",
+      "AccentCyan": "#56B6C2",
+      "AccentGreen": "#98C379",
+      "AccentYellow": "#E5C07B",
+      "AccentRed": "#E06C75",
+      "Comment": "#5C6370",
+      "Gray": "#ABB2BF",
+      "DiffAdded": "#A6E3A1",
+      "DiffRemoved": "#F38BA8",
+      "DiffModified": "#89B4FA",
+      "GradientColors": ["#4796E4", "#847ACE", "#C3677F"]
     }
   }
 }
@@ -96,48 +105,6 @@ You can use either hex codes (e.g., `#FF0000`) **or** standard CSS color names (
 
 You can define multiple custom themes by adding more entries to the `customThemes` object.
 
-### Loading Themes from a File
-
-In addition to defining custom themes in `settings.json`, you can also load a theme directly from a JSON file by specifying the file path in your `settings.json`. This is useful for sharing themes or keeping them separate from your main configuration.
-
-To load a theme from a file, set the `theme` property in your `settings.json` to the path of your theme file:
-
-```json
-{
-  "ui": {
-    "theme": "/path/to/your/theme.json"
-  }
-}
-```
-
-The theme file must be a valid JSON file that follows the same structure as a custom theme defined in `settings.json`.
-
-**Example `my-theme.json`:**
-
-```json
-{
-  "name": "My File Theme",
-  "type": "custom",
-  "Background": "#282A36",
-  "Foreground": "#F8F8F2",
-  "LightBlue": "#82AAFF",
-  "AccentBlue": "#61AFEF",
-  "AccentPurple": "#BD93F9",
-  "AccentCyan": "#8BE9FD",
-  "AccentGreen": "#50FA7B",
-  "AccentYellow": "#F1FA8C",
-  "AccentRed": "#FF5555",
-  "Comment": "#6272A4",
-  "Gray": "#ABB2BF",
-  "DiffAdded": "#A6E3A1",
-  "DiffRemoved": "#F38BA8",
-  "DiffModified": "#89B4FA",
-  "GradientColors": ["#4796E4", "#847ACE", "#C3677F"]
-}
-```
-
-**Security Note:** For your safety, Gemini CLI will only load theme files that are located within your home directory. If you attempt to load a theme from outside your home directory, a warning will be displayed and the theme will not be loaded. This is to prevent loading potentially malicious theme files from untrusted sources.
-
 ### Example Custom Theme
 
 <img src="../assets/theme-custom.png" alt="Custom theme example" width="600" />
@@ -145,7 +112,7 @@ The theme file must be a valid JSON file that follows the same structure as a cu
 ### Using Your Custom Theme
 
 - Select your custom theme using the `/theme` command in Gemini CLI. Your custom theme will appear in the theme selection dialog.
-- Or, set it as the default by adding `"theme": "MyCustomTheme"` to the `ui` object in your `settings.json`.
+- Or, set it as the default by adding `"theme": "MyCustomTheme"` to your `settings.json`.
 - Custom themes can be set at the user, project, or system level, and follow the same [configuration precedence](./configuration.md) as other settings.
 
 ---

docs/core/memport.md

@@ -147,7 +147,7 @@ Processes import statements in GEMINI.md content.
 - `debugMode` (boolean, optional): Whether to enable debug logging (default: false)
 - `importState` (ImportState, optional): State tracking for circular import prevention
 
-**Returns:** Promise<ProcessImportsResult> - Object containing processed content and import tree
+**Returns:** Promise<ProcessImportsResult> - Object containing processed content and import tree
 
 ### `ProcessImportsResult`
 
@@ -187,7 +187,7 @@ Finds the project root by searching for a `.git` directory upwards from the give
 
 - `startDir` (string): The directory to start searching from
 
-**Returns:** Promise&lt;string&gt; - The project root directory (or the start directory if no `.git` is found)
+**Returns:** Promise<string> - The project root directory (or the start directory if no `.git` is found)
 
 ## Best Practices
 

docs/core/tools-api.md

@@ -23,8 +23,8 @@ The Gemini CLI core (`packages/core`) features a robust system for defining, reg
 - **Tool Registry (`tool-registry.ts`):** A class (`ToolRegistry`) responsible for:
   - **Registering Tools:** Holding a collection of all available built-in tools (e.g., `ReadFileTool`, `ShellTool`).
   - **Discovering Tools:** It can also discover tools dynamically:
-    - **Command-based Discovery:** If `tools.discoveryCommand` is configured in settings, this command is executed. It's expected to output JSON describing custom tools, which are then registered as `DiscoveredTool` instances.
-    - **MCP-based Discovery:** If `mcp.serverCommand` is configured, the registry can connect to a Model Context Protocol (MCP) server to list and register tools (`DiscoveredMCPTool`).
+    - **Command-based Discovery:** If `toolDiscoveryCommand` is configured in settings, this command is executed. It's expected to output JSON describing custom tools, which are then registered as `DiscoveredTool` instances.
+    - **MCP-based Discovery:** If `mcpServerCommand` is configured, the registry can connect to a Model Context Protocol (MCP) server to list and register tools (`DiscoveredMCPTool`).
   - **Providing Schemas:** Exposing the `FunctionDeclaration` schemas of all registered tools to the Gemini model, so it knows what tools are available and how to use them.
   - **Retrieving Tools:** Allowing the core to get a specific tool by name for execution.
 
@@ -69,7 +69,7 @@ Each of these tools extends `BaseTool` and implements the required methods for i
 
 While direct programmatic registration of new tools by users isn't explicitly detailed as a primary workflow in the provided files for typical end-users, the architecture supports extension through:
 
-- **Command-based Discovery:** Advanced users or project administrators can define a `tools.discoveryCommand` in `settings.json`. This command, when run by the Gemini CLI core, should output a JSON array of `FunctionDeclaration` objects. The core will then make these available as `DiscoveredTool` instances. The corresponding `tools.callCommand` would then be responsible for actually executing these custom tools.
+- **Command-based Discovery:** Advanced users or project administrators can define a `toolDiscoveryCommand` in `settings.json`. This command, when run by the Gemini CLI core, should output a JSON array of `FunctionDeclaration` objects. The core will then make these available as `DiscoveredTool` instances. The corresponding `toolCallCommand` would then be responsible for actually executing these custom tools.
 - **MCP Server(s):** For more complex scenarios, one or more MCP servers can be set up and configured via the `mcpServers` setting in `settings.json`. The Gemini CLI core can then discover and use tools exposed by these servers. As mentioned, if you have multiple MCP servers, the tool names will be prefixed with the server name from your configuration (e.g., `serverAlias__actualToolName`).
 
 This tool system provides a flexible and powerful way to augment the Gemini model's capabilities, making the Gemini CLI a versatile assistant for a wide range of tasks.

docs/examples/proxy-script.md

@@ -15,10 +15,10 @@ The following is an example of a proxy script that can be used with the `GEMINI_
 // Set `GEMINI_SANDBOX_PROXY_COMMAND=scripts/example-proxy.js` to run proxy alongside sandbox
 // Test via `curl https://example.com` inside sandbox (in shell mode or via shell tool)
 
-import http from 'node:http';
-import net from 'node:net';
-import { URL } from 'node:url';
-import console from 'node:console';
+import http from 'http';
+import net from 'net';
+import { URL } from 'url';
+import console from 'console';
 
 const PROXY_PORT = 8877;
 const ALLOWED_DOMAINS = ['example.com', 'googleapis.com'];

docs/extension-releasing.md

@@ -1,121 +0,0 @@
-# Extension Releasing
-
-There are two primary ways of releasing extensions to users:
-
-- [Git repository](#releasing-through-a-git-repository)
-- [Github Releases](#releasing-through-github-releases)
-
-Git repository releases tend to be the simplest and most flexible approach, while GitHub releases can be more efficient on initial install as they are shipped as single archives instead of requiring a git clone which downloads each file individually. Github releases may also contain platform specific archives if you need to ship platform specific binary files.
-
-## Releasing through a git repository
-
-This is the most flexible and simple option. All you need to do us create a publicly accessible git repo (such as a public github repository) and then users can install your extension using `gemini extensions install <your-repo-uri>`, or for a GitHub repository they can use the simplified `gemini extensions install <org>/<repo>` format. They can optionally depend on a specific ref (branch/tag/commit) using the `--ref=<some-ref>` argument, this defaults to the default branch.
-
-Whenever commits are pushed to the ref that a user depends on, they will be prompted to update the extension. Note that this also allows for easy rollbacks, the HEAD commit is always treated as the latest version regardless of the actual version in the `gemini-extension.json` file.
-
-### Managing release channels using a git repository
-
-Users can depend on any ref from your git repo, such as a branch or tag, which allows you to manage multiple release channels.
-
-For instance, you can maintain a `stable` branch, which users can install this way `gemini extensions install <your-repo-uri> --ref=stable`. Or, you could make this the default by treating your default branch as your stable release branch, and doing development in a different branch (for instance called `dev`). You can maintain as many branches or tags as you like, providing maximum flexibility for you and your users.
-
-Note that these `ref` arguments can be tags, branches, or even specific commits, which allows users to depend on a specific version of your extension. It is up to you how you want to manage your tags and branches.
-
-### Example releasing flow using a git repo
-
-While there are many options for how you want to manage releases using a git flow, we recommend treating your default branch as your "stable" release branch. This means that the default behavior for `gemini extensions install <your-repo-uri>` is to be on the stable release branch.
-
-Lets say you want to maintain three standard release channels, `stable`, `preview`, and `dev`. You would do all your standard development in the `dev` branch. When you are ready to do a preview release, you merge that branch into your `preview` branch. When you are ready to promote your preview branch to stable, you merge `preview` into your stable branch (which might be your default branch or a different branch).
-
-You can also cherry pick changes from one branch into another using `git cherry-pick`, but do note that this will result in your branches having a slightly divergent history from each other, unless you force push changes to your branches on each release to restore the history to a clean slate (which may not be possible for the default branch depending on your repository settings). If you plan on doing cherry picks, you may want to avoid having your default branch be the stable branch to avoid force-pushing to the default branch which should generally be avoided.
-
-## Releasing through Github releases
-
-Gemini CLI extensions can be distributed through [GitHub Releases](https://docs.github.com/en/repositories/releasing-projects-on-github/about-releases). This provides a faster and more reliable initial installation experience for users, as it avoids the need to clone the repository.
-
-Each release includes at least one archive file, which contains the full contents of the repo at the tag that it was linked to. Releases may also include [pre-built archives](#custom-pre-built-archives) if your extension requires some build step or has platform specific binaries attached to it.
-
-When checking for updates, gemini will just look for the latest release on github (you must mark it as such when creating the release), unless the user installed a specific release by passing `--ref=<some-release-tag>`. We do not at this time support opting in to pre-release releases or semver.
-
-### Custom pre-built archives
-
-Custom archives must be attached directly to the github release as assets and must be fully self-contained. This means they should include the entire extension, see [archive structure](#archive-structure).
-
-If your extension is platform-independent, you can provide a single generic asset. In this case, there should be only one asset attached to the release.
-
-Custom archives may also be used if you want to develop your extension within a larger repository, you can build an archive which has a different layout from the repo itself (for instance it might just be an archive of a subdirectory containing the extension).
-
-#### Platform specific archives
-
-To ensure Gemini CLI can automatically find the correct release asset for each platform, you must follow this naming convention. The CLI will search for assets in the following order:
-
-1.  **Platform and Architecture-Specific:** `{platform}.{arch}.{name}.{extension}`
-2.  **Platform-Specific:** `{platform}.{name}.{extension}`
-3.  **Generic:** If only one asset is provided, it will be used as a generic fallback.
-
-- `{name}`: The name of your extension.
-- `{platform}`: The operating system. Supported values are:
-  - `darwin` (macOS)
-  - `linux`
-  - `win32` (Windows)
-- `{arch}`: The architecture. Supported values are:
-  - `x64`
-  - `arm64`
-- `{extension}`: The file extension of the archive (e.g., `.tar.gz` or `.zip`).
-
-**Examples:**
-
-- `darwin.arm64.my-tool.tar.gz` (specific to Apple Silicon Macs)
-- `darwin.my-tool.tar.gz` (for all Macs)
-- `linux.x64.my-tool.tar.gz`
-- `win32.my-tool.zip`
-
-#### Archive structure
-
-Archives must be fully contained extensions and have all the standard requirements - specifically the `gemini-extension.json` file must be at the root of the archive.
-
-The rest of the layout should look exactly the same as a typical extension, see [extensions.md](extension.md).
-
-#### Example GitHub Actions workflow
-
-Here is an example of a GitHub Actions workflow that builds and releases a Gemini CLI extension for multiple platforms:
-
-```yaml
-name: Release Extension
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: '20'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build extension
-        run: npm run build
-
-      - name: Create release assets
-        run: |
-          npm run package -- --platform=darwin --arch=arm64
-          npm run package -- --platform=linux --arch=x64
-          npm run package -- --platform=win32 --arch=x64
-
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: |
-            release/darwin.arm64.my-tool.tar.gz
-            release/linux.arm64.my-tool.tar.gz
-            release/win32.arm64.my-tool.zip
-```

docs/extension.md

@@ -1,90 +1,19 @@
 # Gemini CLI Extensions
 
-_This documentation is up-to-date with the v0.4.0 release._
-
-Gemini CLI extensions package prompts, MCP servers, and custom commands into a familiar and user-friendly format. With extensions, you can expand the capabilities of Gemini CLI and share those capabilities with others. They are designed to be easily installable and shareable.
-
-## Extension management
-
-We offer a suite of extension management tools using `gemini extensions` commands.
-
-Note that these commands are not supported from within the CLI, although you can list installed extensions using the `/extensions list` subcommand.
-
-Note that all of these commands will only be reflected in active CLI sessions on restart.
-
-### Installing an extension
-
-You can install an extension using `gemini extensions install` with either a GitHub URL or a local path`.
-
-Note that we create a copy of the installed extension, so you will need to run `gemini extensions update` to pull in changes from both locally-defined extensions and those on GitHub.
-
-```
-gemini extensions install https://github.com/gemini-cli-extensions/security
-```
-
-This will install the Gemini CLI Security extension, which offers support for a `/security:analyze` command.
-
-### Uninstalling an extension
-
-To uninstall, run `gemini extensions uninstall extension-name`, so, in the case of the install example:
-
-```
-gemini extensions uninstall gemini-cli-security
-```
-
-### Disabling an extension
-
-Extensions are, by default, enabled across all workspaces. You can disable an extension entirely or for specific workspace.
-
-For example, `gemini extensions disable extension-name` will disable the extension at the user level, so it will be disabled everywhere. `gemini extensions disable extension-name --scope=workspace` will only disable the extension in the current workspace.
-
-### Enabling an extension
-
-You can enable extensions using `gemini extensions enable extension-name`. You can also enable an extension for a specific workspace using `gemini extensions enable extension-name --scope=workspace` from within that workspace.
-
-This is useful if you have an extension disabled at the top-level and only enabled in specific places.
-
-### Updating an extension
-
-For extensions installed from a local path or a git repository, you can explicitly update to the latest version (as reflected in the `gemini-extension.json` `version` field) with `gemini extensions update extension-name`.
-
-You can update all extensions with:
-
-```
-gemini extensions update --all
-```
-
-## Extension creation
-
-We offer commands to make extension development easier.
-
-### Create a boilerplate extension
-
-We offer several example extensions `context`, `custom-commands`, `exclude-tools` and `mcp-server`. You can view these examples [here](https://github.com/google-gemini/gemini-cli/tree/main/packages/cli/src/commands/extensions/examples).
-
-To copy one of these examples into a development directory using the type of your choosing, run:
-
-```
-gemini extensions new path/to/directory custom-commands
-```
-
-### Link a local extension
-
-The `gemini extensions link` command will create a symbolic link from the extension installation directory to the development path.
-
-This is useful so you don't have to run `gemini extensions update` every time you make changes you'd like to test.
-
-```
-gemini extensions link path/to/directory
-```
+Gemini CLI supports extensions that can be used to configure and extend its functionality.
 
 ## How it works
 
-On startup, Gemini CLI looks for extensions in `<home>/.gemini/extensions`
+On startup, Gemini CLI looks for extensions in two locations:
 
-Extensions exist as a directory that contains a `gemini-extension.json` file. For example:
+1.  `<workspace>/.gemini/extensions`
+2.  `<home>/.gemini/extensions`
 
-`<home>/.gemini/extensions/my-extension/gemini-extension.json`
+Gemini CLI loads all extensions from both locations. If an extension with the same name exists in both locations, the extension in the workspace directory takes precedence.
+
+Within each location, individual extensions exist as a directory that contains a `gemini-extension.json` file. For example:
+
+`<workspace>/.gemini/extensions/my-extension/gemini-extension.json`
 
 ### `gemini-extension.json`
 
@@ -104,20 +33,19 @@ The `gemini-extension.json` file contains the configuration for the extension. T
 }
 ```
 
-- `name`: The name of the extension. This is used to uniquely identify the extension and for conflict resolution when extension commands have the same name as user or project commands. The name should be lowercase or numbers and use dashes instead of underscores or spaces. This is how users will refer to your extension in the CLI. Note that we expect this name to match the extension directory name.
+- `name`: The name of the extension. This is used to uniquely identify the extension and for conflict resolution when extension commands have the same name as user or project commands.
 - `version`: The version of the extension.
 - `mcpServers`: A map of MCP servers to configure. The key is the name of the server, and the value is the server configuration. These servers will be loaded on startup just like MCP servers configured in a [`settings.json` file](./cli/configuration.md). If both an extension and a `settings.json` file configure an MCP server with the same name, the server defined in the `settings.json` file takes precedence.
-  - Note that all MCP server configuration options are supported except for `trust`.
-- `contextFileName`: The name of the file that contains the context for the extension. This will be used to load the context from the extension directory. If this property is not used but a `GEMINI.md` file is present in your extension directory, then that file will be loaded.
-- `excludeTools`: An array of tool names to exclude from the model. You can also specify command-specific restrictions for tools that support it, like the `run_shell_command` tool. For example, `"excludeTools": ["run_shell_command(rm -rf)"]` will block the `rm -rf` command. Note that this differs from the MCP server `excludeTools` functionality, which can be listed in the MCP server config.
+- `contextFileName`: The name of the file that contains the context for the extension. This will be used to load the context from the workspace. If this property is not used but a `GEMINI.md` file is present in your extension directory, then that file will be loaded.
+- `excludeTools`: An array of tool names to exclude from the model. You can also specify command-specific restrictions for tools that support it, like the `run_shell_command` tool. For example, `"excludeTools": ["run_shell_command(rm -rf)"]` will block the `rm -rf` command.
 
 When Gemini CLI starts, it loads all the extensions and merges their configurations. If there are any conflicts, the workspace configuration takes precedence.
 
-### Custom commands
+## Extension Commands
 
 Extensions can provide [custom commands](./cli/commands.md#custom-commands) by placing TOML files in a `commands/` subdirectory within the extension directory. These commands follow the same format as user and project custom commands and use standard naming conventions.
 
-**Example**
+### Example
 
 An extension named `gcp` with the following structure:
 
@@ -135,7 +63,7 @@ Would provide these commands:
 - `/deploy` - Shows as `[gcp] Custom command from deploy.toml` in help
 - `/gcs:sync` - Shows as `[gcp] Custom command from sync.toml` in help
 
-### Conflict resolution
+### Conflict Resolution
 
 Extension commands have the lowest precedence. When a conflict occurs with user or project commands:
 
@@ -146,15 +74,3 @@ For example, if both a user and the `gcp` extension define a `deploy` command:
 
 - `/deploy` - Executes the user's deploy command
 - `/gcp.deploy` - Executes the extension's deploy command (marked with `[gcp]` tag)
-
-## Variables
-
-Gemini CLI extensions allow variable substitution in `gemini-extension.json`. This can be useful if e.g., you need the current directory to run an MCP server using `"cwd": "${extensionPath}${/}run.ts"`.
-
-**Supported variables:**
-
-| variable                   | description                                                                                                                                                     |
-| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `${extensionPath}`         | The fully-qualified path of the extension in the user's filesystem e.g., '/Users/username/.gemini/extensions/example-extension'. This will not unwrap symlinks. |
-| `${workspacePath}`         | The fully-qualified path of the current workspace.                                                                                                              |
-| `${/} or ${pathSeparator}` | The path separator (differs per OS).                                                                                                                            |

docs/getting-started-extensions.md

@@ -1,213 +0,0 @@
-# Getting Started with Gemini CLI Extensions
-
-This guide will walk you through creating your first Gemini CLI extension. You'll learn how to set up a new extension, add a custom tool via an MCP server, create a custom command, and provide context to the model with a `GEMINI.md` file.
-
-## Prerequisites
-
-Before you start, make sure you have the Gemini CLI installed and a basic understanding of Node.js and TypeScript.
-
-## Step 1: Create a New Extension
-
-The easiest way to start is by using one of the built-in templates. We'll use the `mcp-server` example as our foundation.
-
-Run the following command to create a new directory called `my-first-extension` with the template files:
-
-```bash
-gemini extensions new my-first-extension mcp-server
-```
-
-This will create a new directory with the following structure:
-
-```
-my-first-extension/
-├── example.ts
-├── gemini-extension.json
-├── package.json
-└── tsconfig.json
-```
-
-## Step 2: Understand the Extension Files
-
-Let's look at the key files in your new extension.
-
-### `gemini-extension.json`
-
-This is the manifest file for your extension. It tells Gemini CLI how to load and use your extension.
-
-```json
-{
-  "name": "my-first-extension",
-  "version": "1.0.0",
-  "mcpServers": {
-    "nodeServer": {
-      "command": "node",
-      "args": ["${extensionPath}${/}dist${/}example.js"],
-      "cwd": "${extensionPath}"
-    }
-  }
-}
-```
-
-- `name`: The unique name for your extension.
-- `version`: The version of your extension.
-- `mcpServers`: This section defines one or more Model Context Protocol (MCP) servers. MCP servers are how you can add new tools for the model to use.
-  - `command`, `args`, `cwd`: These fields specify how to start your server. Notice the use of the `${extensionPath}` variable, which Gemini CLI replaces with the absolute path to your extension's installation directory. This allows your extension to work regardless of where it's installed.
-
-### `example.ts`
-
-This file contains the source code for your MCP server. It's a simple Node.js server that uses the `@modelcontextprotocol/sdk`.
-
-```typescript
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { z } from 'zod';
-
-const server = new McpServer({
-  name: 'prompt-server',
-  version: '1.0.0',
-});
-
-// Registers a new tool named 'fetch_posts'
-server.registerTool(
-  'fetch_posts',
-  {
-    description: 'Fetches a list of posts from a public API.',
-    inputSchema: z.object({}).shape,
-  },
-  async () => {
-    const apiResponse = await fetch(
-      'https://jsonplaceholder.typicode.com/posts',
-    );
-    const posts = await apiResponse.json();
-    const response = { posts: posts.slice(0, 5) };
-    return {
-      content: [
-        {
-          type: 'text',
-          text: JSON.stringify(response),
-        },
-      ],
-    };
-  },
-);
-
-// ... (prompt registration omitted for brevity)
-
-const transport = new StdioServerTransport();
-await server.connect(transport);
-```
-
-This server defines a single tool called `fetch_posts` that fetches data from a public API.
-
-### `package.json` and `tsconfig.json`
-
-These are standard configuration files for a TypeScript project. The `package.json` file defines dependencies and a `build` script, and `tsconfig.json` configures the TypeScript compiler.
-
-## Step 3: Build and Link Your Extension
-
-Before you can use the extension, you need to compile the TypeScript code and link the extension to your Gemini CLI installation for local development.
-
-1.  **Install dependencies:**
-
-    ```bash
-    cd my-first-extension
-    npm install
-    ```
-
-2.  **Build the server:**
-
-    ```bash
-    npm run build
-    ```
-
-    This will compile `example.ts` into `dist/example.js`, which is the file referenced in your `gemini-extension.json`.
-
-3.  **Link the extension:**
-
-    The `link` command creates a symbolic link from the Gemini CLI extensions directory to your development directory. This means any changes you make will be reflected immediately without needing to reinstall.
-
-    ```bash
-    gemini extensions link .
-    ```
-
-Now, restart your Gemini CLI session. The new `fetch_posts` tool will be available. You can test it by asking: "fetch posts".
-
-## Step 4: Add a Custom Command
-
-Custom commands provide a way to create shortcuts for complex prompts. Let's add a command that searches for a pattern in your code.
-
-1.  Create a `commands` directory and a subdirectory for your command group:
-
-    ```bash
-    mkdir -p commands/fs
-    ```
-
-2.  Create a file named `commands/fs/grep-code.toml`:
-
-    ```toml
-    prompt = """
-    Please summarize the findings for the pattern `{{args}}`.
-
-    Search Results:
-    !{grep -r {{args}} .}
-    """
-    ```
-
-    This command, `/fs:grep-code`, will take an argument, run the `grep` shell command with it, and pipe the results into a prompt for summarization.
-
-After saving the file, restart the Gemini CLI. You can now run `/fs:grep-code "some pattern"` to use your new command.
-
-## Step 5: Add a Custom `GEMINI.md`
-
-You can provide persistent context to the model by adding a `GEMINI.md` file to your extension. This is useful for giving the model instructions on how to behave or information about your extension's tools. Note that you may not always need this for extensions built to expose commands and prompts.
-
-1.  Create a file named `GEMINI.md` in the root of your extension directory:
-
-    ```markdown
-    # My First Extension Instructions
-
-    You are an expert developer assistant. When the user asks you to fetch posts, use the `fetch_posts` tool. Be concise in your responses.
-    ```
-
-2.  Update your `gemini-extension.json` to tell the CLI to load this file:
-
-    ```json
-    {
-      "name": "my-first-extension",
-      "version": "1.0.0",
-      "contextFileName": "GEMINI.md",
-      "mcpServers": {
-        "nodeServer": {
-          "command": "node",
-          "args": ["${extensionPath}${/}dist${/}example.js"],
-          "cwd": "${extensionPath}"
-        }
-      }
-    }
-    ```
-
-Restart the CLI again. The model will now have the context from your `GEMINI.md` file in every session where the extension is active.
-
-## Step 6: Releasing Your Extension
-
-Once you are happy with your extension, you can share it with others. The two primary ways of releasing extensions are via a Git repository or through GitHub Releases. Using a public Git repository is the simplest method.
-
-For detailed instructions on both methods, please refer to the [Extension Releasing Guide](extension-releasing.md).
-
-## Conclusion
-
-You've successfully created a Gemini CLI extension! You learned how to:
-
-- Bootstrap a new extension from a template.
-- Add custom tools with an MCP server.
-- Create convenient custom commands.
-- Provide persistent context to the model.
-- Link your extension for local development.
-
-From here, you can explore more advanced features and build powerful new capabilities into the Gemini CLI.

docs/headless.md

@@ -1,323 +0,0 @@
-# Headless Mode
-
-Headless mode allows you to run Gemini CLI programmatically from command line
-scripts and automation tools without any interactive UI. This is ideal for
-scripting, automation, CI/CD pipelines, and building AI-powered tools.
-
-- [Headless Mode](#headless-mode)
-  - [Overview](#overview)
-  - [Basic Usage](#basic-usage)
-    - [Direct Prompts](#direct-prompts)
-    - [Stdin Input](#stdin-input)
-    - [Combining with File Input](#combining-with-file-input)
-  - [Output Formats](#output-formats)
-    - [Text Output (Default)](#text-output-default)
-    - [JSON Output](#json-output)
-      - [Response Schema](#response-schema)
-      - [Example Usage](#example-usage)
-    - [File Redirection](#file-redirection)
-  - [Configuration Options](#configuration-options)
-  - [Examples](#examples)
-    - [Code review](#code-review)
-    - [Generate commit messages](#generate-commit-messages)
-    - [API documentation](#api-documentation)
-    - [Batch code analysis](#batch-code-analysis)
-    - [Code review](#code-review-1)
-    - [Log analysis](#log-analysis)
-    - [Release notes generation](#release-notes-generation)
-    - [Model and tool usage tracking](#model-and-tool-usage-tracking)
-  - [Resources](#resources)
-
-## Overview
-
-The headless mode provides a headless interface to Gemini CLI that:
-
-- Accepts prompts via command line arguments or stdin
-- Returns structured output (text or JSON)
-- Supports file redirection and piping
-- Enables automation and scripting workflows
-- Provides consistent exit codes for error handling
-
-## Basic Usage
-
-### Direct Prompts
-
-Use the `--prompt` (or `-p`) flag to run in headless mode:
-
-```bash
-gemini --prompt "What is machine learning?"
-```
-
-### Stdin Input
-
-Pipe input to Gemini CLI from your terminal:
-
-```bash
-echo "Explain this code" | gemini
-```
-
-### Combining with File Input
-
-Read from files and process with Gemini:
-
-```bash
-cat README.md | gemini --prompt "Summarize this documentation"
-```
-
-## Output Formats
-
-### Text Output (Default)
-
-Standard human-readable output:
-
-```bash
-gemini -p "What is the capital of France?"
-```
-
-Response format:
-
-```
-The capital of France is Paris.
-```
-
-### JSON Output
-
-Returns structured data including response, statistics, and metadata. This
-format is ideal for programmatic processing and automation scripts.
-
-#### Response Schema
-
-The JSON output follows this high-level structure:
-
-```json
-{
-  "response": "string", // The main AI-generated content answering your prompt
-  "stats": {
-    // Usage metrics and performance data
-    "models": {
-      // Per-model API and token usage statistics
-      "[model-name]": {
-        "api": {
-          /* request counts, errors, latency */
-        },
-        "tokens": {
-          /* prompt, response, cached, total counts */
-        }
-      }
-    },
-    "tools": {
-      // Tool execution statistics
-      "totalCalls": "number",
-      "totalSuccess": "number",
-      "totalFail": "number",
-      "totalDurationMs": "number",
-      "totalDecisions": {
-        /* accept, reject, modify, auto_accept counts */
-      },
-      "byName": {
-        /* per-tool detailed stats */
-      }
-    },
-    "files": {
-      // File modification statistics
-      "totalLinesAdded": "number",
-      "totalLinesRemoved": "number"
-    }
-  },
-  "error": {
-    // Present only when an error occurred
-    "type": "string", // Error type (e.g., "ApiError", "AuthError")
-    "message": "string", // Human-readable error description
-    "code": "number" // Optional error code
-  }
-}
-```
-
-#### Example Usage
-
-```bash
-gemini -p "What is the capital of France?" --output-format json
-```
-
-Response:
-
-```json
-{
-  "response": "The capital of France is Paris.",
-  "stats": {
-    "models": {
-      "gemini-2.5-pro": {
-        "api": {
-          "totalRequests": 2,
-          "totalErrors": 0,
-          "totalLatencyMs": 5053
-        },
-        "tokens": {
-          "prompt": 24939,
-          "candidates": 20,
-          "total": 25113,
-          "cached": 21263,
-          "thoughts": 154,
-          "tool": 0
-        }
-      },
-      "gemini-2.5-flash": {
-        "api": {
-          "totalRequests": 1,
-          "totalErrors": 0,
-          "totalLatencyMs": 1879
-        },
-        "tokens": {
-          "prompt": 8965,
-          "candidates": 10,
-          "total": 9033,
-          "cached": 0,
-          "thoughts": 30,
-          "tool": 28
-        }
-      }
-    },
-    "tools": {
-      "totalCalls": 1,
-      "totalSuccess": 1,
-      "totalFail": 0,
-      "totalDurationMs": 1881,
-      "totalDecisions": {
-        "accept": 0,
-        "reject": 0,
-        "modify": 0,
-        "auto_accept": 1
-      },
-      "byName": {
-        "google_web_search": {
-          "count": 1,
-          "success": 1,
-          "fail": 0,
-          "durationMs": 1881,
-          "decisions": {
-            "accept": 0,
-            "reject": 0,
-            "modify": 0,
-            "auto_accept": 1
-          }
-        }
-      }
-    },
-    "files": {
-      "totalLinesAdded": 0,
-      "totalLinesRemoved": 0
-    }
-  }
-}
-```
-
-### File Redirection
-
-Save output to files or pipe to other commands:
-
-```bash
-# Save to file
-gemini -p "Explain Docker" > docker-explanation.txt
-gemini -p "Explain Docker" --output-format json > docker-explanation.json
-
-# Append to file
-gemini -p "Add more details" >> docker-explanation.txt
-
-# Pipe to other tools
-gemini -p "What is Kubernetes?" --output-format json | jq '.response'
-gemini -p "Explain microservices" | wc -w
-gemini -p "List programming languages" | grep -i "python"
-```
-
-## Configuration Options
-
-Key command-line options for headless usage:
-
-| Option                  | Description                        | Example                                            |
-| ----------------------- | ---------------------------------- | -------------------------------------------------- |
-| `--prompt`, `-p`        | Run in headless mode               | `gemini -p "query"`                                |
-| `--output-format`       | Specify output format (text, json) | `gemini -p "query" --output-format json`           |
-| `--model`, `-m`         | Specify the Gemini model           | `gemini -p "query" -m gemini-2.5-flash`            |
-| `--debug`, `-d`         | Enable debug mode                  | `gemini -p "query" --debug`                        |
-| `--all-files`, `-a`     | Include all files in context       | `gemini -p "query" --all-files`                    |
-| `--include-directories` | Include additional directories     | `gemini -p "query" --include-directories src,docs` |
-| `--yolo`, `-y`          | Auto-approve all actions           | `gemini -p "query" --yolo`                         |
-| `--approval-mode`       | Set approval mode                  | `gemini -p "query" --approval-mode auto_edit`      |
-
-For complete details on all available configuration options, settings files, and environment variables, see the [Configuration Guide](./cli/configuration.md).
-
-## Examples
-
-#### Code review
-
-```bash
-cat src/auth.py | gemini -p "Review this authentication code for security issues" > security-review.txt
-```
-
-#### Generate commit messages
-
-```bash
-result=$(git diff --cached | gemini -p "Write a concise commit message for these changes" --output-format json)
-echo "$result" | jq -r '.response'
-```
-
-#### API documentation
-
-```bash
-result=$(cat api/routes.js | gemini -p "Generate OpenAPI spec for these routes" --output-format json)
-echo "$result" | jq -r '.response' > openapi.json
-```
-
-#### Batch code analysis
-
-```bash
-for file in src/*.py; do
-    echo "Analyzing $file..."
-    result=$(cat "$file" | gemini -p "Find potential bugs and suggest improvements" --output-format json)
-    echo "$result" | jq -r '.response' > "reports/$(basename "$file").analysis"
-    echo "Completed analysis for $(basename "$file")" >> reports/progress.log
-done
-```
-
-#### Code review
-
-```bash
-result=$(git diff origin/main...HEAD | gemini -p "Review these changes for bugs, security issues, and code quality" --output-format json)
-echo "$result" | jq -r '.response' > pr-review.json
-```
-
-#### Log analysis
-
-```bash
-grep "ERROR" /var/log/app.log | tail -20 | gemini -p "Analyze these errors and suggest root cause and fixes" > error-analysis.txt
-```
-
-#### Release notes generation
-
-```bash
-result=$(git log --oneline v1.0.0..HEAD | gemini -p "Generate release notes from these commits" --output-format json)
-response=$(echo "$result" | jq -r '.response')
-echo "$response"
-echo "$response" >> CHANGELOG.md
-```
-
-#### Model and tool usage tracking
-
-```bash
-result=$(gemini -p "Explain this database schema" --include-directories db --output-format json)
-total_tokens=$(echo "$result" | jq -r '.stats.models // {} | to_entries | map(.value.tokens.total) | add // 0')
-models_used=$(echo "$result" | jq -r '.stats.models // {} | keys | join(", ") | if . == "" then "none" else . end')
-tool_calls=$(echo "$result" | jq -r '.stats.tools.totalCalls // 0')
-tools_used=$(echo "$result" | jq -r '.stats.tools.byName // {} | keys | join(", ") | if . == "" then "none" else . end')
-echo "$(date): $total_tokens tokens, $tool_calls tool calls ($tools_used) used with models: $models_used" >> usage.log
-echo "$result" | jq -r '.response' > schema-docs.md
-echo "Recent usage trends:"
-tail -5 usage.log
-```
-
-## Resources
-
-- [CLI Configuration](./cli/configuration.md) - Complete configuration guide
-- [Authentication](./cli/authentication.md) - Setup authentication
-- [Commands](./cli/commands.md) - Interactive commands reference
-- [Tutorials](./cli/tutorials.md) - Step-by-step automation guides

docs/ide-companion-spec.md

@@ -1,184 +0,0 @@
-# Gemini CLI Companion Plugin: Interface Specification
-
-> Last Updated: September 15, 2025
-
-This document defines the contract for building a companion plugin to enable Gemini CLI's IDE mode. For VS Code, these features (native diffing, context awareness) are provided by the official extension ([marketplace](https://marketplace.visualstudio.com/items?itemName=Google.gemini-cli-vscode-ide-companion)). This specification is for contributors who wish to bring similar functionality to other editors like JetBrains IDEs, Sublime Text, etc.
-
-## I. The Communication Interface
-
-Gemini CLI and the IDE plugin communicate through a local communication channel.
-
-### 1. Transport Layer: MCP over HTTP
-
-The plugin **MUST** run a local HTTP server that implements the **Model Context Protocol (MCP)**.
-
-- **Protocol:** The server must be a valid MCP server. We recommend using an existing MCP SDK for your language of choice if available.
-- **Endpoint:** The server should expose a single endpoint (e.g., `/mcp`) for all MCP communication.
-- **Port:** The server **MUST** listen on a dynamically assigned port (i.e., listen on port `0`).
-
-### 2. Discovery Mechanism: The Port File
-
-For Gemini CLI to connect, it needs to discover which IDE instance it's running in and what port your server is using. The plugin **MUST** facilitate this by creating a "discovery file."
-
-- **How the CLI Finds the File:** The CLI determines the Process ID (PID) of the IDE it's running in by traversing the process tree. It then looks for a discovery file that contains this PID in its name.
-- **File Location:** The file must be created in a specific directory: `os.tmpdir()/gemini/ide/`. Your plugin must create this directory if it doesn't exist.
-- **File Naming Convention:** The filename is critical and **MUST** follow the pattern:
-  `gemini-ide-server-${PID}-${PORT}.json`
-  - `${PID}`: The process ID of the parent IDE process. Your plugin must determine this PID and include it in the filename.
-  - `${PORT}`: The port your MCP server is listening on.
-- **File Content & Workspace Validation:** The file **MUST** contain a JSON object with the following structure:
-
-  ```json
-  {
-    "port": 12345,
-    "workspacePath": "/path/to/project1:/path/to/project2",
-    "authToken": "a-very-secret-token",
-    "ideInfo": {
-      "name": "vscode",
-      "displayName": "VS Code"
-    }
-  }
-  ```
-  - `port` (number, required): The port of the MCP server.
-  - `workspacePath` (string, required): A list of all open workspace root paths, delimited by the OS-specific path separator (`:` for Linux/macOS, `;` for Windows). The CLI uses this path to ensure it's running in the same project folder that's open in the IDE. If the CLI's current working directory is not a sub-directory of `workspacePath`, the connection will be rejected. Your plugin **MUST** provide the correct, absolute path(s) to the root of the open workspace(s).
-  - `authToken` (string, required): A secret token for securing the connection. The CLI will include this token in an `Authorization: Bearer <token>` header on all requests.
-  - `ideInfo` (object, required): Information about the IDE.
-    - `name` (string, required): A short, lowercase identifier for the IDE (e.g., `vscode`, `jetbrains`).
-    - `displayName` (string, required): A user-friendly name for the IDE (e.g., `VS Code`, `JetBrains IDE`).
-
-- **Authentication:** To secure the connection, the plugin **MUST** generate a unique, secret token and include it in the discovery file. The CLI will then include this token in the `Authorization` header for all requests to the MCP server (e.g., `Authorization: Bearer a-very-secret-token`). Your server **MUST** validate this token on every request and reject any that are unauthorized.
-- **Tie-Breaking with Environment Variables (Recommended):** For the most reliable experience, your plugin **SHOULD** both create the discovery file and set the `GEMINI_CLI_IDE_SERVER_PORT` environment variable in the integrated terminal. The file serves as the primary discovery mechanism, but the environment variable is crucial for tie-breaking. If a user has multiple IDE windows open for the same workspace, the CLI uses the `GEMINI_CLI_IDE_SERVER_PORT` variable to identify and connect to the correct window's server.
-
-## II. The Context Interface
-
-To enable context awareness, the plugin **MAY** provide the CLI with real-time information about the user's activity in the IDE.
-
-### `ide/contextUpdate` Notification
-
-The plugin **MAY** send an `ide/contextUpdate` [notification](https://modelcontextprotocol.io/specification/2025-06-18/basic/index#notifications) to the CLI whenever the user's context changes.
-
-- **Triggering Events:** This notification should be sent (with a recommended debounce of 50ms) when:
-  - A file is opened, closed, or focused.
-  - The user's cursor position or text selection changes in the active file.
-- **Payload (`IdeContext`):** The notification parameters **MUST** be an `IdeContext` object:
-
-  ```typescript
-  interface IdeContext {
-    workspaceState?: {
-      openFiles?: File[];
-      isTrusted?: boolean;
-    };
-  }
-
-  interface File {
-    // Absolute path to the file
-    path: string;
-    // Last focused Unix timestamp (for ordering)
-    timestamp: number;
-    // True if this is the currently focused file
-    isActive?: boolean;
-    cursor?: {
-      // 1-based line number
-      line: number;
-      // 1-based character number
-      character: number;
-    };
-    // The text currently selected by the user
-    selectedText?: string;
-  }
-  ```
-
-  **Note:** The `openFiles` list should only include files that exist on disk. Virtual files (e.g., unsaved files without a path, editor settings pages) **MUST** be excluded.
-
-### How the CLI Uses This Context
-
-After receiving the `IdeContext` object, the CLI performs several normalization and truncation steps before sending the information to the model.
-
-- **File Ordering:** The CLI uses the `timestamp` field to determine the most recently used files. It sorts the `openFiles` list based on this value. Therefore, your plugin **MUST** provide an accurate Unix timestamp for when a file was last focused.
-- **Active File:** The CLI considers only the most recent file (after sorting) to be the "active" file. It will ignore the `isActive` flag on all other files and clear their `cursor` and `selectedText` fields. Your plugin should focus on setting `isActive: true` and providing cursor/selection details only for the currently focused file.
-- **Truncation:** To manage token limits, the CLI truncates both the file list (to 10 files) and the `selectedText` (to 16KB).
-
-While the CLI handles the final truncation, it is highly recommended that your plugin also limits the amount of context it sends.
-
-## III. The Diffing Interface
-
-To enable interactive code modifications, the plugin **MAY** expose a diffing interface. This allows the CLI to request that the IDE open a diff view, showing proposed changes to a file. The user can then review, edit, and ultimately accept or reject these changes directly within the IDE.
-
-### `openDiff` Tool
-
-The plugin **MUST** register an `openDiff` tool on its MCP server.
-
-- **Description:** This tool instructs the IDE to open a modifiable diff view for a specific file.
-- **Request (`OpenDiffRequest`):** The tool is invoked via a `tools/call` request. The `arguments` field within the request's `params` **MUST** be an `OpenDiffRequest` object.
-
-  ```typescript
-  interface OpenDiffRequest {
-    // The absolute path to the file to be diffed.
-    filePath: string;
-    // The proposed new content for the file.
-    newContent: string;
-  }
-  ```
-
-- **Response (`CallToolResult`):** The tool **MUST** immediately return a `CallToolResult` to acknowledge the request and report whether the diff view was successfully opened.
-  - On Success: If the diff view was opened successfully, the response **MUST** contain empty content (i.e., `content: []`).
-  - On Failure: If an error prevented the diff view from opening, the response **MUST** have `isError: true` and include a `TextContent` block in the `content` array describing the error.
-
-  The actual outcome of the diff (acceptance or rejection) is communicated asynchronously via notifications.
-
-### `closeDiff` Tool
-
-The plugin **MUST** register a `closeDiff` tool on its MCP server.
-
-- **Description:** This tool instructs the IDE to close an open diff view for a specific file.
-- **Request (`CloseDiffRequest`):** The tool is invoked via a `tools/call` request. The `arguments` field within the request's `params` **MUST** be an `CloseDiffRequest` object.
-
-  ```typescript
-  interface CloseDiffRequest {
-    // The absolute path to the file whose diff view should be closed.
-    filePath: string;
-  }
-  ```
-
-- **Response (`CallToolResult`):** The tool **MUST** return a `CallToolResult`.
-  - On Success: If the diff view was closed successfully, the response **MUST** include a single **TextContent** block in the content array containing the file's final content before closing.
-  - On Failure: If an error prevented the diff view from closing, the response **MUST** have `isError: true` and include a `TextContent` block in the `content` array describing the error.
-
-### `ide/diffAccepted` Notification
-
-When the user accepts the changes in a diff view (e.g., by clicking an "Apply" or "Save" button), the plugin **MUST** send an `ide/diffAccepted` notification to the CLI.
-
-- **Payload:** The notification parameters **MUST** include the file path and the final content of the file. The content may differ from the original `newContent` if the user made manual edits in the diff view.
-
-  ```typescript
-  {
-    // The absolute path to the file that was diffed.
-    filePath: string;
-    // The full content of the file after acceptance.
-    content: string;
-  }
-  ```
-
-### `ide/diffRejected` Notification
-
-When the user rejects the changes (e.g., by closing the diff view without accepting), the plugin **MUST** send an `ide/diffRejected` notification to the CLI.
-
-- **Payload:** The notification parameters **MUST** include the file path of the rejected diff.
-
-  ```typescript
-  {
-    // The absolute path to the file that was diffed.
-    filePath: string;
-  }
-  ```
-
-## IV. The Lifecycle Interface
-
-The plugin **MUST** manage its resources and the discovery file correctly based on the IDE's lifecycle.
-
-- **On Activation (IDE startup/plugin enabled):**
-  1.  Start the MCP server.
-  2.  Create the discovery file.
-- **On Deactivation (IDE shutdown/plugin disabled):**
-  1.  Stop the MCP server.
-  2.  Delete the discovery file.

docs/ide-integration.md

@@ -1,144 +0,0 @@
-# IDE Integration
-
-Gemini CLI can integrate with your IDE to provide a more seamless and context-aware experience. This integration allows the CLI to understand your workspace better and enables powerful features like native in-editor diffing.
-
-Currently, the only supported IDE is [Visual Studio Code](https://code.visualstudio.com/) and other editors that support VS Code extensions. To build support for other editors, see the [IDE Companion Extension Spec](./ide-companion-spec.md).
-
-## Features
-
-- **Workspace Context:** The CLI automatically gains awareness of your workspace to provide more relevant and accurate responses. This context includes:
-  - The **10 most recently accessed files** in your workspace.
-  - Your active cursor position.
-  - Any text you have selected (up to a 16KB limit; longer selections will be truncated).
-
-- **Native Diffing:** When Gemini suggests code modifications, you can view the changes directly within your IDE's native diff viewer. This allows you to review, edit, and accept or reject the suggested changes seamlessly.
-
-- **VS Code Commands:** You can access Gemini CLI features directly from the VS Code Command Palette (`Cmd+Shift+P` or `Ctrl+Shift+P`):
-  - `Gemini CLI: Run`: Starts a new Gemini CLI session in the integrated terminal.
-  - `Gemini CLI: Accept Diff`: Accepts the changes in the active diff editor.
-  - `Gemini CLI: Close Diff Editor`: Rejects the changes and closes the active diff editor.
-  - `Gemini CLI: View Third-Party Notices`: Displays the third-party notices for the extension.
-
-## Installation and Setup
-
-There are three ways to set up the IDE integration:
-
-### 1. Automatic Nudge (Recommended)
-
-When you run Gemini CLI inside a supported editor, it will automatically detect your environment and prompt you to connect. Answering "Yes" will automatically run the necessary setup, which includes installing the companion extension and enabling the connection.
-
-### 2. Manual Installation from CLI
-
-If you previously dismissed the prompt or want to install the extension manually, you can run the following command inside Gemini CLI:
-
-```
-/ide install
-```
-
-This will find the correct extension for your IDE and install it.
-
-### 3. Manual Installation from a Marketplace
-
-You can also install the extension directly from a marketplace.
-
-- **For Visual Studio Code:** Install from the [VS Code Marketplace](https://marketplace.visualstudio.com/items?itemName=google.gemini-cli-vscode-ide-companion).
-- **For VS Code Forks:** To support forks of VS Code, the extension is also published on the [Open VSX Registry](https://open-vsx.org/extension/google/gemini-cli-vscode-ide-companion). Follow your editor's instructions for installing extensions from this registry.
-
-> NOTE:
-> The "Gemini CLI Companion" extension may appear towards the bottom of search results. If you don't see it immediately, try scrolling down or sorting by "Newly Published".
->
-> After manually installing the extension, you must run `/ide enable` in the CLI to activate the integration.
-
-## Usage
-
-### Enabling and Disabling
-
-You can control the IDE integration from within the CLI:
-
-- To enable the connection to the IDE, run:
-  ```
-  /ide enable
-  ```
-- To disable the connection, run:
-  ```
-  /ide disable
-  ```
-
-When enabled, Gemini CLI will automatically attempt to connect to the IDE companion extension.
-
-### Checking the Status
-
-To check the connection status and see the context the CLI has received from the IDE, run:
-
-```
-/ide status
-```
-
-If connected, this command will show the IDE it's connected to and a list of recently opened files it is aware of.
-
-(Note: The file list is limited to 10 recently accessed files within your workspace and only includes local files on disk.)
-
-### Working with Diffs
-
-When you ask Gemini to modify a file, it can open a diff view directly in your editor.
-
-**To accept a diff**, you can perform any of the following actions:
-
-- Click the **checkmark icon** in the diff editor's title bar.
-- Save the file (e.g., with `Cmd+S` or `Ctrl+S`).
-- Open the Command Palette and run **Gemini CLI: Accept Diff**.
-- Respond with `yes` in the CLI when prompted.
-
-**To reject a diff**, you can:
-
-- Click the **'x' icon** in the diff editor's title bar.
-- Close the diff editor tab.
-- Open the Command Palette and run **Gemini CLI: Close Diff Editor**.
-- Respond with `no` in the CLI when prompted.
-
-You can also **modify the suggested changes** directly in the diff view before accepting them.
-
-If you select ‘Yes, allow always’ in the CLI, changes will no longer show up in the IDE as they will be auto-accepted.
-
-## Using with Sandboxing
-
-If you are using Gemini CLI within a sandbox, please be aware of the following:
-
-- **On macOS:** The IDE integration requires network access to communicate with the IDE companion extension. You must use a Seatbelt profile that allows network access.
-- **In a Docker Container:** If you run Gemini CLI inside a Docker (or Podman) container, the IDE integration can still connect to the VS Code extension running on your host machine. The CLI is configured to automatically find the IDE server on `host.docker.internal`. No special configuration is usually required, but you may need to ensure your Docker networking setup allows connections from the container to the host.
-
-## Troubleshooting
-
-If you encounter issues with IDE integration, here are some common error messages and how to resolve them.
-
-### Connection Errors
-
-- **Message:** `🔴 Disconnected: Failed to connect to IDE companion extension in [IDE Name]. Please ensure the extension is running. To install the extension, run /ide install.`
-  - **Cause:** Gemini CLI could not find the necessary environment variables (`GEMINI_CLI_IDE_WORKSPACE_PATH` or `GEMINI_CLI_IDE_SERVER_PORT`) to connect to the IDE. This usually means the IDE companion extension is not running or did not initialize correctly.
-  - **Solution:**
-    1.  Make sure you have installed the **Gemini CLI Companion** extension in your IDE and that it is enabled.
-    2.  Open a new terminal window in your IDE to ensure it picks up the correct environment.
-
-- **Message:** `🔴 Disconnected: IDE connection error. The connection was lost unexpectedly. Please try reconnecting by running /ide enable`
-  - **Cause:** The connection to the IDE companion was lost.
-  - **Solution:** Run `/ide enable` to try and reconnect. If the issue continues, open a new terminal window or restart your IDE.
-
-### Configuration Errors
-
-- **Message:** `🔴 Disconnected: Directory mismatch. Gemini CLI is running in a different location than the open workspace in [IDE Name]. Please run the CLI from one of the following directories: [List of directories]`
-  - **Cause:** The CLI's current working directory is outside the workspace you have open in your IDE.
-  - **Solution:** `cd` into the same directory that is open in your IDE and restart the CLI.
-
-- **Message:** `🔴 Disconnected: To use this feature, please open a workspace folder in [IDE Name] and try again.`
-  - **Cause:** You have no workspace open in your IDE.
-  - **Solution:** Open a workspace in your IDE and restart the CLI.
-
-### General Errors
-
-- **Message:** `IDE integration is not supported in your current environment. To use this feature, run Gemini CLI in one of these supported IDEs: [List of IDEs]`
-  - **Cause:** You are running Gemini CLI in a terminal or environment that is not a supported IDE.
-  - **Solution:** Run Gemini CLI from the integrated terminal of a supported IDE, like VS Code.
-
-- **Message:** `No installer is available for IDE. Please install the Gemini CLI Companion extension manually from the marketplace.`
-  - **Cause:** You ran `/ide install`, but the CLI does not have an automated installer for your specific IDE.
-  - **Solution:** Open your IDE's extension marketplace, search for "Gemini CLI Companion", and [install it manually](#3-manual-installation-from-a-marketplace).

docs/index.md

@@ -18,10 +18,7 @@ This documentation is organized into the following sections:
   - **[Configuration](./cli/configuration.md):** Information on configuring the CLI.
   - **[Checkpointing](./checkpointing.md):** Documentation for the checkpointing feature.
   - **[Extensions](./extension.md):** How to extend the CLI with new functionality.
-  - **[IDE Integration](./ide-integration.md):** Connect the CLI to your editor.
-  - **[IDE Companion Extension Spec](./ide-companion-spec.md):** Spec for building IDE companion extensions.
   - **[Telemetry](./telemetry.md):** Overview of telemetry in the CLI.
-  - **[Trusted Folders](./trusted-folders.md):** An overview of the Trusted Folders security feature.
 - **Core Details:** Documentation for `packages/core`.
   - **[Core Introduction](./core/index.md):** Overview of the core component.
   - **[Tools API](./core/tools-api.md):** Information on how the core manages and exposes tools.
@@ -34,9 +31,8 @@ This documentation is organized into the following sections:
   - **[Web Search Tool](./tools/web-search.md):** Documentation for the `google_web_search` tool.
   - **[Memory Tool](./tools/memory.md):** Documentation for the `save_memory` tool.
 - **[Contributing & Development Guide](../CONTRIBUTING.md):** Information for contributors and developers, including setup, building, testing, and coding conventions.
-- **[NPM](./npm.md):** Details on how the project's packages are structured
+- **[NPM Workspaces and Publishing](./npm.md):** Details on how the project's packages are managed and published.
 - **[Troubleshooting Guide](./troubleshooting.md):** Find solutions to common problems and FAQs.
 - **[Terms of Service and Privacy Notice](./tos-privacy.md):** Information on the terms of service and privacy notices applicable to your use of Gemini CLI.
-- **[Releases](./releases.md):** Information on the project's releases and deployment cadence.
 
 We hope this documentation helps you make the most of the Gemini CLI!

docs/integration-tests.md

@@ -20,7 +20,7 @@ npm run test:e2e
 
 ## Running a specific set of tests
 
-To run a subset of test files, you can use `npm run <integration test command> <file_name1> ....` where &lt;integration test command&gt; is either `test:e2e` or `test:integration*` and `<file_name>` is any of the `.test.js` files in the `integration-tests/` directory. For example, the following command runs `list_directory.test.js` and `write_file.test.js`:
+To run a subset of test files, you can use `npm run <integration test command> <file_name1> ....` where <integration test command> is either `test:e2e` or `test:integration*` and `<file_name>` is any of the `.test.js` files in the `integration-tests/` directory. For example, the following command runs `list_directory.test.js` and `write_file.test.js`:
 
 ```bash
 npm run test:e2e list_directory write_file
@@ -67,9 +67,13 @@ The integration test runner provides several options for diagnostics to help tra
 
 You can preserve the temporary files created during a test run for inspection. This is useful for debugging issues with file system operations.
 
-To keep the test output set the `KEEP_OUTPUT` environment variable to `true`.
+To keep the test output, you can either use the `--keep-output` flag or set the `KEEP_OUTPUT` environment variable to `true`.
 
 ```bash
+# Using the flag
+npm run test:integration:sandbox:none -- --keep-output
+
+# Using the environment variable
 KEEP_OUTPUT=true npm run test:integration:sandbox:none
 ```
 
@@ -77,20 +81,20 @@ When output is kept, the test runner will print the path to the unique directory
 
 ### Verbose output
 
-For more detailed debugging, set the `VERBOSE` environment variable to `true`.
+For more detailed debugging, the `--verbose` flag streams the real-time output from the `gemini` command to the console.
 
 ```bash
-VERBOSE=true npm run test:integration:sandbox:none
+npm run test:integration:sandbox:none -- --verbose
 ```
 
-When using `VERBOSE=true` and `KEEP_OUTPUT=true` in the same command, the output is streamed to the console and also saved to a log file within the test's temporary directory.
+When using `--verbose` and `--keep-output` in the same command, the output is streamed to the console and also saved to a log file within the test's temporary directory.
 
 The verbose output is formatted to clearly identify the source of the logs:
 
 ```
---- TEST: <log dir>:<test-name> ---
+--- TEST: <file-name-without-js>:<test-name> ---
 ... output from the gemini command ...
---- END TEST: <log dir>:<test-name> ---
+--- END TEST: <file-name-without-js>:<test-name> ---
 ```
 
 ## Linting and formatting

docs/issue-and-pr-automation.md

@@ -73,7 +73,7 @@ This is a fallback workflow to ensure that no issue gets missed by the triage pr
 
 This workflow handles the process of packaging and publishing new versions of the Gemini CLI.
 
-- **Workflow File**: `.github/workflows/release-manual.yml`
+- **Workflow File**: `.github/workflows/release.yml`
 - **When it runs**: On a daily schedule for "nightly" releases, and manually for official patch/minor releases.
 - **What it does**:
   - Automatically builds the project, bumps the version numbers, and publishes the packages to npm.

docs/keyboard-shortcuts.md

@@ -7,7 +7,7 @@ This document lists the available keyboard shortcuts in the Gemini CLI.
 | Shortcut | Description                                                                                                           |
 | -------- | --------------------------------------------------------------------------------------------------------------------- |
 | `Esc`    | Close dialogs and suggestions.                                                                                        |
-| `Ctrl+C` | Cancel the ongoing request and clear the input. Press twice to exit the application.                                  |
+| `Ctrl+C` | Exit the application. Press twice to confirm.                                                                         |
 | `Ctrl+D` | Exit the application if the input is empty. Press twice to confirm.                                                   |
 | `Ctrl+L` | Clear the screen.                                                                                                     |
 | `Ctrl+O` | Toggle the display of the debug console.                                                                              |
@@ -29,7 +29,6 @@ This document lists the available keyboard shortcuts in the Gemini CLI.
 | `Ctrl+A` / `Home`                                  | Move the cursor to the beginning of the line.                                                                                       |
 | `Ctrl+B` / `Left Arrow`                            | Move the cursor one character to the left.                                                                                          |
 | `Ctrl+C`                                           | Clear the input prompt                                                                                                              |
-| `Esc` (double press)                               | Clear the input prompt.                                                                                                             |
 | `Ctrl+D` / `Delete`                                | Delete the character to the right of the cursor.                                                                                    |
 | `Ctrl+E` / `End`                                   | Move the cursor to the end of the line.                                                                                             |
 | `Ctrl+F` / `Right Arrow`                           | Move the cursor one character to the right.                                                                                         |
@@ -61,9 +60,3 @@ This document lists the available keyboard shortcuts in the Gemini CLI.
 | `Up Arrow` / `k`   | Move selection up.                                                                                            |
 | `1-9`              | Select an item by its number.                                                                                 |
 | (multi-digit)      | For items with numbers greater than 9, press the digits in quick succession to select the corresponding item. |
-
-## IDE Integration
-
-| Shortcut | Description                       |
-| -------- | --------------------------------- |
-| `Ctrl+G` | See context CLI received from IDE |

docs/mermaid/context.mmd

@@ -1,103 +0,0 @@
-graph LR
-    %% --- Style Definitions ---
-    classDef new fill:#98fb98,color:#000
-    classDef changed fill:#add8e6,color:#000
-    classDef unchanged fill:#f0f0f0,color:#000
-
-    %% --- Subgraphs ---
-    subgraph "Context Providers"
-        direction TB
-        A["gemini.tsx"]
-        B["AppContainer.tsx"]
-    end
-
-    subgraph "Contexts"
-        direction TB
-        CtxSession["SessionContext"]
-        CtxVim["VimModeContext"]
-        CtxSettings["SettingsContext"]
-        CtxApp["AppContext"]
-        CtxConfig["ConfigContext"]
-        CtxUIState["UIStateContext"]
-        CtxUIActions["UIActionsContext"]
-    end
-
-    subgraph "Component Consumers"
-        direction TB
-        ConsumerApp["App"]
-        ConsumerAppContainer["AppContainer"]
-        ConsumerAppHeader["AppHeader"]
-        ConsumerDialogManager["DialogManager"]
-        ConsumerHistoryItem["HistoryItemDisplay"]
-        ConsumerComposer["Composer"]
-        ConsumerMainContent["MainContent"]
-        ConsumerNotifications["Notifications"]
-    end
-
-    %% --- Provider -> Context Connections ---
-    A -.-> CtxSession
-    A -.-> CtxVim
-    A -.-> CtxSettings
-
-    B -.-> CtxApp
-    B -.-> CtxConfig
-    B -.-> CtxUIState
-    B -.-> CtxUIActions
-    B -.-> CtxSettings
-
-    %% --- Context -> Consumer Connections ---
-    CtxSession -.-> ConsumerAppContainer
-    CtxSession -.-> ConsumerApp
-
-    CtxVim -.-> ConsumerAppContainer
-    CtxVim -.-> ConsumerComposer
-    CtxVim -.-> ConsumerApp
-
-    CtxSettings -.-> ConsumerAppContainer
-    CtxSettings -.-> ConsumerAppHeader
-    CtxSettings -.-> ConsumerDialogManager
-    CtxSettings -.-> ConsumerApp
-
-    CtxApp -.-> ConsumerAppHeader
-    CtxApp -.-> ConsumerNotifications
-
-    CtxConfig -.-> ConsumerAppHeader
-    CtxConfig -.-> ConsumerHistoryItem
-    CtxConfig -.-> ConsumerComposer
-    CtxConfig -.-> ConsumerDialogManager
-
-
-
-    CtxUIState -.-> ConsumerApp
-    CtxUIState -.-> ConsumerMainContent
-    CtxUIState -.-> ConsumerComposer
-    CtxUIState -.-> ConsumerDialogManager
-
-    CtxUIActions -.-> ConsumerComposer
-    CtxUIActions -.-> ConsumerDialogManager
-
-    %% --- Apply Styles ---
-    %% New Elements (Green)
-    class B,CtxApp,CtxConfig,CtxUIState,CtxUIActions,ConsumerAppHeader,ConsumerDialogManager,ConsumerComposer,ConsumerMainContent,ConsumerNotifications new
-
-    %% Heavily Changed Elements (Blue)
-    class A,ConsumerApp,ConsumerAppContainer,ConsumerHistoryItem changed
-
-    %% Mostly Unchanged Elements (Gray)
-    class CtxSession,CtxVim,CtxSettings unchanged
-
-    %% --- Link Styles ---
-    %% CtxSession (Red)
-    linkStyle 0,8,9 stroke:#e57373,stroke-width:2px
-    %% CtxVim (Orange)
-    linkStyle 1,10,11,12 stroke:#ffb74d,stroke-width:2px
-    %% CtxSettings (Yellow)
-    linkStyle 2,7,13,14,15,16 stroke:#fff176,stroke-width:2px
-    %% CtxApp (Green)
-    linkStyle 3,17,18 stroke:#81c784,stroke-width:2px
-    %% CtxConfig (Blue)
-    linkStyle 4,19,20,21,22 stroke:#64b5f6,stroke-width:2px
-    %% CtxUIState (Indigo)
-    linkStyle 5,23,24,25,26 stroke:#7986cb,stroke-width:2px
-    %% CtxUIActions (Violet)
-    linkStyle 6,27,28 stroke:#ba68c8,stroke-width:2px

docs/mermaid/render-path.mmd

@@ -1,64 +0,0 @@
-graph TD
-    %% --- Style Definitions ---
-    classDef new fill:#98fb98,color:#000
-    classDef changed fill:#add8e6,color:#000
-    classDef unchanged fill:#f0f0f0,color:#000
-    classDef dispatcher fill:#f9e79f,color:#000,stroke:#333,stroke-width:1px
-    classDef container fill:#f5f5f5,color:#000,stroke:#ccc
-
-    %% --- Component Tree ---
-    subgraph "Entry Point"
-      A["gemini.tsx"]
-    end
-
-    subgraph "State & Logic Wrapper"
-      B["AppContainer.tsx"]
-    end
-
-    subgraph "Primary Layout"
-      C["App.tsx"]
-    end
-
-    A -.-> B
-    B -.-> C
-
-    subgraph "UI Containers"
-        direction LR
-        C -.-> D["MainContent"]
-        C -.-> G["Composer"]
-        C -.-> F["DialogManager"]
-        C -.-> E["Notifications"]
-    end
-
-    subgraph "MainContent"
-        direction TB
-        D -.-> H["AppHeader"]
-        D -.-> I["HistoryItemDisplay"]:::dispatcher
-        D -.-> L["ShowMoreLines"]
-    end
-
-    subgraph "Composer"
-        direction TB
-        G -.-> K_Prompt["InputPrompt"]
-        G -.-> K_Footer["Footer"]
-    end
-
-    subgraph "DialogManager"
-        F -.-> J["Various Dialogs<br>(Auth, Theme, Settings, etc.)"]
-    end
-
-    %% --- Apply Styles ---
-    class B,D,E,F,G,H,J,K_Prompt,L new
-    class A,C,I changed
-    class K_Footer unchanged
-
-    %% --- Link Styles ---
-    %% MainContent Branch (Blue)
-    linkStyle 2,6,7,8 stroke:#64b5f6,stroke-width:2px
-    %% Composer Branch (Green)
-    linkStyle 3,9,10 stroke:#81c784,stroke-width:2px
-    %% DialogManager Branch (Orange)
-    linkStyle 4,11 stroke:#ffb74d,stroke-width:2px
-    %% Notifications Branch (Violet)
-    linkStyle 5 stroke:#ba68c8,stroke-width:2px
-

docs/npm.md

@@ -14,6 +14,249 @@ This package contains the core logic for interacting with the Gemini API. It is
 
 This package is not bundled. When it is published, it is published as a standard Node.js package with its own dependencies. This allows it to be used as a standalone package in other projects, if needed. All transpiled js code in the `dist` folder is included in the package.
 
+# Release Process
+
+This project follows a structured release process to ensure that all packages are versioned and published correctly. The process is designed to be as automated as possible.
+
+## How To Release
+
+Releases are managed through the [release.yml](https://github.com/google-gemini/gemini-cli/actions/workflows/release.yml) GitHub Actions workflow. To perform a manual release for a patch or hotfix:
+
+1.  Navigate to the **Actions** tab of the repository.
+2.  Select the **Release** workflow from the list.
+3.  Click the **Run workflow** dropdown button.
+4.  Fill in the required inputs:
+    - **Version**: The exact version to release (e.g., `v0.2.1`).
+    - **Ref**: The branch or commit SHA to release from (defaults to `main`).
+    - **Dry Run**: Leave as `true` to test the workflow without publishing, or set to `false` to perform a live release.
+5.  Click **Run workflow**.
+
+## Nightly Releases
+
+In addition to manual releases, this project has an automated nightly release process to provide the latest "bleeding edge" version for testing and development.
+
+### Process
+
+Every night at midnight UTC, the [Release workflow](https://github.com/google-gemini/gemini-cli/actions/workflows/release.yml) runs automatically on a schedule. It performs the following steps:
+
+1.  Checks out the latest code from the `main` branch.
+2.  Installs all dependencies.
+3.  Runs the full suite of `preflight` checks and integration tests.
+4.  If all tests succeed, it calculates the next nightly version number (e.g., `v0.2.1-nightly.20230101`).
+5.  It then builds and publishes the packages to npm with the `nightly` dist-tag.
+6.  Finally, it creates a GitHub Release for the nightly version.
+
+### Failure Handling
+
+If any step in the nightly workflow fails, it will automatically create a new issue in the repository with the labels `bug` and `nightly-failure`. The issue will contain a link to the failed workflow run for easy debugging.
+
+### How to Use the Nightly Build
+
+To install the latest nightly build, use the `@nightly` tag:
+
+```bash
+npm install -g @google/gemini-cli@nightly
+```
+
+We also run a Google cloud build called [release-docker.yml](../.gcp/release-docker.yaml). Which publishes the sandbox docker to match your release. This will also be moved to GH and combined with the main release file once service account permissions are sorted out.
+
+### After the Release
+
+After the workflow has successfully completed, you can monitor its progress in the [GitHub Actions tab](https://github.com/google-gemini/gemini-cli/actions/workflows/release.yml). Once complete, you should:
+
+1.  Go to the [pull requests page](https://github.com/google-gemini/gemini-cli/pulls) of the repository.
+2.  Create a new pull request from the `release/vX.Y.Z` branch to `main`.
+3.  Review the pull request (it should only contain version updates in `package.json` files) and merge it. This keeps the version in `main` up-to-date.
+
+## Release Validation
+
+After pushing a new release smoke testing should be performed to ensure that the packages are working as expected. This can be done by installing the packages locally and running a set of tests to ensure that they are functioning correctly.
+
+- `npx -y @google/gemini-cli@latest --version` to validate the push worked as expected if you were not doing a rc or dev tag
+- `npx -y @google/gemini-cli@<release tag> --version` to validate the tag pushed appropriately
+- _This is destructive locally_ `npm uninstall @google/gemini-cli && npm uninstall -g @google/gemini-cli && npm cache clean --force &&  npm install @google/gemini-cli@<version>`
+- Smoke testing a basic run through of exercising a few llm commands and tools is recommended to ensure that the packages are working as expected. We'll codify this more in the future.
+
+## When to merge the version change, or not?
+
+The above pattern for creating patch or hotfix releases from current or older commits leaves the repository in the following state:
+
+1.  The Tag (`vX.Y.Z-patch.1`): This tag correctly points to the original commit on main
+    that contains the stable code you intended to release. This is crucial. Anyone checking
+    out this tag gets the exact code that was published.
+2.  The Branch (`release-vX.Y.Z-patch.1`): This branch contains one new commit on top of the
+    tagged commit. That new commit only contains the version number change in package.json
+    (and other related files like package-lock.json).
+
+This separation is good. It keeps your main branch history clean of release-specific
+version bumps until you decide to merge them.
+
+This is the critical decision, and it depends entirely on the nature of the release.
+
+### Merge Back for Stable Patches and Hotfixes
+
+You almost always want to merge the `release-<tag>` branch back into `main` for any
+stable patch or hotfix release.
+
+- Why? The primary reason is to update the version in main's package.json. If you release
+  v1.2.1 from an older commit but never merge the version bump back, your main branch's
+  package.json will still say "version": "1.2.0". The next developer who starts work for
+  the next feature release (v1.3.0) will be branching from a codebase that has an
+  incorrect, older version number. This leads to confusion and requires manual version
+  bumping later.
+- The Process: After the release-v1.2.1 branch is created and the package is successfully
+  published, you should open a pull request to merge release-v1.2.1 into main. This PR
+  will contain just one commit: "chore: bump version to v1.2.1". It's a clean, simple
+  integration that keeps your main branch in sync with the latest released version.
+
+### Do NOT Merge Back for Pre-Releases (RC, Beta, Dev)
+
+You typically do not merge release branches for pre-releases back into `main`.
+
+- Why? Pre-release versions (e.g., v1.3.0-rc.1, v1.3.0-rc.2) are, by definition, not
+  stable and are temporary. You don't want to pollute your main branch's history with a
+  series of version bumps for release candidates. The package.json in main should reflect
+  the latest stable release version, not an RC.
+- The Process: The release-v1.3.0-rc.1 branch is created, the npm publish --tag rc happens,
+  and then... the branch has served its purpose. You can simply delete it. The code for
+  the RC is already on main (or a feature branch), so no functional code is lost. The
+  release branch was just a temporary vehicle for the version number.
+
+## Local Testing and Validation: Changes to the Packaging and Publishing Process
+
+If you need to test the release process without actually publishing to NPM or creating a public GitHub release, you can trigger the workflow manually from the GitHub UI.
+
+1.  Go to the [Actions tab](https://github.com/google-gemini/gemini-cli/actions/workflows/release.yml) of the repository.
+2.  Click on the "Run workflow" dropdown.
+3.  Leave the `dry_run` option checked (`true`).
+4.  Click the "Run workflow" button.
+
+This will run the entire release process but will skip the `npm publish` and `gh release create` steps. You can inspect the workflow logs to ensure everything is working as expected.
+
+It is crucial to test any changes to the packaging and publishing process locally before committing them. This ensures that the packages will be published correctly and that they will work as expected when installed by a user.
+
+To validate your changes, you can perform a dry run of the publishing process. This will simulate the publishing process without actually publishing the packages to the npm registry.
+
+```bash
+npm_package_version=9.9.9 SANDBOX_IMAGE_REGISTRY="registry" SANDBOX_IMAGE_NAME="thename" npm run publish:npm --dry-run
+```
+
+This command will do the following:
+
+1.  Build all the packages.
+2.  Run all the prepublish scripts.
+3.  Create the package tarballs that would be published to npm.
+4.  Print a summary of the packages that would be published.
+
+You can then inspect the generated tarballs to ensure that they contain the correct files and that the `package.json` files have been updated correctly. The tarballs will be created in the root of each package's directory (e.g., `packages/cli/google-gemini-cli-0.1.6.tgz`).
+
+By performing a dry run, you can be confident that your changes to the packaging process are correct and that the packages will be published successfully.
+
+## Release Deep Dive
+
+The main goal of the release process is to take the source code from the packages/ directory, build it, and assemble a
+clean, self-contained package in a temporary `bundle` directory at the root of the project. This `bundle` directory is what
+actually gets published to NPM.
+
+Here are the key stages:
+
+Stage 1: Pre-Release Sanity Checks and Versioning
+
+- What happens: Before any files are moved, the process ensures the project is in a good state. This involves running tests,
+  linting, and type-checking (npm run preflight). The version number in the root package.json and packages/cli/package.json
+  is updated to the new release version.
+- Why: This guarantees that only high-quality, working code is released. Versioning is the first step to signify a new
+  release.
+
+Stage 2: Building the Source Code
+
+- What happens: The TypeScript source code in packages/core/src and packages/cli/src is compiled into JavaScript.
+- File movement:
+  - packages/core/src/\*_/_.ts -> compiled to -> packages/core/dist/
+  - packages/cli/src/\*_/_.ts -> compiled to -> packages/cli/dist/
+- Why: The TypeScript code written during development needs to be converted into plain JavaScript that can be run by
+  Node.js. The core package is built first as the cli package depends on it.
+
+Stage 3: Assembling the Final Publishable Package
+
+This is the most critical stage where files are moved and transformed into their final state for publishing. A temporary
+`bundle` folder is created at the project root to house the final package contents.
+
+1.  The `package.json` is Transformed:
+    - What happens: The package.json from packages/cli/ is read, modified, and written into the root `bundle`/ directory.
+    - File movement: packages/cli/package.json -> (in-memory transformation) -> `bundle`/package.json
+    - Why: The final package.json must be different from the one used in development. Key changes include:
+      - Removing devDependencies.
+      - Removing workspace-specific "dependencies": { "@gemini-cli/core": "workspace:\*" } and ensuring the core code is
+        bundled directly into the final JavaScript file.
+      - Ensuring the bin, main, and files fields point to the correct locations within the final package structure.
+
+2.  The JavaScript Bundle is Created:
+    - What happens: The built JavaScript from both packages/core/dist and packages/cli/dist are bundled into a single,
+      executable JavaScript file.
+    - File movement: packages/cli/dist/index.js + packages/core/dist/index.js -> (bundled by esbuild) -> `bundle`/gemini.js (or a
+      similar name).
+    - Why: This creates a single, optimized file that contains all the necessary application code. It simplifies the package
+      by removing the need for the core package to be a separate dependency on NPM, as its code is now included directly.
+
+3.  Static and Supporting Files are Copied:
+    - What happens: Essential files that are not part of the source code but are required for the package to work correctly
+      or be well-described are copied into the `bundle` directory.
+    - File movement:
+      - README.md -> `bundle`/README.md
+      - LICENSE -> `bundle`/LICENSE
+      - packages/cli/src/utils/\*.sb (sandbox profiles) -> `bundle`/
+    - Why:
+      - The README.md and LICENSE are standard files that should be included in any NPM package.
+      - The sandbox profiles (.sb files) are critical runtime assets required for the CLI's sandboxing feature to
+        function. They must be located next to the final executable.
+
+Stage 4: Publishing to NPM
+
+- What happens: The npm publish command is run from inside the root `bundle` directory.
+- Why: By running npm publish from within the `bundle` directory, only the files we carefully assembled in Stage 3 are uploaded
+  to the NPM registry. This prevents any source code, test files, or development configurations from being accidentally
+  published, resulting in a clean and minimal package for users.
+
+Summary of File Flow
+
+```mermaid
+graph TD
+    subgraph "Source Files"
+        A["packages/core/src/*.ts<br/>packages/cli/src/*.ts"]
+        B["packages/cli/package.json"]
+        C["README.md<br/>LICENSE<br/>packages/cli/src/utils/*.sb"]
+    end
+
+    subgraph "Process"
+        D(Build)
+        E(Transform)
+        F(Assemble)
+        G(Publish)
+    end
+
+    subgraph "Artifacts"
+        H["Bundled JS"]
+        I["Final package.json"]
+        J["bundle/"]
+    end
+
+    subgraph "Destination"
+        K["NPM Registry"]
+    end
+
+    A --> D --> H
+    B --> E --> I
+    C --> F
+    H --> F
+    I --> F
+    F --> J
+    J --> G --> K
+```
+
+This process ensures that the final published artifact is a purpose-built, clean, and efficient representation of the
+project, rather than a direct copy of the development workspace.
+
 ## NPM Workspaces
 
 This project uses [NPM Workspaces](https://docs.npmjs.com/cli/v10/using-npm/workspaces) to manage the packages within this monorepo. This simplifies development by allowing us to manage dependencies and run scripts across multiple packages from the root of the project.

docs/quota-and-pricing.md

@@ -1,113 +1,70 @@
 # Gemini CLI: Quotas and Pricing
 
-Gemini CLI offers a generous free tier that covers the use cases for many individual developers. For enterprise / professional usage, or if you need higher limits, there are multiple possible avenues depending on what type of account you use to authenticate.
-
-See [privacy and terms](./tos-privacy.md) for details on Privacy policy and Terms of Service.
-
-Note: published prices are list price; additional negotiated commercial discounting may apply.
+Your Gemini CLI quotas and pricing depend on the type of account you use to authenticate with Google. Additionally, both quotas and pricing may be calculated differently based on the model version, requests, and tokens used. A summary of model usage is available through the `/stats` command and presented on exit at the end of a session. See [privacy and terms](./tos-privacy.md) for details on Privacy policy and Terms of Service. Note: published prices are list price; additional negotiated commercial discounting may apply.
 
 This article outlines the specific quotas and pricing applicable to the Gemini CLI when using different authentication methods.
 
-Generally, there are three categories to choose from:
+## 1. Log in with Google (Gemini Code Assist Free Tier)
 
-- Free Usage: Ideal for experimentation and light use.
-- Paid Tier (fixed price): For individual developers or enterprises who need more generous daily quotas and predictable costs.
-- Pay-As-You-Go: The most flexible option for professional use, long-running tasks, or when you need full control over your usage.
+For users who authenticate by using their Google account to access Gemini Code Assist for individuals:
 
-## Free Usage
+- **Quota:**
+  - 60 requests per minute
+  - 1000 requests per day
+  - Token usage is not applicable
+- **Cost:** Free
+- **Details:** [Gemini Code Assist Quotas](https://developers.google.com/gemini-code-assist/resources/quotas#quotas-for-agent-mode-gemini-cli)
+- **Notes:** A specific quota for different models is not specified; model fallback may occur to preserve shared experience quality.
 
-Your journey begins with a generous free tier, perfect for experimentation and light use.
+## 2. Gemini API Key (Unpaid)
 
-Your free usage limits depend on your authorization type.
+If you are using a Gemini API key for the free tier:
 
-### Log in with Google (Gemini Code Assist for individuals)
+- **Quota:**
+  - Flash model only
+  - 10 requests per minute
+  - 250 requests per day
+- **Cost:** Free
+- **Details:** [Gemini API Rate Limits](https://ai.google.dev/gemini-api/docs/rate-limits)
 
-For users who authenticate by using their Google account to access Gemini Code Assist for individuals. This includes:
+## 3. Gemini API Key (Paid)
 
-- 1000 model requests / user / day
-- 60 model requests / user / minute
-- Model requests will be made across the Gemini model family as determined by Gemini CLI.
+If you are using a Gemini API key with a paid plan:
 
-Learn more at [Gemini Code Assist for Individuals Limits](https://developers.google.com/gemini-code-assist/resources/quotas#quotas-for-agent-mode-gemini-cli).
+- **Quota:** Varies by pricing tier.
+- **Cost:** Varies by pricing tier and model/token usage.
+- **Details:** [Gemini API Rate Limits](https://ai.google.dev/gemini-api/docs/rate-limits), [Gemini API Pricing](https://ai.google.dev/gemini-api/docs/pricing)
 
-### Log in with Gemini API Key (Unpaid)
+## 4. Login with Google (for Workspace or Licensed Code Assist users)
 
-If you are using a Gemini API key, you can also benefit from a free tier. This includes:
+For users of Standard or Enterprise editions of Gemini Code Assist, quotas and pricing are based on a fixed price subscription with assigned license seats:
 
-- 250 model requests / user / day
-- 10 model requests / user / minute
-- Model requests to Flash model only.
+- **Standard Tier:**
+  - **Quota:** 120 requests per minute, 1500 per day
+- **Enterprise Tier:**
+  - **Quota:** 120 requests per minute, 2000 per day
+- **Cost:** Fixed price included with your Gemini for Google Workspace or Gemini Code Assist subscription.
+- **Details:** [Gemini Code Assist Quotas](https://developers.google.com/gemini-code-assist/resources/quotas#quotas-for-agent-mode-gemini-cli), [Gemini Code Assist Pricing](https://cloud.google.com/products/gemini/pricing)
+- **Notes:**
+  - Specific quota for different models is not specified; model fallback may occur to preserve shared experience quality.
+  - Members of the Google Developer Program may have Gemini Code Assist licenses through their membership.
 
-Learn more at [Gemini API Rate Limits](https://ai.google.dev/gemini-api/docs/rate-limits).
+## 5. Vertex AI (Express Mode)
 
-### Log in with Vertex AI (Express Mode)
+If you are using Vertex AI in Express Mode:
 
-Vertex AI offers an Express Mode without the need to enable billing. This includes:
+- **Quota:** Quotas are variable and specific to your account. See the source for more details.
+- **Cost:** After your Express Mode usage is consumed and you enable billing for your project, cost is based on standard [Vertex AI Pricing](https://cloud.google.com/vertex-ai/pricing).
+- **Details:** [Vertex AI Express Mode Quotas](https://cloud.google.com/vertex-ai/generative-ai/docs/start/express-mode/overview#quotas)
 
-- 90 days before you need to enable billing.
-- Quotas and models are variable and specific to your account.
+## 6. Vertex AI (Regular Mode)
 
-Learn more at [Vertex AI Express Mode Limits](https://cloud.google.com/vertex-ai/generative-ai/docs/start/express-mode/overview#quotas).
+If you are using the standard Vertex AI service:
 
-## Paid tier: Higher limits for a fixed cost
+- **Quota:** Governed by a dynamic shared quota system or pre-purchased provisioned throughput.
+- **Cost:** Based on model and token usage. See [Vertex AI Pricing](https://cloud.google.com/vertex-ai/pricing).
+- **Details:** [Vertex AI Dynamic Shared Quota](https://cloud.google.com/vertex-ai/generative-ai/docs/resources/dynamic-shared-quota)
 
-If you use up your initial number of requests, you can continue to benefit from Gemini CLI by upgrading to one of the following subscriptions:
-
-- [Google AI Pro and AI Ultra](https://cloud.google.com/products/gemini/pricing) by signing up at [Set up Gemini Code Assist](https://goo.gle/set-up-gemini-code-assist). This is recommended for individual developers. Quotas and pricing are based on a fixed price subscription.
-
-  For predictable costs, you can log in with Google.
-
-  Learn more at [Gemini Code Assist Quotas and Limits](https://developers.google.com/gemini-code-assist/resources/quotas)
-
-- [Purchase a Gemini Code Assist Subscription through Google Cloud ](https://cloud.google.com/gemini/docs/codeassist/overview) by signing up in the Google Cloud console. Learn more at [Set up Gemini Code Assist] (https://cloud.google.com/gemini/docs/discover/set-up-gemini) Quotas and pricing are based on a fixed price subscription with assigned license seats. For predictable costs, you can sign in with Google.
-
-  This includes:
-  - Gemini Code Assist Standard edition:
-    - 1500 model requests / user / day
-    - 120 model requests / user / minute
-  - Gemini Code Assist Enterprise edition:
-    - 2000 model requests / user / day
-    - 120 model requests / user / minute
-  - Model requests will be made across the Gemini model family as determined by Gemini CLI.
-
-  [Learn more about Gemini Code Assist Standard and Enterprise license limits](https://developers.google.com/gemini-code-assist/resources/quotas#quotas-for-agent-mode-gemini-cli).
-
-## Pay As You Go
-
-If you hit your daily request limits or exhaust your Gemini Pro quota even after upgrading, the most flexible solution is to switch to a pay-as-you-go model, where you pay for the specific amount of processing you use. This is the recommended path for uninterrupted access.
-
-To do this, log in using a Gemini API key or Vertex AI.
-
-- Vertex AI (Regular Mode):
-  - Quota: Governed by a dynamic shared quota system or pre-purchased provisioned throughput.
-  - Cost: Based on model and token usage.
-
-Learn more at [Vertex AI Dynamic Shared Quota](https://cloud.google.com/vertex-ai/generative-ai/docs/resources/dynamic-shared-quota) and [Vertex AI Pricing](https://cloud.google.com/vertex-ai/pricing).
-
-- Gemini API key:
-  - Quota: Varies by pricing tier.
-  - Cost: Varies by pricing tier and model/token usage.
-
-Learn more at [Gemini API Rate Limits](https://ai.google.dev/gemini-api/docs/rate-limits), [Gemini API Pricing](https://ai.google.dev/gemini-api/docs/pricing)
-
-It’s important to highlight that when using an API key, you pay per token/call. This can be more expensive for many small calls with few tokens, but it's the only way to ensure your workflow isn't interrupted by quota limits.
-
-## Gemini for Workspace plans
+## 7. Google One and Ultra plans, Gemini for Workspace plans
 
 These plans currently apply only to the use of Gemini web-based products provided by Google-based experiences (for example, the Gemini web app or the Flow video editor). These plans do not apply to the API usage which powers the Gemini CLI. Supporting these plans is under active consideration for future support.
-
-## Tips to Avoid High Costs
-
-When using a Pay as you Go API key, be mindful of your usage to avoid unexpected costs.
-
-- Don't blindly accept every suggestion, especially for computationally intensive tasks like refactoring large codebases.
-- Be intentional with your prompts and commands. You are paying per call, so think about the most efficient way to get the job done.
-
-## Gemini API vs. Vertex
-
-- Gemini API (gemini developer api): This is the fastest way to use the Gemini models directly.
-- Vertex AI: This is the enterprise-grade platform for building, deploying, and managing Gemini models with specific security and control requirements.
-
-## Understanding your usage
-
-A summary of model usage is available through the `/stats` command and presented on exit at the end of a session.

docs/releases.md

@@ -1,369 +0,0 @@
-# Gemini CLI Releases
-
-## Release Cadence and Tags
-
-We will follow https://semver.org/ as closely as possible but will call out when or if we have to deviate from it. Our weekly releases will be minor version increments and any bug or hotfixes between releases will go out as patch versions on the most recent release.
-
-Each Tuesday ~2000 UTC new Stable and Preview releases will be cut. The promotion flow is:
-
-- Code is commited to main and pushed each night to nightly
-- After no more than 1 week on main, code is promoted to the `preview` channel
-- After 1 week the most recent `preview` channel is promoted to `stable` cannel
-- Patch fixes will be produced against both `preview` and `stable` as needed, with the final 'patch' version number incrementing each time.
-
-### Preview
-
-These releases will not have been fully vetted and may contain regressions or other outstanding issues. Please help us test and install with `preview` tag.
-
-```bash
-npm install -g @google/gemini-cli@preview
-```
-
-### Stable
-
-This will be the full promotion of last week's release + any bug fixes and validations. Use `latest` tag.
-
-```bash
-npm install -g @google/gemini-cli@latest
-```
-
-### Nightly
-
-- New releases will be published each day at UTC 0000. This will be all changes from the main branch as represented at time of release. It should be assumed there are pending validations and issues. Use `nightly` tag.
-
-```bash
-npm install -g @google/gemini-cli@nightly
-```
-
-## Weekly Release Promotion
-
-Each Tuesday, the on-call engineer will trigger the "Promote Release" workflow. This single action automates the entire weekly release process:
-
-1.  **Promotes Preview to Stable:** The workflow identifies the latest `preview` release and promotes it to `stable`. This becomes the new `latest` version on npm.
-2.  **Promotes Nightly to Preview:** The latest `nightly` release is then promoted to become the new `preview` version.
-3.  **Prepares for next Nightly:** A pull request is automatically created and merged to bump the version in `main` in preparation for the next nightly release.
-
-This process ensures a consistent and reliable release cadence with minimal manual intervention.
-
-### Source of Truth for Versioning
-
-To ensure the highest reliability, the release promotion process uses the **NPM registry as the single source of truth** for determining the current version of each release channel (`stable`, `preview`, and `nightly`).
-
-1.  **Fetch from NPM:** The workflow begins by querying NPM's `dist-tags` (`latest`, `preview`, `nightly`) to get the exact version strings for the packages currently available to users.
-2.  **Cross-Check for Integrity:** For each version retrieved from NPM, the workflow performs a critical integrity check:
-    - It verifies that a corresponding **git tag** exists in the repository.
-    - It verifies that a corresponding **GitHub Release** has been created.
-3.  **Halt on Discrepancy:** If either the git tag or the GitHub Release is missing for a version listed on NPM, the workflow will immediately fail. This strict check prevents promotions from a broken or incomplete previous release and alerts the on-call engineer to a release state inconsistency that must be manually resolved.
-4.  **Calculate Next Version:** Only after these checks pass does the workflow proceed to calculate the next semantic version based on the trusted version numbers retrieved from NPM.
-
-This NPM-first approach, backed by integrity checks, makes the release process highly robust and prevents the kinds of versioning discrepancies that can arise from relying solely on git history or API outputs.
-
-## Manual Releases
-
-For situations requiring a release outside of the regular nightly and weekly promotion schedule, and NOT already covered by patching process, you can use the `Release: Manual` workflow. This workflow provides a direct way to publish a specific version from any branch, tag, or commit SHA.
-
-### How to Create a Manual Release
-
-1.  Navigate to the **Actions** tab of the repository.
-2.  Select the **Release: Manual** workflow from the list.
-3.  Click the **Run workflow** dropdown button.
-4.  Fill in the required inputs:
-    - **Version**: The exact version to release (e.g., `v0.6.1`). This must be a valid semantic version with a `v` prefix.
-    - **Ref**: The branch, tag, or full commit SHA to release from.
-    - **NPM Channel**: The npm channel to publish to. The options are `preview`, `nightly`, `latest` (for stable releases), and `dev`. The default is `dev`.
-    - **Dry Run**: Leave as `true` to run all steps without publishing, or set to `false` to perform a live release.
-    - **Force Skip Tests**: Set to `true` to skip the test suite. This is not recommended for production releases.
-    - **Skip GitHub Release**: Set to `true` to skip creating a GitHub release and create an npm release only.
-5.  Click **Run workflow**.
-
-The workflow will then proceed to test (if not skipped), build, and publish the release. If the workflow fails during a non-dry run, it will automatically create a GitHub issue with the failure details.
-
-## Rollback/Rollforward
-
-In the event that a release has a critical regression, you can quickly roll back to a previous stable version or roll forward to a new patch by changing the npm `dist-tag`. The `Release: Change Tags` workflow provides a safe and controlled way to do this.
-
-This is the preferred method for both rollbacks and rollforwards, as it does not require a full release cycle.
-
-### How to Change a Release Tag
-
-1.  Navigate to the **Actions** tab of the repository.
-2.  Select the **Release: Change Tags** workflow from the list.
-3.  Click the **Run workflow** dropdown button.
-4.  Fill in the required inputs:
-    - **Version**: The existing package version that you want to point the tag to (e.g., `0.5.0-preview-2`). This version **must** already be published to the npm registry.
-    - **Channel**: The npm `dist-tag` to apply (e.g., `preview`, `stable`).
-    - **Dry Run**: Leave as `true` to log the action without making changes, or set to `false` to perform the live tag change.
-5.  Click **Run workflow**.
-
-The workflow will then run `npm dist-tag add` for both the `@google/gemini-cli` and `@google/gemini-cli-core` packages, pointing the specified channel to the specified version.
-
-## Patching
-
-If a critical bug that is already fixed on `main` needs to be patched on a `stable` or `preview` release, the process is now highly automated.
-
-### How to Patch
-
-#### 1. Create the Patch Pull Request
-
-There are two ways to create a patch pull request:
-
-**Option A: From a GitHub Comment (Recommended)**
-
-After a pull request containing the fix has been merged, a maintainer can add a comment on that same PR with the following format:
-
-`/patch [channel]`
-
-- **channel** (optional):
-  - _no channel_ - patches both stable and preview channels (default, recommended for most fixes)
-  - `both` - patches both stable and preview channels (same as default)
-  - `stable` - patches only the stable channel
-  - `preview` - patches only the preview channel
-
-Examples:
-
-- `/patch` (patches both stable and preview - default)
-- `/patch both` (patches both stable and preview - explicit)
-- `/patch stable` (patches only stable)
-- `/patch preview` (patches only preview)
-
-The `Release: Patch from Comment` workflow will automatically find the merge commit SHA and trigger the `Release: Patch (1) Create PR` workflow. If the PR is not yet merged, it will post a comment indicating the failure.
-
-**Option B: Manually Triggering the Workflow**
-
-Navigate to the **Actions** tab and run the **Release: Patch (1) Create PR** workflow.
-
-- **Commit**: The full SHA of the commit on `main` that you want to cherry-pick.
-- **Channel**: The channel you want to patch (`stable` or `preview`).
-
-This workflow will automatically:
-
-1.  Find the latest release tag for the channel.
-2.  Create a release branch from that tag if one doesn't exist (e.g., `release/v0.5.1`).
-3.  Create a new hotfix branch from the release branch.
-4.  Cherry-pick your specified commit into the hotfix branch.
-5.  Create a pull request from the hotfix branch back to the release branch.
-
-#### 2. Review and Merge
-
-Review the automatically created pull request(s) to ensure the cherry-pick was successful and the changes are correct. Once approved, merge the pull request.
-
-**Security Note:** The `release/*` branches are protected by branch protection rules. A pull request to one of these branches requires at least one review from a code owner before it can be merged. This ensures that no unauthorized code is released.
-
-#### 2.5. Adding Multiple Commits to a Hotfix (Advanced)
-
-If you need to include multiple fixes in a single patch release, you can add additional commits to the hotfix branch after the initial patch PR has been created:
-
-1. **Start with the primary fix**: Use `/patch` (or `/patch both`) on the most important PR to create the initial hotfix branch and PR.
-
-2. **Checkout the hotfix branch locally**:
-
-   ```bash
-   git fetch origin
-   git checkout hotfix/v0.5.1/stable/cherry-pick-abc1234  # Use the actual branch name from the PR
-   ```
-
-3. **Cherry-pick additional commits**:
-
-   ```bash
-   git cherry-pick <commit-sha-1>
-   git cherry-pick <commit-sha-2>
-   # Add as many commits as needed
-   ```
-
-4. **Push the updated branch**:
-
-   ```bash
-   git push origin hotfix/v0.5.1/stable/cherry-pick-abc1234
-   ```
-
-5. **Test and review**: The existing patch PR will automatically update with your additional commits. Test thoroughly since you're now releasing multiple changes together.
-
-6. **Update the PR description**: Consider updating the PR title and description to reflect that it includes multiple fixes.
-
-This approach allows you to group related fixes into a single patch release while maintaining full control over what gets included and how conflicts are resolved.
-
-#### 3. Automatic Release
-
-Upon merging the pull request, the `Release: Patch (2) Trigger` workflow is automatically triggered. It will then start the `Release: Patch (3) Release` workflow, which will:
-
-1.  Build and test the patched code.
-2.  Publish the new patch version to npm.
-3.  Create a new GitHub release with the patch notes.
-
-This fully automated process ensures that patches are created and released consistently and reliably.
-
-#### Troubleshooting: Older Branch Workflows
-
-**Issue**: If the patch trigger workflow fails with errors like "Resource not accessible by integration" or references to non-existent workflow files (e.g., `patch-release.yml`), this indicates the hotfix branch contains an outdated version of the workflow files.
-
-**Root Cause**: When a PR is merged, GitHub Actions runs the workflow definition from the **source branch** (the hotfix branch), not from the target branch (the release branch). If the hotfix branch was created from an older release branch that predates workflow improvements, it will use the old workflow logic.
-
-**Solutions**:
-
-**Option 1: Manual Trigger (Quick Fix)**
-Manually trigger the updated workflow from the branch with the latest workflow code:
-
-```bash
-# For a preview channel patch with tests skipped
-gh workflow run release-patch-2-trigger.yml --ref <branch-with-updated-workflow> \
-  --field ref="hotfix/v0.6.0-preview.2/preview/cherry-pick-abc1234" \
-  --field workflow_ref=<branch-with-updated-workflow> \
-  --field dry_run=false \
-  --field force_skip_tests=true
-
-# For a stable channel patch
-gh workflow run release-patch-2-trigger.yml --ref <branch-with-updated-workflow> \
-  --field ref="hotfix/v0.5.1/stable/cherry-pick-abc1234" \
-  --field workflow_ref=<branch-with-updated-workflow> \
-  --field dry_run=false \
-  --field force_skip_tests=false
-
-# Example using main branch (most common case)
-gh workflow run release-patch-2-trigger.yml --ref main \
-  --field ref="hotfix/v0.6.0-preview.2/preview/cherry-pick-abc1234" \
-  --field workflow_ref=main \
-  --field dry_run=false \
-  --field force_skip_tests=true
-```
-
-**Note**: Replace `<branch-with-updated-workflow>` with the branch containing the latest workflow improvements (usually `main`, but could be a feature branch if testing updates).
-
-**Option 2: Update the Hotfix Branch**
-Merge the latest main branch into your hotfix branch to get the updated workflows:
-
-```bash
-git checkout hotfix/v0.6.0-preview.2/preview/cherry-pick-abc1234
-git merge main
-git push
-```
-
-Then close and reopen the PR to retrigger the workflow with the updated version.
-
-**Option 3: Direct Release Trigger**
-Skip the trigger workflow entirely and directly run the release workflow:
-
-```bash
-# Replace channel and release_ref with appropriate values
-gh workflow run release-patch-3-release.yml --ref main \
-  --field type="preview" \
-  --field dry_run=false \
-  --field force_skip_tests=true \
-  --field release_ref="release/v0.6.0-preview.2"
-```
-
-### Docker
-
-We also run a Google cloud build called [release-docker.yml](../.gcp/release-docker.yml). Which publishes the sandbox docker to match your release. This will also be moved to GH and combined with the main release file once service account permissions are sorted out.
-
-## Release Validation
-
-After pushing a new release smoke testing should be performed to ensure that the packages are working as expected. This can be done by installing the packages locally and running a set of tests to ensure that they are functioning correctly.
-
-- `npx -y @google/gemini-cli@latest --version` to validate the push worked as expected if you were not doing a rc or dev tag
-- `npx -y @google/gemini-cli@<release tag> --version` to validate the tag pushed appropriately
-- _This is destructive locally_ `npm uninstall @google/gemini-cli && npm uninstall -g @google/gemini-cli && npm cache clean --force &&  npm install @google/gemini-cli@<version>`
-- Smoke testing a basic run through of exercising a few llm commands and tools is recommended to ensure that the packages are working as expected. We'll codify this more in the future.
-
-## Local Testing and Validation: Changes to the Packaging and Publishing Process
-
-If you need to test the release process without actually publishing to NPM or creating a public GitHub release, you can trigger the workflow manually from the GitHub UI.
-
-1.  Go to the [Actions tab](https://github.com/google-gemini/gemini-cli/actions/workflows/release-manual.yml) of the repository.
-2.  Click on the "Run workflow" dropdown.
-3.  Leave the `dry_run` option checked (`true`).
-4.  Click the "Run workflow" button.
-
-This will run the entire release process but will skip the `npm publish` and `gh release create` steps. You can inspect the workflow logs to ensure everything is working as expected.
-
-It is crucial to test any changes to the packaging and publishing process locally before committing them. This ensures that the packages will be published correctly and that they will work as expected when installed by a user.
-
-To validate your changes, you can perform a dry run of the publishing process. This will simulate the publishing process without actually publishing the packages to the npm registry.
-
-```bash
-npm_package_version=9.9.9 SANDBOX_IMAGE_REGISTRY="registry" SANDBOX_IMAGE_NAME="thename" npm run publish:npm --dry-run
-```
-
-This command will do the following:
-
-1.  Build all the packages.
-2.  Run all the prepublish scripts.
-3.  Create the package tarballs that would be published to npm.
-4.  Print a summary of the packages that would be published.
-
-You can then inspect the generated tarballs to ensure that they contain the correct files and that the `package.json` files have been updated correctly. The tarballs will be created in the root of each package's directory (e.g., `packages/cli/google-gemini-cli-0.1.6.tgz`).
-
-By performing a dry run, you can be confident that your changes to the packaging process are correct and that the packages will be published successfully.
-
-## Release Deep Dive
-
-The release process creates two distinct types of artifacts for different distribution channels: standard packages for the NPM registry and a single, self-contained executable for GitHub Releases.
-
-Here are the key stages:
-
-**Stage 1: Pre-Release Sanity Checks and Versioning**
-
-- **What happens:** Before any files are moved, the process ensures the project is in a good state. This involves running tests, linting, and type-checking (`npm run preflight`). The version number in the root `package.json` and `packages/cli/package.json` is updated to the new release version.
-
-**Stage 2: Building the Source Code for NPM**
-
-- **What happens:** The TypeScript source code in `packages/core/src` and `packages/cli/src` is compiled into standard JavaScript.
-- **File movement:**
-  - `packages/core/src/**/*.ts` -> compiled to -> `packages/core/dist/`
-  - `packages/cli/src/**/*.ts` -> compiled to -> `packages/cli/dist/`
-- **Why:** The TypeScript code written during development needs to be converted into plain JavaScript that can be run by Node.js. The `core` package is built first as the `cli` package depends on it.
-
-**Stage 3: Publishing Standard Packages to NPM**
-
-- **What happens:** The `npm publish` command is run for the `@google/gemini-cli-core` and `@google/gemini-cli` packages.
-- **Why:** This publishes them as standard Node.js packages. Users installing via `npm install -g @google/gemini-cli` will download these packages, and `npm` will handle installing the `@google/gemini-cli-core` dependency automatically. The code in these packages is not bundled into a single file.
-
-**Stage 4: Assembling and Creating the GitHub Release Asset**
-
-This stage happens _after_ the NPM publish and creates the single-file executable that enables `npx` usage directly from the GitHub repository.
-
-1.  **The JavaScript Bundle is Created:**
-    - **What happens:** The built JavaScript from both `packages/core/dist` and `packages/cli/dist`, along with all third-party JavaScript dependencies, are bundled by `esbuild` into a single, executable JavaScript file (e.g., `gemini.js`). The `node-pty` library is excluded from this bundle as it contains native binaries.
-    - **Why:** This creates a single, optimized file that contains all the necessary application code. It simplifies execution for users who want to run the CLI without a full `npm install`, as all dependencies (including the `core` package) are included directly.
-
-2.  **The `bundle` Directory is Assembled:**
-    - **What happens:** A temporary `bundle` folder is created at the project root. The single `gemini.js` executable is placed inside it, along with other essential files.
-    - **File movement:**
-      - `gemini.js` (from esbuild) -> `bundle/gemini.js`
-      - `README.md` -> `bundle/README.md`
-      - `LICENSE` -> `bundle/LICENSE`
-      - `packages/cli/src/utils/*.sb` (sandbox profiles) -> `bundle/`
-    - **Why:** This creates a clean, self-contained directory with everything needed to run the CLI and understand its license and usage.
-
-3.  **The GitHub Release is Created:**
-    - **What happens:** The contents of the `bundle` directory, including the `gemini.js` executable, are attached as assets to a new GitHub Release.
-    - **Why:** This makes the single-file version of the CLI available for direct download and enables the `npx https://github.com/google-gemini/gemini-cli` command, which downloads and runs this specific bundled asset.
-
-**Summary of Artifacts**
-
-- **NPM:** Publishes standard, un-bundled Node.js packages. The primary artifact is the code in `packages/cli/dist`, which depends on `@google/gemini-cli-core`.
-- **GitHub Release:** Publishes a single, bundled `gemini.js` file that contains all dependencies, for easy execution via `npx`.
-
-This dual-artifact process ensures that both traditional `npm` users and those who prefer the convenience of `npx` have an optimized experience.
-
-## Notifications
-
-Failing release workflows will automatically create an issue with the label
-`release-failure`.
-
-A notification will be posted to the maintainer's chat channel when issues with
-this type are created.
-
-### Modifying chat notifications
-
-Notifications use [GitHub for Google Chat](https://workspace.google.com/marketplace/app/github_for_google_chat/536184076190). To modify the notifications, use `/github-settings` within the chat space.
-
-> [!WARNING]
-> The following instructions describe a fragile workaround that depends on the internal structure of the chat application's UI. It is likely to break with future updates.
-
-The list of available labels is not currently populated correctly. If you want to add a label that does not appear alphabetically in the first 30 labels in the repo, you must use your browser's developer tools to manually modify the UI:
-
-1. Open your browser's developer tools (e.g., Chrome DevTools).
-2. In the `/github-settings` dialog, inspect the list of labels.
-3. Locate one of the `<li>` elements representing a label.
-4. In the HTML, modify the `data-option-value` attribute of that `<li>` element to the desired label name (e.g., `release-failure`).
-5. Click on your modified label in the UI to select it, then save your settings.

docs/sandbox.md

@@ -55,9 +55,7 @@ gemini -p "run the test suite"
 
 # Configure in settings.json
 {
-  "tools": {
-    "sandbox": "docker"
-  }
+  "sandbox": "docker"
 }
 ```
 
@@ -67,7 +65,7 @@ gemini -p "run the test suite"
 
 1. **Command flag**: `-s` or `--sandbox`
 2. **Environment variable**: `GEMINI_SANDBOX=true|docker|podman|sandbox-exec`
-3. **Settings file**: `"sandbox": true` in the `tools` object of your `settings.json` file (e.g., `{"tools": {"sandbox": true}}`).
+3. **Settings file**: `"sandbox": true` in `settings.json`
 
 ### macOS Seatbelt profiles
 

docs/sidebar.json

@@ -1,69 +0,0 @@
-[
-  {
-    "label": "Overview",
-    "items": [
-      { "label": "Welcome", "slug": "docs" },
-      { "label": "Execution and Deployment", "slug": "docs/deployment" },
-      { "label": "Architecture Overview", "slug": "docs/architecture" }
-    ]
-  },
-  {
-    "label": "CLI",
-    "items": [
-      { "label": "Introduction", "slug": "docs/cli" },
-      { "label": "Authentication", "slug": "docs/cli/authentication" },
-      { "label": "Commands", "slug": "docs/cli/commands" },
-      { "label": "Configuration", "slug": "docs/cli/configuration" },
-      { "label": "Checkpointing", "slug": "docs/checkpointing" },
-      { "label": "Enterprise", "slug": "docs/cli/enterprise" },
-      { "label": "Extensions", "slug": "docs/extension" },
-      { "label": "Headless Mode", "slug": "docs/headless" },
-      { "label": "IDE Integration", "slug": "docs/ide-integration" },
-      {
-        "label": "IDE Companion Spec",
-        "slug": "docs/ide-companion-spec"
-      },
-      { "label": "Telemetry", "slug": "docs/telemetry" },
-      { "label": "Themes", "slug": "docs/cli/themes" },
-      { "label": "Token Caching", "slug": "docs/cli/token-caching" },
-      { "label": "Trusted Folders", "slug": "docs/trusted-folders" },
-      { "label": "Tutorials", "slug": "docs/cli/tutorials" }
-    ]
-  },
-  {
-    "label": "Core",
-    "items": [
-      { "label": "Introduction", "slug": "docs/core" },
-      { "label": "Tools API", "slug": "docs/core/tools-api" },
-      { "label": "Memory Import Processor", "slug": "docs/core/memport" }
-    ]
-  },
-  {
-    "label": "Tools",
-    "items": [
-      { "label": "Overview", "slug": "docs/tools" },
-      { "label": "File System", "slug": "docs/tools/file-system" },
-      { "label": "Multi-File Read", "slug": "docs/tools/multi-file" },
-      { "label": "Shell", "slug": "docs/tools/shell" },
-      { "label": "Web Fetch", "slug": "docs/tools/web-fetch" },
-      { "label": "Web Search", "slug": "docs/tools/web-search" },
-      { "label": "Memory", "slug": "docs/tools/memory" },
-      { "label": "MCP Servers", "slug": "docs/tools/mcp-server" },
-      { "label": "Sandboxing", "slug": "docs/sandbox" }
-    ]
-  },
-  {
-    "label": "Development",
-    "items": [
-      { "label": "NPM", "slug": "docs/npm" },
-      { "label": "Releases", "slug": "docs/releases" }
-    ]
-  },
-  {
-    "label": "Support",
-    "items": [
-      { "label": "Troubleshooting", "slug": "docs/troubleshooting" },
-      { "label": "Terms of Service", "slug": "docs/tos-privacy" }
-    ]
-  }
-]

docs/telemetry.md

@@ -1,216 +1,162 @@
-# Observability with OpenTelemetry
+# Gemini CLI Observability Guide
 
-Learn how to enable and setup OpenTelemetry for Gemini CLI.
+Telemetry provides data about Gemini CLI's performance, health, and usage. By enabling it, you can monitor operations, debug issues, and optimize tool usage through traces, metrics, and structured logs.
 
-- [Observability with OpenTelemetry](#observability-with-opentelemetry)
-  - [Key Benefits](#key-benefits)
-  - [OpenTelemetry Integration](#opentelemetry-integration)
-  - [Configuration](#configuration)
-  - [Google Cloud Telemetry](#google-cloud-telemetry)
-    - [Prerequisites](#prerequisites)
-    - [Direct Export (Recommended)](#direct-export-recommended)
-    - [Collector-Based Export (Advanced)](#collector-based-export-advanced)
-  - [Local Telemetry](#local-telemetry)
-    - [File-based Output (Recommended)](#file-based-output-recommended)
-    - [Collector-Based Export (Advanced)](#collector-based-export-advanced-1)
-  - [Logs and Metrics](#logs-and-metrics)
-    - [Logs](#logs)
-    - [Metrics](#metrics)
-
-## Key Benefits
-
-- **🔍 Usage Analytics**: Understand interaction patterns and feature adoption
-  across your team
-- **⚡ Performance Monitoring**: Track response times, token consumption, and
-  resource utilization
-- **🐛 Real-time Debugging**: Identify bottlenecks, failures, and error patterns
-  as they occur
-- **📊 Workflow Optimization**: Make informed decisions to improve
-  configurations and processes
-- **🏢 Enterprise Governance**: Monitor usage across teams, track costs, ensure
-  compliance, and integrate with existing monitoring infrastructure
-
-## OpenTelemetry Integration
-
-Built on **[OpenTelemetry]** — the vendor-neutral, industry-standard
-observability framework — Gemini CLI's observability system provides:
-
-- **Universal Compatibility**: Export to any OpenTelemetry backend (Google
-  Cloud, Jaeger, Prometheus, Datadog, etc.)
-- **Standardized Data**: Use consistent formats and collection methods across
-  your toolchain
-- **Future-Proof Integration**: Connect with existing and future observability
-  infrastructure
-- **No Vendor Lock-in**: Switch between backends without changing your
-  instrumentation
+Gemini CLI's telemetry system is built on the **[OpenTelemetry] (OTEL)** standard, allowing you to send data to any compatible backend.
 
 [OpenTelemetry]: https://opentelemetry.io/
 
-## Configuration
+## Enabling telemetry
 
-All telemetry behavior is controlled through your `.gemini/settings.json` file.
-These settings can be overridden by environment variables or CLI flags.
+You can enable telemetry in multiple ways. Configuration is primarily managed via the [`.gemini/settings.json` file](./cli/configuration.md) and environment variables, but CLI flags can override these settings for a specific session.
 
-| Setting        | Environment Variable             | CLI Flag                                                 | Description                                       | Values            | Default                 |
-| -------------- | -------------------------------- | -------------------------------------------------------- | ------------------------------------------------- | ----------------- | ----------------------- |
-| `enabled`      | `GEMINI_TELEMETRY_ENABLED`       | `--telemetry` / `--no-telemetry`                         | Enable or disable telemetry                       | `true`/`false`    | `false`                 |
-| `target`       | `GEMINI_TELEMETRY_TARGET`        | `--telemetry-target <local\|gcp>`                        | Where to send telemetry data                      | `"gcp"`/`"local"` | `"local"`               |
-| `otlpEndpoint` | `GEMINI_TELEMETRY_OTLP_ENDPOINT` | `--telemetry-otlp-endpoint <URL>`                        | OTLP collector endpoint                           | URL string        | `http://localhost:4317` |
-| `otlpProtocol` | `GEMINI_TELEMETRY_OTLP_PROTOCOL` | `--telemetry-otlp-protocol <grpc\|http>`                 | OTLP transport protocol                           | `"grpc"`/`"http"` | `"grpc"`                |
-| `outfile`      | `GEMINI_TELEMETRY_OUTFILE`       | `--telemetry-outfile <path>`                             | Save telemetry to file (overrides `otlpEndpoint`) | file path         | -                       |
-| `logPrompts`   | `GEMINI_TELEMETRY_LOG_PROMPTS`   | `--telemetry-log-prompts` / `--no-telemetry-log-prompts` | Include prompts in telemetry logs                 | `true`/`false`    | `true`                  |
-| `useCollector` | `GEMINI_TELEMETRY_USE_COLLECTOR` | -                                                        | Use external OTLP collector (advanced)            | `true`/`false`    | `false`                 |
+### Order of precedence
 
-**Note on boolean environment variables:** For the boolean settings (`enabled`,
-`logPrompts`, `useCollector`), setting the corresponding environment variable to
-`true` or `1` will enable the feature. Any other value will disable it.
+The following lists the precedence for applying telemetry settings, with items listed higher having greater precedence:
 
-For detailed information about all configuration options, see the
-[Configuration Guide](./cli/configuration.md).
+1.  **CLI flags (for `gemini` command):**
+    - `--telemetry` / `--no-telemetry`: Overrides `telemetry.enabled`.
+    - `--telemetry-target <local|gcp>`: Overrides `telemetry.target`.
+    - `--telemetry-otlp-endpoint <URL>`: Overrides `telemetry.otlpEndpoint`.
+    - `--telemetry-log-prompts` / `--no-telemetry-log-prompts`: Overrides `telemetry.logPrompts`.
+    - `--telemetry-outfile <path>`: Redirects telemetry output to a file. See [Exporting to a file](#exporting-to-a-file).
 
-## Google Cloud Telemetry
+1.  **Environment variables:**
+    - `OTEL_EXPORTER_OTLP_ENDPOINT`: Overrides `telemetry.otlpEndpoint`.
 
-### Prerequisites
+1.  **Workspace settings file (`.gemini/settings.json`):** Values from the `telemetry` object in this project-specific file.
 
-Before using either method below, complete these steps:
+1.  **User settings file (`~/.gemini/settings.json`):** Values from the `telemetry` object in this global user file.
 
-1. Set your Google Cloud project ID:
-   - For telemetry in a separate project from inference:
-     ```bash
-     export OTLP_GOOGLE_CLOUD_PROJECT="your-telemetry-project-id"
-     ```
-   - For telemetry in the same project as inference:
-     ```bash
-     export GOOGLE_CLOUD_PROJECT="your-project-id"
-     ```
+1.  **Defaults:** applied if not set by any of the above.
+    - `telemetry.enabled`: `false`
+    - `telemetry.target`: `local`
+    - `telemetry.otlpEndpoint`: `http://localhost:4317`
+    - `telemetry.logPrompts`: `true`
 
-2. Authenticate with Google Cloud:
-   - If using a user account:
-     ```bash
-     gcloud auth application-default login
-     ```
-   - If using a service account:
-     ```bash
-     export GOOGLE_APPLICATION_CREDENTIALS="/path/to/your/service-account.json"
-     ```
-3. Make sure your account or service account has these IAM roles:
-   - Cloud Trace Agent
-   - Monitoring Metric Writer
-   - Logs Writer
+**For the `npm run telemetry -- --target=<gcp|local>` script:**
+The `--target` argument to this script _only_ overrides the `telemetry.target` for the duration and purpose of that script (i.e., choosing which collector to start). It does not permanently change your `settings.json`. The script will first look at `settings.json` for a `telemetry.target` to use as its default.
 
-4. Enable the required Google Cloud APIs (if not already enabled):
-   ```bash
-   gcloud services enable \
-     cloudtrace.googleapis.com \
-     monitoring.googleapis.com \
-     logging.googleapis.com \
-     --project="$OTLP_GOOGLE_CLOUD_PROJECT"
-   ```
+### Example settings
 
-### Direct Export (Recommended)
+The following code can be added to your workspace (`.gemini/settings.json`) or user (`~/.gemini/settings.json`) settings to enable telemetry and send the output to Google Cloud:
 
-Sends telemetry directly to Google Cloud services. No collector needed.
+```json
+{
+  "telemetry": {
+    "enabled": true,
+    "target": "gcp"
+  },
+  "sandbox": false
+}
+```
 
-1. Enable telemetry in your `.gemini/settings.json`:
-   ```json
-   {
-     "telemetry": {
-       "enabled": true,
-       "target": "gcp"
-     }
-   }
-   ```
-2. Run Gemini CLI and send prompts.
-3. View logs and metrics:
-   - Open the Google Cloud Console in your browser after sending prompts:
-     - Logs: https://console.cloud.google.com/logs/
-     - Metrics: https://console.cloud.google.com/monitoring/metrics-explorer
-     - Traces: https://console.cloud.google.com/traces/list
+### Exporting to a file
 
-### Collector-Based Export (Advanced)
+You can export all telemetry data to a file for local inspection.
 
-For custom processing, filtering, or routing, use an OpenTelemetry collector to
-forward data to Google Cloud.
+To enable file export, use the `--telemetry-outfile` flag with a path to your desired output file. This must be run using `--telemetry-target=local`.
 
-1. Configure your `.gemini/settings.json`:
-   ```json
-   {
-     "telemetry": {
-       "enabled": true,
-       "target": "gcp",
-       "useCollector": true
-     }
-   }
-   ```
-2. Run the automation script:
-   ```bash
-   npm run telemetry -- --target=gcp
-   ```
-   This will:
-   - Start a local OTEL collector that forwards to Google Cloud
-   - Configure your workspace
-   - Provide links to view traces, metrics, and logs in Google Cloud Console
-   - Save collector logs to `~/.gemini/tmp/<projectHash>/otel/collector-gcp.log`
-   - Stop collector on exit (e.g. `Ctrl+C`)
-3. Run Gemini CLI and send prompts.
-4. View logs and metrics:
-   - Open the Google Cloud Console in your browser after sending prompts:
-     - Logs: https://console.cloud.google.com/logs/
-     - Metrics: https://console.cloud.google.com/monitoring/metrics-explorer
-     - Traces: https://console.cloud.google.com/traces/list
-   - Open `~/.gemini/tmp/<projectHash>/otel/collector-gcp.log` to view local
-     collector logs.
+```bash
+# Set your desired output file path
+TELEMETRY_FILE=".gemini/telemetry.log"
 
-## Local Telemetry
+# Run Gemini CLI with local telemetry
+# NOTE: --telemetry-otlp-endpoint="" is required to override the default
+# OTLP exporter and ensure telemetry is written to the local file.
+gemini --telemetry \
+  --telemetry-target=local \
+  --telemetry-otlp-endpoint="" \
+  --telemetry-outfile="$TELEMETRY_FILE" \
+  --prompt "What is OpenTelemetry?"
+```
 
-For local development and debugging, you can capture telemetry data locally:
+## Running an OTEL Collector
 
-### File-based Output (Recommended)
+An OTEL Collector is a service that receives, processes, and exports telemetry data.
+The CLI sends data using the OTLP/gRPC protocol.
 
-1. Enable telemetry in your `.gemini/settings.json`:
-   ```json
-   {
-     "telemetry": {
-       "enabled": true,
-       "target": "local",
-       "otlpEndpoint": "",
-       "outfile": ".gemini/telemetry.log"
-     }
-   }
-   ```
-2. Run Gemini CLI and send prompts.
-3. View logs and metrics in the specified file (e.g., `.gemini/telemetry.log`).
+Learn more about OTEL exporter standard configuration in [documentation][otel-config-docs].
 
-### Collector-Based Export (Advanced)
+[otel-config-docs]: https://opentelemetry.io/docs/languages/sdk-configuration/otlp-exporter/
 
-1. Run the automation script:
-   ```bash
-   npm run telemetry -- --target=local
-   ```
-   This will:
-   - Download and start Jaeger and OTEL collector
-   - Configure your workspace for local telemetry
-   - Provide a Jaeger UI at http://localhost:16686
-   - Save logs/metrics to `~/.gemini/tmp/<projectHash>/otel/collector.log`
-   - Stop collector on exit (e.g. `Ctrl+C`)
-2. Run Gemini CLI and send prompts.
-3. View traces at http://localhost:16686 and logs/metrics in the collector log
-   file.
+### Local
 
-## Logs and Metrics
+Use the `npm run telemetry -- --target=local` command to automate the process of setting up a local telemetry pipeline, including configuring the necessary settings in your `.gemini/settings.json` file. The underlying script installs `otelcol-contrib` (the OpenTelemetry Collector) and `jaeger` (The Jaeger UI for viewing traces). To use it:
 
-The following section describes the structure of logs and metrics generated for
-Gemini CLI.
+1.  **Run the command**:
+    Execute the command from the root of the repository:
+
+    ```bash
+    npm run telemetry -- --target=local
+    ```
+
+    The script will:
+    - Download Jaeger and OTEL if needed.
+    - Start a local Jaeger instance.
+    - Start an OTEL collector configured to receive data from Gemini CLI.
+    - Automatically enable telemetry in your workspace settings.
+    - On exit, disable telemetry.
+
+1.  **View traces**:
+    Open your web browser and navigate to **http://localhost:16686** to access the Jaeger UI. Here you can inspect detailed traces of Gemini CLI operations.
+
+1.  **Inspect logs and metrics**:
+    The script redirects the OTEL collector output (which includes logs and metrics) to `~/.gemini/tmp/<projectHash>/otel/collector.log`. The script will provide links to view and a command to tail your telemetry data (traces, metrics, logs) locally.
+
+1.  **Stop the services**:
+    Press `Ctrl+C` in the terminal where the script is running to stop the OTEL Collector and Jaeger services.
+
+### Google Cloud
+
+Use the `npm run telemetry -- --target=gcp` command to automate setting up a local OpenTelemetry collector that forwards data to your Google Cloud project, including configuring the necessary settings in your `.gemini/settings.json` file. The underlying script installs `otelcol-contrib`. To use it:
+
+1.  **Prerequisites**:
+    - Have a Google Cloud project ID.
+    - Export the `GOOGLE_CLOUD_PROJECT` environment variable to make it available to the OTEL collector.
+      ```bash
+      export OTLP_GOOGLE_CLOUD_PROJECT="your-project-id"
+      ```
+    - Authenticate with Google Cloud (e.g., run `gcloud auth application-default login` or ensure `GOOGLE_APPLICATION_CREDENTIALS` is set).
+    - Ensure your Google Cloud account/service account has the necessary IAM roles: "Cloud Trace Agent", "Monitoring Metric Writer", and "Logs Writer".
+
+1.  **Run the command**:
+    Execute the command from the root of the repository:
+
+    ```bash
+    npm run telemetry -- --target=gcp
+    ```
+
+    The script will:
+    - Download the `otelcol-contrib` binary if needed.
+    - Start an OTEL collector configured to receive data from Gemini CLI and export it to your specified Google Cloud project.
+    - Automatically enable telemetry and disable sandbox mode in your workspace settings (`.gemini/settings.json`).
+    - Provide direct links to view traces, metrics, and logs in your Google Cloud Console.
+    - On exit (Ctrl+C), it will attempt to restore your original telemetry and sandbox settings.
+
+1.  **Run Gemini CLI:**
+    In a separate terminal, run your Gemini CLI commands. This generates telemetry data that the collector captures.
+
+1.  **View telemetry in Google Cloud**:
+    Use the links provided by the script to navigate to the Google Cloud Console and view your traces, metrics, and logs.
+
+1.  **Inspect local collector logs**:
+    The script redirects the local OTEL collector output to `~/.gemini/tmp/<projectHash>/otel/collector-gcp.log`. The script provides links to view and command to tail your collector logs locally.
+
+1.  **Stop the service**:
+    Press `Ctrl+C` in the terminal where the script is running to stop the OTEL Collector.
+
+## Logs and metric reference
+
+The following section describes the structure of logs and metrics generated for Gemini CLI.
 
 - A `sessionId` is included as a common attribute on all logs and metrics.
 
 ### Logs
 
-Logs are timestamped records of specific events. The following events are logged
-for Gemini CLI:
+Logs are timestamped records of specific events. The following events are logged for Gemini CLI:
 
-- `gemini_cli.config`: This event occurs once at startup with the CLI's
-  configuration.
+- `gemini_cli.config`: This event occurs once at startup with the CLI's configuration.
   - **Attributes**:
     - `model` (string)
     - `embedding_model` (string)
@@ -224,15 +170,12 @@ for Gemini CLI:
     - `file_filtering_respect_git_ignore` (boolean)
     - `debug_mode` (boolean)
     - `mcp_servers` (string)
-    - `output_format` (string: "text" or "json")
 
 - `gemini_cli.user_prompt`: This event occurs when a user submits a prompt.
   - **Attributes**:
-    - `prompt_length` (int)
-    - `prompt_id` (string)
-    - `prompt` (string, this attribute is excluded if `log_prompts_enabled` is
-      configured to be `false`)
-    - `auth_type` (string)
+    - `prompt_length`
+    - `prompt` (this attribute is excluded if `log_prompts_enabled` is configured to be `false`)
+    - `auth_type`
 
 - `gemini_cli.tool_call`: This event occurs for each function call.
   - **Attributes**:
@@ -240,27 +183,11 @@ for Gemini CLI:
     - `function_args`
     - `duration_ms`
     - `success` (boolean)
-    - `decision` (string: "accept", "reject", "auto_accept", or "modify", if
-      applicable)
+    - `decision` (string: "accept", "reject", "auto_accept", or "modify", if applicable)
     - `error` (if applicable)
     - `error_type` (if applicable)
-    - `content_length` (int, if applicable)
     - `metadata` (if applicable, dictionary of string -> any)
 
-- `gemini_cli.file_operation`: This event occurs for each file operation.
-  - **Attributes**:
-    - `tool_name` (string)
-    - `operation` (string: "create", "read", "update")
-    - `lines` (int, if applicable)
-    - `mimetype` (string, if applicable)
-    - `extension` (string, if applicable)
-    - `programming_language` (string, if applicable)
-    - `diff_stat` (json string, if applicable): A JSON string with the following members:
-      - `ai_added_lines` (int)
-      - `ai_removed_lines` (int)
-      - `user_added_lines` (int)
-      - `user_removed_lines` (int)
-
 - `gemini_cli.api_request`: This event occurs when making a request to Gemini API.
   - **Attributes**:
     - `model`
@@ -289,19 +216,6 @@ for Gemini CLI:
     - `response_text` (if applicable)
     - `auth_type`
 
-- `gemini_cli.tool_output_truncated`: This event occurs when the output of a tool call is too large and gets truncated.
-  - **Attributes**:
-    - `tool_name` (string)
-    - `original_content_length` (int)
-    - `truncated_content_length` (int)
-    - `threshold` (int)
-    - `lines` (int)
-    - `prompt_id` (string)
-
-- `gemini_cli.malformed_json_response`: This event occurs when a `generateJson` response from Gemini API cannot be parsed as a json.
-  - **Attributes**:
-    - `model`
-
 - `gemini_cli.flash_fallback`: This event occurs when Gemini CLI switches to flash as fallback.
   - **Attributes**:
     - `auth_type`
@@ -311,15 +225,6 @@ for Gemini CLI:
     - `command` (string)
     - `subcommand` (string, if applicable)
 
-- `gemini_cli.extension_enable`: This event occurs when an extension is enabled
-- `gemini_cli.extension_install`: This event occurs when an extension is installed
-  - **Attributes**:
-    - `extension_name` (string)
-    - `extension_version` (string)
-    - `extension_source` (string)
-    - `status` (string)
-- `gemini_cli.extension_uninstall`: This event occurs when an extension is uninstalled
-
 ### Metrics
 
 Metrics are numerical measurements of behavior over time. The following metrics are collected for Gemini CLI:
@@ -331,7 +236,6 @@ Metrics are numerical measurements of behavior over time. The following metrics
     - `function_name`
     - `success` (boolean)
     - `decision` (string: "accept", "reject", or "modify", if applicable)
-    - `tool_type` (string: "mcp", or "native", if applicable)
 
 - `gemini_cli.tool.call.latency` (Histogram, ms): Measures tool call latency.
   - **Attributes**:
@@ -359,13 +263,7 @@ Metrics are numerical measurements of behavior over time. The following metrics
     - `lines` (Int, if applicable): Number of lines in the file.
     - `mimetype` (string, if applicable): Mimetype of the file.
     - `extension` (string, if applicable): File extension of the file.
-    - `model_added_lines` (Int, if applicable): Number of lines added/changed by the model.
-    - `model_removed_lines` (Int, if applicable): Number of lines removed/changed by the model.
+    - `ai_added_lines` (Int, if applicable): Number of lines added/changed by AI.
+    - `ai_removed_lines` (Int, if applicable): Number of lines removed/changed by AI.
     - `user_added_lines` (Int, if applicable): Number of lines added/changed by user in AI proposed changes.
     - `user_removed_lines` (Int, if applicable): Number of lines removed/changed by user in AI proposed changes.
-    - `programming_language` (string, if applicable): The programming language of the file.
-
-- `gemini_cli.chat_compression` (Counter, Int): Counts chat compression operations
-  - **Attributes**:
-    - `tokens_before`: (Int): Number of tokens in context prior to compression
-    - `tokens_after`: (Int): Number of tokens in context after compression

docs/tools/mcp-server.md

@@ -51,30 +51,7 @@ The Gemini CLI uses the `mcpServers` configuration in your `settings.json` file
 
 ### Configure the MCP server in settings.json
 
-You can configure MCP servers in your `settings.json` file in two main ways: through the top-level `mcpServers` object for specific server definitions, and through the `mcp` object for global settings that control server discovery and execution.
-
-#### Global MCP Settings (`mcp`)
-
-The `mcp` object in your `settings.json` allows you to define global rules for all MCP servers.
-
-- **`mcp.serverCommand`** (string): A global command to start an MCP server.
-- **`mcp.allowed`** (array of strings): A list of MCP server names to allow. If this is set, only servers from this list (matching the keys in the `mcpServers` object) will be connected to.
-- **`mcp.excluded`** (array of strings): A list of MCP server names to exclude. Servers in this list will not be connected to.
-
-**Example:**
-
-```json
-{
-  "mcp": {
-    "allowed": ["my-trusted-server"],
-    "excluded": ["experimental-server"]
-  }
-}
-```
-
-#### Server-Specific Configuration (`mcpServers`)
-
-The `mcpServers` object is where you define each individual MCP server you want the CLI to connect to.
+You can configure MCP servers at the global level in the `~/.gemini/settings.json` file or in your project's root directory, create or open the `.gemini/settings.json` file. Within the file, add the `mcpServers` configuration block.
 
 ### Configuration Structure
 
@@ -115,10 +92,8 @@ Each server configuration supports the following properties:
 - **`cwd`** (string): Working directory for Stdio transport
 - **`timeout`** (number): Request timeout in milliseconds (default: 600,000ms = 10 minutes)
 - **`trust`** (boolean): When `true`, bypasses all tool call confirmations for this server (default: `false`)
-- **`includeTools`** (string[]): List of tool names to include from this MCP server. When specified, only the tools listed here will be available from this server (allowlist behavior). If not specified, all tools from the server are enabled by default.
+- **`includeTools`** (string[]): List of tool names to include from this MCP server. When specified, only the tools listed here will be available from this server (whitelist behavior). If not specified, all tools from the server are enabled by default.
 - **`excludeTools`** (string[]): List of tool names to exclude from this MCP server. Tools listed here will not be available to the model, even if they are exposed by the server. **Note:** `excludeTools` takes precedence over `includeTools` - if a tool is in both lists, it will be excluded.
-- **`targetAudience`** (string): The OAuth Client ID allowlisted on the IAP-protected application you are trying to access. Used with `authProviderType: 'service_account_impersonation'`.
-- **`targetServiceAccount`** (string): The email address of the Google Cloud Service Account to impersonate. Used with `authProviderType: 'service_account_impersonation'`.
 
 ### OAuth Support for Remote MCP Servers
 
@@ -212,9 +187,6 @@ You can specify the authentication provider type using the `authProviderType` pr
 - **`authProviderType`** (string): Specifies the authentication provider. Can be one of the following:
   - **`dynamic_discovery`** (default): The CLI will automatically discover the OAuth configuration from the server.
   - **`google_credentials`**: The CLI will use the Google Application Default Credentials (ADC) to authenticate with the server. When using this provider, you must specify the required scopes.
-  - **`service_account_impersonation`**: The CLI will impersonate a Google Cloud Service Account to authenticate with the server. This is useful for accessing IAP-protected services (this was specifically designed for Cloud Run services).
-
-#### Google Credentials
 
 ```json
 {
@@ -230,24 +202,6 @@ You can specify the authentication provider type using the `authProviderType` pr
 }
 ```
 
-#### Service Account Impersonation
-
-To authenticate with a server using Service Account Impersonation, you must set the `authProviderType` to `service_account_impersonation` and provide the following properties:
-
-- **`targetAudience`** (string): The OAuth Client ID allowslisted on the IAP-protected application you are trying to access.
-- **`targetServiceAccount`** (string): The email address of the Google Cloud Service Account to impersonate.
-
-The CLI will use your local Application Default Credentials (ADC) to generate an OIDC ID token for the specified service account and audience. This token will then be used to authenticate with the MCP server.
-
-#### Setup Instructions
-
-1. **[Create](https://cloud.google.com/iap/docs/oauth-client-creation) or use an existing OAuth 2.0 client ID.** To use an existing OAuth 2.0 client ID, follow the steps in [How to share OAuth Clients](https://cloud.google.com/iap/docs/sharing-oauth-clients).
-2. **Add the OAuth ID to the allowlist for [programmatic access](https://cloud.google.com/iap/docs/sharing-oauth-clients#programmatic_access) for the application.** Since Cloud Run is not yet a supported resource type in gcloud iap, you must allowlist the Client ID on the project.
-3. **Create a service account.** [Documentation](https://cloud.google.com/iam/docs/service-accounts-create#creating), [Cloud Console Link](https://console.cloud.google.com/iam-admin/serviceaccounts)
-4. **Add both the service account and users to the IAP Policy** in the "Security" tab of the Cloud Run service itself or via gcloud.
-5. **Grant all users and groups** who will access the MCP Server the necessary permissions to [impersonate the service account](https://cloud.google.com/docs/authentication/use-service-account-impersonation) (i.e., `roles/iam.serviceAccountTokenCreator`).
-6. **[Enable](https://console.cloud.google.com/apis/library/iamcredentials.googleapis.com) the IAM Credentials API** for your project.
-
 ### Example Configurations
 
 #### Python MCP Server (Stdio)
@@ -356,21 +310,6 @@ The CLI will use your local Application Default Credentials (ADC) to generate an
 }
 ```
 
-### SSE MCP Server with SA Impersonation
-
-```json
-{
-  "mcpServers": {
-    "myIapProtectedServer": {
-      "url": "https://my-iap-service.run.app/sse",
-      "authProviderType": "service_account_impersonation",
-      "targetAudience": "YOUR_IAP_CLIENT_ID.apps.googleusercontent.com",
-      "targetServiceAccount": "your-sa@your-project.iam.gserviceaccount.com"
-    }
-  }
-}
-```
-
 ## Discovery Process Deep Dive
 
 When the Gemini CLI starts, it performs MCP server discovery through the following detailed process:
@@ -728,13 +667,9 @@ await server.connect(transport);
 This can be included in `settings.json` under `mcpServers` with:
 
 ```json
-{
-  "mcpServers": {
-    "nodeServer": {
-      "command": "node",
-      "args": ["filename.ts"]
-    }
-  }
+"nodeServer": {
+  "command": "node",
+  "args": ["filename.ts"],
 }
 ```
 

docs/tools/multi-file.md

@@ -29,7 +29,6 @@ Use `read_many_files` to read content from multiple files specified by paths or
 `read_many_files` searches for files matching the provided `paths` and `include` patterns, while respecting `exclude` patterns and default excludes (if enabled).
 
 - For text files: it reads the content of each matched file (attempting to skip binary files not explicitly requested as image/PDF) and concatenates it into a single string, with a separator `--- {filePath} ---` between the content of each file. Uses UTF-8 encoding by default.
-- The tool inserts a `--- End of content ---` after the last file.
 - For image and PDF files: if explicitly requested by name or extension (e.g., `paths: ["logo.png"]` or `include: ["*.pdf"]`), the tool reads the file and returns its content as a base64 encoded string.
 - The tool attempts to detect and skip other binary files (those not matching common image/PDF types or not explicitly requested) by checking for null bytes in their initial content.
 

docs/tools/shell.md

@@ -4,9 +4,7 @@ This document describes the `run_shell_command` tool for the Gemini CLI.
 
 ## Description
 
-Use `run_shell_command` to interact with the underlying system, run scripts, or perform command-line operations. `run_shell_command` executes a given shell command, including interactive commands that require user input (e.g., `vim`, `git rebase -i`) if the `tools.shell.enableInteractiveShell` setting is set to `true`.
-
-On Windows, commands are executed with `cmd.exe /c`. On other platforms, they are executed with `bash -c`.
+Use `run_shell_command` to interact with the underlying system, run scripts, or perform command-line operations. `run_shell_command` executes a given shell command. On Windows, the command will be executed with `cmd.exe /c`. On other platforms, the command will be executed with `bash -c`.
 
 ### Arguments
 
@@ -55,67 +53,10 @@ Start a background server:
 run_shell_command(command="npm run dev &", description="Start development server in background")
 ```
 
-## Configuration
-
-You can configure the behavior of the `run_shell_command` tool by modifying your `settings.json` file or by using the `/settings` command in the Gemini CLI.
-
-### Enabling Interactive Commands
-
-To enable interactive commands, you need to set the `tools.shell.enableInteractiveShell` setting to `true`. This will use `node-pty` for shell command execution, which allows for interactive sessions. If `node-pty` is not available, it will fall back to the `child_process` implementation, which does not support interactive commands.
-
-**Example `settings.json`:**
-
-```json
-{
-  "tools": {
-    "shell": {
-      "enableInteractiveShell": true
-    }
-  }
-}
-```
-
-### Showing Color in Output
-
-To show color in the shell output, you need to set the `tools.shell.showColor` setting to `true`. **Note: This setting only applies when `tools.shell.enableInteractiveShell` is enabled.**
-
-**Example `settings.json`:**
-
-```json
-{
-  "tools": {
-    "shell": {
-      "showColor": true
-    }
-  }
-}
-```
-
-### Setting the Pager
-
-You can set a custom pager for the shell output by setting the `tools.shell.pager` setting. The default pager is `cat`. **Note: This setting only applies when `tools.shell.enableInteractiveShell` is enabled.**
-
-**Example `settings.json`:**
-
-```json
-{
-  "tools": {
-    "shell": {
-      "pager": "less"
-    }
-  }
-}
-```
-
-## Interactive Commands
-
-The `run_shell_command` tool now supports interactive commands by integrating a pseudo-terminal (pty). This allows you to run commands that require real-time user input, such as text editors (`vim`, `nano`), terminal-based UIs (`htop`), and interactive version control operations (`git rebase -i`).
-
-When an interactive command is running, you can send input to it from the Gemini CLI. To focus on the interactive shell, press `ctrl+f`. The terminal output, including complex TUIs, will be rendered correctly.
-
 ## Important notes
 
 - **Security:** Be cautious when executing commands, especially those constructed from user input, to prevent security vulnerabilities.
+- **Interactive commands:** Avoid commands that require interactive user input, as this can cause the tool to hang. Use non-interactive flags if available (e.g., `npm init -y`).
 - **Error handling:** Check the `Stderr`, `Error`, and `Exit Code` fields to determine if a command executed successfully.
 - **Background processes:** When a command is run in the background with `&`, the tool will return immediately and the process will continue to run in the background. The `Background PIDs` field will contain the process ID of the background process.
 
@@ -125,16 +66,16 @@ When `run_shell_command` executes a command, it sets the `GEMINI_CLI=1` environm
 
 ## Command Restrictions
 
-You can restrict the commands that can be executed by the `run_shell_command` tool by using the `tools.core` and `tools.exclude` settings in your configuration file.
+You can restrict the commands that can be executed by the `run_shell_command` tool by using the `coreTools` and `excludeTools` settings in your configuration file.
 
-- `tools.core`: To restrict `run_shell_command` to a specific set of commands, add entries to the `core` list under the `tools` category in the format `run_shell_command(<command>)`. For example, `"tools": {"core": ["run_shell_command(git)"]}` will only allow `git` commands. Including the generic `run_shell_command` acts as a wildcard, allowing any command not explicitly blocked.
-- `tools.exclude`: To block specific commands, add entries to the `exclude` list under the `tools` category in the format `run_shell_command(<command>)`. For example, `"tools": {"exclude": ["run_shell_command(rm)"]}` will block `rm` commands.
+- `coreTools`: To restrict `run_shell_command` to a specific set of commands, add entries to the `coreTools` list in the format `run_shell_command(<command>)`. For example, `"coreTools": ["run_shell_command(git)"]` will only allow `git` commands. Including the generic `run_shell_command` acts as a wildcard, allowing any command not explicitly blocked.
+- `excludeTools`: To block specific commands, add entries to the `excludeTools` list in the format `run_shell_command(<command>)`. For example, `"excludeTools": ["run_shell_command(rm)"]` will block `rm` commands.
 
 The validation logic is designed to be secure and flexible:
 
 1.  **Command Chaining Disabled**: The tool automatically splits commands chained with `&&`, `||`, or `;` and validates each part separately. If any part of the chain is disallowed, the entire command is blocked.
 2.  **Prefix Matching**: The tool uses prefix matching. For example, if you allow `git`, you can run `git status` or `git log`.
-3.  **Blocklist Precedence**: The `tools.exclude` list is always checked first. If a command matches a blocked prefix, it will be denied, even if it also matches an allowed prefix in `tools.core`.
+3.  **Blocklist Precedence**: The `excludeTools` list is always checked first. If a command matches a blocked prefix, it will be denied, even if it also matches an allowed prefix in `coreTools`.
 
 ### Command Restriction Examples
 
@@ -144,9 +85,7 @@ To allow only `git` and `npm` commands, and block all others:
 
 ```json
 {
-  "tools": {
-    "core": ["run_shell_command(git)", "run_shell_command(npm)"]
-  }
+  "coreTools": ["run_shell_command(git)", "run_shell_command(npm)"]
 }
 ```
 
@@ -160,10 +99,8 @@ To block `rm` and allow all other commands:
 
 ```json
 {
-  "tools": {
-    "core": ["run_shell_command"],
-    "exclude": ["run_shell_command(rm)"]
-  }
+  "coreTools": ["run_shell_command"],
+  "excludeTools": ["run_shell_command(rm)"]
 }
 ```
 
@@ -173,14 +110,12 @@ To block `rm` and allow all other commands:
 
 **Blocklist takes precedence**
 
-If a command prefix is in both `tools.core` and `tools.exclude`, it will be blocked.
+If a command prefix is in both `coreTools` and `excludeTools`, it will be blocked.
 
 ```json
 {
-  "tools": {
-    "core": ["run_shell_command(git)"],
-    "exclude": ["run_shell_command(git push)"]
-  }
+  "coreTools": ["run_shell_command(git)"],
+  "excludeTools": ["run_shell_command(git push)"]
 }
 ```
 
@@ -189,13 +124,11 @@ If a command prefix is in both `tools.core` and `tools.exclude`, it will be bloc
 
 **Block all shell commands**
 
-To block all shell commands, add the `run_shell_command` wildcard to `tools.exclude`:
+To block all shell commands, add the `run_shell_command` wildcard to `excludeTools`:
 
 ```json
 {
-  "tools": {
-    "exclude": ["run_shell_command"]
-  }
+  "excludeTools": ["run_shell_command"]
 }
 ```
 

docs/tos-privacy.md

@@ -8,8 +8,8 @@ This article outlines the specific terms and privacy policies applicable for dif
 
 Your authentication method refers to the method you use to log into and access the Gemini CLI. There are four ways to authenticate:
 
-- Logging in with your Google account to Gemini Code Assist for individuals
-- Logging in with your Google account to Gemini Code Assist for Standard, or Enterprise Users
+- Logging in with your Google account to Gemini Code Assist for Individuals
+- Logging in with your Google account to Gemini Code Assist for Workspace, Standard, or Enterprise Users
 - Using an API key with Gemini Developer
 - Using an API key with Vertex AI GenAI API
 
@@ -17,20 +17,20 @@ For each of these four methods of authentication, different Terms of Service and
 
 | Authentication                | Account             | Terms of Service                                                                                        | Privacy Notice                                                                                                                                                                                   |
 | :---------------------------- | :------------------ | :------------------------------------------------------------------------------------------------------ | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Gemini Code Assist via Google | Individual          | [Google Terms of Service](https://policies.google.com/terms?hl=en-US)                                   | [Gemini Code Assist Privacy Notice for individuals](https://developers.google.com/gemini-code-assist/resources/privacy-notice-gemini-code-assist-individuals)                                    |
+| Gemini Code Assist via Google | Individual          | [Google Terms of Service](https://policies.google.com/terms?hl=en-US)                                   | [Gemini Code Assist Privacy Notice for Individuals](https://developers.google.com/gemini-code-assist/resources/privacy-notice-gemini-code-assist-individuals)                                    |
 | Gemini Code Assist via Google | Standard/Enterprise | [Google Cloud Platform Terms of Service](https://cloud.google.com/terms)                                | [Gemini Code Assist Privacy Notice for Standard and Enterprise](https://cloud.google.com/gemini/docs/codeassist/security-privacy-compliance#standard_and_enterprise_data_protection_and_privacy) |
 | Gemini Developer API          | Unpaid              | [Gemini API Terms of Service - Unpaid Services](https://ai.google.dev/gemini-api/terms#unpaid-services) | [Google Privacy Policy](https://policies.google.com/privacy)                                                                                                                                     |
 | Gemini Developer API          | Paid                | [Gemini API Terms of Service - Paid Services](https://ai.google.dev/gemini-api/terms#paid-services)     | [Google Privacy Policy](https://policies.google.com/privacy)                                                                                                                                     |
 | Vertex AI Gen API             |                     | [Google Cloud Platform Service Terms](https://cloud.google.com/terms/service-terms/)                    | [Google Cloud Privacy Notice](https://cloud.google.com/terms/cloud-privacy-notice)                                                                                                               |
 
-## 1. If you have logged in with your Google account to Gemini Code Assist for individuals
+## 1. If you have logged in with your Google account to Gemini Code Assist for Individuals
 
-For users who use their Google account to access [Gemini Code Assist for individuals](https://developers.google.com/gemini-code-assist/docs/overview#supported-features-gca), these Terms of Service and Privacy Notice documents apply:
+For users who use their Google account to access [Gemini Code Assist for Individuals](https://developers.google.com/gemini-code-assist/docs/overview#supported-features-gca), these Terms of Service and Privacy Notice documents apply:
 
 - **Terms of Service:** Your use of the Gemini CLI is governed by the [Google Terms of Service](https://policies.google.com/terms?hl=en-US).
-- **Privacy Notice:** The collection and use of your data is described in the [Gemini Code Assist Privacy Notice for individuals](https://developers.google.com/gemini-code-assist/resources/privacy-notice-gemini-code-assist-individuals).
+- **Privacy Notice:** The collection and use of your data is described in the [Gemini Code Assist Privacy Notice for Individuals](https://developers.google.com/gemini-code-assist/resources/privacy-notice-gemini-code-assist-individuals).
 
-## 2. If you have logged in with your Google account to Gemini Code Assist for Standard, or Enterprise Users
+## 2. If you have logged in with your Google account to Gemini Code Assist for Workspace, Standard, or Enterprise Users
 
 For users who use their Google account to access the [Standard or Enterprise edition](https://cloud.google.com/gemini/docs/codeassist/overview#editions-overview) of Gemini Code Assist, these Terms of Service and Privacy Notice documents apply:
 
@@ -65,9 +65,9 @@ Whether your code, including prompts and answers, is used to train Google's mode
 
 By default (if you have not opted out):
 
-- **Google account with Gemini Code Assist for individuals**: Yes. When you use your personal Google account, the [Gemini Code Assist Privacy Notice for individuals](https://developers.google.com/gemini-code-assist/resources/privacy-notice-gemini-code-assist-individuals) applies. Under this notice,
+- **Google account with Gemini Code Assist for Individuals**: Yes. When you use your personal Google account, the [Gemini Code Assist Privacy Notice for Individuals](https://developers.google.com/gemini-code-assist/resources/privacy-notice-gemini-code-assist-individuals) applies. Under this notice,
   your **prompts, answers, and related code are collected** and may be used to improve Google's products, including for model training.
-- **Google account with Gemini Code Assist for Standard, or Enterprise**: No. For these accounts, your data is governed by the [Gemini Code Assist Privacy Notices](https://cloud.google.com/gemini/docs/codeassist/security-privacy-compliance#standard_and_enterprise_data_protection_and_privacy) terms, which treat your inputs as confidential. Your **prompts, answers, and related code are not collected** and are not used to train models.
+- **Google account with Gemini Code Assist for Workspace, Standard, or Enterprise**: No. For these accounts, your data is governed by the [Gemini Code Assist Privacy Notices](https://cloud.google.com/gemini/docs/codeassist/security-privacy-compliance#standard_and_enterprise_data_protection_and_privacy) terms, which treat your inputs as confidential. Your **prompts, answers, and related code are not collected** and are not used to train models.
 - **Gemini API key via the Gemini Developer API**: Whether your code is collected or used depends on whether you are using an unpaid or paid service.
   - **Unpaid services**: Yes. When you use the Gemini API key via the Gemini Developer API with an unpaid service, the [Gemini API Terms of Service - Unpaid Services](https://ai.google.dev/gemini-api/terms#unpaid-services) terms apply. Under this notice, your **prompts, answers, and related code are collected** and may be used to improve Google's products, including for model training.
   - **Paid services**: No. When you use the Gemini API key via the Gemini Developer API with a paid service, the [Gemini API Terms of Service - Paid Services](https://ai.google.dev/gemini-api/terms#paid-services) terms apply, which treats your inputs as confidential. Your **prompts, answers, and related code are not collected** and are not used to train models.
@@ -81,8 +81,8 @@ The **Usage Statistics** setting is the single control for all optional data col
 
 The data it collects depends on your account and authentication type:
 
-- **Google account with Gemini Code Assist for individuals**: When enabled, this setting allows Google to collect both anonymous telemetry (for example, commands run and performance metrics) and **your prompts and answers, including code,** for model improvement.
-- **Google account with Gemini Code Assist for Standard, or Enterprise**: This setting only controls the collection of anonymous telemetry. Your prompts and answers, including code, are never collected, regardless of this setting.
+- **Google account with Gemini Code Assist for Individuals**: When enabled, this setting allows Google to collect both anonymous telemetry (for example, commands run and performance metrics) and **your prompts and answers, including code,** for model improvement.
+- **Google account with Gemini Code Assist for Workspace, Standard, or Enterprise**: This setting only controls the collection of anonymous telemetry. Your prompts and answers, including code, are never collected, regardless of this setting.
 - **Gemini API key via the Gemini Developer API**:
   **Unpaid services**: When enabled, this setting allows Google to collect both anonymous telemetry (like commands run and performance metrics) and **your prompts and answers, including code,** for model improvement. When disabled we will use your data as described in [How Google Uses Your Data](https://ai.google.dev/gemini-api/terms#data-use-unpaid).
   **Paid services**: This setting only controls the collection of anonymous telemetry. Google logs prompts and responses for a limited period of time, solely for the purpose of detecting violations of the Prohibited Use Policy and any required legal or regulatory disclosures.

docs/troubleshooting.md

@@ -19,11 +19,6 @@ This guide provides solutions to common issues and debugging tips, including top
     [Google AI Studio](http://aistudio.google.com/app/apikey), which also includes a
     separate free tier.
 
-- **Error: `UNABLE_TO_GET_ISSUER_CERT_LOCALLY` or `unable to get local issuer certificate`**
-  - **Cause:** You may be on a corporate network with a firewall that intercepts and inspects SSL/TLS traffic. This often requires a custom root CA certificate to be trusted by Node.js.
-  - **Solution:** Set the `NODE_EXTRA_CA_CERTS` environment variable to the absolute path of your corporate root CA certificate file.
-    - Example: `export NODE_EXTRA_CA_CERTS=/path/to/your/corporate-ca.crt`
-
 ## Frequently asked questions (FAQs)
 
 - **Q: How do I update Gemini CLI to the latest version?**
@@ -72,19 +67,7 @@ This guide provides solutions to common issues and debugging tips, including top
 - **DEBUG mode not working from project .env file**
   - **Issue:** Setting `DEBUG=true` in a project's `.env` file doesn't enable debug mode for gemini-cli.
   - **Cause:** The `DEBUG` and `DEBUG_MODE` variables are automatically excluded from project `.env` files to prevent interference with gemini-cli behavior.
-  - **Solution:** Use a `.gemini/.env` file instead, or configure the `advanced.excludedEnvVars` setting in your `settings.json` to exclude fewer variables.
-
-## Exit Codes
-
-The Gemini CLI uses specific exit codes to indicate the reason for termination. This is especially useful for scripting and automation.
-
-| Exit Code | Error Type                 | Description                                                                                         |
-| --------- | -------------------------- | --------------------------------------------------------------------------------------------------- |
-| 41        | `FatalAuthenticationError` | An error occurred during the authentication process.                                                |
-| 42        | `FatalInputError`          | Invalid or missing input was provided to the CLI. (non-interactive mode only)                       |
-| 44        | `FatalSandboxError`        | An error occurred with the sandboxing environment (e.g., Docker, Podman, or Seatbelt).              |
-| 52        | `FatalConfigError`         | A configuration file (`settings.json`) is invalid or contains errors.                               |
-| 53        | `FatalTurnLimitedError`    | The maximum number of conversational turns for the session was reached. (non-interactive mode only) |
+  - **Solution:** Use a `.gemini/.env` file instead, or configure the `excludedProjectEnvVars` setting in your `settings.json` to exclude fewer variables.
 
 ## Debugging Tips
 

docs/trusted-folders.md

@@ -1,61 +0,0 @@
-# Trusted Folders
-
-The Trusted Folders feature is a security setting that gives you control over which projects can use the full capabilities of the Gemini CLI. It prevents potentially malicious code from running by asking you to approve a folder before the CLI loads any project-specific configurations from it.
-
-## Enabling the Feature
-
-The Trusted Folders feature is **disabled by default**. To use it, you must first enable it in your settings.
-
-Add the following to your user `settings.json` file:
-
-```json
-{
-  "security": {
-    "folderTrust": {
-      "enabled": true
-    }
-  }
-}
-```
-
-## How It Works: The Trust Dialog
-
-Once the feature is enabled, the first time you run the Gemini CLI from a folder, a dialog will automatically appear, prompting you to make a choice:
-
-- **Trust folder**: Grants full trust to the current folder (e.g., `my-project`).
-- **Trust parent folder**: Grants trust to the parent directory (e.g., `safe-projects`), which automatically trusts all of its subdirectories as well. This is useful if you keep all your safe projects in one place.
-- **Don't trust**: Marks the folder as untrusted. The CLI will operate in a restricted "safe mode."
-
-Your choice is saved in a central file (`~/.gemini/trustedFolders.json`), so you will only be asked once per folder.
-
-## Why Trust Matters: The Impact of an Untrusted Workspace
-
-When a folder is **untrusted**, the Gemini CLI runs in a restricted "safe mode" to protect you. In this mode, the following features are disabled:
-
-1.  **Workspace Settings are Ignored**: The CLI will **not** load the `.gemini/settings.json` file from the project. This prevents the loading of custom tools and other potentially dangerous configurations.
-
-2.  **Environment Variables are Ignored**: The CLI will **not** load any `.env` files from the project.
-
-3.  **Extension Management is Restricted**: You **cannot install, update, or uninstall** extensions.
-
-4.  **Tool Auto-Acceptance is Disabled**: You will always be prompted before any tool is run, even if you have auto-acceptance enabled globally.
-
-5.  **Automatic Memory Loading is Disabled**: The CLI will not automatically load files into context from directories specified in local settings.
-
-Granting trust to a folder unlocks the full functionality of the Gemini CLI for that workspace.
-
-## Managing Your Trust Settings
-
-If you need to change a decision or see all your settings, you have a couple of options:
-
-- **Change the Current Folder's Trust**: Run the `/permissions` command from within the CLI. This will bring up the same interactive dialog, allowing you to change the trust level for the current folder.
-
-- **View All Trust Rules**: To see a complete list of all your trusted and untrusted folder rules, you can inspect the contents of the `~/.gemini/trustedFolders.json` file in your home directory.
-
-## The Trust Check Process (Advanced)
-
-For advanced users, it's helpful to know the exact order of operations for how trust is determined:
-
-1.  **IDE Trust Signal**: If you are using the [IDE Integration](./ide-integration.md), the CLI first asks the IDE if the workspace is trusted. The IDE's response takes highest priority.
-
-2.  **Local Trust File**: If the IDE is not connected, the CLI checks the central `~/.gemini/trustedFolders.json` file.

esbuild.config.js

@@ -4,34 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { createRequire } from 'node:module';
-import { writeFileSync } from 'node:fs';
-
-let esbuild;
-try {
-  esbuild = (await import('esbuild')).default;
-} catch (_error) {
-  console.warn('esbuild not available, skipping bundle step');
-  process.exit(0);
-}
+import esbuild from 'esbuild';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { createRequire } from 'module';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const require = createRequire(import.meta.url);
 const pkg = require(path.resolve(__dirname, 'package.json'));
 
-const external = [
-  '@lydell/node-pty',
-  'node-pty',
-  '@lydell/node-pty-darwin-arm64',
-  '@lydell/node-pty-darwin-x64',
-  '@lydell/node-pty-linux-x64',
-  '@lydell/node-pty-win32-arm64',
-  '@lydell/node-pty-win32-x64',
-];
-
 esbuild
   .build({
     entryPoints: ['packages/cli/index.ts'],
@@ -39,7 +21,7 @@ esbuild
     outfile: 'bundle/gemini.js',
     platform: 'node',
     format: 'esm',
-    external,
+    external: [],
     alias: {
       'is-in-ci': path.resolve(
         __dirname,
@@ -52,13 +34,5 @@ esbuild
     banner: {
       js: `import { createRequire } from 'module'; const require = createRequire(import.meta.url); globalThis.__filename = require('url').fileURLToPath(import.meta.url); globalThis.__dirname = require('path').dirname(globalThis.__filename);`,
     },
-    loader: { '.node': 'file' },
-    metafile: true,
-    write: true,
-  })
-  .then(({ metafile }) => {
-    if (process.env.DEV === 'true') {
-      writeFileSync('./bundle/esbuild.json', JSON.stringify(metafile, null, 2));
-    }
   })
   .catch(() => process.exit(1));

eslint.config.js

@@ -10,10 +10,9 @@ import reactPlugin from 'eslint-plugin-react';
 import reactHooks from 'eslint-plugin-react-hooks';
 import prettierConfig from 'eslint-config-prettier';
 import importPlugin from 'eslint-plugin-import';
-import vitest from '@vitest/eslint-plugin';
 import globals from 'globals';
 import licenseHeader from 'eslint-plugin-license-header';
-import path from 'node:path';
+import path from 'node:path'; // Use node: prefix for built-ins
 import url from 'node:url';
 
 // --- ESM way to get __dirname ---
@@ -31,11 +30,13 @@ export default tseslint.config(
       'node_modules/*',
       '.integration-tests/**',
       'eslint.config.js',
-      'packages/**/dist/**',
+      'packages/cli/dist/**',
+      'packages/core/dist/**',
+      'packages/server/dist/**',
+      'packages/vscode-ide-companion/dist/**',
       'bundle/**',
       'package/bundle/**',
       '.integration-tests/**',
-      'dist/**',
     ],
   },
   eslint.configs.recommended,
@@ -105,10 +106,6 @@ export default tseslint.config(
         'error',
         { ignoreParameters: true, ignoreProperties: true },
       ],
-      '@typescript-eslint/consistent-type-imports': [
-        'error',
-        { disallowTypeAnnotations: false },
-      ],
       '@typescript-eslint/no-namespace': ['error', { allowDeclarations: true }],
       '@typescript-eslint/no-unused-vars': [
         'error',
@@ -121,12 +118,7 @@ export default tseslint.config(
       'import/no-internal-modules': [
         'error',
         {
-          allow: [
-            'react-dom/test-utils',
-            'memfs/lib/volume.js',
-            'yargs/**',
-            'msw/node',
-          ],
+          allow: ['react-dom/test-utils', 'memfs/lib/volume.js', 'yargs/**'],
         },
       ],
       'import/no-relative-packages': 'error',
@@ -161,22 +153,10 @@ export default tseslint.config(
       'default-case': 'error',
     },
   },
-  {
-    files: ['packages/*/src/**/*.test.{ts,tsx}'],
-    plugins: {
-      vitest,
-    },
-    rules: {
-      ...vitest.configs.recommended.rules,
-      'vitest/expect-expect': 'off',
-      'vitest/no-commented-out-tests': 'off',
-    },
-  },
   {
     files: ['./**/*.{tsx,ts,js}'],
     plugins: {
       'license-header': licenseHeader,
-      import: importPlugin,
     },
     rules: {
       'license-header/header': [
@@ -189,7 +169,6 @@ export default tseslint.config(
           ' */',
         ],
       ],
-      'import/enforce-node-protocol-usage': ['error', 'always'],
     },
   },
   // extra settings for scripts that we run directly with node

hello/GEMINI.md

@@ -1,8 +0,0 @@
-# Ink Library Screen Reader Guidance
-
-When building custom components, it's important to keep accessibility in mind. While Ink provides the building blocks, ensuring your components are accessible will make your CLIs usable by a wider audience.
-
-## General Principles
-
-Provide screen reader-friendly output: Use the useIsScreenReaderEnabled hook to detect if a screen reader is active. You can then render a more descriptive output for screen reader users.
-Leverage ARIA props: For components that have a specific role (e.g., a checkbox or a button), use the aria-role, aria-state, and aria-label props on <Box> and <Text> to provide semantic meaning to screen readers.

hello/gemini-extension.json

@@ -1,5 +0,0 @@
-{
-  "name": "context-example",
-  "version": "1.0.0",
-  "contextFileName": "GEMINI.md"
-}

integration-tests/context-compress-interactive.test.ts

@@ -1,116 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { expect, describe, it, beforeEach, afterEach } from 'vitest';
-import { TestRig, type } from './test-helper.js';
-
-describe('Interactive Mode', () => {
-  let rig: TestRig;
-
-  beforeEach(() => {
-    rig = new TestRig();
-  });
-
-  afterEach(async () => {
-    await rig.cleanup();
-  });
-
-  it.skipIf(process.platform === 'win32')(
-    'should trigger chat compression with /compress command',
-    async () => {
-      await rig.setup('interactive-compress-test');
-
-      const { ptyProcess } = rig.runInteractive();
-
-      let fullOutput = '';
-      ptyProcess.onData((data) => (fullOutput += data));
-
-      const authDialogAppeared = await rig.waitForText(
-        'How would you like to authenticate',
-        5000,
-      );
-
-      // select the second option if auth dialog come's up
-      if (authDialogAppeared) {
-        ptyProcess.write('2');
-      }
-
-      // Wait for the app to be ready
-      const isReady = await rig.waitForText('Type your message', 15000);
-      expect(
-        isReady,
-        'CLI did not start up in interactive mode correctly',
-      ).toBe(true);
-
-      const longPrompt =
-        'Dont do anything except returning a 1000 token long paragragh with the <name of the scientist who discovered theory of relativity> at the end to indicate end of response. This is a moderately long sentence.';
-
-      await type(ptyProcess, longPrompt);
-      await type(ptyProcess, '\r');
-
-      await rig.waitForText('einstein', 25000);
-
-      await type(ptyProcess, '/compress');
-      // A small delay to allow React to re-render the command list.
-      await new Promise((resolve) => setTimeout(resolve, 100));
-      await type(ptyProcess, '\r');
-
-      const foundEvent = await rig.waitForTelemetryEvent(
-        'chat_compression',
-        90000,
-      );
-      expect(foundEvent, 'chat_compression telemetry event was not found').toBe(
-        true,
-      );
-    },
-  );
-
-  it.skipIf(process.platform === 'win32')(
-    'should handle compression failure on token inflation',
-    async () => {
-      await rig.setup('interactive-compress-test');
-
-      const { ptyProcess } = rig.runInteractive();
-
-      let fullOutput = '';
-      ptyProcess.onData((data) => (fullOutput += data));
-
-      const authDialogAppeared = await rig.waitForText(
-        'How would you like to authenticate',
-        5000,
-      );
-
-      // select the second option if auth dialog come's up
-      if (authDialogAppeared) {
-        ptyProcess.write('2');
-      }
-
-      // Wait for the app to be ready
-      const isReady = await rig.waitForText('Type your message', 25000);
-      expect(
-        isReady,
-        'CLI did not start up in interactive mode correctly',
-      ).toBe(true);
-
-      await type(ptyProcess, '/compress');
-      await new Promise((resolve) => setTimeout(resolve, 100));
-      await type(ptyProcess, '\r');
-
-      const foundEvent = await rig.waitForTelemetryEvent(
-        'chat_compression',
-        90000,
-      );
-      expect(foundEvent).toBe(true);
-
-      const compressionFailed = await rig.waitForText(
-        'compression was not beneficial',
-        25000,
-      );
-
-      expect(compressionFailed).toBe(true);
-    },
-  );
-});

integration-tests/ctrl-c-exit.test.ts

@@ -1,129 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect } from 'vitest';
-import { TestRig } from './test-helper.js';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-
-describe('Ctrl+C exit', () => {
-  // (#9782) Temporarily disabling on windows because it is failing on main and every
-  // PR, which is potentially hiding other failures
-  it.skipIf(process.platform === 'win32')(
-    'should exit gracefully on second Ctrl+C',
-    async () => {
-      const rig = new TestRig();
-      await rig.setup('should exit gracefully on second Ctrl+C');
-
-      const { ptyProcess, promise } = rig.runInteractive();
-
-      let output = '';
-      ptyProcess.onData((data) => {
-        output += data;
-      });
-
-      // Wait for the app to be ready by looking for the initial prompt indicator
-      await rig.poll(() => output.includes('▶'), 5000, 100);
-
-      // Send first Ctrl+C
-      ptyProcess.write(String.fromCharCode(3));
-
-      // Wait for the exit prompt
-      await rig.poll(
-        () => output.includes('Press Ctrl+C again to exit'),
-        1500,
-        50,
-      );
-
-      // Send second Ctrl+C
-      ptyProcess.write(String.fromCharCode(3));
-
-      const result = await promise;
-
-      // Expect a graceful exit (code 0)
-      expect(
-        result.exitCode,
-        `Process exited with code ${result.exitCode}. Output: ${result.output}`,
-      ).toBe(0);
-
-      // Check that the quitting message is displayed
-      const quittingMessage = 'Agent powering down. Goodbye!';
-      // The regex below is intentionally matching the ESC control character (\x1b)
-      // to strip ANSI color codes from the terminal output.
-      // eslint-disable-next-line no-control-regex
-      const cleanOutput = output.replace(/\x1b\[[0-9;]*m/g, '');
-      expect(cleanOutput).toContain(quittingMessage);
-    },
-  );
-
-  it.skipIf(process.platform === 'win32')(
-    'should exit gracefully on second Ctrl+C when calling a tool',
-    async () => {
-      const rig = new TestRig();
-      await rig.setup(
-        'should exit gracefully on second Ctrl+C when calling a tool',
-      );
-
-      const childProcessFile = 'child_process_file.txt';
-      rig.createFile(
-        'wait.js',
-        `setTimeout(() => require('fs').writeFileSync('${childProcessFile}', 'done'), 5000)`,
-      );
-
-      const { ptyProcess, promise } = rig.runInteractive();
-
-      let output = '';
-      ptyProcess.onData((data) => {
-        output += data;
-      });
-
-      // Wait for the app to be ready by looking for the initial prompt indicator
-      await rig.poll(() => output.includes('▶'), 5000, 100);
-
-      ptyProcess.write('use the tool to run "node -e wait.js"\n');
-
-      await rig.poll(() => output.includes('Shell'), 5000, 100);
-
-      // Send first Ctrl+C
-      ptyProcess.write(String.fromCharCode(3));
-
-      // Wait for the exit prompt
-      await rig.poll(
-        () => output.includes('Press Ctrl+C again to exit'),
-        1500,
-        50,
-      );
-
-      // Send second Ctrl+C
-      ptyProcess.write(String.fromCharCode(3));
-
-      const result = await promise;
-
-      // Expect a graceful exit (code 0)
-      expect(
-        result.exitCode,
-        `Process exited with code ${result.exitCode}. Output: ${result.output}`,
-      ).toBe(0);
-
-      // Check that the quitting message is displayed
-      const quittingMessage = 'Agent powering down. Goodbye!';
-      // The regex below is intentionally matching the ESC control character (\x1b)
-      // to strip ANSI color codes from the terminal output.
-      // eslint-disable-next-line no-control-regex
-      const cleanOutput = output.replace(/\x1b\[[0-9;]*m/g, '');
-      expect(cleanOutput).toContain(quittingMessage);
-
-      // Check that the child process was terminated and did not create the file.
-      const childProcessFileExists = fs.existsSync(
-        path.join(rig.testDir!, childProcessFile),
-      );
-      expect(
-        childProcessFileExists,
-        'Child process file should not exist',
-      ).toBe(false);
-    },
-  );
-});