mirror of
https://github.com/google-gemini/gemini-cli.git
synced 2026-05-12 21:03:05 -07:00
refactor: deprecate legacy confirmation settings and enforce Policy Engine (#15626)
This commit is contained in:
@@ -312,7 +312,6 @@ export interface ConfigParameters {
|
||||
useWriteTodos?: boolean;
|
||||
policyEngineConfig?: PolicyEngineConfig;
|
||||
output?: OutputSettings;
|
||||
enableMessageBusIntegration?: boolean;
|
||||
disableModelRouterForAuth?: AuthType[];
|
||||
codebaseInvestigatorSettings?: CodebaseInvestigatorSettings;
|
||||
introspectionAgentSettings?: IntrospectionAgentSettings;
|
||||
@@ -436,7 +435,6 @@ export class Config {
|
||||
private readonly messageBus: MessageBus;
|
||||
private readonly policyEngine: PolicyEngine;
|
||||
private readonly outputSettings: OutputSettings;
|
||||
private readonly enableMessageBusIntegration: boolean;
|
||||
private readonly codebaseInvestigatorSettings: CodebaseInvestigatorSettings;
|
||||
private readonly introspectionAgentSettings: IntrospectionAgentSettings;
|
||||
private readonly continueOnFailedApiCall: boolean;
|
||||
@@ -579,14 +577,6 @@ export class Config {
|
||||
? params.hooks.disabled
|
||||
: undefined) ?? [];
|
||||
|
||||
// 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.codebaseInvestigatorSettings = {
|
||||
enabled: params.codebaseInvestigatorSettings?.enabled ?? true,
|
||||
maxNumTurns: params.codebaseInvestigatorSettings?.maxNumTurns ?? 10,
|
||||
@@ -1580,10 +1570,6 @@ export class Config {
|
||||
return this.policyEngine;
|
||||
}
|
||||
|
||||
getEnableMessageBusIntegration(): boolean {
|
||||
return this.enableMessageBusIntegration;
|
||||
}
|
||||
|
||||
getEnableHooks(): boolean {
|
||||
return this.enableHooks;
|
||||
}
|
||||
@@ -1600,9 +1586,7 @@ export class Config {
|
||||
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);
|
||||
}
|
||||
registry.setMessageBus(this.messageBus);
|
||||
|
||||
// helper to create & register core tools that are enabled
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
@@ -1628,11 +1612,7 @@ export class Config {
|
||||
// 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;
|
||||
const toolArgs = [...args, this.getMessageBus()];
|
||||
|
||||
registry.registerTool(new ToolClass(...toolArgs));
|
||||
}
|
||||
@@ -1686,11 +1666,10 @@ export class Config {
|
||||
!allowedTools || allowedTools.includes(DELEGATE_TO_AGENT_TOOL_NAME);
|
||||
|
||||
if (isAllowed) {
|
||||
const messageBusEnabled = this.getEnableMessageBusIntegration();
|
||||
const delegateTool = new DelegateToAgentTool(
|
||||
this.agentRegistry,
|
||||
this,
|
||||
messageBusEnabled ? this.getMessageBus() : undefined,
|
||||
this.getMessageBus(),
|
||||
);
|
||||
registry.registerTool(delegateTool);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user