@codingame/monaco-vscode-chat-service-override 30.0.1 → 31.0.0

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

@@ -103,13 +103,13 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
     }
     getEntryProps() {
         let text = "$(copilot)";
-        let ariaLabel = ( localize(6382, "Copilot status"));
+        let ariaLabel = ( localize(6436, "Copilot status"));
         let kind;
         if (isNewUser(this.chatEntitlementService)) {
             const entitlement = this.chatEntitlementService.entitlement;
             if (
             this.chatEntitlementService.sentiment.later || entitlement === ChatEntitlement.Available || isProUser(entitlement) || entitlement === ChatEntitlement.Free) {
-                const finishSetup = ( localize(6383, "Finish Setup"));
+                const finishSetup = ( localize(6437, "Finish Setup"));
                 text = `$(copilot) ${finishSetup}`;
                 ariaLabel = finishSetup;
                 kind = "prominent";
@@ -119,24 +119,24 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             const completionsQuotaExceeded = this.chatEntitlementService.quotas.completions?.percentRemaining === 0;
             if (this.chatEntitlementService.sentiment.disabled || this.chatEntitlementService.sentiment.untrusted) {
                 text = "$(copilot-unavailable)";
-                ariaLabel = ( localize(6384, "Copilot disabled"));
+                ariaLabel = ( localize(6438, "Copilot disabled"));
             }
             else if (this.runningSessionsCount > 0) {
                 text = "$(copilot-in-progress)";
                 if (this.runningSessionsCount > 1) {
-                    ariaLabel = ( localize(6385, "{0} agent sessions in progress", this.runningSessionsCount));
+                    ariaLabel = ( localize(6439, "{0} agent sessions in progress", this.runningSessionsCount));
                 } else {
-                    ariaLabel = ( localize(6386, "1 agent session in progress"));
+                    ariaLabel = ( localize(6440, "1 agent session in progress"));
                 }
             }
             else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
                 const signInExperiment = this.configurationService.getValue(ChatConfiguration.SignInTitleBarEnabled);
                 if (signInExperiment) {
-                    const signIn = ( localize(6387, "Sign In"));
+                    const signIn = ( localize(6441, "Sign In"));
                     text = `$(copilot) ${signIn}`;
                     ariaLabel = signIn;
                 } else {
-                    const signedOut = ( localize(6388, "Signed out"));
+                    const signedOut = ( localize(6442, "Signed out"));
                     text = `${this.chatEntitlementService.anonymous ? "$(copilot)" : "$(copilot-not-connected)"} ${signedOut}`;
                     ariaLabel = signedOut;
                     kind = "prominent";
@@ -145,11 +145,11 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             else if (this.chatEntitlementService.entitlement === ChatEntitlement.Free && (chatQuotaExceeded || completionsQuotaExceeded)) {
                 let quotaWarning;
                 if (chatQuotaExceeded && !completionsQuotaExceeded) {
-                    quotaWarning = ( localize(6389, "Chat quota reached"));
+                    quotaWarning = ( localize(6443, "Chat quota reached"));
                 } else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-                    quotaWarning = ( localize(6390, "Inline suggestions quota reached"));
+                    quotaWarning = ( localize(6444, "Inline suggestions quota reached"));
                 } else {
-                    quotaWarning = ( localize(6391, "Quota reached"));
+                    quotaWarning = ( localize(6445, "Quota reached"));
                 }
                 text = `$(copilot-warning) ${quotaWarning}`;
                 ariaLabel = quotaWarning;
@@ -157,15 +157,15 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
             }
             else if (this.editorService.activeTextEditorLanguageId && !isCompletionsEnabled(this.configurationService, this.editorService.activeTextEditorLanguageId)) {
                 text = "$(copilot-unavailable)";
-                ariaLabel = ( localize(6392, "Inline suggestions disabled"));
+                ariaLabel = ( localize(6446, "Inline suggestions disabled"));
             }
             else if (this.completionsService.isSnoozing()) {
                 text = "$(copilot-snooze)";
-                ariaLabel = ( localize(6393, "Inline suggestions snoozed"));
+                ariaLabel = ( localize(6447, "Inline suggestions snoozed"));
             }
         }
         const baseResult = {
-            name: ( localize(6394, "Copilot Status")),
+            name: ( localize(6448, "Copilot Status")),
             text,
             ariaLabel,
             command: ShowTooltipCommand,
@@ -177,7 +177,7 @@ let ChatStatusBarEntry = class ChatStatusBarEntry extends Disposable {
                     store.add(token.onCancellationRequested(() => {
                         store.dispose();
                     }));
-                    const elem = ChatStatusDashboard.instantiateInContents(this.instantiationService, store);
+                    const elem = ChatStatusDashboard.instantiateInContents(this.instantiationService, store, undefined);
                     store.add(disposableWindowInterval(mainWindow, () => {
                         if (!elem.isConnected) {
                             store.dispose();

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

@@ -8,6 +8,7 @@
 .chat-status-bar-entry-tooltip {
 	margin-top: 4px;
 	margin-bottom: 4px;
+	max-width: 340px;
 }
 
 .chat-status-bar-entry-tooltip hr {
@@ -15,6 +16,59 @@
 	margin-bottom: 8px;
 }
 
+/* Tab Bar */
+
+.chat-status-bar-entry-tooltip .tab-bar {
+	display: flex;
+	gap: 0;
+	margin-bottom: 8px;
+	border-bottom: 1px solid var(--vscode-editorWidget-border);
+}
+
+.chat-status-bar-entry-tooltip .tab-bar .tab {
+	padding: 4px 12px;
+	border: none;
+	background: none;
+	cursor: pointer;
+	font-size: inherit;
+	font-family: inherit;
+	color: var(--vscode-descriptionForeground);
+	border-bottom: 2px solid transparent;
+	margin-bottom: -1px;
+}
+
+.chat-status-bar-entry-tooltip .tab-bar .tab:hover {
+	color: var(--vscode-foreground);
+}
+
+.chat-status-bar-entry-tooltip .tab-bar .tab.active {
+	color: var(--vscode-foreground);
+	border-bottom-color: var(--vscode-focusBorder);
+	font-weight: 600;
+}
+
+.chat-status-bar-entry-tooltip .tab-bar .tab:focus-visible {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: -1px;
+}
+
+/* Tab Content — grid overlay keeps height stable across tab switches */
+
+.chat-status-bar-entry-tooltip .tab-content-container {
+	display: grid;
+}
+
+.chat-status-bar-entry-tooltip .tab-content-container > .tab-content {
+	grid-area: 1 / 1;
+	visibility: hidden;
+	pointer-events: none;
+}
+
+.chat-status-bar-entry-tooltip .tab-content-container > .tab-content.active {
+	visibility: visible;
+	pointer-events: auto;
+}
+
 .chat-status-bar-entry-tooltip div.header {
 	display: flex;
 	align-items: center;
@@ -56,25 +110,52 @@
 /* Quota Indicator */
 
 .chat-status-bar-entry-tooltip .quota-indicator {
-	margin-bottom: 6px;
+	margin-bottom: 8px;
+	padding: 10px 12px;
+	border: 1px solid var(--vscode-editorWidget-border);
+	border-radius: 8px;
 }
 
-.chat-status-bar-entry-tooltip .quota-indicator .quota-label {
+.chat-status-bar-entry-tooltip .quota-indicator .quota-title {
+	font-weight: 600;
+	margin-bottom: 4px;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator .quota-details {
 	display: flex;
 	justify-content: space-between;
-	gap: 20px;
-	margin-bottom: 3px;
+	align-items: baseline;
+	gap: 12px;
+	margin-bottom: 6px;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator .quota-percentage {
+	display: flex;
+	align-items: baseline;
+	gap: 2px;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator .quota-percentage .quota-value {
+	font-size: 18px;
+	font-weight: 700;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator .quota-percentage .quota-value-suffix {
+	font-size: 12px;
+	color: var(--vscode-descriptionForeground);
 }
 
-.chat-status-bar-entry-tooltip .quota-indicator .quota-label .quota-value {
+.chat-status-bar-entry-tooltip .quota-indicator .quota-reset {
+	font-size: 12px;
 	color: var(--vscode-descriptionForeground);
+	white-space: nowrap;
 }
 
 .chat-status-bar-entry-tooltip .quota-indicator .quota-bar {
 	width: 100%;
-	height: 4px;
+	height: 6px;
 	background-color: var(--vscode-gauge-background);
-	border-radius: 4px;
+	border-radius: 6px;
 	border: 1px solid var(--vscode-gauge-border);
 	margin: 4px 0;
 }
@@ -82,7 +163,11 @@
 .chat-status-bar-entry-tooltip .quota-indicator .quota-bar .quota-bit {
 	height: 100%;
 	background-color: var(--vscode-gauge-foreground);
-	border-radius: 4px;
+	border-radius: 6px;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.warning {
+	border-color: var(--vscode-gauge-warningForeground);
 }
 
 .chat-status-bar-entry-tooltip .quota-indicator.warning .quota-bar {
@@ -93,6 +178,22 @@
 	background-color: var(--vscode-gauge-warningForeground);
 }
 
+.chat-status-bar-entry-tooltip .quota-indicator.warning .quota-percentage .quota-value {
+	color: var(--vscode-gauge-warningForeground);
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.info {
+	border-color: var(--vscode-gauge-foreground);
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.info .quota-percentage .quota-value {
+	color: var(--vscode-gauge-foreground);
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.error {
+	border-color: var(--vscode-gauge-errorForeground);
+}
+
 .chat-status-bar-entry-tooltip .quota-indicator.error .quota-bar {
 	background-color: var(--vscode-gauge-errorBackground);
 }
@@ -101,6 +202,73 @@
 	background-color: var(--vscode-gauge-errorForeground);
 }
 
+.chat-status-bar-entry-tooltip .quota-indicator.error .quota-percentage .quota-value {
+	color: var(--vscode-gauge-errorForeground);
+}
+
+/* Dimmed state when quota limit is fully exhausted */
+
+.chat-status-bar-entry-tooltip .quota-indicator.dimmed {
+	border-color: var(--vscode-editorWidget-border);
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.dimmed .quota-percentage .quota-value {
+	color: var(--vscode-disabledForeground);
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.dimmed .quota-bar {
+	background-color: var(--vscode-gauge-background);
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.dimmed .quota-bar .quota-bit {
+	background-color: var(--vscode-disabledForeground);
+}
+
+/* Quota Callout */
+
+.chat-status-bar-entry-tooltip .quota-callout {
+	display: flex;
+	align-items: flex-start;
+	gap: 6px;
+	padding: 8px 10px;
+	border-radius: 6px;
+	border: 1px solid;
+	margin-bottom: 8px;
+	font-size: 12px;
+	line-height: 1.4;
+}
+
+.chat-status-bar-entry-tooltip .quota-callout .callout-icon {
+	flex-shrink: 0;
+}
+
+.chat-status-bar-entry-tooltip .quota-callout.warning {
+	border-color: var(--vscode-gauge-warningForeground);
+	color: var(--vscode-foreground);
+}
+
+.chat-status-bar-entry-tooltip .quota-callout.warning .callout-icon {
+	color: var(--vscode-gauge-warningForeground);
+}
+
+.chat-status-bar-entry-tooltip .quota-callout.error {
+	border-color: var(--vscode-gauge-errorForeground);
+	color: var(--vscode-foreground);
+}
+
+.chat-status-bar-entry-tooltip .quota-callout.error .callout-icon {
+	color: var(--vscode-gauge-errorForeground);
+}
+
+.chat-status-bar-entry-tooltip .quota-callout.info {
+	border-color: var(--vscode-editorWidget-border);
+	color: var(--vscode-descriptionForeground);
+}
+
+.chat-status-bar-entry-tooltip .quota-callout.info .callout-icon {
+	color: var(--vscode-descriptionForeground);
+}
+
 /* Settings */
 
 .chat-status-bar-entry-tooltip .settings {
@@ -216,24 +384,28 @@
 	margin-left: auto;
 }
 
-/* Contributions */
-
 .chat-status-bar-entry-tooltip .contribution .body {
 	display: flex;
-	flex-direction: row;
 	align-items: center;
-	gap: 5px;
+	gap: 4px;
+	font-size: 11px;
+	overflow: hidden;
+	min-width: 0;
+}
+
+.chat-status-bar-entry-tooltip .contribution .body .description,
+.chat-status-bar-entry-tooltip .contribution .body .detail-item {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	min-width: 0;
+}
+
+.chat-status-bar-entry-tooltip .contribution .body .detail-item {
+	color: var(--vscode-descriptionForeground);
+}
 
-	.description,
-	.detail-item {
-		display: flex;
-		align-items: center;
-		gap: 3px;
-	}
-
-	.detail-item,
-	.detail-item a {
-		margin-left: auto;
-		color: var(--vscode-descriptionForeground);
-	}
+.chat-status-bar-entry-tooltip .contribution .body .separator {
+	opacity: 0.6;
+	padding: 0 2px;
 }

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

@@ -3,8 +3,10 @@ import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/comm
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { ProductQualityContext } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkeys';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { ChatConfiguration, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+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';
 import { TipTrackingCommands } from './chatTipStorageKeys.js';
 import { GENERATE_AGENT_INSTRUCTIONS_COMMAND_ID, GENERATE_PROMPT_COMMAND_ID, GENERATE_AGENT_COMMAND_ID, GENERATE_SKILL_COMMAND_ID, INSERT_FORK_CONVERSATION_COMMAND_ID, INSERT_TROUBLESHOOT_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
@@ -33,7 +35,7 @@ const TIP_CATALOG = [{
     priority: 0,
     buildMessage(_ctx) {
         return (new MarkdownString(localize(
-            6395,
+            6449,
             "Using GPT-4.1? Try switching to [Auto](command:workbench.action.chat.openModelPicker \"Open Model Picker\") in the model picker for better coding performance."
         )));
     },
@@ -45,7 +47,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, GENERATE_AGENT_INSTRUCTIONS_COMMAND_ID);
         return (new MarkdownString(localize(
-            6396,
+            6450,
             "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,
@@ -63,7 +65,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, GENERATE_PROMPT_COMMAND_ID);
         return (new MarkdownString(localize(
-            6397,
+            6451,
             "Use [{0}](command:{1} \"Run /create-prompt\"){2} to generate a reusable prompt file with the agent.",
             "/create-prompt",
             GENERATE_PROMPT_COMMAND_ID,
@@ -79,7 +81,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, GENERATE_AGENT_COMMAND_ID);
         return (new MarkdownString(localize(
-            6398,
+            6452,
             "Use [{0}](command:{1} \"Run /create-agent\"){2} to scaffold a custom agent for your workflow.",
             "/create-agent",
             GENERATE_AGENT_COMMAND_ID,
@@ -95,7 +97,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, GENERATE_SKILL_COMMAND_ID);
         return (new MarkdownString(localize(
-            6399,
+            6453,
             "Use [{0}](command:{1} \"Run /create-skill\"){2} to create a skill the agent can load when relevant.",
             "/create-skill",
             GENERATE_SKILL_COMMAND_ID,
@@ -111,7 +113,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, "workbench.action.chat.openPlan");
         return (new MarkdownString(localize(
-            6400,
+            6454,
             "Try the [{0}](command:workbench.action.chat.openPlan \"Start Plan Mode\"){1} to research and plan before implementing changes.",
             "Plan agent",
             kb
@@ -125,7 +127,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6401,
+            6455,
             "Reference files or folders with # to give the agent more context about the task."
         )));
     },
@@ -141,7 +143,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6402,
+            6456,
             "Select a code block in the editor and right-click to access more AI actions."
         )));
     },
@@ -151,7 +153,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6403,
+            6457,
             "Hover a previous request and select \"Restore Checkpoint\" to undo changes after that point in the chat conversation."
         )));
     },
@@ -165,7 +167,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6404,
+            6458,
             "Steer the agent mid-task by sending follow-up messages. They queue and apply in order."
         )));
     },
@@ -180,7 +182,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, INSERT_FORK_CONVERSATION_COMMAND_ID);
         return (new MarkdownString(localize(
-            6405,
+            6459,
             "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,
@@ -197,7 +199,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6406,
+            6460,
             "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"
         )));
@@ -210,7 +212,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6407,
+            6461,
             "Ask the agent to draw an architectural diagram or flow chart. It can render Mermaid diagrams directly in chat."
         )));
     },
@@ -221,7 +223,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6408,
+            6462,
             "Have another task to work on? Start a new session to run multiple agents at once."
         )));
     },
@@ -232,7 +234,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6409,
+            6463,
             "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
@@ -246,7 +248,7 @@ const TIP_CATALOG = [{
     tier: ChatTipTier.Qol,
     buildMessage() {
         return (new MarkdownString(localize(
-            6410,
+            6464,
             "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"
         )));
@@ -260,7 +262,7 @@ const TIP_CATALOG = [{
     buildMessage(ctx) {
         const kb = formatKeybinding(ctx, INSERT_TROUBLESHOOT_COMMAND_ID);
         return (new MarkdownString(localize(
-            6411,
+            6465,
             "Something not working? Type [{0}](command:{1} \"Run /troubleshoot\"){2} <question> to diagnose issues from debug logs.",
             "/troubleshoot",
             INSERT_TROUBLESHOOT_COMMAND_ID,
@@ -269,6 +271,43 @@ const TIP_CATALOG = [{
     },
     when: ( ChatContextKeys.chatSessionType.isEqualTo(localChatSessionType)),
     excludeWhenToolsInvoked: ["listDebugEvents"]
+}, {
+    id: "tip.openAgentsWindow",
+    tier: ChatTipTier.Qol,
+    buildMessage() {
+        return (new MarkdownString(localize(
+            6466,
+            "Try the [Agents Application](command:workbench.action.openAgentsWindow \"Open Agents Application\") to run multiple agents simultaneously and manage your coding sessions."
+        )));
+    },
+    when: ( ContextKeyExpr.and(( ProductQualityContext.notEqualsTo("stable")), ( IsSessionsWindowContext.negate()), ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)))),
+    excludeWhenCommandsExecuted: ["workbench.action.openAgentsWindow"],
+    dismissWhenCommandsClicked: ["workbench.action.openAgentsWindow"]
+}, {
+    id: "tip.copilotCli",
+    tier: ChatTipTier.Qol,
+    buildMessage() {
+        return (new MarkdownString(localize(
+            6467,
+            "Run agents in parallel with [Copilot CLI](command:workbench.action.chat.openNewChatSessionInPlace.copilotcli?%5B%22sidebar%22%5D \"Switch to Copilot CLI\")."
+        )));
+    },
+    when: ( ContextKeyExpr.and(( IsSessionsWindowContext.negate()), ( ChatContextKeys.chatSessionType.isEqualTo(localChatSessionType)), ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)), ChatContextKeys.hasCanDelegateProviders)),
+    excludeWhenCommandsExecuted: ["workbench.action.chat.openNewChatSessionInPlace.copilotcli"]
+}, {
+    id: "tip.defaultPermissions",
+    tier: ChatTipTier.Qol,
+    buildMessage() {
+        return (new MarkdownString(localize(
+            6468,
+            "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
+        )));
+    },
+    when: ( ContextKeyExpr.or(( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)), ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Edit)))),
+    excludeWhenSettingsChanged: [ChatConfiguration.DefaultPermissionLevel],
+    dismissWhenCommandsClicked: ["workbench.action.openSettings"]
 }];
 
 export { ChatTipTier, TIP_CATALOG, extractCommandIds };

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

@@ -3,7 +3,7 @@ import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { AgentFileType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
+import { AgentInstructionFileType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
 import { PromptsType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
 import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
@@ -22,7 +22,7 @@ export interface ITipExclusionConfig {
     /** File-based exclusion configuration. */
     readonly excludeWhenPromptFilesExist?: {
         readonly promptType: PromptsType;
-        readonly agentFileType?: AgentFileType;
+        readonly agentFileType?: AgentInstructionFileType;
         readonly excludeUntilChecked?: boolean;
     };
 }

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

@@ -606,7 +606,7 @@ let ChatTipService = class ChatTipService extends Disposable {
             keybindingService: this._keybindingService
         };
         const rawMessage = tipDef.buildMessage(ctx);
-        const prefixedMessage = ( localize(6412, "**Tip:** {0}", rawMessage.value));
+        const prefixedMessage = ( localize(6469, "**Tip:** {0}", rawMessage.value));
         const enabledCommands = extractCommandIds(prefixedMessage);
         const markdown = ( new MarkdownString(prefixedMessage, {
             isTrusted: enabledCommands.length > 0 ? {
@@ -640,7 +640,7 @@ let ChatTipService = class ChatTipService extends Disposable {
         this._tipCommandListener.value = this._commandService.onDidExecuteCommand(e => {
             if (( enabledCommandSet.has(e.commandId)) && this._shownTip?.id === tip.id) {
                 this._logTipTelemetry(tip.id, "commandClicked", e.commandId);
-                this.dismissTip();
+                this.dismissTipForSession();
             }
         });
     }

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(6413, "Session: {0}", info.title)) : ( localize(6414, "Untitled Session"));
+        const notificationTitle = info.title ? ( localize(6470, "Session: {0}", info.title)) : ( localize(6471, "Untitled Session"));
         const cts = ( new CancellationTokenSource());
         this._activeNotifications.set(sessionResource, toDisposable(() => cts.dispose(true)));
         const isQuestionCarousel = this._isQuestionCarouselPending(sessionResource);
         try {
-            const actionLabel = isQuestionCarousel ? ( localize(6415, "Open Session")) : ( localize(6416, "Allow"));
+            const actionLabel = isQuestionCarousel ? ( localize(6472, "Open Session")) : ( localize(6473, "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(6417, "Questions need your input.");
+            return localize(6474, "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(6418, "Approval needed to continue.");
+        return localize(6475, "Approval needed to continue.");
     }
     _getPendingTerminalCommand(sessionResource) {
         const model = this._chatService.getSession(sessionResource);
@@ -140,6 +140,10 @@ let ChatWindowNotifier = class ChatWindowNotifier extends Disposable {
         }
         for (const part of lastResponse.response.value) {
             if (part.kind === "toolInvocation" && part.toolSpecificData?.kind === "terminal") {
+                const state = part.state.get();
+                if (state?.type !== IChatToolInvocation.StateKind.WaitingForConfirmation && state?.type !== IChatToolInvocation.StateKind.WaitingForPostApproval) {
+                    continue;
+                }
                 const terminalData = migrateLegacyTerminalToolSpecificData(part.toolSpecificData);
                 return terminalData.commandLine.forDisplay ?? terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original;
             }

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

@@ -51,8 +51,8 @@ let AgentPluginRecommendations = class AgentPluginRecommendations extends Dispos
         if (uninstalledCount === 0) {
             return;
         }
-        this._notificationService.prompt(Severity.Info, uninstalledCount === 1 ? ( localize(6419, "This workspace recommends 1 agent plugin.")) : ( localize(6420, "This workspace recommends {0} agent plugins.", uninstalledCount)), [{
-            label: ( localize(6421, "Show Plugins")),
+        this._notificationService.prompt(Severity.Info, uninstalledCount === 1 ? ( localize(6476, "This workspace recommends 1 agent plugin.")) : ( localize(6477, "This workspace recommends {0} agent plugins.", uninstalledCount)), [{
+            label: ( localize(6478, "Show Plugins")),
             run: () => {
                 this._extensionsWorkbenchService.openSearch("@agentPlugins @recommended");
             }