Polish and fix test failure

Author: chrmarti

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)'}",

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/extension/test/node/configurations.spec.ts

@@ -95,6 +95,10 @@ describe('Configurations', () => {
 		// Validate advanced settings in code are in the advanced section of package.json
 		advancedPublicKeys.forEach(key => {
 			expect(key, 'Advanced settings must not start wih github.copilot.chat.advanced.').not.toMatch(/^github\.copilot\.chat\.advanced\./);
+			if (key === ConfigKey.Advanced.DebugGitHubAuthFailWith.fullyQualifiedId) {
+				// This setting should be internal, but can't be made TeamInternal because we lose the team and internal flags as part of its testing.
+				return;
+			}
 			expect(advancedConfigurationsInPackageJson, `Advanced setting ${key} should be defined in the advanced section of package.json`).toContain(key);
 		});
 

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);
 	}
 
 	/**