docs: add research proposal for cloud state sync

.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/settings.json

@@ -1,8 +1,9 @@
 {
   "experimental": {
+    "plan": true,
     "extensionReloading": true,
     "modelSteering": true,
-    "topicUpdateNarration": true
+    "memoryManager": true
   },
   "general": {
     "devtools": true

.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/references/fixing.md

@@ -33,35 +33,6 @@ evaluation.
     - **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

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

@@ -162,7 +162,5 @@ instructions for the other section.
 
 ## Finalize
 
-- After making changes, if `npm run format` fails, it may be necessary to run
-  `npm install` first to ensure all formatting dependencies are available.
-  Then, run `npm run format` to ensure consistency.
+- After making changes, run `npm run format` ONLY to ensure consistency.
 - Delete any temporary files created during the process.

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

@@ -1,7 +1,7 @@
 ---
 name: docs-writer
 description:
-  Always use this skill when the task involves writing, reviewing, or editing
+  Always use this skill when the task involves writing, reviewing, or editing 
   files in the `/docs` directory or any `.md` files in the repository.
 ---
 
@@ -24,7 +24,7 @@ approach.
 
 - **Perspective and tense:** Address the reader as "you." Use active voice and
   present tense (e.g., "The API returns...").
-- **Tone:** Professional, friendly, and direct.
+- **Tone:** Professional, friendly, and direct. 
 - **Clarity:** Use simple vocabulary. Avoid jargon, slang, and marketing hype.
 - **Global Audience:** Write in standard US English. Avoid idioms and cultural
   references.
@@ -47,8 +47,8 @@ Write precisely to ensure your instructions are unambiguous.
   "foo" or "bar."
 - **Quota and limit terminology:** For any content involving resource capacity
   or using the word "quota" or "limit", strictly adhere to the guidelines in
-  the `quota-limit-style-guide.md` resource file. Generally, Use "quota" for
-  the administrative bucket and "limit" for the numerical ceiling.
+  the `quota-limit-style-guide.md` resource file. Generally, Use "quota" for the
+  administrative bucket and "limit" for the numerical ceiling.
 
 ### Formatting and syntax
 Apply consistent formatting to make documentation visually organized and
@@ -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,
@@ -120,7 +110,7 @@ accessible.
 > This is an experimental feature currently under active development.
 
 - **Headings:** Use hierarchical headings to support the user journey.
-- **Procedures:**
+- **Procedures:** 
   - Introduce lists of steps with a complete sentence.
   - Start each step with an imperative verb.
   - Number sequential steps; use bullets for non-sequential lists.
@@ -134,7 +124,7 @@ accessible.
 
 ## Phase 2: Preparation
 Before modifying any documentation, thoroughly investigate the request and the
-surrounding context.
+surrounding context. 
 
 1.  **Clarify:** Understand the core request. Differentiate between writing new
     content and editing existing content. If the request is ambiguous (e.g.,
@@ -145,8 +135,6 @@ surrounding context.
 4.  **Connect:** Identify all referencing pages if changing behavior. Check if
     `docs/sidebar.json` needs updates.
 5.  **Plan:** Create a step-by-step plan before making changes.
-6.  **Audit Docset:** If asked to audit the documentation, follow the procedural
-    guide in [docs-auditing.md](./references/docs-auditing.md).
 
 ## Phase 3: Execution
 Implement your plan by either updating existing files or creating new ones
@@ -159,7 +147,7 @@ documentation.
 
 - **Gaps:** Identify areas where the documentation is incomplete or no longer
   reflects existing code.
-- **Structure:** Apply "Structure (New Docs)" rules (BLUF, headings, etc.) when
+- **Structure:** Apply "Structure (New Docs)" rules (BLUF, headings, etc.) when 
   adding new sections to existing pages.
 - **Headers**: If you change a header, you must check for links that lead to
   that header and update them.
@@ -169,17 +157,17 @@ 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.
+Perform a final quality check to ensure that all changes are correctly formatted
+and that all links are functional.
 
 1.  **Accuracy:** Ensure content accurately reflects the implementation and
   technical behavior.
 2.  **Self-review:** Re-read changes for formatting, correctness, and flow.
-3.  **Link check:** Verify all new and existing links leading to or from
-    modified pages. If you changed a header, ensure that any links that lead to
-    it are updated.
-4.  **Format:** If `npm run format` fails, it may be necessary to run `npm
-    install` first to ensure all formatting dependencies are available. Once all
-    changes are complete, ask to execute `npm run format` to ensure consistent
-    formatting across the project. If the user confirms, execute the command.
+3.  **Link check:** Verify all new and existing links leading to or from modified
+    pages. If you changed a header, ensure that any links that lead to it are
+    updated.
+4.  **Format:** Once all changes are complete, ask to execute `npm run format`
+    to ensure consistent formatting across the project. If the user confirms,
+    execute the command.

.gemini/skills/docs-writer/references/docs-auditing.md

@@ -1,195 +0,0 @@
-# Procedural Guide: Auditing the Docset
-
-This guide outlines the process for auditing the Gemini CLI documentation for
-correctness and adherence to style guidelines. This process involves both an
-"Editor" and "Technical Writer" phase.
-
-## Objective
-
-To ensure all public-facing documentation is accurate, up-to-date, adheres to
-the Gemini CLI documentation style guide, and reflects the current state of the
-codebase.
-
-## Phase 1: Editor Audit
-
-**Role:** The editor is responsible for identifying potential issues based on
-style guide violations and technical inaccuracies.
-
-### Steps
-
-1.  **Identify Documentation Scope:**
-    - Read `docs/sidebar.json` to get a list of all viewable documentation
-      pages.
-    - For each entry with a `slug`, convert it into a file path (e.g., `docs` ->
-      `docs/index.md`, `docs/get-started` -> `docs/get-started.md`). Ignore
-      entries with `link` properties.
-
-2.  **Prepare Audit Results File:**
-    - Create a new Markdown file named `audit-results-[YYYY-MM-DD].md` (e.g.,
-      `audit-results-2026-03-13.md`). This file will contain all identified
-      violations and recommendations.
-
-3.  **Retrieve Style Guidelines:**
-    - Familiarize yourself with the `docs-writer` skill instructions and the
-      included style guidelines.
-
-4.  **Audit Each Document:**
-    - For each documentation file identified in Step 1, read its content.
-    - **Review against Style Guide:**
-      - **Voice and Tone Violations:**
-        - **Unprofessional Tone:** Identify phrasing that is overly casual,
-          defensive, or lacks a professional and friendly demeanor.
-        - **Indirectness or Vagueness:** Identify sentences that are
-          unnecessarily wordy or fail to be concise and direct.
-        - **Incorrect Pronoun:** Identify any use of third-person pronouns
-          (e.g., "we," "they," "the user") when referring to the reader, instead
-          of the second-person pronoun **"you"**.
-        - **Passive Voice:** Identify sentences written in the passive voice.
-        - **Incorrect Tense:** Identify the use of past or future tense verbs,
-          instead of the **present tense**.
-        - **Poor Vocabulary:** Identify the use of jargon, slang, or overly
-          informal language.
-      - **Language and Grammar Violations:**
-        - **Lack of Conciseness:** Identify unnecessarily long phrases or
-          sentences.
-        - **Punctuation Errors:** Identify incorrect or missing punctuation.
-        - **Ambiguous Dates:** Identify dates that could be misinterpreted
-          (e.g., "next Monday" instead of "April 15, 2026").
-        - **Abbreviation Usage:** Identify the use of abbreviations that should
-          be spelled out (e.g., "e.g." instead of "for example").
-        - **Terminology:** Check for incorrect or inconsistent use of
-          product-specific terms (e.g., "quota" vs. "limit").
-      - **Formatting and Syntax Violations:**
-        - **Missing Overview:** Check for the absence of a brief overview
-          paragraph at the start of the document.
-        - **Line Length:** Identify any lines of text that exceed **80
-          characters** (text wrap violation).
-        - **Casing:** Identify incorrect casing for headings, titles, or named
-          entities (e.g., product names like `Gemini CLI`).
-        - **List Formatting:** Identify incorrectly formatted lists (e.g.,
-          inconsistent indentation or numbering).
-        - **Incorrect Emphasis:** Identify incorrect use of bold text (should
-          only be used for UI elements) or code font (should be used for code,
-          file names, or command-line input).
-        - **Link Quality:** Identify links with non-descriptive anchor text
-          (e.g., "click here").
-        - **Image Alt Text:** Identify images with missing or poor-quality
-          (non-descriptive) alt text.
-      - **Structure Violations:**
-        - **Missing BLUF:** Check for the absence of a "Bottom Line Up Front"
-          summary at the start of complex sections or documents.
-        - **Experimental Feature Notes:** Identify experimental features that
-          are not clearly labeled with a standard note.
-        - **Heading Hierarchy:** Check for skipped heading levels (e.g., going
-          from `##` to `####`).
-        - **Procedure Clarity:** Check for procedural steps that do not start
-          with an imperative verb or where a condition is placed _after_ the
-          instruction.
-        - **Element Misuse:** Identify the incorrect or inappropriate use of
-          special elements (e.g., Notes, Warnings, Cautions).
-        - **Table of Contents:** Identify the presence of a dynamically
-          generated or manually included table of contents.
-        - **Missing Next Steps:** Check for procedural documents that lack a
-          "Next steps" section (if applicable).
-    - **Verify Code Accuracy (if applicable):**
-      - If the document contains code snippets (e.g., shell commands, API calls,
-        file paths, Docker image versions), use `grep_search` and `read_file`
-        within the `packages/` directory (or other relevant parts of the
-        codebase) to ensure the code is still accurate and up-to-date. Pay close
-        attention to version numbers, package names, and command syntax.
-    - **Record Findings:** For each **violation** or inaccuracy found:
-      - Note the file path.
-      - Describe the violation (e.g., "Violation (Language and Grammar): Uses
-        'e.g.'").
-      - Provide a clear and actionable recommendation to correct the issue.
-        (e.g., "Recommendation: Replace 'e.g.' with 'for example'." or
-        "Recommendation: Replace '...' with '...' in active voice.).
-      - Append these findings to `audit-results-[YYYY-MM-DD].md`.
-
-## Phase 2: Software Engineer Audit
-
-**Role:** The software engineer is responsible for finding undocumented features
-by auditing the codebase and recent changelogs, and passing these findings to
-the technical writer.
-
-### Steps
-
-1.  **Proactive Codebase Audit:**
-    - Audit high-signal areas of the codebase to identify undocumented features.
-      You MUST review:
-      - `packages/cli/src/commands/`
-      - `packages/core/src/tools/`
-      - `packages/cli/src/config/settings.ts`
-
-2.  **Review Recent Updates:**
-    - Check recent changelogs in stable and announcements within the
-      documentation to see if newly introduced features are documented properly.
-
-3.  **Evaluate and Record Findings:**
-    - Determine if these features are adequately covered in the docs. They do
-      not need to be documented word for word, but major features that customers
-      should care about probably should have an article.
-    - Append your findings to the `audit-results-[YYYY-MM-DD].md` file,
-      providing a brief description of the feature and where it should be
-      documented.
-
-## Phase 3: Technical Writer Implementation
-
-**Role:** The technical writer handles input from both the editor and the
-software engineer, makes appropriate decisions about what to change, and
-implements the approved changes.
-
-### Steps
-
-1.  **Review Audit Results:**
-    - Read `audit-results-[YYYY-MM-DD].md` to understand all identified issues,
-      undocumented features, and recommendations from both the Editor and
-      Software Engineer phases.
-
-2.  **Make Decisions and Log Reasoning:**
-    - Create or update an implementation log (e.g.,
-      `audit-implementation-log-[YYYY-MM-DD].md`).
-    - Make sure the logs are updated for all steps, documenting your reasoning
-      for each recommendation (why it was accepted, modified, or rejected). This
-      is required for a final check by a human in the PR.
-
-3.  **Implement Changes:**
-    - For each approved recommendation:
-      - Read the target documentation file.
-      - Apply the recommended change using the `replace` tool. Pay close
-        attention to `old_string` for exact matches, including whitespace and
-        newlines. For multiple occurrences of the same simple string (e.g.,
-        "e.g."), use `allow_multiple: true`.
-      - **String replacement safeguards:** When applying these fixes across the
-        docset, you must verify the following:
-        - **Preserve Code Blocks:** Explicitly verify that no code blocks,
-          inline code snippets, terminal commands, or file paths have been
-          erroneously capitalized or modified.
-        - **Preserve Literal Strings:** Never alter the wording of literal error
-          messages, UI quotes, or system logs. For example, if a style rule says
-          to remove the word "please", you must NOT remove it if it appears
-          inside a quoted error message (e.g.,
-          `Error: Please contact your administrator`).
-        - **Verify Sentence Casing:** When removing filler words (like "please")
-          from the beginning of a sentence or list item, always verify that the
-          new first word of the sentence is properly capitalized.
-      - For structural changes (e.g., adding an overview paragraph), use
-        `replace` or `write_file` as appropriate.
-      - For broken links, determine the correct new path or update the link
-        text.
-      - For creating new files (e.g., `docs/get-started.md` to fix a broken
-        link, or a new feature article), use `write_file`.
-
-4.  **Execute Auto-Generation Scripts:**
-    - Some documentation pages are auto-generated from the codebase and should
-      be updated using npm scripts rather than manual edits. After implementing
-      manual changes (especially if you edited settings or configurations based
-      on SWE recommendations), ensure you run:
-      - `npm run docs:settings` to generate/update the configuration reference.
-      - `npm run docs:keybindings` to generate/update the keybindings reference.
-
-5.  **Format Code:**
-    - **Dependencies:** If `npm run format` fails, it may be necessary to run
-      `npm install` first to ensure all formatting dependencies are available.
-    - After all changes have been implemented, run `npm run format` to ensure
-      consistent formatting across the project.

.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
 
     - 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
 
     - 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
 
     - 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,22 +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'
-          # Only run always passes behavioral tests.
-          EVAL_SUITE_TYPE: 'behavioral'
-          # 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'
@@ -175,10 +172,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 +260,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 +426,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/docs-audit.yml

@@ -1,62 +0,0 @@
-name: 'Automated Documentation Audit'
-
-on:
-  schedule:
-    # Runs every Monday at 00:00 UTC
-    - cron: '0 0 * * MON'
-  workflow_dispatch:
-
-jobs:
-  audit-docs:
-    runs-on: 'ubuntu-latest'
-    permissions:
-      contents: 'write'
-      pull-requests: 'write'
-
-    steps:
-      - name: 'Checkout repository'
-        uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5'
-        with:
-          fetch-depth: 0
-          ref: 'main'
-
-      - name: 'Set up Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020'
-        with:
-          node-version: '20'
-
-      - name: 'Run Docs Audit with Gemini'
-        id: 'run_gemini'
-        uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31'
-        with:
-          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
-          prompt: |
-            Activate the 'docs-writer' skill.
-
-            **Task:** Execute the docs audit procedure, as defined in your 'docs-auditing.md' reference.
-            Provide a detailed summary of the changes you make.
-
-      - name: 'Get current date'
-        id: 'date'
-        run: |
-          echo "date=$(date +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
-
-      - name: 'Create Pull Request with Audit Results'
-        uses: 'peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c'
-        with:
-          token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
-          commit-message: 'docs: weekly audit results for ${{ github.run_id }}'
-          title: 'Docs audit: ${{ steps.date.outputs.date }}'
-          body: |
-            This PR contains the auto-generated documentation audit for the week. It includes a new `audit-results-*.md` file with findings and any direct fixes applied by the agent.
-
-            ### Audit Summary:
-            ${{ steps.run_gemini.outputs.summary || 'No summary provided.' }}
-
-            Please review the suggestions and merge.
-
-            Related to #25152
-          branch: 'docs-audit-${{ github.run_id }}'
-          base: 'main'
-          team-reviewers: 'gemini-cli-docs, gemini-cli-maintainers'
-          delete-branch: true

.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

@@ -5,18 +5,10 @@ on:
     - cron: '0 1 * * *' # Runs at 1 AM every day
   workflow_dispatch:
     inputs:
-      suite_type:
-        description: 'Suite type to run'
-        type: 'choice'
-        options:
-          - 'behavioral'
-          - 'component-level'
-          - 'hero-scenario'
-        default: 'behavioral'
-      suite_name:
-        description: 'Specific suite name to run'
-        required: false
-        type: 'string'
+      run_all:
+        description: 'Run all evaluations (including usually passing)'
+        type: 'boolean'
+        default: true
       test_name_pattern:
         description: 'Test name pattern or file name'
         required: false
@@ -67,12 +59,8 @@ jobs:
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
           GEMINI_MODEL: '${{ matrix.model }}'
-          RUN_EVALS: 'true'
-          EVAL_SUITE_TYPE: "${{ github.event.inputs.suite_type || 'behavioral' }}"
-          EVAL_SUITE_NAME: '${{ github.event.inputs.suite_name }}'
+          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/perf-nightly.yml

@@ -1,33 +0,0 @@
-name: 'Performance Tests: Nightly'
-
-on:
-  schedule:
-    - cron: '0 3 * * *' # Runs at 3 AM every day
-  workflow_dispatch: # Allow manual trigger
-
-permissions:
-  contents: 'read'
-
-jobs:
-  perf-test:
-    name: 'Run Performance 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 Performance Tests'
-        run: 'npm run test:perf'

.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:

.gitignore

@@ -48,7 +48,6 @@ packages/cli/src/generated/
 packages/core/src/generated/
 packages/devtools/src/_client-assets.ts
 .integration-tests/
-.perf-tests/
 packages/vscode-ide-companion/*.vsix
 packages/cli/download-ripgrep*/
 
@@ -65,6 +64,3 @@ gemini-debug.log
 evals/logs/
 
 temp_agents/
-
-# conductor extension and planning directories
-conductor/

CONTRIBUTING.md

@@ -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,13 +44,6 @@ powerful tool for developers.
 - **Test Commands:**
   - **Unit (All):** `npm run test`
   - **Integration (E2E):** `npm run test:e2e`
-  - > **NOTE**: Please run the memory and perf tests locally **only if** you are
-    > implementing changes related to those test areas. Otherwise skip these
-    > tests locally and rely on CI to run them on nightly builds.
-  - **Memory (Nightly):** `npm run test:memory` (Runs memory regression tests
-    against baselines. Excluded from `preflight`, run nightly.)
-  - **Performance (Nightly):** `npm run test:perf` (Runs CPU performance
-    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/admin/enterprise-controls.md

@@ -72,7 +72,7 @@ organization.
 **Supported Fields:**
 
 - `url`: (Required) The full URL of the MCP server endpoint.
-- `type`: (Required) The connection type (for example, `sse` or `http`).
+- `type`: (Required) The connection type (e.g., `sse` or `http`).
 - `trust`: (Optional) If set to `true`, the server is trusted and tool execution
   will not require user approval.
 - `includeTools`: (Optional) An explicit list of tool names to allow. If

docs/changelogs/index.md

@@ -18,76 +18,6 @@ on GitHub.
 | [Preview](preview.md) | Experimental features ready for early feedback. |
 | [Stable](latest.md)   | Stable, recommended for general use.            |
 
-## Announcements: v0.37.0 - 2026-04-08
-
-- **Dynamic Sandbox Expansion:** Implemented dynamic sandbox expansion and
-  worktree support for Linux and Windows, improving developer workflows in
-  isolated environments
-  ([#23692](https://github.com/google-gemini/gemini-cli/pull/23692) by @galz10,
-  [#23691](https://github.com/google-gemini/gemini-cli/pull/23691) by
-  @scidomino).
-- **Chapters Narrative Flow:** Introduced tool-based topic grouping ("Chapters")
-  to provide better session structure and narrative continuity
-  ([#23150](https://github.com/google-gemini/gemini-cli/pull/23150) by
-  @Abhijit-2592,
-  [#24079](https://github.com/google-gemini/gemini-cli/pull/24079) by
-  @gundermanc).
-- **Advanced Browser Capabilities:** Enhanced the browser agent with persistent
-  sessions and dynamic tool discovery
-  ([#21306](https://github.com/google-gemini/gemini-cli/pull/21306) by
-  @kunal-10-cloud,
-  [#23805](https://github.com/google-gemini/gemini-cli/pull/23805) by
-  @cynthialong0-0).
-
-## 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.37.1
+# Latest stable release: v0.34.0
 
-Released: April 09, 2026
+Released: March 17, 2026
 
 For most users, our latest stable release is the recommended release. Install
 the latest stable version with:
@@ -11,415 +11,474 @@ npm install -g @google/gemini-cli
 
 ## Highlights
 
-- **Dynamic Sandbox Expansion:** Implemented dynamic sandbox expansion and
-  worktree support for both Linux and Windows, enhancing development flexibility
-  in restricted environments.
-- **Tool-Based Topic Grouping (Chapters):** Introduced "Chapters" to logically
-  group agent interactions based on tool usage and intent, providing a clearer
-  narrative flow in long sessions.
-- **Enhanced Browser Agent:** Added persistent session management, dynamic
-  read-only tool discovery, and sandbox-aware initialization for the browser
-  agent.
-- **Security & Permission Hardening:** Implemented secret visibility lockdown
-  for environment files and integrated integrity controls for Windows
-  sandboxing.
+- **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
 
-- fix(acp): handle all InvalidStreamError types gracefully in prompt
-  [#24540](https://github.com/google-gemini/gemini-cli/pull/24540)
-- feat(acp): add support for /about command
-  [#24649](https://github.com/google-gemini/gemini-cli/pull/24649)
-- feat(acp): add /help command
-  [#24839](https://github.com/google-gemini/gemini-cli/pull/24839)
-- 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
+- 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
+  [#21034](https://github.com/google-gemini/gemini-cli/pull/21034)
+- feat(ui): standardize semantic focus colors and enhance history visibility 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
+  [#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
+  [#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
+  [#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
-  [#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
-  @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
+  [#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
-  [#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
+  [#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
-  [#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)
-- 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
+  [#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
+  [#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
-  [#24561](https://github.com/google-gemini/gemini-cli/pull/24561)
-- 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
+  [#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
-  [#24842](https://github.com/google-gemini/gemini-cli/pull/24842)
+  [#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.36.0...v0.37.1
+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.38.0-preview.0
+# Preview release: v0.36.0-preview.0
 
-Released: April 08, 2026
+Released: March 24, 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,256 +13,366 @@ npm install -g @google/gemini-cli@preview
 
 ## Highlights
 
-- **Context Management:** Introduced a Context Compression Service to optimize
-  context window usage and landed a background memory service for skill
-  extraction.
-- **Enhanced Security:** Implemented context-aware persistent policy approvals
-  for smarter tool permissions and enabled `web_fetch` in plan mode with user
-  confirmation.
-- **Workflow Monitoring:** Added background process monitoring and inspection
-  tools for better visibility into long-running tasks.
-- **UI/UX Refinements:** Enhanced the tool confirmation UI, selection layout,
-  and added support for selective topic expansion and click-to-expand.
-- **Core Stability:** Improved sandbox reliability on Linux and Windows,
-  resolved shebang compatibility issues, and fixed various crashes in the CLI
-  and core services.
+- **Subagent Architecture Enhancements:** Significant updates to subagents,
+  including local execution, tool isolation, multi-registry discovery, dynamic
+  tool filtering, and JIT context injection.
+- **Enhanced Security & Sandboxing:** Implemented strict macOS sandboxing using
+  Seatbelt allowlist, native Windows sandboxing, and support for
+  "Write-Protected" governance files.
+- **Agent Context & State Management:** Introduced task tracker protocol
+  integration, 'blocked' statuses for tasks/todos, and `AgentSession` for
+  improved state management and replay semantics.
+- **Browser & ACP Capabilities:** Added privacy consent for the browser agent,
+  sensitive action controls, improved API token usage metadata, and gateway auth
+  support via ACP.
+- **CLI & UX Improvements:** Implemented a refreshed Composer layout, expanded
+  terminal fallback warnings, dynamic model resolution, and Git worktree support
+  for isolated parallel sessions.
 
 ## What's Changed
 
-- fix(cli): refresh slash command list after /skills reload by @NTaylorMullen in
-  [#24454](https://github.com/google-gemini/gemini-cli/pull/24454)
-- Update README.md for links. by @g-samroberts in
-  [#22759](https://github.com/google-gemini/gemini-cli/pull/22759)
-- fix(core): ensure complete_task tool calls are recorded in chat history by
-  @abhipatel12 in
-  [#24437](https://github.com/google-gemini/gemini-cli/pull/24437)
-- feat(policy): explicitly allow web_fetch in plan mode with ask_user by
-  @Adib234 in [#24456](https://github.com/google-gemini/gemini-cli/pull/24456)
-- fix(core): refactor linux sandbox to fix ARG_MAX crashes by @ehedlund in
-  [#24286](https://github.com/google-gemini/gemini-cli/pull/24286)
-- feat(config): add experimental.adk.agentSessionNoninteractiveEnabled setting
-  by @adamfweidman in
-  [#24439](https://github.com/google-gemini/gemini-cli/pull/24439)
-- Changelog for v0.36.0-preview.8 by @gemini-cli-robot in
-  [#24453](https://github.com/google-gemini/gemini-cli/pull/24453)
-- feat(cli): change default loadingPhrases to 'off' to hide tips by @keithguerin
-  in [#24342](https://github.com/google-gemini/gemini-cli/pull/24342)
-- fix(cli): ensure agent stops when all declinable tools are cancelled by
-  @NTaylorMullen in
-  [#24479](https://github.com/google-gemini/gemini-cli/pull/24479)
-- fix(core): enhance sandbox usability and fix build error by @galz10 in
-  [#24460](https://github.com/google-gemini/gemini-cli/pull/24460)
-- Terminal Serializer Optimization by @jacob314 in
-  [#24485](https://github.com/google-gemini/gemini-cli/pull/24485)
-- Auto configure memory. by @jacob314 in
-  [#24474](https://github.com/google-gemini/gemini-cli/pull/24474)
-- Unused error variables in catch block are not allowed by @alisa-alisa in
-  [#24487](https://github.com/google-gemini/gemini-cli/pull/24487)
-- feat(core): add background memory service for skill extraction by @SandyTao520
-  in [#24274](https://github.com/google-gemini/gemini-cli/pull/24274)
-- feat: implement high-signal PR regression check for evaluations by
-  @alisa-alisa in
-  [#23937](https://github.com/google-gemini/gemini-cli/pull/23937)
-- Fix shell output display by @jacob314 in
-  [#24490](https://github.com/google-gemini/gemini-cli/pull/24490)
-- fix(ui): resolve unwanted vertical spacing around various tool output
-  treatments by @jwhelangoog in
-  [#24449](https://github.com/google-gemini/gemini-cli/pull/24449)
-- revert(cli): bring back input box and footer visibility in copy mode by
-  @sehoon38 in [#24504](https://github.com/google-gemini/gemini-cli/pull/24504)
-- fix(cli): prevent crash in AnsiOutputText when handling non-array data by
-  @sehoon38 in [#24498](https://github.com/google-gemini/gemini-cli/pull/24498)
-- feat(cli): support default values for environment variables by @ruomengz in
-  [#24469](https://github.com/google-gemini/gemini-cli/pull/24469)
-- Implement background process monitoring and inspection tools by @cocosheng-g
-  in [#23799](https://github.com/google-gemini/gemini-cli/pull/23799)
-- docs(browser-agent): update stale browser agent documentation by @gsquared94
-  in [#24463](https://github.com/google-gemini/gemini-cli/pull/24463)
-- fix: enable browser_agent in integration tests and add localhost fixture tests
-  by @gsquared94 in
-  [#24523](https://github.com/google-gemini/gemini-cli/pull/24523)
-- fix(browser): handle computer-use model detection for analyze_screenshot by
-  @gsquared94 in
-  [#24502](https://github.com/google-gemini/gemini-cli/pull/24502)
-- feat(core): Land ContextCompressionService by @joshualitt in
-  [#24483](https://github.com/google-gemini/gemini-cli/pull/24483)
-- feat(core): scope subagent workspace directories via AsyncLocalStorage by
+- 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
-  [#24445](https://github.com/google-gemini/gemini-cli/pull/24445)
-- Update ink version to 6.6.7 by @jacob314 in
-  [#24514](https://github.com/google-gemini/gemini-cli/pull/24514)
-- fix(acp): handle all InvalidStreamError types gracefully in prompt by @sripasg
-  in [#24540](https://github.com/google-gemini/gemini-cli/pull/24540)
-- Fix crash when vim editor is not found in PATH on Windows by
-  @Nagajyothi-tammisetti in
-  [#22423](https://github.com/google-gemini/gemini-cli/pull/22423)
-- fix(core): move project memory dir under tmp directory by @SandyTao520 in
-  [#24542](https://github.com/google-gemini/gemini-cli/pull/24542)
-- Enable 'Other' option for yesno question type by @ruomengz in
-  [#24545](https://github.com/google-gemini/gemini-cli/pull/24545)
-- fix(cli): clear stale retry/loading state after cancellation (#21096) by
-  @Aaxhirrr in [#21960](https://github.com/google-gemini/gemini-cli/pull/21960)
-- Changelog for v0.37.0-preview.0 by @gemini-cli-robot in
-  [#24464](https://github.com/google-gemini/gemini-cli/pull/24464)
-- feat(core): implement context-aware persistent policy approvals by @jerop in
-  [#23257](https://github.com/google-gemini/gemini-cli/pull/23257)
-- docs: move agent disabling instructions and update remote agent status by
-  @jackwotherspoon in
-  [#24559](https://github.com/google-gemini/gemini-cli/pull/24559)
-- feat(cli): migrate nonInteractiveCli to LegacyAgentSession by @adamfweidman in
-  [#22987](https://github.com/google-gemini/gemini-cli/pull/22987)
-- fix(core): unsafe type assertions in Core File System #19712 by
-  @aniketsaurav18 in
-  [#19739](https://github.com/google-gemini/gemini-cli/pull/19739)
-- fix(ui): hide model quota in /stats and refactor quota display by @danzaharia1
-  in [#24206](https://github.com/google-gemini/gemini-cli/pull/24206)
-- Changelog for v0.36.0 by @gemini-cli-robot in
-  [#24558](https://github.com/google-gemini/gemini-cli/pull/24558)
-- Changelog for v0.37.0-preview.1 by @gemini-cli-robot in
-  [#24568](https://github.com/google-gemini/gemini-cli/pull/24568)
-- docs: add missing .md extensions to internal doc links by @ishaan-arora-1 in
-  [#24145](https://github.com/google-gemini/gemini-cli/pull/24145)
-- fix(ui): fixed table styling by @devr0306 in
-  [#24565](https://github.com/google-gemini/gemini-cli/pull/24565)
-- fix(core): pass includeDirectories to sandbox configuration by @galz10 in
-  [#24573](https://github.com/google-gemini/gemini-cli/pull/24573)
-- feat(ui): enable "TerminalBuffer" mode to solve flicker by @jacob314 in
-  [#24512](https://github.com/google-gemini/gemini-cli/pull/24512)
-- docs: clarify release coordination by @scidomino in
-  [#24575](https://github.com/google-gemini/gemini-cli/pull/24575)
-- fix(core): remove broken PowerShell translation and fix native \_\_write in
-  Windows sandbox by @scidomino in
-  [#24571](https://github.com/google-gemini/gemini-cli/pull/24571)
-- Add instructions for how to start react in prod and force react to prod mode
-  by @jacob314 in
-  [#24590](https://github.com/google-gemini/gemini-cli/pull/24590)
-- feat(cli): minimalist sandbox status labels by @galz10 in
-  [#24582](https://github.com/google-gemini/gemini-cli/pull/24582)
-- Feat/browser agent metrics by @kunal-10-cloud in
-  [#24210](https://github.com/google-gemini/gemini-cli/pull/24210)
-- test: fix Windows CI execution and resolve exposed platform failures by
-  @ehedlund in [#24476](https://github.com/google-gemini/gemini-cli/pull/24476)
-- feat(core,cli): prioritize summary for topics (#24608) by @Abhijit-2592 in
-  [#24609](https://github.com/google-gemini/gemini-cli/pull/24609)
-- show color by @jacob314 in
-  [#24613](https://github.com/google-gemini/gemini-cli/pull/24613)
-- feat(cli): enable compact tool output by default (#24509) by @jwhelangoog in
-  [#24510](https://github.com/google-gemini/gemini-cli/pull/24510)
-- fix(core): inject skill system instructions into subagent prompts if activated
-  by @abhipatel12 in
-  [#24620](https://github.com/google-gemini/gemini-cli/pull/24620)
-- fix(core): improve windows sandbox reliability and fix integration tests by
-  @ehedlund in [#24480](https://github.com/google-gemini/gemini-cli/pull/24480)
-- fix(core): ensure sandbox approvals are correctly persisted and matched for
-  proactive expansions by @galz10 in
-  [#24577](https://github.com/google-gemini/gemini-cli/pull/24577)
-- feat(cli) Scrollbar for input prompt by @jacob314 in
-  [#21992](https://github.com/google-gemini/gemini-cli/pull/21992)
-- Do not run pr-eval workflow when no steering changes detected by @alisa-alisa
-  in [#24621](https://github.com/google-gemini/gemini-cli/pull/24621)
-- Fix restoration of topic headers. by @gundermanc in
-  [#24650](https://github.com/google-gemini/gemini-cli/pull/24650)
-- feat(core): discourage update topic tool for simple tasks by @Samee24 in
-  [#24640](https://github.com/google-gemini/gemini-cli/pull/24640)
-- fix(core): ensure global temp directory is always in sandbox allowed paths by
-  @galz10 in [#24638](https://github.com/google-gemini/gemini-cli/pull/24638)
-- fix(core): detect uninitialized lines by @jacob314 in
-  [#24646](https://github.com/google-gemini/gemini-cli/pull/24646)
-- docs: update sandboxing documentation and toolSandboxing settings by @galz10
-  in [#24655](https://github.com/google-gemini/gemini-cli/pull/24655)
-- feat(cli): enhance tool confirmation UI and selection layout by @galz10 in
-  [#24376](https://github.com/google-gemini/gemini-cli/pull/24376)
-- feat(acp): add support for `/about` command by @sripasg in
-  [#24649](https://github.com/google-gemini/gemini-cli/pull/24649)
-- feat(cli): add role specific metrics to /stats by @cynthialong0-0 in
-  [#24659](https://github.com/google-gemini/gemini-cli/pull/24659)
-- split context by @jacob314 in
-  [#24623](https://github.com/google-gemini/gemini-cli/pull/24623)
-- fix(cli): remove -S from shebang to fix Windows and BSD execution by
-  @scidomino in [#24756](https://github.com/google-gemini/gemini-cli/pull/24756)
-- Fix issue where topic headers can be posted back to back by @gundermanc in
-  [#24759](https://github.com/google-gemini/gemini-cli/pull/24759)
-- fix(core): handle partial llm_request in BeforeModel hook override by
-  @krishdef7 in [#22326](https://github.com/google-gemini/gemini-cli/pull/22326)
-- fix(ui): improve narration suppression and reduce flicker by @gundermanc in
-  [#24635](https://github.com/google-gemini/gemini-cli/pull/24635)
-- fix(ui): fixed auth race condition causing logo to flicker by @devr0306 in
-  [#24652](https://github.com/google-gemini/gemini-cli/pull/24652)
-- fix(browser): remove premature browser cleanup after subagent invocation by
+  [#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
+  @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
-  [#24753](https://github.com/google-gemini/gemini-cli/pull/24753)
-- Revert "feat(core,cli): prioritize summary for topics (#24608)" by
-  @Abhijit-2592 in
-  [#24777](https://github.com/google-gemini/gemini-cli/pull/24777)
-- relax tool sandboxing overrides for plan mode to match defaults. by
-  @DavidAPierce in
-  [#24762](https://github.com/google-gemini/gemini-cli/pull/24762)
-- fix(cli): respect global environment variable allowlist by @scidomino in
-  [#24767](https://github.com/google-gemini/gemini-cli/pull/24767)
-- fix(cli): ensure skills list outputs to stdout in non-interactive environments
-  by @spencer426 in
-  [#24566](https://github.com/google-gemini/gemini-cli/pull/24566)
-- Add an eval for and fix unsafe cloning behavior. by @gundermanc in
-  [#24457](https://github.com/google-gemini/gemini-cli/pull/24457)
-- fix(policy): allow complete_task in plan mode by @abhipatel12 in
-  [#24771](https://github.com/google-gemini/gemini-cli/pull/24771)
-- feat(telemetry): add browser agent clearcut metrics by @gsquared94 in
-  [#24688](https://github.com/google-gemini/gemini-cli/pull/24688)
-- feat(cli): support selective topic expansion and click-to-expand by
-  @Abhijit-2592 in
-  [#24793](https://github.com/google-gemini/gemini-cli/pull/24793)
-- temporarily disable sandbox integration test on windows by @ehedlund in
-  [#24786](https://github.com/google-gemini/gemini-cli/pull/24786)
-- Remove flakey test by @scidomino in
-  [#24837](https://github.com/google-gemini/gemini-cli/pull/24837)
-- Alisa/approve button by @alisa-alisa in
-  [#24645](https://github.com/google-gemini/gemini-cli/pull/24645)
-- feat(hooks): display hook system messages in UI by @mbleigh in
-  [#24616](https://github.com/google-gemini/gemini-cli/pull/24616)
-- fix(core): propagate BeforeModel hook model override end-to-end by @krishdef7
-  in [#24784](https://github.com/google-gemini/gemini-cli/pull/24784)
-- chore: fix formatting for behavioral eval skill reference file by @abhipatel12
-  in [#24846](https://github.com/google-gemini/gemini-cli/pull/24846)
-- fix: use directory junctions on Windows for skill linking by @enjoykumawat in
-  [#24823](https://github.com/google-gemini/gemini-cli/pull/24823)
-- fix(cli): prevent multiple banner increments on remount by @sehoon38 in
-  [#24843](https://github.com/google-gemini/gemini-cli/pull/24843)
-- feat(acp): add /help command by @sripasg in
-  [#24839](https://github.com/google-gemini/gemini-cli/pull/24839)
-- fix(core): remove tmux alternate buffer warning by @jackwotherspoon in
-  [#24852](https://github.com/google-gemini/gemini-cli/pull/24852)
-- Improve sandbox error matching and caching by @DavidAPierce in
-  [#24550](https://github.com/google-gemini/gemini-cli/pull/24550)
-- feat(core): add agent protocol UI types and experimental flag by @mbleigh in
-  [#24275](https://github.com/google-gemini/gemini-cli/pull/24275)
-- feat(core): use experiment flags for default fetch timeouts by @yunaseoul in
-  [#24261](https://github.com/google-gemini/gemini-cli/pull/24261)
-- Revert "fix(ui): improve narration suppression and reduce flicker (#2… by
-  @gundermanc in
-  [#24857](https://github.com/google-gemini/gemini-cli/pull/24857)
-- refactor(cli): remove duplication in interactive shell awaiting input hint by
-  @JayadityaGit in
-  [#24801](https://github.com/google-gemini/gemini-cli/pull/24801)
-- refactor(core): make LegacyAgentSession dependencies optional by @mbleigh in
-  [#24287](https://github.com/google-gemini/gemini-cli/pull/24287)
-- Changelog for v0.37.0-preview.2 by @gemini-cli-robot in
-  [#24848](https://github.com/google-gemini/gemini-cli/pull/24848)
-- fix(cli): always show shell command description or actual command by @jacob314
-  in [#24774](https://github.com/google-gemini/gemini-cli/pull/24774)
-- Added flag for ept size and increased default size by @devr0306 in
-  [#24859](https://github.com/google-gemini/gemini-cli/pull/24859)
-- fix(core): dispose Scheduler to prevent McpProgress listener leak by
-  @Anjaligarhwal in
-  [#24870](https://github.com/google-gemini/gemini-cli/pull/24870)
-- fix(cli): switch default back to terminalBuffer=false and fix regressions
-  introduced for that mode by @jacob314 in
-  [#24873](https://github.com/google-gemini/gemini-cli/pull/24873)
-- feat(cli): switch to ctrl+g from ctrl-x by @jacob314 in
-  [#24861](https://github.com/google-gemini/gemini-cli/pull/24861)
-- fix: isolate concurrent browser agent instances by @gsquared94 in
-  [#24794](https://github.com/google-gemini/gemini-cli/pull/24794)
-- docs: update MCP server OAuth redirect port documentation by @adamfweidman in
-  [#24844](https://github.com/google-gemini/gemini-cli/pull/24844)
+  [#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
+  @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
+  @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
+  @SandyTao520 in
+  [#23572](https://github.com/google-gemini/gemini-cli/pull/23572)
+- fix(telemetry): patch memory leak and enforce logPrompts privacy 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)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.37.0-preview.2...v0.38.0-preview.0
+https://github.com/google-gemini/gemini-cli/compare/v0.35.0-preview.5...v0.36.0-preview.0

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 (for
-  example, 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 (for example 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 (for
-  example, 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/checkpointing.md

@@ -1,9 +1,9 @@
 # Checkpointing
 
-Gemini CLI includes a Checkpointing feature that automatically saves a snapshot
-of your project's state before any file modifications are made by AI-powered
-tools. This lets you safely experiment with and apply code changes, knowing you
-can instantly revert back to the state before the tool was run.
+The Gemini CLI includes a Checkpointing feature that automatically saves a
+snapshot of your project's state before any file modifications are made by
+AI-powered tools. This lets you safely experiment with and apply code changes,
+knowing you can instantly revert back to the state before the tool was run.
 
 ## How it works
 
@@ -72,7 +72,7 @@ To see a list of all saved checkpoints for the current project, simply run:
 
 The CLI will display a list of available checkpoint files. These file names are
 typically composed of a timestamp, the name of the file being modified, and the
-name of the tool that was about to be run (for example,
+name of the tool that was about to be run (e.g.,
 `2025-06-22T10-00-00_000Z-my-file.txt-write_file`).
 
 ### Restore a specific checkpoint

docs/cli/cli-reference.md

@@ -29,16 +29,16 @@ and parameters.
 
 These commands are available within the interactive REPL.
 
-| Command              | Description                                     |
-| -------------------- | ----------------------------------------------- |
-| `/skills reload`     | Reload discovered skills from disk              |
-| `/agents reload`     | Reload the agent registry                       |
-| `/commands reload`   | Reload custom slash commands                    |
-| `/memory reload`     | Reload context files (for example, `GEMINI.md`) |
-| `/mcp reload`        | Restart and reload MCP servers                  |
-| `/extensions reload` | Reload all active extensions                    |
-| `/help`              | Show help for all commands                      |
-| `/quit`              | Exit the interactive session                    |
+| Command              | Description                              |
+| -------------------- | ---------------------------------------- |
+| `/skills reload`     | Reload discovered skills from disk       |
+| `/agents reload`     | Reload the agent registry                |
+| `/commands reload`   | Reload custom slash commands             |
+| `/memory reload`     | Reload context files (e.g., `GEMINI.md`) |
+| `/mcp reload`        | Restart and reload MCP servers           |
+| `/extensions reload` | Reload all active extensions             |
+| `/help`              | Show help for all commands               |
+| `/quit`              | Exit the interactive session             |
 
 ## CLI Options
 
@@ -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.**                                                                                                          |
@@ -60,7 +60,7 @@ These commands are available within the interactive REPL.
 | `--allowed-tools`                | -     | array   | -         | **Deprecated.** Use the [Policy Engine](../reference/policy-engine.md) instead. Tools that are allowed to run without confirmation (comma-separated or multiple flags) |
 | `--extensions`                   | `-e`  | array   | -         | List of extensions to use. If not provided, all extensions are enabled (comma-separated or multiple flags)                                                             |
 | `--list-extensions`              | `-l`  | boolean | -         | List all available extensions and exit                                                                                                                                 |
-| `--resume`                       | `-r`  | string  | -         | Resume a previous session. Use `"latest"` for most recent or index number (for example `--resume 5`)                                                                   |
+| `--resume`                       | `-r`  | string  | -         | Resume a previous session. Use `"latest"` for most recent or index number (e.g. `--resume 5`)                                                                          |
 | `--list-sessions`                | -     | boolean | -         | List available sessions for the current project and exit                                                                                                               |
 | `--delete-session`               | -     | string  | -         | Delete a session by index number (use `--list-sessions` to see available sessions)                                                                                     |
 | `--include-directories`          | -     | array   | -         | Additional directories to include in the workspace (comma-separated or multiple flags)                                                                                 |

docs/cli/creating-skills.md

@@ -14,7 +14,7 @@ skill. To use it, ask Gemini CLI to create a new skill for you.
 
 Gemini CLI will then use the `skill-creator` to generate the skill:
 
-1.  Generate a new directory for your skill (for example, `my-new-skill/`).
+1.  Generate a new directory for your skill (e.g., `my-new-skill/`).
 2.  Create a `SKILL.md` file with the necessary YAML frontmatter (`name` and
     `description`).
 3.  Create the standard resource directories: `scripts/`, `references/`, and
@@ -24,7 +24,7 @@ Gemini CLI will then use the `skill-creator` to generate the skill:
 
 If you prefer to create skills manually:
 
-1.  **Create a directory** for your skill (for example, `my-new-skill/`).
+1.  **Create a directory** for your skill (e.g., `my-new-skill/`).
 2.  **Create a `SKILL.md` file** inside the new directory.
 
 To add additional resources that support the skill, refer to the skill

docs/cli/custom-commands.md

@@ -85,8 +85,8 @@ The model receives:
 **B. Using arguments in shell commands (inside `!{...}` blocks)**
 
 When you use `{{args}}` inside a shell injection block (`!{...}`), the arguments
-are automatically **shell-escaped** before replacement. This lets you safely
-pass arguments to shell commands, ensuring the resulting command is
+are automatically **shell-escaped** before replacement. This allows you to
+safely pass arguments to shell commands, ensuring the resulting command is
 syntactically correct and secure while preventing command injection
 vulnerabilities.
 
@@ -105,8 +105,8 @@ When you run `/grep-code It's complicated`:
 
 1. The CLI sees `{{args}}` used both outside and inside `!{...}`.
 2. Outside: The first `{{args}}` is replaced raw with `It's complicated`.
-3. Inside: The second `{{args}}` is replaced with the escaped version (for
-   example, on Linux: `"It\'s complicated"`).
+3. Inside: The second `{{args}}` is replaced with the escaped version (e.g., on
+   Linux: `"It\'s complicated"`).
 4. The command executed is `grep -r "It's complicated" .`.
 5. The CLI prompts you to confirm this exact, secure command before execution.
 6. The final prompt is sent.
@@ -116,13 +116,13 @@ When you run `/grep-code It's complicated`:
 If your `prompt` does **not** contain the special placeholder `{{args}}`, the
 CLI uses a default behavior for handling arguments.
 
-If you provide arguments to the command (for example, `/mycommand arg1`), the
-CLI will append the full command you typed to the end of the prompt, separated
-by two newlines. This allows the model to see both the original instructions and
-the specific arguments you just provided.
+If you provide arguments to the command (e.g., `/mycommand arg1`), the CLI will
+append the full command you typed to the end of the prompt, separated by two
+newlines. This allows the model to see both the original instructions and the
+specific arguments you just provided.
 
-If you do **not** provide any arguments (for example, `/mycommand`), the prompt
-is sent to the model exactly as it is, with nothing appended.
+If you do **not** provide any arguments (e.g., `/mycommand`), the prompt is sent
+to the model exactly as it is, with nothing appended.
 
 **Example (`changelog.toml`):**
 
@@ -188,7 +188,7 @@ ensure that only intended commands can be run.
     dialog will appear showing the exact command(s) to be executed.
 5.  **Execution and error reporting:** The command is executed. If the command
     fails, the output injected into the prompt will include the error messages
-    (stderr) followed by a status line, for example,
+    (stderr) followed by a status line, e.g.,
     `[Shell command exited with code 1]`. This helps the model understand the
     context of the failure.
 
@@ -229,10 +229,9 @@ operate on specific files.
 
 - **File injection**: `@{path/to/file.txt}` is replaced by the content of
   `file.txt`.
-- **Multimodal support**: If the path points to a supported image (for example,
-  PNG, JPEG), PDF, audio, or video file, it will be correctly encoded and
-  injected as multimodal input. Other binary files are handled gracefully and
-  skipped.
+- **Multimodal support**: If the path points to a supported image (e.g., PNG,
+  JPEG), PDF, audio, or video file, it will be correctly encoded and injected as
+  multimodal input. Other binary files are handled gracefully and skipped.
 - **Directory listing**: `@{path/to/dir}` is traversed and each file present
   within the directory and all subdirectories is inserted into the prompt. This
   respects `.gitignore` and `.geminiignore` if enabled.

docs/cli/enterprise.md

@@ -175,8 +175,8 @@ the enterprise settings are always loaded with the highest precedence.
 **Example wrapper script:**
 
 Administrators can create a script named `gemini` and place it in a directory
-that appears earlier in the user's `PATH` than the actual Gemini CLI binary (for
-example, `/usr/local/bin/gemini`).
+that appears earlier in the user's `PATH` than the actual Gemini CLI binary
+(e.g., `/usr/local/bin/gemini`).
 
 ```bash
 #!/bin/bash
@@ -325,9 +325,9 @@ User. When it comes to the `mcpServers` object, these configurations are
 1.  **Merging:** The lists of servers from all three levels are combined into a
     single list.
 2.  **Precedence:** If a server with the **same name** is defined at multiple
-    levels (for example, a server named `corp-api` exists in both system and
-    user settings), the definition from the highest-precedence level is used.
-    The order of precedence is: **System > Workspace > User**.
+    levels (e.g., a server named `corp-api` exists in both system and user
+    settings), the definition from the highest-precedence level is used. The
+    order of precedence is: **System > Workspace > User**.
 
 This means a user **cannot** override the definition of a server that is already
 defined in the system-level settings. However, they **can** add new servers with
@@ -343,8 +343,8 @@ canonical servers and adding their names to an allowlist.
 For even greater security, especially when dealing with third-party MCP servers,
 you can restrict which specific tools from a server are exposed to the model.
 This is done using the `includeTools` and `excludeTools` properties within a
-server's definition. This lets you use a subset of tools from a server without
-allowing potentially dangerous ones.
+server's definition. This allows you to use a subset of tools from a server
+without allowing potentially dangerous ones.
 
 Following the principle of least privilege, it is highly recommended to use
 `includeTools` to create an allowlist of only the necessary tools.
@@ -481,8 +481,9 @@ an environment variable, but it can also be enforced for custom tools via the
 ## Telemetry and auditing
 
 For auditing and monitoring purposes, you can configure Gemini CLI to send
-telemetry data to a central location. This lets you track tool usage and other
-events. For more information, see the [telemetry documentation](./telemetry.md).
+telemetry data to a central location. This allows you to track tool usage and
+other events. For more information, see the
+[telemetry documentation](./telemetry.md).
 
 **Example:** Enable telemetry and send it to a local OTLP collector. If
 `otlpEndpoint` is not specified, it defaults to `http://localhost:4317`.
@@ -505,19 +506,15 @@ events. For more information, see the [telemetry documentation](./telemetry.md).
 ## Authentication
 
 You can enforce a specific authentication method for all users by setting the
-`security.auth.enforcedType` in the system-level `settings.json` file. This
-prevents users from choosing a different authentication method. See the
+`enforcedAuthType` in the system-level `settings.json` file. This prevents users
+from choosing a different authentication method. See the
 [Authentication docs](../get-started/authentication.md) for more details.
 
 **Example:** Enforce the use of Google login for all users.
 
 ```json
 {
-  "security": {
-    "auth": {
-      "enforcedType": "oauth-personal"
-    }
-  }
+  "enforcedAuthType": "oauth-personal"
 }
 ```
 

docs/cli/gemini-ignore.md

@@ -1,9 +1,9 @@
 # Ignoring files
 
 This document provides an overview of the Gemini Ignore (`.geminiignore`)
-feature of Gemini CLI.
+feature of the Gemini CLI.
 
-Gemini CLI includes the ability to automatically ignore files, similar to
+The Gemini CLI includes the ability to automatically ignore files, similar to
 `.gitignore` (used by Git) and `.aiexclude` (used by Gemini Code Assist). Adding
 paths to your `.geminiignore` file will exclude them from tools that support
 this feature, although they will still be visible to other services (such as

docs/cli/generation-settings.md

@@ -1,28 +1,26 @@
 # Advanced Model Configuration
 
-This guide details the Model Configuration system within Gemini CLI. Designed
-for researchers, AI quality engineers, and advanced users, this system provides
-a rigorous framework for managing generative model hyperparameters and
+This guide details the Model Configuration system within the Gemini CLI.
+Designed for researchers, AI quality engineers, and advanced users, this system
+provides a rigorous framework for managing generative model hyperparameters and
 behaviors.
 
-<!-- prettier-ignore -->
-> [!WARNING]
-> This is a power-user feature. Configuration values are passed
+> **Warning**: This is a power-user feature. Configuration values are passed
 > directly to the model provider with minimal validation. Incorrect settings
-> (for example, incompatible parameter combinations) may result in runtime
-> errors from the API.
+> (e.g., incompatible parameter combinations) may result in runtime errors from
+> the API.
 
 ## 1. System Overview
 
 The Model Configuration system (`ModelConfigService`) enables deterministic
-control over model generation. It decouples the requested model identifier (for
-example, a CLI flag or agent request) from the underlying API configuration.
-This allows for:
+control over model generation. It decouples the requested model identifier
+(e.g., a CLI flag or agent request) from the underlying API configuration. This
+allows for:
 
 - **Precise Hyperparameter Tuning**: Direct control over `temperature`, `topP`,
   `thinkingBudget`, and other SDK-level parameters.
 - **Environment-Specific Behavior**: Distinct configurations for different
-  operating contexts (for example, testing vs. production).
+  operating contexts (e.g., testing vs. production).
 - **Agent-Scoped Customization**: Applying specific settings only when a
   particular agent is active.
 
@@ -73,7 +71,7 @@ context. They are evaluated dynamically for each model request.
   specified `match` properties.
   - `model`: Matches the requested model name or alias.
   - `overrideScope`: Matches the distinct scope of the request (typically the
-    agent name, for example, `codebaseInvestigator`).
+    agent name, e.g., `codebaseInvestigator`).
 
 **Example Override**:
 
@@ -115,8 +113,8 @@ and `overrideScope`).
 1.  **Filtering**: All matching overrides are identified.
 2.  **Sorting**: Matches are prioritized by **specificity** (the number of
     matched keys in the `match` object).
-    - Specific matches (for example, `model` + `overrideScope`) override broad
-      matches (for example, `model` only).
+    - Specific matches (e.g., `model` + `overrideScope`) override broad matches
+      (e.g., `model` only).
     - Tie-breaking: If specificity is equal, the order of definition in the
       `overrides` array is preserved (last one wins).
 3.  **Merging**: The configurations from the sorted overrides are merged
@@ -130,10 +128,10 @@ The configuration follows the `ModelConfigServiceConfig` interface.
 
 Defines the actual parameters for the model.
 
-| Property                | Type     | Description                                                               |
-| :---------------------- | :------- | :------------------------------------------------------------------------ |
-| `model`                 | `string` | The identifier of the model to be called (for example, `gemini-2.5-pro`). |
-| `generateContentConfig` | `object` | The configuration object passed to the `@google/genai` SDK.               |
+| Property                | Type     | Description                                                        |
+| :---------------------- | :------- | :----------------------------------------------------------------- |
+| `model`                 | `string` | The identifier of the model to be called (e.g., `gemini-2.5-pro`). |
+| `generateContentConfig` | `object` | The configuration object passed to the `@google/genai` SDK.        |
 
 ### `GenerateContentConfig` (Common Parameters)
 
@@ -144,7 +142,7 @@ Directly maps to the SDK's `GenerateContentConfig`. Common parameters include:
 - **`topP`**: (`number`) Nucleus sampling probability.
 - **`maxOutputTokens`**: (`number`) Limit on generated response length.
 - **`thinkingConfig`**: (`object`) Configuration for models with reasoning
-  capabilities (for example, `thinkingBudget`, `includeThoughts`).
+  capabilities (e.g., `thinkingBudget`, `includeThoughts`).
 
 ## 5. Practical Examples
 
@@ -172,7 +170,7 @@ configuration but enforcing zero temperature.
 ### Agent-Specific Parameter Injection
 
 Enforce extended thinking budgets for a specific agent without altering the
-global default, for example for the `codebaseInvestigator`.
+global default, e.g. for the `codebaseInvestigator`.
 
 ```json
 "modelConfigs": {

docs/cli/model-routing.md

@@ -10,8 +10,8 @@ Model routing is managed by the `ModelAvailabilityService`, which monitors model
 health and automatically routes requests to available models based on defined
 policies.
 
-1.  **Model failure:** If the currently selected model fails (for example, due
-    to quota or server errors), the CLI will initiate the fallback process.
+1.  **Model failure:** If the currently selected model fails (e.g., due to quota
+    or server errors), the CLI will initiate the fallback process.
 
 2.  **User consent:** Depending on the failure and the model's policy, the CLI
     may prompt you to switch to a fallback model (by default always prompts

docs/cli/model-steering.md

@@ -19,7 +19,7 @@ Model steering is an experimental feature and is disabled by default. You can
 enable it using the `/settings` command or by updating your `settings.json`
 file.
 
-1.  Type `/settings` in Gemini CLI.
+1.  Type `/settings` in the Gemini CLI.
 2.  Search for **Model Steering**.
 3.  Set the value to **true**.
 

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]]
@@ -314,8 +302,8 @@ Hooks such as `BeforeTool` or `AfterTool` can be configured to intercept the
 > [!WARNING] When hooks are triggered by **tool executions**, they do **not**
 > run when you manually toggle Plan Mode using the `/plan` command or the
 > `Shift+Tab` keyboard shortcut. If you need hooks to execute on mode changes,
-> ensure the transition is initiated by the agent (for example, by asking "start
-> a plan for...").
+> ensure the transition is initiated by the agent (e.g., by asking "start a plan
+> for...").
 
 #### Example: Archive approved plans to GCS (`AfterTool`)
 

docs/cli/sandbox.md

@@ -1,11 +1,11 @@
-# Sandboxing in Gemini CLI
+# Sandboxing in the Gemini CLI
 
-This document provides a guide to sandboxing in Gemini CLI, including
+This document provides a guide to sandboxing in the Gemini CLI, including
 prerequisites, quickstart, and configuration.
 
 ## Prerequisites
 
-Before using sandboxing, you need to install and set up Gemini CLI:
+Before using sandboxing, you need to install and set up the Gemini CLI:
 
 ```bash
 npm install -g @google/gemini-cli
@@ -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
@@ -229,7 +177,7 @@ gemini -p "run the test suite"
 2. **Environment variable**:
    `GEMINI_SANDBOX=true|docker|podman|sandbox-exec|runsc|lxc`
 3. **Settings file**: `"sandbox": true` in the `tools` object of your
-   `settings.json` file (for example, `{"tools": {"sandbox": true}}`).
+   `settings.json` file (e.g., `{"tools": {"sandbox": true}}`).
 
 ### macOS Seatbelt profiles
 
@@ -309,9 +257,7 @@ $env:SANDBOX_SET_UID_GID="false"  # Disable UID/GID mapping
 
 **Missing commands**
 
-- Add to a custom Dockerfile. Automatic `BUILD_SANDBOX` builds are only
-  available when running Gemini CLI from source; npm installs need a prebuilt
-  image instead.
+- Add to custom Dockerfile.
 - Install via `sandbox.bashrc`.
 
 **Network issues**

docs/cli/settings.md

@@ -29,8 +29,7 @@ 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`      |
+| 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. A custom directory requires a policy to allow write access in Plan Mode.                                                                     | `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`      |
@@ -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` |
@@ -153,23 +149,23 @@ they appear in the UI.
 
 ### Advanced
 
-| UI Label                          | Setting                        | Description                                                                                                                                                                                                           | Default |
-| --------------------------------- | ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| Auto Configure Max Old Space Size | `advanced.autoConfigureMemory` | Automatically configure Node.js memory limits. Note: Because memory is allocated during the initial process boot, this setting is only read from the global user settings file and ignores workspace-level overrides. | `true`  |
+| UI Label                          | Setting                        | Description                                   | Default |
+| --------------------------------- | ------------------------------ | --------------------------------------------- | ------- |
+| 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/system-prompt.md

@@ -35,7 +35,7 @@ via a `.gemini/.env` file. See
   - `GEMINI_SYSTEM_MD=/absolute/path/to/my-system.md`
   - Relative paths are supported and resolved from the current working
     directory.
-  - Tilde expansion is supported (for example, `~/my-system.md`).
+  - Tilde expansion is supported (e.g., `~/my-system.md`).
 
 - Disable the override (use built‑in prompt):
   - `GEMINI_SYSTEM_MD=false` or `GEMINI_SYSTEM_MD=0` or unset the variable.
@@ -70,7 +70,7 @@ dynamically include built-in content:
 - `${AvailableTools}`: Injects a bulleted list of all currently enabled tool
   names.
 - Tool Name Variables: Injects the actual name of a tool using the pattern:
-  `${toolName}_ToolName` (for example, `${write_file_ToolName}`,
+  `${toolName}_ToolName` (e.g., `${write_file_ToolName}`,
   `${run_shell_command_ToolName}`).
 
   This pattern is generated dynamically for all available tools.

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`
@@ -117,8 +116,8 @@ least `background.primary`, `text.primary`, `text.secondary`, and the various
 accent colors via `text.link`, `text.accent`, and `status` to ensure a cohesive
 UI.
 
-You can use either hex codes (for example, `#FF0000`) **or** standard CSS color
-names (for example, `coral`, `teal`, `blue`) for any color value. See
+You can use either hex codes (e.g., `#FF0000`) **or** standard CSS color names
+(e.g., `coral`, `teal`, `blue`) for any color value. See
 [CSS color names](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value#color_keywords)
 for a full list of supported names.
 
@@ -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/cli/trusted-folders.md

@@ -1,7 +1,7 @@
 # Trusted Folders
 
 The Trusted Folders feature is a security setting that gives you control over
-which projects can use the full capabilities of Gemini CLI. It prevents
+which projects can use the full capabilities of the Gemini CLI. It prevents
 potentially malicious code from running by asking you to approve a folder before
 the CLI loads any project-specific configurations from it.
 
@@ -24,12 +24,12 @@ Add the following to your user `settings.json` file:
 
 ## How it works: The trust dialog
 
-Once the feature is enabled, the first time you run Gemini CLI from a folder, a
-dialog will automatically appear, prompting you to make a choice:
+Once the feature is enabled, the first time you run the Gemini CLI from a
+folder, a dialog will automatically appear, prompting you to make a choice:
 
-- **Trust folder**: Grants full trust to the current folder (for example,
+- **Trust folder**: Grants full trust to the current folder (e.g.,
   `my-project`).
-- **Trust parent folder**: Grants trust to the parent directory (for example,
+- **Trust parent folder**: Grants trust to the parent directory (e.g.,
   `safe-projects`), which automatically trusts all of its subdirectories as
   well. This is useful if you keep all your safe projects in one place.
 - **Don't trust**: Marks the folder as untrusted. The CLI will operate in a
@@ -40,9 +40,9 @@ will only be asked once per folder.
 
 ## Understanding folder contents: The discovery phase
 
-Before you make a choice, Gemini CLI performs a **discovery phase** to scan the
-folder for potential configurations. This information is displayed in the trust
-dialog to help you make an informed decision.
+Before you make a choice, the Gemini CLI performs a **discovery phase** to scan
+the folder for potential configurations. This information is displayed in the
+trust dialog to help you make an informed decision.
 
 The discovery UI lists the following categories of items found in the project:
 
@@ -63,16 +63,16 @@ attention:
   settings, such as auto-approving certain tools or disabling the security
   sandbox.
 - **Discovery Errors**: If the CLI encounters issues while scanning the folder
-  (for example, a malformed `settings.json` file), these errors will be
-  displayed prominently.
+  (e.g., a malformed `settings.json` file), these errors will be displayed
+  prominently.
 
 By reviewing these details, you can ensure that you only grant trust to projects
 that you know are safe.
 
 ## Why trust matters: The impact of an untrusted workspace
 
-When a folder is **untrusted**, Gemini CLI runs in a restricted "safe mode" to
-protect you. In this mode, the following features are disabled:
+When a folder is **untrusted**, the Gemini CLI runs in a restricted "safe mode"
+to protect you. In this mode, the following features are disabled:
 
 1.  **Workspace settings are ignored**: The CLI will **not** load the
     `.gemini/settings.json` file from the project. This prevents the loading of
@@ -97,8 +97,8 @@ protect you. In this mode, the following features are disabled:
     commands from .toml files, including both project-specific and global user
     commands.
 
-Granting trust to a folder unlocks the full functionality of Gemini CLI for that
-workspace.
+Granting trust to a folder unlocks the full functionality of the Gemini CLI for
+that workspace.
 
 ## Managing your trust settings
 

docs/cli/tutorials/mcp-setup.md

@@ -102,7 +102,7 @@ The agent will:
 ## Troubleshooting
 
 - **Server won't start?** Try running the docker command manually in your
-  terminal to see if it prints an error (for example, "image not found").
+  terminal to see if it prints an error (e.g., "image not found").
 - **Tools not found?** Run `/mcp reload` to force the CLI to re-query the server
   for its capabilities.
 

docs/cli/tutorials/memory-management.md

@@ -50,7 +50,7 @@ loaded into every conversation.
 
 ### Scenario: Using the hierarchy
 
-Context is loaded hierarchically. This lets you have general rules for
+Context is loaded hierarchically. This allows you to have general rules for
 everything and specific rules for sub-projects.
 
 1.  **Global:** `~/.gemini/GEMINI.md` (Rules for _every_ project you work on).

docs/cli/tutorials/plan-mode-steering.md

@@ -79,8 +79,8 @@ each step with higher confidence and fewer errors.
 - **Steer early:** Providing feedback during the research phase is more
   efficient than waiting for the final plan to be drafted.
 - **Use for context:** Steering is a great way to provide knowledge that might
-  not be obvious from reading the code (for example, "We are planning to
-  deprecate this module next month").
+  not be obvious from reading the code (e.g., "We are planning to deprecate this
+  module next month").
 
 ## Next steps
 

docs/cli/tutorials/session-management.md

@@ -35,7 +35,7 @@ browser.
 
 This opens a searchable list of all your past sessions. You'll see:
 
-- A timestamp (for example, "2 hours ago").
+- A timestamp (e.g., "2 hours ago").
 - The first user message (helping you identify the topic).
 - The number of turns in the conversation.
 

docs/cli/tutorials/shell-commands.md

@@ -58,7 +58,7 @@ watchers.
 
 **Prompt:** `Start the React dev server in the background.`
 
-Gemini will run the command (for example, `npm run dev`) and detach it.
+Gemini will run the command (e.g., `npm run dev`) and detach it.
 
 ### Scenario: Viewing active shells
 

docs/cli/tutorials/task-planning.md

@@ -7,7 +7,7 @@ progress with the todo list.
 ## Prerequisites
 
 - Gemini CLI installed and authenticated.
-- A complex task in mind (for example, a multi-file refactor or new feature).
+- A complex task in mind (e.g., a multi-file refactor or new feature).
 
 ## Why use task planning?
 
@@ -58,7 +58,7 @@ Tell the agent to proceed.
 As the agent works, you'll see the todo list update in real-time above the input
 box.
 
-- **Current focus:** The active task is highlighted (for example,
+- **Current focus:** The active task is highlighted (e.g.,
   `[IN_PROGRESS] Create tsconfig.json`).
 - **Progress:** Completed tasks are marked as done.
 
@@ -90,4 +90,4 @@ living document, not a static text block.
 - See the [Todo tool reference](../../tools/todos.md) for technical schema
   details.
 - Learn about [Memory management](memory-management.md) to persist planning
-  preferences (for example, "Always create a test plan first").
+  preferences (e.g., "Always create a test plan first").

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
@@ -29,7 +29,7 @@ While the `packages/cli` portion of Gemini CLI provides the user interface,
   potentially incorporating conversation history, tool definitions, and
   instructional context from `GEMINI.md` files.
 - **Tool management & orchestration:**
-  - Registering available tools (for example, file system tools, shell command
+  - Registering available tools (e.g., file system tools, shell command
     execution).
   - Interpreting tool use requests from the Gemini model.
   - Executing the requested tools with the provided arguments.
@@ -45,7 +45,7 @@ The core plays a vital role in security:
 
 - **API key management:** It handles the `GEMINI_API_KEY` and ensures it's used
   securely when communicating with the Gemini API.
-- **Tool execution:** When tools interact with the local system (for example,
+- **Tool execution:** When tools interact with the local system (e.g.,
   `run_shell_command`), the core (and its underlying tool implementations) must
   do so with appropriate caution, often involving sandboxing mechanisms to
   prevent unintended modifications.
@@ -70,7 +70,7 @@ to use the CLI even if the default "pro" model is rate-limited.
 
 If you are using the default "pro" model and the CLI detects that you are being
 rate-limited, it automatically switches to the "flash" model for the current
-session. This lets you continue working without interruption.
+session. This allows you to continue working without interruption.
 
 Internal utility calls that use `gemini-2.5-flash-lite` (for example, prompt
 completion and classification) silently fall back to `gemini-2.5-flash` and
@@ -90,8 +90,9 @@ in a hierarchical manner, starting from the current working directory and moving
 up to the project root and the user's home directory. It also searches in
 subdirectories.
 
-This lets you have global, project-level, and component-level context files,
-which are all combined to provide the model with the most relevant information.
+This allows you to have global, project-level, and component-level context
+files, which are all combined to provide the model with the most relevant
+information.
 
 You can use the [`/memory` command](../reference/commands.md) to `show`, `add`,
 and `refresh` the content of loaded `GEMINI.md` files.

docs/core/local-model-routing.md

@@ -108,7 +108,7 @@ Download complete.
 $ ./lit.lit.macos_arm64 pull gemma3-1b-gpu-custom
 
 [Legal] The model you are about to download is governed by
-the Gemma Terms of Use and Prohibited Use Policy. Review these terms and ensure you agree before continuing.
+the Gemma Terms of Use and Prohibited Use Policy. Please review these terms and ensure you agree before continuing.
 
 Full Terms: https://ai.google.dev/gemma/terms
 Prohibited Use Policy: https://ai.google.dev/gemma/prohibited_use_policy

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
@@ -430,7 +447,7 @@ both behind auth.
 
 ## Managing Subagents
 
-Users can manage subagents using the following commands within Gemini CLI:
+Users can manage subagents using the following commands within the Gemini CLI:
 
 - `/agents list`: Displays all available local and remote subagents.
 - `/agents reload`: Reloads the agent registry. Use this after adding or
@@ -442,16 +459,3 @@ Users can manage subagents using the following commands within 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,8 +290,7 @@ 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 (for example, `gemini-3-preview`). Defaults to `inherit` (uses the main session model).                                                                                                 |
+| `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`.                                                                                                          |
 | `timeout_mins` | number | No       | Maximum execution time in minutes. Defaults to `10`.                                                                                                                                                          |
@@ -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 lets you 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
@@ -521,24 +381,6 @@ field.
 }
 ```
 
-#### Safety policies (TOML)
-
-You can restrict access to specific subagents using the CLI's **Policy Engine**.
-Subagents are treated as virtual tool names for policy matching purposes.
-
-To govern access to a subagent, create a `.toml` file in your policy directory
-(e.g., `~/.gemini/policies/`):
-
-```toml
-[[rule]]
-toolName = "codebase_investigator"
-decision = "deny"
-deny_message = "Deep codebase analysis is restricted for this session."
-```
-
-For more information on setting up fine-grained safety guardrails, see the
-[Policy Engine reference](../reference/policy-engine.md#special-syntax-for-subagents).
-
 ### Optimizing your subagent
 
 The main agent's system prompt encourages it to use an expert subagent when one
@@ -564,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.
 
@@ -577,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/extensions/best-practices.md

@@ -117,9 +117,8 @@ for your users.
 Follow [Semantic Versioning (SemVer)](https://semver.org/) to communicate
 changes clearly.
 
-- **Major:** Breaking changes (for example, renaming tools or changing
-  arguments).
-- **Minor:** New features (for example, adding new tools or commands).
+- **Major:** Breaking changes (e.g., renaming tools or changing arguments).
+- **Minor:** New features (e.g., adding new tools or commands).
 - **Patch:** Bug fixes and performance improvements.
 
 ### Release channels
@@ -183,7 +182,7 @@ If your tools aren't working as expected:
 If a custom command isn't responding:
 
 - **Check precedence:** Remember that user and project commands take precedence
-  over extension commands. Use the prefixed name (for example,
-  `/extension.command`) to verify the extension's version.
+  over extension commands. Use the prefixed name (e.g., `/extension.command`) to
+  verify the extension's version.
 - **Help command:** Run `/help` to see a list of all available commands and
   their sources.

docs/extensions/reference.md

@@ -88,12 +88,12 @@ gemini extensions new <path> [template]
 ```
 
 - `<path>`: The directory to create.
-- `[template]`: The template to use (for example, `mcp-server`, `context`,
+- `[template]`: The template to use (e.g., `mcp-server`, `context`,
   `custom-commands`).
 
 ### Link a local extension
 
-Create a symbolic link between your development directory and Gemini CLI
+Create a symbolic link between your development directory and the Gemini CLI
 extensions directory. This lets you test changes immediately without
 reinstalling.
 
@@ -244,7 +244,7 @@ agent definition files (`.md`) to an `agents/` directory in your extension root.
 
 ### <a id="policy-engine"></a>Policy Engine
 
-Extensions can contribute policy rules and safety checkers to Gemini CLI
+Extensions can contribute policy rules and safety checkers to the Gemini CLI
 [Policy Engine](../reference/policy-engine.md). These rules are defined in
 `.toml` files and take effect when the extension is activated.
 
@@ -324,14 +324,13 @@ defined in the `themes` array in `gemini-extension.json`.
 Custom themes provided by extensions can be selected using the `/theme` command
 or by setting the `ui.theme` property in your `settings.json` file. Note that
 when referring to a theme from an extension, the extension name is appended to
-the theme name in parentheses, for example,
-`shades-of-green (my-green-extension)`.
+the theme name in parentheses, e.g., `shades-of-green (my-green-extension)`.
 
 ### Conflict resolution
 
 Extension commands have the lowest precedence. If an extension command name
 conflicts with a user or project command, the extension command is prefixed with
-the extension name (for example, `/gcp.deploy`) using a dot separator.
+the extension name (e.g., `/gcp.deploy`) using a dot separator.
 
 ## Variables
 

docs/extensions/releasing.md

@@ -98,7 +98,7 @@ Use these values for the placeholders:
 **Examples:**
 
 - `darwin.arm64.my-tool.tar.gz` (specific to Apple Silicon Macs)
-- `darwin.my-tool.tar.gz` (fallback for all Macs, for example Intel)
+- `darwin.my-tool.tar.gz` (fallback for all Macs, e.g. Intel)
 - `linux.x64.my-tool.tar.gz`
 - `win32.my-tool.zip`
 
@@ -155,10 +155,9 @@ jobs:
 
 ## Migrating an Extension Repository
 
-If you need to move your extension to a new repository (for example, from a
-personal account to an organization) or rename it, you can use the `migratedTo`
-property in your `gemini-extension.json` file to seamlessly transition your
-users.
+If you need to move your extension to a new repository (e.g., from a personal
+account to an organization) or rename it, you can use the `migratedTo` property
+in your `gemini-extension.json` file to seamlessly transition your users.
 
 1. **Create the new repository**: Setup your extension in its new location.
 2. **Update the old repository**: In your original repository, update the
@@ -174,7 +173,7 @@ users.
    ```
 3. **Release the update**: Publish this new version in your old repository.
 
-When users check for updates, Gemini CLI will detect the `migratedTo` field,
+When users check for updates, the Gemini CLI will detect the `migratedTo` field,
 verify that the new repository contains a valid extension update, and
 automatically update their local installation to track the new source and name
 moving forward. All extension settings will automatically migrate to the new

docs/extensions/writing-extensions.md

@@ -7,22 +7,22 @@ linking it for local development.
 
 ## Prerequisites
 
-Before you start, ensure you have Gemini CLI installed and a basic understanding
-of Node.js.
+Before you start, ensure you have the Gemini CLI installed and a basic
+understanding of Node.js.
 
 ## Extension features
 
 Extensions offer several ways to customize Gemini CLI. Use this table to decide
 which features your extension needs.
 
-| Feature                                                        | What it is                                                                                                                | When to use it                                                                                                                                                                                                                                                                                 | Invoked by            |
-| :------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------ | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :-------------------- |
-| **[MCP server](reference.md#mcp-servers)**                     | A standard way to expose new tools and data sources to the model.                                                         | Use this when you want the model to be able to _do_ new things, like fetching data from an internal API, querying a database, or controlling a local application. We also support MCP resources (which can replace custom commands) and system instructions (which can replace custom context) | Model                 |
-| **[Custom commands](../cli/custom-commands.md)**               | A shortcut (like `/my-cmd`) that executes a pre-defined prompt or shell command.                                          | Use this for repetitive tasks or to save long, complex prompts that you use frequently. Great for automation.                                                                                                                                                                                  | User                  |
-| **[Context file (`GEMINI.md`)](reference.md#contextfilename)** | A markdown file containing instructions that are loaded into the model's context at the start of every session.           | Use this to define the "personality" of your extension, set coding standards, or provide essential knowledge that the model should always have.                                                                                                                                                | CLI provides to model |
-| **[Agent skills](../cli/skills.md)**                           | A specialized set of instructions and workflows that the model activates only when needed.                                | Use this for complex, occasional tasks (like "create a PR" or "audit security") to avoid cluttering the main context window when the skill isn't being used.                                                                                                                                   | Model                 |
-| **[Hooks](../hooks/index.md)**                                 | A way to intercept and customize the CLI's behavior at specific lifecycle events (for example, before/after a tool call). | Use this when you want to automate actions based on what the model is doing, like validating tool arguments, logging activity, or modifying the model's input/output.                                                                                                                          | CLI                   |
-| **[Custom themes](reference.md#themes)**                       | A set of color definitions to personalize the CLI UI.                                                                     | Use this to provide a unique visual identity for your extension or to offer specialized high-contrast or thematic color schemes.                                                                                                                                                               | User (via /theme)     |
+| Feature                                                        | What it is                                                                                                         | When to use it                                                                                                                                                                                                                                                                                 | Invoked by            |
+| :------------------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :-------------------- |
+| **[MCP server](reference.md#mcp-servers)**                     | A standard way to expose new tools and data sources to the model.                                                  | Use this when you want the model to be able to _do_ new things, like fetching data from an internal API, querying a database, or controlling a local application. We also support MCP resources (which can replace custom commands) and system instructions (which can replace custom context) | Model                 |
+| **[Custom commands](../cli/custom-commands.md)**               | A shortcut (like `/my-cmd`) that executes a pre-defined prompt or shell command.                                   | Use this for repetitive tasks or to save long, complex prompts that you use frequently. Great for automation.                                                                                                                                                                                  | User                  |
+| **[Context file (`GEMINI.md`)](reference.md#contextfilename)** | A markdown file containing instructions that are loaded into the model's context at the start of every session.    | Use this to define the "personality" of your extension, set coding standards, or provide essential knowledge that the model should always have.                                                                                                                                                | CLI provides to model |
+| **[Agent skills](../cli/skills.md)**                           | A specialized set of instructions and workflows that the model activates only when needed.                         | Use this for complex, occasional tasks (like "create a PR" or "audit security") to avoid cluttering the main context window when the skill isn't being used.                                                                                                                                   | Model                 |
+| **[Hooks](../hooks/index.md)**                                 | A way to intercept and customize the CLI's behavior at specific lifecycle events (e.g., before/after a tool call). | Use this when you want to automate actions based on what the model is doing, like validating tool arguments, logging activity, or modifying the model's input/output.                                                                                                                          | CLI                   |
+| **[Custom themes](reference.md#themes)**                       | A set of color definitions to personalize the CLI UI.                                                              | Use this to provide a unique visual identity for your extension or to offer specialized high-contrast or thematic color schemes.                                                                                                                                                               | User (via /theme)     |
 
 ## Step 1: Create a new extension
 
@@ -172,7 +172,7 @@ Link your extension to your Gemini CLI installation for local development.
 
 2.  **Link the extension:**
 
-    The `link` command creates a symbolic link from Gemini CLI extensions
+    The `link` command creates a symbolic link from the Gemini CLI extensions
     directory to your development directory. Changes you make are reflected
     immediately.
 

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]
@@ -60,7 +60,7 @@ or fallback to Gemini 2.5 Pro.
 > [!NOTE]
 > The **Keep trying** option uses exponential backoff, in which Gemini
 > CLI waits longer between each retry, when the system is busy. If the retry
-> doesn't happen immediately, wait a few minutes for the request to
+> doesn't happen immediately, please wait a few minutes for the request to
 > process.
 
 ### Model selection and routing types

docs/get-started/index.md

@@ -1,7 +1,7 @@
 # Get started with Gemini CLI
 
 Welcome to Gemini CLI! This guide will help you install, configure, and start
-using Gemini CLI to enhance your workflow right from your terminal.
+using the Gemini CLI to enhance your workflow right from your terminal.
 
 ## Quickstart: Install, authenticate, configure, and use Gemini CLI
 
@@ -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 (for example, 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/best-practices.md

@@ -367,7 +367,7 @@ chmod +x .gemini/hooks/*.js
 ```
 
 **Windows Note**: On Windows, PowerShell scripts (`.ps1`) don't use `chmod`, but
-you may need to ensure your execution policy allows them to run (for example,
+you may need to ensure your execution policy allows them to run (e.g.,
 `Set-ExecutionPolicy RemoteSigned -Scope CurrentUser`).
 
 ### Version control
@@ -401,12 +401,12 @@ git add .gemini/settings.json
 Understanding where hooks come from and what they can do is critical for secure
 usage.
 
-| Hook Source                   | Description                                                                                                                       |
-| :---------------------------- | :-------------------------------------------------------------------------------------------------------------------------------- |
-| **System**                    | Configured by system administrators (for example, `/etc/gemini-cli/settings.json`, `/Library/...`). Assumed to be the **safest**. |
-| **User** (`~/.gemini/...`)    | Configured by you. You are responsible for ensuring they are safe.                                                                |
-| **Extensions**                | You explicitly approve and install these. Security depends on the extension source (integrity).                                   |
-| **Project** (`./.gemini/...`) | **Untrusted by default.** Safest in trusted internal repos; higher risk in third-party/public repos.                              |
+| Hook Source                   | Description                                                                                                                |
+| :---------------------------- | :------------------------------------------------------------------------------------------------------------------------- |
+| **System**                    | Configured by system administrators (e.g., `/etc/gemini-cli/settings.json`, `/Library/...`). Assumed to be the **safest**. |
+| **User** (`~/.gemini/...`)    | Configured by you. You are responsible for ensuring they are safe.                                                         |
+| **Extensions**                | You explicitly approve and install these. Security depends on the extension source (integrity).                            |
+| **Project** (`./.gemini/...`) | **Untrusted by default.** Safest in trusted internal repos; higher risk in third-party/public repos.                       |
 
 #### Project Hook Security
 
@@ -422,10 +422,9 @@ When you open a project with hooks defined in `.gemini/settings.json`:
 5. **Trust**: The hook is marked as "trusted" for this project.
 
 > **Modification detection**: If the `command` string of a project hook is
-> changed (for example, by a `git pull`), its identity changes. Gemini CLI will
-> treat it as a **new, untrusted hook** and warn you again. This prevents
-> malicious actors from silently swapping a verified command for a malicious
-> one.
+> changed (e.g., by a `git pull`), its identity changes. Gemini CLI will treat
+> it as a **new, untrusted hook** and warn you again. This prevents malicious
+> actors from silently swapping a verified command for a malicious one.
 
 ### Risks
 
@@ -442,17 +441,17 @@ When you open a project with hooks defined in `.gemini/settings.json`:
 **Verify the source** of any project hooks or extensions before enabling them.
 
 - For open-source projects, a quick review of the hook scripts is recommended.
-- For extensions, ensure you trust the author or publisher (for example,
-  verified publishers, well-known community members).
+- For extensions, ensure you trust the author or publisher (e.g., verified
+  publishers, well-known community members).
 - Be cautious with obfuscated scripts or compiled binaries from unknown sources.
 
 #### Sanitize environment
 
-Hooks inherit the environment of Gemini CLI process, which may include sensitive
-API keys. Gemini CLI provides a
+Hooks inherit the environment of the Gemini CLI process, which may include
+sensitive API keys. Gemini CLI provides a
 [redaction system](../reference/configuration.md#environment-variable-redaction)
-that automatically filters variables matching sensitive patterns (for example,
-`KEY`, `TOKEN`).
+that automatically filters variables matching sensitive patterns (e.g., `KEY`,
+`TOKEN`).
 
 > **Disabled by Default**: Environment redaction is currently **OFF by
 > default**. We strongly recommend enabling it if you are running third-party
@@ -512,7 +511,7 @@ chmod +x .gemini/hooks/my-hook.sh
 ```
 
 **Windows Note**: On Windows, ensure your execution policy allows running
-scripts (for example, `Get-ExecutionPolicy`).
+scripts (e.g., `Get-ExecutionPolicy`).
 
 **Verify script path:** Ensure the path in `settings.json` resolves correctly.
 

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
@@ -63,9 +63,9 @@ Hooks communicate via `stdin` (Input) and `stdout` (Output).
 2. **Pollution = Failure**: If `stdout` contains non-JSON text, parsing will
    fail. The CLI will default to "Allow" and treat the entire output as a
    `systemMessage`.
-3. **Debug via Stderr**: Use `stderr` for **all** logging and debugging (for
-   example, `echo "debug" >&2`). Gemini CLI captures `stderr` but never attempts
-   to parse it as JSON.
+3. **Debug via Stderr**: Use `stderr` for **all** logging and debugging (e.g.,
+   `echo "debug" >&2`). Gemini CLI captures `stderr` but never attempts to parse
+   it as JSON.
 
 #### Exit codes
 
@@ -74,7 +74,7 @@ execution:
 
 | Exit Code | Label            | Behavioral Impact                                                                                                                                                            |
 | --------- | ---------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **0**     | **Success**      | The `stdout` is parsed as JSON. **Preferred code** for all logic, including intentional blocks (for example, `{"decision": "deny"}`).                                        |
+| **0**     | **Success**      | The `stdout` is parsed as JSON. **Preferred code** for all logic, including intentional blocks (e.g., `{"decision": "deny"}`).                                               |
 | **2**     | **System Block** | **Critical Block**. The target action (tool, turn, or stop) is aborted. `stderr` is used as the rejection reason. High severity; used for security stops or script failures. |
 | **Other** | **Warning**      | Non-fatal failure. A warning is shown, but the interaction proceeds using original parameters.                                                                               |
 
@@ -84,9 +84,8 @@ You can filter which specific tools or triggers fire your hook using the
 `matcher` field.
 
 - **Tool events** (`BeforeTool`, `AfterTool`): Matchers are **Regular
-  Expressions**. (for example, `"write_.*"`).
-- **Lifecycle events**: Matchers are **Exact Strings**. (for example,
-  `"startup"`).
+  Expressions**. (e.g., `"write_.*"`).
+- **Lifecycle events**: Matchers are **Exact Strings**. (e.g., `"startup"`).
 - **Wildcards**: `"*"` or `""` (empty string) matches all occurrences.
 
 ## Configuration
@@ -152,11 +151,11 @@ Hooks are executed with a sanitized environment.
 
 **Project-level hooks** are particularly risky when opening untrusted projects.
 Gemini CLI **fingerprints** project hooks. If a hook's name or command changes
-(for example, via `git pull`), it is treated as a **new, untrusted hook** and
-you will be warned before it executes.
+(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/hooks/reference.md

@@ -20,8 +20,8 @@ including JSON schemas and API details.
 
 ## Configuration schema
 
-Hooks are defined in `settings.json` within the `hooks` object. Each event (for
-example, `BeforeTool`) contains an array of **hook definitions**.
+Hooks are defined in `settings.json` within the `hooks` object. Each event
+(e.g., `BeforeTool`) contains an array of **hook definitions**.
 
 ### Hook definition
 
@@ -52,7 +52,7 @@ All hooks receive these common fields via `stdin`:
   "session_id": string,      // Unique ID for the current session
   "transcript_path": string, // Absolute path to session transcript JSON
   "cwd": string,             // Current working directory
-  "hook_event_name": string, // The firing event (for example "BeforeTool")
+  "hook_event_name": string, // The firing event (e.g. "BeforeTool")
   "timestamp": string        // ISO 8601 execution time
 }
 ```
@@ -81,12 +81,12 @@ Most hooks support these fields in their `stdout` JSON:
 For `BeforeTool` and `AfterTool` events, the `matcher` field in your settings is
 compared against the name of the tool being executed.
 
-- **Built-in Tools**: You can match any built-in tool (for example, `read_file`,
+- **Built-in Tools**: You can match any built-in tool (e.g., `read_file`,
   `run_shell_command`). See the [Tools Reference](../reference/tools) for a full
   list of available tool names.
 - **MCP Tools**: Tools from MCP servers follow the naming pattern
   `mcp_<server_name>_<tool_name>`.
-- **Regex Support**: Matchers support regular expressions (for example,
+- **Regex Support**: Matchers support regular expressions (e.g.,
   `matcher: "read_.*"` matches all file reading tools).
 
 ### `BeforeTool`
@@ -194,7 +194,7 @@ request format.
     (generation params).
 - **Relevant Output Fields**:
   - `hookSpecificOutput.llm_request`: An object that **overrides** parts of the
-    outgoing request (for example, changing models or temperature).
+    outgoing request (e.g., changing models or temperature).
   - `hookSpecificOutput.llm_response`: A **Synthetic Response** object. If
     provided, the CLI skips the LLM call entirely and uses this as the response.
   - `decision`: Set to `"deny"` to block the request and abort the turn.
@@ -271,14 +271,14 @@ telemetry.
 
 ### `Notification`
 
-Fires when the CLI emits a system alert (for example, Tool Permissions). Used
-for external logging or cross-platform alerts.
+Fires when the CLI emits a system alert (e.g., Tool Permissions). Used for
+external logging or cross-platform alerts.
 
 - **Input Fields**:
   - `notification_type`: (`"ToolPermission"`)
   - `message`: Summary of the alert.
-  - `details`: JSON object with alert-specific metadata (for example, tool name,
-    file path).
+  - `details`: JSON object with alert-specific metadata (e.g., tool name, file
+    path).
 - **Relevant Output Fields**:
   - `systemMessage`: Displayed alongside the system alert.
 - **Observability Only**: This hook **cannot** block alerts or grant permissions

docs/ide-integration/ide-companion-spec.md

@@ -20,9 +20,9 @@ Protocol (MCP)**.
 
 - **Protocol:** The server must be a valid MCP server. We recommend using an
   existing MCP SDK for your language of choice if available.
-- **Endpoint:** The server should expose a single endpoint (for example, `/mcp`)
-  for all MCP communication.
-- **Port:** The server **MUST** listen on a dynamically assigned port (that is,
+- **Endpoint:** The server should expose a single endpoint (e.g., `/mcp`) for
+  all MCP communication.
+- **Port:** The server **MUST** listen on a dynamically assigned port (i.e.,
   listen on port `0`).
 
 ### 2. Discovery mechanism: The port file
@@ -68,15 +68,15 @@ creating a "discovery file."
     The CLI will include this token in an `Authorization: Bearer <token>` header
     on all requests.
   - `ideInfo` (object, required): Information about the IDE.
-    - `name` (string, required): A short, lowercase identifier for the IDE (for
-      example, `vscode`, `jetbrains`).
-    - `displayName` (string, required): A user-friendly name for the IDE (for
-      example, `VS Code`, `JetBrains IDE`).
+    - `name` (string, required): A short, lowercase identifier for the IDE
+      (e.g., `vscode`, `jetbrains`).
+    - `displayName` (string, required): A user-friendly name for the IDE (e.g.,
+      `VS Code`, `JetBrains IDE`).
 
 - **Authentication:** To secure the connection, the plugin **MUST** generate a
   unique, secret token and include it in the discovery file. The CLI will then
   include this token in the `Authorization` header for all requests to the MCP
-  server (for example, `Authorization: Bearer a-very-secret-token`). Your server
+  server (e.g., `Authorization: Bearer a-very-secret-token`). Your server
   **MUST** validate this token on every request and reject any that are
   unauthorized.
 - **Tie-breaking with environment variables (recommended):** For the most
@@ -135,7 +135,7 @@ to the CLI whenever the user's context changes.
 <!-- prettier-ignore -->
 > [!NOTE]
 > The `openFiles` list should only include files that exist on disk.
-> Virtual files (for example, unsaved files without a path, editor settings pages)
+> Virtual files (e.g., unsaved files without a path, editor settings pages)
 > **MUST** be excluded.
 
 ### How the CLI uses this context
@@ -188,7 +188,7 @@ The plugin **MUST** register an `openDiff` tool on its MCP server.
   `CallToolResult` to acknowledge the request and report whether the diff view
   was successfully opened.
   - On Success: If the diff view was opened successfully, the response **MUST**
-    contain empty content (that is, `content: []`).
+    contain empty content (i.e., `content: []`).
   - On Failure: If an error prevented the diff view from opening, the response
     **MUST** have `isError: true` and include a `TextContent` block in the
     `content` array describing the error.
@@ -223,9 +223,9 @@ The plugin **MUST** register a `closeDiff` tool on its MCP server.
 
 ### `ide/diffAccepted` notification
 
-When the user accepts the changes in a diff view (for example, by clicking an
-"Apply" or "Save" button), the plugin **MUST** send an `ide/diffAccepted`
-notification to the CLI.
+When the user accepts the changes in a diff view (e.g., by clicking an "Apply"
+or "Save" button), the plugin **MUST** send an `ide/diffAccepted` notification
+to the CLI.
 
 - **Payload:** The notification parameters **MUST** include the file path and
   the final content of the file. The content may differ from the original
@@ -242,7 +242,7 @@ notification to the CLI.
 
 ### `ide/diffRejected` notification
 
-When the user rejects the changes (for example, by closing the diff view without
+When the user rejects the changes (e.g., by closing the diff view without
 accepting), the plugin **MUST** send an `ide/diffRejected` notification to the
 CLI.
 

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.
@@ -132,7 +118,7 @@ editor.
 **To accept a diff**, you can perform any of the following actions:
 
 - Click the **checkmark icon** in the diff editor's title bar.
-- Save the file (for example, with `Cmd+S` or `Ctrl+S`).
+- Save the file (e.g., with `Cmd+S` or `Ctrl+S`).
 - Open the Command Palette and run **Gemini CLI: Accept Diff**.
 - Respond with `yes` in the CLI when prompted.
 
@@ -149,66 +135,9 @@ 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, be aware of the following:
+If you are using Gemini CLI within a sandbox, please be aware of the following:
 
 - **On macOS:** The IDE integration requires network access to communicate with
   the IDE companion extension. You must use a Seatbelt profile that allows
@@ -222,9 +151,10 @@ If you are using Gemini CLI within a sandbox, 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, 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, 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

@@ -6,8 +6,8 @@ in this project.
 ## Overview
 
 The integration tests are designed to validate the end-to-end functionality of
-Gemini CLI. They execute the built binary in a controlled environment and verify
-that it behaves as expected when interacting with the file system.
+the Gemini CLI. They execute the built binary in a controlled environment and
+verify that it behaves as expected when interacting with the file system.
 
 These tests are located in the `integration-tests` directory and are run using a
 custom test runner.
@@ -117,88 +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()`.
-
-## Performance regression tests
-
-Performance regression tests are designed to detect wall-clock time, CPU usage,
-and event loop delay regressions across key CLI scenarios. They are located in
-the `perf-tests` directory.
-
-These tests are distinct from standard integration tests because they measure
-performance metrics and compare it against committed baselines.
-
-### Running performance tests
-
-Performance 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:perf
-```
-
-### Updating baselines
-
-If you intentionally change behavior that affects performance, you may need to
-update the baselines. Set the `UPDATE_PERF_BASELINES` environment variable to
-`true`:
-
-```bash
-UPDATE_PERF_BASELINES=true npm run test:perf
-```
-
-This will run the tests multiple times (with warmup), apply IQR outlier
-filtering, and overwrite `perf-tests/baselines.json`. You should review the
-changes and commit the updated baseline file.
-
-### How it works
-
-The harness (`PerfTestHarness` in `packages/test-utils`):
-
-- Measures wall-clock time using `performance.now()`.
-- Measures CPU usage using `process.cpuUsage()`.
-- Monitors event loop delay using `perf_hooks.monitorEventLoopDelay()`.
-- Applies IQR (Interquartile Range) filtering to remove outlier samples.
-- Compares against baselines with a 15% tolerance.
-
 ## Diagnostics
 
 The integration test runner provides several options for diagnostics to help

docs/issue-and-pr-automation.md

@@ -37,8 +37,8 @@ is to perform an initial analysis and apply the correct labels.
   - It uses a Gemini model to analyze the issue's title and body against a
     detailed set of guidelines.
   - **Applies one `area/*` label**: Categorizes the issue into a functional area
-    of the project (for example, `area/ux`, `area/models`, `area/platform`).
-  - **Applies one `kind/*` label**: Identifies the type of issue (for example,
+    of the project (e.g., `area/ux`, `area/models`, `area/platform`).
+  - **Applies one `kind/*` label**: Identifies the type of issue (e.g.,
     `kind/bug`, `kind/enhancement`, `kind/question`).
   - **Applies one `priority/*` label**: Assigns a priority from P0 (critical) to
     P3 (low) based on the described impact.
@@ -50,8 +50,8 @@ is to perform an initial analysis and apply the correct labels.
 - **What you should do**:
   - Fill out the issue template as completely as possible. The more detail you
     provide, the more accurate the triage will be.
-  - If the `status/need-information` label is added, provide the requested
-    details in a comment.
+  - If the `status/need-information` label is added, please provide the
+    requested details in a comment.
 
 ### 2. When you open a pull request: `Continuous Integration (CI)`
 
@@ -84,8 +84,7 @@ issues and have consistent labels.
 - **When it runs**: Every 15 minutes on all open pull requests.
 - **What it does**:
   - **Checks for a linked issue**: The bot scans your PR description for a
-    keyword that links it to an issue (for example, `Fixes #123`,
-    `Closes #456`).
+    keyword that links it to an issue (e.g., `Fixes #123`, `Closes #456`).
   - **Adds `status/need-issue`**: If no linked issue is found, the bot will add
     the `status/need-issue` label to your PR. This is a clear signal that an
     issue needs to be created and linked.
@@ -157,7 +156,7 @@ and will never be auto-unassigned.
 ### 6. Release automation
 
 This workflow handles the process of packaging and publishing new versions of
-Gemini CLI.
+the Gemini CLI.
 
 - **Workflow File**: `.github/workflows/release-manual.yml`
 - **When it runs**: On a daily schedule for "nightly" releases, and manually for
@@ -172,4 +171,4 @@ Gemini CLI.
     will be included in the very next nightly release.
 
 We hope this detailed overview is helpful. If you have any questions about our
-automation or processes, don't hesitate to ask!
+automation or processes, please don't hesitate to ask!

docs/npm.md

@@ -5,7 +5,7 @@ This monorepo contains two main packages: `@google/gemini-cli` and
 
 ## `@google/gemini-cli`
 
-This is the main package for Gemini CLI. It is responsible for the user
+This is the main package for the Gemini CLI. It is responsible for the user
 interface, command parsing, and all other user-facing functionality.
 
 When this package is published, it is bundled into a single executable file.

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,
@@ -156,7 +158,7 @@ Slash commands provide meta-level control over the CLI itself.
 
 ### `/docs`
 
-- **Description:** Open Gemini CLI documentation in your browser.
+- **Description:** Open the Gemini CLI documentation in your browser.
 
 ### `/editor`
 
@@ -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.
@@ -400,8 +402,8 @@ Slash commands provide meta-level control over the CLI itself.
 
 ### `/shells` (or `/bashes`)
 
-- **Description:** Toggle the background shells view. This lets you view and
-  manage long-running processes that you've sent to the background.
+- **Description:** Toggle the background shells view. This allows you to view
+  and manage long-running processes that you've sent to the background.
 
 ### `/setup-github`
 
@@ -474,8 +476,7 @@ Slash commands provide meta-level control over the CLI itself.
   input area supports vim-style navigation and editing commands in both NORMAL
   and INSERT modes.
 - **Features:**
-  - **Count support:** Prefix commands with numbers (for example, `3h`, `5w`,
-    `10G`)
+  - **Count support:** Prefix commands with numbers (e.g., `3h`, `5w`, `10G`)
   - **Editing commands:** Delete with `x`, change with `c`, insert with `i`,
     `a`, `o`, `O`; complex operations like `dd`, `cc`, `dw`, `cw`
   - **INSERT mode:** Standard text input with escape to return to NORMAL mode
@@ -491,8 +492,9 @@ Slash commands provide meta-level control over the CLI itself.
 ### Custom commands
 
 Custom commands allow you to create personalized shortcuts for your most-used
-prompts. For detailed instructions on how to create, manage, and use them, see
-the dedicated [Custom Commands documentation](../cli/custom-commands.md).
+prompts. For detailed instructions on how to create, manage, and use them,
+please see the dedicated
+[Custom Commands documentation](../cli/custom-commands.md).
 
 ## Input prompt shortcuts
 
@@ -523,7 +525,7 @@ your prompt to Gemini. These commands include git-aware filtering.
     - If a path to a single file is provided, the content of that file is read.
     - If a path to a directory is provided, the command attempts to read the
       content of files within that directory and any subdirectories.
-    - Spaces in paths should be escaped with a backslash (for example,
+    - Spaces in paths should be escaped with a backslash (e.g.,
       `@My\ Documents/file.txt`).
     - The command uses the `read_many_files` tool internally. The content is
       fetched and then inserted into your query before being sent to the Gemini
@@ -549,8 +551,8 @@ your prompt to Gemini. These commands include git-aware filtering.
 - If the path specified after `@` is not found or is invalid, an error message
   will be displayed, and the query might not be sent to the Gemini model, or it
   will be sent without the file content.
-- If the `read_many_files` tool encounters an error (for example, permission
-  issues), this will also be reported.
+- If the `read_many_files` tool encounters an error (e.g., permission issues),
+  this will also be reported.
 
 ## Shell mode and passthrough commands (`!`)
 
@@ -583,4 +585,4 @@ Gemini CLI.
 - **Environment variable:** When a command is executed via `!` or in shell mode,
   the `GEMINI_CLI=1` environment variable is set in the subprocess's
   environment. This allows scripts or tools to detect if they are being run from
-  within Gemini CLI.
+  within the Gemini CLI.

docs/reference/configuration.md

@@ -62,16 +62,14 @@ 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, see the
+in a corporate environment, please see the
 [Enterprise Configuration](../cli/enterprise.md) documentation.
 
 ### The `.gemini` directory in your project
@@ -79,7 +77,7 @@ in a corporate environment, see the
 In addition to a project settings file, a project's `.gemini` directory can
 contain other project-specific files related to Gemini CLI's operation, such as:
 
-- [Custom sandbox profiles](#sandboxing) (for example,
+- [Custom sandbox profiles](#sandboxing) (e.g.,
   `.gemini/sandbox-macos-custom.sb`, `.gemini/sandbox.Dockerfile`).
 
 ### Available settings in `settings.json`
@@ -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,11 +141,6 @@ 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
@@ -202,12 +195,6 @@ their corresponding top-level category object in your `settings.json` file.
 
 #### `ui`
 
-- **`ui.debugRainbow`** (boolean):
-  - **Description:** Enable debug rainbow rendering. Only useful for debugging
-    rendering bugs and performance issues.
-  - **Default:** `false`
-  - **Requires restart:** Yes
-
 - **`ui.theme`** (string):
   - **Description:** The color theme for the UI. See the CLI themes guide for
     available options.
@@ -270,11 +257,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`
@@ -345,16 +327,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`
@@ -372,8 +344,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):
@@ -698,11 +670,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"
-        }
       }
     }
     ```
@@ -1260,8 +1227,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
 
@@ -1316,18 +1282,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.
@@ -1395,14 +1349,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`.
@@ -1410,7 +1356,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
@@ -1498,10 +1444,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.
@@ -1584,11 +1529,8 @@ their corresponding top-level category object in your `settings.json` file.
 #### `advanced`
 
 - **`advanced.autoConfigureMemory`** (boolean):
-  - **Description:** Automatically configure Node.js memory limits. Note:
-    Because memory is allocated during the initial process boot, this setting is
-    only read from the global user settings file and ignores workspace-level
-    overrides.
-  - **Default:** `true`
+  - **Description:** Automatically configure Node.js memory limits
+  - **Default:** `false`
   - **Requires restart:** Yes
 
 - **`advanced.dnsResolutionOrder`** (string):
@@ -1610,15 +1552,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):
@@ -1659,7 +1612,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):
@@ -1674,6 +1627,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`
@@ -1719,16 +1677,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.
@@ -1820,69 +1768,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):
@@ -1918,15 +1803,15 @@ Configures connections to one or more Model-Context Protocol (MCP) servers for
 discovering and using custom tools. Gemini CLI attempts to connect to each
 configured MCP server to discover available tools. Every discovered tool is
 prepended with the `mcp_` prefix and its server alias to form a fully qualified
-name (FQN) (for example, `mcp_serverAlias_actualToolName`) to avoid conflicts.
-Note that the system might strip certain schema properties from MCP tool
-definitions for compatibility. At least one of `command`, `url`, or `httpUrl`
-must be provided. If multiple are specified, the order of precedence is
-`httpUrl`, then `url`, then `command`.
+name (FQN) (e.g., `mcp_serverAlias_actualToolName`) to avoid conflicts. Note
+that the system might strip certain schema properties from MCP tool definitions
+for compatibility. At least one of `command`, `url`, or `httpUrl` must be
+provided. If multiple are specified, the order of precedence is `httpUrl`, then
+`url`, then `command`.
 
 <!-- prettier-ignore -->
 > [!WARNING]
-> Avoid using underscores (`_`) in your server aliases (for example, use
+> Avoid using underscores (`_`) in your server aliases (e.g., use
 > `my-server` instead of `my_server`). The underlying policy engine parses Fully
 > Qualified Names (`mcp_server_tool`) using the first underscore after the
 > `mcp_` prefix. An underscore in your server alias will cause the parser to
@@ -2092,8 +1977,8 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
   - Your API key for the Gemini API.
   - One of several available
     [authentication methods](../get-started/authentication.md).
-  - Set this in your shell profile (for example, `~/.bashrc`, `~/.zshrc`) or an
-    `.env` file.
+  - Set this in your shell profile (e.g., `~/.bashrc`, `~/.zshrc`) or an `.env`
+    file.
 - **`GEMINI_MODEL`**:
   - Specifies the default Gemini model to use.
   - Overrides the hardcoded default
@@ -2177,7 +2062,7 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
     Any other value is treated as disabling it.
   - Overrides the `telemetry.useCollector` setting.
 - **`GOOGLE_CLOUD_LOCATION`**:
-  - Your Google Cloud Project Location (for example, us-central1).
+  - Your Google Cloud Project Location (e.g., us-central1).
   - Required for using Vertex AI in non-express mode.
   - Example: `export GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"` (Windows
     PowerShell: `$env:GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"`).
@@ -2208,7 +2093,7 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
   - `strict-proxied`: Same as `strict-open` but routes network through proxy.
   - `<profile_name>`: Uses a custom profile. To define a custom profile, create
     a file named `sandbox-macos-<profile_name>.sb` in your project's `.gemini/`
-    directory (for example, `my-project/.gemini/sandbox-macos-custom.sb`).
+    directory (e.g., `my-project/.gemini/sandbox-macos-custom.sb`).
 - **`DEBUG` or `DEBUG_MODE`** (often used by underlying libraries or the CLI
   itself):
   - Set to `true` or `1` to enable verbose debug logging, which can be helpful
@@ -2247,7 +2132,7 @@ from the system or loaded from `.env` files.
 
 **Allowlist (Never Redacted):**
 
-- Common system variables (for example, `PATH`, `HOME`, `USER`, `SHELL`, `TERM`,
+- Common system variables (e.g., `PATH`, `HOME`, `USER`, `SHELL`, `TERM`,
   `LANG`).
 - Variables starting with `GEMINI_CLI_`.
 - GitHub Action specific variables.
@@ -2275,14 +2160,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)
@@ -2296,61 +2204,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.
@@ -2358,22 +2222,44 @@ 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)
 
 While not strictly configuration for the CLI's _behavior_, context files
 (defaulting to `GEMINI.md` but configurable via the `context.fileName` setting)
 are crucial for configuring the _instructional context_ (also referred to as
-"memory") provided to the Gemini model. This powerful feature lets you give
+"memory") provided to the Gemini model. This powerful feature allows you to give
 project-specific instructions, coding style guides, or any relevant background
 information to the AI, making its responses more tailored and accurate to your
 needs. The CLI includes UI elements, such as an indicator in the footer showing
@@ -2384,7 +2270,7 @@ context.
   that you want the Gemini model to be aware of during your interactions. The
   system is designed to manage this instructional context hierarchically.
 
-### Example context file content (for example, `GEMINI.md`)
+### Example context file content (e.g., `GEMINI.md`)
 
 Here's a conceptual example of what a context file at the root of a TypeScript
 project might contain:
@@ -2394,7 +2280,7 @@ project might contain:
 
 ## General Instructions:
 
-- When generating new TypeScript code, follow the existing coding style.
+- When generating new TypeScript code, please follow the existing coding style.
 - Ensure all new functions and classes have JSDoc comments.
 - Prefer functional programming paradigms where appropriate.
 - All code should be compatible with TypeScript 5.0 and Node.js 20+.
@@ -2402,7 +2288,7 @@ project might contain:
 ## Coding Style:
 
 - Use 2 spaces for indentation.
-- Interface names should be prefixed with `I` (for example, `IUserService`).
+- Interface names should be prefixed with `I` (e.g., `IUserService`).
 - Private class members should be prefixed with an underscore (`_`).
 - Always use strict equality (`===` and `!==`).
 
@@ -2416,7 +2302,7 @@ project might contain:
 ## Regarding Dependencies:
 
 - Avoid introducing new external dependencies unless absolutely necessary.
-- If a new dependency is required, state the reason.
+- If a new dependency is required, please state the reason.
 ```
 
 This example demonstrates how you can provide general project context, specific
@@ -2426,13 +2312,13 @@ you. Project-specific context files are highly encouraged to establish
 conventions and context.
 
 - **Hierarchical loading and precedence:** The CLI implements a sophisticated
-  hierarchical memory system by loading context files (for example, `GEMINI.md`)
-  from several locations. Content from files lower in this list (more specific)
+  hierarchical memory system by loading context files (e.g., `GEMINI.md`) from
+  several locations. Content from files lower in this list (more specific)
   typically overrides or supplements content from files higher up (more
   general). The exact concatenation order and final context can be inspected
   using the `/memory show` command. The typical loading order is:
   1.  **Global context file:**
-      - Location: `~/.gemini/<configured-context-filename>` (for example,
+      - Location: `~/.gemini/<configured-context-filename>` (e.g.,
         `~/.gemini/GEMINI.md` in your user home directory).
       - Scope: Provides default instructions for all your projects.
   2.  **Project root and ancestors context files:**
@@ -2469,12 +2355,12 @@ conventions and context.
 
 By understanding and utilizing these configuration layers and the hierarchical
 nature of context files, you can effectively manage the AI's memory and tailor
-Gemini CLI's responses to your specific needs and projects.
+the Gemini CLI's responses to your specific needs and projects.
 
 ## Sandboxing
 
-Gemini CLI can execute potentially unsafe operations (like shell commands and
-file modifications) within a sandboxed environment to protect your system.
+The Gemini CLI can execute potentially unsafe operations (like shell commands
+and file modifications) within a sandboxed environment to protect your system.
 
 Sandboxing is disabled by default, but you can enable it in a few ways:
 
@@ -2509,15 +2395,11 @@ sandbox image:
 BUILD_SANDBOX=1 gemini -s
 ```
 
-Building a custom sandbox with `BUILD_SANDBOX` is only supported when running
-Gemini CLI from source. If you installed the CLI with npm, build the Docker
-image separately and reference that image in your sandbox configuration.
-
 ## Usage statistics
 
-To help us improve Gemini CLI, we collect anonymized usage statistics. This data
-helps us understand how the CLI is used, identify common issues, and prioritize
-new features.
+To help us improve the Gemini CLI, we collect anonymized usage statistics. This
+data helps us understand how the CLI is used, identify common issues, and
+prioritize new features.
 
 **What we collect:**
 

docs/reference/keyboard-shortcuts.md

@@ -86,25 +86,22 @@ 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`<br />`Ctrl+Shift+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
 
 | Command                       | Action                                                                                                                                             | Keys               |
 | ----------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
-| `app.showErrorDetails`        | Toggle the debug console for detailed error information.                                                                                           | `F12`              |
+| `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 -->
 
@@ -248,83 +235,6 @@ a `key` combination.
 - `Double-click` on a paste placeholder (alternate buffer mode only): Expand to
   view full content inline. Double-click again to collapse.
 
-## Vi mode shortcuts
-
-When vim mode is enabled with `/vim` or `general.vimMode: true`, Gemini CLI
-supports NORMAL and INSERT modes.
-
-### Mode switching
-
-| Action                                       | Keys      |
-| -------------------------------------------- | --------- |
-| Enter NORMAL mode from INSERT mode           | `Esc`     |
-| Enter INSERT mode at the cursor              | `i`       |
-| Enter INSERT mode after the cursor           | `a`       |
-| Enter INSERT mode at the start of the line   | `I`       |
-| Enter INSERT mode at the end of the line     | `A`       |
-| Insert a new line below and switch to INSERT | `o`       |
-| Insert a new line above and switch to INSERT | `O`       |
-| Clear input in NORMAL mode                   | `Esc Esc` |
-
-### Navigation in NORMAL mode
-
-| Action                            | Keys            |
-| --------------------------------- | --------------- |
-| Move left                         | `h`             |
-| Move down                         | `j`             |
-| Move up                           | `k`             |
-| Move right                        | `l`             |
-| Move to start of line             | `0`             |
-| Move to first non-whitespace char | `^`             |
-| Move to end of line               | `$`             |
-| Move forward by word              | `w`             |
-| Move backward by word             | `b`             |
-| Move to end of word               | `e`             |
-| Move forward by WORD              | `W`             |
-| Move backward by WORD             | `B`             |
-| Move to end of WORD               | `E`             |
-| Go to first line                  | `gg`            |
-| Go to last line                   | `G`             |
-| Go to line N                      | `N G` or `N gg` |
-
-Counts are supported for navigation commands. For example, `5j` moves down five
-lines and `3w` moves forward three words.
-
-### Editing in NORMAL mode
-
-| Action                         | Keys  |
-| ------------------------------ | ----- |
-| Delete character under cursor  | `x`   |
-| Delete to end of line          | `D`   |
-| Delete line                    | `dd`  |
-| Change to end of line          | `C`   |
-| Change line                    | `cc`  |
-| Delete forward word            | `dw`  |
-| Delete backward word           | `db`  |
-| Delete to end of word          | `de`  |
-| Delete forward WORD            | `dW`  |
-| Delete backward WORD           | `dB`  |
-| Delete to end of WORD          | `dE`  |
-| Change forward word            | `cw`  |
-| Change backward word           | `cb`  |
-| Change to end of word          | `ce`  |
-| Change forward WORD            | `cW`  |
-| Change backward WORD           | `cB`  |
-| Change to end of WORD          | `cE`  |
-| Delete to start of line        | `d0`  |
-| Delete to first non-whitespace | `d^`  |
-| Change to start of line        | `c0`  |
-| Change to first non-whitespace | `c^`  |
-| Delete from first line to here | `dgg` |
-| Delete from here to last line  | `dG`  |
-| Change from first line to here | `cgg` |
-| Change from here to last line  | `cG`  |
-| Undo last change               | `u`   |
-| Repeat last command            | `.`   |
-
-Counts are also supported for editing commands. For example, `3dd` deletes three
-lines and `2cw` changes two words.
-
 ## Limitations
 
 - On [Windows Terminal](https://en.wikipedia.org/wiki/Windows_Terminal):

docs/reference/memport.md

@@ -1,7 +1,8 @@
 # Memory Import Processor
 
-The Memory Import Processor is a feature that lets you modularize your GEMINI.md
-files by importing content from other files using the `@file.md` syntax.
+The Memory Import Processor is a feature that allows you to modularize your
+GEMINI.md files by importing content from other files using the `@file.md`
+syntax.
 
 ## Overview
 

docs/reference/policy-engine.md

@@ -1,8 +1,8 @@
 # Policy engine
 
-Gemini CLI includes a powerful policy engine that provides fine-grained control
-over tool execution. It allows users and administrators to define rules that
-determine whether a tool call should be allowed, denied, or require user
+The Gemini CLI includes a powerful policy engine that provides fine-grained
+control over tool execution. It allows users and administrators to define rules
+that determine whether a tool call should be allowed, denied, or require user
 confirmation.
 
 ## Quick start
@@ -23,18 +23,19 @@ To create your first policy:
     New-Item -ItemType Directory -Force -Path "$env:USERPROFILE\.gemini\policies"
     ```
 
-2.  **Create a new policy file** (for example,
-    `~/.gemini/policies/my-rules.toml`). You can use any filename ending in
-    `.toml`; all such files in this directory will be loaded and combined:
+2.  **Create a new policy file** (e.g., `~/.gemini/policies/my-rules.toml`). You
+    can use any filename ending in `.toml`; all such files in this directory
+    will be loaded and combined:
     ```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 (for example, ask Gemini CLI to
-    `rm -rf /`). The tool will now be blocked automatically.
+3.  **Run a command** that triggers the policy (e.g., ask Gemini CLI to
+    `git status`). The tool will now execute automatically without prompting for
+    confirmation.
 
 ## Core concepts
 
@@ -127,13 +128,13 @@ rule with the highest priority wins**.
 To provide a clear hierarchy, policies are organized into three tiers. Each tier
 has a designated number that forms the base of the final priority calculation.
 
-| Tier      | Base | Description                                                                       |
-| :-------- | :--- | :-------------------------------------------------------------------------------- |
-| Default   | 1    | Built-in policies that ship with Gemini CLI.                                      |
-| Extension | 2    | Policies defined in extensions.                                                   |
-| Workspace | 3    | Policies defined in the current workspace's configuration directory.              |
-| User      | 4    | Custom policies defined by the user.                                              |
-| Admin     | 5    | Policies managed by an administrator (for example, in an enterprise environment). |
+| Tier      | Base | Description                                                                |
+| :-------- | :--- | :------------------------------------------------------------------------- |
+| Default   | 1    | Built-in policies that ship with the Gemini CLI.                           |
+| Extension | 2    | Policies defined in extensions.                                            |
+| Workspace | 3    | Policies defined in the current workspace's configuration directory.       |
+| User      | 4    | Custom policies defined by the user.                                       |
+| Admin     | 5    | Policies managed by an administrator (e.g., in an enterprise environment). |
 
 Within a TOML policy file, you assign a priority value from **0 to 999**. The
 engine transforms this into a final priority using the following formula:
@@ -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 (for example, `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.
@@ -257,7 +239,7 @@ To prevent privilege escalation, the CLI enforces strict security checks on the
 directory are **ignored**.
 
 - **Linux / macOS:** Must be owned by `root` (UID 0) and NOT writable by group
-  or others (for example, `chmod 755`).
+  or others (e.g., `chmod 755`).
 - **Windows:** Must be in `C:\ProgramData`. Standard users (`Users`, `Everyone`)
   must NOT have `Write`, `Modify`, or `Full Control` permissions. If you see a
   security warning, use the folder properties to remove write permissions for
@@ -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".
@@ -322,8 +304,7 @@ priority = 10
 denyMessage = "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.
@@ -386,7 +367,7 @@ policies, as it is much more robust than manually writing Fully Qualified Names
 
 <!-- prettier-ignore -->
 > [!WARNING]
-> Do not use underscores (`_`) in your MCP server names (for example, use
+> Do not use underscores (`_`) in your MCP server names (e.g., use
 > `my-server` rather than `my_server`). The policy parser splits Fully Qualified
 > Names (`mcp_server_tool`) on the _first_ underscore following the `mcp_`
 > prefix. If your server name contains an underscore, the parser will
@@ -397,8 +378,7 @@ policies, as it is much more robust than manually writing Fully Qualified Names
 
 Combine `mcpName` and `toolName` to target a single operation. When using
 `mcpName`, the `toolName` field should strictly be the simple name of the tool
-(for example, `search`), **not** the Fully Qualified Name (for example,
-`mcp_server_search`).
+(e.g., `search`), **not** the Fully Qualified Name (e.g., `mcp_server_search`).
 
 ```toml
 # Allows the `search` tool on the `my-jira-server` MCP
@@ -439,37 +419,24 @@ decision = "ask_user"
 priority = 10
 ```
 
-### Special syntax for subagents
+**4. Targeting a tool name across all servers**
 
-You can secure and govern subagents using standard policy rules by treating the
-subagent's name as the `toolName`.
-
-When the main agent invokes a subagent (e.g., using the unified `invoke_agent`
-tool), the Policy Engine automatically treats the target `agent_name` as a
-virtual tool alias for rule matching.
-
-**Example:**
-
-This rule denies access to the `codebase_investigator` subagent.
+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]]
-toolName = "codebase_investigator"
-decision = "deny"
-priority = 500
-deny_message = "Deep codebase analysis is restricted for this session."
+mcpName = "*"
+toolName = "search"
+decision = "allow"
+priority = 50
 ```
 
-- **Backward Compatibility**: Any rules written targeting historical 1:1
-  subagent tool names will continue to match transparently.
-- **Context differentiation**: To create rules based on **who** is calling a
-  tool, use the `subagent` field instead. See
-  [TOML rule schema](#toml-rule-schema).
-
 ## Default policies
 
-Gemini CLI ships with a set of default policies to provide a safe out-of-the-box
-experience.
+The Gemini CLI ships with a set of default policies to provide a safe
+out-of-the-box experience.
 
 - **Read-only tools** (like `read_file`, `glob`) are generally **allowed**.
 - **Agent delegation** defaults to **`ask_user`** to ensure remote agents can

docs/reference/tools.md

@@ -113,24 +113,12 @@ each tool.
 | :-------------- | :------ | :----------------------------------------------------------------------------------------------------------------- |
 | `complete_task` | `Other` | Finalizes a subagent's mission and returns the result to the parent agent. This tool is not available to the user. |
 
-### Task Tracking
-
-| Tool                     | Kind    | Description                                                                 |
-| :----------------------- | :------ | :-------------------------------------------------------------------------- |
-| `tracker_add_dependency` | `Think` | Adds a dependency between two existing tasks in the tracker.                |
-| `tracker_create_task`    | `Think` | Creates a new task in the internal tracker to monitor progress.             |
-| `tracker_get_task`       | `Think` | Retrieves the details and current status of a specific tracked task.        |
-| `tracker_list_tasks`     | `Think` | Lists all tasks currently being tracked.                                    |
-| `tracker_update_task`    | `Think` | Updates the status or details of an existing task.                          |
-| `tracker_visualize`      | `Think` | Generates a visual representation of the current task dependency graph.     |
-| `update_topic`           | `Think` | Updates the current topic and status to keep the user informed of progress. |
-
 ### 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 (for example, localhost), which may pose a security risk if used with untrusted prompts. In Plan Mode, this tool requires explicit user confirmation. |
+| 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. |
 
 ## Under the hood
 

docs/release-confidence.md

@@ -1,7 +1,7 @@
 # Release confidence strategy
 
 This document outlines the strategy for gaining confidence in every release of
-Gemini CLI. It serves as a checklist and quality gate for release manager to
+the Gemini CLI. It serves as a checklist and quality gate for release manager to
 ensure we are shipping a high-quality product.
 
 ## The goal
@@ -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.
@@ -45,7 +41,7 @@ promotion flow is:
 ### Preview
 
 These releases will not have been fully vetted and may contain regressions or
-other outstanding issues. Help us test and install with `preview` tag.
+other outstanding issues. Please help us test and install with `preview` tag.
 
 ```bash
 npm install -g @google/gemini-cli@preview
@@ -126,8 +122,8 @@ specific version from any branch, tag, or commit SHA.
 2.  Select the **Release: Manual** workflow from the list.
 3.  Click the **Run workflow** dropdown button.
 4.  Fill in the required inputs:
-    - **Version**: The exact version to release (for example, `v0.6.1`). This
-      must be a valid semantic version with a `v` prefix.
+    - **Version**: The exact version to release (e.g., `v0.6.1`). This must be a
+      valid semantic version with a `v` prefix.
     - **Ref**: The branch, tag, or full commit SHA to release from.
     - **NPM Channel**: The npm channel to publish to. The options are `preview`,
       `nightly`, `latest` (for stable releases), and `dev`. The default is
@@ -165,10 +161,9 @@ require a full release cycle.
 3.  Click the **Run workflow** dropdown button.
 4.  Fill in the required inputs:
     - **Version**: The existing package version that you want to point the tag
-      to (for example, `0.5.0-preview-2`). This version **must** already be
-      published to the npm registry.
-    - **Channel**: The npm `dist-tag` to apply (for example, `preview`,
-      `stable`).
+      to (e.g., `0.5.0-preview-2`). This version **must** already be published
+      to the npm registry.
+    - **Channel**: The npm `dist-tag` to apply (e.g., `preview`, `stable`).
     - **Dry Run**: Leave as `true` to log the action without making changes, or
       set to `false` to perform the live tag change.
     - **Environment**: Select the appropriate environment. The `dev` environment
@@ -228,7 +223,7 @@ workflow.
 This workflow will automatically:
 
 1.  Find the latest release tag for the channel.
-2.  Create a release branch from that tag if one doesn't exist (for example,
+2.  Create a release branch from that tag if one doesn't exist (e.g.,
     `release/v0.5.1-pr-12345`).
 3.  Create a new hotfix branch from the release branch.
 4.  Cherry-pick your specified commit into the hotfix branch.
@@ -283,8 +278,9 @@ created:
 6. **Update the PR description**: Consider updating the PR title and description
    to reflect that it includes multiple fixes.
 
-This approach lets you group related fixes into a single patch release while
-maintaining full control over what gets included and how conflicts are resolved.
+This approach allows you to group related fixes into a single patch release
+while maintaining full control over what gets included and how conflicts are
+resolved.
 
 #### 3. Automatic release
 
@@ -302,9 +298,9 @@ consistently and reliably.
 #### Troubleshooting: Older branch workflows
 
 **Issue**: If the patch trigger workflow fails with errors like "Resource not
-accessible by integration" or references to non-existent workflow files (for
-example, `patch-release.yml`), this indicates the hotfix branch contains an
-outdated version of the workflow files.
+accessible by integration" or references to non-existent workflow files (e.g.,
+`patch-release.yml`), this indicates the hotfix branch contains an outdated
+version of the workflow files.
 
 **Root cause**: When a PR is merged, GitHub Actions runs the workflow definition
 from the **source branch** (the hotfix branch), not from the target branch (the
@@ -428,7 +424,7 @@ This command will do the following:
 
 You can then inspect the generated tarballs to ensure that they contain the
 correct files and that the `package.json` files have been updated correctly. The
-tarballs will be created in the root of each package's directory (for example,
+tarballs will be created in the root of each package's directory (e.g.,
 `packages/cli/google-gemini-cli-0.1.6.tgz`).
 
 By performing a dry run, you can be confident that your changes to the packaging
@@ -477,9 +473,9 @@ executable that enables `npx` usage directly from the GitHub repository.
 1.  **The JavaScript bundle is created:**
     - **What happens:** The built JavaScript from both `packages/core/dist` and
       `packages/cli/dist`, along with all third-party JavaScript dependencies,
-      are bundled by `esbuild` into a single, executable JavaScript file (for
-      example, `gemini.js`). The `node-pty` library is excluded from this bundle
-      as it contains native binaries.
+      are bundled by `esbuild` into a single, executable JavaScript file (e.g.,
+      `gemini.js`). The `node-pty` library is excluded from this bundle as it
+      contains native binaries.
     - **Why:** This creates a single, optimized file that contains all the
       necessary application code. It simplifies execution for users who want to
       run the CLI without a full `npm install`, as all dependencies (including
@@ -540,9 +536,9 @@ The list of available labels is not currently populated correctly. If you want
 to add a label that does not appear alphabetically in the first 30 labels in the
 repo, you must use your browser's developer tools to manually modify the UI:
 
-1. Open your browser's developer tools (for example, Chrome DevTools).
+1. Open your browser's developer tools (e.g., Chrome DevTools).
 2. In the `/github-settings` dialog, inspect the list of labels.
 3. Locate one of the `<li>` elements representing a label.
 4. In the HTML, modify the `data-option-value` attribute of that `<li>` element
-   to the desired label name (for example, `release-failure`).
+   to the desired label name (e.g., `release-failure`).
 5. Click on your modified label in the UI to select it, then save your settings.

docs/research/cloud-state-sync-proposal.md

@@ -0,0 +1,94 @@
+# Research Proposal: Cloud State Sync
+
+This document explores the architectural shift of moving the global `~/.gemini`
+folder to the cloud. The goal is to enable a shared data store for plans,
+settings, and configurations across devices, instances, and sessions while
+maintaining performance, security, and portability.
+
+## Objective
+
+Transition Gemini CLI from a local-first state management system to a
+distributed, synchronized agent. This allows you to start a task on one machine
+(e.g., a local laptop) and resume it seamlessly on another (e.g., a remote
+workstation or a different office machine).
+
+## Data Categorization
+
+Not all data within `~/.gemini` should be treated equally. We categorize the
+contents to determine the most effective synchronization strategy.
+
+- **Static and Configuration:** `settings.json`, `projects.json`, and `policies/`.
+  These are small files with low-frequency updates, making them ideal for simple
+  cloud synchronization.
+- **Sensitive and Identity:** `google_accounts.json` and `installation_id`. These
+  contain refresh tokens and unique identifiers that require high-grade,
+  client-side encryption before leaving the device.
+- **High-Volume and Ephemeral:** `history/`, `tmp/`, and `antigravity/` (browser
+  profiles). These are large or frequently updated. Naive synchronization would
+  be slow and resource-intensive.
+- **Computed and Environment-Specific:** `extension_integrity.json` and
+  `trustedFolders.json`. These often contain absolute local paths that may not
+  be valid across different machines or operating systems.
+
+## Architectural Approaches
+
+We are evaluating three primary methods for implementing cloud synchronization.
+
+### Virtual Filesystem (VFS) Layer
+
+Implement an abstraction layer for Node.js `fs` calls that transparently
+redirects operations to a cloud provider like GCS or S3.
+
+- **Pros:** Requires minimal changes to existing high-level logic.
+- **Cons:** Network latency on every file operation could degrade the user
+  experience. Requires a robust local LRU (Least Recently Used) cache.
+
+### Git-Ops and Snapshot Syncing
+
+Automatically commit and push state changes to a private, hidden repository.
+
+- **Pros:** Provides built-in versioning, conflict resolution, and portability.
+- **Cons:** High overhead for frequent, small writes, such as session history
+  updates.
+
+### Centralized State Server (The "Brain")
+
+Communicate with a lightweight service (gRPC or WebSockets) that acts as the
+single source of truth for the agent's state.
+
+- **Pros:** Enables real-time synchronization across active sessions.
+- **Cons:** Requires a hosted service and a persistent internet connection.
+
+## Technical Considerations
+
+The following table outlines the primary technical challenges and proposed
+solutions for a cloud-synced state.
+
+| Dimension | Challenge | Potential Solution |
+| :--- | :--- | :--- |
+| **Performance** | Shell startup latency is critical. | **Stale-While-Revalidate:** Load local cache instantly; sync in the background. |
+| **Security** | Secrets management in the cloud. | **Zero-Knowledge Encryption:** Encrypt secrets client-side with a user passphrase. |
+| **Portability** | Inconsistent absolute paths. | **Path Normalization:** Store paths relative to `$HOME` or use UUIDs. |
+| **Conflicts** | Simultaneous edits on multiple devices. | **CRDTs:** Use Conflict-free Replicated Data Types for plans and history. |
+
+## Hybrid Strategy Proposal
+
+A tiered synchronization model balances performance with portability.
+
+1.  **Tier 1 (Cloud Native):** Sync settings, plans, and global memories
+    immediately via a structured API.
+2.  **Tier 2 (Lazy Sync):** Upload session history and logs at the end of a
+    session or when explicitly resuming on another device.
+3.  **Tier 3 (Local Only):** Keep large caches, browser profiles, and
+    environment-specific integrity checks local to the device.
+
+## Next Steps
+
+To move forward with this proposal, we must perform the following actions:
+
+1.  Audit the current `~/.gemini` directory to determine the typical data
+    volume, particularly within the `history/` folder.
+2.  Identify all files within `~/.gemini` that contain environment-dependent
+    absolute paths.
+3.  Prototype a synchronization provider using a private Git repository or a
+    dedicated cloud storage bucket.

docs/resources/faq.md

@@ -8,7 +8,7 @@ problems encountered while using Gemini CLI.
 This section addresses common questions about Gemini CLI usage, security, and
 troubleshooting general errors.
 
-### Why can't I use third-party software like Claude Code, OpenClaw, or OpenCode with Gemini CLI?
+### Why can't I use third-party software (e.g. Claude Code, OpenClaw, OpenCode) with Gemini CLI?
 
 Using third-party software, tools, or services to harvest or piggyback on Gemini
 CLI's OAuth authentication to access our backend services is a direct violation
@@ -113,8 +113,8 @@ export GOOGLE_CLOUD_PROJECT="your-project-id"
 $env:GOOGLE_CLOUD_PROJECT="your-project-id"
 ```
 
-To make this setting permanent, add this line to your shell's startup file (for
-example, `~/.bashrc`, `~/.zshrc`).
+To make this setting permanent, add this line to your shell's startup file
+(e.g., `~/.bashrc`, `~/.zshrc`).
 
 ### What is the best way to store my API keys securely?
 
@@ -131,9 +131,9 @@ To store your API keys securely, you can:
   Manager, or a secret manager on Linux). You can then have your scripts or
   environment load the key from the secure storage at runtime.
 
-### Where are Gemini CLI configuration and settings files stored?
+### Where are the Gemini CLI configuration and settings files stored?
 
-Gemini CLI configuration is stored in two `settings.json` files:
+The Gemini CLI configuration is stored in two `settings.json` files:
 
 1.  In your home directory: `~/.gemini/settings.json`.
 2.  In your project's root directory: `./.gemini/settings.json`.

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/resources/tos-privacy.md

@@ -1,17 +1,17 @@
 # Gemini CLI: License, Terms of Service, and Privacy Notices
 
 Gemini CLI is an open-source tool that lets you interact with Google's powerful
-AI services directly from your command-line interface. Gemini CLI software is
-licensed under the
+AI services directly from your command-line interface. The Gemini CLI software
+is licensed under the
 [Apache 2.0 license](https://github.com/google-gemini/gemini-cli/blob/main/LICENSE).
 When you use Gemini CLI to access or use Google’s services, the Terms of Service
 and Privacy Notices applicable to those services apply to such access and use.
 
-Directly accessing the services powering Gemini CLI (for example, the Gemini
-Code Assist service) using third-party software, tools, or services (for
-example, using OpenClaw with Gemini CLI OAuth) is a violation of applicable
-terms and policies. Such actions may be grounds for suspension or termination of
-your account.
+Directly accessing the services powering Gemini CLI (e.g., the Gemini Code
+Assist service) using third-party software, tools, or services (for example,
+using OpenClaw with Gemini CLI OAuth) is a violation of applicable terms and
+policies. Such actions may be grounds for suspension or termination of your
+account.
 
 Your Gemini CLI Usage Statistics are handled in accordance with Google's Privacy
 Policy.
@@ -19,7 +19,7 @@ Policy.
 <!-- prettier-ignore -->
 > [!NOTE]
 > See [quotas and pricing](quota-and-pricing.md) for the quota and
-> pricing details that apply to your usage of Gemini CLI.
+> pricing details that apply to your usage of the Gemini CLI.
 
 ## Supported authentication methods
 
@@ -37,7 +37,7 @@ If you log in with your Google account and you do not already have a Gemini Code
 Assist account associated with your Google account, you will be directed to the
 sign up flow for Gemini Code Assist for individuals. If your Google account is
 managed by your organization, your administrator may not permit access to Gemini
-Code Assist for individuals. See the
+Code Assist for individuals. Please see the
 [Gemini Code Assist for individuals FAQs](https://developers.google.com/gemini-code-assist/resources/faqs)
 for further information.
 
@@ -76,7 +76,7 @@ If you are using a Gemini API key for authentication with the
 [Gemini Developer API](https://ai.google.dev/gemini-api/docs), these Terms of
 Service and Privacy Notice documents apply:
 
-- Terms of Service: Your use of Gemini CLI is governed by the
+- Terms of Service: Your use of the Gemini CLI is governed by the
   [Gemini API Terms of Service](https://ai.google.dev/gemini-api/terms). These
   terms may differ depending on whether you are using an unpaid or paid service:
   - For unpaid services, refer to the
@@ -92,7 +92,7 @@ If you are using a Gemini API key for authentication with a
 [Vertex AI GenAI API](https://cloud.google.com/vertex-ai/generative-ai/docs/reference/rest)
 backend, these Terms of Service and Privacy Notice documents apply:
 
-- Terms of Service: Your use of Gemini CLI is governed by the
+- Terms of Service: Your use of the Gemini CLI is governed by the
   [Google Cloud Platform Service Terms](https://cloud.google.com/terms/service-terms/).
 - Privacy Notice: The collection and use of your data is described in the
   [Google Cloud Privacy Notice](https://cloud.google.com/terms/cloud-privacy-notice).

docs/resources/troubleshooting.md

@@ -80,9 +80,9 @@ topics on:
       directory is in your `PATH`. You can update Gemini CLI using the command
       `npm install -g @google/gemini-cli@latest`.
     - If you are running `gemini` from source, ensure you are using the correct
-      command to invoke it (for example, `node packages/cli/dist/index.js ...`).
-      To update Gemini CLI, pull the latest changes from the repository, and
-      then rebuild using the command `npm run build`.
+      command to invoke it (e.g., `node packages/cli/dist/index.js ...`). To
+      update Gemini CLI, pull the latest changes from the repository, and then
+      rebuild using the command `npm run build`.
 
 - **Error: `MODULE_NOT_FOUND` or import errors.**
   - **Cause:** Dependencies are not installed correctly, or the project hasn't
@@ -101,18 +101,18 @@ topics on:
     configuration.
 
 - **Gemini CLI is not running in interactive mode in "CI" environments**
-  - **Issue:** Gemini CLI does not enter interactive mode (no prompt appears) if
-    an environment variable starting with `CI_` (for example, `CI_TOKEN`) is
-    set. This is because the `is-in-ci` package, used by the underlying UI
+  - **Issue:** The Gemini CLI does not enter interactive mode (no prompt
+    appears) if an environment variable starting with `CI_` (e.g., `CI_TOKEN`)
+    is set. This is because the `is-in-ci` package, used by the underlying UI
     framework, detects these variables and assumes a non-interactive CI
     environment.
   - **Cause:** The `is-in-ci` package checks for the presence of `CI`,
     `CONTINUOUS_INTEGRATION`, or any environment variable with a `CI_` prefix.
     When any of these are found, it signals that the environment is
-    non-interactive, which prevents Gemini CLI from starting in its interactive
-    mode.
+    non-interactive, which prevents the Gemini CLI from starting in its
+    interactive mode.
   - **Solution:** If the `CI_` prefixed variable is not needed for the CLI to
-    function, you can temporarily unset it for the command. For example,
+    function, you can temporarily unset it for the command. e.g.,
     `env -u CI_TOKEN gemini`
 
 - **DEBUG mode not working from project .env file**
@@ -126,7 +126,7 @@ topics on:
 
 - **Warning: `npm WARN deprecated node-domexception@1.0.0` or
   `npm WARN deprecated glob` during install/update**
-  - **Issue:** When installing or updating Gemini CLI globally via
+  - **Issue:** When installing or updating the Gemini CLI globally via
     `npm install -g @google/gemini-cli` or `npm update -g @google/gemini-cli`,
     you might see deprecation warnings regarding `node-domexception` or old
     versions of `glob`.
@@ -141,14 +141,14 @@ topics on:
 
 ## Exit codes
 
-Gemini CLI uses specific exit codes to indicate the reason for termination. This
-is especially useful for scripting and automation.
+The Gemini CLI uses specific exit codes to indicate the reason for termination.
+This is especially useful for scripting and automation.
 
 | Exit Code | Error Type                 | Description                                                                                         |
 | --------- | -------------------------- | --------------------------------------------------------------------------------------------------- |
 | 41        | `FatalAuthenticationError` | An error occurred during the authentication process.                                                |
 | 42        | `FatalInputError`          | Invalid or missing input was provided to the CLI. (non-interactive mode only)                       |
-| 44        | `FatalSandboxError`        | An error occurred with the sandboxing environment (for example, Docker, Podman, or Seatbelt).       |
+| 44        | `FatalSandboxError`        | An error occurred with the sandboxing environment (e.g., Docker, Podman, or Seatbelt).              |
 | 52        | `FatalConfigError`         | A configuration file (`settings.json`) is invalid or contains errors.                               |
 | 53        | `FatalTurnLimitedError`    | The maximum number of conversational turns for the session was reached. (non-interactive mode only) |
 
@@ -164,8 +164,8 @@ is especially useful for scripting and automation.
   - Check the server console output for error messages or stack traces.
   - Increase log verbosity if configurable. For example, set the `DEBUG_MODE`
     environment variable to `true` or `1`.
-  - Use Node.js debugging tools (for example, `node --inspect`) if you need to
-    step through server-side code.
+  - Use Node.js debugging tools (e.g., `node --inspect`) if you need to step
+    through server-side code.
 
 - **Tool issues:**
   - If a specific tool is failing, try to isolate the issue by running the
@@ -182,7 +182,7 @@ is especially useful for scripting and automation.
 ## Existing GitHub issues similar to yours or creating new issues
 
 If you encounter an issue that was not covered here in this _Troubleshooting
-guide_, consider searching Gemini CLI
+guide_, consider searching the Gemini CLI
 [Issue tracker on GitHub](https://github.com/google-gemini/gemini-cli/issues).
 If you can't find an issue similar to yours, consider creating a new GitHub
 Issue with a detailed description. Pull requests are also welcome!