Polish and fix test failure

Author: chrmarti

package.json

@@ -4024,6 +4024,27 @@
 							"experimental"
 						]
 					},
+					"github.copilot.chat.debug.gitHubAuthFailWith": {
+						"type": [
+							"string",
+							"null"
+						],
+						"enum": [
+							null,
+							"NotAuthorized",
+							"RequestFailed",
+							"ParseFailed",
+							"HTTP401",
+							"RateLimited",
+							"GitHubLoginFailed"
+						],
+						"default": null,
+						"markdownDescription": "%github.copilot.config.debug.gitHubAuthFailWith%",
+						"tags": [
+							"advanced",
+							"experimental"
+						]
+					},
 					"github.copilot.chat.inlineEdits.diagnosticsContextProvider.enabled": {
 						"type": "boolean",
 						"default": false,

package.nls.json

@@ -45,7 +45,7 @@
 		]
 	},
 	"github.copilot.viewsWelcome.invalidToken": {
-		"message": "Your GitHub token is invalid. Please sign out from your GitHub account and sign in again.\n\n[Sign In](command:workbench.action.chat.triggerSetupForceSignIn)\n\nSee also [Copilot log](command:github.copilot.debug.showOutputChannel.internal) and [run diagnostics](command:github.copilot.debug.collectDiagnostics.internal).",
+		"message": "Your GitHub token is invalid. Please sign in again to refresh your authentication.\n\n[Sign In](command:workbench.action.chat.triggerSetupForceSignIn)\n\nSee also [Copilot log](command:github.copilot.debug.showOutputChannel.internal) and [run diagnostics](command:github.copilot.debug.collectDiagnostics.internal).",
 		"comment": [
 			"{Locked='['}",
 			"{Locked='](command:workbench.action.chat.triggerSetupForceSignIn)'}",
@@ -371,6 +371,7 @@
 	"github.copilot.config.editRecording.enabled": "Enable edit recording for analysis.",
 	"github.copilot.config.inlineChat.selectionRatioThreshold": "Threshold at which to switch editing strategies for inline chat. When a selection porition of code matches a parse tree node, only that is presented to the language model. This speeds up response times but might have lower quality results. Requires having a parse tree for the document and the `inlineChat.enableV2` setting. Values must be between 0 and 1, where 0 means off and 1 means the selection perfectly matches a parse tree node.",
 	"github.copilot.config.debug.requestLogger.maxEntries": "Maximum number of entries to keep in the request logger for debugging purposes.",
+	"github.copilot.config.debug.gitHubAuthFailWith": "Simulate a specific GitHub authentication failure for testing purposes.",
 	"github.copilot.config.inlineEdits.diagnosticsContextProvider.enabled": "Enable diagnostics context provider for next edit suggestions.",
 	"github.copilot.config.inlineEdits.chatSessionContextProvider.enabled": "Enable chat session context provider for next edit suggestions.",
 	"github.copilot.config.codesearch.agent.enabled": "Enable code search capabilities in agent mode.",

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

@@ -46,6 +46,7 @@ export class ContextKeysContribution extends Disposable {
 	private _needsOfflineCheck = false;
 	private _scheduledOfflineCheck: TimeoutHandle | undefined;
 	private _showLogView = false;
+	private _lastContextKey: string | undefined;
 
 	constructor(
 		@IAuthenticationService private readonly _authenticationService: IAuthenticationService,
@@ -157,7 +158,10 @@ export class ContextKeysContribution extends Disposable {
 		}
 
 		if (key) {
-			this._logService.info(`[context keys] Setting context key: ${key}`);
+			if (key !== this._lastContextKey) {
+				this._logService.info(`[context keys] Setting context key: ${key}`);
+				this._lastContextKey = key;
+			}
 			commands.executeCommand('setContext', key, true);
 		}
 

src/platform/configuration/common/configurationService.ts

@@ -719,8 +719,8 @@ export namespace ConfigKey {
 
 		/** Enable the built-in agent customization skill provider */
 		export const AgentCustomizationSkillEnabled = defineSetting<boolean>('chat.agentCustomizationSkill.enabled', ConfigType.ExperimentBased, false);
-		/** Simulate GitHub authentication failures for testing. Can't be TeamInternal because we loose these flags as part of testing. */
-		export const DebugGitHubAuthFailWith = defineSetting<'NotAuthorized' | 'RequestFailed' | 'ParseFailed' | 'HTTP401' | 'RateLimited' | 'GitHubLoginFailed' | null>('chat.advanced.debug.gitHubAuthFailWith', ConfigType.Simple, null);
+		/** Simulate GitHub authentication failures for testing. Can't be TeamInternal because we lose these flags as part of testing. */
+		export const DebugGitHubAuthFailWith = defineSetting<'NotAuthorized' | 'RequestFailed' | 'ParseFailed' | 'HTTP401' | 'RateLimited' | 'GitHubLoginFailed' | null>('chat.debug.githubAuthFailWith', ConfigType.Simple, null);
 	}
 
 	/**