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

package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/agentMergeActions.js

@@ -19,12 +19,14 @@ import { IsSessionsWindowContext } from '@codingame/monaco-vscode-api/vscode/vs/
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service';
 import { ANY_AGENT_HOST_PROVIDER_RE, isAgentHostProvider } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/agentHostSessionsProvider';
-import { SessionProviderIdContext, SessionIsArchivedContext, SessionHasOpenPullRequestContext, SessionPrimaryPullRequestOperationContext, SessionAgentMergeEnabledContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
+import { SessionProviderIdContext, SessionIsArchivedContext, SessionHasOpenPullRequestContext, SessionPrimaryPullRequestOperationContext, SessionAgentMergeEnabledContext, DesktopChangesEditorTransitionContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
 import { CHANGES_OPERATIONS_DROPDOWN_PRIMARY_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/changesView';
+import { IChangesViewService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/common/changesViewService.service';
 import { Menus } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/menus';
 import { ISessionsProvidersService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsProvidersService.service';
 import { ISessionsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service';
 import { getSessionAgentMergeConfigurationObservable, getGlobalAgentMergeConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/sessionAgentMerge';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 const agentMergeCommandPrecondition = ( ContextKeyExpr.and(IsSessionsWindowContext, ChatContextKeys.enabled, ( ContextKeyExpr.regex(SessionProviderIdContext.key, ANY_AGENT_HOST_PROVIDER_RE)), ( SessionIsArchivedContext.negate()), ( ContextKeyExpr.equals(`config.${AgentMergeSettingId.Enabled}`, true))));
@@ -44,21 +46,21 @@ const AgentMergeSessionActionContexts = {
     addressReviews: new RawContextKey("sessionAgentMergeAddressReviews", false, {
         type: "boolean",
         description: ( localize(
-            4262,
+            4942,
             "True when Agent Merge may address reviews for the active agent session."
         ))
     }),
     fixCI: new RawContextKey("sessionAgentMergeFixCI", false, {
         type: "boolean",
         description: ( localize(
-            4263,
+            4943,
             "True when Agent Merge may fix CI failures for the active agent session."
         ))
     }),
     resolveConflicts: new RawContextKey("sessionAgentMergeResolveConflicts", false, {
         type: "boolean",
         description: ( localize(
-            4264,
+            4944,
             "True when Agent Merge may resolve conflicts for the active agent session."
         ))
     })
@@ -66,28 +68,28 @@ const AgentMergeSessionActionContexts = {
 const AgentMergeSessionMergePullRequestContext = new RawContextKey("sessionAgentMergeMergePullRequest", "never", {
     type: "string",
     description: ( localize(
-        4265,
+        4945,
         "When Agent Merge may merge the pull request for the active agent session ('always', 'ifUnchanged' or 'never')."
     ))
 });
 const agentMergeActionLabels = {
-    addressReviews: ( localize(4266, "Address Reviews")),
-    fixCI: ( localize(4267, "Fix CI Failures")),
-    resolveConflicts: ( localize(4268, "Resolve Conflicts and Behind Branches"))
+    addressReviews: ( localize(4946, "Address Reviews")),
+    fixCI: ( localize(4947, "Fix CI Failures")),
+    resolveConflicts: ( localize(4948, "Resolve Conflicts and Behind Branches"))
 };
 const agentMergeRepairActions = ( Object.keys(agentMergeActionLabels));
 const agentMergeMergePullRequestLabels = {
-    always: ( localize(4269, "On")),
-    ifUnchanged: ( localize(4270, "Only if Agent Merge Made No Changes")),
-    never: ( localize(4271, "Off"))
+    always: ( localize(4949, "On")),
+    ifUnchanged: ( localize(4950, "Only if Agent Merge Made No Changes")),
+    never: ( localize(4951, "Off"))
 };
 const agentMergeMergePullRequestDescriptions = {
-    always: ( localize(4272, "Merge the pull request whenever it is ready.")),
+    always: ( localize(4952, "Merge the pull request whenever it is ready.")),
     ifUnchanged: ( localize(
-        4273,
+        4953,
         "Merge the pull request only while Agent Merge has not changed it. Once a repair turn lands a commit this switches itself off."
     )),
-    never: ( localize(4274, "Do not merge the pull request automatically."))
+    never: ( localize(4954, "Do not merge the pull request automatically."))
 };
 let AgentMergeContextContribution = class AgentMergeContextContribution extends Disposable {
     static {
@@ -98,6 +100,7 @@ let AgentMergeContextContribution = class AgentMergeContextContribution extends
         configurationService,
         sessionsService,
         sessionsProvidersService,
+        changesViewService,
         logService
     ) {
         super();
@@ -106,29 +109,39 @@ let AgentMergeContextContribution = class AgentMergeContextContribution extends
             action => [action, AgentMergeSessionActionContexts[action].bindTo(contextKeyService)]
         )));
         const mergePullRequestKey = AgentMergeSessionMergePullRequestContext.bindTo(contextKeyService);
+        const changesEditorTransitionObs = observableFromEvent(
+            contextKeyService.onDidChangeContext,
+            () => DesktopChangesEditorTransitionContext.getValue(contextKeyService) === true
+        );
         let lastLogged;
         this._register(autorun(reader => {
+            if (changesEditorTransitionObs.read(reader) || changesViewService.activeSessionChangesetsLoadingObs.read(reader) || changesViewService.activeSessionLoadingObs.read(reader)) {
+                return;
+            }
             const session = sessionsService.activeSession.read(reader);
-            const state = session ? getSessionAgentMergeConfigurationObservable(session, sessionsProvidersService, configurationService).read(reader) : undefined;
+            const chat = session?.activeChat.read(reader);
+            const state = session ? getSessionAgentMergeConfigurationObservable(session, sessionsProvidersService, configurationService, chat).read(reader) : undefined;
             const enabled = state?.enabled === true;
             const effective = state?.actions ?? getGlobalAgentMergeConfiguration(configurationService);
-            enabledKey.set(enabled);
-            for (const [action, key] of actionKeys) {
-                key.set(effective[action]);
-            }
-            mergePullRequestKey.set(effective.mergePullRequest);
+            contextKeyService.bufferChangeEvents(() => {
+                enabledKey.set(enabled);
+                for (const [action, key] of actionKeys) {
+                    key.set(effective[action]);
+                }
+                mergePullRequestKey.set(effective.mergePullRequest);
+            });
             const authorized = agentMergeRepairActions.filter(action => effective[action]);
-            const signature = `${session?.sessionId ?? "none"}|${enabled}|${authorized.join(",")}|${effective.mergePullRequest}`;
+            const signature = `${session?.sessionId ?? "none"}|${chat?.resource.toString() ?? "none"}|${enabled}|${authorized.join(",")}|${effective.mergePullRequest}`;
             if (lastLogged !== signature) {
                 lastLogged = signature;
                 logService.info(
-                    `[AgentMergeActions] Session state: session=${session?.sessionId ?? "none"}, enabled=${enabled}, authorizedActions=[${authorized.join(", ") || "none"}], mergePullRequest=${effective.mergePullRequest}`
+                    `[AgentMergeActions] Session state: session=${session?.sessionId ?? "none"}, chat=${chat?.resource.toString() ?? "none"}, enabled=${enabled}, authorizedActions=[${authorized.join(", ") || "none"}], mergePullRequest=${effective.mergePullRequest}`
                 );
             }
         }));
     }
 };
-AgentMergeContextContribution = ( __decorate([( __param(0, IContextKeyService)), ( __param(1, IConfigurationService)), ( __param(2, ISessionsService)), ( __param(3, ISessionsProvidersService)), ( __param(4, ILogService))], AgentMergeContextContribution));
+AgentMergeContextContribution = ( __decorate([( __param(0, IContextKeyService)), ( __param(1, IConfigurationService)), ( __param(2, ISessionsService)), ( __param(3, ISessionsProvidersService)), ( __param(4, IChangesViewService)), ( __param(5, ILogService))], AgentMergeContextContribution));
 registerWorkbenchContribution2(
     AgentMergeContextContribution.ID,
     AgentMergeContextContribution,
@@ -140,7 +153,8 @@ class AgentMergeActionBase extends Action2 {
         const provider = session && accessor.get(ISessionsProvidersService).getProvider(session.providerId);
         return session && provider && isAgentHostProvider(provider) ? {
             session,
-            provider
+            provider,
+            chat: session.activeChat.get().resource
         } : undefined;
     }
     async updateOverrides(accessor, patch) {
@@ -150,7 +164,7 @@ class AgentMergeActionBase extends Action2 {
         }
         const configurationService = accessor.get(IConfigurationService);
         const logService = accessor.get(ILogService);
-        const state = active.provider.getAgentMergeSessionState(active.session.sessionId);
+        const state = active.provider.getAgentMergeSessionState(active.session.sessionId, active.chat);
         const effective = resolveAgentMergeConfiguration(getGlobalAgentMergeConfiguration(configurationService), state?.overrides);
         const overrides = {
             addressReviews: effective.addressReviews,
@@ -159,7 +173,7 @@ class AgentMergeActionBase extends Action2 {
             mergePullRequest: effective.mergePullRequest,
             ...patch
         };
-        await active.provider.setAgentMergeOverrides(active.session.sessionId, overrides);
+        await active.provider.setAgentMergeOverrides(active.session.sessionId, overrides, active.chat);
         logService.info(
             `[AgentMergeActions] Overrides updated: session=${active.session.sessionId}, change=${JSON.stringify(patch)}`
         );
@@ -167,7 +181,7 @@ class AgentMergeActionBase extends Action2 {
 }
 MenuRegistry.appendMenuItem(Menus.ChangesOperationsDropdown, {
     submenu: Menus.ChangesAgentMerge,
-    title: ( localize2(4275, "Agent Merge")),
+    title: ( localize2(4955, "Agent Merge")),
     icon: Codicon.gitMerge,
     group: CHANGES_OPERATIONS_DROPDOWN_PRIMARY_GROUP,
     order: 1,
@@ -178,7 +192,7 @@ registerAction2(class EnableAgentMergeInSessionAction extends AgentMergeActionBa
     constructor() {
         super({
             id: "sessions.agentHost.agentMerge.enableInSession",
-            title: ( localize2(4276, "Enable Agent Merge")),
+            title: ( localize2(4956, "Enable Agent Merge")),
             f1: false,
             menu: agentMergeTopLevelMenus.map(id => ({
                 id,
@@ -194,7 +208,7 @@ registerAction2(class EnableAgentMergeInSessionAction extends AgentMergeActionBa
         if (!active) {
             return;
         }
-        await active.provider.setAgentMergeEnabled(active.session.sessionId, true);
+        await active.provider.setAgentMergeEnabled(active.session.sessionId, true, active.chat);
         logService.info(
             `[AgentMergeActions] Enabled from the title bar: session=${active.session.sessionId}`
         );
@@ -204,7 +218,7 @@ registerAction2(class DisableAgentMergeInSessionAction extends AgentMergeActionB
     constructor() {
         super({
             id: "sessions.agentHost.agentMerge.disableInSession",
-            title: ( localize2(4277, "Disable Agent Merge")),
+            title: ( localize2(4957, "Disable Agent Merge")),
             f1: false,
             menu: agentMergeTopLevelMenus.map(id => ({
                 id,
@@ -220,7 +234,7 @@ registerAction2(class DisableAgentMergeInSessionAction extends AgentMergeActionB
         if (!active) {
             return;
         }
-        await active.provider.setAgentMergeEnabled(active.session.sessionId, false);
+        await active.provider.setAgentMergeEnabled(active.session.sessionId, false, active.chat);
         logService.info(
             `[AgentMergeActions] Disabled from the title bar: session=${active.session.sessionId}`
         );
@@ -229,7 +243,7 @@ registerAction2(class DisableAgentMergeInSessionAction extends AgentMergeActionB
 for (const id of agentMergeTopLevelMenus) {
     MenuRegistry.appendMenuItem(id, {
         submenu: Menus.ChangesAgentMergeConfigure,
-        title: ( localize2(4278, "Configure Agent Merge")),
+        title: ( localize2(4958, "Configure Agent Merge")),
         group: "1_agentMerge",
         order: 2,
         when: agentMergeMenuPrecondition
@@ -259,7 +273,7 @@ for (const [index, action] of agentMergeRepairActions.entries()) {
             if (!active) {
                 return;
             }
-            const state = active.provider.getAgentMergeSessionState(active.session.sessionId);
+            const state = active.provider.getAgentMergeSessionState(active.session.sessionId, active.chat);
             const effective = resolveAgentMergeConfiguration(
                 getGlobalAgentMergeConfiguration(accessor.get(IConfigurationService)),
                 state?.overrides
@@ -274,7 +288,7 @@ for (const value of agentMergeMergePullRequestValues) {
     MenuRegistry.appendMenuItem(Menus.ChangesAgentMergeConfigure, mergePullRequestSubmenuItem(value));
 }
 function mergePullRequestSubmenuItem(value) {
-    const title = ( localize(4279, "Merge Pull Request ({0})", agentMergeMergePullRequestLabels[value]));
+    const title = ( localize(4959, "Merge Pull Request ({0})", agentMergeMergePullRequestLabels[value]));
     return {
         submenu: Menus.ChangesAgentMergeMergePullRequest,
         title: {
@@ -316,7 +330,7 @@ registerAction2(class OpenAgentMergeDefaultsAction extends Action2 {
     constructor() {
         super({
             id: "sessions.agentHost.agentMerge.openDefaults",
-            title: ( localize2(4280, "Agent Merge Defaults")),
+            title: ( localize2(4960, "Agent Merge Defaults")),
             f1: false,
             menu: [{
                 id: Menus.ChangesAgentMergeConfigure,
@@ -340,7 +354,7 @@ registerAction2(class EnableAgentMergeAction extends AgentMergeActionBase {
     constructor() {
         super({
             id: "sessions.agentHost.agentMerge.enable",
-            title: ( localize2(4281, "Enable Agent Merge for Active Session")),
+            title: ( localize2(4961, "Enable Agent Merge for Active Session")),
             f1: true,
             precondition: ( ContextKeyExpr.and(agentMergeCommandPrecondition, ( SessionAgentMergeEnabledContext.negate())))
         });
@@ -352,18 +366,18 @@ registerAction2(class EnableAgentMergeAction extends AgentMergeActionBase {
         }
         const logService = accessor.get(ILogService);
         const notificationService = accessor.get(INotificationService);
-        await active.provider.setAgentMergeEnabled(active.session.sessionId, true);
+        await active.provider.setAgentMergeEnabled(active.session.sessionId, true, active.chat);
         logService.info(
             `[AgentMergeActions] Enable requested: session=${active.session.sessionId}, provider=${active.session.providerId}`
         );
-        notificationService.info(( localize(4282, "Agent Merge is enabled for the active session.")));
+        notificationService.info(( localize(4962, "Agent Merge is enabled for the active session.")));
     }
 });
 registerAction2(class DisableAgentMergeAction extends AgentMergeActionBase {
     constructor() {
         super({
             id: "sessions.agentHost.agentMerge.disable",
-            title: ( localize2(4283, "Disable Agent Merge for Active Session")),
+            title: ( localize2(4963, "Disable Agent Merge for Active Session")),
             f1: true,
             precondition: ( ContextKeyExpr.and(agentMergeCommandPrecondition, SessionAgentMergeEnabledContext))
         });
@@ -375,18 +389,18 @@ registerAction2(class DisableAgentMergeAction extends AgentMergeActionBase {
         }
         const logService = accessor.get(ILogService);
         const notificationService = accessor.get(INotificationService);
-        await active.provider.setAgentMergeEnabled(active.session.sessionId, false);
+        await active.provider.setAgentMergeEnabled(active.session.sessionId, false, active.chat);
         logService.info(
             `[AgentMergeActions] Disable requested: session=${active.session.sessionId}, provider=${active.session.providerId}`
         );
-        notificationService.info(( localize(4284, "Agent Merge is disabled for the active session.")));
+        notificationService.info(( localize(4964, "Agent Merge is disabled for the active session.")));
     }
 });
 registerAction2(class ConfigureAgentMergeAction extends AgentMergeActionBase {
     constructor() {
         super({
             id: "sessions.agentHost.agentMerge.configure",
-            title: ( localize2(4285, "Configure Agent Merge for Active Session")),
+            title: ( localize2(4965, "Configure Agent Merge for Active Session")),
             f1: true,
             precondition: agentMergeCommandPrecondition
         });
@@ -401,7 +415,7 @@ registerAction2(class ConfigureAgentMergeAction extends AgentMergeActionBase {
         const logService = accessor.get(ILogService);
         const notificationService = accessor.get(INotificationService);
         const defaults = getGlobalAgentMergeConfiguration(configurationService);
-        const current = active.provider.getAgentMergeSessionState(active.session.sessionId);
+        const current = active.provider.getAgentMergeSessionState(active.session.sessionId, active.chat);
         const effective = resolveAgentMergeConfiguration(defaults, current?.overrides);
         const picks = agentMergeRepairActions.map(action => ({
             action,
@@ -413,28 +427,28 @@ registerAction2(class ConfigureAgentMergeAction extends AgentMergeActionBase {
             return;
         }
         const overrides = result.reset ? undefined : toOverrides(result.actions, effective.mergePullRequest);
-        await active.provider.setAgentMergeOverrides(active.session.sessionId, overrides);
+        await active.provider.setAgentMergeOverrides(active.session.sessionId, overrides, active.chat);
         logService.info(
             `[AgentMergeActions] Action overrides updated: session=${active.session.sessionId}, provider=${active.session.providerId}, reset=${result.reset}, enabledActions=${[...result.actions].sort().join(",") || "none"}`
         );
         notificationService.info(result.reset ? ( localize(
-            4286,
+            4966,
             "Agent Merge now follows the global action defaults for this session."
-        )) : ( localize(4287, "Agent Merge actions were updated for the active session.")));
+        )) : ( localize(4967, "Agent Merge actions were updated for the active session.")));
     }
 });
 function pickAgentMergeActions(quickInputService, picks) {
     const store = ( new DisposableStore());
     return (new Promise(resolve => {
         const quickPick = store.add(quickInputService.createQuickPick());
-        quickPick.title = ( localize(4288, "Agent Merge"));
-        quickPick.placeholder = ( localize(4289, "Select actions Agent Merge may perform for this session"));
+        quickPick.title = ( localize(4968, "Agent Merge"));
+        quickPick.placeholder = ( localize(4969, "Select actions Agent Merge may perform for this session"));
         quickPick.canSelectMany = true;
         quickPick.items = picks;
         quickPick.selectedItems = picks.filter(pick => pick.picked);
         quickPick.buttons = [{
             iconClass: ThemeIcon.asClassName(Codicon.discard),
-            tooltip: ( localize(4290, "Reset to Global Defaults"))
+            tooltip: ( localize(4970, "Reset to Global Defaults"))
         }];
         store.add(quickPick.onDidTriggerButton(() => {
             resolve({

package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/exportDebugLogsAction.js

@@ -19,7 +19,7 @@ class ExportAgentHostDebugLogsAction extends Action2 {
     constructor() {
         super({
             id: ExportAgentHostDebugLogsAction.ID,
-            title: ( localize2(4309, "Export Agent Host Debug Logs...")),
+            title: ( localize2(5011, "Export Agent Host Debug Logs...")),
             f1: true,
             category: Categories.Developer,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(IsSessionsWindowContext, AGENT_HOST_ENABLED_CONTEXT_KEY))))

package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/mobile/mobileChatInputConfigPicker.js

@@ -16,6 +16,7 @@ import { SessionConfigKey } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IChatPhoneInputPresenter } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/chatPhoneInputPresenter.service';
 import { getModelProviderIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/modelPicker/modelProviderIcons';
 import { didExplicitlySwitchChatPetModel, ChatPetAchievementIds } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatPetAchievements';
@@ -26,12 +27,12 @@ import { isAgentHostProvider } from '@codingame/monaco-vscode-api/vscode/vs/sess
 import { ISessionsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service';
 import { ISessionsProvidersService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsProvidersService.service';
 import { ISessionContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionContext.service';
-import '../agentHostPermissionPickerDelegate.js';
-import { getAgentHostModeIcon } from '../agentHostModeIcon.js';
+import '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/providers/agentHost/browser/agentHostPermissionPickerDelegate';
+import { getAgentHostModeIcon } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/providers/agentHost/browser/agentHostModeIcon';
 import { INewChatModelPickerService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/chat/browser/newChatModelPicker.service';
 import { ISessionModelSelection } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/chat/browser/sessionModelSelection.service';
 import { reportNewChatPickerClosed } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/chat/browser/newChatPickerTelemetry';
-import { createChatPhoneInputTarget, createChatPhoneInputSessionContext, matchesChatPhoneInputTarget } from './mobileChatPhoneInputTarget.js';
+import { createChatPhoneInputTarget, createChatPhoneInputSessionContext, matchesChatPhoneInputTarget } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/providers/agentHost/browser/mobile/mobileChatPhoneInputTarget';
 import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { isWellKnownModeSchema } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostModePickerPresentation';
@@ -60,6 +61,7 @@ let MobileChatInputConfigPicker = class MobileChatInputConfigPicker extends Disp
         this._renderDisposables = this._register(( new DisposableStore()));
         this._providerListeners = this._register(( new DisposableMap()));
         this._register(this._newChatModelPickerService.registerModelPicker({
+            getDomNode: () => this._triggerElement,
             open: () => {
                 void this._showSheet();
             },
@@ -177,7 +179,7 @@ let MobileChatInputConfigPicker = class MobileChatInputConfigPicker extends Disp
         if (currentModel) {
             append(this._triggerElement, renderIcon(getModelProviderIcon(currentModel)));
         }
-        const labelText = currentModel?.metadata.name ?? (ctx.showAutoModel ? ( localize(4310, "Auto")) : ( localize(4311, "No models available")));
+        const labelText = currentModel?.metadata.name ?? (ctx.showAutoModel ? ( localize(5012, "Auto")) : ( localize(5013, "No models available")));
         const labelSpan = append(this._triggerElement, $("span.chat-input-picker-label"));
         labelSpan.textContent = labelText;
         const ariaParts = [];
@@ -188,7 +190,7 @@ let MobileChatInputConfigPicker = class MobileChatInputConfigPicker extends Disp
             }
         }
         ariaParts.push(labelText);
-        this._triggerElement.ariaLabel = ( localize(4312, "Pick Mode and Model, {0}", ariaParts.join(", ")));
+        this._triggerElement.ariaLabel = ( localize(5014, "Pick Mode and Model, {0}", ariaParts.join(", ")));
         const isResolving = ctx.provider.isSessionConfigResolving(ctx.session.sessionId).get();
         this._slotElement.classList.toggle("resolving", isResolving);
         this._triggerElement.setAttribute("aria-disabled", isResolving ? "true" : "false");
@@ -270,13 +272,23 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: MOBILE_CHAT_INPUT_CONFIG_PICKER_ID,
-            title: ( localize2(4313, "Mode and Model")),
+            title: ( localize2(5015, "Mode and Model")),
             f1: false,
             menu: [{
                 id: Menus.NewSessionConfig,
                 group: "navigation",
                 order: 0,
                 when: ( ContextKeyExpr.and(SessionUsesCombinedConfigPickerContext, IsPhoneLayoutContext))
+            }, {
+                id: Menus.AutomationsDialogInputToolbar,
+                group: "navigation",
+                order: 0,
+                when: ( ContextKeyExpr.and(
+                    ChatContextKeys.enabled,
+                    ChatContextKeys.inAutomationsDialog,
+                    SessionUsesCombinedConfigPickerContext,
+                    IsPhoneLayoutContext
+                ))
             }]
         });
     }
@@ -303,17 +315,19 @@ let MobileChatInputConfigPickerContribution = class MobileChatInputConfigPickerC
                 !!session && sessionsProvidersService.getProvider(session.providerId)?.usesCombinedNewSessionConfigPicker === true
             );
         }));
-        this._register(actionViewItemService.register(
-            Menus.NewSessionConfig,
-            MOBILE_CHAT_INPUT_CONFIG_PICKER_ID,
-            (_action, _options, scopedInstantiationService) => {
-                const {
-                    session
-                } = scopedInstantiationService.invokeFunction(accessor => accessor.get(ISessionContext));
-                const picker = scopedInstantiationService.createInstance(MobileChatInputConfigPicker, session);
-                return ( new MobileChatInputConfigPickerActionViewItem(picker));
-            }
-        ));
+        for (const menu of [Menus.NewSessionConfig, Menus.AutomationsDialogInputToolbar]) {
+            this._register(actionViewItemService.register(
+                menu,
+                MOBILE_CHAT_INPUT_CONFIG_PICKER_ID,
+                (_action, _options, scopedInstantiationService) => {
+                    const {
+                        session
+                    } = scopedInstantiationService.invokeFunction(accessor => accessor.get(ISessionContext));
+                    const picker = scopedInstantiationService.createInstance(MobileChatInputConfigPicker, session);
+                    return ( new MobileChatInputConfigPickerActionViewItem(picker));
+                }
+            ));
+        }
     }
 };
 MobileChatInputConfigPickerContribution = ( __decorate([( __param(0, IActionViewItemService)), ( __param(1, IInstantiationService)), ( __param(2, ISessionsService)), ( __param(3, ISessionsProvidersService)), ( __param(4, IContextKeyService))], MobileChatInputConfigPickerContribution));

package/vscode/src/vs/sessions/contrib/providers/remoteAgentHost/browser/connectionDiagnostics.contribution.d.ts

@@ -0,0 +1,32 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { AccessibleContentProvider, AccessibleViewType } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView";
+import { IAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
+import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
+import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
+import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
+import { IConnectionDiagnosticsSnapshot } from "@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/providers/remoteAgentHost/browser/connectionDiagnostics";
+import { IConnectionDiagnosticsService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/providers/remoteAgentHost/browser/connectionDiagnostics.service";
+export declare class ConnectionDiagnosticsContribution extends Disposable {
+    private readonly diagnosticsService;
+    private readonly instantiationService;
+    private readonly layoutService;
+    private readonly contextKeyService;
+    private readonly entitlementService;
+    private readonly accessibilityService;
+    private readonly configurationService;
+    private readonly keybindingService;
+    private readonly notificationService;
+    static readonly ID = "sessions.connectionDiagnostics";
+    private active;
+    private accessibleView;
+    protected get isWebPlatform(): boolean;
+    constructor(diagnosticsService: IConnectionDiagnosticsService, instantiationService: IInstantiationService, layoutService: IWorkbenchLayoutService, contextKeyService: IContextKeyService, entitlementService: IChatEntitlementService, accessibilityService: IAccessibilityService, configurationService: IConfigurationService, keybindingService: IKeybindingService, notificationService: INotificationService);
+    show(snapshot?: IConnectionDiagnosticsSnapshot, returnFocus?: HTMLElement): Promise<void>;
+    private focusActiveReport;
+    private attachModal;
+    getAccessibleProvider(type: AccessibleViewType): AccessibleContentProvider | undefined;
+}