Mirrors/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-28 06:31:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

tweaks to #282623 (#282889)

Browse Source 
* update chat.agent.enabled description

* code suggestions

* includeDisabled bug
This commit is contained in:
Josh Spicer 2025-12-11 15:02:42 -08:00 committed by GitHub
parent f8616ec3df
commit 37b74ec64d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/lib/policies/policyData.jsonc
View File

@ -163,7 +163,7 @@
"localization": {
"description": {
"key": "chat.agent.enabled.description",
"value": "Enable agent mode for chat. When this is enabled, agent mode can be activated via the dropdown in the view."
"value": "When enabled, agent mode can be activated from chat and tools in agentic contexts with side effects can be used."
}
},
"type": "boolean",

4
src/vs/workbench/contrib/chat/browser/chat.contribution.ts
View File

@ -528,7 +528,7 @@ configurationRegistry.registerConfiguration({
},
[ChatConfiguration.AgentEnabled]: {
type: 'boolean',
description: nls.localize('chat.agent.enabled.description', "Enable agent mode for chat. When this is enabled, agent mode can be activated via the dropdown in the view."),
description: nls.localize('chat.agent.enabled.description', "When enabled, agent mode can be activated from chat and tools in agentic contexts with side effects can be used."),
default: true,
policy: {
name: 'ChatAgentMode',
@ -538,7 +538,7 @@ configurationRegistry.registerConfiguration({
localization: {
description: {
key: 'chat.agent.enabled.description',
value: nls.localize('chat.agent.enabled.description', "Enable agent mode for chat. When this is enabled, agent mode can be activated via the dropdown in the view."),
value: nls.localize('chat.agent.enabled.description', "When enabled, agent mode can be activated from chat and tools in agentic contexts with side effects can be used."),
}
}
}

14
src/vs/workbench/contrib/chat/browser/languageModelToolsService.ts
View File

@ -29,6 +29,7 @@ import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
import * as JSONContributionRegistry from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
import { ILogService } from '../../../../platform/log/common/log.js';
import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
import { Registry } from '../../../../platform/registry/common/platform.js';
import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
@ -93,7 +94,7 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
private readonly _callsByRequestId = new Map<string, ITrackedCall[]>();
private readonly _isAgentModeEnabled: IObservable<boolean | undefined>;
private readonly _isAgentModeEnabled: IObservable<boolean>;
constructor(
@IInstantiationService private readonly _instantiationService: IInstantiationService,
@ -111,11 +112,7 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
) {
super();
this._isAgentModeEnabled = observableFromEventOpts(
{ owner: this, equalsFn: () => false },
Event.filter(this._configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(ChatConfiguration.AgentEnabled)),
() => this._configurationService.getValue<boolean>(ChatConfiguration.AgentEnabled)
);
this._isAgentModeEnabled = observableConfigValue(ChatConfiguration.AgentEnabled, true, this._configurationService);
this._register(this._contextKeyService.onDidChangeContext(e => {
if (e.affectsSome(this._toolContextKeys)) {
@ -181,7 +178,7 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
* When agent mode is disabled only a subset of read-only tools are permitted in agentic-loop contexts.
*/
private isPermitted(toolOrToolSet: IToolData | ToolSet, reader?: IReader): boolean {
const agentModeEnabled = reader ? this._isAgentModeEnabled.read(reader) : this._isAgentModeEnabled.get();
const agentModeEnabled = this._isAgentModeEnabled.read(reader);
if (agentModeEnabled !== false) {
return true;
}
@ -272,7 +269,8 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
toolData => {
const satisfiesWhenClause = includeDisabled || !toolData.when || this._contextKeyService.contextMatchesRules(toolData.when);
const satisfiesExternalToolCheck = toolData.source.type !== 'extension' || !!extensionToolsEnabled;
return satisfiesWhenClause && satisfiesExternalToolCheck && this.isPermitted(toolData);
const satisfiesPermittedCheck = includeDisabled || this.isPermitted(toolData);
return satisfiesWhenClause && satisfiesExternalToolCheck && satisfiesPermittedCheck;
});
}