@codingame/monaco-vscode-chat-service-override 36.2.7 → 37.0.0

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

@@ -6,7 +6,7 @@ import { Disposable, MutableDisposable, DisposableStore, toDisposable } from '@c
 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, ChatEntitlementContextKeys, isProUser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
+import { ChatEntitlement, ChatEntitlementContextKeys, getQuotaReset, 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 { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { disposableLongTimeout, disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
@@ -27,6 +27,7 @@ import { CHAT_SETUP_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/wor
 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';
 import { InEditorZenModeContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
+import { UpdateTitleBarEditorVisibleContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/update/common/update';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 
 var ChatStatusBarEntry_1;
@@ -78,11 +79,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         this.ID = "workbench.contrib.chatStatusBarEntry";
     }
     static {
-        this.TITLE_BAR_CONTEXT_KEYS = ( new Set([
-            "updateTitleBar",
-            InEditorZenModeContext.key,
-            ChatEntitlementContextKeys.hasByokModels.key
-        ]));
+        this.TITLE_BAR_CONTEXT_KEYS = ( new Set([...( UpdateTitleBarEditorVisibleContext.keys()), ChatEntitlementContextKeys.hasByokModels.key]));
     }
     static {
         this.QUOTA_RESUME_STATE_KEY = "chat.quotaResumeState";
@@ -211,17 +208,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     }
     getQuotaResetTime() {
         const quotas = this.chatEntitlementService.quotas;
-        const premiumResetAt = quotas.premiumChat?.resetAt;
-        if (typeof premiumResetAt === "number") {
-            return premiumResetAt * 1000;
-        }
-        if (quotas.resetDate) {
-            const parsed = Date.parse(quotas.resetDate);
-            if (!isNaN(parsed)) {
-                return parsed;
-            }
-        }
-        return undefined;
+        return getQuotaReset(quotas.premiumChat, quotas)?.date.getTime();
     }
     scheduleQuotaResetRefresh() {
         const resetAt = this.getQuotaResetTime();
@@ -284,7 +271,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     }
     getEntryProps() {
         let text = "$(copilot)";
-        let ariaLabel = ( localize(7371, "Copilot status"));
+        let ariaLabel = ( localize(8606, "Copilot status"));
         let kind;
         if (isNewUser(this.chatEntitlementService)) {
             const entitlement = this.chatEntitlementService.entitlement;
@@ -296,34 +283,34 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             const quotas = this.chatEntitlementService.quotas;
             if (this.chatEntitlementService.sentiment.disabled || this.chatEntitlementService.sentiment.untrusted) {
                 text = "$(copilot-unavailable)";
-                ariaLabel = ( localize(7372, "Copilot disabled"));
+                ariaLabel = ( localize(8607, "Copilot disabled"));
             }
             else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
                 return this.getSetupEntryProps();
             }
             else if (isTrackedEntitlement(this.chatEntitlementService.entitlement) && isQuotaBlocked(quotas)) {
-                const quotaWarning = ( localize(7373, "Quota reached"));
+                const quotaWarning = ( localize(8608, "Quota reached"));
                 text = `$(copilot-warning) ${quotaWarning}`;
                 ariaLabel = quotaWarning;
                 kind = "prominent";
             }
             else if (this.quotaResumeState === "resumed") {
-                const resumedLabel = ( localize(7374, "Copilot Resumed"));
+                const resumedLabel = ( localize(8609, "Copilot Resumed"));
                 text = `$(copilot) ${resumedLabel}`;
                 ariaLabel = resumedLabel;
                 kind = "prominent";
             }
             else if (this.editorService.activeTextEditorLanguageId && !isCompletionsEnabled(this.configurationService, this.editorService.activeTextEditorLanguageId)) {
                 text = "$(copilot-unavailable)";
-                ariaLabel = ( localize(7375, "Inline suggestions disabled"));
+                ariaLabel = ( localize(8610, "Inline suggestions disabled"));
             }
             else if (this.completionsService.isSnoozing()) {
                 text = "$(copilot-snooze)";
-                ariaLabel = ( localize(7376, "Inline suggestions snoozed"));
+                ariaLabel = ( localize(8611, "Inline suggestions snoozed"));
             }
         }
         const baseResult = {
-            name: ( localize(7377, "Copilot Status")),
+            name: ( localize(8612, "Copilot Status")),
             text,
             ariaLabel,
             command: ShowTooltipCommand,
@@ -336,11 +323,11 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     }
     getSetupEntryProps() {
         const showSignInLabel = !this.isSignInTitleBarAffordanceVisible();
-        const signInLabel = ( localize(7378, "Sign In"));
+        const signInLabel = ( localize(8613, "Sign In"));
         return {
-            name: ( localize(7377, "Copilot Status")),
+            name: ( localize(8612, "Copilot Status")),
             text: showSignInLabel ? `$(copilot) ${signInLabel}` : "$(copilot)",
-            ariaLabel: showSignInLabel ? signInLabel : ( localize(7371, "Copilot status")),
+            ariaLabel: showSignInLabel ? signInLabel : ( localize(8606, "Copilot status")),
             command: CHAT_SETUP_ACTION_ID,
             showInAllWindows: true,
             kind: undefined,
@@ -357,8 +344,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         if (this.chatEntitlementService.sentiment.hidden || this.chatEntitlementService.sentiment.disabledInWorkspace) {
             return false;
         }
-        const hasTitleBarUpdate = Boolean(this.contextKeyService.getContextKeyValue("updateTitleBar"));
-        if (hasTitleBarUpdate) {
+        if (this.contextKeyService.contextMatchesRules(UpdateTitleBarEditorVisibleContext)) {
             return false;
         }
         const inZenMode = Boolean(this.contextKeyService.getContextKeyValue(InEditorZenModeContext.key));

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

@@ -58,7 +58,7 @@
 }
 
 .chat-status-bar-entry-tooltip .collapsible-chevron {
-	font-size: 12px;
+	font-size: var(--vscode-codiconFontSize-compact);
 	display: flex;
 	align-items: center;
 	flex-shrink: 0;
@@ -67,7 +67,7 @@
 }
 
 .chat-status-bar-entry-tooltip .contributed-info-icon {
-	font-size: 12px;
+	font-size: var(--vscode-codiconFontSize-compact);
 	display: flex;
 	align-items: center;
 	flex-shrink: 0;
@@ -210,11 +210,29 @@
 	margin-bottom: 4px;
 }
 
-.chat-status-bar-entry-tooltip .quota-indicator.included.compact {
+.chat-status-bar-entry-tooltip .quota-indicator.included.compact:not(.credits-used) {
 	display: flex;
 	flex-direction: column;
 }
 
+.chat-status-bar-entry-tooltip .quota-indicator.included.credits-used:not(.compact) {
+	padding: 6px 0;
+	margin-bottom: 0;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.included.credits-used:not(.compact) .quota-details {
+	align-items: center;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.included.credits-used:not(.compact) .quota-percentage .quota-value {
+	font-size: 16px;
+	line-height: 20px;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.included.credits-used .quota-details {
+	margin-bottom: 0;
+}
+
 .chat-status-bar-entry-tooltip .quota-indicator .quota-title {
 	display: flex;
 	justify-content: space-between;

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

@@ -0,0 +1,22 @@
+import { type IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IChatSubmitRequestHandlerService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatSubmitRequestHandlerService.service";
+/** A chat input submission before it is sent to the selected chat session. */
+export interface IChatSubmitRequest {
+    readonly sessionResource: URI;
+    readonly providerId?: string;
+    readonly sessionId?: string;
+    readonly input: string;
+}
+/** Handler offered a chat input submission before the normal send path. */
+export interface IChatSubmitRequestHandler {
+    readonly id: string;
+    tryHandle(request: IChatSubmitRequest): Promise<boolean>;
+}
+/** Default sequential first-match implementation of the submit handler registry. */
+export declare class ChatSubmitRequestHandlerService implements IChatSubmitRequestHandlerService {
+    readonly _serviceBrand: undefined;
+    private readonly _handlers;
+    register(handler: IChatSubmitRequestHandler): IDisposable;
+    tryHandle(request: IChatSubmitRequest): Promise<boolean>;
+}

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

@@ -0,0 +1,27 @@
+
+import { toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+
+class ChatSubmitRequestHandlerService {
+    constructor() {
+        this._handlers = [];
+    }
+    register(handler) {
+        this._handlers.push(handler);
+        return toDisposable(() => {
+            const index = this._handlers.indexOf(handler);
+            if (index >= 0) {
+                this._handlers.splice(index, 1);
+            }
+        });
+    }
+    async tryHandle(request) {
+        for (const handler of this._handlers) {
+            if (await handler.tryHandle(request)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
+
+export { ChatSubmitRequestHandlerService };

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

@@ -57,6 +57,15 @@ export interface ITipDefinition extends ITipExclusionConfig {
      * When clause expression that determines if this tip is eligible to be shown.
      */
     readonly when?: ContextKeyExpression;
+    /**
+     * Command IDs that must be registered for this tip to be eligible.
+     */
+    readonly requiresCommands?: readonly string[];
+    /**
+     * Chat mode names that must be available in the current widget for this tip to
+     * be eligible.
+     */
+    readonly requiresModeNames?: readonly string[];
     /**
      * Chat model IDs for which this tip is eligible (lowercase).
      */

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

@@ -39,7 +39,7 @@ const TIP_CATALOG = [{
     priority: 0,
     buildMessage(_ctx) {
         return (new MarkdownString(localize(
-            7379,
+            8617,
             "Using GPT-4.1? Try switching to [Auto](command:workbench.action.chat.openModelPicker \"Open Model Picker\") in the model picker for better coding performance."
         )));
     },
@@ -51,7 +51,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, GENERATE_AGENT_INSTRUCTIONS_COMMAND_ID);
         return (new MarkdownString(localize(
-            7380,
+            8618,
             "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,
@@ -69,7 +69,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, GENERATE_PROMPT_COMMAND_ID);
         return (new MarkdownString(localize(
-            7381,
+            8619,
             "Use [{0}](command:{1} \"Run /create-prompt\"){2} to generate a reusable prompt file with the agent.",
             "/create-prompt",
             GENERATE_PROMPT_COMMAND_ID,
@@ -85,7 +85,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, GENERATE_AGENT_COMMAND_ID);
         return (new MarkdownString(localize(
-            7382,
+            8620,
             "Use [{0}](command:{1} \"Run /create-agent\"){2} to scaffold a custom agent for your workflow.",
             "/create-agent",
             GENERATE_AGENT_COMMAND_ID,
@@ -101,7 +101,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, GENERATE_SKILL_COMMAND_ID);
         return (new MarkdownString(localize(
-            7383,
+            8621,
             "Use [{0}](command:{1} \"Run /create-skill\"){2} to create a skill the agent can load when relevant.",
             "/create-skill",
             GENERATE_SKILL_COMMAND_ID,
@@ -117,13 +117,14 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, "workbench.action.chat.openPlan");
         return (new MarkdownString(localize(
-            7384,
-            "Try the [{0}](command:workbench.action.chat.openPlan \"Start Plan Mode\"){1} to research and plan before implementing changes.",
+            8622,
+            "Try the [{0}](command:workbench.action.chat.open?%5B%7B%22mode%22%3A%22Plan%22%7D%5D \"Start Plan Mode\"){1} to research and plan before implementing changes.",
             "Plan agent",
             kb
         )));
     },
     when: ( ChatContextKeys.chatModeName.notEqualsTo("Plan")),
+    requiresModeNames: ["Plan"],
     excludeWhenCommandsExecuted: ["workbench.action.chat.openPlan"],
     excludeWhenModesUsed: ["Plan"]
 }, {
@@ -131,7 +132,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            7385,
+            8623,
             "Reference files or folders with # to give the agent more context about the task."
         )));
     },
@@ -147,17 +148,18 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            7386,
+            8624,
             "Select a code block in the editor and right-click to access more AI actions."
         )));
     },
+    when: ( IsSessionsWindowContext.negate()),
     excludeWhenCommandsExecuted: ["inlineChat.start"]
 }, {
     id: "tip.undoChanges",
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            7387,
+            8625,
             "Hover a previous request and select \"Restore Checkpoint\" to undo changes after that point in the chat conversation."
         )));
     },
@@ -171,7 +173,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            7388,
+            8626,
             "Steer the agent mid-task by sending follow-up messages. They queue and apply in order."
         )));
     },
@@ -186,7 +188,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, INSERT_FORK_CONVERSATION_COMMAND_ID);
         return (new MarkdownString(localize(
-            7389,
+            8627,
             "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,
@@ -203,7 +205,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            7390,
+            8628,
             "Ask the agent to draw an architectural diagram or flow chart. It can render Mermaid diagrams directly in chat."
         )));
     },
@@ -214,7 +216,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            7391,
+            8629,
             "Have another task to work on? Start a new session to run multiple agents at once."
         )));
     },
@@ -225,7 +227,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            7392,
+            8630,
             "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
@@ -239,12 +241,12 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            7393,
+            8631,
             "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"
         )));
     },
-    when: ( ContextKeyExpr.or(( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)), ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Edit)))),
+    when: ( ContextKeyExpr.and(( IsSessionsWindowContext.negate()), ( ContextKeyExpr.or(( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)), ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Edit)))))),
     excludeWhenSettingsChanged: ["chat.editing.autoAcceptDelay"],
     dismissWhenCommandsClicked: ["workbench.action.openSettings"]
 }, {
@@ -253,7 +255,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, INSERT_TROUBLESHOOT_COMMAND_ID);
         return (new MarkdownString(localize(
-            7394,
+            8632,
             "Something not working? Type [{0}](command:{1} \"Run /troubleshoot\"){2} <question> to diagnose issues from debug logs.",
             "/troubleshoot",
             INSERT_TROUBLESHOOT_COMMAND_ID,
@@ -267,7 +269,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage(ctx) {
         const defaultMessage = ( localize(
-            7395,
+            8633,
             "Work across multiple projects at once in the [Agents window](command:{0} \"Open Agents Window\").",
             OPEN_AGENTS_WINDOW_COMMAND_ID
         ));
@@ -282,7 +284,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            7396,
+            8634,
             "Run agents in parallel with [Copilot CLI](command:workbench.action.chat.openNewChatSessionInPlace.copilotcli?%5B%22sidebar%22%5D \"Switch to Copilot CLI\")."
         )));
     },
@@ -293,7 +295,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            7397,
+            8635,
             "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.d.ts

@@ -13,6 +13,7 @@ import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { TipTrackingCommands } from "./chatTipStorageKeys.js";
 import { IWorkbenchAssignmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service";
+import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 import { IChatTipService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatTipService.service";
 export { TipTrackingCommands };
 /** @deprecated Use TipTrackingCommands.AttachFilesReferenceUsed */
@@ -45,6 +46,7 @@ export declare class ChatTipService extends Disposable implements IChatTipServic
     private readonly _telemetryService;
     private readonly _keybindingService;
     private readonly _assignmentService;
+    private readonly _chatWidgetService;
     readonly _serviceBrand: undefined;
     private readonly _onDidDismissTip;
     readonly onDidDismissTip: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
@@ -74,7 +76,7 @@ export declare class ChatTipService extends Disposable implements IChatTipServic
     private _tipsHiddenForSession;
     private readonly _tipCommandListener;
     private readonly _experimentalTipMessages;
-    constructor(_productService: IProductService, _configurationService: IConfigurationService, _storageService: IStorageService, _chatService: IChatService, instantiationService: IInstantiationService, _logService: ILogService, _chatEntitlementService: IChatEntitlementService, _commandService: ICommandService, _telemetryService: ITelemetryService, _keybindingService: IKeybindingService, _assignmentService: IWorkbenchAssignmentService);
+    constructor(_productService: IProductService, _configurationService: IConfigurationService, _storageService: IStorageService, _chatService: IChatService, instantiationService: IInstantiationService, _logService: ILogService, _chatEntitlementService: IChatEntitlementService, _commandService: ICommandService, _telemetryService: ITelemetryService, _keybindingService: IKeybindingService, _assignmentService: IWorkbenchAssignmentService, _chatWidgetService: IChatWidgetService);
     private _hasFileOrFolderReference;
     private _getSlashCommandTrackingId;
     private _toSlashCommandTrackingId;
@@ -88,6 +90,7 @@ export declare class ChatTipService extends Disposable implements IChatTipServic
     hideTipsForSession(): void;
     disableTips(): Promise<void>;
     getWelcomeTip(contextKeyService: IContextKeyService): IChatTip | undefined;
+    private _hasSingleForegroundChatSurface;
     private _findNextEligibleTip;
     private _hideShownTipIfNowIneligible;
     private _pickTip;
@@ -102,6 +105,8 @@ export declare class ChatTipService extends Disposable implements IChatTipServic
     private _getOrderedEligibleTips;
     private _sortByPriorityAndCatalogOrder;
     private _isEligible;
+    private _isModeAvailable;
+    private _areTipCommandsRegistered;
     private _isSettingModified;
     private _getCurrentChatModelId;
     private _isChatLocation;

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

@@ -10,6 +10,7 @@ import { ChatConfiguration, ChatAgentLocation } from '@codingame/monaco-vscode-a
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
@@ -23,9 +24,11 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestAgentSubcommandPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { TipEligibilityTracker } from './chatTipEligibilityTracker.js';
-import { TIP_CATALOG, ChatTipTier, ChatTipExperiment, extractCommandIds } from './chatTipCatalog.js';
+import { TIP_CATALOG, ChatTipTier, extractCommandIds, ChatTipExperiment } from './chatTipCatalog.js';
 import { TipTrackingCommands, ChatTipStorageKeys } from './chatTipStorageKeys.js';
 import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service';
+import { IsSessionsWindowContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
 const CREATE_AGENT_INSTRUCTIONS_TRACKING_COMMAND = TipTrackingCommands.CreateAgentInstructionsUsed;
 const CREATE_PROMPT_TRACKING_COMMAND = TipTrackingCommands.CreatePromptUsed;
@@ -44,7 +47,8 @@ let ChatTipService = class ChatTipService extends Disposable {
         _commandService,
         _telemetryService,
         _keybindingService,
-        _assignmentService
+        _assignmentService,
+        _chatWidgetService
     ) {
         super();
         this._productService = _productService;
@@ -57,6 +61,7 @@ let ChatTipService = class ChatTipService extends Disposable {
         this._telemetryService = _telemetryService;
         this._keybindingService = _keybindingService;
         this._assignmentService = _assignmentService;
+        this._chatWidgetService = _chatWidgetService;
         this._onDidDismissTip = this._register(( new Emitter()));
         this.onDidDismissTip = this._onDidDismissTip.event;
         this._onDidNavigateTip = this._register(( new Emitter()));
@@ -120,6 +125,12 @@ let ChatTipService = class ChatTipService extends Disposable {
                 }
             }));
         }
+        this._register(CommandsRegistry.onDidRegisterCommand(commandId => {
+            this._hideShownTipIfNowIneligible();
+            if (this._tipRequestId === "welcome" && ( TIP_CATALOG.some(tip => tip.requiresCommands?.includes(commandId)))) {
+                this._tipRequestId = undefined;
+            }
+        }));
     }
     _hasFileOrFolderReference(message) {
         return ( message.parts.some(part => {
@@ -273,8 +284,7 @@ let ChatTipService = class ChatTipService extends Disposable {
         if (!this._isChatLocation(contextKeyService)) {
             return undefined;
         }
-        const foregroundSessionCount = contextKeyService.getContextKeyValue(ChatContextKeys.foregroundSessionCount.key);
-        if (foregroundSessionCount !== 1) {
+        if (!this._hasSingleForegroundChatSurface(contextKeyService)) {
             return undefined;
         }
         if (this._isChatQuotaExceeded(contextKeyService)) {
@@ -327,6 +337,10 @@ let ChatTipService = class ChatTipService extends Disposable {
         const tip = this._pickTip("welcome", contextKeyService);
         return tip;
     }
+    _hasSingleForegroundChatSurface(contextKeyService) {
+        const foregroundSessionCount = contextKeyService.getContextKeyValue(ChatContextKeys.foregroundSessionCount.key);
+        return foregroundSessionCount === 1 || (foregroundSessionCount === 0 && contextKeyService.getContextKeyValue(IsSessionsWindowContext.key) === true);
+    }
     _findNextEligibleTip(currentTipId, contextKeyService) {
         this._createSlashCommandsUsageTracker.syncContextKey(contextKeyService);
         const currentIndex = TIP_CATALOG.findIndex(tip => tip.id === currentTipId);
@@ -559,6 +573,22 @@ let ChatTipService = class ChatTipService extends Disposable {
             );
             return false;
         }
+        if (tip.requiresModeNames?.some(modeName => !this._isModeAvailable(modeName, contextKeyService))) {
+            this._logService.debug(
+                "#ChatTips: tip is not eligible because a required mode is not available",
+                tip.id,
+                tip.requiresModeNames
+            );
+            return false;
+        }
+        if (tip.requiresCommands?.some(commandId => !CommandsRegistry.getCommand(commandId))) {
+            this._logService.debug(
+                "#ChatTips: tip is not eligible because a required command is not registered",
+                tip.id,
+                tip.requiresCommands
+            );
+            return false;
+        }
         if (this._tracker.isExcluded(tip)) {
             return false;
         }
@@ -569,9 +599,35 @@ let ChatTipService = class ChatTipService extends Disposable {
             );
             return false;
         }
+        if (!this._areTipCommandsRegistered(tip)) {
+            return false;
+        }
         this._logService.debug("#ChatTips: tip is eligible", tip.id);
         return true;
     }
+    _isModeAvailable(modeName, contextKeyService) {
+        const widget = this._chatWidgetService.getAllWidgets().find(widget => widget.scopedContextKeyService === contextKeyService);
+        return !!widget?.input.currentChatModesObs.get().findModeByName(modeName);
+    }
+    _areTipCommandsRegistered(tip) {
+        const ctx = {
+            keybindingService: this._keybindingService,
+            experimentalTipMessages: this._experimentalTipMessages
+        };
+        const rawMessage = tip.buildMessage(ctx);
+        const commandIds = extractCommandIds(rawMessage.value);
+        for (const commandId of commandIds) {
+            if (!CommandsRegistry.getCommand(commandId)) {
+                this._logService.debug(
+                    "#ChatTips: tip excluded because command is not registered",
+                    tip.id,
+                    commandId
+                );
+                return false;
+            }
+        }
+        return true;
+    }
     _isSettingModified(key) {
         const inspected = this._configurationService.inspect(key);
         return inspected.userValue !== undefined || inspected.userLocalValue !== undefined || inspected.userRemoteValue !== undefined || inspected.workspaceValue !== undefined || inspected.workspaceFolderValue !== undefined;
@@ -613,7 +669,7 @@ let ChatTipService = class ChatTipService extends Disposable {
             experimentalTipMessages: this._experimentalTipMessages
         };
         const rawMessage = tipDef.buildMessage(ctx);
-        const prefixedMessage = ( localize(7398, "**Tip:** {0}", rawMessage.value));
+        const prefixedMessage = ( localize(8636, "**Tip:** {0}", rawMessage.value));
         const enabledCommands = extractCommandIds(prefixedMessage);
         const markdown = ( new MarkdownString(prefixedMessage, {
             isTrusted: enabledCommands.length > 0 ? {
@@ -664,6 +720,6 @@ let ChatTipService = class ChatTipService extends Disposable {
         return profileValue;
     }
 };
-ChatTipService = ( __decorate([( __param(0, IProductService)), ( __param(1, IConfigurationService)), ( __param(2, IStorageService)), ( __param(3, IChatService)), ( __param(4, IInstantiationService)), ( __param(5, ILogService)), ( __param(6, IChatEntitlementService)), ( __param(7, ICommandService)), ( __param(8, ITelemetryService)), ( __param(9, IKeybindingService)), ( __param(10, IWorkbenchAssignmentService))], ChatTipService));
+ChatTipService = ( __decorate([( __param(0, IProductService)), ( __param(1, IConfigurationService)), ( __param(2, IStorageService)), ( __param(3, IChatService)), ( __param(4, IInstantiationService)), ( __param(5, ILogService)), ( __param(6, IChatEntitlementService)), ( __param(7, ICommandService)), ( __param(8, ITelemetryService)), ( __param(9, IKeybindingService)), ( __param(10, IWorkbenchAssignmentService)), ( __param(11, IChatWidgetService))], ChatTipService));
 
 export { CREATE_AGENT_INSTRUCTIONS_TRACKING_COMMAND, CREATE_AGENT_TRACKING_COMMAND, CREATE_PROMPT_TRACKING_COMMAND, CREATE_SKILL_TRACKING_COMMAND, ChatTipService, FORK_CONVERSATION_TRACKING_COMMAND, TipEligibilityTracker, TipTrackingCommands };

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

@@ -6,7 +6,7 @@ import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 /**
  * Observes all live chat models and triggers OS notifications when any model
- * transitions to needing input (confirmation/elicitation).
+ * transitions to needing input or becomes idle.
  */
 export declare class ChatWindowNotifier extends Disposable implements IWorkbenchContribution {
     private readonly _chatService;
@@ -16,8 +16,22 @@ export declare class ChatWindowNotifier extends Disposable implements IWorkbench
     static readonly ID = "workbench.contrib.chatWindowNotifier";
     private readonly _activeNotifications;
     constructor(_chatService: IChatService, _chatWidgetService: IChatWidgetService, _hostService: IHostService, _configurationService: IConfigurationService);
+    /**
+     * Delay before an idle session is announced, to swallow the brief idle gap
+     * between a turn ending and the next queued turn starting. A method rather
+     * than a field so tests can override it before `_trackModel` runs during
+     * construction.
+     */
+    protected _getIdleNotificationDelay(): number;
+    /**
+     * Delay before a toast from a window that is not showing the session, so that
+     * a window showing it notifies first.
+     */
+    protected _getBackgroundNotificationDelay(): number;
     private _trackModel;
     private _notifyIfNeeded;
+    private _notifyIdleIfNeeded;
+    private _delayForBackgroundWindow;
     private _confirmAllow;
     private _getNotificationBody;
     private _getPendingTerminalCommand;