@machina.ai/cell-cli-core 1.8.2-rc1 → 1.11.0-rc1

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

@@ -29,6 +29,7 @@ import { MessageBus } from '../confirmation-bus/message-bus.js';
 import { PolicyEngine } from '../policy/policy-engine.js';
 import type { PolicyEngineConfig } from '../policy/types.js';
 import type { UserTierId } from '../code_assist/types.js';
+import { AgentRegistry } from '../agents/registry.js';
 export declare enum ApprovalMode {
     DEFAULT = "default",
     AUTO_EDIT = "autoEdit",
@@ -59,12 +60,29 @@ export interface TelemetrySettings {
 export interface OutputSettings {
     format?: OutputFormat;
 }
+export interface CodebaseInvestigatorSettings {
+    enabled?: boolean;
+    maxNumTurns?: number;
+    maxTimeMinutes?: number;
+    thinkingBudget?: number;
+    model?: string;
+}
+/**
+ * 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
+ * around on the config object though Core does not use this information
+ * directly.
+ */
 export interface GeminiCLIExtension {
     name: string;
     version: string;
     isActive: boolean;
     path: string;
     installMetadata?: ExtensionInstallMetadata;
+    mcpServers?: Record<string, MCPServerConfig>;
+    contextFiles: string[];
+    excludeTools?: string[];
+    id: string;
 }
 export interface ExtensionInstallMetadata {
     source: string;
@@ -72,11 +90,12 @@ export interface ExtensionInstallMetadata {
     releaseTag?: string;
     ref?: string;
     autoUpdate?: boolean;
+    allowPreRelease?: boolean;
 }
 import type { FileFilteringOptions } from './constants.js';
-import { DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, DEFAULT_FILE_FILTERING_OPTIONS } from './constants.js';
+import { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS } from './constants.js';
 export type { FileFilteringOptions };
-export { DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, DEFAULT_FILE_FILTERING_OPTIONS, };
+export { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, };
 export declare const DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD = 4000000;
 export declare const DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES = 1000;
 export declare class MCPServerConfig {
@@ -93,12 +112,12 @@ export declare class MCPServerConfig {
     readonly description?: string | undefined;
     readonly includeTools?: string[] | undefined;
     readonly excludeTools?: string[] | undefined;
-    readonly extensionName?: string | undefined;
+    readonly extension?: GeminiCLIExtension | undefined;
     readonly oauth?: MCPOAuthConfig | undefined;
     readonly authProviderType?: AuthProviderType | undefined;
     readonly targetAudience?: string | undefined;
     readonly targetServiceAccount?: string | undefined;
-    constructor(command?: string | undefined, args?: string[] | undefined, env?: Record<string, string> | undefined, cwd?: string | undefined, url?: string | undefined, httpUrl?: string | undefined, headers?: Record<string, string> | undefined, tcp?: string | undefined, timeout?: number | undefined, trust?: boolean | undefined, description?: string | undefined, includeTools?: string[] | undefined, excludeTools?: string[] | undefined, extensionName?: string | undefined, oauth?: MCPOAuthConfig | undefined, authProviderType?: AuthProviderType | undefined, targetAudience?: string | undefined, targetServiceAccount?: string | undefined);
+    constructor(command?: string | undefined, args?: string[] | undefined, env?: Record<string, string> | undefined, cwd?: string | undefined, url?: string | undefined, httpUrl?: string | undefined, headers?: Record<string, string> | undefined, tcp?: string | undefined, timeout?: number | undefined, trust?: boolean | undefined, description?: string | undefined, includeTools?: string[] | undefined, excludeTools?: string[] | undefined, extension?: GeminiCLIExtension | undefined, oauth?: MCPOAuthConfig | undefined, authProviderType?: AuthProviderType | undefined, targetAudience?: string | undefined, targetServiceAccount?: string | undefined);
 }
 export declare enum AuthProviderType {
     DYNAMIC_DISCOVERY = "dynamic_discovery",
@@ -116,7 +135,6 @@ export interface ConfigParameters {
     targetDir: string;
     debugMode: boolean;
     question?: string;
-    fullContext?: boolean;
     coreTools?: string[];
     allowedTools?: string[];
     excludeTools?: string[];
@@ -126,6 +144,7 @@ export interface ConfigParameters {
     mcpServers?: Record<string, MCPServerConfig>;
     userMemory?: string;
     geminiMdFileCount?: number;
+    geminiMdFilePaths?: string[];
     approvalMode?: ApprovalMode;
     showMemoryUsage?: boolean;
     contextFileName?: string | string[];
@@ -149,18 +168,17 @@ export interface ConfigParameters {
     includeDirectories?: string[];
     bugCommand?: BugCommandSettings;
     model: string;
-    extensionContextFilePaths?: string[];
     maxSessionTurns?: number;
     experimentalZedIntegration?: boolean;
     listExtensions?: boolean;
     extensions?: GeminiCLIExtension[];
+    enabledExtensions?: string[];
     blockedMcpServers?: Array<{
         name: string;
         extensionName: string;
     }>;
     noBrowser?: boolean;
     summarizeToolOutput?: Record<string, SummarizeToolOutputSettings>;
-    folderTrustFeature?: boolean;
     folderTrust?: boolean;
     ideMode?: boolean;
     loadMemoryFromIncludeDirectories?: boolean;
@@ -168,7 +186,7 @@ export interface ConfigParameters {
     interactive?: boolean;
     trustedFolder?: boolean;
     useRipgrep?: boolean;
-    shouldUseNodePtyShell?: boolean;
+    enableInteractiveShell?: boolean;
     skipNextSpeakerCheck?: boolean;
     shellExecutionConfig?: ShellExecutionConfig;
     extensionManagement?: boolean;
@@ -183,10 +201,17 @@ export interface ConfigParameters {
     output?: OutputSettings;
     useModelRouter?: boolean;
     enableMessageBusIntegration?: boolean;
+    disableModelRouterForAuth?: AuthType[];
+    codebaseInvestigatorSettings?: CodebaseInvestigatorSettings;
+    continueOnFailedApiCall?: boolean;
+    retryFetchErrors?: boolean;
+    enableShellOutputEfficiency?: boolean;
+    ptyInfo?: string;
 }
 export declare class Config {
     private toolRegistry;
     private promptRegistry;
+    private agentRegistry;
     private readonly sessionId;
     private fileSystemService;
     private contentGeneratorConfig;
@@ -197,7 +222,6 @@ export declare class Config {
     private workspaceContext;
     private readonly debugMode;
     private readonly question;
-    private readonly fullContext;
     private readonly coreTools;
     private readonly allowedTools;
     private readonly excludeTools;
@@ -207,6 +231,7 @@ export declare class Config {
     private readonly mcpServers;
     private userMemory;
     private geminiMdFileCount;
+    private geminiMdFilePaths;
     private approvalMode;
     private readonly showMemoryUsage;
     private readonly accessibility;
@@ -227,15 +252,14 @@ export declare class Config {
     private readonly cwd;
     private readonly bugCommand;
     private model;
-    private readonly extensionContextFilePaths;
     private readonly noBrowser;
-    private readonly folderTrustFeature;
     private readonly folderTrust;
     private ideMode;
     private inFallbackMode;
     private readonly maxSessionTurns;
     private readonly listExtensions;
     private readonly _extensions;
+    private readonly _enabledExtensions;
     private readonly _blockedMcpServers;
     fallbackModelHandler?: FallbackModelHandler;
     private quotaErrorOccurred;
@@ -244,9 +268,10 @@ export declare class Config {
     private readonly loadMemoryFromIncludeDirectories;
     private readonly chatCompression;
     private readonly interactive;
+    private readonly ptyInfo;
     private readonly trustedFolder;
     private readonly useRipgrep;
-    private readonly shouldUseNodePtyShell;
+    private readonly enableInteractiveShell;
     private readonly skipNextSpeakerCheck;
     private shellExecutionConfig;
     private readonly extensionManagement;
@@ -263,8 +288,14 @@ export declare class Config {
     private readonly messageBus;
     private readonly policyEngine;
     private readonly outputSettings;
-    private readonly useModelRouter;
+    private useModelRouter;
+    private readonly initialUseModelRouter;
+    private readonly disableModelRouterForAuth?;
     private readonly enableMessageBusIntegration;
+    private readonly codebaseInvestigatorSettings;
+    private readonly continueOnFailedApiCall;
+    private readonly retryFetchErrors;
+    private readonly enableShellOutputEfficiency;
     constructor(params: ConfigParameters);
     /**
      * Must only be called once, throws if called again.
@@ -294,11 +325,11 @@ export declare class Config {
     getTargetDir(): string;
     getProjectRoot(): string;
     getWorkspaceContext(): WorkspaceContext;
+    getAgentRegistry(): AgentRegistry;
     getToolRegistry(): ToolRegistry;
     getPromptRegistry(): PromptRegistry;
     getDebugMode(): boolean;
     getQuestion(): string | undefined;
-    getFullContext(): boolean;
     getCoreTools(): string[] | undefined;
     getAllowedTools(): string[] | undefined;
     getExcludeTools(): string[] | undefined;
@@ -310,6 +341,8 @@ export declare class Config {
     setUserMemory(newUserMemory: string): void;
     getGeminiMdFileCount(): number;
     setGeminiMdFileCount(count: number): void;
+    getGeminiMdFilePaths(): string[];
+    setGeminiMdFilePaths(paths: string[]): void;
     getApprovalMode(): ApprovalMode;
     setApprovalMode(mode: ApprovalMode): void;
     getShowMemoryUsage(): boolean;
@@ -344,11 +377,11 @@ export declare class Config {
     getBugCommand(): BugCommandSettings | undefined;
     getFileService(): FileDiscoveryService;
     getUsageStatisticsEnabled(): boolean;
-    getExtensionContextFilePaths(): string[];
     getExperimentalZedIntegration(): boolean;
     getListExtensions(): boolean;
     getExtensionManagement(): boolean;
     getExtensions(): GeminiCLIExtension[];
+    getEnabledExtensions(): string[];
     getBlockedMcpServers(): Array<{
         name: string;
         extensionName: string;
@@ -357,12 +390,14 @@ export declare class Config {
     isBrowserLaunchSuppressed(): boolean;
     getSummarizeToolOutputConfig(): Record<string, SummarizeToolOutputSettings> | undefined;
     getIdeMode(): boolean;
-    getFolderTrustFeature(): boolean;
+    /**
+     * Returns 'true' if the folder trust feature is enabled.
+     */
+    getFolderTrust(): boolean;
     /**
      * Returns 'true' if the workspace is considered "trusted".
      * 'false' for untrusted.
      */
-    getFolderTrust(): boolean;
     isTrustedFolder(): boolean;
     setIdeMode(value: boolean): void;
     /**
@@ -374,10 +409,14 @@ export declare class Config {
      */
     setFileSystemService(fileSystemService: FileSystemService): void;
     getChatCompression(): ChatCompressionSettings | undefined;
+    isInteractiveShellEnabled(): boolean;
     isInteractive(): boolean;
     getUseRipgrep(): boolean;
-    getShouldUseNodePtyShell(): boolean;
+    getEnableInteractiveShell(): boolean;
     getSkipNextSpeakerCheck(): boolean;
+    getContinueOnFailedApiCall(): boolean;
+    getRetryFetchErrors(): boolean;
+    getEnableShellOutputEfficiency(): boolean;
     getShellExecutionConfig(): ShellExecutionConfig;
     setShellExecutionConfig(config: ShellExecutionConfig): void;
     getScreenReader(): boolean;
@@ -394,6 +433,7 @@ export declare class Config {
     getMessageBus(): MessageBus;
     getPolicyEngine(): PolicyEngine;
     getEnableMessageBusIntegration(): boolean;
+    getCodebaseInvestigatorSettings(): CodebaseInvestigatorSettings;
     createToolRegistry(): Promise<ToolRegistry>;
 }
 export { DEFAULT_GEMINI_FLASH_MODEL };

package/dist/src/config/config.js

@@ -28,7 +28,7 @@ import { GitService } from '../services/gitService.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 { DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, DEFAULT_THINKING_MODE, } from './models.js';
 import { shouldAttemptBrowserLaunch } from '../utils/browser.js';
 import { ideContextStore } from '../ide/ideContext.js';
 import { WriteTodosTool } from '../tools/write-todos.js';
@@ -42,15 +42,18 @@ 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';
+import { AgentRegistry } from '../agents/registry.js';
+import { setGlobalProxy } from '../utils/fetch.js';
+import { SubagentToolWrapper } from '../agents/subagent-tool-wrapper.js';
 export var ApprovalMode;
 (function (ApprovalMode) {
     ApprovalMode["DEFAULT"] = "default";
     ApprovalMode["AUTO_EDIT"] = "autoEdit";
     ApprovalMode["YOLO"] = "yolo";
 })(ApprovalMode || (ApprovalMode = {}));
-import { DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, DEFAULT_FILE_FILTERING_OPTIONS, } from './constants.js';
-export { DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, DEFAULT_FILE_FILTERING_OPTIONS, };
+import { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, } from './constants.js';
+import { debugLogger } from '../utils/debugLogger.js';
+export { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, };
 export const DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD = 4_000_000;
 export const DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES = 1000;
 export class MCPServerConfig {
@@ -67,7 +70,7 @@ export class MCPServerConfig {
     description;
     includeTools;
     excludeTools;
-    extensionName;
+    extension;
     oauth;
     authProviderType;
     targetAudience;
@@ -84,7 +87,7 @@ export class MCPServerConfig {
     // Common
     timeout, trust, 
     // Metadata
-    description, includeTools, excludeTools, extensionName, 
+    description, includeTools, excludeTools, extension, 
     // OAuth configuration
     oauth, authProviderType, 
     // Service Account Configuration
@@ -105,7 +108,7 @@ export class MCPServerConfig {
         this.description = description;
         this.includeTools = includeTools;
         this.excludeTools = excludeTools;
-        this.extensionName = extensionName;
+        this.extension = extension;
         this.oauth = oauth;
         this.authProviderType = authProviderType;
         this.targetAudience = targetAudience;
@@ -121,6 +124,7 @@ export var AuthProviderType;
 export class Config {
     toolRegistry;
     promptRegistry;
+    agentRegistry;
     sessionId;
     fileSystemService;
     contentGeneratorConfig;
@@ -131,7 +135,6 @@ export class Config {
     workspaceContext;
     debugMode;
     question;
-    fullContext;
     coreTools;
     allowedTools;
     excludeTools;
@@ -141,6 +144,7 @@ export class Config {
     mcpServers;
     userMemory;
     geminiMdFileCount;
+    geminiMdFilePaths;
     approvalMode;
     showMemoryUsage;
     accessibility;
@@ -161,15 +165,14 @@ export class Config {
     cwd;
     bugCommand;
     model;
-    extensionContextFilePaths;
     noBrowser;
-    folderTrustFeature;
     folderTrust;
     ideMode;
     inFallbackMode = false;
     maxSessionTurns;
     listExtensions;
     _extensions;
+    _enabledExtensions;
     _blockedMcpServers;
     fallbackModelHandler;
     quotaErrorOccurred = false;
@@ -178,9 +181,10 @@ export class Config {
     loadMemoryFromIncludeDirectories = false;
     chatCompression;
     interactive;
+    ptyInfo;
     trustedFolder;
     useRipgrep;
-    shouldUseNodePtyShell;
+    enableInteractiveShell;
     skipNextSpeakerCheck;
     shellExecutionConfig;
     extensionManagement = true;
@@ -198,7 +202,13 @@ export class Config {
     policyEngine;
     outputSettings;
     useModelRouter;
+    initialUseModelRouter;
+    disableModelRouterForAuth;
     enableMessageBusIntegration;
+    codebaseInvestigatorSettings;
+    continueOnFailedApiCall;
+    retryFetchErrors;
+    enableShellOutputEfficiency;
     constructor(params) {
         this.sessionId = params.sessionId;
         this.embeddingModel =
@@ -209,7 +219,6 @@ export class Config {
         this.workspaceContext = new WorkspaceContext(this.targetDir, params.includeDirectories ?? []);
         this.debugMode = params.debugMode;
         this.question = params.question;
-        this.fullContext = params.fullContext ?? false;
         this.coreTools = params.coreTools;
         this.allowedTools = params.allowedTools;
         this.excludeTools = params.excludeTools;
@@ -219,6 +228,7 @@ export class Config {
         this.mcpServers = params.mcpServers;
         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 ?? {};
@@ -233,8 +243,10 @@ export class Config {
         };
         this.usageStatisticsEnabled = params.usageStatisticsEnabled ?? true;
         this.fileFiltering = {
-            respectGitIgnore: params.fileFiltering?.respectGitIgnore ?? true,
-            respectGeminiIgnore: params.fileFiltering?.respectGeminiIgnore ?? true,
+            respectGitIgnore: params.fileFiltering?.respectGitIgnore ??
+                DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
+            respectGeminiIgnore: params.fileFiltering?.respectGeminiIgnore ??
+                DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore,
             enableRecursiveFileSearch: params.fileFiltering?.enableRecursiveFileSearch ?? true,
             disableFuzzySearch: params.fileFiltering?.disableFuzzySearch ?? false,
         };
@@ -248,25 +260,25 @@ export class Config {
         this.fileDiscoveryService = params.fileDiscoveryService ?? null;
         this.bugCommand = params.bugCommand;
         this.model = params.model;
-        this.extensionContextFilePaths = params.extensionContextFilePaths ?? [];
         this.maxSessionTurns = params.maxSessionTurns ?? -1;
         this.experimentalZedIntegration =
             params.experimentalZedIntegration ?? false;
         this.listExtensions = params.listExtensions ?? false;
         this._extensions = params.extensions ?? [];
+        this._enabledExtensions = params.enabledExtensions ?? [];
         this._blockedMcpServers = params.blockedMcpServers ?? [];
         this.noBrowser = params.noBrowser ?? false;
         this.summarizeToolOutput = params.summarizeToolOutput;
-        this.folderTrustFeature = params.folderTrustFeature ?? false;
         this.folderTrust = params.folderTrust ?? false;
         this.ideMode = params.ideMode ?? false;
         this.loadMemoryFromIncludeDirectories =
             params.loadMemoryFromIncludeDirectories ?? false;
         this.chatCompression = params.chatCompression;
         this.interactive = params.interactive ?? false;
+        this.ptyInfo = params.ptyInfo ?? 'child_process';
         this.trustedFolder = params.trustedFolder;
         this.useRipgrep = params.useRipgrep ?? true;
-        this.shouldUseNodePtyShell = params.shouldUseNodePtyShell ?? false;
+        this.enableInteractiveShell = params.enableInteractiveShell ?? false;
         this.skipNextSpeakerCheck = params.skipNextSpeakerCheck ?? true;
         this.shellExecutionConfig = {
             terminalWidth: params.shellExecutionConfig?.terminalWidth ?? 80,
@@ -282,19 +294,35 @@ export class Config {
         this.enableToolOutputTruncation = params.enableToolOutputTruncation ?? true;
         this.useSmartEdit = params.useSmartEdit ?? true;
         this.useWriteTodos = params.useWriteTodos ?? false;
-        this.useModelRouter = params.useModelRouter ?? false;
+        this.initialUseModelRouter = params.useModelRouter ?? false;
+        this.useModelRouter = this.initialUseModelRouter;
+        this.disableModelRouterForAuth = params.disableModelRouterForAuth ?? [
+            AuthType.LOGIN_WITH_GOOGLE,
+        ];
         this.enableMessageBusIntegration =
             params.enableMessageBusIntegration ?? false;
+        this.codebaseInvestigatorSettings = {
+            enabled: params.codebaseInvestigatorSettings?.enabled ?? false,
+            maxNumTurns: params.codebaseInvestigatorSettings?.maxNumTurns ?? 15,
+            maxTimeMinutes: params.codebaseInvestigatorSettings?.maxTimeMinutes ?? 5,
+            thinkingBudget: params.codebaseInvestigatorSettings?.thinkingBudget ??
+                DEFAULT_THINKING_MODE,
+            model: params.codebaseInvestigatorSettings?.model ?? DEFAULT_GEMINI_MODEL,
+        };
+        this.continueOnFailedApiCall = params.continueOnFailedApiCall ?? true;
+        this.enableShellOutputEfficiency =
+            params.enableShellOutputEfficiency ?? true;
         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.messageBus = new MessageBus(this.policyEngine, this.debugMode);
         this.outputSettings = {
             format: params.output?.format ?? OutputFormat.TEXT,
         };
+        this.retryFetchErrors = params.retryFetchErrors ?? false;
         if (params.contextFileName) {
             setGeminiMdFilename(params.contextFileName);
         }
@@ -302,7 +330,7 @@ export class Config {
             initializeTelemetry(this);
         }
         if (this.getProxy()) {
-            setGlobalDispatcher(new ProxyAgent(this.getProxy()));
+            setGlobalProxy(this.getProxy());
         }
         this.geminiClient = new GeminiClient(this);
         this.modelRouterService = new ModelRouterService(this);
@@ -321,6 +349,8 @@ export class Config {
             await this.getGitService();
         }
         this.promptRegistry = new PromptRegistry();
+        this.agentRegistry = new AgentRegistry(this);
+        await this.agentRegistry.initialize();
         this.toolRegistry = await this.createToolRegistry();
         await this.geminiClient.initialize();
     }
@@ -328,8 +358,18 @@ export class Config {
         return this.contentGenerator;
     }
     async refreshAuth(authMethod, displayMessage) {
+        this.useModelRouter = this.initialUseModelRouter;
+        if (this.disableModelRouterForAuth?.includes(authMethod)) {
+            this.useModelRouter = false;
+            if (this.model === DEFAULT_GEMINI_MODEL_AUTO) {
+                this.model = DEFAULT_GEMINI_MODEL;
+            }
+        }
+        else if (this.useModelRouter && this.model === DEFAULT_GEMINI_MODEL) {
+            this.model = DEFAULT_GEMINI_MODEL_AUTO;
+        }
         // Vertex and Genai have incompatible encryption and sending history with
-        // throughtSignature from Genai to Vertex will fail, we need to strip them
+        // thoughtSignature from Genai to Vertex will fail, we need to strip them
         if (this.contentGeneratorConfig?.authType === AuthType.USE_GEMINI &&
             authMethod === AuthType.LOGIN_WITH_GOOGLE) {
             // Restore the conversation history to the new client
@@ -428,6 +468,9 @@ export class Config {
     getWorkspaceContext() {
         return this.workspaceContext;
     }
+    getAgentRegistry() {
+        return this.agentRegistry;
+    }
     getToolRegistry() {
         return this.toolRegistry;
     }
@@ -440,9 +483,6 @@ export class Config {
     getQuestion() {
         return this.question;
     }
-    getFullContext() {
-        return this.fullContext;
-    }
     getCoreTools() {
         return this.coreTools;
     }
@@ -476,6 +516,12 @@ export class Config {
     setGeminiMdFileCount(count) {
         this.geminiMdFileCount = count;
     }
+    getGeminiMdFilePaths() {
+        return this.geminiMdFilePaths;
+    }
+    setGeminiMdFilePaths(paths) {
+        this.geminiMdFilePaths = paths;
+    }
     getApprovalMode() {
         return this.approvalMode;
     }
@@ -583,9 +629,6 @@ export class Config {
     getUsageStatisticsEnabled() {
         return this.usageStatisticsEnabled;
     }
-    getExtensionContextFilePaths() {
-        return this.extensionContextFilePaths;
-    }
     getExperimentalZedIntegration() {
         return this.experimentalZedIntegration;
     }
@@ -598,6 +641,11 @@ export class Config {
     getExtensions() {
         return this._extensions;
     }
+    // The list of explicitly enabled extensions, if any were given, may contain
+    // the string "none".
+    getEnabledExtensions() {
+        return this._enabledExtensions;
+    }
     getBlockedMcpServers() {
         return this._blockedMcpServers;
     }
@@ -613,16 +661,16 @@ export class Config {
     getIdeMode() {
         return this.ideMode;
     }
-    getFolderTrustFeature() {
-        return this.folderTrustFeature;
-    }
     /**
-     * Returns 'true' if the workspace is considered "trusted".
-     * 'false' for untrusted.
+     * Returns 'true' if the folder trust feature is enabled.
      */
     getFolderTrust() {
         return this.folderTrust;
     }
+    /**
+     * Returns 'true' if the workspace is considered "trusted".
+     * '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
@@ -658,18 +706,32 @@ export class Config {
     getChatCompression() {
         return this.chatCompression;
     }
+    isInteractiveShellEnabled() {
+        return (this.interactive &&
+            this.ptyInfo !== 'child_process' &&
+            this.enableInteractiveShell);
+    }
     isInteractive() {
         return this.interactive;
     }
     getUseRipgrep() {
         return this.useRipgrep;
     }
-    getShouldUseNodePtyShell() {
-        return this.shouldUseNodePtyShell;
+    getEnableInteractiveShell() {
+        return this.enableInteractiveShell;
     }
     getSkipNextSpeakerCheck() {
         return this.skipNextSpeakerCheck;
     }
+    getContinueOnFailedApiCall() {
+        return this.continueOnFailedApiCall;
+    }
+    getRetryFetchErrors() {
+        return this.retryFetchErrors;
+    }
+    getEnableShellOutputEfficiency() {
+        return this.enableShellOutputEfficiency;
+    }
     getShellExecutionConfig() {
         return this.shellExecutionConfig;
     }
@@ -732,6 +794,9 @@ export class Config {
     getEnableMessageBusIntegration() {
         return this.enableMessageBusIntegration;
     }
+    getCodebaseInvestigatorSettings() {
+        return this.codebaseInvestigatorSettings;
+    }
     async createToolRegistry() {
         const registry = new ToolRegistry(this, this.eventEmitter);
         // helper to create & register core tools that are enabled
@@ -760,13 +825,13 @@ export class Config {
                 // the tool registry.
                 const messageBusEnabled = this.getEnableMessageBusIntegration();
                 if (this.debugMode && messageBusEnabled) {
-                    console.log(`[DEBUG] enableMessageBusIntegration setting: ${messageBusEnabled}`);
+                    debugLogger.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'}`);
+                    debugLogger.log(`[DEBUG] Registering ${className} with messageBus: ${messageBusEnabled ? 'YES' : 'NO'}`);
                 }
                 registry.registerTool(new ToolClass(...toolArgs));
             }
@@ -809,6 +874,30 @@ export class Config {
         if (this.getUseWriteTodos()) {
             registerCoreTool(WriteTodosTool, this);
         }
+        // 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 excludeTools = this.getExcludeTools() || [];
+                const allowedTools = this.getAllowedTools();
+                const isExcluded = excludeTools.includes(definition.name);
+                const isAllowed = !allowedTools || allowedTools.includes(definition.name);
+                if (isAllowed && !isExcluded) {
+                    try {
+                        const messageBusEnabled = this.getEnableMessageBusIntegration();
+                        const wrapper = new SubagentToolWrapper(definition, this, messageBusEnabled ? this.getMessageBus() : undefined);
+                        registry.registerTool(wrapper);
+                    }
+                    catch (error) {
+                        console.error(`Failed to wrap agent '${definition.name}' as a tool:`, error);
+                    }
+                }
+                else if (this.getDebugMode()) {
+                    debugLogger.log(`[Config] Skipping registration of agent '${definition.name}' due to allow/exclude configuration.`);
+                }
+            }
+        }
         await registry.discoverAllTools();
         return registry;
     }