@google/gemini-cli-core 0.31.0 → 0.33.0-nightly.20260228.1ca5c05d0

package/dist/src/code_assist/setup.js

@@ -7,6 +7,7 @@ import { UserTierId, IneligibleTierReasonCode } from './types.js';
 import { CodeAssistServer } from './server.js';
 import { ChangeAuthRequestedError } from '../utils/errors.js';
 import { ValidationRequiredError } from '../utils/googleQuotaErrors.js';
+import { debugLogger } from '../utils/debugLogger.js';
 export class ProjectIdRequiredError extends Error {
     constructor() {
         super('This account requires setting the GOOGLE_CLOUD_PROJECT or GOOGLE_CLOUD_PROJECT_ID env var. See https://goo.gle/gemini-cli-auth-docs#workspace-gca');
@@ -89,12 +90,18 @@ export async function setupUser(client, validationHandler, httpOptions = {}) {
         }
     }
     if (loadRes.currentTier) {
+        if (!loadRes.paidTier?.id && !loadRes.currentTier.id) {
+            debugLogger.warn('Warning: Code Assist API did not return a user tier ID. Defaulting to STANDARD tier.');
+        }
         if (!loadRes.cloudaicompanionProject) {
             if (projectId) {
                 return {
                     projectId,
-                    userTier: loadRes.paidTier?.id ?? loadRes.currentTier.id,
+                    userTier: loadRes.paidTier?.id ??
+                        loadRes.currentTier.id ??
+                        UserTierId.STANDARD,
                     userTierName: loadRes.paidTier?.name ?? loadRes.currentTier.name,
+                    paidTier: loadRes.paidTier ?? undefined,
                 };
             }
             // If user is not setup for standard tier, inform them about all other tiers they are ineligible for.
@@ -102,11 +109,15 @@ export async function setupUser(client, validationHandler, httpOptions = {}) {
         }
         return {
             projectId: loadRes.cloudaicompanionProject,
-            userTier: loadRes.paidTier?.id ?? loadRes.currentTier.id,
+            userTier: loadRes.paidTier?.id ?? loadRes.currentTier.id ?? UserTierId.STANDARD,
             userTierName: loadRes.paidTier?.name ?? loadRes.currentTier.name,
+            paidTier: loadRes.paidTier ?? undefined,
         };
     }
     const tier = getOnboardTier(loadRes);
+    if (!tier.id) {
+        debugLogger.warn('Warning: Code Assist API did not return an onboarding tier ID. Defaulting to STANDARD tier.');
+    }
     let onboardReq;
     if (tier.id === UserTierId.FREE) {
         // The free tier uses a managed google cloud project. Setting a project in the `onboardUser` request causes a `Precondition Failed` error.
@@ -138,7 +149,7 @@ export async function setupUser(client, validationHandler, httpOptions = {}) {
         if (projectId) {
             return {
                 projectId,
-                userTier: tier.id,
+                userTier: tier.id ?? UserTierId.STANDARD,
                 userTierName: tier.name,
             };
         }
@@ -146,7 +157,7 @@ export async function setupUser(client, validationHandler, httpOptions = {}) {
     }
     return {
         projectId: lroRes.response.cloudaicompanionProject.id,
-        userTier: tier.id,
+        userTier: tier.id ?? UserTierId.STANDARD,
         userTierName: tier.name,
     };
 }

package/dist/src/code_assist/setup.js.map

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

package/dist/src/code_assist/types.d.ts

@@ -17,10 +17,31 @@ export interface ClientMetadata {
 export type ClientMetadataIdeType = 'IDE_UNSPECIFIED' | 'VSCODE' | 'INTELLIJ' | 'VSCODE_CLOUD_WORKSTATION' | 'INTELLIJ_CLOUD_WORKSTATION' | 'CLOUD_SHELL' | 'GEMINI_CLI';
 export type ClientMetadataPlatform = 'PLATFORM_UNSPECIFIED' | 'DARWIN_AMD64' | 'DARWIN_ARM64' | 'LINUX_AMD64' | 'LINUX_ARM64' | 'WINDOWS_AMD64';
 export type ClientMetadataPluginType = 'PLUGIN_UNSPECIFIED' | 'CLOUD_CODE' | 'GEMINI' | 'AIPLUGIN_INTELLIJ' | 'AIPLUGIN_STUDIO';
+/**
+ * Credit types that can be used for API consumption.
+ */
+export type CreditType = 'CREDIT_TYPE_UNSPECIFIED' | 'GOOGLE_ONE_AI';
+/**
+ * Represents a credit amount for a specific credit type.
+ * Used in LoadCodeAssistResponse for available credits and
+ * in GenerateContentResponse for consumed/remaining credits.
+ */
+export interface Credits {
+    creditType: CreditType;
+    creditAmount: string;
+}
+/** Alias for Credits used in available_credits context */
+export type AvailableCredits = Credits;
+/** Alias for Credits used in consumedCredits context */
+export type ConsumedCredits = Credits;
+/** Alias for Credits used in remainingCredits context */
+export type RemainingCredits = Credits;
 export interface LoadCodeAssistRequest {
     cloudaicompanionProject?: string;
     metadata: ClientMetadata;
+    mode?: LoadCodeAssistMode;
 }
+export type LoadCodeAssistMode = 'MODE_UNSPECIFIED' | 'FULL_ELIGIBILITY_CHECK' | 'HEALTH_CHECK';
 /**
  * Represents LoadCodeAssistResponse proto json field
  * http://google3/google/internal/cloud/code/v1internal/cloudcode.proto;l=224
@@ -36,7 +57,7 @@ export interface LoadCodeAssistResponse {
  * GeminiUserTier reflects the structure received from the CodeAssist when calling LoadCodeAssist.
  */
 export interface GeminiUserTier {
-    id: UserTierId;
+    id?: UserTierId;
     name?: string;
     description?: string;
     userDefinedCloudaicompanionProject?: boolean | null;
@@ -44,6 +65,8 @@ export interface GeminiUserTier {
     privacyNotice?: PrivacyNotice;
     hasAcceptedTos?: boolean;
     hasOnboardedPreviously?: boolean;
+    /** Available AI credits for this tier (e.g., Google One AI credits) */
+    availableCredits?: AvailableCredits[];
 }
 /**
  * Includes information specifying the reasons for a user's ineligibility for a specific tier.
@@ -53,10 +76,10 @@ export interface GeminiUserTier {
  * @param tierName name of the tier.
  */
 export interface IneligibleTier {
-    reasonCode: IneligibleTierReasonCode;
-    reasonMessage: string;
-    tierId: UserTierId;
-    tierName: string;
+    reasonCode?: IneligibleTierReasonCode;
+    reasonMessage?: string;
+    tierId?: UserTierId;
+    tierName?: string;
     validationErrorMessage?: string;
     validationUrl?: string;
     validationUrlLinkText?: string;
@@ -96,7 +119,7 @@ export type UserTierId = (typeof UserTierId)[keyof typeof UserTierId] | string;
  * privacy notice.
  */
 export interface PrivacyNotice {
-    showNotice: boolean;
+    showNotice?: boolean;
     noticeText?: string;
 }
 /**
@@ -112,7 +135,7 @@ export interface OnboardUserRequest {
  * http://google3/google/longrunning/operations.proto;rcl=698857719;l=107
  */
 export interface LongRunningOperationResponse {
-    name: string;
+    name?: string;
     done?: boolean;
     response?: OnboardUserResponse;
 }
@@ -122,8 +145,8 @@ export interface LongRunningOperationResponse {
  */
 export interface OnboardUserResponse {
     cloudaicompanionProject?: {
-        id: string;
-        name: string;
+        id?: string;
+        name?: string;
     };
 }
 /**
@@ -155,7 +178,7 @@ export interface SetCodeAssistGlobalUserSettingRequest {
 }
 export interface CodeAssistGlobalUserSettingResponse {
     cloudaicompanionProject?: string;
-    freeTierDataCollectionOptin: boolean;
+    freeTierDataCollectionOptin?: boolean;
 }
 /**
  * Relevant fields that can be returned from a Google RPC response

package/dist/src/code_assist/types.js.map

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

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

@@ -4,12 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import type { ContentGenerator, ContentGeneratorConfig } from '../core/contentGenerator.js';
+import type { OverageStrategy } from '../billing/billing.js';
 import { AuthType } from '../core/contentGenerator.js';
 import { PromptRegistry } from '../prompts/prompt-registry.js';
 import { ResourceRegistry } from '../resources/resource-registry.js';
 import { ToolRegistry } from '../tools/tool-registry.js';
 import { GeminiClient } from '../core/client.js';
 import { BaseLlmClient } from '../core/baseLlmClient.js';
+import { LocalLiteRtLmClient } from '../core/localLiteRtLmClient.js';
 import type { HookDefinition, HookEventName } from '../hooks/types.js';
 import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
 import { GitService } from '../services/gitService.js';
@@ -34,9 +36,9 @@ import { FileExclusions } from '../utils/ignorePatterns.js';
 import { MessageBus } from '../confirmation-bus/message-bus.js';
 import type { EventEmitter } from 'node:events';
 import { PolicyEngine } from '../policy/policy-engine.js';
-import { ApprovalMode, type PolicyEngineConfig } from '../policy/types.js';
+import { ApprovalMode, type PolicyEngineConfig, type PolicyRule, type SafetyCheckerRule } from '../policy/types.js';
 import { HookSystem } from '../hooks/index.js';
-import type { UserTierId, RetrieveUserQuotaResponse, AdminControlsSettings } from '../code_assist/types.js';
+import type { UserTierId, GeminiUserTier, RetrieveUserQuotaResponse, AdminControlsSettings } from '../code_assist/types.js';
 import type { HierarchicalMemory } from './memory.js';
 import type { Experiments } from '../code_assist/experiments/experiments.js';
 import { AgentRegistry } from '../agents/registry.js';
@@ -78,6 +80,13 @@ export interface ToolOutputMaskingConfig {
     minPrunableTokensThreshold: number;
     protectLatestTurn: boolean;
 }
+export interface GemmaModelRouterSettings {
+    enabled?: boolean;
+    classifier?: {
+        host?: string;
+        model?: string;
+    };
+}
 export interface ExtensionSetting {
     name: string;
     description: string;
@@ -207,6 +216,14 @@ export interface GeminiCLIExtension {
      * These themes will be registered when the extension is activated.
      */
     themes?: CustomTheme[];
+    /**
+     * Policy rules contributed by this extension.
+     */
+    rules?: PolicyRule[];
+    /**
+     * Safety checkers contributed by this extension.
+     */
+    checkers?: SafetyCheckerRule[];
 }
 export interface ExtensionInstallMetadata {
     source: string;
@@ -220,6 +237,7 @@ import type { FileFilteringOptions } from './constants.js';
 import { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS } from './constants.js';
 import { type ExtensionLoader } from '../utils/extensionLoader.js';
 import { McpClientManager } from '../tools/mcp-client-manager.js';
+import { type McpContext } from '../tools/mcp-client.js';
 import type { EnvironmentSanitizationConfig } from '../services/environmentSanitization.js';
 export type { FileFilteringOptions };
 export { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, };
@@ -341,6 +359,7 @@ export interface ConfigParameters {
     interactive?: boolean;
     trustedFolder?: boolean;
     useBackgroundColor?: boolean;
+    useAlternateBuffer?: boolean;
     useRipgrep?: boolean;
     enableInteractiveShell?: boolean;
     skipNextSpeakerCheck?: boolean;
@@ -353,6 +372,7 @@ export interface ConfigParameters {
     directWebFetch?: boolean;
     policyUpdateConfirmationRequest?: PolicyUpdateConfirmationRequest;
     output?: OutputSettings;
+    gemmaModelRouter?: GemmaModelRouterSettings;
     disableModelRouterForAuth?: AuthType[];
     continueOnFailedApiCall?: boolean;
     retryFetchErrors?: boolean;
@@ -397,8 +417,11 @@ export interface ConfigParameters {
         agents?: AgentSettings;
     }>;
     enableConseca?: boolean;
+    billing?: {
+        overageStrategy?: OverageStrategy;
+    };
 }
-export declare class Config {
+export declare class Config implements McpContext {
     private toolRegistry;
     private mcpClientManager?;
     private allowedMcpServers;
@@ -445,6 +468,7 @@ export declare class Config {
     private readonly usageStatisticsEnabled;
     private geminiClient;
     private baseLlmClient;
+    private localLiteRtLmClient?;
     private modelRouterService;
     private readonly modelAvailabilityService;
     private readonly fileFiltering;
@@ -493,6 +517,7 @@ export declare class Config {
     private readonly enableInteractiveShell;
     private readonly skipNextSpeakerCheck;
     private readonly useBackgroundColor;
+    private readonly useAlternateBuffer;
     private shellExecutionConfig;
     private readonly extensionManagement;
     private readonly truncateToolOutputThreshold;
@@ -507,6 +532,7 @@ export declare class Config {
     private readonly policyEngine;
     private policyUpdateConfirmationRequest;
     private readonly outputSettings;
+    private readonly gemmaModelRouter;
     private readonly continueOnFailedApiCall;
     private readonly retryFetchErrors;
     private readonly maxAttempts;
@@ -529,6 +555,7 @@ export declare class Config {
     private hookSystem?;
     private readonly onModelChange;
     private readonly onReload;
+    private readonly billing;
     private readonly enableAgents;
     private agents;
     private readonly enableEventDrivenScheduler;
@@ -556,14 +583,16 @@ export declare class Config {
     initialize(): Promise<void>;
     private _initialize;
     getContentGenerator(): ContentGenerator;
-    refreshAuth(authMethod: AuthType): Promise<void>;
+    refreshAuth(authMethod: AuthType, apiKey?: string): Promise<void>;
     getExperimentsAsync(): Promise<Experiments | undefined>;
     getUserTier(): UserTierId | undefined;
     getUserTierName(): string | undefined;
+    getUserPaidTier(): GeminiUserTier | undefined;
     /**
      * Provides access to the BaseLlmClient for stateless LLM operations.
      */
     getBaseLlmClient(): BaseLlmClient;
+    getLocalLiteRtLmClient(): LocalLiteRtLmClient;
     getSessionId(): string;
     setSessionId(sessionId: string): void;
     setTerminalBackground(terminalBackground: string | undefined): void;
@@ -612,6 +641,7 @@ export declare class Config {
     getQuestion(): string | undefined;
     getHasAccessToPreviewModel(): boolean;
     setHasAccessToPreviewModel(hasAccess: boolean | null): void;
+    refreshAvailableCredits(): Promise<void>;
     refreshUserQuota(): Promise<RetrieveUserQuotaResponse | undefined>;
     refreshUserQuotaIfStale(staleMs?: number): Promise<RetrieveUserQuotaResponse | undefined>;
     getLastRetrievedQuota(): RetrieveUserQuotaResponse | undefined;
@@ -642,6 +672,10 @@ export declare class Config {
     getMcpEnablementCallbacks(): McpEnablementCallbacks | undefined;
     getExtensionsEnabled(): boolean;
     getMcpClientManager(): McpClientManager | undefined;
+    setUserInteractedWithMcp(): void;
+    /** @deprecated Use getMcpClientManager().getLastError() directly */
+    getLastMcpError(serverName: string): string | undefined;
+    emitMcpDiagnostic(severity: 'info' | 'warning' | 'error', message: string, error?: unknown, serverName?: string): void;
     getAllowedMcpServers(): string[] | undefined;
     getBlockedMcpServers(): string[] | undefined;
     get sanitizationConfig(): EnvironmentSanitizationConfig;
@@ -694,6 +728,15 @@ export declare class Config {
     getTelemetryOtlpProtocol(): 'grpc' | 'http';
     getTelemetryTarget(): TelemetryTarget;
     getTelemetryOutfile(): string | undefined;
+    getBillingSettings(): {
+        overageStrategy: OverageStrategy;
+    };
+    /**
+     * Updates the overage strategy at runtime.
+     * Used to switch from 'ask' to 'always' after the user accepts credits
+     * via the overage dialog, so subsequent API calls auto-include credits.
+     */
+    setOverageStrategy(strategy: OverageStrategy): void;
     getTelemetryUseCollector(): boolean;
     getTelemetryUseCliAuth(): boolean;
     getGeminiClient(): GeminiClient;
@@ -811,6 +854,7 @@ export declare class Config {
     isInteractive(): boolean;
     getUseRipgrep(): boolean;
     getUseBackgroundColor(): boolean;
+    getUseAlternateBuffer(): boolean;
     getEnableInteractiveShell(): boolean;
     getSkipNextSpeakerCheck(): boolean;
     getContinueOnFailedApiCall(): boolean;
@@ -831,6 +875,8 @@ export declare class Config {
     getPolicyEngine(): PolicyEngine;
     getEnableHooks(): boolean;
     getEnableHooksUI(): boolean;
+    getGemmaModelRouterEnabled(): boolean;
+    getGemmaModelRouterSettings(): GemmaModelRouterSettings;
     /**
      * Get override settings for a specific agent.
      * Reads from agents.overrides.<agentName>.

package/dist/src/config/config.js

@@ -29,6 +29,7 @@ import { ExitPlanModeTool } from '../tools/exit-plan-mode.js';
 import { EnterPlanModeTool } from '../tools/enter-plan-mode.js';
 import { GeminiClient } from '../core/client.js';
 import { BaseLlmClient } from '../core/baseLlmClient.js';
+import { LocalLiteRtLmClient } from '../core/localLiteRtLmClient.js';
 import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
 import { GitService } from '../services/gitService.js';
 import { initializeTelemetry, DEFAULT_TELEMETRY_TARGET, DEFAULT_OTLP_ENDPOINT, uiTelemetryService, } from '../telemetry/index.js';
@@ -52,7 +53,7 @@ import { Storage } from './storage.js';
 import { FileExclusions } from '../utils/ignorePatterns.js';
 import { MessageBus } from '../confirmation-bus/message-bus.js';
 import { PolicyEngine } from '../policy/policy-engine.js';
-import { ApprovalMode } from '../policy/types.js';
+import { ApprovalMode, } from '../policy/types.js';
 import { HookSystem } from '../hooks/index.js';
 import { getCodeAssistServer } from '../code_assist/codeAssist.js';
 import { AgentRegistry } from '../agents/registry.js';
@@ -78,6 +79,7 @@ import { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
 import { DEFAULT_TOOL_PROTECTION_THRESHOLD, DEFAULT_MIN_PRUNABLE_TOKENS_THRESHOLD, DEFAULT_PROTECT_LATEST_TURN, } from '../services/toolOutputMaskingService.js';
 import { SimpleExtensionLoader, } from '../utils/extensionLoader.js';
 import { McpClientManager } from '../tools/mcp-client-manager.js';
+import {} from '../tools/mcp-client.js';
 import { getErrorMessage } from '../utils/errors.js';
 import { ENTER_PLAN_MODE_TOOL_NAME, EXIT_PLAN_MODE_TOOL_NAME, } from '../tools/tool-names.js';
 export { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, };
@@ -202,6 +204,7 @@ export class Config {
     usageStatisticsEnabled;
     geminiClient;
     baseLlmClient;
+    localLiteRtLmClient;
     modelRouterService;
     modelAvailabilityService;
     fileFiltering;
@@ -259,6 +262,7 @@ export class Config {
     enableInteractiveShell;
     skipNextSpeakerCheck;
     useBackgroundColor;
+    useAlternateBuffer;
     shellExecutionConfig;
     extensionManagement = true;
     truncateToolOutputThreshold;
@@ -273,6 +277,7 @@ export class Config {
     policyEngine;
     policyUpdateConfirmationRequest;
     outputSettings;
+    gemmaModelRouter;
     continueOnFailedApiCall;
     retryFetchErrors;
     maxAttempts;
@@ -295,6 +300,7 @@ export class Config {
     hookSystem;
     onModelChange;
     onReload;
+    billing;
     enableAgents;
     agents;
     enableEventDrivenScheduler;
@@ -429,6 +435,7 @@ export class Config {
         this.directWebFetch = params.directWebFetch ?? false;
         this.useRipgrep = params.useRipgrep ?? true;
         this.useBackgroundColor = params.useBackgroundColor ?? true;
+        this.useAlternateBuffer = params.useAlternateBuffer ?? false;
         this.enableInteractiveShell = params.enableInteractiveShell ?? false;
         this.skipNextSpeakerCheck = params.skipNextSpeakerCheck ?? true;
         this.shellExecutionConfig = {
@@ -488,6 +495,13 @@ export class Config {
         this.outputSettings = {
             format: params.output?.format ?? OutputFormat.TEXT,
         };
+        this.gemmaModelRouter = {
+            enabled: params.gemmaModelRouter?.enabled ?? false,
+            classifier: {
+                host: params.gemmaModelRouter?.classifier?.host ?? 'http://localhost:9379',
+                model: params.gemmaModelRouter?.classifier?.model ?? 'gemma3-1b-gpu-custom',
+            },
+        };
         this.retryFetchErrors = params.retryFetchErrors ?? false;
         this.maxAttempts = Math.min(params.maxAttempts ?? DEFAULT_MAX_ATTEMPTS, DEFAULT_MAX_ATTEMPTS);
         this.disableYoloMode = params.disableYoloMode ?? false;
@@ -502,6 +516,9 @@ export class Config {
         this.experiments = params.experiments;
         this.onModelChange = params.onModelChange;
         this.onReload = params.onReload;
+        this.billing = {
+            overageStrategy: params.billing?.overageStrategy ?? 'ask',
+        };
         if (params.contextFileName) {
             setGeminiMdFilename(params.contextFileName);
         }
@@ -627,7 +644,7 @@ export class Config {
     getContentGenerator() {
         return this.contentGenerator;
     }
-    async refreshAuth(authMethod) {
+    async refreshAuth(authMethod, apiKey) {
         // Reset availability service when switching auth
         this.modelAvailabilityService.reset();
         // Vertex and Genai have incompatible encryption and sending history with
@@ -644,7 +661,7 @@ export class Config {
         if (this.contentGeneratorConfig) {
             this.contentGeneratorConfig.authType = undefined;
         }
-        const newContentGeneratorConfig = await createContentGeneratorConfig(this, authMethod);
+        const newContentGeneratorConfig = await createContentGeneratorConfig(this, authMethod, apiKey);
         this.contentGenerator = await createContentGenerator(newContentGeneratorConfig, this, this.getSessionId());
         // Only assign to instance properties after successful initialization
         this.contentGeneratorConfig = newContentGeneratorConfig;
@@ -694,6 +711,9 @@ export class Config {
     getUserTierName() {
         return this.contentGenerator?.userTierName;
     }
+    getUserPaidTier() {
+        return this.contentGenerator?.paidTier;
+    }
     /**
      * Provides access to the BaseLlmClient for stateless LLM operations.
      */
@@ -709,6 +729,12 @@ export class Config {
         }
         return this.baseLlmClient;
     }
+    getLocalLiteRtLmClient() {
+        if (!this.localLiteRtLmClient) {
+            this.localLiteRtLmClient = new LocalLiteRtLmClient(this);
+        }
+        return this.localLiteRtLmClient;
+    }
     getSessionId() {
         return this.sessionId;
     }
@@ -922,6 +948,19 @@ export class Config {
     setHasAccessToPreviewModel(hasAccess) {
         this.hasAccessToPreviewModel = hasAccess;
     }
+    async refreshAvailableCredits() {
+        const codeAssistServer = getCodeAssistServer(this);
+        if (!codeAssistServer) {
+            return;
+        }
+        try {
+            await codeAssistServer.refreshAvailableCredits();
+        }
+        catch {
+            // Non-fatal: proceed even if refresh fails.
+            // The actual credit balance will be verified server-side.
+        }
+    }
     async refreshUserQuota() {
         const codeAssistServer = getCodeAssistServer(this);
         if (!codeAssistServer || !codeAssistServer.projectId) {
@@ -1043,6 +1082,21 @@ export class Config {
     getMcpClientManager() {
         return this.mcpClientManager;
     }
+    setUserInteractedWithMcp() {
+        this.mcpClientManager?.setUserInteractedWithMcp();
+    }
+    /** @deprecated Use getMcpClientManager().getLastError() directly */
+    getLastMcpError(serverName) {
+        return this.mcpClientManager?.getLastError(serverName);
+    }
+    emitMcpDiagnostic(severity, message, error, serverName) {
+        if (this.mcpClientManager) {
+            this.mcpClientManager.emitDiagnostic(severity, message, error, serverName);
+        }
+        else {
+            coreEvents.emitFeedback(severity, message, error);
+        }
+    }
     getAllowedMcpServers() {
         return this.allowedMcpServers;
     }
@@ -1284,6 +1338,17 @@ export class Config {
     getTelemetryOutfile() {
         return this.telemetrySettings.outfile;
     }
+    getBillingSettings() {
+        return this.billing;
+    }
+    /**
+     * Updates the overage strategy at runtime.
+     * Used to switch from 'ask' to 'always' after the user accepts credits
+     * via the overage dialog, so subsequent API calls auto-include credits.
+     */
+    setOverageStrategy(strategy) {
+        this.billing.overageStrategy = strategy;
+    }
     getTelemetryUseCollector() {
         return this.telemetrySettings.useCollector ?? false;
     }
@@ -1656,6 +1721,9 @@ export class Config {
     getUseBackgroundColor() {
         return this.useBackgroundColor;
     }
+    getUseAlternateBuffer() {
+        return this.useAlternateBuffer;
+    }
     getEnableInteractiveShell() {
         return this.enableInteractiveShell;
     }
@@ -1732,6 +1800,12 @@ export class Config {
     getEnableHooksUI() {
         return this.enableHooksUI;
     }
+    getGemmaModelRouterEnabled() {
+        return this.gemmaModelRouter.enabled ?? false;
+    }
+    getGemmaModelRouterSettings() {
+        return this.gemmaModelRouter;
+    }
     /**
      * Get override settings for a specific agent.
      * Reads from agents.overrides.<agentName>.