@google/gemini-cli-core 0.61.0-nightly.20260914.g9c1b0a610 → 0.61.0-preview.0

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

@@ -568,7 +568,11 @@ export interface ConfigParameters {
     logRagSnippets?: boolean;
 }
 export declare class Config implements McpContext, AgentLoopContext {
-    private _toolRegistry;
+    readonly config: Config;
+    promptId: string;
+    toolRegistry: ToolRegistry;
+    promptRegistry: PromptRegistry;
+    resourceRegistry: ResourceRegistry;
     private mcpClientManager?;
     private readonly a2aClientManager?;
     private allowedMcpServers;
@@ -576,8 +580,6 @@ export declare class Config implements McpContext, AgentLoopContext {
     private allowedEnvironmentVariables;
     private blockedEnvironmentVariables;
     private readonly enableEnvironmentVariableRedaction;
-    private _promptRegistry;
-    private _resourceRegistry;
     private agentRegistry;
     private readonly acknowledgedAgentsService;
     private skillManager;
@@ -621,8 +623,8 @@ export declare class Config implements McpContext, AgentLoopContext {
     private readonly accessibility;
     private readonly telemetrySettings;
     private readonly usageStatisticsEnabled;
-    private _geminiClient;
-    private _sandboxManager;
+    geminiClient: GeminiClient;
+    sandboxManager: SandboxManager;
     private readonly _sandboxPolicyManager;
     private baseLlmClient;
     private localLiteRtLmClient?;
@@ -694,7 +696,7 @@ export declare class Config implements McpContext, AgentLoopContext {
     private readonly eventEmitter?;
     private readonly useWriteTodos;
     private readonly workspacePoliciesDir;
-    private readonly _messageBus;
+    readonly messageBus: MessageBus;
     private readonly policyEngine;
     private policyUpdateConfirmationRequest;
     private readonly outputSettings;
@@ -753,7 +755,6 @@ export declare class Config implements McpContext, AgentLoopContext {
     readonly injectionService: InjectionService;
     private approvedPlanPath;
     constructor(params: ConfigParameters);
-    get config(): Config;
     isInitialized(): boolean;
     /**
      * Dedups initialization requests using a shared promise that is only resolved
@@ -772,36 +773,26 @@ export declare class Config implements McpContext, AgentLoopContext {
      */
     getBaseLlmClient(): BaseLlmClient;
     getLocalLiteRtLmClient(): LocalLiteRtLmClient;
-    get promptId(): string;
-    /**
-     * @deprecated Do not access directly on Config.
-     * Use the injected AgentLoopContext instead.
-     */
-    get toolRegistry(): ToolRegistry;
-    /**
-     * @deprecated Do not access directly on Config.
-     * Use the injected AgentLoopContext instead.
-     */
-    get promptRegistry(): PromptRegistry;
-    /**
-     * @deprecated Do not access directly on Config.
-     * Use the injected AgentLoopContext instead.
-     */
-    get resourceRegistry(): ResourceRegistry;
-    /**
-     * @deprecated Do not access directly on Config.
-     * Use the injected AgentLoopContext instead.
-     */
-    get messageBus(): MessageBus;
-    /**
-     * @deprecated Do not access directly on Config.
-     * Use the injected AgentLoopContext instead.
-     */
-    get geminiClient(): GeminiClient;
+    /** @internal Backing field alias for backwards-compatibility */
+    get _toolRegistry(): ToolRegistry;
+    set _toolRegistry(value: ToolRegistry);
+    /** @internal Backing field alias for backwards-compatibility */
+    get _promptRegistry(): PromptRegistry;
+    set _promptRegistry(registry: PromptRegistry);
+    /** @internal Backing field alias for backwards-compatibility */
+    get _resourceRegistry(): ResourceRegistry;
+    set _resourceRegistry(registry: ResourceRegistry);
+    /** @internal Backing field alias for backwards-compatibility */
+    get _messageBus(): MessageBus;
+    /** @internal Backing field alias for backwards-compatibility */
+    get _geminiClient(): GeminiClient;
+    set _geminiClient(client: GeminiClient);
     private getSandboxForbiddenPaths;
     private refreshSandboxManager;
     get sandboxPolicyManager(): SandboxPolicyManager;
-    get sandboxManager(): SandboxManager;
+    /** @internal Backing field alias for backwards-compatibility */
+    get _sandboxManager(): SandboxManager;
+    set _sandboxManager(manager: SandboxManager);
     getSessionId(): string;
     getWorktreeSettings(): WorktreeSettings | undefined;
     getClientName(): string | undefined;

package/dist/src/config/config.js

@@ -203,7 +203,11 @@ export const ConfigSchema = z.object({
         .optional(),
 });
 export class Config {
-    _toolRegistry;
+    config = this;
+    promptId;
+    toolRegistry;
+    promptRegistry;
+    resourceRegistry;
     mcpClientManager;
     a2aClientManager;
     allowedMcpServers;
@@ -211,8 +215,6 @@ export class Config {
     allowedEnvironmentVariables;
     blockedEnvironmentVariables;
     enableEnvironmentVariableRedaction;
-    _promptRegistry;
-    _resourceRegistry;
     agentRegistry;
     acknowledgedAgentsService;
     skillManager;
@@ -256,8 +258,8 @@ export class Config {
     accessibility;
     telemetrySettings;
     usageStatisticsEnabled;
-    _geminiClient;
-    _sandboxManager;
+    geminiClient;
+    sandboxManager;
     _sandboxPolicyManager;
     baseLlmClient;
     localLiteRtLmClient;
@@ -340,7 +342,7 @@ export class Config {
     eventEmitter;
     useWriteTodos;
     workspacePoliciesDir;
-    _messageBus;
+    messageBus;
     policyEngine;
     policyUpdateConfirmationRequest;
     outputSettings;
@@ -400,6 +402,7 @@ export class Config {
     approvedPlanPath;
     constructor(params) {
         this._sessionId = params.sessionId;
+        this.promptId = params.sessionId;
         this.clientName = params.clientName;
         this._clientVersion = params.clientVersion ?? 'unknown';
         this.approvedPlanPath = undefined;
@@ -435,7 +438,7 @@ export class Config {
         const initialApprovalMode = params.approvalMode ??
             params.policyEngineConfig?.approvalMode ??
             'default';
-        this._sandboxManager = createSandboxManager(this.sandbox, {
+        this.sandboxManager = createSandboxManager(this.sandbox, {
             workspace: this.targetDir,
             forbiddenPaths: this.getSandboxForbiddenPaths.bind(this),
             includeDirectories: [
@@ -444,9 +447,9 @@ export class Config {
             ],
             policyManager: this._sandboxPolicyManager,
         }, initialApprovalMode);
-        if (!(this._sandboxManager instanceof NoopSandboxManager) &&
+        if (!(this.sandboxManager instanceof NoopSandboxManager) &&
             this.sandbox?.enabled) {
-            this.fileSystemService = new SandboxedFileSystemService(this._sandboxManager, params.targetDir);
+            this.fileSystemService = new SandboxedFileSystemService(this.sandboxManager, params.targetDir);
         }
         else {
             this.fileSystemService = new StandardFileSystemService();
@@ -650,7 +653,7 @@ export class Config {
             showColor: params.shellExecutionConfig?.showColor ?? false,
             pager: params.shellExecutionConfig?.pager ?? 'cat',
             sanitizationConfig: this.sanitizationConfig,
-            sandboxManager: this._sandboxManager,
+            sandboxManager: this.sandboxManager,
             sandboxConfig: this.sandbox,
             backgroundCompletionBehavior: this.shellBackgroundCompletionBehavior,
         };
@@ -700,7 +703,7 @@ export class Config {
             ...params.policyEngineConfig,
             approvalMode: engineApprovalMode,
             disableAlwaysAllow: this.disableAlwaysAllow,
-            sandboxManager: this._sandboxManager,
+            sandboxManager: this.sandboxManager,
             isTrustedFolder: () => this.isTrustedFolder(),
         }, checkerRunner);
         // Register Conseca if enabled
@@ -708,7 +711,7 @@ export class Config {
             debugLogger.log('[SAFETY] Registering Conseca Safety Checker');
             ConsecaSafetyChecker.getInstance().setContext(this);
         }
-        this._messageBus = new MessageBus(this.policyEngine, this.debugMode);
+        this.messageBus = new MessageBus(this.policyEngine, this.debugMode);
         this.acknowledgedAgentsService = new AcknowledgedAgentsService();
         this.skillManager = new SkillManager();
         this.outputSettings = {
@@ -763,13 +766,10 @@ export class Config {
                 coreEvents.emitFeedback('error', 'Invalid proxy configuration detected. Check debug drawer for more details (F12)', error);
             }
         }
-        this._geminiClient = new GeminiClient(this);
+        this.geminiClient = new GeminiClient(this);
         this.a2aClientManager = new A2AClientManager(this);
         this.modelRouterService = new ModelRouterService(this);
     }
-    get config() {
-        return this;
-    }
     isInitialized() {
         return this.initialized;
     }
@@ -823,16 +823,16 @@ export class Config {
         if (this.getCheckpointingEnabled()) {
             await this.getGitService();
         }
-        this._promptRegistry = new PromptRegistry();
-        this._resourceRegistry = new ResourceRegistry();
+        this.promptRegistry = new PromptRegistry();
+        this.resourceRegistry = new ResourceRegistry();
         this.agentRegistry = new AgentRegistry(this);
         await this.agentRegistry.initialize();
         coreEvents.on(CoreEvent.AgentsRefreshed, this.onAgentsRefreshed);
-        this._toolRegistry = await this.createToolRegistry();
+        this.toolRegistry = await this.createToolRegistry();
         discoverToolsHandle?.end();
         this.mcpClientManager = new McpClientManager(this.clientVersion, this, this.eventEmitter);
         this.mcpClientManager.setMainRegistries({
-            toolRegistry: this._toolRegistry,
+            toolRegistry: this.toolRegistry,
             promptRegistry: this.promptRegistry,
             resourceRegistry: this.resourceRegistry,
         });
@@ -870,7 +870,7 @@ export class Config {
         }
         this.memoryContextManager = new MemoryContextManager(this);
         await this.memoryContextManager.refresh();
-        await this._geminiClient.initialize();
+        await this.geminiClient.initialize();
         this.initialized = true;
     }
     getContentGenerator() {
@@ -886,7 +886,7 @@ export class Config {
         if (this.contentGeneratorConfig?.authType === AuthType.USE_GEMINI &&
             authMethod !== AuthType.USE_GEMINI) {
             // Restore the conversation history to the new client
-            this._geminiClient.stripThoughtsFromHistory();
+            this.geminiClient.stripThoughtsFromHistory();
         }
         // Reset availability status when switching auth (e.g. from limited key to OAuth)
         this.modelAvailabilityService.reset();
@@ -991,43 +991,37 @@ export class Config {
         }
         return this.localLiteRtLmClient;
     }
-    get promptId() {
-        return this._sessionId;
+    /** @internal Backing field alias for backwards-compatibility */
+    get _toolRegistry() {
+        return this.toolRegistry;
     }
-    /**
-     * @deprecated Do not access directly on Config.
-     * Use the injected AgentLoopContext instead.
-     */
-    get toolRegistry() {
-        return this._toolRegistry;
+    set _toolRegistry(value) {
+        this.toolRegistry = value;
     }
-    /**
-     * @deprecated Do not access directly on Config.
-     * Use the injected AgentLoopContext instead.
-     */
-    get promptRegistry() {
-        return this._promptRegistry;
+    /** @internal Backing field alias for backwards-compatibility */
+    get _promptRegistry() {
+        return this.promptRegistry;
     }
-    /**
-     * @deprecated Do not access directly on Config.
-     * Use the injected AgentLoopContext instead.
-     */
-    get resourceRegistry() {
-        return this._resourceRegistry;
+    set _promptRegistry(registry) {
+        this.promptRegistry = registry;
     }
-    /**
-     * @deprecated Do not access directly on Config.
-     * Use the injected AgentLoopContext instead.
-     */
-    get messageBus() {
-        return this._messageBus;
+    /** @internal Backing field alias for backwards-compatibility */
+    get _resourceRegistry() {
+        return this.resourceRegistry;
     }
-    /**
-     * @deprecated Do not access directly on Config.
-     * Use the injected AgentLoopContext instead.
-     */
-    get geminiClient() {
-        return this._geminiClient;
+    set _resourceRegistry(registry) {
+        this.resourceRegistry = registry;
+    }
+    /** @internal Backing field alias for backwards-compatibility */
+    get _messageBus() {
+        return this.messageBus;
+    }
+    /** @internal Backing field alias for backwards-compatibility */
+    get _geminiClient() {
+        return this.geminiClient;
+    }
+    set _geminiClient(client) {
+        this.geminiClient = client;
     }
     async getSandboxForbiddenPaths() {
         if (this._sandboxForbiddenPaths) {
@@ -1040,7 +1034,7 @@ export class Config {
         return this._sandboxForbiddenPaths;
     }
     refreshSandboxManager() {
-        this._sandboxManager = createSandboxManager(this.sandbox, {
+        this.sandboxManager = createSandboxManager(this.sandbox, {
             workspace: this.targetDir,
             forbiddenPaths: this.getSandboxForbiddenPaths.bind(this),
             includeDirectories: [
@@ -1049,13 +1043,17 @@ export class Config {
             ],
             policyManager: this._sandboxPolicyManager,
         }, this.getApprovalMode());
-        this.shellExecutionConfig.sandboxManager = this._sandboxManager;
+        this.shellExecutionConfig.sandboxManager = this.sandboxManager;
     }
     get sandboxPolicyManager() {
         return this._sandboxPolicyManager;
     }
-    get sandboxManager() {
-        return this._sandboxManager;
+    /** @internal Backing field alias for backwards-compatibility */
+    get _sandboxManager() {
+        return this.sandboxManager;
+    }
+    set _sandboxManager(manager) {
+        this.sandboxManager = manager;
     }
     getSessionId() {
         return this.promptId;
@@ -1071,6 +1069,7 @@ export class Config {
             ? this.storage.getPlansDir()
             : undefined;
         this._sessionId = sessionId;
+        this.promptId = sessionId;
         this.storage.setSessionId(sessionId);
         this.trackerService = undefined;
         this.fallbackOverrides.clear();
@@ -1097,6 +1096,7 @@ export class Config {
     }
     rotateSessionId(sessionId) {
         this._sessionId = sessionId;
+        this.promptId = sessionId;
     }
     resetNewSessionState(sessionId) {
         this.setSessionId(sessionId);
@@ -1393,13 +1393,13 @@ export class Config {
         return this.toolRegistry;
     }
     getPromptRegistry() {
-        return this._promptRegistry;
+        return this.promptRegistry;
     }
     getSkillManager() {
         return this.skillManager;
     }
     getResourceRegistry() {
-        return this._resourceRegistry;
+        return this.resourceRegistry;
     }
     getDebugMode() {
         return this.debugMode;
@@ -1617,9 +1617,9 @@ export class Config {
      */
     async refreshMcpContext() {
         await this.memoryContextManager?.refresh();
-        if (this._geminiClient?.isInitialized()) {
-            await this._geminiClient.setTools();
-            this._geminiClient.updateSystemInstruction();
+        if (this.geminiClient?.isInitialized()) {
+            await this.geminiClient.setTools();
+            this.geminiClient.updateSystemInstruction();
         }
     }
     setUserMemory(newUserMemory) {
@@ -1808,9 +1808,9 @@ export class Config {
             const isPlanModeTransition = currentMode === ApprovalMode.PLAN || mode === ApprovalMode.PLAN;
             const isYoloModeTransition = currentMode === ApprovalMode.YOLO || mode === ApprovalMode.YOLO;
             if (isPlanModeTransition || isYoloModeTransition) {
-                if (this._geminiClient?.isInitialized()) {
-                    this._geminiClient.clearCurrentSequenceModel();
-                    this._geminiClient.setTools().catch((err) => {
+                if (this.geminiClient?.isInitialized()) {
+                    this.geminiClient.clearCurrentSequenceModel();
+                    this.geminiClient.setTools().catch((err) => {
                         debugLogger.error('Failed to update tools', err);
                     });
                 }
@@ -2838,7 +2838,7 @@ export class Config {
         this.logCurrentModeDuration(this.getApprovalMode());
         coreEvents.off(CoreEvent.AgentsRefreshed, this.onAgentsRefreshed);
         this.agentRegistry?.dispose();
-        this._geminiClient?.dispose();
+        this.geminiClient?.dispose();
         if (this.mcpClientManager) {
             await this.mcpClientManager.stop();
         }