@codingame/monaco-vscode-chat-service-override 32.0.1 → 33.0.4

package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusEntry.d.ts

@@ -7,7 +7,6 @@ import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IInlineCompletionsService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/inlineCompletionsService.service";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
-import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 export declare class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
     private readonly chatEntitlementService;
@@ -17,7 +16,6 @@ export declare class ChatStatusBarEntry extends Disposable implements IWorkbench
     private readonly configurationService;
     private readonly completionsService;
     private readonly chatSessionsService;
-    private readonly hoverService;
     private readonly contextKeyService;
     static readonly ID = "workbench.contrib.chatStatusBarEntry";
     private static readonly TITLE_BAR_CONTEXT_KEYS;
@@ -25,7 +23,7 @@ export declare class ChatStatusBarEntry extends Disposable implements IWorkbench
     private readonly activeCodeEditorListener;
     private readonly entryAnchor;
     private runningSessionsCount;
-    constructor(chatEntitlementService: ChatEntitlementService, instantiationService: IInstantiationService, statusbarService: IStatusbarService, editorService: IEditorService, configurationService: IConfigurationService, completionsService: IInlineCompletionsService, chatSessionsService: IChatSessionsService, hoverService: IHoverService, contextKeyService: IContextKeyService);
+    constructor(chatEntitlementService: ChatEntitlementService, instantiationService: IInstantiationService, statusbarService: IStatusbarService, editorService: IEditorService, configurationService: IConfigurationService, completionsService: IInlineCompletionsService, chatSessionsService: IChatSessionsService, contextKeyService: IContextKeyService);
     private update;
     private registerListeners;
     private onDidActiveEditorChange;

package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusEntry.js

@@ -6,7 +6,7 @@ import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monac
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { StatusbarAlignment, ShowTooltipCommand } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
-import { ChatEntitlement, isProUser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
+import { ChatEntitlementContextKeys, ChatEntitlement, isProUser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -20,8 +20,6 @@ import { $, disposableWindowInterval } from '@codingame/monaco-vscode-api/vscode
 import { isNewUser } from './chatStatus.js';
 import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
 import { isCompletionsEnabled } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/completionsEnablement';
-import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
-import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { CHAT_SETUP_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { isWeb } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
@@ -38,7 +36,11 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         this.ID = "workbench.contrib.chatStatusBarEntry";
     }
     static {
-        this.TITLE_BAR_CONTEXT_KEYS = ( new Set(["updateTitleBar", InEditorZenModeContext.key]));
+        this.TITLE_BAR_CONTEXT_KEYS = ( new Set([
+            "updateTitleBar",
+            InEditorZenModeContext.key,
+            ChatEntitlementContextKeys.hasByokModels.key
+        ]));
     }
     constructor(
         chatEntitlementService,
@@ -48,7 +50,6 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         configurationService,
         completionsService,
         chatSessionsService,
-        hoverService,
         contextKeyService
     ) {
         super();
@@ -59,43 +60,11 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         this.configurationService = configurationService;
         this.completionsService = completionsService;
         this.chatSessionsService = chatSessionsService;
-        this.hoverService = hoverService;
         this.contextKeyService = contextKeyService;
         this.entry = undefined;
         this.activeCodeEditorListener = this._register(( new MutableDisposable()));
         this.entryAnchor = $("span");
         this.runningSessionsCount = this.chatSessionsService.getInProgress().reduce((total, item) => total + item.count, 0);
-        this._register(
-            CommandsRegistry.registerCommand("workbench.action.chat.openCopilotStatus", () => {
-                const target = this.entryAnchor.parentElement;
-                if (!target) {
-                    return;
-                }
-                const store = ( new DisposableStore());
-                const content = ChatStatusDashboard.instantiateInContents(this.instantiationService, store, undefined);
-                const hover = this.hoverService.showInstantHover({
-                    content,
-                    target,
-                    persistence: {
-                        hideOnKeyDown: true,
-                        sticky: true
-                    },
-                    appearance: {
-                        maxHeightRatio: 0.9
-                    }
-                }, true);
-                if (hover) {
-                    store.add(hover);
-                    store.add(disposableWindowInterval(mainWindow, () => {
-                        if (!content.isConnected) {
-                            store.dispose();
-                        }
-                    }, 2000));
-                } else {
-                    store.dispose();
-                }
-            })
-        );
         this.update();
         this.registerListeners();
     }
@@ -157,7 +126,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     }
     getEntryProps() {
         let text = "$(copilot)";
-        let ariaLabel = ( localize(6682, "Copilot status"));
+        let ariaLabel = ( localize(6746, "Copilot status"));
         let kind;
         if (isNewUser(this.chatEntitlementService)) {
             const entitlement = this.chatEntitlementService.entitlement;
@@ -166,47 +135,55 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
                 return this.getSetupEntryProps();
             }
         } else {
-            const chatQuotaExceeded = this.chatEntitlementService.quotas.chat?.percentRemaining === 0;
-            const completionsQuotaExceeded = this.chatEntitlementService.quotas.completions?.percentRemaining === 0;
+            const quotas = this.chatEntitlementService.quotas;
+            const chatQuotaExceeded = quotas.chat?.percentRemaining === 0;
+            const completionsQuotaExceeded = quotas.completions?.percentRemaining === 0;
+            const isPooledQuotaDepleted = quotas.premiumChat?.unlimited && quotas.premiumChat.hasQuota === false && !(quotas.additionalUsageEnabled ?? false);
             if (this.chatEntitlementService.sentiment.disabled || this.chatEntitlementService.sentiment.untrusted) {
                 text = "$(copilot-unavailable)";
-                ariaLabel = ( localize(6683, "Copilot disabled"));
+                ariaLabel = ( localize(6747, "Copilot disabled"));
             }
             else if (this.runningSessionsCount > 0) {
                 text = "$(copilot-in-progress)";
                 if (this.runningSessionsCount > 1) {
-                    ariaLabel = ( localize(6684, "{0} agent sessions in progress", this.runningSessionsCount));
+                    ariaLabel = ( localize(6748, "{0} agent sessions in progress", this.runningSessionsCount));
                 } else {
-                    ariaLabel = ( localize(6685, "1 agent session in progress"));
+                    ariaLabel = ( localize(6749, "1 agent session in progress"));
                 }
             }
-            else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
+            else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown && !this.chatEntitlementService.hasByokModels) {
                 return this.getSetupEntryProps();
             }
             else if (this.chatEntitlementService.entitlement === ChatEntitlement.Free && (chatQuotaExceeded || completionsQuotaExceeded)) {
                 let quotaWarning;
                 if (chatQuotaExceeded && !completionsQuotaExceeded) {
-                    quotaWarning = ( localize(6686, "Chat quota reached"));
+                    quotaWarning = ( localize(6750, "Chat quota reached"));
                 } else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-                    quotaWarning = ( localize(6687, "Inline suggestions quota reached"));
+                    quotaWarning = ( localize(6751, "Inline suggestions quota reached"));
                 } else {
-                    quotaWarning = ( localize(6688, "Quota reached"));
+                    quotaWarning = ( localize(6752, "Quota reached"));
                 }
                 text = `$(copilot-warning) ${quotaWarning}`;
                 ariaLabel = quotaWarning;
                 kind = "prominent";
             }
+            else if ((this.chatEntitlementService.entitlement === ChatEntitlement.Business || this.chatEntitlementService.entitlement === ChatEntitlement.Enterprise) && isPooledQuotaDepleted) {
+                const quotaWarning = ( localize(6752, "Quota reached"));
+                text = `$(copilot-warning) ${quotaWarning}`;
+                ariaLabel = quotaWarning;
+                kind = "prominent";
+            }
             else if (this.editorService.activeTextEditorLanguageId && !isCompletionsEnabled(this.configurationService, this.editorService.activeTextEditorLanguageId)) {
                 text = "$(copilot-unavailable)";
-                ariaLabel = ( localize(6689, "Inline suggestions disabled"));
+                ariaLabel = ( localize(6753, "Inline suggestions disabled"));
             }
             else if (this.completionsService.isSnoozing()) {
                 text = "$(copilot-snooze)";
-                ariaLabel = ( localize(6690, "Inline suggestions snoozed"));
+                ariaLabel = ( localize(6754, "Inline suggestions snoozed"));
             }
         }
         const baseResult = {
-            name: ( localize(6691, "Copilot Status")),
+            name: ( localize(6755, "Copilot Status")),
             text,
             ariaLabel,
             command: ShowTooltipCommand,
@@ -233,11 +210,11 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     }
     getSetupEntryProps() {
         const showSignInLabel = !this.isSignInTitleBarAffordanceVisible();
-        const signInLabel = ( localize(6692, "Sign In"));
+        const signInLabel = ( localize(6756, "Sign In"));
         return {
-            name: ( localize(6691, "Copilot Status")),
+            name: ( localize(6755, "Copilot Status")),
             text: showSignInLabel ? `$(copilot) ${signInLabel}` : "$(copilot)",
-            ariaLabel: showSignInLabel ? signInLabel : ( localize(6682, "Copilot status")),
+            ariaLabel: showSignInLabel ? signInLabel : ( localize(6746, "Copilot status")),
             command: CHAT_SETUP_ACTION_ID,
             showInAllWindows: true,
             kind: undefined,
@@ -271,6 +248,6 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         this.entry = undefined;
     }
 };
-ChatStatusBarEntry = ChatStatusBarEntry_1 = ( __decorate([( __param(0, IChatEntitlementService)), ( __param(1, IInstantiationService)), ( __param(2, IStatusbarService)), ( __param(3, IEditorService)), ( __param(4, IConfigurationService)), ( __param(5, IInlineCompletionsService)), ( __param(6, IChatSessionsService)), ( __param(7, IHoverService)), ( __param(8, IContextKeyService))], ChatStatusBarEntry));
+ChatStatusBarEntry = ChatStatusBarEntry_1 = ( __decorate([( __param(0, IChatEntitlementService)), ( __param(1, IInstantiationService)), ( __param(2, IStatusbarService)), ( __param(3, IEditorService)), ( __param(4, IConfigurationService)), ( __param(5, IInlineCompletionsService)), ( __param(6, IChatSessionsService)), ( __param(7, IContextKeyService))], ChatStatusBarEntry));
 
 export { ChatStatusBarEntry };

package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.d.ts

@@ -11,6 +11,7 @@ export type ChatStatusEntry = {
     };
     description: string;
     detail: string | undefined;
+    tooltip: string | undefined;
 };
 export declare class ChatStatusItemService implements IChatStatusItemService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/contrib/chat/browser/chatStatus/media/chatStatus.css

@@ -39,6 +39,15 @@
 	margin-top: 0;
 }
 
+.chat-status-bar-entry-tooltip .collapsible-header.non-collapsible {
+	cursor: default;
+}
+
+.chat-status-bar-entry-tooltip .contributed-section {
+	display: flex;
+	flex-direction: column;
+}
+
 .chat-status-bar-entry-tooltip .collapsible-header:focus {
 	outline: none;
 }
@@ -57,6 +66,15 @@
 	margin-top: 2px;
 }
 
+.chat-status-bar-entry-tooltip .contributed-info-icon {
+	font-size: 12px;
+	display: flex;
+	align-items: center;
+	flex-shrink: 0;
+	opacity: 0.7;
+	color: var(--vscode-descriptionForeground);
+}
+
 .chat-status-bar-entry-tooltip .collapsible-label {
 	white-space: nowrap;
 	flex-shrink: 0;
@@ -89,6 +107,16 @@
 	color: var(--vscode-descriptionForeground);
 }
 
+.chat-status-bar-entry-tooltip .contributed-detail {
+	font-size: 12px;
+	line-height: 16px;
+	font-weight: 400;
+	color: var(--vscode-descriptionForeground);
+	min-width: 0;
+	padding-bottom: 6px;
+	white-space: normal;
+}
+
 .chat-status-bar-entry-tooltip .collapsible-content {
 	display: grid;
 	grid-template-rows: 1fr;
@@ -182,6 +210,11 @@
 	margin-bottom: 4px;
 }
 
+.chat-status-bar-entry-tooltip .quota-indicator.included.compact {
+	display: flex;
+	flex-direction: column;
+}
+
 .chat-status-bar-entry-tooltip .quota-indicator .quota-title {
 	font-size: 13px;
 	line-height: 18px;
@@ -237,6 +270,52 @@
 	border-radius: 4px;
 }
 
+/* Compact Quota Indicator (2x2 grid: plan name + percentage, reset + label) */
+
+.chat-status-bar-entry-tooltip .quota-indicator.compact {
+	display: grid;
+	grid-template-columns: 1fr auto;
+	grid-template-rows: auto auto;
+	grid-template-areas:
+		"title value"
+		"reset suffix";
+	column-gap: 12px;
+	row-gap: 2px;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.compact .quota-title {
+	grid-area: title;
+	margin-bottom: 0;
+	font-size: 14px;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.compact .quota-details {
+	display: contents;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.compact .quota-percentage {
+	display: contents;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.compact .quota-percentage .quota-value {
+	grid-area: value;
+	text-align: right;
+	font-size: 14px;
+	line-height: inherit;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.compact .quota-percentage .quota-value-suffix {
+	grid-area: suffix;
+	text-align: right;
+	font-size: 12px;
+	line-height: 16px;
+	color: var(--vscode-descriptionForeground);
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.compact .quota-reset {
+	grid-area: reset;
+}
+
 /* Quota Callout */
 
 .chat-status-bar-entry-tooltip .quota-callout {
@@ -268,6 +347,15 @@
 	color: var(--vscode-focusBorder);
 }
 
+/* Compact mode: quota callout matches compact notification style */
+.chat-status-bar-entry-tooltip.compact .quota-callout {
+	border: none;
+	border-radius: 0;
+	margin-left: -8px;
+	margin-right: -8px;
+	margin-top: -10px;
+}
+
 
 /* Settings */
 

package/vscode/src/vs/workbench/contrib/chat/browser/chatTipCatalog.js

@@ -34,7 +34,7 @@ const TIP_CATALOG = [{
     priority: 0,
     buildMessage(_ctx) {
         return (new MarkdownString(localize(
-            6693,
+            6757,
             "Using GPT-4.1? Try switching to [Auto](command:workbench.action.chat.openModelPicker \"Open Model Picker\") in the model picker for better coding performance."
         )));
     },
@@ -46,7 +46,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, GENERATE_AGENT_INSTRUCTIONS_COMMAND_ID);
         return (new MarkdownString(localize(
-            6694,
+            6758,
             "Use [{0}](command:{1} \"Run /init\"){2} to generate or update a workspace instructions file for AI coding agents.",
             "/init",
             GENERATE_AGENT_INSTRUCTIONS_COMMAND_ID,
@@ -64,7 +64,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, GENERATE_PROMPT_COMMAND_ID);
         return (new MarkdownString(localize(
-            6695,
+            6759,
             "Use [{0}](command:{1} \"Run /create-prompt\"){2} to generate a reusable prompt file with the agent.",
             "/create-prompt",
             GENERATE_PROMPT_COMMAND_ID,
@@ -80,7 +80,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, GENERATE_AGENT_COMMAND_ID);
         return (new MarkdownString(localize(
-            6696,
+            6760,
             "Use [{0}](command:{1} \"Run /create-agent\"){2} to scaffold a custom agent for your workflow.",
             "/create-agent",
             GENERATE_AGENT_COMMAND_ID,
@@ -96,7 +96,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, GENERATE_SKILL_COMMAND_ID);
         return (new MarkdownString(localize(
-            6697,
+            6761,
             "Use [{0}](command:{1} \"Run /create-skill\"){2} to create a skill the agent can load when relevant.",
             "/create-skill",
             GENERATE_SKILL_COMMAND_ID,
@@ -112,7 +112,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, "workbench.action.chat.openPlan");
         return (new MarkdownString(localize(
-            6698,
+            6762,
             "Try the [{0}](command:workbench.action.chat.openPlan \"Start Plan Mode\"){1} to research and plan before implementing changes.",
             "Plan agent",
             kb
@@ -126,7 +126,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6699,
+            6763,
             "Reference files or folders with # to give the agent more context about the task."
         )));
     },
@@ -142,7 +142,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6700,
+            6764,
             "Select a code block in the editor and right-click to access more AI actions."
         )));
     },
@@ -152,7 +152,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6701,
+            6765,
             "Hover a previous request and select \"Restore Checkpoint\" to undo changes after that point in the chat conversation."
         )));
     },
@@ -166,7 +166,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6702,
+            6766,
             "Steer the agent mid-task by sending follow-up messages. They queue and apply in order."
         )));
     },
@@ -181,7 +181,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, INSERT_FORK_CONVERSATION_COMMAND_ID);
         return (new MarkdownString(localize(
-            6703,
+            6767,
             "Use [{0}](command:{1} \"Run /fork\"){2} to branch the conversation. Explore a different approach without losing the original context.",
             "/fork",
             INSERT_FORK_CONVERSATION_COMMAND_ID,
@@ -198,7 +198,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6704,
+            6768,
             "Enable [{0}](command:workbench.action.openSettings?%5B%22workbench.browser.enableChatTools%22%5D \"Open Settings\") to let the agent open and interact with pages in the Integrated Browser.",
             "agentic browser integration"
         )));
@@ -211,7 +211,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6705,
+            6769,
             "Ask the agent to draw an architectural diagram or flow chart. It can render Mermaid diagrams directly in chat."
         )));
     },
@@ -222,7 +222,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6706,
+            6770,
             "Have another task to work on? Start a new session to run multiple agents at once."
         )));
     },
@@ -233,7 +233,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6707,
+            6771,
             "Customize the loading messages shown while the agent works with [{0}](command:workbench.action.openSettings?%5B%22{1}%22%5D \"Open Settings\").",
             "thinking phrases",
             ChatConfiguration.ThinkingPhrases
@@ -247,7 +247,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6708,
+            6772,
             "Configure [{0}](command:workbench.action.openSettings?%5B%22chat.editing.autoAcceptDelay%22%5D \"Open Settings\") to automatically accept changes from the agent after a short countdown.",
             "auto-accept delay"
         )));
@@ -261,7 +261,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, INSERT_TROUBLESHOOT_COMMAND_ID);
         return (new MarkdownString(localize(
-            6709,
+            6773,
             "Something not working? Type [{0}](command:{1} \"Run /troubleshoot\"){2} <question> to diagnose issues from debug logs.",
             "/troubleshoot",
             INSERT_TROUBLESHOOT_COMMAND_ID,
@@ -275,7 +275,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6710,
+            6774,
             "Run agents in parallel with [Copilot CLI](command:workbench.action.chat.openNewChatSessionInPlace.copilotcli?%5B%22sidebar%22%5D \"Switch to Copilot CLI\")."
         )));
     },
@@ -286,7 +286,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6711,
+            6775,
             "Configure [{0}](command:workbench.action.openSettings?%5B%22{1}%22%5D \"Open Settings\") to start new sessions in Bypass Approvals or Autopilot mode.",
             "default permissions",
             ChatConfiguration.DefaultPermissionLevel

package/vscode/src/vs/workbench/contrib/chat/browser/chatTipService.js

@@ -258,7 +258,7 @@ let ChatTipService = class ChatTipService extends Disposable {
         if (!this._isCopilotEnabled()) {
             return undefined;
         }
-        if (this._chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
+        if (this._chatEntitlementService.entitlement === ChatEntitlement.Unknown && !this._chatEntitlementService.hasByokModels) {
             return undefined;
         }
         if (!this._isChatLocation(contextKeyService)) {
@@ -613,7 +613,7 @@ let ChatTipService = class ChatTipService extends Disposable {
             keybindingService: this._keybindingService
         };
         const rawMessage = tipDef.buildMessage(ctx);
-        const prefixedMessage = ( localize(6712, "**Tip:** {0}", rawMessage.value));
+        const prefixedMessage = ( localize(6776, "**Tip:** {0}", rawMessage.value));
         const enabledCommands = extractCommandIds(prefixedMessage);
         const markdown = ( new MarkdownString(prefixedMessage, {
             isTrusted: enabledCommands.length > 0 ? {

package/vscode/src/vs/workbench/contrib/chat/browser/chatWindowNotifier.js

@@ -77,12 +77,12 @@ let ChatWindowNotifier = class ChatWindowNotifier extends Disposable {
                 mode: FocusMode.Notify
             });
         }
-        const notificationTitle = info.title ? ( localize(6713, "Session: {0}", info.title)) : ( localize(6714, "Untitled Session"));
+        const notificationTitle = info.title ? ( localize(6777, "Session: {0}", info.title)) : ( localize(6778, "Untitled Session"));
         const cts = ( new CancellationTokenSource());
         this._activeNotifications.set(sessionResource, toDisposable(() => cts.dispose(true)));
         const isQuestionCarousel = this._isQuestionCarouselPending(sessionResource);
         try {
-            const actionLabel = isQuestionCarousel ? ( localize(6715, "Open Session")) : ( localize(6716, "Allow"));
+            const actionLabel = isQuestionCarousel ? ( localize(6779, "Open Session")) : ( localize(6780, "Allow"));
             const result = await this._hostService.showToast({
                 title: this._sanitizeOSToastText(notificationTitle),
                 body: this._getNotificationBody(sessionResource, info, isQuestionCarousel),
@@ -121,7 +121,7 @@ let ChatWindowNotifier = class ChatWindowNotifier extends Disposable {
     }
     _getNotificationBody(sessionResource, info, isQuestionCarousel) {
         if (isQuestionCarousel) {
-            return localize(6717, "Questions need your input.");
+            return localize(6781, "Questions need your input.");
         }
         const terminalCommand = this._getPendingTerminalCommand(sessionResource);
         if (terminalCommand) {
@@ -130,7 +130,7 @@ let ChatWindowNotifier = class ChatWindowNotifier extends Disposable {
         if (info.detail) {
             return this._sanitizeOSToastText(info.detail);
         }
-        return localize(6718, "Approval needed to continue.");
+        return localize(6782, "Approval needed to continue.");
     }
     _getPendingTerminalCommand(sessionResource) {
         const model = this._chatService.getSession(sessionResource);

package/vscode/src/vs/workbench/contrib/chat/browser/claudePluginRecommendations.js

@@ -1,5 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { NeverShowAgainScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
@@ -32,7 +33,7 @@ let AgentPluginRecommendations = class AgentPluginRecommendations extends Dispos
             }
         }));
     }
-    _checkForRecommendedPlugins() {
+    async _checkForRecommendedPlugins() {
         const recommended = this._pluginMarketplaceService.recommendedPlugins.get();
         if (recommended.size === 0) {
             return;
@@ -42,17 +43,29 @@ let AgentPluginRecommendations = class AgentPluginRecommendations extends Dispos
             const key = `${entry.plugin.name}@${entry.plugin.marketplace}`;
             installedKeys.add(key);
         }
+        let fetched = this._pluginMarketplaceService.lastFetchedPlugins.get();
+        if (fetched.length === 0) {
+            try {
+                fetched = await this._pluginMarketplaceService.fetchMarketplacePlugins(CancellationToken.None);
+            } catch {
+                return;
+            }
+        }
+        const knownKeys = ( new Set());
+        for (const plugin of fetched) {
+            knownKeys.add(`${plugin.name}@${plugin.marketplace}`);
+        }
         let uninstalledCount = 0;
         for (const key of recommended) {
-            if (!( installedKeys.has(key))) {
+            if (!( installedKeys.has(key)) && ( knownKeys.has(key))) {
                 uninstalledCount++;
             }
         }
         if (uninstalledCount === 0) {
             return;
         }
-        this._notificationService.prompt(Severity.Info, uninstalledCount === 1 ? ( localize(6719, "This workspace recommends 1 agent plugin.")) : ( localize(6720, "This workspace recommends {0} agent plugins.", uninstalledCount)), [{
-            label: ( localize(6721, "Show Plugins")),
+        this._notificationService.prompt(Severity.Info, uninstalledCount === 1 ? ( localize(6783, "This workspace recommends 1 agent plugin.")) : ( localize(6784, "This workspace recommends {0} agent plugins.", uninstalledCount)), [{
+            label: ( localize(6785, "Show Plugins")),
             run: () => {
                 this._extensionsWorkbenchService.openSearch("@agentPlugins @recommended");
             }

package/vscode/src/vs/workbench/contrib/chat/browser/contextContrib/chatContext.contribution.d.ts

@@ -0,0 +1,8 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IChatContextService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service";
+export declare class ChatContextContribution extends Disposable implements IWorkbenchContribution {
+    private readonly _chatContextService;
+    static readonly ID = "workbench.contrib.chatContextContribution";
+    constructor(_chatContextService: IChatContextService);
+}