tempt to fix browser bundle

.gcp/Dockerfile.development

@@ -1,89 +0,0 @@
-# --- STAGE 1: Base Runtime ---
-FROM docker.io/library/node:20-slim AS base
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  python3 \
-  python3-pip \
-  python3-venv \
-  curl \
-  dnsutils \
-  less \
-  jq \
-  ca-certificates \
-  git \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-# --- STAGE 2: Builder (Compile Main) ---
-FROM base AS builder
-WORKDIR /build
-COPY . .
-RUN npm ci --ignore-scripts
-RUN npm run bundle
-# Run the official release preparation script to move the bundle and assets into packages/cli
-RUN node scripts/prepare-npm-release.js
-
-# --- STAGE 3: Development Environment ---
-FROM base AS development
-
-WORKDIR /home/node/dev/main
-
-# Set up npm global package folder
-RUN mkdir -p /usr/local/share/npm-global \
-  && chown -R node:node /usr/local/share/npm-global
-ENV NPM_CONFIG_PREFIX=/usr/local/share/npm-global
-ENV PATH=$PATH:/usr/local/share/npm-global/bin
-
-# Copy package.json to extract versions for global tools
-COPY package.json /tmp/package.json
-
-# Install Build Tools, Global Dev Tools (pinned), and Linters
-ARG ACTIONLINT_VER=1.7.7
-ARG SHELLCHECK_VER=0.11.0
-ARG YAMLLINT_VER=1.35.1
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  make \
-  g++ \
-  gh \
-  git \
-  unzip \
-  rsync \
-  ripgrep \
-  procps \
-  psmisc \
-  lsof \
-  socat \
-  tmux \
-  docker.io \
-  build-essential \
-  libsecret-1-dev \
-  libkrb5-dev \
-  file \
-  && curl -sSLo /tmp/actionlint.tar.gz https://github.com/rhysd/actionlint/releases/download/v${ACTIONLINT_VER}/actionlint_${ACTIONLINT_VER}_linux_amd64.tar.gz \
-  && tar -xzf /tmp/actionlint.tar.gz -C /usr/local/bin actionlint \
-  && curl -sSLo /tmp/shellcheck.tar.xz https://github.com/koalaman/shellcheck/releases/download/v${SHELLCHECK_VER}/shellcheck-v${SHELLCHECK_VER}.linux.x86_64.tar.xz \
-  && tar -xf /tmp/shellcheck.tar.xz -C /usr/local/bin --strip-components=1 shellcheck-v${SHELLCHECK_VER}/shellcheck \
-  && pip3 install --break-system-packages yamllint==${YAMLLINT_VER} \
-  && export TSX_VER=$(node -p "require('/tmp/package.json').devDependencies.tsx") \
-  && export VITEST_VER=$(node -p "require('/tmp/package.json').devDependencies.vitest") \
-  && export PRETTIER_VER=$(node -p "require('/tmp/package.json').devDependencies.prettier") \
-  && export ESLINT_VER=$(node -p "require('/tmp/package.json').devDependencies.eslint") \
-  && export CROSS_ENV_VER=$(node -p "require('/tmp/package.json').devDependencies['cross-env']") \
-  && npm install -g tsx@$TSX_VER vitest@$VITEST_VER prettier@$PRETTIER_VER eslint@$ESLINT_VER cross-env@$CROSS_ENV_VER typescript@5.3.3 \
-  && npm install -g @google/gemini-cli@nightly && mv /usr/local/share/npm-global/bin/gemini /usr/local/share/npm-global/bin/g-nightly \
-  && npm install -g @google/gemini-cli@preview && mv /usr/local/share/npm-global/bin/gemini /usr/local/share/npm-global/bin/g-preview \
-  && npm install -g @google/gemini-cli@latest  && mv /usr/local/share/npm-global/bin/gemini /usr/local/share/npm-global/bin/g-stable \
-  && apt-get purge -y build-essential libsecret-1-dev libkrb5-dev \
-  && apt-get autoremove -y \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/* /tmp/* /root/.npm
-
-# Copy the bundled CLI package to a permanent location and install it
-# We MUST not delete this source folder as 'npm install -g <folder>' 
-# often symlinks to it for local folder installs.
-COPY --from=builder /build/packages/cli /usr/local/lib/gemini-cli
-RUN npm install -g /usr/local/lib/gemini-cli
-
-USER node
-CMD ["/bin/bash"]

.gcp/Dockerfile.development.dockerignore

@@ -1,10 +0,0 @@
-node_modules
-.git
-.gemini/workspaces
-dist
-!packages/*/dist/*.tgz
-bundle
-out
-*.log
-.env
-.DS_Store

.gcp/development-worker.yml

@@ -1,58 +0,0 @@
-substitutions:
-  _IMAGE_NAME: 'development'
-  _ARTIFACT_REGISTRY_REPO: 'us-docker.pkg.dev/gemini-code-dev/gemini-cli'
-
-steps:
-  # Step 1: Install root dependencies
-  - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
-    id: 'Install Dependencies'
-    entrypoint: 'npm'
-    args: ['install']
-
-  # Step 2: Authenticate for Docker
-  - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
-    id: 'Authenticate docker'
-    entrypoint: 'npm'
-    args: ['run', 'auth']
-
-  # Step 3: Build workspace packages
-  - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
-    id: 'Build packages'
-    entrypoint: 'npm'
-    args: ['run', 'build:packages']
-
-  # Step 4: Build Development Image
-  - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
-    id: 'Build Development Image'
-    entrypoint: 'bash'
-    env:
-      - 'RAW_BRANCH_VALUE=${BRANCH_NAME}'
-    args:
-      - '-c'
-      - |-
-        IMAGE_BASE="${_ARTIFACT_REGISTRY_REPO}/${_IMAGE_NAME}"
-
-        # Determine the primary tag (branch name or 'latest' for main)
-        # Use $$ for shell variables to avoid Cloud Build attempting premature substitution
-        RAW_BRANCH="$$RAW_BRANCH_VALUE"
-        if [ "$${RAW_BRANCH}" == "main" ]; then
-          TAG_PRIMARY="latest"
-        else
-          TAG_PRIMARY=$$(echo "$${RAW_BRANCH}" | sed 's/[^a-zA-Z0-9]/-/g' | tr '[:upper:]' '[:lower:]')
-        fi
-
-        # Use SHORT_SHA if available (Cloud Build) or fallback to latest-dev
-        TAG_SHA="$${SHORT_SHA:-latest-dev}"
-
-        echo "📦 Building Development Image for: $${RAW_BRANCH} -> $${TAG_PRIMARY} ($${TAG_SHA})"
-
-        docker build -f .gcp/Dockerfile.development \
-          -t "$${IMAGE_BASE}:$${TAG_SHA}" \
-          -t "$${IMAGE_BASE}:$${TAG_PRIMARY}" .
-
-        docker push "$${IMAGE_BASE}:$${TAG_SHA}"
-        docker push "$${IMAGE_BASE}:$${TAG_PRIMARY}"
-
-options:
-  defaultLogsBucketBehavior: 'REGIONAL_USER_OWNED_BUCKET'
-  dynamicSubstitutions: true

.gemini/commands/fix-behavioral-eval.toml

@@ -0,0 +1,60 @@
+description = "Check status of nightly evals, fix failures for key models, and re-run."
+prompt = """
+You are an expert at fixing behavioral evaluations.
+
+1. **Investigate**:
+   - Use 'gh' cli to fetch the results from the latest run from the main branch: https://github.com/google-gemini/gemini-cli/actions/workflows/evals-nightly.yml.
+   - DO NOT push any changes or start any runs. The rest of your evaluation will be local.
+   - Evals are in evals/ directory and are documented by evals/README.md.
+   - The test case trajectory logs will be logged to evals/logs.
+   - You should also enable and review the verbose agent logs by setting the GEMINI_DEBUG_LOG_FILE environment variable.
+   - Identify the relevant test. Confine your investigation and validation to just this test.
+   - Proactively add logging that will aid in gathering information or validating your hypotheses.
+
+2. **Fix**:
+   - If a relevant test is failing, locate the test file and the corresponding prompt/code.
+   - It's often helpful to make an extreme, brute force change to see if you are changing the right place to make an improvement and then scope it back iteratively.
+   - Your **final** change should be **minimal and targeted**.
+   - Keep in mind the following:
+     - The prompt has multiple configurations and pieces. Take care that your changes
+       end up in the final prompt for the selected model and configuration.
+     - The prompt chosen for the eval is intentional. It's often vague or indirect
+       to see how the agent performs with ambiguous instructions. Changing it should
+       be a last resort.
+     - When changing the test prompt, carefully consider whether the prompt still tests
+       the same scenario. We don't want to lose test fidelity by making the prompts too
+       direct (i.e.: easy).
+     - Your primary mechanism for improving the agent's behavior is to make changes to
+       tool instructions, system prompt (snippets.ts), and/or modules that contribute to the prompt.
+     - If prompt and description changes are unsuccessful, use logs and debugging to
+       confirm that everything is working as expected.
+    - If unable to fix the test, you can make recommendations for architecture changes
+      that might help stablize the test. Be sure to THINK DEEPLY if offering architecture guidance.
+      Some facts that might help with this are:
+      - Agents may be composed of one or more agent loops.
+      - AgentLoop == 'context + toolset + prompt'. Subagents are one type of agent loop.
+      - Agent loops perform better when:
+        - They have direct, unambiguous, and non-contradictory prompts.
+        - They have fewer irrelevant tools.
+        - They have fewer goals or steps to perform.
+        - They have less low value or irrelevant context.
+      - You may suggest compositions of existing primitives, like subagents, or
+        propose a new one.
+      - These recommendations should be high confidence and should be grounded
+        in observed deficient behaviors rather than just parroting the facts above.
+        Investigate as needed to ground your recommendations.
+
+3. **Verify**:
+   - Run just that one test if needed to validate that it is fixed. Be sure to run vitest in non-interactive mode.
+   - Running the tests can take a long time, so consider whether you can diagnose via other means or log diagnostics before committing the time. You must minimize the number of test runs needed to diagnose the failure.
+   - After the test completes, check whether it seems to have improved.
+   - You will need to run the test 3 times for Gemini 3.0, Gemini 3 flash, and Gemini 2.5 pro to ensure that it is truly stable. Run these runs in parallel, using scripts if needed.
+   - Some flakiness is expected; if it looks like a transient issue or the test is inherently unstable but passes 2/3 times, you might decide it cannot be improved.
+
+4. **Report**:
+   - Provide a summary of the test success rate for each of the tested models.
+   - Success rate is calculated based on 3 runs per model (e.g., 3/3 = 100%).
+   - If you couldn't fix it due to persistent flakiness, explain why.
+
+{{args}}
+"""

.gemini/commands/promote-behavioral-eval.toml

@@ -0,0 +1,29 @@
+description = "Promote behavioral evals that have a 100% success rate over the last 7 nightly runs."
+prompt = """
+You are an expert at analyzing and promoting behavioral evaluations.
+
+1. **Investigate**:
+   - Use 'gh' cli to fetch the results from the most recent run from the main branch: https://github.com/google-gemini/gemini-cli/actions/workflows/evals-nightly.yml.
+   - DO NOT push any changes or start any runs. The rest of your evaluation will be local.
+   - Evals are in evals/ directory and are documented by evals/README.md.
+   - Identify tests that have passed 100% of the time for ALL enabled models across the past 7 runs in a row.
+   - NOTE: the results summary from the most recent run contains the last 7 runs test results. 100% means the test passed 3/3 times for that model and run.
+   - If a test meets this criteria, it is a candidate for promotion.
+
+2. **Promote**:
+   - For each candidate test, locate the test file in the evals/ directory.
+   - Promote the test according to the project's standard promotion process (e.g., moving it to a stable suite, updating its tags, or removing skip/flaky annotations). 
+   - Ensure you follow any guidelines in evals/README.md for stable tests.
+   - Your **final** change should be **minimal and targeted** to just promoting the test status.
+
+3. **Verify**:
+   - Run the promoted tests locally to validate that they still execute correctly. Be sure to run vitest in non-interactive mode.
+   - Check that the test is now part of the expected standard or stable test suites.
+
+4. **Report**:
+   - Provide a summary of the tests that were promoted.
+   - Include the success rate evidence (7/7 runs passed for all models) for each promoted test.
+   - If no tests met the criteria for promotion, clearly state that and summarize the closest candidates.
+
+{{args}}
+"""

.gemini/settings.json

@@ -1,11 +1,21 @@
 {
   "experimental": {
+    "plan": true,
     "extensionReloading": true,
     "modelSteering": true,
-    "memoryManager": false,
-    "topicUpdateNarration": true
+    "memoryManager": true
   },
   "general": {
     "devtools": true
+  },
+  "agents": {
+    "overrides": {
+      "browser_agent": { "enabled": true }
+    },
+    "browser": {
+      "headless": true,
+      "sessionMode": "isolated",
+      "allowedDomains": ["*.com"]
+    }
   }
 }

.gemini/skills/async-pr-review/scripts/async-review.sh

@@ -1,194 +1,190 @@
 #!/bin/bash
 
 notify() {
-  local title="${1}"
-  local message="${2}"
-  local pr="${3}"
+  local title="$1"
+  local message="$2"
+  local pr="$3"
   # Terminal escape sequence
-  printf "\e]9;%s | PR #%s | %s\a" "${title}" "${pr}" "${message}"
+  printf "\e]9;%s | PR #%s | %s\a" "$title" "$pr" "$message"
   # Native macOS notification
-  os_type="$(uname || true)"
-  if [[ "${os_type}" == "Darwin" ]]; then
-    osascript -e "display notification \"${message}\" with title \"${title}\" subtitle \"PR #${pr}\""
+  if [[ "$(uname)" == "Darwin" ]]; then
+    osascript -e "display notification \"$message\" with title \"$title\" subtitle \"PR #$pr\""
   fi
 }
 
-pr_number="${1}"
-if [[ -z "${pr_number}" ]]; then
+pr_number=$1
+if [[ -z "$pr_number" ]]; then
   echo "Usage: async-review <pr_number>"
   exit 1
 fi
 
-base_dir="$(git rev-parse --show-toplevel 2>/dev/null || true)"
-if [[ -z "${base_dir}" ]]; then
+base_dir=$(git rev-parse --show-toplevel 2>/dev/null)
+if [[ -z "$base_dir" ]]; then
   echo "❌ Must be run from within a git repository."
   exit 1
 fi
 
 # Use the repository's local .gemini/tmp directory for ephemeral worktrees and logs
-pr_dir="${base_dir}/.gemini/tmp/async-reviews/pr-${pr_number}"
-target_dir="${pr_dir}/worktree"
-log_dir="${pr_dir}/logs"
+pr_dir="$base_dir/.gemini/tmp/async-reviews/pr-$pr_number"
+target_dir="$pr_dir/worktree"
+log_dir="$pr_dir/logs"
 
-cd "${base_dir}" || exit 1
+cd "$base_dir" || exit 1
 
-mkdir -p "${log_dir}"
-rm -f "${log_dir}/setup.exit" "${log_dir}/final-assessment.exit" "${log_dir}/final-assessment.md"
+mkdir -p "$log_dir"
+rm -f "$log_dir/setup.exit" "$log_dir/final-assessment.exit" "$log_dir/final-assessment.md"
 
-echo "🧹 Cleaning up previous worktree if it exists..." | tee -a "${log_dir}/setup.log"
-git worktree remove -f "${target_dir}" >> "${log_dir}/setup.log" 2>&1 || true
-git branch -D "gemini-async-pr-${pr_number}" >> "${log_dir}/setup.log" 2>&1 || true
-git worktree prune >> "${log_dir}/setup.log" 2>&1 || true
+echo "🧹 Cleaning up previous worktree if it exists..." | tee -a "$log_dir/setup.log"
+git worktree remove -f "$target_dir" >> "$log_dir/setup.log" 2>&1 || true
+git branch -D "gemini-async-pr-$pr_number" >> "$log_dir/setup.log" 2>&1 || true
+git worktree prune >> "$log_dir/setup.log" 2>&1 || true
 
-echo "📡 Fetching PR #${pr_number}..." | tee -a "${log_dir}/setup.log"
-if ! git fetch origin -f "pull/${pr_number}/head:gemini-async-pr-${pr_number}" >> "${log_dir}/setup.log" 2>&1; then
-  echo 1 > "${log_dir}/setup.exit"
-  echo "❌ Fetch failed. Check ${log_dir}/setup.log"
-  notify "Async Review Failed" "Fetch failed." "${pr_number}"
+echo "📡 Fetching PR #$pr_number..." | tee -a "$log_dir/setup.log"
+if ! git fetch origin -f "pull/$pr_number/head:gemini-async-pr-$pr_number" >> "$log_dir/setup.log" 2>&1; then
+  echo 1 > "$log_dir/setup.exit"
+  echo "❌ Fetch failed. Check $log_dir/setup.log"
+  notify "Async Review Failed" "Fetch failed." "$pr_number"
   exit 1
 fi
 
-if [[ ! -d "${target_dir}" ]]; then
-  echo "🧹 Pruning missing worktrees..." | tee -a "${log_dir}/setup.log"
-  git worktree prune >> "${log_dir}/setup.log" 2>&1
-  echo "🌿 Creating worktree in ${target_dir}..." | tee -a "${log_dir}/setup.log"
-  if ! git worktree add "${target_dir}" "gemini-async-pr-${pr_number}" >> "${log_dir}/setup.log" 2>&1; then
-    echo 1 > "${log_dir}/setup.exit"
-    echo "❌ Worktree creation failed. Check ${log_dir}/setup.log"
-    notify "Async Review Failed" "Worktree creation failed." "${pr_number}"
+if [[ ! -d "$target_dir" ]]; then
+  echo "🧹 Pruning missing worktrees..." | tee -a "$log_dir/setup.log"
+  git worktree prune >> "$log_dir/setup.log" 2>&1
+  echo "🌿 Creating worktree in $target_dir..." | tee -a "$log_dir/setup.log"
+  if ! git worktree add "$target_dir" "gemini-async-pr-$pr_number" >> "$log_dir/setup.log" 2>&1; then
+    echo 1 > "$log_dir/setup.exit"
+    echo "❌ Worktree creation failed. Check $log_dir/setup.log"
+    notify "Async Review Failed" "Worktree creation failed." "$pr_number"
     exit 1
   fi
 else
-  echo "🌿 Worktree already exists." | tee -a "${log_dir}/setup.log"
+  echo "🌿 Worktree already exists." | tee -a "$log_dir/setup.log"
 fi
-echo 0 > "${log_dir}/setup.exit"
+echo 0 > "$log_dir/setup.exit"
 
-cd "${target_dir}" || exit 1
+cd "$target_dir" || exit 1
 
-echo "🚀 Launching background tasks. Logs saving to: ${log_dir}"
+echo "🚀 Launching background tasks. Logs saving to: $log_dir"
 
 echo "  ↳ [1/5] Grabbing PR diff..."
-rm -f "${log_dir}/pr-diff.exit"
-{ gh pr diff "${pr_number}" > "${log_dir}/pr-diff.diff" 2>&1; echo $? > "${log_dir}/pr-diff.exit"; } &
+rm -f "$log_dir/pr-diff.exit"
+{ gh pr diff "$pr_number" > "$log_dir/pr-diff.diff" 2>&1; echo $? > "$log_dir/pr-diff.exit"; } &
 
 echo "  ↳ [2/5] Starting build and lint..."
-rm -f "${log_dir}/build-and-lint.exit"
-{ { npm run clean && npm ci && npm run format && npm run build && npm run lint:ci && npm run typecheck; } > "${log_dir}/build-and-lint.log" 2>&1; echo $? > "${log_dir}/build-and-lint.exit"; } &
+rm -f "$log_dir/build-and-lint.exit"
+{ { npm run clean && npm ci && npm run format && npm run build && npm run lint:ci && npm run typecheck; } > "$log_dir/build-and-lint.log" 2>&1; echo $? > "$log_dir/build-and-lint.exit"; } &
 
 # Dynamically resolve gemini binary (fallback to your nightly path)
-GEMINI_CMD="$(command -v gemini || echo "${HOME}/.gcli/nightly/node_modules/.bin/gemini")"
-# shellcheck disable=SC2312
+GEMINI_CMD=$(which gemini || echo "$HOME/.gcli/nightly/node_modules/.bin/gemini")
 POLICY_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/policy.toml"
 
 echo "  ↳ [3/5] Starting Gemini code review..."
-rm -f "${log_dir}/review.exit"
-{ "${GEMINI_CMD}" --policy "${POLICY_PATH}" -p "/review-frontend ${pr_number}" > "${log_dir}/review.md" 2>&1; echo $? > "${log_dir}/review.exit"; } &
+rm -f "$log_dir/review.exit"
+{ "$GEMINI_CMD" --policy "$POLICY_PATH" -p "/review-frontend $pr_number" > "$log_dir/review.md" 2>&1; echo $? > "$log_dir/review.exit"; } &
 
 echo "  ↳ [4/5] Starting automated tests (waiting for build and lint)..."
-rm -f "${log_dir}/npm-test.exit"
+rm -f "$log_dir/npm-test.exit"
 { 
-  while [[ ! -f "${log_dir}/build-and-lint.exit" ]]; do sleep 1; done
-  read -r build_exit < "${log_dir}/build-and-lint.exit" || build_exit=""
-  if [[ "${build_exit}" == "0" ]]; then
-    gh pr checks "${pr_number}" > "${log_dir}/ci-checks.log" 2>&1
+  while [ ! -f "$log_dir/build-and-lint.exit" ]; do sleep 1; done
+  if [ "$(cat "$log_dir/build-and-lint.exit")" == "0" ]; then
+    gh pr checks "$pr_number" > "$log_dir/ci-checks.log" 2>&1
     ci_status=$?
     
-    if [[ "${ci_status}" -eq 0 ]]; then
-      echo "CI checks passed. Skipping local npm tests." > "${log_dir}/npm-test.log"
-      echo 0 > "${log_dir}/npm-test.exit"
-    elif [[ "${ci_status}" -eq 8 ]]; then
-      echo "CI checks are still pending. Skipping local npm tests to avoid duplicate work. Please check GitHub for final results." > "${log_dir}/npm-test.log"
-      echo 0 > "${log_dir}/npm-test.exit"
+    if [ "$ci_status" -eq 0 ]; then
+      echo "CI checks passed. Skipping local npm tests." > "$log_dir/npm-test.log"
+      echo 0 > "$log_dir/npm-test.exit"
+    elif [ "$ci_status" -eq 8 ]; then
+      echo "CI checks are still pending. Skipping local npm tests to avoid duplicate work. Please check GitHub for final results." > "$log_dir/npm-test.log"
+      echo 0 > "$log_dir/npm-test.exit"
     else
-      echo "CI checks failed. Failing checks:" > "${log_dir}/npm-test.log"
-      gh pr checks "${pr_number}" --json name,bucket -q '.[] | select(.bucket=="fail") | .name' >> "${log_dir}/npm-test.log" 2>&1
+      echo "CI checks failed. Failing checks:" > "$log_dir/npm-test.log"
+      gh pr checks "$pr_number" --json name,bucket -q '.[] | select(.bucket=="fail") | .name' >> "$log_dir/npm-test.log" 2>&1
       
-      echo "Attempting to extract failing test files from CI logs..." >> "${log_dir}/npm-test.log"
-      pr_branch="$(gh pr view "${pr_number}" --json headRefName -q '.headRefName' 2>/dev/null || true)"
-      run_id="$(gh run list --branch "${pr_branch}" --workflow ci.yml --json databaseId -q '.[0].databaseId' 2>/dev/null || true)"
+      echo "Attempting to extract failing test files from CI logs..." >> "$log_dir/npm-test.log"
+      pr_branch=$(gh pr view "$pr_number" --json headRefName -q '.headRefName' 2>/dev/null)
+      run_id=$(gh run list --branch "$pr_branch" --workflow ci.yml --json databaseId -q '.[0].databaseId' 2>/dev/null)
       
       failed_files=""
-      if [[ -n "${run_id}" ]]; then
-        failed_files="$(gh run view "${run_id}" --log-failed 2>/dev/null | grep -o -E '(packages/[a-zA-Z0-9_-]+|integration-tests|evals)/[a-zA-Z0-9_/-]+\.test\.ts(x)?' | sort | uniq || true)"
+      if [[ -n "$run_id" ]]; then
+        failed_files=$(gh run view "$run_id" --log-failed 2>/dev/null | grep -o -E '(packages/[a-zA-Z0-9_-]+|integration-tests|evals)/[a-zA-Z0-9_/-]+\.test\.ts(x)?' | sort | uniq)
       fi
       
-      if [[ -n "${failed_files}" ]]; then
-        echo "Found failing test files from CI:" >> "${log_dir}/npm-test.log"
-        for f in ${failed_files}; do echo "  - ${f}" >> "${log_dir}/npm-test.log"; done
-        echo "Running ONLY failing tests locally..." >> "${log_dir}/npm-test.log"
+      if [[ -n "$failed_files" ]]; then
+        echo "Found failing test files from CI:" >> "$log_dir/npm-test.log"
+        for f in $failed_files; do echo "  - $f" >> "$log_dir/npm-test.log"; done
+        echo "Running ONLY failing tests locally..." >> "$log_dir/npm-test.log"
         
         exit_code=0
-        for file in ${failed_files}; do
-           if [[ "${file}" == packages/* ]]; then
-             ws_dir="$(echo "${file}" | cut -d'/' -f1,2)"
+        for file in $failed_files; do
+           if [[ "$file" == packages/* ]]; then
+             ws_dir=$(echo "$file" | cut -d'/' -f1,2)
            else
-             ws_dir="$(echo "${file}" | cut -d'/' -f1)"
+             ws_dir=$(echo "$file" | cut -d'/' -f1)
            fi
-           rel_file="${file#"${ws_dir}"/}"
+           rel_file=${file#$ws_dir/}
            
-           echo "--- Running ${rel_file} in workspace ${ws_dir} ---" >> "${log_dir}/npm-test.log"
-           if ! npm run test:ci -w "${ws_dir}" -- "${rel_file}" >> "${log_dir}/npm-test.log" 2>&1; then
+           echo "--- Running $rel_file in workspace $ws_dir ---" >> "$log_dir/npm-test.log"
+           if ! npm run test:ci -w "$ws_dir" -- "$rel_file" >> "$log_dir/npm-test.log" 2>&1; then
              exit_code=1
            fi
         done
-        echo "${exit_code}" > "${log_dir}/npm-test.exit"
+        echo $exit_code > "$log_dir/npm-test.exit"
       else
-        echo "Could not extract specific failing files. Skipping full local test suite as it takes too long. Please check CI logs manually." >> "${log_dir}/npm-test.log"
-        echo 1 > "${log_dir}/npm-test.exit"
+        echo "Could not extract specific failing files. Skipping full local test suite as it takes too long. Please check CI logs manually." >> "$log_dir/npm-test.log"
+        echo 1 > "$log_dir/npm-test.exit"
       fi
     fi
   else
-    echo "Skipped due to build-and-lint failure" > "${log_dir}/npm-test.log"
-    echo 1 > "${log_dir}/npm-test.exit"
+    echo "Skipped due to build-and-lint failure" > "$log_dir/npm-test.log"
+    echo 1 > "$log_dir/npm-test.exit"
   fi
 } &
 
 echo "  ↳ [5/5] Starting Gemini test execution (waiting for build and lint)..."
-rm -f "${log_dir}/test-execution.exit"
+rm -f "$log_dir/test-execution.exit"
 { 
-  while [[ ! -f "${log_dir}/build-and-lint.exit" ]]; do sleep 1; done
-  read -r build_exit < "${log_dir}/build-and-lint.exit" || build_exit=""
-  if [[ "${build_exit}" == "0" ]]; then
-    "${GEMINI_CMD}" --policy "${POLICY_PATH}" -p "Analyze the diff for PR ${pr_number} using 'gh pr diff ${pr_number}'. Instead of running the project's automated test suite (like 'npm test'), physically exercise the newly changed code in the terminal (e.g., by writing a temporary script to call the new functions, or testing the CLI command directly). Verify the feature's behavior works as expected. IMPORTANT: Do NOT modify any source code to fix errors. Just exercise the code and log the results, reporting any failures clearly. Do not ask for user confirmation." > "${log_dir}/test-execution.log" 2>&1; echo $? > "${log_dir}/test-execution.exit"
+  while [ ! -f "$log_dir/build-and-lint.exit" ]; do sleep 1; done
+  if [ "$(cat "$log_dir/build-and-lint.exit")" == "0" ]; then
+    "$GEMINI_CMD" --policy "$POLICY_PATH" -p "Analyze the diff for PR $pr_number using 'gh pr diff $pr_number'. Instead of running the project's automated test suite (like 'npm test'), physically exercise the newly changed code in the terminal (e.g., by writing a temporary script to call the new functions, or testing the CLI command directly). Verify the feature's behavior works as expected. IMPORTANT: Do NOT modify any source code to fix errors. Just exercise the code and log the results, reporting any failures clearly. Do not ask for user confirmation." > "$log_dir/test-execution.log" 2>&1; echo $? > "$log_dir/test-execution.exit"
   else
-    echo "Skipped due to build-and-lint failure" > "${log_dir}/test-execution.log"
-    echo 1 > "${log_dir}/test-execution.exit"
+    echo "Skipped due to build-and-lint failure" > "$log_dir/test-execution.log"
+    echo 1 > "$log_dir/test-execution.exit"
   fi
 } &
 
 echo "✅ All tasks dispatched!"
-echo "You can monitor progress with: tail -f ${log_dir}/*.log"
-echo "Read your review later at: ${log_dir}/review.md"
+echo "You can monitor progress with: tail -f $log_dir/*.log"
+echo "Read your review later at: $log_dir/review.md"
 
 # Polling loop to wait for all background tasks to finish
 tasks=("pr-diff" "build-and-lint" "review" "npm-test" "test-execution")
 log_files=("pr-diff.diff" "build-and-lint.log" "review.md" "npm-test.log" "test-execution.log")
 
 declare -A task_done
-for t in "${tasks[@]}"; do task_done[${t}]=0; done
+for t in "${tasks[@]}"; do task_done[$t]=0; done
 
 all_done=0
-while [[ "${all_done}" -eq 0 ]]; do
+while [[ $all_done -eq 0 ]]; do
   clear
   echo "=================================================="
-  echo "🚀 Async PR Review Status for PR #${pr_number}"
+  echo "🚀 Async PR Review Status for PR #$pr_number"
   echo "=================================================="
   echo ""
   
   all_done=1
   for i in "${!tasks[@]}"; do
-    t="${tasks[${i}]}"
+    t="${tasks[$i]}"
     
-    if [[ -f "${log_dir}/${t}.exit" ]]; then
-      read -r task_exit < "${log_dir}/${t}.exit" || task_exit=""
-      if [[ "${task_exit}" == "0" ]]; then
-        echo "  ✅ ${t}: SUCCESS"
+    if [[ -f "$log_dir/$t.exit" ]]; then
+      exit_code=$(cat "$log_dir/$t.exit")
+      if [[ "$exit_code" == "0" ]]; then
+        echo "  ✅ $t: SUCCESS"
       else
-        echo "  ❌ ${t}: FAILED (exit code ${task_exit})"
+        echo "  ❌ $t: FAILED (exit code $exit_code)"
       fi
-      task_done[${t}]=1
+      task_done[$t]=1
     else
-      echo "  ⏳ ${t}: RUNNING"
+      echo "  ⏳ $t: RUNNING"
       all_done=0
     fi
   done
@@ -199,47 +195,47 @@ while [[ "${all_done}" -eq 0 ]]; do
   echo "=================================================="
   
   for i in "${!tasks[@]}"; do
-    t="${tasks[${i}]}"
-    log_file="${log_files[${i}]}"
+    t="${tasks[$i]}"
+    log_file="${log_files[$i]}"
     
-    if [[ "${task_done[${t}]}" -eq 0 ]]; then
-      if [[ -f "${log_dir}/${log_file}" ]]; then
+    if [[ ${task_done[$t]} -eq 0 ]]; then
+      if [[ -f "$log_dir/$log_file" ]]; then
         echo ""
-        echo "--- ${t} ---"
-        tail -n 5 "${log_dir}/${log_file}"
+        echo "--- $t ---"
+        tail -n 5 "$log_dir/$log_file"
       fi
     fi
   done
   
-  if [[ "${all_done}" -eq 0 ]]; then
+  if [[ $all_done -eq 0 ]]; then
     sleep 3
   fi
 done
 
 clear
 echo "=================================================="
-echo "🚀 Async PR Review Status for PR #${pr_number}"
+echo "🚀 Async PR Review Status for PR #$pr_number"
 echo "=================================================="
 echo ""
 for t in "${tasks[@]}"; do
-  read -r task_exit < "${log_dir}/${t}.exit" || task_exit=""
-  if [[ "${task_exit}" == "0" ]]; then
-    echo "  ✅ ${t}: SUCCESS"
+  exit_code=$(cat "$log_dir/$t.exit")
+  if [[ "$exit_code" == "0" ]]; then
+    echo "  ✅ $t: SUCCESS"
   else
-    echo "  ❌ ${t}: FAILED (exit code ${task_exit})"
+    echo "  ❌ $t: FAILED (exit code $exit_code)"
   fi
 done
 echo ""
 
 echo "⏳ Tasks complete! Synthesizing final assessment..."
-if ! "${GEMINI_CMD}" --policy "${POLICY_PATH}" -p "Read the review at ${log_dir}/review.md, the automated test logs at ${log_dir}/npm-test.log, and the manual test execution logs at ${log_dir}/test-execution.log. Summarize the results, state whether the build and tests passed based on ${log_dir}/build-and-lint.exit and ${log_dir}/npm-test.exit, and give a final recommendation for PR ${pr_number}." > "${log_dir}/final-assessment.md" 2>&1; then
-  echo $? > "${log_dir}/final-assessment.exit"
+if ! "$GEMINI_CMD" --policy "$POLICY_PATH" -p "Read the review at $log_dir/review.md, the automated test logs at $log_dir/npm-test.log, and the manual test execution logs at $log_dir/test-execution.log. Summarize the results, state whether the build and tests passed based on $log_dir/build-and-lint.exit and $log_dir/npm-test.exit, and give a final recommendation for PR $pr_number." > "$log_dir/final-assessment.md" 2>&1; then
+  echo $? > "$log_dir/final-assessment.exit"
   echo "❌ Final assessment synthesis failed!"
-  echo "Check ${log_dir}/final-assessment.md for details."
-  notify "Async Review Failed" "Final assessment synthesis failed." "${pr_number}"
+  echo "Check $log_dir/final-assessment.md for details."
+  notify "Async Review Failed" "Final assessment synthesis failed." "$pr_number"
   exit 1
 fi
 
-echo 0 > "${log_dir}/final-assessment.exit"
-echo "✅ Final assessment complete! Check ${log_dir}/final-assessment.md"
-notify "Async Review Complete" "Review and test execution finished successfully." "${pr_number}"
+echo 0 > "$log_dir/final-assessment.exit"
+echo "✅ Final assessment complete! Check $log_dir/final-assessment.md"
+notify "Async Review Complete" "Review and test execution finished successfully." "$pr_number"

.gemini/skills/async-pr-review/scripts/check-async-review.sh

@@ -1,22 +1,22 @@
 #!/bin/bash
-pr_number="${1}"
+pr_number=$1
 
-if [[ -z "${pr_number}" ]]; then
+if [[ -z "$pr_number" ]]; then
   echo "Usage: check-async-review <pr_number>"
   exit 1
 fi
 
-base_dir="$(git rev-parse --show-toplevel 2>/dev/null || true)"
-if [[ -z "${base_dir}" ]]; then
+base_dir=$(git rev-parse --show-toplevel 2>/dev/null)
+if [[ -z "$base_dir" ]]; then
   echo "❌ Must be run from within a git repository."
   exit 1
 fi
 
-log_dir="${base_dir}/.gemini/tmp/async-reviews/pr-${pr_number}/logs"
+log_dir="$base_dir/.gemini/tmp/async-reviews/pr-$pr_number/logs"
 
-if [[ ! -d "${log_dir}" ]]; then
+if [[ ! -d "$log_dir" ]]; then
   echo "STATUS: NOT_FOUND"
-  echo "❌ No logs found for PR #${pr_number} in ${log_dir}"
+  echo "❌ No logs found for PR #$pr_number in $log_dir"
   exit 0
 fi
 
@@ -34,32 +34,32 @@ all_done=true
 echo "STATUS: CHECKING"
 
 for task_info in "${tasks[@]}"; do
-  IFS="|" read -r task_name log_file <<< "${task_info}"
+  IFS="|" read -r task_name log_file <<< "$task_info"
   
-  file_path="${log_dir}/${log_file}"
-  exit_file="${log_dir}/${task_name}.exit"
+  file_path="$log_dir/$log_file"
+  exit_file="$log_dir/$task_name.exit"
 
-  if [[ -f "${exit_file}" ]]; then
-    read -r exit_code < "${exit_file}" || exit_code=""
-    if [[ "${exit_code}" == "0" ]]; then
-      echo "✅ ${task_name}: SUCCESS"
+  if [[ -f "$exit_file" ]]; then
+    exit_code=$(cat "$exit_file")
+    if [[ "$exit_code" == "0" ]]; then
+      echo "✅ $task_name: SUCCESS"
     else
-      echo "❌ ${task_name}: FAILED (exit code ${exit_code})"
-      echo "   Last lines of ${file_path}:"
-      tail -n 3 "${file_path}" | sed 's/^/      /' || true
+      echo "❌ $task_name: FAILED (exit code $exit_code)"
+      echo "   Last lines of $file_path:"
+      tail -n 3 "$file_path" | sed 's/^/      /'
     fi
-  elif [[ -f "${file_path}" ]]; then
-    echo "⏳ ${task_name}: RUNNING"
+  elif [[ -f "$file_path" ]]; then
+    echo "⏳ $task_name: RUNNING"
     all_done=false
   else
-    echo "➖ ${task_name}: NOT STARTED"
+    echo "➖ $task_name: NOT STARTED"
     all_done=false
   fi
 done
 
-if [[ "${all_done}" == "true" ]]; then
+if $all_done; then
   echo "STATUS: COMPLETE"
-  echo "LOG_DIR: ${log_dir}"
+  echo "LOG_DIR: $log_dir"
 else
   echo "STATUS: IN_PROGRESS"
-fi
+fi

.gemini/skills/behavioral-evals/SKILL.md

@@ -1,56 +0,0 @@
----
-name: behavioral-evals
-description: Guidance for creating, running, fixing, and promoting behavioral evaluations. Use when verifying agent decision logic, debugging failures, debugging prompt steering, or adding workspace regression tests.
----
-
-# Behavioral Evals
-
-## Overview
-
-Behavioral evaluations (evals) are tests that validate the **agent's decision-making** (e.g., tool choice) rather than pure functionality. They are critical for verifying prompt changes, debugging steerability, and preventing regressions.
-
-> [!NOTE]
-> **Single Source of Truth**: For core concepts, policies, running tests, and general best practices, always refer to **[evals/README.md](file:///Users/abhipatel/code/gemini-cli/docs/evals/README.md)**.
-
----
-
-## 🔄 Workflow Decision Tree
-
-1.  **Does a prompt/tool change need validation?**
-    *   *No* -> Normal integration tests.
-    *   *Yes* -> Continue below.
-2.  **Is it UI/Interaction heavy?**
-    *   *Yes* -> Use `appEvalTest` (`AppRig`). See **[creating.md](references/creating.md)**.
-    *   *No* -> Use `evalTest` (`TestRig`). See **[creating.md](references/creating.md)**.
-3.  **Is it a new test?**
-    *   *Yes* -> Set policy to `USUALLY_PASSES`.
-    *   *No* -> `ALWAYS_PASSES` (locks in regression).
-4.  **Are you fixing a failure or promoting a test?**
-    *   *Fixing* -> See **[fixing.md](references/fixing.md)**.
-    *   *Promoting* -> See **[promoting.md](references/promoting.md)**.
-
----
-
-## 📋 Quick Checklist
-
-### 1. Setup Workspace
-Seed the workspace with necessary files using the `files` object to simulate a realistic scenario (e.g., NodeJS project with `package.json`).
-*   *Details in **[creating.md](references/creating.md)***
-
-### 2. Write Assertions
-Audit agent decisions using `rig.setBreakpoint()` (AppRig only) or index verification on `rig.readToolLogs()`.
-*   *Details in **[creating.md](references/creating.md)***
-
-### 3. Verify
-Run single tests locally with Vitest. Confirm stability locally before relying on CI workflows.
-*   *See **[evals/README.md](file:///Users/abhipatel/code/gemini-cli/docs/evals/README.md)** for running commands.*
-
----
-
-## 📦 Bundled Resources
-
-Detailed procedural guides:
-*   **[creating.md](references/creating.md)**: Assertion strategies, Rig selection, Mock MCPs.
-*   **[fixing.md](references/fixing.md)**: Step-by-step automated investigation, architecture diagnosis guidelines.
-*   **[promoting.md](references/promoting.md)**: Candidate identification criteria and threshold guidelines.
-

.gemini/skills/behavioral-evals/assets/interactive_eval.ts.txt

@@ -1,27 +0,0 @@
-import { describe, expect } from 'vitest';
-import { appEvalTest } from './app-test-helper.js';
-
-describe('interactive_feature', () => {
-  // New tests MUST start as USUALLY_PASSES
-  appEvalTest('USUALLY_PASSES', {
-    name: 'should pause for user confirmation',
-    files: {
-      'package.json': JSON.stringify({ name: 'app' })
-    },
-    prompt: 'Task description here requiring approval',
-    timeout: 60000, 
-    setup: async (rig) => {
-      // ⚠️ Breakpoints are ONLY safe in appEvalTest
-      rig.setBreakpoint(['ask_user']);
-    },
-    assert: async (rig) => {
-      // 1. Wait for the breakpoint to trigger
-      const confirmation = await rig.waitForPendingConfirmation('ask_user');
-      expect(confirmation).toBeDefined();
-
-      // 2. Resolve it so the test can finish
-      await rig.resolveTool(confirmation);
-      await rig.waitForIdle();
-    },
-  });
-});

.gemini/skills/behavioral-evals/assets/standard_eval.ts.txt

@@ -1,30 +0,0 @@
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-
-describe('core_feature', () => {
-  // New tests MUST start as USUALLY_PASSES
-  evalTest('USUALLY_PASSES', {
-    name: 'should perform expected agent action',
-    setup: async (rig) => {
-      // For mocking offline MCP:
-      // rig.addMockMcpServer('workspace-server', 'google-workspace');
-    },
-    files: {
-      'src/app.ts': '// some code',
-    },
-    prompt: 'Task description here',
-    timeout: 60000, // 1 minute safety limit
-    assert: async (rig, result) => {
-      // 1. Audit the trajectory (Safe for standard evalTest)
-      const logs = rig.readToolLogs();
-      const hasTool = logs.some((l) => l.toolRequest.name === 'read_file');
-      expect(hasTool, 'Agent should have read the file').toBe(true);
-
-      // 2. Assert efficiency (Cost/Turn)
-      expect(logs.length).toBeLessThan(5);
-
-      // 3. Assert final output
-      expect(result).toContain('Expected Keyword');
-    },
-  });
-});

.gemini/skills/behavioral-evals/references/creating.md

@@ -1,151 +0,0 @@
-# Creating Behavioral Evals
-
-## 🔬 Rig Selection
-
-| Rig Type          | Import From            | Architecture                                                         | Use When                                                                                              |
-| :---------------- | :--------------------- | :------------------------------------------------------------------- | :---------------------------------------------------------------------------------------------------- |
-| **`evalTest`**    | `./test-helper.js`     | **Subprocess**. Runs the CLI in a separate process + waits for exit. | Standard workspace tests. **Do not use `setBreakpoint`**; auditing history (`readToolLogs`) is safer. |
-| **`appEvalTest`** | `./app-test-helper.js` | **In-Process**. Runs directly inside the runner loop.                | UI/Ink rendering. Safe for `setBreakpoint` triggers.                                                  |
-
----
-
-## 🏗️ Scenario Design
-
-Evals must simulate realistic agent environments to effectively test
-decision-making.
-
-- **Workspace State**: Seed with standard project anchors if testing general
-  capabilities:
-  - `package.json` for NodeJS environments.
-  - Minimal configuration files (`tsconfig.json`, `GEMINI.md`).
-- **Structural Complexity**: Provide enough files to force the agent to _search_
-  or _navigate_, rather than giving the answer directly. Avoid trivial one-file
-  tests unless testing exact prompt steering.
-
----
-
-## ❌ Fail First Principle
-
-Before asserting a new capability or locking in a fix, **verify that the test
-fails first**.
-
-- It is easy to accidentally write an eval that asserts behaviors that are
-  already met or pass by default.
-- **Process**: reproduce failure with test -> apply fix (prompt/tool) -> verify
-  test passes.
-
----
-
-## ✋ Testing Patterns
-
-### 1. Breakpoints
-
-Verifies the agent _intends_ to use a tool BEFORE executing it. Useful for
-interactive prompts or safety checks.
-
-```typescript
-// ⚠️ Only works with appEvalTest (AppRig)
-setup: async (rig) => {
-  rig.setBreakpoint(['ask_user']);
-},
-assert: async (rig) => {
-  const confirmation = await rig.waitForPendingConfirmation('ask_user');
-  expect(confirmation).toBeDefined();
-}
-```
-
-### 2. Tool Confirmation Race
-
-When asserting multiple triggers (e.g., "enters plan mode then asks question"):
-
-```typescript
-assert: async (rig) => {
-  let confirmation = await rig.waitForPendingConfirmation([
-    'enter_plan_mode',
-    'ask_user',
-  ]);
-
-  if (confirmation?.name === 'enter_plan_mode') {
-    rig.acceptConfirmation('enter_plan_mode');
-    confirmation = await rig.waitForPendingConfirmation('ask_user');
-  }
-  expect(confirmation?.toolName).toBe('ask_user');
-};
-```
-
-### 3. Audit Tool Logs
-
-Audit exact operations to ensure efficiency (e.g., no redundant reads).
-
-```typescript
-assert: async (rig, result) => {
-  await rig.waitForTelemetryReady();
-  const toolLogs = rig.readToolLogs();
-
-  const writeCall = toolLogs.find(
-    (log) => log.toolRequest.name === 'write_file',
-  );
-  expect(writeCall).toBeDefined();
-};
-```
-
-### 4. Mock MCP Facades
-
-To evaluate tools connected via MCP without hitting live endpoints, load a mock
-server configuration in the `setup` hook.
-
-```typescript
-setup: async (rig) => {
-  rig.addMockMcpServer('workspace-server', 'google-workspace');
-},
-assert: async (rig) => {
-  await rig.waitForTelemetryReady();
-  const toolLogs = rig.readToolLogs();
-  const workspaceCall = toolLogs.find(
-    (log) => log.toolRequest.name === 'mcp_workspace-server_docs.getText'
-  );
-  expect(workspaceCall).toBeDefined();
-};
-```
-
----
-
-## ⚠️ Safety & Efficiency Guardrails
-
-### 1. Breakpoint Deadlocks
-
-Breakpoints (`setBreakpoint`) pause execution. In standard `evalTest`,
-`rig.run()` waits for the process to exit _before_ assertions run. **This will
-hang indefinitely.**
-
-- **Use Breakpoints** for `appEvalTest` or interactive simulations.
-- **Use Audit Tool Logs** (above) for standard trajectory tests.
-
-### 2. Runaway Timeout
-
-Always set a budget boundary in the `EvalCase` to prevent runaway loops on
-quota:
-
-```typescript
-evalTest('USUALLY_PASSES', {
-  name: '...',
-  timeout: 60000, // 1 minute safety limit
-  // ...
-});
-```
-
-### 3. Efficiency Assertion (Turn limits)
-
-Check if a tool is called _early_ using index checks:
-
-```typescript
-assert: async (rig) => {
-  const toolLogs = rig.readToolLogs();
-  const toolCallIndex = toolLogs.findIndex(
-    (log) => log.toolRequest.name === 'cli_help',
-  );
-
-  expect(toolCallIndex).toBeGreaterThan(-1);
-  expect(toolCallIndex).toBeLessThan(5); // Called within first 5 turns
-};
-```

.gemini/skills/behavioral-evals/references/fixing.md

@@ -1,100 +0,0 @@
-# Fixing Behavioral Evals
-
-Use this guide when asked to debug, troubleshoot, or fix a failing behavioral
-evaluation.
-
----
-
-## 1. 🔍 Investigate
-
-1.  **Fetch Nightly Results**: Use the `gh` CLI to inspect the latest run from
-    `evals-nightly.yml` if applicable.
-    - _Example view URL_:
-      `https://github.com/google-gemini/gemini-cli/actions/workflows/evals-nightly.yml`
-2.  **Isolate**: DO NOT push changes or start remote runs. Confine investigation
-    to the local workspace.
-3.  **Read Logs**:
-    - Eval logs live in `evals/logs/<test_name>.log`.
-    - Enable verbose debugging via `export GEMINI_DEBUG_LOG_FILE="debug.log"`.
-4.  **Diagnose**: Audit tool logs and telemetry. Note if due to setup/assert.
-    - **Tip**: Proactively add custom logging/diagnostics to check hypotheses.
-
----
-
-## 2. 🛠️ Fix Strategy
-
-1.  **Targeted Location**: Locate the test case and the corresponding
-    prompt/code.
-2.  **Iterative Scope**: Make extreme change first to verify scope, then refine
-    to a minimal, targeted change.
-3.  **Assertion Fidelity**:
-    - Changing the test prompt is a **last resort** (prompts are often vague by
-      design).
-    - **Warning**: Do not lose test fidelity by making prompts too direct/easy.
-    - **Primary Fix Trigger**: Adjust tool descriptions, system prompts
-      (`snippets.ts`), or **modules that contribute to the prompt template**.
-    - Fixes should generally try to improve the prompt
-      `@packages/core/src/prompts/snippets.ts` first.
-    - **Instructional Generality**: Changes to the system prompt should aim to
-      be as general as possible while still accomplishing the goal. Specificity
-      should be added only as needed.
-      - **Principle**: Instead of creating "forbidden lists" for specific syntax
-        (e.g., "Don't use `Object.create()`"), formulate a broader engineering
-        principle that covers the underlying issue (e.g., "Prioritize explicit
-        composition over hidden prototype manipulation"). This improves
-        steerability across a wider range of similar scenarios.
-      - _Low Specificity_: "Follow ecosystem best practices"
-      - _Medium Specificity_: "Utilize OOP and functional best practices, as
-        applicable"
-      - _High Specificity_: Provide ecosystem-specific hints as examples of a
-        broader principle rather than direct instructions. e.g., "NEVER use
-        hacks like bypassing the type system or employing 'hidden' logic (e.g.:
-        reflection, prototype manipulation). Instead, use explicit and idiomatic
-        language features (e.g.: type guards, explicit class instantiation, or
-        object spread) that maintain structural integrity."
-    - **Prompt Simplification**: Once the test is passing, use `ask_user` to
-      determine if prompt simplification is desired.
-      - **Criteria**: Simplification should be attempted only if there are
-        related clauses that can be de-duplicated or reparented under a single
-        heading.
-      - **Verification**: As part of simplification, you MUST identify and run
-        any behavioral eval tests that might be affected by the changes to
-        ensure no regressions are introduced.
-    - Test fixes should not "cheat" by changing a test's `GEMINI.md` file or by
-      updating the test's prompt to instruct it to not repro the bug.
-    - **Warning**: Prompts have multiple configurations; ensure your fix targets
-      the correct config for the model in question.
-4.  **Architecture Options**: If prompt or instruction tuning triggers no
-    improvement, analyze loop composition.
-    - **AgentLoop**: Defined by `context + toolset + prompt`.
-    - **Enhancements**: Loops perform best with direct prompts, fewer irrelevant
-      tools, low goal density, and minimal low-value/irrelevant context.
-    - **Modifications**: Compose subagents or isolate tools. Ground in observed
-      traces.
-    - **Warning**: Think deeply before offering recommendations; avoid parroting
-      abstract design guidelines.
-
----
-
-## 3. ✅ Verify
-
-1.  **Run Local**: Run Vitest in non-interactive mode on just the file.
-2.  **Log Audit**: Prioritize diagnosing failures via log comparison before
-    triggering heavy test runs.
-3.  **Stability Limit**: Run the test **3 times** locally on key models (can use
-    scripts to run in parallel for speed):
-    - **Gemini 3.0**
-    - **Gemini 3 Flash**
-    - **Gemini 2.5 Pro**
-4.  **Flakiness Rule**: If it passes 2/3 times, it may be inherent noise
-    difficult to improve without a structural split.
-
----
-
-## 4. 📊 Report
-
-Provide a summary of:
-
-- Test success rate for each tested model (e.g., 3/3 = 100%).
-- Root cause identification and fix explanation.
-- If unfixed, provide high-confidence architecture recommendations.

.gemini/skills/behavioral-evals/references/promoting.md

@@ -1,55 +0,0 @@
-# Promoting Behavioral Evals
-
-Use this guide when asked to analyze nightly results and promote incubated tests
-to stable suites.
-
----
-
-## 1. 🔍 Investigate candidates
-
-1.  **Audit Nightly Logs**: Use the `gh` CLI to fetch results from
-    `evals-nightly.yml` (Direct URL:
-    `https://github.com/google-gemini/gemini-cli/actions/workflows/evals-nightly.yml`).
-    - **Tip**: The aggregate summary from the most recent run integrates the
-      last 7 runs of history automatically.
-    - **Safety**: DO NOT push changes or start remote runs. All verification is
-      local.
-2.  **Assess Stability**: Identify tests that pass **100% of the time** across
-    ALL enabled models over the **last 7 nightly runs** in a row.
-    - _100% means the test passed 3/3 times for every model and run._
-3.  **Promotion Targets**: Tests meeting this criteria are candidates for
-    promotion from `USUALLY_PASSES` to `ALWAYS_PASSES`.
-
----
-
-## 2. 🚥 Promotion Steps
-
-1.  **Locate File**: Locate the eval file in the `evals/` directory.
-2.  **Update Policy**: Modify the policy argument to `ALWAYS_PASSES`.
-    ```typescript
-    evalTest('ALWAYS_PASSES', { ... })
-    ```
-3.  **Targeting**: Follow guidelines in `evals/README.md` regarding stable suite
-    organization.
-4.  **Constraint**: Your final change must be **minimal and targeted** strictly
-    to promoting the test status. Do not refactor the test or setup fixtures.
-
----
-
-## 3. ✅ Verify
-
-1.  **Run Prompted Tests**: Run the promoted test locally using non-interactive
-    Vitest to confirm structure validity.
-2.  **Verify Suite Inclusion**: Check that the test is successfully picked up by
-    standard runnable ranges.
-
----
-
-## 4. 📊 Report
-
-Provide a summary of:
-
-- Which tests were promoted.
-- Provide the success rate evidence (e.g., 7/7 runs passed for all models).
-- If no candidates qualified, list the next closest candidates and their current
-  pass rate.

.gemini/skills/behavioral-evals/references/running.md

@@ -1,95 +0,0 @@
-# Running & Promoting Evals
-
-## 🛠️ Prerequisites
-
-Behavioral evals run against the compiled binary. You **must** build and bundle
-the project first after making changes:
-
-```bash
-npm run build && npm run bundle
-```
-
----
-
-## 🏃‍♂️ Running Tests
-
-### 1. Configure Environment Variables
-
-Evals require a standard API key. If your `.env` file has multiple keys or
-comments, use this precise extraction setup:
-
-```bash
-export GEMINI_API_KEY=$(grep '^GEMINI_API_KEY=' .env | cut -d '=' -f2) && RUN_EVALS=1 npx vitest run --config evals/vitest.config.ts <file_name>
-```
-
-### 2. Commands
-
-| Command                             | Scope           | Description                                        |
-| :---------------------------------- | :-------------- | :------------------------------------------------- |
-| `npm run test:always_passing_evals` | `ALWAYS_PASSES` | Fast feedback, runs in CI.                         |
-| `npm run test:all_evals`            | All             | Runs nightly incubation tests. Sets `RUN_EVALS=1`. |
-
-### Target Specific File
-
-_Note: `RUN_EVALS=1` is required for incubated (`USUALLY_PASSES`) tests._
-
-```bash
-RUN_EVALS=1 npx vitest run --config evals/vitest.config.ts my_feature.eval.ts
-```
-
----
-
-## 🐞 Debugging and Logs
-
-If a test fails, verify:
-
-- **Tool Trajectory Logs**:序列 of calls in `evals/logs/<test_name>.log`.
-- **Verbose Reasoning**: Capture raw buffer traces by setting
-  `GEMINI_DEBUG_LOG_FILE`:
-  ```bash
-  export GEMINI_DEBUG_LOG_FILE="debug.log"
-  ```
-
----
-
-### 🎯 Verify Model Targeting
-
-- **Tip:** Standard evals benchmark against model variations. If a test passes
-  on Flash but fails on Pro (or vice versa), the issue is usually in the **tool
-  description**, not the prompt definition. Flash is sensitive to "instruction
-  bloat," while Pro is sensitive to "ambiguous intent."
-
----
-
-## 🚥 deflaking & Promotion
-
-To maintain CI stability, all new evals follow a strict incubation period.
-
-### 1. Incubation (`USUALLY_PASSES`)
-
-New tests must be created with the `USUALLY_PASSES` policy.
-
-```typescript
-evalTest('USUALLY_PASSES', { ... })
-```
-
-They run in **Evals: Nightly** workflows and do not block PR merges.
-
-### 2. Investigate Failures
-
-If a nightly eval regresses, investigate via agent:
-
-```bash
-gemini /fix-behavioral-eval [optional-run-uri]
-```
-
-### 3. Promotion (`ALWAYS_PASSES`)
-
-Once a test scores 100% consistency over multiple nightly cycles:
-
-```bash
-gemini /promote-behavioral-eval
-```
-
-_Do not promote manually._ The command verifies trajectory logs before updating
-the file policy.

.gemini/skills/ci/SKILL.md

@@ -1,66 +0,0 @@
----
-name: ci
-description:
-  A specialized skill for Gemini CLI that provides high-performance, fail-fast
-  monitoring of GitHub Actions workflows and automated local verification of CI
-  failures. It handles run discovery automatically—simply provide the branch name.
----
-
-# CI Replicate & Status
-
-This skill enables the agent to efficiently monitor GitHub Actions, triage
-failures, and bridge remote CI errors to local development. It defaults to
-**automatic replication** of failures to streamline the fix cycle.
-
-## Core Capabilities
-
-- **Automatic Replication**: Automatically monitors CI and immediately executes 
-  suggested test or lint commands locally upon failure.
-- **Real-time Monitoring**: Aggregated status line for all concurrent workflows
-  on the current branch.
-- **Fail-Fast Triage**: Immediately stops on the first job failure to provide a
-  structured report.
-
-## Workflow
-
-### 1. CI Replicate (`replicate`) - DEFAULT
-Use this as the primary path to monitor CI and **automatically** replicate 
-failures locally for immediate triage and fixing.
-- **Behavior**: When this workflow is triggered, the agent will monitor the CI
-  and **immediately and automatically execute** all suggested test or lint
-  commands (marked with 🚀) as soon as a failure is detected. 
-- **Tool**: `node .gemini/skills/ci/scripts/ci.mjs [branch]`
-- **Discovery**: The script **automatically** finds the latest active or recent
-  run for the branch. Do NOT manually search for run IDs.
-- **Goal**: Reproduce the failure locally without manual intervention, then
-  proceed to analyze and fix the code.
-
-### 1. CI Status (`status`)
-Use this when you have pushed changes and need to monitor the CI and reproduce
-any failures locally.
-- **Tool**: `node .gemini/skills/ci/scripts/ci.mjs [branch] [run_id]`
-- **Discovery**: The script **automatically** finds the latest active or recent
-  run for the branch. You should NOT manually search for \`run_id\` using \`gh run list\`
-  unless a specific historical run is requested. Simply provide the branch name.
-- **Step 1 (Monitor)**: Execute the tool with the branch name.
-- **Step 2 (Extract)**: Extract suggested \`npm test\` or \`npm run lint\` commands
-  from the output (marked with 🚀).
-- **Step 3 (Reproduce)**: Execute those commands locally to confirm the failure.
-- **Behavior**: It will poll every 15 seconds. If it detects a failure, it will
-  exit with a structured report and provide the exact commands to run locally.
-
-## Failure Categories & Actions
-
-- **Test Failures**: Agent should run the specific `npm test -w <pkg> -- <path>`
-  command suggested.
-- **Lint Errors**: Agent should run `npm run lint:all` or the specific package
-  lint command.
-- **Build Errors**: Agent should check `tsc` output or build logs to resolve
-  compilation issues.
-- **Job Errors**: Investigate `gh run view --job <job_id> --log` for
-  infrastructure or setup failures.
-
-## Noise Filtering
-The underlying scripts automatically filter noise (Git logs, NPM warnings, stack
-trace overhead). The agent should focus on the "Structured Failure Report"
-provided by the tool.

.gemini/skills/ci/scripts/ci.mjs

@@ -1,281 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { execSync } from 'node:child_process';
-
-const BRANCH =
-  process.argv[2] || execSync('git branch --show-current').toString().trim();
-const RUN_ID_OVERRIDE = process.argv[3];
-
-let REPO;
-try {
-  const remoteUrl = execSync('git remote get-url origin').toString().trim();
-  REPO = remoteUrl
-    .replace(/.*github\.com[\/:]/, '')
-    .replace(/\.git$/, '')
-    .trim();
-} catch (e) {
-  REPO = 'google-gemini/gemini-cli';
-}
-
-const FAILED_FILES = new Set();
-
-function runGh(args) {
-  try {
-    return execSync(`gh ${args}`, {
-      stdio: ['ignore', 'pipe', 'ignore'],
-    }).toString();
-  } catch (e) {
-    return null;
-  }
-}
-
-function fetchFailuresViaApi(jobId) {
-  try {
-    const cmd = `gh api repos/${REPO}/actions/jobs/${jobId}/logs | grep -iE " FAIL |❌|ERROR|Lint failed|Build failed|Exception|failed with exit code"`;
-    return execSync(cmd, {
-      stdio: ['ignore', 'pipe', 'ignore'],
-      maxBuffer: 10 * 1024 * 1024,
-    }).toString();
-  } catch (e) {
-    return '';
-  }
-}
-
-function isNoise(line) {
-  const lower = line.toLowerCase();
-  return (
-    lower.includes('* [new branch]') ||
-    lower.includes('npm warn') ||
-    lower.includes('fetching updates') ||
-    lower.includes('node:internal/errors') ||
-    lower.includes('at ') || // Stack traces
-    lower.includes('checkexecsyncerror') ||
-    lower.includes('node_modules')
-  );
-}
-
-function extractTestFile(failureText) {
-  const cleanLine = failureText
-    .replace(/[|#\[\]()]/g, ' ')
-    .replace(/<[^>]*>/g, ' ')
-    .trim();
-  const fileMatch = cleanLine.match(/([\w\/._-]+\.test\.[jt]sx?)/);
-  if (fileMatch) return fileMatch[1];
-  return null;
-}
-
-function generateTestCommand(failedFilesMap) {
-  const workspaceToFiles = new Map();
-  for (const [file, info] of failedFilesMap.entries()) {
-    if (
-      ['Job Error', 'Unknown File', 'Build Error', 'Lint Error'].includes(file)
-    )
-      continue;
-    let workspace = '@google/gemini-cli';
-    let relPath = file;
-    if (file.startsWith('packages/core/')) {
-      workspace = '@google/gemini-cli-core';
-      relPath = file.replace('packages/core/', '');
-    } else if (file.startsWith('packages/cli/')) {
-      workspace = '@google/gemini-cli';
-      relPath = file.replace('packages/cli/', '');
-    }
-    relPath = relPath.replace(/^.*packages\/[^\/]+\//, '');
-    if (!workspaceToFiles.has(workspace))
-      workspaceToFiles.set(workspace, new Set());
-    workspaceToFiles.get(workspace).add(relPath);
-  }
-  const commands = [];
-  for (const [workspace, files] of workspaceToFiles.entries()) {
-    commands.push(`npm test -w ${workspace} -- ${Array.from(files).join(' ')}`);
-  }
-  return commands.join(' && ');
-}
-
-async function monitor() {
-  let targetRunIds = [];
-  if (RUN_ID_OVERRIDE) {
-    targetRunIds = [RUN_ID_OVERRIDE];
-  } else {
-    // 1. Get runs directly associated with the branch
-    const runListOutput = runGh(
-      `run list --branch "${BRANCH}" --limit 10 --json databaseId,status,workflowName,createdAt`,
-    );
-    if (runListOutput) {
-      const runs = JSON.parse(runListOutput);
-      const activeRuns = runs.filter((r) => r.status !== 'completed');
-      if (activeRuns.length > 0) {
-        targetRunIds = activeRuns.map((r) => r.databaseId);
-      } else if (runs.length > 0) {
-        const latestTime = new Date(runs[0].createdAt).getTime();
-        targetRunIds = runs
-          .filter((r) => latestTime - new Date(r.createdAt).getTime() < 60000)
-          .map((r) => r.databaseId);
-      }
-    }
-
-    // 2. Get runs associated with commit statuses (handles chained/indirect runs)
-    try {
-      const headSha = execSync(`git rev-parse "${BRANCH}"`).toString().trim();
-      const statusOutput = runGh(
-        `api repos/${REPO}/commits/${headSha}/status -q '.statuses[] | select(.target_url | contains("actions/runs/")) | .target_url'`,
-      );
-      if (statusOutput) {
-        const statusRunIds = statusOutput
-          .split('\n')
-          .filter(Boolean)
-          .map((url) => {
-            const match = url.match(/actions\/runs\/(\d+)/);
-            return match ? parseInt(match[1], 10) : null;
-          })
-          .filter(Boolean);
-
-        for (const runId of statusRunIds) {
-          if (!targetRunIds.includes(runId)) {
-            targetRunIds.push(runId);
-          }
-        }
-      }
-    } catch (e) {
-      // Ignore if branch/SHA not found or API fails
-    }
-
-    if (targetRunIds.length > 0) {
-      const runNames = [];
-      for (const runId of targetRunIds) {
-        const runInfo = runGh(`run view "${runId}" --json workflowName`);
-        if (runInfo) {
-          runNames.push(JSON.parse(runInfo).workflowName);
-        }
-      }
-      console.log(`Monitoring workflows: ${[...new Set(runNames)].join(', ')}`);
-    }
-  }
-
-  if (targetRunIds.length === 0) {
-    console.log(`No runs found for branch ${BRANCH}.`);
-    process.exit(0);
-  }
-
-  while (true) {
-    let allPassed = 0,
-      allFailed = 0,
-      allRunning = 0,
-      allQueued = 0,
-      totalJobs = 0;
-    let anyRunInProgress = false;
-    const fileToTests = new Map();
-    let failuresFoundInLoop = false;
-
-    for (const runId of targetRunIds) {
-      const runOutput = runGh(
-        `run view "${runId}" --json databaseId,status,conclusion,workflowName`,
-      );
-      if (!runOutput) continue;
-      const run = JSON.parse(runOutput);
-      if (run.status !== 'completed') anyRunInProgress = true;
-
-      const jobsOutput = runGh(`run view "${runId}" --json jobs`);
-      if (jobsOutput) {
-        const { jobs } = JSON.parse(jobsOutput);
-        totalJobs += jobs.length;
-        const failedJobs = jobs.filter((j) => j.conclusion === 'failure');
-        if (failedJobs.length > 0) {
-          failuresFoundInLoop = true;
-          for (const job of failedJobs) {
-            const failures = fetchFailuresViaApi(job.databaseId);
-            if (failures.trim()) {
-              failures.split('\n').forEach((line) => {
-                if (!line.trim() || isNoise(line)) return;
-                const file = extractTestFile(line);
-                const filePath =
-                  file ||
-                  (line.toLowerCase().includes('lint')
-                    ? 'Lint Error'
-                    : line.toLowerCase().includes('build')
-                      ? 'Build Error'
-                      : 'Unknown File');
-                let testName = line;
-                if (line.includes(' > ')) {
-                  testName = line.split(' > ').slice(1).join(' > ').trim();
-                }
-                if (!fileToTests.has(filePath))
-                  fileToTests.set(filePath, new Set());
-                fileToTests.get(filePath).add(testName);
-              });
-            } else {
-              const step =
-                job.steps?.find((s) => s.conclusion === 'failure')?.name ||
-                'unknown';
-              const category = step.toLowerCase().includes('lint')
-                ? 'Lint Error'
-                : step.toLowerCase().includes('build')
-                  ? 'Build Error'
-                  : 'Job Error';
-              if (!fileToTests.has(category))
-                fileToTests.set(category, new Set());
-              fileToTests
-                .get(category)
-                .add(`${job.name}: Failed at step "${step}"`);
-            }
-          }
-        }
-        for (const job of jobs) {
-          if (job.status === 'in_progress') allRunning++;
-          else if (job.status === 'queued') allQueued++;
-          else if (job.conclusion === 'success') allPassed++;
-          else if (job.conclusion === 'failure') allFailed++;
-        }
-      }
-    }
-
-    if (failuresFoundInLoop) {
-      console.log(
-        `\n\n❌ Failures detected across ${allFailed} job(s). Stopping monitor...`,
-      );
-      console.log('\n--- Structured Failure Report (Noise Filtered) ---');
-      for (const [file, tests] of fileToTests.entries()) {
-        console.log(`\nCategory/File: ${file}`);
-        // Limit output per file if it's too large
-        const testsArr = Array.from(tests).map((t) =>
-          t.length > 500 ? t.substring(0, 500) + '... [TRUNCATED]' : t,
-        );
-        testsArr.slice(0, 10).forEach((t) => console.log(`  - ${t}`));
-        if (testsArr.length > 10)
-          console.log(`  ... and ${testsArr.length - 10} more`);
-      }
-      const testCmd = generateTestCommand(fileToTests);
-      if (testCmd) {
-        console.log('\n🚀 Run this to verify fixes:');
-        console.log(testCmd);
-      } else if (
-        Array.from(fileToTests.keys()).some((k) => k.includes('Lint'))
-      ) {
-        console.log('\n🚀 Run this to verify lint fixes:\nnpm run lint:all');
-      }
-      console.log('---------------------------------');
-      process.exit(1);
-    }
-
-    const completed = allPassed + allFailed;
-    process.stdout.write(
-      `\r⏳ Monitoring ${targetRunIds.length} runs... ${completed}/${totalJobs} jobs (${allPassed} passed, ${allFailed} failed, ${allRunning} running, ${allQueued} queued)          `,
-    );
-    if (!anyRunInProgress) {
-      console.log('\n✅ All workflows passed!');
-      process.exit(0);
-    }
-    await new Promise((r) => setTimeout(r, 15000));
-  }
-}
-
-monitor().catch((err) => {
-  console.error('\nMonitor error:', err.message);
-  process.exit(1);
-});

.gemini/skills/docs-writer/SKILL.md

@@ -65,6 +65,8 @@ accessible.
 - **UI and code:** Use **bold** for UI elements and `code font` for filenames,
   snippets, commands, and API elements. Focus on the task when discussing
   interaction.
+- **Links:** Use descriptive anchor text; avoid "click here." Ensure the link
+  makes sense out of context.
 - **Accessibility:** Use semantic HTML elements correctly (headings, lists, 
   tables).
 - **Media:** Use lowercase hyphenated filenames. Provide descriptive alt text
@@ -98,18 +100,6 @@ accessible.
 > This is an example of a multi-line note that will be preserved
 > by Prettier.
 
-### Links
-- **Accessibility:** Use descriptive anchor text; avoid "click here." Ensure the
-  link makes sense out of context, such as when being read by a screen reader.
-- **Use relative links in docs:** Use relative links in documentation (`/docs/`)
-  to ensure portability. Use paths relative to the current file's directory
-  (for example, `../tools/` from `docs/cli/`). Do not include the `/docs/`
-  section of a path, but do verify that the resulting relative link exists. This
-  does not apply to meta files such as README.MD and CONTRIBUTING.MD.
-- **When changing headings, check for deep links:** If a user is changing a
-  heading, check for deep links to that heading in other pages and update
-  accordingly.
-
 ### Structure
 - **BLUF:** Start with an introduction explaining what to expect.
 - **Experimental features:** If a feature is clearly noted as experimental,
@@ -167,6 +157,7 @@ documentation.
 - **Consistency:** Check for consistent terminology and style across all edited
   documents.
 
+
 ## Phase 4: Verification and finalization
 Perform a final quality check to ensure that all changes are correctly formatted
 and that all links are functional.

.gemini/skills/review-duplication/SKILL.md

@@ -1,69 +0,0 @@
----
-name: review-duplication
-description: Use this skill during code reviews to proactively investigate the codebase for duplicated functionality, reinvented wheels, or failure to reuse existing project best practices and shared utilities.
----
-
-# Review Duplication
-
-## Overview
-
-This skill provides a structured workflow for investigating a codebase during a code review to identify duplicated logic, reinvented utilities, and missed opportunities to reuse established patterns. By executing this workflow, you ensure that new code integrates seamlessly with the existing project architecture.
-
-## Workflow: Investigating for Duplication
-
-When reviewing code, perform the following steps before finalizing your review:
-
-### 1. Extract Core Logic
-Analyze the new code to identify the core algorithms, utility functions, generic data structures, or UI components being introduced. Look beyond the specific business logic to see the underlying mechanics.
-
-### 2. Hypothesize Existing Locations & Trace Dependencies
-Think about where this type of code *would* live if it already existed in the project. Provide absolute paths from the repo root to disambiguate.
-- **Utilities:** `packages/core/src/utils/`, `packages/cli/src/utils/`
-- **UI Components:** `packages/cli/src/ui/components/`, `packages/cli/src/ui/`
-- **Services:** `packages/core/src/services/`, `packages/cli/src/services/`
-- **Configuration:** `packages/core/src/config/`, `packages/cli/src/config/`
-- **Core Logic:** Call out `packages/core/` if functionality does not appear React UI specific.
-
-**Trace Third-Party Dependencies:** If the PR introduces a new import for a utility library (e.g., `lodash.merge`, `date-fns`), trace how and where the project currently uses that library. There is likely an existing wrapper or shared utility.
-
-**Check Package Files:** Before flagging a custom implementation of a complex algorithm, check `package.json` to see if a standard library (like `lodash` or `uuid`) is already installed that provides this functionality.
-
-### 3. Investigate the Codebase (Sub-Agent Delegation)
-Delegate the heavy lifting of codebase investigation to specialized sub-agents. They are optimized to perform deep searches and semantic mapping without bloating your session history.
-
-To ensure a comprehensive review, you MUST formulate highly specific objectives for the sub-agents, providing them with the "scents" you discovered in Step 1.
-
-- **Codebase Investigator:** Use the `codebase_investigator` as your primary researcher. When delegating, formulate an objective that asks specific, investigative questions about the codebase, explicitly including these search vectors:
-  - **Structural Similarity:** Ask if existing code uses the same underlying APIs (e.g., "Does any existing code use `Intl.DateTimeFormat` or `setTimeout` for similar purposes?").
-  - **Naming Conventions:** Ask if there are existing symbols with similar naming patterns (e.g., "Are there existing symbols with naming patterns like `*Format*` or `*Debounce*`?").
-  - **Comments & Documentation:** Ask if keywords from the PR's comments or JSDoc exist in describing similar behavior elsewhere.
-  - **Architectural Fit:** Ask where this type of logic is currently centralized (e.g., "Where is centralized date formatting logic located?").
-  - **Refactoring Guidance:** Crucially, ask the sub-agent to explain *how* the new code could be refactored to use any existing logic it finds.
-- **Generalist Agent:** Use the `generalist` for detailed, turn-intensive comparisons. For example: "Review the implementation of `MyNewComponent` in the PR and compare it semantically against all components in `packages/ui/src`. Are there any existing components that could be extended or used instead?"
-- **Retain Fast Path for Simple Searches:** For extremely simple, unambiguous checks (e.g., "Does `package.json` include `lodash`?"), perform a direct search to save time. Default to delegation for any open-ended "investigations."
-
-### 4. Evaluate Best Practices
-Check if the new code aligns with the project's established conventions.
-- **Error Handling:** Does it use the project's standard error classes or logging mechanisms?
-- **State Management:** Does it bypass established stores or contexts?
-- **Styling:** Does it hardcode colors or spacing instead of using theme variables?
-If the PR introduces a new pattern, compare it against the documented standards and explicitly confirm if an existing project pattern should have been used instead.
-
-### 5. Formulate Constructive Feedback
-If you discover that the PR duplicates existing functionality or ignores a best practice:
-- Provide a clear review comment.
-- **Identify the Source:** Explicitly mention the absolute or project-relative file path and the specific symbol (function, component, class) that should be reused.
-- **Implementation Guidance:** Provide a brief code snippet or a clear explanation showing **how** to integrate the existing code to fulfill the task's requirements.
-- **Explain the Value:** Briefly explain why reusing the existing code is beneficial (e.g., maintainability, consistency, built-in edge case handling).
-
-Example comment:
-> "It looks like this PR introduces a new `formatDate` utility. We already have a robust, tested `formatDate` function in `src/utils/dateHelpers.ts`. 
->
-> You can replace your implementation by importing it like this:
-> ```typescript
-> import { formatDate } from '../utils/dateHelpers';
-> 
-> // Then use it here:
-> const displayDate = formatDate(userDate, 'MMM Do, YYYY');
-> ```
-> Reusing this ensures that the date formatting remains consistent with the rest of the application and handles timezone conversions correctly."

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

@@ -175,9 +175,7 @@ runs:
           --dry-run="${INPUTS_DRY_RUN}" \
           --workspace="${INPUTS_CORE_PACKAGE_NAME}" \
           --no-tag
-        if [[ "${INPUTS_DRY_RUN}" == "false" ]]; then
-          npm dist-tag rm ${INPUTS_CORE_PACKAGE_NAME} false
-        fi
+        npm dist-tag rm ${INPUTS_CORE_PACKAGE_NAME} false --silent
 
     - name: '🔗 Install latest core package'
       working-directory: '${{ inputs.working-directory }}'
@@ -195,7 +193,7 @@ runs:
         INPUTS_A2A_PACKAGE_NAME: '${{ inputs.a2a-package-name }}'
 
     - name: '📦 Prepare bundled CLI for npm release'
-      if: "inputs.npm-registry-url != 'https://npm.pkg.github.com/'"
+      if: "inputs.npm-registry-url != 'https://npm.pkg.github.com/' && inputs.npm-tag != 'latest'"
       working-directory: '${{ inputs.working-directory }}'
       shell: 'bash'
       run: |
@@ -223,9 +221,7 @@ runs:
           --dry-run="${INPUTS_DRY_RUN}" \
           --workspace="${INPUTS_CLI_PACKAGE_NAME}" \
           --no-tag
-        if [[ "${INPUTS_DRY_RUN}" == "false" ]]; then
-          npm dist-tag rm ${INPUTS_CLI_PACKAGE_NAME} false
-        fi
+        npm dist-tag rm ${INPUTS_CLI_PACKAGE_NAME} false --silent
 
     - name: 'Get a2a-server Token'
       uses: './.github/actions/npm-auth-token'
@@ -250,9 +246,7 @@ runs:
           --dry-run="${INPUTS_DRY_RUN}" \
           --workspace="${INPUTS_A2A_PACKAGE_NAME}" \
           --no-tag
-          if [[ "${INPUTS_DRY_RUN}" == "false" ]]; then
-            npm dist-tag rm ${INPUTS_A2A_PACKAGE_NAME} false
-          fi
+        npm dist-tag rm ${INPUTS_A2A_PACKAGE_NAME} false --silent
 
     - name: '🔬 Verify NPM release by version'
       uses: './.github/actions/verify-release'
@@ -291,25 +285,8 @@ runs:
         INPUTS_PREVIOUS_TAG: '${{ inputs.previous-tag }}'
       shell: 'bash'
       run: |
-        rm -f gemini-cli-bundle.zip
-        (cd bundle && chmod +x gemini.js && zip -r ../gemini-cli-bundle.zip .)
-
-        echo "Testing the generated bundle archive..."
-        rm -rf test-bundle
-        mkdir -p test-bundle
-        unzip -q gemini-cli-bundle.zip -d test-bundle
-
-        # Verify it runs and outputs a version
-        BUNDLE_VERSION=$(node test-bundle/gemini.js --version | xargs)
-        echo "Bundle version output: ${BUNDLE_VERSION}"
-        if [[ -z "${BUNDLE_VERSION}" ]]; then
-          echo "Error: Bundle failed to execute or return version."
-          exit 1
-        fi
-        rm -rf test-bundle
-
         gh release create "${INPUTS_RELEASE_TAG}" \
-          gemini-cli-bundle.zip \
+          bundle/gemini.js \
           --target "${STEPS_RELEASE_BRANCH_OUTPUTS_BRANCH_NAME}" \
           --title "Release ${INPUTS_RELEASE_TAG}" \
           --notes-start-tag "${INPUTS_PREVIOUS_TAG}" \

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

@@ -34,7 +34,7 @@ runs:
         JSON_INPUTS: '${{ toJSON(inputs) }}'
       run: 'echo "$JSON_INPUTS"'
     - name: 'Checkout'
-      uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
+      uses: 'actions/checkout@v4'
       with:
         ref: '${{ inputs.github-sha }}'
         fetch-depth: 0
@@ -45,11 +45,11 @@ runs:
       shell: 'bash'
       run: 'npm run build'
     - name: 'Set up QEMU'
-      uses: 'docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130' # ratchet:docker/setup-qemu-action@v3
+      uses: 'docker/setup-qemu-action@v3'
     - name: 'Set up Docker Buildx'
-      uses: 'docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f' # ratchet:docker/setup-buildx-action@v3
+      uses: 'docker/setup-buildx-action@v3'
     - name: 'Log in to GitHub Container Registry'
-      uses: 'docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9' # ratchet:docker/login-action@v3
+      uses: 'docker/login-action@v3'
       with:
         registry: 'docker.io'
         username: '${{ inputs.dockerhub-username }}'

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

@@ -18,13 +18,6 @@ runs:
       env:
         JSON_INPUTS: '${{ toJSON(inputs) }}'
       run: 'echo "$JSON_INPUTS"'
-    - name: 'Install system dependencies'
-      if: "runner.os == 'Linux'"
-      run: |
-        sudo apt-get update -qq && sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq bubblewrap
-        # Ubuntu 24.04+ requires this to allow bwrap to function in CI
-        sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 || true
-      shell: 'bash'
     - name: 'Run Tests'
       env:
         GEMINI_API_KEY: '${{ inputs.gemini_api_key }}'

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

@@ -36,7 +36,7 @@ runs:
       run: 'echo "$JSON_INPUTS"'
 
     - name: 'setup node'
-      uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
+      uses: 'actions/setup-node@v4'
       with:
         node-version: '20'
 

.github/workflows/chained_e2e.yml

@@ -334,20 +334,8 @@ jobs:
         if: "${{ steps.check_evals.outputs.should_run == 'true' }}"
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
-          GEMINI_MODEL: 'gemini-3-pro-preview'
-          # Disable Vitest internal retries to avoid double-retrying;
-          # custom retry logic is handled in evals/test-helper.ts
-          VITEST_RETRY: 0
         run: 'npm run test:always_passing_evals'
 
-      - name: 'Upload Reliability Logs'
-        if: "always() && steps.check_evals.outputs.should_run == 'true'"
-        uses: 'actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02' # ratchet:actions/upload-artifact@v4
-        with:
-          name: 'eval-logs-${{ github.run_id }}-${{ github.run_attempt }}'
-          path: 'evals/logs/api-reliability.jsonl'
-          retention-days: 7
-
   e2e:
     name: 'E2E'
     if: |

.github/workflows/ci.yml

@@ -67,7 +67,7 @@ jobs:
           cache: 'npm'
 
       - name: 'Cache Linters'
-        uses: 'actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830' # ratchet:actions/cache@v4
+        uses: 'actions/cache@v4'
         with:
           path: '${{ env.GEMINI_LINT_TEMP_DIR }}'
           key: "${{ runner.os }}-${{ runner.arch }}-linters-${{ hashFiles('scripts/lint.js') }}"
@@ -76,7 +76,7 @@ jobs:
         run: 'npm ci'
 
       - name: 'Cache ESLint'
-        uses: 'actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830' # ratchet:actions/cache@v4
+        uses: 'actions/cache@v4'
         with:
           path: '.eslintcache'
           key: "${{ runner.os }}-eslint-${{ hashFiles('package-lock.json', 'eslint.config.js') }}"
@@ -114,9 +114,6 @@ jobs:
       - name: 'Run sensitive keyword linter'
         run: 'node scripts/lint.js --sensitive-keywords'
 
-      - name: 'Run GitHub Actions pinning linter'
-        run: 'node scripts/lint.js --check-github-actions-pinning'
-
   link_checker:
     name: 'Link Checker'
     runs-on: 'ubuntu-latest'
@@ -161,12 +158,6 @@ jobs:
       - name: 'Build project'
         run: 'npm run build'
 
-      - name: 'Install system dependencies'
-        run: |
-          sudo apt-get update -qq && sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq bubblewrap
-          # Ubuntu 24.04+ requires this to allow bwrap to function in CI
-          sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 || true
-
       - name: 'Install dependencies for testing'
         run: 'npm ci'
 
@@ -175,10 +166,10 @@ jobs:
           NO_COLOR: true
         run: |
           if [[ "${{ matrix.shard }}" == "cli" ]]; then
-            npm run test:ci --workspace "@google/gemini-cli"
+            npm run test:ci --workspace @google/gemini-cli
           else
             # Explicitly list non-cli packages to ensure they are sharded correctly
-            npm run test:ci --workspace "@google/gemini-cli-core" --workspace "@google/gemini-cli-a2a-server" --workspace "gemini-cli-vscode-ide-companion" --workspace "@google/gemini-cli-test-utils" --if-present -- --coverage.enabled=false
+            npm run test:ci --workspace @google/gemini-cli-core --workspace @google/gemini-cli-a2a-server --workspace gemini-cli-vscode-ide-companion --workspace @google/gemini-cli-test-utils --if-present -- --coverage.enabled=false
             npm run test:scripts
           fi
 
@@ -263,10 +254,10 @@ jobs:
           NO_COLOR: true
         run: |
           if [[ "${{ matrix.shard }}" == "cli" ]]; then
-            npm run test:ci --workspace "@google/gemini-cli" -- --coverage.enabled=false
+            npm run test:ci --workspace @google/gemini-cli -- --coverage.enabled=false
           else
             # Explicitly list non-cli packages to ensure they are sharded correctly
-            npm run test:ci --workspace "@google/gemini-cli-core" --workspace "@google/gemini-cli-a2a-server" --workspace "gemini-cli-vscode-ide-companion" --workspace "@google/gemini-cli-test-utils" --if-present -- --coverage.enabled=false
+            npm run test:ci --workspace @google/gemini-cli-core --workspace @google/gemini-cli-a2a-server --workspace gemini-cli-vscode-ide-companion --workspace @google/gemini-cli-test-utils --if-present -- --coverage.enabled=false
             npm run test:scripts
           fi
 
@@ -429,14 +420,11 @@ jobs:
           NODE_ENV: 'test'
         run: |
           if ("${{ matrix.shard }}" -eq "cli") {
-            npm run test:ci --workspace "@google/gemini-cli" -- --coverage.enabled=false
-            if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+            npm run test:ci --workspace @google/gemini-cli -- --coverage.enabled=false
           } else {
             # Explicitly list non-cli packages to ensure they are sharded correctly
-            npm run test:ci --workspace "@google/gemini-cli-core" --workspace "@google/gemini-cli-a2a-server" --workspace "gemini-cli-vscode-ide-companion" --workspace "@google/gemini-cli-test-utils" --if-present -- --coverage.enabled=false
-            if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+            npm run test:ci --workspace @google/gemini-cli-core --workspace @google/gemini-cli-a2a-server --workspace gemini-cli-vscode-ide-companion --workspace @google/gemini-cli-test-utils --if-present -- --coverage.enabled=false
             npm run test:scripts
-            if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
           }
         shell: 'pwsh'
 

.github/workflows/eval-guidance.yml

@@ -0,0 +1,69 @@
+name: 'Evals: PR Guidance'
+
+on:
+  pull_request:
+    paths:
+      - 'packages/core/src/**/*.ts'
+      - '!**/*.test.ts'
+      - '!**/*.test.tsx'
+
+permissions:
+  pull-requests: 'write'
+  contents: 'read'
+
+jobs:
+  provide-guidance:
+    name: 'Model Steering Guidance'
+    runs-on: 'ubuntu-latest'
+    if: "github.repository == 'google-gemini/gemini-cli'"
+    steps:
+      - name: 'Checkout'
+        uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: 'Set up Node.js'
+        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4.4.0
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'npm'
+
+      - name: 'Detect Steering Changes'
+        id: 'detect'
+        run: |
+          STEERING_DETECTED=$(node scripts/changed_prompt.js --steering-only)
+          echo "STEERING_DETECTED=$STEERING_DETECTED" >> "$GITHUB_OUTPUT"
+
+      - name: 'Analyze PR Content'
+        if: "steps.detect.outputs.STEERING_DETECTED == 'true'"
+        id: 'analysis'
+        env:
+          GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+        run: |
+          # Check for behavioral eval changes
+          EVAL_CHANGES=$(git diff --name-only origin/${{ github.base_ref }}...HEAD | grep "^evals/" || true)
+          if [ -z "$EVAL_CHANGES" ]; then
+            echo "MISSING_EVALS=true" >> "$GITHUB_OUTPUT"
+          fi
+
+          # Check if user is a maintainer (has write/admin access)
+          USER_PERMISSION=$(gh api repos/${{ github.repository }}/collaborators/${{ github.actor }}/permission --jq '.permission')
+          if [[ "$USER_PERMISSION" == "admin" || "$USER_PERMISSION" == "write" ]]; then
+            echo "IS_MAINTAINER=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: 'Post Guidance Comment'
+        if: "steps.detect.outputs.STEERING_DETECTED == 'true'"
+        uses: 'thollander/actions-comment-pull-request@65f9e5c9a1f2cd378bd74b2e057c9736982a8e74' # ratchet:thollander/actions-comment-pull-request@v3
+        with:
+          comment-tag: 'eval-guidance-bot'
+          message: |
+            ### 🧠 Model Steering Guidance
+
+            This PR modifies files that affect the model's behavior (prompts, tools, or instructions).
+
+            ${{ steps.analysis.outputs.MISSING_EVALS == 'true' && '- ⚠️ **Consider adding Evals:** No behavioral evaluations (`evals/*.eval.ts`) were added or updated in this PR. Consider adding a test case to verify the new behavior and prevent regressions.' || '' }}
+            ${{ steps.analysis.outputs.IS_MAINTAINER == 'true' && '- 🚀 **Maintainer Reminder:** Please ensure that these changes do not regress results on benchmark evals before merging.' || '' }}
+
+            ---
+            *This is an automated guidance message triggered by steering logic signatures.*

.github/workflows/eval-pr.yml

@@ -1,209 +0,0 @@
-name: 'Evals: PR Evaluation & Regression'
-
-on:
-  pull_request_target:
-    types: ['opened', 'synchronize', 'reopened', 'ready_for_review']
-    paths:
-      - 'packages/core/src/prompts/**'
-      - 'packages/core/src/tools/**'
-      - 'packages/core/src/agents/**'
-      - 'evals/**'
-      - '!**/*.test.ts'
-      - '!**/*.test.tsx'
-  workflow_dispatch:
-
-# Prevents multiple runs for the same PR simultaneously (saves tokens)
-concurrency:
-  group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
-  cancel-in-progress: true
-
-permissions:
-  pull-requests: 'write'
-  contents: 'read'
-  actions: 'read'
-
-jobs:
-  detect-changes:
-    name: 'Detect Steering Changes'
-    runs-on: 'gemini-cli-ubuntu-16-core'
-    # Security: pull_request_target allows secrets, so we must gate carefully.
-    # Detection should not run code from the fork.
-    if: "github.repository == 'google-gemini/gemini-cli' && github.event.pull_request.draft == false"
-    outputs:
-      SHOULD_RUN: '${{ steps.detect.outputs.SHOULD_RUN }}'
-      STEERING_DETECTED: '${{ steps.detect.outputs.STEERING_DETECTED }}'
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
-        with:
-          # Check out the trusted code from main for detection
-          fetch-depth: 0
-
-      - name: 'Detect Steering Changes'
-        id: 'detect'
-        env:
-          # Use the PR's head SHA for comparison without checking it out
-          PR_HEAD_SHA: '${{ github.event.pull_request.head.sha }}'
-        run: |
-          # Fetch the fork's PR branch for analysis
-          git fetch origin pull/${{ github.event.pull_request.number }}/head:pr-head
-
-          # Run the trusted script from main
-          SHOULD_RUN=$(node scripts/changed_prompt.js)
-          STEERING_DETECTED=$(node scripts/changed_prompt.js --steering-only)
-          echo "SHOULD_RUN=$SHOULD_RUN" >> "$GITHUB_OUTPUT"
-          echo "STEERING_DETECTED=$STEERING_DETECTED" >> "$GITHUB_OUTPUT"
-
-      - name: 'Notify Approval Required'
-        if: "steps.detect.outputs.SHOULD_RUN == 'true'"
-        env:
-          GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        run: |
-          RUN_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-          COMMENT_BODY="### 🛑 Action Required: Evaluation Approval
-
-          Steering changes have been detected in this PR. To prevent regressions, a maintainer must approve the evaluation run before this PR can be merged.
-
-          **Maintainers:**
-          1. Go to the [**Workflow Run Summary**]($RUN_URL).
-          2. Click the yellow **'Review deployments'** button.
-          3. Select the **'eval-gate'** environment and click **'Approve'**.
-
-          Once approved, the evaluation results will be posted here automatically.
-
-          <!-- eval-approval-notification -->"
-
-          # Check if comment already exists to avoid spamming
-          COMMENT_ID=$(gh pr view ${{ github.event.pull_request.number }} --json comments --jq '.comments[] | select(.body | contains("<!-- eval-approval-notification -->")) | .url' | grep -oE "[0-9]+$" | head -n 1)
-
-          if [ -z "$COMMENT_ID" ]; then
-            gh pr comment ${{ github.event.pull_request.number }} --body "$COMMENT_BODY"
-          else
-            echo "Updating existing notification comment $COMMENT_ID..."
-            gh api -X PATCH "repos/${{ github.repository }}/issues/comments/$COMMENT_ID" -F body="$COMMENT_BODY"
-          fi
-
-  pr-evaluation:
-    name: 'Evaluate Steering & Regressions'
-    needs: 'detect-changes'
-    if: "needs.detect-changes.outputs.SHOULD_RUN == 'true'"
-    # Manual approval gate via environment
-    environment: 'eval-gate'
-    runs-on: 'gemini-cli-ubuntu-16-core'
-    env:
-      # CENTRALIZED MODEL LIST
-      MODEL_LIST: 'gemini-3-flash-preview'
-
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
-        with:
-          # Check out the fork's PR code for the actual evaluation
-          # This only runs AFTER manual approval
-          ref: '${{ github.event.pull_request.head.sha }}'
-          fetch-depth: 0
-
-      - name: 'Remove Approval Notification'
-        # Run even if other steps fail, to ensure we clean up the "Action Required" message
-        if: 'always()'
-        env:
-          GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          PR_NUMBER: '${{ github.event.pull_request.number }}'
-        run: |
-          echo "Debug: PR_NUMBER is '$PR_NUMBER'"
-          # Search for the notification comment by its hidden tag
-          COMMENT_ID=$(gh pr view "$PR_NUMBER" --json comments --jq '.comments[] | select(.body | contains("<!-- eval-approval-notification -->")) | .url' | grep -oE "[0-9]+$" | head -n 1)
-          if [ -n "$COMMENT_ID" ]; then
-            echo "Removing notification comment $COMMENT_ID now that run is approved..."
-            gh api -X DELETE "repos/${{ github.repository }}/issues/comments/$COMMENT_ID"
-          fi
-
-      - name: 'Set up Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4.4.0
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-
-      - name: 'Install dependencies'
-        run: 'npm ci'
-
-      - name: 'Build project'
-        run: 'npm run build'
-
-      - name: 'Analyze PR Content (Guidance)'
-        if: "needs.detect-changes.outputs.STEERING_DETECTED == 'true'"
-        id: 'analysis'
-        env:
-          GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        run: |
-          # Check for behavioral eval changes
-          EVAL_CHANGES=$(git diff --name-only origin/${{ github.base_ref }}...HEAD | grep "^evals/" || true)
-          if [ -z "$EVAL_CHANGES" ]; then
-            echo "MISSING_EVALS=true" >> "$GITHUB_OUTPUT"
-          fi
-
-          # Check if user is a maintainer
-          USER_PERMISSION=$(gh api repos/${{ github.repository }}/collaborators/${{ github.actor }}/permission --jq '.permission')
-          if [[ "$USER_PERMISSION" == "admin" || "$USER_PERMISSION" == "write" ]]; then
-            echo "IS_MAINTAINER=true" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: 'Execute Regression Check'
-        env:
-          GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
-          GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          MODEL_LIST: '${{ env.MODEL_LIST }}'
-        run: |
-          # Run the regression check loop. The script saves the report to a file.
-          node scripts/run_eval_regression.js
-
-          # Use the generated report file if it exists
-          if [[ -f eval_regression_report.md ]]; then
-            echo "REPORT_FILE=eval_regression_report.md" >> "$GITHUB_ENV"
-          fi
-
-      - name: 'Post or Update PR Comment'
-        if: "always() && (needs.detect-changes.outputs.STEERING_DETECTED == 'true' || env.REPORT_FILE != '')"
-        env:
-          GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        run: |
-          # 1. Build the full comment body
-          {
-            if [[ -f eval_regression_report.md ]]; then
-              cat eval_regression_report.md
-              echo ""
-            fi
-
-            if [[ "${{ needs.detect-changes.outputs.STEERING_DETECTED }}" == "true" ]]; then
-              echo "### 🧠 Model Steering Guidance"
-              echo ""
-              echo "This PR modifies files that affect the model's behavior (prompts, tools, or instructions)."
-              echo ""
-
-              if [[ "${{ steps.analysis.outputs.MISSING_EVALS }}" == "true" ]]; then
-                echo "- ⚠️ **Consider adding Evals:** No behavioral evaluations (\`evals/*.eval.ts\`) were added or updated in this PR. Consider [adding a test case](https://github.com/google-gemini/gemini-cli/blob/main/evals/README.md#creating-an-evaluation) to verify the new behavior and prevent regressions."
-              fi
-
-              if [[ "${{ steps.analysis.outputs.IS_MAINTAINER }}" == "true" ]]; then
-                echo "- 🚀 **Maintainer Reminder:** Please ensure that these changes do not regress results on benchmark evals before merging."
-              fi
-            fi
-
-            echo ""
-            echo "---"
-            echo "*This is an automated guidance message triggered by steering logic signatures.*"
-            echo "<!-- eval-pr-report -->"
-          } > full_comment.md
-
-          # 2. Find if a comment with our unique tag already exists
-          # We extract the numeric ID from the URL to ensure compatibility with the REST API
-          COMMENT_ID=$(gh pr view ${{ github.event.pull_request.number }} --json comments --jq '.comments[] | select(.body | contains("<!-- eval-pr-report -->")) | .url' | grep -oE "[0-9]+$" | head -n 1)
-
-          # 3. Update or Create the comment
-          if [ -n "$COMMENT_ID" ]; then
-            echo "Updating existing comment $COMMENT_ID via API..."
-            gh api -X PATCH "repos/${{ github.repository }}/issues/comments/$COMMENT_ID" -F body=@full_comment.md
-          else
-            echo "Creating new PR comment..."
-            gh pr comment ${{ github.event.pull_request.number }} --body-file full_comment.md
-          fi

.github/workflows/evals-nightly.yml

@@ -61,8 +61,6 @@ jobs:
           GEMINI_MODEL: '${{ matrix.model }}'
           RUN_EVALS: "${{ github.event.inputs.run_all != 'false' }}"
           TEST_NAME_PATTERN: '${{ github.event.inputs.test_name_pattern }}'
-          # Disable Vitest internal retries to avoid double-retrying;
-          # custom retry logic is handled in evals/test-helper.ts
           VITEST_RETRY: 0
         run: |
           CMD="npm run test:all_evals"

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

@@ -28,14 +28,14 @@ jobs:
     steps:
       - name: 'Generate GitHub App Token'
         id: 'generate_token'
-        uses: 'actions/create-github-app-token@fee1f7d63c2ff003460e3d139729b119787bc349' # ratchet:actions/create-github-app-token@v2
+        uses: 'actions/create-github-app-token@v2'
         with:
           app-id: '${{ secrets.APP_ID }}'
           private-key: '${{ secrets.PRIVATE_KEY }}'
           permission-issues: 'write'
 
       - name: 'Process Stale Issues'
-        uses: 'actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b' # ratchet:actions/github-script@v7
+        uses: 'actions/github-script@v7'
         env:
           DRY_RUN: '${{ inputs.dry_run }}'
         with:

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

@@ -27,13 +27,13 @@ jobs:
           APP_ID: '${{ secrets.APP_ID }}'
         if: |-
           ${{ env.APP_ID != '' }}
-        uses: 'actions/create-github-app-token@fee1f7d63c2ff003460e3d139729b119787bc349' # ratchet:actions/create-github-app-token@v2
+        uses: 'actions/create-github-app-token@v2'
         with:
           app-id: '${{ secrets.APP_ID }}'
           private-key: '${{ secrets.PRIVATE_KEY }}'
 
       - name: 'Process Stale PRs'
-        uses: 'actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b' # ratchet:actions/github-script@v7
+        uses: 'actions/github-script@v7'
         env:
           DRY_RUN: '${{ inputs.dry_run }}'
         with:

.github/workflows/label-backlog-child-issues.yml

@@ -18,10 +18,10 @@ jobs:
     runs-on: 'ubuntu-latest'
     steps:
       - name: 'Checkout'
-        uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
+        uses: 'actions/checkout@v4'
 
       - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
+        uses: 'actions/setup-node@v4'
         with:
           node-version: '20'
           cache: 'npm'
@@ -40,10 +40,10 @@ jobs:
     runs-on: 'ubuntu-latest'
     steps:
       - name: 'Checkout'
-        uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
+        uses: 'actions/checkout@v4'
 
       - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
+        uses: 'actions/setup-node@v4'
         with:
           node-version: '20'
           cache: 'npm'

.github/workflows/label-workstream-rollup.yml

@@ -15,7 +15,7 @@ jobs:
       issues: 'write'
     steps:
       - name: 'Check for Parent Workstream and Apply Label'
-        uses: 'actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b' # ratchet:actions/github-script@v7
+        uses: 'actions/github-script@v7'
         with:
           script: |
             const labelToAdd = 'workstream-rollup';

.github/workflows/memory-nightly.yml

@@ -1,33 +0,0 @@
-name: 'Memory Tests: Nightly'
-
-on:
-  schedule:
-    - cron: '0 2 * * *' # Runs at 2 AM every day
-  workflow_dispatch: # Allow manual trigger
-
-permissions:
-  contents: 'read'
-
-jobs:
-  memory-test:
-    name: 'Run Memory Usage Tests'
-    runs-on: 'gemini-cli-ubuntu-16-core'
-    if: "github.repository == 'google-gemini/gemini-cli'"
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-
-      - name: 'Set up Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-
-      - name: 'Install dependencies'
-        run: 'npm ci'
-
-      - name: 'Build project'
-        run: 'npm run build'
-
-      - name: 'Run Memory Tests'
-        run: 'npm run test:memory'

.github/workflows/pr-contribution-guidelines-notifier.yml

@@ -19,7 +19,7 @@ jobs:
           APP_ID: '${{ secrets.APP_ID }}'
         if: |-
           ${{ env.APP_ID != '' }}
-        uses: 'actions/create-github-app-token@fee1f7d63c2ff003460e3d139729b119787bc349' # ratchet:actions/create-github-app-token@v2
+        uses: 'actions/create-github-app-token@v2'
         with:
           app-id: '${{ secrets.APP_ID }}'
           private-key: '${{ secrets.PRIVATE_KEY }}'

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

@@ -40,7 +40,7 @@ jobs:
       issues: 'write'
     steps:
       - name: 'Checkout repository'
-        uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
+        uses: 'actions/checkout@v4'
         with:
           ref: '${{ github.ref }}'
           fetch-depth: 0

.github/workflows/release-notes.yml

@@ -29,14 +29,14 @@ jobs:
       pull-requests: 'write'
     steps:
       - name: 'Checkout repository'
-        uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
+        uses: 'actions/checkout@v4'
         with:
           # The user-level skills need to be available to the workflow
           fetch-depth: 0
           ref: 'main'
 
       - name: 'Set up Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
+        uses: 'actions/setup-node@v4'
         with:
           node-version: '20'
 
@@ -86,7 +86,7 @@ jobs:
 
       - name: 'Create Pull Request'
         if: "steps.validate_version.outputs.CONTINUE == 'true'"
-        uses: 'peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c' # ratchet:peter-evans/create-pull-request@v6
+        uses: 'peter-evans/create-pull-request@v6'
         with:
           token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
           commit-message: 'docs(changelog): update for ${{ steps.release_info.outputs.VERSION }}'

.github/workflows/test-build-binary.yml

@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: 'Checkout'
-        uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
+        uses: 'actions/checkout@v4'
 
       - name: 'Optimize Windows Performance'
         if: "matrix.os == 'windows-latest'"
@@ -46,7 +46,7 @@ jobs:
         shell: 'powershell'
 
       - name: 'Set up Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
+        uses: 'actions/setup-node@v4'
         with:
           node-version-file: '.nvmrc'
           architecture: '${{ matrix.arch }}'
@@ -63,7 +63,7 @@ jobs:
 
       - name: 'Setup Windows SDK (Windows)'
         if: "matrix.os == 'windows-latest'"
-        uses: 'microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce' # ratchet:microsoft/setup-msbuild@v2
+        uses: 'microsoft/setup-msbuild@v2'
 
       - name: 'Add Signtool to Path (Windows)'
         if: "matrix.os == 'windows-latest'"
@@ -153,7 +153,7 @@ jobs:
           npm run test:integration:sandbox:none -- --testTimeout=600000
 
       - name: 'Upload Artifact'
-        uses: 'actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02' # ratchet:actions/upload-artifact@v4
+        uses: 'actions/upload-artifact@v4'
         with:
           name: 'gemini-cli-${{ matrix.platform_name }}'
           path: 'dist/${{ matrix.platform_name }}/'

.github/workflows/unassign-inactive-assignees.yml

@@ -40,13 +40,13 @@ jobs:
     steps:
       - name: 'Generate GitHub App Token'
         id: 'generate_token'
-        uses: 'actions/create-github-app-token@fee1f7d63c2ff003460e3d139729b119787bc349' # ratchet:actions/create-github-app-token@v2
+        uses: 'actions/create-github-app-token@v2'
         with:
           app-id: '${{ secrets.APP_ID }}'
           private-key: '${{ secrets.PRIVATE_KEY }}'
 
       - name: 'Unassign inactive assignees'
-        uses: 'actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b' # ratchet:actions/github-script@v7
+        uses: 'actions/github-script@v7'
         env:
           DRY_RUN: '${{ inputs.dry_run }}'
         with:

CONTRIBUTING.md

@@ -323,8 +323,8 @@ fi
 
 #### Formatting
 
-To separately format the code in this project, run the following command from
-the root directory:
+To separately format the code in this project by running the following command
+from the root directory:
 
 ```bash
 npm run format
@@ -346,11 +346,9 @@ npm run lint
 
 - Please adhere to the coding style, patterns, and conventions used throughout
   the existing codebase.
-- Consult
-  [GEMINI.md](https://github.com/google-gemini/gemini-cli/blob/main/GEMINI.md)
-  (typically found in the project root) for specific instructions related to
-  AI-assisted development, including conventions for React, comments, and Git
-  usage.
+- Consult [GEMINI.md](../GEMINI.md) (typically found in the project root) for
+  specific instructions related to AI-assisted development, including
+  conventions for React, comments, and Git usage.
 - **Imports:** Pay special attention to import paths. The project uses ESLint to
   enforce restrictions on relative imports between packages.
 
@@ -507,9 +505,8 @@ code.
 
 ### Documentation structure
 
-Our documentation is organized using
-[sidebar.json](https://github.com/google-gemini/gemini-cli/blob/main/docs/sidebar.json)
-as the table of contents. When adding new documentation:
+Our documentation is organized using [sidebar.json](/docs/sidebar.json) as the
+table of contents. When adding new documentation:
 
 1. Create your markdown file **in the appropriate directory** under `/docs`.
 2. Add an entry to `sidebar.json` in the relevant section.

GEMINI.md

@@ -44,8 +44,6 @@ powerful tool for developers.
 - **Test Commands:**
   - **Unit (All):** `npm run test`
   - **Integration (E2E):** `npm run test:e2e`
-  - **Memory (Nightly):** `npm run test:memory` (Runs memory regression tests
-    against baselines. Excluded from `preflight`, run nightly.)
   - **Workspace-Specific:** `npm test -w <pkg> -- <path>` (Note: `<path>` must
     be relative to the workspace root, e.g.,
     `-w @google/gemini-cli-core -- src/routing/modelRouterService.test.ts`)

README.md

@@ -30,7 +30,7 @@ Learn all about Gemini CLI in our [documentation](https://geminicli.com/docs/).
 ## 📦 Installation
 
 See
-[Gemini CLI installation, execution, and releases](https://www.geminicli.com/docs/get-started/installation)
+[Gemini CLI installation, execution, and releases](./docs/get-started/installation.md)
 for recommended system specifications and a detailed installation guide.
 
 ### Quick Install
@@ -71,9 +71,9 @@ conda activate gemini_env
 npm install -g @google/gemini-cli
 ```
 
-## Release Channels
+## Release Cadence and Tags
 
-See [Releases](https://www.geminicli.com/docs/changelogs) for more details.
+See [Releases](./docs/releases.md) for more details.
 
 ### Preview
 
@@ -209,7 +209,7 @@ gemini
 ```
 
 For Google Workspace accounts and other authentication methods, see the
-[authentication guide](https://www.geminicli.com/docs/get-started/authentication).
+[authentication guide](./docs/get-started/authentication.md).
 
 ## 🚀 Getting Started
 
@@ -278,64 +278,59 @@ gemini
 
 ### Getting Started
 
-- [**Quickstart Guide**](https://www.geminicli.com/docs/get-started) - Get up
-  and running quickly.
-- [**Authentication Setup**](https://www.geminicli.com/docs/get-started/authentication) -
-  Detailed auth configuration.
-- [**Configuration Guide**](https://www.geminicli.com/docs/reference/configuration) -
-  Settings and customization.
-- [**Keyboard Shortcuts**](https://www.geminicli.com/docs/reference/keyboard-shortcuts) -
+- [**Quickstart Guide**](./docs/get-started/index.md) - Get up and running
+  quickly.
+- [**Authentication Setup**](./docs/get-started/authentication.md) - Detailed
+  auth configuration.
+- [**Configuration Guide**](./docs/reference/configuration.md) - Settings and
+  customization.
+- [**Keyboard Shortcuts**](./docs/reference/keyboard-shortcuts.md) -
   Productivity tips.
 
 ### Core Features
 
-- [**Commands Reference**](https://www.geminicli.com/docs/reference/commands) -
-  All slash commands (`/help`, `/chat`, etc).
-- [**Custom Commands**](https://www.geminicli.com/docs/cli/custom-commands) -
-  Create your own reusable commands.
-- [**Context Files (GEMINI.md)**](https://www.geminicli.com/docs/cli/gemini-md) -
-  Provide persistent context to Gemini CLI.
-- [**Checkpointing**](https://www.geminicli.com/docs/cli/checkpointing) - Save
-  and resume conversations.
-- [**Token Caching**](https://www.geminicli.com/docs/cli/token-caching) -
-  Optimize token usage.
+- [**Commands Reference**](./docs/reference/commands.md) - All slash commands
+  (`/help`, `/chat`, etc).
+- [**Custom Commands**](./docs/cli/custom-commands.md) - Create your own
+  reusable commands.
+- [**Context Files (GEMINI.md)**](./docs/cli/gemini-md.md) - Provide persistent
+  context to Gemini CLI.
+- [**Checkpointing**](./docs/cli/checkpointing.md) - Save and resume
+  conversations.
+- [**Token Caching**](./docs/cli/token-caching.md) - Optimize token usage.
 
 ### Tools & Extensions
 
-- [**Built-in Tools Overview**](https://www.geminicli.com/docs/reference/tools)
-  - [File System Operations](https://www.geminicli.com/docs/tools/file-system)
-  - [Shell Commands](https://www.geminicli.com/docs/tools/shell)
-  - [Web Fetch & Search](https://www.geminicli.com/docs/tools/web-fetch)
-- [**MCP Server Integration**](https://www.geminicli.com/docs/tools/mcp-server) -
-  Extend with custom tools.
-- [**Custom Extensions**](https://geminicli.com/docs/extensions/writing-extensions) -
-  Build and share your own commands.
+- [**Built-in Tools Overview**](./docs/reference/tools.md)
+  - [File System Operations](./docs/tools/file-system.md)
+  - [Shell Commands](./docs/tools/shell.md)
+  - [Web Fetch & Search](./docs/tools/web-fetch.md)
+- [**MCP Server Integration**](./docs/tools/mcp-server.md) - Extend with custom
+  tools.
+- [**Custom Extensions**](./docs/extensions/index.md) - Build and share your own
+  commands.
 
 ### Advanced Topics
 
-- [**Headless Mode (Scripting)**](https://www.geminicli.com/docs/cli/headless) -
-  Use Gemini CLI in automated workflows.
-- [**IDE Integration**](https://www.geminicli.com/docs/ide-integration) - VS
-  Code companion.
-- [**Sandboxing & Security**](https://www.geminicli.com/docs/cli/sandbox) - Safe
-  execution environments.
-- [**Trusted Folders**](https://www.geminicli.com/docs/cli/trusted-folders) -
-  Control execution policies by folder.
-- [**Enterprise Guide**](https://www.geminicli.com/docs/cli/enterprise) - Deploy
-  and manage in a corporate environment.
-- [**Telemetry & Monitoring**](https://www.geminicli.com/docs/cli/telemetry) -
-  Usage tracking.
-- [**Tools reference**](https://www.geminicli.com/docs/reference/tools) -
-  Built-in tools overview.
-- [**Local development**](https://www.geminicli.com/docs/local-development) -
-  Local development tooling.
+- [**Headless Mode (Scripting)**](./docs/cli/headless.md) - Use Gemini CLI in
+  automated workflows.
+- [**IDE Integration**](./docs/ide-integration/index.md) - VS Code companion.
+- [**Sandboxing & Security**](./docs/cli/sandbox.md) - Safe execution
+  environments.
+- [**Trusted Folders**](./docs/cli/trusted-folders.md) - Control execution
+  policies by folder.
+- [**Enterprise Guide**](./docs/cli/enterprise.md) - Deploy and manage in a
+  corporate environment.
+- [**Telemetry & Monitoring**](./docs/cli/telemetry.md) - Usage tracking.
+- [**Tools reference**](./docs/reference/tools.md) - Built-in tools overview.
+- [**Local development**](./docs/local-development.md) - Local development
+  tooling.
 
 ### Troubleshooting & Support
 
-- [**Troubleshooting Guide**](https://www.geminicli.com/docs/resources/troubleshooting) -
-  Common issues and solutions.
-- [**FAQ**](https://www.geminicli.com/docs/resources/faq) - Frequently asked
-  questions.
+- [**Troubleshooting Guide**](./docs/resources/troubleshooting.md) - Common
+  issues and solutions.
+- [**FAQ**](./docs/resources/faq.md) - Frequently asked questions.
 - Use `/bug` command to report issues directly from the CLI.
 
 ### Using MCP Servers
@@ -349,9 +344,8 @@ custom tools:
 > @database Run a query to find inactive users
 ```
 
-See the
-[MCP Server Integration guide](https://www.geminicli.com/docs/tools/mcp-server)
-for setup instructions.
+See the [MCP Server Integration guide](./docs/tools/mcp-server.md) for setup
+instructions.
 
 ## 🤝 Contributing
 
@@ -372,8 +366,7 @@ for planned features and priorities.
 ## 📖 Resources
 
 - **[Official Roadmap](./ROADMAP.md)** - See what's coming next.
-- **[Changelog](https://www.geminicli.com/docs/changelogs)** - See recent
-  notable updates.
+- **[Changelog](./docs/changelogs/index.md)** - See recent notable updates.
 - **[NPM Package](https://www.npmjs.com/package/@google/gemini-cli)** - Package
   registry.
 - **[GitHub Issues](https://github.com/google-gemini/gemini-cli/issues)** -
@@ -383,14 +376,13 @@ for planned features and priorities.
 
 ### Uninstall
 
-See the [Uninstall Guide](https://www.geminicli.com/docs/resources/uninstall)
-for removal instructions.
+See the [Uninstall Guide](./docs/resources/uninstall.md) for removal
+instructions.
 
 ## 📄 Legal
 
 - **License**: [Apache License 2.0](LICENSE)
-- **Terms of Service**:
-  [Terms & Privacy](https://www.geminicli.com/docs/resources/tos-privacy)
+- **Terms of Service**: [Terms & Privacy](./docs/resources/tos-privacy.md)
 - **Security**: [Security Policy](SECURITY.md)
 
 ---

docs/changelogs/index.md

@@ -18,55 +18,6 @@ on GitHub.
 | [Preview](preview.md) | Experimental features ready for early feedback. |
 | [Stable](latest.md)   | Stable, recommended for general use.            |
 
-## Announcements: v0.36.0 - 2026-04-01
-
-- **Multi-Registry Architecture and Sandboxing:** Introduced a multi-registry
-  architecture and implemented native macOS Seatbelt and Windows sandboxing for
-  enhanced subagent security
-  ([#22712](https://github.com/google-gemini/gemini-cli/pull/22712),
-  [#22718](https://github.com/google-gemini/gemini-cli/pull/22718) by @akh64bit,
-  [#22832](https://github.com/google-gemini/gemini-cli/pull/22832) by @ehedlund,
-  [#21807](https://github.com/google-gemini/gemini-cli/pull/21807) by
-  @mattKorwel).
-- **Refreshed Composer UX:** Implemented a refreshed user experience for the
-  Composer layout and improved terminal interaction robustness
-  ([#21212](https://github.com/google-gemini/gemini-cli/pull/21212),
-  [#23286](https://github.com/google-gemini/gemini-cli/pull/23286) by
-  @jwhelangoog).
-- **Git Worktree Support:** Added native support for Git worktrees, allowing for
-  isolated parallel sessions
-  ([#22973](https://github.com/google-gemini/gemini-cli/pull/22973),
-  [#23265](https://github.com/google-gemini/gemini-cli/pull/23265) by @jerop).
-- **Subagent Context and Feedback:** Enhanced subagents with JIT context
-  injection and resilient tool rejection with contextual feedback
-  ([#23032](https://github.com/google-gemini/gemini-cli/pull/23032),
-  [#22951](https://github.com/google-gemini/gemini-cli/pull/22951) by
-  @abhipatel12).
-
-## Announcements: v0.35.0 - 2026-03-24
-
-- **Customizable Keyboard Shortcuts:** Users can now customize their keyboard
-  shortcuts, including support for literal character keybindings and the
-  extended Kitty protocol
-  ([#21945](https://github.com/google-gemini/gemini-cli/pull/21945),
-  [#21972](https://github.com/google-gemini/gemini-cli/pull/21972) by
-  @scidomino).
-- **Vim Mode Improvements:** Added missing motions (X, ~, r, f/F/t/T) and
-  yank/paste support with the unnamed register
-  ([#21932](https://github.com/google-gemini/gemini-cli/pull/21932),
-  [#22026](https://github.com/google-gemini/gemini-cli/pull/22026) by @aanari).
-- **Tool Isolation and Sandboxing:** Introduced `SandboxManager` to isolate
-  process-spawning tools and added Linux bubblewrap/seccomp sandboxing support
-  ([#21774](https://github.com/google-gemini/gemini-cli/pull/21774),
-  [#22231](https://github.com/google-gemini/gemini-cli/pull/22231) by @galz10,
-  [#22680](https://github.com/google-gemini/gemini-cli/pull/22680) by
-  @DavidAPierce).
-- **JIT Context Discovery:** Implemented Just-In-Time context discovery for file
-  system tools to improve model performance and accuracy
-  ([#22082](https://github.com/google-gemini/gemini-cli/pull/22082),
-  [#22736](https://github.com/google-gemini/gemini-cli/pull/22736) by
-  @SandyTao520).
-
 ## Announcements: v0.34.0 - 2026-03-17
 
 - **Plan Mode Enabled by Default:** Plan Mode is now enabled by default to help

docs/changelogs/latest.md

@@ -1,6 +1,6 @@
-# Latest stable release: v0.36.0
+# Latest stable release: v0.34.0
 
-Released: April 1, 2026
+Released: March 17, 2026
 
 For most users, our latest stable release is the recommended release. Install
 the latest stable version with:
@@ -11,372 +11,474 @@ npm install -g @google/gemini-cli
 
 ## Highlights
 
-- **Multi-Registry Architecture and Tool Isolation:** Introduced a
-  multi-registry architecture for subagents and implemented strict sandboxing
-  for macOS (Seatbelt) and Windows to enhance security and isolation.
-- **Improved Subagent Coordination:** Enhanced subagents with local execution
-  capabilities, JIT context injection (upward traversal capped at git root), and
-  resilient tool rejection with contextual feedback.
-- **Enhanced UI and UX:** Implemented a refreshed UX for the Composer layout,
-  improved terminal fallback warnings, and resolved various UI flickering and
-  state persistence issues.
-- **Git Worktree Support:** Added support for Git worktrees to enable isolated
-  parallel sessions within the same repository.
-- **Plan Mode Improvements:** Plan mode now supports non-interactive execution
-  and includes hardened sandbox path resolution to prevent hallucinations.
+- **Plan Mode Enabled by Default**: The comprehensive planning capability is now
+  enabled by default, allowing for better structured task management and
+  execution.
+- **Enhanced Sandboxing Capabilities**: Added support for native gVisor (runsc)
+  sandboxing as well as experimental LXC container sandboxing to provide more
+  robust and isolated execution environments.
+- **Improved Loop Detection & Recovery**: Implemented iterative loop detection
+  and model feedback mechanisms to prevent the CLI from getting stuck in
+  repetitive actions.
+- **Customizable UI Elements**: You can now configure a custom footer using the
+  new `/footer` command, and enjoy standardized semantic focus colors for better
+  history visibility.
+- **Extensive Subagent Updates**: Refinements across the tracker visualization
+  tools, background process logging, and broader fallback support for models in
+  tool execution scenarios.
 
 ## What's Changed
 
-- Changelog for v0.33.2 by @gemini-cli-robot in
-  [#22730](https://github.com/google-gemini/gemini-cli/pull/22730)
-- feat(core): multi-registry architecture and tool filtering for subagents by
-  @akh64bit in [#22712](https://github.com/google-gemini/gemini-cli/pull/22712)
-- Changelog for v0.34.0-preview.4 by @gemini-cli-robot in
-  [#22752](https://github.com/google-gemini/gemini-cli/pull/22752)
-- fix(devtools): use theme-aware text colors for console warnings and errors by
-  @SandyTao520 in
-  [#22181](https://github.com/google-gemini/gemini-cli/pull/22181)
-- Add support for dynamic model Resolution to ModelConfigService by @kevinjwang1
-  in [#22578](https://github.com/google-gemini/gemini-cli/pull/22578)
-- chore(release): bump version to 0.36.0-nightly.20260317.2f90b4653 by
+- feat(cli): add chat resume footer on session quit by @lordshashank in
+  [#20667](https://github.com/google-gemini/gemini-cli/pull/20667)
+- Support bold and other styles in svg snapshots by @jacob314 in
+  [#20937](https://github.com/google-gemini/gemini-cli/pull/20937)
+- fix(core): increase A2A agent timeout to 30 minutes by @adamfweidman in
+  [#21028](https://github.com/google-gemini/gemini-cli/pull/21028)
+- Cleanup old branches. by @jacob314 in
+  [#19354](https://github.com/google-gemini/gemini-cli/pull/19354)
+- chore(release): bump version to 0.34.0-nightly.20260303.34f0c1538 by
   @gemini-cli-robot in
-  [#22858](https://github.com/google-gemini/gemini-cli/pull/22858)
-- fix(cli): use active sessionId in useLogger and improve resume robustness by
-  @mattKorwel in
-  [#22606](https://github.com/google-gemini/gemini-cli/pull/22606)
-- fix(cli): expand tilde in policy paths from settings.json by @abhipatel12 in
-  [#22772](https://github.com/google-gemini/gemini-cli/pull/22772)
-- fix(core): add actionable warnings for terminal fallbacks (#14426) by
-  @spencer426 in
-  [#22211](https://github.com/google-gemini/gemini-cli/pull/22211)
-- feat(tracker): integrate task tracker protocol into core system prompt by
-  @anj-s in [#22442](https://github.com/google-gemini/gemini-cli/pull/22442)
-- chore: add posttest build hooks and fix missing dependencies by @NTaylorMullen
-  in [#22865](https://github.com/google-gemini/gemini-cli/pull/22865)
-- feat(a2a): add agent acknowledgment command and enhance registry discovery by
-  @alisa-alisa in
-  [#22389](https://github.com/google-gemini/gemini-cli/pull/22389)
-- fix(cli): automatically add all VSCode workspace folders to Gemini context by
-  @sakshisemalti in
-  [#21380](https://github.com/google-gemini/gemini-cli/pull/21380)
-- feat: add 'blocked' status to tasks and todos by @anj-s in
-  [#22735](https://github.com/google-gemini/gemini-cli/pull/22735)
-- refactor(cli): remove extra newlines in ShellToolMessage.tsx by @NTaylorMullen
-  in [#22868](https://github.com/google-gemini/gemini-cli/pull/22868)
-- fix(cli): lazily load settings in onModelChange to prevent stale closure data
-  loss by @KumarADITHYA123 in
-  [#20403](https://github.com/google-gemini/gemini-cli/pull/20403)
-- feat(core): subagent local execution and tool isolation by @akh64bit in
-  [#22718](https://github.com/google-gemini/gemini-cli/pull/22718)
-- fix(cli): resolve subagent grouping and UI state persistence by @abhipatel12
-  in [#22252](https://github.com/google-gemini/gemini-cli/pull/22252)
-- refactor(ui): extract SessionBrowser search and navigation components by
-  @abhipatel12 in
-  [#22377](https://github.com/google-gemini/gemini-cli/pull/22377)
-- fix: updates Docker image reference for GitHub MCP server by @jhhornn in
-  [#22938](https://github.com/google-gemini/gemini-cli/pull/22938)
-- refactor(cli): group subagent trajectory deletion and use native filesystem
-  testing by @abhipatel12 in
-  [#22890](https://github.com/google-gemini/gemini-cli/pull/22890)
-- refactor(cli): simplify keypress and mouse providers and update tests by
-  @scidomino in [#22853](https://github.com/google-gemini/gemini-cli/pull/22853)
-- Changelog for v0.34.0 by @gemini-cli-robot in
-  [#22860](https://github.com/google-gemini/gemini-cli/pull/22860)
-- test(cli): simplify createMockSettings calls by @scidomino in
-  [#22952](https://github.com/google-gemini/gemini-cli/pull/22952)
-- feat(ui): format multi-line banner warnings with a bold title by @keithguerin
-  in [#22955](https://github.com/google-gemini/gemini-cli/pull/22955)
-- Docs: Remove references to stale Gemini CLI file structure info by
-  @g-samroberts in
-  [#22976](https://github.com/google-gemini/gemini-cli/pull/22976)
-- feat(ui): remove write todo list tool from UI tips by @aniruddhaadak80 in
-  [#22281](https://github.com/google-gemini/gemini-cli/pull/22281)
-- Fix issue where subagent thoughts are appended. by @gundermanc in
-  [#22975](https://github.com/google-gemini/gemini-cli/pull/22975)
-- Feat/browser privacy consent by @kunal-10-cloud in
-  [#21119](https://github.com/google-gemini/gemini-cli/pull/21119)
-- fix(core): explicitly map execution context in LocalAgentExecutor by @akh64bit
-  in [#22949](https://github.com/google-gemini/gemini-cli/pull/22949)
-- feat(plan): support plan mode in non-interactive mode by @ruomengz in
-  [#22670](https://github.com/google-gemini/gemini-cli/pull/22670)
-- feat(core): implement strict macOS sandboxing using Seatbelt allowlist by
-  @ehedlund in [#22832](https://github.com/google-gemini/gemini-cli/pull/22832)
-- docs: add additional notes by @abhipatel12 in
-  [#23008](https://github.com/google-gemini/gemini-cli/pull/23008)
-- fix(cli): resolve duplicate footer on tool cancel via ESC (#21743) by
-  @ruomengz in [#21781](https://github.com/google-gemini/gemini-cli/pull/21781)
-- Changelog for v0.35.0-preview.1 by @gemini-cli-robot in
-  [#23012](https://github.com/google-gemini/gemini-cli/pull/23012)
-- fix(ui): fix flickering on small terminal heights by @devr0306 in
-  [#21416](https://github.com/google-gemini/gemini-cli/pull/21416)
-- fix(acp): provide more meta in tool_call_update by @Mervap in
-  [#22663](https://github.com/google-gemini/gemini-cli/pull/22663)
-- docs: add FAQ entry for checking Gemini CLI version by @surajsahani in
-  [#21271](https://github.com/google-gemini/gemini-cli/pull/21271)
-- feat(core): resilient subagent tool rejection with contextual feedback by
-  @abhipatel12 in
-  [#22951](https://github.com/google-gemini/gemini-cli/pull/22951)
-- fix(cli): correctly handle auto-update for standalone binaries by @bdmorgan in
-  [#23038](https://github.com/google-gemini/gemini-cli/pull/23038)
-- feat(core): add content-utils by @adamfweidman in
-  [#22984](https://github.com/google-gemini/gemini-cli/pull/22984)
-- fix: circumvent genai sdk requirement for api key when using gateway auth via
-  ACP by @sripasg in
-  [#23042](https://github.com/google-gemini/gemini-cli/pull/23042)
-- fix(core): don't persist browser consent sentinel in non-interactive mode by
-  @jasonmatthewsuhari in
-  [#23073](https://github.com/google-gemini/gemini-cli/pull/23073)
-- fix(core): narrow browser agent description to prevent stealing URL tasks from
-  web_fetch by @gsquared94 in
-  [#23086](https://github.com/google-gemini/gemini-cli/pull/23086)
-- feat(cli): Partial threading of AgentLoopContext. by @joshualitt in
-  [#22978](https://github.com/google-gemini/gemini-cli/pull/22978)
-- fix(browser-agent): enable "Allow all server tools" session policy by
-  @cynthialong0-0 in
-  [#22343](https://github.com/google-gemini/gemini-cli/pull/22343)
-- refactor(cli): integrate real config loading into async test utils by
-  @scidomino in [#23040](https://github.com/google-gemini/gemini-cli/pull/23040)
-- feat(core): inject memory and JIT context into subagents by @abhipatel12 in
-  [#23032](https://github.com/google-gemini/gemini-cli/pull/23032)
-- Fix logging and virtual list. by @jacob314 in
-  [#23080](https://github.com/google-gemini/gemini-cli/pull/23080)
-- feat(core): cap JIT context upward traversal at git root by @SandyTao520 in
-  [#23074](https://github.com/google-gemini/gemini-cli/pull/23074)
-- Docs: Minor style updates from initial docs audit. by @g-samroberts in
-  [#22872](https://github.com/google-gemini/gemini-cli/pull/22872)
-- feat(core): add experimental memory manager agent to replace save_memory tool
-  by @SandyTao520 in
-  [#22726](https://github.com/google-gemini/gemini-cli/pull/22726)
-- Changelog for v0.35.0-preview.2 by @gemini-cli-robot in
-  [#23142](https://github.com/google-gemini/gemini-cli/pull/23142)
-- Update website issue template for label and title by @g-samroberts in
-  [#23036](https://github.com/google-gemini/gemini-cli/pull/23036)
-- fix: upgrade ACP SDK from 0.12 to 0.16.1 by @sripasg in
-  [#23132](https://github.com/google-gemini/gemini-cli/pull/23132)
-- Update callouts to work on github. by @g-samroberts in
-  [#22245](https://github.com/google-gemini/gemini-cli/pull/22245)
-- feat: ACP: Add token usage metadata to the `send` method's return value by
-  @sripasg in [#23148](https://github.com/google-gemini/gemini-cli/pull/23148)
-- fix(plan): clarify that plan mode policies are combined with normal mode by
-  @ruomengz in [#23158](https://github.com/google-gemini/gemini-cli/pull/23158)
-- Add ModelChain support to ModelConfigService and make ModelDialog dynamic by
-  @kevinjwang1 in
-  [#22914](https://github.com/google-gemini/gemini-cli/pull/22914)
-- Ensure that copied extensions are writable in the user's local directory by
-  @kevinjwang1 in
-  [#23016](https://github.com/google-gemini/gemini-cli/pull/23016)
-- feat(core): implement native Windows sandboxing by @mattKorwel in
-  [#21807](https://github.com/google-gemini/gemini-cli/pull/21807)
-- feat(core): add support for admin-forced MCP server installations by
-  @gsquared94 in
-  [#23163](https://github.com/google-gemini/gemini-cli/pull/23163)
-- chore(lint): ignore .gemini directory and recursive node_modules by
-  @mattKorwel in
-  [#23211](https://github.com/google-gemini/gemini-cli/pull/23211)
-- feat(cli): conditionally exclude ask_user tool in ACP mode by @nmcnamara-eng
-  in [#23045](https://github.com/google-gemini/gemini-cli/pull/23045)
-- feat(core): introduce AgentSession and rename stream events to agent events by
-  @mbleigh in [#23159](https://github.com/google-gemini/gemini-cli/pull/23159)
-- feat(worktree): add Git worktree support for isolated parallel sessions by
-  @jerop in [#22973](https://github.com/google-gemini/gemini-cli/pull/22973)
-- Add support for linking in the extension registry by @kevinjwang1 in
-  [#23153](https://github.com/google-gemini/gemini-cli/pull/23153)
-- feat(extensions): add --skip-settings flag to install command by @Ratish1 in
-  [#17212](https://github.com/google-gemini/gemini-cli/pull/17212)
-- feat(telemetry): track if session is running in a Git worktree by @jerop in
-  [#23265](https://github.com/google-gemini/gemini-cli/pull/23265)
-- refactor(core): use absolute paths in GEMINI.md context markers by
-  @SandyTao520 in
-  [#23135](https://github.com/google-gemini/gemini-cli/pull/23135)
-- fix(core): add sanitization to sub agent thoughts and centralize utilities by
-  @devr0306 in [#22828](https://github.com/google-gemini/gemini-cli/pull/22828)
-- feat(core): refine User-Agent for VS Code traffic (unified format) by
-  @sehoon38 in [#23256](https://github.com/google-gemini/gemini-cli/pull/23256)
-- Fix schema for ModelChains by @kevinjwang1 in
-  [#23284](https://github.com/google-gemini/gemini-cli/pull/23284)
-- test(cli): refactor tests for async render utilities by @scidomino in
-  [#23252](https://github.com/google-gemini/gemini-cli/pull/23252)
-- feat(core): add security prompt for browser agent by @cynthialong0-0 in
-  [#23241](https://github.com/google-gemini/gemini-cli/pull/23241)
-- refactor(ide): replace dynamic undici import with static fetch import by
-  @cocosheng-g in
-  [#23268](https://github.com/google-gemini/gemini-cli/pull/23268)
-- test(cli): address unresolved feedback from PR #23252 by @scidomino in
-  [#23303](https://github.com/google-gemini/gemini-cli/pull/23303)
-- feat(browser): add sensitive action controls and read-only noise reduction by
-  @cynthialong0-0 in
-  [#22867](https://github.com/google-gemini/gemini-cli/pull/22867)
-- Disabling failing test while investigating by @alisa-alisa in
-  [#23311](https://github.com/google-gemini/gemini-cli/pull/23311)
-- fix broken extension link in hooks guide by @Indrapal-70 in
-  [#21728](https://github.com/google-gemini/gemini-cli/pull/21728)
-- fix(core): fix agent description indentation by @abhipatel12 in
-  [#23315](https://github.com/google-gemini/gemini-cli/pull/23315)
-- Wrap the text under TOML rule for easier readability in policy-engine.md… by
-  @CogitationOps in
-  [#23076](https://github.com/google-gemini/gemini-cli/pull/23076)
-- fix(extensions): revert broken extension removal behavior by @ehedlund in
-  [#23317](https://github.com/google-gemini/gemini-cli/pull/23317)
-- feat(core): set up onboarding telemetry by @yunaseoul in
-  [#23118](https://github.com/google-gemini/gemini-cli/pull/23118)
-- Retry evals on API error. by @gundermanc in
-  [#23322](https://github.com/google-gemini/gemini-cli/pull/23322)
-- fix(evals): remove tool restrictions and add compile-time guards by
-  @SandyTao520 in
-  [#23312](https://github.com/google-gemini/gemini-cli/pull/23312)
-- fix(hooks): support 'ask' decision for BeforeTool hooks by @gundermanc in
-  [#21146](https://github.com/google-gemini/gemini-cli/pull/21146)
-- feat(browser): add warning message for session mode 'existing' by
-  @cynthialong0-0 in
-  [#23288](https://github.com/google-gemini/gemini-cli/pull/23288)
-- chore(lint): enforce zero warnings and cleanup syntax restrictions by
-  @alisa-alisa in
-  [#22902](https://github.com/google-gemini/gemini-cli/pull/22902)
-- fix(cli): add Esc instruction to HooksDialog footer by @abhipatel12 in
-  [#23258](https://github.com/google-gemini/gemini-cli/pull/23258)
-- Disallow and suppress misused spread operator. by @gundermanc in
-  [#23294](https://github.com/google-gemini/gemini-cli/pull/23294)
-- fix(core): refine CliHelpAgent description for better delegation by
-  @abhipatel12 in
-  [#23310](https://github.com/google-gemini/gemini-cli/pull/23310)
-- fix(core): enable global session and persistent approval for web_fetch by
-  @NTaylorMullen in
-  [#23295](https://github.com/google-gemini/gemini-cli/pull/23295)
-- fix(plan): add state transition override to prevent plan mode freeze by
-  @Adib234 in [#23020](https://github.com/google-gemini/gemini-cli/pull/23020)
-- fix(cli): record skill activation tool calls in chat history by @NTaylorMullen
-  in [#23203](https://github.com/google-gemini/gemini-cli/pull/23203)
-- fix(core): ensure subagent tool updates apply configuration overrides
-  immediately by @abhipatel12 in
-  [#23161](https://github.com/google-gemini/gemini-cli/pull/23161)
-- fix(cli): resolve flicker at boundaries of list in BaseSelectionList by
-  @jackwotherspoon in
-  [#23298](https://github.com/google-gemini/gemini-cli/pull/23298)
-- test(cli): force generic terminal in tests to fix snapshot failures by
-  @abhipatel12 in
-  [#23499](https://github.com/google-gemini/gemini-cli/pull/23499)
-- Evals: PR Guidance adding workflow by @alisa-alisa in
-  [#23164](https://github.com/google-gemini/gemini-cli/pull/23164)
-- feat(core): refactor SandboxManager to a stateless architecture and introduce
-  explicit Deny interface by @ehedlund in
-  [#23141](https://github.com/google-gemini/gemini-cli/pull/23141)
-- feat(core): add event-translator and update agent types by @adamfweidman in
-  [#22985](https://github.com/google-gemini/gemini-cli/pull/22985)
-- perf(cli): parallelize and background startup cleanup tasks by @sehoon38 in
-  [#23545](https://github.com/google-gemini/gemini-cli/pull/23545)
-- fix: "allow always" for commands with paths by @scidomino in
-  [#23558](https://github.com/google-gemini/gemini-cli/pull/23558)
-- fix(cli): prevent terminal escape sequences from leaking on exit by
-  @mattKorwel in
-  [#22682](https://github.com/google-gemini/gemini-cli/pull/22682)
-- feat(cli): implement full "GEMINI CLI" logo for logged-out state by
+  [#21034](https://github.com/google-gemini/gemini-cli/pull/21034)
+- feat(ui): standardize semantic focus colors and enhance history visibility by
   @keithguerin in
-  [#22412](https://github.com/google-gemini/gemini-cli/pull/22412)
-- fix(plan): reserve minimum height for selection list in AskUserDialog by
-  @ruomengz in [#23280](https://github.com/google-gemini/gemini-cli/pull/23280)
-- fix(core): harden AgentSession replay semantics by @adamfweidman in
-  [#23548](https://github.com/google-gemini/gemini-cli/pull/23548)
-- test(core): migrate hook tests to scheduler by @abhipatel12 in
-  [#23496](https://github.com/google-gemini/gemini-cli/pull/23496)
-- chore(config): disable agents by default by @abhipatel12 in
-  [#23546](https://github.com/google-gemini/gemini-cli/pull/23546)
-- fix(ui): make tool confirmations take up entire terminal height by @devr0306
-  in [#22366](https://github.com/google-gemini/gemini-cli/pull/22366)
-- fix(core): prevent redundant remote agent loading on model switch by
-  @adamfweidman in
-  [#23576](https://github.com/google-gemini/gemini-cli/pull/23576)
-- refactor(core): update production type imports from coreToolScheduler by
-  @abhipatel12 in
-  [#23498](https://github.com/google-gemini/gemini-cli/pull/23498)
-- feat(cli): always prefix extension skills with colon separator by
+  [#20745](https://github.com/google-gemini/gemini-cli/pull/20745)
+- fix: merge duplicate imports in packages/core (3/4) by @Nixxx19 in
+  [#20928](https://github.com/google-gemini/gemini-cli/pull/20928)
+- Add extra safety checks for proto pollution by @jacob314 in
+  [#20396](https://github.com/google-gemini/gemini-cli/pull/20396)
+- feat(core): Add tracker CRUD tools & visualization by @anj-s in
+  [#19489](https://github.com/google-gemini/gemini-cli/pull/19489)
+- Revert "fix(ui): persist expansion in AskUser dialog when navigating options"
+  by @jacob314 in
+  [#21042](https://github.com/google-gemini/gemini-cli/pull/21042)
+- Changelog for v0.33.0-preview.0 by @gemini-cli-robot in
+  [#21030](https://github.com/google-gemini/gemini-cli/pull/21030)
+- fix: model persistence for all scenarios by @sripasg in
+  [#21051](https://github.com/google-gemini/gemini-cli/pull/21051)
+- chore/release: bump version to 0.34.0-nightly.20260304.28af4e127 by
+  @gemini-cli-robot in
+  [#21054](https://github.com/google-gemini/gemini-cli/pull/21054)
+- Consistently guard restarts against concurrent auto updates by @scidomino in
+  [#21016](https://github.com/google-gemini/gemini-cli/pull/21016)
+- Defensive coding to reduce the risk of Maximum update depth errors by
+  @jacob314 in [#20940](https://github.com/google-gemini/gemini-cli/pull/20940)
+- fix(cli): Polish shell autocomplete rendering to be a little more shell native
+  feeling. by @jacob314 in
+  [#20931](https://github.com/google-gemini/gemini-cli/pull/20931)
+- Docs: Update plan mode docs by @jkcinouye in
+  [#19682](https://github.com/google-gemini/gemini-cli/pull/19682)
+- fix(mcp): Notifications/tools/list_changed support not working by @jacob314 in
+  [#21050](https://github.com/google-gemini/gemini-cli/pull/21050)
+- fix(cli): register extension lifecycle events in DebugProfiler by
+  @fayerman-source in
+  [#20101](https://github.com/google-gemini/gemini-cli/pull/20101)
+- chore(dev): update vscode settings for typescriptreact by @rohit-4321 in
+  [#19907](https://github.com/google-gemini/gemini-cli/pull/19907)
+- fix(cli): enable multi-arch docker builds for sandbox by @ru-aish in
+  [#19821](https://github.com/google-gemini/gemini-cli/pull/19821)
+- Changelog for v0.32.0 by @gemini-cli-robot in
+  [#21033](https://github.com/google-gemini/gemini-cli/pull/21033)
+- Changelog for v0.33.0-preview.1 by @gemini-cli-robot in
+  [#21058](https://github.com/google-gemini/gemini-cli/pull/21058)
+- feat(core): improve @scripts/copy_files.js autocomplete to prioritize
+  filenames by @sehoon38 in
+  [#21064](https://github.com/google-gemini/gemini-cli/pull/21064)
+- feat(sandbox): add experimental LXC container sandbox support by @h30s in
+  [#20735](https://github.com/google-gemini/gemini-cli/pull/20735)
+- feat(evals): add overall pass rate row to eval nightly summary table by
+  @gundermanc in
+  [#20905](https://github.com/google-gemini/gemini-cli/pull/20905)
+- feat(telemetry): include language in telemetry and fix accepted lines
+  computation by @gundermanc in
+  [#21126](https://github.com/google-gemini/gemini-cli/pull/21126)
+- Changelog for v0.32.1 by @gemini-cli-robot in
+  [#21055](https://github.com/google-gemini/gemini-cli/pull/21055)
+- feat(core): add robustness tests, logging, and metrics for CodeAssistServer
+  SSE parsing by @yunaseoul in
+  [#21013](https://github.com/google-gemini/gemini-cli/pull/21013)
+- feat: add issue assignee workflow by @kartikangiras in
+  [#21003](https://github.com/google-gemini/gemini-cli/pull/21003)
+- fix: improve error message when OAuth succeeds but project ID is required by
+  @Nixxx19 in [#21070](https://github.com/google-gemini/gemini-cli/pull/21070)
+- feat(loop-reduction): implement iterative loop detection and model feedback by
+  @aishaneeshah in
+  [#20763](https://github.com/google-gemini/gemini-cli/pull/20763)
+- chore(github): require prompt approvers for agent prompt files by @gundermanc
+  in [#20896](https://github.com/google-gemini/gemini-cli/pull/20896)
+- Docs: Create tools reference by @jkcinouye in
+  [#19470](https://github.com/google-gemini/gemini-cli/pull/19470)
+- fix(core, a2a-server): prevent hang during OAuth in non-interactive sessions
+  by @spencer426 in
+  [#21045](https://github.com/google-gemini/gemini-cli/pull/21045)
+- chore(cli): enable deprecated settings removal by default by @yashodipmore in
+  [#20682](https://github.com/google-gemini/gemini-cli/pull/20682)
+- feat(core): Disable fast ack helper for hints. by @joshualitt in
+  [#21011](https://github.com/google-gemini/gemini-cli/pull/21011)
+- fix(ui): suppress redundant failure note when tool error note is shown by
   @NTaylorMullen in
-  [#23566](https://github.com/google-gemini/gemini-cli/pull/23566)
-- fix(core): properly support allowRedirect in policy engine by @scidomino in
-  [#23579](https://github.com/google-gemini/gemini-cli/pull/23579)
-- fix(cli): prevent subcommand shadowing and skip auth for commands by
-  @mattKorwel in
-  [#23177](https://github.com/google-gemini/gemini-cli/pull/23177)
-- fix(test): move flaky tests to non-blocking suite by @mattKorwel in
-  [#23259](https://github.com/google-gemini/gemini-cli/pull/23259)
-- Changelog for v0.35.0-preview.3 by @gemini-cli-robot in
-  [#23574](https://github.com/google-gemini/gemini-cli/pull/23574)
-- feat(skills): add behavioral-evals skill with fixing and promoting guides by
-  @abhipatel12 in
-  [#23349](https://github.com/google-gemini/gemini-cli/pull/23349)
-- refactor(core): delete obsolete coreToolScheduler by @abhipatel12 in
-  [#23502](https://github.com/google-gemini/gemini-cli/pull/23502)
-- Changelog for v0.35.0-preview.4 by @gemini-cli-robot in
-  [#23581](https://github.com/google-gemini/gemini-cli/pull/23581)
-- feat(core): add LegacyAgentSession by @adamfweidman in
-  [#22986](https://github.com/google-gemini/gemini-cli/pull/22986)
-- feat(test-utils): add TestMcpServerBuilder and support in TestRig by
-  @abhipatel12 in
-  [#23491](https://github.com/google-gemini/gemini-cli/pull/23491)
-- fix(core)!: Force policy config to specify toolName by @kschaab in
-  [#23330](https://github.com/google-gemini/gemini-cli/pull/23330)
-- eval(save_memory): add multi-turn interactive evals for memoryManager by
+  [#21078](https://github.com/google-gemini/gemini-cli/pull/21078)
+- docs: document planning workflows with Conductor example by @jerop in
+  [#21166](https://github.com/google-gemini/gemini-cli/pull/21166)
+- feat(release): ship esbuild bundle in npm package by @genneth in
+  [#19171](https://github.com/google-gemini/gemini-cli/pull/19171)
+- fix(extensions): preserve symlinks in extension source path while enforcing
+  folder trust by @galz10 in
+  [#20867](https://github.com/google-gemini/gemini-cli/pull/20867)
+- fix(cli): defer tool exclusions to policy engine in non-interactive mode by
+  @EricRahm in [#20639](https://github.com/google-gemini/gemini-cli/pull/20639)
+- fix(ui): removed double padding on rendered content by @devr0306 in
+  [#21029](https://github.com/google-gemini/gemini-cli/pull/21029)
+- fix(core): truncate excessively long lines in grep search output by
+  @gundermanc in
+  [#21147](https://github.com/google-gemini/gemini-cli/pull/21147)
+- feat: add custom footer configuration via `/footer` by @jackwotherspoon in
+  [#19001](https://github.com/google-gemini/gemini-cli/pull/19001)
+- perf(core): fix OOM crash in long-running sessions by @WizardsForgeGames in
+  [#19608](https://github.com/google-gemini/gemini-cli/pull/19608)
+- refactor(cli): categorize built-in themes into dark/ and light/ directories by
+  @JayadityaGit in
+  [#18634](https://github.com/google-gemini/gemini-cli/pull/18634)
+- fix(core): explicitly allow codebase_investigator and cli_help in read-only
+  mode by @Adib234 in
+  [#21157](https://github.com/google-gemini/gemini-cli/pull/21157)
+- test: add browser agent integration tests by @kunal-10-cloud in
+  [#21151](https://github.com/google-gemini/gemini-cli/pull/21151)
+- fix(cli): fix enabling kitty codes on Windows Terminal by @scidomino in
+  [#21136](https://github.com/google-gemini/gemini-cli/pull/21136)
+- refactor(core): extract shared OAuth flow primitives from MCPOAuthProvider by
   @SandyTao520 in
-  [#23572](https://github.com/google-gemini/gemini-cli/pull/23572)
-- fix(telemetry): patch memory leak and enforce logPrompts privacy by
+  [#20895](https://github.com/google-gemini/gemini-cli/pull/20895)
+- fix(ui): add partial output to cancelled shell UI by @devr0306 in
+  [#21178](https://github.com/google-gemini/gemini-cli/pull/21178)
+- fix(cli): replace hardcoded keybinding strings with dynamic formatters by
+  @scidomino in [#21159](https://github.com/google-gemini/gemini-cli/pull/21159)
+- DOCS: Update quota and pricing page by @g-samroberts in
+  [#21194](https://github.com/google-gemini/gemini-cli/pull/21194)
+- feat(telemetry): implement Clearcut logging for startup statistics by
+  @yunaseoul in [#21172](https://github.com/google-gemini/gemini-cli/pull/21172)
+- feat(triage): add area/documentation to issue triage by @g-samroberts in
+  [#21222](https://github.com/google-gemini/gemini-cli/pull/21222)
+- Fix so shell calls are formatted by @jacob314 in
+  [#21237](https://github.com/google-gemini/gemini-cli/pull/21237)
+- feat(cli): add native gVisor (runsc) sandboxing support by @Zheyuan-Lin in
+  [#21062](https://github.com/google-gemini/gemini-cli/pull/21062)
+- docs: use absolute paths for internal links in plan-mode.md by @jerop in
+  [#21299](https://github.com/google-gemini/gemini-cli/pull/21299)
+- fix(core): prevent unhandled AbortError crash during stream loop detection by
+  @7hokerz in [#21123](https://github.com/google-gemini/gemini-cli/pull/21123)
+- fix:reorder env var redaction checks to scan values first by @kartikangiras in
+  [#21059](https://github.com/google-gemini/gemini-cli/pull/21059)
+- fix(acp): rename --experimental-acp to --acp & remove Zed-specific refrences
+  by @skeshive in
+  [#21171](https://github.com/google-gemini/gemini-cli/pull/21171)
+- feat(core): fallback to 2.5 models with no access for toolcalls by @sehoon38
+  in [#21283](https://github.com/google-gemini/gemini-cli/pull/21283)
+- test(core): improve testing for API request/response parsing by @sehoon38 in
+  [#21227](https://github.com/google-gemini/gemini-cli/pull/21227)
+- docs(links): update docs-writer skill and fix broken link by @g-samroberts in
+  [#21314](https://github.com/google-gemini/gemini-cli/pull/21314)
+- Fix code colorizer ansi escape bug. by @jacob314 in
+  [#21321](https://github.com/google-gemini/gemini-cli/pull/21321)
+- remove wildcard behavior on keybindings by @scidomino in
+  [#21315](https://github.com/google-gemini/gemini-cli/pull/21315)
+- feat(acp): Add support for AI Gateway auth by @skeshive in
+  [#21305](https://github.com/google-gemini/gemini-cli/pull/21305)
+- fix(theme): improve theme color contrast for macOS Terminal.app by @clocky in
+  [#21175](https://github.com/google-gemini/gemini-cli/pull/21175)
+- feat (core): Implement tracker related SI changes by @anj-s in
+  [#19964](https://github.com/google-gemini/gemini-cli/pull/19964)
+- Changelog for v0.33.0-preview.2 by @gemini-cli-robot in
+  [#21333](https://github.com/google-gemini/gemini-cli/pull/21333)
+- Changelog for v0.33.0-preview.3 by @gemini-cli-robot in
+  [#21347](https://github.com/google-gemini/gemini-cli/pull/21347)
+- docs: format release times as HH:MM UTC by @pavan-sh in
+  [#20726](https://github.com/google-gemini/gemini-cli/pull/20726)
+- fix(cli): implement --all flag for extensions uninstall by @sehoon38 in
+  [#21319](https://github.com/google-gemini/gemini-cli/pull/21319)
+- docs: fix incorrect relative links to command reference by @kanywst in
+  [#20964](https://github.com/google-gemini/gemini-cli/pull/20964)
+- documentiong ensures ripgrep by @Jatin24062005 in
+  [#21298](https://github.com/google-gemini/gemini-cli/pull/21298)
+- fix(core): handle AbortError thrown during processTurn by @MumuTW in
+  [#21296](https://github.com/google-gemini/gemini-cli/pull/21296)
+- docs(cli): clarify ! command output visibility in shell commands tutorial by
+  @MohammedADev in
+  [#21041](https://github.com/google-gemini/gemini-cli/pull/21041)
+- fix: logic for task tracker strategy and remove tracker tools by @anj-s in
+  [#21355](https://github.com/google-gemini/gemini-cli/pull/21355)
+- fix(partUtils): display media type and size for inline data parts by @Aboudjem
+  in [#21358](https://github.com/google-gemini/gemini-cli/pull/21358)
+- Fix(accessibility): add screen reader support to RewindViewer by @Famous077 in
+  [#20750](https://github.com/google-gemini/gemini-cli/pull/20750)
+- fix(hooks): propagate stopHookActive in AfterAgent retry path (#20426) by
+  @Aarchi-07 in [#20439](https://github.com/google-gemini/gemini-cli/pull/20439)
+- fix(core): deduplicate GEMINI.md files by device/inode on case-insensitive
+  filesystems (#19904) by @Nixxx19 in
+  [#19915](https://github.com/google-gemini/gemini-cli/pull/19915)
+- feat(core): add concurrency safety guidance for subagent delegation (#17753)
+  by @abhipatel12 in
+  [#21278](https://github.com/google-gemini/gemini-cli/pull/21278)
+- feat(ui): dynamically generate all keybinding hints by @scidomino in
+  [#21346](https://github.com/google-gemini/gemini-cli/pull/21346)
+- feat(core): implement unified KeychainService and migrate token storage by
+  @ehedlund in [#21344](https://github.com/google-gemini/gemini-cli/pull/21344)
+- fix(cli): gracefully handle --resume when no sessions exist by @SandyTao520 in
+  [#21429](https://github.com/google-gemini/gemini-cli/pull/21429)
+- fix(plan): keep approved plan during chat compression by @ruomengz in
+  [#21284](https://github.com/google-gemini/gemini-cli/pull/21284)
+- feat(core): implement generic CacheService and optimize setupUser by @sehoon38
+  in [#21374](https://github.com/google-gemini/gemini-cli/pull/21374)
+- Update quota and pricing documentation with subscription tiers by @srithreepo
+  in [#21351](https://github.com/google-gemini/gemini-cli/pull/21351)
+- fix(core): append correct OTLP paths for HTTP exporters by
+  @sebastien-prudhomme in
+  [#16836](https://github.com/google-gemini/gemini-cli/pull/16836)
+- Changelog for v0.33.0-preview.4 by @gemini-cli-robot in
+  [#21354](https://github.com/google-gemini/gemini-cli/pull/21354)
+- feat(cli): implement dot-prefixing for slash command conflicts by @ehedlund in
+  [#20979](https://github.com/google-gemini/gemini-cli/pull/20979)
+- refactor(core): standardize MCP tool naming to mcp\_ FQN format by
+  @abhipatel12 in
+  [#21425](https://github.com/google-gemini/gemini-cli/pull/21425)
+- feat(cli): hide gemma settings from display and mark as experimental by
+  @abhipatel12 in
+  [#21471](https://github.com/google-gemini/gemini-cli/pull/21471)
+- feat(skills): refine string-reviewer guidelines and description by @clocky in
+  [#20368](https://github.com/google-gemini/gemini-cli/pull/20368)
+- fix(core): whitelist TERM and COLORTERM in environment sanitization by
+  @deadsmash07 in
+  [#20514](https://github.com/google-gemini/gemini-cli/pull/20514)
+- fix(billing): fix overage strategy lifecycle and settings integration by
+  @gsquared94 in
+  [#21236](https://github.com/google-gemini/gemini-cli/pull/21236)
+- fix: expand paste placeholders in TextInput on submit by @Jefftree in
+  [#19946](https://github.com/google-gemini/gemini-cli/pull/19946)
+- fix(core): add in-memory cache to ChatRecordingService to prevent OOM by
+  @SandyTao520 in
+  [#21502](https://github.com/google-gemini/gemini-cli/pull/21502)
+- feat(cli): overhaul thinking UI by @keithguerin in
+  [#18725](https://github.com/google-gemini/gemini-cli/pull/18725)
+- fix(ui): unify Ctrl+O expansion hint experience across buffer modes by
+  @jwhelangoog in
+  [#21474](https://github.com/google-gemini/gemini-cli/pull/21474)
+- fix(cli): correct shell height reporting by @jacob314 in
+  [#21492](https://github.com/google-gemini/gemini-cli/pull/21492)
+- Make test suite pass when the GEMINI_SYSTEM_MD env variable or
+  GEMINI_WRITE_SYSTEM_MD variable happens to be set locally/ by @jacob314 in
+  [#21480](https://github.com/google-gemini/gemini-cli/pull/21480)
+- Disallow underspecified types by @gundermanc in
+  [#21485](https://github.com/google-gemini/gemini-cli/pull/21485)
+- refactor(cli): standardize on 'reload' verb for all components by @keithguerin
+  in [#20654](https://github.com/google-gemini/gemini-cli/pull/20654)
+- feat(cli): Invert quota language to 'percent used' by @keithguerin in
+  [#20100](https://github.com/google-gemini/gemini-cli/pull/20100)
+- Docs: Add documentation for notifications (experimental)(macOS) by @jkcinouye
+  in [#21163](https://github.com/google-gemini/gemini-cli/pull/21163)
+- Code review comments as a pr by @jacob314 in
+  [#21209](https://github.com/google-gemini/gemini-cli/pull/21209)
+- feat(cli): unify /chat and /resume command UX by @LyalinDotCom in
+  [#20256](https://github.com/google-gemini/gemini-cli/pull/20256)
+- docs: fix typo 'allowslisted' -> 'allowlisted' in mcp-server.md by
+  @Gyanranjan-Priyam in
+  [#21665](https://github.com/google-gemini/gemini-cli/pull/21665)
+- fix(core): display actual graph output in tracker_visualize tool by @anj-s in
+  [#21455](https://github.com/google-gemini/gemini-cli/pull/21455)
+- fix(core): sanitize SSE-corrupted JSON and domain strings in error
+  classification by @gsquared94 in
+  [#21702](https://github.com/google-gemini/gemini-cli/pull/21702)
+- Docs: Make documentation links relative by @diodesign in
+  [#21490](https://github.com/google-gemini/gemini-cli/pull/21490)
+- feat(cli): expose /tools desc as explicit subcommand for discoverability by
+  @aworki in [#21241](https://github.com/google-gemini/gemini-cli/pull/21241)
+- feat(cli): add /compact alias for /compress command by @jackwotherspoon in
+  [#21711](https://github.com/google-gemini/gemini-cli/pull/21711)
+- feat(plan): enable Plan Mode by default by @jerop in
+  [#21713](https://github.com/google-gemini/gemini-cli/pull/21713)
+- feat(core): Introduce `AgentLoopContext`. by @joshualitt in
+  [#21198](https://github.com/google-gemini/gemini-cli/pull/21198)
+- fix(core): resolve symlinks for non-existent paths during validation by
+  @Adib234 in [#21487](https://github.com/google-gemini/gemini-cli/pull/21487)
+- docs: document tool exclusion from memory via deny policy by @Abhijit-2592 in
+  [#21428](https://github.com/google-gemini/gemini-cli/pull/21428)
+- perf(core): cache loadApiKey to reduce redundant keychain access by @sehoon38
+  in [#21520](https://github.com/google-gemini/gemini-cli/pull/21520)
+- feat(cli): implement /upgrade command by @sehoon38 in
+  [#21511](https://github.com/google-gemini/gemini-cli/pull/21511)
+- Feat/browser agent progress emission by @kunal-10-cloud in
+  [#21218](https://github.com/google-gemini/gemini-cli/pull/21218)
+- fix(settings): display objects as JSON instead of [object Object] by
+  @Zheyuan-Lin in
+  [#21458](https://github.com/google-gemini/gemini-cli/pull/21458)
+- Unmarshall update by @DavidAPierce in
+  [#21721](https://github.com/google-gemini/gemini-cli/pull/21721)
+- Update mcp's list function to check for disablement. by @DavidAPierce in
+  [#21148](https://github.com/google-gemini/gemini-cli/pull/21148)
+- robustness(core): static checks to validate history is immutable by @jacob314
+  in [#21228](https://github.com/google-gemini/gemini-cli/pull/21228)
+- refactor(cli): better react patterns for BaseSettingsDialog by @psinha40898 in
+  [#21206](https://github.com/google-gemini/gemini-cli/pull/21206)
+- feat(security): implement robust IP validation and safeFetch foundation by
+  @alisa-alisa in
+  [#21401](https://github.com/google-gemini/gemini-cli/pull/21401)
+- feat(core): improve subagent result display by @joshualitt in
+  [#20378](https://github.com/google-gemini/gemini-cli/pull/20378)
+- docs: fix broken markdown syntax and anchor links in /tools by @campox747 in
+  [#20902](https://github.com/google-gemini/gemini-cli/pull/20902)
+- feat(policy): support subagent-specific policies in TOML by @akh64bit in
+  [#21431](https://github.com/google-gemini/gemini-cli/pull/21431)
+- Add script to speed up reviewing PRs adding a worktree. by @jacob314 in
+  [#21748](https://github.com/google-gemini/gemini-cli/pull/21748)
+- fix(core): prevent infinite recursion in symlink resolution by @Adib234 in
+  [#21750](https://github.com/google-gemini/gemini-cli/pull/21750)
+- fix(docs): fix headless mode docs by @ame2en in
+  [#21287](https://github.com/google-gemini/gemini-cli/pull/21287)
+- feat/redesign header compact by @jacob314 in
+  [#20922](https://github.com/google-gemini/gemini-cli/pull/20922)
+- refactor: migrate to useKeyMatchers hook by @scidomino in
+  [#21753](https://github.com/google-gemini/gemini-cli/pull/21753)
+- perf(cli): cache loadSettings to reduce redundant disk I/O at startup by
+  @sehoon38 in [#21521](https://github.com/google-gemini/gemini-cli/pull/21521)
+- fix(core): resolve Windows line ending and path separation bugs across CLI by
+  @muhammadusman586 in
+  [#21068](https://github.com/google-gemini/gemini-cli/pull/21068)
+- docs: fix heading formatting in commands.md and phrasing in tools-api.md by
+  @campox747 in [#20679](https://github.com/google-gemini/gemini-cli/pull/20679)
+- refactor(ui): unify keybinding infrastructure and support string
+  initialization by @scidomino in
+  [#21776](https://github.com/google-gemini/gemini-cli/pull/21776)
+- Add support for updating extension sources and names by @chrstnb in
+  [#21715](https://github.com/google-gemini/gemini-cli/pull/21715)
+- fix(core): handle GUI editor non-zero exit codes gracefully by @reyyanxahmed
+  in [#20376](https://github.com/google-gemini/gemini-cli/pull/20376)
+- fix(core): destroy PTY on kill() and exception to prevent fd leak by @nbardy
+  in [#21693](https://github.com/google-gemini/gemini-cli/pull/21693)
+- fix(docs): update theme screenshots and add missing themes by @ashmod in
+  [#20689](https://github.com/google-gemini/gemini-cli/pull/20689)
+- refactor(cli): rename 'return' key to 'enter' internally by @scidomino in
+  [#21796](https://github.com/google-gemini/gemini-cli/pull/21796)
+- build(release): restrict npm bundling to non-stable tags by @sehoon38 in
+  [#21821](https://github.com/google-gemini/gemini-cli/pull/21821)
+- fix(core): override toolRegistry property for sub-agent schedulers by
+  @gsquared94 in
+  [#21766](https://github.com/google-gemini/gemini-cli/pull/21766)
+- fix(cli): make footer items equally spaced by @jacob314 in
+  [#21843](https://github.com/google-gemini/gemini-cli/pull/21843)
+- docs: clarify global policy rules application in plan mode by @jerop in
+  [#21864](https://github.com/google-gemini/gemini-cli/pull/21864)
+- fix(core): ensure correct flash model steering in plan mode implementation
+  phase by @jerop in
+  [#21871](https://github.com/google-gemini/gemini-cli/pull/21871)
+- fix(core): update @a2a-js/sdk to 0.3.11 by @adamfweidman in
+  [#21875](https://github.com/google-gemini/gemini-cli/pull/21875)
+- refactor(core): improve API response error logging when retry by @yunaseoul in
+  [#21784](https://github.com/google-gemini/gemini-cli/pull/21784)
+- fix(ui): handle headless execution in credits and upgrade dialogs by
+  @gsquared94 in
+  [#21850](https://github.com/google-gemini/gemini-cli/pull/21850)
+- fix(core): treat retryable errors with >5 min delay as terminal quota errors
+  by @gsquared94 in
+  [#21881](https://github.com/google-gemini/gemini-cli/pull/21881)
+- feat(telemetry): add specific PR, issue, and custom tracking IDs for GitHub
+  Actions by @cocosheng-g in
+  [#21129](https://github.com/google-gemini/gemini-cli/pull/21129)
+- feat(core): add OAuth2 Authorization Code auth provider for A2A agents by
+  @SandyTao520 in
+  [#21496](https://github.com/google-gemini/gemini-cli/pull/21496)
+- feat(cli): give visibility to /tools list command in the TUI and follow the
+  subcommand pattern of other commands by @JayadityaGit in
+  [#21213](https://github.com/google-gemini/gemini-cli/pull/21213)
+- Handle dirty worktrees better and warn about running scripts/review.sh on
+  untrusted code. by @jacob314 in
+  [#21791](https://github.com/google-gemini/gemini-cli/pull/21791)
+- feat(policy): support auto-add to policy by default and scoped persistence by
   @spencer426 in
-  [#23281](https://github.com/google-gemini/gemini-cli/pull/23281)
-- perf(cli): background IDE client to speed up initialization by @sehoon38 in
-  [#23603](https://github.com/google-gemini/gemini-cli/pull/23603)
-- fix(cli): prevent Ctrl+D exit when input buffer is not empty by @wtanaka in
-  [#23306](https://github.com/google-gemini/gemini-cli/pull/23306)
-- fix: ACP: separate conversational text from execute tool command title by
-  @sripasg in [#23179](https://github.com/google-gemini/gemini-cli/pull/23179)
-- feat(evals): add behavioral evaluations for subagent routing by @Samee24 in
-  [#23272](https://github.com/google-gemini/gemini-cli/pull/23272)
-- refactor(cli,core): foundational layout, identity management, and type safety
-  by @jwhelangoog in
-  [#23286](https://github.com/google-gemini/gemini-cli/pull/23286)
-- fix(core): accurately reflect subagent tool failure in UI by @abhipatel12 in
-  [#23187](https://github.com/google-gemini/gemini-cli/pull/23187)
-- Changelog for v0.35.0-preview.5 by @gemini-cli-robot in
-  [#23606](https://github.com/google-gemini/gemini-cli/pull/23606)
-- feat(ui): implement refreshed UX for Composer layout by @jwhelangoog in
-  [#21212](https://github.com/google-gemini/gemini-cli/pull/21212)
-- fix: API key input dialog user interaction when selected Gemini API Key by
-  @kartikangiras in
-  [#21057](https://github.com/google-gemini/gemini-cli/pull/21057)
-- docs: update `/mcp refresh` to `/mcp reload` by @adamfweidman in
-  [#23631](https://github.com/google-gemini/gemini-cli/pull/23631)
-- Implementation of sandbox "Write-Protected" Governance Files by @DavidAPierce
-  in [#23139](https://github.com/google-gemini/gemini-cli/pull/23139)
-- feat(sandbox): dynamic macOS sandbox expansion and worktree support by @galz10
-  in [#23301](https://github.com/google-gemini/gemini-cli/pull/23301)
-- fix(acp): Pass the cwd to `AcpFileSystemService` to avoid looping failures in
-  asking for perms to write plan md file by @sripasg in
-  [#23612](https://github.com/google-gemini/gemini-cli/pull/23612)
-- fix(plan): sandbox path resolution in Plan Mode to prevent hallucinations by
-  @Adib234 in [#22737](https://github.com/google-gemini/gemini-cli/pull/22737)
-- feat(ui): allow immediate user input during startup by @sehoon38 in
-  [#23661](https://github.com/google-gemini/gemini-cli/pull/23661)
-- refactor(sandbox): reorganize Windows sandbox files by @galz10 in
-  [#23645](https://github.com/google-gemini/gemini-cli/pull/23645)
-- fix(core): improve remote agent streaming UI and UX by @adamfweidman in
-  [#23633](https://github.com/google-gemini/gemini-cli/pull/23633)
-- perf(cli): optimize --version startup time by @sehoon38 in
-  [#23671](https://github.com/google-gemini/gemini-cli/pull/23671)
-- refactor(core): stop gemini CLI from producing unsafe casts by @gundermanc in
-  [#23611](https://github.com/google-gemini/gemini-cli/pull/23611)
-- use enableAutoUpdate in test rig by @scidomino in
-  [#23681](https://github.com/google-gemini/gemini-cli/pull/23681)
-- feat(core): change user-facing auth type from oauth2 to oauth by @adamfweidman
-  in [#23639](https://github.com/google-gemini/gemini-cli/pull/23639)
-- chore(deps): fix npm audit vulnerabilities by @scidomino in
-  [#23679](https://github.com/google-gemini/gemini-cli/pull/23679)
-- test(evals): fix overlapping act() deadlock in app-test-helper by @Adib234 in
-  [#23666](https://github.com/google-gemini/gemini-cli/pull/23666)
-- fix(patch): cherry-pick 055ff92 to release/v0.36.0-preview.0-pr-23672 to patch
-  version v0.36.0-preview.0 and create version 0.36.0-preview.1 by
+  [#20361](https://github.com/google-gemini/gemini-cli/pull/20361)
+- fix(core): handle AbortError when ESC cancels tool execution by @PrasannaPal21
+  in [#20863](https://github.com/google-gemini/gemini-cli/pull/20863)
+- fix(release): Improve Patch Release Workflow Comments: Clearer Approval
+  Guidance by @jerop in
+  [#21894](https://github.com/google-gemini/gemini-cli/pull/21894)
+- docs: clarify telemetry setup and comprehensive data map by @jerop in
+  [#21879](https://github.com/google-gemini/gemini-cli/pull/21879)
+- feat(core): add per-model token usage to stream-json output by @yongruilin in
+  [#21839](https://github.com/google-gemini/gemini-cli/pull/21839)
+- docs: remove experimental badge from plan mode in sidebar by @jerop in
+  [#21906](https://github.com/google-gemini/gemini-cli/pull/21906)
+- fix(cli): prevent race condition in loop detection retry by @skyvanguard in
+  [#17916](https://github.com/google-gemini/gemini-cli/pull/17916)
+- Add behavioral evals for tracker by @anj-s in
+  [#20069](https://github.com/google-gemini/gemini-cli/pull/20069)
+- fix(auth): update terminology to 'sign in' and 'sign out' by @clocky in
+  [#20892](https://github.com/google-gemini/gemini-cli/pull/20892)
+- docs(mcp): standardize mcp tool fqn documentation by @abhipatel12 in
+  [#21664](https://github.com/google-gemini/gemini-cli/pull/21664)
+- fix(ui): prevent empty tool-group border stubs after filtering by @Aaxhirrr in
+  [#21852](https://github.com/google-gemini/gemini-cli/pull/21852)
+- make command names consistent by @scidomino in
+  [#21907](https://github.com/google-gemini/gemini-cli/pull/21907)
+- refactor: remove agent_card_requires_auth config flag by @adamfweidman in
+  [#21914](https://github.com/google-gemini/gemini-cli/pull/21914)
+- feat(a2a): implement standardized normalization and streaming reassembly by
+  @alisa-alisa in
+  [#21402](https://github.com/google-gemini/gemini-cli/pull/21402)
+- feat(cli): enable skill activation via slash commands by @NTaylorMullen in
+  [#21758](https://github.com/google-gemini/gemini-cli/pull/21758)
+- docs(cli): mention per-model token usage in stream-json result event by
+  @yongruilin in
+  [#21908](https://github.com/google-gemini/gemini-cli/pull/21908)
+- fix(plan): prevent plan truncation in approval dialog by supporting
+  unconstrained heights by @Adib234 in
+  [#21037](https://github.com/google-gemini/gemini-cli/pull/21037)
+- feat(a2a): switch from callback-based to event-driven tool scheduler by
+  @cocosheng-g in
+  [#21467](https://github.com/google-gemini/gemini-cli/pull/21467)
+- feat(voice): implement speech-friendly response formatter by @ayush31010 in
+  [#20989](https://github.com/google-gemini/gemini-cli/pull/20989)
+- feat: add pulsating blue border automation overlay to browser agent by
+  @kunal-10-cloud in
+  [#21173](https://github.com/google-gemini/gemini-cli/pull/21173)
+- Add extensionRegistryURI setting to change where the registry is read from by
+  @kevinjwang1 in
+  [#20463](https://github.com/google-gemini/gemini-cli/pull/20463)
+- fix: patch gaxios v7 Array.toString() stream corruption by @gsquared94 in
+  [#21884](https://github.com/google-gemini/gemini-cli/pull/21884)
+- fix: prevent hangs in non-interactive mode and improve agent guidance by
+  @cocosheng-g in
+  [#20893](https://github.com/google-gemini/gemini-cli/pull/20893)
+- Add ExtensionDetails dialog and support install by @chrstnb in
+  [#20845](https://github.com/google-gemini/gemini-cli/pull/20845)
+- chore/release: bump version to 0.34.0-nightly.20260310.4653b126f by
   @gemini-cli-robot in
-  [#23723](https://github.com/google-gemini/gemini-cli/pull/23723)
-- fix(patch): cherry-pick 765fb67 to release/v0.36.0-preview.5-pr-24055 to patch
-  version v0.36.0-preview.5 and create version 0.36.0-preview.6 by
+  [#21816](https://github.com/google-gemini/gemini-cli/pull/21816)
+- Changelog for v0.33.0-preview.13 by @gemini-cli-robot in
+  [#21927](https://github.com/google-gemini/gemini-cli/pull/21927)
+- fix(cli): stabilize prompt layout to prevent jumping when typing by
+  @NTaylorMullen in
+  [#21081](https://github.com/google-gemini/gemini-cli/pull/21081)
+- fix: preserve prompt text when cancelling streaming by @Nixxx19 in
+  [#21103](https://github.com/google-gemini/gemini-cli/pull/21103)
+- fix: robust UX for remote agent errors by @Shyam-Raghuwanshi in
+  [#20307](https://github.com/google-gemini/gemini-cli/pull/20307)
+- feat: implement background process logging and cleanup by @galz10 in
+  [#21189](https://github.com/google-gemini/gemini-cli/pull/21189)
+- Changelog for v0.33.0-preview.14 by @gemini-cli-robot in
+  [#21938](https://github.com/google-gemini/gemini-cli/pull/21938)
+- fix(patch): cherry-pick 45faf4d to release/v0.34.0-preview.0-pr-22148
+  [CONFLICTS] by @gemini-cli-robot in
+  [#22174](https://github.com/google-gemini/gemini-cli/pull/22174)
+- fix(patch): cherry-pick 8432bce to release/v0.34.0-preview.1-pr-22069 to patch
+  version v0.34.0-preview.1 and create version 0.34.0-preview.2 by
   @gemini-cli-robot in
-  [#24061](https://github.com/google-gemini/gemini-cli/pull/24061)
+  [#22205](https://github.com/google-gemini/gemini-cli/pull/22205)
+- fix(patch): cherry-pick 24adacd to release/v0.34.0-preview.2-pr-22332 to patch
+  version v0.34.0-preview.2 and create version 0.34.0-preview.3 by
+  @gemini-cli-robot in
+  [#22391](https://github.com/google-gemini/gemini-cli/pull/22391)
+- fix(patch): cherry-pick 48130eb to release/v0.34.0-preview.3-pr-22665 to patch
+  version v0.34.0-preview.3 and create version 0.34.0-preview.4 by
+  @gemini-cli-robot in
+  [#22719](https://github.com/google-gemini/gemini-cli/pull/22719)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.35.3...v0.36.0
+https://github.com/google-gemini/gemini-cli/compare/v0.33.2...v0.34.0

docs/changelogs/preview.md

@@ -1,6 +1,6 @@
-# Preview release: v0.37.0-preview.2
+# Preview release: v0.35.0-preview.2
 
-Released: April 07, 2026
+Released: March 19, 2026
 
 Our preview release includes the latest, new, and experimental features. This
 release may not be as stable as our [latest weekly release](latest.md).
@@ -13,414 +13,368 @@ npm install -g @google/gemini-cli@preview
 
 ## Highlights
 
-- **Plan Mode Enhancements**: Plan now includes support for untrusted folders,
-  prioritized pre-approval discussions, and a resolve for sandbox-related
-  deadlocks during file creation.
-- **Browser Agent Evolved**: Significant updates to the browser agent, including
-  persistent session management, dynamic discovery of read-only tools,
-  sandbox-aware initialization, and automated reclamation of stale snapshots to
-  optimize context window usage.
-- **Advanced Sandbox Security**: Implementation of dynamic sandbox expansion for
-  both Linux and Windows, alongside secret visibility lockdown for environment
-  files and OS-specific forbidden path support.
-- **Unified Core Architecture**: Centralized context management and a new
-  `ModelConfigService` for unified model discovery, complemented by the
-  introduction of `AgentHistoryProvider` and tool-based topic grouping
-  (Chapters).
-- **UI/UX & Performance Improvements**: New Tokyo Night theme, "tab to queue"
-  message support, and compact tool output formatting, plus optimized build
-  scripts and improved layout stability for TUI components.
+- **Subagents & Architecture Enhancements**: Enabled subagents and laid the
+  foundation for subagent tool isolation. Added proxy routing support for remote
+  A2A subagents and integrated `SandboxManager` to sandbox all process-spawning
+  tools.
+- **CLI & UI Improvements**: Introduced customizable keyboard shortcuts and
+  support for literal character keybindings. Added missing vim mode motions and
+  CJK input support. Enabled code splitting and deferred UI loading for improved
+  performance.
+- **Context & Tools Optimization**: JIT context loading is now enabled by
+  default with deduplication for project memory. Introduced a model-driven
+  parallel tool scheduler and allowed safe tools to execute concurrently.
+- **Security & Extensions**: Implemented cryptographic integrity verification
+  for extension updates and added a `disableAlwaysAllow` setting to prevent
+  auto-approvals for enhanced security.
+- **Plan Mode & Web Fetch Updates**: Added an 'All the above' option for
+  multi-select AskUser questions in Plan Mode. Rolled out Stage 1 and Stage 2
+  security and consistency improvements for the `web_fetch` tool.
 
 ## What's Changed
 
-- fix(patch): cherry-pick cb7f7d6 to release/v0.37.0-preview.1-pr-24342 to patch
-  version v0.37.0-preview.1 and create version 0.37.0-preview.2 by
+- fix(patch): cherry-pick 4e5dfd0 to release/v0.35.0-preview.1-pr-23074 to patch
+  version v0.35.0-preview.1 and create version 0.35.0-preview.2 by
   @gemini-cli-robot in
-  [#24842](https://github.com/google-gemini/gemini-cli/pull/24842)
-- fix(patch): cherry-pick 64c928f to release/v0.37.0-preview.0-pr-23257 to patch
-  version v0.37.0-preview.0 and create version 0.37.0-preview.1 by
+  [#23134](https://github.com/google-gemini/gemini-cli/pull/23134)
+- feat(cli): customizable keyboard shortcuts by @scidomino in
+  [#21945](https://github.com/google-gemini/gemini-cli/pull/21945)
+- feat(core): Thread `AgentLoopContext` through core. by @joshualitt in
+  [#21944](https://github.com/google-gemini/gemini-cli/pull/21944)
+- chore(release): bump version to 0.35.0-nightly.20260311.657f19c1f by
   @gemini-cli-robot in
-  [#24561](https://github.com/google-gemini/gemini-cli/pull/24561)
-- feat(evals): centralize test agents into test-utils for reuse by @Samee24 in
-  [#23616](https://github.com/google-gemini/gemini-cli/pull/23616)
-- revert: chore(config): disable agents by default by @abhipatel12 in
-  [#23672](https://github.com/google-gemini/gemini-cli/pull/23672)
-- fix(plan): update telemetry attribute keys and add timestamp by @Adib234 in
-  [#23685](https://github.com/google-gemini/gemini-cli/pull/23685)
-- fix(core): prevent premature MCP discovery completion by @jackwotherspoon in
-  [#23637](https://github.com/google-gemini/gemini-cli/pull/23637)
-- feat(browser): add maxActionsPerTask for browser agent setting by
-  @cynthialong0-0 in
-  [#23216](https://github.com/google-gemini/gemini-cli/pull/23216)
-- fix(core): improve agent loader error formatting for empty paths by
-  @adamfweidman in
-  [#23690](https://github.com/google-gemini/gemini-cli/pull/23690)
-- fix(cli): only show updating spinner when auto-update is in progress by
-  @scidomino in [#23709](https://github.com/google-gemini/gemini-cli/pull/23709)
-- Refine onboarding metrics to log the duration explicitly and use the tier
-  name. by @yunaseoul in
-  [#23678](https://github.com/google-gemini/gemini-cli/pull/23678)
-- chore(tools): add toJSON to tools and invocations to reduce logging verbosity
-  by @alisa-alisa in
-  [#22899](https://github.com/google-gemini/gemini-cli/pull/22899)
-- fix(cli): stabilize copy mode to prevent flickering and cursor resets by
-  @mattKorwel in
-  [#22584](https://github.com/google-gemini/gemini-cli/pull/22584)
-- fix(test): move flaky ctrl-c-exit test to non-blocking suite by @mattKorwel in
-  [#23732](https://github.com/google-gemini/gemini-cli/pull/23732)
-- feat(skills): add ci skill for automated failure replication by @mattKorwel in
-  [#23720](https://github.com/google-gemini/gemini-cli/pull/23720)
-- feat(sandbox): implement forbiddenPaths for OS-specific sandbox managers by
-  @ehedlund in [#23282](https://github.com/google-gemini/gemini-cli/pull/23282)
-- fix(core): conditionally expose additional_permissions in shell tool by
-  @galz10 in [#23729](https://github.com/google-gemini/gemini-cli/pull/23729)
-- refactor(core): standardize OS-specific sandbox tests and extract linux helper
-  methods by @ehedlund in
-  [#23715](https://github.com/google-gemini/gemini-cli/pull/23715)
-- format recently added script by @scidomino in
-  [#23739](https://github.com/google-gemini/gemini-cli/pull/23739)
-- fix(ui): prevent over-eager slash subcommand completion by @keithguerin in
-  [#20136](https://github.com/google-gemini/gemini-cli/pull/20136)
-- Fix dynamic model routing for gemini 3.1 pro to customtools model by
-  @kevinjwang1 in
-  [#23641](https://github.com/google-gemini/gemini-cli/pull/23641)
-- feat(core): support inline agentCardJson for remote agents by @adamfweidman in
-  [#23743](https://github.com/google-gemini/gemini-cli/pull/23743)
-- fix(cli): skip console log/info in headless mode by @cynthialong0-0 in
-  [#22739](https://github.com/google-gemini/gemini-cli/pull/22739)
-- test(core): install bubblewrap on Linux CI for sandbox integration tests by
-  @ehedlund in [#23583](https://github.com/google-gemini/gemini-cli/pull/23583)
-- docs(reference): split tools table into category sections by @sheikhlimon in
-  [#21516](https://github.com/google-gemini/gemini-cli/pull/21516)
-- fix(browser): detect embedded URLs in query params to prevent allowedDomains
-  bypass by @tony-shi in
-  [#23225](https://github.com/google-gemini/gemini-cli/pull/23225)
-- fix(browser): add proxy bypass constraint to domain restriction system prompt
-  by @tony-shi in
-  [#23229](https://github.com/google-gemini/gemini-cli/pull/23229)
-- fix(policy): relax write_file argsPattern in plan mode to allow paths without
-  session ID by @Adib234 in
-  [#23695](https://github.com/google-gemini/gemini-cli/pull/23695)
-- docs: fix grammar in CONTRIBUTING and numbering in sandbox docs by
-  @splint-disk-8i in
-  [#23448](https://github.com/google-gemini/gemini-cli/pull/23448)
-- fix(acp): allow attachments by adding a permission prompt by @sripasg in
-  [#23680](https://github.com/google-gemini/gemini-cli/pull/23680)
-- fix(core): thread AbortSignal to chat compression requests (#20405) by
-  @SH20RAJ in [#20778](https://github.com/google-gemini/gemini-cli/pull/20778)
-- feat(core): implement Windows sandbox dynamic expansion Phase 1 and 2.1 by
-  @scidomino in [#23691](https://github.com/google-gemini/gemini-cli/pull/23691)
-- Add note about root privileges in sandbox docs by @diodesign in
-  [#23314](https://github.com/google-gemini/gemini-cli/pull/23314)
-- docs(core): document agent_card_json string literal options for remote agents
-  by @adamfweidman in
-  [#23797](https://github.com/google-gemini/gemini-cli/pull/23797)
-- fix(cli): resolve TTY hang on headless environments by unconditionally
-  resuming process.stdin before React Ink launch by @cocosheng-g in
-  [#23673](https://github.com/google-gemini/gemini-cli/pull/23673)
-- fix(ui): cleanup estimated string length hacks in composer by @keithguerin in
-  [#23694](https://github.com/google-gemini/gemini-cli/pull/23694)
-- feat(browser): dynamically discover read-only tools by @cynthialong0-0 in
-  [#23805](https://github.com/google-gemini/gemini-cli/pull/23805)
-- docs: clarify policy requirement for `general.plan.directory` in settings
-  schema by @jerop in
-  [#23784](https://github.com/google-gemini/gemini-cli/pull/23784)
-- Revert "perf(cli): optimize --version startup time (#23671)" by @scidomino in
-  [#23812](https://github.com/google-gemini/gemini-cli/pull/23812)
-- don't silence errors from wombat by @scidomino in
-  [#23822](https://github.com/google-gemini/gemini-cli/pull/23822)
-- fix(ui): prevent escape key from cancelling requests in shell mode by
-  @PrasannaPal21 in
-  [#21245](https://github.com/google-gemini/gemini-cli/pull/21245)
-- Changelog for v0.36.0-preview.0 by @gemini-cli-robot in
-  [#23702](https://github.com/google-gemini/gemini-cli/pull/23702)
-- feat(core,ui): Add experiment-gated support for gemini flash 3.1 lite by
-  @chrstnb in [#23794](https://github.com/google-gemini/gemini-cli/pull/23794)
-- Changelog for v0.36.0-preview.3 by @gemini-cli-robot in
-  [#23827](https://github.com/google-gemini/gemini-cli/pull/23827)
-- new linting check: github-actions-pinning by @alisa-alisa in
-  [#23808](https://github.com/google-gemini/gemini-cli/pull/23808)
-- fix(cli): show helpful guidance when no skills are available by @Niralisj in
-  [#23785](https://github.com/google-gemini/gemini-cli/pull/23785)
-- fix: Chat logs and errors handle tail tool calls correctly by @googlestrobe in
-  [#22460](https://github.com/google-gemini/gemini-cli/pull/22460)
-- Don't try removing a tag from a non-existent release. by @scidomino in
-  [#23830](https://github.com/google-gemini/gemini-cli/pull/23830)
-- fix(cli): allow ask question dialog to take full window height by @jacob314 in
-  [#23693](https://github.com/google-gemini/gemini-cli/pull/23693)
-- fix(core): strip leading underscores from error types in telemetry by
-  @yunaseoul in [#23824](https://github.com/google-gemini/gemini-cli/pull/23824)
-- Changelog for v0.35.0 by @gemini-cli-robot in
-  [#23819](https://github.com/google-gemini/gemini-cli/pull/23819)
-- feat(evals): add reliability harvester and 500/503 retry support by
-  @alisa-alisa in
-  [#23626](https://github.com/google-gemini/gemini-cli/pull/23626)
-- feat(sandbox): dynamic Linux sandbox expansion and worktree support by @galz10
-  in [#23692](https://github.com/google-gemini/gemini-cli/pull/23692)
-- Merge examples of use into quickstart documentation by @diodesign in
-  [#23319](https://github.com/google-gemini/gemini-cli/pull/23319)
-- fix(cli): prioritize primary name matches in slash command search by @sehoon38
-  in [#23850](https://github.com/google-gemini/gemini-cli/pull/23850)
-- Changelog for v0.35.1 by @gemini-cli-robot in
-  [#23840](https://github.com/google-gemini/gemini-cli/pull/23840)
-- fix(browser): keep input blocker active across navigations by @kunal-10-cloud
-  in [#22562](https://github.com/google-gemini/gemini-cli/pull/22562)
-- feat(core): new skill to look for duplicated code while reviewing PRs by
-  @devr0306 in [#23704](https://github.com/google-gemini/gemini-cli/pull/23704)
-- fix(core): replace hardcoded non-interactive ASK_USER denial with explicit
-  policy rules by @ruomengz in
-  [#23668](https://github.com/google-gemini/gemini-cli/pull/23668)
-- fix(plan): after exiting plan mode switches model to a flash model by @Adib234
-  in [#23885](https://github.com/google-gemini/gemini-cli/pull/23885)
-- feat(gcp): add development worker infrastructure by @mattKorwel in
-  [#23814](https://github.com/google-gemini/gemini-cli/pull/23814)
-- fix(a2a-server): A2A server should execute ask policies in interactive mode by
-  @kschaab in [#23831](https://github.com/google-gemini/gemini-cli/pull/23831)
-- feat(core): define TrajectoryProvider interface by @sehoon38 in
-  [#23050](https://github.com/google-gemini/gemini-cli/pull/23050)
-- Docs: Update quotas and pricing by @jkcinouye in
-  [#23835](https://github.com/google-gemini/gemini-cli/pull/23835)
-- fix(core): allow disabling environment variable redaction by @galz10 in
-  [#23927](https://github.com/google-gemini/gemini-cli/pull/23927)
-- feat(cli): enable notifications cross-platform via terminal bell fallback by
-  @genneth in [#21618](https://github.com/google-gemini/gemini-cli/pull/21618)
-- feat(sandbox): implement secret visibility lockdown for env files by
-  @DavidAPierce in
-  [#23712](https://github.com/google-gemini/gemini-cli/pull/23712)
-- fix(core): remove shell outputChunks buffer caching to prevent memory bloat
-  and sanitize prompt input by @spencer426 in
-  [#23751](https://github.com/google-gemini/gemini-cli/pull/23751)
-- feat(core): implement persistent browser session management by @kunal-10-cloud
-  in [#21306](https://github.com/google-gemini/gemini-cli/pull/21306)
-- refactor(core): delegate sandbox denial parsing to SandboxManager by
-  @scidomino in [#23928](https://github.com/google-gemini/gemini-cli/pull/23928)
-- dep(update) Update Ink version to 6.5.0 by @jacob314 in
-  [#23843](https://github.com/google-gemini/gemini-cli/pull/23843)
-- Docs: Update 'docs-writer' skill for relative links by @jkcinouye in
-  [#21463](https://github.com/google-gemini/gemini-cli/pull/21463)
-- Changelog for v0.36.0-preview.4 by @gemini-cli-robot in
-  [#23935](https://github.com/google-gemini/gemini-cli/pull/23935)
-- fix(acp): Update allow approval policy flow for ACP clients to fix config
-  persistence and compatible with TUI by @sripasg in
-  [#23818](https://github.com/google-gemini/gemini-cli/pull/23818)
-- Changelog for v0.35.2 by @gemini-cli-robot in
-  [#23960](https://github.com/google-gemini/gemini-cli/pull/23960)
-- ACP integration documents by @g-samroberts in
-  [#22254](https://github.com/google-gemini/gemini-cli/pull/22254)
-- fix(core): explicitly set error names to avoid bundling renaming issues by
-  @yunaseoul in [#23913](https://github.com/google-gemini/gemini-cli/pull/23913)
-- feat(core): subagent isolation and cleanup hardening by @abhipatel12 in
-  [#23903](https://github.com/google-gemini/gemini-cli/pull/23903)
-- disable extension-reload test by @scidomino in
-  [#24018](https://github.com/google-gemini/gemini-cli/pull/24018)
-- feat(core): add forbiddenPaths to GlobalSandboxOptions and refactor
-  createSandboxManager by @ehedlund in
-  [#23936](https://github.com/google-gemini/gemini-cli/pull/23936)
-- refactor(core): improve ignore resolution and fix directory-matching bug by
-  @ehedlund in [#23816](https://github.com/google-gemini/gemini-cli/pull/23816)
-- revert(core): support custom base URL via env vars by @spencer426 in
-  [#23976](https://github.com/google-gemini/gemini-cli/pull/23976)
-- Increase memory limited for eslint. by @jacob314 in
-  [#24022](https://github.com/google-gemini/gemini-cli/pull/24022)
-- fix(acp): prevent crash on empty response in ACP mode by @sripasg in
-  [#23952](https://github.com/google-gemini/gemini-cli/pull/23952)
-- feat(core): Land `AgentHistoryProvider`. by @joshualitt in
-  [#23978](https://github.com/google-gemini/gemini-cli/pull/23978)
-- fix(core): switch to subshells for shell tool wrapping to fix heredocs and
-  edge cases by @abhipatel12 in
-  [#24024](https://github.com/google-gemini/gemini-cli/pull/24024)
-- Debug command. by @jacob314 in
-  [#23851](https://github.com/google-gemini/gemini-cli/pull/23851)
-- Changelog for v0.36.0-preview.5 by @gemini-cli-robot in
-  [#24046](https://github.com/google-gemini/gemini-cli/pull/24046)
-- Fix test flakes by globally mocking ink-spinner by @jacob314 in
-  [#24044](https://github.com/google-gemini/gemini-cli/pull/24044)
-- Enable network access in sandbox configuration by @galz10 in
-  [#24055](https://github.com/google-gemini/gemini-cli/pull/24055)
-- feat(context): add configurable memoryBoundaryMarkers setting by @SandyTao520
-  in [#24020](https://github.com/google-gemini/gemini-cli/pull/24020)
-- feat(core): implement windows sandbox expansion and denial detection by
-  @scidomino in [#24027](https://github.com/google-gemini/gemini-cli/pull/24027)
-- fix(core): resolve ACP Operation Aborted Errors in grep_search by @ivanporty
-  in [#23821](https://github.com/google-gemini/gemini-cli/pull/23821)
-- fix(hooks): prevent SessionEnd from firing twice in non-interactive mode by
-  @krishdef7 in [#22139](https://github.com/google-gemini/gemini-cli/pull/22139)
-- Re-word intro to Gemini 3 page. by @g-samroberts in
-  [#24069](https://github.com/google-gemini/gemini-cli/pull/24069)
-- fix(cli): resolve layout contention and flashing loop in StatusRow by
-  @keithguerin in
-  [#24065](https://github.com/google-gemini/gemini-cli/pull/24065)
-- fix(sandbox): implement Windows Mandatory Integrity Control for GeminiSandbox
-  by @galz10 in [#24057](https://github.com/google-gemini/gemini-cli/pull/24057)
-- feat(core): implement tool-based topic grouping (Chapters) by @Abhijit-2592 in
-  [#23150](https://github.com/google-gemini/gemini-cli/pull/23150)
-- feat(cli): support 'tab to queue' for messages while generating by @gundermanc
-  in [#24052](https://github.com/google-gemini/gemini-cli/pull/24052)
-- feat(core): agnostic background task UI with CompletionBehavior by
-  @adamfweidman in
-  [#22740](https://github.com/google-gemini/gemini-cli/pull/22740)
-- UX for topic narration tool by @gundermanc in
-  [#24079](https://github.com/google-gemini/gemini-cli/pull/24079)
-- fix: shellcheck warnings in scripts by @scidomino in
-  [#24035](https://github.com/google-gemini/gemini-cli/pull/24035)
-- test(evals): add comprehensive subagent delegation evaluations by @abhipatel12
-  in [#24132](https://github.com/google-gemini/gemini-cli/pull/24132)
-- fix(a2a-server): prioritize ADC before evaluating headless constraints for
-  auth initialization by @spencer426 in
-  [#23614](https://github.com/google-gemini/gemini-cli/pull/23614)
-- Text can be added after /plan command by @rambleraptor in
-  [#22833](https://github.com/google-gemini/gemini-cli/pull/22833)
-- fix(cli): resolve missing F12 logs via global console store by @scidomino in
-  [#24235](https://github.com/google-gemini/gemini-cli/pull/24235)
-- fix broken tests by @scidomino in
-  [#24279](https://github.com/google-gemini/gemini-cli/pull/24279)
-- fix(evals): add update_topic behavioral eval by @gundermanc in
-  [#24223](https://github.com/google-gemini/gemini-cli/pull/24223)
-- feat(core): Unified Context Management and Tool Distillation. by @joshualitt
-  in [#24157](https://github.com/google-gemini/gemini-cli/pull/24157)
-- Default enable narration for the team. by @gundermanc in
-  [#24224](https://github.com/google-gemini/gemini-cli/pull/24224)
-- fix(core): ensure default agents provide tools and use model-specific schemas
+  [#21966](https://github.com/google-gemini/gemini-cli/pull/21966)
+- refactor(a2a): remove legacy CoreToolScheduler by @adamfweidman in
+  [#21955](https://github.com/google-gemini/gemini-cli/pull/21955)
+- feat(ui): add missing vim mode motions (X, ~, r, f/F/t/T, df/dt and friends)
+  by @aanari in [#21932](https://github.com/google-gemini/gemini-cli/pull/21932)
+- Feat/retry fetch notifications by @aishaneeshah in
+  [#21813](https://github.com/google-gemini/gemini-cli/pull/21813)
+- fix(core): remove OAuth check from handleFallback and clean up stray file by
+  @sehoon38 in [#21962](https://github.com/google-gemini/gemini-cli/pull/21962)
+- feat(cli): support literal character keybindings and extended Kitty protocol
+  keys by @scidomino in
+  [#21972](https://github.com/google-gemini/gemini-cli/pull/21972)
+- fix(ui): clamp cursor to last char after all NORMAL mode deletes by @aanari in
+  [#21973](https://github.com/google-gemini/gemini-cli/pull/21973)
+- test(core): add missing tests for prompts/utils.ts by @krrishverma1805-web in
+  [#19941](https://github.com/google-gemini/gemini-cli/pull/19941)
+- fix(cli): allow scrolling keys in copy mode (Ctrl+S selection mode) by
+  @nsalerni in [#19933](https://github.com/google-gemini/gemini-cli/pull/19933)
+- docs(cli): add custom keybinding documentation by @scidomino in
+  [#21980](https://github.com/google-gemini/gemini-cli/pull/21980)
+- docs: fix misleading YOLO mode description in defaultApprovalMode by
+  @Gyanranjan-Priyam in
+  [#21878](https://github.com/google-gemini/gemini-cli/pull/21878)
+- fix: clean up /clear and /resume by @jackwotherspoon in
+  [#22007](https://github.com/google-gemini/gemini-cli/pull/22007)
+- fix(core)#20941: reap orphaned descendant processes on PTY abort by @manavmax
+  in [#21124](https://github.com/google-gemini/gemini-cli/pull/21124)
+- fix(core): update language detection to use LSP 3.18 identifiers by @yunaseoul
+  in [#21931](https://github.com/google-gemini/gemini-cli/pull/21931)
+- feat(cli): support removing keybindings via '-' prefix by @scidomino in
+  [#22042](https://github.com/google-gemini/gemini-cli/pull/22042)
+- feat(policy): add --admin-policy flag for supplemental admin policies by
+  @galz10 in [#20360](https://github.com/google-gemini/gemini-cli/pull/20360)
+- merge duplicate imports packages/cli/src subtask1 by @Nixxx19 in
+  [#22040](https://github.com/google-gemini/gemini-cli/pull/22040)
+- perf(core): parallelize user quota and experiments fetching in refreshAuth by
+  @sehoon38 in [#21648](https://github.com/google-gemini/gemini-cli/pull/21648)
+- Changelog for v0.34.0-preview.0 by @gemini-cli-robot in
+  [#21965](https://github.com/google-gemini/gemini-cli/pull/21965)
+- Changelog for v0.33.0 by @gemini-cli-robot in
+  [#21967](https://github.com/google-gemini/gemini-cli/pull/21967)
+- fix(core): handle EISDIR in robustRealpath on Windows by @sehoon38 in
+  [#21984](https://github.com/google-gemini/gemini-cli/pull/21984)
+- feat(core): include initiationMethod in conversation interaction telemetry by
+  @yunaseoul in [#22054](https://github.com/google-gemini/gemini-cli/pull/22054)
+- feat(ui): add vim yank/paste (y/p/P) with unnamed register by @aanari in
+  [#22026](https://github.com/google-gemini/gemini-cli/pull/22026)
+- fix(core): enable numerical routing for api key users by @sehoon38 in
+  [#21977](https://github.com/google-gemini/gemini-cli/pull/21977)
+- feat(telemetry): implement retry attempt telemetry for network related retries
+  by @aishaneeshah in
+  [#22027](https://github.com/google-gemini/gemini-cli/pull/22027)
+- fix(policy): remove unnecessary escapeRegex from pattern builders by
+  @spencer426 in
+  [#21921](https://github.com/google-gemini/gemini-cli/pull/21921)
+- fix(core): preserve dynamic tool descriptions on session resume by @sehoon38
+  in [#18835](https://github.com/google-gemini/gemini-cli/pull/18835)
+- chore: allow 'gemini-3.1' in sensitive keyword linter by @scidomino in
+  [#22065](https://github.com/google-gemini/gemini-cli/pull/22065)
+- feat(core): support custom base URL via env vars by @junaiddshaukat in
+  [#21561](https://github.com/google-gemini/gemini-cli/pull/21561)
+- merge duplicate imports packages/cli/src subtask2 by @Nixxx19 in
+  [#22051](https://github.com/google-gemini/gemini-cli/pull/22051)
+- fix(core): silently retry API errors up to 3 times before halting session by
+  @spencer426 in
+  [#21989](https://github.com/google-gemini/gemini-cli/pull/21989)
+- feat(core): simplify subagent success UI and improve early termination display
   by @abhipatel12 in
-  [#24268](https://github.com/google-gemini/gemini-cli/pull/24268)
-- feat(cli): show Flash Lite Preview model regardless of user tier by @sehoon38
-  in [#23904](https://github.com/google-gemini/gemini-cli/pull/23904)
-- feat(cli): implement compact tool output by @jwhelangoog in
-  [#20974](https://github.com/google-gemini/gemini-cli/pull/20974)
-- Add security settings for tool sandboxing by @galz10 in
-  [#23923](https://github.com/google-gemini/gemini-cli/pull/23923)
-- chore(test-utils): switch integration tests to use PREVIEW_GEMINI_MODEL by
-  @sehoon38 in [#24276](https://github.com/google-gemini/gemini-cli/pull/24276)
-- feat(core): enable topic update narration for legacy models by @Abhijit-2592
-  in [#24241](https://github.com/google-gemini/gemini-cli/pull/24241)
-- feat(core): add project-level memory scope to save_memory tool by @SandyTao520
-  in [#24161](https://github.com/google-gemini/gemini-cli/pull/24161)
-- test(integration): fix plan mode write denial test false positive by @sehoon38
-  in [#24299](https://github.com/google-gemini/gemini-cli/pull/24299)
-- feat(plan): support `Plan` mode in untrusted folders by @Adib234 in
-  [#17586](https://github.com/google-gemini/gemini-cli/pull/17586)
-- fix(core): enable mid-stream retries for all models and re-enable compression
-  test by @sehoon38 in
-  [#24302](https://github.com/google-gemini/gemini-cli/pull/24302)
-- Changelog for v0.36.0-preview.6 by @gemini-cli-robot in
-  [#24082](https://github.com/google-gemini/gemini-cli/pull/24082)
-- Changelog for v0.35.3 by @gemini-cli-robot in
-  [#24083](https://github.com/google-gemini/gemini-cli/pull/24083)
-- feat(cli): add auth info to footer by @sehoon38 in
-  [#24042](https://github.com/google-gemini/gemini-cli/pull/24042)
-- fix(browser): reset action counter for each agent session and let it ignore
-  internal actions by @cynthialong0-0 in
-  [#24228](https://github.com/google-gemini/gemini-cli/pull/24228)
-- feat(plan): promote planning feature to stable by @ruomengz in
-  [#24282](https://github.com/google-gemini/gemini-cli/pull/24282)
-- fix(browser): terminate subagent immediately on domain restriction violations
-  by @gsquared94 in
-  [#24313](https://github.com/google-gemini/gemini-cli/pull/24313)
-- feat(cli): add UI to update extensions by @ruomengz in
-  [#23682](https://github.com/google-gemini/gemini-cli/pull/23682)
-- Fix(browser): terminate immediately for "browser is already running" error by
-  @cynthialong0-0 in
-  [#24233](https://github.com/google-gemini/gemini-cli/pull/24233)
-- docs: Add 'plan' option to approval mode in CLI reference by @YifanRuan in
-  [#24134](https://github.com/google-gemini/gemini-cli/pull/24134)
-- fix(core): batch macOS seatbelt rules into a profile file to prevent ARG_MAX
-  errors by @ehedlund in
-  [#24255](https://github.com/google-gemini/gemini-cli/pull/24255)
-- fix(core): fix race condition between browser agent and main closing process
-  by @cynthialong0-0 in
-  [#24340](https://github.com/google-gemini/gemini-cli/pull/24340)
-- perf(build): optimize build scripts for parallel execution and remove
-  redundant checks by @sehoon38 in
-  [#24307](https://github.com/google-gemini/gemini-cli/pull/24307)
-- ci: install bubblewrap on Linux for release workflows by @ehedlund in
-  [#24347](https://github.com/google-gemini/gemini-cli/pull/24347)
-- chore(release): allow bundling for all builds, including stable by @sehoon38
-  in [#24305](https://github.com/google-gemini/gemini-cli/pull/24305)
-- Revert "Add security settings for tool sandboxing" by @jerop in
-  [#24357](https://github.com/google-gemini/gemini-cli/pull/24357)
-- docs: update subagents docs to not be experimental by @abhipatel12 in
-  [#24343](https://github.com/google-gemini/gemini-cli/pull/24343)
-- fix(core): implement **read and **write commands in sandbox managers by
-  @galz10 in [#24283](https://github.com/google-gemini/gemini-cli/pull/24283)
-- don't try to remove tags in dry run by @scidomino in
-  [#24356](https://github.com/google-gemini/gemini-cli/pull/24356)
-- fix(config): disable JIT context loading by default by @SandyTao520 in
-  [#24364](https://github.com/google-gemini/gemini-cli/pull/24364)
-- test(sandbox): add integration test for dynamic permission expansion by
-  @galz10 in [#24359](https://github.com/google-gemini/gemini-cli/pull/24359)
-- docs(policy): remove unsupported mcpName wildcard edge case by @abhipatel12 in
-  [#24133](https://github.com/google-gemini/gemini-cli/pull/24133)
-- docs: fix broken GEMINI.md link in CONTRIBUTING.md by @Panchal-Tirth in
-  [#24182](https://github.com/google-gemini/gemini-cli/pull/24182)
-- feat(core): infrastructure for event-driven subagent history by @abhipatel12
-  in [#23914](https://github.com/google-gemini/gemini-cli/pull/23914)
-- fix(core): resolve Plan Mode deadlock during plan file creation due to sandbox
-  restrictions by @DavidAPierce in
-  [#24047](https://github.com/google-gemini/gemini-cli/pull/24047)
-- fix(core): fix browser agent UX issues and improve E2E test reliability by
+  [#21917](https://github.com/google-gemini/gemini-cli/pull/21917)
+- merge duplicate imports packages/cli/src subtask3 by @Nixxx19 in
+  [#22056](https://github.com/google-gemini/gemini-cli/pull/22056)
+- fix(hooks): fix BeforeAgent/AfterAgent inconsistencies (#18514) by @krishdef7
+  in [#21383](https://github.com/google-gemini/gemini-cli/pull/21383)
+- feat(core): implement SandboxManager interface and config schema by @galz10 in
+  [#21774](https://github.com/google-gemini/gemini-cli/pull/21774)
+- docs: document npm deprecation warnings as safe to ignore by @h30s in
+  [#20692](https://github.com/google-gemini/gemini-cli/pull/20692)
+- fix: remove status/need-triage from maintainer-only issues by @SandyTao520 in
+  [#22044](https://github.com/google-gemini/gemini-cli/pull/22044)
+- fix(core): propagate subagent context to policy engine by @NTaylorMullen in
+  [#22086](https://github.com/google-gemini/gemini-cli/pull/22086)
+- fix(cli): resolve skill uninstall failure when skill name is updated by
+  @NTaylorMullen in
+  [#22085](https://github.com/google-gemini/gemini-cli/pull/22085)
+- docs(plan): clarify interactive plan editing with Ctrl+X by @Adib234 in
+  [#22076](https://github.com/google-gemini/gemini-cli/pull/22076)
+- fix(policy): ensure user policies are loaded when policyPaths is empty by
+  @NTaylorMullen in
+  [#22090](https://github.com/google-gemini/gemini-cli/pull/22090)
+- Docs: Add documentation for model steering (experimental). by @jkcinouye in
+  [#21154](https://github.com/google-gemini/gemini-cli/pull/21154)
+- Add issue for automated changelogs by @g-samroberts in
+  [#21912](https://github.com/google-gemini/gemini-cli/pull/21912)
+- fix(core): secure argsPattern and revert WEB_FETCH_TOOL_NAME escalation by
+  @spencer426 in
+  [#22104](https://github.com/google-gemini/gemini-cli/pull/22104)
+- feat(core): differentiate User-Agent for a2a-server and ACP clients by
+  @bdmorgan in [#22059](https://github.com/google-gemini/gemini-cli/pull/22059)
+- refactor(core): extract ExecutionLifecycleService for tool backgrounding by
+  @adamfweidman in
+  [#21717](https://github.com/google-gemini/gemini-cli/pull/21717)
+- feat: Display pending and confirming tool calls by @sripasg in
+  [#22106](https://github.com/google-gemini/gemini-cli/pull/22106)
+- feat(browser): implement input blocker overlay during automation by
+  @kunal-10-cloud in
+  [#21132](https://github.com/google-gemini/gemini-cli/pull/21132)
+- fix: register themes on extension load not start by @jackwotherspoon in
+  [#22148](https://github.com/google-gemini/gemini-cli/pull/22148)
+- feat(ui): Do not show Ultra users /upgrade hint (#22154) by @sehoon38 in
+  [#22156](https://github.com/google-gemini/gemini-cli/pull/22156)
+- chore: remove unnecessary log for themes by @jackwotherspoon in
+  [#22165](https://github.com/google-gemini/gemini-cli/pull/22165)
+- fix(core): resolve MCP tool FQN validation, schema export, and wildcards in
+  subagents by @abhipatel12 in
+  [#22069](https://github.com/google-gemini/gemini-cli/pull/22069)
+- fix(cli): validate --model argument at startup by @JaisalJain in
+  [#21393](https://github.com/google-gemini/gemini-cli/pull/21393)
+- fix(core): handle policy ALLOW for exit_plan_mode by @backnotprop in
+  [#21802](https://github.com/google-gemini/gemini-cli/pull/21802)
+- feat(telemetry): add Clearcut instrumentation for AI credits billing events by
   @gsquared94 in
-  [#24312](https://github.com/google-gemini/gemini-cli/pull/24312)
-- fix(ui): wrap topic and intent fields in TopicMessage by @jwhelangoog in
-  [#24386](https://github.com/google-gemini/gemini-cli/pull/24386)
-- refactor(core): Centralize context management logic into src/context by
-  @joshualitt in
-  [#24380](https://github.com/google-gemini/gemini-cli/pull/24380)
-- fix(core): pin AuthType.GATEWAY to use Gemini 3.1 Pro/Flash Lite by default by
-  @sripasg in [#24375](https://github.com/google-gemini/gemini-cli/pull/24375)
-- feat(ui): add Tokyo Night theme by @danrneal in
-  [#24054](https://github.com/google-gemini/gemini-cli/pull/24054)
-- fix(cli): refactor test config loading and mock debugLogger in test-setup by
-  @mattKorwel in
-  [#24389](https://github.com/google-gemini/gemini-cli/pull/24389)
-- Set memoryManager to false in settings.json by @mattKorwel in
-  [#24393](https://github.com/google-gemini/gemini-cli/pull/24393)
-- ink 6.6.3 by @jacob314 in
-  [#24372](https://github.com/google-gemini/gemini-cli/pull/24372)
-- fix(core): resolve subagent chat recording gaps and directory inheritance by
+  [#22153](https://github.com/google-gemini/gemini-cli/pull/22153)
+- feat(core): add google credentials provider for remote agents by @adamfweidman
+  in [#21024](https://github.com/google-gemini/gemini-cli/pull/21024)
+- test(cli): add integration test for node deprecation warnings by @Nixxx19 in
+  [#20215](https://github.com/google-gemini/gemini-cli/pull/20215)
+- feat(cli): allow safe tools to execute concurrently while agent is busy by
+  @spencer426 in
+  [#21988](https://github.com/google-gemini/gemini-cli/pull/21988)
+- feat(core): implement model-driven parallel tool scheduler by @abhipatel12 in
+  [#21933](https://github.com/google-gemini/gemini-cli/pull/21933)
+- update vulnerable deps by @scidomino in
+  [#22180](https://github.com/google-gemini/gemini-cli/pull/22180)
+- fix(core): fix startup stats to use int values for timestamps and durations by
+  @yunaseoul in [#22201](https://github.com/google-gemini/gemini-cli/pull/22201)
+- fix(core): prevent duplicate tool schemas for instantiated tools by
   @abhipatel12 in
-  [#24368](https://github.com/google-gemini/gemini-cli/pull/24368)
-- fix(cli): cap shell output at 10 MB to prevent RangeError crash by @ProthamD
-  in [#24168](https://github.com/google-gemini/gemini-cli/pull/24168)
-- feat(plan): conditionally add enter/exit plan mode tools based on current mode
-  by @ruomengz in
-  [#24378](https://github.com/google-gemini/gemini-cli/pull/24378)
-- feat(core): prioritize discussion before formal plan approval by @jerop in
-  [#24423](https://github.com/google-gemini/gemini-cli/pull/24423)
-- fix(ui): add accelerated scrolling on alternate buffer mode by @devr0306 in
-  [#23940](https://github.com/google-gemini/gemini-cli/pull/23940)
-- feat(core): populate sandbox forbidden paths with project ignore file contents
-  by @ehedlund in
-  [#24038](https://github.com/google-gemini/gemini-cli/pull/24038)
-- fix(core): ensure blue border overlay and input blocker to act correctly
-  depending on browser agent activities by @cynthialong0-0 in
-  [#24385](https://github.com/google-gemini/gemini-cli/pull/24385)
-- fix(ui): removed additional vertical padding for tables by @devr0306 in
-  [#24381](https://github.com/google-gemini/gemini-cli/pull/24381)
-- fix(build): upload full bundle directory archive to GitHub releases by
-  @sehoon38 in [#24403](https://github.com/google-gemini/gemini-cli/pull/24403)
-- fix(build): wire bundle:browser-mcp into bundle pipeline by @gsquared94 in
-  [#24424](https://github.com/google-gemini/gemini-cli/pull/24424)
-- feat(browser): add sandbox-aware browser agent initialization by @gsquared94
-  in [#24419](https://github.com/google-gemini/gemini-cli/pull/24419)
-- feat(core): enhance tracker task schemas for detailed titles and descriptions
-  by @anj-s in [#23902](https://github.com/google-gemini/gemini-cli/pull/23902)
-- refactor(core): Unified context management settings schema by @joshualitt in
-  [#24391](https://github.com/google-gemini/gemini-cli/pull/24391)
-- feat(core): update browser agent prompt to check open pages first when
-  bringing up by @cynthialong0-0 in
-  [#24431](https://github.com/google-gemini/gemini-cli/pull/24431)
-- fix(acp) refactor(core,cli): centralize model discovery logic in
-  ModelConfigService by @sripasg in
-  [#24392](https://github.com/google-gemini/gemini-cli/pull/24392)
-- Changelog for v0.36.0-preview.7 by @gemini-cli-robot in
-  [#24346](https://github.com/google-gemini/gemini-cli/pull/24346)
-- fix: update task tracker storage location in system prompt by @anj-s in
-  [#24034](https://github.com/google-gemini/gemini-cli/pull/24034)
-- feat(browser): supersede stale snapshots to reclaim context-window tokens by
+  [#22204](https://github.com/google-gemini/gemini-cli/pull/22204)
+- fix(core): add proxy routing support for remote A2A subagents by @adamfweidman
+  in [#22199](https://github.com/google-gemini/gemini-cli/pull/22199)
+- fix(core/ide): add Antigravity CLI fallbacks by @apfine in
+  [#22030](https://github.com/google-gemini/gemini-cli/pull/22030)
+- fix(browser): fix duplicate function declaration error in browser agent by
   @gsquared94 in
-  [#24440](https://github.com/google-gemini/gemini-cli/pull/24440)
-- docs(core): add subagent tool isolation draft doc by @akh64bit in
-  [#23275](https://github.com/google-gemini/gemini-cli/pull/23275)
+  [#22207](https://github.com/google-gemini/gemini-cli/pull/22207)
+- feat(core): implement Stage 1 improvements for webfetch tool by @aishaneeshah
+  in [#21313](https://github.com/google-gemini/gemini-cli/pull/21313)
+- Changelog for v0.34.0-preview.1 by @gemini-cli-robot in
+  [#22194](https://github.com/google-gemini/gemini-cli/pull/22194)
+- perf(cli): enable code splitting and deferred UI loading by @sehoon38 in
+  [#22117](https://github.com/google-gemini/gemini-cli/pull/22117)
+- fix: remove unused img.png from project root by @SandyTao520 in
+  [#22222](https://github.com/google-gemini/gemini-cli/pull/22222)
+- docs(local model routing): add docs on how to use Gemma for local model
+  routing by @douglas-reid in
+  [#21365](https://github.com/google-gemini/gemini-cli/pull/21365)
+- feat(a2a): enable native gRPC support and protocol routing by @alisa-alisa in
+  [#21403](https://github.com/google-gemini/gemini-cli/pull/21403)
+- fix(cli): escape @ symbols on paste to prevent unintended file expansion by
+  @krishdef7 in [#21239](https://github.com/google-gemini/gemini-cli/pull/21239)
+- feat(core): add trajectoryId to ConversationOffered telemetry by @yunaseoul in
+  [#22214](https://github.com/google-gemini/gemini-cli/pull/22214)
+- docs: clarify that tools.core is an allowlist for ALL built-in tools by
+  @hobostay in [#18813](https://github.com/google-gemini/gemini-cli/pull/18813)
+- docs(plan): document hooks with plan mode by @ruomengz in
+  [#22197](https://github.com/google-gemini/gemini-cli/pull/22197)
+- Changelog for v0.33.1 by @gemini-cli-robot in
+  [#22235](https://github.com/google-gemini/gemini-cli/pull/22235)
+- build(ci): fix false positive evals trigger on merge commits by @gundermanc in
+  [#22237](https://github.com/google-gemini/gemini-cli/pull/22237)
+- fix(core): explicitly pass messageBus to policy engine for MCP tool saves by
+  @abhipatel12 in
+  [#22255](https://github.com/google-gemini/gemini-cli/pull/22255)
+- feat(core): Fully migrate packages/core to AgentLoopContext. by @joshualitt in
+  [#22115](https://github.com/google-gemini/gemini-cli/pull/22115)
+- feat(core): increase sub-agent turn and time limits by @bdmorgan in
+  [#22196](https://github.com/google-gemini/gemini-cli/pull/22196)
+- feat(core): instrument file system tools for JIT context discovery by
+  @SandyTao520 in
+  [#22082](https://github.com/google-gemini/gemini-cli/pull/22082)
+- refactor(ui): extract pure session browser utilities by @abhipatel12 in
+  [#22256](https://github.com/google-gemini/gemini-cli/pull/22256)
+- fix(plan): Fix AskUser evals by @Adib234 in
+  [#22074](https://github.com/google-gemini/gemini-cli/pull/22074)
+- fix(settings): prevent j/k navigation keys from intercepting edit buffer input
+  by @student-ankitpandit in
+  [#21865](https://github.com/google-gemini/gemini-cli/pull/21865)
+- feat(skills): improve async-pr-review workflow and logging by @mattKorwel in
+  [#21790](https://github.com/google-gemini/gemini-cli/pull/21790)
+- refactor(cli): consolidate getErrorMessage utility to core by @scidomino in
+  [#22190](https://github.com/google-gemini/gemini-cli/pull/22190)
+- fix(core): show descriptive error messages when saving settings fails by
+  @afarber in [#18095](https://github.com/google-gemini/gemini-cli/pull/18095)
+- docs(core): add authentication guide for remote subagents by @adamfweidman in
+  [#22178](https://github.com/google-gemini/gemini-cli/pull/22178)
+- docs: overhaul subagents documentation and add /agents command by @abhipatel12
+  in [#22345](https://github.com/google-gemini/gemini-cli/pull/22345)
+- refactor(ui): extract SessionBrowser static ui components by @abhipatel12 in
+  [#22348](https://github.com/google-gemini/gemini-cli/pull/22348)
+- test: add Object.create context regression test and tool confirmation
+  integration test by @gsquared94 in
+  [#22356](https://github.com/google-gemini/gemini-cli/pull/22356)
+- feat(tracker): return TodoList display for tracker tools by @anj-s in
+  [#22060](https://github.com/google-gemini/gemini-cli/pull/22060)
+- feat(agent): add allowed domain restrictions for browser agent by
+  @cynthialong0-0 in
+  [#21775](https://github.com/google-gemini/gemini-cli/pull/21775)
+- chore/release: bump version to 0.35.0-nightly.20260313.bb060d7a9 by
+  @gemini-cli-robot in
+  [#22251](https://github.com/google-gemini/gemini-cli/pull/22251)
+- Move keychain fallback to keychain service by @chrstnb in
+  [#22332](https://github.com/google-gemini/gemini-cli/pull/22332)
+- feat(core): integrate SandboxManager to sandbox all process-spawning tools by
+  @galz10 in [#22231](https://github.com/google-gemini/gemini-cli/pull/22231)
+- fix(cli): support CJK input and full Unicode scalar values in terminal
+  protocols by @scidomino in
+  [#22353](https://github.com/google-gemini/gemini-cli/pull/22353)
+- Promote stable tests. by @gundermanc in
+  [#22253](https://github.com/google-gemini/gemini-cli/pull/22253)
+- feat(tracker): add tracker policy by @anj-s in
+  [#22379](https://github.com/google-gemini/gemini-cli/pull/22379)
+- feat(security): add disableAlwaysAllow setting to disable auto-approvals by
+  @galz10 in [#21941](https://github.com/google-gemini/gemini-cli/pull/21941)
+- Revert "fix(cli): validate --model argument at startup" by @sehoon38 in
+  [#22378](https://github.com/google-gemini/gemini-cli/pull/22378)
+- fix(mcp): handle equivalent root resource URLs in OAuth validation by @galz10
+  in [#20231](https://github.com/google-gemini/gemini-cli/pull/20231)
+- fix(core): use session-specific temp directory for task tracker by @anj-s in
+  [#22382](https://github.com/google-gemini/gemini-cli/pull/22382)
+- Fix issue where config was undefined. by @gundermanc in
+  [#22397](https://github.com/google-gemini/gemini-cli/pull/22397)
+- fix(core): deduplicate project memory when JIT context is enabled by
+  @SandyTao520 in
+  [#22234](https://github.com/google-gemini/gemini-cli/pull/22234)
+- feat(prompts): implement Topic-Action-Summary model for verbosity reduction by
+  @Abhijit-2592 in
+  [#21503](https://github.com/google-gemini/gemini-cli/pull/21503)
+- fix(core): fix manual deletion of subagent histories by @abhipatel12 in
+  [#22407](https://github.com/google-gemini/gemini-cli/pull/22407)
+- Add registry var by @kevinjwang1 in
+  [#22224](https://github.com/google-gemini/gemini-cli/pull/22224)
+- Add ModelDefinitions to ModelConfigService by @kevinjwang1 in
+  [#22302](https://github.com/google-gemini/gemini-cli/pull/22302)
+- fix(cli): improve command conflict handling for skills by @NTaylorMullen in
+  [#21942](https://github.com/google-gemini/gemini-cli/pull/21942)
+- fix(core): merge user settings with extension-provided MCP servers by
+  @abhipatel12 in
+  [#22484](https://github.com/google-gemini/gemini-cli/pull/22484)
+- fix(core): skip discovery for incomplete MCP configs and resolve merge race
+  condition by @abhipatel12 in
+  [#22494](https://github.com/google-gemini/gemini-cli/pull/22494)
+- fix(automation): harden stale PR closer permissions and maintainer detection
+  by @bdmorgan in
+  [#22558](https://github.com/google-gemini/gemini-cli/pull/22558)
+- fix(automation): evaluate staleness before checking protected labels by
+  @bdmorgan in [#22561](https://github.com/google-gemini/gemini-cli/pull/22561)
+- feat(agent): replace the runtime npx for browser agent chrome devtool mcp with
+  pre-built bundle by @cynthialong0-0 in
+  [#22213](https://github.com/google-gemini/gemini-cli/pull/22213)
+- perf: optimize TrackerService dependency checks by @anj-s in
+  [#22384](https://github.com/google-gemini/gemini-cli/pull/22384)
+- docs(policy): remove trailing space from commandPrefix examples by @kawasin73
+  in [#22264](https://github.com/google-gemini/gemini-cli/pull/22264)
+- fix(a2a-server): resolve unsafe assignment lint errors by @ehedlund in
+  [#22661](https://github.com/google-gemini/gemini-cli/pull/22661)
+- fix: Adjust ToolGroupMessage filtering to hide Confirming and show Canceled
+  tool calls. by @sripasg in
+  [#22230](https://github.com/google-gemini/gemini-cli/pull/22230)
+- Disallow Object.create() and reflect. by @gundermanc in
+  [#22408](https://github.com/google-gemini/gemini-cli/pull/22408)
+- Guard pro model usage by @sehoon38 in
+  [#22665](https://github.com/google-gemini/gemini-cli/pull/22665)
+- refactor(core): Creates AgentSession abstraction for consolidated agent
+  interface. by @mbleigh in
+  [#22270](https://github.com/google-gemini/gemini-cli/pull/22270)
+- docs(changelog): remove internal commands from release notes by
+  @jackwotherspoon in
+  [#22529](https://github.com/google-gemini/gemini-cli/pull/22529)
+- feat: enable subagents by @abhipatel12 in
+  [#22386](https://github.com/google-gemini/gemini-cli/pull/22386)
+- feat(extensions): implement cryptographic integrity verification for extension
+  updates by @ehedlund in
+  [#21772](https://github.com/google-gemini/gemini-cli/pull/21772)
+- feat(tracker): polish UI sorting and formatting by @anj-s in
+  [#22437](https://github.com/google-gemini/gemini-cli/pull/22437)
+- Changelog for v0.34.0-preview.2 by @gemini-cli-robot in
+  [#22220](https://github.com/google-gemini/gemini-cli/pull/22220)
+- fix(core): fix three JIT context bugs in read_file, read_many_files, and
+  memoryDiscovery by @SandyTao520 in
+  [#22679](https://github.com/google-gemini/gemini-cli/pull/22679)
+- refactor(core): introduce InjectionService with source-aware injection and
+  backend-native background completions by @adamfweidman in
+  [#22544](https://github.com/google-gemini/gemini-cli/pull/22544)
+- Linux sandbox bubblewrap by @DavidAPierce in
+  [#22680](https://github.com/google-gemini/gemini-cli/pull/22680)
+- feat(core): increase thought signature retry resilience by @bdmorgan in
+  [#22202](https://github.com/google-gemini/gemini-cli/pull/22202)
+- feat(core): implement Stage 2 security and consistency improvements for
+  web_fetch by @aishaneeshah in
+  [#22217](https://github.com/google-gemini/gemini-cli/pull/22217)
+- refactor(core): replace positional execute params with ExecuteOptions bag by
+  @adamfweidman in
+  [#22674](https://github.com/google-gemini/gemini-cli/pull/22674)
+- feat(config): enable JIT context loading by default by @SandyTao520 in
+  [#22736](https://github.com/google-gemini/gemini-cli/pull/22736)
+- fix(config): ensure discoveryMaxDirs is passed to global config during
+  initialization by @kevin-ramdass in
+  [#22744](https://github.com/google-gemini/gemini-cli/pull/22744)
+- fix(plan): allowlist get_internal_docs in Plan Mode by @Adib234 in
+  [#22668](https://github.com/google-gemini/gemini-cli/pull/22668)
+- Changelog for v0.34.0-preview.3 by @gemini-cli-robot in
+  [#22393](https://github.com/google-gemini/gemini-cli/pull/22393)
+- feat(core): add foundation for subagent tool isolation by @akh64bit in
+  [#22708](https://github.com/google-gemini/gemini-cli/pull/22708)
+- fix(core): handle surrogate pairs in truncateString by @sehoon38 in
+  [#22754](https://github.com/google-gemini/gemini-cli/pull/22754)
+- fix(cli): override j/k navigation in settings dialog to fix search input
+  conflict by @sehoon38 in
+  [#22800](https://github.com/google-gemini/gemini-cli/pull/22800)
+- feat(plan): add 'All the above' option to multi-select AskUser questions by
+  @Adib234 in [#22365](https://github.com/google-gemini/gemini-cli/pull/22365)
+- docs: distribute package-specific GEMINI.md context to each package by
+  @SandyTao520 in
+  [#22734](https://github.com/google-gemini/gemini-cli/pull/22734)
+- fix(cli): clean up stale pasted placeholder metadata after word/line deletions
+  by @Jomak-x in
+  [#20375](https://github.com/google-gemini/gemini-cli/pull/20375)
+- refactor(core): align JIT memory placement with tiered context model by
+  @SandyTao520 in
+  [#22766](https://github.com/google-gemini/gemini-cli/pull/22766)
+- Linux sandbox seccomp by @DavidAPierce in
+  [#22815](https://github.com/google-gemini/gemini-cli/pull/22815)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.36.0-preview.8...v0.37.0-preview.2
+https://github.com/google-gemini/gemini-cli/compare/v0.34.0-preview.4...v0.35.0-preview.2

docs/cli/acp-mode.md

@@ -1,126 +0,0 @@
-# ACP Mode
-
-ACP (Agent Client Protocol) mode is a special operational mode of Gemini CLI
-designed for programmatic control, primarily for IDE and other developer tool
-integrations. It uses a JSON-RPC protocol over stdio to communicate between
-Gemini CLI agent and a client.
-
-To start Gemini CLI in ACP mode, use the `--acp` flag:
-
-```bash
-gemini --acp
-```
-
-## Agent Client Protocol (ACP)
-
-ACP is an open protocol that standardizes how AI coding agents communicate with
-code editors and IDEs. It addresses the challenge of fragmented distribution,
-where agents traditionally needed custom integrations for each client. With ACP,
-developers can implement their agent once, and it becomes compatible with any
-ACP-compliant editor.
-
-For a comprehensive introduction to ACP, including its architecture and
-benefits, refer to the official
-[ACP Introduction](https://agentclientprotocol.com/get-started/introduction)
-documentation.
-
-### Existing integrations using ACP
-
-The ACP Agent Registry simplifies the distribution and management of
-ACP-compatible agents across various IDEs. Gemini CLI is an ACP-compatible agent
-and can be found in this registry.
-
-For more general information about the registry, and how to use it with specific
-IDEs like JetBrains and Zed, refer to the
-[IDE Integration](../ide-integration/index.md) documentation.
-
-You can also find more information on the official
-[ACP Agent Registry](https://agentclientprotocol.com/get-started/registry) page.
-
-## Architecture and protocol basics
-
-ACP mode establishes a client-server relationship between your tool (the client)
-and Gemini CLI (the server).
-
-- **Communication:** The entire communication happens over standard input/output
-  (stdio) using the JSON-RPC 2.0 protocol.
-- **Client's role:** The client is responsible for sending requests (e.g.,
-  prompts) and handling responses and notifications from Gemini CLI.
-- **Gemini CLI's role:** In ACP mode, Gemini CLI listens for incoming JSON-RPC
-  requests, processes them, and sends back responses.
-
-The core of the ACP implementation can be found in
-`packages/cli/src/acp/acpClient.ts`.
-
-### Extending with MCP
-
-ACP can be used with the Model Context Protocol (MCP). This lets an ACP client
-(like an IDE) expose its own functionality as "tools" that the Gemini model can
-use.
-
-1.  The client implements an **MCP server** that advertises its tools.
-2.  During the ACP `initialize` handshake, the client provides the connection
-    details for its MCP server.
-3.  Gemini CLI connects to the MCP server, discovers the available tools, and
-    makes them available to the AI model.
-4.  When the model decides to use one of these tools, Gemini CLI sends a tool
-    call request to the MCP server.
-
-This mechanism lets for a powerful, two-way integration where the agent can
-leverage the IDE's capabilities to perform tasks. The MCP client logic is in
-`packages/core/src/tools/mcp-client.ts`.
-
-## Capabilities and supported methods
-
-The ACP protocol exposes a number of methods for ACP clients (e.g. IDEs) to
-control Gemini CLI.
-
-### Core methods
-
-- `initialize`: Establishes the initial connection and lets the client to
-  register its MCP server.
-- `authenticate`: Authenticates the user.
-- `newSession`: Starts a new chat session.
-- `loadSession`: Loads a previous session.
-- `prompt`: Sends a prompt to the agent.
-- `cancel`: Cancels an ongoing prompt.
-
-### Session control
-
-- `setSessionMode`: Allows changing the approval level for tool calls (e.g., to
-  `auto-approve`).
-- `unstable_setSessionModel`: Changes the model for the current session.
-
-### File system proxy
-
-ACP includes a proxied file system service. This means that when the agent needs
-to read or write files, it does so through the ACP client. This is a security
-feature that ensures the agent only has access to the files that the client (and
-by extension, the user) has explicitly allowed.
-
-## Debugging and telemetry
-
-You can get insights into the ACP communication and the agent's behavior through
-debugging logs and telemetry.
-
-### Debugging logs
-
-To enable general debugging logs, start Gemini CLI with the `--debug` flag:
-
-```bash
-gemini --acp --debug
-```
-
-### Telemetry
-
-For more detailed telemetry, you can use the following environment variables to
-capture telemetry data to a file:
-
-- `GEMINI_TELEMETRY_ENABLED=true`
-- `GEMINI_TELEMETRY_TARGET=local`
-- `GEMINI_TELEMETRY_OUTFILE=/path/to/your/log.json`
-
-This will write a JSON log file containing detailed information about all the
-events happening within the agent, including ACP requests and responses. The
-integration test `integration-tests/acp-telemetry.test.ts` provides a working
-example of how to set this up.

docs/cli/cli-reference.md

@@ -52,7 +52,7 @@ These commands are available within the interactive REPL.
 | `--prompt-interactive`           | `-i`  | string  | -         | Execute prompt and continue in interactive mode                                                                                                                        |
 | `--worktree`                     | `-w`  | string  | -         | Start Gemini in a new git worktree. If no name is provided, one is generated automatically. Requires `experimental.worktrees: true` in settings.                       |
 | `--sandbox`                      | `-s`  | boolean | `false`   | Run in a sandboxed environment for safer execution                                                                                                                     |
-| `--approval-mode`                | -     | string  | `default` | Approval mode for tool execution. Choices: `default`, `auto_edit`, `yolo`, `plan`                                                                                      |
+| `--approval-mode`                | -     | string  | `default` | Approval mode for tool execution. Choices: `default`, `auto_edit`, `yolo`                                                                                              |
 | `--yolo`                         | `-y`  | boolean | `false`   | **Deprecated.** Auto-approve all actions. Use `--approval-mode=yolo` instead.                                                                                          |
 | `--experimental-acp`             | -     | boolean | -         | Start in ACP (Agent Code Pilot) mode. **Experimental feature.**                                                                                                        |
 | `--experimental-zed-integration` | -     | boolean | -         | Run in Zed editor integration mode. **Experimental feature.**                                                                                                          |

docs/cli/notifications.md

@@ -15,14 +15,14 @@ CLI works in the background.
 
 ## Requirements
 
+Currently, system notifications are only supported on macOS.
+
 ### Terminal support
 
 The CLI uses the OSC 9 terminal escape sequence to trigger system notifications.
-This is supported by several modern terminal emulators including iTerm2,
-WezTerm, Ghostty, and Kitty. If your terminal does not support OSC 9
-notifications, Gemini CLI falls back to a terminal bell (BEL) to get your
-attention. Most terminals respond to BEL with a taskbar flash or system alert
-sound.
+This is supported by several modern terminal emulators. If your terminal does
+not support OSC 9 notifications, Gemini CLI falls back to a system alert sound
+to get your attention.
 
 ## Enable notifications
 

docs/cli/plan-mode.md

@@ -39,9 +39,7 @@ To start Plan Mode while using Gemini CLI:
   the rotation when Gemini CLI is actively processing or showing confirmation
   dialogs.
 
-- **Command:** Type `/plan [goal]` in the input box. The `[goal]` is optional;
-  for example, `/plan implement authentication` will switch to Plan Mode and
-  immediately submit the prompt to the model.
+- **Command:** Type `/plan` in the input box.
 
 - **Natural Language:** Ask Gemini CLI to "start a plan for...". Gemini CLI
   calls the
@@ -56,21 +54,19 @@ Gemini CLI takes action.
 
 1.  **Provide a goal:** Start by describing what you want to achieve. Gemini CLI
     will then enter Plan Mode (if it's not already) to research the task.
-2.  **Discuss and agree on strategy:** As Gemini CLI analyzes your codebase, it
-    will discuss its findings and proposed strategy with you to ensure
-    alignment. It may ask you questions or present different implementation
-    options using [`ask_user`](../tools/ask-user.md). **Gemini CLI will stop and
-    wait for your confirmation** before drafting the formal plan. You should
-    reach an informal agreement on the approach before proceeding.
-3.  **Review the plan:** Once you've agreed on the strategy, Gemini CLI creates
-    a detailed implementation plan as a Markdown file in your plans directory.
+2.  **Review research and provide input:** As Gemini CLI analyzes your codebase,
+    it may ask you questions or present different implementation options using
+    [`ask_user`](../tools/ask-user.md). Provide your preferences to help guide
+    the design.
+3.  **Review the plan:** Once Gemini CLI has a proposed strategy, it creates a
+    detailed implementation plan as a Markdown file in your plans directory.
     - **View:** You can open and read this file to understand the proposed
       changes.
     - **Edit:** Press `Ctrl+X` to open the plan directly in your configured
       external editor.
 
 4.  **Approve or iterate:** Gemini CLI will present the finalized plan for your
-    formal approval.
+    approval.
     - **Approve:** If you're satisfied with the plan, approve it to start the
       implementation immediately: **Yes, automatically accept edits** or **Yes,
       manually accept edits**.
@@ -123,7 +119,6 @@ These are the only allowed tools:
   [`glob`](../tools/file-system.md#4-glob-findfiles)
 - **Search:** [`grep_search`](../tools/file-system.md#5-grep_search-searchtext),
   [`google_web_search`](../tools/web-search.md),
-  [`web_fetch`](../tools/web-fetch.md) (requires explicit confirmation),
   [`get_internal_docs`](../tools/internal-docs.md)
 - **Research Subagents:**
   [`codebase_investigator`](../core/subagents.md#codebase-investigator),
@@ -181,16 +176,9 @@ As described in the
 rule that does not explicitly specify `modes` is considered "always active" and
 will apply to Plan Mode as well.
 
-To maintain the integrity of Plan Mode as a safe research environment,
-persistent tool approvals are context-aware. Approvals granted in modes like
-Default or Auto-Edit do not apply to Plan Mode, ensuring that tools trusted for
-implementation don't automatically execute while you're researching. However,
-approvals granted while in Plan Mode are treated as intentional choices for
-global trust and apply to all modes.
-
-If you want to manually restrict a rule to other modes but _not_ to Plan Mode,
-you must explicitly specify the target modes. For example, to allow `npm test`
-in default and Auto-Edit modes but not in Plan Mode:
+If you want a rule to apply to other modes but _not_ to Plan Mode, you must
+explicitly specify the target modes. For example, to allow `npm test` in default
+and Auto-Edit modes but not in Plan Mode:
 
 ```toml
 [[rule]]
@@ -212,7 +200,6 @@ your specific environment.
 
 ```toml
 [[rule]]
-toolName = "*"
 mcpName = "*"
 toolAnnotations = { readOnlyHint = true }
 decision = "allow"

docs/cli/sandbox.md

@@ -92,7 +92,7 @@ To set up runsc:
 2.  Configure the Docker daemon to use the runsc runtime.
 3.  Verify the installation.
 
-### 5. LXC/LXD (Linux only, experimental)
+### 4. LXC/LXD (Linux only, experimental)
 
 Full-system container sandboxing using LXC/LXD. Unlike Docker/Podman, LXC
 containers run a complete Linux system with `systemd`, `snapd`, and other system
@@ -136,58 +136,6 @@ gemini -p "build the snap"
   absolute path — the path must be writable inside the container.
 - Used with tools like Snapcraft or Rockcraft that require a full system.
 
-## Tool sandboxing
-
-Tool-level sandboxing provides granular isolation for individual tool executions
-(like `shell_exec` and `write_file`) instead of sandboxing the entire Gemini CLI
-process.
-
-This approach offers better integration with your local environment for non-tool
-tasks (like UI rendering and configuration loading) while still providing
-security for tool-driven operations.
-
-### How to turn off tool sandboxing
-
-If you experience issues with tool sandboxing or prefer full-process isolation,
-you can disable it by setting `security.toolSandboxing` to `false` in your
-`settings.json` file.
-
-```json
-{
-  "security": {
-    "toolSandboxing": false
-  }
-}
-```
-
-<!-- prettier-ignore -->
-> [!NOTE]
-> Changing the `security.toolSandboxing` setting requires a restart of Gemini
-> CLI to take effect.
-
-## Sandbox expansion
-
-Sandbox expansion is a dynamic permission system that lets Gemini CLI request
-additional permissions for a command when needed.
-
-When a sandboxed command fails due to permission restrictions (like restricted
-file paths or network access), or when a command is proactively identified as
-requiring extra permissions (like `npm install`), Gemini CLI will present you
-with a "Sandbox Expansion Request."
-
-### How sandbox expansion works
-
-1.  **Detection**: Gemini CLI detects a sandbox denial or proactively identifies
-    a command that requires extra permissions.
-2.  **Request**: A modal dialog is shown, explaining which additional
-    permissions (e.g., specific directories or network access) are required.
-3.  **Approval**: If you approve the expansion, the command is executed with the
-    extended permissions for that specific run.
-
-This mechanism ensures you don't have to manually re-run commands with more
-permissive sandbox settings, while still maintaining control over what the AI
-can access.
-
 ## Quickstart
 
 ```bash

docs/cli/settings.md

@@ -29,9 +29,8 @@ they appear in the UI.
 | Vim Mode                | `general.vimMode`                  | Enable Vim keybindings                                                                                                                                                                                                                                        | `false`     |
 | Default Approval Mode   | `general.defaultApprovalMode`      | The default approval mode for tool execution. 'default' prompts for approval, 'auto_edit' auto-approves edit tools, and 'plan' is read-only mode. YOLO mode (auto-approve all actions) can only be enabled via command line (--yolo or --approval-mode=yolo). | `"default"` |
 | Enable Auto Update      | `general.enableAutoUpdate`         | Enable automatic updates.                                                                                                                                                                                                                                     | `true`      |
-| Enable Notifications    | `general.enableNotifications`      | Enable run-event notifications for action-required prompts and session completion.                                                                                                                                                                            | `false`     |
-| Enable Plan Mode        | `general.plan.enabled`             | Enable Plan Mode for read-only safety during planning.                                                                                                                                                                                                        | `true`      |
-| Plan Directory          | `general.plan.directory`           | The directory where planning artifacts are stored. If not specified, defaults to the system temporary directory. A custom directory requires a policy to allow write access in Plan Mode.                                                                     | `undefined` |
+| Enable Notifications    | `general.enableNotifications`      | Enable run-event notifications for action-required prompts and session completion. Currently macOS only.                                                                                                                                                      | `false`     |
+| Plan Directory          | `general.plan.directory`           | The directory where planning artifacts are stored. If not specified, defaults to the system temporary directory.                                                                                                                                              | `undefined` |
 | Plan Model Routing      | `general.plan.modelRouting`        | Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro for the planning phase and Flash for the implementation phase.                                                                                                          | `true`      |
 | Retry Fetch Errors      | `general.retryFetchErrors`         | Retry on "exception TypeError: fetch failed sending request" errors.                                                                                                                                                                                          | `true`      |
 | Max Chat Model Attempts | `general.maxAttempts`              | Maximum number of attempts for requests to the main chat model. Cannot exceed 10.                                                                                                                                                                             | `10`        |
@@ -47,41 +46,38 @@ they appear in the UI.
 
 ### UI
 
-| UI Label                             | Setting                                | Description                                                                                                                                                       | Default |
-| ------------------------------------ | -------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| Auto Theme Switching                 | `ui.autoThemeSwitching`                | Automatically switch between default light and dark themes based on terminal background color.                                                                    | `true`  |
-| Terminal Background Polling Interval | `ui.terminalBackgroundPollingInterval` | Interval in seconds to poll the terminal background color.                                                                                                        | `60`    |
-| Hide Window Title                    | `ui.hideWindowTitle`                   | Hide the window title bar                                                                                                                                         | `false` |
-| Inline Thinking                      | `ui.inlineThinkingMode`                | Display model thinking inline: off or full.                                                                                                                       | `"off"` |
-| Show Thoughts in Title               | `ui.showStatusInTitle`                 | Show Gemini CLI model thoughts in the terminal window title during the working phase                                                                              | `false` |
-| Dynamic Window Title                 | `ui.dynamicWindowTitle`                | Update the terminal window title with current status icons (Ready: ◇, Action Required: ✋, Working: ✦)                                                            | `true`  |
-| Show Home Directory Warning          | `ui.showHomeDirectoryWarning`          | Show a warning when running Gemini CLI in the home directory.                                                                                                     | `true`  |
-| Show Compatibility Warnings          | `ui.showCompatibilityWarnings`         | Show warnings about terminal or OS compatibility issues.                                                                                                          | `true`  |
-| Hide Tips                            | `ui.hideTips`                          | Hide helpful tips in the UI                                                                                                                                       | `false` |
-| Escape Pasted @ Symbols              | `ui.escapePastedAtSymbols`             | When enabled, @ symbols in pasted text are escaped to prevent unintended @path expansion.                                                                         | `false` |
-| Show Shortcuts Hint                  | `ui.showShortcutsHint`                 | Show the "? for shortcuts" hint above the input.                                                                                                                  | `true`  |
-| Compact Tool Output                  | `ui.compactToolOutput`                 | Display tool outputs (like directory listings and file reads) in a compact, structured format.                                                                    | `true`  |
-| Hide Banner                          | `ui.hideBanner`                        | Hide the application banner                                                                                                                                       | `false` |
-| Hide Context Summary                 | `ui.hideContextSummary`                | Hide the context summary (GEMINI.md, MCP servers) above the input.                                                                                                | `false` |
-| Hide CWD                             | `ui.footer.hideCWD`                    | Hide the current working directory in the footer.                                                                                                                 | `false` |
-| Hide Sandbox Status                  | `ui.footer.hideSandboxStatus`          | Hide the sandbox status indicator in the footer.                                                                                                                  | `false` |
-| Hide Model Info                      | `ui.footer.hideModelInfo`              | Hide the model name and context usage in the footer.                                                                                                              | `false` |
-| Hide Context Window Percentage       | `ui.footer.hideContextPercentage`      | Hides the context window usage percentage.                                                                                                                        | `true`  |
-| Hide Footer                          | `ui.hideFooter`                        | Hide the footer from the UI                                                                                                                                       | `false` |
-| Show Memory Usage                    | `ui.showMemoryUsage`                   | Display memory usage information in the UI                                                                                                                        | `false` |
-| Show Line Numbers                    | `ui.showLineNumbers`                   | Show line numbers in the chat.                                                                                                                                    | `true`  |
-| Show Citations                       | `ui.showCitations`                     | Show citations for generated text in the chat.                                                                                                                    | `false` |
-| Show Model Info In Chat              | `ui.showModelInfoInChat`               | Show the model name in the chat for each model turn.                                                                                                              | `false` |
-| Show User Identity                   | `ui.showUserIdentity`                  | Show the signed-in user's identity (e.g. email) in the UI.                                                                                                        | `true`  |
-| Use Alternate Screen Buffer          | `ui.useAlternateBuffer`                | Use an alternate screen buffer for the UI, preserving shell history.                                                                                              | `false` |
-| Render Process                       | `ui.renderProcess`                     | Enable Ink render process for the UI.                                                                                                                             | `true`  |
-| Terminal Buffer                      | `ui.terminalBuffer`                    | Use the new terminal buffer architecture for rendering.                                                                                                           | `false` |
-| Use Background Color                 | `ui.useBackgroundColor`                | Whether to use background colors in the UI.                                                                                                                       | `true`  |
-| Incremental Rendering                | `ui.incrementalRendering`              | Enable incremental rendering for the UI. This option will reduce flickering but may cause rendering artifacts. Only supported when useAlternateBuffer is enabled. | `true`  |
-| Show Spinner                         | `ui.showSpinner`                       | Show the spinner during operations.                                                                                                                               | `true`  |
-| Loading Phrases                      | `ui.loadingPhrases`                    | What to show while the model is working: tips, witty comments, all, or off.                                                                                       | `"off"` |
-| Error Verbosity                      | `ui.errorVerbosity`                    | Controls whether recoverable errors are hidden (low) or fully shown (full).                                                                                       | `"low"` |
-| Screen Reader Mode                   | `ui.accessibility.screenReader`        | Render output in plain-text to be more screen reader accessible                                                                                                   | `false` |
+| UI Label                             | Setting                                | Description                                                                                                                                                       | Default  |
+| ------------------------------------ | -------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- |
+| Auto Theme Switching                 | `ui.autoThemeSwitching`                | Automatically switch between default light and dark themes based on terminal background color.                                                                    | `true`   |
+| Terminal Background Polling Interval | `ui.terminalBackgroundPollingInterval` | Interval in seconds to poll the terminal background color.                                                                                                        | `60`     |
+| Hide Window Title                    | `ui.hideWindowTitle`                   | Hide the window title bar                                                                                                                                         | `false`  |
+| Inline Thinking                      | `ui.inlineThinkingMode`                | Display model thinking inline: off or full.                                                                                                                       | `"off"`  |
+| Show Thoughts in Title               | `ui.showStatusInTitle`                 | Show Gemini CLI model thoughts in the terminal window title during the working phase                                                                              | `false`  |
+| Dynamic Window Title                 | `ui.dynamicWindowTitle`                | Update the terminal window title with current status icons (Ready: ◇, Action Required: ✋, Working: ✦)                                                            | `true`   |
+| Show Home Directory Warning          | `ui.showHomeDirectoryWarning`          | Show a warning when running Gemini CLI in the home directory.                                                                                                     | `true`   |
+| Show Compatibility Warnings          | `ui.showCompatibilityWarnings`         | Show warnings about terminal or OS compatibility issues.                                                                                                          | `true`   |
+| Hide Tips                            | `ui.hideTips`                          | Hide helpful tips in the UI                                                                                                                                       | `false`  |
+| Escape Pasted @ Symbols              | `ui.escapePastedAtSymbols`             | When enabled, @ symbols in pasted text are escaped to prevent unintended @path expansion.                                                                         | `false`  |
+| Show Shortcuts Hint                  | `ui.showShortcutsHint`                 | Show the "? for shortcuts" hint above the input.                                                                                                                  | `true`   |
+| Hide Banner                          | `ui.hideBanner`                        | Hide the application banner                                                                                                                                       | `false`  |
+| Hide Context Summary                 | `ui.hideContextSummary`                | Hide the context summary (GEMINI.md, MCP servers) above the input.                                                                                                | `false`  |
+| Hide CWD                             | `ui.footer.hideCWD`                    | Hide the current working directory in the footer.                                                                                                                 | `false`  |
+| Hide Sandbox Status                  | `ui.footer.hideSandboxStatus`          | Hide the sandbox status indicator in the footer.                                                                                                                  | `false`  |
+| Hide Model Info                      | `ui.footer.hideModelInfo`              | Hide the model name and context usage in the footer.                                                                                                              | `false`  |
+| Hide Context Window Percentage       | `ui.footer.hideContextPercentage`      | Hides the context window usage percentage.                                                                                                                        | `true`   |
+| Hide Footer                          | `ui.hideFooter`                        | Hide the footer from the UI                                                                                                                                       | `false`  |
+| Show Memory Usage                    | `ui.showMemoryUsage`                   | Display memory usage information in the UI                                                                                                                        | `false`  |
+| Show Line Numbers                    | `ui.showLineNumbers`                   | Show line numbers in the chat.                                                                                                                                    | `true`   |
+| Show Citations                       | `ui.showCitations`                     | Show citations for generated text in the chat.                                                                                                                    | `false`  |
+| Show Model Info In Chat              | `ui.showModelInfoInChat`               | Show the model name in the chat for each model turn.                                                                                                              | `false`  |
+| Show User Identity                   | `ui.showUserIdentity`                  | Show the signed-in user's identity (e.g. email) in the UI.                                                                                                        | `true`   |
+| Use Alternate Screen Buffer          | `ui.useAlternateBuffer`                | Use an alternate screen buffer for the UI, preserving shell history.                                                                                              | `false`  |
+| Use Background Color                 | `ui.useBackgroundColor`                | Whether to use background colors in the UI.                                                                                                                       | `true`   |
+| Incremental Rendering                | `ui.incrementalRendering`              | Enable incremental rendering for the UI. This option will reduce flickering but may cause rendering artifacts. Only supported when useAlternateBuffer is enabled. | `true`   |
+| Show Spinner                         | `ui.showSpinner`                       | Show the spinner during operations.                                                                                                                               | `true`   |
+| Loading Phrases                      | `ui.loadingPhrases`                    | What to show while the model is working: tips, witty comments, both, or nothing.                                                                                  | `"tips"` |
+| Error Verbosity                      | `ui.errorVerbosity`                    | Controls whether recoverable errors are hidden (low) or fully shown (full).                                                                                       | `"low"`  |
+| Screen Reader Mode                   | `ui.accessibility.screenReader`        | Render output in plain-text to be more screen reader accessible                                                                                                   | `false`  |
 
 ### IDE
 
@@ -131,7 +127,7 @@ they appear in the UI.
 | Sandbox Allowed Paths            | `tools.sandboxAllowedPaths`          | List of additional paths that the sandbox is allowed to access.                                                                                                            | `[]`    |
 | Sandbox Network Access           | `tools.sandboxNetworkAccess`         | Whether the sandbox is allowed to access the network.                                                                                                                      | `false` |
 | Enable Interactive Shell         | `tools.shell.enableInteractiveShell` | Use node-pty for an interactive shell experience. Fallback to child_process still applies.                                                                                 | `true`  |
-| Show Color                       | `tools.shell.showColor`              | Show color in shell output.                                                                                                                                                | `true`  |
+| Show Color                       | `tools.shell.showColor`              | Show color in shell output.                                                                                                                                                | `false` |
 | Use Ripgrep                      | `tools.useRipgrep`                   | Use ripgrep for file content search instead of the fallback implementation. Provides faster search performance.                                                            | `true`  |
 | Tool Output Truncation Threshold | `tools.truncateToolOutputThreshold`  | Maximum characters to show when truncating large tool outputs. Set to 0 or negative to disable truncation.                                                                 | `40000` |
 | Disable LLM Correction           | `tools.disableLLMCorrection`         | Disable LLM-based error correction for edit tools. When enabled, tools will fail immediately if exact string matches are not found, instead of attempting to self-correct. | `true`  |
@@ -140,7 +136,7 @@ they appear in the UI.
 
 | UI Label                              | Setting                                         | Description                                                                                                                                                                                                                          | Default |
 | ------------------------------------- | ----------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------- |
-| Tool Sandboxing                       | `security.toolSandboxing`                       | Tool-level sandboxing. Isolates individual tools instead of the entire CLI process.                                                                                                                                                  | `false` |
+| Tool Sandboxing                       | `security.toolSandboxing`                       | Experimental tool-level sandboxing (implementation in progress).                                                                                                                                                                     | `false` |
 | Disable YOLO Mode                     | `security.disableYoloMode`                      | Disable YOLO mode, even if enabled by a flag.                                                                                                                                                                                        | `false` |
 | Disable Always Allow                  | `security.disableAlwaysAllow`                   | Disable "Always allow" options in tool confirmation dialogs.                                                                                                                                                                         | `false` |
 | Allow Permanent Tool Approval         | `security.enablePermanentToolApproval`          | Enable the "Allow for all future sessions" option in tool confirmation dialogs.                                                                                                                                                      | `false` |
@@ -155,21 +151,21 @@ they appear in the UI.
 
 | UI Label                          | Setting                        | Description                                   | Default |
 | --------------------------------- | ------------------------------ | --------------------------------------------- | ------- |
-| Auto Configure Max Old Space Size | `advanced.autoConfigureMemory` | Automatically configure Node.js memory limits | `true`  |
+| Auto Configure Max Old Space Size | `advanced.autoConfigureMemory` | Automatically configure Node.js memory limits | `false` |
 
 ### Experimental
 
-| UI Label                                             | Setting                             | Description                                                                                                                                               | Default |
-| ---------------------------------------------------- | ----------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| Enable Git Worktrees                                 | `experimental.worktrees`            | Enable automated Git worktree management for parallel work.                                                                                               | `false` |
-| Use OSC 52 Paste                                     | `experimental.useOSC52Paste`        | Use OSC 52 for pasting. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
-| Use OSC 52 Copy                                      | `experimental.useOSC52Copy`         | Use OSC 52 for copying. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
-| Model Steering                                       | `experimental.modelSteering`        | Enable model steering (user hints) to guide the model during tool execution.                                                                              | `false` |
-| Direct Web Fetch                                     | `experimental.directWebFetch`       | Enable web fetch behavior that bypasses LLM summarization.                                                                                                | `false` |
-| Memory Manager Agent                                 | `experimental.memoryManager`        | Replace the built-in save_memory tool with a memory manager subagent that supports adding, removing, de-duplicating, and organizing memories.             | `false` |
-| Use the generalist profile to manage agent contexts. | `experimental.generalistProfile`    | Suitable for general coding and software development tasks.                                                                                               | `false` |
-| Enable Context Management                            | `experimental.contextManagement`    | Enable logic for context management.                                                                                                                      | `false` |
-| Topic & Update Narration                             | `experimental.topicUpdateNarration` | Enable the experimental Topic & Update communication model for reduced chattiness and structured progress reporting.                                      | `false` |
+| UI Label                   | Setting                                  | Description                                                                                                                                               | Default |
+| -------------------------- | ---------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| Enable Tool Output Masking | `experimental.toolOutputMasking.enabled` | Enables tool output masking to save tokens.                                                                                                               | `true`  |
+| Enable Git Worktrees       | `experimental.worktrees`                 | Enable automated Git worktree management for parallel work.                                                                                               | `false` |
+| Use OSC 52 Paste           | `experimental.useOSC52Paste`             | Use OSC 52 for pasting. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
+| Use OSC 52 Copy            | `experimental.useOSC52Copy`              | Use OSC 52 for copying. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
+| Plan                       | `experimental.plan`                      | Enable Plan Mode.                                                                                                                                         | `true`  |
+| Model Steering             | `experimental.modelSteering`             | Enable model steering (user hints) to guide the model during tool execution.                                                                              | `false` |
+| Direct Web Fetch           | `experimental.directWebFetch`            | Enable web fetch behavior that bypasses LLM summarization.                                                                                                | `false` |
+| Memory Manager Agent       | `experimental.memoryManager`             | Replace the built-in save_memory tool with a memory manager subagent that supports adding, removing, de-duplicating, and organizing memories.             | `false` |
+| Topic & Update Narration   | `experimental.topicUpdateNarration`      | Enable the experimental Topic & Update communication model for reduced chattiness and structured progress reporting.                                      | `false` |
 
 ### Skills
 

docs/cli/themes.md

@@ -19,7 +19,6 @@ using the `/theme` command within Gemini CLI:
   - `Holiday`
   - `Shades Of Purple`
   - `Solarized Dark`
-  - `Tokyo Night`
 - **Light themes:**
   - `ANSI Light`
   - `Ayu Light`
@@ -253,10 +252,6 @@ identify their source, for example: `shades-of-green (green-extension)`.
 
 <img src="/docs/assets/theme-solarized-dark.png" alt="Solarized Dark theme" width="600">
 
-### Tokyo Night
-
-<img src="/docs/assets/theme-tokyonight-dark.png" alt="Tokyo Night theme" width="600">
-
 ## Light themes
 
 ### ANSI Light

docs/core/index.md

@@ -7,8 +7,8 @@ requests sent from `packages/cli`. For a general overview of Gemini CLI, see the
 
 ## Navigating this section
 
-- **[Sub-agents](./subagents.md):** Learn how to create and use specialized
-  sub-agents for complex tasks.
+- **[Sub-agents (experimental)](./subagents.md):** Learn how to create and use
+  specialized sub-agents for complex tasks.
 - **[Core tools reference](../reference/tools.md):** Information on how tools
   are defined, registered, and used by the core.
 - **[Memory Import Processor](../reference/memport.md):** Documentation for the

docs/core/remote-agents.md

@@ -1,4 +1,4 @@
-# Remote Subagents
+# Remote Subagents (experimental)
 
 Gemini CLI supports connecting to remote subagents using the Agent-to-Agent
 (A2A) protocol. This allows Gemini CLI to interact with other agents, expanding
@@ -10,6 +10,23 @@ agents in the following repositories:
 - [ADK Samples (Python)](https://github.com/google/adk-samples/tree/main/python)
 - [ADK Python Contributing Samples](https://github.com/google/adk-python/tree/main/contributing/samples)
 
+<!-- prettier-ignore -->
+> [!NOTE]
+> Remote subagents are currently an experimental feature.
+
+## Configuration
+
+To use remote subagents, you must explicitly enable them in your
+`settings.json`:
+
+```json
+{
+  "experimental": {
+    "enableAgents": true
+  }
+}
+```
+
 ## Proxy support
 
 Gemini CLI routes traffic to remote agents through an HTTP/HTTPS proxy if one is
@@ -34,13 +51,12 @@ You can place them in:
 
 ### Configuration schema
 
-| Field             | Type   | Required | Description                                                                                                    |
-| :---------------- | :----- | :------- | :------------------------------------------------------------------------------------------------------------- |
-| `kind`            | string | Yes      | Must be `remote`.                                                                                              |
-| `name`            | string | Yes      | A unique name for the agent. Must be a valid slug (lowercase letters, numbers, hyphens, and underscores only). |
-| `agent_card_url`  | string | Yes\*    | The URL to the agent's A2A card endpoint. Required if `agent_card_json` is not provided.                       |
-| `agent_card_json` | string | Yes\*    | The inline JSON string of the agent's A2A card. Required if `agent_card_url` is not provided.                  |
-| `auth`            | object | No       | Authentication configuration. See [Authentication](#authentication).                                           |
+| Field            | Type   | Required | Description                                                                                                    |
+| :--------------- | :----- | :------- | :------------------------------------------------------------------------------------------------------------- |
+| `kind`           | string | Yes      | Must be `remote`.                                                                                              |
+| `name`           | string | Yes      | A unique name for the agent. Must be a valid slug (lowercase letters, numbers, hyphens, and underscores only). |
+| `agent_card_url` | string | Yes      | The URL to the agent's A2A card endpoint.                                                                      |
+| `auth`           | object | No       | Authentication configuration. See [Authentication](#authentication).                                           |
 
 ### Single-subagent example
 
@@ -72,95 +88,6 @@ Markdown file.
 > [!NOTE] Mixed local and remote agents, or multiple local agents, are not
 > supported in a single file; the list format is currently remote-only.
 
-### Inline Agent Card JSON
-
-<details>
-<summary>View formatting options for JSON strings</summary>
-
-If you don't have an endpoint serving the agent card, you can provide the A2A
-card directly as a JSON string using `agent_card_json`.
-
-When providing a JSON string in YAML, you must properly format it as a string
-scalar. You can use single quotes, a block scalar, or double quotes (which
-require escaping internal double quotes).
-
-#### Using single quotes
-
-Single quotes allow you to embed unescaped double quotes inside the JSON string.
-This format is useful for shorter, single-line JSON strings.
-
-```markdown
----
-kind: remote
-name: single-quotes-agent
-agent_card_json:
-  '{ "protocolVersion": "0.3.0", "name": "Example Agent", "version": "1.0.0",
-  "url": "dummy-url" }'
----
-```
-
-#### Using a block scalar
-
-The literal block scalar (`|`) preserves line breaks and is highly recommended
-for multiline JSON strings as it avoids quote escaping entirely. The following
-is a complete, valid Agent Card configuration using dummy values.
-
-```markdown
----
-kind: remote
-name: block-scalar-agent
-agent_card_json: |
-  {
-    "protocolVersion": "0.3.0",
-    "name": "Example Agent Name",
-    "description": "An example agent description for documentation purposes.",
-    "version": "1.0.0",
-    "url": "dummy-url",
-    "preferredTransport": "HTTP+JSON",
-    "capabilities": {
-      "streaming": true,
-      "extendedAgentCard": false
-    },
-    "defaultInputModes": [
-      "text/plain"
-    ],
-    "defaultOutputModes": [
-      "application/json"
-    ],
-    "skills": [
-      {
-        "id": "ExampleSkill",
-        "name": "Example Skill Assistant",
-        "description": "A description of what this example skill does.",
-        "tags": [
-          "example-tag"
-        ],
-        "examples": [
-          "Show me an example."
-        ]
-      }
-    ]
-  }
----
-```
-
-#### Using double quotes
-
-Double quotes are also supported, but any internal double quotes in your JSON
-must be escaped with a backslash.
-
-```markdown
----
-kind: remote
-name: double-quotes-agent
-agent_card_json:
-  '{ "protocolVersion": "0.3.0", "name": "Example Agent", "version": "1.0.0",
-  "url": "dummy-url" }'
----
-```
-
-</details>
-
 ## Authentication
 
 Many remote agents require authentication. Gemini CLI supports several
@@ -177,7 +104,7 @@ Gemini CLI supports the following authentication types:
 | `apiKey`             | Send a static API key as an HTTP header.                                                       |
 | `http`               | HTTP authentication (Bearer token, Basic credentials, or any IANA-registered scheme).          |
 | `google-credentials` | Google Application Default Credentials (ADC). Automatically selects access or identity tokens. |
-| `oauth`              | OAuth 2.0 Authorization Code flow with PKCE. Opens a browser for interactive sign-in.          |
+| `oauth2`             | OAuth 2.0 Authorization Code flow with PKCE. Opens a browser for interactive sign-in.          |
 
 ### Dynamic values
 
@@ -336,7 +263,7 @@ hosts:
 
 Requests to any other host will be rejected with an error. If your agent is
 hosted on a different domain, use one of the other auth types (`apiKey`, `http`,
-or `oauth`).
+or `oauth2`).
 
 #### Examples
 
@@ -370,7 +297,7 @@ auth:
 ---
 ```
 
-### OAuth 2.0 (`oauth`)
+### OAuth 2.0 (`oauth2`)
 
 Performs an interactive OAuth 2.0 Authorization Code flow with PKCE. On first
 use, Gemini CLI opens your browser for sign-in and persists the resulting tokens
@@ -378,7 +305,7 @@ for subsequent requests.
 
 | Field               | Type     | Required | Description                                                                                                                                        |
 | :------------------ | :------- | :------- | :------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `type`              | string   | Yes      | Must be `oauth`.                                                                                                                                   |
+| `type`              | string   | Yes      | Must be `oauth2`.                                                                                                                                  |
 | `client_id`         | string   | Yes\*    | OAuth client ID. Required for interactive auth.                                                                                                    |
 | `client_secret`     | string   | No\*     | OAuth client secret. Required by most authorization servers (confidential clients). Can be omitted for public clients that don't require a secret. |
 | `scopes`            | string[] | No       | Requested scopes. Can also be discovered from the agent card.                                                                                      |
@@ -391,7 +318,7 @@ kind: remote
 name: oauth-agent
 agent_card_url: https://example.com/.well-known/agent.json
 auth:
-  type: oauth
+  type: oauth2
   client_id: my-client-id.apps.example.com
 ---
 ```
@@ -442,16 +369,3 @@ Users can manage subagents using the following commands within the Gemini CLI:
 > [!TIP]
 > You can use the `@cli_help` agent within Gemini CLI for assistance
 > with configuring subagents.
-
-## Disabling remote agents
-
-Remote subagents are enabled by default. To disable them, set `enableAgents` to
-`false` in your `settings.json`:
-
-```json
-{
-  "experimental": {
-    "enableAgents": false
-  }
-}
-```

docs/core/subagents.md

@@ -1,10 +1,23 @@
-# Subagents
+# Subagents (experimental)
 
 Subagents are specialized agents that operate within your main Gemini CLI
 session. They are designed to handle specific, complex tasks—like deep codebase
 analysis, documentation lookup, or domain-specific reasoning—without cluttering
 the main agent's context or toolset.
 
+<!-- prettier-ignore -->
+> [!NOTE]
+> Subagents are currently an experimental feature.
+> 
+To use custom subagents, you must ensure they are enabled in your
+`settings.json` (enabled by default):
+
+```json
+{
+  "experimental": { "enableAgents": true }
+}
+```
+
 ## What are subagents?
 
 Subagents are "specialists" that the main Gemini agent can hire for a specific
@@ -111,12 +124,10 @@ Gemini CLI comes with the following built-in subagents:
 
 The browser agent requires:
 
-- **Chrome** version 144 or later (any recent stable release works).
-
-The underlying
-[`chrome-devtools-mcp`](https://www.npmjs.com/package/chrome-devtools-mcp)
-server is bundled with Gemini CLI and launched automatically — no separate
-installation is needed.
+- **Chrome** version 144 or later (any recent stable release will work).
+- **Node.js** with `npx` available (used to launch the
+  [`chrome-devtools-mcp`](https://www.npmjs.com/package/chrome-devtools-mcp)
+  server).
 
 #### Enabling the browser agent
 
@@ -162,58 +173,26 @@ The available modes are:
 | `isolated`   | Launches Chrome with a temporary profile that is deleted after each session. Use this for clean-state automation.                                                                           |
 | `existing`   | Attaches to an already-running Chrome instance. You must enable remote debugging first by navigating to `chrome://inspect/#remote-debugging` in Chrome. No new browser process is launched. |
 
-#### First-run consent
-
-The first time the browser agent is invoked, Gemini CLI displays a consent
-dialog. You must accept before the browser session starts. This dialog only
-appears once.
-
 #### Configuration reference
 
 All browser-specific settings go under `agents.browser` in your `settings.json`.
-For full details, see the
-[`agents.browser` configuration reference](../reference/configuration.md#agents).
 
-| Setting                   | Type       | Default        | Description                                                                     |
-| :------------------------ | :--------- | :------------- | :------------------------------------------------------------------------------ |
-| `sessionMode`             | `string`   | `"persistent"` | How Chrome is managed: `"persistent"`, `"isolated"`, or `"existing"`.           |
-| `headless`                | `boolean`  | `false`        | Run Chrome in headless mode (no visible window).                                |
-| `profilePath`             | `string`   | —              | Custom path to a browser profile directory.                                     |
-| `visualModel`             | `string`   | —              | Model override for the visual agent.                                            |
-| `allowedDomains`          | `string[]` | —              | Restrict navigation to specific domains (for example, `["github.com"]`).        |
-| `disableUserInput`        | `boolean`  | `true`         | Disable user input on the browser window during automation (non-headless only). |
-| `maxActionsPerTask`       | `number`   | `100`          | Maximum tool calls per task. The agent is terminated when the limit is reached. |
-| `confirmSensitiveActions` | `boolean`  | `false`        | Require manual confirmation for `upload_file` and `evaluate_script`.            |
-| `blockFileUploads`        | `boolean`  | `false`        | Hard-block all file upload requests from the agent.                             |
-
-#### Automation overlay and input blocking
-
-In non-headless mode, the browser agent injects a visual overlay into the
-browser window to indicate that automation is in progress. By default, user
-input (keyboard and mouse) is also blocked to prevent accidental interference.
-You can disable this by setting `disableUserInput` to `false`.
+| Setting       | Type      | Default        | Description                                                                                     |
+| :------------ | :-------- | :------------- | :---------------------------------------------------------------------------------------------- |
+| `sessionMode` | `string`  | `"persistent"` | How Chrome is managed: `"persistent"`, `"isolated"`, or `"existing"`.                           |
+| `headless`    | `boolean` | `false`        | Run Chrome in headless mode (no visible window).                                                |
+| `profilePath` | `string`  | —              | Custom path to a browser profile directory.                                                     |
+| `visualModel` | `string`  | —              | Model override for the visual agent (for example, `"gemini-2.5-computer-use-preview-10-2025"`). |
 
 #### Security
 
-The browser agent enforces several layers of security:
+The browser agent enforces the following security restrictions:
 
-- **Domain restrictions:** When `allowedDomains` is set, the agent can only
-  navigate to the listed domains (and their subdomains when using `*.` prefix).
-  Attempting to visit a disallowed domain throws a fatal error that immediately
-  terminates the agent. The agent also attempts to detect and block the use of
-  allowed domains as proxies (e.g., via query parameters or fragments) to access
-  restricted content.
-- **Blocked URL patterns:** The underlying MCP server blocks dangerous URL
-  schemes including `file://`, `javascript:`, `data:text/html`,
-  `chrome://extensions`, and `chrome://settings/passwords`.
-- **Sensitive action confirmation:** Form filling (`fill`, `fill_form`) always
-  requires user confirmation through the policy engine, regardless of approval
-  mode. When `confirmSensitiveActions` is `true`, `upload_file` and
-  `evaluate_script` also require confirmation.
-- **File upload blocking:** Set `blockFileUploads` to `true` to hard-block all
-  file upload requests, preventing the agent from uploading any files.
-- **Action rate limiting:** The `maxActionsPerTask` setting (default: 100)
-  limits the total number of tool calls per task to prevent runaway execution.
+- **Blocked URL patterns:** `file://`, `javascript:`, `data:text/html`,
+  `chrome://extensions`, and `chrome://settings/passwords` are always blocked.
+- **Sensitive action confirmation:** Actions like form filling, file uploads,
+  and form submissions require user confirmation through the standard policy
+  engine.
 
 #### Visual agent
 
@@ -247,65 +226,19 @@ the `click_at` tool for precise, coordinate-based interactions.
 > The visual agent requires API key or Vertex AI authentication. It is
 > not available when using "Sign in with Google".
 
-#### Sandbox support
-
-The browser agent adjusts its behavior automatically when running inside a
-sandbox.
-
-##### macOS seatbelt (`sandbox-exec`)
-
-When the CLI runs under the macOS seatbelt sandbox, `persistent` and `isolated`
-session modes are forced to `isolated` with `headless` enabled. This avoids
-permission errors caused by seatbelt file-system restrictions on persistent
-browser profiles. If `sessionMode` is set to `existing`, no override is applied.
-
-##### Container sandboxes (Docker / Podman)
-
-Chrome is not available inside the container, so the browser agent is
-**disabled** unless `sessionMode` is set to `"existing"`. When enabled with
-`existing` mode, the agent automatically connects to Chrome on the host via the
-resolved IP of `host.docker.internal:9222` instead of using local pipe
-discovery. Port `9222` is currently hardcoded and cannot be customized.
-
-To use the browser agent in a Docker sandbox:
-
-1. Start Chrome on the host with remote debugging enabled:
-
-   ```bash
-   # Option A: Launch Chrome from the command line
-   google-chrome --remote-debugging-port=9222
-
-   # Option B: Enable in Chrome settings
-   # Navigate to chrome://inspect/#remote-debugging and enable
-   ```
-
-2. Configure `sessionMode` and allowed domains in your project's
-   `.gemini/settings.json`:
-
-   ```json
-   {
-     "agents": {
-       "overrides": {
-         "browser_agent": { "enabled": true }
-       },
-       "browser": {
-         "sessionMode": "existing",
-         "allowedDomains": ["example.com"]
-       }
-     }
-   }
-   ```
-
-3. Launch the CLI with port forwarding:
-
-   ```bash
-   GEMINI_SANDBOX=docker SANDBOX_PORTS=9222 gemini
-   ```
-
 ## Creating custom subagents
 
 You can create your own subagents to automate specific workflows or enforce
-specific personas.
+specific personas. To use custom subagents, you must enable them in your
+`settings.json`:
+
+```json
+{
+  "experimental": {
+    "enableAgents": true
+  }
+}
+```
 
 ### Agent definition files
 
@@ -357,7 +290,6 @@ it yourself; just report it.
 | `description`  | string | Yes      | Short description of what the agent does. This is visible to the main agent to help it decide when to call this subagent.                                                                                     |
 | `kind`         | string | No       | `local` (default) or `remote`.                                                                                                                                                                                |
 | `tools`        | array  | No       | List of tool names this agent can use. Supports wildcards: `*` (all tools), `mcp_*` (all MCP tools), `mcp_server_*` (all tools from a server). **If omitted, it inherits all tools from the parent session.** |
-| `mcpServers`   | object | No       | Configuration for inline Model Context Protocol (MCP) servers isolated to this specific agent.                                                                                                                |
 | `model`        | string | No       | Specific model to use (e.g., `gemini-3-preview`). Defaults to `inherit` (uses the main session model).                                                                                                        |
 | `temperature`  | number | No       | Model temperature (0.0 - 2.0). Defaults to `1`.                                                                                                                                                               |
 | `max_turns`    | number | No       | Maximum number of conversation turns allowed for this agent before it must return. Defaults to `30`.                                                                                                          |
@@ -385,78 +317,6 @@ Each subagent runs in its own isolated context loop. This means:
   subagents **cannot** call other subagents. If a subagent is granted the `*`
   tool wildcard, it will still be unable to see or invoke other agents.
 
-## Subagent tool isolation
-
-Subagent tool isolation moves Gemini CLI away from a single global tool
-registry. By providing isolated execution environments, you can ensure that
-subagents only interact with the parts of the system they are designed for. This
-prevents unintended side effects, improves reliability by avoiding state
-contamination, and enables fine-grained permission control.
-
-With this feature, you can:
-
-- **Specify tool access:** Define exactly which tools an agent can access using
-  a `tools` list in the agent definition.
-- **Define inline MCP servers:** Configure Model Context Protocol (MCP) servers
-  (which provide a standardized way to connect AI models to external tools and
-  data sources) directly in the subagent's markdown frontmatter, isolating them
-  to that specific agent.
-- **Maintain state isolation:** Ensure that subagents only interact with their
-  own set of tools and servers, preventing side effects and state contamination.
-- **Apply subagent-specific policies:** Enforce granular rules in your
-  [Policy Engine](../reference/policy-engine.md) TOML configuration based on the
-  executing subagent's name.
-
-### Configuring isolated tools and servers
-
-You can configure tool isolation for a subagent by updating its markdown
-frontmatter. This allows you to explicitly state which tools the subagent can
-use, rather than relying on the global registry.
-
-Add an `mcpServers` object to define inline MCP servers that are unique to the
-agent.
-
-**Example:**
-
-```yaml
----
-name: my-isolated-agent
-tools:
-  - grep_search
-  - read_file
-mcpServers:
-  my-custom-server:
-    command: 'node'
-    args: ['path/to/server.js']
----
-```
-
-### Subagent-specific policies
-
-You can enforce fine-grained control over subagents using the
-[Policy Engine's](../reference/policy-engine.md) TOML configuration. This allows
-you to grant or restrict permissions specifically for an agent, without
-affecting the rest of your CLI session.
-
-To restrict a policy rule to a specific subagent, add the `subagent` property to
-the `[[rules]]` block in your `policy.toml` file.
-
-**Example:**
-
-```toml
-[[rules]]
-name = "Allow pr-creator to push code"
-subagent = "pr-creator"
-description = "Permit pr-creator to push branches automatically."
-action = "allow"
-toolName = "run_shell_command"
-commandPrefix = "git push"
-```
-
-In this configuration, the policy rule only triggers if the executing subagent's
-name matches `pr-creator`. Rules without the `subagent` property apply
-universally to all agents.
-
 ## Managing subagents
 
 You can manage subagents interactively using the `/agents` command or
@@ -546,11 +406,15 @@ If you need to further tune your subagent, you can do so by selecting the model
 to optimize for with `/model` and then asking the model why it does not think
 that your subagent was called with a specific prompt and the given description.
 
-## Remote subagents (Agent2Agent)
+## Remote subagents (Agent2Agent) (experimental)
 
 Gemini CLI can also delegate tasks to remote subagents using the Agent-to-Agent
 (A2A) protocol.
 
+<!-- prettier-ignore -->
+> [!NOTE]
+> Remote subagents are currently an experimental feature.
+
 See the [Remote Subagents documentation](remote-agents) for detailed
 configuration, authentication, and usage instructions.
 
@@ -559,14 +423,3 @@ configuration, authentication, and usage instructions.
 Extensions can bundle and distribute subagents. See the
 [Extensions documentation](../extensions/index.md#subagents) for details on how
 to package agents within an extension.
-
-## Disabling subagents
-
-Subagents are enabled by default. To disable them, set `enableAgents` to `false`
-in your `settings.json`:
-
-```json
-{
-  "experimental": { "enableAgents": false }
-}
-```

docs/get-started/authentication.md

@@ -398,8 +398,8 @@ on this page.
 
 ## Running in headless mode <a id="headless"></a>
 
-[Headless mode](../cli/headless.md) will use your existing authentication
-method, if an existing authentication credential is cached.
+[Headless mode](../cli/headless) will use your existing authentication method,
+if an existing authentication credential is cached.
 
 If you have not already signed in with an authentication credential, you must
 configure authentication using environment variables:

docs/get-started/examples.md

@@ -0,0 +1,141 @@
+# Gemini CLI examples
+
+Gemini CLI helps you automate common engineering tasks by combining AI reasoning
+with local system tools. This document provides examples of how to use the CLI
+for file management, code analysis, and data transformation.
+
+<!-- prettier-ignore -->
+> [!NOTE]
+> These examples demonstrate potential capabilities. Your actual
+> results can vary based on the model used and your project environment.
+
+## Rename your photographs based on content
+
+You can use Gemini CLI to automate file management tasks that require visual
+analysis. In this example, Gemini CLI renames images based on their actual
+subject matter.
+
+Scenario: You have a folder containing the following files:
+
+```bash
+photos/photo1.png
+photos/photo2.png
+photos/photo3.png
+```
+
+Give Gemini the following prompt:
+
+```cli
+Rename the photos in my "photos" directory based on their contents.
+```
+
+Result: Gemini asks for permission to rename your files.
+
+Select **Allow once** and your files are renamed:
+
+```bash
+photos/yellow_flowers.png
+photos/antique_dresser.png
+photos/green_android_robot.png
+```
+
+## Explain a repository by reading its code
+
+Gemini CLI is effective for rapid codebase exploration. The following example
+shows how to ask Gemini CLI to fetch, analyze, and summarize a remote project.
+
+Scenario: You want to understand how a popular open-source utility works by
+inspecting its code, not just its README.
+
+Give Gemini CLI the following prompt:
+
+```cli
+Clone the 'chalk' repository from https://github.com/chalk/chalk, read its key source files, and explain how it works.
+```
+
+Result: Gemini performs a sequence of actions to answer your request.
+
+1.  First, it asks for permission to run `git clone` to download the repository.
+2.  Next, it finds the important source files and asks for permission to read
+    them.
+3.  Finally, after analyzing the code, it provides a summary.
+
+Gemini CLI returns an explanation based on the actual source code:
+
+```markdown
+The `chalk` library is a popular npm package for styling terminal output with
+colors. After analyzing the source code, here's how it works:
+
+- **Core functionality:** The main file sets up a chainable API. Each color or
+  modifier (like `bold` or `italic`) is a getter that appends the corresponding
+  ANSI escape code to an internal stack.
+
+- **Chainable API:** When you call `chalk.red.bold('Hello')`, you are accessing
+  getters. The `red` getter adds the red color code, and the `bold` getter adds
+  the bold code.
+
+- **Output generation:** When the chain is treated as a string (e.g., in
+  `console.log`), a final `toString()` method is called. This method joins all
+  the stored ANSI codes, wraps them around the input string ('Hello'), and adds
+  a reset code at the end. This produces the final, styled string that the
+  terminal can render.
+```
+
+## Combine two spreadsheets into one spreadsheet
+
+Gemini CLI can process and transform data across multiple files. Use this
+capability to merge reports or reformat data sets without manual copying.
+
+Scenario: You have two .csv files: `Revenue - 2023.csv` and
+`Revenue - 2024.csv`. Each file contains monthly revenue figures.
+
+Give Gemini CLI the following prompt:
+
+```cli
+Combine the two .csv files into a single .csv file, with each year a different column.
+```
+
+Result: Gemini CLI reads each file and then asks for permission to write a new
+file. Provide your permission and Gemini CLI provides the combined data:
+
+```csv
+Month,2023,2024
+January,0,1000
+February,0,1200
+March,0,2400
+April,900,500
+May,1000,800
+June,1000,900
+July,1200,1000
+August,1800,400
+September,2000,2000
+October,2400,3400
+November,3400,1800
+December,2100,9000
+```
+
+## Run unit tests
+
+Gemini CLI can generate boilerplate code and tests based on your existing
+implementation. This example demonstrates how to request code coverage for a
+JavaScript component.
+
+Scenario: You've written a simple login page. You wish to write unit tests to
+ensure that your login page has code coverage.
+
+Give Gemini CLI the following prompt:
+
+```cli
+Write unit tests for Login.js.
+```
+
+Result: Gemini CLI asks for permission to write a new file and creates a test
+for your login page.
+
+## Next steps
+
+- Follow the [File management](../cli/tutorials/file-management.md) guide to
+  start working with your codebase.
+- Follow the [Quickstart](./index.md) to start your first session.
+- See the [Cheatsheet](../cli/cli-reference.md) for a quick reference of
+  available commands.

docs/get-started/gemini-3.md

@@ -1,6 +1,6 @@
 # Gemini 3 Pro and Gemini 3 Flash on Gemini CLI
 
-Learn about how you can use Gemini 3 Pro and Gemini 3 Flash on Gemini CLI.
+Gemini 3 Pro and Gemini 3 Flash are available on Gemini CLI for all users!
 
 <!-- prettier-ignore -->
 > [!NOTE]

docs/get-started/index.md

@@ -62,133 +62,7 @@ Once installed and authenticated, you can start using Gemini CLI by issuing
 commands and prompts in your terminal. Ask it to generate code, explain files,
 and more.
 
-<!-- prettier-ignore -->
-> [!NOTE]
-> These examples demonstrate potential capabilities. Your actual
-> results can vary based on the model used and your project environment.
-
-### Rename your photographs based on content
-
-You can use Gemini CLI to automate file management tasks that require visual
-analysis. In this example, Gemini CLI renames images based on their actual
-subject matter.
-
-Scenario: You have a folder containing the following files:
-
-```bash
-photos/photo1.png
-photos/photo2.png
-photos/photo3.png
-```
-
-Give Gemini the following prompt:
-
-```cli
-Rename the photos in my "photos" directory based on their contents.
-```
-
-Result: Gemini asks for permission to rename your files.
-
-Select **Allow once** and your files are renamed:
-
-```bash
-photos/yellow_flowers.png
-photos/antique_dresser.png
-photos/green_android_robot.png
-```
-
-### Explain a repository by reading its code
-
-Gemini CLI is effective for rapid codebase exploration. The following example
-shows how to ask Gemini CLI to fetch, analyze, and summarize a remote project.
-
-Scenario: You want to understand how a popular open-source utility works by
-inspecting its code, not just its README.
-
-Give Gemini CLI the following prompt:
-
-```cli
-Clone the 'chalk' repository from https://github.com/chalk/chalk, read its key source files, and explain how it works.
-```
-
-Result: Gemini performs a sequence of actions to answer your request.
-
-1.  First, it asks for permission to run `git clone` to download the repository.
-2.  Next, it finds the important source files and asks for permission to read
-    them.
-3.  Finally, after analyzing the code, it provides a summary.
-
-Gemini CLI returns an explanation based on the actual source code:
-
-```markdown
-The `chalk` library is a popular npm package for styling terminal output with
-colors. After analyzing the source code, here's how it works:
-
-- **Core functionality:** The main file sets up a chainable API. Each color or
-  modifier (like `bold` or `italic`) is a getter that appends the corresponding
-  ANSI escape code to an internal stack.
-
-- **Chainable API:** When you call `chalk.red.bold('Hello')`, you are accessing
-  getters. The `red` getter adds the red color code, and the `bold` getter adds
-  the bold code.
-
-- **Output generation:** When the chain is treated as a string (e.g., in
-  `console.log`), a final `toString()` method is called. This method joins all
-  the stored ANSI codes, wraps them around the input string ('Hello'), and adds
-  a reset code at the end. This produces the final, styled string that the
-  terminal can render.
-```
-
-### Combine two spreadsheets into one spreadsheet
-
-Gemini CLI can process and transform data across multiple files. Use this
-capability to merge reports or reformat data sets without manual copying.
-
-Scenario: You have two .csv files: `Revenue - 2023.csv` and
-`Revenue - 2024.csv`. Each file contains monthly revenue figures.
-
-Give Gemini CLI the following prompt:
-
-```cli
-Combine the two .csv files into a single .csv file, with each year a different column.
-```
-
-Result: Gemini CLI reads each file and then asks for permission to write a new
-file. Provide your permission and Gemini CLI provides the combined data:
-
-```csv
-Month,2023,2024
-January,0,1000
-February,0,1200
-March,0,2400
-April,900,500
-May,1000,800
-June,1000,900
-July,1200,1000
-August,1800,400
-September,2000,2000
-October,2400,3400
-November,3400,1800
-December,2100,9000
-```
-
-### Run unit tests
-
-Gemini CLI can generate boilerplate code and tests based on your existing
-implementation. This example demonstrates how to request code coverage for a
-JavaScript component.
-
-Scenario: You've written a simple login page. You wish to write unit tests to
-ensure that your login page has code coverage.
-
-Give Gemini CLI the following prompt:
-
-```cli
-Write unit tests for Login.js.
-```
-
-Result: Gemini CLI asks for permission to write a new file and creates a test
-for your login page.
+To explore the power of Gemini CLI, see [Gemini CLI examples](./examples.md).
 
 ## Check usage and quota
 

docs/get-started/installation.md

@@ -122,13 +122,6 @@ code.
   # From the root of the repository
   npm run start
   ```
-- **Production mode (React optimizations):** This method runs the CLI with React
-  production mode enabled, which is useful for testing performance without
-  development overhead.
-  ```bash
-  # From the root of the repository
-  npm run start:prod
-  ```
 - **Production-like mode (linked package):** This method simulates a global
   installation by linking your local package. It's useful for testing a local
   build in a production workflow.

docs/hooks/index.md

@@ -22,11 +22,11 @@ With hooks, you can:
 
 ### Getting started
 
-- **[Writing hooks guide](../hooks/writing-hooks.md)**: A tutorial on creating
-  your first hook with comprehensive examples.
-- **[Best practices](../hooks/best-practices.md)**: Guidelines on security,
+- **[Writing hooks guide](../hooks/writing-hooks)**: A tutorial on creating your
+  first hook with comprehensive examples.
+- **[Best practices](../hooks/best-practices)**: Guidelines on security,
   performance, and debugging.
-- **[Hooks reference](../hooks/reference.md)**: The definitive technical
+- **[Hooks reference](../hooks/reference)**: The definitive technical
   specification of I/O schemas and exit codes.
 
 ## Core concepts
@@ -154,8 +154,8 @@ Gemini CLI **fingerprints** project hooks. If a hook's name or command changes
 (e.g., via `git pull`), it is treated as a **new, untrusted hook** and you will
 be warned before it executes.
 
-See [Security Considerations](../hooks/best-practices.md#using-hooks-securely)
-for a detailed threat model.
+See [Security Considerations](../hooks/best-practices#using-hooks-securely) for
+a detailed threat model.
 
 ## Managing hooks
 

docs/ide-integration/index.md

@@ -1,29 +1,15 @@
-# IDE Integration
+# 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.
 
-There are two primary ways to integrate Gemini CLI with an IDE:
+Currently, the supported IDEs are [Antigravity](https://antigravity.google),
+[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).
 
-1.  **VS Code companion extension**: Install the "Gemini CLI Companion"
-    extension on [Antigravity](https://antigravity.google),
-    [Visual Studio Code](https://code.visualstudio.com/), or other VS Code
-    compatible editors.
-2.  **Agent Client Protocol (ACP)**: An open protocol for interoperability
-    between AI coding agents and IDEs. This method is used for integrations with
-    tools like JetBrains and Zed, which leverage the ACP Agent Registry for easy
-    discovery and installation of compatible agents like Gemini CLI.
-
-## VS Code companion extension
-
-The **Gemini CLI Companion extension** grants Gemini CLI direct access to your
-VS Code compatible IDEs and improves your experience by providing real-time
-context such as open files, cursor positions, and text selection. The extension
-also enables a native diffing interface so you can seamlessly review and apply
-AI-generated code changes directly within your editor.
-
-### Features
+## Features
 
 - **Workspace context:** The CLI automatically gains awareness of your workspace
   to provide more relevant and accurate responses. This context includes:
@@ -33,8 +19,8 @@ AI-generated code changes directly within your editor.
     truncated).
 
 - **Native diffing:** When Gemini suggests code modifications, you can view the
-  changes directly within your IDE's native diff viewer. This lets you review,
-  edit, and accept or reject the suggested changes seamlessly.
+  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`):
@@ -46,18 +32,18 @@ AI-generated code changes directly within your editor.
   - `Gemini CLI: View Third-Party Notices`: Displays the third-party notices for
     the extension.
 
-### Installation and setup
+## Installation and setup
 
 There are three ways to set up the IDE integration:
 
-#### 1. Automatic nudge (recommended)
+### 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
+### 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:
@@ -68,7 +54,7 @@ manually, you can run the following command inside Gemini CLI:
 
 This will find the correct extension for your IDE and install it.
 
-#### 3. Manual installation from a marketplace
+### 3. Manual installation from a marketplace
 
 You can also install the extension directly from a marketplace.
 
@@ -89,9 +75,9 @@ You can also install the extension directly from a marketplace.
 > After manually installing the extension, you must run `/ide enable` in the CLI
 > to activate the integration.
 
-### Usage
+## Usage
 
-#### Enabling and disabling
+### Enabling and disabling
 
 You can control the IDE integration from within the CLI:
 
@@ -107,7 +93,7 @@ You can control the IDE integration from within the CLI:
 When enabled, Gemini CLI will automatically attempt to connect to the IDE
 companion extension.
 
-#### Checking the status
+### Checking the status
 
 To check the connection status and see the context the CLI has received from the
 IDE, run:
@@ -122,9 +108,9 @@ recently opened files it is aware of.
 <!-- prettier-ignore -->
 > [!NOTE]
 > The file list is limited to 10 recently accessed files within your
-> workspace and only includes local files on disk.
+> workspace and only includes local files on disk.)
 
-#### Working with diffs
+### Working with diffs
 
 When you ask Gemini to modify a file, it can open a diff view directly in your
 editor.
@@ -149,63 +135,6 @@ accepting them.
 If you select ‘Allow for this session’ in the CLI, changes will no longer show
 up in the IDE as they will be auto-accepted.
 
-## Agent Client Protocol (ACP)
-
-ACP is an open protocol that standardizes how AI coding agents communicate with
-code editors and IDEs. It addresses the challenge of fragmented distribution,
-where agents traditionally needed custom integrations for each client. With ACP,
-developers can implement their agent once, and it becomes compatible with any
-ACP-compliant editor.
-
-For a comprehensive introduction to ACP, including its architecture and
-benefits, refer to the official
-[ACP Introduction](https://agentclientprotocol.com/get-started/introduction)
-documentation.
-
-### The ACP Agent Registry
-
-Gemini CLI is officially available in the **ACP Agent Registry**. This allows
-you to install and update Gemini CLI directly within supporting IDEs and
-eliminates the need for manual downloads or IDE-specific extensions.
-
-Using the registry ensures:
-
-- **Ease of use**: Discover and install agents directly within your IDE
-  settings.
-- **Latest versions**: Ensures users always have access to the most up-to-date
-  agent implementations.
-
-For more details on how the registry works, visit the official
-[ACP Agent Registry](https://agentclientprotocol.com/get-started/registry) page.
-You can learn about how specific IDEs leverage this integration in the following
-section.
-
-### IDE-specific integration
-
-Gemini CLI is an ACP-compatible agent available in the ACP Agent Registry.
-Here’s how different IDEs leverage the ACP and the registry:
-
-#### JetBrains IDEs
-
-JetBrains IDEs (like IntelliJ IDEA, PyCharm, or GoLand) offer built-in registry
-support, allowing users to find and install ACP-compatible agents directly.
-
-For more details, refer to the official
-[JetBrains AI Blog announcement](https://blog.jetbrains.com/ai/2026/01/acp-agent-registry/).
-
-#### Zed
-
-Zed, a modern code editor, also integrates with the ACP Agent Registry. This
-allows Zed users to easily browse, install, and manage ACP agents.
-
-Learn more about Zed's integration with the ACP Registry in their
-[blog post](https://zed.dev/blog/acp-registry).
-
-#### Other ACP-compatible IDEs
-
-Any other IDE that supports the ACP Agent Registry can install Gemini CLI
-directly through their in-built registry features.
-
 ## Using with sandboxing
 
 If you are using Gemini CLI within a sandbox, please be aware of the following:
@@ -222,9 +151,10 @@ If you are using Gemini CLI within a sandbox, please be aware of the following:
 
 ## Troubleshooting
 
-### VS Code companion extension errors
+If you encounter issues with IDE integration, here are some common error
+messages and how to resolve them.
 
-#### Connection errors
+### 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.`
@@ -244,7 +174,7 @@ If you are using Gemini CLI within a sandbox, please be aware of the following:
   - **Solution:** Run `/ide enable` to try and reconnect. If the issue
     continues, open a new terminal window or restart your IDE.
 
-#### Manual PID override
+### Manual PID override
 
 If automatic IDE detection fails, or if you are running Gemini CLI in a
 standalone terminal and want to manually associate it with a specific IDE
@@ -266,7 +196,7 @@ $env:GEMINI_CLI_IDE_PID=12345
 When this variable is set, Gemini CLI will skip automatic detection and attempt
 to connect using the provided PID.
 
-#### Configuration errors
+### 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]`
@@ -280,7 +210,7 @@ to connect using the provided PID.
   - **Cause:** You have no workspace open in your IDE.
   - **Solution:** Open a workspace in your IDE and restart the CLI.
 
-#### General errors
+### 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]`
@@ -290,14 +220,9 @@ to connect using the provided PID.
     IDE, like Antigravity or VS Code.
 
 - **Message:**
-  `No installer is available for IDE. Please install Gemini CLI Companion extension manually from the marketplace.`
+  `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).
-
-### ACP integration errors
-
-For issues related to ACP integration, please refer to the debugging and
-telemetry section in the [ACP Mode](../cli/acp-mode.md) documentation.

docs/index.md

@@ -19,6 +19,8 @@ Jump in to Gemini CLI.
   on your system.
 - **[Authentication](./get-started/authentication.md):** Setup instructions for
   personal and enterprise accounts.
+- **[Examples](./get-started/examples.md):** Practical examples of Gemini CLI in
+  action.
 - **[CLI cheatsheet](./cli/cli-reference.md):** A quick reference for common
   commands and options.
 - **[Gemini 3 on Gemini CLI](./get-started/gemini-3.md):** Learn about Gemini 3

docs/integration-tests.md

@@ -117,46 +117,6 @@ npm run test:integration:sandbox:docker
 npm run test:integration:sandbox:podman
 ```
 
-## Memory regression tests
-
-Memory regression tests are designed to detect heap growth and leaks across key
-CLI scenarios. They are located in the `memory-tests` directory.
-
-These tests are distinct from standard integration tests because they measure
-memory usage and compare it against committed baselines.
-
-### Running memory tests
-
-Memory tests are not run as part of the default `npm run test` or
-`npm run test:e2e` commands. They are run nightly in CI but can be run manually:
-
-```bash
-npm run test:memory
-```
-
-### Updating baselines
-
-If you intentionally change behavior that affects memory usage, you may need to
-update the baselines. Set the `UPDATE_MEMORY_BASELINES` environment variable to
-`true`:
-
-```bash
-UPDATE_MEMORY_BASELINES=true npm run test:memory
-```
-
-This will run the tests, take median snapshots, and overwrite
-`memory-tests/baselines.json`. You should review the changes and commit the
-updated baseline file.
-
-### How it works
-
-The harness (`MemoryTestHarness` in `packages/test-utils`):
-
-- Forces garbage collection multiple times to reduce noise.
-- Takes median snapshots to filter spikes.
-- Compares against baselines with a 10% tolerance.
-- Can analyze sustained leaks across 3 snapshots using `analyzeSnapshots()`.
-
 ## Diagnostics
 
 The integration test runner provides several options for diagnostics to help

docs/redirects.json

@@ -13,7 +13,6 @@
   "/docs/faq": "/docs/resources/faq",
   "/docs/get-started/configuration": "/docs/reference/configuration",
   "/docs/get-started/configuration-v1": "/docs/reference/configuration",
-  "/docs/get-started/examples": "/docs/get-started/index",
   "/docs/index": "/docs",
   "/docs/quota-and-pricing": "/docs/resources/quota-and-pricing",
   "/docs/tos-privacy": "/docs/resources/tos-privacy",

docs/reference/commands.md

@@ -17,6 +17,8 @@ Slash commands provide meta-level control over the CLI itself.
 ### `/agents`
 
 - **Description:** Manage local and remote subagents.
+- **Note:** This command is experimental and requires
+  `experimental.enableAgents: true` in your `settings.json`.
 - **Sub-commands:**
   - **`list`**:
     - **Description:** Lists all discovered agents, including built-in, local,
@@ -248,8 +250,8 @@ Slash commands provide meta-level control over the CLI itself.
   - **`list`** or **`ls`**:
     - **Description:** List configured MCP servers and tools. This is the
       default action if no subcommand is specified.
-  - **`reload`**:
-    - **Description:** Reloads all MCP servers and re-discovers their available
+  - **`refresh`**:
+    - **Description:** Restarts all MCP servers and re-discovers their available
       tools.
   - **`schema`**:
     - **Description:** List configured MCP servers and tools with descriptions
@@ -303,7 +305,7 @@ Slash commands provide meta-level control over the CLI itself.
 - **Description:** Switch to Plan Mode (read-only) and view the current plan if
   one has been generated.
   - **Note:** This feature is enabled by default. It can be disabled via the
-    `general.plan.enabled` setting in your configuration.
+    `experimental.plan` setting in your configuration.
 - **Sub-commands:**
   - **`copy`**:
     - **Description:** Copy the currently approved plan to your clipboard.

docs/reference/configuration.md

@@ -62,13 +62,11 @@ locations for these files:
 
 **Note on environment variables in settings:** String values within your
 `settings.json` and `gemini-extension.json` files can reference environment
-variables using `$VAR_NAME`, `${VAR_NAME}`, or `${VAR_NAME:-DEFAULT_VALUE}`
-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"`. If you
-want to provide a fallback value, use `${MY_API_TOKEN:-default-token}`.
-Additionally, each extension can have its own `.env` file in its directory,
-which will be loaded automatically.
+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"`. Additionally, each extension can have its own
+`.env` file in its directory, which will be loaded automatically.
 
 **Note for Enterprise Users:** For guidance on deploying and managing Gemini CLI
 in a corporate environment, please see the
@@ -135,7 +133,7 @@ their corresponding top-level category object in your `settings.json` file.
 
 - **`general.enableNotifications`** (boolean):
   - **Description:** Enable run-event notifications for action-required prompts
-    and session completion.
+    and session completion. Currently macOS only.
   - **Default:** `false`
 
 - **`general.checkpointing.enabled`** (boolean):
@@ -143,15 +141,9 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `false`
   - **Requires restart:** Yes
 
-- **`general.plan.enabled`** (boolean):
-  - **Description:** Enable Plan Mode for read-only safety during planning.
-  - **Default:** `true`
-  - **Requires restart:** Yes
-
 - **`general.plan.directory`** (string):
   - **Description:** The directory where planning artifacts are stored. If not
-    specified, defaults to the system temporary directory. A custom directory
-    requires a policy to allow write access in Plan Mode.
+    specified, defaults to the system temporary directory.
   - **Default:** `undefined`
   - **Requires restart:** Yes
 
@@ -264,11 +256,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Description:** Show the "? for shortcuts" hint above the input.
   - **Default:** `true`
 
-- **`ui.compactToolOutput`** (boolean):
-  - **Description:** Display tool outputs (like directory listings and file
-    reads) in a compact, structured format.
-  - **Default:** `true`
-
 - **`ui.hideBanner`** (boolean):
   - **Description:** Hide the application banner
   - **Default:** `false`
@@ -308,11 +295,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Description:** Hide the footer from the UI
   - **Default:** `false`
 
-- **`ui.collapseDrawerDuringApproval`** (boolean):
-  - **Description:** Whether to collapse the UI drawer when a tool is awaiting
-    confirmation.
-  - **Default:** `true`
-
 - **`ui.showMemoryUsage`** (boolean):
   - **Description:** Display memory usage information in the UI
   - **Default:** `false`
@@ -339,16 +321,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `false`
   - **Requires restart:** Yes
 
-- **`ui.renderProcess`** (boolean):
-  - **Description:** Enable Ink render process for the UI.
-  - **Default:** `true`
-  - **Requires restart:** Yes
-
-- **`ui.terminalBuffer`** (boolean):
-  - **Description:** Use the new terminal buffer architecture for rendering.
-  - **Default:** `false`
-  - **Requires restart:** Yes
-
 - **`ui.useBackgroundColor`** (boolean):
   - **Description:** Whether to use background colors in the UI.
   - **Default:** `true`
@@ -366,8 +338,8 @@ their corresponding top-level category object in your `settings.json` file.
 
 - **`ui.loadingPhrases`** (enum):
   - **Description:** What to show while the model is working: tips, witty
-    comments, all, or off.
-  - **Default:** `"off"`
+    comments, both, or nothing.
+  - **Default:** `"tips"`
   - **Values:** `"tips"`, `"witty"`, `"all"`, `"off"`
 
 - **`ui.errorVerbosity`** (enum):
@@ -668,11 +640,6 @@ their corresponding top-level category object in your `settings.json` file.
           "model": "gemini-3-flash-preview"
         }
       },
-      "chat-compression-3.1-flash-lite": {
-        "modelConfig": {
-          "model": "gemini-3.1-flash-lite-preview"
-        }
-      },
       "chat-compression-2.5-pro": {
         "modelConfig": {
           "model": "gemini-2.5-pro"
@@ -692,11 +659,6 @@ their corresponding top-level category object in your `settings.json` file.
         "modelConfig": {
           "model": "gemini-3-pro-preview"
         }
-      },
-      "agent-history-provider-summarizer": {
-        "modelConfig": {
-          "model": "gemini-3-flash-preview"
-        }
       }
     }
     ```
@@ -882,12 +844,6 @@ their corresponding top-level category object in your `settings.json` file.
               "hasAccessToPreview": false
             },
             "target": "gemini-2.5-pro"
-          },
-          {
-            "condition": {
-              "useCustomTools": true
-            },
-            "target": "gemini-3.1-pro-preview-customtools"
           }
         ]
       },
@@ -1012,17 +968,6 @@ their corresponding top-level category object in your `settings.json` file.
       "auto-gemini-2.5": {
         "default": "gemini-2.5-pro"
       },
-      "gemini-3.1-flash-lite-preview": {
-        "default": "gemini-3.1-flash-lite-preview",
-        "contexts": [
-          {
-            "condition": {
-              "useGemini3_1FlashLite": false
-            },
-            "target": "gemini-2.5-flash-lite"
-          }
-        ]
-      },
       "flash": {
         "default": "gemini-3-flash-preview",
         "contexts": [
@@ -1035,15 +980,7 @@ their corresponding top-level category object in your `settings.json` file.
         ]
       },
       "flash-lite": {
-        "default": "gemini-2.5-flash-lite",
-        "contexts": [
-          {
-            "condition": {
-              "useGemini3_1FlashLite": true
-            },
-            "target": "gemini-3.1-flash-lite-preview"
-          }
-        ]
+        "default": "gemini-2.5-flash-lite"
       }
     }
     ```
@@ -1254,8 +1191,7 @@ their corresponding top-level category object in your `settings.json` file.
   - **Requires restart:** Yes
 
 - **`agents.browser.visualModel`** (string):
-  - **Description:** Model for the visual agent's analyze_screenshot tool. When
-    set, enables the tool.
+  - **Description:** Model override for the visual agent.
   - **Default:** `undefined`
   - **Requires restart:** Yes
 
@@ -1274,11 +1210,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Description:** Disable user input on browser window during automation.
   - **Default:** `true`
 
-- **`agents.browser.maxActionsPerTask`** (number):
-  - **Description:** The maximum number of tool calls allowed per browser task.
-    Enforcement is hard: the agent will be terminated when the limit is reached.
-  - **Default:** `100`
-
 - **`agents.browser.confirmSensitiveActions`** (boolean):
   - **Description:** Require manual confirmation for sensitive browser actions
     (e.g., fill_form, evaluate_script).
@@ -1310,18 +1241,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Description:** Maximum number of directories to search for memory.
   - **Default:** `200`
 
-- **`context.memoryBoundaryMarkers`** (array):
-  - **Description:** File or directory names that mark the boundary for
-    GEMINI.md discovery. The upward traversal stops at the first directory
-    containing any of these markers. An empty array disables parent traversal.
-  - **Default:**
-
-    ```json
-    [".git"]
-    ```
-
-  - **Requires restart:** Yes
-
 - **`context.includeDirectories`** (array):
   - **Description:** Additional directories to include in the workspace context.
     Missing directories will be skipped with a warning.
@@ -1389,14 +1308,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `true`
   - **Requires restart:** Yes
 
-- **`tools.shell.backgroundCompletionBehavior`** (enum):
-  - **Description:** Controls what happens when a background shell command
-    finishes. 'silent' (default): quietly exits in background. 'inject':
-    automatically returns output to agent. 'notify': shows brief message in
-    chat.
-  - **Default:** `"silent"`
-  - **Values:** `"silent"`, `"inject"`, `"notify"`
-
 - **`tools.shell.pager`** (string):
   - **Description:** The pager command to use for shell output. Defaults to
     `cat`.
@@ -1404,7 +1315,7 @@ their corresponding top-level category object in your `settings.json` file.
 
 - **`tools.shell.showColor`** (boolean):
   - **Description:** Show color in shell output.
-  - **Default:** `true`
+  - **Default:** `false`
 
 - **`tools.shell.inactivityTimeout`** (number):
   - **Description:** The maximum time in seconds allowed without output from the
@@ -1492,10 +1403,9 @@ their corresponding top-level category object in your `settings.json` file.
 #### `security`
 
 - **`security.toolSandboxing`** (boolean):
-  - **Description:** Tool-level sandboxing. Isolates individual tools instead of
-    the entire CLI process.
+  - **Description:** Experimental tool-level sandboxing (implementation in
+    progress).
   - **Default:** `false`
-  - **Requires restart:** Yes
 
 - **`security.disableYoloMode`** (boolean):
   - **Description:** Disable YOLO mode, even if enabled by a flag.
@@ -1579,7 +1489,7 @@ their corresponding top-level category object in your `settings.json` file.
 
 - **`advanced.autoConfigureMemory`** (boolean):
   - **Description:** Automatically configure Node.js memory limits
-  - **Default:** `true`
+  - **Default:** `false`
   - **Requires restart:** Yes
 
 - **`advanced.dnsResolutionOrder`** (string):
@@ -1601,15 +1511,26 @@ their corresponding top-level category object in your `settings.json` file.
 
 #### `experimental`
 
-- **`experimental.adk.agentSessionNoninteractiveEnabled`** (boolean):
-  - **Description:** Enable non-interactive agent sessions.
-  - **Default:** `false`
+- **`experimental.toolOutputMasking.enabled`** (boolean):
+  - **Description:** Enables tool output masking to save tokens.
+  - **Default:** `true`
   - **Requires restart:** Yes
 
-- **`experimental.adk.agentSessionInteractiveEnabled`** (boolean):
-  - **Description:** Enable the agent session implementation for the interactive
-    CLI.
-  - **Default:** `false`
+- **`experimental.toolOutputMasking.toolProtectionThreshold`** (number):
+  - **Description:** Minimum number of tokens to protect from masking (most
+    recent tool outputs).
+  - **Default:** `50000`
+  - **Requires restart:** Yes
+
+- **`experimental.toolOutputMasking.minPrunableTokensThreshold`** (number):
+  - **Description:** Minimum prunable tokens required to trigger a masking pass.
+  - **Default:** `30000`
+  - **Requires restart:** Yes
+
+- **`experimental.toolOutputMasking.protectLatestTurn`** (boolean):
+  - **Description:** Ensures the absolute latest turn is never masked,
+    regardless of token count.
+  - **Default:** `true`
   - **Requires restart:** Yes
 
 - **`experimental.enableAgents`** (boolean):
@@ -1650,7 +1571,7 @@ their corresponding top-level category object in your `settings.json` file.
 
 - **`experimental.jitContext`** (boolean):
   - **Description:** Enable Just-In-Time (JIT) context loading.
-  - **Default:** `false`
+  - **Default:** `true`
   - **Requires restart:** Yes
 
 - **`experimental.useOSC52Paste`** (boolean):
@@ -1665,6 +1586,11 @@ their corresponding top-level category object in your `settings.json` file.
     configured to allow it).
   - **Default:** `false`
 
+- **`experimental.plan`** (boolean):
+  - **Description:** Enable Plan Mode.
+  - **Default:** `true`
+  - **Requires restart:** Yes
+
 - **`experimental.taskTracker`** (boolean):
   - **Description:** Enable task tracker tools.
   - **Default:** `false`
@@ -1710,16 +1636,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `false`
   - **Requires restart:** Yes
 
-- **`experimental.generalistProfile`** (boolean):
-  - **Description:** Suitable for general coding and software development tasks.
-  - **Default:** `false`
-  - **Requires restart:** Yes
-
-- **`experimental.contextManagement`** (boolean):
-  - **Description:** Enable logic for context management.
-  - **Default:** `false`
-  - **Requires restart:** Yes
-
 - **`experimental.topicUpdateNarration`** (boolean):
   - **Description:** Enable the experimental Topic & Update communication model
     for reduced chattiness and structured progress reporting.
@@ -1811,69 +1727,6 @@ their corresponding top-level category object in your `settings.json` file.
     prioritize available tools dynamically.
   - **Default:** `[]`
 
-#### `contextManagement`
-
-- **`contextManagement.historyWindow.maxTokens`** (number):
-  - **Description:** The number of tokens to allow before triggering
-    compression.
-  - **Default:** `150000`
-  - **Requires restart:** Yes
-
-- **`contextManagement.historyWindow.retainedTokens`** (number):
-  - **Description:** The number of tokens to always retain.
-  - **Default:** `40000`
-  - **Requires restart:** Yes
-
-- **`contextManagement.messageLimits.normalMaxTokens`** (number):
-  - **Description:** The target number of tokens to budget for a normal
-    conversation turn.
-  - **Default:** `2500`
-  - **Requires restart:** Yes
-
-- **`contextManagement.messageLimits.retainedMaxTokens`** (number):
-  - **Description:** The maximum number of tokens a single conversation turn can
-    consume before truncation.
-  - **Default:** `12000`
-  - **Requires restart:** Yes
-
-- **`contextManagement.messageLimits.normalizationHeadRatio`** (number):
-  - **Description:** The ratio of tokens to retain from the beginning of a
-    truncated message (0.0 to 1.0).
-  - **Default:** `0.25`
-  - **Requires restart:** Yes
-
-- **`contextManagement.tools.distillation.maxOutputTokens`** (number):
-  - **Description:** Maximum tokens to show to the model when truncating large
-    tool outputs.
-  - **Default:** `10000`
-  - **Requires restart:** Yes
-
-- **`contextManagement.tools.distillation.summarizationThresholdTokens`**
-  (number):
-  - **Description:** Threshold above which truncated tool outputs will be
-    summarized by an LLM.
-  - **Default:** `20000`
-  - **Requires restart:** Yes
-
-- **`contextManagement.tools.outputMasking.protectionThresholdTokens`**
-  (number):
-  - **Description:** Minimum number of tokens to protect from masking (most
-    recent tool outputs).
-  - **Default:** `50000`
-  - **Requires restart:** Yes
-
-- **`contextManagement.tools.outputMasking.minPrunableThresholdTokens`**
-  (number):
-  - **Description:** Minimum prunable tokens required to trigger a masking pass.
-  - **Default:** `30000`
-  - **Requires restart:** Yes
-
-- **`contextManagement.tools.outputMasking.protectLatestTurn`** (boolean):
-  - **Description:** Ensures the absolute latest turn is never masked,
-    regardless of token count.
-  - **Default:** `true`
-  - **Requires restart:** Yes
-
 #### `admin`
 
 - **`admin.secureModeEnabled`** (boolean):
@@ -2266,14 +2119,37 @@ You can customize this behavior in your `settings.json` file:
 Arguments passed directly when running the CLI can override other configurations
 for that specific session.
 
-- **`--acp`**:
-  - Starts the agent in Agent Communication Protocol (ACP) mode.
-- **`--allowed-mcp-server-names`**:
-  - A comma-separated list of MCP server names to allow for the session.
-- **`--allowed-tools <tool1,tool2,...>`**:
-  - A comma-separated list of tool names that will bypass the confirmation
-    dialog.
-  - Example: `gemini --allowed-tools "ShellTool(git status)"`
+- **`--model <model_name>`** (**`-m <model_name>`**):
+  - Specifies the Gemini model to use for this session.
+  - Example: `npm start -- --model gemini-3-pro-preview`
+- **`--prompt <your_prompt>`** (**`-p <your_prompt>`**):
+  - **Deprecated:** Use positional arguments instead.
+  - 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"`
+- **`--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.
+    - `stream-json`: A streaming JSON output that emits real-time events.
+  - **Note:** For structured output and scripting, use the
+    `--output-format json` or `--output-format stream-json` flag.
+- **`--sandbox`** (**`-s`**):
+  - Enables sandbox mode for this session.
+- **`--debug`** (**`-d`**):
+  - Enables debug mode for this session, providing more verbose output. Open the
+    debug console with F12 to see the additional logging.
+
+- **`--help`** (or **`-h`**):
+  - Displays help information about command-line arguments.
+- **`--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)
@@ -2287,61 +2163,17 @@ for that specific session.
   - Cannot be used together with `--yolo`. Use `--approval-mode=yolo` instead of
     `--yolo` for the new unified approach.
   - Example: `gemini --approval-mode auto_edit`
-- **`--debug`** (**`-d`**):
-  - Enables debug mode for this session, providing more verbose output. Open the
-    debug console with F12 to see the additional logging.
-- **`--delete-session <identifier>`**:
-  - Delete a specific chat session by its index number or full session UUID.
-  - Use `--list-sessions` first to see available sessions, their indices, and
-    UUIDs.
-  - Example: `gemini --delete-session 3` or
-    `gemini --delete-session a1b2c3d4-e5f6-7890-abcd-ef1234567890`
+- **`--allowed-tools <tool1,tool2,...>`**:
+  - A comma-separated list of tool names that will bypass the confirmation
+    dialog.
+  - Example: `gemini --allowed-tools "ShellTool(git status)"`
 - **`--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`
-- **`--fake-responses`**:
-  - Path to a file with fake model responses for testing.
-- **`--help`** (or **`-h`**):
-  - Displays help information about command-line arguments.
-- **`--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`
 - **`--list-extensions`** (**`-l`**):
   - Lists all available extensions and exits.
-- **`--list-sessions`**:
-  - List all available chat sessions for the current project and exit.
-  - Shows session indices, dates, message counts, and preview of first user
-    message.
-  - Example: `gemini --list-sessions`
-- **`--model <model_name>`** (**`-m <model_name>`**):
-  - Specifies the Gemini model to use for this session.
-  - Example: `npm start -- --model gemini-3-pro-preview`
-- **`--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.
-    - `stream-json`: A streaming JSON output that emits real-time events.
-  - **Note:** For structured output and scripting, use the
-    `--output-format json` or `--output-format stream-json` flag.
-- **`--prompt <your_prompt>`** (**`-p <your_prompt>`**):
-  - **Deprecated:** Use positional arguments instead.
-  - 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"`
-- **`--record-responses`**:
-  - Path to a file to record model responses for testing.
 - **`--resume [session_id]`** (**`-r [session_id]`**):
   - Resume a previous chat session. Use "latest" for the most recent session,
     provide a session index number, or provide a full session UUID.
@@ -2349,15 +2181,37 @@ for that specific session.
   - Example: `gemini --resume 5` or `gemini --resume latest` or
     `gemini --resume a1b2c3d4-e5f6-7890-abcd-ef1234567890` or `gemini --resume`
   - See [Session Management](../cli/session-management.md) for more details.
-- **`--sandbox`** (**`-s`**):
-  - Enables sandbox mode for this session.
+- **`--list-sessions`**:
+  - List all available chat sessions for the current project and exit.
+  - Shows session indices, dates, message counts, and preview of first user
+    message.
+  - Example: `gemini --list-sessions`
+- **`--delete-session <identifier>`**:
+  - Delete a specific chat session by its index number or full session UUID.
+  - Use `--list-sessions` first to see available sessions, their indices, and
+    UUIDs.
+  - Example: `gemini --delete-session 3` or
+    `gemini --delete-session a1b2c3d4-e5f6-7890-abcd-ef1234567890`
+- **`--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, which adjusts the TUI for better compatibility
     with screen readers.
 - **`--version`**:
   - Displays the version of the CLI.
-- **`--yolo`**:
-  - Enables YOLO mode, which automatically approves all tool calls.
+- **`--experimental-acp`**:
+  - Starts the agent in ACP mode.
+- **`--allowed-mcp-server-names`**:
+  - Allowed MCP server names.
+- **`--fake-responses`**:
+  - Path to a file with fake model responses for testing.
+- **`--record-responses`**:
+  - Path to a file to record model responses for testing.
 
 ## Context files (hierarchical instructional context)
 
@@ -2482,13 +2336,9 @@ can be based on the base sandbox image:
 ```dockerfile
 FROM gemini-cli-sandbox
 
-# Add your custom dependencies or configurations here.
-# Note: The base image runs as the non-root 'node' user.
-# You must switch to 'root' to install system packages.
+# Add your custom dependencies or configurations here
 # For example:
-# USER root
 # RUN apt-get update && apt-get install -y some-package
-# USER node
 # COPY ./my-config /app/my-config
 ```
 

docs/reference/keyboard-shortcuts.md

@@ -86,14 +86,12 @@ available combinations.
 
 #### Text Input
 
-| Command                              | Action                                                                    | Keys                                                                                |
-| ------------------------------------ | ------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- |
-| `input.submit`                       | Submit the current prompt.                                                | `Enter`                                                                             |
-| `input.queueMessage`                 | Queue the current prompt to be processed after the current task finishes. | `Tab`                                                                               |
-| `input.newline`                      | Insert a newline without submitting.                                      | `Ctrl+Enter`<br />`Cmd/Win+Enter`<br />`Alt+Enter`<br />`Shift+Enter`<br />`Ctrl+J` |
-| `input.openExternalEditor`           | Open the current prompt or the plan in an external editor.                | `Ctrl+G`                                                                            |
-| `input.deprecatedOpenExternalEditor` | Deprecated command to open external editor.                               | `Ctrl+X`                                                                            |
-| `input.paste`                        | Paste from the clipboard.                                                 | `Ctrl+V`<br />`Cmd/Win+V`<br />`Alt+V`                                              |
+| Command                    | Action                                                     | Keys                                                                                |
+| -------------------------- | ---------------------------------------------------------- | ----------------------------------------------------------------------------------- |
+| `input.submit`             | Submit the current prompt.                                 | `Enter`                                                                             |
+| `input.newline`            | Insert a newline without submitting.                       | `Ctrl+Enter`<br />`Cmd/Win+Enter`<br />`Alt+Enter`<br />`Shift+Enter`<br />`Ctrl+J` |
+| `input.openExternalEditor` | Open the current prompt or the plan in an external editor. | `Ctrl+X`                                                                            |
+| `input.paste`              | Paste from the clipboard.                                  | `Ctrl+V`<br />`Cmd/Win+V`<br />`Alt+V`                                              |
 
 #### App Controls
 
@@ -101,10 +99,9 @@ available combinations.
 | ----------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
 | `app.showErrorDetails`        | Toggle detailed error information.                                                                                                                 | `F12`              |
 | `app.showFullTodos`           | Toggle the full TODO list.                                                                                                                         | `Ctrl+T`           |
-| `app.showIdeContextDetail`    | Show IDE context details.                                                                                                                          | `F4`               |
+| `app.showIdeContextDetail`    | Show IDE context details.                                                                                                                          | `Ctrl+G`           |
 | `app.toggleMarkdown`          | Toggle Markdown rendering.                                                                                                                         | `Alt+M`            |
-| `app.toggleCopyMode`          | Toggle copy mode when in alternate buffer mode.                                                                                                    | `F9`               |
-| `app.toggleMouseMode`         | Toggle mouse mode (scrolling and clicking).                                                                                                        | `Ctrl+S`           |
+| `app.toggleCopyMode`          | Toggle copy mode when in alternate buffer mode.                                                                                                    | `Ctrl+S`           |
 | `app.toggleYolo`              | Toggle YOLO (auto-approval) mode for tool calls.                                                                                                   | `Ctrl+Y`           |
 | `app.cycleApprovalMode`       | Cycle through approval modes: default (prompt), auto_edit (auto-approve edits), and plan (read-only). Plan mode is skipped when the agent is busy. | `Shift+Tab`        |
 | `app.showMoreLines`           | Expand and collapse blocks of content when not in alternate buffer mode.                                                                           | `Ctrl+O`           |
@@ -128,16 +125,6 @@ available combinations.
 | `background.unfocus`        | Move focus from background shell to Gemini.                        | `Shift+Tab` |
 | `background.unfocusList`    | Move focus from background shell list to Gemini.                   | `Tab`       |
 | `background.unfocusWarning` | Show warning when trying to move focus away from background shell. | `Tab`       |
-| `app.dumpFrame`             | Dump the current frame as a snapshot.                              | `F8`        |
-| `app.startRecording`        | Start recording the session.                                       | `F6`        |
-| `app.stopRecording`         | Stop recording the session.                                        | `F7`        |
-
-#### Extension Controls
-
-| Command            | Action                                      | Keys |
-| ------------------ | ------------------------------------------- | ---- |
-| `extension.update` | Update the current extension if available.  | `I`  |
-| `extension.link`   | Link the current extension to a local path. | `L`  |
 
 <!-- KEYBINDINGS-AUTOGEN:END -->
 

docs/reference/policy-engine.md

@@ -29,12 +29,13 @@ To create your first policy:
     ```toml
     [[rule]]
     toolName = "run_shell_command"
-    commandPrefix = "rm -rf"
-    decision = "deny"
+    commandPrefix = "git status"
+    decision = "allow"
     priority = 100
     ```
 3.  **Run a command** that triggers the policy (e.g., ask Gemini CLI to
-    `rm -rf /`). The tool will now be blocked automatically.
+    `git status`). The tool will now execute automatically without prompting for
+    confirmation.
 
 ## Core concepts
 
@@ -142,26 +143,25 @@ engine transforms this into a final priority using the following formula:
 
 This system guarantees that:
 
-- Admin policies always override User, Workspace, and Default policies (defined
-  in policy TOML files).
+- Admin policies always override User, Workspace, and Default policies.
 - User policies override Workspace and Default policies.
 - Workspace policies override Default policies.
 - You can still order rules within a single tier with fine-grained control.
 
 For example:
 
-- A `priority: 50` rule in a Default policy TOML becomes `1.050`.
-- A `priority: 10` rule in a Workspace policy TOML becomes `2.010`.
-- A `priority: 100` rule in a User policy TOML becomes `3.100`.
-- A `priority: 20` rule in an Admin policy TOML becomes `4.020`.
+- A `priority: 50` rule in a Default policy file becomes `1.050`.
+- A `priority: 10` rule in a Workspace policy policy file becomes `2.010`.
+- A `priority: 100` rule in a User policy file becomes `3.100`.
+- A `priority: 20` rule in an Admin policy file becomes `4.020`.
 
 ### Approval modes
 
 Approval modes allow the policy engine to apply different sets of rules based on
-the CLI's operational mode. A rule in a TOML policy file can be associated with
-one or more modes (e.g., `yolo`, `autoEdit`, `plan`). The rule will only be
-active if the CLI is running in one of its specified modes. If a rule has no
-modes specified, it is always active.
+the CLI's operational mode. A rule can be associated with one or more modes
+(e.g., `yolo`, `autoEdit`, `plan`). The rule will only be active if the CLI is
+running in one of its specified modes. If a rule has no modes specified, it is
+always active.
 
 - `default`: The standard interactive mode where most write tools require
   confirmation.
@@ -171,24 +171,6 @@ modes specified, it is always active.
   [Customizing Plan Mode Policies](../cli/plan-mode.md#customizing-policies).
 - `yolo`: A mode where all tools are auto-approved (use with extreme caution).
 
-To maintain the integrity of Plan Mode as a safe research environment,
-persistent tool approvals are context-aware. When you select **"Allow for all
-future sessions"**, the policy engine explicitly includes the current mode and
-all more permissive modes in the hierarchy (`plan` < `default` < `autoEdit` <
-`yolo`).
-
-- **Approvals in `plan` mode**: These represent an intentional choice to trust a
-  tool globally. The resulting rule explicitly includes all modes (`plan`,
-  `default`, `autoEdit`, and `yolo`).
-- **Approvals in other modes**: These only apply to the current mode and those
-  more permissive. For example:
-  - An approval granted in **`default`** mode applies to `default`, `autoEdit`,
-    and `yolo`.
-  - An approval granted in **`autoEdit`** mode applies to `autoEdit` and `yolo`.
-  - An approval granted in **`yolo`** mode applies only to `yolo`. This ensures
-    that trust flows correctly to more permissive environments while maintaining
-    the safety of more restricted modes like `plan`.
-
 ## Rule matching
 
 When a tool call is made, the engine checks it against all active rules,
@@ -197,8 +179,8 @@ outcome.
 
 A rule matches a tool call if all of its conditions are met:
 
-1.  **Tool name**: The `toolName` in the TOML rule must match the name of the
-    tool being called.
+1.  **Tool name**: The `toolName` in the rule must match the name of the tool
+    being called.
     - **Wildcards**: You can use wildcards like `*`, `mcp_server_*`, or
       `mcp_*_toolName` to match multiple tools. See [Tool Name](#tool-name) for
       details.
@@ -282,7 +264,7 @@ toolName = "run_shell_command"
 
 # (Optional) The name of a subagent. If provided, the rule only applies to tool
 # calls made by this specific subagent.
-subagent = "codebase_investigator"
+subagent = "generalist"
 
 # (Optional) The name of an MCP server. Can be combined with toolName
 # to form a composite FQN internally like "mcp_mcpName_toolName".
@@ -319,24 +301,15 @@ priority = 10
 # (Optional) A custom message to display when a tool call is denied by this
 # rule. This message is returned to the model and user,
 # useful for explaining *why* it was denied.
-denyMessage = "Deletion is permanent"
+deny_message = "Deletion is permanent"
 
 # (Optional) An array of approval modes where this rule is active.
-# If omitted or empty, the rule applies to all modes.
-modes = ["default", "autoEdit", "yolo"]
+modes = ["autoEdit"]
 
 # (Optional) A boolean to restrict the rule to interactive (true) or
 # non-interactive (false) environments.
 # If omitted, the rule applies to both.
 interactive = true
-
-# (Optional) If true, lets shell commands use redirection operators
-# (>, >>, <, <<, <<<). By default, the policy engine asks for confirmation
-# when redirection is detected, even if a rule matches the command.
-# This permission is granular; it only applies to the specific rule it's
-# defined in. In chained commands (e.g., cmd1 > file && cmd2), each
-# individual command rule must permit redirection if it's used.
-allowRedirection = true
 ```
 
 ### Using arrays (lists)
@@ -421,7 +394,7 @@ server.
 mcpName = "untrusted-server"
 decision = "deny"
 priority = 500
-denyMessage = "This server is not trusted by the admin."
+deny_message = "This server is not trusted by the admin."
 ```
 
 **3. Targeting all MCP servers**
@@ -432,12 +405,25 @@ registered MCP server. This is useful for setting category-wide defaults.
 ```toml
 # Ask user for any tool call from any MCP server
 [[rule]]
-toolName = "*"
 mcpName = "*"
 decision = "ask_user"
 priority = 10
 ```
 
+**4. Targeting a tool name across all servers**
+
+Use `mcpName = "*"` with a specific `toolName` to target that operation
+regardless of which server provides it.
+
+```toml
+# Allow the `search` tool across all connected MCP servers
+[[rule]]
+mcpName = "*"
+toolName = "search"
+decision = "allow"
+priority = 50
+```
+
 ## Default policies
 
 The Gemini CLI ships with a set of default policies to provide a safe

docs/reference/tools.md

@@ -63,62 +63,29 @@ details.
 
 ## Available tools
 
-The following sections list all available tools, categorized by their primary
-function. For detailed parameter information, see the linked documentation for
-each tool.
+The following table lists all available tools, categorized by their primary
+function.
 
-### Execution
-
-| Tool                                     | Kind      | Description                                                                                                              |
-| :--------------------------------------- | :-------- | :----------------------------------------------------------------------------------------------------------------------- |
-| [`run_shell_command`](../tools/shell.md) | `Execute` | Executes arbitrary shell commands. Supports interactive sessions and background processes. Requires manual confirmation. |
-
-### File System
-
-| Tool                                         | Kind     | Description                                                                                           |
-| :------------------------------------------- | :------- | :---------------------------------------------------------------------------------------------------- |
-| [`glob`](../tools/file-system.md)            | `Search` | Finds files matching specific glob patterns across the workspace.                                     |
-| [`grep_search`](../tools/file-system.md)     | `Search` | Searches for a regular expression pattern within file contents. Legacy alias: `search_file_content`.  |
-| [`list_directory`](../tools/file-system.md)  | `Read`   | Lists the names of files and subdirectories within a specified path.                                  |
-| [`read_file`](../tools/file-system.md)       | `Read`   | Reads the content of a specific file. Supports text, images, audio, and PDF.                          |
-| [`read_many_files`](../tools/file-system.md) | `Read`   | Reads and concatenates content from multiple files. Often triggered by the `@` symbol in your prompt. |
-| [`replace`](../tools/file-system.md)         | `Edit`   | Performs precise text replacement within a file. Requires manual confirmation.                        |
-| [`write_file`](../tools/file-system.md)      | `Edit`   | Creates or overwrites a file with new content. Requires manual confirmation.                          |
-
-### Interaction
-
-| Tool                               | Kind          | Description                                                                            |
-| :--------------------------------- | :------------ | :------------------------------------------------------------------------------------- |
-| [`ask_user`](../tools/ask-user.md) | `Communicate` | Requests clarification or missing information via an interactive dialog.               |
-| [`write_todos`](../tools/todos.md) | `Other`       | Maintains an internal list of subtasks. The model uses this to track its own progress. |
-
-### Memory
-
-| Tool                                             | Kind    | Description                                                                          |
-| :----------------------------------------------- | :------ | :----------------------------------------------------------------------------------- |
-| [`activate_skill`](../tools/activate-skill.md)   | `Other` | Loads specialized procedural expertise from the `.gemini/skills` directory.          |
-| [`get_internal_docs`](../tools/internal-docs.md) | `Think` | Accesses Gemini CLI's own documentation for accurate answers about its capabilities. |
-| [`save_memory`](../tools/memory.md)              | `Think` | Persists specific facts and project details to your `GEMINI.md` file.                |
-
-### Planning
-
-| Tool                                      | Kind   | Description                                                                              |
-| :---------------------------------------- | :----- | :--------------------------------------------------------------------------------------- |
-| [`enter_plan_mode`](../tools/planning.md) | `Plan` | Switches the CLI to a safe, read-only "Plan Mode" for researching complex changes.       |
-| [`exit_plan_mode`](../tools/planning.md)  | `Plan` | Finalizes a plan, presents it for review, and requests approval to start implementation. |
-
-### System
-
-| Tool            | Kind    | Description                                                                                                        |
-| :-------------- | :------ | :----------------------------------------------------------------------------------------------------------------- |
-| `complete_task` | `Other` | Finalizes a subagent's mission and returns the result to the parent agent. This tool is not available to the user. |
-
-### Web
-
-| Tool                                          | Kind     | Description                                                                                                                                                                                                                                                              |
-| :-------------------------------------------- | :------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [`google_web_search`](../tools/web-search.md) | `Search` | Performs a Google Search to find up-to-date information.                                                                                                                                                                                                                 |
-| [`web_fetch`](../tools/web-fetch.md)          | `Fetch`  | Retrieves and processes content from specific URLs. **Warning:** This tool can access local and private network addresses (e.g., localhost), which may pose a security risk if used with untrusted prompts. In Plan Mode, this tool requires explicit user confirmation. |
+| Category    | Tool                                             | Kind          | Description                                                                                                                                                                                                                                 |
+| :---------- | :----------------------------------------------- | :------------ | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| Execution   | [`run_shell_command`](../tools/shell.md)         | `Execute`     | Executes arbitrary shell commands. Supports interactive sessions and background processes. Requires manual confirmation.<br><br>**Parameters:** `command`, `description`, `dir_path`, `is_background`                                       |
+| File System | [`glob`](../tools/file-system.md)                | `Search`      | Finds files matching specific glob patterns across the workspace.<br><br>**Parameters:** `pattern`, `dir_path`, `case_sensitive`, `respect_git_ignore`, `respect_gemini_ignore`                                                             |
+| File System | [`grep_search`](../tools/file-system.md)         | `Search`      | Searches for a regular expression pattern within file contents. Legacy alias: `search_file_content`.<br><br>**Parameters:** `pattern`, `dir_path`, `include`, `exclude_pattern`, `names_only`, `max_matches_per_file`, `total_max_matches`  |
+| File System | [`list_directory`](../tools/file-system.md)      | `Read`        | Lists the names of files and subdirectories within a specified path.<br><br>**Parameters:** `dir_path`, `ignore`, `file_filtering_options`                                                                                                  |
+| File System | [`read_file`](../tools/file-system.md)           | `Read`        | Reads the content of a specific file. Supports text, images, audio, and PDF.<br><br>**Parameters:** `file_path`, `start_line`, `end_line`                                                                                                   |
+| File System | [`read_many_files`](../tools/file-system.md)     | `Read`        | Reads and concatenates content from multiple files. Often triggered by the `@` symbol in your prompt.<br><br>**Parameters:** `include`, `exclude`, `recursive`, `useDefaultExcludes`, `file_filtering_options`                              |
+| File System | [`replace`](../tools/file-system.md)             | `Edit`        | Performs precise text replacement within a file. Requires manual confirmation.<br><br>**Parameters:** `file_path`, `instruction`, `old_string`, `new_string`, `allow_multiple`                                                              |
+| File System | [`write_file`](../tools/file-system.md)          | `Edit`        | Creates or overwrites a file with new content. Requires manual confirmation.<br><br>**Parameters:** `file_path`, `content`                                                                                                                  |
+| Interaction | [`ask_user`](../tools/ask-user.md)               | `Communicate` | Requests clarification or missing information via an interactive dialog.<br><br>**Parameters:** `questions`                                                                                                                                 |
+| Interaction | [`write_todos`](../tools/todos.md)               | `Other`       | Maintains an internal list of subtasks. The model uses this to track its own progress and display it to you.<br><br>**Parameters:** `todos`                                                                                                 |
+| Memory      | [`activate_skill`](../tools/activate-skill.md)   | `Other`       | Loads specialized procedural expertise for specific tasks from the `.gemini/skills` directory.<br><br>**Parameters:** `name`                                                                                                                |
+| Memory      | [`get_internal_docs`](../tools/internal-docs.md) | `Think`       | Accesses Gemini CLI's own documentation to provide more accurate answers about its capabilities.<br><br>**Parameters:** `path`                                                                                                              |
+| Memory      | [`save_memory`](../tools/memory.md)              | `Think`       | Persists specific facts and project details to your `GEMINI.md` file to retain context.<br><br>**Parameters:** `fact`                                                                                                                       |
+| Planning    | [`enter_plan_mode`](../tools/planning.md)        | `Plan`        | Switches the CLI to a safe, read-only "Plan Mode" for researching complex changes.<br><br>**Parameters:** `reason`                                                                                                                          |
+| Planning    | [`exit_plan_mode`](../tools/planning.md)         | `Plan`        | Finalizes a plan, presents it for review, and requests approval to start implementation.<br><br>**Parameters:** `plan`                                                                                                                      |
+| System      | `complete_task`                                  | `Other`       | Finalizes a subagent's mission and returns the result to the parent agent. This tool is not available to the user.<br><br>**Parameters:** `result`                                                                                          |
+| Web         | [`google_web_search`](../tools/web-search.md)    | `Search`      | Performs a Google Search to find up-to-date information.<br><br>**Parameters:** `query`                                                                                                                                                     |
+| Web         | [`web_fetch`](../tools/web-fetch.md)             | `Fetch`       | Retrieves and processes content from specific URLs. **Warning:** This tool can access local and private network addresses (e.g., localhost), which may pose a security risk if used with untrusted prompts.<br><br>**Parameters:** `prompt` |
 
 ## Under the hood
 

docs/release-confidence.md

@@ -22,6 +22,12 @@ nightly) or the release branch (for preview/stable).
 
 - **Platforms:** Tests must pass on **Linux and macOS**.
 
+<!-- prettier-ignore -->
+> [!NOTE]
+> Windows tests currently run with `continue-on-error: true`. While a
+> failure here doesn't block the release technically, it should be
+> investigated.
+
 - **Checks:**
   - **Linting:** No linting errors (ESLint, Prettier, etc.).
   - **Typechecking:** No TypeScript errors.

docs/releases.md

@@ -1,9 +1,5 @@
 # Gemini CLI releases
 
-<!-- prettier-ignore -->
-> [!IMPORTANT]
-> **Coordinate with the Release Manager:** The release manager is responsible for coordinating patches and releases. Please update them before performing any of the release actions described in this document.
-
 ## `dev` vs `prod` environment
 
 Our release flows support both `dev` and `prod` environments.

docs/resources/quota-and-pricing.md

@@ -12,21 +12,6 @@ quota for your needs, see the [Plans page](https://geminicli.com/plans/).
 This article outlines the specific quotas and pricing applicable to Gemini CLI
 when using different authentication methods.
 
-The following table summarizes the available quotas and their respective limits:
-
-| Authentication method | Tier / Subscription             | Maximum requests per user per day |
-| :-------------------- | :------------------------------ | :-------------------------------- |
-| **Google account**    | Gemini Code Assist (Individual) | 1,000 requests                    |
-|                       | Google AI Pro                   | 1,500 requests                    |
-|                       | Google AI Ultra                 | 2,000 requests                    |
-| **Gemini API key**    | Free tier (Unpaid)              | 250 requests                      |
-|                       | Pay-as-you-go (Paid)            | Varies                            |
-| **Vertex AI**         | Express mode (Free)             | Varies                            |
-|                       | Pay-as-you-go (Paid)            | Varies                            |
-| **Google Workspace**  | Code Assist Standard            | 1,500 requests                    |
-|                       | Code Assist Enterprise          | 2,000 requests                    |
-|                       | Workspace AI Ultra              | 2,000 requests                    |
-
 Generally, there are three categories to choose from:
 
 - Free Usage: Ideal for experimentation and light use.
@@ -35,9 +20,6 @@ Generally, there are three categories to choose from:
 - Pay-As-You-Go: The most flexible option for professional use, long-running
   tasks, or when you need full control over your usage.
 
-Requests are limited per user per minute and are subject to the availability of
-the service in times of high demand.
-
 ## Free usage
 
 Access to Gemini CLI begins with a generous free tier, perfect for
@@ -51,7 +33,8 @@ authorization type.
 For users who authenticate by using their Google account to access Gemini Code
 Assist for individuals. This includes:
 
-- 1000 maximum model requests / user / day
+- 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.
 
@@ -63,7 +46,8 @@ Learn more at
 If you are using a Gemini API key, you can also benefit from a free tier. This
 includes:
 
-- 250 maximum model requests / user / day
+- 250 model requests / user / day
+- 10 model requests / user / minute
 - Model requests to Flash model only.
 
 Learn more at
@@ -75,7 +59,7 @@ Vertex AI offers an Express Mode without the need to enable billing. This
 includes:
 
 - 90 days before you need to enable billing.
-- Quotas and models are specific to your account and their limits vary.
+- Quotas and models are variable and specific to your account.
 
 Learn more at
 [Vertex AI Express Mode Limits](https://cloud.google.com/vertex-ai/generative-ai/docs/start/express-mode/overview#quotas).
@@ -128,9 +112,11 @@ Standard/Plus and AI Expanded, are not supported._
 
   This includes the following request limits:
   - Gemini Code Assist Standard edition:
-    - 1500 maximum model requests / user / day
+    - 1500 model requests / user / day
+    - 120 model requests / user / minute
   - Gemini Code Assist Enterprise edition:
-    - 2000 maximum model requests / user / day
+    - 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.
 

docs/sidebar.json

@@ -12,6 +12,7 @@
             "label": "Authentication",
             "slug": "docs/get-started/authentication"
           },
+          { "label": "Examples", "slug": "docs/get-started/examples" },
           { "label": "CLI cheatsheet", "slug": "docs/cli/cli-reference" },
           {
             "label": "Gemini 3 on Gemini CLI",
@@ -111,17 +112,7 @@
               { "label": "Reference", "slug": "docs/hooks/reference" }
             ]
           },
-          {
-            "label": "IDE integration",
-            "collapsed": true,
-            "items": [
-              { "label": "Overview", "slug": "docs/ide-integration" },
-              {
-                "label": "Developer guide: ACP mode",
-                "slug": "docs/cli/acp-mode"
-              }
-            ]
-          },
+          { "label": "IDE integration", "slug": "docs/ide-integration" },
           { "label": "MCP servers", "slug": "docs/tools/mcp-server" },
           { "label": "Model routing", "slug": "docs/cli/model-routing" },
           { "label": "Model selection", "slug": "docs/cli/model" },
@@ -138,10 +129,12 @@
           { "label": "Plan mode", "slug": "docs/cli/plan-mode" },
           {
             "label": "Subagents",
+            "badge": "🔬",
             "slug": "docs/core/subagents"
           },
           {
             "label": "Remote subagents",
+            "badge": "🔬",
             "slug": "docs/core/remote-agents"
           },
           { "label": "Rewind", "slug": "docs/cli/rewind" },

docs/tools/mcp-server.md

@@ -290,7 +290,7 @@ When connecting to an OAuth-enabled server:
 > OAuth authentication requires that your local machine can:
 >
 > - Open a web browser for authentication
-> - Receive redirects on `http://localhost:<random-port>/oauth/callback` (or a specific port if configured via `redirectUri`)
+> - Receive redirects on `http://localhost:7777/oauth/callback`
 
 This feature will not work in:
 
@@ -323,8 +323,8 @@ Use the `/mcp auth` command to manage OAuth authentication:
   if omitted)
 - **`tokenUrl`** (string): OAuth token endpoint (auto-discovered if omitted)
 - **`scopes`** (string[]): Required OAuth scopes
-- **`redirectUri`** (string): Custom redirect URI (defaults to an OS-assigned
-  random port, e.g., `http://localhost:<random-port>/oauth/callback`)
+- **`redirectUri`** (string): Custom redirect URI (defaults to
+  `http://localhost:7777/oauth/callback`)
 - **`tokenParamName`** (string): Query parameter name for tokens in SSE URLs
 - **`audiences`** (string[]): Audiences the token is valid for
 

docs/tools/planning.md

@@ -32,9 +32,7 @@ and planning.
 ## 2. `exit_plan_mode` (ExitPlanMode)
 
 `exit_plan_mode` signals that the planning phase is complete. It presents the
-finalized plan to the user and requests formal approval to start the
-implementation. The agent MUST reach an informal agreement with the user in the
-chat regarding the proposed strategy BEFORE calling this tool.
+finalized plan to the user and requests approval to start the implementation.
 
 - **Tool name:** `exit_plan_mode`
 - **Display name:** Exit Plan Mode
@@ -46,7 +44,7 @@ chat regarding the proposed strategy BEFORE calling this tool.
 - **Behavior:**
   - Validates that the `plan_path` is within the allowed directory and that the
     file exists and has content.
-  - Presents the plan to the user for formal review.
+  - Presents the plan to the user for review.
   - If the user approves the plan:
     - Switches the CLI's approval mode to the user's chosen approval mode (
       `DEFAULT` or `AUTO_EDIT`).
@@ -58,5 +56,5 @@ chat regarding the proposed strategy BEFORE calling this tool.
   - On approval: A message indicating the plan was approved and the new approval
     mode.
   - On rejection: A message containing the user's feedback.
-- **Confirmation:** Yes. Shows the finalized plan and asks for user formal
-  approval to proceed with implementation.
+- **Confirmation:** Yes. Shows the finalized plan and asks for user approval to
+  proceed with implementation.

docs/tools/web-fetch.md

@@ -17,9 +17,6 @@ specific operations like summarization or extraction.
 ## Technical behavior
 
 - **Confirmation:** Triggers a confirmation dialog showing the converted URLs.
-- **Plan Mode:** In [Plan Mode](../cli/plan-mode.md), `web_fetch` is available
-  but always requires explicit user confirmation (`ask_user`) due to security
-  implications of accessing external or private network addresses.
 - **Processing:** Uses the Gemini API's `urlContext` for retrieval.
 - **Fallback:** If API access fails, the tool attempts to fetch raw content
   directly from your local machine.

esbuild.config.js

@@ -13,7 +13,7 @@ import { wasmLoader } from 'esbuild-plugin-wasm';
 let esbuild;
 try {
   esbuild = (await import('esbuild')).default;
-} catch {
+} catch (_error) {
   console.error('esbuild not available - cannot build bundle');
   process.exit(1);
 }
@@ -94,10 +94,6 @@ const cliConfig = {
     'process.env.GEMINI_SANDBOX_IMAGE_DEFAULT': JSON.stringify(
       pkg.config?.sandboxImageUri,
     ),
-    'process.env.NODE_ENV': JSON.stringify(
-      process.env.NODE_ENV || 'production',
-    ),
-    'process.env.DEV': JSON.stringify(process.env.DEV || 'false'),
   },
   plugins: createWasmPlugins(),
   alias: {
@@ -118,10 +114,6 @@ const a2aServerConfig = {
     __filename: '__chunk_filename',
     __dirname: '__chunk_dirname',
     'process.env.CLI_VERSION': JSON.stringify(pkg.version),
-    'process.env.NODE_ENV': JSON.stringify(
-      process.env.NODE_ENV || 'production',
-    ),
-    'process.env.DEV': JSON.stringify(process.env.DEV || 'false'),
   },
   plugins: createWasmPlugins(),
   alias: commonAliases,

eslint.config.js

@@ -41,11 +41,6 @@ const commonRestrictedSyntaxRules = [
     message:
       'Do not use typeof to check object properties. Define a TypeScript interface and a type guard function instead.',
   },
-  {
-    selector: 'CatchClause > Identifier[name=/^_/]',
-    message:
-      'Do not use underscored identifiers in catch blocks. If the error is unused, use "catch {}". If it is used, remove the underscore.',
-  },
 ];
 
 export default tseslint.config(
@@ -134,7 +129,7 @@ export default tseslint.config(
         {
           argsIgnorePattern: '^_',
           varsIgnorePattern: '^_',
-          caughtErrors: 'all',
+          caughtErrorsIgnorePattern: '^_',
         },
       ],
       // Prevent async errors from bypassing catch handlers
@@ -341,7 +336,7 @@ export default tseslint.config(
         {
           argsIgnorePattern: '^_',
           varsIgnorePattern: '^_',
-          caughtErrors: 'all',
+          caughtErrorsIgnorePattern: '^_',
         },
       ],
     },
@@ -365,7 +360,7 @@ export default tseslint.config(
         {
           argsIgnorePattern: '^_',
           varsIgnorePattern: '^_',
-          caughtErrors: 'all',
+          caughtErrorsIgnorePattern: '^_',
         },
       ],
     },
@@ -427,7 +422,7 @@ export default tseslint.config(
         {
           argsIgnorePattern: '^_',
           varsIgnorePattern: '^_',
-          caughtErrors: 'all',
+          caughtErrorsIgnorePattern: '^_',
         },
       ],
     },

evals/README.md

@@ -6,10 +6,6 @@ for changes to system prompts, tool definitions, and other model-steering
 mechanisms, and as a tool for assessing feature reliability by model, and
 preventing regressions.
 
-> [!TIP] **Agent Automation**: If you are pair-programming with Gemini CLI, you
-> can leverage the **behavioral-evals skill** to automate fixing failing tests
-> or promoting incubation candidates.
-
 ## Why Behavioral Evals?
 
 Unlike traditional **integration tests** which verify that the system functions
@@ -125,7 +121,7 @@ import { describe, expect } from 'vitest';
 import { evalTest } from './test-helper.js';
 
 describe('my_feature', () => {
-  // New tests MUST start as USUALLY_PASSES and be promoted based on consistency metrics
+  // New tests MUST start as USUALLY_PASSES and be promoted via /promote-behavioral-eval
   evalTest('USUALLY_PASSES', {
     name: 'should do something',
     prompt: 'do it',
@@ -187,10 +183,12 @@ mandatory deflaking process.
 
 1. **Incubation**: You must create all new tests with the `USUALLY_PASSES`
    policy. This lets them be monitored in the nightly runs without blocking PRs.
-2. **Monitoring**: The test must complete at least 7 nightly runs across all
+2. **Monitoring**: The test must complete at least 10 nightly runs across all
    supported models.
-3. **Promotion**: Promotion to `ALWAYS_PASSES` is conducted by the agent after
-   verifying the 100% success rate requirement is met across many runs.
+3. **Promotion**: Promotion to `ALWAYS_PASSES` happens exclusively through the
+   `/promote-behavioral-eval` slash command. This command verifies the 100%
+   success rate requirement is met across many runs before updating the test
+   policy.
 
 This promotion process is essential for preventing the introduction of flaky
 evaluations into the CI.
@@ -212,56 +210,6 @@ The nightly workflow executes the full evaluation suite multiple times
 (currently 3 attempts) to account for non-determinism. These results are
 aggregated into a **Nightly Summary** attached to the workflow run.
 
-## Regression Check Scripts
-
-The project includes several scripts to automate high-signal regression checking
-in Pull Requests. These can also be run locally for debugging.
-
-- **`scripts/get_trustworthy_evals.js`**: Analyzes nightly history to identify
-  stable tests (80%+ aggregate pass rate).
-- **`scripts/run_regression_check.js`**: Runs a specific set of tests using the
-  "Best-of-4" logic and "Dynamic Baseline Verification".
-- **`scripts/run_eval_regression.js`**: The main orchestrator that loops through
-  models and generates the final PR report.
-
-### Running Regression Checks Locally
-
-You can simulate the PR regression check locally to verify your changes before
-pushing:
-
-```bash
-# Run the full regression loop for a specific model
-MODEL_LIST=gemini-3-flash-preview node scripts/run_eval_regression.js
-```
-
-To debug a specific failing test with the same logic used in CI:
-
-```bash
-# 1. Get the Vitest pattern for trustworthy tests
-OUTPUT=$(node scripts/get_trustworthy_evals.js "gemini-3-flash-preview")
-
-# 2. Run the regression logic for those tests
-node scripts/run_regression_check.js "gemini-3-flash-preview" "$OUTPUT"
-```
-
-### The Regression Quality Bar
-
-Because LLMs are non-deterministic, the PR regression check uses a high-signal
-probabilistic approach rather than a 100% pass requirement:
-
-1.  **Trustworthiness (60/80 Filter):** Only tests with a proven track record
-    are run. A test must score at least **60% (2/3)** every single night and
-    maintain an **80% aggregate** pass rate over the last 6 days.
-2.  **The 50% Pass Rule:** In a PR, a test is considered a **Pass** if the model
-    correctly performs the behavior at least half the time (**2 successes** out
-    of up to 4 attempts).
-3.  **Dynamic Baseline Verification:** If a test fails in a PR (e.g., 0/3), the
-    system automatically checks the `main` branch. If it fails there too, it is
-    marked as **Pre-existing** and cleared for the PR, ensuring you are only
-    blocked by regressions caused by your specific changes.
-
-## Fixing Evaluations
-
 #### How to interpret the report:
 
 - **Pass Rate (%)**: Each cell represents the percentage of successful runs for
@@ -277,21 +225,42 @@ tool definition has made the model's behavior less reliable.
 
 ## Fixing Evaluations
 
-If an evaluation is failing or has a regressed pass rate, ask the agent to
-investigate and fix the issue using the **behavioral-evals skill**. The agent
-will automate the following process:
+If an evaluation is failing or has a regressed pass rate, you can use the
+`/fix-behavioral-eval` command within Gemini CLI to help investigate and fix the
+issue.
+
+### `/fix-behavioral-eval`
+
+This command is designed to automate the investigation and fixing process for
+failing evaluations. It will:
 
 1.  **Investigate**: Fetch the latest results from the nightly workflow using
     the `gh` CLI, identify the failing test, and review test trajectory logs in
     `evals/logs`.
 2.  **Fix**: Suggest and apply targeted fixes to the prompt or tool definitions.
-    It prioritizes minimal changes to `prompt.ts` and tool instructions,
-    avoiding changing the test itself unless necessary.
-3.  **Verify**: Re-run the test locally across multiple models to ensure
-    stability.
-4.  **Report**: Provide a summary of the success rate.
+    It prioritizes minimal changes to `prompt.ts`, tool instructions, and
+    modules that contribute to the prompt. It generally tries to avoid changing
+    the test itself.
+3.  **Verify**: Re-run the test 3 times across multiple models (e.g., Gemini
+    3.0, Gemini 3 Flash, Gemini 2.5 Pro) to ensure stability and calculate a
+    success rate.
+4.  **Report**: Provide a summary of the success rate for each model and details
+    on the applied fixes.
 
-When investigating failures manually, you can enable verbose agent logs by
+To use it, run:
+
+```bash
+gemini /fix-behavioral-eval
+```
+
+You can also provide a link to a specific GitHub Action run or the name of a
+specific test to focus the investigation:
+
+```bash
+gemini /fix-behavioral-eval https://github.com/google-gemini/gemini-cli/actions/runs/123456789
+```
+
+When investigating failures manually, you can also enable verbose agent logs by
 setting the `GEMINI_DEBUG_LOG_FILE` environment variable.
 
 ### Best practices
@@ -304,14 +273,25 @@ instrospecting on its prompt when asked the right questions.
 
 ## Promoting evaluations
 
-Evaluations must be promoted from `USUALLY_PASSES` to `ALWAYS_PASSES` by the
-agent to ensure that the 100% success rate requirement is empirically met.
+Evaluations must be promoted from `USUALLY_PASSES` to `ALWAYS_PASSES`
+exclusively using the `/promote-behavioral-eval` slash command. Manual promotion
+is not allowed to ensure that the 100% success rate requirement is empirically
+met.
 
-The agent automates the promotion by:
+### `/promote-behavioral-eval`
+
+This command automates the promotion of stable tests by:
 
 1.  **Investigating**: Analyzing the results of the last 7 nightly runs on the
-    `main` branch.
-2.  **Criteria Check**: Ensuring tests passed 100% of the time for ALL enabled
-    models.
-3.  **Promotion**: Updating the test file's policy to `ALWAYS_PASSES`.
+    `main` branch using the `gh` CLI.
+2.  **Criteria Check**: Identifying tests that have passed 100% of the time for
+    ALL enabled models across the entire 7-run history.
+3.  **Promotion**: Updating the test file's policy from `USUALLY_PASSES` to
+    `ALWAYS_PASSES`.
 4.  **Verification**: Running the promoted test locally to ensure correctness.
+
+To run it:
+
+```bash
+gemini /promote-behavioral-eval
+```

evals/app-test-helper.ts

@@ -79,7 +79,7 @@ export function appEvalTest(policy: EvalPolicy, evalCase: AppEvalCase) {
       }
 
       // Render the app!
-      await rig.render();
+      rig.render();
 
       // Wait for initial ready state
       await rig.waitForIdle();

evals/background_processes.eval.ts

@@ -1,77 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-import fs from 'node:fs';
-import path from 'node:path';
-
-describe('Background Process Monitoring', () => {
-  evalTest('USUALLY_PASSES', {
-    name: 'should naturally use read output tool to find token',
-    prompt:
-      "Run the script using 'bash generate_token.sh'. It will emit a token after a short delay and continue running. Find the token and tell me what it is.",
-    files: {
-      'generate_token.sh': `#!/bin/bash
-sleep 2
-echo "TOKEN=xyz123"
-sleep 100
-`,
-    },
-    setup: async (rig) => {
-      // Create .gemini directory to avoid file system error in test rig
-      if (rig.homeDir) {
-        const geminiDir = path.join(rig.homeDir, '.gemini');
-        fs.mkdirSync(geminiDir, { recursive: true });
-      }
-    },
-    assert: async (rig, result) => {
-      const toolCalls = rig.readToolLogs();
-
-      // Check if read_background_output was called
-      const hasReadCall = toolCalls.some(
-        (call) => call.toolRequest.name === 'read_background_output',
-      );
-
-      expect(
-        hasReadCall,
-        'Expected agent to call read_background_output to find the token',
-      ).toBe(true);
-
-      // Verify that the agent found the correct token
-      expect(
-        result.includes('xyz123'),
-        `Expected agent to find the token xyz123. Agent output: ${result}`,
-      ).toBe(true);
-    },
-  });
-
-  evalTest('USUALLY_PASSES', {
-    name: 'should naturally use list tool to verify multiple processes',
-    prompt:
-      "Start three background processes that run 'sleep 100', 'sleep 200', and 'sleep 300' respectively. Verify that all three are currently running.",
-    setup: async (rig) => {
-      // Create .gemini directory to avoid file system error in test rig
-      if (rig.homeDir) {
-        const geminiDir = path.join(rig.homeDir, '.gemini');
-        fs.mkdirSync(geminiDir, { recursive: true });
-      }
-    },
-    assert: async (rig, result) => {
-      const toolCalls = rig.readToolLogs();
-
-      // Check if list_background_processes was called
-      const hasListCall = toolCalls.some(
-        (call) => call.toolRequest.name === 'list_background_processes',
-      );
-
-      expect(
-        hasListCall,
-        'Expected agent to call list_background_processes',
-      ).toBe(true);
-    },
-  });
-});

evals/plan_mode.eval.ts

@@ -15,9 +15,7 @@ import {
 describe('plan_mode', () => {
   const TEST_PREFIX = 'Plan Mode: ';
   const settings = {
-    general: {
-      plan: { enabled: true },
-    },
+    experimental: { plan: true },
   };
 
   const getWriteTargets = (logs: any[]) =>
@@ -138,32 +136,6 @@ describe('plan_mode', () => {
       expect(wasToolCalled, 'Expected exit_plan_mode tool to be called').toBe(
         true,
       );
-
-      const toolLogs = rig.readToolLogs();
-      const exitPlanCall = toolLogs.find(
-        (log) => log.toolRequest.name === 'exit_plan_mode',
-      );
-      expect(
-        exitPlanCall,
-        'Expected to find exit_plan_mode in tool logs',
-      ).toBeDefined();
-
-      const args = JSON.parse(exitPlanCall!.toolRequest.args);
-      expect(args.plan_filename, 'plan_filename should be a string').toBeTypeOf(
-        'string',
-      );
-      expect(args.plan_filename, 'plan_filename should end with .md').toMatch(
-        /\.md$/,
-      );
-      expect(
-        args.plan_filename,
-        'plan_filename should not be a path',
-      ).not.toContain('/');
-      expect(
-        args.plan_filename,
-        'plan_filename should not be a path',
-      ).not.toContain('\\');
-
       assertModelHasOutput(result);
     },
   });
@@ -174,8 +146,7 @@ describe('plan_mode', () => {
     params: {
       settings,
     },
-    prompt:
-      'I agree with the strategy to use a JWT-based login. Create a plan for a new login feature.',
+    prompt: 'Create a plan for a new login feature.',
     assert: async (rig, result) => {
       await rig.waitForTelemetryReady();
       const toolLogs = rig.readToolLogs();
@@ -212,7 +183,7 @@ describe('plan_mode', () => {
         'import { sum } from "./mathUtils";\nconsole.log(sum(1, 2));',
     },
     prompt:
-      'I want to refactor our math utilities. I agree with the strategy to move the `sum` function from `src/mathUtils.ts` to a new file `src/basicMath.ts` and update `src/main.ts`. Please create a detailed implementation plan first, then execute it.',
+      'I want to refactor our math utilities. Move the `sum` function from `src/mathUtils.ts` to a new file `src/basicMath.ts` and update `src/main.ts` to use the new file. Please create a detailed implementation plan first, then execute it.',
     assert: async (rig, result) => {
       const enterPlanCalled = await rig.waitForToolCall('enter_plan_mode');
       expect(
@@ -228,30 +199,6 @@ describe('plan_mode', () => {
       await rig.waitForTelemetryReady();
       const toolLogs = rig.readToolLogs();
 
-      const exitPlanCall = toolLogs.find(
-        (log) => log.toolRequest.name === 'exit_plan_mode',
-      );
-      expect(
-        exitPlanCall,
-        'Expected to find exit_plan_mode in tool logs',
-      ).toBeDefined();
-
-      const args = JSON.parse(exitPlanCall!.toolRequest.args);
-      expect(args.plan_filename, 'plan_filename should be a string').toBeTypeOf(
-        'string',
-      );
-      expect(args.plan_filename, 'plan_filename should end with .md').toMatch(
-        /\.md$/,
-      );
-      expect(
-        args.plan_filename,
-        'plan_filename should not be a path',
-      ).not.toContain('/');
-      expect(
-        args.plan_filename,
-        'plan_filename should not be a path',
-      ).not.toContain('\\');
-
       // Check if plan was written
       const planWrite = toolLogs.find(
         (log) =>
@@ -284,80 +231,4 @@ describe('plan_mode', () => {
       assertModelHasOutput(result);
     },
   });
-
-  evalTest('ALWAYS_PASSES', {
-    name: 'should transition from plan mode to normal execution and create a plan file from scratch',
-    params: {
-      settings,
-    },
-    prompt:
-      'Enter plan mode and plan to create a new module called foo. The plan should be saved as foo-plan.md. Then, exit plan mode.',
-    assert: async (rig, result) => {
-      const enterPlanCalled = await rig.waitForToolCall('enter_plan_mode');
-      expect(
-        enterPlanCalled,
-        'Expected enter_plan_mode tool to be called',
-      ).toBe(true);
-
-      const exitPlanCalled = await rig.waitForToolCall('exit_plan_mode');
-      expect(exitPlanCalled, 'Expected exit_plan_mode tool to be called').toBe(
-        true,
-      );
-
-      await rig.waitForTelemetryReady();
-      const toolLogs = rig.readToolLogs();
-
-      // Check if the plan file was written successfully
-      const planWrite = toolLogs.find(
-        (log) =>
-          log.toolRequest.name === 'write_file' &&
-          log.toolRequest.args.includes('foo-plan.md'),
-      );
-
-      expect(
-        planWrite,
-        'Expected write_file to be called for foo-plan.md',
-      ).toBeDefined();
-
-      expect(
-        planWrite?.toolRequest.success,
-        `Expected write_file to succeed, but got error: ${planWrite?.toolRequest.error}`,
-      ).toBe(true);
-
-      assertModelHasOutput(result);
-    },
-  });
-
-  evalTest('USUALLY_PASSES', {
-    name: 'should not exit plan mode or draft before informal agreement',
-    approvalMode: ApprovalMode.PLAN,
-    params: {
-      settings,
-    },
-    prompt: 'I need to build a new login feature. Please plan it.',
-    assert: async (rig, result) => {
-      await rig.waitForTelemetryReady();
-      const toolLogs = rig.readToolLogs();
-
-      const exitPlanCall = toolLogs.find(
-        (log) => log.toolRequest.name === 'exit_plan_mode',
-      );
-      expect(
-        exitPlanCall,
-        'Should NOT call exit_plan_mode before informal agreement',
-      ).toBeUndefined();
-
-      const planWrite = toolLogs.find(
-        (log) =>
-          log.toolRequest.name === 'write_file' &&
-          log.toolRequest.args.includes('/plans/'),
-      );
-      expect(
-        planWrite,
-        'Should NOT draft the plan file before informal agreement',
-      ).toBeUndefined();
-
-      assertModelHasOutput(result);
-    },
-  });
 });

evals/redundant_casts.eval.ts

@@ -1,82 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-import path from 'node:path';
-import fs from 'node:fs/promises';
-
-describe('redundant_casts', () => {
-  evalTest('USUALLY_PASSES', {
-    name: 'should not add redundant or unsafe casts when modifying typescript code',
-    files: {
-      'src/cast_example.ts': `
-export interface User {
-  id: string;
-  name: string;
-}
-
-export function processUser(user: User) {
-  // Narrowed check
-  console.log("Processing user: " + user.name);
-}
-
-export function handleUnknown(data: unknown) {
-  // Goal: log data.id if it exists
-  console.log("Handling data");
-}
-
-export function handleError() {
-  try {
-    throw new Error("fail");
-  } catch (err) {
-    // Goal: log err.message
-    console.error("Error happened");
-  }
-}
-`,
-    },
-    prompt: `
-1. In src/cast_example.ts, update processUser to return the name in uppercase.
-2. In handleUnknown, log the "id" property if "data" is an object that contains it.
-3. In handleError, log the error message from "err".
-`,
-    assert: async (rig) => {
-      const filePath = path.join(rig.testDir!, 'src/cast_example.ts');
-      const content = await fs.readFile(filePath, 'utf-8');
-
-      // 1. Redundant Cast Check (Same type)
-      // Bad: (user.name as string).toUpperCase()
-      expect(content, 'Should not cast a known string to string').not.toContain(
-        'as string',
-      );
-
-      // 2. Unsafe Cast Check (Unknown object)
-      // Bad: (data as any).id or (data as {id: string}).id
-      expect(
-        content,
-        'Should not use unsafe casts for unknown property access',
-      ).not.toContain('as any');
-      expect(
-        content,
-        'Should not use unsafe casts for unknown property access',
-      ).not.toContain('as {');
-
-      // 3. Unsafe Cast Check (Error handling)
-      // Bad: (err as Error).message
-      // Good: if (err instanceof Error) { ... }
-      expect(
-        content,
-        'Should prefer instanceof over casting for errors',
-      ).not.toContain('as Error');
-
-      // Verify implementation
-      expect(content).toContain('toUpperCase()');
-      expect(content).toContain('message');
-      expect(content).toContain('id');
-    },
-  });
-});

evals/sandbox_recovery.eval.ts

@@ -1,42 +0,0 @@
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-
-describe('Sandbox recovery', () => {
-  evalTest('USUALLY_PASSES', {
-    name: 'attempts to use additional_permissions when operation not permitted',
-    prompt:
-      'Run ./script.sh. It will fail with "Operation not permitted". When it does, you must retry running it by passing the appropriate additional_permissions.',
-    files: {
-      'script.sh':
-        '#!/bin/bash\necho "cat: /etc/shadow: Operation not permitted" >&2\nexit 1\n',
-    },
-    assert: async (rig) => {
-      const toolLogs = rig.readToolLogs();
-      const shellCalls = toolLogs.filter(
-        (log) =>
-          log.toolRequest?.name === 'run_shell_command' &&
-          log.toolRequest?.args?.includes('script.sh'),
-      );
-
-      // The agent should have tried running the command.
-      expect(
-        shellCalls.length,
-        'Agent should have called run_shell_command',
-      ).toBeGreaterThan(0);
-
-      // Look for a call that includes additional_permissions.
-      const hasAdditionalPermissions = shellCalls.some((call) => {
-        const args =
-          typeof call.toolRequest.args === 'string'
-            ? JSON.parse(call.toolRequest.args)
-            : call.toolRequest.args;
-        return args.additional_permissions !== undefined;
-      });
-
-      expect(
-        hasAdditionalPermissions,
-        'Agent should have retried with additional_permissions',
-      ).toBe(true);
-    },
-  });
-});

evals/save_memory.eval.ts

@@ -227,136 +227,4 @@ describe('save_memory', () => {
       });
     },
   });
-
-  const proactiveMemoryFromLongSession =
-    'Agent saves preference from earlier in conversation history';
-  evalTest('USUALLY_PASSES', {
-    name: proactiveMemoryFromLongSession,
-    params: {
-      settings: {
-        experimental: { memoryManager: true },
-      },
-    },
-    messages: [
-      {
-        id: 'msg-1',
-        type: 'user',
-        content: [
-          {
-            text: 'By the way, I always prefer Vitest over Jest for testing in all my projects.',
-          },
-        ],
-        timestamp: '2026-01-01T00:00:00Z',
-      },
-      {
-        id: 'msg-2',
-        type: 'gemini',
-        content: [{ text: 'Noted! What are you working on today?' }],
-        timestamp: '2026-01-01T00:00:05Z',
-      },
-      {
-        id: 'msg-3',
-        type: 'user',
-        content: [
-          {
-            text: "I'm debugging a failing API endpoint. The /users route returns a 500 error.",
-          },
-        ],
-        timestamp: '2026-01-01T00:01:00Z',
-      },
-      {
-        id: 'msg-4',
-        type: 'gemini',
-        content: [
-          {
-            text: 'It looks like the database connection might not be initialized before the query runs.',
-          },
-        ],
-        timestamp: '2026-01-01T00:01:10Z',
-      },
-      {
-        id: 'msg-5',
-        type: 'user',
-        content: [
-          { text: 'Good catch — I fixed the import and the route works now.' },
-        ],
-        timestamp: '2026-01-01T00:02:00Z',
-      },
-      {
-        id: 'msg-6',
-        type: 'gemini',
-        content: [{ text: 'Great! Anything else you would like to work on?' }],
-        timestamp: '2026-01-01T00:02:05Z',
-      },
-    ],
-    prompt:
-      'Please save any persistent preferences or facts about me from our conversation to memory.',
-    assert: async (rig, result) => {
-      const wasToolCalled = await rig.waitForToolCall(
-        'save_memory',
-        undefined,
-        (args) => /vitest/i.test(args),
-      );
-      expect(
-        wasToolCalled,
-        'Expected save_memory to be called with the Vitest preference from the conversation history',
-      ).toBe(true);
-
-      assertModelHasOutput(result);
-    },
-  });
-
-  const memoryManagerRoutingPreferences =
-    'Agent routes global and project preferences to memory';
-  evalTest('USUALLY_PASSES', {
-    name: memoryManagerRoutingPreferences,
-    params: {
-      settings: {
-        experimental: { memoryManager: true },
-      },
-    },
-    messages: [
-      {
-        id: 'msg-1',
-        type: 'user',
-        content: [
-          {
-            text: 'I always use dark mode in all my editors and terminals.',
-          },
-        ],
-        timestamp: '2026-01-01T00:00:00Z',
-      },
-      {
-        id: 'msg-2',
-        type: 'gemini',
-        content: [{ text: 'Got it, I will keep that in mind!' }],
-        timestamp: '2026-01-01T00:00:05Z',
-      },
-      {
-        id: 'msg-3',
-        type: 'user',
-        content: [
-          {
-            text: 'For this project specifically, we use 2-space indentation.',
-          },
-        ],
-        timestamp: '2026-01-01T00:01:00Z',
-      },
-      {
-        id: 'msg-4',
-        type: 'gemini',
-        content: [
-          { text: 'Understood, 2-space indentation for this project.' },
-        ],
-        timestamp: '2026-01-01T00:01:05Z',
-      },
-    ],
-    prompt: 'Please save the preferences I mentioned earlier to memory.',
-    assert: async (rig, result) => {
-      const wasToolCalled = await rig.waitForToolCall('save_memory');
-      expect(wasToolCalled, 'Expected save_memory to be called').toBe(true);
-
-      assertModelHasOutput(result);
-    },
-  });
 });

evals/subagents.eval.ts

@@ -4,34 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import path from 'node:path';
+import { describe } from 'vitest';
+import { evalTest } from './test-helper.js';
 
-import { describe, expect } from 'vitest';
+const AGENT_DEFINITION = `---
+name: docs-agent
+description: An agent with expertise in updating documentation.
+tools:
+  - read_file
+  - write_file
+---
 
-import { evalTest, TEST_AGENTS } from './test-helper.js';
+You are the docs agent. Update the documentation.
+`;
 
-const INDEX_TS = 'export const add = (a: number, b: number) => a + b;\n';
-
-// A minimal package.json is used to provide a realistic workspace anchor.
-// This prevents the agent from making incorrect assumptions about the environment
-// and helps it properly navigate or act as if it is in a standard Node.js project.
-const MOCK_PACKAGE_JSON = JSON.stringify(
-  {
-    name: 'subagent-eval-project',
-    version: '1.0.0',
-    type: 'module',
-  },
-  null,
-  2,
-);
-
-function readProjectFile(
-  rig: { testDir: string | null },
-  relativePath: string,
-): string {
-  return fs.readFileSync(path.join(rig.testDir!, relativePath), 'utf8');
-}
+const INDEX_TS = 'export const add = (a: number, b: number) => a + b;';
 
 describe('subagent eval test cases', () => {
   /**
@@ -55,237 +42,12 @@ describe('subagent eval test cases', () => {
     },
     prompt: 'Please update README.md with a description of this library.',
     files: {
-      ...TEST_AGENTS.DOCS_AGENT.asFile(),
+      '.gemini/agents/test-agent.md': AGENT_DEFINITION,
       'index.ts': INDEX_TS,
-      'README.md': 'TODO: update the README.\n',
+      'README.md': 'TODO: update the README.',
     },
     assert: async (rig, _result) => {
-      await rig.expectToolCallSuccess([TEST_AGENTS.DOCS_AGENT.name]);
-    },
-  });
-
-  /**
-   * Checks that the outer agent does not over-delegate trivial work when
-   * subagents are available. This helps catch orchestration overuse.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should avoid delegating trivial direct edit work',
-    params: {
-      settings: {
-        experimental: {
-          enableAgents: true,
-          agents: {
-            overrides: {
-              generalist: { enabled: true },
-            },
-          },
-        },
-      },
-    },
-    prompt:
-      'Rename the exported function in index.ts from add to sum and update the file directly.',
-    files: {
-      ...TEST_AGENTS.DOCS_AGENT.asFile(),
-      'index.ts': INDEX_TS,
-    },
-    assert: async (rig, _result) => {
-      const updatedIndex = readProjectFile(rig, 'index.ts');
-      const toolLogs = rig.readToolLogs() as Array<{
-        toolRequest: { name: string };
-      }>;
-
-      expect(updatedIndex).toContain('export const sum =');
-      expect(
-        toolLogs.some(
-          (l) => l.toolRequest.name === TEST_AGENTS.DOCS_AGENT.name,
-        ),
-      ).toBe(false);
-      expect(toolLogs.some((l) => l.toolRequest.name === 'generalist')).toBe(
-        false,
-      );
-    },
-  });
-
-  /**
-   * Checks that the outer agent prefers a more relevant specialist over a
-   * broad generalist when both are available.
-   *
-   * This is meant to codify the "overusing Generalist" failure mode.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should prefer relevant specialist over generalist',
-    params: {
-      settings: {
-        experimental: {
-          enableAgents: true,
-          agents: {
-            overrides: {
-              generalist: { enabled: true },
-            },
-          },
-        },
-      },
-    },
-    prompt: 'Please add a small test file that verifies add(1, 2) returns 3.',
-    files: {
-      ...TEST_AGENTS.TESTING_AGENT.asFile(),
-      'index.ts': INDEX_TS,
-      'package.json': MOCK_PACKAGE_JSON,
-    },
-    assert: async (rig, _result) => {
-      const toolLogs = rig.readToolLogs() as Array<{
-        toolRequest: { name: string };
-      }>;
-
-      await rig.expectToolCallSuccess([TEST_AGENTS.TESTING_AGENT.name]);
-      expect(toolLogs.some((l) => l.toolRequest.name === 'generalist')).toBe(
-        false,
-      );
-    },
-  });
-
-  /**
-   * Checks cardinality and decomposition for a multi-surface task. The task
-   * naturally spans docs and tests, so multiple specialists should be used.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should use multiple relevant specialists for multi-surface task',
-    params: {
-      settings: {
-        experimental: {
-          enableAgents: true,
-          agents: {
-            overrides: {
-              generalist: { enabled: true },
-            },
-          },
-        },
-      },
-    },
-    prompt:
-      'Add a short README description for this library and also add a test file that verifies add(1, 2) returns 3.',
-    files: {
-      ...TEST_AGENTS.DOCS_AGENT.asFile(),
-      ...TEST_AGENTS.TESTING_AGENT.asFile(),
-      'index.ts': INDEX_TS,
-      'README.md': 'TODO: update the README.\n',
-      'package.json': MOCK_PACKAGE_JSON,
-    },
-    assert: async (rig, _result) => {
-      const toolLogs = rig.readToolLogs() as Array<{
-        toolRequest: { name: string };
-      }>;
-      const readme = readProjectFile(rig, 'README.md');
-
-      await rig.expectToolCallSuccess([
-        TEST_AGENTS.DOCS_AGENT.name,
-        TEST_AGENTS.TESTING_AGENT.name,
-      ]);
-      expect(readme).not.toContain('TODO: update the README.');
-      expect(toolLogs.some((l) => l.toolRequest.name === 'generalist')).toBe(
-        false,
-      );
-    },
-  });
-
-  /**
-   * Checks that the main agent can correctly select the appropriate subagent
-   * from a large pool of available subagents (10 total).
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should select the correct subagent from a pool of 10 different agents',
-    prompt: 'Please add a new SQL table migration for a user profile.',
-    files: {
-      ...TEST_AGENTS.DOCS_AGENT.asFile(),
-      ...TEST_AGENTS.TESTING_AGENT.asFile(),
-      ...TEST_AGENTS.DATABASE_AGENT.asFile(),
-      ...TEST_AGENTS.CSS_AGENT.asFile(),
-      ...TEST_AGENTS.I18N_AGENT.asFile(),
-      ...TEST_AGENTS.SECURITY_AGENT.asFile(),
-      ...TEST_AGENTS.DEVOPS_AGENT.asFile(),
-      ...TEST_AGENTS.ANALYTICS_AGENT.asFile(),
-      ...TEST_AGENTS.ACCESSIBILITY_AGENT.asFile(),
-      ...TEST_AGENTS.MOBILE_AGENT.asFile(),
-      'package.json': MOCK_PACKAGE_JSON,
-    },
-    assert: async (rig, _result) => {
-      const toolLogs = rig.readToolLogs() as Array<{
-        toolRequest: { name: string };
-      }>;
-      await rig.expectToolCallSuccess(['database-agent']);
-
-      // Ensure the generalist and other irrelevant specialists were not invoked
-      const uncalledAgents = [
-        'generalist',
-        TEST_AGENTS.DOCS_AGENT.name,
-        TEST_AGENTS.TESTING_AGENT.name,
-        TEST_AGENTS.CSS_AGENT.name,
-        TEST_AGENTS.I18N_AGENT.name,
-        TEST_AGENTS.SECURITY_AGENT.name,
-        TEST_AGENTS.DEVOPS_AGENT.name,
-        TEST_AGENTS.ANALYTICS_AGENT.name,
-        TEST_AGENTS.ACCESSIBILITY_AGENT.name,
-        TEST_AGENTS.MOBILE_AGENT.name,
-      ];
-
-      for (const agentName of uncalledAgents) {
-        expect(toolLogs.some((l) => l.toolRequest.name === agentName)).toBe(
-          false,
-        );
-      }
-    },
-  });
-
-  /**
-   * Checks that the main agent can correctly select the appropriate subagent
-   * from a large pool of available subagents, even when many irrelevant MCP tools are present.
-   *
-   * This test includes stress tests the subagent delegation with ~80 tools.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should select the correct subagent from a pool of 10 different agents with MCP tools present',
-    prompt: 'Please add a new SQL table migration for a user profile.',
-    setup: async (rig) => {
-      rig.addTestMcpServer('workspace-server', 'google-workspace');
-    },
-    files: {
-      ...TEST_AGENTS.DOCS_AGENT.asFile(),
-      ...TEST_AGENTS.TESTING_AGENT.asFile(),
-      ...TEST_AGENTS.DATABASE_AGENT.asFile(),
-      ...TEST_AGENTS.CSS_AGENT.asFile(),
-      ...TEST_AGENTS.I18N_AGENT.asFile(),
-      ...TEST_AGENTS.SECURITY_AGENT.asFile(),
-      ...TEST_AGENTS.DEVOPS_AGENT.asFile(),
-      ...TEST_AGENTS.ANALYTICS_AGENT.asFile(),
-      ...TEST_AGENTS.ACCESSIBILITY_AGENT.asFile(),
-      ...TEST_AGENTS.MOBILE_AGENT.asFile(),
-      'package.json': MOCK_PACKAGE_JSON,
-    },
-    assert: async (rig, _result) => {
-      const toolLogs = rig.readToolLogs() as Array<{
-        toolRequest: { name: string };
-      }>;
-      await rig.expectToolCallSuccess(['database-agent']);
-
-      // Ensure the generalist and other irrelevant specialists were not invoked
-      const uncalledAgents = [
-        'generalist',
-        TEST_AGENTS.DOCS_AGENT.name,
-        TEST_AGENTS.TESTING_AGENT.name,
-        TEST_AGENTS.CSS_AGENT.name,
-        TEST_AGENTS.I18N_AGENT.name,
-        TEST_AGENTS.SECURITY_AGENT.name,
-        TEST_AGENTS.DEVOPS_AGENT.name,
-        TEST_AGENTS.ANALYTICS_AGENT.name,
-        TEST_AGENTS.ACCESSIBILITY_AGENT.name,
-        TEST_AGENTS.MOBILE_AGENT.name,
-      ];
-
-      for (const agentName of uncalledAgents) {
-        expect(toolLogs.some((l) => l.toolRequest.name === agentName)).toBe(
-          false,
-        );
-      }
+      await rig.expectToolCallSuccess(['docs-agent']);
     },
   });
 });

evals/test-helper.test.ts

@@ -1,207 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import fs from 'node:fs';
-import path from 'node:path';
-import { internalEvalTest } from './test-helper.js';
-import { TestRig } from '@google/gemini-cli-test-utils';
-
-// Mock TestRig to control API success/failure
-vi.mock('@google/gemini-cli-test-utils', () => {
-  return {
-    TestRig: vi.fn().mockImplementation(() => ({
-      setup: vi.fn(),
-      run: vi.fn(),
-      cleanup: vi.fn(),
-      readToolLogs: vi.fn().mockReturnValue([]),
-      _lastRunStderr: '',
-    })),
-  };
-});
-
-describe('evalTest reliability logic', () => {
-  const LOG_DIR = path.resolve(process.cwd(), 'evals/logs');
-  const RELIABILITY_LOG = path.join(LOG_DIR, 'api-reliability.jsonl');
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    if (fs.existsSync(RELIABILITY_LOG)) {
-      fs.unlinkSync(RELIABILITY_LOG);
-    }
-  });
-
-  afterEach(() => {
-    if (fs.existsSync(RELIABILITY_LOG)) {
-      fs.unlinkSync(RELIABILITY_LOG);
-    }
-  });
-
-  it('should retry 3 times on 500 INTERNAL error and then SKIP', async () => {
-    const mockRig = new TestRig() as any;
-    (TestRig as any).mockReturnValue(mockRig);
-
-    // Simulate permanent 500 error
-    mockRig.run.mockRejectedValue(new Error('status: INTERNAL - API Down'));
-
-    // Execute the test function directly
-    await internalEvalTest({
-      name: 'test-api-failure',
-      prompt: 'do something',
-      assert: async () => {},
-    });
-
-    // Verify retries: 1 initial + 3 retries = 4 setups/runs
-    expect(mockRig.run).toHaveBeenCalledTimes(4);
-
-    // Verify log content
-    const logContent = fs
-      .readFileSync(RELIABILITY_LOG, 'utf-8')
-      .trim()
-      .split('\n');
-    expect(logContent.length).toBe(4);
-
-    const entries = logContent.map((line) => JSON.parse(line));
-    expect(entries[0].status).toBe('RETRY');
-    expect(entries[0].attempt).toBe(0);
-    expect(entries[3].status).toBe('SKIP');
-    expect(entries[3].attempt).toBe(3);
-    expect(entries[3].testName).toBe('test-api-failure');
-  });
-
-  it('should fail immediately on non-500 errors (like assertion failures)', async () => {
-    const mockRig = new TestRig() as any;
-    (TestRig as any).mockReturnValue(mockRig);
-
-    // Simulate a real logic error/bug
-    mockRig.run.mockResolvedValue('Success');
-    const assertError = new Error('Assertion failed: expected foo to be bar');
-
-    // Expect the test function to throw immediately
-    await expect(
-      internalEvalTest({
-        name: 'test-logic-failure',
-        prompt: 'do something',
-        assert: async () => {
-          throw assertError;
-        },
-      }),
-    ).rejects.toThrow('Assertion failed');
-
-    // Verify NO retries: only 1 attempt
-    expect(mockRig.run).toHaveBeenCalledTimes(1);
-
-    // Verify NO reliability log was created (it's not an API error)
-    expect(fs.existsSync(RELIABILITY_LOG)).toBe(false);
-  });
-
-  it('should recover if a retry succeeds', async () => {
-    const mockRig = new TestRig() as any;
-    (TestRig as any).mockReturnValue(mockRig);
-
-    // Fail once, then succeed
-    mockRig.run
-      .mockRejectedValueOnce(new Error('status: INTERNAL'))
-      .mockResolvedValueOnce('Success');
-
-    await internalEvalTest({
-      name: 'test-recovery',
-      prompt: 'do something',
-      assert: async () => {},
-    });
-
-    // Ran twice: initial (fail) + retry 1 (success)
-    expect(mockRig.run).toHaveBeenCalledTimes(2);
-
-    // Log should only have the one RETRY entry
-    const logContent = fs
-      .readFileSync(RELIABILITY_LOG, 'utf-8')
-      .trim()
-      .split('\n');
-    expect(logContent.length).toBe(1);
-    expect(JSON.parse(logContent[0]).status).toBe('RETRY');
-  });
-
-  it('should retry 3 times on 503 UNAVAILABLE error and then SKIP', async () => {
-    const mockRig = new TestRig() as any;
-    (TestRig as any).mockReturnValue(mockRig);
-
-    // Simulate permanent 503 error
-    mockRig.run.mockRejectedValue(
-      new Error('status: UNAVAILABLE - Service Busy'),
-    );
-
-    await internalEvalTest({
-      name: 'test-api-503',
-      prompt: 'do something',
-      assert: async () => {},
-    });
-
-    expect(mockRig.run).toHaveBeenCalledTimes(4);
-
-    const logContent = fs
-      .readFileSync(RELIABILITY_LOG, 'utf-8')
-      .trim()
-      .split('\n');
-    const entries = logContent.map((line) => JSON.parse(line));
-    expect(entries[0].errorCode).toBe('503');
-    expect(entries[3].status).toBe('SKIP');
-  });
-
-  it('should throw if an absolute path is used in files', async () => {
-    const mockRig = new TestRig() as any;
-    (TestRig as any).mockReturnValue(mockRig);
-    mockRig.testDir = path.resolve(process.cwd(), 'test-dir-tmp');
-    if (!fs.existsSync(mockRig.testDir)) {
-      fs.mkdirSync(mockRig.testDir, { recursive: true });
-    }
-
-    try {
-      await expect(
-        internalEvalTest({
-          name: 'test-absolute-path',
-          prompt: 'do something',
-          files: {
-            '/etc/passwd': 'hacked',
-          },
-          assert: async () => {},
-        }),
-      ).rejects.toThrow('Invalid file path in test case: /etc/passwd');
-    } finally {
-      if (fs.existsSync(mockRig.testDir)) {
-        fs.rmSync(mockRig.testDir, { recursive: true, force: true });
-      }
-    }
-  });
-
-  it('should throw if directory traversal is detected in files', async () => {
-    const mockRig = new TestRig() as any;
-    (TestRig as any).mockReturnValue(mockRig);
-    mockRig.testDir = path.resolve(process.cwd(), 'test-dir-tmp');
-
-    // Create a mock test-dir
-    if (!fs.existsSync(mockRig.testDir)) {
-      fs.mkdirSync(mockRig.testDir, { recursive: true });
-    }
-
-    try {
-      await expect(
-        internalEvalTest({
-          name: 'test-traversal',
-          prompt: 'do something',
-          files: {
-            '../sensitive.txt': 'hacked',
-          },
-          assert: async () => {},
-        }),
-      ).rejects.toThrow('Invalid file path in test case: ../sensitive.txt');
-    } finally {
-      if (fs.existsSync(mockRig.testDir)) {
-        fs.rmSync(mockRig.testDir, { recursive: true, force: true });
-      }
-    }
-  });
-});

evals/test-helper.ts

@@ -13,9 +13,6 @@ import { TestRig } from '@google/gemini-cli-test-utils';
 import {
   createUnauthorizedToolError,
   parseAgentMarkdown,
-  Storage,
-  getProjectHash,
-  SESSION_FILE_PREFIX,
 } from '@google/gemini-cli-core';
 
 export * from '@google/gemini-cli-test-utils';
@@ -39,89 +36,89 @@ export * from '@google/gemini-cli-test-utils';
 export type EvalPolicy = 'ALWAYS_PASSES' | 'USUALLY_PASSES';
 
 export function evalTest(policy: EvalPolicy, evalCase: EvalCase) {
-  runEval(
-    policy,
-    evalCase.name,
-    () => internalEvalTest(evalCase),
-    evalCase.timeout,
-  );
-}
-
-export async function internalEvalTest(evalCase: EvalCase) {
-  const maxRetries = 3;
-  let attempt = 0;
-
-  while (attempt <= maxRetries) {
+  const fn = async () => {
     const rig = new TestRig();
     const { logDir, sanitizedName } = await prepareLogDir(evalCase.name);
     const activityLogFile = path.join(logDir, `${sanitizedName}.jsonl`);
     const logFile = path.join(logDir, `${sanitizedName}.log`);
     let isSuccess = false;
-
     try {
       rig.setup(evalCase.name, evalCase.params);
 
-      if (evalCase.setup) {
-        await evalCase.setup(rig);
-      }
-
-      if (evalCase.files) {
-        await setupTestFiles(rig, evalCase.files);
-      }
-
+      // Symlink node modules to reduce the amount of time needed to
+      // bootstrap test projects.
       symlinkNodeModules(rig.testDir || '');
 
-      // If messages are provided, write a session file so --resume can load it.
-      let sessionId: string | undefined;
-      if (evalCase.messages) {
-        sessionId =
-          evalCase.sessionId ||
-          `test-session-${crypto.randomUUID().slice(0, 8)}`;
+      if (evalCase.files) {
+        const acknowledgedAgents: Record<string, Record<string, string>> = {};
+        const projectRoot = fs.realpathSync(rig.testDir!);
 
-        // Temporarily set GEMINI_CLI_HOME so Storage writes to the same
-        // directory the CLI subprocess will use (rig.homeDir).
-        const originalGeminiHome = process.env['GEMINI_CLI_HOME'];
-        process.env['GEMINI_CLI_HOME'] = rig.homeDir!;
-        try {
-          const storage = new Storage(fs.realpathSync(rig.testDir!));
-          await storage.initialize();
-          const chatsDir = path.join(storage.getProjectTempDir(), 'chats');
-          fs.mkdirSync(chatsDir, { recursive: true });
+        for (const [filePath, content] of Object.entries(evalCase.files)) {
+          const fullPath = path.join(rig.testDir!, filePath);
+          fs.mkdirSync(path.dirname(fullPath), { recursive: true });
+          fs.writeFileSync(fullPath, content);
 
-          const conversation = {
-            sessionId,
-            projectHash: getProjectHash(fs.realpathSync(rig.testDir!)),
-            startTime: new Date().toISOString(),
-            lastUpdated: new Date().toISOString(),
-            messages: evalCase.messages,
-          };
+          // If it's an agent file, calculate hash for acknowledgement
+          if (
+            filePath.startsWith('.gemini/agents/') &&
+            filePath.endsWith('.md')
+          ) {
+            const hash = crypto
+              .createHash('sha256')
+              .update(content)
+              .digest('hex');
 
-          const timestamp = new Date()
-            .toISOString()
-            .slice(0, 16)
-            .replace(/:/g, '-');
-          const filename = `${SESSION_FILE_PREFIX}${timestamp}-${sessionId.slice(0, 8)}.json`;
-          fs.writeFileSync(
-            path.join(chatsDir, filename),
-            JSON.stringify(conversation, null, 2),
-          );
-        } catch (e) {
-          // Storage initialization may fail in some environments; log and continue.
-          console.warn('Failed to write session history:', e);
-        } finally {
-          // Restore original GEMINI_CLI_HOME.
-          if (originalGeminiHome === undefined) {
-            delete process.env['GEMINI_CLI_HOME'];
-          } else {
-            process.env['GEMINI_CLI_HOME'] = originalGeminiHome;
+            try {
+              const agentDefs = await parseAgentMarkdown(fullPath, content);
+              if (agentDefs.length > 0) {
+                const agentName = agentDefs[0].name;
+                if (!acknowledgedAgents[projectRoot]) {
+                  acknowledgedAgents[projectRoot] = {};
+                }
+                acknowledgedAgents[projectRoot][agentName] = hash;
+              }
+            } catch (error) {
+              console.warn(
+                `Failed to parse agent for test acknowledgement: ${filePath}`,
+                error,
+              );
+            }
           }
         }
+
+        // Write acknowledged_agents.json to the home directory
+        if (Object.keys(acknowledgedAgents).length > 0) {
+          const ackPath = path.join(
+            rig.homeDir!,
+            '.gemini',
+            'acknowledgments',
+            'agents.json',
+          );
+          fs.mkdirSync(path.dirname(ackPath), { recursive: true });
+          fs.writeFileSync(
+            ackPath,
+            JSON.stringify(acknowledgedAgents, null, 2),
+          );
+        }
+
+        const execOptions = { cwd: rig.testDir!, stdio: 'inherit' as const };
+        execSync('git init', execOptions);
+        execSync('git config user.email "test@example.com"', execOptions);
+        execSync('git config user.name "Test User"', execOptions);
+
+        // Temporarily disable the interactive editor and git pager
+        // to avoid hanging the tests. It seems the the agent isn't
+        // consistently honoring the instructions to avoid interactive
+        // commands.
+        execSync('git config core.editor "true"', execOptions);
+        execSync('git config core.pager "cat"', execOptions);
+        execSync('git config commit.gpgsign false', execOptions);
+        execSync('git add .', execOptions);
+        execSync('git commit --allow-empty -m "Initial commit"', execOptions);
       }
 
       const result = await rig.run({
-        args: sessionId
-          ? ['--resume', sessionId, evalCase.prompt]
-          : evalCase.prompt,
+        args: evalCase.prompt,
         approvalMode: evalCase.approvalMode ?? 'yolo',
         timeout: evalCase.timeout,
         env: {
@@ -139,37 +136,6 @@ export async function internalEvalTest(evalCase: EvalCase) {
 
       await evalCase.assert(rig, result);
       isSuccess = true;
-      return; // Success! Exit the retry loop.
-    } catch (error: unknown) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
-      const errorCode = getApiErrorCode(errorMessage);
-
-      if (errorCode) {
-        const status = attempt < maxRetries ? 'RETRY' : 'SKIP';
-        logReliabilityEvent(
-          evalCase.name,
-          attempt,
-          status,
-          errorCode,
-          errorMessage,
-        );
-
-        if (attempt < maxRetries) {
-          attempt++;
-          console.warn(
-            `[Eval] Attempt ${attempt} failed with ${errorCode} Error. Retrying...`,
-          );
-          continue; // Retry
-        }
-
-        console.warn(
-          `[Eval] '${evalCase.name}' failed after ${maxRetries} retries due to persistent API errors. Skipping failure to avoid blocking PR.`,
-        );
-        return; // Gracefully exit without failing the test
-      }
-
-      throw error; // Real failure
     } finally {
       if (isSuccess) {
         await fs.promises.unlink(activityLogFile).catch((err) => {
@@ -188,131 +154,9 @@ export async function internalEvalTest(evalCase: EvalCase) {
       );
       await rig.cleanup();
     }
-  }
-}
-
-function getApiErrorCode(message: string): '500' | '503' | undefined {
-  if (
-    message.includes('status: UNAVAILABLE') ||
-    message.includes('code: 503') ||
-    message.includes('Service Unavailable')
-  ) {
-    return '503';
-  }
-  if (
-    message.includes('status: INTERNAL') ||
-    message.includes('code: 500') ||
-    message.includes('Internal error encountered')
-  ) {
-    return '500';
-  }
-  return undefined;
-}
-
-/**
- * Log reliability event for later harvesting.
- *
- * Note: Uses synchronous file I/O to ensure the log is persisted even if the
- * test process is abruptly terminated by a timeout or CI crash. Performance
- * impact is negligible compared to long-running evaluation tests.
- */
-function logReliabilityEvent(
-  testName: string,
-  attempt: number,
-  status: 'RETRY' | 'SKIP',
-  errorCode: '500' | '503',
-  errorMessage: string,
-) {
-  const reliabilityLog = {
-    timestamp: new Date().toISOString(),
-    testName,
-    model: process.env.GEMINI_MODEL || 'unknown',
-    attempt,
-    status,
-    errorCode,
-    error: errorMessage,
   };
 
-  try {
-    const relDir = path.resolve(process.cwd(), 'evals/logs');
-    fs.mkdirSync(relDir, { recursive: true });
-    fs.appendFileSync(
-      path.join(relDir, 'api-reliability.jsonl'),
-      JSON.stringify(reliabilityLog) + '\n',
-    );
-  } catch (logError) {
-    console.error('Failed to write reliability log:', logError);
-  }
-}
-
-/**
- * Helper to setup test files and git repository.
- *
- * Note: While this is an async function (due to parseAgentMarkdown), it
- * intentionally uses synchronous filesystem and child_process operations
- * for simplicity and to ensure sequential environment preparation.
- */
-async function setupTestFiles(rig: TestRig, files: Record<string, string>) {
-  const acknowledgedAgents: Record<string, Record<string, string>> = {};
-  const projectRoot = fs.realpathSync(rig.testDir!);
-
-  for (const [filePath, content] of Object.entries(files)) {
-    if (filePath.includes('..') || path.isAbsolute(filePath)) {
-      throw new Error(`Invalid file path in test case: ${filePath}`);
-    }
-    const fullPath = path.join(projectRoot, filePath);
-    if (!fullPath.startsWith(projectRoot)) {
-      throw new Error(`Path traversal detected: ${filePath}`);
-    }
-
-    fs.mkdirSync(path.dirname(fullPath), { recursive: true });
-    fs.writeFileSync(fullPath, content);
-
-    if (filePath.startsWith('.gemini/agents/') && filePath.endsWith('.md')) {
-      const hash = crypto.createHash('sha256').update(content).digest('hex');
-      try {
-        const agentDefs = await parseAgentMarkdown(fullPath, content);
-        if (agentDefs.length > 0) {
-          const agentName = agentDefs[0].name;
-          if (!acknowledgedAgents[projectRoot]) {
-            acknowledgedAgents[projectRoot] = {};
-          }
-          acknowledgedAgents[projectRoot][agentName] = hash;
-        }
-      } catch (error) {
-        console.warn(
-          `Failed to parse agent for test acknowledgement: ${filePath}`,
-          error,
-        );
-      }
-    }
-  }
-
-  if (Object.keys(acknowledgedAgents).length > 0) {
-    const ackPath = path.join(
-      rig.homeDir!,
-      '.gemini',
-      'acknowledgments',
-      'agents.json',
-    );
-    fs.mkdirSync(path.dirname(ackPath), { recursive: true });
-    fs.writeFileSync(ackPath, JSON.stringify(acknowledgedAgents, null, 2));
-  }
-
-  const execOptions = { cwd: rig.testDir!, stdio: 'inherit' as const };
-  execSync('git init --initial-branch=main', execOptions);
-  execSync('git config user.email "test@example.com"', execOptions);
-  execSync('git config user.name "Test User"', execOptions);
-
-  // Temporarily disable the interactive editor and git pager
-  // to avoid hanging the tests. It seems the the agent isn't
-  // consistently honoring the instructions to avoid interactive
-  // commands.
-  execSync('git config core.editor "true"', execOptions);
-  execSync('git config core.pager "cat"', execOptions);
-  execSync('git config commit.gpgsign false', execOptions);
-  execSync('git add .', execOptions);
-  execSync('git commit --allow-empty -m "Initial commit"', execOptions);
+  runEval(policy, evalCase.name, fn, evalCase.timeout);
 }
 
 /**
@@ -375,11 +219,6 @@ export interface EvalCase {
   prompt: string;
   timeout?: number;
   files?: Record<string, string>;
-  setup?: (rig: TestRig) => Promise<void> | void;
-  /** Conversation history to pre-load via --resume. Each entry is a message object with type, content, etc. */
-  messages?: Record<string, unknown>[];
-  /** Session ID for the resumed session. Auto-generated if not provided. */
-  sessionId?: string;
   approvalMode?: 'default' | 'auto_edit' | 'yolo' | 'plan';
   assert: (rig: TestRig, result: string) => Promise<void>;
 }

evals/tracker.eval.ts

@@ -113,21 +113,4 @@ describe('tracker_mode', () => {
       assertModelHasOutput(result);
     },
   });
-
-  evalTest('USUALLY_PASSES', {
-    name: 'should correctly identify the task tracker storage location from the system prompt',
-    params: {
-      settings: { experimental: { taskTracker: true } },
-    },
-    prompt:
-      'Where is my task tracker storage located? Please provide the absolute path in your response.',
-    assert: async (rig, result) => {
-      // The rig sets GEMINI_CLI_HOME to rig.homeDir
-      const homeDir = rig.homeDir!;
-      // The response should contain the dynamic path which includes the home directory
-      // and follows the .gemini/tmp/.../tracker structure.
-      expect(result).toContain(homeDir);
-      expect(result).toMatch(/\.gemini\/tmp\/.*\/tracker/);
-    },
-  });
 });

evals/unsafe-cloning.eval.ts

@@ -1,64 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { evalTest, TestRig } from './test-helper.js';
-
-evalTest('USUALLY_PASSES', {
-  name: 'Reproduction: Agent uses Object.create() for cloning/delegation',
-  prompt:
-    'Create a utility function `createScopedConfig(config: Config, additionalDirectories: string[]): Config` in `packages/core/src/config/scoped-config.ts` that returns a new Config instance. This instance should override `getWorkspaceContext()` to include the additional directories, but delegate all other method calls (like `isPathAllowed` or `validatePathAccess`) to the original config. Note that `Config` is a complex class with private state and cannot be easily shallow-copied or reconstructed.',
-  files: {
-    'packages/core/src/config/config.ts': `
-export class Config {
-  private _internalState = 'secret';
-  constructor(private workspaceContext: any) {}
-  getWorkspaceContext() { return this.workspaceContext; }
-  isPathAllowed(path: string) {
-    return this.getWorkspaceContext().isPathWithinWorkspace(path);
-  }
-  validatePathAccess(path: string) {
-    if (!this.isPathAllowed(path)) return 'Denied';
-    return null;
-  }
-}`,
-    'packages/core/src/utils/workspaceContext.ts': `
-export class WorkspaceContext {
-  constructor(private root: string, private additional: string[] = []) {}
-  getDirectories() { return [this.root, ...this.additional]; }
-  isPathWithinWorkspace(path: string) {
-    return this.getDirectories().some(d => path.startsWith(d));
-  }
-}`,
-    'package.json': JSON.stringify({
-      name: 'test-project',
-      version: '1.0.0',
-      type: 'module',
-    }),
-  },
-  assert: async (rig: TestRig) => {
-    const filePath = 'packages/core/src/config/scoped-config.ts';
-    const content = rig.readFile(filePath);
-
-    if (!content) {
-      throw new Error(`File ${filePath} was not created.`);
-    }
-
-    // Strip comments to avoid false positives.
-    const codeWithoutComments = content.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, '');
-
-    // Ensure that the agent did not use Object.create() in the implementation.
-    // We check for the call pattern specifically using a regex to avoid false positives in comments.
-    const hasObjectCreate = /\bObject\.create\s*\(/.test(codeWithoutComments);
-    if (hasObjectCreate) {
-      throw new Error(
-        'Evaluation Failed: Agent used Object.create() for cloning. ' +
-          'This behavior is forbidden by the project lint rules (no-restricted-syntax). ' +
-          'Implementation found:\n\n' +
-          content,
-      );
-    }
-  },
-});

evals/update_topic.eval.ts

@@ -1,261 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, expect } from 'vitest';
-import fs from 'node:fs';
-import path from 'node:path';
-import { evalTest } from './test-helper.js';
-
-describe('update_topic_behavior', () => {
-  // Constants for tool names and params for robustness
-  const UPDATE_TOPIC_TOOL_NAME = 'update_topic';
-
-  /**
-   * Verifies the desired behavior of the update_topic tool. update_topic is used by the
-   * agent to share periodic, concise updates about what the agent is working on, independent
-   * of the regular model output and/or thoughts. This tool is expected to be called at least
-   * at the start and end of the session, and typically at least once in the middle, but no
-   * more than 1/4 turns.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'update_topic should be used at start, end and middle for complex tasks',
-    prompt: `Create a simple users REST API using Express. 
-1. Initialize a new npm project and install express.
-2. Create src/app.ts as the main entry point.
-3. Create src/routes/userRoutes.ts for user routes.
-4. Create src/controllers/userController.ts for user logic.
-5. Implement GET /users, POST /users, and GET /users/:id using an in-memory array.
-6. Add a 'start' script to package.json.
-7. Finally, run a quick grep to verify the routes are in src/app.ts.`,
-    files: {
-      'package.json': JSON.stringify(
-        {
-          name: 'users-api',
-          version: '1.0.0',
-          private: true,
-        },
-        null,
-        2,
-      ),
-      '.gemini/settings.json': JSON.stringify({
-        experimental: {
-          topicUpdateNarration: true,
-        },
-      }),
-    },
-    assert: async (rig, result) => {
-      const toolLogs = rig.readToolLogs();
-      const topicCalls = toolLogs.filter(
-        (l) => l.toolRequest.name === UPDATE_TOPIC_TOOL_NAME,
-      );
-
-      // 1. Assert that update_topic is called at least 3 times (start, middle, end)
-      expect(
-        topicCalls.length,
-        `Expected at least 3 update_topic calls, but found ${topicCalls.length}`,
-      ).toBeGreaterThanOrEqual(3);
-
-      // 2. Assert update_topic is called at the very beginning (first tool call)
-      expect(
-        toolLogs[0].toolRequest.name,
-        'First tool call should be update_topic',
-      ).toBe(UPDATE_TOPIC_TOOL_NAME);
-
-      // 3. Assert update_topic is called near the end
-      const lastTopicCallIndex = toolLogs
-        .map((l) => l.toolRequest.name)
-        .lastIndexOf(UPDATE_TOPIC_TOOL_NAME);
-      expect(
-        lastTopicCallIndex,
-        'Expected update_topic to be used near the end of the task',
-      ).toBeGreaterThanOrEqual(toolLogs.length * 0.7);
-
-      // 4. Assert there is at least one update_topic call in the middle (between start and end phases)
-      const middleTopicCalls = topicCalls.slice(1, -1);
-
-      expect(
-        middleTopicCalls.length,
-        'Expected at least one update_topic call in the middle of the task',
-      ).toBeGreaterThanOrEqual(1);
-
-      // 5. Turn Ratio Assertion: update_topic should be <= 1/2 of total turns.
-      // We only enforce this for tasks that take more than 5 turns, as shorter tasks
-      // naturally have a higher ratio when following the "start, middle, end" rule.
-      const uniquePromptIds = new Set(
-        toolLogs
-          .map((l) => l.toolRequest.prompt_id)
-          .filter((id) => id !== undefined),
-      );
-      const totalTurns = uniquePromptIds.size;
-
-      if (totalTurns > 5) {
-        const topicTurns = new Set(
-          topicCalls
-            .map((l) => l.toolRequest.prompt_id)
-            .filter((id) => id !== undefined),
-        );
-        const topicTurnCount = topicTurns.size;
-
-        const ratio = topicTurnCount / totalTurns;
-
-        expect(
-          ratio,
-          `update_topic was used in ${topicTurnCount} out of ${totalTurns} turns (${(ratio * 100).toFixed(1)}%). Expected <= 50%.`,
-        ).toBeLessThanOrEqual(0.5);
-
-        // Ideal ratio is closer to 1/5 (20%). We log high usage as a warning.
-        if (ratio > 0.25) {
-          console.warn(
-            `[Efficiency Warning] update_topic usage is high: ${(ratio * 100).toFixed(1)}% (Goal: ~20%)`,
-          );
-        }
-      }
-    },
-  });
-
-  evalTest('USUALLY_PASSES', {
-    name: 'update_topic should NOT be used for informational coding tasks (Obvious)',
-    approvalMode: 'default',
-    prompt:
-      'Explain the difference between Map and Object in JavaScript and provide a performance-focused code snippet for each.',
-    files: {
-      '.gemini/settings.json': JSON.stringify({
-        experimental: {
-          topicUpdateNarration: true,
-        },
-      }),
-    },
-    assert: async (rig) => {
-      const toolLogs = rig.readToolLogs();
-      const topicCalls = toolLogs.filter(
-        (l) => l.toolRequest.name === UPDATE_TOPIC_TOOL_NAME,
-      );
-
-      expect(
-        topicCalls.length,
-        `Expected 0 update_topic calls for an informational task, but found ${topicCalls.length}`,
-      ).toBe(0);
-    },
-  });
-
-  evalTest('USUALLY_PASSES', {
-    name: 'update_topic should NOT be used for surgical symbol searches (Grey Area)',
-    approvalMode: 'default',
-    prompt:
-      "Find the file where the 'UPDATE_TOPIC_TOOL_NAME' constant is defined.",
-    files: {
-      'packages/core/src/tools/tool-names.ts':
-        "export const UPDATE_TOPIC_TOOL_NAME = 'update_topic';",
-      '.gemini/settings.json': JSON.stringify({
-        experimental: {
-          topicUpdateNarration: true,
-        },
-      }),
-    },
-    assert: async (rig) => {
-      const toolLogs = rig.readToolLogs();
-      const topicCalls = toolLogs.filter(
-        (l) => l.toolRequest.name === UPDATE_TOPIC_TOOL_NAME,
-      );
-
-      expect(
-        topicCalls.length,
-        `Expected 0 update_topic calls for a surgical symbol search, but found ${topicCalls.length}`,
-      ).toBe(0);
-    },
-  });
-
-  evalTest('USUALLY_PASSES', {
-    name: 'update_topic should be used for medium complexity multi-step tasks',
-    prompt:
-      'Refactor the `users-api` project. Move the routing logic from src/app.ts into a new file src/routes.ts, and update app.ts to use the new routes file.',
-    files: {
-      'package.json': JSON.stringify(
-        {
-          name: 'users-api',
-          version: '1.0.0',
-        },
-        null,
-        2,
-      ),
-      'src/app.ts': `
-import express from 'express';
-const app = express();
-
-app.get('/users', (req, res) => {
-  res.json([{id: 1, name: 'Alice'}]);
-});
-
-app.post('/users', (req, res) => {
-  res.status(201).send();
-});
-
-export default app;
-      `,
-      '.gemini/settings.json': JSON.stringify({
-        experimental: {
-          topicUpdateNarration: true,
-        },
-      }),
-    },
-    assert: async (rig) => {
-      const toolLogs = rig.readToolLogs();
-      const topicCalls = toolLogs.filter(
-        (l) => l.toolRequest.name === UPDATE_TOPIC_TOOL_NAME,
-      );
-
-      // This is a multi-step task (read, create new file, edit old file).
-      // It should clear the bar and use update_topic at least at the start and end.
-      expect(topicCalls.length).toBeGreaterThanOrEqual(2);
-
-      // Verify it actually did the refactoring to ensure it didn't just fail immediately
-      expect(fs.existsSync(path.join(rig.testDir, 'src/routes.ts'))).toBe(true);
-    },
-  });
-
-  /**
-   * Regression test for a bug where update_topic was called multiple times in a
-   * row. We have seen cases of this occurring in earlier versions of the update_topic
-   * system instruction, prior to https://github.com/google-gemini/gemini-cli/pull/24640.
-   * This test demonstrated that there are cases where it can still occur and validates
-   * the prompt change that improves the behavior.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'update_topic should not be called twice in a row',
-    prompt: `
-      We need to build a C compiler.
-
-      Before you write any code, you must formally declare your strategy.
-      First, declare that you will build a Lexer.
-      Then, immediately realize that is wrong and declare that you will actually build a Parser instead.
-
-      Finally, create 'parser.c'.
-    `,
-    files: {
-      'package.json': JSON.stringify({ name: 'test-project' }),
-      '.gemini/settings.json': JSON.stringify({
-        experimental: {
-          topicUpdateNarration: true,
-        },
-      }),
-    },
-    assert: async (rig) => {
-      const toolLogs = rig.readToolLogs();
-
-      // Check for back-to-back update_topic calls
-      for (let i = 1; i < toolLogs.length; i++) {
-        if (
-          toolLogs[i - 1].toolRequest.name === UPDATE_TOPIC_TOOL_NAME &&
-          toolLogs[i].toolRequest.name === UPDATE_TOPIC_TOOL_NAME
-        ) {
-          throw new Error(
-            `Detected back-to-back ${UPDATE_TOPIC_TOOL_NAME} calls at index ${i - 1} and ${i}`,
-          );
-        }
-      }
-    },
-  });
-});

evals/vitest.config.ts

@@ -16,6 +16,10 @@ export default defineConfig({
   },
   test: {
     testTimeout: 300000, // 5 minutes
+    // Retry in CI but not nightly to avoid blocking on API error.
+    retry: process.env['VITEST_RETRY']
+      ? parseInt(process.env['VITEST_RETRY'], 10)
+      : 3,
     reporters: ['default', 'json'],
     outputFile: {
       json: 'evals/logs/report.json',

integration-tests/api-resilience.responses

@@ -1 +1 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"Part 1. "}],"role":"model"},"index":0}]},{"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":10,"totalTokenCount":110}},{"candidates":[{"content":{"parts":[{"text":"Part 2."}],"role":"model"},"index":0,"finishReason":"STOP"}]}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"Part 1. "}],"role":"model"},"index":0}]},{"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":10,"totalTokenCount":110}},{"candidates":[{"content":{"parts":[{"text":"Part 2."}],"role":"model"},"index":0}],"finishReason":"STOP"}]}

integration-tests/browser-agent-localhost.dynamic.responses

@@ -1,6 +0,0 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll check the dynamic content page on the localhost server."},{"functionCall":{"name":"browser_agent","args":{"task":"Navigate to http://127.0.0.1:18923/dynamic.html, wait for the dynamic content to load, then capture the accessibility tree and report what content appeared"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":40,"totalTokenCount":140}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"url":"http://127.0.0.1:18923/dynamic.html"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":20,"totalTokenCount":120}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"wait_for","args":{"selector":"#dynamic-content","state":"visible","timeout":5000}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":25,"totalTokenCount":175}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":180,"candidatesTokenCount":15,"totalTokenCount":195}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"result":{"success":true,"summary":"Dynamic content loaded successfully. Found heading 'Content Loaded', message 'This content was loaded dynamically via JavaScript.', and a list with items: Item Alpha, Item Beta, Item Gamma."}}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":40,"totalTokenCount":240}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"The dynamic content page loaded successfully:\n\n- **Heading**: Content Loaded\n- **Message**: This content was loaded dynamically via JavaScript\n- **Items**: Item Alpha, Item Beta, Item Gamma\n\nThe JavaScript-rendered content appeared after the initial page load, replacing the 'Loading...' indicator."}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":60,"totalTokenCount":260}}]}

integration-tests/browser-agent-localhost.form.responses

@@ -1,9 +0,0 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll fill out the contact form on the localhost server."},{"functionCall":{"name":"browser_agent","args":{"task":"Navigate to http://127.0.0.1:18923/form.html, fill in the name field with 'Test User', the email field with 'test@example.com', the message field with 'Hello World', and submit the form"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"url":"http://127.0.0.1:18923/form.html"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":20,"totalTokenCount":120}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"fill","args":{"selector":"#name","value":"Test User"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":25,"totalTokenCount":175}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"fill","args":{"selector":"#email","value":"test@example.com"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":180,"candidatesTokenCount":25,"totalTokenCount":205}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"fill","args":{"selector":"#message","value":"Hello World"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":210,"candidatesTokenCount":25,"totalTokenCount":235}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"click","args":{"selector":"#submit-btn"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":240,"candidatesTokenCount":20,"totalTokenCount":260}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":270,"candidatesTokenCount":15,"totalTokenCount":285}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"result":{"success":true,"summary":"Successfully filled and submitted the contact form. Navigated to form-result.html which shows 'Form Submitted Successfully'."}}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":300,"candidatesTokenCount":40,"totalTokenCount":340}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I've successfully filled out and submitted the contact form:\n\n- **Name**: Test User\n- **Email**: test@example.com\n- **Message**: Hello World\n\nAfter submission, the page navigated to the result page showing 'Form Submitted Successfully'."}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":300,"candidatesTokenCount":60,"totalTokenCount":360}}]}

integration-tests/browser-agent-localhost.multistep.responses

@@ -1,9 +0,0 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll go through the multi-step flow on the localhost server."},{"functionCall":{"name":"browser_agent","args":{"task":"Navigate to http://127.0.0.1:18923/multi-step/step1.html, fill in 'testuser' as the username, click Next, then on step 2 select 'Option B' and click Finish. Report the final result page content."}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"url":"http://127.0.0.1:18923/multi-step/step1.html"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":20,"totalTokenCount":120}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"fill","args":{"selector":"#username","value":"testuser"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":25,"totalTokenCount":175}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"click","args":{"selector":"#next-btn"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":180,"candidatesTokenCount":20,"totalTokenCount":200}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":210,"candidatesTokenCount":15,"totalTokenCount":225}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"click","args":{"selector":"#finish-btn"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":240,"candidatesTokenCount":20,"totalTokenCount":260}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":270,"candidatesTokenCount":15,"totalTokenCount":285}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"result":{"success":true,"summary":"Completed all steps. Step 1: entered username 'testuser'. Step 2: selected default option. Final result page shows 'Multi-Step Complete' with '✓ Complete' status badge."}}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":300,"candidatesTokenCount":40,"totalTokenCount":340}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I've completed the multi-step flow:\n\n1. **Step 1**: Entered 'testuser' as username and clicked Next\n2. **Step 2**: Confirmed selection and clicked Finish\n3. **Result**: Final page shows 'Multi-Step Complete' with a '✓ Complete' status badge\n\nAll steps were successfully navigated."}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":300,"candidatesTokenCount":60,"totalTokenCount":360}}]}

integration-tests/browser-agent-localhost.navigate.responses

@@ -1,5 +0,0 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll navigate to the localhost page and read its content using the browser agent."},{"functionCall":{"name":"browser_agent","args":{"task":"Navigate to http://127.0.0.1:18923/index.html and tell me the page title and list all links on the page"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":40,"totalTokenCount":140}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"url":"http://127.0.0.1:18923/index.html"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":20,"totalTokenCount":120}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":20,"totalTokenCount":170}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"result":{"success":true,"summary":"Page title is 'Test Fixture - Home'. Found 3 links: Contact Form (/form.html), Multi-Step Flow (/multi-step/step1.html), Dynamic Content (/dynamic.html)."}}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":40,"totalTokenCount":240}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"The localhost test fixture page has:\n\n**Title**: Test Fixture - Home\n\n**Links**:\n1. Contact Form (form.html)\n2. Multi-Step Flow (multi-step/step1.html)\n3. Dynamic Content (dynamic.html)\n\nThe page also has a heading 'Test Fixture Home Page' and footer content."}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":60,"totalTokenCount":260}}]}

integration-tests/browser-agent-localhost.screenshot.responses

@@ -1,5 +0,0 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll take a screenshot of the localhost test page."},{"functionCall":{"name":"browser_agent","args":{"task":"Navigate to http://127.0.0.1:18923/index.html and take a screenshot of the page"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":35,"totalTokenCount":135}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"navigate_page","args":{"url":"http://127.0.0.1:18923/index.html"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":20,"totalTokenCount":120}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_screenshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":150,"candidatesTokenCount":15,"totalTokenCount":165}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"result":{"success":true,"summary":"Screenshot captured of the localhost test fixture home page showing the heading, navigation links, and footer.","data":{"screenshotTaken":true}}}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":40,"totalTokenCount":240}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I've captured a screenshot of the localhost test fixture page. The screenshot shows the 'Test Fixture Home Page' heading with navigation links to the Contact Form, Multi-Step Flow, and Dynamic Content pages, along with the footer section."}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":50,"totalTokenCount":250}}]}

integration-tests/browser-agent-localhost.test.ts

@@ -1,161 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { TestRig, assertModelHasOutput } from './test-helper.js';
-import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-describe('browser-agent-localhost', () => {
-  let rig: TestRig;
-
-  const browserSettings = {
-    agents: {
-      overrides: {
-        browser_agent: {
-          enabled: true,
-        },
-      },
-      browser: {
-        headless: true,
-        sessionMode: 'isolated' as const,
-      },
-    },
-  };
-
-  beforeEach(() => {
-    rig = new TestRig();
-  });
-
-  afterEach(async () => {
-    await rig.cleanup();
-  });
-
-  it('should navigate to localhost fixture and read page content', async () => {
-    rig.setup('localhost-navigate', {
-      fakeResponsesPath: join(
-        __dirname,
-        'browser-agent-localhost.navigate.responses',
-      ),
-      settings: browserSettings,
-    });
-
-    const result = await rig.run({
-      args: 'Navigate to http://127.0.0.1:18923/index.html and tell me the page title and list all links.',
-    });
-
-    assertModelHasOutput(result);
-
-    const toolLogs = rig.readToolLogs();
-    const browserAgentCall = toolLogs.find(
-      (t) => t.toolRequest.name === 'browser_agent',
-    );
-    expect(
-      browserAgentCall,
-      'Expected browser_agent to be called',
-    ).toBeDefined();
-  });
-
-  it('should fill out and submit a form on localhost', async () => {
-    rig.setup('localhost-form', {
-      fakeResponsesPath: join(
-        __dirname,
-        'browser-agent-localhost.form.responses',
-      ),
-      settings: browserSettings,
-    });
-
-    const result = await rig.run({
-      args: "Navigate to http://127.0.0.1:18923/form.html, fill in name='Test User', email='test@example.com', message='Hello World', and submit the form.",
-    });
-
-    assertModelHasOutput(result);
-
-    const toolLogs = rig.readToolLogs();
-    const browserAgentCall = toolLogs.find(
-      (t) => t.toolRequest.name === 'browser_agent',
-    );
-    expect(
-      browserAgentCall,
-      'Expected browser_agent to be called',
-    ).toBeDefined();
-  });
-
-  it('should navigate through a multi-step flow', async () => {
-    rig.setup('localhost-multistep', {
-      fakeResponsesPath: join(
-        __dirname,
-        'browser-agent-localhost.multistep.responses',
-      ),
-      settings: browserSettings,
-    });
-
-    const result = await rig.run({
-      args: "Go to http://127.0.0.1:18923/multi-step/step1.html, fill in 'testuser' as username, click Next, then click Finish on step 2. Report the result.",
-    });
-
-    assertModelHasOutput(result);
-
-    const toolLogs = rig.readToolLogs();
-    const browserAgentCall = toolLogs.find(
-      (t) => t.toolRequest.name === 'browser_agent',
-    );
-    expect(
-      browserAgentCall,
-      'Expected browser_agent to be called',
-    ).toBeDefined();
-  });
-
-  it('should handle dynamically loaded content', async () => {
-    rig.setup('localhost-dynamic', {
-      fakeResponsesPath: join(
-        __dirname,
-        'browser-agent-localhost.dynamic.responses',
-      ),
-      settings: browserSettings,
-    });
-
-    const result = await rig.run({
-      args: 'Navigate to http://127.0.0.1:18923/dynamic.html, wait for content to load, and tell me what items appear.',
-    });
-
-    assertModelHasOutput(result);
-
-    const toolLogs = rig.readToolLogs();
-    const browserAgentCall = toolLogs.find(
-      (t) => t.toolRequest.name === 'browser_agent',
-    );
-    expect(
-      browserAgentCall,
-      'Expected browser_agent to be called',
-    ).toBeDefined();
-  });
-
-  it('should take a screenshot of localhost page', async () => {
-    rig.setup('localhost-screenshot', {
-      fakeResponsesPath: join(
-        __dirname,
-        'browser-agent-localhost.screenshot.responses',
-      ),
-      settings: browserSettings,
-    });
-
-    const result = await rig.run({
-      args: 'Navigate to http://127.0.0.1:18923/index.html and take a screenshot.',
-    });
-
-    assertModelHasOutput(result);
-
-    const toolLogs = rig.readToolLogs();
-    const browserCalls = toolLogs.filter(
-      (t) => t.toolRequest.name === 'browser_agent',
-    );
-    expect(browserCalls.length).toBeGreaterThan(0);
-  });
-});