Skip to content

Commit 1cd6969

Browse files
dmitrivMSCopilot
andauthored
Hide Update, Sign-In and Open in Agents title bar items in Zen mode (#313430)
--------- Co-authored-by: Copilot <copilot@github.com>
1 parent 4c7f8d0 commit 1cd6969

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import { ExtensionUrlHandlerOverrideRegistry, IExtensionUrlHandlerOverride } fro
4141
import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
4242
import { IHostService } from '../../../../services/host/browser/host.js';
4343
import { IWorkbenchLayoutService, Parts } from '../../../../services/layout/browser/layoutService.js';
44+
import { InEditorZenModeContext } from '../../../../common/contextkeys.js';
4445
import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
4546
import { IPreferencesService } from '../../../../services/preferences/common/preferences.js';
4647
import { IExtension, IExtensionsWorkbenchService } from '../../../extensions/common/extensions.js';
@@ -387,7 +388,8 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
387388
ChatContextKeys.Entitlement.signedOut,
388389
ChatContextKeys.Setup.hidden.negate(),
389390
ChatContextKeys.Setup.disabledInWorkspace.negate(),
390-
ContextKeyExpr.has('updateTitleBar').negate()
391+
ContextKeyExpr.has('updateTitleBar').negate(),
392+
InEditorZenModeContext.negate(),
391393
),
392394
}]
393395
});

src/vs/workbench/contrib/update/browser/updateTitleBarEntry.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ import { localize } from '../../../../nls.js';
1414
import { IActionViewItemService } from '../../../../platform/actions/browser/actionViewItemService.js';
1515
import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
1616
import { ICommandService } from '../../../../platform/commands/common/commands.js';
17-
import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
17+
import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
1818
import { IHoverService } from '../../../../platform/hover/browser/hover.js';
1919
import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
2020
import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
2121
import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
2222
import { DisablementReason, IUpdateService, State, StateType } from '../../../../platform/update/common/update.js';
2323
import { IWorkbenchContribution } from '../../../common/contributions.js';
24+
import { InEditorZenModeContext } from '../../../common/contextkeys.js';
2425
import { IHostService } from '../../../services/host/browser/host.js';
2526
import { IChatService } from '../../chat/common/chatService/chatService.js';
2627
import { computeProgressPercent } from '../common/updateUtils.js';
@@ -46,7 +47,7 @@ registerAction2(class UpdateIndicatorTitleBarAction extends Action2 {
4647
menu: [{
4748
id: MenuId.TitleBarAdjacentCenter,
4849
order: 0,
49-
when: UPDATE_TITLE_BAR_CONTEXT,
50+
when: ContextKeyExpr.and(UPDATE_TITLE_BAR_CONTEXT, InEditorZenModeContext.negate()),
5051
}]
5152
});
5253
}

src/vs/workbench/electron-browser/actions/openInAgentsAction.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { ITelemetryService } from '../../../platform/telemetry/common/telemetry.
2424
import { IWorkspaceContextService, WorkbenchState } from '../../../platform/workspace/common/workspace.js';
2525
import { ToggleTitleBarConfigAction, TitleBarLeadingActionsGroup } from '../../browser/parts/titlebar/titlebarActions.js';
2626
import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../common/contributions.js';
27-
import { IsAuxiliaryWindowContext, IsSessionsWindowContext } from '../../common/contextkeys.js';
27+
import { InEditorZenModeContext, IsAuxiliaryWindowContext, IsSessionsWindowContext } from '../../common/contextkeys.js';
2828
import { workbenchConfigurationNodeBase } from '../../common/configuration.js';
2929
import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js';
3030
import { ChatEntitlementContextKeys } from '../../services/chat/common/chatEntitlementService.js';
@@ -49,6 +49,7 @@ const OpenInAgentsVisibility = ContextKeyExpr.and(
4949
ContextKeyExpr.equals(`config.${OpenInAgentsEnabledSetting}`, true),
5050
IsSessionsWindowContext.toNegated(),
5151
IsAuxiliaryWindowContext.toNegated(),
52+
InEditorZenModeContext.negate(),
5253
// Hide whenever the user has signaled (or policy/workspace trust dictates)
5354
// that AI features should not be shown in this window/workspace.
5455
ChatEntitlementContextKeys.Setup.hidden.negate(),

0 commit comments

Comments
 (0)