@codingame/monaco-vscode-welcome-service-override 33.0.9 → 34.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-welcome-service-override",
-  "version": "33.0.9",
+  "version": "34.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - welcome service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "33.0.9"
+    "@codingame/monaco-vscode-api": "34.0.1"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/contrib/welcomeOnboarding/browser/media/variationA.css

@@ -310,6 +310,7 @@
 	flex-direction: column;
 	justify-content: center;
 	gap: 10px;
+	min-width: 0;
 }
 
 .onboarding-a-signin-title {
@@ -334,6 +335,7 @@
 	gap: 8px;
 	margin-top: 4px;
 	flex-wrap: nowrap;
+	min-width: 0;
 }
 
 .onboarding-a-signin-footer {
@@ -434,6 +436,72 @@
 	white-space: nowrap;
 }
 
+/* Inline GitHub Enterprise instance input */
+.onboarding-a-signin-ghe-input {
+	display: flex;
+	flex: 1 1 auto;
+	flex-direction: column;
+	gap: 6px;
+	margin-top: 4px;
+	min-width: 0;
+	width: 100%;
+	max-width: 320px;
+}
+
+.onboarding-a-signin-ghe-input .monaco-inputbox {
+	height: 40px;
+	border-radius: 8px;
+	font-size: 13px;
+	line-height: 40px;
+}
+
+.onboarding-a-signin-ghe-input .monaco-inputbox .monaco-action-bar {
+	top: 50%;
+	right: 6px;
+	transform: translateY(-50%);
+}
+
+.onboarding-a-signin-ghe-input .monaco-inputbox.error {
+	box-shadow: inset 0 0 0 1px var(--vscode-inputValidation-errorBorder);
+}
+
+.onboarding-a-signin-ghe-message {
+	font-size: 12px;
+	line-height: 1.4;
+	color: var(--vscode-descriptionForeground);
+	width: 100%;
+	max-width: 100%;
+	box-sizing: border-box;
+	white-space: normal;
+	overflow-wrap: anywhere;
+	word-break: break-word;
+	min-height: 16px;
+}
+
+.onboarding-a-signin-ghe-message.error {
+	color: var(--vscode-inputValidation-errorForeground, var(--vscode-errorForeground));
+}
+
+.onboarding-a-signin-ghe-progress {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	padding: 8px 0;
+}
+
+.onboarding-a-signin-ghe-progress-message {
+	font-size: 13px;
+	color: var(--vscode-descriptionForeground);
+}
+
+.onboarding-a-signin-confirmation {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	padding: 8px 0;
+	font-size: 13px;
+	color: var(--vscode-descriptionForeground);
+}
 
 .onboarding-a-provider-mark {
 	display: flex;

package/vscode/src/vs/workbench/contrib/welcomeOnboarding/browser/onboardingVariationA.d.ts

@@ -7,7 +7,6 @@ import { IExtensionGalleryService } from "@codingame/monaco-vscode-api/vscode/vs
 import { IDefaultAccountService } from "@codingame/monaco-vscode-api/vscode/vs/platform/defaultAccount/common/defaultAccount.service";
 import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
@@ -34,7 +33,6 @@ export declare class OnboardingVariationA extends Disposable implements IOnboard
     private readonly extensionManagementService;
     private readonly configurationService;
     private readonly notificationService;
-    private readonly quickInputService;
     private readonly fileService;
     private readonly pathService;
     private readonly telemetryService;
@@ -71,7 +69,10 @@ export declare class OnboardingVariationA extends Disposable implements IOnboard
     private _detectedEditorIds;
     private _userSignedIn;
     private selectedAiMode;
-    constructor(layoutService: ILayoutService, themeService: IWorkbenchThemeService, defaultAccountService: IDefaultAccountService, extensionGalleryService: IExtensionGalleryService, extensionManagementService: IExtensionManagementService, configurationService: IConfigurationService, notificationService: INotificationService, quickInputService: IQuickInputService, fileService: IFileService, pathService: IPathService, telemetryService: ITelemetryService, commandService: ICommandService, accessibilityService: IAccessibilityService);
+    private enterpriseSignInUiState;
+    private enterpriseInstanceValue;
+    private enterpriseSignInWatch;
+    constructor(layoutService: ILayoutService, themeService: IWorkbenchThemeService, defaultAccountService: IDefaultAccountService, extensionGalleryService: IExtensionGalleryService, extensionManagementService: IExtensionManagementService, configurationService: IConfigurationService, notificationService: INotificationService, fileService: IFileService, pathService: IPathService, telemetryService: ITelemetryService, commandService: ICommandService, accessibilityService: IAccessibilityService);
     get isShowing(): boolean;
     show(): void;
     private _dismiss;
@@ -82,10 +83,18 @@ export declare class OnboardingVariationA extends Disposable implements IOnboard
     private _renderStep;
     private _updateButtonStates;
     private _renderSignInStep;
+    private _renderDefaultSignInActions;
+    private static readonly GHE_INPUT_ACTION_PADDING;
+    private _renderEnterpriseInstanceForm;
+    private _renderEnterpriseSignInProgress;
+    private _getEnterpriseInstancePromptLabel;
+    private _setEnterpriseSignInUiState;
     private _createSignInButton;
     private _handleSignIn;
     private _handleEnterpriseSignIn;
-    private _ensureEnterpriseInstance;
+    private _submitEnterpriseInstance;
+    private _runEnterpriseSignInSetup;
+    private _notifyEnterpriseSignInError;
     private _renderPersonalizeStep;
     private _renderPersonalizeSubtitle;
     private _createThemeCard;

package/vscode/src/vs/workbench/contrib/welcomeOnboarding/browser/onboardingVariationA.js

@@ -12,9 +12,12 @@ import { FileAccess } from '@codingame/monaco-vscode-api/vscode/vs/base/common/n
 import { ILayoutService } from '@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service';
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { StandardKeyboardEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/keyboardEvent';
+import { InputBox } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/inputbox/inputBox';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { renderIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
+import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { IWorkbenchThemeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/workbenchThemeService.service';
 import { EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { IExtensionGalleryService, IExtensionManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
@@ -25,23 +28,27 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/noti
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { defaultInputBoxStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
-import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { ChatSetupStrategy } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatSetup/chatSetup';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
-import { ONBOARDING_STEPS, AiCollaborationMode, OnboardingStepId, getOnboardingStepTitle, getOnboardingStepSubtitle, ONBOARDING_AI_PREFERENCE_OPTIONS } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/welcomeOnboarding/common/onboardingTypes';
+import { ONBOARDING_STEPS, AiCollaborationMode, OnboardingStepId, getOnboardingStepTitle, getOnboardingStepSubtitle, parseGheInstanceInput, GheParseResultKind, GHE_FULL_URI_REGEX, ONBOARDING_AI_PREFERENCE_OPTIONS } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/welcomeOnboarding/common/onboardingTypes';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
+var OnboardingVariationA_1;
 assertDefined(
     product.defaultChatAgent,
     "Onboarding requires a default chat agent product configuration."
 );
 const defaultChat = product.defaultChatAgent;
 let OnboardingVariationA = class OnboardingVariationA extends Disposable {
+    static {
+        OnboardingVariationA_1 = this;
+    }
     constructor(
         layoutService,
         themeService,
@@ -50,7 +57,6 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
         extensionManagementService,
         configurationService,
         notificationService,
-        quickInputService,
         fileService,
         pathService,
         telemetryService,
@@ -65,7 +71,6 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
         this.extensionManagementService = extensionManagementService;
         this.configurationService = configurationService;
         this.notificationService = notificationService;
-        this.quickInputService = quickInputService;
         this.fileService = fileService;
         this.pathService = pathService;
         this.telemetryService = telemetryService;
@@ -86,6 +91,8 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
         this.selectedKeymapId = "vscode";
         this._userSignedIn = false;
         this.selectedAiMode = AiCollaborationMode.Balanced;
+        this.enterpriseSignInUiState = "options";
+        this.enterpriseInstanceValue = "";
         const currentTheme = this.themeService.getColorTheme();
         const allThemes = product.onboardingThemes ?? [];
         const matchingTheme = allThemes.find(t => t.themeId === currentTheme.settingsId);
@@ -109,11 +116,11 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
         this.overlay = append(container, $(".onboarding-a-overlay"));
         this.overlay.setAttribute("role", "dialog");
         this.overlay.setAttribute("aria-modal", "true");
-        this.overlay.setAttribute("aria-label", ( localize(16096, "Welcome to Visual Studio Code")));
+        this.overlay.setAttribute("aria-label", ( localize(16303, "Welcome to Visual Studio Code")));
         this.card = append(this.overlay, $(".onboarding-a-card"));
         this.closeButton = append(this.card, $("button.onboarding-a-close-btn"));
         this.closeButton.type = "button";
-        this.closeButton.setAttribute("aria-label", ( localize(16097, "Close")));
+        this.closeButton.setAttribute("aria-label", ( localize(16304, "Close")));
         this.closeButton.appendChild(renderIcon(Codicon.close));
         const header = append(this.card, $(".onboarding-a-header"));
         this.progressContainer = append(header, $(".onboarding-a-progress"));
@@ -129,7 +136,7 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
         this.footerLeft = append(footer, $(".onboarding-a-footer-left"));
         const footerRight = append(footer, $(".onboarding-a-footer-right"));
         this.backButton = append(footerRight, $("button.onboarding-a-btn.onboarding-a-btn-secondary"));
-        this.backButton.textContent = ( localize(16098, "Back"));
+        this.backButton.textContent = ( localize(16305, "Back"));
         this.backButton.type = "button";
         this.footerFocusableElements.push(this.backButton);
         this.nextButton = append(footerRight, $("button.onboarding-a-btn.onboarding-a-btn-primary"));
@@ -141,6 +148,12 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
             this._dismiss("skip");
         }));
         this.disposables.add(addDisposableListener(this.backButton, EventType.CLICK, () => {
+            if (this.currentStepIndex === 0 && this.enterpriseSignInUiState === "instance") {
+                this._logAction("cancelEnterpriseInstancePrompt");
+                this.enterpriseSignInWatch = undefined;
+                this._setEnterpriseSignInUiState("options");
+                return;
+            }
             this._logAction("back");
             this._prevStep();
         }));
@@ -207,6 +220,11 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
     _nextStep() {
         if (this.currentStepIndex < this.steps.length - 1) {
             const leavingStep = this.steps[this.currentStepIndex];
+            if (leavingStep === OnboardingStepId.SignIn) {
+                this.enterpriseSignInUiState = "options";
+                this.enterpriseInstanceValue = "";
+                this.enterpriseSignInWatch = undefined;
+            }
             if (leavingStep === OnboardingStepId.Personalize) {
                 this._applyKeymap(this.selectedKeymapId);
             }
@@ -245,7 +263,7 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
             }
         }
         this.progressContainer.appendChild(this.stepLabelEl);
-        this.stepLabelEl.textContent = ( localize(16099, "{0} of {1}", this.currentStepIndex + 1, this.steps.length));
+        this.stepLabelEl.textContent = ( localize(16306, "{0} of {1}", this.currentStepIndex + 1, this.steps.length));
     }
     _renderStep() {
         if (!this.titleEl || !this.subtitleEl || !this.contentEl) {
@@ -281,7 +299,7 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
             break;
         }
         this.bodyEl?.setAttribute("aria-label", ( localize(
-            16100,
+            16307,
             "Step {0} of {1}: {2}",
             this.currentStepIndex + 1,
             this.steps.length,
@@ -290,18 +308,24 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
     }
     _updateButtonStates() {
         if (this.backButton) {
-            this.backButton.style.display = this.currentStepIndex === 0 ? "none" : "";
+            const showEnterpriseBack = this.currentStepIndex === 0 && this.enterpriseSignInUiState === "instance";
+            this.backButton.style.display = (this.currentStepIndex === 0 && !showEnterpriseBack) ? "none" : "";
         }
         if (this.nextButton) {
             if (this.currentStepIndex === 0) {
-                this.nextButton.className = "onboarding-a-btn onboarding-a-btn-secondary";
-                this.nextButton.textContent = ( localize(16101, "Continue without Signing In"));
+                if (this._userSignedIn) {
+                    this.nextButton.className = "onboarding-a-btn onboarding-a-btn-primary";
+                    this.nextButton.textContent = ( localize(16308, "Continue"));
+                } else {
+                    this.nextButton.className = "onboarding-a-btn onboarding-a-btn-secondary";
+                    this.nextButton.textContent = ( localize(16309, "Continue without Signing In"));
+                }
             } else if (this._isLastStep()) {
                 this.nextButton.className = "onboarding-a-btn onboarding-a-btn-primary";
-                this.nextButton.textContent = ( localize(16102, "Get Started"));
+                this.nextButton.textContent = ( localize(16310, "Get Started"));
             } else {
                 this.nextButton.className = "onboarding-a-btn onboarding-a-btn-primary";
-                this.nextButton.textContent = ( localize(16103, "Continue"));
+                this.nextButton.textContent = ( localize(16311, "Continue"));
             }
         }
         if (this.footerLeft) {
@@ -309,7 +333,7 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
                 if (!this._footerSignInBtn && !this._userSignedIn) {
                     this._footerSignInBtn = append(this.footerLeft, $("button.onboarding-a-signin-nudge-btn"));
                     this._footerSignInBtn.type = "button";
-                    this._footerSignInBtn.textContent = ( localize(16104, "Sign in for AI Powered Features"));
+                    this._footerSignInBtn.textContent = ( localize(16312, "Sign in for AI Powered Features"));
                     this.stepDisposables.add(
                         addDisposableListener(this._footerSignInBtn, EventType.CLICK, async () => {
                             this._logAction("signInNudge");
@@ -337,60 +361,183 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
         const content = append(wrapper, $(".onboarding-a-signin-content"));
         const contentMain = append(content, $(".onboarding-a-signin-content-main"));
         const title = append(contentMain, $("h2.onboarding-a-signin-title"));
-        title.textContent = ( localize(16105, "Welcome to VS Code"));
+        title.textContent = ( localize(16313, "Welcome to VS Code"));
         const subtitle = append(contentMain, $("p.onboarding-a-signin-subtitle"));
-        subtitle.textContent = ( localize(16106, "Sign in to continue with AI-powered development."));
+        subtitle.textContent = ( localize(16314, "Sign in to use GitHub Copilot."));
         const actions = append(contentMain, $(".onboarding-a-signin-actions"));
-        const githubBtn = this._registerStepFocusable(this._createSignInButton(actions, "github", ( localize(16107, "Continue with GitHub")), {
+        if (this._userSignedIn) {
+            const signedIn = append(actions, $(".onboarding-a-signin-confirmation"));
+            const icon = append(signedIn, $("span"));
+            icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.check));
+            icon.setAttribute("aria-hidden", "true");
+            const text = append(signedIn, $("span"));
+            text.textContent = ( localize(16315, "You're signed in. You can continue to the next step."));
+        } else {
+            switch (this.enterpriseSignInUiState) {
+            case "instance":
+                this._renderEnterpriseInstanceForm(actions);
+                break;
+            case "progress":
+                this._renderEnterpriseSignInProgress(actions);
+                break;
+            default:
+                this._renderDefaultSignInActions(actions);
+                break;
+            }
+        }
+        const footer = append(wrapper, $(".onboarding-a-signin-footer"));
+        const disclaimerCol = append(footer, $(".onboarding-a-signin-disclaimer-col"));
+        const copilotDisclaimer = append(disclaimerCol, $(".onboarding-a-signin-disclaimer"));
+        copilotDisclaimer.append(( localize(
+            16316,
+            "By signing in, you agree to {0}'s ",
+            defaultChat.provider.default.name
+        )));
+        this._createInlineLink(copilotDisclaimer, ( localize(16317, "Terms")), defaultChat.termsStatementUrl);
+        copilotDisclaimer.append(( localize(16318, " and ")));
+        this._createInlineLink(copilotDisclaimer, ( localize(16319, "Privacy Statement")), defaultChat.privacyStatementUrl);
+        copilotDisclaimer.append(( localize(16320, ". {0} Copilot may show ", defaultChat.provider.default.name)));
+        this._createInlineLink(copilotDisclaimer, ( localize(16321, "public code")), defaultChat.publicCodeMatchesUrl);
+        copilotDisclaimer.append(( localize(16322, " suggestions and use your data to improve the product.")));
+        copilotDisclaimer.append(" ");
+        copilotDisclaimer.append(( localize(16323, "You can change these ")));
+        this._createInlineLink(copilotDisclaimer, ( localize(16324, "settings")), this.defaultAccountService.resolveGitHubUrl(GitHubPaths.copilotSettings));
+        copilotDisclaimer.append(( localize(16325, " anytime.")));
+    }
+    _renderDefaultSignInActions(actions) {
+        const githubBtn = this._registerStepFocusable(this._createSignInButton(actions, "github", ( localize(16326, "Continue with GitHub")), {
             emphasized: true,
-            label: ( localize(16108, "Continue with GitHub"))
+            label: ( localize(16327, "Continue with GitHub"))
         }));
         this.stepDisposables.add(addDisposableListener(githubBtn, EventType.CLICK, () => {
             this._logAction("signIn", undefined, "github");
             this._handleSignIn();
         }));
-        const googleBtn = this._registerStepFocusable(this._createSignInButton(actions, "google", ( localize(16109, "Continue with Google")), {
+        const googleBtn = this._registerStepFocusable(this._createSignInButton(actions, "google", ( localize(16328, "Continue with Google")), {
             iconOnly: true,
-            label: ( localize(16109, "Continue with Google"))
+            label: ( localize(16328, "Continue with Google"))
         }));
         this.stepDisposables.add(addDisposableListener(googleBtn, EventType.CLICK, () => {
             this._logAction("signIn", undefined, "google");
             this._handleSignIn("google");
         }));
-        const appleBtn = this._registerStepFocusable(this._createSignInButton(actions, "apple", ( localize(16110, "Continue with Apple")), {
+        const appleBtn = this._registerStepFocusable(this._createSignInButton(actions, "apple", ( localize(16329, "Continue with Apple")), {
             iconOnly: true,
-            label: ( localize(16110, "Continue with Apple"))
+            label: ( localize(16329, "Continue with Apple"))
         }));
         this.stepDisposables.add(addDisposableListener(appleBtn, EventType.CLICK, () => {
             this._logAction("signIn", undefined, "apple");
             this._handleSignIn("apple");
         }));
-        const gheBtn = this._registerStepFocusable(this._createSignInButton(actions, "github-enterprise", ( localize(16111, "GHE")), {
+        const gheBtn = this._registerStepFocusable(this._createSignInButton(actions, "github-enterprise", ( localize(16330, "GHE")), {
             textOnly: true,
-            label: ( localize(16112, "Continue with GitHub Enterprise"))
+            label: ( localize(16331, "Continue with GitHub Enterprise"))
         }));
         this.stepDisposables.add(addDisposableListener(gheBtn, EventType.CLICK, () => {
             this._logAction("signIn", undefined, "github-enterprise");
-            this._handleEnterpriseSignIn();
+            void this._handleEnterpriseSignIn();
         }));
-        const footer = append(wrapper, $(".onboarding-a-signin-footer"));
-        const disclaimerCol = append(footer, $(".onboarding-a-signin-disclaimer-col"));
-        const copilotDisclaimer = append(disclaimerCol, $(".onboarding-a-signin-disclaimer"));
-        copilotDisclaimer.append(( localize(
-            16113,
-            "By signing in, you agree to {0}'s ",
-            defaultChat.provider.default.name
-        )));
-        this._createInlineLink(copilotDisclaimer, ( localize(16114, "Terms")), defaultChat.termsStatementUrl);
-        copilotDisclaimer.append(( localize(16115, " and ")));
-        this._createInlineLink(copilotDisclaimer, ( localize(16116, "Privacy Statement")), defaultChat.privacyStatementUrl);
-        copilotDisclaimer.append(( localize(16117, ". {0} Copilot may show ", defaultChat.provider.default.name)));
-        this._createInlineLink(copilotDisclaimer, ( localize(16118, "public code")), defaultChat.publicCodeMatchesUrl);
-        copilotDisclaimer.append(( localize(16119, " suggestions and use your data to improve the product.")));
-        copilotDisclaimer.append(" ");
-        copilotDisclaimer.append(( localize(16120, "You can change these ")));
-        this._createInlineLink(copilotDisclaimer, ( localize(16121, "settings")), this.defaultAccountService.resolveGitHubUrl(GitHubPaths.copilotSettings));
-        copilotDisclaimer.append(( localize(16122, " anytime.")));
+    }
+    static {
+        this.GHE_INPUT_ACTION_PADDING = 28;
+    }
+    _renderEnterpriseInstanceForm(actions) {
+        const enterprisePromptLabel = this._getEnterpriseInstancePromptLabel();
+        const container = append(actions, $(".onboarding-a-signin-ghe-input"));
+        const submitAction = this.stepDisposables.add(( new Action("onboarding.signIn.enterprise.submit", ( localize(16332, "Continue")), ThemeIcon.asClassName(Codicon.arrowRight), false)));
+        const inputBox = this.stepDisposables.add(( new InputBox(container, undefined, {
+            placeholder: ( localize(16333, "i.e. \"octocat\" or \"https://octocat.ghe.com\"...")),
+            ariaLabel: enterprisePromptLabel,
+            actions: [submitAction],
+            inputBoxStyles: defaultInputBoxStyles
+        })));
+        inputBox.value = this.enterpriseInstanceValue;
+        inputBox.paddingRight = OnboardingVariationA_1.GHE_INPUT_ACTION_PADDING;
+        const input = this._registerStepFocusable(inputBox.inputElement);
+        const submit = async () => {
+            const result = parseGheInstanceInput(inputBox.value);
+            if (result.kind === GheParseResultKind.Empty || result.kind === GheParseResultKind.Invalid) {
+                validate();
+                return;
+            }
+            await this._submitEnterpriseInstance(result.resolvedUri);
+        };
+        submitAction.run = submit;
+        const message = append(container, $(".onboarding-a-signin-ghe-message"));
+        const validate = () => {
+            this.enterpriseInstanceValue = inputBox.value;
+            inputBox.element.classList.remove("error");
+            message.classList.remove("error", "info");
+            const result = parseGheInstanceInput(inputBox.value);
+            switch (result.kind) {
+            case GheParseResultKind.Empty:
+                message.textContent = enterprisePromptLabel;
+                submitAction.enabled = false;
+                return false;
+            case GheParseResultKind.SingleWord:
+                message.classList.add("info");
+                message.textContent = ( localize(16334, "Will resolve to {0}", result.resolvedUri));
+                submitAction.enabled = true;
+                return true;
+            case GheParseResultKind.FullUri:
+                submitAction.enabled = true;
+                message.textContent = "";
+                return true;
+            case GheParseResultKind.Invalid:
+                inputBox.element.classList.add("error");
+                message.classList.add("error");
+                message.textContent = ( localize(
+                    16335,
+                    "You must enter a valid {0} instance (i.e. \"octocat\" or \"https://octocat.ghe.com\")",
+                    defaultChat.provider.enterprise.name
+                ));
+                submitAction.enabled = false;
+                return false;
+            }
+        };
+        this.stepDisposables.add(inputBox.onDidChange(() => {
+            validate();
+        }));
+        this.stepDisposables.add(addDisposableListener(input, EventType.KEY_DOWN, e => {
+            const event = ( new StandardKeyboardEvent(e));
+            if (event.keyCode === KeyCode.Enter) {
+                e.preventDefault();
+                void submitAction.run();
+                return;
+            }
+            if (event.keyCode === KeyCode.Escape) {
+                e.preventDefault();
+                e.stopPropagation();
+                this._logAction("cancelEnterpriseInstancePrompt");
+                this.enterpriseSignInWatch = undefined;
+                this._setEnterpriseSignInUiState("options");
+            }
+        }));
+        validate();
+    }
+    _renderEnterpriseSignInProgress(actions) {
+        const container = append(actions, $(".onboarding-a-signin-ghe-progress"));
+        container.setAttribute("aria-live", "polite");
+        const spinner = append(container, $("span"));
+        spinner.classList.add(...ThemeIcon.asClassNameArray(Codicon.loading), "codicon-modifier-spin");
+        spinner.setAttribute("aria-hidden", "true");
+        const message = append(container, $(".onboarding-a-signin-ghe-progress-message"));
+        message.textContent = ( localize(
+            16336,
+            "Waiting for {0} sign-in to complete...",
+            defaultChat.provider.enterprise.name
+        ));
+    }
+    _getEnterpriseInstancePromptLabel() {
+        return localize(16337, "What is your {0} instance?", defaultChat.provider.enterprise.name);
+    }
+    _setEnterpriseSignInUiState(state) {
+        this.enterpriseSignInUiState = state;
+        if (this.steps[this.currentStepIndex] === OnboardingStepId.SignIn && this.contentEl) {
+            this._renderStep();
+            this._updateButtonStates();
+            this._focusCurrentStepElement();
+        }
     }
     _createSignInButton(parent, providerClass, label, options) {
         const isCompact = options?.iconOnly || options?.textOnly;
@@ -459,24 +606,42 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
             });
             this.notificationService.notify({
                 severity: Severity.Error,
-                message: ( localize(16123, "Sign-in failed. You can try again later from the Accounts menu."))
+                message: ( localize(16338, "Sign-in failed. You can try again later from the Accounts menu."))
             });
         }
     }
     async _handleEnterpriseSignIn() {
-        const watch = StopWatch.create();
+        const existingUri = this.configurationService.getValue(defaultChat.providerUriSetting);
+        if (typeof existingUri !== "string" || !GHE_FULL_URI_REGEX.test(existingUri)) {
+            this.enterpriseInstanceValue = existingUri ?? "";
+            this.enterpriseSignInWatch = StopWatch.create();
+            this._setEnterpriseSignInUiState("instance");
+            return;
+        }
+        this.enterpriseInstanceValue = existingUri;
+        await this._runEnterpriseSignInSetup();
+    }
+    async _submitEnterpriseInstance(resolvedUri) {
         try {
-            const configured = await this._ensureEnterpriseInstance();
-            if (!configured) {
-                return;
-            }
-            const provider = defaultChat.provider.enterprise.id;
-            const account = await this.defaultAccountService.signIn({
-                extraAuthorizeParameters: {
-                    get_started_with: "copilot-vscode"
-                }
+            await this.configurationService.updateValue(defaultChat.providerUriSetting, resolvedUri, ConfigurationTarget.USER);
+            this.enterpriseInstanceValue = resolvedUri;
+            await this._runEnterpriseSignInSetup();
+        } catch {
+            this.enterpriseSignInWatch = undefined;
+            this._setEnterpriseSignInUiState("instance");
+            this._notifyEnterpriseSignInError();
+        }
+    }
+    async _runEnterpriseSignInSetup() {
+        const watch = this.enterpriseSignInWatch ?? StopWatch.create();
+        const provider = defaultChat.provider.enterprise.id;
+        this._setEnterpriseSignInUiState("progress");
+        try {
+            const success = await this.commandService.executeCommand("workbench.action.chat.triggerSetup", undefined, {
+                disableChatViewReveal: true,
+                setupStrategy: ChatSetupStrategy.SetupWithEnterpriseProvider
             });
-            if (account) {
+            if (success) {
                 this._userSignedIn = true;
                 this.telemetryService.publicLog2("commandCenter.chatInstall", {
                     installResult: "installed",
@@ -484,99 +649,54 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
                     signUpErrorCode: undefined,
                     provider
                 });
-                this.commandService.executeCommand("workbench.action.chat.triggerSetup", undefined, {
-                    disableChatViewReveal: true,
-                    setupStrategy: ChatSetupStrategy.DefaultSetup
-                });
                 this._nextStep();
+            } else {
+                this._setEnterpriseSignInUiState("options");
             }
         } catch (error) {
             if (isCancellationError(error)) {
+                this._setEnterpriseSignInUiState("options");
                 this.telemetryService.publicLog2("commandCenter.chatInstall", {
                     installResult: "cancelled",
                     installDuration: watch.elapsed(),
                     signUpErrorCode: undefined,
-                    provider: defaultChat.provider.enterprise.id
+                    provider
                 });
                 return;
             }
+            this._setEnterpriseSignInUiState("instance");
             this.telemetryService.publicLog2("commandCenter.chatInstall", {
                 installResult: "failedNotSignedIn",
                 installDuration: watch.elapsed(),
                 signUpErrorCode: undefined,
-                provider: defaultChat.provider.enterprise.id
-            });
-            this.notificationService.notify({
-                severity: Severity.Error,
-                message: ( localize(
-                    16124,
-                    "GitHub Enterprise sign-in failed. Check your instance URL and try again."
-                ))
+                provider
             });
+            this._notifyEnterpriseSignInError();
+        } finally {
+            this.enterpriseSignInWatch = undefined;
         }
     }
-    async _ensureEnterpriseInstance() {
-        const domainRegEx = /^[a-zA-Z\-_]+$/;
-        const fullUriRegEx = /^(https:\/\/)?([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.ghe\.com\/?$/;
-        const uri = this.configurationService.getValue(defaultChat.providerUriSetting);
-        if (typeof uri === "string" && fullUriRegEx.test(uri)) {
-            return true;
-        }
-        let isSingleWord = false;
-        const result = await this.quickInputService.input({
-            prompt: ( localize(16125, "What is your {0} instance?", defaultChat.provider.enterprise.name)),
-            placeHolder: ( localize(16126, "i.e. \"octocat\" or \"https://octocat.ghe.com\"...")),
-            ignoreFocusLost: true,
-            value: uri,
-            validateInput: async value => {
-                isSingleWord = false;
-                if (!value) {
-                    return undefined;
-                }
-                if (domainRegEx.test(value)) {
-                    isSingleWord = true;
-                    return {
-                        content: ( localize(16127, "Will resolve to {0}", `https://${value}.ghe.com`)),
-                        severity: Severity.Info
-                    };
-                }
-                if (!fullUriRegEx.test(value)) {
-                    return {
-                        content: ( localize(
-                            16128,
-                            "You must enter a valid {0} instance (i.e. \"octocat\" or \"https://octocat.ghe.com\")",
-                            defaultChat.provider.enterprise.name
-                        )),
-                        severity: Severity.Error
-                    };
-                }
-                return undefined;
-            }
+    _notifyEnterpriseSignInError() {
+        this.notificationService.notify({
+            severity: Severity.Error,
+            message: ( localize(
+                16339,
+                "GitHub Enterprise sign-in failed. Check your instance URL and try again."
+            ))
         });
-        if (!result) {
-            return false;
-        }
-        let resolvedUri = result;
-        if (isSingleWord) {
-            resolvedUri = `https://${resolvedUri}.ghe.com`;
-        } else if (!result.toLowerCase().startsWith("https://")) {
-            resolvedUri = `https://${result}`;
-        }
-        await this.configurationService.updateValue(defaultChat.providerUriSetting, resolvedUri, ConfigurationTarget.USER);
-        return true;
     }
     _renderPersonalizeStep(container) {
         const wrapper = append(container, $(".onboarding-a-personalize"));
         const themeLabel = append(wrapper, $("div.onboarding-a-section-label"));
-        themeLabel.textContent = ( localize(16129, "Color Theme"));
+        themeLabel.textContent = ( localize(16340, "Color Theme"));
         const themeHint = append(wrapper, $("div.onboarding-a-theme-hint"));
         themeHint.textContent = ( localize(
-            16130,
+            16341,
             "You can browse and install more themes later from the Extensions view."
         ));
         const themeGrid = append(wrapper, $(".onboarding-a-theme-grid"));
         themeGrid.setAttribute("role", "radiogroup");
-        themeGrid.setAttribute("aria-label", ( localize(16131, "Choose a color theme")));
+        themeGrid.setAttribute("aria-label", ( localize(16342, "Choose a color theme")));
         const hasOtherEditors = this._hasOtherEditors();
         const allThemes = product.onboardingThemes ?? [];
         const themes = hasOtherEditors ? allThemes.filter(t => !t.id.startsWith("solarized")) : allThemes;
@@ -596,15 +716,15 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
                 wrapper,
                 $("div.onboarding-a-section-label.onboarding-a-section-label-keymap")
             );
-            keymapLabel.textContent = ( localize(16132, "Keyboard Mapping"));
+            keymapLabel.textContent = ( localize(16343, "Keyboard Mapping"));
             const keymapHint = append(wrapper, $("div.onboarding-a-theme-hint"));
             keymapHint.textContent = ( localize(
-                16133,
+                16344,
                 "Coming from another editor? Import your keyboard mapping to feel right at home."
             ));
             const keymapList = append(wrapper, $(".onboarding-a-keymap-list"));
             keymapList.setAttribute("role", "radiogroup");
-            keymapList.setAttribute("aria-label", ( localize(16134, "Choose a keyboard mapping")));
+            keymapList.setAttribute("aria-label", ( localize(16345, "Choose a keyboard mapping")));
             const keymapPills = [];
             for (const keymap of keymapOptions) {
                 const pill = this._registerStepFocusable(append(keymapList, $("button.onboarding-a-keymap-pill")));
@@ -627,7 +747,7 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
                     }
                     pill.classList.add("selected");
                     pill.setAttribute("aria-checked", "true");
-                    this.accessibilityService.alert(( localize(16135, "{0} keyboard mapping selected", keymap.label)));
+                    this.accessibilityService.alert(( localize(16346, "{0} keyboard mapping selected", keymap.label)));
                 }));
             }
             const selectedKeymapIndex = keymapOptions.findIndex(k => k.id === this.selectedKeymapId);
@@ -637,7 +757,7 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
     _renderPersonalizeSubtitle(container) {
         clearNode(container);
         const modifier = isMacintosh ? "Cmd" : "Ctrl";
-        container.append(( localize(16136, "Tip: Press ")), this._createKbd(( localize(16137, "{0}", modifier))), "+", this._createKbd(( localize(16138, "Shift"))), "+", this._createKbd(( localize(16139, "P"))), ( localize(16140, " to access all VS Code commands.")));
+        container.append(( localize(16347, "Tip: Press ")), this._createKbd(( localize(16348, "{0}", modifier))), "+", this._createKbd(( localize(16349, "Shift"))), "+", this._createKbd(( localize(16350, "P"))), ( localize(16351, " to access all VS Code commands.")));
     }
     _createThemeCard(parent, theme, allCards) {
         const card = this._registerStepFocusable(append(parent, $("div.onboarding-a-theme-card")));
@@ -665,7 +785,7 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
             }
             card.classList.add("selected");
             card.setAttribute("aria-checked", "true");
-            this.accessibilityService.alert(( localize(16141, "{0} theme selected", theme.label)));
+            this.accessibilityService.alert(( localize(16352, "{0} theme selected", theme.label)));
         }));
         this.stepDisposables.add(addDisposableListener(card, EventType.KEY_DOWN, e => {
             if (e.key === "Enter" || e.key === " ") {
@@ -702,7 +822,7 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
             this.notificationService.notify({
                 severity: Severity.Warning,
                 message: ( localize(
-                    16142,
+                    16353,
                     "Could not install {0} keymap. You can install it later from Extensions.",
                     keymap.label
                 ))
@@ -825,7 +945,7 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
         const wrapper = append(container, $(".onboarding-a-ai-pref"));
         const cards = append(wrapper, $(".onboarding-a-ai-pref-cards"));
         cards.setAttribute("role", "radiogroup");
-        cards.setAttribute("aria-label", ( localize(16143, "Choose your AI collaboration style")));
+        cards.setAttribute("aria-label", ( localize(16354, "Choose your AI collaboration style")));
         const allCards = [];
         for (const option of ONBOARDING_AI_PREFERENCE_OPTIONS) {
             const card = this._registerStepFocusable(append(cards, $("button.onboarding-a-ai-pref-card")));
@@ -853,13 +973,13 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
                     c.setAttribute("aria-checked", c.dataset.id === option.id ? "true" : "false");
                 }
                 this._applyAiPreference(option.id);
-                this.accessibilityService.alert(( localize(16144, "{0} selected", option.label)));
+                this.accessibilityService.alert(( localize(16355, "{0} selected", option.label)));
             }));
         }
         const selectedAiIndex = ONBOARDING_AI_PREFERENCE_OPTIONS.findIndex(o => o.id === this.selectedAiMode);
         this._setupRadioGroupNavigation(allCards, Math.max(0, selectedAiIndex));
         const hint = append(wrapper, $("div.onboarding-a-ai-pref-hint"));
-        hint.textContent = ( localize(16145, "You can change this anytime in Settings."));
+        hint.textContent = ( localize(16356, "You can change this anytime in Settings."));
     }
     _applyAiPreference(mode) {
         switch (mode) {
@@ -879,7 +999,7 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
         const keys = isMacintosh ?
         ["⌘", "⌃", "I"] : ["Ctrl", "Alt", "I"];
         const shortcut = ( keys.map(k => this._createKbd(k)));
-        el.append(( localize(16146, "Open Chat anytime with ")));
+        el.append(( localize(16357, "Open Chat anytime with ")));
         for (let i = 0; i < shortcut.length; i++) {
             if (i > 0) {
                 el.append("+");
@@ -892,36 +1012,33 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
         const features = append(wrapper, $(".onboarding-a-sessions-features"));
         const chatGroup = append(features, $(".onboarding-a-sessions-group"));
         const chatLabel = append(chatGroup, $("div.onboarding-a-sessions-group-label"));
-        chatLabel.textContent = ( localize(16147, "Choose Your Agent"));
+        chatLabel.textContent = ( localize(16358, "Agents made for the task"));
         const chatGrid = append(chatGroup, $(".onboarding-a-sessions-grid.onboarding-a-sessions-grid-2"));
-        this._createFeatureCard(chatGrid, Codicon.listOrdered, ( localize(16148, "Plan")), ( localize(
-            16149,
-            "Produce a structured implementation plan before any code changes, then hand it off to an implementation agent to execute."
+        this._createFeatureCard(chatGrid, Codicon.listOrdered, ( localize(16359, "Plan")), ( localize(
+            16360,
+            "Produce a structured implementation plan before any code changes, then hand it off to an agent to execute."
         )));
-        this._createFeatureCard(chatGrid, Codicon.commentDiscussion, ( localize(16150, "Agent")), ( localize(
-            16151,
+        this._createFeatureCard(chatGrid, Codicon.commentDiscussion, ( localize(16361, "Agent")), ( localize(
+            16362,
             "Describe a goal. The agent plans the approach, edits files, runs commands, and self-corrects. You review and approve along the way."
         )));
         const moreGroup = append(features, $(".onboarding-a-sessions-group"));
         const moreLabel = append(moreGroup, $("div.onboarding-a-sessions-group-label"));
-        moreLabel.textContent = ( localize(16152, "Agents That Work Your Way"));
+        moreLabel.textContent = ( localize(16363, "Agents that work your way"));
         const moreGrid = append(moreGroup, $(".onboarding-a-sessions-grid.onboarding-a-sessions-grid-2"));
-        this._createFeatureCard(moreGrid, Codicon.rocket, ( localize(16153, "Run Agents Anywhere")), ( localize(
-            16154,
+        this._createFeatureCard(moreGrid, Codicon.rocket, ( localize(16364, "Run Agents Anywhere")), ( localize(
+            16365,
             "Run agents locally for interactive work, in the background with Copilot CLI, or in the cloud with cloud agents that open a pull request your team can review."
         )));
-        this._createFeatureCard(moreGrid, Codicon.settingsGear, ( localize(16155, "Customize Your Agents")), ( localize(
-            16156,
+        this._createFeatureCard(moreGrid, Codicon.settingsGear, ( localize(16366, "Customize Your Agents")), ( localize(
+            16367,
             "Tailor Copilot to your project with custom instructions and agents, skills, reusable prompts, and MCP servers that connect to the tools and context you rely on."
         )));
         const docsRow = append(wrapper, $(".onboarding-a-sessions-docs"));
-        this._createDocLink(docsRow, ( localize(16157, "Agents tutorial")), "https://code.visualstudio.com/docs/copilot/agents/agents-tutorial", "agentsTutorial");
+        this._createDocLink(docsRow, ( localize(16368, "Agents tutorial")), "https://code.visualstudio.com/docs/copilot/agents/agents-tutorial", "agentsTutorial");
     }
     _createFeatureCard(parent, icon, title, description) {
-        const card = this._registerStepFocusable(append(parent, $("div.onboarding-a-feature-card")));
-        card.setAttribute("tabindex", "0");
-        card.setAttribute("role", "group");
-        card.setAttribute("aria-label", title);
+        const card = append(parent, $("div.onboarding-a-feature-card"));
         const iconCol = append(card, $("div.onboarding-a-feature-icon"));
         iconCol.appendChild(renderIcon(icon));
         const textCol = append(card, $("div.onboarding-a-feature-text"));
@@ -1061,6 +1178,9 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
         this._footerSignInBtn = undefined;
         this.footerFocusableElements.length = 0;
         this.stepFocusableElements.length = 0;
+        this.enterpriseSignInUiState = "options";
+        this.enterpriseInstanceValue = "";
+        this.enterpriseSignInWatch = undefined;
         this._isShowing = false;
         this.disposables.clear();
         this.stepDisposables.clear();
@@ -1075,6 +1195,6 @@ let OnboardingVariationA = class OnboardingVariationA extends Disposable {
         super.dispose();
     }
 };
-OnboardingVariationA = ( __decorate([( __param(0, ILayoutService)), ( __param(1, IWorkbenchThemeService)), ( __param(2, IDefaultAccountService)), ( __param(3, IExtensionGalleryService)), ( __param(4, IExtensionManagementService)), ( __param(5, IConfigurationService)), ( __param(6, INotificationService)), ( __param(7, IQuickInputService)), ( __param(8, IFileService)), ( __param(9, IPathService)), ( __param(10, ITelemetryService)), ( __param(11, ICommandService)), ( __param(12, IAccessibilityService))], OnboardingVariationA));
+OnboardingVariationA = OnboardingVariationA_1 = ( __decorate([( __param(0, ILayoutService)), ( __param(1, IWorkbenchThemeService)), ( __param(2, IDefaultAccountService)), ( __param(3, IExtensionGalleryService)), ( __param(4, IExtensionManagementService)), ( __param(5, IConfigurationService)), ( __param(6, INotificationService)), ( __param(7, IFileService)), ( __param(8, IPathService)), ( __param(9, ITelemetryService)), ( __param(10, ICommandService)), ( __param(11, IAccessibilityService))], OnboardingVariationA));
 
 export { OnboardingVariationA };

package/vscode/src/vs/workbench/contrib/welcomeOnboarding/browser/welcomeOnboarding.contribution.js

@@ -13,7 +13,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "workbench.action.welcomeOnboarding2026",
-            title: ( localize2(16158, "Welcome Onboarding 2026")),
+            title: ( localize2(16369, "Welcome Onboarding 2026")),
             category: Categories.Developer,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.js

@@ -18,13 +18,13 @@ import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/com
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 var NewFileTemplatesManager_1;
-const builtInSource = ( localize(16173, "Built-In"));
-const category = ( localize2(16174, "Create"));
+const builtInSource = ( localize(16384, "Built-In"));
+const category = ( localize2(16385, "Create"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "welcome.showNewFileEntries",
-            title: ( localize2(16175, "New File...")),
+            title: ( localize2(16386, "New File...")),
             category,
             f1: true,
             precondition: ( IsSessionsWindowContext.negate()),
@@ -108,8 +108,8 @@ let NewFileTemplatesManager = class NewFileTemplatesManager extends Disposable {
         const qp = this.quickInputService.createQuickPick({
             useSeparators: true
         });
-        qp.title = ( localize(16176, "New File..."));
-        qp.placeholder = ( localize(16177, "Select File Type or Enter File Name..."));
+        qp.title = ( localize(16387, "New File..."));
+        qp.placeholder = ( localize(16388, "Select File Type or Enter File Name..."));
         qp.sortByLabel = false;
         qp.matchOnDetail = true;
         qp.matchOnDescription = true;
@@ -136,8 +136,8 @@ let NewFileTemplatesManager = class NewFileTemplatesManager extends Disposable {
             return a.from.localeCompare(b.from);
         };
         const displayCategory = {
-            "file": ( localize(16178, "File")),
-            "notebook": ( localize(16179, "Notebook"))
+            "file": ( localize(16389, "File")),
+            "notebook": ( localize(16390, "Notebook"))
         };
         const refreshQp = entries => {
             const items = [];
@@ -159,7 +159,7 @@ let NewFileTemplatesManager = class NewFileTemplatesManager extends Disposable {
                     keybinding,
                     buttons: command ? [{
                         iconClass: "codicon codicon-gear",
-                        tooltip: ( localize(16180, "Configure Keybinding"))
+                        tooltip: ( localize(16391, "Configure Keybinding"))
                     }] : [],
                     detail: "",
                     description: entry.from
@@ -181,7 +181,7 @@ let NewFileTemplatesManager = class NewFileTemplatesManager extends Disposable {
                     viewType: undefined,
                     fileName: val
                 },
-                title: ( localize(16181, "Create New File ({0})", val)),
+                title: ( localize(16392, "Create New File ({0})", val)),
                 group: "file",
                 from: builtInSource
             };
@@ -215,7 +215,7 @@ MenuRegistry.appendMenuItem(MenuId.NewFile, {
     group: "file",
     command: {
         id: "workbench.action.files.newUntitledFile",
-        title: ( localize(16182, "Text File"))
+        title: ( localize(16393, "Text File"))
     },
     order: 1
 });

package/vscode/src/vs/workbench/contrib/welcomeViews/common/viewsWelcomeContribution.js

@@ -63,7 +63,7 @@ function parseGroupAndOrder(welcome, contribution) {
     if (welcome.group) {
         if (!isProposedApiEnabled(contribution.description)) {
             contribution.collector.warn(( localize(
-                16183,
+                16394,
                 "The viewsWelcome contribution in '{0}' requires 'enabledApiProposals: [\"contribViewsWelcome\"]' in order to use the 'group' proposed property.",
                 contribution.description.identifier.value
             )));

package/vscode/src/vs/workbench/contrib/welcomeViews/common/viewsWelcomeExtensionPoint.js

@@ -20,12 +20,12 @@ const ViewIdentifierMap = {
 const viewsWelcomeExtensionPointSchema = ( Object.freeze({
     type: "array",
     description: ( localize(
-        16184,
+        16395,
         "Contributed views welcome content. Welcome content will be rendered in tree based views whenever they have no meaningful content to display, ie. the File Explorer when no folder is open. Such content is useful as in-product documentation to drive users to use certain features before they are available. A good example would be a `Clone Repository` button in the File Explorer welcome view."
     )),
     items: {
         type: "object",
-        description: ( localize(16185, "Contributed welcome content for a specific view.")),
+        description: ( localize(16396, "Contributed welcome content for a specific view.")),
         required: [
             ViewsWelcomeExtensionPointFields.view,
             ViewsWelcomeExtensionPointFields.contents
@@ -35,13 +35,13 @@ const viewsWelcomeExtensionPointSchema = ( Object.freeze({
                 anyOf: [{
                     type: "string",
                     description: ( localize(
-                        16186,
+                        16397,
                         "Target view identifier for this welcome content. Only tree based views are supported."
                     ))
                 }, {
                     type: "string",
                     description: ( localize(
-                        16186,
+                        16397,
                         "Target view identifier for this welcome content. Only tree based views are supported."
                     )),
                     enum: ( Object.keys(ViewIdentifierMap))
@@ -50,22 +50,22 @@ const viewsWelcomeExtensionPointSchema = ( Object.freeze({
             [ViewsWelcomeExtensionPointFields.contents]: {
                 type: "string",
                 description: ( localize(
-                    16187,
+                    16398,
                     "Welcome content to be displayed. The format of the contents is a subset of Markdown, with support for links only."
                 ))
             },
             [ViewsWelcomeExtensionPointFields.when]: {
                 type: "string",
-                description: ( localize(16188, "Condition when the welcome content should be displayed."))
+                description: ( localize(16399, "Condition when the welcome content should be displayed."))
             },
             [ViewsWelcomeExtensionPointFields.group]: {
                 type: "string",
-                description: ( localize(16189, "Group to which this welcome content belongs. Proposed API."))
+                description: ( localize(16400, "Group to which this welcome content belongs. Proposed API."))
             },
             [ViewsWelcomeExtensionPointFields.enablement]: {
                 type: "string",
                 description: ( localize(
-                    16190,
+                    16401,
                     "Condition when the welcome content buttons and command links should be enabled."
                 ))
             }