@office-ai/aioncli-core 0.18.7 → 0.24.0

package/dist/src/config/config.js

@@ -8,14 +8,15 @@ import { inspect } from 'node:util';
 import process from 'node:process';
 import { AuthType, createContentGenerator, createContentGeneratorConfig, } from '../core/contentGenerator.js';
 import { PromptRegistry } from '../prompts/prompt-registry.js';
+import { ResourceRegistry } from '../resources/resource-registry.js';
 import { ToolRegistry } from '../tools/tool-registry.js';
 import { LSTool } from '../tools/ls.js';
 import { ReadFileTool } from '../tools/read-file.js';
 import { GrepTool } from '../tools/grep.js';
 import { canUseRipgrep, RipGrepTool } from '../tools/ripGrep.js';
 import { GlobTool } from '../tools/glob.js';
+import { ActivateSkillTool } from '../tools/activate-skill.js';
 import { EditTool } from '../tools/edit.js';
-import { SmartEditTool } from '../tools/smart-edit.js';
 import { ShellTool } from '../tools/shell.js';
 import { WriteFileTool } from '../tools/write-file.js';
 import { WebFetchTool } from '../tools/web-fetch.js';
@@ -28,29 +29,35 @@ 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 { tokenLimit } from '../core/tokenLimits.js';
-import { DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, DEFAULT_THINKING_MODE, } from './models.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';
 import { ideContextStore } from '../ide/ideContext.js';
 import { WriteTodosTool } from '../tools/write-todos.js';
 import { StandardFileSystemService } from '../services/fileSystemService.js';
-import { logRipgrepFallback } from '../telemetry/loggers.js';
-import { RipgrepFallbackEvent } from '../telemetry/types.js';
+import { logRipgrepFallback, logFlashFallback } from '../telemetry/loggers.js';
+import { RipgrepFallbackEvent, FlashFallbackEvent, } from '../telemetry/types.js';
+import { ModelAvailabilityService } from '../availability/modelAvailabilityService.js';
 import { ModelRouterService } from '../routing/modelRouterService.js';
 import { OutputFormat } from '../output/types.js';
 import { ModelConfigService } from '../services/modelConfigService.js';
 import { DEFAULT_MODEL_CONFIGS } from './defaultModelConfigs.js';
+import { ContextManager } from '../services/contextManager.js';
 import { WorkspaceContext } from '../utils/workspaceContext.js';
 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 { HookSystem } from '../hooks/index.js';
 import { getCodeAssistServer } from '../code_assist/codeAssist.js';
 import { AgentRegistry } from '../agents/registry.js';
 import { setGlobalProxy } from '../utils/fetch.js';
-import { SubagentToolWrapper } from '../agents/subagent-tool-wrapper.js';
+import { DelegateToAgentTool } from '../agents/delegate-to-agent-tool.js';
+import { DELEGATE_TO_AGENT_TOOL_NAME } from '../tools/tool-names.js';
 import { getExperiments } from '../code_assist/experiments/experiments.js';
 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';
@@ -67,6 +74,7 @@ export class MCPServerConfig {
     httpUrl;
     headers;
     tcp;
+    type;
     timeout;
     trust;
     description;
@@ -86,6 +94,12 @@ export class MCPServerConfig {
     httpUrl, headers, 
     // For websocket transport
     tcp, 
+    // Transport type (optional, for use with 'url' field)
+    // When set to 'http', uses StreamableHTTPClientTransport
+    // When set to 'sse', uses SSEClientTransport
+    // When omitted, auto-detects transport type
+    // Note: 'httpUrl' is deprecated in favor of 'url' + 'type'
+    type, 
     // Common
     timeout, trust, 
     // Metadata
@@ -105,6 +119,7 @@ export class MCPServerConfig {
         this.httpUrl = httpUrl;
         this.headers = headers;
         this.tcp = tcp;
+        this.type = type;
         this.timeout = timeout;
         this.trust = trust;
         this.description = description;
@@ -128,8 +143,13 @@ export class Config {
     mcpClientManager;
     allowedMcpServers;
     blockedMcpServers;
+    allowedEnvironmentVariables;
+    blockedEnvironmentVariables;
+    enableEnvironmentVariableRedaction;
     promptRegistry;
+    resourceRegistry;
     agentRegistry;
+    skillManager;
     sessionId;
     fileSystemService;
     contentGeneratorConfig;
@@ -147,11 +167,11 @@ export class Config {
     toolDiscoveryCommand;
     toolCallCommand;
     mcpServerCommand;
+    mcpEnabled;
     mcpServers;
     userMemory;
     geminiMdFileCount;
     geminiMdFilePaths;
-    approvalMode;
     showMemoryUsage;
     accessibility;
     telemetrySettings;
@@ -159,6 +179,7 @@ export class Config {
     geminiClient;
     baseLlmClient;
     modelRouterService;
+    modelAvailabilityService;
     fileFiltering;
     fileDiscoveryService = null;
     gitService = undefined;
@@ -168,10 +189,11 @@ export class Config {
     bugCommand;
     model;
     previewFeatures;
+    hasAccessToPreviewModel = false;
     noBrowser;
     folderTrust;
     ideMode;
-    inFallbackMode = false;
+    _activeModel;
     maxSessionTurns;
     listSessions;
     deleteSession;
@@ -203,29 +225,36 @@ export class Config {
     storage;
     fileExclusions;
     eventEmitter;
-    useSmartEdit;
     useWriteTodos;
     messageBus;
     policyEngine;
     outputSettings;
-    useModelRouter;
-    initialUseModelRouter;
-    disableModelRouterForAuth;
-    enableMessageBusIntegration;
     codebaseInvestigatorSettings;
+    introspectionAgentSettings;
     continueOnFailedApiCall;
     retryFetchErrors;
     enableShellOutputEfficiency;
+    shellToolInactivityTimeout;
     fakeResponses;
     recordResponses;
     disableYoloMode;
     pendingIncludeDirectories;
     enableHooks;
     hooks;
+    projectHooks;
+    disabledHooks;
     experiments;
     experimentsPromise;
-    previewModelFallbackMode = false;
-    previewModelBypassMode = false;
+    hookSystem;
+    onModelChange;
+    onReload;
+    enableAgents;
+    skillsSupport;
+    disabledSkills;
+    experimentalJitContext;
+    contextManager;
+    terminalBackground = undefined;
+    remoteAdminSettings;
     constructor(params) {
         this.sessionId = params.sessionId;
         this.embeddingModel =
@@ -245,12 +274,16 @@ export class Config {
         this.toolCallCommand = params.toolCallCommand;
         this.mcpServerCommand = params.mcpServerCommand;
         this.mcpServers = params.mcpServers;
+        this.mcpEnabled = params.mcpEnabled ?? true;
         this.allowedMcpServers = params.allowedMcpServers ?? [];
         this.blockedMcpServers = params.blockedMcpServers ?? [];
+        this.allowedEnvironmentVariables = params.allowedEnvironmentVariables ?? [];
+        this.blockedEnvironmentVariables = params.blockedEnvironmentVariables ?? [];
+        this.enableEnvironmentVariableRedaction =
+            params.enableEnvironmentVariableRedaction ?? false;
         this.userMemory = params.userMemory ?? '';
         this.geminiMdFileCount = params.geminiMdFileCount ?? 0;
         this.geminiMdFilePaths = params.geminiMdFilePaths ?? [];
-        this.approvalMode = params.approvalMode ?? ApprovalMode.DEFAULT;
         this.showMemoryUsage = params.showMemoryUsage ?? false;
         this.accessibility = params.accessibility ?? {};
         this.telemetrySettings = {
@@ -261,6 +294,7 @@ export class Config {
             logPrompts: params.telemetry?.logPrompts ?? true,
             outfile: params.telemetry?.outfile,
             useCollector: params.telemetry?.useCollector,
+            useCliAuth: params.telemetry?.useCliAuth,
         };
         this.usageStatisticsEnabled = params.usageStatisticsEnabled ?? true;
         this.fileFiltering = {
@@ -277,7 +311,13 @@ export class Config {
         this.fileDiscoveryService = params.fileDiscoveryService ?? null;
         this.bugCommand = params.bugCommand;
         this.model = params.model;
+        this._activeModel = params.model;
+        this.enableAgents = params.enableAgents ?? false;
+        this.skillsSupport = params.skillsSupport ?? false;
+        this.disabledSkills = params.disabledSkills ?? [];
+        this.modelAvailabilityService = new ModelAvailabilityService();
         this.previewFeatures = params.previewFeatures ?? undefined;
+        this.experimentalJitContext = params.experimentalJitContext ?? false;
         this.maxSessionTurns = params.maxSessionTurns ?? -1;
         this.experimentalZedIntegration =
             params.experimentalZedIntegration ?? false;
@@ -307,6 +347,7 @@ export class Config {
             terminalHeight: params.shellExecutionConfig?.terminalHeight ?? 24,
             showColor: params.shellExecutionConfig?.showColor ?? false,
             pager: params.shellExecutionConfig?.pager ?? 'cat',
+            sanitizationConfig: this.sanitizationConfig,
         };
         this.truncateToolOutputThreshold =
             params.truncateToolOutputThreshold ??
@@ -314,31 +355,31 @@ export class Config {
         this.truncateToolOutputLines =
             params.truncateToolOutputLines ?? DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES;
         this.enableToolOutputTruncation = params.enableToolOutputTruncation ?? true;
-        this.useSmartEdit = params.useSmartEdit ?? true;
-        this.useWriteTodos = params.useWriteTodos ?? true;
-        this.initialUseModelRouter = params.useModelRouter ?? false;
-        this.useModelRouter = this.initialUseModelRouter;
-        this.disableModelRouterForAuth = params.disableModelRouterForAuth ?? [];
+        // // TODO(joshualitt): Re-evaluate the todo tool for 3 family.
+        this.useWriteTodos = isPreviewModel(this.model)
+            ? false
+            : (params.useWriteTodos ?? true);
         this.enableHooks = params.enableHooks ?? false;
-        // Enable MessageBus integration if:
-        // 1. Explicitly enabled via setting, OR
-        // 2. Hooks are enabled and hooks are configured
-        const hasHooks = params.hooks && Object.keys(params.hooks).length > 0;
-        const hooksNeedMessageBus = this.enableHooks && hasHooks;
-        this.enableMessageBusIntegration =
-            params.enableMessageBusIntegration ??
-                (hooksNeedMessageBus ? true : false);
+        this.disabledHooks =
+            (params.hooks && 'disabled' in params.hooks
+                ? params.hooks.disabled
+                : undefined) ?? [];
         this.codebaseInvestigatorSettings = {
             enabled: params.codebaseInvestigatorSettings?.enabled ?? true,
             maxNumTurns: params.codebaseInvestigatorSettings?.maxNumTurns ?? 10,
             maxTimeMinutes: params.codebaseInvestigatorSettings?.maxTimeMinutes ?? 3,
             thinkingBudget: params.codebaseInvestigatorSettings?.thinkingBudget ??
                 DEFAULT_THINKING_MODE,
-            model: params.codebaseInvestigatorSettings?.model ?? DEFAULT_GEMINI_MODEL,
+            model: params.codebaseInvestigatorSettings?.model,
+        };
+        this.introspectionAgentSettings = {
+            enabled: params.introspectionAgentSettings?.enabled ?? false,
         };
         this.continueOnFailedApiCall = params.continueOnFailedApiCall ?? true;
         this.enableShellOutputEfficiency =
             params.enableShellOutputEfficiency ?? true;
+        this.shellToolInactivityTimeout =
+            (params.shellToolInactivityTimeout ?? 300) * 1000; // 5 minutes
         this.extensionManagement = params.extensionManagement ?? true;
         this.enableExtensionReloading = params.enableExtensionReloading ?? false;
         this.storage = new Storage(this.targetDir);
@@ -347,19 +388,27 @@ export class Config {
         this.enablePromptCompletion = params.enablePromptCompletion ?? false;
         this.fileExclusions = new FileExclusions(this);
         this.eventEmitter = params.eventEmitter;
-        this.policyEngine = new PolicyEngine(params.policyEngineConfig);
+        this.policyEngine = new PolicyEngine({
+            ...params.policyEngineConfig,
+            approvalMode: params.approvalMode ?? params.policyEngineConfig?.approvalMode,
+        });
         this.messageBus = new MessageBus(this.policyEngine, this.debugMode);
+        this.skillManager = new SkillManager();
         this.outputSettings = {
             format: params.output?.format ?? OutputFormat.TEXT,
         };
         this.retryFetchErrors = params.retryFetchErrors ?? false;
         this.disableYoloMode = params.disableYoloMode ?? false;
         this.hooks = params.hooks;
+        this.projectHooks = params.projectHooks;
         this.experiments = params.experiments;
+        this.onModelChange = params.onModelChange;
+        this.onReload = params.onReload;
         if (params.contextFileName) {
             setGeminiMdFilename(params.contextFileName);
         }
         if (this.telemetrySettings.enabled) {
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
             initializeTelemetry(this);
         }
         const proxy = this.getProxy();
@@ -381,11 +430,19 @@ export class Config {
         // TODO(12593): Fix the settings loading logic to properly merge defaults and
         // remove this hack.
         let modelConfigServiceConfig = params.modelConfigServiceConfig;
-        if (modelConfigServiceConfig && !modelConfigServiceConfig.aliases) {
-            modelConfigServiceConfig = {
-                ...modelConfigServiceConfig,
-                aliases: DEFAULT_MODEL_CONFIGS.aliases,
-            };
+        if (modelConfigServiceConfig) {
+            if (!modelConfigServiceConfig.aliases) {
+                modelConfigServiceConfig = {
+                    ...modelConfigServiceConfig,
+                    aliases: DEFAULT_MODEL_CONFIGS.aliases,
+                };
+            }
+            if (!modelConfigServiceConfig.overrides) {
+                modelConfigServiceConfig = {
+                    ...modelConfigServiceConfig,
+                    overrides: DEFAULT_MODEL_CONFIGS.overrides,
+                };
+            }
         }
         this.modelConfigService = new ModelConfigService(modelConfigServiceConfig ?? DEFAULT_MODEL_CONFIGS);
     }
@@ -398,32 +455,50 @@ export class Config {
         }
         this.initialized = true;
         // Initialize centralized FileDiscoveryService
+        const discoverToolsHandle = startupProfiler.start('discover_tools');
         this.getFileService();
         if (this.getCheckpointingEnabled()) {
             await this.getGitService();
         }
         this.promptRegistry = new PromptRegistry();
+        this.resourceRegistry = new ResourceRegistry();
         this.agentRegistry = new AgentRegistry(this);
         await this.agentRegistry.initialize();
         this.toolRegistry = await this.createToolRegistry();
+        discoverToolsHandle?.end();
         this.mcpClientManager = new McpClientManager(this.toolRegistry, this, this.eventEmitter);
+        const initMcpHandle = startupProfiler.start('initialize_mcp_clients');
         await Promise.all([
             await this.mcpClientManager.startConfiguredMcpServers(),
             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));
+            }
+        }
+        // Initialize hook system if enabled
+        if (this.getEnableHooks()) {
+            this.hookSystem = new HookSystem(this);
+            await this.hookSystem.initialize();
+        }
+        if (this.experimentalJitContext) {
+            this.contextManager = new ContextManager(this);
+            await this.contextManager.refresh();
+        }
         await this.geminiClient.initialize();
     }
     getContentGenerator() {
         return this.contentGenerator;
     }
     async refreshAuth(authMethod) {
-        this.useModelRouter = this.initialUseModelRouter;
-        if (this.disableModelRouterForAuth?.includes(authMethod)) {
-            this.useModelRouter = false;
-            if (this.model === DEFAULT_GEMINI_MODEL_AUTO) {
-                this.model = DEFAULT_GEMINI_MODEL;
-            }
-        }
+        // Reset availability service when switching auth
+        this.modelAvailabilityService.reset();
         // 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 &&
@@ -431,20 +506,24 @@ export class Config {
             // Restore the conversation history to the new client
             this.geminiClient.stripThoughtsFromHistory();
         }
+        // Reset availability status when switching auth (e.g. from limited key to OAuth)
+        this.modelAvailabilityService.reset();
         const newContentGeneratorConfig = await createContentGeneratorConfig(this, authMethod);
         this.contentGenerator = await createContentGenerator(newContentGeneratorConfig, this, this.getSessionId());
         // Only assign to instance properties after successful initialization
         this.contentGeneratorConfig = newContentGeneratorConfig;
         // Initialize BaseLlmClient now that the ContentGenerator is available
         this.baseLlmClient = new BaseLlmClient(this.contentGenerator, this);
-        const previewFeatures = this.getPreviewFeatures();
         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 (previewFeatures === undefined) {
+                if (this.getPreviewFeatures() === undefined) {
                     const remotePreviewFeatures = experiments.flags[ExperimentFlags.ENABLE_PREVIEW]?.boolValue;
                     if (remotePreviewFeatures === true) {
                         this.setPreviewFeatures(remotePreviewFeatures);
@@ -459,8 +538,25 @@ export class Config {
             this.experiments = undefined;
             this.experimentsPromise = undefined;
         }
-        // Reset the session flag since we're explicitly changing auth and using default model
-        this.inFallbackMode = false;
+        const authType = this.contentGeneratorConfig.authType;
+        if (authType === AuthType.USE_GEMINI ||
+            authType === AuthType.USE_VERTEX_AI) {
+            this.setHasAccessToPreviewModel(true);
+        }
+        // Update model if user no longer has access to the preview model
+        if (!this.hasAccessToPreviewModel && isPreviewModel(this.model)) {
+            this.setModel(DEFAULT_GEMINI_MODEL_AUTO);
+        }
+    }
+    async getExperimentsAsync() {
+        if (this.experiments) {
+            return this.experiments;
+        }
+        const codeAssistServer = getCodeAssistServer(this);
+        if (codeAssistServer) {
+            return getExperiments(codeAssistServer);
+        }
+        return undefined;
     }
     getUserTier() {
         return this.contentGenerator?.userTier;
@@ -486,6 +582,18 @@ export class Config {
     setSessionId(sessionId) {
         this.sessionId = sessionId;
     }
+    setTerminalBackground(terminalBackground) {
+        this.terminalBackground = terminalBackground;
+    }
+    getTerminalBackground() {
+        return this.terminalBackground;
+    }
+    getRemoteAdminSettings() {
+        return this.remoteAdminSettings;
+    }
+    setRemoteAdminSettings(settings) {
+        this.remoteAdminSettings = settings;
+    }
     shouldLoadMemoryFromIncludeDirectories() {
         return this.loadMemoryFromIncludeDirectories;
     }
@@ -501,18 +609,32 @@ export class Config {
     getModel() {
         return this.model;
     }
-    setModel(newModel) {
-        if (this.model !== newModel || this.inFallbackMode) {
+    setModel(newModel, isTemporary = true) {
+        if (this.model !== newModel || this._activeModel !== newModel) {
             this.model = newModel;
+            // When the user explicitly sets a model, that becomes the active model.
+            this._activeModel = newModel;
             coreEvents.emitModelChanged(newModel);
+            if (this.onModelChange && !isTemporary) {
+                this.onModelChange(newModel);
+            }
         }
-        this.setFallbackMode(false);
+        this.modelAvailabilityService.reset();
     }
-    isInFallbackMode() {
-        return this.inFallbackMode;
+    activateFallbackMode(model) {
+        this.setModel(model, true);
+        const authType = this.getContentGeneratorConfig()?.authType;
+        if (authType) {
+            logFlashFallback(this, new FlashFallbackEvent(authType));
+        }
+    }
+    getActiveModel() {
+        return this._activeModel ?? this.model;
     }
-    setFallbackMode(active) {
-        this.inFallbackMode = active;
+    setActiveModel(model) {
+        if (this._activeModel !== model) {
+            this._activeModel = model;
+        }
     }
     setFallbackModelHandler(handler) {
         this.fallbackModelHandler = handler;
@@ -520,17 +642,8 @@ export class Config {
     getFallbackModelHandler() {
         return this.fallbackModelHandler;
     }
-    isPreviewModelFallbackMode() {
-        return this.previewModelFallbackMode;
-    }
-    setPreviewModelFallbackMode(active) {
-        this.previewModelFallbackMode = active;
-    }
-    isPreviewModelBypassMode() {
-        return this.previewModelBypassMode;
-    }
-    setPreviewModelBypassMode(active) {
-        this.previewModelBypassMode = active;
+    resetTurn() {
+        this.modelAvailabilityService.resetTurn();
     }
     getMaxSessionTurns() {
         return this.maxSessionTurns;
@@ -567,12 +680,18 @@ export class Config {
     getAgentRegistry() {
         return this.agentRegistry;
     }
+    getSkillManager() {
+        return this.skillManager;
+    }
     getToolRegistry() {
         return this.toolRegistry;
     }
     getPromptRegistry() {
         return this.promptRegistry;
     }
+    getResourceRegistry() {
+        return this.resourceRegistry;
+    }
     getDebugMode() {
         return this.debugMode;
     }
@@ -583,7 +702,44 @@ export class Config {
         return this.previewFeatures;
     }
     setPreviewFeatures(previewFeatures) {
+        // No change in state, no action needed
+        if (this.previewFeatures === previewFeatures) {
+            return;
+        }
         this.previewFeatures = previewFeatures;
+        const currentModel = this.getModel();
+        // Case 1: Disabling preview features while on a preview model
+        if (!previewFeatures && isPreviewModel(currentModel)) {
+            this.setModel(DEFAULT_GEMINI_MODEL_AUTO);
+        }
+        // Case 2: Enabling preview features while on the default auto model
+        else if (previewFeatures && currentModel === DEFAULT_GEMINI_MODEL_AUTO) {
+            this.setModel(PREVIEW_GEMINI_MODEL_AUTO);
+        }
+    }
+    getHasAccessToPreviewModel() {
+        return this.hasAccessToPreviewModel;
+    }
+    setHasAccessToPreviewModel(hasAccess) {
+        this.hasAccessToPreviewModel = hasAccess;
+    }
+    async refreshUserQuota() {
+        const codeAssistServer = getCodeAssistServer(this);
+        if (!codeAssistServer || !codeAssistServer.projectId) {
+            return undefined;
+        }
+        try {
+            const quota = await codeAssistServer.retrieveUserQuota({
+                project: codeAssistServer.projectId,
+            });
+            const hasAccess = quota.buckets?.some((b) => b.modelId === PREVIEW_GEMINI_MODEL) ?? false;
+            this.setHasAccessToPreviewModel(hasAccess);
+            return quota;
+        }
+        catch (e) {
+            debugLogger.debug('Failed to retrieve user quota', e);
+            return undefined;
+        }
     }
     getCoreTools() {
         return this.coreTools;
@@ -626,6 +782,9 @@ export class Config {
     getMcpServers() {
         return this.mcpServers;
     }
+    getMcpEnabled() {
+        return this.mcpEnabled;
+    }
     getMcpClientManager() {
         return this.mcpClientManager;
     }
@@ -635,35 +794,68 @@ export class Config {
     getBlockedMcpServers() {
         return this.blockedMcpServers;
     }
+    get sanitizationConfig() {
+        return {
+            allowedEnvironmentVariables: this.allowedEnvironmentVariables,
+            blockedEnvironmentVariables: this.blockedEnvironmentVariables,
+            enableEnvironmentVariableRedaction: this.enableEnvironmentVariableRedaction,
+        };
+    }
     setMcpServers(mcpServers) {
         this.mcpServers = mcpServers;
     }
     getUserMemory() {
+        if (this.experimentalJitContext && this.contextManager) {
+            return [
+                this.contextManager.getGlobalMemory(),
+                this.contextManager.getEnvironmentMemory(),
+            ]
+                .filter(Boolean)
+                .join('\n\n');
+        }
         return this.userMemory;
     }
     setUserMemory(newUserMemory) {
         this.userMemory = newUserMemory;
     }
+    getGlobalMemory() {
+        return this.contextManager?.getGlobalMemory() ?? '';
+    }
+    getEnvironmentMemory() {
+        return this.contextManager?.getEnvironmentMemory() ?? '';
+    }
+    getContextManager() {
+        return this.contextManager;
+    }
+    isJitContextEnabled() {
+        return this.experimentalJitContext;
+    }
     getGeminiMdFileCount() {
+        if (this.experimentalJitContext && this.contextManager) {
+            return this.contextManager.getLoadedPaths().size;
+        }
         return this.geminiMdFileCount;
     }
     setGeminiMdFileCount(count) {
         this.geminiMdFileCount = count;
     }
     getGeminiMdFilePaths() {
+        if (this.experimentalJitContext && this.contextManager) {
+            return Array.from(this.contextManager.getLoadedPaths());
+        }
         return this.geminiMdFilePaths;
     }
     setGeminiMdFilePaths(paths) {
         this.geminiMdFilePaths = paths;
     }
     getApprovalMode() {
-        return this.approvalMode;
+        return this.policyEngine.getApprovalMode();
     }
     setApprovalMode(mode) {
         if (!this.isTrustedFolder() && mode !== ApprovalMode.DEFAULT) {
             throw new Error('Cannot enable privileged approval modes in an untrusted folder.');
         }
-        this.approvalMode = mode;
+        this.policyEngine.setApprovalMode(mode);
     }
     isYoloModeDisabled() {
         return this.disableYoloMode || !this.isTrustedFolder();
@@ -701,6 +893,9 @@ export class Config {
     getTelemetryUseCollector() {
         return this.telemetrySettings.useCollector ?? false;
     }
+    getTelemetryUseCliAuth() {
+        return this.telemetrySettings.useCliAuth ?? false;
+    }
     getGeminiClient() {
         return this.geminiClient;
     }
@@ -717,6 +912,9 @@ export class Config {
     getModelRouterService() {
         return this.modelRouterService;
     }
+    getModelAvailabilityService() {
+        return this.modelAvailabilityService;
+    }
     getEnableRecursiveFileSearch() {
         return this.fileFiltering.enableRecursiveFileSearch;
     }
@@ -799,6 +997,9 @@ export class Config {
     getEnableExtensionReloading() {
         return this.enableExtensionReloading;
     }
+    isAgentsEnabled() {
+        return this.enableAgents;
+    }
     getNoBrowser() {
         return this.noBrowser;
     }
@@ -822,21 +1023,12 @@ export class Config {
      * 'false' for untrusted.
      */
     isTrustedFolder() {
-        // isWorkspaceTrusted in cli/src/config/trustedFolder.js returns undefined
-        // when the file based trust value is unavailable, since it is mainly used
-        // in the initialization for trust dialogs, etc. Here we return true since
-        // config.isTrustedFolder() is used for the main business logic of blocking
-        // tool calls etc in the rest of the application.
-        //
-        // Default value is true since we load with trusted settings to avoid
-        // restarts in the more common path. If the user chooses to mark the folder
-        // as untrusted, the CLI will restart and we will have the trust value
-        // reloaded.
         const context = ideContextStore.get();
         if (context?.workspaceState?.isTrusted !== undefined) {
             return context.workspaceState.isTrusted;
         }
-        return this.trustedFolder ?? true;
+        // Default to untrusted if folder trust is enabled and no explicit value is set.
+        return this.folderTrust ? (this.trustedFolder ?? false) : true;
     }
     setIdeMode(value) {
         this.ideMode = value;
@@ -895,6 +1087,32 @@ export class Config {
             this.ptyInfo !== 'child_process' &&
             this.enableInteractiveShell);
     }
+    isSkillsSupportEnabled() {
+        return this.skillsSupport;
+    }
+    /**
+     * Reloads skills by re-discovering them from extensions and local directories.
+     */
+    async reloadSkills() {
+        if (!this.skillsSupport) {
+            return;
+        }
+        if (this.onReload) {
+            const refreshed = await this.onReload();
+            this.disabledSkills = refreshed.disabledSkills ?? [];
+        }
+        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));
+        }
+        else {
+            this.getToolRegistry().unregisterTool(ActivateSkillTool.Name);
+        }
+        // Notify the client that system instructions might need updating
+        await this.updateSystemInstructionIfInitialized();
+    }
     isInteractive() {
         return this.interactive;
     }
@@ -916,6 +1134,9 @@ export class Config {
     getEnableShellOutputEfficiency() {
         return this.enableShellOutputEfficiency;
     }
+    getShellToolInactivityTimeout() {
+        return this.shellToolInactivityTimeout;
+    }
     getShellExecutionConfig() {
         return this.shellExecutionConfig;
     }
@@ -925,6 +1146,8 @@ export class Config {
             terminalHeight: config.terminalHeight ?? this.shellExecutionConfig.terminalHeight,
             showColor: config.showColor ?? this.shellExecutionConfig.showColor,
             pager: config.pager ?? this.shellExecutionConfig.pager,
+            sanitizationConfig: config.sanitizationConfig ??
+                this.shellExecutionConfig.sanitizationConfig,
         };
     }
     getScreenReader() {
@@ -945,9 +1168,6 @@ export class Config {
     getTruncateToolOutputLines() {
         return this.truncateToolOutputLines;
     }
-    getUseSmartEdit() {
-        return this.useSmartEdit;
-    }
     getUseWriteTodos() {
         return this.useWriteTodos;
     }
@@ -956,9 +1176,6 @@ export class Config {
             ? this.outputSettings.format
             : OutputFormat.TEXT;
     }
-    getUseModelRouter() {
-        return this.useModelRouter;
-    }
     async getGitService() {
         if (!this.gitService) {
             this.gitService = new GitService(this.targetDir, this.storage);
@@ -975,21 +1192,17 @@ export class Config {
     getPolicyEngine() {
         return this.policyEngine;
     }
-    getEnableMessageBusIntegration() {
-        return this.enableMessageBusIntegration;
-    }
     getEnableHooks() {
         return this.enableHooks;
     }
     getCodebaseInvestigatorSettings() {
         return this.codebaseInvestigatorSettings;
     }
+    getIntrospectionAgentSettings() {
+        return this.introspectionAgentSettings;
+    }
     async createToolRegistry() {
-        const registry = new ToolRegistry(this);
-        // Set message bus on tool registry before discovery so MCP tools can access it
-        if (this.getEnableMessageBusIntegration()) {
-            registry.setMessageBus(this.messageBus);
-        }
+        const registry = new ToolRegistry(this, this.messageBus);
         // helper to create & register core tools that are enabled
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const registerCoreTool = (ToolClass, ...args) => {
@@ -1006,13 +1219,8 @@ export class Config {
                     tool.startsWith(`${normalizedClassName}(`));
             }
             if (isEnabled) {
-                // Pass message bus to tools when feature flag is enabled
-                // This first implementation is only focused on the general case of
-                // the tool registry.
-                const messageBusEnabled = this.getEnableMessageBusIntegration();
-                const toolArgs = messageBusEnabled
-                    ? [...args, this.getMessageBus()]
-                    : args;
+                // Pass message bus to tools (required for policy engine integration)
+                const toolArgs = [...args, this.getMessageBus()];
                 registry.registerTool(new ToolClass(...toolArgs));
             }
         };
@@ -1039,44 +1247,56 @@ export class Config {
             registerCoreTool(GrepTool, this);
         }
         registerCoreTool(GlobTool, this);
-        if (this.getUseSmartEdit()) {
-            registerCoreTool(SmartEditTool, this);
-        }
-        else {
-            registerCoreTool(EditTool, this);
-        }
+        registerCoreTool(ActivateSkillTool, this);
+        registerCoreTool(EditTool, this);
         registerCoreTool(WriteFileTool, this);
         registerCoreTool(WebFetchTool, this);
         registerCoreTool(ShellTool, this);
         registerCoreTool(MemoryTool);
         registerCoreTool(WebSearchTool, this);
         if (this.getUseWriteTodos()) {
-            registerCoreTool(WriteTodosTool, this);
+            registerCoreTool(WriteTodosTool);
         }
         // Register Subagents as Tools
-        if (this.getCodebaseInvestigatorSettings().enabled) {
-            const definition = this.agentRegistry.getDefinition('codebase_investigator');
-            if (definition) {
-                // We must respect the main allowed/exclude lists for agents too.
-                const allowedTools = this.getAllowedTools();
-                const isAllowed = !allowedTools || allowedTools.includes(definition.name);
-                if (isAllowed) {
-                    const messageBusEnabled = this.getEnableMessageBusIntegration();
-                    const wrapper = new SubagentToolWrapper(definition, this, messageBusEnabled ? this.getMessageBus() : undefined);
-                    registry.registerTool(wrapper);
-                }
+        // Register DelegateToAgentTool if agents are enabled
+        if (this.isAgentsEnabled() ||
+            this.getCodebaseInvestigatorSettings().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);
+            if (isAllowed) {
+                const delegateTool = new DelegateToAgentTool(this.agentRegistry, this, this.getMessageBus());
+                registry.registerTool(delegateTool);
             }
         }
         await registry.discoverAllTools();
         registry.sortTools();
         return registry;
     }
+    /**
+     * Get the hook system instance
+     */
+    getHookSystem() {
+        return this.hookSystem;
+    }
     /**
      * Get hooks configuration
      */
     getHooks() {
         return this.hooks;
     }
+    /**
+     * Get project-specific hooks configuration
+     */
+    getProjectHooks() {
+        return this.projectHooks;
+    }
+    /**
+     * Get disabled hooks list
+     */
+    getDisabledHooks() {
+        return this.disabledHooks;
+    }
     /**
      * Get experiments configuration
      */