@office-ai/aioncli-core 0.2.3 → 0.8.1

package/dist/src/config/config.js

@@ -5,48 +5,54 @@
  */
 import * as path from 'node:path';
 import process from 'node:process';
-import { AuthType, createContentGeneratorConfig, } from '../core/contentGenerator.js';
+import { AuthType, createContentGenerator, createContentGeneratorConfig, } from '../core/contentGenerator.js';
 import { PromptRegistry } from '../prompts/prompt-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 { 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';
 import { ReadManyFilesTool } from '../tools/read-many-files.js';
-import { MemoryTool, setGeminiMdFilename, GEMINI_CONFIG_DIR as GEMINI_DIR, } from '../tools/memoryTool.js';
+import { MemoryTool, setGeminiMdFilename } from '../tools/memoryTool.js';
 import { WebSearchTool } from '../tools/web-search.js';
 import { GeminiClient } from '../core/client.js';
+import { BaseLlmClient } from '../core/baseLlmClient.js';
 import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
 import { GitService } from '../services/gitService.js';
-import { getProjectTempDir } from '../utils/paths.js';
-import { initializeTelemetry, DEFAULT_TELEMETRY_TARGET, DEFAULT_OTLP_ENDPOINT, StartSessionEvent, } from '../telemetry/index.js';
+import { initializeTelemetry, DEFAULT_TELEMETRY_TARGET, DEFAULT_OTLP_ENDPOINT, uiTelemetryService, } from '../telemetry/index.js';
+import { tokenLimit } from '../core/tokenLimits.js';
+import { StartSessionEvent } from '../telemetry/index.js';
 import { DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_GEMINI_FLASH_MODEL, } from './models.js';
 import { shouldAttemptBrowserLaunch } from '../utils/browser.js';
-import { IdeClient } from '../ide/ide-client.js';
-import { StandardFileSystemService, } from '../services/fileSystemService.js';
-import { logCliConfiguration, logIdeConnection } from '../telemetry/loggers.js';
-import { IdeConnectionEvent, IdeConnectionType } from '../telemetry/types.js';
+import { ideContextStore } from '../ide/ideContext.js';
+import { WriteTodosTool } from '../tools/write-todos.js';
+import { StandardFileSystemService } from '../services/fileSystemService.js';
+import { logCliConfiguration, logRipgrepFallback, } from '../telemetry/loggers.js';
+import { RipgrepFallbackEvent } from '../telemetry/types.js';
+import { ModelRouterService } from '../routing/modelRouterService.js';
+import { OutputFormat } from '../output/types.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 { ProxyAgent, setGlobalDispatcher } from 'undici';
 export var ApprovalMode;
 (function (ApprovalMode) {
     ApprovalMode["DEFAULT"] = "default";
     ApprovalMode["AUTO_EDIT"] = "autoEdit";
     ApprovalMode["YOLO"] = "yolo";
 })(ApprovalMode || (ApprovalMode = {}));
-// For memory files
-export const DEFAULT_MEMORY_FILE_FILTERING_OPTIONS = {
-    respectGitIgnore: false,
-    respectGeminiIgnore: true,
-};
-// For all other files
-export const DEFAULT_FILE_FILTERING_OPTIONS = {
-    respectGitIgnore: true,
-    respectGeminiIgnore: true,
-};
+import { DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, DEFAULT_FILE_FILTERING_OPTIONS, } from './constants.js';
+export { DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, DEFAULT_FILE_FILTERING_OPTIONS, };
+export const DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD = 4_000_000;
+export const DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES = 1000;
 export class MCPServerConfig {
     command;
     args;
@@ -64,6 +70,8 @@ export class MCPServerConfig {
     extensionName;
     oauth;
     authProviderType;
+    targetAudience;
+    targetServiceAccount;
     constructor(
     // For stdio transport
     command, args, env, cwd, 
@@ -78,7 +86,12 @@ export class MCPServerConfig {
     // Metadata
     description, includeTools, excludeTools, extensionName, 
     // OAuth configuration
-    oauth, authProviderType) {
+    oauth, authProviderType, 
+    // Service Account Configuration
+    /* targetAudience format: CLIENT_ID.apps.googleusercontent.com */
+    targetAudience, 
+    /* targetServiceAccount format: <service-account-name>@<project-num>.iam.gserviceaccount.com */
+    targetServiceAccount) {
         this.command = command;
         this.args = args;
         this.env = env;
@@ -95,12 +108,15 @@ export class MCPServerConfig {
         this.extensionName = extensionName;
         this.oauth = oauth;
         this.authProviderType = authProviderType;
+        this.targetAudience = targetAudience;
+        this.targetServiceAccount = targetServiceAccount;
     }
 }
 export var AuthProviderType;
 (function (AuthProviderType) {
     AuthProviderType["DYNAMIC_DISCOVERY"] = "dynamic_discovery";
     AuthProviderType["GOOGLE_CREDENTIALS"] = "google_credentials";
+    AuthProviderType["SERVICE_ACCOUNT_IMPERSONATION"] = "service_account_impersonation";
 })(AuthProviderType || (AuthProviderType = {}));
 export class Config {
     toolRegistry;
@@ -108,6 +124,7 @@ export class Config {
     sessionId;
     fileSystemService;
     contentGeneratorConfig;
+    contentGenerator;
     embeddingModel;
     sandbox;
     targetDir;
@@ -116,6 +133,7 @@ export class Config {
     question;
     fullContext;
     coreTools;
+    allowedTools;
     excludeTools;
     toolDiscoveryCommand;
     toolCallCommand;
@@ -129,6 +147,8 @@ export class Config {
     telemetrySettings;
     usageStatisticsEnabled;
     geminiClient;
+    baseLlmClient;
+    modelRouterService;
     fileFiltering;
     fileDiscoveryService = null;
     gitService = undefined;
@@ -142,13 +162,12 @@ export class Config {
     folderTrustFeature;
     folderTrust;
     ideMode;
-    ideClient;
     inFallbackMode = false;
     maxSessionTurns;
     listExtensions;
     _extensions;
     _blockedMcpServers;
-    flashFallbackHandler;
+    fallbackModelHandler;
     quotaErrorOccurred = false;
     summarizeToolOutput;
     experimentalZedIntegration = false;
@@ -156,9 +175,26 @@ export class Config {
     chatCompression;
     interactive;
     trustedFolder;
+    useRipgrep;
     shouldUseNodePtyShell;
     skipNextSpeakerCheck;
+    shellExecutionConfig;
+    extensionManagement = true;
+    enablePromptCompletion = false;
+    truncateToolOutputThreshold;
+    truncateToolOutputLines;
+    enableToolOutputTruncation;
     initialized = false;
+    storage;
+    fileExclusions;
+    eventEmitter;
+    useSmartEdit;
+    useWriteTodos;
+    messageBus;
+    policyEngine;
+    outputSettings;
+    useModelRouter;
+    enableMessageBusIntegration;
     constructor(params) {
         this.sessionId = params.sessionId;
         this.embeddingModel =
@@ -171,6 +207,7 @@ export class Config {
         this.question = params.question;
         this.fullContext = params.fullContext ?? false;
         this.coreTools = params.coreTools;
+        this.allowedTools = params.allowedTools;
         this.excludeTools = params.excludeTools;
         this.toolDiscoveryCommand = params.toolDiscoveryCommand;
         this.toolCallCommand = params.toolCallCommand;
@@ -188,12 +225,14 @@ export class Config {
             otlpProtocol: params.telemetry?.otlpProtocol,
             logPrompts: params.telemetry?.logPrompts ?? true,
             outfile: params.telemetry?.outfile,
+            useCollector: params.telemetry?.useCollector,
         };
         this.usageStatisticsEnabled = params.usageStatisticsEnabled ?? true;
         this.fileFiltering = {
             respectGitIgnore: params.fileFiltering?.respectGitIgnore ?? true,
             respectGeminiIgnore: params.fileFiltering?.respectGeminiIgnore ?? true,
             enableRecursiveFileSearch: params.fileFiltering?.enableRecursiveFileSearch ?? true,
+            disableFuzzySearch: params.fileFiltering?.disableFuzzySearch ?? false,
         };
         this.checkpointing = params.checkpointing ?? false;
         this.proxy = params.proxy;
@@ -213,21 +252,52 @@ export class Config {
         this.folderTrustFeature = params.folderTrustFeature ?? false;
         this.folderTrust = params.folderTrust ?? false;
         this.ideMode = params.ideMode ?? false;
-        this.ideClient = IdeClient.getInstance();
         this.loadMemoryFromIncludeDirectories =
             params.loadMemoryFromIncludeDirectories ?? false;
         this.chatCompression = params.chatCompression;
         this.interactive = params.interactive ?? false;
         this.trustedFolder = params.trustedFolder;
+        this.useRipgrep = params.useRipgrep ?? true;
         this.shouldUseNodePtyShell = params.shouldUseNodePtyShell ?? false;
-        this.skipNextSpeakerCheck = params.skipNextSpeakerCheck ?? false;
+        this.skipNextSpeakerCheck = params.skipNextSpeakerCheck ?? true;
+        this.shellExecutionConfig = {
+            terminalWidth: params.shellExecutionConfig?.terminalWidth ?? 80,
+            terminalHeight: params.shellExecutionConfig?.terminalHeight ?? 24,
+            showColor: params.shellExecutionConfig?.showColor ?? false,
+            pager: params.shellExecutionConfig?.pager ?? 'cat',
+        };
+        this.truncateToolOutputThreshold =
+            params.truncateToolOutputThreshold ??
+                DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD;
+        this.truncateToolOutputLines =
+            params.truncateToolOutputLines ?? DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES;
+        this.enableToolOutputTruncation = params.enableToolOutputTruncation ?? true;
+        this.useSmartEdit = params.useSmartEdit ?? true;
+        this.useWriteTodos = params.useWriteTodos ?? false;
+        this.useModelRouter = params.useModelRouter ?? false;
+        this.enableMessageBusIntegration =
+            params.enableMessageBusIntegration ?? false;
+        this.extensionManagement = params.extensionManagement ?? true;
+        this.storage = new Storage(this.targetDir);
+        this.enablePromptCompletion = params.enablePromptCompletion ?? false;
+        this.fileExclusions = new FileExclusions(this);
+        this.eventEmitter = params.eventEmitter;
+        this.policyEngine = new PolicyEngine(params.policyEngineConfig);
+        this.messageBus = new MessageBus(this.policyEngine);
+        this.outputSettings = {
+            format: params.output?.format ?? OutputFormat.TEXT,
+        };
         if (params.contextFileName) {
             setGeminiMdFilename(params.contextFileName);
         }
         if (this.telemetrySettings.enabled) {
             initializeTelemetry(this);
         }
-        logCliConfiguration(this, new StartSessionEvent(this));
+        if (this.getProxy()) {
+            setGlobalDispatcher(new ProxyAgent(this.getProxy()));
+        }
+        this.geminiClient = new GeminiClient(this);
+        this.modelRouterService = new ModelRouterService(this);
     }
     /**
      * Must only be called once, throws if called again.
@@ -244,40 +314,51 @@ export class Config {
         }
         this.promptRegistry = new PromptRegistry();
         this.toolRegistry = await this.createToolRegistry();
+        await this.geminiClient.initialize();
+    }
+    getContentGenerator() {
+        return this.contentGenerator;
     }
     async refreshAuth(authMethod) {
-        // Save the current conversation history before creating a new client
-        let existingHistory = [];
-        if (this.geminiClient && this.geminiClient.isInitialized()) {
-            existingHistory = this.geminiClient.getHistory();
-        }
-        // Create new content generator config
-        const newContentGeneratorConfig = createContentGeneratorConfig(this, authMethod);
-        // Create and initialize new client in local variable first
-        const newGeminiClient = new GeminiClient(this);
-        await newGeminiClient.initialize(newContentGeneratorConfig);
         // Vertex and Genai have incompatible encryption and sending history with
         // throughtSignature from Genai to Vertex will fail, we need to strip them
-        const fromGenaiToVertex = this.contentGeneratorConfig?.authType === AuthType.USE_GEMINI &&
-            authMethod === AuthType.LOGIN_WITH_GOOGLE;
+        if (this.contentGeneratorConfig?.authType === AuthType.USE_GEMINI &&
+            authMethod === AuthType.LOGIN_WITH_GOOGLE) {
+            // Restore the conversation history to the new client
+            this.geminiClient.stripThoughtsFromHistory();
+        }
+        const newContentGeneratorConfig = createContentGeneratorConfig(this, authMethod);
+        this.contentGenerator = await createContentGenerator(newContentGeneratorConfig, this, this.getSessionId());
         // Only assign to instance properties after successful initialization
         this.contentGeneratorConfig = newContentGeneratorConfig;
-        this.geminiClient = newGeminiClient;
-        // Restore the conversation history to the new client
-        if (existingHistory.length > 0) {
-            this.geminiClient.setHistory(existingHistory, {
-                stripThoughts: fromGenaiToVertex,
-            });
-        }
+        // Initialize BaseLlmClient now that the ContentGenerator is available
+        this.baseLlmClient = new BaseLlmClient(this.contentGenerator, this);
         // Reset the session flag since we're explicitly changing auth and using default model
         this.inFallbackMode = false;
+        // Logging the cli configuration here as the auth related configuration params would have been loaded by this point
+        logCliConfiguration(this, new StartSessionEvent(this, this.toolRegistry));
+    }
+    getUserTier() {
+        return this.contentGenerator?.userTier;
+    }
+    /**
+     * Provides access to the BaseLlmClient for stateless LLM operations.
+     */
+    getBaseLlmClient() {
+        if (!this.baseLlmClient) {
+            // Handle cases where initialization might be deferred or authentication failed
+            if (this.contentGenerator) {
+                this.baseLlmClient = new BaseLlmClient(this.getContentGenerator(), this);
+            }
+            else {
+                throw new Error('BaseLlmClient not initialized. Ensure authentication has occurred and ContentGenerator is ready.');
+            }
+        }
+        return this.baseLlmClient;
     }
     getSessionId() {
         return this.sessionId;
     }
-    setSessionId(sessionId) {
-        this.sessionId = sessionId;
-    }
     shouldLoadMemoryFromIncludeDirectories() {
         return this.loadMemoryFromIncludeDirectories;
     }
@@ -285,12 +366,14 @@ export class Config {
         return this.contentGeneratorConfig;
     }
     getModel() {
-        return this.contentGeneratorConfig?.model || this.model;
+        return this.model;
     }
     setModel(newModel) {
-        if (this.contentGeneratorConfig) {
-            this.contentGeneratorConfig.model = newModel;
+        // Do not allow Pro usage if the user is in fallback mode.
+        if (newModel.includes('pro') && this.isInFallbackMode()) {
+            return;
         }
+        this.model = newModel;
     }
     isInFallbackMode() {
         return this.inFallbackMode;
@@ -298,10 +381,8 @@ export class Config {
     setFallbackMode(active) {
         this.inFallbackMode = active;
     }
-    setFlashFallbackHandler(handler) {
-        console.log(`[Config] Registering flashFallbackHandler`);
-        this.flashFallbackHandler = handler;
-        console.log(`[Config] FlashFallbackHandler registered successfully`);
+    setFallbackModelHandler(handler) {
+        this.fallbackModelHandler = handler;
     }
     getMaxSessionTurns() {
         return this.maxSessionTurns;
@@ -353,6 +434,9 @@ export class Config {
     getCoreTools() {
         return this.coreTools;
     }
+    getAllowedTools() {
+        return this.allowedTools;
+    }
     getExcludeTools() {
         return this.excludeTools;
     }
@@ -384,6 +468,9 @@ export class Config {
         return this.approvalMode;
     }
     setApprovalMode(mode) {
+        if (!this.isTrustedFolder() && mode !== ApprovalMode.DEFAULT) {
+            throw new Error('Cannot enable privileged approval modes in an untrusted folder.');
+        }
         this.approvalMode = mode;
     }
     getShowMemoryUsage() {
@@ -410,18 +497,21 @@ export class Config {
     getTelemetryOutfile() {
         return this.telemetrySettings.outfile;
     }
+    getTelemetryUseCollector() {
+        return this.telemetrySettings.useCollector ?? false;
+    }
     getGeminiClient() {
         return this.geminiClient;
     }
-    getGeminiDir() {
-        return path.join(this.targetDir, GEMINI_DIR);
-    }
-    getProjectTempDir() {
-        return getProjectTempDir(this.getProjectRoot());
+    getModelRouterService() {
+        return this.modelRouterService;
     }
     getEnableRecursiveFileSearch() {
         return this.fileFiltering.enableRecursiveFileSearch;
     }
+    getFileFilteringDisableFuzzySearch() {
+        return this.fileFiltering.disableFuzzySearch;
+    }
     getFileFilteringRespectGitIgnore() {
         return this.fileFiltering.respectGitIgnore;
     }
@@ -434,6 +524,20 @@ export class Config {
             respectGeminiIgnore: this.fileFiltering.respectGeminiIgnore,
         };
     }
+    /**
+     * Gets custom file exclusion patterns from configuration.
+     * TODO: This is a placeholder implementation. In the future, this could
+     * read from settings files, CLI arguments, or environment variables.
+     */
+    getCustomExcludes() {
+        // Placeholder implementation - returns empty array for now
+        // Future implementation could read from:
+        // - User settings file
+        // - Project-specific configuration
+        // - Environment variables
+        // - CLI arguments
+        return [];
+    }
     getCheckpointingEnabled() {
         return this.checkpointing;
     }
@@ -464,6 +568,9 @@ export class Config {
     getListExtensions() {
         return this.listExtensions;
     }
+    getExtensionManagement() {
+        return this.extensionManagement;
+    }
     getExtensions() {
         return this._extensions;
     }
@@ -485,28 +592,33 @@ export class Config {
     getFolderTrustFeature() {
         return this.folderTrustFeature;
     }
+    /**
+     * Returns 'true' if the workspace is considered "trusted".
+     * 'false' for untrusted.
+     */
     getFolderTrust() {
         return this.folderTrust;
     }
     isTrustedFolder() {
-        return this.trustedFolder;
+        // 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;
     }
     setIdeMode(value) {
         this.ideMode = value;
     }
-    async setIdeModeAndSyncConnection(value) {
-        this.ideMode = value;
-        if (value) {
-            await this.ideClient.connect();
-            logIdeConnection(this, new IdeConnectionEvent(IdeConnectionType.SESSION));
-        }
-        else {
-            await this.ideClient.disconnect();
-        }
-    }
-    getIdeClient() {
-        return this.ideClient;
-    }
     /**
      * Get the current FileSystemService
      */
@@ -525,57 +637,154 @@ export class Config {
     isInteractive() {
         return this.interactive;
     }
+    getUseRipgrep() {
+        return this.useRipgrep;
+    }
     getShouldUseNodePtyShell() {
         return this.shouldUseNodePtyShell;
     }
     getSkipNextSpeakerCheck() {
         return this.skipNextSpeakerCheck;
     }
+    getShellExecutionConfig() {
+        return this.shellExecutionConfig;
+    }
+    setShellExecutionConfig(config) {
+        this.shellExecutionConfig = {
+            terminalWidth: config.terminalWidth ?? this.shellExecutionConfig.terminalWidth,
+            terminalHeight: config.terminalHeight ?? this.shellExecutionConfig.terminalHeight,
+            showColor: config.showColor ?? this.shellExecutionConfig.showColor,
+            pager: config.pager ?? this.shellExecutionConfig.pager,
+        };
+    }
+    getScreenReader() {
+        return this.accessibility.screenReader ?? false;
+    }
+    getEnablePromptCompletion() {
+        return this.enablePromptCompletion;
+    }
+    getEnableToolOutputTruncation() {
+        return this.enableToolOutputTruncation;
+    }
+    getTruncateToolOutputThreshold() {
+        return Math.min(
+        // Estimate remaining context window in characters (1 token ~= 4 chars).
+        4 *
+            (tokenLimit(this.model) - uiTelemetryService.getLastPromptTokenCount()), this.truncateToolOutputThreshold);
+    }
+    getTruncateToolOutputLines() {
+        return this.truncateToolOutputLines;
+    }
+    getUseSmartEdit() {
+        return this.useSmartEdit;
+    }
+    getUseWriteTodos() {
+        return this.useWriteTodos;
+    }
+    getOutputFormat() {
+        return this.outputSettings?.format
+            ? this.outputSettings.format
+            : OutputFormat.TEXT;
+    }
+    getUseModelRouter() {
+        return this.useModelRouter;
+    }
     async getGitService() {
         if (!this.gitService) {
-            this.gitService = new GitService(this.targetDir);
+            this.gitService = new GitService(this.targetDir, this.storage);
             await this.gitService.initialize();
         }
         return this.gitService;
     }
+    getFileExclusions() {
+        return this.fileExclusions;
+    }
+    getMessageBus() {
+        return this.messageBus;
+    }
+    getPolicyEngine() {
+        return this.policyEngine;
+    }
+    getEnableMessageBusIntegration() {
+        return this.enableMessageBusIntegration;
+    }
     async createToolRegistry() {
-        const registry = new ToolRegistry(this);
+        const registry = new ToolRegistry(this, this.eventEmitter);
         // helper to create & register core tools that are enabled
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const registerCoreTool = (ToolClass, ...args) => {
             const className = ToolClass.name;
             const toolName = ToolClass.Name || className;
             const coreTools = this.getCoreTools();
-            const excludeTools = this.getExcludeTools();
-            let isEnabled = false;
-            if (coreTools === undefined) {
-                isEnabled = true;
-            }
-            else {
-                isEnabled = coreTools.some((tool) => tool === className ||
-                    tool === toolName ||
-                    tool.startsWith(`${className}(`) ||
-                    tool.startsWith(`${toolName}(`));
+            const excludeTools = this.getExcludeTools() || [];
+            // On some platforms, the className can be minified to _ClassName.
+            const normalizedClassName = className.replace(/^_+/, '');
+            let isEnabled = true; // Enabled by default if coreTools is not set.
+            if (coreTools) {
+                isEnabled = coreTools.some((tool) => tool === toolName ||
+                    tool === normalizedClassName ||
+                    tool.startsWith(`${toolName}(`) ||
+                    tool.startsWith(`${normalizedClassName}(`));
             }
-            if (excludeTools?.includes(className) ||
-                excludeTools?.includes(toolName)) {
+            const isExcluded = excludeTools.some((tool) => tool === toolName || tool === normalizedClassName);
+            if (isExcluded) {
                 isEnabled = false;
             }
             if (isEnabled) {
-                registry.registerTool(new ToolClass(...args));
+                // 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();
+                if (this.debugMode && messageBusEnabled) {
+                    console.log(`[DEBUG] enableMessageBusIntegration setting: ${messageBusEnabled}`);
+                }
+                const toolArgs = messageBusEnabled
+                    ? [...args, this.getMessageBus()]
+                    : args;
+                if (this.debugMode && messageBusEnabled) {
+                    console.log(`[DEBUG] Registering ${className} with messageBus: ${messageBusEnabled ? 'YES' : 'NO'}`);
+                }
+                registry.registerTool(new ToolClass(...toolArgs));
             }
         };
         registerCoreTool(LSTool, this);
         registerCoreTool(ReadFileTool, this);
-        registerCoreTool(GrepTool, this);
+        if (this.getUseRipgrep()) {
+            let useRipgrep = false;
+            let errorString = undefined;
+            try {
+                useRipgrep = await canUseRipgrep();
+            }
+            catch (error) {
+                errorString = String(error);
+            }
+            if (useRipgrep) {
+                registerCoreTool(RipGrepTool, this);
+            }
+            else {
+                logRipgrepFallback(this, new RipgrepFallbackEvent(errorString));
+                registerCoreTool(GrepTool, this);
+            }
+        }
+        else {
+            registerCoreTool(GrepTool, this);
+        }
         registerCoreTool(GlobTool, this);
-        registerCoreTool(EditTool, this);
+        if (this.getUseSmartEdit()) {
+            registerCoreTool(SmartEditTool, this);
+        }
+        else {
+            registerCoreTool(EditTool, this);
+        }
         registerCoreTool(WriteFileTool, this);
         registerCoreTool(WebFetchTool, this);
         registerCoreTool(ReadManyFilesTool, this);
         registerCoreTool(ShellTool, this);
         registerCoreTool(MemoryTool);
         registerCoreTool(WebSearchTool, this);
+        if (this.getUseWriteTodos()) {
+            registerCoreTool(WriteTodosTool, this);
+        }
         await registry.discoverAllTools();
         return registry;
     }