@codingame/monaco-vscode-chat-service-override 33.0.9 → 34.0.0

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

@@ -65,6 +65,21 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         this.activeCodeEditorListener = this._register(( new MutableDisposable()));
         this.entryAnchor = $("span");
         this.runningSessionsCount = this.chatSessionsService.getInProgress().reduce((total, item) => total + item.count, 0);
+        this.dashboardTooltip = {
+            element: token => {
+                const store = ( new DisposableStore());
+                store.add(token.onCancellationRequested(() => {
+                    store.dispose();
+                }));
+                const elem = ChatStatusDashboard.instantiateInContents(this.instantiationService, store, undefined);
+                store.add(disposableWindowInterval(mainWindow, () => {
+                    if (!elem.isConnected) {
+                        store.dispose();
+                    }
+                }, 2000));
+                return elem;
+            }
+        };
         this.update();
         this.registerListeners();
     }
@@ -126,7 +141,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     }
     getEntryProps() {
         let text = "$(copilot)";
-        let ariaLabel = ( localize(6746, "Copilot status"));
+        let ariaLabel = ( localize(6865, "Copilot status"));
         let kind;
         if (isNewUser(this.chatEntitlementService)) {
             const entitlement = this.chatEntitlementService.entitlement;
@@ -138,83 +153,69 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             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);
+            const isPooledQuotaDepleted = quotas.premiumChat?.unlimited && quotas.premiumChat.hasQuota === false;
             if (this.chatEntitlementService.sentiment.disabled || this.chatEntitlementService.sentiment.untrusted) {
                 text = "$(copilot-unavailable)";
-                ariaLabel = ( localize(6747, "Copilot disabled"));
+                ariaLabel = ( localize(6866, "Copilot disabled"));
             }
             else if (this.runningSessionsCount > 0) {
                 text = "$(copilot-in-progress)";
                 if (this.runningSessionsCount > 1) {
-                    ariaLabel = ( localize(6748, "{0} agent sessions in progress", this.runningSessionsCount));
+                    ariaLabel = ( localize(6867, "{0} agent sessions in progress", this.runningSessionsCount));
                 } else {
-                    ariaLabel = ( localize(6749, "1 agent session in progress"));
+                    ariaLabel = ( localize(6868, "1 agent session in progress"));
                 }
             }
-            else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown && !this.chatEntitlementService.hasByokModels) {
+            else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
                 return this.getSetupEntryProps();
             }
             else if (this.chatEntitlementService.entitlement === ChatEntitlement.Free && (chatQuotaExceeded || completionsQuotaExceeded)) {
                 let quotaWarning;
                 if (chatQuotaExceeded && !completionsQuotaExceeded) {
-                    quotaWarning = ( localize(6750, "Chat quota reached"));
+                    quotaWarning = ( localize(6869, "Chat quota reached"));
                 } else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-                    quotaWarning = ( localize(6751, "Inline suggestions quota reached"));
+                    quotaWarning = ( localize(6870, "Inline suggestions limit reached"));
                 } else {
-                    quotaWarning = ( localize(6752, "Quota reached"));
+                    quotaWarning = ( localize(6871, "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"));
+                const quotaWarning = ( localize(6871, "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(6753, "Inline suggestions disabled"));
+                ariaLabel = ( localize(6872, "Inline suggestions disabled"));
             }
             else if (this.completionsService.isSnoozing()) {
                 text = "$(copilot-snooze)";
-                ariaLabel = ( localize(6754, "Inline suggestions snoozed"));
+                ariaLabel = ( localize(6873, "Inline suggestions snoozed"));
             }
         }
         const baseResult = {
-            name: ( localize(6755, "Copilot Status")),
+            name: ( localize(6874, "Copilot Status")),
             text,
             ariaLabel,
             command: ShowTooltipCommand,
             showInAllWindows: true,
             kind,
             content: this.entryAnchor,
-            tooltip: {
-                element: token => {
-                    const store = ( new DisposableStore());
-                    store.add(token.onCancellationRequested(() => {
-                        store.dispose();
-                    }));
-                    const elem = ChatStatusDashboard.instantiateInContents(this.instantiationService, store, undefined);
-                    store.add(disposableWindowInterval(mainWindow, () => {
-                        if (!elem.isConnected) {
-                            store.dispose();
-                        }
-                    }, 2000));
-                    return elem;
-                }
-            }
+            tooltip: this.dashboardTooltip
         };
         return baseResult;
     }
     getSetupEntryProps() {
         const showSignInLabel = !this.isSignInTitleBarAffordanceVisible();
-        const signInLabel = ( localize(6756, "Sign In"));
+        const signInLabel = ( localize(6875, "Sign In"));
         return {
-            name: ( localize(6755, "Copilot Status")),
+            name: ( localize(6874, "Copilot Status")),
             text: showSignInLabel ? `$(copilot) ${signInLabel}` : "$(copilot)",
-            ariaLabel: showSignInLabel ? signInLabel : ( localize(6746, "Copilot status")),
+            ariaLabel: showSignInLabel ? signInLabel : ( localize(6865, "Copilot status")),
             command: CHAT_SETUP_ACTION_ID,
             showInAllWindows: true,
             kind: undefined,

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

@@ -216,6 +216,9 @@
 }
 
 .chat-status-bar-entry-tooltip .quota-indicator .quota-title {
+	display: flex;
+	justify-content: space-between;
+	align-items: baseline;
 	font-size: 13px;
 	line-height: 18px;
 	font-weight: 600;
@@ -252,6 +255,7 @@
 
 .chat-status-bar-entry-tooltip .quota-indicator .quota-reset {
 	font-size: 12px;
+	font-weight: normal;
 	line-height: 16px;
 	color: var(--vscode-descriptionForeground);
 	white-space: nowrap;

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

@@ -6,6 +6,12 @@ export declare enum ChatTipTier {
     Foundational = "foundational",
     Qol = "qol"
 }
+/**
+ * Treatment names for tip messages overridable via the workbench assignment service.
+ */
+export declare enum ChatTipExperiment {
+    OpenAgentsWindowTip = "openagentswindowtip"
+}
 /**
  * Context provided to tip builders for dynamic message construction.
  */
@@ -14,6 +20,11 @@ export interface ITipBuildContext {
      * Keybinding service for looking up keyboard shortcuts.
      */
     readonly keybindingService: IKeybindingService;
+    /**
+     * Experimental tip message overrides keyed by treatment name (see {@link ChatTipExperiment}).
+     * Builders should fall back to their default localized strings when a treatment is not set.
+     */
+    readonly experimentalTipMessages: ReadonlyMap<string, string>;
 }
 /**
  * Gets the display label for a command, looking it up from MenuRegistry.

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

@@ -2,8 +2,9 @@
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { IsWebContext } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkeys';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
-import { ChatConfiguration, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatConfiguration, OPEN_AGENTS_WINDOW_COMMAND_ID, OPEN_WORKSPACE_IN_AGENTS_WINDOW_COMMAND_ID, ChatModeKind, OPEN_AGENTS_WINDOW_PRECONDITION } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IsSessionsWindowContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
@@ -15,6 +16,10 @@ var ChatTipTier;
     ChatTipTier["Foundational"] = "foundational";
     ChatTipTier["Qol"] = "qol";
 })(ChatTipTier || (ChatTipTier = {}));
+var ChatTipExperiment;
+(function(ChatTipExperiment) {
+    ChatTipExperiment["OpenAgentsWindowTip"] = "openagentswindowtip";
+})(ChatTipExperiment || (ChatTipExperiment = {}));
 function formatKeybinding(ctx, commandId) {
     const kb = ctx.keybindingService.lookupKeybinding(commandId);
     return kb ? ` (${kb.getLabel()})` : "";
@@ -34,7 +39,7 @@ const TIP_CATALOG = [{
     priority: 0,
     buildMessage(_ctx) {
         return (new MarkdownString(localize(
-            6757,
+            6876,
             "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 +51,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, GENERATE_AGENT_INSTRUCTIONS_COMMAND_ID);
         return (new MarkdownString(localize(
-            6758,
+            6877,
             "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 +69,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, GENERATE_PROMPT_COMMAND_ID);
         return (new MarkdownString(localize(
-            6759,
+            6878,
             "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 +85,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, GENERATE_AGENT_COMMAND_ID);
         return (new MarkdownString(localize(
-            6760,
+            6879,
             "Use [{0}](command:{1} \"Run /create-agent\"){2} to scaffold a custom agent for your workflow.",
             "/create-agent",
             GENERATE_AGENT_COMMAND_ID,
@@ -96,7 +101,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, GENERATE_SKILL_COMMAND_ID);
         return (new MarkdownString(localize(
-            6761,
+            6880,
             "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 +117,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, "workbench.action.chat.openPlan");
         return (new MarkdownString(localize(
-            6762,
+            6881,
             "Try the [{0}](command:workbench.action.chat.openPlan \"Start Plan Mode\"){1} to research and plan before implementing changes.",
             "Plan agent",
             kb
@@ -126,7 +131,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6763,
+            6882,
             "Reference files or folders with # to give the agent more context about the task."
         )));
     },
@@ -142,7 +147,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6764,
+            6883,
             "Select a code block in the editor and right-click to access more AI actions."
         )));
     },
@@ -152,7 +157,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6765,
+            6884,
             "Hover a previous request and select \"Restore Checkpoint\" to undo changes after that point in the chat conversation."
         )));
     },
@@ -166,7 +171,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6766,
+            6885,
             "Steer the agent mid-task by sending follow-up messages. They queue and apply in order."
         )));
     },
@@ -181,7 +186,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, INSERT_FORK_CONVERSATION_COMMAND_ID);
         return (new MarkdownString(localize(
-            6767,
+            6886,
             "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,
@@ -193,25 +198,12 @@ const TIP_CATALOG = [{
         "workbench.action.chat.forkConversation",
         TipTrackingCommands.ForkConversationUsed
     ]
-}, {
-    id: "tip.agenticBrowser",
-    tier: ChatTipTier.Qol,
-    buildMessage() {
-        return (new MarkdownString(localize(
-            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"
-        )));
-    },
-    when: ( ContextKeyExpr.and(( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)), ( ContextKeyExpr.notEquals("config.workbench.browser.enableChatTools", true)))),
-    excludeWhenSettingsChanged: ["workbench.browser.enableChatTools"],
-    dismissWhenCommandsClicked: ["workbench.action.openSettings"]
 }, {
     id: "tip.mermaid",
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6769,
+            6887,
             "Ask the agent to draw an architectural diagram or flow chart. It can render Mermaid diagrams directly in chat."
         )));
     },
@@ -222,7 +214,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6770,
+            6888,
             "Have another task to work on? Start a new session to run multiple agents at once."
         )));
     },
@@ -233,7 +225,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6771,
+            6889,
             "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 +239,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6772,
+            6890,
             "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 +253,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, INSERT_TROUBLESHOOT_COMMAND_ID);
         return (new MarkdownString(localize(
-            6773,
+            6891,
             "Something not working? Type [{0}](command:{1} \"Run /troubleshoot\"){2} <question> to diagnose issues from debug logs.",
             "/troubleshoot",
             INSERT_TROUBLESHOOT_COMMAND_ID,
@@ -270,12 +262,27 @@ const TIP_CATALOG = [{
     },
     when: ( ChatContextKeys.chatSessionType.isEqualTo(localChatSessionType)),
     excludeWhenToolsInvoked: ["listDebugEvents"]
+}, {
+    id: "tip.agentsWindow",
+    tier: ChatTipTier.Qol,
+    buildMessage(ctx) {
+        const defaultMessage = ( localize(
+            6892,
+            "Work across multiple projects at once in the [Agents window](command:{0} \"Open Agents Window\").",
+            OPEN_AGENTS_WINDOW_COMMAND_ID
+        ));
+        const experimentalTemplate = ctx.experimentalTipMessages.get(ChatTipExperiment.OpenAgentsWindowTip);
+        const message = experimentalTemplate ? experimentalTemplate.replace(/\{0\}/g, OPEN_AGENTS_WINDOW_COMMAND_ID) : defaultMessage;
+        return ( new MarkdownString(message));
+    },
+    when: ( ContextKeyExpr.and(( IsWebContext.negate()), OPEN_AGENTS_WINDOW_PRECONDITION)),
+    excludeWhenCommandsExecuted: [OPEN_AGENTS_WINDOW_COMMAND_ID, OPEN_WORKSPACE_IN_AGENTS_WINDOW_COMMAND_ID]
 }, {
     id: "tip.copilotCli",
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6774,
+            6893,
             "Run agents in parallel with [Copilot CLI](command:workbench.action.chat.openNewChatSessionInPlace.copilotcli?%5B%22sidebar%22%5D \"Switch to Copilot CLI\")."
         )));
     },
@@ -286,7 +293,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6775,
+            6894,
             "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
@@ -297,4 +304,4 @@ const TIP_CATALOG = [{
     dismissWhenCommandsClicked: ["workbench.action.openSettings"]
 }];
 
-export { ChatTipTier, TIP_CATALOG, extractCommandIds };
+export { ChatTipExperiment, ChatTipTier, TIP_CATALOG, extractCommandIds };

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

@@ -12,6 +12,7 @@ import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 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 { IChatTipService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatTipService.service";
 export { TipTrackingCommands };
 /** @deprecated Use TipTrackingCommands.AttachFilesReferenceUsed */
@@ -43,6 +44,7 @@ export declare class ChatTipService extends Disposable implements IChatTipServic
     private readonly _commandService;
     private readonly _telemetryService;
     private readonly _keybindingService;
+    private readonly _assignmentService;
     readonly _serviceBrand: undefined;
     private readonly _onDidDismissTip;
     readonly onDidDismissTip: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
@@ -71,7 +73,8 @@ export declare class ChatTipService extends Disposable implements IChatTipServic
     private _thinkingPhrasesEverModified;
     private _tipsHiddenForSession;
     private readonly _tipCommandListener;
-    constructor(_productService: IProductService, _configurationService: IConfigurationService, _storageService: IStorageService, _chatService: IChatService, instantiationService: IInstantiationService, _logService: ILogService, _chatEntitlementService: IChatEntitlementService, _commandService: ICommandService, _telemetryService: ITelemetryService, _keybindingService: IKeybindingService);
+    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);
     private _hasFileOrFolderReference;
     private _getSlashCommandTrackingId;
     private _toSlashCommandTrackingId;
@@ -104,6 +107,7 @@ export declare class ChatTipService extends Disposable implements IChatTipServic
     private _isChatLocation;
     private _isChatQuotaExceeded;
     private _isCopilotEnabled;
+    private _fetchExperimentalTipMessages;
     private _createTip;
     private _logTipTelemetry;
     private _trackTipCommandClicks;

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

@@ -5,6 +5,7 @@ import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/comm
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { getSelectedModelIdentifier } from '../common/chatSelectedModel.js';
 import { ChatConfiguration, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 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';
@@ -22,8 +23,9 @@ 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, extractCommandIds } from './chatTipCatalog.js';
+import { TIP_CATALOG, ChatTipTier, ChatTipExperiment, extractCommandIds } from './chatTipCatalog.js';
 import { TipTrackingCommands, ChatTipStorageKeys } from './chatTipStorageKeys.js';
+import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service';
 
 const CREATE_AGENT_INSTRUCTIONS_TRACKING_COMMAND = TipTrackingCommands.CreateAgentInstructionsUsed;
 const CREATE_PROMPT_TRACKING_COMMAND = TipTrackingCommands.CreatePromptUsed;
@@ -41,7 +43,8 @@ let ChatTipService = class ChatTipService extends Disposable {
         _chatEntitlementService,
         _commandService,
         _telemetryService,
-        _keybindingService
+        _keybindingService,
+        _assignmentService
     ) {
         super();
         this._productService = _productService;
@@ -53,6 +56,7 @@ let ChatTipService = class ChatTipService extends Disposable {
         this._commandService = _commandService;
         this._telemetryService = _telemetryService;
         this._keybindingService = _keybindingService;
+        this._assignmentService = _assignmentService;
         this._onDidDismissTip = this._register(( new Emitter()));
         this.onDidDismissTip = this._onDidDismissTip.event;
         this._onDidNavigateTip = this._register(( new Emitter()));
@@ -63,8 +67,13 @@ let ChatTipService = class ChatTipService extends Disposable {
         this.onDidDisableTips = this._onDidDisableTips.event;
         this._tipsHiddenForSession = false;
         this._tipCommandListener = this._register(( new MutableDisposable()));
+        this._experimentalTipMessages = ( new Map());
         this._tracker = this._register(instantiationService.createInstance(TipEligibilityTracker, TIP_CATALOG));
         this._createSlashCommandsUsageTracker = this._register(( new CreateSlashCommandsUsageTracker(this._chatService, this._storageService, () => this._contextKeyService)));
+        this._fetchExperimentalTipMessages();
+        this._register(
+            this._assignmentService.onDidRefetchAssignments(() => this._fetchExperimentalTipMessages())
+        );
         this._register(this._chatEntitlementService.onDidChangeQuotaExceeded(() => {
             if (this._chatEntitlementService.quotas.chat?.percentRemaining === 0 && this._shownTip) {
                 this.hideTip();
@@ -578,24 +587,7 @@ let ChatTipService = class ChatTipService extends Disposable {
             }
             return normalizedModelId;
         };
-        const contextKeyModelId = normalize(contextKeyService.getContextKeyValue(ChatContextKeys.chatModelId.key));
-        if (contextKeyModelId) {
-            return contextKeyModelId;
-        }
-        const location = contextKeyService.getContextKeyValue(ChatContextKeys.location.key) ?? ChatAgentLocation.Chat;
-        const sessionType = contextKeyService.getContextKeyValue(ChatContextKeys.chatSessionType.key) ?? "";
-        const candidateStorageKeys = sessionType ? [
-            `chat.currentLanguageModel.${location}.${sessionType}`,
-            `chat.currentLanguageModel.${location}`
-        ] : [`chat.currentLanguageModel.${location}`];
-        for (const storageKey of candidateStorageKeys) {
-            const persistedModelIdentifier = this._storageService.get(storageKey, StorageScope.APPLICATION);
-            const persistedModelId = normalize(persistedModelIdentifier);
-            if (persistedModelId) {
-                return persistedModelId;
-            }
-        }
-        return "";
+        return normalize(getSelectedModelIdentifier(contextKeyService, this._storageService));
     }
     _isChatLocation(contextKeyService) {
         const location = contextKeyService.getContextKeyValue(ChatContextKeys.location.key);
@@ -608,12 +600,20 @@ let ChatTipService = class ChatTipService extends Disposable {
         const defaultChatAgent = this._productService.defaultChatAgent;
         return !!defaultChatAgent?.chatExtensionId;
     }
+    _fetchExperimentalTipMessages() {
+        this._assignmentService.getTreatment(ChatTipExperiment.OpenAgentsWindowTip).then(value => {
+            if (typeof value === "string" && value.length > 0) {
+                this._experimentalTipMessages.set(ChatTipExperiment.OpenAgentsWindowTip, value);
+            }
+        });
+    }
     _createTip(tipDef) {
         const ctx = {
-            keybindingService: this._keybindingService
+            keybindingService: this._keybindingService,
+            experimentalTipMessages: this._experimentalTipMessages
         };
         const rawMessage = tipDef.buildMessage(ctx);
-        const prefixedMessage = ( localize(6776, "**Tip:** {0}", rawMessage.value));
+        const prefixedMessage = ( localize(6895, "**Tip:** {0}", rawMessage.value));
         const enabledCommands = extractCommandIds(prefixedMessage);
         const markdown = ( new MarkdownString(prefixedMessage, {
             isTrusted: enabledCommands.length > 0 ? {
@@ -636,7 +636,8 @@ let ChatTipService = class ChatTipService extends Disposable {
     _trackTipCommandClicks(tip) {
         this._tipCommandListener.clear();
         const ctx = {
-            keybindingService: this._keybindingService
+            keybindingService: this._keybindingService,
+            experimentalTipMessages: this._experimentalTipMessages
         };
         const rawMessage = tip.buildMessage(ctx);
         const enabledCommands = extractCommandIds(rawMessage.value);
@@ -663,6 +664,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))], 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))], 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.js

@@ -77,12 +77,12 @@ let ChatWindowNotifier = class ChatWindowNotifier extends Disposable {
                 mode: FocusMode.Notify
             });
         }
-        const notificationTitle = info.title ? ( localize(6777, "Session: {0}", info.title)) : ( localize(6778, "Untitled Session"));
+        const notificationTitle = info.title ? ( localize(6896, "Session: {0}", info.title)) : ( localize(6897, "Untitled Session"));
         const cts = ( new CancellationTokenSource());
         this._activeNotifications.set(sessionResource, toDisposable(() => cts.dispose(true)));
         const isQuestionCarousel = this._isQuestionCarouselPending(sessionResource);
         try {
-            const actionLabel = isQuestionCarousel ? ( localize(6779, "Open Session")) : ( localize(6780, "Allow"));
+            const actionLabel = isQuestionCarousel ? ( localize(6898, "Open Session")) : ( localize(6899, "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(6781, "Questions need your input.");
+            return localize(6900, "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(6782, "Approval needed to continue.");
+        return localize(6901, "Approval needed to continue.");
     }
     _getPendingTerminalCommand(sessionResource) {
         const model = this._chatService.getSession(sessionResource);

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

@@ -64,8 +64,8 @@ let AgentPluginRecommendations = class AgentPluginRecommendations extends Dispos
         if (uninstalledCount === 0) {
             return;
         }
-        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")),
+        this._notificationService.prompt(Severity.Info, uninstalledCount === 1 ? ( localize(6902, "This workspace recommends 1 agent plugin.")) : ( localize(6903, "This workspace recommends {0} agent plugins.", uninstalledCount)), [{
+            label: ( localize(6904, "Show Plugins")),
             run: () => {
                 this._extensionsWorkbenchService.openSearch("@agentPlugins @recommended");
             }

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

@@ -11,22 +11,22 @@ import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workb
 const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "chatContext",
     jsonSchema: {
-        description: ( localize(6786, "Contributes chat context integrations to the chat widget.")),
+        description: ( localize(6905, "Contributes chat context integrations to the chat widget.")),
         type: "array",
         items: {
             type: "object",
             properties: {
                 id: {
-                    description: ( localize(6787, "A unique identifier for this item.")),
+                    description: ( localize(6906, "A unique identifier for this item.")),
                     type: "string"
                 },
                 icon: {
-                    description: ( localize(6788, "The icon associated with this chat context item.")),
+                    description: ( localize(6907, "The icon associated with this chat context item.")),
                     type: "string"
                 },
                 displayName: {
                     description: ( localize(
-                        6789,
+                        6908,
                         "A user-friendly name for this item which is used for display in menus."
                     )),
                     type: "string"
@@ -60,7 +60,7 @@ let ChatContextContribution = class ChatContextContribution extends Disposable {
                     const icon = contribution.icon ? ThemeIcon.fromString(contribution.icon) : undefined;
                     if (!icon && contribution.icon) {
                         ext.collector.error(( localize(
-                            6790,
+                            6909,
                             "Invalid icon format for chat context contribution '{0}'. Icon must be in the format '{1}' or '{2}', e.g. '{3}'.",
                             contribution.id,
                             "$(iconId)",