@google/gemini-cli-core 0.24.0-preview.3 → 0.25.0-preview.0

package/dist/src/commands/memory.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"memory.test.js","sourceRoot":"","sources":["../../../src/commands/memory.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEzE,OAAO,EACL,SAAS,EACT,eAAe,EACf,aAAa,EACb,UAAU,GACX,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,eAAe,MAAM,6BAA6B,CAAC;AAE/D,EAAE,CAAC,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE,CAAC,CAAC;IAC5C,+BAA+B,EAAE,EAAE,CAAC,EAAE,EAAE;CACzC,CAAC,CAAC,CAAC;AAEJ,MAAM,WAAW,GAAG,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,+BAA+B,CAAC,CAAC;AAE/E,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,IAAI,UAAkB,CAAC;IAEvB,UAAU,CAAC,GAAG,EAAE;QACd,UAAU,GAAG;YACX,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE;YACtB,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE;YAC7B,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE;YAC7B,mBAAmB,EAAE,EAAE,CAAC,EAAE,EAAE;YAC5B,oCAAoC,EAAE,EAAE;iBACrC,EAAE,EAAE;iBACJ,iBAAiB,CAAC,SAAS,CAAC;SACX,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YACjD,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,eAAe,CACjD,qBAAqB,CACtB,CAAC;YACF,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YAE9D,MAAM,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;YAEtC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpC,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC9B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAC9B,uCAAuC,CACxC,CAAC;gBACF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YAClD,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YACxD,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YAE9D,MAAM,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;YAEtC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpC,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC9B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;QACzB,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;YACpD,MAAM,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;YACvC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjC,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBAC3B,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAC5C,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;YACnC,MAAM,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAAC;YAC3C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjC,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBAC3B,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YAClD,MAAM,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;YAC7B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpC,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC9B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACzC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;YACvE,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;YAC5D,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;YAChC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpC,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC9B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACzC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;YACvE,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;YACtD,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;YACpC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpC,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC9B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACzC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;YACvE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;YAC9D,WAAW,CAAC,iBAAiB,CAAC;gBAC5B,aAAa,EAAE,mBAAmB;gBAClC,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,EAAE;aACd,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC;YAE/C,MAAM,CAAC,WAAW,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;YACrD,MAAM,CACJ,UAAU,CAAC,oCAAoC,CAChD,CAAC,gBAAgB,EAAE,CAAC;YACrB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpC,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC9B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CACzB,qEAAqE,CACtE,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;YACjF,WAAW,CAAC,iBAAiB,CAAC;gBAC5B,aAAa,EAAE,EAAE;gBACjB,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,EAAE;aACd,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC;YAC/C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpC,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC9B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CACzB,yDAAyD,CAC1D,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;YAC7C,MAAM,SAAS,GAAG,CAAC,oBAAoB,EAAE,uBAAuB,CAAC,CAAC;YAClE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAEtE,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;YAE3C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpC,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC9B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAC9B,uCAAuC,CACxC,CAAC;gBACF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACzD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;YAC7D,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YAE/D,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;YAE3C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpC,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC9B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;YAC3D,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,eAAe,CACxD,SAAgC,CACjC,CAAC;YAEF,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;YAE3C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpC,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC9B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -21,9 +21,10 @@ import type { FallbackModelHandler } from '../fallback/types.js';
 import { ModelAvailabilityService } from '../availability/modelAvailabilityService.js';
 import { ModelRouterService } from '../routing/modelRouterService.js';
 import { OutputFormat } from '../output/types.js';
-import type { ModelConfigServiceConfig } from '../services/modelConfigService.js';
+import type { ModelConfig, ModelConfigServiceConfig } from '../services/modelConfigService.js';
 import { ModelConfigService } from '../services/modelConfigService.js';
 import { ContextManager } from '../services/contextManager.js';
+import type { GenerateContentParameters } from '@google/genai';
 export type { MCPOAuthConfig, AnyToolInvocation };
 import type { AnyToolInvocation } from '../tools/tools.js';
 import { WorkspaceContext } from '../utils/workspaceContext.js';
@@ -33,7 +34,7 @@ import { FileExclusions } from '../utils/ignorePatterns.js';
 import type { EventEmitter } from 'node:events';
 import { MessageBus } from '../confirmation-bus/message-bus.js';
 import { PolicyEngine } from '../policy/policy-engine.js';
-import type { PolicyEngineConfig } from '../policy/types.js';
+import { ApprovalMode, type PolicyEngineConfig } from '../policy/types.js';
 import { HookSystem } from '../hooks/index.js';
 import type { UserTierId } from '../code_assist/types.js';
 import type { RetrieveUserQuotaResponse } from '../code_assist/types.js';
@@ -41,7 +42,7 @@ import type { GeminiCodeAssistSetting } from '../code_assist/types.js';
 import type { Experiments } from '../code_assist/experiments/experiments.js';
 import { AgentRegistry } from '../agents/registry.js';
 import { SkillManager, type SkillDefinition } from '../skills/skillManager.js';
-import { ApprovalMode } from '../policy/types.js';
+import type { AgentDefinition } from '../agents/types.js';
 export interface AccessibilitySettings {
     disableLoadingPhrases?: boolean;
     screenReader?: boolean;
@@ -83,10 +84,24 @@ export interface ResolvedExtensionSetting {
     envVar: string;
     value: string;
     sensitive: boolean;
+    scope?: 'user' | 'workspace';
+    source?: string;
 }
-export interface IntrospectionAgentSettings {
+export interface CliHelpAgentSettings {
     enabled?: boolean;
 }
+export interface AgentRunConfig {
+    maxTimeMinutes?: number;
+    maxTurns?: number;
+}
+export interface AgentOverride {
+    modelConfig?: ModelConfig;
+    runConfig?: AgentRunConfig;
+    disabled?: boolean;
+}
+export interface AgentSettings {
+    overrides?: Record<string, AgentOverride>;
+}
 /**
  * All information required in CLI to handle an extension. Defined in Core so
  * that the collection of loaded, active, and inactive extensions can be passed
@@ -109,6 +124,7 @@ export interface GeminiCLIExtension {
     settings?: ExtensionSetting[];
     resolvedSettings?: ResolvedExtensionSetting[];
     skills?: SkillDefinition[];
+    agents?: AgentDefinition[];
 }
 export interface ExtensionInstallMetadata {
     source: string;
@@ -232,7 +248,7 @@ export interface ConfigParameters {
     output?: OutputSettings;
     disableModelRouterForAuth?: AuthType[];
     codebaseInvestigatorSettings?: CodebaseInvestigatorSettings;
-    introspectionAgentSettings?: IntrospectionAgentSettings;
+    cliHelpAgentSettings?: CliHelpAgentSettings;
     continueOnFailedApiCall?: boolean;
     retryFetchErrors?: boolean;
     enableShellOutputEfficiency?: boolean;
@@ -243,6 +259,7 @@ export interface ConfigParameters {
     disableYoloMode?: boolean;
     modelConfigServiceConfig?: ModelConfigServiceConfig;
     enableHooks?: boolean;
+    enableHooksUI?: boolean;
     experiments?: Experiments;
     hooks?: {
         [K in HookEventName]?: HookDefinition[];
@@ -258,11 +275,16 @@ export interface ConfigParameters {
     enableAgents?: boolean;
     skillsSupport?: boolean;
     disabledSkills?: string[];
+    adminSkillsEnabled?: boolean;
     experimentalJitContext?: boolean;
+    disableLLMCorrection?: boolean;
     onModelChange?: (model: string) => void;
     mcpEnabled?: boolean;
+    extensionsEnabled?: boolean;
+    agents?: AgentSettings;
     onReload?: () => Promise<{
         disabledSkills?: string[];
+        adminSkillsEnabled?: boolean;
     }>;
 }
 export declare class Config {
@@ -295,6 +317,7 @@ export declare class Config {
     private readonly toolCallCommand;
     private readonly mcpServerCommand;
     private readonly mcpEnabled;
+    private readonly extensionsEnabled;
     private mcpServers;
     private userMemory;
     private geminiMdFileCount;
@@ -357,7 +380,7 @@ export declare class Config {
     private readonly policyEngine;
     private readonly outputSettings;
     private readonly codebaseInvestigatorSettings;
-    private readonly introspectionAgentSettings;
+    private readonly cliHelpAgentSettings;
     private readonly continueOnFailedApiCall;
     private readonly retryFetchErrors;
     private readonly enableShellOutputEfficiency;
@@ -367,6 +390,7 @@ export declare class Config {
     private readonly disableYoloMode;
     private pendingIncludeDirectories;
     private readonly enableHooks;
+    private readonly enableHooksUI;
     private readonly hooks;
     private readonly projectHooks;
     private readonly disabledHooks;
@@ -376,12 +400,16 @@ export declare class Config {
     private readonly onModelChange;
     private readonly onReload;
     private readonly enableAgents;
+    private readonly agents;
     private readonly skillsSupport;
     private disabledSkills;
+    private readonly adminSkillsEnabled;
     private readonly experimentalJitContext;
+    private readonly disableLLMCorrection;
     private contextManager?;
     private terminalBackground;
     private remoteAdminSettings;
+    private latestApiRequest;
     constructor(params: ConfigParameters);
     /**
      * Must only be called once, throws if called again.
@@ -399,6 +427,8 @@ export declare class Config {
     setSessionId(sessionId: string): void;
     setTerminalBackground(terminalBackground: string | undefined): void;
     getTerminalBackground(): string | undefined;
+    getLatestApiRequest(): GenerateContentParameters | undefined;
+    setLatestApiRequest(req: GenerateContentParameters): void;
     getRemoteAdminSettings(): GeminiCodeAssistSetting | undefined;
     setRemoteAdminSettings(settings: GeminiCodeAssistSetting): void;
     shouldLoadMemoryFromIncludeDirectories(): boolean;
@@ -453,6 +483,7 @@ export declare class Config {
      */
     getMcpServers(): Record<string, MCPServerConfig> | undefined;
     getMcpEnabled(): boolean;
+    getExtensionsEnabled(): boolean;
     getMcpClientManager(): McpClientManager | undefined;
     getAllowedMcpServers(): string[] | undefined;
     getBlockedMcpServers(): string[] | undefined;
@@ -517,8 +548,10 @@ export declare class Config {
     getExtensionLoader(): ExtensionLoader;
     getEnabledExtensions(): string[];
     getEnableExtensionReloading(): boolean;
+    getDisableLLMCorrection(): boolean;
     isAgentsEnabled(): boolean;
     getNoBrowser(): boolean;
+    getAgentsSettings(): AgentSettings;
     isBrowserLaunchSuppressed(): boolean;
     getSummarizeToolOutputConfig(): Record<string, SummarizeToolOutputSettings> | undefined;
     getIdeMode(): boolean;
@@ -573,9 +606,14 @@ export declare class Config {
     getMessageBus(): MessageBus;
     getPolicyEngine(): PolicyEngine;
     getEnableHooks(): boolean;
+    getEnableHooksUI(): boolean;
     getCodebaseInvestigatorSettings(): CodebaseInvestigatorSettings;
-    getIntrospectionAgentSettings(): IntrospectionAgentSettings;
+    getCliHelpAgentSettings(): CliHelpAgentSettings;
     createToolRegistry(): Promise<ToolRegistry>;
+    /**
+     * Registers the DelegateToAgentTool if agents or related features are enabled.
+     */
+    private registerDelegateToAgentTool;
     /**
      * Get the hook system instance
      */
@@ -606,5 +644,10 @@ export declare class Config {
      * Set experiments configuration
      */
     setExperiments(experiments: Experiments): void;
+    private onAgentsRefreshed;
+    /**
+     * Disposes of resources and removes event listeners.
+     */
+    dispose(): Promise<void>;
 }
 export { DEFAULT_GEMINI_FLASH_MODEL };

package/dist/src/config/config.js

@@ -27,7 +27,7 @@ import { BaseLlmClient } from '../core/baseLlmClient.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';
-import { coreEvents } from '../utils/events.js';
+import { coreEvents, CoreEvent } from '../utils/events.js';
 import { tokenLimit } from '../core/tokenLimits.js';
 import { DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL_AUTO, DEFAULT_THINKING_MODE, isPreviewModel, PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_MODEL_AUTO, } from './models.js';
 import { shouldAttemptBrowserLaunch } from '../utils/browser.js';
@@ -47,6 +47,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 { HookSystem } from '../hooks/index.js';
 import { getCodeAssistServer } from '../code_assist/codeAssist.js';
 import { AgentRegistry } from '../agents/registry.js';
@@ -58,7 +59,6 @@ import { ExperimentFlags } from '../code_assist/experiments/flagNames.js';
 import { debugLogger } from '../utils/debugLogger.js';
 import { SkillManager } from '../skills/skillManager.js';
 import { startupProfiler } from '../telemetry/startupProfiler.js';
-import { ApprovalMode } from '../policy/types.js';
 import { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, } from './constants.js';
 import { SimpleExtensionLoader, } from '../utils/extensionLoader.js';
 import { McpClientManager } from '../tools/mcp-client-manager.js';
@@ -168,6 +168,7 @@ export class Config {
     toolCallCommand;
     mcpServerCommand;
     mcpEnabled;
+    extensionsEnabled;
     mcpServers;
     userMemory;
     geminiMdFileCount;
@@ -230,7 +231,7 @@ export class Config {
     policyEngine;
     outputSettings;
     codebaseInvestigatorSettings;
-    introspectionAgentSettings;
+    cliHelpAgentSettings;
     continueOnFailedApiCall;
     retryFetchErrors;
     enableShellOutputEfficiency;
@@ -240,6 +241,7 @@ export class Config {
     disableYoloMode;
     pendingIncludeDirectories;
     enableHooks;
+    enableHooksUI;
     hooks;
     projectHooks;
     disabledHooks;
@@ -249,12 +251,16 @@ export class Config {
     onModelChange;
     onReload;
     enableAgents;
+    agents;
     skillsSupport;
     disabledSkills;
+    adminSkillsEnabled;
     experimentalJitContext;
+    disableLLMCorrection;
     contextManager;
     terminalBackground = undefined;
     remoteAdminSettings;
+    latestApiRequest;
     constructor(params) {
         this.sessionId = params.sessionId;
         this.embeddingModel =
@@ -275,6 +281,7 @@ export class Config {
         this.mcpServerCommand = params.mcpServerCommand;
         this.mcpServers = params.mcpServers;
         this.mcpEnabled = params.mcpEnabled ?? true;
+        this.extensionsEnabled = params.extensionsEnabled ?? true;
         this.allowedMcpServers = params.allowedMcpServers ?? [];
         this.blockedMcpServers = params.blockedMcpServers ?? [];
         this.allowedEnvironmentVariables = params.allowedEnvironmentVariables ?? [];
@@ -313,8 +320,11 @@ export class Config {
         this.model = params.model;
         this._activeModel = params.model;
         this.enableAgents = params.enableAgents ?? false;
+        this.agents = params.agents ?? {};
+        this.disableLLMCorrection = params.disableLLMCorrection ?? false;
         this.skillsSupport = params.skillsSupport ?? false;
         this.disabledSkills = params.disabledSkills ?? [];
+        this.adminSkillsEnabled = params.adminSkillsEnabled ?? true;
         this.modelAvailabilityService = new ModelAvailabilityService();
         this.previewFeatures = params.previewFeatures ?? undefined;
         this.experimentalJitContext = params.experimentalJitContext ?? false;
@@ -359,6 +369,7 @@ export class Config {
         this.useWriteTodos = isPreviewModel(this.model)
             ? false
             : (params.useWriteTodos ?? true);
+        this.enableHooksUI = params.enableHooksUI ?? true;
         this.enableHooks = params.enableHooks ?? false;
         this.disabledHooks =
             (params.hooks && 'disabled' in params.hooks
@@ -372,8 +383,8 @@ export class Config {
                 DEFAULT_THINKING_MODE,
             model: params.codebaseInvestigatorSettings?.model,
         };
-        this.introspectionAgentSettings = {
-            enabled: params.introspectionAgentSettings?.enabled ?? false,
+        this.cliHelpAgentSettings = {
+            enabled: params.cliHelpAgentSettings?.enabled ?? true,
         };
         this.continueOnFailedApiCall = params.continueOnFailedApiCall ?? true;
         this.enableShellOutputEfficiency =
@@ -464,6 +475,7 @@ export class Config {
         this.resourceRegistry = new ResourceRegistry();
         this.agentRegistry = new AgentRegistry(this);
         await this.agentRegistry.initialize();
+        coreEvents.on(CoreEvent.AgentsRefreshed, this.onAgentsRefreshed);
         this.toolRegistry = await this.createToolRegistry();
         discoverToolsHandle?.end();
         this.mcpClientManager = new McpClientManager(this.toolRegistry, this, this.eventEmitter);
@@ -473,13 +485,16 @@ export class Config {
             await this.getExtensionLoader().start(this),
         ]);
         initMcpHandle?.end();
-        // Discover skills if enabled
         if (this.skillsSupport) {
-            await this.getSkillManager().discoverSkills(this.storage, this.getExtensions());
-            this.getSkillManager().setDisabledSkills(this.disabledSkills);
-            // Re-register ActivateSkillTool to update its schema with the discovered enabled skill enums
-            if (this.getSkillManager().getSkills().length > 0) {
-                this.getToolRegistry().registerTool(new ActivateSkillTool(this, this.messageBus));
+            this.getSkillManager().setAdminSettings(this.adminSkillsEnabled);
+            if (this.adminSkillsEnabled) {
+                await this.getSkillManager().discoverSkills(this.storage, this.getExtensions());
+                this.getSkillManager().setDisabledSkills(this.disabledSkills);
+                // Re-register ActivateSkillTool to update its schema with the discovered enabled skill enums
+                if (this.getSkillManager().getSkills().length > 0) {
+                    this.getToolRegistry().unregisterTool(ActivateSkillTool.Name);
+                    this.getToolRegistry().registerTool(new ActivateSkillTool(this, this.messageBus));
+                }
             }
         }
         // Initialize hook system if enabled
@@ -515,29 +530,23 @@ export class Config {
         // Initialize BaseLlmClient now that the ContentGenerator is available
         this.baseLlmClient = new BaseLlmClient(this.contentGenerator, this);
         const codeAssistServer = getCodeAssistServer(this);
-        if (codeAssistServer) {
-            if (codeAssistServer.projectId) {
-                await this.refreshUserQuota();
-            }
-            this.experimentsPromise = getExperiments(codeAssistServer)
-                .then((experiments) => {
-                this.setExperiments(experiments);
-                // If preview features have not been set and the user authenticated through Google, we enable preview based on remote config only if it's true
-                if (this.getPreviewFeatures() === undefined) {
-                    const remotePreviewFeatures = experiments.flags[ExperimentFlags.ENABLE_PREVIEW]?.boolValue;
-                    if (remotePreviewFeatures === true) {
-                        this.setPreviewFeatures(remotePreviewFeatures);
-                    }
-                }
-            })
-                .catch((e) => {
-                debugLogger.error('Failed to fetch experiments', e);
-            });
-        }
-        else {
-            this.experiments = undefined;
-            this.experimentsPromise = undefined;
+        if (codeAssistServer?.projectId) {
+            await this.refreshUserQuota();
         }
+        this.experimentsPromise = getExperiments(codeAssistServer)
+            .then((experiments) => {
+            this.setExperiments(experiments);
+            // If preview features have not been set and the user authenticated through Google, we enable preview based on remote config only if it's true
+            if (this.getPreviewFeatures() === undefined) {
+                const remotePreviewFeatures = experiments.flags[ExperimentFlags.ENABLE_PREVIEW]?.boolValue;
+                if (remotePreviewFeatures === true) {
+                    this.setPreviewFeatures(remotePreviewFeatures);
+                }
+            }
+        })
+            .catch((e) => {
+            debugLogger.error('Failed to fetch experiments', e);
+        });
         const authType = this.contentGeneratorConfig.authType;
         if (authType === AuthType.USE_GEMINI ||
             authType === AuthType.USE_VERTEX_AI) {
@@ -553,10 +562,7 @@ export class Config {
             return this.experiments;
         }
         const codeAssistServer = getCodeAssistServer(this);
-        if (codeAssistServer) {
-            return getExperiments(codeAssistServer);
-        }
-        return undefined;
+        return getExperiments(codeAssistServer);
     }
     getUserTier() {
         return this.contentGenerator?.userTier;
@@ -588,6 +594,12 @@ export class Config {
     getTerminalBackground() {
         return this.terminalBackground;
     }
+    getLatestApiRequest() {
+        return this.latestApiRequest;
+    }
+    setLatestApiRequest(req) {
+        this.latestApiRequest = req;
+    }
     getRemoteAdminSettings() {
         return this.remoteAdminSettings;
     }
@@ -785,6 +797,9 @@ export class Config {
     getMcpEnabled() {
         return this.mcpEnabled;
     }
+    getExtensionsEnabled() {
+        return this.extensionsEnabled;
+    }
     getMcpClientManager() {
         return this.mcpClientManager;
     }
@@ -997,12 +1012,18 @@ export class Config {
     getEnableExtensionReloading() {
         return this.enableExtensionReloading;
     }
+    getDisableLLMCorrection() {
+        return this.disableLLMCorrection;
+    }
     isAgentsEnabled() {
         return this.enableAgents;
     }
     getNoBrowser() {
         return this.noBrowser;
     }
+    getAgentsSettings() {
+        return this.agents;
+    }
     isBrowserLaunchSuppressed() {
         return this.getNoBrowser() || !shouldAttemptBrowserLaunch();
     }
@@ -1100,14 +1121,22 @@ export class Config {
         if (this.onReload) {
             const refreshed = await this.onReload();
             this.disabledSkills = refreshed.disabledSkills ?? [];
+            this.getSkillManager().setAdminSettings(refreshed.adminSkillsEnabled ?? this.adminSkillsEnabled);
         }
-        await this.getSkillManager().discoverSkills(this.storage, this.getExtensions());
-        this.getSkillManager().setDisabledSkills(this.disabledSkills);
-        // Re-register ActivateSkillTool to update its schema with the newly discovered skills
-        if (this.getSkillManager().getSkills().length > 0) {
-            this.getToolRegistry().registerTool(new ActivateSkillTool(this, this.messageBus));
+        if (this.getSkillManager().isAdminEnabled()) {
+            await this.getSkillManager().discoverSkills(this.storage, this.getExtensions());
+            this.getSkillManager().setDisabledSkills(this.disabledSkills);
+            // Re-register ActivateSkillTool to update its schema with the newly discovered skills
+            if (this.getSkillManager().getSkills().length > 0) {
+                this.getToolRegistry().unregisterTool(ActivateSkillTool.Name);
+                this.getToolRegistry().registerTool(new ActivateSkillTool(this, this.messageBus));
+            }
+            else {
+                this.getToolRegistry().unregisterTool(ActivateSkillTool.Name);
+            }
         }
         else {
+            this.getSkillManager().clearSkills();
             this.getToolRegistry().unregisterTool(ActivateSkillTool.Name);
         }
         // Notify the client that system instructions might need updating
@@ -1195,11 +1224,14 @@ export class Config {
     getEnableHooks() {
         return this.enableHooks;
     }
+    getEnableHooksUI() {
+        return this.enableHooksUI;
+    }
     getCodebaseInvestigatorSettings() {
         return this.codebaseInvestigatorSettings;
     }
-    getIntrospectionAgentSettings() {
-        return this.introspectionAgentSettings;
+    getCliHelpAgentSettings() {
+        return this.cliHelpAgentSettings;
     }
     async createToolRegistry() {
         const registry = new ToolRegistry(this, this.messageBus);
@@ -1259,8 +1291,18 @@ export class Config {
         }
         // Register Subagents as Tools
         // Register DelegateToAgentTool if agents are enabled
+        this.registerDelegateToAgentTool(registry);
+        await registry.discoverAllTools();
+        registry.sortTools();
+        return registry;
+    }
+    /**
+     * Registers the DelegateToAgentTool if agents or related features are enabled.
+     */
+    registerDelegateToAgentTool(registry) {
         if (this.isAgentsEnabled() ||
-            this.getCodebaseInvestigatorSettings().enabled) {
+            this.getCodebaseInvestigatorSettings().enabled ||
+            this.getCliHelpAgentSettings().enabled) {
             // Check if the delegate tool itself is allowed (if allowedTools is set)
             const allowedTools = this.getAllowedTools();
             const isAllowed = !allowedTools || allowedTools.includes(DELEGATE_TO_AGENT_TOOL_NAME);
@@ -1269,9 +1311,6 @@ export class Config {
                 registry.registerTool(delegateTool);
             }
         }
-        await registry.discoverAllTools();
-        registry.sortTools();
-        return registry;
     }
     /**
      * Get the hook system instance
@@ -1347,6 +1386,32 @@ export class Config {
         });
         debugLogger.debug('Experiments loaded', summaryString);
     }
+    onAgentsRefreshed = async () => {
+        if (this.toolRegistry) {
+            this.registerDelegateToAgentTool(this.toolRegistry);
+        }
+        // Propagate updates to the active chat session
+        const client = this.getGeminiClient();
+        if (client?.isInitialized()) {
+            await client.setTools();
+            await client.updateSystemInstruction();
+        }
+        else {
+            debugLogger.debug('[Config] GeminiClient not initialized; skipping live prompt/tool refresh.');
+        }
+    };
+    /**
+     * Disposes of resources and removes event listeners.
+     */
+    async dispose() {
+        coreEvents.off(CoreEvent.AgentsRefreshed, this.onAgentsRefreshed);
+        if (this.agentRegistry) {
+            this.agentRegistry.dispose();
+        }
+        if (this.mcpClientManager) {
+            await this.mcpClientManager.stop();
+        }
+    }
 }
 // Export model constants for use in CLI
 export { DEFAULT_GEMINI_FLASH_MODEL };