Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions patches/00-copilot-remove-terminal-hint.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
diff --git a/src/vs/workbench/contrib/terminalContrib/inlineHint/browser/terminal.initialHint.contribution.ts b/src/vs/workbench/contrib/terminalContrib/inlineHint/browser/terminal.initialHint.contribution.ts
index d7bb9e3d..da21494d 100644
--- a/src/vs/workbench/contrib/terminalContrib/inlineHint/browser/terminal.initialHint.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/inlineHint/browser/terminal.initialHint.contribution.ts
@@ -10,3 +10,2 @@ import { status } from '../../../../../base/browser/ui/aria/aria.js';
import { KeybindingLabel } from '../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
-import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../../base/common/actions.js';
import { Emitter, Event } from '../../../../../base/common/event.js';
@@ -21,3 +20,2 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
-import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
import { ITerminalCapabilityStore, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
@@ -33,3 +31,2 @@ import { TerminalSuggestCommandId } from '../../suggest/common/terminal.suggest.
import { TerminalSuggestSettingId } from '../../suggest/common/terminalSuggestConfiguration.js';
-import { IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';

@@ -214,3 +211,2 @@ class TerminalInitialHintWidget extends Disposable {
private readonly _instance: ITerminalInstance,
- @IChatEntitlementService private readonly _chatEntitlementService: IChatEntitlementService,
@ICommandService private readonly _commandService: ICommandService,
@@ -219,3 +215,2 @@ class TerminalInitialHintWidget extends Disposable {
@IKeybindingService private readonly _keybindingService: IKeybindingService,
- @ITelemetryService private readonly _telemetryService: ITelemetryService,
) {
@@ -270,29 +265,3 @@ class TerminalInitialHintWidget extends Disposable {

- const aiFeaturesHidden = this._chatEntitlementService.sentiment.hidden;
-
- // Copilot CLI hint (only shown when AI features are enabled)
- if (!aiFeaturesHidden) {
- const handleCopilotCliClick = () => {
- this._telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', {
- id: 'terminalCopilotCli.hintAction',
- from: 'hint'
- });
- this._instance.sendText('copilot', false);
- };
- const copilotCliHint = localize({
- key: 'copilotCliHint',
- comment: [
- 'Preserve double-square brackets and their order',
- ]
- }, "Type [[copilot]] to use Copilot CLI.");
- const copilotCliHintHandler: IContentActionHandler = {
- callback: () => handleCopilotCliClick(),
- disposables: this._toDispose
- };
- hintElement.appendChild(renderFormattedText(copilotCliHint, { actionHandler: copilotCliHintHandler }));
- ariaLabelParts.push(localize('copilotCliHintAriaLabel', "Type copilot to use Copilot CLI."));
- }
-
- // Suggest hint - only shown when AI features are hidden (otherwise the Copilot CLI hint takes precedence)
- const suggestEnabled = aiFeaturesHidden && this._configurationService.getValue<boolean>(TerminalSuggestSettingId.Enabled);
+ const suggestEnabled = this._configurationService.getValue<boolean>(TerminalSuggestSettingId.Enabled);
const suggestKeybinding = suggestEnabled ? this._keybindingService.lookupKeybinding(TerminalSuggestCommandId.TriggerSuggest) : undefined;
Loading