@codingame/monaco-vscode-workbench-service-override 37.6.1 → 38.0.0

package/vscode/src/vs/sessions/contrib/changes/browser/sessionsChangesAccessibilityHelp.js

@@ -6,7 +6,6 @@ import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { FocusedViewContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
-import { IAgentWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench.service';
 import { CHANGES_VIEW_ID, CreatePullRequestFocusedContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/common/changes';
 
 class SessionsChangesAccessibilityHelp {
@@ -22,70 +21,65 @@ class SessionsChangesAccessibilityHelp {
             return (new AccessibleContentProvider(AccessibleViewProviderId.SessionsChanges, {
                 type: AccessibleViewType.Help
             }, () => [( localize(
-                3555,
-                "You are in the Create Pull Request form. Title and description are generated in the background. Each field shows a loading indicator and reports a busy state until generation finishes. You may start editing immediately; generated text never replaces your edits."
+                3977,
+                "You are in the Create Pull Request form. Title and description are generated in the background. Each field shows a loading indicator and reports a busy state until generation finishes. Your remembered options are shown immediately and can be changed while generation is in progress. You may start editing immediately; generated text never replaces your edits."
             )), ( localize(
-                3556,
+                3978,
                 "The header identifies the repository, followed by the base branch on the left and source branch on the right. The arrow points toward the base branch that will receive the changes."
             )), ( localize(
-                3557,
+                3979,
                 "Use Tab and Shift+Tab to move between fields and buttons. Use arrow keys to choose a merge option and Space to toggle Create as Draft."
             )), ( localize(
-                3558,
+                3980,
                 "Create as Draft keeps the pull request in draft until it is ready for review."
             )), ( localize(
-                3559,
+                3981,
                 "Merge Manually leaves merging to you. Selecting Agent Merge reveals checkboxes for addressing reviews, fixing CI failures, and resolving conflicts or behind branches. Merge Pull Request lets you turn merging off, merge only if Agent Merge made no changes, or merge when ready. Session settings are changed only on submission, not when opening or cancelling the form. Auto-Merge asks GitHub to merge when requirements pass and lets you choose an allowed merge method. GitHub auto-merge is not available for drafts."
             )), ( localize(
-                3560,
-                "Draft, merge options, and the last-used submission action are remembered across sessions in this profile, even if you cancel. Title, description, repository, and branches are not remembered. Unavailable options are not applied, but your preferences are kept for repositories and hosts that support them."
+                3982,
+                "Draft, merge options, and the last-used submission action are remembered across sessions in this profile, even if you cancel. Title and description are kept in memory when you dismiss and reopen the form for the same session and branches. Cancel discards this content. Unavailable options are not applied, but your preferences are kept for repositories and hosts that support them."
             )), ( localize(
-                3561,
+                3983,
                 "Each Agent Merge checkbox has a description explaining what it does and when it acts. Focus a checkbox to hear its description, or hover over the info icon after its label to read it. Press Space to toggle it."
             )), ( localize(
-                3562,
-                "Create PR commits and pushes your changes and creates the pull request directly. When available, Tab to Pull Request Actions and press Enter or Space to open the dropdown. Choose Send Create PR Message to send the form details and options to this session's chat instead. The last-used action becomes the primary button. Control+Enter on Windows and Linux, or Command+Enter on macOS, runs that primary action. Press Escape to dismiss the dropdown, or Escape in the form or Cancel to close without submitting."
+                3984,
+                "Create PR is disabled while details are being generated. It closes the form immediately, then commits and pushes your changes and creates the pull request in the background. When available, Tab to Pull Request Actions and press Enter or Space to open the dropdown. Send Create PR Message is available even during generation. It asks this session's agent to create the pull request with your selected options and generate its own title and description, without using the form's text. The last-used action becomes the primary button. Control+Enter on Windows and Linux, or Command+Enter on macOS, runs that primary action. Press Escape to dismiss the dropdown, or Escape in the form to close without submitting and keep your text. Cancel closes the form and discards your text."
             ))].join("\n"), () => focusedElement.focus(), AccessibilityVerbositySettingId.SessionsChanges));
         }
         const viewsService = accessor.get(IViewsService);
-        const layoutService = accessor.get(IAgentWorkbenchLayoutService);
         const content = [];
         content.push(( localize(
-            3563,
+            3985,
             "You are in the Changes view. It shows the files changed by the current session as a tree, followed by a collapsible Checks section."
         )));
         content.push(( localize(
-            3564,
+            3986,
             "Use the up and down arrow keys to move between changed files, and the left and right arrow keys to collapse or expand folders. Press Enter to open the selected file's diff."
         )));
         content.push(( localize(
-            3565,
+            3987,
             "The Checks section lists the continuous integration checks for the session's pull request. Its header is a button: press Enter or Space to collapse or expand it{0}.",
             "<keybinding:sessions.action.revealCIChecks>"
         )));
         content.push(( localize(
-            3566,
+            3988,
             "The Changes view can show files as a tree or a flat list. Use the view's toolbar actions to switch between Tree and List modes."
         )));
         content.push(( localize(
-            3567,
+            3989,
             "When available, the Changes toolbar or editor title bar also provides actions to commit, merge, sync, or create a pull request. When Agent Merge is the primary action, activate it to toggle Agent Merge and use its dropdown to configure it. Use Tab and Shift+Tab to move between the file list and toolbar actions."
         )));
         content.push(( localize(
-            3568,
-            "For Agent Host sessions, Create PR opens a form with generated, editable title and description, a draft checkbox, and merge options. The form appears while generation is in progress and preserves anything you type. Use Tab to navigate and Escape to cancel."
+            3990,
+            "For Agent Host sessions, Create PR opens a form with generated, editable title and description, a draft checkbox, and merge options. The form appears while generation is in progress and preserves anything you type. Use Tab to navigate and Escape to dismiss while keeping your text. Cancel discards your text."
         )));
-        content.push(layoutService.isSinglePaneLayoutEnabled ? ( localize(
-            3569,
-            "Use Diff View in the editor title area's More Actions menu to select inline, side-by-side, or automatic layout. The Toggle Preferred Diff View command switches between inline and automatic layout{0}.",
-            "<keybinding:toggle.diff.renderSideBySide>"
-        )) : ( localize(
-            3570,
+        content.push(( localize(
+            3991,
             "Use Diff View in the editor title area's More Actions menu to select inline, side-by-side, or automatic layout. The Toggle Preferred Diff View command switches between inline and automatic layout{0}.",
             "<keybinding:toggle.diff.renderSideBySide>"
         )));
         content.push(( localize(
-            3571,
+            3992,
             "Use Word Wrap in the editor title area's More Actions menu to control word wrapping independently for code and multi-diff editors in the Agents window."
         )));
         return ( new AccessibleContentProvider(AccessibleViewProviderId.SessionsChanges, {

package/vscode/src/vs/sessions/contrib/chat/browser/sessionChatInputToolbarDebug.js

@@ -27,7 +27,7 @@ import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/obse
 registerCss(sessionChatInputToolbarDebug, 1);
 const $ = $$1;
 const SessionChatPillsDebugAvailableContext = new RawContextKey("sessionsChatPillsDebugAvailable", false, ( localize(
-    3892,
+    4394,
     "Whether a session chat view is active and can show fake status pills"
 )));
 const SHOW_SESSION_CHAT_PILLS_DEBUG_COMMAND_ID = "sessions.debug.showFakeChatPills";
@@ -62,7 +62,7 @@ let SessionChatPillsDebugService = class SessionChatPillsDebugService extends Di
                 constructor() {
                     super({
                         id: SHOW_SESSION_CHAT_PILLS_DEBUG_COMMAND_ID,
-                        title: ( localize2(3893, "Configure Fake Session Chat UI")),
+                        title: ( localize2(4395, "Configure Fake Session Chat UI")),
                         category: Categories.Developer,
                         precondition: SessionChatPillsDebugAvailableContext,
                         menu: [{
@@ -121,7 +121,7 @@ let SessionChatPillsDebugService = class SessionChatPillsDebugService extends Di
         let applyButton;
         let numericInputs = [];
         let revalidate = () => {};
-        const dialog = disposables.add(( new Dialog(this._layoutService.activeContainer, ( localize(3894, "Fake Session Chat UI")), [( localize(3895, "Apply")), ( localize(3896, "Clear")), ( localize(3897, "Cancel"))], createWorkbenchDialogOptions({
+        const dialog = disposables.add(( new Dialog(this._layoutService.activeContainer, ( localize(4396, "Fake Session Chat UI")), [( localize(4397, "Apply")), ( localize(4398, "Clear")), ( localize(4399, "Cancel"))], createWorkbenchDialogOptions({
             type: "none",
             extraClasses: ["session-chat-pills-debug-dialog"],
             cancelId: 2,
@@ -137,16 +137,16 @@ let SessionChatPillsDebugService = class SessionChatPillsDebugService extends Di
                 append(
                     form,
                     $("p.session-chat-pills-debug-description", undefined, ( localize(
-                        3898,
+                        4400,
                         "Configure the values shown by status pills and input banners. Separate multiple names with commas or new lines."
                     )))
                 );
                 const stats = append(form, $(".session-chat-pills-debug-stats"));
-                const files = this._createInput(stats, disposables, ( localize(3899, "Files")), state.files, value => state.files = value, true, () => revalidate());
-                const insertions = this._createInput(stats, disposables, ( localize(3900, "Insertions")), state.insertions, value => state.insertions = value, true, () => revalidate());
-                const deletions = this._createInput(stats, disposables, ( localize(3901, "Deletions")), state.deletions, value => state.deletions = value, true, () => revalidate());
+                const files = this._createInput(stats, disposables, ( localize(4401, "Files")), state.files, value => state.files = value, true, () => revalidate());
+                const insertions = this._createInput(stats, disposables, ( localize(4402, "Insertions")), state.insertions, value => state.insertions = value, true, () => revalidate());
+                const deletions = this._createInput(stats, disposables, ( localize(4403, "Deletions")), state.deletions, value => state.deletions = value, true, () => revalidate());
                 numericInputs = [files, insertions, deletions];
-                const autoIncrementLabel = ( localize(3902, "Automatically increase insertions and deletions every 2 seconds"));
+                const autoIncrementLabel = ( localize(4404, "Automatically increase insertions and deletions every 2 seconds"));
                 const autoIncrementRow = append(form, $(".session-chat-pills-debug-checkbox-row"));
                 const autoIncrementCheckbox = disposables.add(( new Checkbox(autoIncrementLabel, state.autoIncrementChanges, defaultCheckboxStyles)));
                 append(autoIncrementRow, autoIncrementCheckbox.domNode);
@@ -167,15 +167,15 @@ let SessionChatPillsDebugService = class SessionChatPillsDebugService extends Di
                     EventType.CLICK,
                     () => setAutoIncrement(!autoIncrementCheckbox.checked)
                 ));
-                this._createInput(form, disposables, ( localize(3903, "Artifact File Names")), state.markdownFiles, value => state.markdownFiles = value);
-                this._createInput(form, disposables, ( localize(3904, "Subagent Names")), state.subagents, value => state.subagents = value);
-                this._createInput(form, disposables, ( localize(3905, "Browser Labels")), state.browsers, value => state.browsers = value);
-                append(form, $("h3.session-chat-pills-debug-heading", undefined, ( localize(3906, "Input Banners"))));
+                this._createInput(form, disposables, ( localize(4405, "Artifact File Names")), state.markdownFiles, value => state.markdownFiles = value);
+                this._createInput(form, disposables, ( localize(4406, "Subagent Names")), state.subagents, value => state.subagents = value);
+                this._createInput(form, disposables, ( localize(4407, "Browser Labels")), state.browsers, value => state.browsers = value);
+                append(form, $("h3.session-chat-pills-debug-heading", undefined, ( localize(4408, "Input Banners"))));
                 const bannerStats = append(form, $(".session-chat-pills-debug-banner-stats"));
-                const ciFailed = this._createInput(bannerStats, disposables, ( localize(3907, "Failed CI Checks")), state.ciFailed, value => state.ciFailed = value, true, () => revalidate());
-                const ciPending = this._createInput(bannerStats, disposables, ( localize(3908, "Pending CI Checks")), state.ciPending, value => state.ciPending = value, true, () => revalidate());
-                const prFeedback = this._createInput(bannerStats, disposables, ( localize(3909, "PR Feedback to Address")), state.prFeedback, value => state.prFeedback = value, true, () => revalidate());
-                const agentFeedback = this._createInput(bannerStats, disposables, ( localize(3910, "Agent Feedback to Address")), state.agentFeedback, value => state.agentFeedback = value, true, () => revalidate());
+                const ciFailed = this._createInput(bannerStats, disposables, ( localize(4409, "Failed CI Checks")), state.ciFailed, value => state.ciFailed = value, true, () => revalidate());
+                const ciPending = this._createInput(bannerStats, disposables, ( localize(4410, "Pending CI Checks")), state.ciPending, value => state.ciPending = value, true, () => revalidate());
+                const prFeedback = this._createInput(bannerStats, disposables, ( localize(4411, "PR Feedback to Address")), state.prFeedback, value => state.prFeedback = value, true, () => revalidate());
+                const agentFeedback = this._createInput(bannerStats, disposables, ( localize(4412, "Agent Feedback to Address")), state.agentFeedback, value => state.agentFeedback = value, true, () => revalidate());
                 numericInputs = [...numericInputs, ciFailed, ciPending, prFeedback, agentFeedback];
                 revalidate = () => {
                     const valid = numericInputs.every(input => input.validate() !== MessageType.ERROR);
@@ -240,7 +240,7 @@ let SessionChatPillsDebugService = class SessionChatPillsDebugService extends Di
                 validationOptions: numeric ? {
                     validation: raw => {
                         return isNonNegativeIntegerInput(raw) ? null : {
-                            content: ( localize(3911, "Enter a whole number greater than or equal to 0.")),
+                            content: ( localize(4413, "Enter a whole number greater than or equal to 0.")),
                             type: MessageType.ERROR
                         };
                     }

package/vscode/src/vs/sessions/contrib/chat/browser/sessionTaskRunner.d.ts

@@ -1,5 +1,5 @@
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ISession } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session";
+import { IChat, ISession } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session";
 import { ITaskEntry } from "@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/chat/browser/sessionsTasksService";
 import { ISessionTaskRunnerRegistry } from "@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/chat/browser/sessionTaskRunner.service";
 /**
@@ -19,8 +19,8 @@ export interface ISessionTaskRunner {
      * runners typically use a higher value (e.g. `100`).
      */
     readonly priority: number;
-    /** Returns `true` if this runner can execute tasks for the given session. */
-    canRun(session: ISession): boolean;
+    /** Returns `true` if this runner can execute tasks for the given session and optional chat. */
+    canRun(session: ISession, chat?: IChat): boolean;
     /**
      * Executes the given task in the session's runtime. The returned promise
      * resolves once the task has been launched (not when it has finished).
@@ -31,11 +31,11 @@ export interface ISessionTaskRunner {
      * processes when a session is marked done. Resolves to `undefined` when the
      * runner has nothing to stop.
      */
-    runTask(task: ITaskEntry, session: ISession): Promise<IDisposable | undefined>;
+    runTask(task: ITaskEntry, session: ISession, chat?: IChat): Promise<IDisposable | undefined>;
 }
 export declare class SessionTaskRunnerRegistry implements ISessionTaskRunnerRegistry {
     readonly _serviceBrand: undefined;
     private readonly _runners;
     register(runner: ISessionTaskRunner): IDisposable;
-    getRunner(session: ISession): ISessionTaskRunner | undefined;
+    getRunner(session: ISession, chat?: IChat): ISessionTaskRunner | undefined;
 }

package/vscode/src/vs/sessions/contrib/chat/browser/sessionTaskRunner.js

@@ -14,10 +14,10 @@ class SessionTaskRunnerRegistry {
             }
         });
     }
-    getRunner(session) {
+    getRunner(session, chat) {
         let best;
         for (const runner of this._runners) {
-            if (!runner.canRun(session)) {
+            if (!runner.canRun(session, chat)) {
                 continue;
             }
             if (!best || runner.priority >= best.priority) {

package/vscode/src/vs/sessions/contrib/chatDebug/browser/chatDebug.contribution.js

@@ -14,7 +14,7 @@ import { Extensions, WindowEnablement, ViewContainerLocation } from '@codingame/
 const COPILOT_CHAT_VIEW_CONTAINER_ID = "workbench.view.extension.copilot-chat";
 const COPILOT_CHAT_VIEW_ID = "copilot-chat";
 const SESSIONS_CHAT_DEBUG_CONTAINER_ID = "workbench.sessions.panel.chatDebugContainer";
-const chatDebugViewIcon = registerIcon("sessions-chat-debug-view-icon", Codicon.debug, ( localize(4034, "View icon of the chat debug view in the sessions window.")));
+const chatDebugViewIcon = registerIcon("sessions-chat-debug-view-icon", Codicon.debug, ( localize(4678, "View icon of the chat debug view in the sessions window.")));
 let RegisterChatDebugViewContribution = class RegisterChatDebugViewContribution extends Disposable {
     static {
         this.ID = "sessions.registerChatDebugView";
@@ -55,7 +55,7 @@ let RegisterChatDebugViewContribution = class RegisterChatDebugViewContribution
         viewContainerRegistry.deregisterViewContainer(viewContainer);
         const chatDebugViewContainer = viewContainerRegistry.registerViewContainer({
             id: SESSIONS_CHAT_DEBUG_CONTAINER_ID,
-            title: ( localize2(4035, "Chat Debug")),
+            title: ( localize2(4679, "Chat Debug")),
             icon: chatDebugViewIcon,
             order: 3,
             ctorDescriptor: ( new SyncDescriptor(ViewPaneContainer, [SESSIONS_CHAT_DEBUG_CONTAINER_ID, {

package/vscode/src/vs/sessions/contrib/codeReview/browser/codeReview.contributions.js

@@ -2,11 +2,11 @@
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { Action2, MenuId, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { Action2, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { IsSessionsWindowContext, ActiveEditorContext, IsAuxiliaryWindowContext, IsTopRightEditorGroupContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
-import { SinglePaneLayoutEnabledContext, SessionWorkspaceIsVirtualContext, IsPhoneLayoutContext, SessionIsCreatedContext, SessionProviderIdContext, SessionHasChangesContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
+import { DesktopLayoutContext, SessionWorkspaceIsVirtualContext, SessionIsCreatedContext, SessionHasChangesContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ISessionsManagementService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement.service';
@@ -14,16 +14,14 @@ import { ISessionsService } from '@codingame/monaco-vscode-api/vscode/vs/session
 import '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/codeReview/browser/codeReviewService';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ANY_AGENT_HOST_PROVIDER_RE } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/agentHostSessionsProvider';
 import { Menus } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/menus';
 import { SessionChangesEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/sessionChangesEditorInput';
 import '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/sessionChangesService';
 import { ISessionChangesService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/common/sessionChangesService.service';
 
 const CODE_REVIEW_QUERY = "/code-review";
-const singlePaneDetailPanel = SinglePaneLayoutEnabledContext;
-const codeReviewChangesToolbarWhen = ( ContextKeyExpr.and(IsSessionsWindowContext, ( SessionWorkspaceIsVirtualContext.toNegated()), ( IsPhoneLayoutContext.negate()), SessionIsCreatedContext, ( ContextKeyExpr.regex(SessionProviderIdContext.key, ANY_AGENT_HOST_PROVIDER_RE)), ( singlePaneDetailPanel.negate())));
-const singlePaneCodeReviewWhen = ( ContextKeyExpr.and(IsSessionsWindowContext, ( ActiveEditorContext.isEqualTo(SessionChangesEditorInput.EDITOR_ID)), singlePaneDetailPanel, ( IsAuxiliaryWindowContext.toNegated()), IsTopRightEditorGroupContext, ( SessionWorkspaceIsVirtualContext.toNegated()), SessionIsCreatedContext, SessionHasChangesContext));
+const desktopDetailPanel = DesktopLayoutContext;
+const desktopCodeReviewWhen = ( ContextKeyExpr.and(IsSessionsWindowContext, ( ActiveEditorContext.isEqualTo(SessionChangesEditorInput.EDITOR_ID)), desktopDetailPanel, ( IsAuxiliaryWindowContext.toNegated()), IsTopRightEditorGroupContext, ( SessionWorkspaceIsVirtualContext.toNegated()), SessionIsCreatedContext, SessionHasChangesContext));
 class RunSessionCodeReviewAction extends Action2 {
     static {
         this.ID = "sessions.codeReview.run";
@@ -31,22 +29,17 @@ class RunSessionCodeReviewAction extends Action2 {
     constructor() {
         super({
             id: RunSessionCodeReviewAction.ID,
-            title: ( localize2(4036, "Run Code Review")),
-            tooltip: ( localize(4037, "Run Code Review")),
+            title: ( localize2(4680, "Run Code Review")),
+            tooltip: ( localize(4681, "Run Code Review")),
             category: CHAT_CATEGORY,
             icon: Codicon.codeReview,
             precondition: ( ContextKeyExpr.or(ChatContextKeys.hasAgentSessionChanges, SessionHasChangesContext)),
-            menu: [{
-                id: MenuId.AgentsChangesToolbar,
-                group: "navigation",
-                order: 7,
-                when: codeReviewChangesToolbarWhen
-            }, {
+            menu: {
                 id: Menus.SessionsEditorHeaderLayout,
                 group: "navigation",
                 order: 10,
-                when: singlePaneCodeReviewWhen
-            }]
+                when: desktopCodeReviewWhen
+            }
         });
     }
     async run(accessor, sessionResource) {

package/vscode/src/vs/sessions/contrib/customViewTest/browser/customViewTest.contribution.js

@@ -23,9 +23,9 @@ const TEST_CUSTOM_VIEW_ID = "sessions.customView.test";
 class TestCustomView extends AbstractCustomView {
     constructor() {
         super(...arguments);
-        this.title = constObservable(( localize(4038, "Test Custom View")));
+        this.title = constObservable(( localize(4682, "Test Custom View")));
         this.description = constObservable(( localize(
-            4039,
+            4683,
             "A placeholder view used to verify the custom view grid layout, header and scrolling."
         )));
     }
@@ -34,7 +34,7 @@ class TestCustomView extends AbstractCustomView {
     }
     render(container) {
         for (let i = 0; i < TestCustomView.ITEM_COUNT; i++) {
-            container.appendChild($(".custom-view-test-item", undefined, ( localize(4040, "Item {0}", i + 1))));
+            container.appendChild($(".custom-view-test-item", undefined, ( localize(4684, "Item {0}", i + 1))));
         }
     }
     layout(_width, _height) {}
@@ -65,7 +65,7 @@ class ShowTestCustomViewAction extends Action2 {
     constructor() {
         super({
             id: "sessions.customView.showTestView",
-            title: ( localize2(4041, "Show Test Custom View")),
+            title: ( localize2(4685, "Show Test Custom View")),
             category: Categories.Developer,
             f1: true,
             precondition: IsDevelopmentContext
@@ -79,7 +79,7 @@ class HideTestCustomViewAction extends Action2 {
     constructor() {
         super({
             id: "sessions.customView.hideTestView",
-            title: ( localize2(4042, "Hide Test Custom View")),
+            title: ( localize2(4686, "Hide Test Custom View")),
             category: Categories.Developer,
             f1: true,
             precondition: IsDevelopmentContext
@@ -93,7 +93,7 @@ class TestCustomViewPingAction extends Action2 {
     constructor() {
         super({
             id: "sessions.customView.testView.ping",
-            title: ( localize2(4043, "Ping Test Custom View")),
+            title: ( localize2(4687, "Ping Test Custom View")),
             icon: Codicon.debugAlt,
             menu: [{
                 id: Menus.CustomViewTest,
@@ -103,7 +103,7 @@ class TestCustomViewPingAction extends Action2 {
         });
     }
     run(accessor) {
-        accessor.get(INotificationService).info(( localize(4044, "Test custom view action ran.")));
+        accessor.get(INotificationService).info(( localize(4688, "Test custom view action ran.")));
     }
 }
 registerAction2(ShowTestCustomViewAction);

package/vscode/src/vs/sessions/contrib/editor/browser/addTabActions.js

@@ -14,7 +14,7 @@ import { openNewSearchEditor } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IsSessionsWindowContext, IsAuxiliaryWindowContext, IsTopRightEditorGroupContext, EditorTabsVisibleContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
-import { SinglePaneChangesTabAvailableContext, SinglePaneFilesTabAvailableContext, IsQuickChatSessionContext, SinglePaneFilesTabMissingContext, SinglePaneChangesTabMissingContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
+import { DesktopChangesTabAvailableContext, DesktopFilesTabAvailableContext, IsQuickChatSessionContext, DesktopFilesTabMissingContext, DesktopChangesTabMissingContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
 import { SessionsCategories } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/categories';
 import { NEW_FILE_TAB_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/sessionCommands';
 import '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/sessionChangesService';
@@ -29,15 +29,15 @@ const NEW_CHANGES_TAB_COMMAND_ID = "workbench.action.agentSessions.newChangesTab
 const addTabActionWhen = ( ContextKeyExpr.and(IsSessionsWindowContext, ( IsAuxiliaryWindowContext.toNegated())));
 const addTabLayoutWhen = ( ContextKeyExpr.and(addTabActionWhen, IsTopRightEditorGroupContext));
 const singleEditorTitleWhen = ( EditorTabsVisibleContext.negate());
-const changesTabActionWhen = ( ContextKeyExpr.and(addTabActionWhen, SinglePaneChangesTabAvailableContext));
-const filesTabActionWhen = ( ContextKeyExpr.and(addTabActionWhen, SinglePaneFilesTabAvailableContext));
+const changesTabActionWhen = ( ContextKeyExpr.and(addTabActionWhen, DesktopChangesTabAvailableContext));
+const filesTabActionWhen = ( ContextKeyExpr.and(addTabActionWhen, DesktopFilesTabAvailableContext));
 const browserTabActionWhen = ( ContextKeyExpr.and(addTabActionWhen, ( IsWebContext.toNegated())));
 const searchTabActionWhen = ( ContextKeyExpr.and(addTabActionWhen, ( IsQuickChatSessionContext.negate())));
 class NewFileTabAction extends Action2 {
     constructor() {
         super({
             id: NEW_FILE_TAB_COMMAND_ID,
-            title: ( localize2(4045, "Files")),
+            title: ( localize2(4689, "Files")),
             category: SessionsCategories.Sessions,
             icon: Codicon.newFile,
             f1: true,
@@ -51,7 +51,7 @@ class NewFileTabAction extends Action2 {
                 id: Menus.SessionsEditorTabsBarAddTab,
                 group: "navigation",
                 order: 1,
-                when: ( ContextKeyExpr.and(addTabLayoutWhen, SinglePaneFilesTabAvailableContext, ( ContextKeyExpr.or(singleEditorTitleWhen, SinglePaneFilesTabMissingContext))))
+                when: ( ContextKeyExpr.and(addTabLayoutWhen, DesktopFilesTabAvailableContext, ( ContextKeyExpr.or(singleEditorTitleWhen, DesktopFilesTabMissingContext))))
             }
         });
     }
@@ -61,7 +61,7 @@ class NewFileTabAction extends Action2 {
         const instantiationService = accessor.get(IInstantiationService);
         const sessionsService = accessor.get(ISessionsService);
         const group = editorGroupsService.mainPart.activeGroup;
-        const workspace = sessionsService.activeSession.get()?.workspace.get();
+        const workspace = sessionsService.activeSession.get()?.activeChat.get().workspace.get();
         await editorService.openEditor(instantiationService.createInstance(EmptyFileEditorInput, workspace), {
             pinned: true,
             index: group.count
@@ -72,7 +72,7 @@ class NewBrowserTabAction extends Action2 {
     constructor() {
         super({
             id: NEW_BROWSER_TAB_COMMAND_ID,
-            title: ( localize2(4046, "Browser")),
+            title: ( localize2(4690, "Browser")),
             category: SessionsCategories.Sessions,
             icon: Codicon.globe,
             f1: true,
@@ -105,7 +105,7 @@ class NewSearchTabAction extends Action2 {
     constructor() {
         super({
             id: NEW_SEARCH_TAB_COMMAND_ID,
-            title: ( localize2(4047, "Search")),
+            title: ( localize2(4691, "Search")),
             category: SessionsCategories.Sessions,
             icon: Codicon.search,
             f1: true,
@@ -134,7 +134,7 @@ class NewChangesTabAction extends Action2 {
     constructor() {
         super({
             id: NEW_CHANGES_TAB_COMMAND_ID,
-            title: ( localize2(4048, "Changes")),
+            title: ( localize2(4692, "Changes")),
             category: SessionsCategories.Sessions,
             icon: Codicon.gitCompare,
             f1: false,
@@ -151,7 +151,7 @@ class NewChangesTabAction extends Action2 {
                 id: Menus.SessionsEditorTabsBarAddTab,
                 group: "navigation",
                 order: 0,
-                when: ( ContextKeyExpr.and(addTabLayoutWhen, SinglePaneChangesTabAvailableContext, ( ContextKeyExpr.or(singleEditorTitleWhen, SinglePaneChangesTabMissingContext))))
+                when: ( ContextKeyExpr.and(addTabLayoutWhen, DesktopChangesTabAvailableContext, ( ContextKeyExpr.or(singleEditorTitleWhen, DesktopChangesTabMissingContext))))
             }
         });
     }

package/vscode/src/vs/sessions/contrib/editor/browser/editor.contribution.d.ts

@@ -1,9 +1,21 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IAgentWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
+import { IAuxiliaryWindowService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service";
+export declare class SessionsTabStyleContribution extends Disposable implements IWorkbenchContribution {
+    private readonly configurationService;
+    private readonly layoutService;
+    private readonly auxiliaryWindowService;
+    static readonly ID = "workbench.contrib.sessions.tabStyle";
+    constructor(configurationService: IConfigurationService, layoutService: IWorkbenchLayoutService, auxiliaryWindowService: IAuxiliaryWindowService);
+    private applyTo;
+    dispose(): void;
+}
 /**
  * Mirrors extension-contributed `editor/title` items into {@link Menus.SessionsEditorTitle}
- * so they are not lost in the single-pane layout. See `LAYOUT.md` for details.
+ * so they are not lost in the desktop layout. See `LAYOUT.md` for details.
  */
 export declare class EditorTitleMenuBridgeContribution extends Disposable implements IWorkbenchContribution {
     static readonly ID = "workbench.contrib.sessions.editorTitleMenuBridge";