@google/gemini-cli-core 0.35.0-preview.2 → 0.36.0-nightly.20260321.fc03891a1

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

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { z } from 'zod';
+import { AuthProviderType } from '../config/config.js';
 export interface ClientMetadata {
     ideType?: ClientMetadataIdeType;
     ideVersion?: string;
@@ -273,6 +274,67 @@ export interface FetchAdminControlsRequest {
     project: string;
 }
 export type FetchAdminControlsResponse = z.infer<typeof FetchAdminControlsResponseSchema>;
+export declare const RequiredMcpServerConfigSchema: z.ZodObject<{
+    url: z.ZodString;
+    type: z.ZodEnum<["sse", "http"]>;
+    authProviderType: z.ZodOptional<z.ZodNativeEnum<typeof AuthProviderType>>;
+    oauth: z.ZodOptional<z.ZodObject<{
+        scopes: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        clientId: z.ZodOptional<z.ZodString>;
+        clientSecret: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        scopes?: string[] | undefined;
+        clientId?: string | undefined;
+        clientSecret?: string | undefined;
+    }, {
+        scopes?: string[] | undefined;
+        clientId?: string | undefined;
+        clientSecret?: string | undefined;
+    }>>;
+    targetAudience: z.ZodOptional<z.ZodString>;
+    targetServiceAccount: z.ZodOptional<z.ZodString>;
+    headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    trust: z.ZodOptional<z.ZodBoolean>;
+    timeout: z.ZodOptional<z.ZodNumber>;
+    description: z.ZodOptional<z.ZodString>;
+    includeTools: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    excludeTools: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+}, "strip", z.ZodTypeAny, {
+    type: "sse" | "http";
+    url: string;
+    headers?: Record<string, string> | undefined;
+    description?: string | undefined;
+    timeout?: number | undefined;
+    trust?: boolean | undefined;
+    includeTools?: string[] | undefined;
+    excludeTools?: string[] | undefined;
+    authProviderType?: AuthProviderType | undefined;
+    oauth?: {
+        scopes?: string[] | undefined;
+        clientId?: string | undefined;
+        clientSecret?: string | undefined;
+    } | undefined;
+    targetAudience?: string | undefined;
+    targetServiceAccount?: string | undefined;
+}, {
+    type: "sse" | "http";
+    url: string;
+    headers?: Record<string, string> | undefined;
+    description?: string | undefined;
+    timeout?: number | undefined;
+    trust?: boolean | undefined;
+    includeTools?: string[] | undefined;
+    excludeTools?: string[] | undefined;
+    authProviderType?: AuthProviderType | undefined;
+    oauth?: {
+        scopes?: string[] | undefined;
+        clientId?: string | undefined;
+        clientSecret?: string | undefined;
+    } | undefined;
+    targetAudience?: string | undefined;
+    targetServiceAccount?: string | undefined;
+}>;
+export type RequiredMcpServerConfig = z.infer<typeof RequiredMcpServerConfigSchema>;
 export declare const McpConfigDefinitionSchema: z.ZodObject<{
     mcpServers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
         url: z.ZodOptional<z.ZodString>;
@@ -293,6 +355,66 @@ export declare const McpConfigDefinitionSchema: z.ZodObject<{
         includeTools?: string[] | undefined;
         excludeTools?: string[] | undefined;
     }>>>;
+    requiredMcpServers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+        url: z.ZodString;
+        type: z.ZodEnum<["sse", "http"]>;
+        authProviderType: z.ZodOptional<z.ZodNativeEnum<typeof AuthProviderType>>;
+        oauth: z.ZodOptional<z.ZodObject<{
+            scopes: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            clientId: z.ZodOptional<z.ZodString>;
+            clientSecret: z.ZodOptional<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            scopes?: string[] | undefined;
+            clientId?: string | undefined;
+            clientSecret?: string | undefined;
+        }, {
+            scopes?: string[] | undefined;
+            clientId?: string | undefined;
+            clientSecret?: string | undefined;
+        }>>;
+        targetAudience: z.ZodOptional<z.ZodString>;
+        targetServiceAccount: z.ZodOptional<z.ZodString>;
+        headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        trust: z.ZodOptional<z.ZodBoolean>;
+        timeout: z.ZodOptional<z.ZodNumber>;
+        description: z.ZodOptional<z.ZodString>;
+        includeTools: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        excludeTools: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    }, "strip", z.ZodTypeAny, {
+        type: "sse" | "http";
+        url: string;
+        headers?: Record<string, string> | undefined;
+        description?: string | undefined;
+        timeout?: number | undefined;
+        trust?: boolean | undefined;
+        includeTools?: string[] | undefined;
+        excludeTools?: string[] | undefined;
+        authProviderType?: AuthProviderType | undefined;
+        oauth?: {
+            scopes?: string[] | undefined;
+            clientId?: string | undefined;
+            clientSecret?: string | undefined;
+        } | undefined;
+        targetAudience?: string | undefined;
+        targetServiceAccount?: string | undefined;
+    }, {
+        type: "sse" | "http";
+        url: string;
+        headers?: Record<string, string> | undefined;
+        description?: string | undefined;
+        timeout?: number | undefined;
+        trust?: boolean | undefined;
+        includeTools?: string[] | undefined;
+        excludeTools?: string[] | undefined;
+        authProviderType?: AuthProviderType | undefined;
+        oauth?: {
+            scopes?: string[] | undefined;
+            clientId?: string | undefined;
+            clientSecret?: string | undefined;
+        } | undefined;
+        targetAudience?: string | undefined;
+        targetServiceAccount?: string | undefined;
+    }>>>;
 }, "strip", z.ZodTypeAny, {
     mcpServers?: Record<string, {
         type?: "sse" | "http" | undefined;
@@ -301,6 +423,24 @@ export declare const McpConfigDefinitionSchema: z.ZodObject<{
         includeTools?: string[] | undefined;
         excludeTools?: string[] | undefined;
     }> | undefined;
+    requiredMcpServers?: Record<string, {
+        type: "sse" | "http";
+        url: string;
+        headers?: Record<string, string> | undefined;
+        description?: string | undefined;
+        timeout?: number | undefined;
+        trust?: boolean | undefined;
+        includeTools?: string[] | undefined;
+        excludeTools?: string[] | undefined;
+        authProviderType?: AuthProviderType | undefined;
+        oauth?: {
+            scopes?: string[] | undefined;
+            clientId?: string | undefined;
+            clientSecret?: string | undefined;
+        } | undefined;
+        targetAudience?: string | undefined;
+        targetServiceAccount?: string | undefined;
+    }> | undefined;
 }, {
     mcpServers?: Record<string, {
         type?: "sse" | "http" | undefined;
@@ -309,6 +449,24 @@ export declare const McpConfigDefinitionSchema: z.ZodObject<{
         includeTools?: string[] | undefined;
         excludeTools?: string[] | undefined;
     }> | undefined;
+    requiredMcpServers?: Record<string, {
+        type: "sse" | "http";
+        url: string;
+        headers?: Record<string, string> | undefined;
+        description?: string | undefined;
+        timeout?: number | undefined;
+        trust?: boolean | undefined;
+        includeTools?: string[] | undefined;
+        excludeTools?: string[] | undefined;
+        authProviderType?: AuthProviderType | undefined;
+        oauth?: {
+            scopes?: string[] | undefined;
+            clientId?: string | undefined;
+            clientSecret?: string | undefined;
+        } | undefined;
+        targetAudience?: string | undefined;
+        targetServiceAccount?: string | undefined;
+    }> | undefined;
 }>;
 export type McpConfigDefinition = z.infer<typeof McpConfigDefinitionSchema>;
 export declare const AdminControlsSettingsSchema: z.ZodObject<{
@@ -335,6 +493,66 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 includeTools?: string[] | undefined;
                 excludeTools?: string[] | undefined;
             }>>>;
+            requiredMcpServers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+                url: z.ZodString;
+                type: z.ZodEnum<["sse", "http"]>;
+                authProviderType: z.ZodOptional<z.ZodNativeEnum<typeof AuthProviderType>>;
+                oauth: z.ZodOptional<z.ZodObject<{
+                    scopes: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+                    clientId: z.ZodOptional<z.ZodString>;
+                    clientSecret: z.ZodOptional<z.ZodString>;
+                }, "strip", z.ZodTypeAny, {
+                    scopes?: string[] | undefined;
+                    clientId?: string | undefined;
+                    clientSecret?: string | undefined;
+                }, {
+                    scopes?: string[] | undefined;
+                    clientId?: string | undefined;
+                    clientSecret?: string | undefined;
+                }>>;
+                targetAudience: z.ZodOptional<z.ZodString>;
+                targetServiceAccount: z.ZodOptional<z.ZodString>;
+                headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+                trust: z.ZodOptional<z.ZodBoolean>;
+                timeout: z.ZodOptional<z.ZodNumber>;
+                description: z.ZodOptional<z.ZodString>;
+                includeTools: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+                excludeTools: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            }, "strip", z.ZodTypeAny, {
+                type: "sse" | "http";
+                url: string;
+                headers?: Record<string, string> | undefined;
+                description?: string | undefined;
+                timeout?: number | undefined;
+                trust?: boolean | undefined;
+                includeTools?: string[] | undefined;
+                excludeTools?: string[] | undefined;
+                authProviderType?: AuthProviderType | undefined;
+                oauth?: {
+                    scopes?: string[] | undefined;
+                    clientId?: string | undefined;
+                    clientSecret?: string | undefined;
+                } | undefined;
+                targetAudience?: string | undefined;
+                targetServiceAccount?: string | undefined;
+            }, {
+                type: "sse" | "http";
+                url: string;
+                headers?: Record<string, string> | undefined;
+                description?: string | undefined;
+                timeout?: number | undefined;
+                trust?: boolean | undefined;
+                includeTools?: string[] | undefined;
+                excludeTools?: string[] | undefined;
+                authProviderType?: AuthProviderType | undefined;
+                oauth?: {
+                    scopes?: string[] | undefined;
+                    clientId?: string | undefined;
+                    clientSecret?: string | undefined;
+                } | undefined;
+                targetAudience?: string | undefined;
+                targetServiceAccount?: string | undefined;
+            }>>>;
         }, "strip", z.ZodTypeAny, {
             mcpServers?: Record<string, {
                 type?: "sse" | "http" | undefined;
@@ -343,6 +561,24 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 includeTools?: string[] | undefined;
                 excludeTools?: string[] | undefined;
             }> | undefined;
+            requiredMcpServers?: Record<string, {
+                type: "sse" | "http";
+                url: string;
+                headers?: Record<string, string> | undefined;
+                description?: string | undefined;
+                timeout?: number | undefined;
+                trust?: boolean | undefined;
+                includeTools?: string[] | undefined;
+                excludeTools?: string[] | undefined;
+                authProviderType?: AuthProviderType | undefined;
+                oauth?: {
+                    scopes?: string[] | undefined;
+                    clientId?: string | undefined;
+                    clientSecret?: string | undefined;
+                } | undefined;
+                targetAudience?: string | undefined;
+                targetServiceAccount?: string | undefined;
+            }> | undefined;
         }, {
             mcpServers?: Record<string, {
                 type?: "sse" | "http" | undefined;
@@ -351,7 +587,85 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 includeTools?: string[] | undefined;
                 excludeTools?: string[] | undefined;
             }> | undefined;
+            requiredMcpServers?: Record<string, {
+                type: "sse" | "http";
+                url: string;
+                headers?: Record<string, string> | undefined;
+                description?: string | undefined;
+                timeout?: number | undefined;
+                trust?: boolean | undefined;
+                includeTools?: string[] | undefined;
+                excludeTools?: string[] | undefined;
+                authProviderType?: AuthProviderType | undefined;
+                oauth?: {
+                    scopes?: string[] | undefined;
+                    clientId?: string | undefined;
+                    clientSecret?: string | undefined;
+                } | undefined;
+                targetAudience?: string | undefined;
+                targetServiceAccount?: string | undefined;
+            }> | undefined;
         }>>;
+        requiredMcpConfig: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+            url: z.ZodString;
+            type: z.ZodEnum<["sse", "http"]>;
+            authProviderType: z.ZodOptional<z.ZodNativeEnum<typeof AuthProviderType>>;
+            oauth: z.ZodOptional<z.ZodObject<{
+                scopes: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+                clientId: z.ZodOptional<z.ZodString>;
+                clientSecret: z.ZodOptional<z.ZodString>;
+            }, "strip", z.ZodTypeAny, {
+                scopes?: string[] | undefined;
+                clientId?: string | undefined;
+                clientSecret?: string | undefined;
+            }, {
+                scopes?: string[] | undefined;
+                clientId?: string | undefined;
+                clientSecret?: string | undefined;
+            }>>;
+            targetAudience: z.ZodOptional<z.ZodString>;
+            targetServiceAccount: z.ZodOptional<z.ZodString>;
+            headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+            trust: z.ZodOptional<z.ZodBoolean>;
+            timeout: z.ZodOptional<z.ZodNumber>;
+            description: z.ZodOptional<z.ZodString>;
+            includeTools: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            excludeTools: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        }, "strip", z.ZodTypeAny, {
+            type: "sse" | "http";
+            url: string;
+            headers?: Record<string, string> | undefined;
+            description?: string | undefined;
+            timeout?: number | undefined;
+            trust?: boolean | undefined;
+            includeTools?: string[] | undefined;
+            excludeTools?: string[] | undefined;
+            authProviderType?: AuthProviderType | undefined;
+            oauth?: {
+                scopes?: string[] | undefined;
+                clientId?: string | undefined;
+                clientSecret?: string | undefined;
+            } | undefined;
+            targetAudience?: string | undefined;
+            targetServiceAccount?: string | undefined;
+        }, {
+            type: "sse" | "http";
+            url: string;
+            headers?: Record<string, string> | undefined;
+            description?: string | undefined;
+            timeout?: number | undefined;
+            trust?: boolean | undefined;
+            includeTools?: string[] | undefined;
+            excludeTools?: string[] | undefined;
+            authProviderType?: AuthProviderType | undefined;
+            oauth?: {
+                scopes?: string[] | undefined;
+                clientId?: string | undefined;
+                clientSecret?: string | undefined;
+            } | undefined;
+            targetAudience?: string | undefined;
+            targetServiceAccount?: string | undefined;
+        }>>>;
     }, "strip", z.ZodTypeAny, {
         mcpEnabled?: boolean | undefined;
         mcpConfig?: {
@@ -362,7 +676,43 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 includeTools?: string[] | undefined;
                 excludeTools?: string[] | undefined;
             }> | undefined;
+            requiredMcpServers?: Record<string, {
+                type: "sse" | "http";
+                url: string;
+                headers?: Record<string, string> | undefined;
+                description?: string | undefined;
+                timeout?: number | undefined;
+                trust?: boolean | undefined;
+                includeTools?: string[] | undefined;
+                excludeTools?: string[] | undefined;
+                authProviderType?: AuthProviderType | undefined;
+                oauth?: {
+                    scopes?: string[] | undefined;
+                    clientId?: string | undefined;
+                    clientSecret?: string | undefined;
+                } | undefined;
+                targetAudience?: string | undefined;
+                targetServiceAccount?: string | undefined;
+            }> | undefined;
         } | undefined;
+        requiredMcpConfig?: Record<string, {
+            type: "sse" | "http";
+            url: string;
+            headers?: Record<string, string> | undefined;
+            description?: string | undefined;
+            timeout?: number | undefined;
+            trust?: boolean | undefined;
+            includeTools?: string[] | undefined;
+            excludeTools?: string[] | undefined;
+            authProviderType?: AuthProviderType | undefined;
+            oauth?: {
+                scopes?: string[] | undefined;
+                clientId?: string | undefined;
+                clientSecret?: string | undefined;
+            } | undefined;
+            targetAudience?: string | undefined;
+            targetServiceAccount?: string | undefined;
+        }> | undefined;
     }, {
         mcpEnabled?: boolean | undefined;
         mcpConfig?: {
@@ -373,7 +723,43 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 includeTools?: string[] | undefined;
                 excludeTools?: string[] | undefined;
             }> | undefined;
+            requiredMcpServers?: Record<string, {
+                type: "sse" | "http";
+                url: string;
+                headers?: Record<string, string> | undefined;
+                description?: string | undefined;
+                timeout?: number | undefined;
+                trust?: boolean | undefined;
+                includeTools?: string[] | undefined;
+                excludeTools?: string[] | undefined;
+                authProviderType?: AuthProviderType | undefined;
+                oauth?: {
+                    scopes?: string[] | undefined;
+                    clientId?: string | undefined;
+                    clientSecret?: string | undefined;
+                } | undefined;
+                targetAudience?: string | undefined;
+                targetServiceAccount?: string | undefined;
+            }> | undefined;
         } | undefined;
+        requiredMcpConfig?: Record<string, {
+            type: "sse" | "http";
+            url: string;
+            headers?: Record<string, string> | undefined;
+            description?: string | undefined;
+            timeout?: number | undefined;
+            trust?: boolean | undefined;
+            includeTools?: string[] | undefined;
+            excludeTools?: string[] | undefined;
+            authProviderType?: AuthProviderType | undefined;
+            oauth?: {
+                scopes?: string[] | undefined;
+                clientId?: string | undefined;
+                clientSecret?: string | undefined;
+            } | undefined;
+            targetAudience?: string | undefined;
+            targetServiceAccount?: string | undefined;
+        }> | undefined;
     }>>;
     cliFeatureSetting: z.ZodOptional<z.ZodObject<{
         extensionsSetting: z.ZodOptional<z.ZodObject<{
@@ -407,7 +793,43 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 includeTools?: string[] | undefined;
                 excludeTools?: string[] | undefined;
             }> | undefined;
+            requiredMcpServers?: Record<string, {
+                type: "sse" | "http";
+                url: string;
+                headers?: Record<string, string> | undefined;
+                description?: string | undefined;
+                timeout?: number | undefined;
+                trust?: boolean | undefined;
+                includeTools?: string[] | undefined;
+                excludeTools?: string[] | undefined;
+                authProviderType?: AuthProviderType | undefined;
+                oauth?: {
+                    scopes?: string[] | undefined;
+                    clientId?: string | undefined;
+                    clientSecret?: string | undefined;
+                } | undefined;
+                targetAudience?: string | undefined;
+                targetServiceAccount?: string | undefined;
+            }> | undefined;
         } | undefined;
+        requiredMcpConfig?: Record<string, {
+            type: "sse" | "http";
+            url: string;
+            headers?: Record<string, string> | undefined;
+            description?: string | undefined;
+            timeout?: number | undefined;
+            trust?: boolean | undefined;
+            includeTools?: string[] | undefined;
+            excludeTools?: string[] | undefined;
+            authProviderType?: AuthProviderType | undefined;
+            oauth?: {
+                scopes?: string[] | undefined;
+                clientId?: string | undefined;
+                clientSecret?: string | undefined;
+            } | undefined;
+            targetAudience?: string | undefined;
+            targetServiceAccount?: string | undefined;
+        }> | undefined;
     } | undefined;
     cliFeatureSetting?: {
         extensionsSetting?: {
@@ -427,7 +849,43 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 includeTools?: string[] | undefined;
                 excludeTools?: string[] | undefined;
             }> | undefined;
+            requiredMcpServers?: Record<string, {
+                type: "sse" | "http";
+                url: string;
+                headers?: Record<string, string> | undefined;
+                description?: string | undefined;
+                timeout?: number | undefined;
+                trust?: boolean | undefined;
+                includeTools?: string[] | undefined;
+                excludeTools?: string[] | undefined;
+                authProviderType?: AuthProviderType | undefined;
+                oauth?: {
+                    scopes?: string[] | undefined;
+                    clientId?: string | undefined;
+                    clientSecret?: string | undefined;
+                } | undefined;
+                targetAudience?: string | undefined;
+                targetServiceAccount?: string | undefined;
+            }> | undefined;
         } | undefined;
+        requiredMcpConfig?: Record<string, {
+            type: "sse" | "http";
+            url: string;
+            headers?: Record<string, string> | undefined;
+            description?: string | undefined;
+            timeout?: number | undefined;
+            trust?: boolean | undefined;
+            includeTools?: string[] | undefined;
+            excludeTools?: string[] | undefined;
+            authProviderType?: AuthProviderType | undefined;
+            oauth?: {
+                scopes?: string[] | undefined;
+                clientId?: string | undefined;
+                clientSecret?: string | undefined;
+            } | undefined;
+            targetAudience?: string | undefined;
+            targetServiceAccount?: string | undefined;
+        }> | undefined;
     } | undefined;
     cliFeatureSetting?: {
         extensionsSetting?: {

package/dist/src/code_assist/types.js

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { z } from 'zod';
+import { AuthProviderType } from '../config/config.js';
 /**
  * List of predefined reason codes when a tier is blocked from a specific tier.
  * https://source.corp.google.com/piper///depot/google3/google/internal/cloud/code/v1internal/cloudcode.proto;l=378
@@ -88,8 +89,32 @@ const McpServerConfigSchema = z.object({
     includeTools: z.array(z.string()).optional(),
     excludeTools: z.array(z.string()).optional(),
 });
+const RequiredMcpServerOAuthSchema = z.object({
+    scopes: z.array(z.string()).optional(),
+    clientId: z.string().optional(),
+    clientSecret: z.string().optional(),
+});
+export const RequiredMcpServerConfigSchema = z.object({
+    // Connection (required for forced servers)
+    url: z.string(),
+    type: z.enum(['sse', 'http']),
+    // Auth
+    authProviderType: z.nativeEnum(AuthProviderType).optional(),
+    oauth: RequiredMcpServerOAuthSchema.optional(),
+    targetAudience: z.string().optional(),
+    targetServiceAccount: z.string().optional(),
+    headers: z.record(z.string()).optional(),
+    // Common
+    trust: z.boolean().optional(),
+    timeout: z.number().optional(),
+    description: z.string().optional(),
+    // Tool filtering
+    includeTools: z.array(z.string()).optional(),
+    excludeTools: z.array(z.string()).optional(),
+});
 export const McpConfigDefinitionSchema = z.object({
     mcpServers: z.record(McpServerConfigSchema).optional(),
+    requiredMcpServers: z.record(RequiredMcpServerConfigSchema).optional(),
 });
 const McpSettingSchema = z.object({
     mcpEnabled: z.boolean().optional(),
@@ -102,6 +127,7 @@ export const AdminControlsSettingsSchema = z.object({
         .object({
         mcpEnabled: z.boolean().optional(),
         mcpConfig: McpConfigDefinitionSchema.optional(),
+        requiredMcpConfig: z.record(RequiredMcpServerConfigSchema).optional(),
     })
         .optional(),
     cliFeatureSetting: CliFeatureSettingSchema.optional(),

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/code_assist/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAsHxB;;;GAGG;AACH,MAAM,CAAN,IAAY,wBAYX;AAZD,WAAY,wBAAwB;IAClC,uBAAuB;IACvB,uDAA2B,CAAA;IAC3B,qEAAyC,CAAA;IACzC,iEAAqC,CAAA;IACrC,6DAAiC,CAAA;IACjC,qEAAyC,CAAA;IACzC,+CAAmB,CAAA;IACnB,iEAAqC,CAAA;IACrC,yEAA6C,CAAA;IAC7C,uEAA2C,CAAA;IAC3C,qBAAqB;AACvB,CAAC,EAZW,wBAAwB,KAAxB,wBAAwB,QAYnC;AACD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,IAAI,EAAE,WAAW;IACjB,MAAM,EAAE,aAAa;IACrB,QAAQ,EAAE,eAAe;CACjB,CAAC;AA4CX;;;;GAIG;AACH,MAAM,CAAN,IAAY,qBAKX;AALD,WAAY,qBAAqB;IAC/B,4CAAmB,CAAA;IACnB,0CAAiB,CAAA;IACjB,4CAAmB,CAAA;IACnB,wCAAe,CAAA;AACjB,CAAC,EALW,qBAAqB,KAArB,qBAAqB,QAKhC;AA2ED,MAAM,CAAN,IAAY,kCAWX;AAXD,WAAY,kCAAkC;IAC5C,iGAAW,CAAA;IACX,mGAAY,CAAA;IACZ,uGAAc,CAAA;IACd,2FAAQ,CAAA;IACR,+FAAU,CAAA;IACV,qHAAqB,CAAA;IACrB,uGAAc,CAAA;IACd,yGAAe,CAAA;IACf,2FAAQ,CAAA;IACR,2GAAgB,CAAA;AAClB,CAAC,EAXW,kCAAkC,KAAlC,kCAAkC,QAW7C;AAED,MAAM,CAAN,IAAY,YAMX;AAND,WAAY,YAAY;IACtB,yFAA6B,CAAA;IAC7B,mFAA0B,CAAA;IAC1B,6FAA+B,CAAA;IAC/B,qFAA2B,CAAA;IAC3B,6EAAuB,CAAA;AACzB,CAAC,EANW,YAAY,KAAZ,YAAY,QAMvB;AAED,MAAM,CAAN,IAAY,gBAKX;AALD,WAAY,gBAAgB;IAC1B,yGAAiC,CAAA;IACjC,qDAAO,CAAA;IACP,6DAAW,CAAA;IACX,yDAAS,CAAA;AACX,CAAC,EALW,gBAAgB,KAAhB,gBAAgB,QAK3B;AAqCD,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,iBAAiB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CAC1C,CAAC,CAAC;AAEH,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,iBAAiB,EAAE,uBAAuB,CAAC,QAAQ,EAAE;IACrD,4BAA4B,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CACrD,CAAC,CAAC;AAEH,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE;IACxC,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC7B,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC5C,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;CAC7C,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,CAAC,MAAM,CAAC;IAChD,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,QAAQ,EAAE;CACvD,CAAC,CAAC;AAIH,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IAChC,UAAU,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAClC,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACrC,CAAC,CAAC;AAEH,yDAAyD;AACzD,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC;IAClD,kBAAkB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC1C,UAAU,EAAE,CAAC;SACV,MAAM,CAAC;QACN,UAAU,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;QAClC,SAAS,EAAE,yBAAyB,CAAC,QAAQ,EAAE;KAChD,CAAC;SACD,QAAQ,EAAE;IACb,iBAAiB,EAAE,uBAAuB,CAAC,QAAQ,EAAE;CACtD,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAAC,CAAC,MAAM,CAAC;IACvD,wDAAwD;IACxD,iBAAiB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACzC,kBAAkB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC1C,UAAU,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IACvC,iBAAiB,EAAE,uBAAuB,CAAC,QAAQ,EAAE;IACrD,uBAAuB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CAChD,CAAC,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/code_assist/types.ts"],"names":[],"mappings":"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"}

package/dist/src/config/agent-loop-context.d.ts

@@ -6,6 +6,8 @@
 import type { GeminiClient } from '../core/client.js';
 import type { MessageBus } from '../confirmation-bus/message-bus.js';
 import type { ToolRegistry } from '../tools/tool-registry.js';
+import type { PromptRegistry } from '../prompts/prompt-registry.js';
+import type { ResourceRegistry } from '../resources/resource-registry.js';
 import type { SandboxManager } from '../services/sandboxManager.js';
 import type { Config } from './config.js';
 /**
@@ -19,6 +21,10 @@ export interface AgentLoopContext {
     readonly promptId: string;
     /** The registry of tools available to the agent in this context. */
     readonly toolRegistry: ToolRegistry;
+    /** The registry of prompts available to the agent in this context. */
+    readonly promptRegistry: PromptRegistry;
+    /** The registry of resources available to the agent in this context. */
+    readonly resourceRegistry: ResourceRegistry;
     /** The bus for user confirmations and messages in this context. */
     readonly messageBus: MessageBus;
     /** The client used to communicate with the LLM in this context. */