Merge pull request #311309 from microsoft/anthonykim1/whyAgentLocalShowsUpWithoutSetting

Gate AgentHostTerminalContribution on chat.agentHost.enabled

Author: anthonykim1

src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostTerminalContribution.ts

@@ -3,9 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
 import { localize } from '../../../../../../nls.js';
-import { IAgentHostService } from '../../../../../../platform/agentHost/common/agentService.js';
+import { AgentHostEnabledSettingId, IAgentHostService } from '../../../../../../platform/agentHost/common/agentService.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { IWorkbenchContribution } from '../../../../../../workbench/common/contributions.js';
 import { LoggingAgentConnection } from '../../../../../../workbench/contrib/chat/browser/agentSessions/agentHost/loggingAgentConnection.js';
@@ -14,22 +15,45 @@ import { IAgentHostTerminalService } from '../../../../../../workbench/contrib/t
 /**
  * Registers local agent host terminal entries with
  * {@link IAgentHostTerminalService} so they appear in the terminal dropdown.
+ *
+ * Gated on the `chat.agentHost.enabled` setting.
  */
 export class AgentHostTerminalContribution extends Disposable implements IWorkbenchContribution {
 	static readonly ID = 'workbench.contrib.agentHostTerminal';
 
 	private readonly _localEntry = this._register(new MutableDisposable());
+	private readonly _conditionalListeners = this._register(new MutableDisposable<DisposableStore>());
 
 	constructor(
 		@IAgentHostService private readonly _agentHostService: IAgentHostService,
 		@IAgentHostTerminalService private readonly _agentHostTerminalService: IAgentHostTerminalService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
 	) {
 		super();
 
-		this._register(this._agentHostService.onAgentHostStart(() => this._reconcile()));
-		this._register(this._agentHostService.onAgentHostExit(() => this._reconcile()));
-		this._reconcile();
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(AgentHostEnabledSettingId)) {
+				this._updateEnabled();
+			}
+		}));
+
+		this._updateEnabled();
+	}
+
+	private _updateEnabled(): void {
+		if (this._configurationService.getValue<boolean>(AgentHostEnabledSettingId)) {
+			if (!this._conditionalListeners.value) {
+				const store = new DisposableStore();
+				store.add(this._agentHostService.onAgentHostStart(() => this._reconcile()));
+				store.add(this._agentHostService.onAgentHostExit(() => this._reconcile()));
+				this._conditionalListeners.value = store;
+				this._reconcile();
+			}
+		} else {
+			this._conditionalListeners.value = undefined;
+			this._localEntry.value = undefined;
+		}
 	}
 
 	private _reconcile(): void {