@codingame/monaco-vscode-chat-service-override 34.1.2 → 35.0.0

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

@@ -2,18 +2,21 @@
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import * as chatStatus from './media/chatStatus.css';
-import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, MutableDisposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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 { ChatEntitlementContextKeys, ChatEntitlement, isProUser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
+import { ChatEntitlement, ChatEntitlementContextKeys, 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';
+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';
 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';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { getCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 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 { ChatStatusDashboard } from './chatStatusDashboard.js';
 import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
 import { $, disposableWindowInterval } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
@@ -28,6 +31,45 @@ import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 
 var ChatStatusBarEntry_1;
 registerCss(chatStatus);
+function isTrackedEntitlement(entitlement) {
+    switch (entitlement) {
+    case ChatEntitlement.Free:
+    case ChatEntitlement.EDU:
+    case ChatEntitlement.Pro:
+    case ChatEntitlement.ProPlus:
+    case ChatEntitlement.Business:
+    case ChatEntitlement.Enterprise:
+        return true;
+    default:
+        return false;
+    }
+}
+function isQuotaBlocked(quotas) {
+    const premiumChat = quotas.premiumChat;
+    if (premiumChat === undefined) {
+        return false;
+    }
+    return premiumChat.unlimited ? premiumChat.hasQuota === false : premiumChat.percentRemaining === 0;
+}
+function hasResolvedQuota(quotas) {
+    return quotas.premiumChat !== undefined;
+}
+function computeQuotaResumeState(previous, entitlement, quotas) {
+    if (!isTrackedEntitlement(entitlement)) {
+        return "none";
+    }
+    const additionalSpend = quotas.additionalUsageEnabled === true;
+    if (!additionalSpend && isQuotaBlocked(quotas)) {
+        return "blocked";
+    }
+    if (previous !== "blocked") {
+        return previous;
+    }
+    if (additionalSpend) {
+        return "none";
+    }
+    return hasResolvedQuota(quotas) ? "resumed" : "blocked";
+}
 let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     static {
         ChatStatusBarEntry_1 = this;
@@ -42,6 +84,12 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             ChatEntitlementContextKeys.hasByokModels.key
         ]));
     }
+    static {
+        this.QUOTA_RESUME_STATE_KEY = "chat.quotaResumeState";
+    }
+    static {
+        this.QUOTA_RESET_RETRY_DELAY = 5 * 60 * 1000;
+    }
     constructor(
         chatEntitlementService,
         instantiationService,
@@ -49,8 +97,8 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         editorService,
         configurationService,
         completionsService,
-        chatSessionsService,
-        contextKeyService
+        contextKeyService,
+        storageService
     ) {
         super();
         this.chatEntitlementService = chatEntitlementService;
@@ -59,14 +107,18 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         this.editorService = editorService;
         this.configurationService = configurationService;
         this.completionsService = completionsService;
-        this.chatSessionsService = chatSessionsService;
         this.contextKeyService = contextKeyService;
+        this.storageService = storageService;
         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.quotaResetTimer = this._register(( new MutableDisposable()));
+        this.quotaRefresh = this._register(( new MutableDisposable()));
+        this.clearResumedScheduler = this._register(( new MutableDisposable()));
+        this.quotaResumeState = this.readPersistedQuotaResumeState();
         this.dashboardTooltip = {
             element: token => {
+                this.onDashboardOpened();
                 const store = ( new DisposableStore());
                 store.add(token.onCancellationRequested(() => {
                     store.dispose();
@@ -82,6 +134,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         };
         this.update();
         this.registerListeners();
+        this.initializeQuotaResumeState();
     }
     update() {
         const sentiment = this.chatEntitlementService.sentiment;
@@ -104,22 +157,22 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
         }
     }
     registerListeners() {
-        this._register(this.chatEntitlementService.onDidChangeQuotaExceeded(() => this.update()));
+        this._register(
+            this.chatEntitlementService.onDidChangeQuotaExceeded(() => this.onQuotaChanged())
+        );
+        this._register(
+            this.chatEntitlementService.onDidChangeQuotaRemaining(() => this.onQuotaChanged())
+        );
         this._register(this.chatEntitlementService.onDidChangeSentiment(() => this.update()));
-        this._register(this.chatEntitlementService.onDidChangeEntitlement(() => this.update()));
+        this._register(
+            this.chatEntitlementService.onDidChangeEntitlement(() => this.onQuotaChanged())
+        );
         this._register(this.contextKeyService.onDidChangeContext(e => {
             if (e.affectsSome(ChatStatusBarEntry_1.TITLE_BAR_CONTEXT_KEYS)) {
                 this.update();
             }
         }));
         this._register(this.completionsService.onDidChangeIsSnoozing(() => this.update()));
-        this._register(this.chatSessionsService.onDidChangeInProgress(() => {
-            const oldSessionsCount = this.runningSessionsCount;
-            this.runningSessionsCount = this.chatSessionsService.getInProgress().reduce((total, item) => total + item.count, 0);
-            if (this.runningSessionsCount !== oldSessionsCount) {
-                this.update();
-            }
-        }));
         this._register(
             this.editorService.onDidActiveEditorChange(() => this.onDidActiveEditorChange())
         );
@@ -139,9 +192,99 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             });
         }
     }
+    onQuotaChanged() {
+        this.evaluateQuotaResumeState();
+        this.update();
+    }
+    evaluateQuotaResumeState() {
+        const next = computeQuotaResumeState(
+            this.quotaResumeState,
+            this.chatEntitlementService.entitlement,
+            this.chatEntitlementService.quotas
+        );
+        this.setQuotaResumeState(next);
+        if (next === "blocked") {
+            this.scheduleQuotaResetRefresh();
+        } else {
+            this.quotaResetTimer.clear();
+        }
+    }
+    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;
+    }
+    scheduleQuotaResetRefresh() {
+        const resetAt = this.getQuotaResetTime();
+        if (resetAt === undefined) {
+            this.quotaResetTimer.clear();
+            return;
+        }
+        const delay = resetAt > Date.now() ? resetAt - Date.now() : ChatStatusBarEntry_1.QUOTA_RESET_RETRY_DELAY;
+        this.quotaResetTimer.value = disposableLongTimeout(() => this.refreshQuotaAndEvaluate(), delay);
+    }
+    refreshQuotaAndEvaluate() {
+        const cts = ( new CancellationTokenSource());
+        this.quotaRefresh.value = toDisposable(() => cts.dispose(true));
+        (async () => {
+            try {
+                await this.chatEntitlementService.update(cts.token);
+            } catch {}
+            if (cts.token.isCancellationRequested) {
+                return;
+            }
+            this.evaluateQuotaResumeState();
+            this.update();
+        })();
+    }
+    initializeQuotaResumeState() {
+        if (this.quotaResumeState === "blocked") {
+            this.refreshQuotaAndEvaluate();
+        } else {
+            this.evaluateQuotaResumeState();
+        }
+    }
+    readPersistedQuotaResumeState() {
+        const stored = this.storageService.get(ChatStatusBarEntry_1.QUOTA_RESUME_STATE_KEY, StorageScope.PROFILE);
+        return stored === "blocked" || stored === "resumed" ? stored : "none";
+    }
+    setQuotaResumeState(state) {
+        if (this.quotaResumeState === state) {
+            return;
+        }
+        this.quotaResumeState = state;
+        if (state === "none") {
+            this.storageService.remove(ChatStatusBarEntry_1.QUOTA_RESUME_STATE_KEY, StorageScope.PROFILE);
+        } else {
+            this.storageService.store(
+                ChatStatusBarEntry_1.QUOTA_RESUME_STATE_KEY,
+                state,
+                StorageScope.PROFILE,
+                StorageTarget.MACHINE
+            );
+        }
+    }
+    onDashboardOpened() {
+        if (this.quotaResumeState !== "resumed") {
+            return;
+        }
+        this.clearResumedScheduler.value = disposableTimeout(() => {
+            this.setQuotaResumeState("none");
+            this.update();
+        }, 0);
+    }
     getEntryProps() {
         let text = "$(copilot)";
-        let ariaLabel = ( localize(6865, "Copilot status"));
+        let ariaLabel = ( localize(7371, "Copilot status"));
         let kind;
         if (isNewUser(this.chatEntitlementService)) {
             const entitlement = this.chatEntitlementService.entitlement;
@@ -151,54 +294,36 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             }
         } else {
             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;
             if (this.chatEntitlementService.sentiment.disabled || this.chatEntitlementService.sentiment.untrusted) {
                 text = "$(copilot-unavailable)";
-                ariaLabel = ( localize(6866, "Copilot disabled"));
-            }
-            else if (this.runningSessionsCount > 0) {
-                text = "$(copilot-in-progress)";
-                if (this.runningSessionsCount > 1) {
-                    ariaLabel = ( localize(6867, "{0} agent sessions in progress", this.runningSessionsCount));
-                } else {
-                    ariaLabel = ( localize(6868, "1 agent session in progress"));
-                }
+                ariaLabel = ( localize(7372, "Copilot disabled"));
             }
             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(6869, "Chat quota reached"));
-                } else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-                    quotaWarning = ( localize(6870, "Inline suggestions limit reached"));
-                } else {
-                    quotaWarning = ( localize(6871, "Quota reached"));
-                }
+            else if (isTrackedEntitlement(this.chatEntitlementService.entitlement) && isQuotaBlocked(quotas)) {
+                const quotaWarning = ( localize(7373, "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(6871, "Quota reached"));
-                text = `$(copilot-warning) ${quotaWarning}`;
-                ariaLabel = quotaWarning;
+            else if (this.quotaResumeState === "resumed") {
+                const resumedLabel = ( localize(7374, "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(6872, "Inline suggestions disabled"));
+                ariaLabel = ( localize(7375, "Inline suggestions disabled"));
             }
             else if (this.completionsService.isSnoozing()) {
                 text = "$(copilot-snooze)";
-                ariaLabel = ( localize(6873, "Inline suggestions snoozed"));
+                ariaLabel = ( localize(7376, "Inline suggestions snoozed"));
             }
         }
         const baseResult = {
-            name: ( localize(6874, "Copilot Status")),
+            name: ( localize(7377, "Copilot Status")),
             text,
             ariaLabel,
             command: ShowTooltipCommand,
@@ -211,11 +336,11 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     }
     getSetupEntryProps() {
         const showSignInLabel = !this.isSignInTitleBarAffordanceVisible();
-        const signInLabel = ( localize(6875, "Sign In"));
+        const signInLabel = ( localize(7378, "Sign In"));
         return {
-            name: ( localize(6874, "Copilot Status")),
+            name: ( localize(7377, "Copilot Status")),
             text: showSignInLabel ? `$(copilot) ${signInLabel}` : "$(copilot)",
-            ariaLabel: showSignInLabel ? signInLabel : ( localize(6865, "Copilot status")),
+            ariaLabel: showSignInLabel ? signInLabel : ( localize(7371, "Copilot status")),
             command: CHAT_SETUP_ACTION_ID,
             showInAllWindows: true,
             kind: undefined,
@@ -249,6 +374,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, 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, IContextKeyService)), ( __param(7, IStorageService))], ChatStatusBarEntry));
 
-export { ChatStatusBarEntry };
+export { ChatStatusBarEntry, computeQuotaResumeState };

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

@@ -274,6 +274,10 @@
 	border-radius: 4px;
 }
 
+.chat-status-bar-entry-tooltip .quota-indicator.muted {
+	opacity: 0.5;
+}
+
 /* Compact Quota Indicator (2x2 grid: plan name + percentage, reset + label) */
 
 .chat-status-bar-entry-tooltip .quota-indicator.compact {

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(
-            6876,
+            7379,
             "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(
-            6877,
+            7380,
             "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(
-            6878,
+            7381,
             "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(
-            6879,
+            7382,
             "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(
-            6880,
+            7383,
             "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,7 +117,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, "workbench.action.chat.openPlan");
         return (new MarkdownString(localize(
-            6881,
+            7384,
             "Try the [{0}](command:workbench.action.chat.openPlan \"Start Plan Mode\"){1} to research and plan before implementing changes.",
             "Plan agent",
             kb
@@ -131,7 +131,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6882,
+            7385,
             "Reference files or folders with # to give the agent more context about the task."
         )));
     },
@@ -147,7 +147,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6883,
+            7386,
             "Select a code block in the editor and right-click to access more AI actions."
         )));
     },
@@ -157,7 +157,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6884,
+            7387,
             "Hover a previous request and select \"Restore Checkpoint\" to undo changes after that point in the chat conversation."
         )));
     },
@@ -171,7 +171,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6885,
+            7388,
             "Steer the agent mid-task by sending follow-up messages. They queue and apply in order."
         )));
     },
@@ -186,7 +186,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, INSERT_FORK_CONVERSATION_COMMAND_ID);
         return (new MarkdownString(localize(
-            6886,
+            7389,
             "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 +203,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6887,
+            7390,
             "Ask the agent to draw an architectural diagram or flow chart. It can render Mermaid diagrams directly in chat."
         )));
     },
@@ -214,7 +214,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6888,
+            7391,
             "Have another task to work on? Start a new session to run multiple agents at once."
         )));
     },
@@ -225,7 +225,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6889,
+            7392,
             "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,7 +239,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6890,
+            7393,
             "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"
         )));
@@ -253,7 +253,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, INSERT_TROUBLESHOOT_COMMAND_ID);
         return (new MarkdownString(localize(
-            6891,
+            7394,
             "Something not working? Type [{0}](command:{1} \"Run /troubleshoot\"){2} <question> to diagnose issues from debug logs.",
             "/troubleshoot",
             INSERT_TROUBLESHOOT_COMMAND_ID,
@@ -267,7 +267,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage(ctx) {
         const defaultMessage = ( localize(
-            6892,
+            7395,
             "Work across multiple projects at once in the [Agents window](command:{0} \"Open Agents Window\").",
             OPEN_AGENTS_WINDOW_COMMAND_ID
         ));
@@ -282,7 +282,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6893,
+            7396,
             "Run agents in parallel with [Copilot CLI](command:workbench.action.chat.openNewChatSessionInPlace.copilotcli?%5B%22sidebar%22%5D \"Switch to Copilot CLI\")."
         )));
     },
@@ -293,7 +293,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6894,
+            7397,
             "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

@@ -5,7 +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 { getSelectedModelIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSelectedModel';
 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';
@@ -613,7 +613,7 @@ let ChatTipService = class ChatTipService extends Disposable {
             experimentalTipMessages: this._experimentalTipMessages
         };
         const rawMessage = tipDef.buildMessage(ctx);
-        const prefixedMessage = ( localize(6895, "**Tip:** {0}", rawMessage.value));
+        const prefixedMessage = ( localize(7398, "**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(6896, "Session: {0}", info.title)) : ( localize(6897, "Untitled Session"));
+        const notificationTitle = info.title ? ( localize(7399, "Session: {0}", info.title)) : ( localize(7400, "Untitled Session"));
         const cts = ( new CancellationTokenSource());
         this._activeNotifications.set(sessionResource, toDisposable(() => cts.dispose(true)));
         const isQuestionCarousel = this._isQuestionCarouselPending(sessionResource);
         try {
-            const actionLabel = isQuestionCarousel ? ( localize(6898, "Open Session")) : ( localize(6899, "Allow"));
+            const actionLabel = isQuestionCarousel ? ( localize(7401, "Open Session")) : ( localize(7402, "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(6900, "Questions need your input.");
+            return localize(7403, "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(6901, "Approval needed to continue.");
+        return localize(7404, "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(6902, "This workspace recommends 1 agent plugin.")) : ( localize(6903, "This workspace recommends {0} agent plugins.", uninstalledCount)), [{
-            label: ( localize(6904, "Show Plugins")),
+        this._notificationService.prompt(Severity.Info, uninstalledCount === 1 ? ( localize(7405, "This workspace recommends 1 agent plugin.")) : ( localize(7406, "This workspace recommends {0} agent plugins.", uninstalledCount)), [{
+            label: ( localize(7407, "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(6905, "Contributes chat context integrations to the chat widget.")),
+        description: ( localize(7408, "Contributes chat context integrations to the chat widget.")),
         type: "array",
         items: {
             type: "object",
             properties: {
                 id: {
-                    description: ( localize(6906, "A unique identifier for this item.")),
+                    description: ( localize(7409, "A unique identifier for this item.")),
                     type: "string"
                 },
                 icon: {
-                    description: ( localize(6907, "The icon associated with this chat context item.")),
+                    description: ( localize(7410, "The icon associated with this chat context item.")),
                     type: "string"
                 },
                 displayName: {
                     description: ( localize(
-                        6908,
+                        7411,
                         "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(
-                            6909,
+                            7412,
                             "Invalid icon format for chat context contribution '{0}'. Icon must be in the format '{1}' or '{2}', e.g. '{3}'.",
                             contribution.id,
                             "$(iconId)",

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

@@ -12,8 +12,8 @@ const configurationRegistry = ( Registry.as(Extensions.Configuration));
 function createDefaultModelArrays(defaultEntryLabel, defaultEntryDescription) {
     return {
         modelIds: [""],
-        modelLabels: [defaultEntryLabel ?? ( localize(6910, "Auto (Vendor Default)"))],
-        modelDescriptions: [defaultEntryDescription ?? ( localize(6911, "Use the vendor's default model"))]
+        modelLabels: [defaultEntryLabel ?? ( localize(7413, "Auto (Vendor Default)"))],
+        modelDescriptions: [defaultEntryDescription ?? ( localize(7414, "Use the vendor's default model"))]
     };
 }
 let DefaultModelContribution = class DefaultModelContribution extends Disposable {
@@ -48,8 +48,8 @@ let DefaultModelContribution = class DefaultModelContribution extends Disposable
             modelLabels.length = 0;
             modelDescriptions.length = 0;
             modelIds.push("");
-            modelLabels.push(defaultEntryLabel ?? ( localize(6910, "Auto (Vendor Default)")));
-            modelDescriptions.push(defaultEntryDescription ?? ( localize(6911, "Use the vendor's default model")));
+            modelLabels.push(defaultEntryLabel ?? ( localize(7413, "Auto (Vendor Default)")));
+            modelDescriptions.push(defaultEntryDescription ?? ( localize(7414, "Use the vendor's default model")));
             const models = [];
             const allModelIds = this._languageModelsService.getLanguageModelIds();
             for (const modelId of allModelIds) {
@@ -119,7 +119,7 @@ let DefaultModelContribution = class DefaultModelContribution extends Disposable
                     }
                     modelIds.push(storedId);
                     modelLabels.push(( localize(
-                        6912,
+                        7415,
                         "{0} ({1})",
                         model.metadata.name,
                         vendorDisplayName ?? model.metadata.vendor