Merge branch 'main' into adibakm/ask-user-file

.gemini/settings.json

@@ -5,10 +5,7 @@
     "autoMemory": true,
     "memoryManager": true,
     "topicUpdateNarration": true,
-    "voiceMode": true,
-    "adk": {
-      "agentSessionNoninteractiveEnabled": true
-    }
+    "voiceMode": true
   },
   "general": {
     "devtools": true

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

@@ -114,14 +114,13 @@ runs:
         BRANCH_NAME: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
         DRY_RUN: '${{ inputs.dry-run }}'
         RELEASE_TAG: '${{ inputs.release-tag }}'
-        GIT_PUSH_TOKEN: '${{ inputs.github-release-token || inputs.github-token }}'
       run: |-
         set -e
         git add package.json package-lock.json packages/*/package.json
         git commit -m "chore(release): ${RELEASE_TAG}"
         if [[ "${DRY_RUN}" == "false" ]]; then
           echo "Pushing release branch to remote..."
-          git push "https://x-access-token:${GIT_PUSH_TOKEN}@github.com/${{ github.repository }}.git" "HEAD:${BRANCH_NAME}" --follow-tags
+          git push --set-upstream origin "${BRANCH_NAME}" --follow-tags
         else
           echo "Dry run enabled. Skipping push."
         fi
@@ -175,9 +174,9 @@ runs:
         npm publish \
           --dry-run="${INPUTS_DRY_RUN}" \
           --workspace="${INPUTS_CORE_PACKAGE_NAME}" \
-          --tag staging-tmp
+          --no-tag
         if [[ "${INPUTS_DRY_RUN}" == "false" ]]; then
-          npm dist-tag rm ${INPUTS_CORE_PACKAGE_NAME} staging-tmp
+          npm dist-tag rm ${INPUTS_CORE_PACKAGE_NAME} false
         fi
 
     - name: '🔗 Install latest core package'
@@ -223,9 +222,9 @@ runs:
         npm publish \
           --dry-run="${INPUTS_DRY_RUN}" \
           --workspace="${INPUTS_CLI_PACKAGE_NAME}" \
-          --tag staging-tmp
+          --no-tag
         if [[ "${INPUTS_DRY_RUN}" == "false" ]]; then
-          npm dist-tag rm ${INPUTS_CLI_PACKAGE_NAME} staging-tmp
+          npm dist-tag rm ${INPUTS_CLI_PACKAGE_NAME} false
         fi
 
     - name: 'Get a2a-server Token'
@@ -250,9 +249,9 @@ runs:
         npm publish \
           --dry-run="${INPUTS_DRY_RUN}" \
           --workspace="${INPUTS_A2A_PACKAGE_NAME}" \
-          --tag staging-tmp
+          --no-tag
           if [[ "${INPUTS_DRY_RUN}" == "false" ]]; then
-            npm dist-tag rm ${INPUTS_A2A_PACKAGE_NAME} staging-tmp
+            npm dist-tag rm ${INPUTS_A2A_PACKAGE_NAME} false
           fi
 
     - name: '🔬 Verify NPM release by version'
@@ -312,15 +311,15 @@ runs:
         RELEASE_ASSETS=("gemini-cli-bundle.zip")
 
         # Check for and prepare macOS binaries if they exist
-        for arch in arm64 x64; do
-          BINARY_PATH="dist/darwin-${arch}/gemini"
-          if [[ -f "$BINARY_PATH" ]]; then
-            chmod +x "$BINARY_PATH"
-            ZIP_NAME="gemini-darwin-${arch}-unsigned.zip"
-            zip -j "$ZIP_NAME" "$BINARY_PATH"
-            RELEASE_ASSETS+=("$ZIP_NAME")
-          fi
-        done
+        if [[ -f "dist/darwin-arm64/gemini" ]]; then
+          zip -j gemini-darwin-arm64-unsigned.zip dist/darwin-arm64/gemini
+          RELEASE_ASSETS+=("gemini-darwin-arm64-unsigned.zip")
+        fi
+
+        if [[ -f "dist/darwin-x64/gemini" ]]; then
+          zip -j gemini-darwin-x64-unsigned.zip dist/darwin-x64/gemini
+          RELEASE_ASSETS+=("gemini-darwin-x64-unsigned.zip")
+        fi
 
         gh release create "${INPUTS_RELEASE_TAG}" \
           "${RELEASE_ASSETS[@]}" \
@@ -337,8 +336,7 @@ runs:
       shell: 'bash'
       run: |
         echo "Cleaning up release branch ${STEPS_RELEASE_BRANCH_OUTPUTS_BRANCH_NAME}..."
-        git push "https://x-access-token:${GIT_PUSH_TOKEN}@github.com/${{ github.repository }}.git" --delete "${STEPS_RELEASE_BRANCH_OUTPUTS_BRANCH_NAME}"
+        git push origin --delete "${STEPS_RELEASE_BRANCH_OUTPUTS_BRANCH_NAME}"
 
       env:
-        GIT_PUSH_TOKEN: '${{ inputs.github-release-token || inputs.github-token }}'
         STEPS_RELEASE_BRANCH_OUTPUTS_BRANCH_NAME: '${{ steps.release_branch.outputs.BRANCH_NAME }}'

.github/scripts/apply-issue-labels.cjs

@@ -1,196 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-module.exports = async ({ github, context, core }) => {
-  const rawLabels = process.env.LABELS_OUTPUT;
-  core.info(`Raw labels JSON: ${rawLabels}`);
-  let parsedLabels;
-  try {
-    // First, try to parse the raw output as JSON.
-    parsedLabels = JSON.parse(rawLabels);
-  } catch (jsonError) {
-    // If that fails, check for a markdown code block.
-    core.warning(
-      `Direct JSON parsing failed: ${jsonError.message}. Trying to extract from a markdown block.`,
-    );
-    const jsonMatch = rawLabels.match(/```json\s*([\s\S]*?)\s*```/);
-    if (jsonMatch && jsonMatch[1]) {
-      try {
-        parsedLabels = JSON.parse(jsonMatch[1].trim());
-      } catch (markdownError) {
-        core.setFailed(
-          `Failed to parse JSON even after extracting from markdown block: ${markdownError.message}\nRaw output: ${rawLabels}`,
-        );
-        return;
-      }
-    } else {
-      // If no markdown block, try to find a raw JSON array in the output.
-      // The CLI may include debug/log lines (e.g. telemetry init, YOLO mode)
-      // before the actual JSON response.
-      const jsonArrayMatch = rawLabels.match(
-        /\[\s*\{\s*"issue_number"[\s\S]*\}\s*\]/,
-      );
-      if (jsonArrayMatch) {
-        try {
-          parsedLabels = JSON.parse(jsonArrayMatch[0]);
-        } catch (extractError) {
-          // It's possible the regex matched from a `[STARTUP]` log all the way to the end
-          // of the JSON array. We need to be more aggressive and find the FIRST `[ { "issue_number"`
-          core.warning(
-            `Strict array match failed: ${extractError.message}. Attempting to clean leading noisy brackets.`,
-          );
-          const fallbackMatch = rawLabels.match(
-            /(\[\s*\{\s*"issue_number"[\s\S]*)/,
-          );
-          if (fallbackMatch) {
-            try {
-              // We might have grabbed trailing noise too, so we find the last closing bracket
-              const cleaned = fallbackMatch[0].substring(
-                0,
-                fallbackMatch[0].lastIndexOf(']') + 1,
-              );
-              parsedLabels = JSON.parse(cleaned);
-            } catch (fallbackError) {
-              core.setFailed(
-                `Found JSON-like content but failed to parse: ${fallbackError.message}\nRaw output: ${rawLabels}`,
-              );
-              return;
-            }
-          } else {
-            core.setFailed(
-              `Found JSON-like content but failed to parse: ${extractError.message}\nRaw output: ${rawLabels}`,
-            );
-            return;
-          }
-        }
-      } else {
-        core.setFailed(
-          `Output is not valid JSON and does not contain extractable JSON.\nRaw output: ${rawLabels}`,
-        );
-        return;
-      }
-    }
-  }
-  core.info(`Parsed labels JSON: ${JSON.stringify(parsedLabels)}`);
-
-  for (const entry of parsedLabels) {
-    const issueNumber = entry.issue_number;
-    if (!issueNumber) {
-      core.info(
-        `Skipping entry with no issue number: ${JSON.stringify(entry)}`,
-      );
-      continue;
-    }
-
-    let labelsToAdd = entry.labels_to_add || [];
-    let labelsToRemove = entry.labels_to_remove || [];
-
-    labelsToRemove.push('status/need-triage');
-
-    if (labelsToAdd.includes('status/manual-triage')) {
-      // If the AI flagged it for manual triage, remove bot-triaged if it exists
-      labelsToRemove.push('status/bot-triaged');
-      // Ensure we don't accidentally try to add bot-triaged if the AI returned it
-      labelsToAdd = labelsToAdd.filter((l) => l !== 'status/bot-triaged');
-    } else {
-      // Standard successful bot triage
-      labelsToAdd.push('status/bot-triaged');
-    }
-
-    // Deduplicate arrays
-    labelsToAdd = [...new Set(labelsToAdd)];
-    labelsToRemove = [...new Set(labelsToRemove)];
-
-    // Enforce mutually exclusive area labels
-    const areaLabelsToAdd = labelsToAdd.filter((l) => l.startsWith('area/'));
-    if (areaLabelsToAdd.length > 1) {
-      core.warning(
-        `Issue #${issueNumber} has multiple area labels to add: ${areaLabelsToAdd.join(', ')}. Keeping only the first one.`,
-      );
-      const firstArea = areaLabelsToAdd[0];
-      labelsToAdd = labelsToAdd.filter(
-        (l) => !l.startsWith('area/') || l === firstArea,
-      );
-    }
-
-    // Enforce mutually exclusive priority labels
-    const priorityLabelsToAdd = labelsToAdd.filter((l) =>
-      l.startsWith('priority/'),
-    );
-    if (priorityLabelsToAdd.length > 1) {
-      core.warning(
-        `Issue #${issueNumber} has multiple priority labels to add: ${priorityLabelsToAdd.join(', ')}. Keeping only the first one.`,
-      );
-      const firstPriority = priorityLabelsToAdd[0];
-      labelsToAdd = labelsToAdd.filter(
-        (l) => !l.startsWith('priority/') || l === firstPriority,
-      );
-    }
-
-    if (labelsToAdd.length > 0) {
-      await github.rest.issues.addLabels({
-        owner: context.repo.owner,
-        repo: context.repo.repo,
-        issue_number: issueNumber,
-        labels: labelsToAdd,
-      });
-
-      const explanation = entry.explanation ? ` - ${entry.explanation}` : '';
-      core.info(
-        `Successfully added labels for #${issueNumber}: ${labelsToAdd.join(', ')}${explanation}`,
-      );
-    }
-
-    if (labelsToRemove.length > 0) {
-      for (const label of labelsToRemove) {
-        try {
-          await github.rest.issues.removeLabel({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            issue_number: issueNumber,
-            name: label,
-          });
-        } catch (e) {
-          if (e.status !== 404) {
-            core.warning(
-              `Failed to remove label ${label} from #${issueNumber}: ${e.message}`,
-            );
-          }
-        }
-      }
-      core.info(
-        `Successfully removed labels for #${issueNumber}: ${labelsToRemove.join(', ')}`,
-      );
-    }
-
-    if (entry.explanation || entry.effort_analysis) {
-      let commentBody = '';
-      if (entry.explanation) {
-        commentBody += entry.explanation;
-      }
-      if (entry.effort_analysis) {
-        if (commentBody) commentBody += '\n\n';
-        commentBody += `**Effort Analysis:**\n${entry.effort_analysis}`;
-      }
-
-      await github.rest.issues.createComment({
-        owner: context.repo.owner,
-        repo: context.repo.repo,
-        issue_number: issueNumber,
-        body: commentBody,
-      });
-    }
-
-    if (
-      (!entry.labels_to_add || entry.labels_to_add.length === 0) &&
-      (!entry.labels_to_remove || entry.labels_to_remove.length === 0)
-    ) {
-      core.info(
-        `No labels to add or remove for #${issueNumber}, leaving as is`,
-      );
-    }
-  }
-};

.github/scripts/cleanup-triage-labels.cjs

@@ -1,50 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-const fs = require('node:fs');
-
-module.exports = async ({ github, context, core }) => {
-  let issuesToCleanup = [];
-  try {
-    const fileContent = fs.readFileSync('issues_to_cleanup.json', 'utf8');
-    issuesToCleanup = JSON.parse(fileContent);
-  } catch (error) {
-    if (error.code === 'ENOENT') {
-      core.info('No issues found to clean up.');
-      return;
-    }
-    core.setFailed(`Failed to read issues_to_cleanup.json: ${error.message}`);
-    return;
-  }
-
-  for (const issue of issuesToCleanup) {
-    try {
-      await github.rest.issues.removeLabel({
-        owner: context.repo.owner,
-        repo: context.repo.repo,
-        issue_number: issue.number,
-        name: 'status/need-triage',
-      });
-      core.info(
-        `Successfully removed status/need-triage from #${issue.number}`,
-      );
-    } catch (error) {
-      if (error.status === 404) {
-        core.info(
-          `Label status/need-triage not found on #${issue.number}, skipping.`,
-        );
-      } else {
-        core.warning(
-          `Failed to remove label from #${issue.number}: ${error.message}`,
-        );
-      }
-    }
-  }
-
-  core.info(
-    `Cleaned up status/need-triage from ${issuesToCleanup.length} issues.`,
-  );
-};

.github/scripts/find-conflicting-labels.cjs

@@ -1,60 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-const fs = require('node:fs');
-
-module.exports = async ({ github, context, core }) => {
-  core.info('Fetching open issues to check for conflicting labels...');
-
-  const issues = await github.paginate(github.rest.issues.listForRepo, {
-    owner: context.repo.owner,
-    repo: context.repo.repo,
-    state: 'open',
-    per_page: 100,
-  });
-
-  const conflictingLabelIssues = [];
-
-  for (const issue of issues) {
-    if (issue.pull_request) continue;
-
-    const areaLabels = issue.labels
-      .filter((l) => l.name && l.name.startsWith('area/'))
-      .map((l) => l.name);
-
-    const priorityLabels = issue.labels
-      .filter((l) => l.name && l.name.startsWith('priority/'))
-      .map((l) => l.name);
-
-    if (areaLabels.length > 1 || priorityLabels.length > 1) {
-      let message = `Issue #${issue.number} has conflicting labels:`;
-      if (areaLabels.length > 1)
-        message += ` multiple areas (${areaLabels.join(', ')}).`;
-      if (priorityLabels.length > 1)
-        message += ` multiple priorities (${priorityLabels.join(', ')}).`;
-
-      core.info(message);
-
-      conflictingLabelIssues.push({
-        number: issue.number,
-        title: issue.title,
-        body: issue.body || '',
-      });
-    }
-  }
-
-  // Limit to 50 to avoid overwhelming the AI in a single run
-  const issuesToProcess = conflictingLabelIssues.slice(0, 50);
-
-  fs.writeFileSync(
-    'conflicting_labels_issues.json',
-    JSON.stringify(issuesToProcess, null, 2),
-  );
-
-  core.info(
-    `Found ${conflictingLabelIssues.length} issues with conflicting labels. Wrote ${issuesToProcess.length} to conflicting_labels_issues.json`,
-  );
-};

.github/scripts/gemini-lifecycle-manager.cjs

@@ -41,41 +41,6 @@ module.exports = async ({ github, context, core }) => {
     now.getTime() - NO_RESPONSE_DAYS * 24 * 60 * 60 * 1000,
   );
 
-  const maintainerCache = new Map();
-  async function isMaintainer(user, association) {
-    if (user?.type === 'Bot') return true;
-    if (['OWNER', 'MEMBER', 'COLLABORATOR'].includes(association)) return true;
-
-    const username = user?.login;
-    if (!username) return false;
-
-    if (maintainerCache.has(username)) {
-      return maintainerCache.get(username);
-    }
-
-    try {
-      const { data } = await github.rest.repos.getCollaboratorPermissionLevel({
-        owner,
-        repo,
-        username,
-      });
-      // Permission can be admin, write, read, none.
-      // Roles like 'maintain' or 'triage' often map to 'write' or 'read' in the top-level field.
-      const isM =
-        ['admin', 'write'].includes(data.permission) ||
-        ['admin', 'maintain', 'write'].includes(data.role_name);
-
-      maintainerCache.set(username, isM);
-      return isM;
-    } catch (err) {
-      core.warning(
-        `Could not check permissions for ${username}: ${err.message}`,
-      );
-      maintainerCache.set(username, false);
-      return false;
-    }
-  }
-
   async function processItems(query, callback) {
     core.info(`Searching: ${query}`);
     try {
@@ -118,7 +83,10 @@ module.exports = async ({ github, context, core }) => {
       const lastComment = comments[0];
       if (
         lastComment &&
-        !(await isMaintainer(lastComment.user, lastComment.author_association))
+        !['OWNER', 'MEMBER', 'COLLABORATOR'].includes(
+          lastComment.author_association,
+        ) &&
+        lastComment.user?.type !== 'Bot'
       ) {
         core.info(
           `Removing ${NEED_INFO_LABEL} from #${item.number} due to contributor response.`,
@@ -220,7 +188,11 @@ module.exports = async ({ github, context, core }) => {
   await processItems(
     `repo:${owner}/${repo} is:open is:pr -label:"help wanted" -label:"🔒 maintainer only" -label:"status/pr-nudge-sent" created:${prCloseThreshold.toISOString()}..${nudgeThreshold.toISOString()}`,
     async (pr) => {
-      if (await isMaintainer(pr.user, pr.author_association)) return;
+      if (
+        ['OWNER', 'MEMBER', 'COLLABORATOR'].includes(pr.author_association) ||
+        pr.user?.type === 'Bot'
+      )
+        return;
 
       core.info(`Nudging PR #${pr.number} for contribution policy.`);
       if (!dryRun) {
@@ -244,7 +216,11 @@ module.exports = async ({ github, context, core }) => {
   await processItems(
     `repo:${owner}/${repo} is:open is:pr -label:"help wanted" -label:"🔒 maintainer only" created:<${prCloseThreshold.toISOString()}`,
     async (pr) => {
-      if (await isMaintainer(pr.user, pr.author_association)) return;
+      if (
+        ['OWNER', 'MEMBER', 'COLLABORATOR'].includes(pr.author_association) ||
+        pr.user?.type === 'Bot'
+      )
+        return;
 
       core.info(
         `Closing PR #${pr.number} per contribution policy (no 'help wanted').`,

.github/scripts/sync-issue-types.cjs

@@ -1,99 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-const fs = require('node:fs');
-
-module.exports = async ({ github, context, core }) => {
-  const query = `
-    query($owner: String!, $repo: String!) {
-      repository(owner: $owner, name: $repo) {
-        issues(first: 50, states: OPEN, orderBy: {field: UPDATED_AT, direction: DESC}) {
-          nodes {
-            id
-            number
-            title
-            body
-            issueType {
-              name
-            }
-            labels(first: 20) {
-              nodes {
-                name
-              }
-            }
-          }
-        }
-      }
-    }
-  `;
-
-  try {
-    const result = await github.graphql(query, {
-      owner: context.repo.owner,
-      repo: context.repo.repo,
-    });
-
-    const issues = result.repository.issues.nodes;
-    const issuesNeedingAnalysis = [];
-    let syncedCount = 0;
-
-    for (const issue of issues) {
-      if (issue.issueType === null) {
-        const labelNames = issue.labels.nodes.map((l) => l.name);
-        const hasBug = labelNames.includes('kind/bug');
-        const hasFeature =
-          labelNames.includes('kind/feature') ||
-          labelNames.includes('kind/enhancement');
-
-        let issueTypeId = null;
-        if (hasBug) {
-          issueTypeId = 'IT_kwDOCaSVvs4BR7vP'; // Bug
-        } else if (hasFeature) {
-          issueTypeId = 'IT_kwDOCaSVvs4BR7vQ'; // Feature
-        }
-
-        if (issueTypeId) {
-          await github.graphql(
-            `
-            mutation($issueId: ID!, $issueTypeId: ID!) {
-              updateIssue(input: {id: $issueId, issueTypeId: $issueTypeId}) {
-                issue {
-                  id
-                }
-              }
-            }
-          `,
-            {
-              issueId: issue.id,
-              issueTypeId: issueTypeId,
-            },
-          );
-          core.info(`Successfully synced Issue Type for #${issue.number}`);
-          syncedCount++;
-        } else {
-          // Needs analysis to determine kind/type
-          issuesNeedingAnalysis.push({
-            number: issue.number,
-            title: issue.title,
-            body: issue.body,
-          });
-        }
-      }
-    }
-
-    // Write issues needing analysis to a file so the AI can process them
-    fs.writeFileSync(
-      'no_type_issues.json',
-      JSON.stringify(issuesNeedingAnalysis),
-    );
-    core.info(`Synced ${syncedCount} issues from labels.`);
-    core.info(
-      `Found ${issuesNeedingAnalysis.length} issues missing both type and kind label to be analyzed.`,
-    );
-  } catch (error) {
-    core.setFailed(`Failed to sync issue types: ${error.message}`);
-  }
-};

.github/workflows/build-unsigned-mac-binaries.yml

@@ -30,7 +30,6 @@ jobs:
         uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
         with:
           ref: '${{ inputs.ref || github.ref }}'
-          persist-credentials: false
 
       - name: 'Set up Node.js'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4

.github/workflows/chained_e2e.yml

@@ -148,7 +148,6 @@ jobs:
         with:
           ref: '${{ needs.parse_run_context.outputs.sha }}'
           repository: '${{ needs.parse_run_context.outputs.repository }}'
-          persist-credentials: false
 
       - name: 'Set up Node.js ${{ matrix.node-version }}'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions-node@v4
@@ -194,7 +193,6 @@ jobs:
         with:
           ref: '${{ needs.parse_run_context.outputs.sha }}'
           repository: '${{ needs.parse_run_context.outputs.repository }}'
-          persist-credentials: false
 
       - name: 'Set up Node.js 20.x'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions-node@v4
@@ -235,7 +233,6 @@ jobs:
         with:
           ref: '${{ needs.parse_run_context.outputs.sha }}'
           repository: '${{ needs.parse_run_context.outputs.repository }}'
-          persist-credentials: false
 
       - name: 'Set up Node.js 20.x'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions-node@v4
@@ -317,7 +314,6 @@ jobs:
         with:
           ref: '${{ needs.parse_run_context.outputs.sha }}'
           repository: '${{ needs.parse_run_context.outputs.repository }}'
-          persist-credentials: false
           fetch-depth: 0
 
       - name: 'Set up Node.js 20.x'

.github/workflows/ci.yml

@@ -57,7 +57,6 @@ jobs:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
         with:
-          persist-credentials: false
           ref: '${{ github.event.inputs.branch_ref || github.ref }}'
           fetch-depth: 0
 
@@ -131,8 +130,6 @@ jobs:
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          persist-credentials: false
       - name: 'Link Checker'
         uses: 'lycheeverse/lychee-action@885c65f3dc543b57c898c8099f4e08c8afd178a2' # ratchet: lycheeverse/lychee-action@v2.6.1
         with:
@@ -160,8 +157,6 @@ jobs:
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          persist-credentials: false
 
       - name: 'Set up Node.js ${{ matrix.node-version }}'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
@@ -257,8 +252,6 @@ jobs:
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          persist-credentials: false
 
       - name: 'Set up Node.js ${{ matrix.node-version }}'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
@@ -346,7 +339,6 @@ jobs:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
         with:
-          persist-credentials: false
           ref: '${{ github.event.inputs.branch_ref || github.ref }}'
 
       - name: 'Initialize CodeQL'
@@ -371,7 +363,6 @@ jobs:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
         with:
-          persist-credentials: false
           ref: '${{ github.event.inputs.branch_ref || github.ref }}'
           fetch-depth: 1
 
@@ -399,7 +390,6 @@ jobs:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
         with:
-          persist-credentials: false
           ref: '${{ github.event.inputs.branch_ref || github.ref }}'
 
       - name: 'Set up Node.js 20.x'

.github/workflows/deflake.yml

@@ -43,7 +43,6 @@ jobs:
         with:
           ref: '${{ github.event.pull_request.head.sha }}'
           repository: '${{ github.repository }}'
-          persist-credentials: false
 
       - name: 'Set up Node.js ${{ matrix.node-version }}'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions-node@v4
@@ -87,7 +86,6 @@ jobs:
         with:
           ref: '${{ github.event.pull_request.head.sha }}'
           repository: '${{ github.repository }}'
-          persist-credentials: false
 
       - name: 'Set up Node.js 20.x'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions-node@v4
@@ -127,7 +125,6 @@ jobs:
         with:
           ref: '${{ github.event.pull_request.head.sha }}'
           repository: '${{ github.repository }}'
-          persist-credentials: false
 
       - name: 'Set up Node.js 20.x'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions-node@v4

.github/workflows/docs-audit.yml

@@ -19,7 +19,6 @@ jobs:
         with:
           fetch-depth: 0
           ref: 'main'
-          persist-credentials: false
 
       - name: 'Set up Node.js'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020'

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

@@ -24,8 +24,6 @@ jobs:
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          persist-credentials: false
 
       - name: 'Setup Pages'
         uses: 'actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b' # ratchet:actions/configure-pages@v5

.github/workflows/eval-pr.yml

@@ -38,7 +38,6 @@ jobs:
         with:
           # Check out the trusted code from main for detection
           fetch-depth: 0
-          persist-credentials: false
 
       - name: 'Detect Steering Changes'
         id: 'detect'
@@ -103,7 +102,6 @@ jobs:
           # This only runs AFTER manual approval
           ref: '${{ github.event.pull_request.head.sha }}'
           fetch-depth: 0
-          persist-credentials: false
 
       - name: 'Remove Approval Notification'
         # Run even if other steps fail, to ensure we clean up the "Action Required" message

.github/workflows/evals-nightly.yml

@@ -46,8 +46,6 @@ jobs:
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          persist-credentials: false
 
       - name: 'Set up Node.js'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
@@ -107,8 +105,6 @@ jobs:
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          persist-credentials: false
 
       - name: 'Download Logs'
         uses: 'actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806' # ratchet:actions/download-artifact@v4

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

@@ -48,8 +48,6 @@ jobs:
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          persist-credentials: false
 
       - name: 'Log in to GitHub Container Registry'
         uses: 'docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1' # ratchet:docker/login-action@v3

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

@@ -90,8 +90,6 @@ jobs:
 
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          persist-credentials: false
 
       - name: 'Generate GitHub App Token'
         id: 'generate_token'
@@ -131,29 +129,19 @@ jobs:
             core.info(`Found ${labelNames.length} labels: ${labelNames.join(', ')}`);
             return labelNames;
 
-      - name: 'Prepare Issue Data'
-        id: 'prepare_issue_data'
-        env:
-          ISSUE_TITLE: >-
-            ${{ github.event_name == 'workflow_dispatch' && steps.get_issue_data.outputs.title || github.event.issue.title }}
-          ISSUE_BODY: >-
-            ${{ github.event_name == 'workflow_dispatch' && steps.get_issue_data.outputs.body || github.event.issue.body }}
-        run: |
-          set -euo pipefail
-          echo "Title: ${ISSUE_TITLE}" > issue_context.md
-          echo "Body:" >> issue_context.md
-          echo "${ISSUE_BODY}" >> issue_context.md
-
       - name: 'Run Gemini Issue Analysis'
         uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31' # ratchet:google-github-actions/run-gemini-cli@v0
         id: 'gemini_issue_analysis'
         env:
           GITHUB_TOKEN: '' # Do not pass any auth token here since this runs on untrusted inputs
+          ISSUE_TITLE: >-
+            ${{ github.event_name == 'workflow_dispatch' && steps.get_issue_data.outputs.title || github.event.issue.title }}
+          ISSUE_BODY: >-
+            ${{ github.event_name == 'workflow_dispatch' && steps.get_issue_data.outputs.body || github.event.issue.body }}
           ISSUE_NUMBER: >-
             ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.issue_number || inputs.issue_number) || github.event.issue.number }}
           REPOSITORY: '${{ github.repository }}'
           AVAILABLE_LABELS: '${{ steps.get_labels.outputs.available_labels }}'
-          GEMINI_CLI_TRUST_WORKSPACE: 'true'
         with:
           gcp_workload_identity_provider: '${{ vars.GCP_WIF_PROVIDER }}'
           gcp_project_id: '${{ vars.GOOGLE_CLOUD_PROJECT }}'
@@ -170,8 +158,7 @@ jobs:
                 "target": "gcp"
               },
               "coreTools": [
-                "run_shell_command(echo)",
-                "read_file"
+                "run_shell_command(echo)"
               ]
             }
           prompt: |-
@@ -180,7 +167,7 @@ jobs:
             You are an issue triage assistant. Your role is to analyze a GitHub issue and determine the single most appropriate area/ label based on the definitions provided.
 
             ## Steps
-            1. Use the read_file tool to read the file "issue_context.md" which contains the issue title and body.
+            1. Review the issue title and body: ${{ env.ISSUE_TITLE }} and ${{ env.ISSUE_BODY }}.
             2. Review the available labels: ${{ env.AVAILABLE_LABELS }}.
             3. Select exactly one area/ label that best matches the issue based on Reference 1: Area Definitions.
             4. Fallback Logic:

.github/workflows/gemini-cli-bot-brain.yml

@@ -29,7 +29,7 @@ on:
         default: false
 
 concurrency:
-  group: '${{ github.workflow }}-${{ github.event.issue.number || github.event.inputs.issue_number || github.ref }}'
+  group: '${{ github.workflow }}-${{ github.event.issue.number || github.event.pull_request.number || github.event.inputs.issue_number || github.ref }}'
   cancel-in-progress: true
 
 jobs:
@@ -41,12 +41,14 @@ jobs:
         github.event_name == 'schedule' ||
         (github.event_name == 'workflow_dispatch' && github.event.inputs.run_interactive != 'true') ||
         (github.event_name == 'workflow_dispatch' && github.event.inputs.run_interactive == 'true') ||
-        (github.event_name == 'issue_comment' && github.event.comment.user.login != 'gemini-cli[bot]' && contains(github.event.comment.body, '@gemini-cli') && contains(fromJSON('["COLLABORATOR", "MEMBER", "OWNER"]'), github.event.comment.author_association))
+        (github.event_name == 'issue_comment' && github.event.comment.user.login != 'gemini-cli[bot]' && contains(github.event.comment.body, '@gemini-cli') && contains(fromJSON('["COLLABORATOR", "MEMBER", "OWNER"]'), github.event.comment.author_association)) ||
+        (github.event_name == 'pull_request_review_comment' && github.event.comment.user.login != 'gemini-cli[bot]' && contains(github.event.comment.body, '@gemini-cli') && contains(fromJSON('["COLLABORATOR", "MEMBER", "OWNER"]'), github.event.comment.author_association))
       )
     # The reasoning phase is strictly readonly.
     permissions:
       contents: 'read'
       issues: 'read'
+      pull-requests: 'read'
       actions: 'read'
     env:
       GEMINI_CLI_TRUST_WORKSPACE: 'true'
@@ -55,7 +57,7 @@ jobs:
         id: 'determine_ref'
         env:
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          ISSUE_NUMBER: '${{ github.event.issue.number || github.event.inputs.issue_number }}'
+          ISSUE_NUMBER: '${{ github.event.issue.number || github.event.pull_request.number || github.event.inputs.issue_number }}'
         run: |
           REF="${{ github.ref }}"
           if [ -n "$ISSUE_NUMBER" ]; then
@@ -123,12 +125,11 @@ jobs:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
           GEMINI_MODEL: 'gemini-3-flash-preview'
-          GEMINI_CLI_HOME: 'tools/gemini-cli-bot'
           ENABLE_PRS: "${{ github.event.inputs.enable_prs || 'false' }}"
           TRIGGER_ISSUE_NUMBER: '${{ github.event.issue.number || github.event.inputs.issue_number }}'
           TRIGGER_COMMENT_ID: '${{ github.event.comment.id || github.event.inputs.comment_id }}'
         run: |
-          PROMPT_PATH="tools/gemini-cli-bot/brain/scheduled.md"
+          PROMPT_PATH="tools/gemini-cli-bot/brain/metrics.md"
           if [ "${{ github.event_name }}" = "issue_comment" ] || [ "${{ github.event.inputs.run_interactive }}" = "true" ]; then
             PROMPT_PATH="tools/gemini-cli-bot/brain/interactive.md"
             export ENABLE_PRS="true"
@@ -151,16 +152,9 @@ jobs:
             echo "</untrusted_context>" >> trigger_context.md
           fi
 
-          if [ "$ENABLE_PRS" = "true" ]; then
-            echo "**System Directive**: PR creation is ENABLED for this run. You MUST activate the **'prs' skill** to stage your changes and generate a \`pr-description.md\` file if you are proposing fixes." >> trigger_context.md
-            echo "**CRITICAL System Directive**: You MUST ONLY propose and implement a **SINGLE** improvement or fix per run. Bundling unrelated changes (e.g., a documentation update and a script fix, or a metrics update and a logic fix) into a single PR is STRICTLY FORBIDDEN and will result in immediate rejection during the critique phase. If you identify multiple issues, pick the most impactful one and ignore the others for now." >> trigger_context.md
-          else
-            echo "**System Directive**: PR creation is DISABLED for this run. You MUST NOT stage files or attempt to create a PR description." >> trigger_context.md
-          fi
-          echo "" >> trigger_context.md
+          cat trigger_context.md "$PROMPT_PATH" tools/gemini-cli-bot/brain/common.md > combined_prompt.md
 
-          cat trigger_context.md "$PROMPT_PATH" > combined_prompt.md
-          node bundle/gemini.js --policy tools/gemini-cli-bot/ci-policy.toml --prompt="$(cat combined_prompt.md)"
+          node bundle/gemini.js --policy tools/gemini-cli-bot/ci-policy.toml -p "$(cat combined_prompt.md)"
 
           if [ -n "$TRIGGER_ISSUE_NUMBER" ] && [ ! -s "issue-comment.md" ] && [ ! -s "pr-comment.md" ]; then
             echo "Agent failed to respond. Generating fallback error message."
@@ -170,18 +164,17 @@ jobs:
           fi
 
       - name: 'Run Critique Phase'
-        if: "${{ github.event.inputs.enable_prs == 'true' || github.event_name == 'issue_comment' || github.event.inputs.run_interactive == 'true' }}"
+        if: "${{ github.event.inputs.enable_prs == 'true' || github.event_name == 'issue_comment' || github.event_name == 'pull_request_review_comment' || github.event.inputs.run_interactive == 'true' }}"
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
           GEMINI_MODEL: 'gemini-3-flash-preview'
-          GEMINI_CLI_HOME: 'tools/gemini-cli-bot'
         run: |
           if git diff --staged --quiet; then
              echo "No changes staged. Skipping critique."
              echo "[APPROVED]" > critique_result.txt
           else
-             node bundle/gemini.js --policy tools/gemini-cli-bot/ci-policy.toml --prompt="$(cat tools/gemini-cli-bot/.gemini/skills/critique/SKILL.md)" 2>&1 | tee critique_output.log
+             node bundle/gemini.js --policy tools/gemini-cli-bot/ci-policy.toml -p "$(cat tools/gemini-cli-bot/brain/critique.md)" 2>&1 | tee critique_output.log
 
              if [ "${PIPESTATUS[0]}" -eq 0 ] && grep -q "\[APPROVED\]" critique_output.log && ! grep -q "\[REJECTED\]" critique_output.log; then
                echo "[APPROVED]" > critique_result.txt
@@ -192,7 +185,7 @@ jobs:
           fi
 
       - name: 'Generate Patch'
-        if: "${{ github.event.inputs.enable_prs == 'true' || github.event_name == 'issue_comment' || github.event.inputs.run_interactive == 'true' }}"
+        if: "${{ github.event.inputs.enable_prs == 'true' || github.event_name == 'issue_comment' || github.event_name == 'pull_request_review_comment' || github.event.inputs.run_interactive == 'true' }}"
         run: |
           touch bot-changes.patch
           touch pr-description.md
@@ -230,7 +223,7 @@ jobs:
     steps:
       - name: 'Generate GitHub App Token 🔑'
         id: 'generate_token'
-        if: "${{ github.event.inputs.enable_prs == 'true' || github.event_name == 'issue_comment' || github.event.inputs.run_interactive == 'true' }}"
+        if: "${{ github.event.inputs.enable_prs == 'true' || github.event_name == 'issue_comment' || github.event_name == 'pull_request_review_comment' || github.event.inputs.run_interactive == 'true' }}"
         uses: 'actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b' # ratchet:actions/create-github-app-token@v2
         with:
           app-id: '${{ secrets.APP_ID }}'
@@ -245,7 +238,7 @@ jobs:
         id: 'determine_ref'
         env:
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          ISSUE_NUMBER: '${{ github.event.issue.number || github.event.inputs.issue_number }}'
+          ISSUE_NUMBER: '${{ github.event.issue.number || github.event.pull_request.number || github.event.inputs.issue_number }}'
         run: |
           REF="main"
           if [ -n "$ISSUE_NUMBER" ]; then
@@ -270,7 +263,7 @@ jobs:
           path: '${{ runner.temp }}/brain-data/'
 
       - name: 'Create or Update PR'
-        if: "${{ github.event.inputs.enable_prs == 'true' || github.event_name == 'issue_comment' || github.event.inputs.run_interactive == 'true' }}"
+        if: "${{ github.event.inputs.enable_prs == 'true' || github.event_name == 'issue_comment' || github.event_name == 'pull_request_review_comment' || github.event.inputs.run_interactive == 'true' }}"
         env:
           GH_TOKEN: '${{ steps.generate_token.outputs.token }}'
           FALLBACK_PAT: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'

.github/workflows/gemini-cli-bot-pulse.yml

@@ -23,7 +23,6 @@ jobs:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
         with:
-          persist-credentials: false
           fetch-depth: 0
 
       - name: 'Setup Node.js'

.github/workflows/gemini-lifecycle-manager.yml

@@ -33,8 +33,6 @@ jobs:
 
       - name: 'Checkout repository'
         uses: 'actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683' # ratchet:actions/checkout@v4
-        with:
-          persist-credentials: false
 
       - name: 'Lifecycle Management'
         uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'

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

@@ -28,8 +28,6 @@ jobs:
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          persist-credentials: false
 
       - name: 'Log in to GitHub Container Registry'
         uses: 'docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1' # ratchet:docker/login-action@v3

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

@@ -23,15 +23,13 @@ permissions:
 
 jobs:
   triage-issues:
-    timeout-minutes: 60
+    timeout-minutes: 10
     if: |-
       ${{ github.repository == 'google-gemini/gemini-cli' }}
     runs-on: 'ubuntu-latest'
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          persist-credentials: false
 
       - name: 'Generate GitHub App Token'
         id: 'generate_token'
@@ -49,30 +47,10 @@ jobs:
           ISSUE_EVENT: '${{ toJSON(github.event.issue) }}'
         run: |
           set -euo pipefail
-          echo "$ISSUE_EVENT" | jq -c '[{number: .number, title: .title, body: .body}]' > issues_to_triage.json
-          echo "has_issues=true" >> "${GITHUB_OUTPUT}"
+          ISSUE_JSON=$(echo "$ISSUE_EVENT" | jq -c '[{number: .number, title: .title, body: .body}]')
+          echo "issues_to_triage=${ISSUE_JSON}" >> "${GITHUB_OUTPUT}"
           echo "✅ Found issue #${{ github.event.issue.number }} from event to triage! 🎯"
 
-      - name: 'Sync Issue Types'
-        if: |-
-          ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
-        with:
-          github-token: '${{ steps.generate_token.outputs.token }}'
-          script: |-
-            const syncIssueTypes = require('./.github/scripts/sync-issue-types.cjs');
-            await syncIssueTypes({ github, context, core });
-
-      - name: 'Find Issues with Conflicting Labels'
-        if: |-
-          ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
-        with:
-          github-token: '${{ steps.generate_token.outputs.token }}'
-          script: |-
-            const findConflictingLabels = require('./.github/scripts/find-conflicting-labels.cjs');
-            await findConflictingLabels({ github, context, core });
-
       - name: 'Find untriaged issues'
         if: |-
           ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
@@ -84,56 +62,25 @@ jobs:
           set -euo pipefail
 
           echo '🔍 Finding issues missing area labels...'
-          gh issue list --repo "${GITHUB_REPOSITORY}" \
-            --search 'is:open is:issue -label:status/bot-triaged -label:area/core -label:area/agent -label:area/enterprise -label:area/non-interactive -label:area/security -label:area/platform -label:area/extensions -label:area/documentation -label:area/unknown' --limit 50 --json number,title,body > no_area_issues.json
+          NO_AREA_ISSUES="$(gh issue list --repo "${GITHUB_REPOSITORY}" \
+            --search 'is:open is:issue -label:status/bot-triaged -label:area/core -label:area/agent -label:area/enterprise -label:area/non-interactive -label:area/security -label:area/platform -label:area/extensions -label:area/documentation -label:area/unknown' --limit 100 --json number,title,body)"
 
           echo '🔍 Finding issues missing kind labels...'
-          gh issue list --repo "${GITHUB_REPOSITORY}" \
-            --search 'is:open is:issue -label:status/bot-triaged -label:kind/bug -label:kind/enhancement -label:kind/customer-issue -label:kind/question' --limit 50 --json number,title,body > no_kind_issues.json
+          NO_KIND_ISSUES="$(gh issue list --repo "${GITHUB_REPOSITORY}" \
+            --search 'is:open is:issue -label:status/bot-triaged -label:kind/bug -label:kind/enhancement -label:kind/customer-issue -label:kind/question' --limit 100 --json number,title,body)"
 
           echo '🏷️ Finding issues missing priority labels...'
-          gh issue list --repo "${GITHUB_REPOSITORY}" \
-            --search 'is:open is:issue -label:priority/p0 -label:priority/p1 -label:priority/p2 -label:priority/p3 -label:priority/unknown' --limit 50 --json number,title,body > no_priority_issues.json
+          NO_PRIORITY_ISSUES="$(gh issue list --repo "${GITHUB_REPOSITORY}" \
+            --search 'is:open is:issue -label:status/bot-triaged -label:priority/p0 -label:priority/p1 -label:priority/p2 -label:priority/p3 -label:priority/unknown' --limit 100 --json number,title,body)"
 
-          echo '📏 Finding issues missing effort labels...'
-          gh issue list --repo "${GITHUB_REPOSITORY}" \
-            --search 'is:open is:issue -label:effort/small -label:effort/medium -label:effort/large label:area/core,area/extensions,area/site,area/non-interactive' --limit 5 --json number,title,body > no_effort_issues.json
+          echo '🔄 Merging and deduplicating issues...'
+          ISSUES="$(echo "${NO_AREA_ISSUES}" "${NO_KIND_ISSUES}" "${NO_PRIORITY_ISSUES}" | jq -c -s 'add | unique_by(.number)')"
 
-          echo '🔄 Merging and deduplicating standard triage issues...'
-          if [ ! -f conflicting_labels_issues.json ]; then echo "[]" > conflicting_labels_issues.json; fi
-          jq -c -s 'add | unique_by(.number)' no_area_issues.json no_kind_issues.json no_priority_issues.json conflicting_labels_issues.json > standard_issues_to_triage.json
+          echo '📝 Setting output for GitHub Actions...'
+          echo "issues_to_triage=${ISSUES}" >> "${GITHUB_OUTPUT}"
 
-          echo '📏 Deduplicating effort issues...'
-          jq -c -s 'add | unique_by(.number)' no_effort_issues.json > effort_issues_to_triage.json
-
-          STANDARD_COUNT="$(jq 'length' standard_issues_to_triage.json)"
-          EFFORT_COUNT="$(jq 'length' effort_issues_to_triage.json)"
-          if [ "$STANDARD_COUNT" -gt 0 ] || [ "$EFFORT_COUNT" -gt 0 ]; then
-            echo "has_issues=true" >> "${GITHUB_OUTPUT}"
-            echo "has_standard_issues=$([ "$STANDARD_COUNT" -gt 0 ] && echo 'true' || echo 'false')" >> "${GITHUB_OUTPUT}"
-            echo "has_effort_issues=$([ "$EFFORT_COUNT" -gt 0 ] && echo 'true' || echo 'false')" >> "${GITHUB_OUTPUT}"
-          else
-            echo "has_issues=false" >> "${GITHUB_OUTPUT}"
-            echo "has_standard_issues=false" >> "${GITHUB_OUTPUT}"
-            echo "has_effort_issues=false" >> "${GITHUB_OUTPUT}"
-          fi
-          echo "✅ Found ${STANDARD_COUNT} standard issues and ${EFFORT_COUNT} effort issues to triage! 🎯"
-
-      - name: 'Create Gemini CLI Experiments Override'
-        if: |-
-          steps.get_issue_from_event.outputs.has_issues == 'true' || steps.find_issues.outputs.has_issues == 'true'
-        run: |
-          cat << 'EOF' > gemini_exp.json
-          {
-            "flags": [
-              {
-                "flagId": 45750526,
-                "boolValue": false
-              }
-            ],
-            "experimentIds": []
-          }
-          EOF
+          ISSUE_COUNT="$(echo "${ISSUES}" | jq 'length')"
+          echo "✅ Found ${ISSUE_COUNT} unique issues to triage! 🎯"
 
       - name: 'Get Repository Labels'
         id: 'get_labels'
@@ -150,18 +97,17 @@ jobs:
             core.info(`Found ${labelNames.length} labels: ${labelNames.join(', ')}`);
             return labelNames;
 
-      - name: 'Run Standard Triage Analysis'
+      - name: 'Run Gemini Issue Analysis'
         if: |-
-          steps.get_issue_from_event.outputs.has_issues == 'true' || steps.find_issues.outputs.has_standard_issues == 'true'
+          (steps.get_issue_from_event.outputs.issues_to_triage != '' && steps.get_issue_from_event.outputs.issues_to_triage != '[]') ||
+          (steps.find_issues.outputs.issues_to_triage != '' && steps.find_issues.outputs.issues_to_triage != '[]')
         uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31' # ratchet:google-github-actions/run-gemini-cli@v0
-        id: 'gemini_standard_issue_analysis'
+        id: 'gemini_issue_analysis'
         env:
           GITHUB_TOKEN: '' # Do not pass any auth token here since this runs on untrusted inputs
+          ISSUES_TO_TRIAGE: '${{ steps.get_issue_from_event.outputs.issues_to_triage || steps.find_issues.outputs.issues_to_triage }}'
           REPOSITORY: '${{ github.repository }}'
           AVAILABLE_LABELS: '${{ steps.get_labels.outputs.available_labels }}'
-          GEMINI_CLI_TRUST_WORKSPACE: 'true'
-          GEMINI_EXP: 'gemini_exp.json'
-          GEMINI_STRICT_TELEMETRY_LIMITS: 'true'
         with:
           gcp_workload_identity_provider: '${{ vars.GCP_WIF_PROVIDER }}'
           gcp_project_id: '${{ vars.GOOGLE_CLOUD_PROJECT }}'
@@ -174,8 +120,7 @@ jobs:
             {
               "maxSessionTurns": 25,
               "coreTools": [
-                "run_shell_command(echo)",
-                "read_file"
+                "run_shell_command(echo)"
               ],
               "telemetry": {
                 "enabled": true,
@@ -191,16 +136,14 @@ jobs:
 
             ## Steps
 
-            1. You are only able to use the echo and read_file commands. Review the available labels in the environment variable: "${AVAILABLE_LABELS}".
-            2. Use the read_file tool to read the file "standard_issues_to_triage.json" which contains the JSON array of issues to triage.
-            3. Review the issue title, body and any comments provided in the JSON file.
-            4. Identify the most relevant labels from the existing labels, specifically focusing on area/*, kind/*, and priority/*.
+            1. You are only able to use the echo command. Review the available labels in the environment variable: "${AVAILABLE_LABELS}".
+            2. Check environment variable for issues to triage: $ISSUES_TO_TRIAGE (JSON array of issues)
+            3. Review the issue title, body and any comments provided in the environment variables.
+            4. Identify the most relevant labels from the existing labels, specifically focusing on area/*, kind/* and priority/*.
             5. Label Policy:
                - If the issue already has a kind/ label, do not change it.
-               - If the issue has exactly ONE priority/ label, do not change it.
-               - If the issue is missing a priority/ label, OR if the issue currently has MULTIPLE priority/ labels, you must evaluate the issue's impact to determine exactly ONE priority level (priority/p0, priority/p1, priority/p2, priority/p3, or priority/unknown) based the guidelines. If you are fixing an issue with multiple priority/ labels, put the correct one in `labels_to_add` and put all the incorrect ones in `labels_to_remove`.
-               - If the issue has exactly ONE area/ label, do not change it.
-               - If the issue is missing an area/ label, OR if the issue currently has MULTIPLE area/ labels, select exactly ONE area/ label that best fits the issue. Issues MUST NOT have multiple area/ labels. If you are fixing an issue with multiple area/ labels, put the correct one in `labels_to_add` and put all the incorrect ones in `labels_to_remove`.
+               - If the issue already has a priority/ label, do not change it.
+               - If the issue already has an area/ label, do not change it.
                - If any of these are missing, select exactly ONE appropriate label for the missing category.
             6. Identify other applicable labels based on the issue content, such as status/*, help wanted, good first issue, etc.
             7. Give me a single short explanation about why you are selecting each label in the process.
@@ -231,121 +174,11 @@ jobs:
               - Do not add comments or modify the issue content.
               - Do not remove the following labels maintainer, help wanted or good first issue.
               - Triage only the current issue.
-              - Identify exactly ONE area/ label. Do NOT assign multiple area/ labels to a single issue.
+              - Identify only one area/ label.
               - Identify only one kind/ label (Do not apply kind/duplicate or kind/parent-issue)
-              - Identify exactly ONE priority/ label. Do NOT assign multiple priority/ labels to a single issue.
+              - Identify only one priority/ label.
               - Once you categorize the issue if it needs information bump down the priority by 1 eg.. a p0 would become a p1 a p1 would become a p2. P2 and P3 can stay as is in this scenario.
 
-            Categorization Guidelines (Priority):
-            P0 - Urgent Blocking Issues:
-              - Definition: Critical failures breaking core functionality for a large portion of users. Examples: CLI fails to launch globally, core commands (gemini run) crash on valid input, unhandled promise rejections on boot, critical security vulnerability.
-              - Note: You must apply status/manual-triage instead of priority/p0.
-            P1 - Critical but Workable:
-              - Definition: Severe issues without a reasonable workaround, significantly degrading the developer experience but not globally blocking. Examples: Specific tools failing consistently (e.g., `web_search` returns 500s), persistent PTY streaming hangs, memory leaks leading to OOM after short use.
-            P2 - Significant Issues:
-              - Definition: Affect some workflows but a clear workaround exists, or non-critical bugs. Examples: Theme flickering, confusing error messages, minor UI misalignment, failing to read deeply nested config files correctly.
-            P3 - Minor/Enhancements:
-              - Definition: Trivial bugs, typos, documentation requests, or feature requests.
-
-            Categorization Guidelines (Kind):
-            kind/bug: The issue is describing an unexpected behavior or failure in the application.
-            kind/enhancement: The issue is describing a feature request or an improvement to an existing feature.
-            kind/question: The issue is asking a question about how to use the CLI or about a specific feature.
-
-            Categorization Guidelines (Area):
-            area/agent: The "brain" of the CLI. Core agent logic, model quality, tool/function calling, memory, web search, generated code quality, sub-agents.
-            area/core: The fundamental CLI app. UI/UX, installation, OS compatibility, performance, command parsing, theming, flickering.
-            area/documentation: Website docs, READMEs, inline help text.
-            area/enterprise: Telemetry, Policy, Quota / Licensing
-            area/extensions: Gemini CLI extensions capability
-            area/non-interactive: GitHub Actions, SDK, 3P Integrations, Shell Scripting, Command line automation
-            area/platform: Platform specific behavior
-            area/security: Authentication, authorization, privacy, data leaks, credential storage.
-
-      - name: 'Stop Telemetry Collector'
-        if: |-
-          steps.find_issues.outputs.has_effort_issues == 'true'
-        run: 'docker rm -f gemini-telemetry-collector || true'
-
-      - name: 'Run Effort Triage Analysis'
-        if: |-
-          steps.find_issues.outputs.has_effort_issues == 'true'
-        uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31' # ratchet:google-github-actions/run-gemini-cli@v0
-        id: 'gemini_effort_issue_analysis'
-        env:
-          GITHUB_TOKEN: '' # Do not pass any auth token here since this runs on untrusted inputs
-          REPOSITORY: '${{ github.repository }}'
-          AVAILABLE_LABELS: '${{ steps.get_labels.outputs.available_labels }}'
-          GEMINI_CLI_TRUST_WORKSPACE: 'true'
-          GEMINI_EXP: 'gemini_exp.json'
-          GEMINI_STRICT_TELEMETRY_LIMITS: 'true'
-        with:
-          gcp_workload_identity_provider: '${{ vars.GCP_WIF_PROVIDER }}'
-          gcp_project_id: '${{ vars.GOOGLE_CLOUD_PROJECT }}'
-          gcp_location: '${{ vars.GOOGLE_CLOUD_LOCATION }}'
-          gcp_service_account: '${{ vars.SERVICE_ACCOUNT_EMAIL }}'
-          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
-          use_vertex_ai: '${{ vars.GOOGLE_GENAI_USE_VERTEXAI }}'
-          use_gemini_code_assist: '${{ vars.GOOGLE_GENAI_USE_GCA }}'
-          settings: |-
-            {
-              "maxSessionTurns": 25,
-              "coreTools": [
-                "run_shell_command(echo)",
-                "grep_search",
-                "glob",
-                "read_file"
-              ],
-              "telemetry": {
-                "enabled": true,
-                "target": "gcp"
-              }
-            }
-          prompt: |-
-            ## Role
-
-            You are an expert software architect. Analyze the provided GitHub issues and assign the correct `effort/*` label based on the codebase complexity.
-
-            ## Steps
-
-            1. Use the read_file tool to read "effort_issues_to_triage.json".
-            2. For each issue in the array:
-               - You must evaluate the architectural complexity to determine the effort level. You MUST NOT guess the root cause. You MUST actively use your codebase search tools (grep_search and glob) to search for keywords from the issue and explore the codebase. You must identify the specific files and components involved before deciding the effort.
-            3. Output a JSON array of objects, each containing the issue number and the effort label to add, along with an explanation and an effort_analysis field. This effort_analysis must be highly detailed, technical, and empirical. It MUST NOT contain vague guesses (e.g., avoid words like "likely points to" or "possibly"). You must explicitly cite the specific file paths and architectural mechanisms you discovered using your search tools, explain the root cause, and then explicitly state how that complexity maps to the chosen effort level guidelines. For example:
-               ```
-               [
-                 {
-                   "issue_number": 123,
-                   "labels_to_add": ["effort/small"],
-                   "explanation": "This is a simple logic fix.",
-                   "effort_analysis": "The `vscode-ide-companion` extension indiscriminately tracks active text editors via `vscode.window.onDidChangeActiveTextEditor` in `open-files-manager.ts`. When a user opens `.vscode/settings.json`, its content is sent to the CLI's context. The fix is highly localized to the VS Code companion extension's event listener. It involves adding a simple conditional check to exclude specific configuration files from the active editor tracking logic, which is a trivial logic adjustment with a clear root cause."
-                 }
-               ]
-               ```
-
-            ## Guidelines
-
-            - Output only valid JSON format
-            - Do not include any explanation or additional text, just the JSON
-            - Triage only the current issue.
-
-            Categorization Guidelines (Effort):
-            effort/small (1 day or less):
-              - Trivial Logic & Config: Schema updates (Zod), feature flag toggles, adding missing fields to package.json or settings.json.
-              - UI/Aesthetic Adjustments: Fixing minor layout bugs in Ink components (e.g., adding flexShrink, correcting padding in a single Box), text color changes.
-              - Documentation & Strings: Typos, log message updates, CLI argument descriptions.
-              - Localized Bug Fixes: Single-file logic errors, straightforward promise rejections (e.g., wrapping a known failure in a try/catch), simple regex or string parsing fixes.
-            effort/medium (2-3 days):
-              - React/Ink State Management: Debugging useState/useEffect/useReducer bugs, component lifecycle issues (memory leaks in the UI), terminal redraw flickering, or state synchronization between the CLI's internal input buffer and the interactive React components.
-              - Asynchronous Flow & Integration: Resolving complex Promise chains, ERR_STREAM_PREMATURE_CLOSE, debugging IDE companion extensions (VS Code, Android Studio) or resolving hanging HTTP requests/IPC between the CLI and external plugins, timeouts in non-interactive/ACP modes.
-              - Tooling & Output Parsers: Modifying how tools parse streaming stdout/stderr buffers, adding new built-in tools that don't require native bindings.
-              - Cross-Component Refactors: Changes that span across packages/cli and packages/core to pass new data models or telemetry state.
-            effort/large (3+ days):
-              - Platform-Specific Complexities (PTY/Signals): Any issue involving node-pty, child_process.spawn, OS-level shell behavior (Windows vs Linux vs macOS), pseudo-terminal exhaustion (ENXIO), raw mode terminal desyncs, or POSIX signal forwarding (SIGINT/SIGTERM).
-              - Core Architecture & Protocols: Refactoring the Scheduler, Agent-to-Agent (A2A) protocol implementation, low-level MCP (Model Context Protocol) transport mechanisms.
-              - Performance & Memory: Diagnosing massive disk/memory leaks, severe boot time regressions, high-throughput streaming optimizations (e.g., voice streaming pipelines).
-            Note: Any bug that is described as intermittent, flickering, difficult to reproduce, platform-specific, or requiring cross-environment setups (e.g., involving the VS Code IDE companion, GCA plugin, or Android Studio) MUST NOT be rated as effort/small because of the increased overhead of testing and reproducing.
-
             Categorization Guidelines (Priority):
             P0 - Urgent Blocking Issues:
               - DO NOT APPLY THIS LABEL AUTOMATICALLY. Use status/manual-triage instead.
@@ -383,64 +216,64 @@ jobs:
             - This product is designed to use different models eg.. using pro, downgrading to flash etc.
             - When users report that they dont expect the model to change those would be categorized as feature requests.
 
-      - name: 'Apply Standard Labels to Issues'
+      - name: 'Apply Labels to Issues'
         if: |-
-          ${{ steps.gemini_standard_issue_analysis.outcome == 'success' &&
-              steps.gemini_standard_issue_analysis.outputs.summary != '[]' &&
-              steps.gemini_standard_issue_analysis.outputs.summary != '' }}
+          ${{ steps.gemini_issue_analysis.outcome == 'success' &&
+              steps.gemini_issue_analysis.outputs.summary != '[]' }}
         env:
           REPOSITORY: '${{ github.repository }}'
-          LABELS_OUTPUT: '${{ steps.gemini_standard_issue_analysis.outputs.summary }}'
+          LABELS_OUTPUT: '${{ steps.gemini_issue_analysis.outputs.summary }}'
         uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
         with:
           github-token: '${{ steps.generate_token.outputs.token }}'
           script: |-
-            const applyLabels = require('./.github/scripts/apply-issue-labels.cjs');
-            await applyLabels({ github, context, core });
+            const rawLabels = process.env.LABELS_OUTPUT;
+            core.info(`Raw labels JSON: ${rawLabels}`);
+            let parsedLabels;
+            try {
+              const jsonMatch = rawLabels.match(/```json\s*([\s\S]*?)\s*```/);
+              if (!jsonMatch || !jsonMatch[1]) {
+                throw new Error("Could not find a ```json ... ``` block in the output.");
+              }
+              const jsonString = jsonMatch[1].trim();
+              parsedLabels = JSON.parse(jsonString);
+              core.info(`Parsed labels JSON: ${JSON.stringify(parsedLabels)}`);
+            } catch (err) {
+              core.setFailed(`Failed to parse labels JSON from Gemini output: ${err.message}\nRaw output: ${rawLabels}`);
+              return;
+            }
 
-      - name: 'Apply Effort Labels to Issues'
-        if: |-
-          ${{ steps.gemini_effort_issue_analysis.outcome == 'success' &&
-              steps.gemini_effort_issue_analysis.outputs.summary != '[]' &&
-              steps.gemini_effort_issue_analysis.outputs.summary != '' }}
-        env:
-          REPOSITORY: '${{ github.repository }}'
-          LABELS_OUTPUT: '${{ steps.gemini_effort_issue_analysis.outputs.summary }}'
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
-        with:
-          github-token: '${{ steps.generate_token.outputs.token }}'
-          script: |-
-            const applyLabels = require('./.github/scripts/apply-issue-labels.cjs');
-            await applyLabels({ github, context, core });
+            for (const entry of parsedLabels) {
+              const issueNumber = entry.issue_number;
+              if (!issueNumber) {
+                core.info(`Skipping entry with no issue number: ${JSON.stringify(entry)}`);
+                continue;
+              }
 
-      - name: 'Sync Issue Types (Post-Analysis)'
-        if: |-
-          always() && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
-        with:
-          github-token: '${{ steps.generate_token.outputs.token }}'
-          script: |-
-            const syncIssueTypes = require('./.github/scripts/sync-issue-types.cjs');
-            await syncIssueTypes({ github, context, core });
+              const labelsToAdd = entry.labels_to_add || [];
+              labelsToAdd.push('status/bot-triaged');
 
-      - name: 'Find Triaged Issues to Clean Up'
-        if: |-
-          always() && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
-        env:
-          GITHUB_TOKEN: '${{ steps.generate_token.outputs.token }}'
-          GITHUB_REPOSITORY: '${{ github.repository }}'
-        run: |-
-          set -euo pipefail
-          echo '🧹 Finding issues that have both bot-triaged and need-triage labels...'
-          gh issue list --repo "${GITHUB_REPOSITORY}" \
-            --search 'is:open is:issue label:status/bot-triaged label:status/need-triage' --limit 50 --json number > issues_to_cleanup.json
+              if (labelsToAdd.length > 0) {
+                await github.rest.issues.addLabels({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number: issueNumber,
+                  labels: labelsToAdd
+                });
+                const explanation = entry.explanation ? ` - ${entry.explanation}` : '';
+                core.info(`Successfully added labels for #${issueNumber}: ${labelsToAdd.join(', ')}${explanation}`);
+              }
 
-      - name: 'Clean Up Triage Labels'
-        if: |-
-          always() && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
-        with:
-          github-token: '${{ steps.generate_token.outputs.token }}'
-          script: |-
-            const cleanupLabels = require('./.github/scripts/cleanup-triage-labels.cjs');
-            await cleanupLabels({ github, context, core });
+              if (entry.explanation) {
+                await github.rest.issues.createComment({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number: issueNumber,
+                  body: entry.explanation,
+                });
+              }
+
+              if ((!entry.labels_to_add || entry.labels_to_add.length === 0) && (!entry.labels_to_remove || entry.labels_to_remove.length === 0)) {
+                core.info(`No labels to add or remove for #${issueNumber}, leaving as is`);
+              }
+            }

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

@@ -21,8 +21,6 @@ jobs:
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          persist-credentials: false
 
       - name: 'Generate GitHub App Token'
         id: 'generate_token'

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

@@ -19,8 +19,6 @@ jobs:
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
-        with:
-          persist-credentials: false
 
       - name: 'Setup Node.js'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
@@ -43,8 +41,6 @@ jobs:
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
-        with:
-          persist-credentials: false
 
       - name: 'Setup Node.js'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4

.github/workflows/links.yml

@@ -17,8 +17,6 @@ jobs:
     runs-on: 'ubuntu-latest'
     steps:
       - uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          persist-credentials: false
 
       - name: 'Link Checker'
         id: 'lychee'

.github/workflows/memory-nightly.yml

@@ -16,8 +16,6 @@ jobs:
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          persist-credentials: false
 
       - name: 'Set up Node.js'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4

.github/workflows/perf-nightly.yml

@@ -16,8 +16,6 @@ jobs:
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          persist-credentials: false
 
       - name: 'Set up Node.js'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4

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

@@ -44,7 +44,6 @@ jobs:
         with:
           ref: '${{ github.ref }}'
           fetch-depth: 0
-          persist-credentials: false
 
       - name: 'Setup Node.js'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020'

.github/workflows/release-manual.yml

@@ -65,13 +65,11 @@ jobs:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
         with:
-          persist-credentials: false
           fetch-depth: 0
 
       - name: 'Checkout Release Code'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
         with:
-          persist-credentials: false
           ref: '${{ github.event.inputs.ref }}'
           path: 'release'
           fetch-depth: 0

.github/workflows/release-nightly.yml

@@ -50,13 +50,11 @@ jobs:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
         with:
-          persist-credentials: false
           fetch-depth: 0
 
       - name: 'Checkout Release Code'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
         with:
-          persist-credentials: false
           ref: '${{ github.event.inputs.ref }}'
           path: 'release'
           fetch-depth: 0

.github/workflows/release-notes.yml

@@ -31,7 +31,6 @@ jobs:
       - name: 'Checkout repository'
         uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
         with:
-          persist-credentials: false
           # The user-level skills need to be available to the workflow
           fetch-depth: 0
           ref: 'main'

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

@@ -17,7 +17,6 @@ jobs:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
         with:
-          persist-credentials: false
           fetch-depth: 1
 
       - name: 'Slash Command Dispatch'

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

@@ -54,7 +54,6 @@ jobs:
         with:
           ref: '${{ github.event.inputs.ref }}'
           fetch-depth: 0
-          persist-credentials: false
 
       - name: 'Setup Node.js'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4

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

@@ -64,7 +64,6 @@ jobs:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
         with:
-          persist-credentials: false
           ref: "${{ github.event.inputs.workflow_ref || 'main' }}"
           fetch-depth: 1
 

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

@@ -53,14 +53,12 @@ jobs:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
         with:
-          persist-credentials: false
           fetch-depth: 0
           fetch-tags: true
 
       - name: 'Checkout Release Code'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
         with:
-          persist-credentials: false
           ref: '${{ github.event.inputs.release_ref }}'
           path: 'release'
           fetch-depth: 0

.github/workflows/release-promote.yml

@@ -55,7 +55,6 @@ jobs:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
         with:
-          persist-credentials: false
           fetch-depth: 0
           fetch-tags: true
 
@@ -172,13 +171,11 @@ jobs:
       - name: 'Checkout Ref'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
         with:
-          persist-credentials: false
           ref: '${{ github.event.inputs.ref }}'
 
       - name: 'Checkout correct SHA'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
         with:
-          persist-credentials: false
           ref: '${{ matrix.sha }}'
           path: 'release'
           fetch-depth: 0
@@ -219,13 +216,11 @@ jobs:
       - name: 'Checkout Ref'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
         with:
-          persist-credentials: false
           ref: '${{ github.event.inputs.ref }}'
 
       - name: 'Checkout correct SHA'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
         with:
-          persist-credentials: false
           ref: '${{ needs.calculate-versions.outputs.PREVIEW_SHA }}'
           path: 'release'
           fetch-depth: 0
@@ -293,13 +288,11 @@ jobs:
       - name: 'Checkout Ref'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
         with:
-          persist-credentials: false
           ref: '${{ github.event.inputs.ref }}'
 
       - name: 'Checkout correct SHA'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
         with:
-          persist-credentials: false
           ref: '${{ needs.calculate-versions.outputs.STABLE_SHA }}'
           path: 'release'
           fetch-depth: 0
@@ -367,7 +360,6 @@ jobs:
       - name: 'Checkout Ref'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
         with:
-          persist-credentials: false
           ref: '${{ github.event.inputs.ref }}'
 
       - name: 'Setup Node.js'
@@ -403,7 +395,6 @@ jobs:
           BRANCH_NAME: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
           DRY_RUN: '${{ github.event.inputs.dry_run }}'
           NEEDS_CALCULATE_VERSIONS_OUTPUTS_NEXT_NIGHTLY_VERSION: '${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}'
-          GIT_PUSH_TOKEN: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
         run: |-
           git add package.json packages/*/package.json
           if [ -f package-lock.json ]; then
@@ -412,7 +403,7 @@ jobs:
           git commit -m "chore(release): bump version to ${NEEDS_CALCULATE_VERSIONS_OUTPUTS_NEXT_NIGHTLY_VERSION}"
           if [[ "${DRY_RUN}" == "false" ]]; then
             echo "Pushing release branch to remote..."
-            git push "https://x-access-token:${GIT_PUSH_TOKEN}@github.com/${{ github.repository }}.git" "HEAD:${BRANCH_NAME}" --follow-tags
+            git push --set-upstream origin "${BRANCH_NAME}"
           else
             echo "Dry run enabled. Skipping push."
           fi

.github/workflows/release-rollback.yml

@@ -52,7 +52,6 @@ jobs:
       - name: 'Checkout repository'
         uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v4
         with:
-          persist-credentials: false
           ref: '${{ github.event.inputs.ref }}'
           fetch-depth: 0
 
@@ -193,7 +192,7 @@ jobs:
         run: |
           echo "ROLLBACK_TAG=$ROLLBACK_TAG_NAME" >> "$GITHUB_OUTPUT"
           git tag "$ROLLBACK_TAG_NAME" "${ORIGIN_HASH}"
-          git push "https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git" --tags
+          git push origin --tags
 
       - name: 'Verify Rollback Tag Added'
         if: "${{ github.event.inputs.dry-run == 'false' }}"

.github/workflows/release-sandbox.yml

@@ -26,7 +26,6 @@ jobs:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
         with:
-          persist-credentials: false
           ref: '${{ github.event.inputs.ref || github.sha }}'
           fetch-depth: 0
       - name: 'Push'

.github/workflows/smoke-test.yml

@@ -32,7 +32,6 @@ jobs:
         with:
           ref: '${{ github.event.inputs.ref || github.sha }}'
           fetch-depth: 0
-          persist-credentials: false
       - name: 'Install Dependencies'
         run: 'npm ci'
       - name: 'Build bundle'

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

@@ -34,8 +34,6 @@ jobs:
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5' # ratchet:actions/checkout@v4
-        with:
-          persist-credentials: false
 
       - name: 'Optimize Windows Performance'
         if: "matrix.os == 'windows-latest'"

.github/workflows/verify-release.yml

@@ -44,8 +44,6 @@ jobs:
         shell: 'bash'
         run: 'echo "${{ toJSON(vars) }}"'
       - uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
-        with:
-          persist-credentials: false
       - name: 'Verify release'
         uses: './.github/actions/verify-release'
         with:

.vscode/launch.json

@@ -43,13 +43,9 @@
     {
       "type": "node",
       "request": "launch",
-      "name": "CLI: Run Current File",
-      "runtimeExecutable": "node",
-      "runtimeArgs": ["--import", "tsx"],
+      "name": "Launch Program",
       "skipFiles": ["<node_internals>/**"],
       "program": "${file}",
-      "cwd": "${workspaceFolder}",
-      "console": "integratedTerminal",
       "outFiles": ["${workspaceFolder}/**/*.js"]
     },
     {

docs/changelogs/index.md

@@ -18,20 +18,6 @@ on GitHub.
 | [Preview](preview.md) | Experimental features ready for early feedback. |
 | [Stable](latest.md)   | Stable, recommended for general use.            |
 
-## Announcements: v0.41.0 - 2026-05-05
-
-- **Real-time Voice Mode:** Implemented real-time voice mode with cloud and
-  local backends
-  ([#24174](https://github.com/google-gemini/gemini-cli/pull/24174) by
-  @Abhijit-2592).
-- **Secure Environment Loading:** Enforced workspace trust and secured .env
-  loading in headless mode
-  ([#25814](https://github.com/google-gemini/gemini-cli/pull/25814) by
-  @ehedlund).
-- **Advanced Shell Validation:** Enhanced shell command validation and added
-  core tools allowlist for improved security
-  ([#25720](https://github.com/google-gemini/gemini-cli/pull/25720) by @galz10).
-
 ## Announcements: v0.40.0 - 2026-04-28
 
 - **Offline Search and Themes:** Bundled ripgrep for offline search support and

docs/changelogs/latest.md

@@ -1,6 +1,6 @@
-# Latest stable release: v0.41.0
+# Latest stable release: v0.40.0
 
-Released: May 05, 2026
+Released: April 28, 2026
 
 For most users, our latest stable release is the recommended release. Install
 the latest stable version with:
@@ -11,119 +11,177 @@ npm install -g @google/gemini-cli
 
 ## Highlights
 
-- **Real-time Voice Mode:** Introduced support for real-time voice interaction
-  with both cloud-based and local processing backends.
-- **Enhanced Security:** Implemented mandatory workspace trust for headless
-  environments and secured the loading of `.env` configuration files.
-- **Advanced Shell Validation:** Added a robust shell command validation layer
-  and a core tools allowlist to prevent unauthorized execution.
-- **Improved Context Management:** Integrated a new `ContextManager` and
-  `AgentChatHistory` to provide more reliable and efficient session handling.
-- **Auto-Memory Persistence:** Enabled the persistence of the auto-memory
-  scratchpad, allowing for seamless skill extraction across turns.
+- **Offline Search Support:** Bundled ripgrep binaries into the Single
+  Executable Application (SEA) to enable powerful codebase searching even in
+  environments without internet access.
+- **Enhanced Theme Customization:** Introduced GitHub-style colorblind-friendly
+  themes to improve accessibility and provide more personalized visual options.
+- **MCP Resource Management:** Added new tools for listing and reading Model
+  Context Protocol (MCP) resources, enhancing the agent's ability to discover
+  and utilize external data.
+- **Improved Narrative Flow:** Enabled topic update narrations by default to
+  provide better session structure and a clearer understanding of the agent's
+  current focus.
+- **Streamlined Local Model Setup:** Introduced a simplified `gemini gemma`
+  command for quickly setting up and running Gemma models locally.
+- **Prompt-Driven Memory Management:** Replaced the legacy `MemoryManagerAgent`
+  with a more efficient prompt-driven memory editing system across four tiers of
+  context.
 
 ## What's Changed
 
-- chore(release): bump version to 0.41.0-nightly.20260423.gaa05b4583 by
+- chore(release): bump version to 0.40.0-nightly.20260414.g5b1f7375a by
   @gemini-cli-robot in
-  [#25847](https://github.com/google-gemini/gemini-cli/pull/25847)
-- fix(core): only show `list` suggestion if the partial input is empty by
+  [#25420](https://github.com/google-gemini/gemini-cli/pull/25420)
+- Fix(core): retry additional OpenSSL 3.x SSL errors during streaming (#16075)
+  by @rcleveng in
+  [#25187](https://github.com/google-gemini/gemini-cli/pull/25187)
+- fix(core): prevent YOLO mode from being downgraded by @galz10 in
+  [#25341](https://github.com/google-gemini/gemini-cli/pull/25341)
+- feat: bundle ripgrep binaries into SEA for offline support by @scidomino in
+  [#25342](https://github.com/google-gemini/gemini-cli/pull/25342)
+- Changelog for v0.39.0-preview.0 by @gemini-cli-robot in
+  [#25417](https://github.com/google-gemini/gemini-cli/pull/25417)
+- feat(test): add large conversation scenario for performance test by
   @cynthialong0-0 in
-  [#25821](https://github.com/google-gemini/gemini-cli/pull/25821)
-- feat(cli): secure .env loading and enforce workspace trust in headless mode by
-  @ehedlund in [#25814](https://github.com/google-gemini/gemini-cli/pull/25814)
-- fix: fatal hard-crash on loop detection via unhandled AbortError by @hsm207 in
-  [#20108](https://github.com/google-gemini/gemini-cli/pull/20108)
-- update package-lock.json by @ehedlund in
-  [#25876](https://github.com/google-gemini/gemini-cli/pull/25876)
-- feat(core): enhance shell command validation and add core tools allowlist by
-  @galz10 in [#25720](https://github.com/google-gemini/gemini-cli/pull/25720)
-- fix(ui): corrected background color check in user message components by
-  @devr0306 in [#25880](https://github.com/google-gemini/gemini-cli/pull/25880)
-- perf(core): fix slow boot by fetching experiments and quota asynchronously by
-  @spencer426 in
-  [#25758](https://github.com/google-gemini/gemini-cli/pull/25758)
-- feat(core,cli): add support for Gemma 4 models (experimental) by @Abhijit-2592
-  in [#25604](https://github.com/google-gemini/gemini-cli/pull/25604)
-- update FatalUntrustedWorkspaceError message to include doc link by @ehedlund
-  in [#25874](https://github.com/google-gemini/gemini-cli/pull/25874)
-- docs: add Gemini CLI course link to README by @JayadityaGit in
-  [#25925](https://github.com/google-gemini/gemini-cli/pull/25925)
-- feat(repo): add gemini-cli-bot metrics and workflows by @gundermanc in
-  [#25888](https://github.com/google-gemini/gemini-cli/pull/25888)
-- fix(cli): allow output redirection for cli commands by @spencer426 in
-  [#25894](https://github.com/google-gemini/gemini-cli/pull/25894)
-- fix(core): fail closed in YOLO mode when shell parsing fails for restricted
-  rules by @ehedlund in
-  [#25935](https://github.com/google-gemini/gemini-cli/pull/25935)
-- fix(cli-ui): revert backspace handling to fix Windows regression by @scidomino
-  in [#25941](https://github.com/google-gemini/gemini-cli/pull/25941)
-- feat(voice): implement real-time voice mode with cloud and local backends by
-  @Abhijit-2592 in
-  [#24174](https://github.com/google-gemini/gemini-cli/pull/24174)
-- Changelog for v0.39.0 by @gemini-cli-robot in
-  [#25848](https://github.com/google-gemini/gemini-cli/pull/25848)
-- feat(memory): persist auto-memory scratchpad for skill extraction by
+  [#25331](https://github.com/google-gemini/gemini-cli/pull/25331)
+- improve(core): require recurrence evidence before extracting skills by
   @SandyTao520 in
-  [#25873](https://github.com/google-gemini/gemini-cli/pull/25873)
-- fix(cli): add missing response key to custom theme text schema by @gaurav0107
-  in [#25822](https://github.com/google-gemini/gemini-cli/pull/25822)
-- fix(cli): provide manual update command when automatic update fails by
+  [#25147](https://github.com/google-gemini/gemini-cli/pull/25147)
+- test(evals): add subagent delegation evaluation tests by @anj-s in
+  [#24619](https://github.com/google-gemini/gemini-cli/pull/24619)
+- feat: add github colorblind themes by @Z1xus in
+  [#15504](https://github.com/google-gemini/gemini-cli/pull/15504)
+- fix(core): honor GOOGLE_GEMINI_BASE_URL and GOOGLE_VERTEX_BASE_URL by
+  @chrisjcthomas in
+  [#25357](https://github.com/google-gemini/gemini-cli/pull/25357)
+- fix(cli): clean up slash command IDE listeners by @jasonmatthewsuhari in
+  [#24397](https://github.com/google-gemini/gemini-cli/pull/24397)
+- Changelog for v0.38.0 by @gemini-cli-robot in
+  [#25470](https://github.com/google-gemini/gemini-cli/pull/25470)
+- fix(evals): update eval tests for invoke_agent telemetry and project-scoped
+  memory by @SandyTao520 in
+  [#25502](https://github.com/google-gemini/gemini-cli/pull/25502)
+- Changelog for v0.38.1 by @gemini-cli-robot in
+  [#25476](https://github.com/google-gemini/gemini-cli/pull/25476)
+- feat(core): integrate skill-creator into skill extraction agent by
+  @SandyTao520 in
+  [#25421](https://github.com/google-gemini/gemini-cli/pull/25421)
+- feat(cli): provide default post-submit prompt for skill command by @ruomengz
+  in [#25327](https://github.com/google-gemini/gemini-cli/pull/25327)
+- feat(core): add tools to list and read MCP resources by @ruomengz in
+  [#25395](https://github.com/google-gemini/gemini-cli/pull/25395)
+- fix(evals): add typecheck coverage for evals, integration-tests, and
+  memory-tests by @SandyTao520 in
+  [#25480](https://github.com/google-gemini/gemini-cli/pull/25480)
+- Use OSC 777 for terminal notifications by @jackyliuxx in
+  [#25300](https://github.com/google-gemini/gemini-cli/pull/25300)
+- fix(extensions): fix bundling for examples by @abhipatel12 in
+  [#25542](https://github.com/google-gemini/gemini-cli/pull/25542)
+- fix(cli): reset plan session state on /clear by @jasonmatthewsuhari in
+  [#25515](https://github.com/google-gemini/gemini-cli/pull/25515)
+- feat(core): add .mdx support to get-internal-docs tool by @g-samroberts in
+  [#25090](https://github.com/google-gemini/gemini-cli/pull/25090)
+- docs(policy): mention that workspace policies are broken by @6112 in
+  [#24367](https://github.com/google-gemini/gemini-cli/pull/24367)
+- fix(core): allow explicit write permissions to override governance file
+  protections in sandboxes by @galz10 in
+  [#25338](https://github.com/google-gemini/gemini-cli/pull/25338)
+- feat(sandbox): resolve custom seatbelt profiles from $HOME/.gemini first by
+  @mvanhorn in [#25427](https://github.com/google-gemini/gemini-cli/pull/25427)
+- Reduce blank lines. by @gundermanc in
+  [#25563](https://github.com/google-gemini/gemini-cli/pull/25563)
+- fix(ui): revert preview theme on dialog unmount by @JayadityaGit in
+  [#22542](https://github.com/google-gemini/gemini-cli/pull/22542)
+- fix(core): fix ShellExecutionConfig spread and add ProjectRegistry save
+  backoff by @mahimashanware in
+  [#25382](https://github.com/google-gemini/gemini-cli/pull/25382)
+- feat(core): Disable topic updates for subagents by @gundermanc in
+  [#25567](https://github.com/google-gemini/gemini-cli/pull/25567)
+- feat(core): enable topic update narration by default and promote to general by
+  @gundermanc in
+  [#25586](https://github.com/google-gemini/gemini-cli/pull/25586)
+- docs: migrate installation and authentication to mdx with tabbed layouts by
+  @g-samroberts in
+  [#25155](https://github.com/google-gemini/gemini-cli/pull/25155)
+- feat(config): split memoryManager flag into autoMemory by @SandyTao520 in
+  [#25601](https://github.com/google-gemini/gemini-cli/pull/25601)
+- fix(core): allow Cloud Shell users to use PRO_MODEL_NO_ACCESS experiment by
+  @sehoon38 in [#25702](https://github.com/google-gemini/gemini-cli/pull/25702)
+- fix(cli): round slow render latency to avoid opentelemetry float warning by
+  @scidomino in [#25709](https://github.com/google-gemini/gemini-cli/pull/25709)
+- docs(tracker): introduce experimental task tracker feature by @anj-s in
+  [#24556](https://github.com/google-gemini/gemini-cli/pull/24556)
+- docs(cli): fix inconsistent system.md casing in system prompt docs by @Bodlux
+  in [#25414](https://github.com/google-gemini/gemini-cli/pull/25414)
+- feat(cli): add streamlined `gemini gemma` local model setup by @Samee24 in
+  [#25498](https://github.com/google-gemini/gemini-cli/pull/25498)
+- Changelog for v0.38.2 by @gemini-cli-robot in
+  [#25593](https://github.com/google-gemini/gemini-cli/pull/25593)
+- Fix: Disallow overriding IDE stdio via workspace .env (RCE) by @M0nd0R in
+  [#25022](https://github.com/google-gemini/gemini-cli/pull/25022)
+- feat(test): refactor the memory usage test to use metrics from CLI process
+  instead of test runner by @cynthialong0-0 in
+  [#25708](https://github.com/google-gemini/gemini-cli/pull/25708)
+- feat(vertex): add settings for Vertex AI request routing by @gordonhwc in
+  [#25513](https://github.com/google-gemini/gemini-cli/pull/25513)
+- Fix/allow for session persistence by @ahsanfarooq210 in
+  [#25176](https://github.com/google-gemini/gemini-cli/pull/25176)
+- Allow dots on GEMINI_API_KEY by @DKbyo in
+  [#25497](https://github.com/google-gemini/gemini-cli/pull/25497)
+- feat(telemetry): add flag for enabling traces specifically by @spencer426 in
+  [#25343](https://github.com/google-gemini/gemini-cli/pull/25343)
+- fix(core): resolve nested plan directory duplication and relative path
+  policies by @mahimashanware in
+  [#25138](https://github.com/google-gemini/gemini-cli/pull/25138)
+- feat: detect new files in @ recommendations with watcher based updates by
+  @prassamin in [#25256](https://github.com/google-gemini/gemini-cli/pull/25256)
+- fix(cli): use newline in shell command wrapping to avoid breaking heredocs by
   @cocosheng-g in
-  [#26052](https://github.com/google-gemini/gemini-cli/pull/26052)
-- test(cli): add unit tests for restore ACP command (#23402) by @cocosheng-g in
-  [#26053](https://github.com/google-gemini/gemini-cli/pull/26053)
-- fix(ui): better error messages for ECONNRESET and ETIMEDOUT by @devr0306 in
-  [#26059](https://github.com/google-gemini/gemini-cli/pull/26059)
-- feat(core): wire up the new ContextManager and AgentChatHistory by @joshualitt
-  in [#25409](https://github.com/google-gemini/gemini-cli/pull/25409)
-- fix(cli): ensure sandbox proxy cleanup and remove handler leaks by @ehedlund
-  in [#26065](https://github.com/google-gemini/gemini-cli/pull/26065)
-- fix(cli): correct alternate buffer warning logic for JetBrains by @Adib234 in
-  [#26067](https://github.com/google-gemini/gemini-cli/pull/26067)
-- fix(cli): make MCP ping optional in list command and use configured timeout by
-  @cocosheng-g in
-  [#26068](https://github.com/google-gemini/gemini-cli/pull/26068)
-- fix(core): better error message for failed cloudshell-gca auth by @devr0306 in
-  [#26079](https://github.com/google-gemini/gemini-cli/pull/26079)
-- feat(cli): provide manual session UUID via command line arg by @cocosheng-g in
-  [#26060](https://github.com/google-gemini/gemini-cli/pull/26060)
-- Changelog for v0.40.0-preview.2 by @gemini-cli-robot in
-  [#25846](https://github.com/google-gemini/gemini-cli/pull/25846)
-- (docs) update sandboxing documentation by @g-samroberts in
-  [#25930](https://github.com/google-gemini/gemini-cli/pull/25930)
-- fix(core): enforce parallel task tracker updates by @anj-s in
-  [#24477](https://github.com/google-gemini/gemini-cli/pull/24477)
-- Update policy so transient errors are not marked terminal by @DavidAPierce in
-  [#26066](https://github.com/google-gemini/gemini-cli/pull/26066)
-- Implement bot that performs time-series metric analysis and suggests repo
-  management improvements by @gundermanc in
-  [#25945](https://github.com/google-gemini/gemini-cli/pull/25945)
-- fix(core): handle non-string model flags in resolution by @Adib234 in
-  [#26069](https://github.com/google-gemini/gemini-cli/pull/26069)
-- fix(ux): added error message for ENOTDIR by @devr0306 in
-  [#26128](https://github.com/google-gemini/gemini-cli/pull/26128)
-- Changelog for v0.40.0-preview.3 by @gemini-cli-robot in
-  [#25904](https://github.com/google-gemini/gemini-cli/pull/25904)
-- fix(cli): prevent ACP stdout pollution from SessionEnd hooks by @cocosheng-g
-  in [#26125](https://github.com/google-gemini/gemini-cli/pull/26125)
-- feat(cli): support boolean and number casting for env vars in settings.json by
-  @cocosheng-g in
-  [#26118](https://github.com/google-gemini/gemini-cli/pull/26118)
-- fix(cli): preserve Request headers in DevTools activity logger by @Adib234 in
-  [#26078](https://github.com/google-gemini/gemini-cli/pull/26078)
-- fix(patch): cherry-pick 2194da2 to release/v0.41.0-preview.0-pr-26153 to patch
-  version v0.41.0-preview.0 and create version 0.41.0-preview.1 by
+  [#25537](https://github.com/google-gemini/gemini-cli/pull/25537)
+- fix(cli): ensure theme dialog labels are rendered for all themes by
+  @JayadityaGit in
+  [#24599](https://github.com/google-gemini/gemini-cli/pull/24599)
+- fix(core): disable detached mode in Bun to prevent immediate SIGHUP of child
+  processes by @euxaristia in
+  [#22620](https://github.com/google-gemini/gemini-cli/pull/22620)
+- feat: add /new as alias for /clear and refine command description by @ved015
+  in [#17865](https://github.com/google-gemini/gemini-cli/pull/17865)
+- fix(cli): start auto memory in ACP sessions by @jasonmatthewsuhari in
+  [#25626](https://github.com/google-gemini/gemini-cli/pull/25626)
+- fix(core): remove duplicate initialize call on agents refreshed by
+  @adamfweidman in
+  [#25670](https://github.com/google-gemini/gemini-cli/pull/25670)
+- test(e2e): default integration tests to Flash Preview by @SandyTao520 in
+  [#25753](https://github.com/google-gemini/gemini-cli/pull/25753)
+- refactor(memory): replace MemoryManagerAgent with prompt-driven memory editing
+  across four tiers by @SandyTao520 in
+  [#25716](https://github.com/google-gemini/gemini-cli/pull/25716)
+- fix(cli): fix "/clear (new)" command by @mini2s in
+  [#25801](https://github.com/google-gemini/gemini-cli/pull/25801)
+- fix(core): use dynamic CLI version for IDE client instead of hardcoded '1.0.0'
+  by @thekishandev in
+  [#24414](https://github.com/google-gemini/gemini-cli/pull/24414)
+- fix(core): handle line endings in ignore file parsing by @xoma-zver in
+  [#23895](https://github.com/google-gemini/gemini-cli/pull/23895)
+- Fix/command injection shell by @Famous077 in
+  [#24170](https://github.com/google-gemini/gemini-cli/pull/24170)
+- fix(ui): removed background color for input by @devr0306 in
+  [#25339](https://github.com/google-gemini/gemini-cli/pull/25339)
+- fix(devtools): reduce memory usage and defer connection by @SandyTao520 in
+  [#24496](https://github.com/google-gemini/gemini-cli/pull/24496)
+- fix(core): support jsonl session logs in memory and summary services by
+  @SandyTao520 in
+  [#25816](https://github.com/google-gemini/gemini-cli/pull/25816)
+- fix(release): exclude ripgrep binaries from npm tarballs by @SandyTao520 in
+  [#25841](https://github.com/google-gemini/gemini-cli/pull/25841)
+- fix(patch): cherry-pick 048bf6e to release/v0.40.0-preview.3-pr-25941 to patch
+  version v0.40.0-preview.3 and create version 0.40.0-preview.4 by
   @gemini-cli-robot in
-  [#26269](https://github.com/google-gemini/gemini-cli/pull/26269)
-- fix(patch): cherry-pick 1d72a12 to release/v0.41.0-preview.1-pr-26479 to patch
-  version v0.41.0-preview.1 and create version 0.41.0-preview.2 by
-  @gemini-cli-robot in
-  [#26508](https://github.com/google-gemini/gemini-cli/pull/26508)
-- fix(patch): cherry-pick 7cc19c2 to release/v0.41.0-preview.2-pr-26507 to patch
-  version v0.41.0-preview.2 and create version 0.41.0-preview.3 by
-  @gemini-cli-robot in
-  [#26530](https://github.com/google-gemini/gemini-cli/pull/26530)
+  [#25942](https://github.com/google-gemini/gemini-cli/pull/25942)
+- fix(patch): cherry-pick 54b7586 to release/v0.40.0-preview.4-pr-26066
+  [CONFLICTS] by @gemini-cli-robot in
+  [#26124](https://github.com/google-gemini/gemini-cli/pull/26124)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.40.1...v0.41.0
+https://github.com/google-gemini/gemini-cli/compare/v0.39.1...v0.40.0

docs/changelogs/preview.md

@@ -1,6 +1,6 @@
-# Preview release: v0.42.0-preview.2
+# Preview release: v0.41.0-preview.0
 
-Released: May 06, 2026
+Released: April 28, 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,233 +13,109 @@ npm install -g @google/gemini-cli@preview
 
 ## Highlights
 
-- **Auto Memory Enhancements:** Introduced an Auto Memory inbox flow with a
-  canonical-patch contract for better memory management.
-- **Improved Voice Mode:** Added a wave animation, microphone icon updates, and
-  privacy/compliance UX warnings for the Gemini Live backend.
-- **New CLI Commands & Flags:** Added a `--delete` flag to the `/exit` command
-  for session deletion, a `list` subcommand to `/commands`, and a `/bug-memory`
-  command for heap snapshots.
-- **Expanded Model Support:** Gemma 4 models are now enabled by default via the
-  Gemini API.
-- **Enhanced Core Resilience:** Improved API resilience with reduced timeouts,
-  automatic retries for stream errors, and better handling of invalid stream
-  events.
+- **Real-Time Voice Mode:** Implemented a new real-time voice mode supporting
+  both cloud and local backends for a more interactive experience.
+- **Enhanced Security & Trust:** Enforced workspace trust in headless mode and
+  secured `.env` file loading to improve system integrity.
+- **Expanded Model Support:** Added experimental support for Gemma 4 models in
+  both core and CLI packages.
+- **Improved Core Infrastructure:** Wired up new `ContextManager` and
+  `AgentChatHistory` for better state management, and optimized boot performance
+  by fetching experiments and quota asynchronously.
+- **New Developer Tools & UX:** Added support for output redirection for CLI
+  commands, manual session UUIDs via command-line arguments, and persistent
+  auto-memory scratchpad for skill extraction.
 
 ## What's Changed
 
-- fix(cli): prevent automatic updates from switching to less stable channels in
-  [#26132](https://github.com/google-gemini/gemini-cli/pull/26132)
-- chore(release): bump version to 0.42.0-nightly.20260428.g59b2dea0e in
-  [#26142](https://github.com/google-gemini/gemini-cli/pull/26142)
-- fix(cli): pass node arguments via NODE_OPTIONS during relaunch to support SEA
-  in [#26130](https://github.com/google-gemini/gemini-cli/pull/26130)
-- fix(cli): handle DECKPAM keypad Enter sequences in terminal in
-  [#26092](https://github.com/google-gemini/gemini-cli/pull/26092)
-- docs(cli): point plan-mode session retention to actual /settings labels in
-  [#25978](https://github.com/google-gemini/gemini-cli/pull/25978)
-- fix(core): add missing oauth fields support in subagent parsing in
-  [#26141](https://github.com/google-gemini/gemini-cli/pull/26141)
-- fix(core): disconnect extension-backed MCP clients in stopExtension in
-  [#26136](https://github.com/google-gemini/gemini-cli/pull/26136)
-- Update documentation workflows with workspace trust in
-  [#26150](https://github.com/google-gemini/gemini-cli/pull/26150)
-- refactor(acp): modularize monolithic acpClient into specialized files in
-  [#26143](https://github.com/google-gemini/gemini-cli/pull/26143)
-- test: fix failures due to antigravity environment leakage in
-  [#26162](https://github.com/google-gemini/gemini-cli/pull/26162)
-- fix(core): add explicit empty log guard in A2A pushMessage in
-  [#26198](https://github.com/google-gemini/gemini-cli/pull/26198)
-- feat(cli): add --delete flag to /exit command for session deletion in
-  [#19332](https://github.com/google-gemini/gemini-cli/pull/19332)
-- test(core): add regression test for issue for ToolConfirmationResponse in
-  [#26194](https://github.com/google-gemini/gemini-cli/pull/26194)
-- Add the ability to @ mention the gemini robot. in
-  [#26207](https://github.com/google-gemini/gemini-cli/pull/26207)
-- test(evals): add EvalMetadata JSDoc annotations to older tests in
-  [#26147](https://github.com/google-gemini/gemini-cli/pull/26147)
-- fix(core): reduce default API timeout to 60s and enable retries for undici
-  timeouts in [#26191](https://github.com/google-gemini/gemini-cli/pull/26191)
-- fix(core): distinguish fallback chains and fix maxAttempts for auto vs
-  explicit model selection in
-  [#26163](https://github.com/google-gemini/gemini-cli/pull/26163)
-- fix(cli): handle InvalidStream event gracefully without throwing in
-  [#26218](https://github.com/google-gemini/gemini-cli/pull/26218)
-- ci(github-actions): switch to github app token and fix bot self-trigger in
-  [#26223](https://github.com/google-gemini/gemini-cli/pull/26223)
-- Respect logPrompts flag for logging sensitive fields in
-  [#26153](https://github.com/google-gemini/gemini-cli/pull/26153)
-- fix: correct API key validation logic in handleApiKeySubmit in
-  [#25453](https://github.com/google-gemini/gemini-cli/pull/25453)
-- fix(agent): prevent exit_plan_mode from being called via shell in
-  [#26230](https://github.com/google-gemini/gemini-cli/pull/26230)
-- # Fix: Inconsistent Case-Sensitivity in GrepTool in [#26235](https://github.com/google-gemini/gemini-cli/pull/26235)
-- docs(core): add automated gemma setup guide in
-  [#26233](https://github.com/google-gemini/gemini-cli/pull/26233)
-- Allow non-https proxy urls to support container environments in
-  [#26234](https://github.com/google-gemini/gemini-cli/pull/26234)
-- fix(bot): productivity and backlog optimizations in
-  [#26236](https://github.com/google-gemini/gemini-cli/pull/26236)
-- refactor(acp): delegate prompt turn processing logic to GeminiClient in
-  [#26222](https://github.com/google-gemini/gemini-cli/pull/26222)
-- fix(cli): refine platform-specific undo/redo and smart bubbling for WSL in
-  [#26202](https://github.com/google-gemini/gemini-cli/pull/26202)
-- fix: suppress duplicate extension warnings during startup in
-  [#26208](https://github.com/google-gemini/gemini-cli/pull/26208)
-- fix(cli): use byte length instead of string length for readStdin size limits
-  in [#26224](https://github.com/google-gemini/gemini-cli/pull/26224)
-- fix(ui): made shell tool header wrap on Ctrl+O in
-  [#26229](https://github.com/google-gemini/gemini-cli/pull/26229)
-- Changelog for v0.41.0-preview.0 in
-  [#26244](https://github.com/google-gemini/gemini-cli/pull/26244)
-- Skip binary CLI relaunch in
-  [#26261](https://github.com/google-gemini/gemini-cli/pull/26261)
-- fix(cli): do not override GOOGLE_CLOUD_PROJECT in Cloud Shell when using
-  Vertex AI in [#24455](https://github.com/google-gemini/gemini-cli/pull/24455)
-- docs(cli): add skill discovery troubleshooting checklist to tutorial in
-  [#26018](https://github.com/google-gemini/gemini-cli/pull/26018)
-- docs(policy-engine): link to tools reference for tool names and args in
-  [#22081](https://github.com/google-gemini/gemini-cli/pull/22081)
-- Fix posting invalid response to a comment in
-  [#26266](https://github.com/google-gemini/gemini-cli/pull/26266)
-- fix(cli): prevent informational logs from polluting json output in
-  [#26264](https://github.com/google-gemini/gemini-cli/pull/26264)
-- feat(ui): added microphone and updated placeholder for voice mode in
-  [#26270](https://github.com/google-gemini/gemini-cli/pull/26270)
-- feat(cli): Add 'list' subcommand to '/commands' in
-  [#22324](https://github.com/google-gemini/gemini-cli/pull/22324)
-- fix(core): ensure tool output cleanup on session deletion for legacy files in
-  [#26263](https://github.com/google-gemini/gemini-cli/pull/26263)
-- Docs: Update Agent Skills documentation in
-  [#22388](https://github.com/google-gemini/gemini-cli/pull/22388)
-- test(acp): add missing coverage for extensions command error paths in
-  [#25313](https://github.com/google-gemini/gemini-cli/pull/25313)
-- Changelog for v0.40.0 in
-  [#26245](https://github.com/google-gemini/gemini-cli/pull/26245)
-- fix: report AgentExecutionBlocked in non-interactive programmatic modes in
-  [#26262](https://github.com/google-gemini/gemini-cli/pull/26262)
-- feat(extensions): add 'delete' as an alias for /extensions uninstall in
-  [#25660](https://github.com/google-gemini/gemini-cli/pull/25660)
-- fix(core): silently skip GEMINI.md paths that are directories (EISDIR) in
-  [#25662](https://github.com/google-gemini/gemini-cli/pull/25662)
-- fix(ci): checkout PR branch instead of main in bot workflow in
-  [#26289](https://github.com/google-gemini/gemini-cli/pull/26289)
-- fix(cli): use resolved sandbox state for auto-update check in
-  [#26285](https://github.com/google-gemini/gemini-cli/pull/26285)
-- # Metrics Integrity & Standardized Reporting (BT-01) in [#26240](https://github.com/google-gemini/gemini-cli/pull/26240)
-- Add Star History section to README in
-  [#26290](https://github.com/google-gemini/gemini-cli/pull/26290)
-- Add Star History section to README in
-  [#26308](https://github.com/google-gemini/gemini-cli/pull/26308)
-- Remove Star History section from README in
-  [#26309](https://github.com/google-gemini/gemini-cli/pull/26309)
-- test(evals): add behavioral eval for file creation and write_file tool
-  selection in [#26292](https://github.com/google-gemini/gemini-cli/pull/26292)
-- feat(config): enable Gemma 4 models by default via Gemini API in
-  [#26307](https://github.com/google-gemini/gemini-cli/pull/26307)
-- fix(cli): insert voice transcription at cursor position instead of ap… in
-  [#26287](https://github.com/google-gemini/gemini-cli/pull/26287)
-- fix(ui): fix issue with box edges in
-  [#26148](https://github.com/google-gemini/gemini-cli/pull/26148)
-- fix(cli): respect .env override for GOOGLE_CLOUD_PROJECT in
-  [#26288](https://github.com/google-gemini/gemini-cli/pull/26288)
-- fix(ci): robust version checking in release verification in
-  [#26337](https://github.com/google-gemini/gemini-cli/pull/26337)
-- fix(cli): enable daemon relaunch in binary and bundle keytar in
-  [#26333](https://github.com/google-gemini/gemini-cli/pull/26333)
-- fix(core): discourage unprompted git add . in prompt snippets in
-  [#26220](https://github.com/google-gemini/gemini-cli/pull/26220)
-- feat(ui): added wave animation for voice mode in
-  [#26284](https://github.com/google-gemini/gemini-cli/pull/26284)
-- fix(cli): prevent Escape from clearing input buffer (#17083) in
-  [#26339](https://github.com/google-gemini/gemini-cli/pull/26339)
-- fix(cli): undeprecate --prompt and correct positional query docs in
-  [#26329](https://github.com/google-gemini/gemini-cli/pull/26329)
-- Metrics updates in
-  [#26348](https://github.com/google-gemini/gemini-cli/pull/26348)
-- fix(core): remove "System: Please continue." injection on InvalidStream events
-  in [#26340](https://github.com/google-gemini/gemini-cli/pull/26340)
-- docs(policy-engine): add tool argument keys reference and shell policy
-  cross-links in
-  [#25292](https://github.com/google-gemini/gemini-cli/pull/25292)
-- fix(cli): resolve Ghostty/raw-mode False Cancellation in oauth flow in
-  [#25026](https://github.com/google-gemini/gemini-cli/pull/25026)
-- fix(core): reset session-scoped state on resumption in
-  [#26342](https://github.com/google-gemini/gemini-cli/pull/26342)
-- Fix bulk of remaining issues with generalist profile in
-  [#26073](https://github.com/google-gemini/gemini-cli/pull/26073)
-- fix(core): make subagents aware of active approval modes in
-  [#23608](https://github.com/google-gemini/gemini-cli/pull/23608)
-- fix(acp): resolve agent mode disconnect and improve mode awareness in
-  [#26332](https://github.com/google-gemini/gemini-cli/pull/26332)
-- docs(sdk): add JSDoc to exported interfaces in packages/sdk/src/types.ts in
-  [#26441](https://github.com/google-gemini/gemini-cli/pull/26441)
-- perf: skip redundant GEMINI.md loading in partialConfig in
-  [#26443](https://github.com/google-gemini/gemini-cli/pull/26443)
-- Enhance React guidelines in
-  [#22667](https://github.com/google-gemini/gemini-cli/pull/22667)
-- feat(core): reinforce Inquiry constraints to prevent unauthorized changes in
-  [#26310](https://github.com/google-gemini/gemini-cli/pull/26310)
-- revert: fix(ci): robust version checking in release verification (#26337) in
-  [#26450](https://github.com/google-gemini/gemini-cli/pull/26450)
-- refactor(UI): created constants file for ThemeDialog in
-  [#26446](https://github.com/google-gemini/gemini-cli/pull/26446)
-- docs: fix GitHub capitalization in releases guide in
-  [#26379](https://github.com/google-gemini/gemini-cli/pull/26379)
-- fix(cli): ensure branch indicator updates in sub-directories and worktrees in
-  [#26330](https://github.com/google-gemini/gemini-cli/pull/26330)
-- feat: add minimal V8 heap snapshot utility for memory diagnostics in
-  [#26440](https://github.com/google-gemini/gemini-cli/pull/26440)
-- fix(hooks): preserve non-text parts in fromHookLLMRequest in
-  [#26275](https://github.com/google-gemini/gemini-cli/pull/26275)
-- fix(cli): allow early stdout when config is undefined in
-  [#26453](https://github.com/google-gemini/gemini-cli/pull/26453)
-- fix(cli)#21297: clear skills consent dialog before reload in
-  [#26431](https://github.com/google-gemini/gemini-cli/pull/26431)
-- fix(cli): render LaTeX-style output as Unicode in the TUI in
-  [#25802](https://github.com/google-gemini/gemini-cli/pull/25802)
-- fix(core): use close event instead of exit in child_process fallback in
-  [#25695](https://github.com/google-gemini/gemini-cli/pull/25695)
-- feat(voice): add privacy and compliance UX warning for Gemini Live backend in
-  [#26454](https://github.com/google-gemini/gemini-cli/pull/26454)
-- feat(memory): add Auto Memory inbox flow with canonical-patch contract in
-  [#26338](https://github.com/google-gemini/gemini-cli/pull/26338)
-- test(cleanup): fix temporary directory leaks in test suites in
-  [#26217](https://github.com/google-gemini/gemini-cli/pull/26217)
-- feat: add ignoreLocalEnv setting and --ignore-env flag (#2493) in
-  [#26445](https://github.com/google-gemini/gemini-cli/pull/26445)
-- docs(sdk): add JSDoc to all exported interfaces and types in
-  [#26277](https://github.com/google-gemini/gemini-cli/pull/26277)
-- feat(cli): improve /agents refresh logging in
-  [#26442](https://github.com/google-gemini/gemini-cli/pull/26442)
-- Fix: make Dockerfile self-contained with multi-stage build in
-  [#24277](https://github.com/google-gemini/gemini-cli/pull/24277)
-- fix(core): filter unsupported multimodal types from tool responses in
-  [#26352](https://github.com/google-gemini/gemini-cli/pull/26352)
-- fix(core): properly format markdown in AskUser tool by unescaping newlines in
-  [#26349](https://github.com/google-gemini/gemini-cli/pull/26349)
-- feat(bot): add actions spend metric script in
-  [#26463](https://github.com/google-gemini/gemini-cli/pull/26463)
-- feat(cli): add /bug-memory command and auto-capture heap snapshot in /bug in
-  [#25639](https://github.com/google-gemini/gemini-cli/pull/25639)
-- fix(cli): make SkillInboxDialog fit and scroll in alternate buffer in
-  [#26455](https://github.com/google-gemini/gemini-cli/pull/26455)
-- Robust Scale-Safe Lifecycle Consolidation in
-  [#26355](https://github.com/google-gemini/gemini-cli/pull/26355)
-- fix(ci): respect exempt labels when closing stale items in
-  [#26475](https://github.com/google-gemini/gemini-cli/pull/26475)
-- fix(cli): use os.homedir() for home directory warning check in
-  [#25890](https://github.com/google-gemini/gemini-cli/pull/25890)
-- fix(a2a-server): resolve tool approval race condition and improve status
-  reporting in [#26479](https://github.com/google-gemini/gemini-cli/pull/26479)
-- fix(cli): prevent settings dialog border clipping using maxHeight in
-  [#26507](https://github.com/google-gemini/gemini-cli/pull/26507)
-- feat: allow queuing messages during compression (#24071) in
-  [#26506](https://github.com/google-gemini/gemini-cli/pull/26506)
-- fix(core): retry on ERR_STREAM_PREMATURE_CLOSE errors in
-  [#26519](https://github.com/google-gemini/gemini-cli/pull/26519)
-- fix(core): Minor fixes for generalist profile. in
-  [#26357](https://github.com/google-gemini/gemini-cli/pull/26357)
+- chore(release): bump version to 0.41.0-nightly.20260423.gaa05b4583 by
+  @gemini-cli-robot in
+  [#25847](https://github.com/google-gemini/gemini-cli/pull/25847)
+- fix(core): only show `list` suggestion if the partial input is empty by
+  @cynthialong0-0 in
+  [#25821](https://github.com/google-gemini/gemini-cli/pull/25821)
+- feat(cli): secure .env loading and enforce workspace trust in headless mode by
+  @ehedlund in [#25814](https://github.com/google-gemini/gemini-cli/pull/25814)
+- fix: fatal hard-crash on loop detection via unhandled AbortError by @hsm207 in
+  [#20108](https://github.com/google-gemini/gemini-cli/pull/20108)
+- update package-lock.json by @ehedlund in
+  [#25876](https://github.com/google-gemini/gemini-cli/pull/25876)
+- feat(core): enhance shell command validation and add core tools allowlist by
+  @galz10 in [#25720](https://github.com/google-gemini/gemini-cli/pull/25720)
+- fix(ui): corrected background color check in user message components by
+  @devr0306 in [#25880](https://github.com/google-gemini/gemini-cli/pull/25880)
+- perf(core): fix slow boot by fetching experiments and quota asynchronously by
+  @spencer426 in
+  [#25758](https://github.com/google-gemini/gemini-cli/pull/25758)
+- feat(core,cli): add support for Gemma 4 models (experimental) by @Abhijit-2592
+  in [#25604](https://github.com/google-gemini/gemini-cli/pull/25604)
+- update FatalUntrustedWorkspaceError message to include doc link by @ehedlund
+  in [#25874](https://github.com/google-gemini/gemini-cli/pull/25874)
+- docs: add Gemini CLI course link to README by @JayadityaGit in
+  [#25925](https://github.com/google-gemini/gemini-cli/pull/25925)
+- feat(repo): add gemini-cli-bot metrics and workflows by @gundermanc in
+  [#25888](https://github.com/google-gemini/gemini-cli/pull/25888)
+- fix(cli): allow output redirection for cli commands by @spencer426 in
+  [#25894](https://github.com/google-gemini/gemini-cli/pull/25894)
+- fix(core): fail closed in YOLO mode when shell parsing fails for restricted
+  rules by @ehedlund in
+  [#25935](https://github.com/google-gemini/gemini-cli/pull/25935)
+- fix(cli-ui): revert backspace handling to fix Windows regression by @scidomino
+  in [#25941](https://github.com/google-gemini/gemini-cli/pull/25941)
+- feat(voice): implement real-time voice mode with cloud and local backends by
+  @Abhijit-2592 in
+  [#24174](https://github.com/google-gemini/gemini-cli/pull/24174)
+- Changelog for v0.39.0 by @gemini-cli-robot in
+  [#25848](https://github.com/google-gemini/gemini-cli/pull/25848)
+- feat(memory): persist auto-memory scratchpad for skill extraction by
+  @SandyTao520 in
+  [#25873](https://github.com/google-gemini/gemini-cli/pull/25873)
+- fix(cli): add missing response key to custom theme text schema by @gaurav0107
+  in [#25822](https://github.com/google-gemini/gemini-cli/pull/25822)
+- fix(cli): provide manual update command when automatic update fails by
+  @cocosheng-g in
+  [#26052](https://github.com/google-gemini/gemini-cli/pull/26052)
+- test(cli): add unit tests for restore ACP command (#23402) by @cocosheng-g in
+  [#26053](https://github.com/google-gemini/gemini-cli/pull/26053)
+- fix(ui): better error messages for ECONNRESET and ETIMEDOUT by @devr0306 in
+  [#26059](https://github.com/google-gemini/gemini-cli/pull/26059)
+- feat(core): wire up the new ContextManager and AgentChatHistory by @joshualitt
+  in [#25409](https://github.com/google-gemini/gemini-cli/pull/25409)
+- fix(cli): ensure sandbox proxy cleanup and remove handler leaks by @ehedlund
+  in [#26065](https://github.com/google-gemini/gemini-cli/pull/26065)
+- fix(cli): correct alternate buffer warning logic for JetBrains by @Adib234 in
+  [#26067](https://github.com/google-gemini/gemini-cli/pull/26067)
+- fix(cli): make MCP ping optional in list command and use configured timeout by
+  @cocosheng-g in
+  [#26068](https://github.com/google-gemini/gemini-cli/pull/26068)
+- fix(core): better error message for failed cloudshell-gca auth by @devr0306 in
+  [#26079](https://github.com/google-gemini/gemini-cli/pull/26079)
+- feat(cli): provide manual session UUID via command line arg by @cocosheng-g in
+  [#26060](https://github.com/google-gemini/gemini-cli/pull/26060)
+- Changelog for v0.40.0-preview.2 by @gemini-cli-robot in
+  [#25846](https://github.com/google-gemini/gemini-cli/pull/25846)
+- (docs) update sandboxing documentation by @g-samroberts in
+  [#25930](https://github.com/google-gemini/gemini-cli/pull/25930)
+- fix(core): enforce parallel task tracker updates by @anj-s in
+  [#24477](https://github.com/google-gemini/gemini-cli/pull/24477)
+- Update policy so transient errors are not marked terminal by @DavidAPierce in
+  [#26066](https://github.com/google-gemini/gemini-cli/pull/26066)
+- Implement bot that performs time-series metric analysis and suggests repo
+  management improvements by @gundermanc in
+  [#25945](https://github.com/google-gemini/gemini-cli/pull/25945)
+- fix(core): handle non-string model flags in resolution by @Adib234 in
+  [#26069](https://github.com/google-gemini/gemini-cli/pull/26069)
+- fix(ux): added error message for ENOTDIR by @devr0306 in
+  [#26128](https://github.com/google-gemini/gemini-cli/pull/26128)
+- Changelog for v0.40.0-preview.3 by @gemini-cli-robot in
+  [#25904](https://github.com/google-gemini/gemini-cli/pull/25904)
+- fix(cli): prevent ACP stdout pollution from SessionEnd hooks by @cocosheng-g
+  in [#26125](https://github.com/google-gemini/gemini-cli/pull/26125)
+- feat(cli): support boolean and number casting for env vars in settings.json by
+  @cocosheng-g in
+  [#26118](https://github.com/google-gemini/gemini-cli/pull/26118)
+- fix(cli): preserve Request headers in DevTools activity logger by @Adib234 in
+  [#26078](https://github.com/google-gemini/gemini-cli/pull/26078)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.41.0-preview.3...v0.42.0-preview.2
+https://github.com/google-gemini/gemini-cli/compare/v0.40.0-preview.5...v0.41.0-preview.0

docs/cli/settings.md

@@ -169,7 +169,7 @@ they appear in the UI.
 | Voice Activation Mode                                | `experimental.voice.activationMode`             | How to trigger voice recording with the Space key.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `"push-to-talk"`     |
 | Voice Transcription Backend                          | `experimental.voice.backend`                    | The backend to use for voice transcription. Note: When using the Gemini Live backend, voice recordings are sent to Google Cloud for transcription.                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `"gemini-live"`      |
 | Whisper Model                                        | `experimental.voice.whisperModel`               | The Whisper model to use for local transcription.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `"ggml-base.en.bin"` |
-| Voice Stop Grace Period (ms)                         | `experimental.voice.stopGracePeriodMs`          | How long to wait for final transcription after stopping recording.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `4000`               |
+| Voice Stop Grace Period (ms)                         | `experimental.voice.stopGracePeriodMs`          | How long to wait for final transcription after stopping recording.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `1000`               |
 | 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`              |

docs/extensions/releasing.md

@@ -1,8 +1,7 @@
 # Release extensions
 
 Release Gemini CLI extensions to your users through a Git repository or GitHub
-Releases. This guide explains how to share your work, list it in the gallery,
-and manage updates.
+Releases.
 
 Git repository releases are the simplest approach and offer the most flexibility
 for managing development branches. GitHub Releases are more efficient for
@@ -154,62 +153,29 @@ jobs:
             release/win32.arm64.my-tool.zip
 ```
 
-## Migrate an extension repository
+## Migrating an Extension Repository
 
-If you move your extension to a new repository or rename it, use the
-`migratedTo` property in `gemini-extension.json` to seamlessly transition your
+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.
 
-1.  **Create the new repository:** Set up your extension in its new location.
-2.  **Update the old repository:** In your original repository, update the
-    `gemini-extension.json` file to include the `migratedTo` property pointing
-    to the new repository URL, and increment the version number.
-    ```json
-    {
-      "name": "my-extension",
-      "version": "1.1.0",
-      "migratedTo": "https://github.com/new-owner/new-extension-repo"
-    }
-    ```
-3.  **Release the update:** Publish this new version in your old repository.
+1. **Create the new repository**: Setup your extension in its new location.
+2. **Update the old repository**: In your original repository, update the
+   `gemini-extension.json` file to include the `migratedTo` property, pointing
+   to the new repository URL, and bump the version number. You can optionally
+   change the `name` of your extension at this time in the new repository.
+   ```json
+   {
+     "name": "my-extension",
+     "version": "1.1.0",
+     "migratedTo": "https://github.com/new-owner/new-extension-repo"
+   }
+   ```
+3. **Release the update**: Publish this new version in your old repository.
 
-When users check for updates, Gemini CLI detects the `migratedTo` field,
-verifies the new repository, and automatically updates their local installation
-to track the new source. All settings migrate automatically.
-
-## How updates work
-
-Gemini CLI automatically checks for extension updates based on the installation
-method. Understanding these mechanisms helps you ensure your users always have
-the latest version.
-
-### Sync manifest and tags
-
-For GitHub releases, always ensure the `version` in `gemini-extension.json`
-matches your GitHub release tag. While the CLI uses tags for update detection,
-it displays the manifest version in the UI. Keeping them in sync prevents
-confusion.
-
-### Update mechanisms
-
-<details>
-<summary>Technical update details</summary>
-
-The CLI uses different strategies depending on the installation type:
-
-- **GitHub releases:** The CLI queries the GitHub API for the latest release
-  tag. It ignores the `version` field in the manifest for detection.
-- **Git clones:** The CLI runs `git ls-remote` to compare the latest remote
-  commit hash with your local `HEAD`.
-- **Local extensions:** The CLI compares the `version` field in the source
-  directory's manifest with the installed version.
-
-To verify an extension's installation type, inspect the `type` field in the
-metadata file at `~/.gemini/extensions/<name>/.gemini-extension-install.json`.
-
-</details>
-
-<!-- prettier-ignore -->
-> [!IMPORTANT]
-> The `migratedTo` flow requires at least one release on the new repository for
-> the CLI to recognize it as a valid update source.
+When users check for updates, 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
+installation.

docs/reference/configuration.md

@@ -700,19 +700,6 @@ their corresponding top-level category object in your `settings.json` file.
         "extends": "gemini-3-flash-base",
         "modelConfig": {}
       },
-      "context-snapshotter": {
-        "extends": "gemini-3-flash-base",
-        "modelConfig": {
-          "generateContentConfig": {
-            "thinkingConfig": {
-              "thinkingLevel": "HIGH"
-            },
-            "temperature": 1,
-            "topP": 0.95,
-            "topK": 64
-          }
-        }
-      },
       "chat-compression-3-pro": {
         "modelConfig": {
           "model": "gemini-3-pro-preview"
@@ -1808,7 +1795,7 @@ their corresponding top-level category object in your `settings.json` file.
 - **`experimental.voice.stopGracePeriodMs`** (number):
   - **Description:** How long to wait for final transcription after stopping
     recording.
-  - **Default:** `4000`
+  - **Default:** `1000`
 
 - **`experimental.adk.agentSessionNoninteractiveEnabled`** (boolean):
   - **Description:** Enable non-interactive agent sessions.

docs/reference/keyboard-shortcuts.md

@@ -326,29 +326,6 @@ lines and `3w` moves forward three words.
 Counts are also supported for editing commands. For example, `3dd` deletes three
 lines and `2cw` changes two words.
 
-### Find, replace, yank, and paste in NORMAL mode
-
-| Action                                    | Keys        |
-| ----------------------------------------- | ----------- |
-| Find next matching character              | `f{char}`   |
-| Find previous matching character          | `F{char}`   |
-| Move until before next matching character | `t{char}`   |
-| Move until after previous matching char   | `T{char}`   |
-| Repeat latest character find              | `;`         |
-| Repeat latest character find in reverse   | `,`         |
-| Delete character before cursor            | `X`         |
-| Toggle case under cursor                  | `~`         |
-| Replace character under cursor            | `r{char}`   |
-| Yank line                                 | `yy`        |
-| Yank to end of line                       | `Y` or `y$` |
-| Yank word / WORD                          | `yw`, `yW`  |
-| Yank to end of word / WORD                | `ye`, `yE`  |
-| Paste after cursor                        | `p`         |
-| Paste before cursor                       | `P`         |
-
-Delete and change operators also compose with character-find motions, so
-commands such as `dfx`, `dtx`, `cFx`, and `cTx` are supported.
-
 ## Limitations
 
 - On [Windows Terminal](https://en.wikipedia.org/wiki/Windows_Terminal):

evals/llm-judge.ts

@@ -1,94 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { LlmRole, type BaseLlmClient } from '@google/gemini-cli-core';
-
-export interface JudgeOptions {
-  /**
-   * The number of parallel generations to run for majority voting.
-   * Defaults to 1. Use 3 or 5 for self-consistency.
-   */
-  selfConsistencyRuns?: number;
-  /**
-   * The model to use for judging. Defaults to gemini-3-flash-base.
-   */
-  model?: string;
-}
-
-export interface JudgeResult {
-  verdict: boolean;
-  reasoning: string[];
-  votes: { yes: number; no: number; other: number };
-}
-
-/**
- * A reusable LLM-as-a-judge utility for behavioral evaluations.
- */
-export class LLMJudge {
-  constructor(private readonly llmClient: BaseLlmClient) {}
-
-  /**
-   * Asks the LLM a Yes/No question and returns a boolean verdict.
-   * If selfConsistencyRuns > 1, it runs in parallel and returns the majority vote.
-   */
-  async judgeYesNo(
-    question: string,
-    options: JudgeOptions = {},
-  ): Promise<JudgeResult> {
-    const runs = options.selfConsistencyRuns ?? 1;
-    const model = options.model ?? 'gemini-3-flash-base';
-
-    const systemPrompt = `You are a strict, impartial expert judge. Read the provided evidence and question carefully. You MUST answer the question with ONLY "YES" or "NO". Do not provide any conversational filler or explanation before your answer.`;
-
-    const generateCall = async (): Promise<string> => {
-      try {
-        const response = await this.llmClient.generateContent({
-          modelConfigKey: { model },
-          contents: [{ role: 'user', parts: [{ text: question }] }],
-          systemInstruction: {
-            role: 'system',
-            parts: [{ text: systemPrompt }],
-          },
-          promptId: 'llm-judge-eval',
-          role: LlmRole.UTILITY_TOOL,
-          abortSignal: new AbortController().signal,
-        });
-
-        const text =
-          response.candidates?.[0]?.content?.parts?.[0]?.text
-            ?.trim()
-            ?.toUpperCase() || 'ERROR';
-        return text;
-      } catch (e: any) {
-        return `ERROR: ${e.message}`;
-      }
-    };
-
-    const promises = Array.from({ length: runs }).map(() => generateCall());
-    const rawResults = await Promise.all(promises);
-
-    let yes = 0;
-    let no = 0;
-    let other = 0;
-
-    for (const res of rawResults) {
-      // Remove any punctuation the model might have appended
-      const cleanRes = res.replace(/[^A-Z]/g, '');
-      if (cleanRes.startsWith('YES')) yes++;
-      else if (cleanRes.startsWith('NO')) no++;
-      else other++;
-    }
-
-    // Pass if YES > NO and YES > OTHER (plurality)
-    const pass = yes > no && yes > other;
-
-    return {
-      verdict: pass,
-      reasoning: rawResults,
-      votes: { yes, no, other },
-    };
-  }
-}

evals/snapshot_fidelity.eval.ts

@@ -1,147 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, expect } from 'vitest';
-import {
-  componentEvalTest,
-  type ComponentEvalCase,
-} from './component-test-helper.js';
-import { type EvalPolicy } from './test-helper.js';
-import { SnapshotGenerator } from '@google/gemini-cli-core';
-import { NodeType, type ConcreteNode } from '@google/gemini-cli-core';
-import { LLMJudge } from './llm-judge.js';
-
-function snapshotEvalTest(policy: EvalPolicy, evalCase: ComponentEvalCase) {
-  return componentEvalTest(policy, evalCase);
-}
-
-describe('snapshot_fidelity', () => {
-  snapshotEvalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
-    name: 'SnapshotGenerator strictly retains specific empirical facts',
-    assert: async (config) => {
-      // 1. Construct a highly specific mock transcript containing 3 empirical facts we can test for:
-      // Fact A: File path -> src/compiler/server.ts
-      // Fact B: Error code -> COMPILE_ERR_404
-      // Fact C: Active Directive -> "do not fix it just yet"
-      const mockNodes: ConcreteNode[] = [
-        {
-          id: '1',
-          turnId: '1',
-          type: NodeType.USER_PROMPT,
-          timestamp: Date.now(),
-          role: 'user',
-          payload: {
-            text: 'I am trying to debug a weird timeout issue when compiling the TS server.',
-          },
-        },
-        {
-          id: '2',
-          turnId: '2',
-          type: NodeType.TOOL_EXECUTION,
-          timestamp: Date.now() + 100,
-          role: 'model',
-          payload: {
-            functionCall: {
-              name: 'run_shell_command',
-              args: { cmd: 'grep -rn "timeout" src/' },
-            },
-          },
-        },
-        {
-          id: '3',
-          turnId: '2',
-          type: NodeType.TOOL_EXECUTION,
-          timestamp: Date.now() + 200,
-          role: 'user',
-          payload: {
-            functionResponse: {
-              name: 'run_shell_command',
-              response: {
-                output:
-                  'src/compiler/server.ts:442: setTimeout(() => reject(new Error("COMPILE_ERR_404")), 5000);',
-              },
-            },
-          },
-        },
-        {
-          id: '4',
-          turnId: '3',
-          type: NodeType.AGENT_YIELD,
-          timestamp: Date.now() + 300,
-          role: 'model',
-          payload: {
-            text: 'I found the exact line. It looks like the compiler throws COMPILE_ERR_404 if it hits 5 seconds.',
-          },
-        },
-        {
-          id: '5',
-          turnId: '4',
-          type: NodeType.USER_PROMPT,
-          timestamp: Date.now() + 400,
-          role: 'user',
-          payload: {
-            text: 'Okay, do not fix it just yet. I want you to remember this error code (COMPILE_ERR_404) and file path. First, list all the files in the directory.',
-          },
-        },
-      ];
-
-      // 2. Extract the LLM Client from the component container
-      const llmClient = config.getBaseLlmClient();
-
-      const generator = new SnapshotGenerator({
-        llmClient,
-        promptId: 'eval-snapshot-test',
-        tokenCalculator: {
-          estimateTokensForString(str: string): number {
-            return str.length * 4;
-          },
-        },
-      } as any);
-
-      // 3. Generate the snapshot using the CURRENT system prompt
-      const snapshotText = await generator.synthesizeSnapshot(mockNodes);
-
-      // 4. Use LLM-as-a-Judge with Self-Consistency to evaluate factual fidelity
-      const judge = new LLMJudge(llmClient);
-
-      const judgePrompt = `
-EVIDENCE (CONTEXT SNAPSHOT):
-"""
-${snapshotText}
-"""
-
-QUESTION:
-Does the EVIDENCE explicitly contain all three of the following facts:
-1. The specific file path "src/compiler/server.ts"
-2. The specific error code "COMPILE_ERR_404"
-3. The user's active constraint/directive to "do not fix it just yet" (or equivalent warning that implementation is paused)
-
-Answer ONLY with "YES" if all three are unambiguously present.
-Answer "NO" if any of the three are missing, abstracted away, or generalized (e.g., if it says "found an error" instead of "COMPILE_ERR_404").`;
-
-      // Use a self-consistency of 3 runs to get a robust majority vote
-      const result = await judge.judgeYesNo(judgePrompt, {
-        selfConsistencyRuns: 3,
-      });
-
-      // 5. Assert the verdict
-      const formattedVotes = JSON.stringify(result.votes);
-      const formattedReasoning = JSON.stringify(result.reasoning);
-
-      expect(
-        result.verdict,
-        `Snapshot failed to retain empirical facts.
-Votes: ${formattedVotes}
-Reasoning: ${formattedReasoning}
-
-Generated Snapshot:
-${snapshotText}`,
-      ).toBe(true);
-    },
-  });
-});

evals/tsconfig.json

@@ -1,7 +1,11 @@
 {
   "extends": "../tsconfig.json",
   "compilerOptions": {
-    "noEmit": true
+    "noEmit": true,
+    "paths": {
+      "@google/gemini-cli-core": ["../packages/core/index.ts"],
+      "@google/gemini-cli": ["../packages/cli/index.ts"]
+    }
   },
   "include": ["**/*.ts"],
   "exclude": ["logs"],

integration-tests/plan-mode.test.ts

@@ -231,8 +231,7 @@ describe('Plan Mode', () => {
       `Expected write_file to succeed, but it failed with error: ${'error' in (planWrite?.toolRequest || {}) ? (planWrite?.toolRequest as unknown as Record<string, string>)['error'] : 'unknown'}`,
     ).toBe(true);
   });
-
-  it.skip('should switch from a pro model to a flash model after exiting plan mode', async () => {
+  it('should switch from a pro model to a flash model after exiting plan mode', async () => {
     const plansDir = 'plans-folder';
     const planFilename = 'my-plan.md';
 

packages/a2a-server/src/agent/race-condition.test.ts

@@ -1,173 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import { Task } from './task.js';
-import {
-  MessageBusType,
-  CoreToolCallStatus,
-  type Config,
-  type MessageBus,
-} from '@google/gemini-cli-core';
-import { createMockConfig } from '../utils/testing_utils.js';
-import type { RequestContext } from '@a2a-js/sdk/server';
-
-describe('Task Race Condition', () => {
-  let mockConfig: Config;
-  let messageBus: MessageBus;
-
-  beforeEach(() => {
-    messageBus = {
-      subscribe: vi.fn(),
-      unsubscribe: vi.fn(),
-      publish: vi.fn(),
-    } as unknown as MessageBus;
-    mockConfig = createMockConfig({
-      messageBus,
-    }) as Config;
-  });
-
-  it('should not hang when multiple tool confirmations are processed while waiting', async () => {
-    // @ts-expect-error - private constructor
-    const task = new Task('task-id', 'context-id', mockConfig);
-
-    // 1. Register two tools as scheduled
-    task['_registerToolCall']('tool-1', 'scheduled');
-    task['_registerToolCall']('tool-2', 'scheduled');
-
-    // 2. Both transition to awaiting_approval
-    const updateHandler = (messageBus.subscribe as Mock).mock.calls.find(
-      (c: unknown[]) => c[0] === MessageBusType.TOOL_CALLS_UPDATE,
-    )?.[1];
-
-    updateHandler({
-      type: MessageBusType.TOOL_CALLS_UPDATE,
-      schedulerId: 'task-id',
-      toolCalls: [
-        {
-          request: { callId: 'tool-1', name: 't1' },
-          status: CoreToolCallStatus.AwaitingApproval,
-          correlationId: 'corr-1',
-          confirmationDetails: { type: 'info' },
-        },
-        {
-          request: { callId: 'tool-2', name: 't2' },
-          status: CoreToolCallStatus.AwaitingApproval,
-          correlationId: 'corr-2',
-          confirmationDetails: { type: 'info' },
-        },
-      ],
-    });
-
-    // 3. Confirm Tool 1. This makes isAwaitingApprovalOnly() return false.
-    for await (const _ of task.acceptUserMessage(
-      {
-        userMessage: {
-          parts: [
-            {
-              kind: 'data',
-              data: { callId: 'tool-1', outcome: 'proceed_once' },
-            },
-          ],
-        },
-      } as unknown as RequestContext,
-      new AbortController().signal,
-    )) {
-      // consume generator
-    }
-
-    // 4. Start waiting. This should now block because Tool 1 is confirmed (so we are waiting for its execution).
-    const waitPromise = task.waitForPendingTools();
-
-    // 5. Confirm Tool 2 while waiting.
-    for await (const _ of task.acceptUserMessage(
-      {
-        userMessage: {
-          parts: [
-            {
-              kind: 'data',
-              data: { callId: 'tool-2', outcome: 'proceed_once' },
-            },
-          ],
-        },
-      } as unknown as RequestContext,
-      new AbortController().signal,
-    )) {
-      // consume generator
-    }
-
-    // 6. Both tools complete successfully
-    updateHandler({
-      type: MessageBusType.TOOL_CALLS_UPDATE,
-      schedulerId: 'task-id',
-      toolCalls: [
-        {
-          request: { callId: 'tool-1', name: 't1' },
-          status: CoreToolCallStatus.Success,
-          response: { responseParts: [] },
-        },
-        {
-          request: { callId: 'tool-2', name: 't2' },
-          status: CoreToolCallStatus.Success,
-          response: { responseParts: [] },
-        },
-      ],
-    });
-
-    // 7. Verify that the original waitPromise resolves.
-    await expect(waitPromise).resolves.toBeUndefined();
-  });
-
-  it('should reject waitForPendingTools when tools are cancelled', async () => {
-    // @ts-expect-error - private constructor
-    const task = new Task('task-id', 'context-id', mockConfig);
-
-    // 1. Register a tool
-    task['_registerToolCall']('tool-1', 'scheduled');
-
-    // 2. Start waiting
-    const waitPromise = task.waitForPendingTools();
-
-    // 3. Cancel pending tools
-    task.cancelPendingTools('User requested cancellation');
-
-    // 4. Verify waitPromise rejects with the reason
-    await expect(waitPromise).rejects.toThrow('User requested cancellation');
-  });
-
-  it('should handle concurrent tool scheduling correctly', async () => {
-    // @ts-expect-error - private constructor
-    const task = new Task('task-id', 'context-id', mockConfig);
-
-    // 1. Register a tool and start waiting
-    task['_registerToolCall']('tool-1', 'scheduled');
-    const waitPromise = task.waitForPendingTools();
-
-    // 2. Schedule another tool concurrently (e.g. from a secondary user message)
-    // This should NOT resolve the current waitPromise until both are done
-    await task.scheduleToolCalls(
-      [{ callId: 'tool-2', name: 't2', args: {} }],
-      new AbortController().signal,
-    );
-
-    expect(task['pendingToolCalls'].size).toBe(2);
-
-    // 3. Resolve tool 1
-    task['_resolveToolCall']('tool-1');
-
-    // 4. Verify waitPromise is still pending
-    let resolved = false;
-    waitPromise.then(() => (resolved = true));
-    await new Promise((resolve) => setTimeout(resolve, 10));
-    expect(resolved).toBe(false);
-
-    // 5. Resolve tool 2
-    task['_resolveToolCall']('tool-2');
-
-    // 6. Now it should resolve
-    await expect(waitPromise).resolves.toBeUndefined();
-  });
-});

packages/a2a-server/src/agent/task-event-driven.test.ts

@@ -12,7 +12,6 @@ import {
   ApprovalMode,
   Scheduler,
   type MessageBus,
-  type ToolLiveOutput,
 } from '@google/gemini-cli-core';
 import { createMockConfig } from '../utils/testing_utils.js';
 import type { ExecutionEventBus } from '@a2a-js/sdk/server';
@@ -609,74 +608,6 @@ describe('Task Event-Driven Scheduler', () => {
     );
   });
 
-  it('should handle multi-turn tool resolution correctly', async () => {
-    // @ts-expect-error - Calling private constructor
-    const task = new Task('task-id', 'context-id', mockConfig);
-
-    task['_registerToolCall']('1', 'scheduled');
-    task['_registerToolCall']('2', 'scheduled');
-
-    const handler = (messageBus.subscribe as Mock).mock.calls.find(
-      (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
-    )?.[1];
-
-    // Turn 1: Resolve tool 1
-    handler({
-      type: MessageBusType.TOOL_CALLS_UPDATE,
-      toolCalls: [
-        {
-          request: { callId: '1', name: 't1' },
-          status: 'success',
-          response: { responseParts: [] },
-        },
-      ],
-      schedulerId: 'task-id',
-    });
-
-    expect(task['pendingToolCalls'].size).toBe(1);
-    expect(task['pendingToolCalls'].has('2')).toBe(true);
-
-    // Turn 2: Resolve tool 2
-    handler({
-      type: MessageBusType.TOOL_CALLS_UPDATE,
-      toolCalls: [
-        {
-          request: { callId: '2', name: 't2' },
-          status: 'success',
-          response: { responseParts: [] },
-        },
-      ],
-      schedulerId: 'task-id',
-    });
-
-    expect(task['pendingToolCalls'].size).toBe(0);
-  });
-
-  it('should handle subagent progress events from the scheduler', async () => {
-    // @ts-expect-error - Calling private constructor
-    const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
-
-    // Trigger _schedulerOutputUpdate with subagent progress
-    task['_schedulerOutputUpdate']('tool-1', {
-      isSubagentProgress: true,
-      agentName: 'researcher',
-      recentActivity: [],
-    } as ToolLiveOutput);
-
-    expect(mockEventBus.publish).toHaveBeenCalledWith(
-      expect.objectContaining({
-        kind: 'artifact-update',
-        artifact: expect.objectContaining({
-          parts: [
-            expect.objectContaining({
-              text: expect.stringContaining('researcher'),
-            }),
-          ],
-        }),
-      }),
-    );
-  });
-
   it('should wait for executing tools before transitioning to input-required state', async () => {
     // @ts-expect-error - Calling private constructor
     const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);

packages/a2a-server/src/agent/task.ts

@@ -52,7 +52,6 @@ import type {
   Artifact,
 } from '@a2a-js/sdk';
 import { v4 as uuidv4 } from 'uuid';
-import { EventEmitter } from 'node:events';
 import { logger } from '../utils/logger.js';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
@@ -100,8 +99,11 @@ export class Task {
   private pendingOutcomes: Map<string, ToolConfirmationOutcome | undefined> =
     new Map(); // toolCallId --> outcome
   private toolsAlreadyConfirmed: Set<string> = new Set();
-  private toolUpdateEmitter = new EventEmitter();
-  private cancellationError?: Error;
+  private toolCompletionPromise?: Promise<void>;
+  private toolCompletionNotifier?: {
+    resolve: () => void;
+    reject: (reason?: Error) => void;
+  };
 
   private constructor(
     id: string,
@@ -122,6 +124,7 @@ export class Task {
     this.taskState = 'submitted';
     this.eventBus = eventBus;
     this.completedToolCalls = [];
+    this._resetToolCompletionPromise();
     this.autoExecute = autoExecute;
     this.config.setFallbackModelHandler(
       // For a2a-server, we want to automatically switch to the fallback model
@@ -176,9 +179,22 @@ export class Task {
     return metadata;
   }
 
+  private _resetToolCompletionPromise(): void {
+    this.toolCompletionPromise = new Promise((resolve, reject) => {
+      this.toolCompletionNotifier = { resolve, reject };
+    });
+    // If there are no pending calls when reset, resolve immediately.
+    if (this.pendingToolCalls.size === 0 && this.toolCompletionNotifier) {
+      this.toolCompletionNotifier.resolve();
+    }
+  }
+
   private _registerToolCall(toolCallId: string, status: string): void {
+    const wasEmpty = this.pendingToolCalls.size === 0;
     this.pendingToolCalls.set(toolCallId, status);
-    this.toolUpdateEmitter.emit('update');
+    if (wasEmpty) {
+      this._resetToolCompletionPromise();
+    }
     logger.info(
       `[Task] Registered tool call: ${toolCallId}. Pending: ${this.pendingToolCalls.size}`,
     );
@@ -187,47 +203,23 @@ export class Task {
   private _resolveToolCall(toolCallId: string): void {
     if (this.pendingToolCalls.has(toolCallId)) {
       this.pendingToolCalls.delete(toolCallId);
-      this.toolUpdateEmitter.emit('update');
       logger.info(
         `[Task] Resolved tool call: ${toolCallId}. Pending: ${this.pendingToolCalls.size}`,
       );
-    }
-  }
-
-  private isAwaitingApprovalOnly(): boolean {
-    if (this.pendingToolCalls.size === 0) {
-      return false;
-    }
-    for (const [callId, status] of this.pendingToolCalls.entries()) {
-      if (
-        status !== CoreToolCallStatus.AwaitingApproval ||
-        this.toolsAlreadyConfirmed.has(callId)
-      ) {
-        return false;
+      if (this.pendingToolCalls.size === 0 && this.toolCompletionNotifier) {
+        this.toolCompletionNotifier.resolve();
       }
     }
-    return true;
   }
 
   async waitForPendingTools(): Promise<void> {
-    while (this.pendingToolCalls.size > 0 && !this.isAwaitingApprovalOnly()) {
-      if (this.cancellationError) {
-        const error = this.cancellationError;
-        this.cancellationError = undefined;
-        throw error;
-      }
-      logger.info(
-        `[Task] Waiting for ${this.pendingToolCalls.size} pending tool(s)...`,
-      );
-      await new Promise((resolve) =>
-        this.toolUpdateEmitter.once('update', resolve),
-      );
-    }
-    if (this.cancellationError) {
-      const error = this.cancellationError;
-      this.cancellationError = undefined;
-      throw error;
+    if (this.pendingToolCalls.size === 0) {
+      return Promise.resolve();
     }
+    logger.info(
+      `[Task] Waiting for ${this.pendingToolCalls.size} pending tool(s)...`,
+    );
+    await this.toolCompletionPromise;
   }
 
   cancelPendingTools(reason: string): void {
@@ -236,13 +228,15 @@ export class Task {
         `[Task] Cancelling all ${this.pendingToolCalls.size} pending tool calls. Reason: ${reason}`,
       );
     }
-    this.cancellationError = new Error(reason);
+    if (this.toolCompletionNotifier) {
+      this.toolCompletionNotifier.reject(new Error(reason));
+    }
     this.pendingToolCalls.clear();
     this.pendingCorrelationIds.clear();
-    this.toolsAlreadyConfirmed.clear();
 
     this.scheduler.cancelAll();
-    this.toolUpdateEmitter.emit('update');
+    // Reset the promise for any future operations, ensuring it's in a clean state.
+    this._resetToolCompletionPromise();
   }
 
   private _createTextMessage(
@@ -558,8 +552,8 @@ export class Task {
 
       // Unblock waitForPendingTools to correctly end the executor loop and release the HTTP response stream.
       // The IDE client will open a new stream with the confirmation reply.
-      if (!wasAlreadyInputRequired) {
-        this.toolUpdateEmitter.emit('update');
+      if (!wasAlreadyInputRequired && this.toolCompletionNotifier) {
+        this.toolCompletionNotifier.resolve();
       }
     }
   }
@@ -923,7 +917,6 @@ export class Task {
     const outcomeString = part.data['outcome'];
 
     this.toolsAlreadyConfirmed.add(callId);
-    this.toolUpdateEmitter.emit('update');
 
     let confirmationOutcome: ToolConfirmationOutcome | undefined;
 
@@ -1137,6 +1130,10 @@ export class Task {
       if (confirmationHandled) {
         anyConfirmationHandled = true;
         // If a confirmation was handled, the scheduler will now run the tool (or cancel it).
+        // We resolve the toolCompletionPromise manually in checkInputRequiredState
+        // to break the original execution loop, so we must reset it here so the
+        // new loop correctly awaits the tool's final execution.
+        this._resetToolCompletionPromise();
         // We don't send anything to the LLM for this part.
         // The subsequent tool execution will eventually lead to resolveToolCall.
         continue;

packages/cli/src/acp/acpSession.test.ts

@@ -586,125 +586,4 @@ describe('Session', () => {
       },
     });
   });
-
-  it('should add explanation to tool call content instead of thought chunk', async () => {
-    mockTool.build.mockReturnValue({
-      getDescription: () => 'Test Tool',
-      getExplanation: () => 'Test Explanation',
-      toolLocations: () => [],
-      shouldConfirmExecute: vi
-        .fn()
-        .mockResolvedValue({ type: 'info', onConfirm: vi.fn() }),
-      execute: vi.fn().mockResolvedValue({ llmContent: 'Tool Result' }),
-    });
-
-    mockConnection.requestPermission.mockResolvedValue({
-      outcome: {
-        outcome: 'selected',
-        optionId: 'proceed_once',
-      },
-    });
-
-    const stream1 = createMockStream([
-      {
-        type: GeminiEventType.ToolCallRequest,
-        value: {
-          callId: 'call-1',
-          name: 'test_tool',
-          args: {},
-          isClientInitiated: false,
-          prompt_id: 'prompt-1',
-        },
-      },
-    ]);
-    const stream2 = createMockStream([
-      {
-        type: GeminiEventType.Content,
-        value: '',
-      },
-    ]);
-
-    mockSendMessageStream
-      .mockReturnValueOnce(stream1)
-      .mockReturnValueOnce(stream2);
-
-    await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Call tool' }],
-    });
-
-    expect(mockConnection.sessionUpdate).not.toHaveBeenCalledWith(
-      expect.objectContaining({
-        update: expect.objectContaining({
-          sessionUpdate: 'agent_thought_chunk',
-          content: { type: 'text', text: 'Test Explanation' },
-        }),
-      }),
-    );
-
-    expect(mockConnection.requestPermission).toHaveBeenCalledWith(
-      expect.objectContaining({
-        toolCall: expect.objectContaining({
-          content: expect.arrayContaining([
-            {
-              type: 'content',
-              content: { type: 'text', text: 'Test Explanation' },
-            },
-          ]),
-        }),
-      }),
-    );
-  });
-
-  it('should add explanation to tool_call update content instead of thought chunk when no permission required', async () => {
-    mockTool.build.mockReturnValue({
-      getDescription: () => 'Test Tool',
-      getExplanation: () => 'Test Explanation',
-      toolLocations: () => [],
-      shouldConfirmExecute: vi.fn().mockResolvedValue(null),
-      execute: vi.fn().mockResolvedValue({ llmContent: 'Tool Result' }),
-    });
-
-    const stream1 = createMockStream([
-      {
-        type: GeminiEventType.ToolCallRequest,
-        value: {
-          callId: 'call-1',
-          name: 'test_tool',
-          args: {},
-          isClientInitiated: false,
-          prompt_id: 'prompt-1',
-        },
-      },
-    ]);
-    const stream2 = createMockStream([
-      {
-        type: GeminiEventType.Content,
-        value: '',
-      },
-    ]);
-
-    mockSendMessageStream
-      .mockReturnValueOnce(stream1)
-      .mockReturnValueOnce(stream2);
-
-    await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Call tool' }],
-    });
-
-    expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(
-      expect.objectContaining({
-        update: expect.objectContaining({
-          sessionUpdate: 'tool_call',
-          content: expect.arrayContaining([
-            {
-              type: 'content',
-              content: { type: 'text', text: 'Test Explanation' },
-            },
-          ]),
-        }),
-      }),
-    );
-  });
 });

packages/cli/src/acp/acpSession.ts

@@ -619,6 +619,13 @@ export class Session {
           ? invocation.getExplanation()
           : '';
 
+      if (explanation) {
+        await this.sendUpdate({
+          sessionUpdate: 'agent_thought_chunk',
+          content: { type: 'text', text: explanation },
+        });
+      }
+
       const confirmationDetails =
         await invocation.shouldConfirmExecute(abortSignal);
 
@@ -641,13 +648,6 @@ export class Session {
           });
         }
 
-        if (content.length === 0 && explanation) {
-          content.push({
-            type: 'content',
-            content: { type: 'text', text: explanation },
-          });
-        }
-
         const params: acp.RequestPermissionRequest = {
           sessionId: this.id,
           options: toPermissionOptions(
@@ -708,13 +708,6 @@ export class Session {
       } else {
         const content: acp.ToolCallContent[] = [];
 
-        if (explanation) {
-          content.push({
-            type: 'content',
-            content: { type: 'text', text: explanation },
-          });
-        }
-
         await this.sendUpdate({
           sessionUpdate: 'tool_call',
           toolCallId: callId,

packages/cli/src/commands/mcp/list.test.ts

@@ -14,17 +14,16 @@ import {
   type Mock,
 } from 'vitest';
 import { listMcpServers } from './list.js';
-import { loadSettings } from '../../config/settings.js';
 import {
-  createTransport,
-  debugLogger,
-  type AdminControlsSettings,
-} from '@google/gemini-cli-core';
+  loadSettings,
+  mergeSettings,
+  type LoadedSettings,
+} from '../../config/settings.js';
+import { createTransport, debugLogger } from '@google/gemini-cli-core';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { ExtensionStorage } from '../../config/extensions/storage.js';
 import { ExtensionManager } from '../../config/extension-manager.js';
 import { McpServerEnablementManager } from '../../config/mcp/index.js';
-import { createMockSettings } from '../../test-utils/settings.js';
 
 vi.mock('../../config/settings.js', async (importOriginal) => {
   const actual =
@@ -134,7 +133,10 @@ describe('mcp list command', () => {
   });
 
   it('should display message when no servers configured', async () => {
-    mockedLoadSettings.mockReturnValue(createMockSettings({ mcpServers: {} }));
+    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
+    mockedLoadSettings.mockReturnValue({
+      merged: { ...defaultMergedSettings, mcpServers: {} },
+    });
 
     await listMcpServers();
 
@@ -142,8 +144,10 @@ describe('mcp list command', () => {
   });
 
   it('should display different server types with connected status', async () => {
-    mockedLoadSettings.mockReturnValue(
-      createMockSettings({
+    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
+    mockedLoadSettings.mockReturnValue({
+      merged: {
+        ...defaultMergedSettings,
         mcpServers: {
           'stdio-server': { command: '/path/to/server', args: ['arg1'] },
           'sse-server': { url: 'https://example.com/sse', type: 'sse' },
@@ -154,9 +158,9 @@ describe('mcp list command', () => {
             type: 'http',
           },
         },
-        isTrusted: true,
-      }),
-    );
+      },
+      isTrusted: true,
+    });
 
     mockClient.connect.mockResolvedValue(undefined);
     mockClient.ping.mockResolvedValue(undefined);
@@ -192,14 +196,15 @@ describe('mcp list command', () => {
   });
 
   it('should display disconnected status when connection fails', async () => {
-    mockedLoadSettings.mockReturnValue(
-      createMockSettings({
+    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
+    mockedLoadSettings.mockReturnValue({
+      merged: {
+        ...defaultMergedSettings,
         mcpServers: {
           'test-server': { command: '/test/server' },
         },
-        isTrusted: true,
-      }),
-    );
+      },
+    });
 
     mockClient.connect.mockRejectedValue(new Error('Connection failed'));
 
@@ -213,14 +218,16 @@ describe('mcp list command', () => {
   });
 
   it('should display connected status even if ping fails', async () => {
-    mockedLoadSettings.mockReturnValue(
-      createMockSettings({
+    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
+    mockedLoadSettings.mockReturnValue({
+      merged: {
+        ...defaultMergedSettings,
         mcpServers: {
           'test-server': { command: '/test/server' },
         },
-        isTrusted: true,
-      }),
-    );
+      },
+      isTrusted: true,
+    });
 
     mockClient.connect.mockResolvedValue(undefined);
     mockClient.ping.mockRejectedValue(new Error('Ping failed'));
@@ -233,14 +240,16 @@ describe('mcp list command', () => {
   });
 
   it('should use configured timeout for connection', async () => {
-    mockedLoadSettings.mockReturnValue(
-      createMockSettings({
+    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
+    mockedLoadSettings.mockReturnValue({
+      merged: {
+        ...defaultMergedSettings,
         mcpServers: {
           'test-server': { command: '/test/server', timeout: 12345 },
         },
-        isTrusted: true,
-      }),
-    );
+      },
+      isTrusted: true,
+    });
 
     mockClient.connect.mockResolvedValue(undefined);
 
@@ -256,14 +265,16 @@ describe('mcp list command', () => {
   });
 
   it('should use default timeout for connection when not configured', async () => {
-    mockedLoadSettings.mockReturnValue(
-      createMockSettings({
+    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
+    mockedLoadSettings.mockReturnValue({
+      merged: {
+        ...defaultMergedSettings,
         mcpServers: {
           'test-server': { command: '/test/server' },
         },
-        isTrusted: true,
-      }),
-    );
+      },
+      isTrusted: true,
+    });
 
     mockClient.connect.mockResolvedValue(undefined);
 
@@ -279,14 +290,16 @@ describe('mcp list command', () => {
   });
 
   it('should merge extension servers with config servers', async () => {
-    mockedLoadSettings.mockReturnValue(
-      createMockSettings({
+    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
+    mockedLoadSettings.mockReturnValue({
+      merged: {
+        ...defaultMergedSettings,
         mcpServers: {
           'config-server': { command: '/config/server' },
         },
-        isTrusted: true,
-      }),
-    );
+      },
+      isTrusted: true,
+    });
 
     mockExtensionManager.loadExtensions.mockReturnValue([
       {
@@ -313,40 +326,36 @@ describe('mcp list command', () => {
   });
 
   it('should filter servers based on admin allowlist passed in settings', async () => {
-    const adminControls = {
-      strictModeDisabled: true,
-      mcpSetting: {
-        mcpEnabled: true,
-        mcpConfig: {
-          mcpServers: {
-            'allowed-server': { url: 'http://allowed' },
-          },
+    const settingsWithAllowlist = mergeSettings({}, {}, {}, {}, true);
+    settingsWithAllowlist.admin = {
+      secureModeEnabled: false,
+      extensions: { enabled: true },
+      skills: { enabled: true },
+      mcp: {
+        enabled: true,
+        config: {
+          'allowed-server': { url: 'http://allowed' },
         },
+        requiredConfig: {},
       },
     };
 
-    const mcpServers = {
+    settingsWithAllowlist.mcpServers = {
       'allowed-server': { command: 'cmd1' },
       'forbidden-server': { command: 'cmd2' },
     };
 
-    const mockSettings = createMockSettings({
-      mcpServers,
-      isTrusted: true,
+    mockedLoadSettings.mockReturnValue({
+      merged: settingsWithAllowlist,
     });
-    // setRemoteAdminSettings is the correct way to set admin settings in tests
-    (
-      mockSettings as unknown as {
-        setRemoteAdminSettings: (controls: AdminControlsSettings) => void;
-      }
-    ).setRemoteAdminSettings(adminControls as unknown as AdminControlsSettings);
-
-    mockedLoadSettings.mockReturnValue(mockSettings);
 
     mockClient.connect.mockResolvedValue(undefined);
     mockClient.ping.mockResolvedValue(undefined);
 
-    await listMcpServers(mockSettings);
+    await listMcpServers({
+      merged: settingsWithAllowlist,
+      isTrusted: true,
+    } as unknown as LoadedSettings);
 
     expect(debugLogger.log).toHaveBeenCalledWith(
       expect.stringContaining('allowed-server'),
@@ -362,40 +371,44 @@ describe('mcp list command', () => {
     );
   });
 
-  it('should show stdio servers as disabled in untrusted folders', async () => {
-    mockedLoadSettings.mockReturnValue(
-      createMockSettings({
+  it('should show stdio servers as disconnected in untrusted folders', async () => {
+    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
+    mockedLoadSettings.mockReturnValue({
+      merged: {
+        ...defaultMergedSettings,
         mcpServers: {
           'test-server': { command: '/test/server' },
         },
-        isTrusted: false,
-      }),
-    );
+      },
+      isTrusted: false,
+    });
+
+    // createTransport will throw in core if not trusted
+    mockedCreateTransport.mockRejectedValue(new Error('Folder not trusted'));
 
     await listMcpServers();
 
     expect(debugLogger.log).toHaveBeenCalledWith(
       expect.stringContaining(
-        'Warning: MCP servers are configured but disabled because this folder is untrusted.',
+        'test-server: /test/server  (stdio) - Disconnected',
       ),
     );
-    expect(debugLogger.log).toHaveBeenCalledWith(
-      expect.stringContaining('test-server: /test/server  (stdio) - Disabled'),
-    );
   });
 
   it('should display blocked status for servers in excluded list', async () => {
-    mockedLoadSettings.mockReturnValue(
-      createMockSettings({
+    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
+    mockedLoadSettings.mockReturnValue({
+      merged: {
+        ...defaultMergedSettings,
         mcp: {
           excluded: ['blocked-server'],
         },
         mcpServers: {
           'blocked-server': { command: '/test/server' },
         },
-        isTrusted: true,
-      }),
-    );
+      },
+      isTrusted: true,
+    });
 
     await listMcpServers();
 
@@ -408,14 +421,16 @@ describe('mcp list command', () => {
   });
 
   it('should display disabled status for servers disabled via enablement manager', async () => {
-    mockedLoadSettings.mockReturnValue(
-      createMockSettings({
+    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
+    mockedLoadSettings.mockReturnValue({
+      merged: {
+        ...defaultMergedSettings,
         mcpServers: {
           'disabled-server': { command: '/test/server' },
         },
-        isTrusted: true,
-      }),
-    );
+      },
+      isTrusted: true,
+    });
 
     vi.spyOn(
       McpServerEnablementManager.prototype,
@@ -431,48 +446,4 @@ describe('mcp list command', () => {
     );
     expect(mockedCreateTransport).not.toHaveBeenCalled();
   });
-
-  it('should display warning and disabled status in untrusted folders', async () => {
-    const userMcpServers = {
-      'user-server': { url: 'https://example.com/user' },
-    };
-    const workspaceMcpServers = {
-      'project-server': { command: '/path/to/project/server' },
-    };
-
-    mockedLoadSettings.mockReturnValue(
-      createMockSettings({
-        user: {
-          settings: { mcpServers: userMcpServers },
-          originalSettings: { mcpServers: userMcpServers },
-          path: '/mock/user/settings.json',
-        },
-        workspace: {
-          settings: { mcpServers: workspaceMcpServers },
-          originalSettings: { mcpServers: workspaceMcpServers },
-          path: '/mock/workspace/settings.json',
-        },
-        isTrusted: false,
-      }),
-    );
-
-    await listMcpServers();
-
-    expect(debugLogger.log).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'Warning: MCP servers are configured but disabled because this folder is untrusted.',
-      ),
-    );
-    expect(debugLogger.log).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'project-server: /path/to/project/server  (stdio) - Disabled',
-      ),
-    );
-    expect(debugLogger.log).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'user-server: https://example.com/user (http) - Disabled',
-      ),
-    );
-    expect(mockedCreateTransport).not.toHaveBeenCalled();
-  });
 });

packages/cli/src/commands/mcp/list.ts

@@ -179,10 +179,6 @@ async function getServerStatus(
     return MCPServerStatus.DISABLED;
   }
 
-  if (!isTrusted) {
-    return MCPServerStatus.DISABLED;
-  }
-
   // Test all server types by attempting actual connection
   return testMCPConnection(serverName, server, isTrusted, activeSettings);
 }
@@ -193,14 +189,8 @@ export async function listMcpServers(
   const loadedSettings = loadedSettingsArg ?? loadSettings();
   const activeSettings = loadedSettings.merged;
 
-  // If the folder is untrusted, we want to show all configured servers (including
-  // project-scoped ones) as disabled.
-  const allSettings = !loadedSettings.isTrusted
-    ? loadedSettings.getMergedSettingsAsIfTrusted()
-    : activeSettings;
-
   const { mcpServers, blockedServerNames } =
-    await getMcpServersFromConfig(allSettings);
+    await getMcpServersFromConfig(activeSettings);
   const serverNames = Object.keys(mcpServers);
 
   if (blockedServerNames.length > 0) {
@@ -218,15 +208,6 @@ export async function listMcpServers(
     return;
   }
 
-  if (!loadedSettings.isTrusted) {
-    debugLogger.log(
-      chalk.yellow(
-        'Warning: MCP servers are configured but disabled because this folder is untrusted.\n' +
-          'User-level servers are also suppressed in untrusted folders to prevent accidental side-effects.\n',
-      ),
-    );
-  }
-
   debugLogger.log('Configured MCP servers:\n');
 
   for (const serverName of serverNames) {

packages/cli/src/config/config.test.ts

@@ -234,7 +234,7 @@ describe('parseArguments', () => {
   afterEach(() => {
     vi.restoreAllMocks();
   });
-  it('should fail if multiple session flags are provided', async () => {
+  it('should fail if both --resume and --session-id are provided', async () => {
     process.argv = [
       'node',
       'script.js',
@@ -255,7 +255,7 @@ describe('parseArguments', () => {
 
     expect(mockConsoleError).toHaveBeenCalledWith(
       expect.stringContaining(
-        'The flags --resume, --session-id, and --session-file are mutually exclusive. Please provide only one.',
+        'Cannot use both --resume (-r) and --session-id together',
       ),
     );
   });
@@ -1043,28 +1043,6 @@ describe('loadCliConfig', () => {
 
     expect(config.isInteractive()).toBe(false);
   });
-
-  describe('isAcpMode', () => {
-    it('should force skipNextSpeakerCheck to true when in ACP mode', async () => {
-      process.argv = ['node', 'script.js', '--acp'];
-      const argv = await parseArguments(createTestMergedSettings());
-      const settings = createTestMergedSettings({
-        model: { skipNextSpeakerCheck: false },
-      });
-      const config = await loadCliConfig(settings, 'test-session', argv);
-      expect(config.getSkipNextSpeakerCheck()).toBe(true);
-    });
-
-    it('should respect settings.model.skipNextSpeakerCheck when not in ACP mode', async () => {
-      process.argv = ['node', 'script.js'];
-      const argv = await parseArguments(createTestMergedSettings());
-      const settings = createTestMergedSettings({
-        model: { skipNextSpeakerCheck: false },
-      });
-      const config = await loadCliConfig(settings, 'test-session', argv);
-      expect(config.getSkipNextSpeakerCheck()).toBe(false);
-    });
-  });
 });
 
 describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {

packages/cli/src/config/config.ts

@@ -97,7 +97,6 @@ export interface CliArgs {
   extensions: string[] | undefined;
   listExtensions: boolean | undefined;
   resume: string | typeof RESUME_LATEST | undefined;
-  sessionFile?: string | undefined;
   sessionId: string | undefined;
   listSessions: boolean | undefined;
   deleteSession: string | undefined;
@@ -240,14 +239,8 @@ export async function parseArguments(
         ? query.length > 0
         : !!query;
 
-      const sessionFlags = [
-        argv['resume'] !== undefined,
-        argv['session-id'] !== undefined,
-        argv['session-file'] !== undefined,
-      ].filter(Boolean).length;
-
-      if (sessionFlags > 1) {
-        return 'The flags --resume, --session-id, and --session-file are mutually exclusive. Please provide only one.';
+      if (argv['resume'] !== undefined && argv['session-id'] !== undefined) {
+        return 'Cannot use both --resume (-r) and --session-id together';
       }
 
       if (argv['prompt'] && hasPositionalQuery) {
@@ -419,11 +412,6 @@ export async function parseArguments(
             return trimmed;
           },
         })
-        .option('session-file', {
-          type: 'string',
-          nargs: 1,
-          description: 'Load a session from a JSON file',
-        })
         .option('session-id', {
           type: 'string',
           nargs: 1,
@@ -1105,11 +1093,7 @@ export async function loadCliConfig(
     shellToolInactivityTimeout: settings.tools?.shell?.inactivityTimeout,
     enableShellOutputEfficiency:
       settings.tools?.shell?.enableShellOutputEfficiency ?? true,
-    // In ACP mode, always skip the next-speaker check. This check triggers
-    // recursive continuation turns inside GeminiClient.processTurn() that
-    // conflict with ACP's explicit turn management via session/prompt,
-    // causing infinite agent_thought_chunk loops.
-    skipNextSpeakerCheck: isAcpMode || settings.model?.skipNextSpeakerCheck,
+    skipNextSpeakerCheck: settings.model?.skipNextSpeakerCheck,
     truncateToolOutputThreshold: settings.tools?.truncateToolOutputThreshold,
     eventEmitter: coreEvents,
     useWriteTodos: argv.useWriteTodos ?? settings.useWriteTodos,

packages/cli/src/config/extension-manager.ts

@@ -1300,8 +1300,7 @@ export async function inferInstallMetadata(
     source.startsWith('git@') ||
     source.startsWith('sso://') ||
     source.startsWith('github:') ||
-    source.startsWith('gitlab:') ||
-    source.startsWith('ssh://')
+    source.startsWith('gitlab:')
   ) {
     return {
       source,

packages/cli/src/config/footerItems.test.ts

@@ -120,7 +120,6 @@ describe('footerItems', () => {
         'quota',
         'memory-usage',
         'session-id',
-        'hostname',
         'code-changes',
         'token-count',
       ]);

packages/cli/src/config/footerItems.ts

@@ -47,11 +47,6 @@ export const ALL_ITEMS = [
     header: 'session',
     description: 'Unique identifier for the current session',
   },
-  {
-    id: 'hostname',
-    header: 'machine',
-    description: 'Current machine hostname',
-  },
   {
     id: 'auth',
     header: '/auth',
@@ -80,7 +75,6 @@ export const DEFAULT_ORDER = [
   'quota',
   'memory-usage',
   'session-id',
-  'hostname',
   'auth',
   'code-changes',
   'token-count',

packages/cli/src/config/mutual-exclusivity.test.ts

@@ -1,44 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi, afterEach } from 'vitest';
-import { parseArguments } from './config.js';
-import { createTestMergedSettings } from './settings.js';
-
-describe('parseArguments mutual exclusivity', () => {
-  afterEach(() => {
-    vi.restoreAllMocks();
-  });
-
-  const combinations = [
-    ['--resume', '--session-id', 'test-id'],
-    ['--resume', '--session-file', 'test.json'],
-    ['--session-id', 'test-id', '--session-file', 'test.json'],
-    ['--resume', '--session-id', 'test-id', '--session-file', 'test.json'],
-  ];
-
-  combinations.forEach((args) => {
-    it(`should fail if ${args.filter((a) => a.startsWith('--')).join(' and ')} are provided`, async () => {
-      process.argv = ['node', 'script.js', ...args];
-      const mockConsoleError = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
-      vi.spyOn(process, 'exit').mockImplementation(() => {
-        throw new Error('process.exit called');
-      });
-
-      await expect(parseArguments(createTestMergedSettings())).rejects.toThrow(
-        'process.exit called',
-      );
-
-      expect(mockConsoleError).toHaveBeenCalledWith(
-        expect.stringContaining(
-          'The flags --resume, --session-id, and --session-file are mutually exclusive. Please provide only one.',
-        ),
-      );
-    });
-  });
-});

packages/cli/src/config/settings.test.ts

@@ -3005,44 +3005,6 @@ describe('Settings Loading and Merging', () => {
       expect(snap1).toBe(snap2);
     });
 
-    it('getSnapshot() should preserve readOnly metadata for each scope', () => {
-      const readonlySettings = new LoadedSettings(
-        {
-          path: getSystemSettingsPath(),
-          settings: {},
-          originalSettings: {},
-          readOnly: true,
-        },
-        {
-          path: getSystemDefaultsPath(),
-          settings: {},
-          originalSettings: {},
-          readOnly: true,
-        },
-        {
-          path: USER_SETTINGS_PATH,
-          settings: {},
-          originalSettings: {},
-          readOnly: false,
-        },
-        {
-          path: MOCK_WORKSPACE_SETTINGS_PATH,
-          settings: {},
-          originalSettings: {},
-          readOnly: true,
-        },
-        true,
-        [],
-      );
-
-      const snapshot = readonlySettings.getSnapshot();
-
-      expect(snapshot.system.readOnly).toBe(true);
-      expect(snapshot.systemDefaults.readOnly).toBe(true);
-      expect(snapshot.user.readOnly).toBe(false);
-      expect(snapshot.workspace.readOnly).toBe(true);
-    });
-
     it('setValue() should create a new snapshot reference and emit event', () => {
       const oldSnapshot = loadedSettings.getSnapshot();
       const oldUserRef = oldSnapshot.user.settings;

packages/cli/src/config/settings.ts

@@ -348,15 +348,6 @@ export class LoadedSettings {
     return this._merged;
   }
 
-  /**
-   * Returns a merged settings object as if the folder were trusted.
-   * This is useful for commands like 'mcp list' that want to show
-   * what's configured even if it's currently disabled for security reasons.
-   */
-  getMergedSettingsAsIfTrusted(): MergedSettings {
-    return this.computeMergedSettings(true);
-  }
-
   setTrusted(isTrusted: boolean): void {
     if (this.isTrusted === isTrusted) {
       return;
@@ -377,16 +368,13 @@ export class LoadedSettings {
     };
   }
 
-  private computeMergedSettings(forceTrusted = false): MergedSettings {
-    const isTrusted = forceTrusted || this.isTrusted;
-    const workspace = forceTrusted ? this._workspaceFile : this.workspace;
-
+  private computeMergedSettings(): MergedSettings {
     const merged = mergeSettings(
       this.system.settings,
       this.systemDefaults.settings,
       this.user.settings,
-      workspace.settings,
-      isTrusted,
+      this.workspace.settings,
+      this.isTrusted,
     );
 
     // Remote admin settings always take precedence and file-based admin settings
@@ -410,7 +398,8 @@ export class LoadedSettings {
 
   private computeSnapshot(): LoadedSettingsSnapshot {
     const cloneSettingsFile = (file: SettingsFile): SettingsFile => ({
-      ...file,
+      path: file.path,
+      rawJson: file.rawJson,
       settings: structuredClone(file.settings),
       originalSettings: structuredClone(file.originalSettings),
     });

packages/cli/src/config/settingsSchema.ts

@@ -2149,7 +2149,7 @@ const SETTINGS_SCHEMA = {
             label: 'Voice Stop Grace Period (ms)',
             category: 'Experimental',
             requiresRestart: false,
-            default: 4000,
+            default: 1000,
             description:
               'How long to wait for final transcription after stopping recording.',
             showInDialog: true,

packages/cli/src/gemini.test.tsx

@@ -44,7 +44,6 @@ import {
   type Config,
   type ResumedSessionData,
   type StartupWarning,
-  type ConversationRecord,
   WarningPriority,
   debugLogger,
   coreEvents,
@@ -829,14 +828,14 @@ describe('gemini.tsx main function kitty protocol', () => {
   });
 
   it('should handle session selector error', async () => {
-    // eslint-disable-next-line prefer-arrow-callback
-    vi.mocked(SessionSelector).mockImplementation(function () {
-      return {
-        resolveSession: vi
-          .fn()
-          .mockRejectedValue(new Error('Session not found')),
-      } as unknown as InstanceType<typeof SessionSelector>;
-    });
+    vi.mocked(SessionSelector).mockImplementation(
+      () =>
+        ({
+          resolveSession: vi
+            .fn()
+            .mockRejectedValue(new Error('Session not found')),
+        }) as any, // eslint-disable-line @typescript-eslint/no-explicit-any
+    );
 
     const processExitSpy = vi
       .spyOn(process, 'exit')
@@ -885,14 +884,14 @@ describe('gemini.tsx main function kitty protocol', () => {
   });
 
   it('should start normally with a warning when no sessions found for resume', async () => {
-    // eslint-disable-next-line prefer-arrow-callback
-    vi.mocked(SessionSelector).mockImplementation(function () {
-      return {
-        resolveSession: vi
-          .fn()
-          .mockRejectedValue(SessionError.noSessionsFound()),
-      } as unknown as InstanceType<typeof SessionSelector>;
-    });
+    vi.mocked(SessionSelector).mockImplementation(
+      () =>
+        ({
+          resolveSession: vi
+            .fn()
+            .mockRejectedValue(SessionError.noSessionsFound()),
+        }) as unknown as InstanceType<typeof SessionSelector>,
+    );
 
     const processExitSpy = vi
       .spyOn(process, 'exit')
@@ -1069,88 +1068,13 @@ describe('resolveSessionId', () => {
     expect(resumedSessionData).toBeUndefined();
   });
 
-  it('should import from session file when sessionFile is provided', async () => {
-    // eslint-disable-next-line prefer-arrow-callback
-    vi.mocked(SessionSelector).mockImplementation(function () {
-      return {
-        sessionExists: vi.fn().mockResolvedValue(false),
-      } as unknown as InstanceType<typeof SessionSelector>;
-    });
-
-    const coreModule = await import('@google/gemini-cli-core');
-    vi.spyOn(coreModule, 'loadConversationRecord').mockResolvedValueOnce({
-      sessionId: 'old-session-id',
-      projectHash: 'hash',
-      startTime: 'time',
-      lastUpdated: 'time',
-      messages: [
-        { type: 'info', content: 'Old info', id: '1' },
-        { type: 'user', content: 'Hello', id: '2' },
-        { type: 'gemini', content: 'Hi', id: '3' },
-        { type: 'error', content: 'Old error', id: '4' },
-        { type: 'user', id: '5' }, // Missing content
-        null, // Null object
-        { type: 'unknown', content: 'Something', id: '6' }, // Unknown type
-      ],
-    } as unknown as ConversationRecord);
-
-    const emitFeedbackSpy = vi.spyOn(coreEvents, 'emitFeedback');
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((code) => {
-        throw new MockProcessExitError(code);
-      });
-
-    try {
-      const { sessionId, resumedSessionData } = await resolveSessionId(
-        undefined,
-        undefined,
-        'dummy-session.json',
-      );
-
-      expect(sessionId).toBeDefined();
-      expect(sessionId).not.toBe('old-session-id'); // A new session ID should be created
-      expect(resumedSessionData).toBeDefined();
-      expect(resumedSessionData?.conversation.sessionId).toBe(sessionId); // Overwritten
-
-      // Verify messages: should have 1 info (the new import confirmation) + 2 valid conversation messages
-      // Invalid messages (missing content, null, unknown type) and transient messages should be filtered out.
-      expect(resumedSessionData?.conversation.messages).toHaveLength(3);
-      expect(resumedSessionData?.conversation.messages![0]).toMatchObject({
-        type: 'info',
-        content: expect.stringContaining('Imported session from'),
-      });
-      expect(resumedSessionData?.conversation.messages![1]).toMatchObject({
-        type: 'user',
-        content: 'Hello',
-      });
-      expect(resumedSessionData?.conversation.messages![2]).toMatchObject({
-        type: 'gemini',
-        content: 'Hi',
-      });
-
-      expect(resumedSessionData?.filePath).toContain(sessionId.slice(0, 8)); // New path
-    } catch (e) {
-      if (e instanceof MockProcessExitError) {
-        throw new Error(
-          'process.exit called with: ' +
-            JSON.stringify(emitFeedbackSpy.mock.calls),
-        );
-      }
-      throw e;
-    } finally {
-      emitFeedbackSpy.mockRestore();
-      processExitSpy.mockRestore();
-    }
-  });
-
   it('should exit with FATAL_INPUT_ERROR when sessionId already exists', async () => {
-    // eslint-disable-next-line prefer-arrow-callback
-    vi.mocked(SessionSelector).mockImplementation(function () {
-      return {
-        sessionExists: vi.fn().mockResolvedValue(true),
-      } as unknown as InstanceType<typeof SessionSelector>;
-    });
+    vi.mocked(SessionSelector).mockImplementation(
+      () =>
+        ({
+          sessionExists: vi.fn().mockResolvedValue(true),
+        }) as unknown as InstanceType<typeof SessionSelector>,
+    );
 
     const emitFeedbackSpy = vi.spyOn(coreEvents, 'emitFeedback');
     const processExitSpy = vi
@@ -1176,12 +1100,12 @@ describe('resolveSessionId', () => {
   });
 
   it('should return provided sessionId when it does not exist', async () => {
-    // eslint-disable-next-line prefer-arrow-callback
-    vi.mocked(SessionSelector).mockImplementation(function () {
-      return {
-        sessionExists: vi.fn().mockResolvedValue(false),
-      } as unknown as InstanceType<typeof SessionSelector>;
-    });
+    vi.mocked(SessionSelector).mockImplementation(
+      () =>
+        ({
+          sessionExists: vi.fn().mockResolvedValue(false),
+        }) as unknown as InstanceType<typeof SessionSelector>,
+    );
     const { sessionId, resumedSessionData } = await resolveSessionId(
       undefined,
       'new-id',
@@ -1189,39 +1113,6 @@ describe('resolveSessionId', () => {
     expect(sessionId).toBe('new-id');
     expect(resumedSessionData).toBeUndefined();
   });
-
-  it('should exit with FATAL_INPUT_ERROR when explicit resume session is missing', async () => {
-    vi.mocked(SessionSelector).mockImplementation(
-      () =>
-        ({
-          resolveSession: vi
-            .fn()
-            .mockRejectedValue(SessionError.noSessionsFound()),
-        }) as unknown as InstanceType<typeof SessionSelector>,
-    );
-
-    const emitFeedbackSpy = vi.spyOn(coreEvents, 'emitFeedback');
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((code) => {
-        throw new MockProcessExitError(code);
-      });
-
-    try {
-      await resolveSessionId('explicit-session-id');
-    } catch (e) {
-      if (!(e instanceof MockProcessExitError)) throw e;
-    }
-
-    expect(emitFeedbackSpy).toHaveBeenCalledWith(
-      'error',
-      expect.stringContaining('Error resuming session:'),
-    );
-    expect(processExitSpy).toHaveBeenCalledWith(ExitCodes.FATAL_INPUT_ERROR);
-
-    emitFeedbackSpy.mockRestore();
-    processExitSpy.mockRestore();
-  });
 });
 
 describe('gemini.tsx main function exit codes', () => {

packages/cli/src/gemini.tsx

@@ -35,9 +35,6 @@ import {
   debugLogger,
   isHeadlessMode,
   Storage,
-  getProjectHash,
-  loadConversationRecord,
-  type MessageRecord,
 } from '@google/gemini-cli-core';
 
 import { loadCliConfig, parseArguments } from './config/config.js';
@@ -47,8 +44,6 @@ import { createHash } from 'node:crypto';
 import v8 from 'node:v8';
 import os from 'node:os';
 import dns from 'node:dns';
-import * as path from 'node:path';
-import * as fsPromises from 'node:fs/promises';
 import { start_sandbox } from './utils/sandbox.js';
 import {
   loadSettings,
@@ -85,11 +80,7 @@ import { validateAuthMethod } from './config/auth.js';
 import { runAcpClient } from './acp/acpStdioTransport.js';
 import { validateNonInteractiveAuth } from './validateNonInterActiveAuth.js';
 import { appEvents, AppEvent } from './utils/events.js';
-import {
-  RESUME_LATEST,
-  SessionError,
-  SessionSelector,
-} from './utils/sessionUtils.js';
+import { SessionError, SessionSelector } from './utils/sessionUtils.js';
 
 import { relaunchOnExitCode } from './utils/relaunch.js';
 import { loadSandboxConfig } from './config/sandboxConfig.js';
@@ -203,12 +194,11 @@ ${reason.stack}`
 export async function resolveSessionId(
   resumeArg: string | undefined,
   sessionIdArg?: string | undefined,
-  sessionFileArg?: string | undefined,
 ): Promise<{
   sessionId: string;
   resumedSessionData?: ResumedSessionData;
 }> {
-  if (!resumeArg && !sessionIdArg && !sessionFileArg) {
+  if (!resumeArg && !sessionIdArg) {
     return { sessionId: createSessionId() };
   }
 
@@ -217,80 +207,6 @@ export async function resolveSessionId(
 
   const sessionSelector = new SessionSelector(storage);
 
-  if (sessionFileArg) {
-    try {
-      const sessionData = await loadConversationRecord(sessionFileArg);
-      if (!sessionData) {
-        throw new Error(`File not found or invalid format: ${sessionFileArg}`);
-      }
-
-      const now = Date.now();
-      const isoNow = new Date(now).toISOString();
-
-      // Filter out old system/info messages that are specific to the previous run
-      // and only keep actual conversation messages (user/gemini).
-      // Best effort parse: ensure message is an object and has required fields.
-      sessionData.messages = (sessionData.messages || []).filter(
-        (m) =>
-          typeof m === 'object' &&
-          m !== null &&
-          (m.type === 'user' || m.type === 'gemini') &&
-          m.content !== undefined,
-      );
-
-      // Add a single info message to the history to confirm the import
-      sessionData.messages.unshift({
-        id: `import-${now}`,
-        type: 'info',
-        content: `Imported session from ${sessionFileArg}`,
-        timestamp: isoNow,
-      } as MessageRecord);
-
-      const newSessionId = createSessionId();
-      sessionData.sessionId = newSessionId;
-      sessionData.projectHash = getProjectHash(storage.getProjectRoot());
-      sessionData.startTime = isoNow;
-      sessionData.lastUpdated = isoNow;
-
-      const chatsDir = path.join(storage.getProjectTempDir(), 'chats');
-      const newSessionPath = path.join(
-        chatsDir,
-        `session-${now}-${newSessionId.slice(0, 8)}.jsonl`,
-      );
-
-      const { messages: _messages, ...initialMetadata } = sessionData;
-
-      const lines = [JSON.stringify(initialMetadata)];
-      if (sessionData.messages) {
-        for (const msg of sessionData.messages) {
-          lines.push(JSON.stringify(msg));
-        }
-      }
-
-      await fsPromises.mkdir(chatsDir, { recursive: true });
-      await fsPromises.writeFile(
-        newSessionPath,
-        lines.join('\n') + '\n',
-        'utf-8',
-      );
-
-      return {
-        sessionId: newSessionId,
-        resumedSessionData: {
-          conversation: sessionData,
-          filePath: newSessionPath,
-        },
-      };
-    } catch (error) {
-      coreEvents.emitFeedback(
-        'error',
-        `Error importing session from file: ${error instanceof Error ? error.message : 'Unknown error'}`,
-      );
-      await runExitCleanup();
-      process.exit(ExitCodes.FATAL_INPUT_ERROR);
-    }
-  }
-
   if (sessionIdArg) {
     if (await sessionSelector.sessionExists(sessionIdArg)) {
       coreEvents.emitFeedback(
@@ -313,10 +229,8 @@ export async function resolveSessionId(
     };
   } catch (error) {
     if (error instanceof SessionError && error.code === 'NO_SESSIONS_FOUND') {
-      if (resumeArg === RESUME_LATEST) {
-        coreEvents.emitFeedback('warning', error.message);
-        return { sessionId: createSessionId() };
-      }
+      coreEvents.emitFeedback('warning', error.message);
+      return { sessionId: createSessionId() };
     }
     coreEvents.emitFeedback(
       'error',
@@ -426,7 +340,6 @@ export async function main() {
   const { sessionId, resumedSessionData } = await resolveSessionId(
     argv.resume,
     argv.sessionId,
-    argv.sessionFile,
   );
 
   if (

packages/cli/src/nonInteractiveCli.ts

@@ -68,9 +68,6 @@ export async function runNonInteractive(
 ): Promise<void> {
   const useAgentSession = params.config.getAgentSessionNoninteractiveEnabled();
   if (useAgentSession) {
-    debugLogger.debug(
-      '[ADK] Running non-interactive mode with ADK agent session',
-    );
     return runNonInteractiveAgentSession(params);
   }
 

packages/cli/src/services/BuiltinCommandLoader.test.ts

@@ -100,9 +100,7 @@ vi.mock('../ui/commands/helpCommand.js', () => ({ helpCommand: {} }));
 vi.mock('../ui/commands/shortcutsCommand.js', () => ({
   shortcutsCommand: {},
 }));
-vi.mock('../ui/commands/memoryCommand.js', () => ({
-  memoryCommand: () => ({}),
-}));
+vi.mock('../ui/commands/memoryCommand.js', () => ({ memoryCommand: {} }));
 vi.mock('../ui/commands/modelCommand.js', () => ({
   modelCommand: { name: 'model' },
 }));

packages/cli/src/services/BuiltinCommandLoader.ts

@@ -30,7 +30,6 @@ import { compressCommand } from '../ui/commands/compressCommand.js';
 import { copyCommand } from '../ui/commands/copyCommand.js';
 import { corgiCommand } from '../ui/commands/corgiCommand.js';
 import { docsCommand } from '../ui/commands/docsCommand.js';
-import { exportSessionCommand } from '../ui/commands/exportSessionCommand.js';
 import { directoryCommand } from '../ui/commands/directoryCommand.js';
 import { editorCommand } from '../ui/commands/editorCommand.js';
 import { extensionsCommand } from '../ui/commands/extensionsCommand.js';
@@ -136,7 +135,6 @@ export class BuiltinCommandLoader implements ICommandLoader {
       copyCommand,
       corgiCommand,
       docsCommand,
-      exportSessionCommand,
       directoryCommand,
       editorCommand,
       ...(this.config?.getExtensionsEnabled() === false
@@ -187,7 +185,7 @@ export class BuiltinCommandLoader implements ICommandLoader {
             },
           ]
         : [mcpCommand]),
-      memoryCommand(this.config),
+      memoryCommand,
       modelCommand,
       ...(this.config?.getFolderTrust() ? [permissionsCommand] : []),
       ...(this.config?.isPlanEnabled() ? [planCommand] : []),

packages/cli/src/services/FileCommandLoader.test.ts

@@ -6,12 +6,7 @@
 
 import * as glob from 'glob';
 import * as path from 'node:path';
-import {
-  GEMINI_DIR,
-  Storage,
-  type Config,
-  homedir,
-} from '@google/gemini-cli-core';
+import { GEMINI_DIR, Storage, type Config } from '@google/gemini-cli-core';
 import mock from 'mock-fs';
 import { FileCommandLoader } from './FileCommandLoader.js';
 import { assert, vi } from 'vitest';
@@ -26,7 +21,7 @@ import {
   ShellProcessor,
 } from './prompt-processors/shellProcessor.js';
 import { DefaultArgumentProcessor } from './prompt-processors/argumentProcessor.js';
-import { CommandKind, type CommandContext } from '../ui/commands/types.js';
+import type { CommandContext } from '../ui/commands/types.js';
 import { AtFileProcessor } from './prompt-processors/atFileProcessor.js';
 
 const mockShellProcess = vi.hoisted(() => vi.fn());
@@ -320,34 +315,6 @@ describe('FileCommandLoader', () => {
     }
   });
 
-  it('does not duplicate commands when project root is the home directory', async () => {
-    const homeDir = homedir();
-    const userCommandsDir = Storage.getUserCommandsDir();
-    mock({
-      [userCommandsDir]: {
-        'test.toml': 'prompt = "User prompt"',
-        'another.toml': 'prompt = "Another prompt"',
-      },
-    });
-
-    const mockConfig = {
-      getProjectRoot: vi.fn(() => homeDir),
-      getExtensions: vi.fn(() => []),
-      getFolderTrust: vi.fn(() => false),
-      isTrustedFolder: vi.fn(() => false),
-    } as unknown as Config;
-    const loader = new FileCommandLoader(mockConfig);
-    const commands = await loader.loadCommands(signal);
-
-    // Should load each command only once (as user commands), not twice
-    expect(commands).toHaveLength(2);
-    const names = commands.map((c) => c.name);
-    expect(names).toContain('test');
-    expect(names).toContain('another');
-    // Verify they are loaded as user commands, not duplicated as workspace commands
-    expect(commands.every((c) => c.kind === CommandKind.USER_FILE)).toBe(true);
-  });
-
   it('ignores files with TOML syntax errors', async () => {
     const userCommandsDir = Storage.getUserCommandsDir();
     mock({

packages/cli/src/services/FileCommandLoader.ts

@@ -212,20 +212,16 @@ export class FileCommandLoader implements ICommandLoader {
     const storage = this.config?.storage ?? new Storage(this.projectRoot);
 
     // 1. User commands
-    const userCommandsDir = Storage.getUserCommandsDir();
     dirs.push({
-      path: userCommandsDir,
+      path: Storage.getUserCommandsDir(),
       kind: CommandKind.USER_FILE,
     });
 
-    // 2. Project commands (skip if same directory as user commands, e.g. when
-    //    cwd is the user's home directory, to avoid false conflict warnings)
-    if (!storage.isWorkspaceHomeDir()) {
-      dirs.push({
-        path: storage.getProjectCommandsDir(),
-        kind: CommandKind.WORKSPACE_FILE,
-      });
-    }
+    // 2. Project commands
+    dirs.push({
+      path: storage.getProjectCommandsDir(),
+      kind: CommandKind.WORKSPACE_FILE,
+    });
 
     // 3. Extension commands (processed last to detect all conflicts)
     if (this.config) {

packages/cli/src/test-utils/settings.ts

@@ -16,7 +16,6 @@ export interface MockSettingsFile {
   settings: any;
   originalSettings: any;
   path: string;
-  readOnly?: boolean;
 }
 
 interface CreateMockSettingsOptions {

packages/cli/src/ui/AppContainer.test.tsx

@@ -1267,42 +1267,6 @@ describe('AppContainer State Management', () => {
     });
   });
 
-  describe('SessionStart Hook Rendering', () => {
-    it('does not render systemMessage directly (avoids duplicate with HookSystemMessage event)', async () => {
-      const mockAddItem = vi.fn();
-      mockedUseHistory.mockReturnValue({
-        history: [],
-        addItem: mockAddItem,
-        updateItem: vi.fn(),
-        clearItems: vi.fn(),
-        loadHistory: vi.fn(),
-      });
-
-      const fireSessionStartEvent = vi.fn().mockResolvedValue({
-        systemMessage: 'Hello from SessionStart hook',
-        getAdditionalContext: vi.fn(() => undefined),
-      });
-      vi.spyOn(mockConfig, 'getHookSystem').mockReturnValue({
-        fireSessionEndEvent: vi.fn().mockResolvedValue(undefined),
-        fireSessionStartEvent,
-      } as unknown as ReturnType<Config['getHookSystem']>);
-
-      const { unmount } = await act(async () => renderAppContainer());
-      await waitFor(() => expect(fireSessionStartEvent).toHaveBeenCalled());
-
-      // The direct-render path (the bug) would call addItem with the
-      // systemMessage text and no `source` field. The HookSystemMessage
-      // event-listener path (the correct one) always sets `source`.
-      const directRenderCall = mockAddItem.mock.calls.find(
-        ([item]) =>
-          item?.text === 'Hello from SessionStart hook' && !item?.source,
-      );
-      expect(directRenderCall).toBeUndefined();
-
-      unmount();
-    });
-  });
-
   describe('Token Counting from Session Stats', () => {
     it('tracks token counts from session messages', async () => {
       // Session stats are provided through the SessionStatsProvider context

packages/cli/src/ui/AppContainer.tsx

@@ -497,6 +497,16 @@ export const AppContainer = (props: AppContainerProps) => {
         ?.fireSessionStartEvent(sessionStartSource);
 
       if (result) {
+        if (result.systemMessage) {
+          historyManager.addItem(
+            {
+              type: MessageType.INFO,
+              text: result.systemMessage,
+            },
+            Date.now(),
+          );
+        }
+
         const additionalContext = result.getAdditionalContext();
         const geminiClient = config.getGeminiClient();
         if (additionalContext && geminiClient) {
@@ -539,6 +549,12 @@ export const AppContainer = (props: AppContainerProps) => {
         debugLogger.error('Error during cleanup:', e),
       );
     };
+    // Disable the dependencies check here. historyManager gets flagged
+    // but we don't want to react to changes to it because each new history
+    // item, including the ones from the start session hook will cause a
+    // re-render and an error when we try to reload config.
+    //
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [config, resumedSessionData]);
 
   useEffect(

packages/cli/src/ui/commands/exportSessionCommand.test.ts

@@ -1,135 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { exportSessionCommand } from './exportSessionCommand.js';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { SessionSelector } from '../../utils/sessionUtils.js';
-import type { CommandContext } from './types.js';
-import { Storage, type ConversationRecord } from '@google/gemini-cli-core';
-
-vi.mock('node:fs/promises');
-vi.mock('../../utils/sessionUtils.js');
-
-describe('exportSessionCommand', () => {
-  let mockContext: CommandContext;
-
-  beforeEach(() => {
-    vi.resetAllMocks();
-    vi.spyOn(Storage.prototype, 'initialize').mockResolvedValue(undefined);
-    vi.spyOn(Storage.prototype, 'getProjectTempDir').mockReturnValue(
-      path.join(path.sep, 'tmp', 'mock-dir'),
-    );
-    mockContext = {
-      services: {
-        agentContext: {
-          config: {
-            sessionId: 'test-session-id',
-            getSessionId: () => 'test-session-id',
-            storage: new Storage(process.cwd()),
-          },
-        },
-      },
-      invocation: {
-        args: '  export.json  ',
-        name: 'export-session',
-        raw: '/export-session export.json',
-      },
-      ui: {
-        addItem: vi.fn(),
-        setPendingItem: vi.fn(),
-        pendingItem: null,
-      },
-    } as unknown as CommandContext;
-  });
-
-  it('should return error if no path is provided', async () => {
-    mockContext.invocation!.args = '   ';
-    const result = await exportSessionCommand.action!(mockContext, '');
-
-    expect(result).toEqual({
-      type: 'message',
-      messageType: 'error',
-      content: expect.stringContaining('Please provide a file path'),
-    });
-  });
-
-  it('should return error if sessionId is missing', async () => {
-    mockContext.services.agentContext!.config.getSessionId = () =>
-      undefined as unknown as string;
-    const result = await exportSessionCommand.action!(mockContext, '');
-
-    expect(result).toEqual({
-      type: 'message',
-      messageType: 'error',
-      content: 'No active session found to export.',
-    });
-  });
-
-  it('should export the session successfully', async () => {
-    const mockSessionData: ConversationRecord = {
-      sessionId: 'test-session-id',
-      messages: [],
-      projectHash: 'hash',
-      startTime: 'time',
-      lastUpdated: 'time',
-    };
-    vi.mocked(SessionSelector.prototype.resolveSession).mockResolvedValue({
-      sessionData: mockSessionData,
-      sessionPath: path.join(
-        path.sep,
-        'tmp',
-        'mock-dir',
-        'chats',
-        'session.jsonl',
-      ),
-      displayInfo: 'test',
-    });
-
-    vi.mocked(fs.access).mockRejectedValue(new Error('Not found'));
-
-    const result = await exportSessionCommand.action!(mockContext, '');
-
-    expect(result).toBeUndefined();
-    expect(fs.writeFile).toHaveBeenCalledWith(
-      path.resolve(process.cwd(), 'export.json'),
-      JSON.stringify(mockSessionData, null, 2),
-      'utf-8',
-    );
-    expect(mockContext.ui.setPendingItem).toHaveBeenCalledWith(
-      expect.objectContaining({
-        type: 'export_session',
-        exportSession: { isPending: true },
-      }),
-    );
-    expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-      expect.objectContaining({
-        type: 'export_session',
-        exportSession: {
-          isPending: false,
-          targetPath: expect.stringContaining('export.json'),
-        },
-      }),
-      expect.any(Number),
-    );
-    expect(mockContext.ui.setPendingItem).toHaveBeenLastCalledWith(null);
-  });
-
-  it('should return error if resolveSession fails', async () => {
-    vi.mocked(SessionSelector.prototype.resolveSession).mockRejectedValue(
-      new Error('Session not found'),
-    );
-
-    const result = await exportSessionCommand.action!(mockContext, '');
-
-    expect(result).toEqual({
-      type: 'message',
-      messageType: 'error',
-      content: 'Failed to export session: Session not found',
-    });
-  });
-});

packages/cli/src/ui/commands/exportSessionCommand.ts

@@ -1,98 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import {
-  type CommandContext,
-  type SlashCommand,
-  type SlashCommandActionReturn,
-  CommandKind,
-} from './types.js';
-import { MessageType, type HistoryItemExportSession } from '../types.js';
-import { SessionSelector } from '../../utils/sessionUtils.js';
-
-export const exportSessionCommand: SlashCommand = {
-  name: 'export-session',
-  description: 'Export the current session to a JSON file',
-  kind: CommandKind.BUILT_IN,
-  autoExecute: true,
-  action: async (
-    context: CommandContext,
-  ): Promise<SlashCommandActionReturn | void> => {
-    const { ui } = context;
-    const args = context.invocation?.args.trim();
-    if (!args) {
-      return {
-        type: 'message',
-        messageType: 'error',
-        content:
-          'Please provide a file path to export the session to. Example: /export-session ./my-session.json',
-      };
-    }
-
-    const sessionId = context.services.agentContext?.config.getSessionId();
-    if (!sessionId) {
-      return {
-        type: 'message',
-        messageType: 'error',
-        content: 'No active session found to export.',
-      };
-    }
-
-    if (ui.pendingItem) {
-      ui.addItem(
-        {
-          type: MessageType.ERROR,
-          text: 'Operation already in progress, please wait.',
-        },
-        Date.now(),
-      );
-      return;
-    }
-
-    const pendingMessage: HistoryItemExportSession = {
-      type: MessageType.EXPORT_SESSION,
-      exportSession: {
-        isPending: true,
-      },
-    };
-
-    try {
-      ui.setPendingItem(pendingMessage);
-      const storage = context.services.agentContext!.config.storage;
-      const sessionSelector = new SessionSelector(storage);
-      const { sessionData } = await sessionSelector.resolveSession(sessionId);
-
-      const targetPath = path.resolve(process.cwd(), args);
-
-      await fs.writeFile(
-        targetPath,
-        JSON.stringify(sessionData, null, 2),
-        'utf-8',
-      );
-
-      ui.addItem(
-        {
-          type: MessageType.EXPORT_SESSION,
-          exportSession: {
-            isPending: false,
-            targetPath,
-          },
-        } as HistoryItemExportSession,
-        Date.now(),
-      );
-    } catch (error) {
-      return {
-        type: 'message',
-        messageType: 'error',
-        content: `Failed to export session: ${error instanceof Error ? error.message : 'Unknown error'}`,
-      };
-    } finally {
-      ui.setPendingItem(null);
-    }
-  },
-};

packages/cli/src/ui/commands/memoryCommand.test.ts

@@ -11,7 +11,6 @@ import { createMockCommandContext } from '../../test-utils/mockCommandContext.js
 import { MessageType } from '../types.js';
 import type { LoadedSettings } from '../../config/settings.js';
 import {
-  type Config,
   refreshMemory,
   refreshServerHierarchicalMemory,
   SimpleExtensionLoader,
@@ -62,17 +61,10 @@ const mockRefreshServerHierarchicalMemory =
 describe('memoryCommand', () => {
   let mockContext: CommandContext;
 
-  const buildMemoryCommand = (isMemoryV2 = false): SlashCommand => {
-    const config: Pick<Config, 'isMemoryV2Enabled'> = {
-      isMemoryV2Enabled: () => isMemoryV2,
-    };
-    return memoryCommand(config as Config);
-  };
-
   const getSubCommand = (
     name: 'show' | 'add' | 'reload' | 'list',
   ): SlashCommand => {
-    const subCommand = buildMemoryCommand().subCommands?.find(
+    const subCommand = memoryCommand.subCommands?.find(
       (cmd) => cmd.name === name,
     );
     if (!subCommand) {
@@ -81,26 +73,6 @@ describe('memoryCommand', () => {
     return subCommand;
   };
 
-  describe('Memory v2', () => {
-    it('omits the /memory add subcommand when memoryV2 is enabled', () => {
-      const command = buildMemoryCommand(true);
-      const names = command.subCommands?.map((cmd) => cmd.name) ?? [];
-      expect(names).not.toContain('add');
-    });
-
-    it('includes the /memory add subcommand by default', () => {
-      const command = buildMemoryCommand(false);
-      const names = command.subCommands?.map((cmd) => cmd.name) ?? [];
-      expect(names).toContain('add');
-    });
-
-    it('includes the /memory add subcommand when no config is provided', () => {
-      const command = memoryCommand(null);
-      const names = command.subCommands?.map((cmd) => cmd.name) ?? [];
-      expect(names).toContain('add');
-    });
-  });
-
   describe('/memory show', () => {
     let showCommand: SlashCommand;
     let mockGetUserMemory: Mock;
@@ -490,7 +462,7 @@ describe('memoryCommand', () => {
     let inboxCommand: SlashCommand;
 
     beforeEach(() => {
-      inboxCommand = buildMemoryCommand().subCommands!.find(
+      inboxCommand = memoryCommand.subCommands!.find(
         (cmd) => cmd.name === 'inbox',
       )!;
       expect(inboxCommand).toBeDefined();

packages/cli/src/ui/commands/memoryCommand.ts

@@ -7,7 +7,6 @@
 import React from 'react';
 import {
   addMemory,
-  type Config,
   listMemoryFiles,
   refreshMemory,
   showMemory,
@@ -21,69 +20,21 @@ import {
 } from './types.js';
 import { InboxDialog } from '../components/InboxDialog.js';
 
-const showSubCommand: SlashCommand = {
-  name: 'show',
-  description: 'Show the current memory contents',
-  kind: CommandKind.BUILT_IN,
-  autoExecute: true,
-  action: async (context) => {
-    const config = context.services.agentContext?.config;
-    if (!config) return;
-    const result = showMemory(config);
-
-    context.ui.addItem(
-      {
-        type: MessageType.INFO,
-        text: result.content,
-      },
-      Date.now(),
-    );
-  },
-};
-
-const addSubCommand: SlashCommand = {
-  name: 'add',
-  description: 'Add content to the memory',
+export const memoryCommand: SlashCommand = {
+  name: 'memory',
+  description: 'Commands for interacting with memory',
   kind: CommandKind.BUILT_IN,
   autoExecute: false,
-  action: (context, args): SlashCommandActionReturn | void => {
-    const result = addMemory(args);
-
-    if (result.type === 'message') {
-      return result;
-    }
-
-    context.ui.addItem(
-      {
-        type: MessageType.INFO,
-        text: `Attempting to save to memory: "${args.trim()}"`,
-      },
-      Date.now(),
-    );
-
-    return result;
-  },
-};
-
-const reloadSubCommand: SlashCommand = {
-  name: 'reload',
-  altNames: ['refresh'],
-  description: 'Reload the memory from the source',
-  kind: CommandKind.BUILT_IN,
-  autoExecute: true,
-  action: async (context) => {
-    context.ui.addItem(
-      {
-        type: MessageType.INFO,
-        text: 'Reloading memory from source files...',
-      },
-      Date.now(),
-    );
-
-    try {
-      const config = context.services.agentContext?.config;
-      if (config) {
-        const result = await refreshMemory(config);
+  subCommands: [
+    {
+      name: 'show',
+      description: 'Show the current memory contents',
+      kind: CommandKind.BUILT_IN,
+      autoExecute: true,
+      action: async (context) => {
+        const config = context.services.agentContext?.config;
+        if (!config) return;
+        const result = showMemory(config);
 
         context.ui.addItem(
           {
@@ -92,102 +43,132 @@ const reloadSubCommand: SlashCommand = {
           },
           Date.now(),
         );
-      }
-    } catch (error) {
-      context.ui.addItem(
-        {
-          type: MessageType.ERROR,
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-          text: `Error reloading memory: ${(error as Error).message}`,
-        },
-        Date.now(),
-      );
-    }
-  },
-};
-
-const listSubCommand: SlashCommand = {
-  name: 'list',
-  description: 'Lists the paths of the GEMINI.md files in use',
-  kind: CommandKind.BUILT_IN,
-  autoExecute: true,
-  action: async (context) => {
-    const config = context.services.agentContext?.config;
-    if (!config) return;
-    const result = listMemoryFiles(config);
-
-    context.ui.addItem(
-      {
-        type: MessageType.INFO,
-        text: result.content,
       },
-      Date.now(),
-    );
-  },
-};
-
-const inboxSubCommand: SlashCommand = {
-  name: 'inbox',
-  description:
-    'Review skills extracted from past sessions and move them to global or project skills',
-  kind: CommandKind.BUILT_IN,
-  autoExecute: true,
-  action: (
-    context,
-  ): OpenCustomDialogActionReturn | SlashCommandActionReturn | void => {
-    const config = context.services.agentContext?.config;
-    if (!config) {
-      return {
-        type: 'message',
-        messageType: 'error',
-        content: 'Config not loaded.',
-      };
-    }
-
-    if (!config.isAutoMemoryEnabled()) {
-      return {
-        type: 'message',
-        messageType: 'info',
-        content:
-          'The memory inbox requires Auto Memory. Enable it with: experimental.autoMemory = true in settings.',
-      };
-    }
-
-    return {
-      type: 'custom_dialog',
-      component: React.createElement(InboxDialog, {
-        config,
-        onClose: () => context.ui.removeComponent(),
-        onReloadSkills: async () => {
-          await config.reloadSkills();
-          context.ui.reloadCommands();
-        },
-        onReloadMemory: async () => {
-          await refreshMemory(config);
-        },
-      }),
-    };
-  },
-};
-
-export const memoryCommand = (config: Config | null): SlashCommand => {
-  // The `add` subcommand depends on the `save_memory` tool, which is not
-  // registered when Memory v2 is enabled. Omit it in that case.
-  const isMemoryV2 = config?.isMemoryV2Enabled() ?? false;
-
-  const subCommands: SlashCommand[] = [
-    showSubCommand,
-    ...(isMemoryV2 ? [] : [addSubCommand]),
-    reloadSubCommand,
-    listSubCommand,
-    inboxSubCommand,
-  ];
-
-  return {
-    name: 'memory',
-    description: 'Commands for interacting with memory',
-    kind: CommandKind.BUILT_IN,
-    autoExecute: false,
-    subCommands,
-  };
+    },
+    {
+      name: 'add',
+      description: 'Add content to the memory',
+      kind: CommandKind.BUILT_IN,
+      autoExecute: false,
+      action: (context, args): SlashCommandActionReturn | void => {
+        const result = addMemory(args);
+
+        if (result.type === 'message') {
+          return result;
+        }
+
+        context.ui.addItem(
+          {
+            type: MessageType.INFO,
+            text: `Attempting to save to memory: "${args.trim()}"`,
+          },
+          Date.now(),
+        );
+
+        return result;
+      },
+    },
+    {
+      name: 'reload',
+      altNames: ['refresh'],
+      description: 'Reload the memory from the source',
+      kind: CommandKind.BUILT_IN,
+      autoExecute: true,
+      action: async (context) => {
+        context.ui.addItem(
+          {
+            type: MessageType.INFO,
+            text: 'Reloading memory from source files...',
+          },
+          Date.now(),
+        );
+
+        try {
+          const config = context.services.agentContext?.config;
+          if (config) {
+            const result = await refreshMemory(config);
+
+            context.ui.addItem(
+              {
+                type: MessageType.INFO,
+                text: result.content,
+              },
+              Date.now(),
+            );
+          }
+        } catch (error) {
+          context.ui.addItem(
+            {
+              type: MessageType.ERROR,
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+              text: `Error reloading memory: ${(error as Error).message}`,
+            },
+            Date.now(),
+          );
+        }
+      },
+    },
+    {
+      name: 'list',
+      description: 'Lists the paths of the GEMINI.md files in use',
+      kind: CommandKind.BUILT_IN,
+      autoExecute: true,
+      action: async (context) => {
+        const config = context.services.agentContext?.config;
+        if (!config) return;
+        const result = listMemoryFiles(config);
+
+        context.ui.addItem(
+          {
+            type: MessageType.INFO,
+            text: result.content,
+          },
+          Date.now(),
+        );
+      },
+    },
+    {
+      name: 'inbox',
+      description:
+        'Review skills extracted from past sessions and move them to global or project skills',
+      kind: CommandKind.BUILT_IN,
+      autoExecute: true,
+      action: (
+        context,
+      ): OpenCustomDialogActionReturn | SlashCommandActionReturn | void => {
+        const config = context.services.agentContext?.config;
+        if (!config) {
+          return {
+            type: 'message',
+            messageType: 'error',
+            content: 'Config not loaded.',
+          };
+        }
+
+        if (!config.isAutoMemoryEnabled()) {
+          return {
+            type: 'message',
+            messageType: 'info',
+            content:
+              'The memory inbox requires Auto Memory. Enable it with: experimental.autoMemory = true in settings.',
+          };
+        }
+
+        return {
+          type: 'custom_dialog',
+          component: React.createElement(InboxDialog, {
+            config,
+            onClose: () => context.ui.removeComponent(),
+            onReloadSkills: async () => {
+              await config.reloadSkills();
+              context.ui.reloadCommands();
+            },
+            onReloadMemory: async () => {
+              await refreshMemory(config);
+            },
+          }),
+        };
+      },
+    },
+  ],
 };

packages/cli/src/ui/components/AskUserDialog.test.tsx

@@ -1581,71 +1581,4 @@ describe('AskUserDialog', () => {
       expect(frame).toContain('1.  Option 1');
     });
   });
-
-  it('indents multi-line descriptions correctly', async () => {
-    const questions: Question[] = [
-      {
-        question: 'Single choice?',
-        header: 'Indent Test',
-        type: QuestionType.CHOICE,
-        options: [
-          {
-            label: 'Option 1',
-            description:
-              'This is a very long description that is expected to wrap onto multiple lines in a narrow terminal. We want to ensure that all lines are correctly indented.',
-          },
-        ],
-        multiSelect: false,
-      },
-    ];
-
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <AskUserDialog
-        questions={questions}
-        onSubmit={vi.fn()}
-        onCancel={vi.fn()}
-        width={40} // Narrow width to force wrapping
-      />,
-      { width: 40 },
-    );
-
-    await waitFor(async () => {
-      await waitUntilReady();
-      // Snapshot will capture the visual alignment
-      expect(lastFrame()).toMatchSnapshot();
-    });
-  });
-
-  it('indents multi-line descriptions correctly in multi-select mode', async () => {
-    const questions: Question[] = [
-      {
-        question: 'Multi-select?',
-        header: 'Indent Test',
-        type: QuestionType.CHOICE,
-        options: [
-          {
-            label: 'Option 1',
-            description:
-              'This is a very long description that is expected to wrap onto multiple lines in a narrow terminal. We want to ensure that all lines are correctly indented even with checkboxes.',
-          },
-        ],
-        multiSelect: true,
-      },
-    ];
-
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
-      <AskUserDialog
-        questions={questions}
-        onSubmit={vi.fn()}
-        onCancel={vi.fn()}
-        width={40} // Narrow width to force wrapping
-      />,
-      { width: 40 },
-    );
-
-    await waitFor(async () => {
-      await waitUntilReady();
-      expect(lastFrame()).toMatchSnapshot();
-    });
-  });
 });

packages/cli/src/ui/components/AskUserDialog.tsx

@@ -22,7 +22,7 @@ import type { SelectionListItem } from '../hooks/useSelectionList.js';
 import { TabHeader, type Tab } from './shared/TabHeader.js';
 import { useKeypress, type Key } from '../hooks/useKeypress.js';
 import { Command } from '../key/keyMatchers.js';
-import { TextInput } from './shared/TextInput.js';
+import { AutocompleteTextInput } from './shared/AutocompleteTextInput.js';
 import { formatCommand } from '../key/keybindingUtils.js';
 import {
   useTextBuffer,
@@ -396,10 +396,12 @@ const TextQuestionView: React.FC<TextQuestionViewProps> = ({
 
       <Box flexDirection="row" marginBottom={1}>
         <Text color={theme.status.success}>{'> '}</Text>
-        <TextInput
+        <AutocompleteTextInput
           buffer={buffer}
           placeholder={placeholder}
           onSubmit={handleSubmit}
+          availableWidth={availableWidth}
+          suggestionsPosition="below"
         />
       </Box>
 
@@ -948,10 +950,12 @@ const ChoiceQuestionView: React.FC<ChoiceQuestionViewProps> = ({
                   />
                 )}
                 <Text color={theme.text.primary}> </Text>
-                <TextInput
+                <AutocompleteTextInput
                   buffer={customBuffer}
                   placeholder={placeholder}
                   focus={context.isSelected}
+                  availableWidth={availableWidth}
+                  suggestionsPosition="below"
                   onSubmit={(val) => {
                     if (question.multiSelect) {
                       const fullAnswer = buildAnswerString(
@@ -1004,15 +1008,13 @@ const ChoiceQuestionView: React.FC<ChoiceQuestionViewProps> = ({
                 )}
               </Box>
               {optionItem.description && (
-                // Padding aligns with option label: 4 for multi-select (checkbox + space), 1 for single-select
-                <Box paddingLeft={showCheck ? 4 : 1}>
-                  <Text color={theme.text.secondary} wrap="wrap">
-                    <RenderInline
-                      text={optionItem.description}
-                      defaultColor={theme.text.secondary}
-                    />
-                  </Text>
-                </Box>
+                <Text color={theme.text.secondary} wrap="wrap">
+                  {' '}
+                  <RenderInline
+                    text={optionItem.description}
+                    defaultColor={theme.text.secondary}
+                  />
+                </Text>
               )}
             </Box>
           );

packages/cli/src/ui/components/Footer.tsx

@@ -18,7 +18,6 @@ import {
 } from '@google/gemini-cli-core';
 import { ConsoleSummaryDisplay } from './ConsoleSummaryDisplay.js';
 import process from 'node:process';
-import os from 'node:os';
 import { MemoryUsageDisplay } from './MemoryUsageDisplay.js';
 import { ContextUsageDisplay } from './ContextUsageDisplay.js';
 import { QuotaDisplay } from './QuotaDisplay.js';
@@ -36,8 +35,6 @@ import {
 } from '../../config/footerItems.js';
 import { isDevelopment } from '../../utils/installationInfo.js';
 
-const HOSTNAME = os.hostname();
-
 interface CwdIndicatorProps {
   targetDir: string;
   maxWidth: number;
@@ -389,15 +386,6 @@ export const Footer: React.FC = () => {
         );
         break;
       }
-      case 'hostname': {
-        addCol(
-          id,
-          header,
-          () => <Text color={itemColor}>{HOSTNAME}</Text>,
-          HOSTNAME.length,
-        );
-        break;
-      }
       case 'auth': {
         if (!settings.merged.ui.showUserIdentity) break;
         if (!authType) break;

packages/cli/src/ui/components/FooterConfigDialog.test.tsx

@@ -116,7 +116,7 @@ describe('<FooterConfigDialog />', () => {
     expect(lastFrame()).toContain('~/project/path');
 
     // Move focus down to 'code-changes' (which has colored elements)
-    for (let i = 0; i < 10; i++) {
+    for (let i = 0; i < 9; i++) {
       act(() => {
         stdin.write('\u001b[B'); // Down arrow
       });

packages/cli/src/ui/components/FooterConfigDialog.tsx

@@ -249,9 +249,6 @@ export const FooterConfigDialog: React.FC<FooterConfigDialogProps> = ({
       'session-id': (
         <Text color={getColor('session-id', itemColor)}>769992f9</Text>
       ),
-      hostname: (
-        <Text color={getColor('hostname', itemColor)}>dev-machine</Text>
-      ),
       'code-changes': (
         <Box flexDirection="row">
           <Text color={getColor('code-changes', theme.status.success)}>

packages/cli/src/ui/components/HistoryItemDisplay.test.tsx

@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
 import { describe, it, expect, vi } from 'vitest';
 import { HistoryItemDisplay } from './HistoryItemDisplay.js';
 import { MessageType, type HistoryItem } from '../types.js';
@@ -199,25 +198,6 @@ describe('<HistoryItemDisplay />', () => {
     unmount();
   });
 
-  it('renders ExportSessionMessage for "export_session" type', async () => {
-    const testPath = path.join(path.sep, 'test', 'path.json');
-    const item: HistoryItem = {
-      ...baseItem,
-      type: 'export_session',
-      exportSession: {
-        isPending: false,
-        targetPath: testPath,
-      },
-    };
-    const { lastFrame, unmount } = await renderWithProviders(
-      <HistoryItemDisplay {...baseItem} item={item} />,
-    );
-    expect(lastFrame()).toContain(
-      `Successfully exported session to ${testPath}`,
-    );
-    unmount();
-  });
-
   it('should escape ANSI codes in text content', async () => {
     const historyItem: HistoryItem = {
       id: 1,

packages/cli/src/ui/components/HistoryItemDisplay.tsx

@@ -14,10 +14,8 @@ import { GeminiMessage } from './messages/GeminiMessage.js';
 import { InfoMessage } from './messages/InfoMessage.js';
 import { ErrorMessage } from './messages/ErrorMessage.js';
 import { ToolGroupMessage } from './messages/ToolGroupMessage.js';
-import { ToolGroupDisplay } from './messages/ToolGroupDisplay.js';
 import { GeminiMessageContent } from './messages/GeminiMessageContent.js';
 import { CompressionMessage } from './messages/CompressionMessage.js';
-import { ExportSessionMessage } from './messages/ExportSessionMessage.js';
 import { WarningMessage } from './messages/WarningMessage.js';
 import { SubagentHistoryMessage } from './messages/SubagentHistoryMessage.js';
 import { Box } from 'ink';
@@ -197,12 +195,6 @@ export const HistoryItemDisplay: React.FC<HistoryItemDisplayProps> = ({
           isExpandable={isExpandable}
         />
       )}
-      {itemForDisplay.type === 'tool_display_group' && (
-        <ToolGroupDisplay
-          item={itemForDisplay}
-          isToolGroupBoundary={isToolGroupBoundary}
-        />
-      )}
       {itemForDisplay.type === 'subagent' && (
         <SubagentHistoryMessage
           item={itemForDisplay}
@@ -212,9 +204,6 @@ export const HistoryItemDisplay: React.FC<HistoryItemDisplayProps> = ({
       {itemForDisplay.type === 'compression' && (
         <CompressionMessage compression={itemForDisplay.compression} />
       )}
-      {itemForDisplay.type === 'export_session' && (
-        <ExportSessionMessage exportSession={itemForDisplay.exportSession} />
-      )}
       {itemForDisplay.type === 'extensions_list' && (
         <ExtensionsList extensions={itemForDisplay.extensions} />
       )}

packages/cli/src/ui/components/InputPrompt.test.tsx

@@ -5332,34 +5332,6 @@ describe('InputPrompt', () => {
       });
     });
   });
-
-  describe('terminal buffer rendering', () => {
-    it('does not clip the last char of a visual line whose width equals inputWidth', async () => {
-      const fullLine = '1234567890'; // 10 chars, exactly props.inputWidth
-      props.inputWidth = 10;
-      props.suggestionsWidth = 10;
-      vi.spyOn(props.config, 'getUseTerminalBuffer').mockReturnValue(true);
-      mockBuffer.text = fullLine;
-      mockBuffer.lines = [fullLine];
-      mockBuffer.allVisualLines = [fullLine];
-      mockBuffer.viewportVisualLines = [fullLine];
-      mockBuffer.visualToLogicalMap = [[0, 0]];
-      mockBuffer.visualToTransformedMap = [0];
-      mockBuffer.transformationsByLine = [[]];
-      mockBuffer.cursor = [0, fullLine.length];
-      mockBuffer.visualCursor = [0, fullLine.length];
-
-      const { lastFrame, unmount } = await renderWithProviders(
-        <TestInputPrompt {...props} />,
-        { uiActions },
-      );
-
-      await waitFor(() => {
-        expect(clean(lastFrame())).toContain(fullLine);
-      });
-      unmount();
-    });
-  });
 });
 
 function clean(str: string | undefined): string {

packages/cli/src/ui/components/InputPrompt.tsx

@@ -43,10 +43,7 @@ import chalk from 'chalk';
 import stringWidth from 'string-width';
 import { useShellHistory } from '../hooks/useShellHistory.js';
 import { useReverseSearchCompletion } from '../hooks/useReverseSearchCompletion.js';
-import {
-  useCommandCompletion,
-  CompletionMode,
-} from '../hooks/useCommandCompletion.js';
+import { useCommandCompletion } from '../hooks/useCommandCompletion.js';
 import { useKeypress, type Key } from '../hooks/useKeypress.js';
 import { Command } from '../key/keyMatchers.js';
 import { formatCommand } from '../key/keybindingUtils.js';
@@ -93,8 +90,6 @@ import { useIsHelpDismissKey } from '../utils/shortcutsHelp.js';
 import { useRepeatedKeyPress } from '../hooks/useRepeatedKeyPress.js';
 import { useKeyMatchers } from '../hooks/useKeyMatchers.js';
 
-const SCROLLBAR_GUTTER_WIDTH = 1;
-
 /**
  * Returns if the terminal can be trusted to handle paste events atomically
  * rather than potentially sending multiple paste events separated by line
@@ -1761,14 +1756,13 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         scrollOffset={activeCompletion.visibleStartIndex}
         userInput={buffer.text}
         mode={
-          completion.completionMode === CompletionMode.AT ||
-          completion.completionMode === CompletionMode.SHELL
+          suggestionsPosition === 'above'
             ? 'reverse'
             : buffer.text.startsWith('/') &&
                 !reverseSearchActive &&
                 !commandSearchActive
               ? 'slash'
-              : 'reverse'
+              : 'normal'
         }
         expandedIndex={expandedSuggestionIndex}
       />
@@ -1870,7 +1864,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
                         ? `line-${item.absoluteVisualIdx}`
                         : `ghost-${item.index}`
                     }
-                    width={inputWidth + SCROLLBAR_GUTTER_WIDTH}
+                    width={inputWidth}
                     backgroundColor={listBackgroundColor}
                     containerHeight={Math.min(
                       buffer.viewportHeight,

packages/cli/src/ui/components/SessionBrowser.tsx

@@ -562,13 +562,6 @@ export const useSessionBrowserInput = (
           state.setActiveIndex(0);
           state.setScrollOffset(0);
           return true;
-        } else if (key.name === 'enter') {
-          const selectedSession =
-            state.filteredAndSortedSessions[state.activeIndex];
-          if (selectedSession && !selectedSession.isCurrentSession) {
-            onResumeSession(selectedSession);
-          }
-          return true;
         } else if (
           key.sequence &&
           key.sequence.length === 1 &&

packages/cli/src/ui/components/SessionSummaryDisplay.test.tsx

@@ -13,7 +13,6 @@ import { type SessionMetrics } from '../contexts/SessionContext.js';
 import {
   ToolCallDecision,
   getShellConfiguration,
-  isWindows,
   type WorktreeSettings,
 } from '@google/gemini-cli-core';
 
@@ -23,7 +22,6 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
   return {
     ...actual,
     getShellConfiguration: vi.fn(),
-    isWindows: vi.fn(),
   };
 });
 
@@ -46,7 +44,6 @@ vi.mock('../contexts/ConfigContext.js', async (importOriginal) => {
 });
 
 const getShellConfigurationMock = vi.mocked(getShellConfiguration);
-const isWindowsMock = vi.mocked(isWindows);
 const useSessionStatsMock = vi.mocked(SessionContext.useSessionStats);
 
 const renderWithMockedStats = async (
@@ -109,7 +106,6 @@ describe('<SessionSummaryDisplay />', () => {
       argsPrefix: ['-c'],
       shell: 'bash',
     });
-    isWindowsMock.mockReturnValue(false);
   });
 
   it('renders the summary display with a title', async () => {
@@ -153,7 +149,7 @@ describe('<SessionSummaryDisplay />', () => {
       );
       const output = lastFrame();
 
-      // Standard UUID characters are NOT wrapped in double quotes on non-Windows.
+      // Standard UUID characters should not be escaped/quoted by default for bash.
       expect(output).toContain('gemini --resume 1234-abcd-5678-efgh');
       unmount();
     });
@@ -171,8 +167,7 @@ describe('<SessionSummaryDisplay />', () => {
       unmount();
     });
 
-    it('renders a standard UUID-formatted session ID in the footer (powershell) on Windows', async () => {
-      isWindowsMock.mockReturnValue(true);
+    it('renders a standard UUID-formatted session ID in the footer (powershell)', async () => {
       getShellConfigurationMock.mockReturnValue({
         executable: 'powershell.exe',
         argsPrefix: ['-NoProfile', '-Command'],
@@ -186,8 +181,8 @@ describe('<SessionSummaryDisplay />', () => {
       );
       const output = lastFrame();
 
-      // PowerShell doesn't wrap UUID in quotes by default, but we wrap it in double quotes on Windows.
-      expect(output).toContain('gemini --resume "1234-abcd-5678-efgh"');
+      // PowerShell wraps strings in single quotes
+      expect(output).toContain("gemini --resume '1234-abcd-5678-efgh'");
       unmount();
     });
 
@@ -205,8 +200,7 @@ describe('<SessionSummaryDisplay />', () => {
       );
       const output = lastFrame();
 
-      // PowerShell wraps in single quotes and escapes internal single quotes by doubling them.
-      // Since it's already quoted, we don't add redundant double quotes.
+      // PowerShell wraps in single quotes and escapes internal single quotes by doubling them
       expect(output).toContain("gemini --resume '''; rm -rf / #'");
       unmount();
     });

packages/cli/src/ui/components/SessionSummaryDisplay.tsx

@@ -8,11 +8,7 @@ import type React from 'react';
 import { StatsDisplay } from './StatsDisplay.js';
 import { useSessionStats } from '../contexts/SessionContext.js';
 import { useConfig } from '../contexts/ConfigContext.js';
-import {
-  escapeShellArg,
-  getShellConfiguration,
-  isWindows,
-} from '@google/gemini-cli-core';
+import { escapeShellArg, getShellConfiguration } from '@google/gemini-cli-core';
 
 interface SessionSummaryDisplayProps {
   duration: string;
@@ -28,17 +24,11 @@ export const SessionSummaryDisplay: React.FC<SessionSummaryDisplayProps> = ({
   const worktreeSettings = config.getWorktreeSettings();
 
   const escapedSessionId = escapeShellArg(stats.sessionId, shell);
-  const footerSessionId =
-    isWindows() &&
-    !escapedSessionId.startsWith('"') &&
-    !escapedSessionId.startsWith("'")
-      ? `"${escapedSessionId}"`
-      : escapedSessionId;
-  let footer = `To resume this session: gemini --resume ${footerSessionId}`;
+  let footer = `To resume this session: gemini --resume ${escapedSessionId}`;
 
   if (worktreeSettings) {
     footer =
-      `To resume work in this worktree: cd ${escapeShellArg(worktreeSettings.path, shell)} && gemini --resume ${footerSessionId}\n` +
+      `To resume work in this worktree: cd ${escapeShellArg(worktreeSettings.path, shell)} && gemini --resume ${escapedSessionId}\n` +
       `To remove manually: git worktree remove ${escapeShellArg(worktreeSettings.path, shell)}`;
   }
 

packages/cli/src/ui/components/SettingsDialog.test.tsx

@@ -25,10 +25,7 @@ import { waitFor } from '../../test-utils/async.js';
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { SettingsDialog } from './SettingsDialog.js';
 import { SettingScope } from '../../config/settings.js';
-import {
-  createMockSettings,
-  type MockSettingsFile,
-} from '../../test-utils/settings.js';
+import { createMockSettings } from '../../test-utils/settings.js';
 import { makeFakeConfig } from '@google/gemini-cli-core';
 import { act } from 'react';
 import { TEST_ONLY } from '../../utils/settingsUtils.js';
@@ -253,17 +250,6 @@ const renderDialog = async (
     },
   );
 
-const createSettingsFile = (
-  path: string,
-  settings: Record<string, unknown> = {},
-  readOnly?: boolean,
-): MockSettingsFile => ({
-  settings,
-  originalSettings: settings,
-  path,
-  readOnly,
-});
-
 describe('SettingsDialog', () => {
   beforeEach(() => {
     vi.clearAllMocks();
@@ -632,131 +618,6 @@ describe('SettingsDialog', () => {
 
       unmount();
     });
-
-    it('should not offer read-only system settings as an editable target', async () => {
-      const settings = createMockSettings({
-        system: createSettingsFile('', {}, true),
-      });
-      const onSelect = vi.fn();
-
-      const { lastFrame, unmount } = await renderDialog(settings, onSelect);
-
-      await waitFor(() => {
-        expect(lastFrame()).toContain('Apply To');
-      });
-
-      const output = lastFrame();
-      expect(output).toContain('User Settings');
-      expect(output).toContain('Workspace Settings');
-      expect(output).not.toContain('System Settings');
-
-      unmount();
-    });
-
-    it('should not offer a read-only home-directory workspace as an editable target', async () => {
-      const settings = createMockSettings({
-        user: createSettingsFile('/mock/home/.gemini/settings.json'),
-        system: createSettingsFile('/mock/system/settings.json', {}, true),
-        systemDefaults: createSettingsFile(
-          '/mock/system-defaults/settings.json',
-          {},
-          true,
-        ),
-        workspace: createSettingsFile('', {}, true),
-      });
-      const setValueSpy = vi.spyOn(settings, 'setValue');
-      const onSelect = vi.fn();
-
-      const { lastFrame, stdin, unmount, waitUntilReady } = await renderDialog(
-        settings,
-        onSelect,
-      );
-
-      await waitFor(() => {
-        expect(lastFrame()).toContain('Vim Mode');
-      });
-
-      const output = lastFrame();
-      expect(output).not.toContain('Workspace Settings');
-      expect(output).not.toContain('System Settings');
-
-      await act(async () => {
-        stdin.write(TerminalKeys.ENTER as string);
-      });
-      await waitUntilReady();
-
-      expect(setValueSpy).toHaveBeenCalledWith(
-        SettingScope.User,
-        'general.vimMode',
-        true,
-      );
-
-      unmount();
-    });
-
-    it('should fall back to the first writable scope when the selected scope is read-only', async () => {
-      const settings = createMockSettings({
-        user: createSettingsFile('', {}, true),
-        system: createSettingsFile('', {}, true),
-        workspace: createSettingsFile('/mock/workspace/.gemini/settings.json'),
-      });
-      const setValueSpy = vi.spyOn(settings, 'setValue');
-      const onSelect = vi.fn();
-
-      const { lastFrame, stdin, unmount, waitUntilReady } = await renderDialog(
-        settings,
-        onSelect,
-      );
-
-      await waitFor(() => {
-        expect(lastFrame()).toContain('Vim Mode');
-      });
-
-      await act(async () => {
-        stdin.write(TerminalKeys.ENTER as string);
-      });
-      await waitUntilReady();
-
-      expect(setValueSpy).toHaveBeenCalledWith(
-        SettingScope.Workspace,
-        'general.vimMode',
-        true,
-      );
-
-      unmount();
-    });
-
-    it('should not save when all editable scopes are read-only', async () => {
-      const settings = createMockSettings({
-        user: createSettingsFile('', {}, true),
-        system: createSettingsFile('', {}, true),
-        workspace: createSettingsFile(
-          '/mock/workspace/.gemini/settings.json',
-          {},
-          true,
-        ),
-      });
-      const setValueSpy = vi.spyOn(settings, 'setValue');
-      const onSelect = vi.fn();
-
-      const { lastFrame, stdin, unmount, waitUntilReady } = await renderDialog(
-        settings,
-        onSelect,
-      );
-
-      await waitFor(() => {
-        expect(lastFrame()).toContain('Vim Mode');
-      });
-
-      await act(async () => {
-        stdin.write(TerminalKeys.ENTER as string);
-      });
-      await waitUntilReady();
-
-      expect(setValueSpy).not.toHaveBeenCalled();
-
-      unmount();
-    });
   });
 
   describe('Restart Prompt', () => {

packages/cli/src/ui/components/SettingsDialog.tsx

@@ -15,10 +15,7 @@ import {
   type LoadableSettingScope,
   type Settings,
 } from '../../config/settings.js';
-import {
-  getScopeItems,
-  getScopeMessageForSetting,
-} from '../../utils/dialogScopeUtils.js';
+import { getScopeMessageForSetting } from '../../utils/dialogScopeUtils.js';
 import {
   getDialogSettingKeys,
   getDisplayValue,
@@ -108,26 +105,6 @@ export function SettingsDialog({
   const [selectedScope, setSelectedScope] = useState<LoadableSettingScope>(
     SettingScope.User,
   );
-  const editableScopeItems = useMemo(
-    () =>
-      getScopeItems().filter((item) => {
-        const settingsFile = settings.forScope(item.value);
-        return (
-          settingsFile.readOnly !== true &&
-          (item.value !== SettingScope.Workspace ||
-            settingsFile.path !== undefined)
-        );
-      }),
-    [settings],
-  );
-  const writableSelectedScope =
-    editableScopeItems.find((item) => item.value === selectedScope)?.value ??
-    editableScopeItems[0]?.value;
-  const effectiveSelectedScope = writableSelectedScope ?? SettingScope.User;
-
-  if (writableSelectedScope && selectedScope !== writableSelectedScope) {
-    setSelectedScope(writableSelectedScope);
-  }
 
   // Snapshot restart-required values at mount time for diff tracking
   const [activeRestartRequiredSettings] = useState(() =>
@@ -228,7 +205,7 @@ export function SettingsDialog({
 
       const scopeMessage = getScopeMessageForSetting(
         key,
-        effectiveSelectedScope,
+        selectedScope,
         settings,
       );
       const label = def.label || key;
@@ -241,7 +218,7 @@ export function SettingsDialog({
       max = Math.max(max, lWidth, dWidth);
     }
     return max;
-  }, [effectiveSelectedScope, settings]);
+  }, [selectedScope, settings]);
 
   // Search input buffer
   const searchBuffer = useSearchBuffer({
@@ -252,7 +229,7 @@ export function SettingsDialog({
   // Generate items for BaseSettingsDialog
   const settingKeys = searchQuery ? filteredKeys : getDialogSettingKeys();
   const items: SettingsDialogItem[] = useMemo(() => {
-    const scopeSettings = settings.forScope(effectiveSelectedScope).settings;
+    const scopeSettings = settings.forScope(selectedScope).settings;
     const mergedSettings = settings.merged;
 
     return settingKeys.map((key) => {
@@ -265,7 +242,7 @@ export function SettingsDialog({
       // Get the scope message (e.g., "(Modified in Workspace)")
       const scopeMessage = getScopeMessageForSetting(
         key,
-        effectiveSelectedScope,
+        selectedScope,
         settings,
       );
 
@@ -289,7 +266,7 @@ export function SettingsDialog({
         editValue,
       };
     });
-  }, [settingKeys, effectiveSelectedScope, settings]);
+  }, [settingKeys, selectedScope, settings]);
 
   const handleScopeChange = useCallback((scope: LoadableSettingScope) => {
     setSelectedScope(scope);
@@ -298,16 +275,12 @@ export function SettingsDialog({
   // Toggle handler for boolean/enum settings
   const handleItemToggle = useCallback(
     (key: string, _item: SettingsDialogItem) => {
-      if (!writableSelectedScope) {
-        return;
-      }
-
       const definition = getSettingDefinition(key);
       if (!TOGGLE_TYPES.has(definition?.type)) {
         return;
       }
 
-      const scopeSettings = settings.forScope(writableSelectedScope).settings;
+      const scopeSettings = settings.forScope(selectedScope).settings;
       const currentValue = getEffectiveValue(key, scopeSettings);
       let newValue: SettingsValue;
 
@@ -337,18 +310,14 @@ export function SettingsDialog({
         `[DEBUG SettingsDialog] Saving ${key} immediately with value:`,
         newValue,
       );
-      setSetting(writableSelectedScope, key, newValue);
+      setSetting(selectedScope, key, newValue);
     },
-    [settings, writableSelectedScope, setSetting],
+    [settings, selectedScope, setSetting],
   );
 
   // For inline editor
   const handleEditCommit = useCallback(
     (key: string, newValue: string, _item: SettingsDialogItem) => {
-      if (!writableSelectedScope) {
-        return;
-      }
-
       const definition = getSettingDefinition(key);
       const type: SettingsType = definition?.type ?? 'string';
       const parsed = parseEditedValue(type, newValue);
@@ -357,26 +326,22 @@ export function SettingsDialog({
         return;
       }
 
-      setSetting(writableSelectedScope, key, parsed);
+      setSetting(selectedScope, key, parsed);
     },
-    [writableSelectedScope, setSetting],
+    [selectedScope, setSetting],
   );
 
   // Clear/reset handler - removes the value from settings.json so it falls back to default
   const handleItemClear = useCallback(
     (key: string, _item: SettingsDialogItem) => {
-      if (!writableSelectedScope) {
-        return;
-      }
-
-      setSetting(writableSelectedScope, key, undefined);
+      setSetting(selectedScope, key, undefined);
     },
-    [writableSelectedScope, setSetting],
+    [selectedScope, setSetting],
   );
 
   const handleClose = useCallback(() => {
-    onSelect(undefined, effectiveSelectedScope as SettingScope);
-  }, [onSelect, effectiveSelectedScope]);
+    onSelect(undefined, selectedScope as SettingScope);
+  }, [onSelect, selectedScope]);
 
   const globalKeyMatchers = useKeyMatchers();
   const settingsKeyMatchers = useMemo(
@@ -404,6 +369,7 @@ export function SettingsDialog({
   );
 
   // Decisions on what features to enable
+  const hasWorkspace = settings.workspace.path !== undefined;
   const showSearch = !showRestartPrompt;
 
   return (
@@ -413,9 +379,8 @@ export function SettingsDialog({
       searchEnabled={showSearch}
       searchBuffer={searchBuffer}
       items={items}
-      showScopeSelector={editableScopeItems.length > 1}
-      scopeItems={editableScopeItems}
-      selectedScope={effectiveSelectedScope}
+      showScopeSelector={hasWorkspace}
+      selectedScope={selectedScope}
       onScopeChange={handleScopeChange}
       maxItemsToShow={MAX_ITEMS_TO_SHOW}
       availableHeight={availableTerminalHeight}

packages/cli/src/ui/components/SuggestionsDisplay.test.tsx

@@ -25,7 +25,7 @@ describe('SuggestionsDisplay', () => {
         width={80}
         scrollOffset={0}
         userInput=""
-        mode="reverse"
+        mode="normal"
       />,
     );
     expect(lastFrame()).toMatchSnapshot();
@@ -40,7 +40,7 @@ describe('SuggestionsDisplay', () => {
         width={80}
         scrollOffset={0}
         userInput=""
-        mode="reverse"
+        mode="normal"
       />,
     );
     expect(lastFrame({ allowEmpty: true })).toBe('');
@@ -55,7 +55,7 @@ describe('SuggestionsDisplay', () => {
         width={80}
         scrollOffset={0}
         userInput=""
-        mode="reverse"
+        mode="normal"
       />,
     );
     expect(lastFrame()).toMatchSnapshot();
@@ -72,7 +72,7 @@ describe('SuggestionsDisplay', () => {
         width={80}
         scrollOffset={0}
         userInput=""
-        mode="reverse"
+        mode="normal"
       />,
     );
     expect(lastFrame()).toMatchSnapshot();
@@ -93,6 +93,21 @@ describe('SuggestionsDisplay', () => {
         width={80}
         scrollOffset={5}
         userInput=""
+        mode="normal"
+      />,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+  });
+
+  it('renders reverse mode correctly', async () => {
+    const { lastFrame } = await render(
+      <SuggestionsDisplay
+        suggestions={mockSuggestions}
+        activeIndex={0}
+        isLoading={false}
+        width={80}
+        scrollOffset={0}
+        userInput=""
         mode="reverse"
       />,
     );
@@ -116,7 +131,7 @@ describe('SuggestionsDisplay', () => {
         width={80}
         scrollOffset={0}
         userInput=""
-        mode="reverse"
+        mode="normal"
       />,
     );
     expect(lastFrame()).toMatchSnapshot();

packages/cli/src/ui/components/SuggestionsDisplay.tsx

@@ -28,7 +28,7 @@ interface SuggestionsDisplayProps {
   width: number;
   scrollOffset: number;
   userInput: string;
-  mode: 'reverse' | 'slash';
+  mode?: 'reverse' | 'slash' | 'normal';
   expandedIndex?: number;
 }
 
@@ -42,7 +42,7 @@ export function SuggestionsDisplay({
   width,
   scrollOffset,
   userInput,
-  mode,
+  mode = 'normal',
   expandedIndex,
 }: SuggestionsDisplayProps) {
   if (isLoading) {
@@ -80,8 +80,17 @@ export function SuggestionsDisplay({
     mode === 'slash' ? Math.min(maxLabelLength, Math.floor(width * 0.5)) : 0;
 
   return (
-    <Box flexDirection="column" paddingX={1} width={width}>
-      {scrollOffset > 0 && <Text color={theme.text.primary}>▲</Text>}
+    <Box
+      flexDirection={mode === 'reverse' ? 'column-reverse' : 'column'}
+      paddingX={1}
+      width={width}
+    >
+      {scrollOffset > 0 && mode !== 'reverse' && (
+        <Text color={theme.text.primary}>▲</Text>
+      )}
+      {endIndex < suggestions.length && mode === 'reverse' && (
+        <Text color="gray">▼</Text>
+      )}
 
       {visibleSuggestions.map((suggestion, index) => {
         const originalIndex = startIndex + index;
@@ -153,7 +162,12 @@ export function SuggestionsDisplay({
           </Box>
         );
       })}
-      {endIndex < suggestions.length && <Text color="gray">▼</Text>}
+      {endIndex < suggestions.length && mode !== 'reverse' && (
+        <Text color="gray">▼</Text>
+      )}
+      {scrollOffset > 0 && mode === 'reverse' && (
+        <Text color={theme.text.primary}>▲</Text>
+      )}
       {suggestions.length > MAX_SUGGESTIONS_TO_SHOW && (
         <Text color="gray">
           ({activeIndex + 1}/{suggestions.length})

packages/cli/src/ui/components/ToolConfirmationQueue.test.tsx

@@ -141,7 +141,7 @@ describe('ToolConfirmationQueue', () => {
     expect(output).toContain('1 of 3');
     expect(output).toContain('ls'); // Tool name
     expect(output).toContain('list files'); // Tool description
-    expect(output).toContain('Allow execution of [Shell]?');
+    expect(output).toContain('Allow execution of [ls]?');
     expect(output).toMatchSnapshot();
 
     unmount();