@codingame/monaco-vscode-chat-service-override 26.2.2 → 27.0.0

package/vscode/src/vs/workbench/contrib/mcp/browser/mcpPromptArgumentPick.js

@@ -82,8 +82,8 @@ let McpPromptArgumentPick = class McpPromptArgumentPick extends Disposable {
             const arg = prompt.arguments[i];
             const restore = backSnapshots.at(i);
             quickPick.step = i + 1;
-            quickPick.placeholder = arg.required ? arg.description : `${arg.description || ""} (${( localize(9383, "Optional"))})`;
-            quickPick.title = ( localize(9384, "Value for: {0}", arg.title || arg.name));
+            quickPick.placeholder = arg.required ? arg.description : `${arg.description || ""} (${( localize(10078, "Optional"))})`;
+            quickPick.title = ( localize(10079, "Value for: {0}", arg.title || arg.name));
             quickPick.value = restore?.value ?? ((args.hasOwnProperty(arg.name) && args[arg.name]) || "");
             quickPick.items = restore?.items ?? [];
             quickPick.activeItems = restore?.activeItems ?? [];
@@ -105,7 +105,7 @@ let McpPromptArgumentPick = class McpPromptArgumentPick extends Disposable {
             }
         }
         quickPick.value = "";
-        quickPick.placeholder = ( localize(9385, "Loading..."));
+        quickPick.placeholder = ( localize(10080, "Loading..."));
         quickPick.busy = true;
         return args;
     }
@@ -116,13 +116,13 @@ let McpPromptArgumentPick = class McpPromptArgumentPick extends Disposable {
         const store = ( new DisposableStore());
         const input$ = observableValue(this, quickPick.value);
         const asyncPicks = [{
-            name: ( localize(9386, "Suggestions")),
+            name: ( localize(10081, "Suggestions")),
             observer: this._promptCompletions(arg, input$, argsSoFar)
         }, {
-            name: ( localize(9387, "Active File")),
+            name: ( localize(10082, "Active File")),
             observer: this._activeFileCompletions()
         }, {
-            name: ( localize(9388, "Files")),
+            name: ( localize(10083, "Files")),
             observer: this._fileCompletions(input$)
         }];
         store.add(autorun(reader => {
@@ -133,15 +133,15 @@ let McpPromptArgumentPick = class McpPromptArgumentPick extends Disposable {
             let items = [];
             items.push({
                 id: "insert-text",
-                label: ( localize(9389, "Insert as text")),
+                label: ( localize(10084, "Insert as text")),
                 iconClass: ThemeIcon.asClassName(Codicon.textSize),
                 action: "text",
                 alwaysShow: true
             });
             items.push({
                 id: "run-command",
-                label: ( localize(9390, "Run as Command")),
-                description: ( localize(9391, "Inserts the command output as the prompt argument")),
+                label: ( localize(10085, "Run as Command")),
+                description: ( localize(10086, "Inserts the command output as the prompt argument")),
                 iconClass: ThemeIcon.asClassName(Codicon.terminal),
                 action: "command",
                 alwaysShow: true
@@ -187,7 +187,7 @@ let McpPromptArgumentPick = class McpPromptArgumentPick extends Disposable {
                 store.add(quickPick.onDidAccept(() => {
                     const item = quickPick.selectedItems[0];
                     if (!quickPick.value && arg.required && (!item || item.action === "text" || item.action === "command")) {
-                        quickPick.validationMessage = ( localize(9392, "This argument is required"));
+                        quickPick.validationMessage = ( localize(10087, "This argument is required"));
                     } else if (!item) {
                         resolve({
                             id: "insert-text",
@@ -322,7 +322,7 @@ let McpPromptArgumentPick = class McpPromptArgumentPick extends Disposable {
             const items = [];
             items.push({
                 id: "active-file",
-                label: ( localize(9393, "Active File")),
+                label: ( localize(10088, "Active File")),
                 description: this._labelService.getUriLabel(resource),
                 iconClasses: getIconClasses(this._modelService, this._languageService, resource),
                 uri: resource,
@@ -332,10 +332,10 @@ let McpPromptArgumentPick = class McpPromptArgumentPick extends Disposable {
             if (selection && selection.model && selection.range && !selection.range.isEmpty()) {
                 const selectedText = selection.model.getValueInRange(selection.range);
                 const lineCount = selection.range.endLineNumber - selection.range.startLineNumber + 1;
-                const description = lineCount === 1 ? ( localize(9394, "line {0}", selection.range.startLineNumber)) : ( localize(9395, "{0} lines", lineCount));
+                const description = lineCount === 1 ? ( localize(10089, "line {0}", selection.range.startLineNumber)) : ( localize(10090, "{0} lines", lineCount));
                 items.push({
                     id: "selected-text",
-                    label: ( localize(9396, "Selected Text")),
+                    label: ( localize(10091, "Selected Text")),
                     description,
                     selectedText,
                     iconClass: ThemeIcon.asClassName(Codicon.selection),
@@ -369,7 +369,7 @@ let McpPromptArgumentPick = class McpPromptArgumentPick extends Disposable {
     async _getTerminalOutput(command, token) {
         const terminal = (this._terminal ??= this._register(await this._terminalService.createTerminal({
             config: {
-                name: ( localize(9397, "MCP Terminal")),
+                name: ( localize(10092, "MCP Terminal")),
                 isTransient: true,
                 forceShellIntegration: true,
                 isFeatureTerminal: true

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chat/notebookChatUtils.js

@@ -41,7 +41,7 @@ function createNotebookOutputVariableEntry(outputViewModel, mimeType, notebookEd
         value: outputCellUri,
         id: ( outputCellUri.toString()),
         name: ( localize(
-            9763,
+            10478,
             "{0} • Cell {1} • Output {2}",
             fileName,
             `${cellIndex + 1}`,

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.js

@@ -42,12 +42,12 @@ registerAction2(class extends NotebookAction {
         super({
             id: "notebook.cell.chat.start",
             title: {
-                value: "$(sparkle) " + ( localize(9866, "Generate")),
+                value: "$(sparkle) " + ( localize(10581, "Generate")),
                 original: "$(sparkle) Generate"
             },
-            tooltip: ( localize(9867, "Start Chat to Generate Code")),
+            tooltip: ( localize(10582, "Start Chat to Generate Code")),
             metadata: {
-                description: ( localize(9867, "Start Chat to Generate Code")),
+                description: ( localize(10582, "Start Chat to Generate Code")),
                 args: [{
                     name: "args",
                     schema: {
@@ -128,10 +128,10 @@ registerAction2(class extends NotebookAction {
         super({
             id: "notebook.cell.chat.startAtTop",
             title: {
-                value: "$(sparkle) " + ( localize(9866, "Generate")),
+                value: "$(sparkle) " + ( localize(10581, "Generate")),
                 original: "$(sparkle) Generate"
             },
-            tooltip: ( localize(9867, "Start Chat to Generate Code")),
+            tooltip: ( localize(10582, "Start Chat to Generate Code")),
             f1: false,
             menu: [{
                 id: MenuId.NotebookCellListTop,
@@ -149,8 +149,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
     command: {
         id: "notebook.cell.chat.start",
         icon: Codicon.sparkle,
-        title: ( localize(9868, "Generate")),
-        tooltip: ( localize(9869, "Start Chat to Generate Code"))
+        title: ( localize(10583, "Generate")),
+        tooltip: ( localize(10584, "Start Chat to Generate Code"))
     },
     order: -10,
     group: "navigation/add",
@@ -160,9 +160,9 @@ class AcceptChangesAndRun extends EditorAction2 {
     constructor() {
         super({
             id: "notebook.inlineChat.acceptChangesAndRun",
-            title: ( localize2(9870, "Accept and Run")),
-            shortTitle: ( localize(9871, "Accept & Run")),
-            tooltip: ( localize(9872, "Accept the changes and run the cell")),
+            title: ( localize2(10585, "Accept and Run")),
+            shortTitle: ( localize(10586, "Accept & Run")),
+            tooltip: ( localize(10587, "Accept the changes and run the cell")),
             icon: Codicon.check,
             f1: true,
             precondition: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), CTX_INLINE_CHAT_VISIBLE)),

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebook.chat.contribution.js

@@ -17,7 +17,7 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monac
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatContextPickService.service';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
 import { computeCompletionRanges } from '../../../../chat/browser/widget/input/editor/chatInputCompletions.js';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
@@ -91,7 +91,7 @@ let NotebookChatContribution = class NotebookChatContribution extends Disposable
                 result.suggestions.push({
                     label: `${chatVariableLeader}${NotebookKernelVariableKey}`,
                     insertText: `${chatVariableLeader}${NotebookKernelVariableKey}:`,
-                    detail: ( localize(9873, "Pick a variable from the kernel")),
+                    detail: ( localize(10588, "Pick a variable from the kernel")),
                     range,
                     kind: CompletionItemKind.Text,
                     command: {
@@ -198,7 +198,7 @@ class SelectAndInsertKernelVariableAction extends Action2 {
                 detail: variable.type
             });
         }
-        const placeHolder = quickPickItems.length > 0 ? ( localize(9874, "Select a kernel variable")) : ( localize(9875, "No kernel variables found"));
+        const placeHolder = quickPickItems.length > 0 ? ( localize(10589, "Select a kernel variable")) : ( localize(10590, "No kernel variables found"));
         const pickedVariable = await quickInputService.pick(quickPickItems, {
             placeHolder
         });
@@ -248,7 +248,7 @@ let KernelVariableContextPicker = class KernelVariableContextPicker {
         this.editorService = editorService;
         this.notebookKernelService = notebookKernelService;
         this.type = "pickerPick";
-        this.label = ( localize(9876, "Kernel Variable..."));
+        this.label = ( localize(10591, "Kernel Variable..."));
         this.icon = Codicon.serverEnvironment;
     }
     isEnabled(widget) {
@@ -287,7 +287,7 @@ let KernelVariableContextPicker = class KernelVariableContextPicker {
             return result;
         })();
         return {
-            placeholder: ( localize(9877, "Select a kernel variable")),
+            placeholder: ( localize(10592, "Select a kernel variable")),
             picks
         };
     }
@@ -297,7 +297,7 @@ registerAction2(class AddCellOutputToChatAction extends Action2 {
     constructor() {
         super({
             id: "notebook.cellOutput.addToChat",
-            title: ( localize(9878, "Add Cell Output to Chat")),
+            title: ( localize(10593, "Add Cell Output to Chat")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_HAS_OUTPUTS, ContextKeyExpr.in(

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.js

@@ -2,6 +2,6 @@
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 
-const CTX_NOTEBOOK_CHAT_HAS_AGENT = ( new RawContextKey("notebookChatAgentRegistered", false, ( localize(9879, "Whether a chat agent for notebook is registered"))));
+const CTX_NOTEBOOK_CHAT_HAS_AGENT = ( new RawContextKey("notebookChatAgentRegistered", false, ( localize(10594, "Whether a chat agent for notebook is registered"))));
 
 export { CTX_NOTEBOOK_CHAT_HAS_AGENT };

package/vscode/src/vs/workbench/contrib/remoteCodingAgents/browser/remoteCodingAgents.contribution.js

@@ -13,42 +13,42 @@ import { IRemoteCodingAgentsService } from '@codingame/monaco-vscode-api/vscode/
 const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "remoteCodingAgents",
     jsonSchema: {
-        description: ( localize(10917, "Contributes remote coding agent integrations to the chat widget.")),
+        description: ( localize(11672, "Contributes remote coding agent integrations to the chat widget.")),
         type: "array",
         items: {
             type: "object",
             properties: {
                 id: {
-                    description: ( localize(10918, "A unique identifier for this item.")),
+                    description: ( localize(11673, "A unique identifier for this item.")),
                     type: "string"
                 },
                 command: {
                     description: ( localize(
-                        10919,
+                        11674,
                         "Identifier of the command to execute. The command must be declared in the \"commands\" section."
                     )),
                     type: "string"
                 },
                 displayName: {
                     description: ( localize(
-                        10920,
+                        11675,
                         "A user-friendly name for this item which is used for display in menus."
                     )),
                     type: "string"
                 },
                 description: {
-                    description: ( localize(10921, "Description of the remote agent for use in menus and tooltips.")),
+                    description: ( localize(11676, "Description of the remote agent for use in menus and tooltips.")),
                     type: "string"
                 },
                 followUpRegex: {
                     description: ( localize(
-                        10922,
+                        11677,
                         "The last occurrence of pattern in an existing chat conversation is sent to the contributing extension to facilitate follow-up responses."
                     )),
                     type: "string"
                 },
                 when: {
-                    description: ( localize(10923, "Condition which must be true to show this item.")),
+                    description: ( localize(11678, "Condition which must be true to show this item.")),
                     type: "string"
                 }
             },

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

@@ -23,8 +23,8 @@
 
 	border-top-style: solid;
 	border-bottom-style: solid;
-	border-top-color: rgb(0, 122, 204);
-	border-bottom-color: rgb(0, 122, 204);
+	border-top-color: var(--vscode-inlineChat-border);
+	border-bottom-color: var(--vscode-inlineChat-border);
 	border-top-width: 1px;
 	border-bottom-width: 1px;
 }
@@ -72,3 +72,7 @@
 	border-image: linear-gradient(90deg, var(--vscode-editorGutter-addedBackground) var(--inline-chat-frame-progress), var(--vscode-button-background)) 1;
 	animation: 3s shift linear infinite;
 }
+
+.monaco-workbench .terminal-inline-chat .inline-chat .chat-widget .interactive-session .interactive-input-part {
+	padding: 0 0 4px 0;
+}

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibilityHelp.js

@@ -37,68 +37,68 @@ function getAccessibilityHelpText(accessor) {
     const focusResponseKeybinding = keybindingService.lookupKeybinding("chat.action.focus")?.getAriaLabel();
     const focusInputKeybinding = keybindingService.lookupKeybinding("workbench.action.chat.focusInput")?.getAriaLabel();
     content.push(( localize(
-        12495,
+        13309,
         "Inline chat occurs within a terminal. It is useful for suggesting terminal commands. Keep in mind that AI generated code may be incorrect."
     )));
     content.push(( localize(
-        12496,
+        13310,
         "It can be activated using the command: Terminal: Start Chat ({0}), which will focus the input box.",
         startChatKeybinding
     )));
     content.push(makeRequestKeybinding ? ( localize(
-        12497,
+        13311,
         "The input box is where the user can type a request and can make the request ({0}). The widget will be closed and all content will be discarded when the Escape key is pressed and the terminal will regain focus.",
         makeRequestKeybinding
     )) : ( localize(
-        12498,
+        13312,
         "The input box is where the user can type a request and can make the request by tabbing to the Make Request button, which is not currently triggerable via keybindings. The widget will be closed and all content will be discarded when the Escape key is pressed and the terminal will regain focus."
     )));
     content.push(openAccessibleViewKeybinding ? ( localize(
-        12499,
+        13313,
         "The response can be inspected in the accessible view ({0}).",
         openAccessibleViewKeybinding
     )) : ( localize(
-        12500,
+        13314,
         "With the input box focused, inspect the response in the accessible view via the Open Accessible View command, which is currently not triggerable by a keybinding."
     )));
     content.push(focusResponseKeybinding ? ( localize(
-        12501,
+        13315,
         "Reach the response from the input box ({0}).",
         focusResponseKeybinding
     )) : ( localize(
-        12502,
+        13316,
         "Reach the response from the input box by tabbing or assigning a keybinding for the command: Focus Terminal Response."
     )));
     content.push(focusInputKeybinding ? ( localize(
-        12503,
+        13317,
         "Reach the input box from the response ({0}).",
         focusInputKeybinding
     )) : ( localize(
-        12504,
+        13318,
         "Reach the response from the input box by shift+tabbing or assigning a keybinding for the command: Focus Terminal Input."
     )));
     content.push(runCommandKeybinding ? ( localize(
-        12505,
+        13319,
         "With focus in the input box or command editor, the Terminal: Run Chat Command ({0}) action.",
         runCommandKeybinding
     )) : ( localize(
-        12506,
+        13320,
         "Run a command by tabbing to the button as the action is currently not triggerable by a keybinding."
     )));
     content.push(insertCommandKeybinding ? ( localize(
-        12507,
+        13321,
         "With focus in the input box command editor, the Terminal: Insert Chat Command ({0}) action.",
         insertCommandKeybinding
     )) : ( localize(
-        12508,
+        13322,
         "Insert a command by tabbing to the button as the action is currently not triggerable by a keybinding."
     )));
     content.push(( localize(
-        12509,
+        13323,
         "Use tab to reach conditional parts like commands, status, message responses and more."
     )));
     content.push(( localize(
-        12510,
+        13324,
         "Accessibility Signals can be changed via settings with a prefix of signals.chat. By default, if a request takes more than 4 seconds, you will hear a sound indicating that progress is still occurring."
     )));
     return content.join("\n");

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.js

@@ -10,7 +10,6 @@ import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/con
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
-import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { ChatAgentLocation, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { isDetachedTerminalInstance } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal';
 import { ITerminalService, ITerminalGroupService, ITerminalEditorService, ITerminalChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
@@ -33,8 +32,8 @@ import { activeChatController } from './terminalChatControllerHolder.js';
 
 registerActiveXtermAction({
     id: TerminalChatCommandId.Start,
-    title: ( localize2(12511, "Open Inline Chat")),
-    category: ( localize2(12512, "Terminal")),
+    title: ( localize2(13325, "Open Inline Chat")),
+    category: ( localize2(13326, "Terminal")),
     keybinding: {
         primary: KeyMod.CtrlCmd | KeyCode.KeyI,
         when: ( ContextKeyExpr.and(TerminalContextKeys.focusInAny)),
@@ -78,7 +77,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.Close,
-    title: ( localize2(12513, "Close")),
+    title: ( localize2(13327, "Close")),
     category: AbstractInlineChatAction.category,
     keybinding: {
         primary: KeyCode.Escape,
@@ -103,8 +102,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunCommand,
-    title: ( localize2(12514, "Run Chat Command")),
-    shortTitle: ( localize2(12515, "Run")),
+    title: ( localize2(13328, "Run Chat Command")),
+    shortTitle: ( localize2(13329, "Run")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -132,8 +131,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunFirstCommand,
-    title: ( localize2(12516, "Run First Chat Command")),
-    shortTitle: ( localize2(12517, "Run First")),
+    title: ( localize2(13330, "Run First Chat Command")),
+    shortTitle: ( localize2(13331, "Run First")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -161,8 +160,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertCommand,
-    title: ( localize2(12518, "Insert Chat Command")),
-    shortTitle: ( localize2(12519, "Insert")),
+    title: ( localize2(13332, "Insert Chat Command")),
+    shortTitle: ( localize2(13333, "Insert")),
     category: AbstractInlineChatAction.category,
     icon: Codicon.insert,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
@@ -191,8 +190,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertFirstCommand,
-    title: ( localize2(12520, "Insert First Chat Command")),
-    shortTitle: ( localize2(12521, "Insert First")),
+    title: ( localize2(13334, "Insert First Chat Command")),
+    shortTitle: ( localize2(13335, "Insert First")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -220,7 +219,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RerunRequest,
-    title: ( localize2(12522, "Rerun Request")),
+    title: ( localize2(13336, "Rerun Request")),
     f1: false,
     icon: Codicon.refresh,
     category: AbstractInlineChatAction.category,
@@ -261,7 +260,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.ViewInChat,
-    title: ( localize2(12523, "View in Chat")),
+    title: ( localize2(13337, "View in Chat")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -287,8 +286,8 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
     constructor() {
         super({
             id: TerminalChatCommandId.ViewHiddenChatTerminals,
-            title: ( localize2(12524, "View Hidden Chat Terminals")),
-            category: ( localize2(12525, "Terminal")),
+            title: ( localize2(13338, "View Hidden Chat Terminals")),
+            category: ( localize2(13339, "Terminal")),
             f1: true,
             precondition: ( ContextKeyExpr.and(TerminalChatContextKeys.hasHiddenChatTerminals, ChatContextKeys.enabled)),
             menu: [{
@@ -300,7 +299,7 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             }]
         });
     }
-    run(accessor) {
+    async run(accessor) {
         const terminalService = accessor.get(ITerminalService);
         const groupService = accessor.get(ITerminalGroupService);
         const editorService = accessor.get(ITerminalEditorService);
@@ -319,18 +318,29 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
                 all.set(i.instanceId, i);
             }
         }
+        if (all.size === 0) {
+            return;
+        }
+        if (all.size === 1) {
+            const instance = Array.from(( all.values()))[0];
+            terminalService.setActiveInstance(instance);
+            await terminalService.revealTerminal(instance);
+            await terminalService.focusInstance(instance);
+            return;
+        }
         const items = [];
-        const lastCommandLocalized = command => ( localize2(12526, "Last: {0}", command)).value;
+        const lastCommandLocalized = command => ( localize2(13340, "Last: {0}", command)).value;
         const MAX_DETAIL_LENGTH = 80;
         const metas = [];
         for (const instance of ( all.values())) {
             const iconId = instantiationService.invokeFunction(getIconId, instance);
             const label = `$(${iconId}) ${instance.title}`;
             const lastCommand = instance.capabilities.get(TerminalCapability.CommandDetection)?.commands.at(-1)?.command;
-            const chatSessionId = terminalChatService.getChatSessionIdForInstance(instance);
+            const chatSessionResource = terminalChatService.getChatSessionResourceForInstance(instance);
             let chatSessionTitle;
-            if (chatSessionId) {
-                chatSessionTitle = chatService.getSessionTitle(LocalChatSessionUri.forSession(chatSessionId));
+            if (chatSessionResource) {
+                const liveTitle = chatService.getSession(chatSessionResource)?.title;
+                chatSessionTitle = liveTitle ?? chatService.getSessionTitle(chatSessionResource);
             }
             const description = chatSessionTitle;
             let detail;
@@ -371,10 +381,10 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             });
         }
         const qp = quickInputService.createQuickPick();
-        qp.placeholder = ( localize2(12527, "Select a chat terminal to show and focus")).value;
+        qp.placeholder = ( localize2(13341, "Select a chat terminal to show and focus")).value;
         qp.items = items;
         qp.canSelectMany = false;
-        qp.title = ( localize2(12528, "Chat Terminals")).value;
+        qp.title = ( localize2(13342, "Chat Terminals")).value;
         qp.matchOnDescription = true;
         qp.matchOnDetail = true;
         const qpDisposables = ( new DisposableStore());
@@ -406,7 +416,6 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: TerminalChatCommandId.FocusMostRecentChatTerminal,
     weight: KeybindingWeight.WorkbenchContrib,
     when: ChatContextKeys.inChatSession,
-    primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KeyT,
     handler: async accessor => {
         const terminalChatService = accessor.get(ITerminalChatService);
         const part = terminalChatService.getMostRecentProgressPart();
@@ -433,14 +442,14 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminal,
-        title: ( localize(12529, "Chat: Focus Most Recent Terminal"))
+        title: ( localize(13343, "Chat: Focus Most Recent Terminal"))
     },
     when: ChatContextKeys.inChatSession
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminalOutput,
-        title: ( localize(12530, "Chat: Focus Most Recent Terminal Output"))
+        title: ( localize(13344, "Chat: Focus Most Recent Terminal Output"))
     },
     when: ChatContextKeys.inChatSession
 });

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

@@ -55,7 +55,6 @@ export declare class TerminalChatService extends Disposable implements ITerminal
     getToolSessionIdForInstance(instance: ITerminalInstance): string | undefined;
     registerTerminalInstanceWithChatSession(chatSessionResource: URI, instance: ITerminalInstance): void;
     getChatSessionResourceForInstance(instance: ITerminalInstance): URI | undefined;
-    getChatSessionIdForInstance(instance: ITerminalInstance): string | undefined;
     isBackgroundTerminal(terminalToolSessionId?: string): boolean;
     registerProgressPart(part: IChatTerminalToolProgressPart): IDisposable;
     setFocusedProgressPart(part: IChatTerminalToolProgressPart): void;

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatService.js

@@ -10,7 +10,7 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { TerminalChatContextKeys } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
-import { LocalChatSessionUri, chatSessionResourceToId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { isNumber, isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 
 var StorageKeys;
@@ -135,10 +135,6 @@ let TerminalChatService = class TerminalChatService extends Disposable {
     getChatSessionResourceForInstance(instance) {
         return this._chatSessionResourceByTerminalInstance.get(instance);
     }
-    getChatSessionIdForInstance(instance) {
-        const resource = this._chatSessionResourceByTerminalInstance.get(instance);
-        return resource ? chatSessionResourceToId(resource) : undefined;
-    }
     isBackgroundTerminal(terminalToolSessionId) {
         if (!terminalToolSessionId) {
             return false;

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.js

@@ -187,7 +187,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     }
     _resetPlaceholder() {
         const defaultAgent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Terminal);
-        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(12531, "Ask about commands"));
+        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(13345, "Ask about commands"));
     }
     async reveal() {
         await this._createSession();
@@ -280,7 +280,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     async _createSession() {
         this._sessionCtor = createCancelablePromise(async token => {
             if (!this._model.value) {
-                const modelRef = this._chatService.startSession(ChatAgentLocation.Terminal);
+                const modelRef = this._chatService.startNewLocalSession(ChatAgentLocation.Terminal);
                 this._model.value = modelRef;
                 const model = modelRef.object;
                 this._inlineChatWidget.setChatModel(model);
@@ -366,7 +366,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
         if (!model?.sessionResource) {
             return;
         }
-        this._chatService.cancelCurrentRequestForSession(model?.sessionResource);
+        this._chatService.cancelCurrentRequestForSession(model?.sessionResource, "terminalChat");
     }
     async viewInChat() {
         const widget = await this._chatWidgetService.revealWidget();