Merge pull request #1608 from microsoft/roblou/renewed-mosquito

Limit placeholder view visibility (#1598)

Author: roblourens

package.json

@@ -3964,7 +3964,7 @@
 				{
 					"id": "codex-placeholder",
 					"name": "OpenAI Codex Agent",
-					"when": "github.copilot.chat.codex.notInstalled && config.chat.experimental.codex.enabled",
+					"when": "github.copilot.chat.codex.showPlaceholder && config.chat.experimental.codex.enabled",
 					"icon": "$(file)"
 				},
 				{

src/extension/contextKeys/vscode-node/placeholderView.contribution.ts

@@ -4,26 +4,38 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
+import { IAuthenticationService } from '../../../platform/authentication/common/authentication';
 import { IRunCommandExecutionService } from '../../../platform/commands/common/runCommandExecutionService';
+import { IConfigurationService } from '../../../platform/configuration/common/configurationService';
 import { IEnvService } from '../../../platform/env/common/envService';
+import { Event } from '../../../util/vs/base/common/event';
 import { Disposable } from '../../../util/vs/base/common/lifecycle';
 
-const CodexPlaceholderKey = 'github.copilot.chat.codex.notInstalled';
+const ShowCodexPlaceholderKey = 'github.copilot.chat.codex.showPlaceholder';
 
 export class PlaceholderViewContribution extends Disposable {
 	constructor(
 		@IRunCommandExecutionService private readonly _commandService: IRunCommandExecutionService,
 		@IEnvService private readonly envService: IEnvService,
+		@IAuthenticationService authenticationService: IAuthenticationService,
+		@IConfigurationService configurationService: IConfigurationService
 	) {
 		super();
 
+		let curShouldShowPlaceholder: boolean | undefined = undefined;
 		const updateContextKey = () => {
+			const token = authenticationService.copilotToken;
+			const enabledForUser = token && (token.codexAgentEnabled || configurationService.getNonExtensionConfig('chat.experimental.codex.enabled'));
 			const codexExtension = vscode.extensions.getExtension('openai.chatgpt');
-			void vscode.commands.executeCommand('setContext', CodexPlaceholderKey, !codexExtension);
+			const shouldShowPlaceholder = enabledForUser && !codexExtension;
+			if (curShouldShowPlaceholder !== shouldShowPlaceholder) {
+				curShouldShowPlaceholder = shouldShowPlaceholder;
+				void vscode.commands.executeCommand('setContext', ShowCodexPlaceholderKey, shouldShowPlaceholder);
+			}
 		};
 
-		updateContextKey();
 		this._register(vscode.extensions.onDidChange(updateContextKey));
+		this._register(Event.runAndSubscribe(authenticationService.onDidAuthenticationChange, updateContextKey));
 
 		this._register(vscode.commands.registerCommand('github.copilot.chat.installAgent', this.installAgentCommand, this));
 	}