@google/gemini-cli 0.31.0-preview.2 → 0.32.0-preview.0

package/dist/src/config/policy-engine.integration.test.js

@@ -99,11 +99,11 @@ describe('Policy Engine Integration Tests', () => {
             };
             const config = await createPolicyEngineConfig(settings, ApprovalMode.DEFAULT);
             const engine = new PolicyEngine(config);
-            // MCP server allowed (priority 3.1) provides general allow for server
-            // MCP server allowed (priority 3.1) provides general allow for server
+            // MCP server allowed (priority 4.1) provides general allow for server
+            // MCP server allowed (priority 4.1) provides general allow for server
             expect((await engine.check({ name: 'my-server__safe-tool' }, undefined))
                 .decision).toBe(PolicyDecision.ALLOW);
-            // But specific tool exclude (priority 3.4) wins over server allow
+            // But specific tool exclude (priority 4.4) wins over server allow
             expect((await engine.check({ name: 'my-server__dangerous-tool' }, undefined))
                 .decision).toBe(PolicyDecision.DENY);
         });
@@ -264,15 +264,15 @@ describe('Policy Engine Integration Tests', () => {
             const rules = config.rules || [];
             // Find rules and verify their priorities
             const blockedToolRule = rules.find((r) => r.toolName === 'blocked-tool');
-            expect(blockedToolRule?.priority).toBe(3.4); // Command line exclude
+            expect(blockedToolRule?.priority).toBe(4.4); // Command line exclude
             const blockedServerRule = rules.find((r) => r.toolName === 'blocked-server__*');
-            expect(blockedServerRule?.priority).toBe(3.9); // MCP server exclude
+            expect(blockedServerRule?.priority).toBe(4.9); // MCP server exclude
             const specificToolRule = rules.find((r) => r.toolName === 'specific-tool');
-            expect(specificToolRule?.priority).toBe(3.3); // Command line allow
+            expect(specificToolRule?.priority).toBe(4.3); // Command line allow
             const trustedServerRule = rules.find((r) => r.toolName === 'trusted-server__*');
-            expect(trustedServerRule?.priority).toBe(3.2); // MCP trusted server
+            expect(trustedServerRule?.priority).toBe(4.2); // MCP trusted server
             const mcpServerRule = rules.find((r) => r.toolName === 'mcp-server__*');
-            expect(mcpServerRule?.priority).toBe(3.1); // MCP allowed server
+            expect(mcpServerRule?.priority).toBe(4.1); // MCP allowed server
             const readOnlyToolRule = rules.find((r) => r.toolName === 'glob');
             // Priority 70 in default tier → 1.07 (Overriding Plan Mode Deny)
             expect(readOnlyToolRule?.priority).toBeCloseTo(1.07, 5);
@@ -358,13 +358,13 @@ describe('Policy Engine Integration Tests', () => {
             const rules = config.rules || [];
             // Verify each rule has the expected priority
             const tool3Rule = rules.find((r) => r.toolName === 'tool3');
-            expect(tool3Rule?.priority).toBe(3.4); // Excluded tools (user tier)
+            expect(tool3Rule?.priority).toBe(4.4); // Excluded tools (user tier)
             const server2Rule = rules.find((r) => r.toolName === 'server2__*');
-            expect(server2Rule?.priority).toBe(3.9); // Excluded servers (user tier)
+            expect(server2Rule?.priority).toBe(4.9); // Excluded servers (user tier)
             const tool1Rule = rules.find((r) => r.toolName === 'tool1');
-            expect(tool1Rule?.priority).toBe(3.3); // Allowed tools (user tier)
+            expect(tool1Rule?.priority).toBe(4.3); // Allowed tools (user tier)
             const server1Rule = rules.find((r) => r.toolName === 'server1__*');
-            expect(server1Rule?.priority).toBe(3.1); // Allowed servers (user tier)
+            expect(server1Rule?.priority).toBe(4.1); // Allowed servers (user tier)
             const globRule = rules.find((r) => r.toolName === 'glob');
             // Priority 70 in default tier → 1.07
             expect(globRule?.priority).toBeCloseTo(1.07, 5); // Auto-accept read-only

package/dist/src/config/policy.d.ts

@@ -5,6 +5,26 @@
  */
 import { type PolicyEngineConfig, type ApprovalMode, type PolicyEngine, type MessageBus, Storage, type PolicyUpdateConfirmationRequest } from '@google/gemini-cli-core';
 import { type Settings } from './settings.js';
+/**
+ * Temporary flag to automatically accept workspace policies to reduce friction.
+ * Exported as 'let' to allow monkey patching in tests via the setter.
+ */
+export declare let autoAcceptWorkspacePolicies: boolean;
+/**
+ * Sets the autoAcceptWorkspacePolicies flag.
+ * Used primarily for testing purposes.
+ */
+export declare function setAutoAcceptWorkspacePolicies(value: boolean): void;
+/**
+ * Temporary flag to disable workspace level policies altogether.
+ * Exported as 'let' to allow monkey patching in tests via the setter.
+ */
+export declare let disableWorkspacePolicies: boolean;
+/**
+ * Sets the disableWorkspacePolicies flag.
+ * Used primarily for testing purposes.
+ */
+export declare function setDisableWorkspacePolicies(value: boolean): void;
 export declare function createPolicyEngineConfig(settings: Settings, approvalMode: ApprovalMode, workspacePoliciesDir?: string): Promise<PolicyEngineConfig>;
 export declare function createPolicyUpdater(policyEngine: PolicyEngine, messageBus: MessageBus, storage: Storage): void;
 export interface WorkspacePolicyState {

package/dist/src/config/policy.js

@@ -3,8 +3,32 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { createPolicyEngineConfig as createCorePolicyEngineConfig, createPolicyUpdater as createCorePolicyUpdater, PolicyIntegrityManager, IntegrityStatus, Storage, writeToStderr, } from '@google/gemini-cli-core';
+import { createPolicyEngineConfig as createCorePolicyEngineConfig, createPolicyUpdater as createCorePolicyUpdater, PolicyIntegrityManager, IntegrityStatus, Storage, writeToStderr, debugLogger, } from '@google/gemini-cli-core';
 import {} from './settings.js';
+/**
+ * Temporary flag to automatically accept workspace policies to reduce friction.
+ * Exported as 'let' to allow monkey patching in tests via the setter.
+ */
+export let autoAcceptWorkspacePolicies = true;
+/**
+ * Sets the autoAcceptWorkspacePolicies flag.
+ * Used primarily for testing purposes.
+ */
+export function setAutoAcceptWorkspacePolicies(value) {
+    autoAcceptWorkspacePolicies = value;
+}
+/**
+ * Temporary flag to disable workspace level policies altogether.
+ * Exported as 'let' to allow monkey patching in tests via the setter.
+ */
+export let disableWorkspacePolicies = true;
+/**
+ * Sets the disableWorkspacePolicies flag.
+ * Used primarily for testing purposes.
+ */
+export function setDisableWorkspacePolicies(value) {
+    disableWorkspacePolicies = value;
+}
 export async function createPolicyEngineConfig(settings, approvalMode, workspacePoliciesDir) {
     // Explicitly construct PolicySettings from Settings to ensure type safety
     // and avoid accidental leakage of other settings properties.
@@ -27,7 +51,7 @@ export async function resolveWorkspacePolicyState(options) {
     const { cwd, trustedFolder, interactive } = options;
     let workspacePoliciesDir;
     let policyUpdateConfirmationRequest;
-    if (trustedFolder) {
+    if (trustedFolder && !disableWorkspacePolicies) {
         const storage = new Storage(cwd);
         // If we are in the home directory (or rather, our target Gemini dir is the global one),
         // don't treat it as a workspace to avoid loading global policies twice.
@@ -45,8 +69,8 @@ export async function resolveWorkspacePolicyState(options) {
             // No workspace policies found
             workspacePoliciesDir = undefined;
         }
-        else if (interactive) {
-            // Policies changed or are new, and we are in interactive mode
+        else if (interactive && !autoAcceptWorkspacePolicies) {
+            // Policies changed or are new, and we are in interactive mode and auto-accept is disabled
             policyUpdateConfirmationRequest = {
                 scope: 'workspace',
                 identifier: cwd,
@@ -55,11 +79,15 @@ export async function resolveWorkspacePolicyState(options) {
             };
         }
         else {
-            // Non-interactive mode: warn and automatically accept/load
+            // Non-interactive mode or auto-accept is enabled: automatically accept/load
             await integrityManager.acceptIntegrity('workspace', cwd, integrityResult.hash);
             workspacePoliciesDir = potentialWorkspacePoliciesDir;
-            // debugLogger.warn here doesn't show up in the terminal. It is showing up only in debug mode on the debug console
-            writeToStderr('WARNING: Workspace policies changed or are new. Automatically accepting and loading them in non-interactive mode.\n');
+            if (!interactive) {
+                writeToStderr('WARNING: Workspace policies changed or are new. Automatically accepting and loading them.\n');
+            }
+            else {
+                debugLogger.warn('Workspace policies changed or are new. Automatically accepting and loading them.');
+            }
         }
     }
     return { workspacePoliciesDir, policyUpdateConfirmationRequest };

package/dist/src/config/policy.js.map

@@ -1 +1 @@
-{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../../src/config/policy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAML,wBAAwB,IAAI,4BAA4B,EACxD,mBAAmB,IAAI,uBAAuB,EAC9C,sBAAsB,EACtB,eAAe,EACf,OAAO,EAEP,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAiB,MAAM,eAAe,CAAC;AAE9C,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,QAAkB,EAClB,YAA0B,EAC1B,oBAA6B;IAE7B,0EAA0E;IAC1E,6DAA6D;IAC7D,MAAM,cAAc,GAAmB;QACrC,GAAG,EAAE,QAAQ,CAAC,GAAG;QACjB,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,oBAAoB;KACrB,CAAC;IAEF,OAAO,4BAA4B,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,YAA0B,EAC1B,UAAsB,EACtB,OAAgB;IAEhB,OAAO,uBAAuB,CAAC,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;AACpE,CAAC;AAOD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,OAIjD;IACC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAEpD,IAAI,oBAAwC,CAAC;IAC7C,IAAI,+BAES,CAAC;IAEd,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;QAEjC,wFAAwF;QACxF,wEAAwE;QACxE,IAAI,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;YACjC,OAAO,EAAE,oBAAoB,EAAE,SAAS,EAAE,CAAC;QAC7C,CAAC;QAED,MAAM,6BAA6B,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;QACxE,MAAM,gBAAgB,GAAG,IAAI,sBAAsB,EAAE,CAAC;QACtD,MAAM,eAAe,GAAG,MAAM,gBAAgB,CAAC,cAAc,CAC3D,WAAW,EACX,GAAG,EACH,6BAA6B,CAC9B,CAAC;QAEF,IAAI,eAAe,CAAC,MAAM,KAAK,eAAe,CAAC,KAAK,EAAE,CAAC;YACrD,oBAAoB,GAAG,6BAA6B,CAAC;QACvD,CAAC;aAAM,IACL,eAAe,CAAC,MAAM,KAAK,eAAe,CAAC,GAAG;YAC9C,eAAe,CAAC,SAAS,KAAK,CAAC,EAC/B,CAAC;YACD,8BAA8B;YAC9B,oBAAoB,GAAG,SAAS,CAAC;QACnC,CAAC;aAAM,IAAI,WAAW,EAAE,CAAC;YACvB,8DAA8D;YAC9D,+BAA+B,GAAG;gBAChC,KAAK,EAAE,WAAW;gBAClB,UAAU,EAAE,GAAG;gBACf,SAAS,EAAE,6BAA6B;gBACxC,OAAO,EAAE,eAAe,CAAC,IAAI;aAC9B,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,2DAA2D;YAC3D,MAAM,gBAAgB,CAAC,eAAe,CACpC,WAAW,EACX,GAAG,EACH,eAAe,CAAC,IAAI,CACrB,CAAC;YACF,oBAAoB,GAAG,6BAA6B,CAAC;YACrD,kHAAkH;YAClH,aAAa,CACX,qHAAqH,CACtH,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,EAAE,oBAAoB,EAAE,+BAA+B,EAAE,CAAC;AACnE,CAAC"}
+{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../../src/config/policy.ts"],"names":[],"mappings":"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"}

package/dist/src/config/policy.test.js

@@ -7,7 +7,7 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as os from 'node:os';
-import { resolveWorkspacePolicyState } from './policy.js';
+import { resolveWorkspacePolicyState, autoAcceptWorkspacePolicies, setAutoAcceptWorkspacePolicies, disableWorkspacePolicies, setDisableWorkspacePolicies, } from './policy.js';
 import { writeToStderr } from '@google/gemini-cli-core';
 // Mock debugLogger to avoid noise in test output
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
@@ -34,6 +34,8 @@ describe('resolveWorkspacePolicyState', () => {
         workspaceDir = path.join(tempDir, 'workspace');
         fs.mkdirSync(workspaceDir);
         policiesDir = path.join(workspaceDir, '.gemini', 'policies');
+        // Enable policies for these tests to verify loading logic
+        setDisableWorkspacePolicies(false);
         vi.clearAllMocks();
     });
     afterEach(() => {
@@ -52,21 +54,25 @@ describe('resolveWorkspacePolicyState', () => {
             policyUpdateConfirmationRequest: undefined,
         });
     });
+    it('should have disableWorkspacePolicies set to true by default', () => {
+        // We explicitly set it to false in beforeEach for other tests,
+        // so here we test that setting it to true works.
+        setDisableWorkspacePolicies(true);
+        expect(disableWorkspacePolicies).toBe(true);
+    });
     it('should return policy directory if integrity matches', async () => {
         // Set up policies directory with a file
         fs.mkdirSync(policiesDir, { recursive: true });
         fs.writeFileSync(path.join(policiesDir, 'policy.toml'), 'rules = []');
-        // First call to establish integrity (interactive accept)
+        // First call to establish integrity (interactive auto-accept)
         const firstResult = await resolveWorkspacePolicyState({
             cwd: workspaceDir,
             trustedFolder: true,
             interactive: true,
         });
-        expect(firstResult.policyUpdateConfirmationRequest).toBeDefined();
-        // Establish integrity manually as if accepted
-        const { PolicyIntegrityManager } = await import('@google/gemini-cli-core');
-        const integrityManager = new PolicyIntegrityManager();
-        await integrityManager.acceptIntegrity('workspace', workspaceDir, firstResult.policyUpdateConfirmationRequest.newHash);
+        expect(firstResult.workspacePoliciesDir).toBe(policiesDir);
+        expect(firstResult.policyUpdateConfirmationRequest).toBeUndefined();
+        expect(writeToStderr).not.toHaveBeenCalled();
         // Second call should match
         const result = await resolveWorkspacePolicyState({
             cwd: workspaceDir,
@@ -85,23 +91,30 @@ describe('resolveWorkspacePolicyState', () => {
         expect(result.workspacePoliciesDir).toBeUndefined();
         expect(result.policyUpdateConfirmationRequest).toBeUndefined();
     });
-    it('should return confirmation request if changed in interactive mode', async () => {
-        fs.mkdirSync(policiesDir, { recursive: true });
-        fs.writeFileSync(path.join(policiesDir, 'policy.toml'), 'rules = []');
-        const result = await resolveWorkspacePolicyState({
-            cwd: workspaceDir,
-            trustedFolder: true,
-            interactive: true,
-        });
-        expect(result.workspacePoliciesDir).toBeUndefined();
-        expect(result.policyUpdateConfirmationRequest).toEqual({
-            scope: 'workspace',
-            identifier: workspaceDir,
-            policyDir: policiesDir,
-            newHash: expect.any(String),
-        });
+    it('should return confirmation request if changed in interactive mode when AUTO_ACCEPT is false', async () => {
+        const originalValue = autoAcceptWorkspacePolicies;
+        setAutoAcceptWorkspacePolicies(false);
+        try {
+            fs.mkdirSync(policiesDir, { recursive: true });
+            fs.writeFileSync(path.join(policiesDir, 'policy.toml'), 'rules = []');
+            const result = await resolveWorkspacePolicyState({
+                cwd: workspaceDir,
+                trustedFolder: true,
+                interactive: true,
+            });
+            expect(result.workspacePoliciesDir).toBeUndefined();
+            expect(result.policyUpdateConfirmationRequest).toEqual({
+                scope: 'workspace',
+                identifier: workspaceDir,
+                policyDir: policiesDir,
+                newHash: expect.any(String),
+            });
+        }
+        finally {
+            setAutoAcceptWorkspacePolicies(originalValue);
+        }
     });
-    it('should warn and auto-accept if changed in non-interactive mode', async () => {
+    it('should warn and auto-accept if changed in non-interactive mode when AUTO_ACCEPT is true', async () => {
         fs.mkdirSync(policiesDir, { recursive: true });
         fs.writeFileSync(path.join(policiesDir, 'policy.toml'), 'rules = []');
         const result = await resolveWorkspacePolicyState({
@@ -113,6 +126,25 @@ describe('resolveWorkspacePolicyState', () => {
         expect(result.policyUpdateConfirmationRequest).toBeUndefined();
         expect(writeToStderr).toHaveBeenCalledWith(expect.stringContaining('Automatically accepting and loading'));
     });
+    it('should warn and auto-accept if changed in non-interactive mode when AUTO_ACCEPT is false', async () => {
+        const originalValue = autoAcceptWorkspacePolicies;
+        setAutoAcceptWorkspacePolicies(false);
+        try {
+            fs.mkdirSync(policiesDir, { recursive: true });
+            fs.writeFileSync(path.join(policiesDir, 'policy.toml'), 'rules = []');
+            const result = await resolveWorkspacePolicyState({
+                cwd: workspaceDir,
+                trustedFolder: true,
+                interactive: false,
+            });
+            expect(result.workspacePoliciesDir).toBe(policiesDir);
+            expect(result.policyUpdateConfirmationRequest).toBeUndefined();
+            expect(writeToStderr).toHaveBeenCalledWith(expect.stringContaining('Automatically accepting and loading'));
+        }
+        finally {
+            setAutoAcceptWorkspacePolicies(originalValue);
+        }
+    });
     it('should not return workspace policies if cwd is the home directory', async () => {
         const policiesDir = path.join(tempDir, '.gemini', 'policies');
         fs.mkdirSync(policiesDir, { recursive: true });
@@ -126,7 +158,22 @@ describe('resolveWorkspacePolicyState', () => {
         expect(result.workspacePoliciesDir).toBeUndefined();
         expect(result.policyUpdateConfirmationRequest).toBeUndefined();
     });
-    it('should not return workspace policies if cwd is a symlink to the home directory', async () => {
+    it('should return empty state if disableWorkspacePolicies is true even if folder is trusted', async () => {
+        setDisableWorkspacePolicies(true);
+        // Set up policies directory with a file
+        fs.mkdirSync(policiesDir, { recursive: true });
+        fs.writeFileSync(path.join(policiesDir, 'policy.toml'), 'rules = []');
+        const result = await resolveWorkspacePolicyState({
+            cwd: workspaceDir,
+            trustedFolder: true,
+            interactive: true,
+        });
+        expect(result).toEqual({
+            workspacePoliciesDir: undefined,
+            policyUpdateConfirmationRequest: undefined,
+        });
+    });
+    it('should return empty state if cwd is a symlink to the home directory', async () => {
         const policiesDir = path.join(tempDir, '.gemini', 'policies');
         fs.mkdirSync(policiesDir, { recursive: true });
         fs.writeFileSync(path.join(policiesDir, 'policy.toml'), 'rules = []');

package/dist/src/config/policy.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"policy.test.js","sourceRoot":"","sources":["../../../src/config/policy.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"policy.test.js","sourceRoot":"","sources":["../../../src/config/policy.test.ts"],"names":[],"mappings":"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"}

package/dist/src/config/settingsSchema.d.ts

@@ -655,6 +655,22 @@ declare const SETTINGS_SCHEMA: {
                     readonly label: "Off";
                 }];
             };
+            readonly errorVerbosity: {
+                readonly type: "enum";
+                readonly label: "Error Verbosity";
+                readonly category: "UI";
+                readonly requiresRestart: false;
+                readonly default: "low";
+                readonly description: "Controls whether recoverable errors are hidden (low) or fully shown (full).";
+                readonly showInDialog: true;
+                readonly options: readonly [{
+                    readonly value: "low";
+                    readonly label: "Low";
+                }, {
+                    readonly value: "full";
+                    readonly label: "Full";
+                }];
+            };
             readonly customWittyPhrases: {
                 readonly type: "array";
                 readonly label: "Custom Witty Phrases";
@@ -757,6 +773,36 @@ declare const SETTINGS_SCHEMA: {
         readonly showInDialog: false;
         readonly ref: "TelemetrySettings";
     };
+    readonly billing: {
+        readonly type: "object";
+        readonly label: "Billing";
+        readonly category: "Advanced";
+        readonly requiresRestart: false;
+        readonly default: {};
+        readonly description: "Billing and AI credits settings.";
+        readonly showInDialog: false;
+        readonly properties: {
+            readonly overageStrategy: {
+                readonly type: "enum";
+                readonly label: "Overage Strategy";
+                readonly category: "Advanced";
+                readonly requiresRestart: false;
+                readonly default: "ask";
+                readonly description: string;
+                readonly showInDialog: true;
+                readonly options: readonly [{
+                    readonly value: "ask";
+                    readonly label: "Ask each time";
+                }, {
+                    readonly value: "always";
+                    readonly label: "Always use credits";
+                }, {
+                    readonly value: "never";
+                    readonly label: "Never use credits";
+                }];
+            };
+        };
+    };
     readonly model: {
         readonly type: "object";
         readonly label: "Model";
@@ -773,7 +819,7 @@ declare const SETTINGS_SCHEMA: {
                 readonly requiresRestart: false;
                 readonly default: string | undefined;
                 readonly description: "The Gemini model to use for conversations.";
-                readonly showInDialog: false;
+                readonly showInDialog: true;
             };
             readonly maxSessionTurns: {
                 readonly type: "number";
@@ -1668,6 +1714,55 @@ declare const SETTINGS_SCHEMA: {
                 readonly description: "Enable web fetch behavior that bypasses LLM summarization.";
                 readonly showInDialog: true;
             };
+            readonly gemmaModelRouter: {
+                readonly type: "object";
+                readonly label: "Gemma Model Router";
+                readonly category: "Experimental";
+                readonly requiresRestart: true;
+                readonly default: {};
+                readonly description: "Enable Gemma model router (experimental).";
+                readonly showInDialog: true;
+                readonly properties: {
+                    readonly enabled: {
+                        readonly type: "boolean";
+                        readonly label: "Enable Gemma Model Router";
+                        readonly category: "Experimental";
+                        readonly requiresRestart: true;
+                        readonly default: false;
+                        readonly description: "Enable the Gemma Model Router. Requires a local endpoint serving Gemma via the Gemini API using LiteRT-LM shim.";
+                        readonly showInDialog: true;
+                    };
+                    readonly classifier: {
+                        readonly type: "object";
+                        readonly label: "Classifier";
+                        readonly category: "Experimental";
+                        readonly requiresRestart: true;
+                        readonly default: {};
+                        readonly description: "Classifier configuration.";
+                        readonly showInDialog: false;
+                        readonly properties: {
+                            readonly host: {
+                                readonly type: "string";
+                                readonly label: "Host";
+                                readonly category: "Experimental";
+                                readonly requiresRestart: true;
+                                readonly default: "http://localhost:9379";
+                                readonly description: "The host of the classifier.";
+                                readonly showInDialog: false;
+                            };
+                            readonly model: {
+                                readonly type: "string";
+                                readonly label: "Model";
+                                readonly category: "Experimental";
+                                readonly requiresRestart: true;
+                                readonly default: "gemma3-1b-gpu-custom";
+                                readonly description: "The model to use for the classifier. Only tested on `gemma3-1b-gpu-custom`.";
+                                readonly showInDialog: false;
+                            };
+                        };
+                    };
+                };
+            };
         };
     };
     readonly extensions: {
@@ -2030,12 +2125,12 @@ export declare function getSettingsSchema(): SettingsSchemaType;
 type InferSettings<T extends SettingsSchema> = {
     -readonly [K in keyof T]?: T[K] extends {
         properties: SettingsSchema;
-    } ? InferSettings<T[K]['properties']> : T[K]['type'] extends 'enum' ? T[K]['options'] extends readonly SettingEnumOption[] ? T[K]['options'][number]['value'] : T[K]['default'] : T[K]['default'] extends boolean ? boolean : T[K]['default'];
+    } ? InferSettings<T[K]['properties']> : T[K]['type'] extends 'enum' ? T[K]['options'] extends readonly SettingEnumOption[] ? T[K]['options'][number]['value'] : T[K]['default'] : T[K]['default'] extends boolean ? boolean : T[K]['default'] extends string ? string : T[K]['default'];
 };
 type InferMergedSettings<T extends SettingsSchema> = {
     -readonly [K in keyof T]-?: T[K] extends {
         properties: SettingsSchema;
-    } ? InferMergedSettings<T[K]['properties']> : T[K]['type'] extends 'enum' ? T[K]['options'] extends readonly SettingEnumOption[] ? T[K]['options'][number]['value'] : T[K]['default'] : T[K]['default'] extends boolean ? boolean : T[K]['default'];
+    } ? InferMergedSettings<T[K]['properties']> : T[K]['type'] extends 'enum' ? T[K]['options'] extends readonly SettingEnumOption[] ? T[K]['options'][number]['value'] : T[K]['default'] : T[K]['default'] extends boolean ? boolean : T[K]['default'] extends string ? string : T[K]['default'];
 };
 export type Settings = InferSettings<SettingsSchemaType>;
 export type MergedSettings = InferMergedSettings<SettingsSchemaType>;

package/dist/src/config/settingsSchema.js

@@ -605,6 +605,19 @@ const SETTINGS_SCHEMA = {
                     { value: 'off', label: 'Off' },
                 ],
             },
+            errorVerbosity: {
+                type: 'enum',
+                label: 'Error Verbosity',
+                category: 'UI',
+                requiresRestart: false,
+                default: 'low',
+                description: 'Controls whether recoverable errors are hidden (low) or fully shown (full).',
+                showInDialog: true,
+                options: [
+                    { value: 'low', label: 'Low' },
+                    { value: 'full', label: 'Full' },
+                ],
+            },
             customWittyPhrases: {
                 type: 'array',
                 label: 'Custom Witty Phrases',
@@ -708,6 +721,35 @@ const SETTINGS_SCHEMA = {
         showInDialog: false,
         ref: 'TelemetrySettings',
     },
+    billing: {
+        type: 'object',
+        label: 'Billing',
+        category: 'Advanced',
+        requiresRestart: false,
+        default: {},
+        description: 'Billing and AI credits settings.',
+        showInDialog: false,
+        properties: {
+            overageStrategy: {
+                type: 'enum',
+                label: 'Overage Strategy',
+                category: 'Advanced',
+                requiresRestart: false,
+                default: 'ask',
+                description: oneLine `
+          How to handle quota exhaustion when AI credits are available.
+          'ask' prompts each time, 'always' automatically uses credits,
+          'never' disables credit usage.
+        `,
+                showInDialog: true,
+                options: [
+                    { value: 'ask', label: 'Ask each time' },
+                    { value: 'always', label: 'Always use credits' },
+                    { value: 'never', label: 'Never use credits' },
+                ],
+            },
+        },
+    },
     model: {
         type: 'object',
         label: 'Model',
@@ -724,7 +766,7 @@ const SETTINGS_SCHEMA = {
                 requiresRestart: false,
                 default: undefined,
                 description: 'The Gemini model to use for conversations.',
-                showInDialog: false,
+                showInDialog: true,
             },
             maxSessionTurns: {
                 type: 'number',
@@ -1621,6 +1663,55 @@ const SETTINGS_SCHEMA = {
                 description: 'Enable web fetch behavior that bypasses LLM summarization.',
                 showInDialog: true,
             },
+            gemmaModelRouter: {
+                type: 'object',
+                label: 'Gemma Model Router',
+                category: 'Experimental',
+                requiresRestart: true,
+                default: {},
+                description: 'Enable Gemma model router (experimental).',
+                showInDialog: true,
+                properties: {
+                    enabled: {
+                        type: 'boolean',
+                        label: 'Enable Gemma Model Router',
+                        category: 'Experimental',
+                        requiresRestart: true,
+                        default: false,
+                        description: 'Enable the Gemma Model Router. Requires a local endpoint serving Gemma via the Gemini API using LiteRT-LM shim.',
+                        showInDialog: true,
+                    },
+                    classifier: {
+                        type: 'object',
+                        label: 'Classifier',
+                        category: 'Experimental',
+                        requiresRestart: true,
+                        default: {},
+                        description: 'Classifier configuration.',
+                        showInDialog: false,
+                        properties: {
+                            host: {
+                                type: 'string',
+                                label: 'Host',
+                                category: 'Experimental',
+                                requiresRestart: true,
+                                default: 'http://localhost:9379',
+                                description: 'The host of the classifier.',
+                                showInDialog: false,
+                            },
+                            model: {
+                                type: 'string',
+                                label: 'Model',
+                                category: 'Experimental',
+                                requiresRestart: true,
+                                default: 'gemma3-1b-gpu-custom',
+                                description: 'The model to use for the classifier. Only tested on `gemma3-1b-gpu-custom`.',
+                                showInDialog: false,
+                            },
+                        },
+                    },
+                },
+            },
         },
     },
     extensions: {