@google/gemini-cli-core 0.44.0-nightly.20260521.g57c42a5c4 → 0.44.0-preview.0

package/dist/docs/changelogs/preview.md

@@ -1,6 +1,6 @@
-# Preview release: v0.43.0-preview.0
+# Preview release: v0.43.0-preview.1
 
-Released: May 12, 2026
+Released: May 19, 2026
 
 Our preview release includes the latest, new, and experimental features. This
 release may not be as stable as our [latest weekly release](latest.md).
@@ -26,6 +26,9 @@ npm install -g @google/gemini-cli@preview
 
 ## What's Changed
 
+- fix(patch): cherry-pick 85566a7 to release/v0.43.0-preview.0-pr-27073
+  [CONFLICTS] by @gemini-cli-robot in
+  [#27256](https://github.com/google-gemini/gemini-cli/pull/27256)
 - feat(core): steer model to use edit tool for surgical edits, fix a typo in
   [#26480](https://github.com/google-gemini/gemini-cli/pull/26480)
 - docs: clarify Auto Memory proposes memory updates and skills in
@@ -193,4 +196,4 @@ npm install -g @google/gemini-cli@preview
   [#26949](https://github.com/google-gemini/gemini-cli/pull/26949)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.42.0-preview.2...v0.43.0-preview.0
+https://github.com/google-gemini/gemini-cli/compare/v0.42.0-preview.2...v0.43.0-preview.1

package/dist/src/agents/agentLoader.d.ts

@@ -64,11 +64,11 @@ declare const localAgentSchema: z.ZodObject<{
         }, "strip", z.ZodTypeAny, {
             type: "oauth";
             scopes?: string[] | undefined;
-            audiences?: string[] | undefined;
             client_id?: string | undefined;
-            redirect_uri?: string | undefined;
             client_secret?: string | undefined;
+            redirect_uri?: string | undefined;
             token_url?: string | undefined;
+            audiences?: string[] | undefined;
             authorization_url?: string | undefined;
             issuer?: string | undefined;
             token_param_name?: string | undefined;
@@ -76,11 +76,11 @@ declare const localAgentSchema: z.ZodObject<{
         }, {
             type: "oauth";
             scopes?: string[] | undefined;
-            audiences?: string[] | undefined;
             client_id?: string | undefined;
-            redirect_uri?: string | undefined;
             client_secret?: string | undefined;
+            redirect_uri?: string | undefined;
             token_url?: string | undefined;
+            audiences?: string[] | undefined;
             authorization_url?: string | undefined;
             issuer?: string | undefined;
             token_param_name?: string | undefined;
@@ -99,11 +99,11 @@ declare const localAgentSchema: z.ZodObject<{
         } | {
             type: "oauth";
             scopes?: string[] | undefined;
-            audiences?: string[] | undefined;
             client_id?: string | undefined;
-            redirect_uri?: string | undefined;
             client_secret?: string | undefined;
+            redirect_uri?: string | undefined;
             token_url?: string | undefined;
+            audiences?: string[] | undefined;
             authorization_url?: string | undefined;
             issuer?: string | undefined;
             token_param_name?: string | undefined;
@@ -130,11 +130,11 @@ declare const localAgentSchema: z.ZodObject<{
         } | {
             type: "oauth";
             scopes?: string[] | undefined;
-            audiences?: string[] | undefined;
             client_id?: string | undefined;
-            redirect_uri?: string | undefined;
             client_secret?: string | undefined;
+            redirect_uri?: string | undefined;
             token_url?: string | undefined;
+            audiences?: string[] | undefined;
             authorization_url?: string | undefined;
             issuer?: string | undefined;
             token_param_name?: string | undefined;
@@ -160,6 +160,7 @@ declare const localAgentSchema: z.ZodObject<{
     model?: string | undefined;
     tools?: string[] | undefined;
     temperature?: number | undefined;
+    max_turns?: number | undefined;
     mcp_servers?: Record<string, {
         type?: "http" | "sse" | undefined;
         url?: string | undefined;
@@ -173,11 +174,11 @@ declare const localAgentSchema: z.ZodObject<{
         } | {
             type: "oauth";
             scopes?: string[] | undefined;
-            audiences?: string[] | undefined;
             client_id?: string | undefined;
-            redirect_uri?: string | undefined;
             client_secret?: string | undefined;
+            redirect_uri?: string | undefined;
             token_url?: string | undefined;
+            audiences?: string[] | undefined;
             authorization_url?: string | undefined;
             issuer?: string | undefined;
             token_param_name?: string | undefined;
@@ -192,7 +193,6 @@ declare const localAgentSchema: z.ZodObject<{
         include_tools?: string[] | undefined;
         exclude_tools?: string[] | undefined;
     }> | undefined;
-    max_turns?: number | undefined;
     display_name?: string | undefined;
     timeout_mins?: number | undefined;
 }, {
@@ -202,6 +202,7 @@ declare const localAgentSchema: z.ZodObject<{
     model?: string | undefined;
     tools?: string[] | undefined;
     temperature?: number | undefined;
+    max_turns?: number | undefined;
     mcp_servers?: Record<string, {
         type?: "http" | "sse" | undefined;
         url?: string | undefined;
@@ -215,11 +216,11 @@ declare const localAgentSchema: z.ZodObject<{
         } | {
             type: "oauth";
             scopes?: string[] | undefined;
-            audiences?: string[] | undefined;
             client_id?: string | undefined;
-            redirect_uri?: string | undefined;
             client_secret?: string | undefined;
+            redirect_uri?: string | undefined;
             token_url?: string | undefined;
+            audiences?: string[] | undefined;
             authorization_url?: string | undefined;
             issuer?: string | undefined;
             token_param_name?: string | undefined;
@@ -234,7 +235,6 @@ declare const localAgentSchema: z.ZodObject<{
         include_tools?: string[] | undefined;
         exclude_tools?: string[] | undefined;
     }> | undefined;
-    max_turns?: number | undefined;
     display_name?: string | undefined;
     timeout_mins?: number | undefined;
 }>;
@@ -303,11 +303,11 @@ declare const remoteAgentSchema: z.ZodUnion<[z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         type: "oauth";
         scopes?: string[] | undefined;
-        audiences?: string[] | undefined;
         client_id?: string | undefined;
-        redirect_uri?: string | undefined;
         client_secret?: string | undefined;
+        redirect_uri?: string | undefined;
         token_url?: string | undefined;
+        audiences?: string[] | undefined;
         authorization_url?: string | undefined;
         issuer?: string | undefined;
         token_param_name?: string | undefined;
@@ -315,11 +315,11 @@ declare const remoteAgentSchema: z.ZodUnion<[z.ZodObject<{
     }, {
         type: "oauth";
         scopes?: string[] | undefined;
-        audiences?: string[] | undefined;
         client_id?: string | undefined;
-        redirect_uri?: string | undefined;
         client_secret?: string | undefined;
+        redirect_uri?: string | undefined;
         token_url?: string | undefined;
+        audiences?: string[] | undefined;
         authorization_url?: string | undefined;
         issuer?: string | undefined;
         token_param_name?: string | undefined;
@@ -341,11 +341,11 @@ declare const remoteAgentSchema: z.ZodUnion<[z.ZodObject<{
     } | {
         type: "oauth";
         scopes?: string[] | undefined;
-        audiences?: string[] | undefined;
         client_id?: string | undefined;
-        redirect_uri?: string | undefined;
         client_secret?: string | undefined;
+        redirect_uri?: string | undefined;
         token_url?: string | undefined;
+        audiences?: string[] | undefined;
         authorization_url?: string | undefined;
         issuer?: string | undefined;
         token_param_name?: string | undefined;
@@ -367,11 +367,11 @@ declare const remoteAgentSchema: z.ZodUnion<[z.ZodObject<{
     } | {
         type: "oauth";
         scopes?: string[] | undefined;
-        audiences?: string[] | undefined;
         client_id?: string | undefined;
-        redirect_uri?: string | undefined;
         client_secret?: string | undefined;
+        redirect_uri?: string | undefined;
         token_url?: string | undefined;
+        audiences?: string[] | undefined;
         authorization_url?: string | undefined;
         issuer?: string | undefined;
         token_param_name?: string | undefined;
@@ -401,11 +401,11 @@ declare const remoteAgentSchema: z.ZodUnion<[z.ZodObject<{
     } | {
         type: "oauth";
         scopes?: string[] | undefined;
-        audiences?: string[] | undefined;
         client_id?: string | undefined;
-        redirect_uri?: string | undefined;
         client_secret?: string | undefined;
+        redirect_uri?: string | undefined;
         token_url?: string | undefined;
+        audiences?: string[] | undefined;
         authorization_url?: string | undefined;
         issuer?: string | undefined;
         token_param_name?: string | undefined;
@@ -435,11 +435,11 @@ declare const remoteAgentSchema: z.ZodUnion<[z.ZodObject<{
     } | {
         type: "oauth";
         scopes?: string[] | undefined;
-        audiences?: string[] | undefined;
         client_id?: string | undefined;
-        redirect_uri?: string | undefined;
         client_secret?: string | undefined;
+        redirect_uri?: string | undefined;
         token_url?: string | undefined;
+        audiences?: string[] | undefined;
         authorization_url?: string | undefined;
         issuer?: string | undefined;
         token_param_name?: string | undefined;
@@ -510,11 +510,11 @@ declare const remoteAgentSchema: z.ZodUnion<[z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         type: "oauth";
         scopes?: string[] | undefined;
-        audiences?: string[] | undefined;
         client_id?: string | undefined;
-        redirect_uri?: string | undefined;
         client_secret?: string | undefined;
+        redirect_uri?: string | undefined;
         token_url?: string | undefined;
+        audiences?: string[] | undefined;
         authorization_url?: string | undefined;
         issuer?: string | undefined;
         token_param_name?: string | undefined;
@@ -522,11 +522,11 @@ declare const remoteAgentSchema: z.ZodUnion<[z.ZodObject<{
     }, {
         type: "oauth";
         scopes?: string[] | undefined;
-        audiences?: string[] | undefined;
         client_id?: string | undefined;
-        redirect_uri?: string | undefined;
         client_secret?: string | undefined;
+        redirect_uri?: string | undefined;
         token_url?: string | undefined;
+        audiences?: string[] | undefined;
         authorization_url?: string | undefined;
         issuer?: string | undefined;
         token_param_name?: string | undefined;
@@ -548,11 +548,11 @@ declare const remoteAgentSchema: z.ZodUnion<[z.ZodObject<{
     } | {
         type: "oauth";
         scopes?: string[] | undefined;
-        audiences?: string[] | undefined;
         client_id?: string | undefined;
-        redirect_uri?: string | undefined;
         client_secret?: string | undefined;
+        redirect_uri?: string | undefined;
         token_url?: string | undefined;
+        audiences?: string[] | undefined;
         authorization_url?: string | undefined;
         issuer?: string | undefined;
         token_param_name?: string | undefined;
@@ -574,11 +574,11 @@ declare const remoteAgentSchema: z.ZodUnion<[z.ZodObject<{
     } | {
         type: "oauth";
         scopes?: string[] | undefined;
-        audiences?: string[] | undefined;
         client_id?: string | undefined;
-        redirect_uri?: string | undefined;
         client_secret?: string | undefined;
+        redirect_uri?: string | undefined;
         token_url?: string | undefined;
+        audiences?: string[] | undefined;
         authorization_url?: string | undefined;
         issuer?: string | undefined;
         token_param_name?: string | undefined;
@@ -608,11 +608,11 @@ declare const remoteAgentSchema: z.ZodUnion<[z.ZodObject<{
     } | {
         type: "oauth";
         scopes?: string[] | undefined;
-        audiences?: string[] | undefined;
         client_id?: string | undefined;
-        redirect_uri?: string | undefined;
         client_secret?: string | undefined;
+        redirect_uri?: string | undefined;
         token_url?: string | undefined;
+        audiences?: string[] | undefined;
         authorization_url?: string | undefined;
         issuer?: string | undefined;
         token_param_name?: string | undefined;
@@ -642,11 +642,11 @@ declare const remoteAgentSchema: z.ZodUnion<[z.ZodObject<{
     } | {
         type: "oauth";
         scopes?: string[] | undefined;
-        audiences?: string[] | undefined;
         client_id?: string | undefined;
-        redirect_uri?: string | undefined;
         client_secret?: string | undefined;
+        redirect_uri?: string | undefined;
         token_url?: string | undefined;
+        audiences?: string[] | undefined;
         authorization_url?: string | undefined;
         issuer?: string | undefined;
         token_param_name?: string | undefined;

package/dist/src/availability/testUtils.js

@@ -13,7 +13,7 @@ export function createAvailabilityServiceMock(selection = { selectedModel: null,
         markHealthy: vi.fn(),
         markRetryOncePerTurn: vi.fn(),
         consumeStickyAttempt: vi.fn(),
-        snapshot: vi.fn(),
+        snapshot: vi.fn().mockReturnValue({ available: true }),
         resetTurn: vi.fn(),
         selectFirstAvailable: vi.fn().mockReturnValue(selection),
     };

package/dist/src/availability/testUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"testUtils.js","sourceRoot":"","sources":["../../../src/availability/testUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAM5B;;GAEG;AACH,MAAM,UAAU,6BAA6B,CAC3C,YAAkC,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;IAEtE,MAAM,OAAO,GAAG;QACd,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE;QACrB,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;QACpB,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE;QAC7B,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE;QAC7B,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE;QACjB,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;QAClB,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;KACzD,CAAC;IAEF,uEAAuE;IACvE,OAAO,OAA8C,CAAC;AACxD,CAAC"}
+{"version":3,"file":"testUtils.js","sourceRoot":"","sources":["../../../src/availability/testUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAM5B;;GAEG;AACH,MAAM,UAAU,6BAA6B,CAC3C,YAAkC,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;IAEtE,MAAM,OAAO,GAAG;QACd,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE;QACrB,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;QACpB,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE;QAC7B,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE;QAC7B,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;QACtD,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;QAClB,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;KACzD,CAAC;IAEF,uEAAuE;IACvE,OAAO,OAA8C,CAAC;AACxD,CAAC"}

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

@@ -641,6 +641,7 @@ export declare class Config implements McpContext, AgentLoopContext {
     private readonly folderTrust;
     private ideMode;
     private _activeModel;
+    private fallbackOverrides;
     private readonly maxSessionTurns;
     private readonly listSessions;
     private readonly deleteSession;
@@ -818,7 +819,8 @@ export declare class Config implements McpContext, AgentLoopContext {
     getModel(): string;
     getDisableLoopDetection(): boolean;
     setModel(newModel: string, isTemporary?: boolean): void;
-    activateFallbackMode(model: string): void;
+    activateFallbackMode(model: string, failedModel?: string): void;
+    getFallbackOverride(model: string): string | undefined;
     getActiveModel(): string;
     setActiveModel(model: string): void;
     setFallbackModelHandler(handler: FallbackModelHandler): void;

package/dist/src/config/config.js

@@ -80,6 +80,7 @@ import { SkillManager } from '../skills/skillManager.js';
 import { startupProfiler } from '../telemetry/startupProfiler.js';
 import { fetchAdminControls } from '../code_assist/admin/admin_controls.js';
 import { isSubpath, resolveToRealPath } from '../utils/paths.js';
+import { validatePath } from '../utils/path-validator.js';
 import { InjectionService } from './injectionService.js';
 import { ExecutionLifecycleService } from '../services/executionLifecycleService.js';
 import { WORKSPACE_POLICY_TIER } from '../policy/config.js';
@@ -277,6 +278,7 @@ export class Config {
     folderTrust;
     ideMode;
     _activeModel;
+    fallbackOverrides = new Map();
     maxSessionTurns;
     listSessions;
     deleteSession;
@@ -874,6 +876,8 @@ export class Config {
     async refreshAuth(authMethod, apiKey, baseUrl, customHeaders) {
         // Reset availability service when switching auth
         this.modelAvailabilityService.reset();
+        this.fallbackOverrides.clear();
+        this.modelConfigService.clearRuntimeOverrides();
         // Vertex and Genai have incompatible encryption and sending history with
         // thoughtSignature from Genai to Vertex will fail, we need to strip them
         if (this.contentGeneratorConfig?.authType === AuthType.USE_GEMINI &&
@@ -1066,6 +1070,8 @@ export class Config {
         this._sessionId = sessionId;
         this.storage.setSessionId(sessionId);
         this.trackerService = undefined;
+        this.fallbackOverrides.clear();
+        this.modelConfigService.clearRuntimeOverrides();
         this.approvedPlanPath = undefined;
         this.topicState.reset();
         this.skillManager.reset();
@@ -1143,13 +1149,37 @@ export class Config {
         }
         this.modelAvailabilityService.reset();
     }
-    activateFallbackMode(model) {
-        this.setModel(model, true);
+    activateFallbackMode(model, failedModel) {
+        if (this.getActiveModel() !== model) {
+            this.setModel(model, true);
+        }
+        if (failedModel) {
+            // Chained fallback mitigation: If we already have overrides that point to the model
+            // that just failed, we need to update them to point to the new fallback model.
+            // e.g. A -> B, then B fails and we fallback to C. We must update A to point to C.
+            for (const [source, target] of this.fallbackOverrides.entries()) {
+                if (target === failedModel) {
+                    this.fallbackOverrides.set(source, model);
+                    this.modelConfigService.registerRuntimeModelOverride({
+                        match: { model: source },
+                        modelConfig: { model },
+                    });
+                }
+            }
+            this.fallbackOverrides.set(failedModel, model);
+            this.modelConfigService.registerRuntimeModelOverride({
+                match: { model: failedModel },
+                modelConfig: { model },
+            });
+        }
         const authType = this.getContentGeneratorConfig()?.authType;
         if (authType) {
             logFlashFallback(this, new FlashFallbackEvent(authType));
         }
     }
+    getFallbackOverride(model) {
+        return this.fallbackOverrides.get(model);
+    }
     getActiveModel() {
         return this._activeModel ?? this.model;
     }
@@ -2168,6 +2198,10 @@ export class Config {
      * @returns An error message string if the path is disallowed, null otherwise.
      */
     validatePathAccess(absolutePath, checkType = 'write') {
+        const pathValidation = validatePath(absolutePath);
+        if (!pathValidation.isValid) {
+            return `Invalid path: ${pathValidation.error}`;
+        }
         if (checkType === 'write' && hasScopedAutoMemoryExtractionWriteAccess()) {
             const resolvedPath = resolveToRealPath(absolutePath);
             if (this.isScopedAutoMemoryExtractionWritePathAllowed(absolutePath, resolvedPath)) {