fix(test): regenerate settings documentation and schema

feat(routing): availability-aware auto-routing with best-effort pro
Adds settings and logic to detect slow/hanging Pro model requests, marking them as temporarily unavailable and automatically triggering a fallback to Flash. Introduces a proTimeoutMinutes and bestEffortPro strategy configuration.
2026-07-27 10:11:00 -07:00 · 2026-04-23 14:34:43 -07:00 · 2026-04-23 13:50:24 -07:00 · 2026-04-23 16:51:21 +00:00 · 2026-04-23 16:09:14 +00:00 · 2026-04-23 14:07:06 +00:00
56 changed files with 703 additions and 1178 deletions
@@ -99,13 +99,16 @@ they appear in the UI.

 ### Model

-| UI Label                      | Setting                      | Description                                                                            | Default     |
-| ----------------------------- | ---------------------------- | -------------------------------------------------------------------------------------- | ----------- |
-| Model                         | `model.name`                 | The Gemini model to use for conversations.                                             | `undefined` |
-| Max Session Turns             | `model.maxSessionTurns`      | Maximum number of user/model/tool turns to keep in a session. -1 means unlimited.      | `-1`        |
-| Context Compression Threshold | `model.compressionThreshold` | The fraction of context usage at which to trigger context compression (e.g. 0.2, 0.3). | `0.5`       |
-| Disable Loop Detection        | `model.disableLoopDetection` | Disable automatic detection and prevention of infinite loops.                          | `false`     |
-| Skip Next Speaker Check       | `model.skipNextSpeakerCheck` | Skip the next speaker check.                                                           | `true`      |
+| UI Label                                | Setting                                               | Description                                                                                                               | Default     |
+| --------------------------------------- | ----------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | ----------- |
+| Model                                   | `model.name`                                          | The Gemini model to use for conversations.                                                                                | `undefined` |
+| Max Session Turns                       | `model.maxSessionTurns`                               | Maximum number of user/model/tool turns to keep in a session. -1 means unlimited.                                         | `-1`        |
+| Context Compression Threshold           | `model.compressionThreshold`                          | The fraction of context usage at which to trigger context compression (e.g. 0.2, 0.3).                                    | `0.5`       |
+| Disable Loop Detection                  | `model.disableLoopDetection`                          | Disable automatic detection and prevention of infinite loops.                                                             | `false`     |
+| Skip Next Speaker Check                 | `model.skipNextSpeakerCheck`                          | Skip the next speaker check.                                                                                              | `true`      |
+| Best Effort Pro                         | `model.autoRouting.bestEffortPro`                     | Always prefer the Pro model unless it is unavailable (e.g., due to timeouts or quota), ignoring other routing hints.      | `false`     |
+| Pro Timeout (Minutes)                   | `model.autoRouting.proTimeoutMinutes`                 | If a Pro request takes longer than this many minutes, it will be marked as temporarily unavailable and fallback to Flash. | `5`         |
+| Pro Timeout Fallback Duration (Minutes) | `model.autoRouting.proTimeoutFallbackDurationMinutes` | How long to route to Flash after Pro times out.                                                                           | `60`        |

 ### Agents

@@ -117,10 +117,6 @@ the following methods:
 These methods will trust the current workspace for the duration of the session
 without prompting.

-For detailed instructions on managing folder trust within CI/CD workflows,
-review the
-[Gemini CLI trust guidance for GitHub Actions](https://github.com/google-github-actions/run-gemini-cli/blob/main/docs/trust-guidance.md).
-
 ## Overriding the trust file location

 By default, trust settings are saved to `~/.gemini/trustedFolders.json`. If you
@@ -483,6 +483,20 @@ their corresponding top-level category object in your `settings.json` file.
  - **Description:** Skip the next speaker check.
  - **Default:** `true`

+- **`model.autoRouting.bestEffortPro`** (boolean):
+  - **Description:** Always prefer the Pro model unless it is unavailable (e.g.,
+    due to timeouts or quota), ignoring other routing hints.
+  - **Default:** `false`
+
+- **`model.autoRouting.proTimeoutMinutes`** (number):
+  - **Description:** If a Pro request takes longer than this many minutes, it
+    will be marked as temporarily unavailable and fallback to Flash.
+  - **Default:** `5`
+
+- **`model.autoRouting.proTimeoutFallbackDurationMinutes`** (number):
+  - **Description:** How long to route to Flash after Pro times out.
+  - **Default:** `60`
+
 #### `modelConfigs`

 - **`modelConfigs.aliases`** (object):
@@ -1151,7 +1165,7 @@ their corresponding top-level category object in your `settings.json` file.
          },
          "stateTransitions": {
            "terminal": "terminal",
-            "transient": "sticky_retry",
+            "transient": "terminal",
            "not_found": "terminal",
            "unknown": "terminal"
          }
@@ -1167,7 +1181,7 @@ their corresponding top-level category object in your `settings.json` file.
          },
          "stateTransitions": {
            "terminal": "terminal",
-            "transient": "sticky_retry",
+            "transient": "terminal",
            "not_found": "terminal",
            "unknown": "terminal"
          }
@@ -1184,7 +1198,7 @@ their corresponding top-level category object in your `settings.json` file.
          },
          "stateTransitions": {
            "terminal": "terminal",
-            "transient": "sticky_retry",
+            "transient": "terminal",
            "not_found": "terminal",
            "unknown": "terminal"
          }
@@ -1200,7 +1214,7 @@ their corresponding top-level category object in your `settings.json` file.
          },
          "stateTransitions": {
            "terminal": "terminal",
-            "transient": "sticky_retry",
+            "transient": "terminal",
            "not_found": "terminal",
            "unknown": "terminal"
          }
@@ -1217,7 +1231,7 @@ their corresponding top-level category object in your `settings.json` file.
          },
          "stateTransitions": {
            "terminal": "terminal",
-            "transient": "sticky_retry",
+            "transient": "terminal",
            "not_found": "terminal",
            "unknown": "terminal"
          }
@@ -1232,7 +1246,7 @@ their corresponding top-level category object in your `settings.json` file.
          },
          "stateTransitions": {
            "terminal": "terminal",
-            "transient": "sticky_retry",
+            "transient": "terminal",
            "not_found": "terminal",
            "unknown": "terminal"
          }
@@ -1248,7 +1262,7 @@ their corresponding top-level category object in your `settings.json` file.
          },
          "stateTransitions": {
            "terminal": "terminal",
-            "transient": "sticky_retry",
+            "transient": "terminal",
            "not_found": "terminal",
            "unknown": "terminal"
          }
@@ -1467,12 +1481,6 @@ their corresponding top-level category object in your `settings.json` file.
  - **Default:** `undefined`
  - **Requires restart:** Yes

- **`tools.confirmationRequired`** (array):
-  - **Description:** Tool names that always require user confirmation. Takes
-    precedence over allowed tools and core tool allowlists.
-  - **Default:** `undefined`
-  - **Requires restart:** Yes
-
 - **`tools.exclude`** (array):
  - **Description:** Tool names to exclude from discovery.
  - **Default:** `undefined`
@@ -18,11 +18,6 @@ describe('save_memory', () => {
    suiteName: 'default',
    suiteType: 'behavioral',
    name: rememberingFavoriteColor,
-    params: {
-      settings: {
-        experimental: { memoryV2: false },
-      },
-    },

    prompt: `remember that my favorite color is  blue.
  
@@ -45,11 +40,6 @@ describe('save_memory', () => {
    suiteName: 'default',
    suiteType: 'behavioral',
    name: rememberingCommandRestrictions,
-    params: {
-      settings: {
-        experimental: { memoryV2: false },
-      },
-    },

    prompt: `I don't want you to ever run npm commands.`,
    assert: async (rig, result) => {
@@ -71,11 +61,6 @@ describe('save_memory', () => {
    suiteName: 'default',
    suiteType: 'behavioral',
    name: rememberingWorkflow,
-    params: {
-      settings: {
-        experimental: { memoryV2: false },
-      },
-    },

    prompt: `I want you to always lint after building.`,
    assert: async (rig, result) => {
@@ -98,11 +83,6 @@ describe('save_memory', () => {
    suiteName: 'default',
    suiteType: 'behavioral',
    name: ignoringTemporaryInformation,
-    params: {
-      settings: {
-        experimental: { memoryV2: false },
-      },
-    },

    prompt: `I'm going to get a coffee.`,
    assert: async (rig, result) => {
@@ -128,11 +108,6 @@ describe('save_memory', () => {
    suiteName: 'default',
    suiteType: 'behavioral',
    name: rememberingPetName,
-    params: {
-      settings: {
-        experimental: { memoryV2: false },
-      },
-    },

    prompt: `Please remember that my dog's name is Buddy.`,
    assert: async (rig, result) => {
@@ -154,11 +129,6 @@ describe('save_memory', () => {
    suiteName: 'default',
    suiteType: 'behavioral',
    name: rememberingCommandAlias,
-    params: {
-      settings: {
-        experimental: { memoryV2: false },
-      },
-    },

    prompt: `When I say 'start server', you should run 'npm run dev'.`,
    assert: async (rig, result) => {
@@ -181,11 +151,6 @@ describe('save_memory', () => {
    suiteName: 'default',
    suiteType: 'behavioral',
    name: savingDbSchemaLocationAsProjectMemory,
-    params: {
-      settings: {
-        experimental: { memoryV2: false },
-      },
-    },
    prompt: `The database schema for this workspace is located in \`db/schema.sql\`.`,
    assert: async (rig, result) => {
      const wasToolCalled = await rig.waitForToolCall(
@@ -215,11 +180,6 @@ describe('save_memory', () => {
    suiteName: 'default',
    suiteType: 'behavioral',
    name: rememberingCodingStyle,
-    params: {
-      settings: {
-        experimental: { memoryV2: false },
-      },
-    },

    prompt: `I prefer to use tabs instead of spaces for indentation.`,
    assert: async (rig, result) => {
@@ -242,11 +202,6 @@ describe('save_memory', () => {
    suiteName: 'default',
    suiteType: 'behavioral',
    name: savingBuildArtifactLocationAsProjectMemory,
-    params: {
-      settings: {
-        experimental: { memoryV2: false },
-      },
-    },
    prompt: `In this workspace, build artifacts are stored in the \`dist/artifacts\` directory.`,
    assert: async (rig, result) => {
      const wasToolCalled = await rig.waitForToolCall(
@@ -276,11 +231,6 @@ describe('save_memory', () => {
    suiteName: 'default',
    suiteType: 'behavioral',
    name: savingMainEntryPointAsProjectMemory,
-    params: {
-      settings: {
-        experimental: { memoryV2: false },
-      },
-    },
    prompt: `The main entry point for this workspace is \`src/index.js\`.`,
    assert: async (rig, result) => {
      const wasToolCalled = await rig.waitForToolCall(
@@ -309,11 +259,6 @@ describe('save_memory', () => {
    suiteName: 'default',
    suiteType: 'behavioral',
    name: rememberingBirthday,
-    params: {
-      settings: {
-        experimental: { memoryV2: false },
-      },
-    },

    prompt: `My birthday is on June 15th.`,
    assert: async (rig, result) => {
@@ -172,7 +172,6 @@ export async function internalEvalTest(evalCase: EvalCase) {
        timeout: evalCase.timeout,
        env: {
          GEMINI_CLI_ACTIVITY_LOG_TARGET: activityLogFile,
-          GEMINI_CLI_TRUST_WORKSPACE: 'true',
        },
      });

@@ -1,12 +1,12 @@
 {
  "name": "@google/gemini-cli",
-  "version": "0.40.1",
+  "version": "0.41.0-nightly.20260423.gaa05b4583",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@google/gemini-cli",
-      "version": "0.40.1",
+      "version": "0.41.0-nightly.20260423.gaa05b4583",
      "workspaces": [
        "packages/*"
      ],
@@ -17692,7 +17692,7 @@
    },
    "packages/a2a-server": {
      "name": "@google/gemini-cli-a2a-server",
-      "version": "0.40.1",
+      "version": "0.41.0-nightly.20260423.gaa05b4583",
      "dependencies": {
        "@a2a-js/sdk": "0.3.11",
        "@google-cloud/storage": "^7.16.0",
@@ -17821,7 +17821,7 @@
    },
    "packages/cli": {
      "name": "@google/gemini-cli",
-      "version": "0.40.1",
+      "version": "0.41.0-nightly.20260423.gaa05b4583",
      "license": "Apache-2.0",
      "dependencies": {
        "@agentclientprotocol/sdk": "^0.16.1",
@@ -17969,7 +17969,7 @@
    },
    "packages/core": {
      "name": "@google/gemini-cli-core",
-      "version": "0.40.1",
+      "version": "0.41.0-nightly.20260423.gaa05b4583",
      "license": "Apache-2.0",
      "dependencies": {
        "@a2a-js/sdk": "0.3.11",
@@ -18279,7 +18279,7 @@
    },
    "packages/devtools": {
      "name": "@google/gemini-cli-devtools",
-      "version": "0.40.1",
+      "version": "0.41.0-nightly.20260423.gaa05b4583",
      "license": "Apache-2.0",
      "dependencies": {
        "ws": "^8.16.0"
@@ -18294,7 +18294,7 @@
    },
    "packages/sdk": {
      "name": "@google/gemini-cli-sdk",
-      "version": "0.40.1",
+      "version": "0.41.0-nightly.20260423.gaa05b4583",
      "license": "Apache-2.0",
      "dependencies": {
        "@google/gemini-cli-core": "file:../core",
@@ -18325,7 +18325,7 @@
    },
    "packages/test-utils": {
      "name": "@google/gemini-cli-test-utils",
-      "version": "0.40.1",
+      "version": "0.41.0-nightly.20260423.gaa05b4583",
      "license": "Apache-2.0",
      "dependencies": {
        "@google/gemini-cli-core": "file:../core",
@@ -18357,7 +18357,7 @@
    },
    "packages/vscode-ide-companion": {
      "name": "gemini-cli-vscode-ide-companion",
-      "version": "0.40.1",
+      "version": "0.41.0-nightly.20260423.gaa05b4583",
      "license": "LICENSE",
      "dependencies": {
        "@modelcontextprotocol/sdk": "^1.23.0",
@@ -1,6 +1,6 @@
 {
  "name": "@google/gemini-cli",
-  "version": "0.40.1",
+  "version": "0.41.0-nightly.20260423.gaa05b4583",
  "engines": {
    "node": ">=20.0.0"
  },
@@ -14,7 +14,7 @@
    "url": "git+https://github.com/google-gemini/gemini-cli.git"
  },
  "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.40.1"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.41.0-nightly.20260423.gaa05b4583"
  },
  "scripts": {
    "start": "cross-env NODE_ENV=development node scripts/start.js",
@@ -1,6 +1,6 @@
 {
  "name": "@google/gemini-cli-a2a-server",
-  "version": "0.40.1",
+  "version": "0.41.0-nightly.20260423.gaa05b4583",
  "description": "Gemini CLI A2A Server",
  "repository": {
    "type": "git",
@@ -1,6 +1,6 @@
 {
  "name": "@google/gemini-cli",
-  "version": "0.40.1",
+  "version": "0.41.0-nightly.20260423.gaa05b4583",
  "description": "Gemini CLI",
  "license": "Apache-2.0",
  "repository": {
@@ -27,7 +27,7 @@
    "dist"
  ],
  "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.40.1"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.41.0-nightly.20260423.gaa05b4583"
  },
  "dependencies": {
    "@agentclientprotocol/sdk": "^0.16.1",
@@ -1044,6 +1044,7 @@ export async function loadCliConfig(
      format: (argv.outputFormat ?? settings.output?.format) as OutputFormat,
    },
    gemmaModelRouter: settings.experimental?.gemmaModelRouter,
+    autoRouting: settings.model?.autoRouting,
    adk: settings.experimental?.adk,
    fakeResponses: argv.fakeResponses,
    recordResponses: argv.recordResponses,
@@ -1112,6 +1112,46 @@ const SETTINGS_SCHEMA = {
        description: 'Skip the next speaker check.',
        showInDialog: true,
      },
+      autoRouting: {
+        type: 'object',
+        label: 'Auto Routing',
+        category: 'Model',
+        requiresRestart: false,
+        default: {},
+        description: 'Settings for automatic model routing.',
+        showInDialog: false,
+        properties: {
+          bestEffortPro: {
+            type: 'boolean',
+            label: 'Best Effort Pro',
+            category: 'Model',
+            requiresRestart: false,
+            default: false,
+            description:
+              'Always prefer the Pro model unless it is unavailable (e.g., due to timeouts or quota), ignoring other routing hints.',
+            showInDialog: true,
+          },
+          proTimeoutMinutes: {
+            type: 'number',
+            label: 'Pro Timeout (Minutes)',
+            category: 'Model',
+            requiresRestart: false,
+            default: 5,
+            description:
+              'If a Pro request takes longer than this many minutes, it will be marked as temporarily unavailable and fallback to Flash.',
+            showInDialog: true,
+          },
+          proTimeoutFallbackDurationMinutes: {
+            type: 'number',
+            label: 'Pro Timeout Fallback Duration (Minutes)',
+            category: 'Model',
+            requiresRestart: false,
+            default: 60,
+            description: 'How long to route to Flash after Pro times out.',
+            showInDialog: true,
+          },
+        },
+      },
    },
  },

@@ -1667,19 +1707,6 @@ const SETTINGS_SCHEMA = {
        showInDialog: false,
        items: { type: 'string' },
      },
-      confirmationRequired: {
-        type: 'array',
-        label: 'Confirmation Required',
-        category: 'Advanced',
-        requiresRestart: true,
-        default: undefined as string[] | undefined,
-        description: oneLine`
-          Tool names that always require user confirmation.
-          Takes precedence over allowed tools and core tool allowlists.
-        `,
-        showInDialog: false,
-        items: { type: 'string' },
-      },
      exclude: {
        type: 'array',
        label: 'Exclude Tools',
@@ -124,6 +124,9 @@ export const createMockConfig = (overrides: Partial<Config> = {}): Config =>
    getCompressionThreshold: vi.fn().mockResolvedValue(undefined),
    getUserCaching: vi.fn().mockResolvedValue(false),
    getNumericalRoutingEnabled: vi.fn().mockResolvedValue(false),
+    getBestEffortProEnabled: vi.fn().mockResolvedValue(false),
+    getProTimeoutMinutes: vi.fn().mockResolvedValue(5),
+    getProTimeoutFallbackDurationMinutes: vi.fn().mockResolvedValue(60),
    getClassifierThreshold: vi.fn().mockResolvedValue(undefined),
    getBannerTextNoCapacityIssues: vi.fn().mockResolvedValue(''),
    getBannerTextCapacityIssues: vi.fn().mockResolvedValue(''),
@@ -44,7 +44,7 @@ enum TerminalKeys {
  LEFT_ARROW = '\u001B[D',
  RIGHT_ARROW = '\u001B[C',
  ESCAPE = '\u001B',
-  BACKSPACE = '\u0008',
+  BACKSPACE = '\x7f',
  CTRL_P = '\u0010',
  CTRL_N = '\u000E',
 }
@@ -168,13 +168,6 @@ exports[`InputPrompt > mouse interaction > should toggle paste expansion on doub
 "
 `;

-exports[`InputPrompt > mouse interaction > should toggle paste expansion on double-click 4`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
- > [Pasted Text: 10 lines]                                                                          
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
-"
-`;
-
 exports[`InputPrompt > multiline rendering > should correctly render multiline input including blank lines 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
 > hello
@@ -24,7 +24,7 @@ enum TerminalKeys {
  LEFT_ARROW = '\u001B[D',
  RIGHT_ARROW = '\u001B[C',
  ESCAPE = '\u001B',
-  BACKSPACE = '\u0008',
+  BACKSPACE = '\x7f',
  CTRL_L = '\u000C',
 }

@@ -9,7 +9,17 @@ import { act } from 'react';
 import { renderHookWithProviders } from '../../test-utils/render.js';
 import { createMockSettings } from '../../test-utils/settings.js';
 import { waitFor } from '../../test-utils/async.js';
-import { vi, afterAll, beforeAll, type Mock } from 'vitest';
+import type { Mock } from 'vitest';
+import {
+  vi,
+  afterAll,
+  beforeAll,
+  describe,
+  it,
+  expect,
+  beforeEach,
+  afterEach,
+} from 'vitest';
 import {
  useKeypressContext,
  ESC_TIMEOUT,
@@ -431,6 +441,80 @@ describe('KeypressContext', () => {
    );
  });

+  describe('Windows Terminal Backspace handling', () => {
+    afterEach(() => {
+      vi.unstubAllEnvs();
+    });
+
+    it('should NOT treat \\b as ctrl when WT_SESSION is NOT present and OS is not Windows_NT', async () => {
+      vi.stubEnv('WT_SESSION', '');
+      vi.stubEnv('OS', 'Linux');
+      const { keyHandler } = await setupKeypressTest();
+
+      act(() => {
+        stdin.write('\b');
+      });
+
+      expect(keyHandler).toHaveBeenCalledWith(
+        expect.objectContaining({
+          name: 'backspace',
+          ctrl: false,
+        }),
+      );
+    });
+
+    it('should treat \\b as ctrl when WT_SESSION IS present (even if not Windows_NT)', async () => {
+      vi.stubEnv('WT_SESSION', 'some-id');
+      vi.stubEnv('OS', 'Linux');
+      const { keyHandler } = await setupKeypressTest();
+
+      act(() => {
+        stdin.write('\b');
+      });
+
+      expect(keyHandler).toHaveBeenCalledWith(
+        expect.objectContaining({
+          name: 'backspace',
+          ctrl: true,
+        }),
+      );
+    });
+
+    it('should treat \\b as ctrl when OS is Windows_NT', async () => {
+      vi.stubEnv('WT_SESSION', '');
+      vi.stubEnv('OS', 'Windows_NT');
+      const { keyHandler } = await setupKeypressTest();
+
+      act(() => {
+        stdin.write('\b');
+      });
+
+      expect(keyHandler).toHaveBeenCalledWith(
+        expect.objectContaining({
+          name: 'backspace',
+          ctrl: true,
+        }),
+      );
+    });
+
+    it('should treat \\x7f as regular backspace regardless of WT_SESSION or OS', async () => {
+      vi.stubEnv('WT_SESSION', 'some-id');
+      vi.stubEnv('OS', 'Windows_NT');
+      const { keyHandler } = await setupKeypressTest();
+
+      act(() => {
+        stdin.write('\x7f');
+      });
+
+      expect(keyHandler).toHaveBeenCalledWith(
+        expect.objectContaining({
+          name: 'backspace',
+          ctrl: false,
+        }),
+      );
+    });
+  });
+
  describe('paste mode', () => {
    it.each([
      {
@@ -651,8 +651,20 @@ function* emitKeys(
      // tab
      name = 'tab';
      alt = escaped;
-    } else if (ch === '\b' || ch === '\x7f') {
-      // backspace or ctrl+h
+    } else if (ch === '\b') {
+      // ctrl+h / ctrl+backspace (windows terminals send \x08 for ctrl+backspace)
+      name = 'backspace';
+      // In Windows environments, \b is sent for Ctrl+Backspace (standard backspace is translated to \x7f).
+      // We scope this to Windows/WT_SESSION to avoid breaking other unixes where \b is a plain backspace.
+      if (
+        typeof process !== 'undefined' &&
+        (process.env?.['OS'] === 'Windows_NT' || !!process.env?.['WT_SESSION'])
+      ) {
+        ctrl = true;
+      }
+      alt = escaped;
+    } else if (ch === '\x7f') {
+      // backspace
      name = 'backspace';
      alt = escaped;
    } else if (ch === ESC) {
@@ -513,6 +513,70 @@ describe('useSlashCompletion', () => {
      unmountResume();
    });

+    it('should NOT suggest the auto-list command when typing a non-matching partial after /chat', async () => {
+      const slashCommands = [
+        createTestCommand({
+          name: 'chat',
+          description: 'Manage chat history',
+          subCommands: [
+            createTestCommand({ name: 'list', description: 'List chats' }),
+          ],
+        }),
+      ];
+
+      const { result, unmount } = await renderHook(() =>
+        useTestHarnessForSlashCompletion(
+          true,
+          '/chat x', // 'x' does not match 'list'
+          slashCommands,
+          mockCommandContext,
+        ),
+      );
+
+      await resolveMatch();
+
+      await waitFor(() => {
+        // It should NOT have the 'auto' section 'list' suggestion
+        const autoSuggestion = result.current.suggestions.find(
+          (s) => s.sectionTitle === 'auto',
+        );
+        expect(autoSuggestion).toBeUndefined();
+      });
+      unmount();
+    });
+
+    it('should STILL suggest the auto-list command when typing a matching partial after /chat', async () => {
+      const slashCommands = [
+        createTestCommand({
+          name: 'chat',
+          description: 'Manage chat history',
+          subCommands: [
+            createTestCommand({ name: 'list', description: 'List chats' }),
+          ],
+        }),
+      ];
+
+      const { result, unmount } = await renderHook(() =>
+        useTestHarnessForSlashCompletion(
+          true,
+          '/chat l', // 'l' matches 'list'
+          slashCommands,
+          mockCommandContext,
+        ),
+      );
+
+      await resolveMatch();
+
+      await waitFor(() => {
+        const autoSuggestion = result.current.suggestions.find(
+          (s) => s.sectionTitle === 'auto',
+        );
+        expect(autoSuggestion).toBeDefined();
+        expect(autoSuggestion?.label).toBe('list');
+      });
+      unmount();
+    });
+
    it('should sort exact altName matches to the top', async () => {
      const slashCommands = [
        createTestCommand({
@@ -338,17 +338,23 @@ function useCommandSuggestions(

          if (isTopLevelChatOrResumeContext) {
            const canonicalParentName = leafCommand.name;
-            const autoSectionSuggestion: Suggestion = {
-              label: 'list',
-              value: 'list',
-              insertValue: canonicalParentName,
-              description: 'Browse auto-saved chats',
-              commandKind: CommandKind.BUILT_IN,
-              sectionTitle: 'auto',
-              submitValue: `/${canonicalParentName}`,
-            };
-            setSuggestions([autoSectionSuggestion, ...finalSuggestions]);
-            return;
+            const autoLabel = 'list';
+            if (
+              partial === '' ||
+              autoLabel.toLowerCase().startsWith(partial.toLowerCase())
+            ) {
+              const autoSectionSuggestion: Suggestion = {
+                label: autoLabel,
+                value: autoLabel,
+                insertValue: canonicalParentName,
+                description: 'Browse auto-saved chats',
+                commandKind: CommandKind.BUILT_IN,
+                sectionTitle: 'auto',
+                submitValue: `/${canonicalParentName}`,
+              };
+              setSuggestions([autoSectionSuggestion, ...finalSuggestions]);
+              return;
+            }
          }

          setSuggestions(finalSuggestions);
@@ -96,9 +96,7 @@ const folderTrustCheck: WarningCheck = {

    if (isHeadlessMode()) {
      throw new FatalUntrustedWorkspaceError(
-        'Gemini CLI is not running in a trusted directory. To proceed, either use `--skip-trust`, ' +
-          'set the `GEMINI_CLI_TRUST_WORKSPACE=true` environment variable, or trust this directory in interactive mode. ' +
-          'For more details, see https://geminicli.com/docs/cli/trusted-folders/#headless-and-automated-environments',
+        'Gemini CLI is not running in a trusted directory. To proceed, either use `--skip-trust`, set the `GEMINI_CLI_TRUST_WORKSPACE=true` environment variable, or trust this directory in interactive mode.',
      );
    }

@@ -1,6 +1,6 @@
 {
  "name": "@google/gemini-cli-core",
-  "version": "0.40.1",
+  "version": "0.41.0-nightly.20260423.gaa05b4583",
  "description": "Gemini CLI Core",
  "license": "Apache-2.0",
  "repository": {
@@ -8,13 +8,15 @@ export type ModelId = string;

 type TerminalUnavailabilityReason = 'quota' | 'capacity';
 export type TurnUnavailabilityReason = 'retry_once_per_turn';
+export type TemporaryUnavailabilityReason = 'timeout';

 export type UnavailabilityReason =
  | TerminalUnavailabilityReason
  | TurnUnavailabilityReason
+  | TemporaryUnavailabilityReason
  | 'unknown';

-export type ModelHealthStatus = 'terminal' | 'sticky_retry';
+export type ModelHealthStatus = 'terminal' | 'sticky_retry' | 'temporary';

 type HealthState =
  | { status: 'terminal'; reason: TerminalUnavailabilityReason }
@@ -22,6 +24,11 @@ type HealthState =
      status: 'sticky_retry';
      reason: TurnUnavailabilityReason;
      consumed: boolean;
+    }
+  | {
+      status: 'temporary';
+      reason: TemporaryUnavailabilityReason;
+      untilMs: number;
    };

 export interface ModelAvailabilitySnapshot {
@@ -48,6 +55,18 @@ export class ModelAvailabilityService {
    });
  }

+  markTemporarilyUnavailable(
+    model: ModelId,
+    reason: TemporaryUnavailabilityReason,
+    durationMs: number,
+  ) {
+    this.setState(model, {
+      status: 'temporary',
+      reason,
+      untilMs: Date.now() + durationMs,
+    });
+  }
+
  markHealthy(model: ModelId) {
    this.clearState(model);
  }
@@ -95,6 +114,15 @@ export class ModelAvailabilityService {
      return { available: false, reason: state.reason };
    }

+    if (state.status === 'temporary') {
+      if (Date.now() < state.untilMs) {
+        return { available: false, reason: state.reason };
+      } else {
+        this.clearState(model);
+        return { available: true };
+      }
+    }
+
    return { available: true };
  }

@@ -56,7 +56,7 @@ describe('policyCatalog', () => {
  it('marks preview transients as sticky retries', () => {
    const [previewPolicy] = getModelPolicyChain({ previewEnabled: true });
    expect(previewPolicy.model).toBe(PREVIEW_GEMINI_MODEL);
-    expect(previewPolicy.stateTransitions.transient).toBe('sticky_retry');
+    expect(previewPolicy.stateTransitions.transient).toBe('terminal');
  });

  it('applies default actions and state transitions for unspecified kinds', () => {
@@ -50,7 +50,7 @@ export const SILENT_ACTIONS: ModelPolicyActionMap = {

 const DEFAULT_STATE: ModelPolicyStateMap = {
  terminal: 'terminal',
-  transient: 'sticky_retry',
+  transient: 'terminal',
  not_found: 'terminal',
  unknown: 'terminal',
 };
@@ -679,6 +679,11 @@ export interface ConfigParameters {
  policyUpdateConfirmationRequest?: PolicyUpdateConfirmationRequest;
  output?: OutputSettings;
  gemmaModelRouter?: GemmaModelRouterSettings;
+  autoRouting?: {
+    bestEffortPro?: boolean;
+    proTimeoutMinutes?: number;
+    proTimeoutFallbackDurationMinutes?: number;
+  };
  adk?: ADKSettings;
  disableModelRouterForAuth?: AuthType[];
  continueOnFailedApiCall?: boolean;
@@ -963,6 +968,9 @@ export class Config implements McpContext, AgentLoopContext {
  private readonly planEnabled: boolean;
  private readonly trackerEnabled: boolean;
  private readonly planModeRoutingEnabled: boolean;
+  private readonly autoRoutingBestEffortPro: boolean;
+  private readonly autoRoutingProTimeoutMinutes: number;
+  private readonly autoRoutingProTimeoutFallbackDurationMinutes: number;
  private readonly modelSteering: boolean;
  private memoryContextManager?: MemoryContextManager;
  private readonly contextManagement: ContextManagementConfig;
@@ -1117,6 +1125,11 @@ export class Config implements McpContext, AgentLoopContext {
    this.planEnabled = params.plan ?? true;
    this.trackerEnabled = params.tracker ?? false;
    this.planModeRoutingEnabled = params.planSettings?.modelRouting ?? true;
+    this.autoRoutingBestEffortPro = params.autoRouting?.bestEffortPro ?? false;
+    this.autoRoutingProTimeoutMinutes =
+      params.autoRouting?.proTimeoutMinutes ?? 5;
+    this.autoRoutingProTimeoutFallbackDurationMinutes =
+      params.autoRouting?.proTimeoutFallbackDurationMinutes ?? 60;
    this.enableEventDrivenScheduler = params.enableEventDrivenScheduler ?? true;
    this.skillsSupport = params.skillsSupport ?? true;
    this.disabledSkills = params.disabledSkills ?? [];
@@ -3144,6 +3157,18 @@ export class Config implements McpContext, AgentLoopContext {
    return flag?.boolValue ?? true;
  }

+  async getBestEffortProEnabled(): Promise<boolean> {
+    return this.autoRoutingBestEffortPro;
+  }
+
+  async getProTimeoutMinutes(): Promise<number> {
+    return this.autoRoutingProTimeoutMinutes;
+  }
+
+  async getProTimeoutFallbackDurationMinutes(): Promise<number> {
+    return this.autoRoutingProTimeoutFallbackDurationMinutes;
+  }
+
  /**
   * Returns the resolved complexity threshold for routing.
   * If a remote threshold is provided and within range (0-100), it is returned.
@@ -520,7 +520,7 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
        },
        stateTransitions: {
          terminal: 'terminal',
-          transient: 'sticky_retry',
+          transient: 'terminal',
          not_found: 'terminal',
          unknown: 'terminal',
        },
@@ -536,7 +536,7 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
        },
        stateTransitions: {
          terminal: 'terminal',
-          transient: 'sticky_retry',
+          transient: 'terminal',
          not_found: 'terminal',
          unknown: 'terminal',
        },
@@ -553,7 +553,7 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
        },
        stateTransitions: {
          terminal: 'terminal',
-          transient: 'sticky_retry',
+          transient: 'terminal',
          not_found: 'terminal',
          unknown: 'terminal',
        },
@@ -569,7 +569,7 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
        },
        stateTransitions: {
          terminal: 'terminal',
-          transient: 'sticky_retry',
+          transient: 'terminal',
          not_found: 'terminal',
          unknown: 'terminal',
        },
@@ -586,7 +586,7 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
        },
        stateTransitions: {
          terminal: 'terminal',
-          transient: 'sticky_retry',
+          transient: 'terminal',
          not_found: 'terminal',
          unknown: 'terminal',
        },
@@ -601,7 +601,7 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
        },
        stateTransitions: {
          terminal: 'terminal',
-          transient: 'sticky_retry',
+          transient: 'terminal',
          not_found: 'terminal',
          unknown: 'terminal',
        },
@@ -617,7 +617,7 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
        },
        stateTransitions: {
          terminal: 'terminal',
-          transient: 'sticky_retry',
+          transient: 'terminal',
          not_found: 'terminal',
          unknown: 'terminal',
        },
@@ -109,6 +109,8 @@ describe('BaseLlmClient', () => {
        .mockReturnValue({ authType: AuthType.USE_GEMINI }),
      getEmbeddingModel: vi.fn().mockReturnValue('test-embedding-model'),
      isInteractive: vi.fn().mockReturnValue(false),
+      getProTimeoutMinutes: vi.fn().mockResolvedValue(5),
+      getProTimeoutFallbackDurationMinutes: vi.fn().mockResolvedValue(60),
      modelConfigService: {
        getResolvedConfig: vi
          .fn()
@@ -325,11 +325,19 @@ export class BaseLlmClient {
        );
      };

+      const proTimeoutMinutes = await this.config.getProTimeoutMinutes();
+      const proTimeoutFallbackDurationMinutes =
+        await this.config.getProTimeoutFallbackDurationMinutes();
+
      return await retryWithBackoff(apiCall, {
        shouldRetryOnContent,
        maxAttempts:
          availabilityMaxAttempts ?? maxAttempts ?? DEFAULT_MAX_ATTEMPTS,
        getAvailabilityContext,
+        timeoutFallback: {
+          timeoutMs: proTimeoutMinutes * 60 * 1000,
+          fallbackDurationMs: proTimeoutFallbackDurationMinutes * 60 * 1000,
+        },
        onPersistent429: this.config.isInteractive()
          ? (authType, error) =>
              handleFallback(this.config, currentModel, authType, error)
@@ -1244,9 +1244,6 @@ ${JSON.stringify(
        count: 2,
      });

-      const abortSpy = vi.spyOn(AbortController.prototype, 'abort');
-
-      // Act
      const stream = client.sendMessageStream(
        [{ text: 'Hi' }],
        new AbortController().signal,
@@ -1267,7 +1264,6 @@ ${JSON.stringify(

      // Assert
      expect(events).toContainEqual({ type: GeminiEventType.LoopDetected });
-      expect(abortSpy).toHaveBeenCalled();
      expect(finalResult).toBeInstanceOf(Turn);
    });

@@ -684,9 +684,6 @@ export class GeminiClient {
    // Re-initialize turn with fresh history
    turn = new Turn(this.getChat(), prompt_id);

-    const controller = new AbortController();
-    const linkedSignal = AbortSignal.any([signal, controller.signal]);
-
    const loopResult = await this.loopDetector.turnStarted(signal);
    if (loopResult.count > 1) {
      yield { type: GeminiEventType.LoopDetected };
@@ -747,7 +744,7 @@ export class GeminiClient {
    const resultStream = turn.run(
      modelConfigKey,
      request,
-      linkedSignal,
+      signal,
      displayContent,
    );
    let isError = false;
@@ -783,7 +780,6 @@ export class GeminiClient {
    }

    if (loopDetectedAbort) {
-      controller.abort();
      return turn;
    }

@@ -795,10 +791,8 @@ export class GeminiClient {
        boundedTurns,
        isInvalidStreamRetry,
        displayContent,
-        controller,
      );
    }
-
    if (isError) {
      return turn;
    }
@@ -1252,10 +1246,7 @@ export class GeminiClient {
    boundedTurns: number,
    isInvalidStreamRetry: boolean,
    displayContent?: PartListUnion,
-    controllerToAbort?: AbortController,
  ): AsyncGenerator<ServerGeminiStreamEvent, Turn> {
-    controllerToAbort?.abort();
-
    // Clear the detection flag so the recursive turn can proceed, but the count remains 1.
    this.loopDetector.clearDetection();

@@ -160,6 +160,8 @@ describe('GeminiChat', () => {
        authType: 'oauth-personal',
        model: currentModel,
      })),
+      getProTimeoutMinutes: vi.fn().mockResolvedValue(5),
+      getProTimeoutFallbackDurationMinutes: vi.fn().mockResolvedValue(60),
      getModel: vi.fn().mockImplementation(() => currentModel),
      setModel: vi.fn().mockImplementation((m: string) => {
        currentModel = m;
@@ -687,6 +687,10 @@ export class GeminiChat {
      );
    };

+    const proTimeoutMinutes = await this.context.config.getProTimeoutMinutes();
+    const proTimeoutFallbackDurationMinutes =
+      await this.context.config.getProTimeoutFallbackDurationMinutes();
+
    const streamResponse = await retryWithBackoff(apiCall, {
      onPersistent429: onPersistent429Callback,
      onValidationRequired: onValidationRequiredCallback,
@@ -696,6 +700,10 @@ export class GeminiChat {
      maxAttempts:
        availabilityMaxAttempts ?? this.context.config.getMaxAttempts(),
      getAvailabilityContext,
+      timeoutFallback: {
+        timeoutMs: proTimeoutMinutes * 60 * 1000,
+        fallbackDurationMs: proTimeoutFallbackDurationMinutes * 60 * 1000,
+      },
      onRetry: (attempt, error, delayMs) => {
        coreEvents.emitRetryAttempt({
          attempt,
@@ -103,6 +103,8 @@ describe('GeminiChat Network Retries', () => {
        authType: 'oauth-personal',
        model: 'test-model',
      }),
+      getProTimeoutMinutes: vi.fn().mockResolvedValue(5),
+      getProTimeoutFallbackDurationMinutes: vi.fn().mockResolvedValue(60),
      getModel: vi.fn().mockReturnValue('gemini-pro'),
      getActiveModel: vi.fn().mockReturnValue('gemini-pro'),
      setActiveModel: vi.fn(),
@@ -74,9 +74,7 @@ export const ADMIN_POLICY_TIER = 5;

 export const MCP_EXCLUDED_PRIORITY = USER_POLICY_TIER + 0.9;
 export const EXCLUDE_TOOLS_FLAG_PRIORITY = USER_POLICY_TIER + 0.4;
-export const CONFIRMATION_REQUIRED_PRIORITY = USER_POLICY_TIER + 0.35;
 export const ALLOWED_TOOLS_FLAG_PRIORITY = USER_POLICY_TIER + 0.3;
-export const CORE_TOOLS_FLAG_PRIORITY = USER_POLICY_TIER + 0.25;
 export const TRUSTED_MCP_SERVER_PRIORITY = USER_POLICY_TIER + 0.2;
 export const ALLOWED_MCP_SERVER_PRIORITY = USER_POLICY_TIER + 0.1;

@@ -436,21 +434,10 @@ export async function createPolicyEngineConfig(
    }
  }

-  const nonPlanModes = [
-    ApprovalMode.DEFAULT,
-    ApprovalMode.AUTO_EDIT,
-    ApprovalMode.YOLO,
-  ];
-
-  const mapToolsToRules = (
-    tools: string[],
-    priority: number,
-    source: string,
-    modes?: ApprovalMode[],
-    addDefaultDenyForTools = false,
-  ) => {
-    const toolsWithNarrowing = new Set<string>();
-    for (const tool of tools) {
+  // Tools that are explicitly allowed in the settings.
+  // Priority: ALLOWED_TOOLS_FLAG_PRIORITY (user tier - explicit temporary allows)
+  if (settings.tools?.allowed) {
+    for (const tool of settings.tools.allowed) {
      // Check for legacy format: toolName(args)
      const match = tool.match(/^([a-zA-Z0-9_-]+)\((.*)\)$/);
      if (match) {
@@ -462,17 +449,15 @@ export async function createPolicyEngineConfig(

        // Treat args as a command prefix for shell tool
        if (toolName === SHELL_TOOL_NAME) {
-          toolsWithNarrowing.add(toolName);
          const patterns = buildArgsPatterns(undefined, args);
          for (const pattern of patterns) {
            if (pattern) {
              rules.push({
                toolName,
                decision: PolicyDecision.ALLOW,
-                priority,
+                priority: ALLOWED_TOOLS_FLAG_PRIORITY,
                argsPattern: new RegExp(pattern),
-                source,
-                modes,
+                source: 'Settings (Tools Allowed)',
              });
            }
          }
@@ -482,9 +467,8 @@ export async function createPolicyEngineConfig(
          rules.push({
            toolName,
            decision: PolicyDecision.ALLOW,
-            priority,
-            source,
-            modes,
+            priority: ALLOWED_TOOLS_FLAG_PRIORITY,
+            source: 'Settings (Tools Allowed)',
          });
        }
      } else {
@@ -495,70 +479,11 @@ export async function createPolicyEngineConfig(
        rules.push({
          toolName,
          decision: PolicyDecision.ALLOW,
-          priority,
-          source,
-          modes,
+          priority: ALLOWED_TOOLS_FLAG_PRIORITY,
+          source: 'Settings (Tools Allowed)',
        });
      }
    }
-
-    if (addDefaultDenyForTools) {
-      for (const toolName of toolsWithNarrowing) {
-        rules.push({
-          toolName,
-          decision: PolicyDecision.DENY,
-          priority: priority - 0.01,
-          source: `${source} (Narrowing Enforcement)`,
-          modes,
-        });
-      }
-    }
-  };
-
-  // Tools that are explicitly allowed in the settings.
-  // Priority: ALLOWED_TOOLS_FLAG_PRIORITY (user tier - explicit temporary allows)
-  if (settings.tools?.allowed) {
-    mapToolsToRules(
-      settings.tools.allowed,
-      ALLOWED_TOOLS_FLAG_PRIORITY,
-      'Settings (Tools Allowed)',
-      undefined,
-      true,
-    );
-  }
-
-  // Tools that explicitly require confirmation in the settings.
-  // Priority: CONFIRMATION_REQUIRED_PRIORITY (overrides allowed and core)
-  if (settings.tools?.confirmationRequired) {
-    for (const tool of settings.tools.confirmationRequired) {
-      rules.push({
-        toolName: SHELL_TOOL_NAMES.includes(tool) ? SHELL_TOOL_NAME : tool,
-        decision: PolicyDecision.ASK_USER,
-        priority: CONFIRMATION_REQUIRED_PRIORITY,
-        source: 'Settings (Confirmation Required)',
-      });
-    }
-  }
-
-  // Core tools that are restricted in the settings.
-  // Priority: CORE_TOOLS_FLAG_PRIORITY (user tier - core tool allowlist)
-  if (settings.tools?.core) {
-    mapToolsToRules(
-      settings.tools.core,
-      CORE_TOOLS_FLAG_PRIORITY,
-      'Settings (Core Tools)',
-      nonPlanModes,
-    );
-
-    // If core tools are restricted, we should add a default DENY rule for everything else
-    // at a slightly lower priority than the explicit allows.
-    rules.push({
-      toolName: '*',
-      decision: PolicyDecision.DENY,
-      priority: CORE_TOOLS_FLAG_PRIORITY - 0.01,
-      source: 'Settings (Core Tools Allowlist Enforcement)',
-      modes: nonPlanModes,
-    });
  }

  // MCP servers that are trusted in the settings.
@@ -576,7 +501,6 @@ export async function createPolicyEngineConfig(
          decision: PolicyDecision.ALLOW,
          priority: TRUSTED_MCP_SERVER_PRIORITY,
          source: 'Settings (MCP Trusted)',
-          modes: nonPlanModes,
        });
      }
    }
@@ -595,7 +519,6 @@ export async function createPolicyEngineConfig(
        decision: PolicyDecision.ALLOW,
        priority: ALLOWED_MCP_SERVER_PRIORITY,
        source: 'Settings (MCP Allowed)',
-        modes: nonPlanModes,
      });
    }
  }
@@ -1,76 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect } from 'vitest';
-import { createPolicyEngineConfig } from './config.js';
-import { PolicyEngine } from './policy-engine.js';
-import { PolicyDecision, ApprovalMode } from './types.js';
-
-describe('PolicyEngine - Core Tools Mapping', () => {
-  it('should allow tools explicitly listed in settings.tools.core', async () => {
-    const settings = {
-      tools: {
-        core: ['run_shell_command(ls)', 'run_shell_command(git status)'],
-      },
-    };
-
-    const config = await createPolicyEngineConfig(
-      settings,
-      ApprovalMode.DEFAULT,
-      undefined,
-      true, // interactive
-    );
-
-    const engine = new PolicyEngine(config);
-
-    // Test simple tool name
-    const result1 = await engine.check(
-      { name: 'run_shell_command', args: { command: 'ls' } },
-      undefined,
-    );
-    expect(result1.decision).toBe(PolicyDecision.ALLOW);
-
-    // Test tool name with args
-    const result2 = await engine.check(
-      { name: 'run_shell_command', args: { command: 'git status' } },
-      undefined,
-    );
-    expect(result2.decision).toBe(PolicyDecision.ALLOW);
-
-    // Test tool not in core list
-    const result3 = await engine.check(
-      { name: 'run_shell_command', args: { command: 'npm test' } },
-      undefined,
-    );
-    // Should be DENIED because of strict allowlist
-    expect(result3.decision).toBe(PolicyDecision.DENY);
-  });
-
-  it('should allow tools in tools.core even if they are restricted by default policies', async () => {
-    // By default run_shell_command is ASK_USER.
-    // Putting it in tools.core should make it ALLOW.
-    const settings = {
-      tools: {
-        core: ['run_shell_command'],
-      },
-    };
-
-    const config = await createPolicyEngineConfig(
-      settings,
-      ApprovalMode.DEFAULT,
-      undefined,
-      true,
-    );
-
-    const engine = new PolicyEngine(config);
-
-    const result = await engine.check(
-      { name: 'run_shell_command', args: { command: 'any command' } },
-      undefined,
-    );
-    expect(result.decision).toBe(PolicyDecision.ALLOW);
-  });
-});
@@ -43,35 +43,6 @@ vi.mock('../utils/shell-utils.js', async (importOriginal) => {
      }
      return [command];
    }),
-    parseCommandDetails: vi.fn().mockImplementation((command: string) => {
-      // Basic mock implementation for PolicyEngine test needs
-      const commands = command.includes('&&')
-        ? command.split('&&').map((c) => c.trim())
-        : [command.trim()];
-
-      // Detect $(...) or `...` and add as sub-commands for recursion tests
-      const subCommands = [...commands];
-      for (const cmd of commands) {
-        const subMatch = cmd.match(/\$\((.*)\)/) || cmd.match(/`(.*)`/);
-        if (subMatch?.[1]) {
-          subCommands.push(subMatch[1].trim());
-        }
-      }
-
-      return {
-        details: subCommands.map((c, i) => ({
-          name: c.split(' ')[0],
-          text: c,
-          startIndex: i === 0 ? 0 : -1, // Simple root indication
-        })),
-        hasError: false,
-      };
-    }),
-    stripShellWrapper: vi.fn().mockImplementation((command: string) => {
-      // Simple mock for stripping wrappers
-      const match = command.match(/^(?:bash|sh|zsh)\s+-c\s+["'](.*)["']$/i);
-      return match ? match[1] : command;
-    }),
    hasRedirection: vi.fn().mockImplementation(
      (command: string) =>
        // Simple mock: true if '>' is present, unless it looks like "-> arrow"
@@ -1891,6 +1862,7 @@ describe('PolicyEngine', () => {
    });

    it('should return ASK_USER in non-YOLO mode if shell command parsing fails', async () => {
+      const { splitCommands } = await import('../utils/shell-utils.js');
      const rules: PolicyRule[] = [
        {
          toolName: 'run_shell_command',
@@ -1905,11 +1877,7 @@ describe('PolicyEngine', () => {
      });

      // Simulate parsing failure
-      const { parseCommandDetails } = await import('../utils/shell-utils.js');
-      vi.mocked(parseCommandDetails).mockReturnValueOnce({
-        details: [],
-        hasError: true,
-      });
+      vi.mocked(splitCommands).mockReturnValueOnce([]);

      const result = await engine.check(
        { name: 'run_shell_command', args: { command: 'complex command' } },
@@ -7,10 +7,8 @@
 import { type FunctionCall } from '@google/genai';
 import {
  SHELL_TOOL_NAMES,
-  REDIRECTION_NAMES,
  initializeShellParsers,
-  parseCommandDetails,
-  stripShellWrapper,
+  splitCommands,
  hasRedirection,
  extractStringFromParseEntry,
 } from '../utils/shell-utils.js';
@@ -361,8 +359,7 @@ export class PolicyEngine {
    }

    await initializeShellParsers();
-    const parsed = parseCommandDetails(command);
-    const subCommands = parsed?.details ?? [];
+    const subCommands = splitCommands(command);

    if (subCommands.length === 0) {
      // If the matched rule says DENY, we should respect it immediately even if parsing fails.
@@ -383,109 +380,115 @@ export class PolicyEngine {
      );

      // Parsing logic failed, we can't trust it. Use default decision ASK_USER (or DENY in non-interactive).
+      // We return the rule that matched so the evaluation loop terminates.
      return {
        decision: this.defaultDecision,
        rule,
      };
    }

-    debugLogger.debug(
-      `[PolicyEngine.check] Validating shell command: ${subCommands.length} parts`,
-    );
+    // If there are multiple parts, or if we just want to validate the single part against DENY rules
+    if (subCommands.length > 0) {
+      debugLogger.debug(
+        `[PolicyEngine.check] Validating shell command: ${subCommands.length} parts`,
+      );

-    if (ruleDecision === PolicyDecision.DENY) {
-      return { decision: PolicyDecision.DENY, rule };
-    }
+      if (ruleDecision === PolicyDecision.DENY) {
+        return { decision: PolicyDecision.DENY, rule };
+      }

-    // Start with the decision from the rule or heuristics.
-    // If the tool call was already downgraded (e.g. by heuristics), we start there.
-    let aggregateDecision = ruleDecision;
+      // Start optimistically. If all parts are ALLOW, the whole is ALLOW.
+      // We will downgrade if any part is ASK_USER or DENY.
+      let aggregateDecision = PolicyDecision.ALLOW;
+      let responsibleRule: PolicyRule | undefined;

-    // If heuristics downgraded the decision, we don't blame the rule.
-    let responsibleRule: PolicyRule | undefined =
-      rule && ruleDecision === rule.decision ? rule : undefined;
-
-    // Check for redirection on the full command string.
-    // Redirection always downgrades ALLOW to ASK_USER (it never upgrades).
-    if (this.shouldDowngradeForRedirection(command, allowRedirection)) {
-      if (aggregateDecision === PolicyDecision.ALLOW) {
+      // Check for redirection on the full command string
+      if (this.shouldDowngradeForRedirection(command, allowRedirection)) {
        debugLogger.debug(
          `[PolicyEngine.check] Downgrading ALLOW to ASK_USER for redirected command: ${command}`,
        );
        aggregateDecision = PolicyDecision.ASK_USER;
        responsibleRule = undefined; // Inherent policy
      }
-    }

-    for (const detail of subCommands) {
-      if (REDIRECTION_NAMES.has(detail.name)) {
-        continue;
-      }
-
-      const subCmd = detail.text.trim();
-      const isAtomic =
-        subCmd === command ||
-        (detail.startIndex === 0 && detail.text.length === command.length);
-
-      // Recursive check for shell wrappers (bash -c, etc.)
-      const stripped = stripShellWrapper(subCmd);
-      if (stripped !== subCmd) {
-        const wrapperResult = await this.check(
-          { name: toolName, args: { command: stripped, dir_path } },
-          serverName,
-          toolAnnotations,
-          subagent,
-          true,
-        );
-
-        if (wrapperResult.decision === PolicyDecision.DENY)
-          return wrapperResult;
-        if (wrapperResult.decision === PolicyDecision.ASK_USER) {
-          if (aggregateDecision === PolicyDecision.ALLOW) {
-            responsibleRule = wrapperResult.rule;
+      for (const rawSubCmd of subCommands) {
+        const subCmd = rawSubCmd.trim();
+        // Prevent infinite recursion for the root command
+        if (subCmd === command) {
+          if (this.shouldDowngradeForRedirection(subCmd, allowRedirection)) {
+            debugLogger.debug(
+              `[PolicyEngine.check] Downgrading ALLOW to ASK_USER for redirected command: ${subCmd}`,
+            );
+            // Redirection always downgrades ALLOW to ASK_USER
+            if (aggregateDecision === PolicyDecision.ALLOW) {
+              aggregateDecision = PolicyDecision.ASK_USER;
+              responsibleRule = undefined; // Inherent policy
+            }
          } else {
-            responsibleRule ??= wrapperResult.rule;
+            // Atomic command matching the rule.
+            if (
+              ruleDecision === PolicyDecision.ASK_USER &&
+              aggregateDecision === PolicyDecision.ALLOW
+            ) {
+              aggregateDecision = PolicyDecision.ASK_USER;
+              responsibleRule = rule;
+            }
          }
-          aggregateDecision = PolicyDecision.ASK_USER;
+          continue;
        }
-      }

-      if (!isAtomic) {
        const subResult = await this.check(
          { name: toolName, args: { command: subCmd, dir_path } },
          serverName,
          toolAnnotations,
          subagent,
-          true,
        );

-        if (subResult.decision === PolicyDecision.DENY) return subResult;
+        // subResult.decision is already filtered through applyNonInteractiveMode by this.check()
+        const subDecision = subResult.decision;

-        if (subResult.decision === PolicyDecision.ASK_USER) {
-          if (aggregateDecision === PolicyDecision.ALLOW) {
-            responsibleRule = subResult.rule;
-          } else {
-            responsibleRule ??= subResult.rule;
-          }
-          aggregateDecision = PolicyDecision.ASK_USER;
+        // If any part is DENIED, the whole command is DENY
+        if (subDecision === PolicyDecision.DENY) {
+          return {
+            decision: PolicyDecision.DENY,
+            rule: subResult.rule,
+          };
        }

-        // Downgrade if sub-command has redirection
+        // If any part requires ASK_USER, the whole command requires ASK_USER
+        if (subDecision === PolicyDecision.ASK_USER) {
+          aggregateDecision = PolicyDecision.ASK_USER;
+          if (!responsibleRule) {
+            responsibleRule = subResult.rule;
+          }
+        }
+
+        // Check for redirection in allowed sub-commands
        if (
-          subResult.decision === PolicyDecision.ALLOW &&
+          subDecision === PolicyDecision.ALLOW &&
          this.shouldDowngradeForRedirection(subCmd, allowRedirection)
        ) {
+          debugLogger.debug(
+            `[PolicyEngine.check] Downgrading ALLOW to ASK_USER for redirected command: ${subCmd}`,
+          );
          if (aggregateDecision === PolicyDecision.ALLOW) {
            aggregateDecision = PolicyDecision.ASK_USER;
            responsibleRule = undefined;
          }
        }
      }
+
+      return {
+        decision: aggregateDecision,
+        // If we stayed at ALLOW, we return the original rule (if any).
+        // If we downgraded, we return the responsible rule (or undefined if implicit).
+        rule: aggregateDecision === ruleDecision ? rule : responsibleRule,
+      };
    }

    return {
-      decision: aggregateDecision,
-      rule: aggregateDecision === ruleDecision ? rule : responsibleRule,
+      decision: ruleDecision,
+      rule,
    };
  }

@@ -498,7 +501,6 @@ export class PolicyEngine {
    serverName: string | undefined,
    toolAnnotations?: Record<string, unknown>,
    subagent?: string,
-    skipHeuristics = false,
  ): Promise<CheckResult> {
    // Case 1: Metadata injection is the primary and safest way to identify an MCP server.
    // If we have explicit `_serverName` metadata (usually injected by tool-registry for active tools), use it.
@@ -592,7 +594,6 @@ export class PolicyEngine {

        let ruleDecision = rule.decision;
        if (
-          !skipHeuristics &&
          isShellCommand &&
          command &&
          !('commandPrefix' in rule) &&
@@ -614,10 +615,12 @@ export class PolicyEngine {
            subagent,
          );
          decision = shellResult.decision;
-          matchedRule = shellResult.rule;
-          break;
+          if (shellResult.rule) {
+            matchedRule = shellResult.rule;
+            break;
+          }
        } else {
-          decision = ruleDecision;
+          decision = rule.decision;
          matchedRule = rule;
          break;
        }
@@ -640,7 +643,7 @@ export class PolicyEngine {
      );
      if (toolName && SHELL_TOOL_NAMES.includes(toolName)) {
        let heuristicDecision = this.defaultDecision;
-        if (!skipHeuristics && command) {
+        if (command) {
          heuristicDecision = await this.applyShellHeuristics(
            command,
            heuristicDecision,
@@ -1,134 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, beforeAll } from 'vitest';
-import { PolicyEngine } from './policy-engine.js';
-import { PolicyDecision, ApprovalMode } from './types.js';
-import { initializeShellParsers } from '../utils/shell-utils.js';
-import { buildArgsPatterns } from './utils.js';
-
-describe('PolicyEngine - Shell Safety Regression Suite', () => {
-  let engine: PolicyEngine;
-
-  beforeAll(async () => {
-    await initializeShellParsers();
-  });
-
-  const setupEngine = (allowedCommands: string[]) => {
-    const rules = allowedCommands.map((cmd) => ({
-      toolName: 'run_shell_command',
-      decision: PolicyDecision.ALLOW,
-      argsPattern: new RegExp(buildArgsPatterns(undefined, cmd)[0]!),
-      priority: 10,
-    }));
-
-    return new PolicyEngine({
-      rules,
-      approvalMode: ApprovalMode.DEFAULT,
-      defaultDecision: PolicyDecision.ASK_USER,
-    });
-  };
-
-  it('should block unauthorized chained command with &&', async () => {
-    engine = setupEngine(['echo']);
-    const result = await engine.check(
-      { name: 'run_shell_command', args: { command: 'echo hi && ls' } },
-      undefined,
-    );
-    expect(result.decision).toBe(PolicyDecision.ASK_USER);
-  });
-
-  it('should allow authorized chained command with &&', async () => {
-    engine = setupEngine(['echo', 'ls']);
-    const result = await engine.check(
-      { name: 'run_shell_command', args: { command: 'echo hi && ls' } },
-      undefined,
-    );
-    expect(result.decision).toBe(PolicyDecision.ALLOW);
-  });
-
-  it('should block unauthorized chained command with ||', async () => {
-    engine = setupEngine(['false']);
-    const result = await engine.check(
-      { name: 'run_shell_command', args: { command: 'false || ls' } },
-      undefined,
-    );
-    expect(result.decision).toBe(PolicyDecision.ASK_USER);
-  });
-
-  it('should block unauthorized chained command with ;', async () => {
-    engine = setupEngine(['echo']);
-    const result = await engine.check(
-      { name: 'run_shell_command', args: { command: 'echo hi; ls' } },
-      undefined,
-    );
-    expect(result.decision).toBe(PolicyDecision.ASK_USER);
-  });
-
-  it('should block unauthorized command in pipe |', async () => {
-    engine = setupEngine(['echo']);
-    const result = await engine.check(
-      { name: 'run_shell_command', args: { command: 'echo hi | grep "hi"' } },
-      undefined,
-    );
-    expect(result.decision).toBe(PolicyDecision.ASK_USER);
-  });
-
-  it('should allow authorized command in pipe |', async () => {
-    engine = setupEngine(['echo', 'grep']);
-    const result = await engine.check(
-      { name: 'run_shell_command', args: { command: 'echo hi | grep "hi"' } },
-      undefined,
-    );
-    expect(result.decision).toBe(PolicyDecision.ALLOW);
-  });
-
-  it('should block unauthorized chained command with &', async () => {
-    engine = setupEngine(['echo']);
-    const result = await engine.check(
-      { name: 'run_shell_command', args: { command: 'echo hi & ls' } },
-      undefined,
-    );
-    expect(result.decision).toBe(PolicyDecision.ASK_USER);
-  });
-
-  it('should allow authorized chained command with &', async () => {
-    engine = setupEngine(['echo', 'ls']);
-    const result = await engine.check(
-      { name: 'run_shell_command', args: { command: 'echo hi & ls' } },
-      undefined,
-    );
-    expect(result.decision).toBe(PolicyDecision.ALLOW);
-  });
-
-  it('should block unauthorized command in nested substitution', async () => {
-    engine = setupEngine(['echo', 'cat']);
-    const result = await engine.check(
-      { name: 'run_shell_command', args: { command: 'echo $(cat $(ls))' } },
-      undefined,
-    );
-    expect(result.decision).toBe(PolicyDecision.ASK_USER);
-  });
-
-  it('should allow authorized command in nested substitution', async () => {
-    engine = setupEngine(['echo', 'cat', 'ls']);
-    const result = await engine.check(
-      { name: 'run_shell_command', args: { command: 'echo $(cat $(ls))' } },
-      undefined,
-    );
-    expect(result.decision).toBe(PolicyDecision.ALLOW);
-  });
-
-  it('should block command redirection if not explicitly allowed', async () => {
-    engine = setupEngine(['echo']);
-    const result = await engine.check(
-      { name: 'run_shell_command', args: { command: 'echo hi > /tmp/test' } },
-      undefined,
-    );
-    // Inherent policy: redirection downgrades to ASK_USER
-    expect(result.decision).toBe(PolicyDecision.ASK_USER);
-  });
-});
@@ -59,30 +59,6 @@ vi.mock('../utils/shell-utils.js', async (importOriginal) => {
  return {
    ...actual,
    initializeShellParsers: vi.fn(),
-    parseCommandDetails: (command: string) => {
-      if (Object.prototype.hasOwnProperty.call(commandMap, command)) {
-        const subcommands = commandMap[command];
-        return {
-          details: subcommands.map((text) => ({
-            name: text.split(' ')[0],
-            text,
-            startIndex: command.indexOf(text),
-          })),
-          hasError: subcommands.length === 0 && command.includes('&&&'),
-        };
-      }
-      return {
-        details: [
-          {
-            name: command.split(' ')[0],
-            text: command,
-            startIndex: 0,
-          },
-        ],
-        hasError: false,
-      };
-    },
-    stripShellWrapper: (command: string) => command,
    splitCommands: (command: string) => {
      if (Object.prototype.hasOwnProperty.call(commandMap, command)) {
        return commandMap[command];
@@ -1,97 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { expect, describe, it, beforeAll, vi } from 'vitest';
-import { PolicyEngine } from './policy-engine.js';
-import { PolicyDecision } from './types.js';
-import { initializeShellParsers } from '../utils/shell-utils.js';
-
-// Mock node:os to ensure shell-utils logic always thinks it's on a POSIX-like system.
-// This ensures that internal calls to getShellConfiguration() and isWindows()
-// within the shell-utils module return 'bash' configuration, even on Windows CI.
-vi.mock('node:os', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('node:os')>();
-  return {
-    ...actual,
-    default: {
-      ...actual,
-      platform: () => 'linux',
-    },
-    platform: () => 'linux',
-  };
-});
-
-// Mock shell-utils to ensure consistent behavior across platforms (especially Windows CI)
-// We want to test PolicyEngine logic with Bash syntax rules.
-vi.mock('../utils/shell-utils.js', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('../utils/shell-utils.js')>();
-  return {
-    ...actual,
-    getShellConfiguration: () => ({
-      executable: 'bash',
-      argsPrefix: ['-c'],
-      shell: 'bash',
-    }),
-  };
-});
-
-describe('PolicyEngine Command Substitution Validation', () => {
-  beforeAll(async () => {
-    await initializeShellParsers();
-  });
-
-  const setupEngine = (blockedCmd: string) =>
-    new PolicyEngine({
-      defaultDecision: PolicyDecision.ALLOW,
-      rules: [
-        {
-          toolName: 'run_shell_command',
-          argsPattern: new RegExp(`"command":"${blockedCmd}"`),
-          decision: PolicyDecision.DENY,
-        },
-      ],
-    });
-
-  it('should block echo $(dangerous_cmd) when dangerous_cmd is explicitly blocked', async () => {
-    const engine = setupEngine('dangerous_cmd');
-    const result = await engine.check(
-      { name: 'run_shell_command', args: { command: 'echo $(dangerous_cmd)' } },
-      'test-server',
-    );
-    expect(result.decision).toBe(PolicyDecision.DENY);
-  });
-
-  it('should block backtick substitution `dangerous_cmd`', async () => {
-    const engine = setupEngine('dangerous_cmd');
-    const result = await engine.check(
-      { name: 'run_shell_command', args: { command: 'echo `dangerous_cmd`' } },
-      'test-server',
-    );
-    expect(result.decision).toBe(PolicyDecision.DENY);
-  });
-
-  it('should block commands inside subshells (dangerous_cmd)', async () => {
-    const engine = setupEngine('dangerous_cmd');
-    const result = await engine.check(
-      { name: 'run_shell_command', args: { command: '(dangerous_cmd)' } },
-      'test-server',
-    );
-    expect(result.decision).toBe(PolicyDecision.DENY);
-  });
-
-  it('should handle nested substitutions deeply', async () => {
-    const engine = setupEngine('deep_danger');
-    const result = await engine.check(
-      {
-        name: 'run_shell_command',
-        args: { command: 'echo $(ls $(deep_danger))' },
-      },
-      'test-server',
-    );
-    expect(result.decision).toBe(PolicyDecision.DENY);
-  });
-});
@@ -335,10 +335,8 @@ export interface PolicySettings {
    allowed?: string[];
  };
  tools?: {
-    core?: string[];
    exclude?: string[];
    allowed?: string[];
-    confirmationRequired?: string[];
  };
  mcpServers?: Record<string, { trust?: boolean }>;
  // User provided policies that will replace the USER level policies in ~/.gemini/policies
@@ -32,6 +32,9 @@ vi.mock('./strategies/overrideStrategy.js');
 vi.mock('./strategies/approvalModeStrategy.js');
 vi.mock('./strategies/classifierStrategy.js');
 vi.mock('./strategies/numericalClassifierStrategy.js');
+import { BestEffortProStrategy } from './strategies/bestEffortProStrategy.js';
+
+vi.mock('./strategies/bestEffortProStrategy.js');
 vi.mock('./strategies/gemmaClassifierStrategy.js');
 vi.mock('../telemetry/loggers.js');
 vi.mock('../telemetry/types.js');
@@ -74,6 +77,7 @@ describe('ModelRouterService', () => {
      [
        new FallbackStrategy(),
        new OverrideStrategy(),
+        new BestEffortProStrategy(),
        new ApprovalModeStrategy(),
        new ClassifierStrategy(),
        new NumericalClassifierStrategy(),
@@ -104,13 +108,14 @@ describe('ModelRouterService', () => {
    const compositeStrategyArgs = vi.mocked(CompositeStrategy).mock.calls[0];
    const childStrategies = compositeStrategyArgs[0];

-    expect(childStrategies.length).toBe(6);
+    expect(childStrategies.length).toBe(7);
    expect(childStrategies[0]).toBeInstanceOf(FallbackStrategy);
    expect(childStrategies[1]).toBeInstanceOf(OverrideStrategy);
-    expect(childStrategies[2]).toBeInstanceOf(ApprovalModeStrategy);
-    expect(childStrategies[3]).toBeInstanceOf(ClassifierStrategy);
-    expect(childStrategies[4]).toBeInstanceOf(NumericalClassifierStrategy);
-    expect(childStrategies[5]).toBeInstanceOf(DefaultStrategy);
+    expect(childStrategies[2]).toBeInstanceOf(BestEffortProStrategy);
+    expect(childStrategies[3]).toBeInstanceOf(ApprovalModeStrategy);
+    expect(childStrategies[4]).toBeInstanceOf(ClassifierStrategy);
+    expect(childStrategies[5]).toBeInstanceOf(NumericalClassifierStrategy);
+    expect(childStrategies[6]).toBeInstanceOf(DefaultStrategy);
    expect(compositeStrategyArgs[1]).toBe('agent-router');
  });

@@ -133,14 +138,15 @@ describe('ModelRouterService', () => {
    const compositeStrategyArgs = vi.mocked(CompositeStrategy).mock.calls[0];
    const childStrategies = compositeStrategyArgs[0];

-    expect(childStrategies.length).toBe(7);
+    expect(childStrategies.length).toBe(8);
    expect(childStrategies[0]).toBeInstanceOf(FallbackStrategy);
    expect(childStrategies[1]).toBeInstanceOf(OverrideStrategy);
-    expect(childStrategies[2]).toBeInstanceOf(ApprovalModeStrategy);
-    expect(childStrategies[3]).toBeInstanceOf(GemmaClassifierStrategy);
-    expect(childStrategies[4]).toBeInstanceOf(ClassifierStrategy);
-    expect(childStrategies[5]).toBeInstanceOf(NumericalClassifierStrategy);
-    expect(childStrategies[6]).toBeInstanceOf(DefaultStrategy);
+    expect(childStrategies[2]).toBeInstanceOf(BestEffortProStrategy);
+    expect(childStrategies[3]).toBeInstanceOf(ApprovalModeStrategy);
+    expect(childStrategies[4]).toBeInstanceOf(GemmaClassifierStrategy);
+    expect(childStrategies[5]).toBeInstanceOf(ClassifierStrategy);
+    expect(childStrategies[6]).toBeInstanceOf(NumericalClassifierStrategy);
+    expect(childStrategies[7]).toBeInstanceOf(DefaultStrategy);
    expect(compositeStrategyArgs[1]).toBe('agent-router');
  });

@@ -18,6 +18,7 @@ import { NumericalClassifierStrategy } from './strategies/numericalClassifierStr
 import { CompositeStrategy } from './strategies/compositeStrategy.js';
 import { FallbackStrategy } from './strategies/fallbackStrategy.js';
 import { OverrideStrategy } from './strategies/overrideStrategy.js';
+import { BestEffortProStrategy } from './strategies/bestEffortProStrategy.js';
 import { ApprovalModeStrategy } from './strategies/approvalModeStrategy.js';

 import { logModelRouting } from '../telemetry/loggers.js';
@@ -43,6 +44,9 @@ export class ModelRouterService {
    strategies.push(new FallbackStrategy());
    strategies.push(new OverrideStrategy());

+    // Best Effort Pro is next.
+    strategies.push(new BestEffortProStrategy());
+
    // Approval mode is next.
    strategies.push(new ApprovalModeStrategy());

@@ -0,0 +1,83 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { Config } from '../../config/config.js';
+import { isAutoModel, resolveModel } from '../../config/models.js';
+import type {
+  RoutingStrategy,
+  RoutingDecision,
+  RoutingContext,
+} from '../routingStrategy.js';
+
+/**
+ * A routing strategy that respects the "Best Effort Pro" setting.
+ * If the setting is enabled and the Pro model is available, it routes to Pro
+ * regardless of complexity. If Pro is unavailable, it routes to Flash.
+ */
+export class BestEffortProStrategy implements RoutingStrategy {
+  name = 'best-effort-pro';
+
+  async route(
+    context: RoutingContext,
+    config: Config,
+  ): Promise<RoutingDecision | null> {
+    const requestedModel = config.getModel();
+    if (!isAutoModel(requestedModel)) {
+      return null;
+    }
+
+    const isBestEffortProEnabled = await config.getBestEffortProEnabled();
+    if (!isBestEffortProEnabled) {
+      return null;
+    }
+
+    const useGemini3_1 = (await config.getGemini31Launched?.()) ?? false;
+    const useGemini3_1FlashLite =
+      (await config.getGemini31FlashLiteLaunched?.()) ?? false;
+    const hasAccessToPreview = config.getHasAccessToPreviewModel?.() ?? true;
+
+    const availabilityService = config.getModelAvailabilityService();
+    const proModel = resolveModel(
+      'gemini-3.1-pro',
+      useGemini3_1,
+      useGemini3_1FlashLite,
+      false,
+      hasAccessToPreview,
+      config,
+    );
+    const flashModel = resolveModel(
+      'gemini-3.1-flash',
+      useGemini3_1,
+      useGemini3_1FlashLite,
+      false,
+      hasAccessToPreview,
+      config,
+    );
+
+    const proSnapshot = availabilityService.snapshot(proModel);
+
+    if (proSnapshot.available) {
+      return {
+        model: proModel,
+        metadata: {
+          source: this.name,
+          latencyMs: 0,
+          reasoning:
+            'Best Effort Pro is enabled and the Pro model is available.',
+        },
+      };
+    } else {
+      return {
+        model: flashModel,
+        metadata: {
+          source: this.name,
+          latencyMs: 0,
+          reasoning: `Best Effort Pro is enabled, but Pro is unavailable (${proSnapshot.reason}). Falling back to Flash.`,
+        },
+      };
+    }
+  }
+}
@@ -19,7 +19,6 @@ import {
 import type { Config } from '../config/config.js';
 import * as sdk from './sdk.js';
 import { ClearcutLogger } from './clearcut-logger/clearcut-logger.js';
-import { EventMetadataKey } from './clearcut-logger/event-metadata-key.js';

 vi.mock('@opentelemetry/api-logs');
 vi.mock('./sdk.js');
@@ -145,174 +144,4 @@ describe('conseca-logger', () => {

    expect(mockLogger.emit).not.toHaveBeenCalled();
  });
-
-  it('should omit user_prompt/trusted_content/policy from OTEL when logPrompts is disabled', () => {
-    const configNoPrompts = {
-      getTelemetryEnabled: vi.fn().mockReturnValue(true),
-      getSessionId: vi.fn().mockReturnValue('test-session-id'),
-      getTelemetryLogPromptsEnabled: vi.fn().mockReturnValue(false),
-      getTelemetryTracesEnabled: vi.fn().mockReturnValue(false),
-      isInteractive: vi.fn().mockReturnValue(true),
-      getExperiments: vi.fn().mockReturnValue({ experimentIds: [] }),
-      getContentGeneratorConfig: vi.fn().mockReturnValue({ authType: 'oauth' }),
-    } as unknown as Config;
-
-    const event = new ConsecaPolicyGenerationEvent(
-      'sensitive prompt',
-      'sensitive content',
-      'sensitive policy',
-    );
-
-    logConsecaPolicyGeneration(configNoPrompts, event);
-
-    const attrs = mockLogger.emit.mock.calls[0][0].attributes as Record<
-      string,
-      unknown
-    >;
-    expect(attrs['user_prompt']).toBeUndefined();
-    expect(attrs['trusted_content']).toBeUndefined();
-    expect(attrs['policy']).toBeUndefined();
-    expect(attrs['event.name']).toBe(EVENT_CONSECA_POLICY_GENERATION);
-  });
-
-  it('should omit user_prompt/trusted_content/policy from Clearcut when logPrompts is disabled', () => {
-    const configNoPrompts = {
-      getTelemetryEnabled: vi.fn().mockReturnValue(true),
-      getSessionId: vi.fn().mockReturnValue('test-session-id'),
-      getTelemetryLogPromptsEnabled: vi.fn().mockReturnValue(false),
-      getTelemetryTracesEnabled: vi.fn().mockReturnValue(false),
-      isInteractive: vi.fn().mockReturnValue(true),
-      getExperiments: vi.fn().mockReturnValue({ experimentIds: [] }),
-      getContentGeneratorConfig: vi.fn().mockReturnValue({ authType: 'oauth' }),
-    } as unknown as Config;
-
-    const event = new ConsecaPolicyGenerationEvent(
-      'sensitive prompt',
-      'sensitive content',
-      'sensitive policy',
-      'some error',
-    );
-
-    logConsecaPolicyGeneration(configNoPrompts, event);
-
-    expect(mockClearcutLogger.createLogEvent).toHaveBeenCalledWith(
-      expect.anything(),
-      [
-        {
-          gemini_cli_key: EventMetadataKey.CONSECA_ERROR,
-          value: 'some error',
-        },
-      ],
-    );
-  });
-
-  it('should include user_prompt/trusted_content/policy in OTEL when logPrompts is enabled', () => {
-    const event = new ConsecaPolicyGenerationEvent(
-      'visible prompt',
-      'visible content',
-      'visible policy',
-    );
-
-    logConsecaPolicyGeneration(mockConfig, event);
-
-    const attrs = mockLogger.emit.mock.calls[0][0].attributes as Record<
-      string,
-      unknown
-    >;
-    expect(attrs['user_prompt']).toBe('visible prompt');
-    expect(attrs['trusted_content']).toBe('visible content');
-    expect(attrs['policy']).toBe('visible policy');
-  });
-
-  it('should omit sensitive fields from verdict OTEL when logPrompts is disabled', () => {
-    const configNoPrompts = {
-      getTelemetryEnabled: vi.fn().mockReturnValue(true),
-      getSessionId: vi.fn().mockReturnValue('test-session-id'),
-      getTelemetryLogPromptsEnabled: vi.fn().mockReturnValue(false),
-      getTelemetryTracesEnabled: vi.fn().mockReturnValue(false),
-      isInteractive: vi.fn().mockReturnValue(true),
-      getExperiments: vi.fn().mockReturnValue({ experimentIds: [] }),
-      getContentGeneratorConfig: vi.fn().mockReturnValue({ authType: 'oauth' }),
-    } as unknown as Config;
-
-    const event = new ConsecaVerdictEvent(
-      'sensitive prompt',
-      'sensitive policy',
-      'sensitive tool call',
-      'allow',
-      'sensitive rationale',
-    );
-
-    logConsecaVerdict(configNoPrompts, event);
-
-    const attrs = mockLogger.emit.mock.calls[0][0].attributes as Record<
-      string,
-      unknown
-    >;
-    expect(attrs['user_prompt']).toBeUndefined();
-    expect(attrs['policy']).toBeUndefined();
-    expect(attrs['tool_call']).toBeUndefined();
-    expect(attrs['verdict_rationale']).toBeUndefined();
-    // verdict (the allow/deny result) is not sensitive and should be present
-    expect(attrs['verdict']).toBe('allow');
-  });
-
-  it('should omit sensitive fields from verdict Clearcut when logPrompts is disabled', () => {
-    const configNoPrompts = {
-      getTelemetryEnabled: vi.fn().mockReturnValue(true),
-      getSessionId: vi.fn().mockReturnValue('test-session-id'),
-      getTelemetryLogPromptsEnabled: vi.fn().mockReturnValue(false),
-      getTelemetryTracesEnabled: vi.fn().mockReturnValue(false),
-      isInteractive: vi.fn().mockReturnValue(true),
-      getExperiments: vi.fn().mockReturnValue({ experimentIds: [] }),
-      getContentGeneratorConfig: vi.fn().mockReturnValue({ authType: 'oauth' }),
-    } as unknown as Config;
-
-    const event = new ConsecaVerdictEvent(
-      'sensitive prompt',
-      'sensitive policy',
-      'sensitive tool call',
-      'allow',
-      'sensitive rationale',
-      'some error',
-    );
-
-    logConsecaVerdict(configNoPrompts, event);
-
-    expect(mockClearcutLogger.createLogEvent).toHaveBeenCalledWith(
-      expect.anything(),
-      [
-        {
-          gemini_cli_key: EventMetadataKey.CONSECA_VERDICT_RESULT,
-          value: '"allow"',
-        },
-        {
-          gemini_cli_key: EventMetadataKey.CONSECA_ERROR,
-          value: 'some error',
-        },
-      ],
-    );
-  });
-
-  it('should include sensitive fields in verdict OTEL when logPrompts is enabled', () => {
-    const event = new ConsecaVerdictEvent(
-      'visible prompt',
-      'visible policy',
-      'visible tool call',
-      'deny',
-      'visible rationale',
-    );
-
-    logConsecaVerdict(mockConfig, event);
-
-    const attrs = mockLogger.emit.mock.calls[0][0].attributes as Record<
-      string,
-      unknown
-    >;
-    expect(attrs['user_prompt']).toBe('visible prompt');
-    expect(attrs['policy']).toBe('visible policy');
-    expect(attrs['tool_call']).toBe('visible tool call');
-    expect(attrs['verdict_rationale']).toBe('visible rationale');
-    expect(attrs['verdict']).toBe('deny');
-  });
 });
@@ -11,7 +11,6 @@ import { isTelemetrySdkInitialized } from './sdk.js';
 import {
  ClearcutLogger,
  EventNames,
-  type EventValue,
 } from './clearcut-logger/clearcut-logger.js';
 import { EventMetadataKey } from './clearcut-logger/event-metadata-key.js';
 import { safeJsonStringify } from '../utils/safeJsonStringify.js';
@@ -28,24 +27,20 @@ export function logConsecaPolicyGeneration(
  debugLogger.debug('Conseca Policy Generation Event:', event);
  const clearcutLogger = ClearcutLogger.getInstance(config);
  if (clearcutLogger) {
-    const data: EventValue[] = [];
-
-    if (config.getTelemetryLogPromptsEnabled()) {
-      data.push(
-        {
-          gemini_cli_key: EventMetadataKey.CONSECA_USER_PROMPT,
-          value: safeJsonStringify(event.user_prompt),
-        },
-        {
-          gemini_cli_key: EventMetadataKey.CONSECA_TRUSTED_CONTENT,
-          value: safeJsonStringify(event.trusted_content),
-        },
-        {
-          gemini_cli_key: EventMetadataKey.CONSECA_GENERATED_POLICY,
-          value: safeJsonStringify(event.policy),
-        },
-      );
-    }
+    const data = [
+      {
+        gemini_cli_key: EventMetadataKey.CONSECA_USER_PROMPT,
+        value: safeJsonStringify(event.user_prompt),
+      },
+      {
+        gemini_cli_key: EventMetadataKey.CONSECA_TRUSTED_CONTENT,
+        value: safeJsonStringify(event.trusted_content),
+      },
+      {
+        gemini_cli_key: EventMetadataKey.CONSECA_GENERATED_POLICY,
+        value: safeJsonStringify(event.policy),
+      },
+    ];

    if (event.error) {
      data.push({
@@ -76,34 +71,29 @@ export function logConsecaVerdict(
  debugLogger.debug('Conseca Verdict Event:', event);
  const clearcutLogger = ClearcutLogger.getInstance(config);
  if (clearcutLogger) {
-    const data: EventValue[] = [
+    const data = [
+      {
+        gemini_cli_key: EventMetadataKey.CONSECA_USER_PROMPT,
+        value: safeJsonStringify(event.user_prompt),
+      },
+      {
+        gemini_cli_key: EventMetadataKey.CONSECA_GENERATED_POLICY,
+        value: safeJsonStringify(event.policy),
+      },
+      {
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_CALL_NAME,
+        value: safeJsonStringify(event.tool_call),
+      },
      {
        gemini_cli_key: EventMetadataKey.CONSECA_VERDICT_RESULT,
        value: safeJsonStringify(event.verdict),
      },
+      {
+        gemini_cli_key: EventMetadataKey.CONSECA_VERDICT_RATIONALE,
+        value: event.verdict_rationale,
+      },
    ];

-    if (config.getTelemetryLogPromptsEnabled()) {
-      data.push(
-        {
-          gemini_cli_key: EventMetadataKey.CONSECA_USER_PROMPT,
-          value: safeJsonStringify(event.user_prompt),
-        },
-        {
-          gemini_cli_key: EventMetadataKey.CONSECA_GENERATED_POLICY,
-          value: safeJsonStringify(event.policy),
-        },
-        {
-          gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_CALL_NAME,
-          value: safeJsonStringify(event.tool_call),
-        },
-        {
-          gemini_cli_key: EventMetadataKey.CONSECA_VERDICT_RATIONALE,
-          value: event.verdict_rationale,
-        },
-      );
-    }
-
    if (event.error) {
      data.push({
        gemini_cli_key: EventMetadataKey.CONSECA_ERROR,
@@ -642,54 +642,6 @@ describe('loggers', () => {
        }),
      });
    });
-    it('should not include response_text when logPrompts is disabled', () => {
-      const mockConfigNoPrompts = {
-        getSessionId: () => 'test-session-id',
-        getTargetDir: () => 'target-dir',
-        getUsageStatisticsEnabled: () => true,
-        getTelemetryEnabled: () => true,
-        getTelemetryLogPromptsEnabled: () => false,
-        getTelemetryTracesEnabled: () => false,
-        isInteractive: () => false,
-        getExperiments: () => undefined,
-        getExperimentsAsync: async () => undefined,
-        getContentGeneratorConfig: () => undefined,
-      } as unknown as Config;
-
-      const event = new ApiResponseEvent(
-        'test-model',
-        100,
-        { prompt_id: 'prompt-id-noprompts', contents: [] },
-        { candidates: [] },
-        AuthType.LOGIN_WITH_GOOGLE,
-        {},
-        'this response should be hidden',
-      );
-
-      logApiResponse(mockConfigNoPrompts, event);
-
-      const firstEmitCall = mockLogger.emit.mock.calls[0][0];
-      expect(firstEmitCall.attributes['response_text']).toBeUndefined();
-    });
-
-    it('should include response_text when logPrompts is enabled', () => {
-      const event = new ApiResponseEvent(
-        'test-model',
-        100,
-        { prompt_id: 'prompt-id-withprompts', contents: [] },
-        { candidates: [] },
-        AuthType.LOGIN_WITH_GOOGLE,
-        {},
-        'this response should be visible',
-      );
-
-      logApiResponse(mockConfig, event);
-
-      const firstEmitCall = mockLogger.emit.mock.calls[0][0];
-      expect(firstEmitCall.attributes['response_text']).toBe(
-        'this response should be visible',
-      );
-    });
  });

  describe('logApiError', () => {
@@ -1124,10 +1076,6 @@ describe('loggers', () => {
      expect(attributes['gen_ai.provider.name']).toBe('gcp.vertex_ai');
      // Ensure prompt messages are NOT included
      expect(attributes['gen_ai.input.messages']).toBeUndefined();
-
-      // Ensure request_text is also NOT included in the first (toLogRecord) log
-      const firstLogCall = mockLogger.emit.mock.calls[0][0];
-      expect(firstLogCall.attributes['request_text']).toBeUndefined();
    });

    it('should correctly derive model from prompt details if available in semantic log', () => {
@@ -1425,20 +1373,16 @@ describe('loggers', () => {
          error_type: undefined,
          mcp_server_name: undefined,
          extension_id: undefined,
-          metadata: JSON.stringify(
-            {
-              model_added_lines: 1,
-              model_removed_lines: 2,
-              model_added_chars: 3,
-              model_removed_chars: 4,
-              user_added_lines: 5,
-              user_removed_lines: 6,
-              user_added_chars: 7,
-              user_removed_chars: 8,
-            },
-            null,
-            2,
-          ),
+          metadata: {
+            model_added_lines: 1,
+            model_removed_lines: 2,
+            model_added_chars: 3,
+            model_removed_chars: 4,
+            user_added_lines: 5,
+            user_removed_lines: 6,
+            user_added_chars: 7,
+            user_removed_chars: 8,
+          },
          content_length: 13,
        },
      });
@@ -1511,16 +1455,12 @@ describe('loggers', () => {
        body: 'Tool call: ask_user. Decision: accept. Success: true. Duration: 100ms.',
        attributes: expect.objectContaining({
          function_name: 'ask_user',
-          metadata: JSON.stringify(
-            {
-              ask_user: {
-                question_types: ['choice'],
-                dismissed: false,
-              },
+          metadata: expect.objectContaining({
+            ask_user: {
+              question_types: ['choice'],
+              dismissed: false,
            },
-            null,
-            2,
-          ),
+          }),
        }),
      });
    });
@@ -1927,99 +1867,6 @@ describe('loggers', () => {
    });
  });

-  describe('logToolCall — logPrompts flag', () => {
-    it('should omit function_args when logPrompts is disabled', () => {
-      const mockConfigNoPrompts = {
-        getSessionId: () => 'test-session-id',
-        getTargetDir: () => 'target-dir',
-        getUsageStatisticsEnabled: () => true,
-        getTelemetryEnabled: () => true,
-        getTelemetryLogPromptsEnabled: () => false,
-        getTelemetryTracesEnabled: () => false,
-        isInteractive: () => false,
-        getExperiments: () => undefined,
-        getExperimentsAsync: async () => undefined,
-        getContentGeneratorConfig: () => undefined,
-      } as unknown as Config;
-
-      const call: CompletedToolCall = {
-        status: CoreToolCallStatus.Success,
-        request: {
-          name: 'run_bash',
-          args: { command: 'echo sensitive' },
-          callId: 'call-1',
-          isClientInitiated: false,
-          prompt_id: 'prompt-noprompts',
-        },
-        response: {
-          callId: 'call-1',
-          responseParts: [],
-          resultDisplay: undefined,
-          error: undefined,
-          errorType: undefined,
-          contentLength: undefined,
-        },
-        tool: undefined as unknown as AnyDeclarativeTool,
-        invocation: {} as AnyToolInvocation,
-        durationMs: 50,
-      };
-      const event = new ToolCallEvent(call);
-      logToolCall(mockConfigNoPrompts, event);
-
-      const emitted = mockLogger.emit.mock.calls[0][0] as {
-        attributes: Record<string, unknown>;
-      };
-      expect(emitted.attributes['function_args']).toBeUndefined();
-      expect(emitted.attributes['function_name']).toBe('run_bash');
-    });
-
-    it('should include function_args when logPrompts is enabled', () => {
-      const mockConfigWithPrompts = {
-        getSessionId: () => 'test-session-id',
-        getTargetDir: () => 'target-dir',
-        getUsageStatisticsEnabled: () => true,
-        getTelemetryEnabled: () => true,
-        getTelemetryLogPromptsEnabled: () => true,
-        getTelemetryTracesEnabled: () => false,
-        isInteractive: () => false,
-        getExperiments: () => undefined,
-        getExperimentsAsync: async () => undefined,
-        getContentGeneratorConfig: () => undefined,
-      } as unknown as Config;
-
-      const call: CompletedToolCall = {
-        status: CoreToolCallStatus.Success,
-        request: {
-          name: 'run_bash',
-          args: { command: 'echo visible' },
-          callId: 'call-2',
-          isClientInitiated: false,
-          prompt_id: 'prompt-withprompts',
-        },
-        response: {
-          callId: 'call-2',
-          responseParts: [],
-          resultDisplay: undefined,
-          error: undefined,
-          errorType: undefined,
-          contentLength: undefined,
-        },
-        tool: undefined as unknown as AnyDeclarativeTool,
-        invocation: {} as AnyToolInvocation,
-        durationMs: 50,
-      };
-      const event = new ToolCallEvent(call);
-      logToolCall(mockConfigWithPrompts, event);
-
-      const emitted = mockLogger.emit.mock.calls[0][0] as {
-        attributes: Record<string, unknown>;
-      };
-      expect(emitted.attributes['function_args']).toBe(
-        JSON.stringify({ command: 'echo visible' }, null, 2),
-      );
-    });
-  });
-
  describe('logMalformedJsonResponse', () => {
    beforeEach(() => {
      vi.spyOn(ClearcutLogger.prototype, 'logMalformedJsonResponseEvent');
@@ -231,17 +231,6 @@ export class UserPromptEvent implements BaseTelemetryEvent {
 }

 export const EVENT_TOOL_CALL = 'gemini_cli.tool_call';
-
-const TOOL_CALL_METADATA_SAFE_KEYS = [
-  'model_added_lines',
-  'model_removed_lines',
-  'model_added_chars',
-  'model_removed_chars',
-  'user_added_lines',
-  'user_removed_lines',
-  'user_added_chars',
-  'user_removed_chars',
-] as const;
 export class ToolCallEvent implements BaseTelemetryEvent {
  'event.name': 'tool_call';
  'event.timestamp': string;
@@ -366,6 +355,7 @@ export class ToolCallEvent implements BaseTelemetryEvent {
      'event.name': EVENT_TOOL_CALL,
      'event.timestamp': this['event.timestamp'],
      function_name: this.function_name,
+      function_args: safeJsonStringify(this.function_args, 2),
      duration_ms: this.duration_ms,
      success: this.success,
      decision: this.decision,
@@ -377,22 +367,8 @@ export class ToolCallEvent implements BaseTelemetryEvent {
      extension_id: this.extension_id,
      start_time: this.start_time,
      end_time: this.end_time,
+      metadata: this.metadata,
    };
-    if (config.getTelemetryLogPromptsEnabled() && this.function_args) {
-      attributes['function_args'] = safeJsonStringify(this.function_args, 2);
-    }
-    if (this.metadata) {
-      const metadata = config.getTelemetryLogPromptsEnabled()
-        ? this.metadata
-        : Object.fromEntries(
-            Object.entries(this.metadata).filter(([k]) =>
-              (TOOL_CALL_METADATA_SAFE_KEYS as readonly string[]).includes(k),
-            ),
-          );
-      if (Object.keys(metadata).length > 0) {
-        attributes['metadata'] = safeJsonStringify(metadata, 2);
-      }
-    }

    if (this.error) {
      attributes[CoreToolCallStatus.Error] = this.error;
@@ -447,10 +423,8 @@ export class ApiRequestEvent implements BaseTelemetryEvent {
      'event.timestamp': this['event.timestamp'],
      model: this.model,
      prompt_id: this.prompt.prompt_id,
+      request_text: this.request_text,
    };
-    if (config.getTelemetryLogPromptsEnabled() && this.request_text) {
-      attributes['request_text'] = this.request_text;
-    }
    if (this.role) {
      attributes['role'] = this.role;
    }
@@ -718,7 +692,7 @@ export class ApiResponseEvent implements BaseTelemetryEvent {
    if (this.role) {
      attributes['role'] = this.role;
    }
-    if (config.getTelemetryLogPromptsEnabled() && this.response_text) {
+    if (this.response_text) {
      attributes['response_text'] = this.response_text;
    }
    if (this.status_code) {
@@ -980,20 +954,11 @@ export class ConsecaPolicyGenerationEvent implements BaseTelemetryEvent {
      ...getCommonAttributes(config),
      'event.name': EVENT_CONSECA_POLICY_GENERATION,
      'event.timestamp': this['event.timestamp'],
+      user_prompt: this.user_prompt,
+      trusted_content: this.trusted_content,
+      policy: this.policy,
    };

-    if (config.getTelemetryLogPromptsEnabled()) {
-      if (this.user_prompt) {
-        attributes['user_prompt'] = this.user_prompt;
-      }
-      if (this.trusted_content) {
-        attributes['trusted_content'] = this.trusted_content;
-      }
-      if (this.policy) {
-        attributes['policy'] = this.policy;
-      }
-    }
-
    if (this.error) {
      attributes['error'] = this.error;
    }
@@ -1040,24 +1005,13 @@ export class ConsecaVerdictEvent implements BaseTelemetryEvent {
      ...getCommonAttributes(config),
      'event.name': EVENT_CONSECA_VERDICT,
      'event.timestamp': this['event.timestamp'],
+      user_prompt: this.user_prompt,
+      policy: this.policy,
+      tool_call: this.tool_call,
      verdict: this.verdict,
+      verdict_rationale: this.verdict_rationale,
    };

-    if (config.getTelemetryLogPromptsEnabled()) {
-      if (this.user_prompt) {
-        attributes['user_prompt'] = this.user_prompt;
-      }
-      if (this.policy) {
-        attributes['policy'] = this.policy;
-      }
-      if (this.tool_call) {
-        attributes['tool_call'] = this.tool_call;
-      }
-      if (this.verdict_rationale) {
-        attributes['verdict_rationale'] = this.verdict_rationale;
-      }
-    }
-
    if (this.error) {
      attributes['error'] = this.error;
    }
@@ -1993,15 +1993,13 @@ describe('getRipgrepPath', () => {
      vi.mocked(fileExists).mockImplementation(
        async (checkPath) =>
          checkPath.includes(path.normalize('core/vendor/ripgrep')) &&
-          !checkPath.includes(path.join(path.sep, 'tools', path.sep)),
+          !checkPath.includes('tools'),
      );

      const resolvedPath = await getRipgrepPath();
      expect(resolvedPath).not.toBeNull();
      expect(resolvedPath).toContain(path.normalize('core/vendor/ripgrep'));
-      expect(resolvedPath).not.toContain(
-        path.join(path.sep, 'tools', path.sep),
-      );
+      expect(resolvedPath).not.toContain('tools');
    });

    it('should return null if binary is missing from both paths', async () => {
@@ -37,6 +37,10 @@ export interface RetryOptions {
  signal?: AbortSignal;
  getAvailabilityContext?: () => RetryAvailabilityContext | undefined;
  onRetry?: (attempt: number, error: unknown, delayMs: number) => void;
+  timeoutFallback?: {
+    timeoutMs: number;
+    fallbackDurationMs: number;
+  };
 }

 const DEFAULT_RETRY_OPTIONS: RetryOptions = {
@@ -240,6 +244,7 @@ export async function retryWithBackoff<T>(
    signal,
    getAvailabilityContext,
    onRetry,
+    timeoutFallback,
  } = {
    ...DEFAULT_RETRY_OPTIONS,
    shouldRetryOnError: isRetryableError,
@@ -248,6 +253,7 @@ export async function retryWithBackoff<T>(

  let attempt = 0;
  let currentDelay = initialDelayMs;
+  let startTime = Date.now();
  const throwIfAborted = () => {
    if (signal?.aborted) {
      throw createAbortError();
@@ -294,6 +300,42 @@ export async function retryWithBackoff<T>(

      const errorCode = getErrorStatus(error);

+      const isTimeout =
+        (error instanceof Error &&
+          error.message.toLowerCase().includes('timeout')) ||
+        getRetryErrorType(error) === 'ETIMEDOUT' ||
+        getRetryErrorType(error) === 'FETCH_FAILED';
+
+      if (isTimeout && timeoutFallback) {
+        if (Date.now() - startTime >= timeoutFallback.timeoutMs) {
+          const successContext = getAvailabilityContext?.();
+          if (successContext) {
+            successContext.service.markTemporarilyUnavailable(
+              successContext.policy.model,
+              'timeout',
+              timeoutFallback.fallbackDurationMs,
+            );
+          }
+          if (onPersistent429) {
+            try {
+              const fallbackModel = await onPersistent429(
+                authType,
+                new Error('Request timed out'),
+              );
+              if (fallbackModel) {
+                attempt = 0;
+                currentDelay = initialDelayMs;
+                startTime = Date.now();
+                continue;
+              }
+            } catch (fallbackError) {
+              debugLogger.warn('Model fallback failed:', fallbackError);
+            }
+          }
+          throw error;
+        }
+      }
+
      if (
        classifiedError instanceof TerminalQuotaError ||
        classifiedError instanceof ModelNotFoundError
@@ -240,15 +240,11 @@ foreach ($commandAst in $commandAsts) {
  'utf16le',
 ).toString('base64');

-export const REDIRECTION_NAMES = new Set([
+const REDIRECTION_NAMES = new Set([
  'redirection (<)',
  'redirection (>)',
  'heredoc (<<)',
  'herestring (<<<)',
-  'command substitution',
-  'backtick substitution',
-  'process substitution',
-  'subshell',
 ]);

 function createParser(): Parser | null {
@@ -364,14 +360,6 @@ function extractNameFromNode(node: Node): string | null {
      return 'heredoc (<<)';
    case 'herestring_redirect':
      return 'herestring (<<<)';
-    case 'command_substitution':
-      return 'command substitution';
-    case 'backtick_substitution':
-      return 'backtick substitution';
-    case 'process_substitution':
-      return 'process substitution';
-    case 'subshell':
-      return 'subshell';
    default:
      return null;
  }
@@ -1,6 +1,6 @@
 {
  "name": "@google/gemini-cli-devtools",
-  "version": "0.40.1",
+  "version": "0.41.0-nightly.20260423.gaa05b4583",
  "license": "Apache-2.0",
  "type": "module",
  "main": "dist/src/index.js",
@@ -1,6 +1,6 @@
 {
  "name": "@google/gemini-cli-sdk",
-  "version": "0.40.1",
+  "version": "0.41.0-nightly.20260423.gaa05b4583",
  "description": "Gemini CLI SDK",
  "license": "Apache-2.0",
  "repository": {
@@ -1,6 +1,6 @@
 {
  "name": "@google/gemini-cli-test-utils",
-  "version": "0.40.1",
+  "version": "0.41.0-nightly.20260423.gaa05b4583",
  "private": true,
  "main": "src/index.ts",
  "license": "Apache-2.0",
@@ -2,7 +2,7 @@
  "name": "gemini-cli-vscode-ide-companion",
  "displayName": "Gemini CLI Companion",
  "description": "Enable Gemini CLI with direct access to your IDE workspace.",
-  "version": "0.40.1",
+  "version": "0.41.0-nightly.20260423.gaa05b4583",
  "publisher": "google",
  "icon": "assets/icon.png",
  "repository": {
Author	SHA1	Message	Date
jacob314	68e33a1103	fix(test): regenerate settings documentation and schema	2026-04-23 14:34:43 -07:00
jacob314	19601955fd	feat(routing): availability-aware auto-routing with best-effort pro Adds settings and logic to detect slow/hanging Pro model requests, marking them as temporarily unavailable and automatically triggering a fallback to Flash. Introduces a proTimeoutMinutes and bestEffortPro strategy configuration.	2026-04-23 13:50:24 -07:00
hsm207	ff28d55100	fix: fatal hard-crash on loop detection via unhandled AbortError (#20108 ) Co-authored-by: Tommaso Sciortino <sciortino@gmail.com>	2026-04-23 16:51:21 +00:00
Emily Hedlund	dba9b9a0ff	feat(cli): secure .env loading and enforce workspace trust in headless mode (#25814 ) Co-authored-by: galz10 <galzahavi@google.com> Co-authored-by: davidapierce <davidapierce@google.com>	2026-04-23 16:09:14 +00:00
cynthialong0-0	a007f64d20	fix(core): only show `list` suggestion if the partial input is empty (#25821 )	2026-04-23 14:07:06 +00:00
gemini-cli-robot	d1c91f5267	chore(release): bump version to 0.41.0-nightly.20260423.gaa05b4583 (#25847 )	2026-04-23 04:28:26 +00:00