@codingame/monaco-vscode-workbench-service-override 37.6.1 → 38.0.0

package/vscode/src/vs/sessions/contrib/layout/common/sessionEditorWorkingSet.js

@@ -0,0 +1,73 @@
+
+import { toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+
+class SessionEditorWorkingSetService {
+    constructor() {
+        this._restoreState = observableValue(this, ( Object.freeze({
+            owner: undefined,
+            restoring: false,
+            applying: false
+        })));
+        this.restoreState = this._restoreState;
+        this._pendingRestores = 0;
+        this._editorsToRetain = ( new Set());
+    }
+    setCurrentOwner(owner) {
+        this._restoreState.set(( Object.freeze({
+            owner,
+            restoring: this._pendingRestores !== 0,
+            applying: false
+        })), undefined);
+    }
+    registerEditorToRetain(input) {
+        this._editorsToRetain.add(input);
+        return toDisposable(() => this._editorsToRetain.delete(input));
+    }
+    shouldRetainEditor(input) {
+        return ( this._editorsToRetain.has(input));
+    }
+    beginApply(owner) {
+        const state = this._restoreState.get();
+        if (!state.restoring || !editorWorkingSetOwnersEqual(state.owner, owner)) {
+            return false;
+        }
+        if (!state.applying) {
+            this._restoreState.set(( Object.freeze({
+                owner,
+                restoring: true,
+                applying: true
+            })), undefined);
+        }
+        return true;
+    }
+    beginRestore(owner) {
+        this._pendingRestores++;
+        this._restoreState.set(( Object.freeze({
+            owner,
+            restoring: true,
+            applying: false
+        })), undefined);
+        let settled = false;
+        return toDisposable(() => {
+            if (settled) {
+                return;
+            }
+            settled = true;
+            if (--this._pendingRestores === 0) {
+                this._restoreState.set(( Object.freeze({
+                    owner: this._restoreState.get().owner,
+                    restoring: false,
+                    applying: false
+                })), undefined);
+            }
+        });
+    }
+}
+function editorWorkingSetOwnersEqual(a, b) {
+    return isEqual(a?.sessionResource, b?.sessionResource) && isEqual(a?.chatResource, b?.chatResource);
+}
+
+export { SessionEditorWorkingSetService };

package/vscode/src/vs/sessions/contrib/onboardingTours/browser/newSessionTourContribution.d.ts

@@ -1 +1,42 @@
-export {};
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IOnboardingScenarioService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/onboarding/common/onboardingScenarioService.service";
+import { ISessionsManagementService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement.service";
+import { ISessionsService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service";
+/**
+ * Registers the "new session" onboarding tour and decides *when* it should run.
+ *
+ * The tour targets brand-new users: it only triggers while the number of
+ * sessions the user has ever started (persisted by the sessions telemetry
+ * tracker and read via {@link AgentsWindowUsage}) is below {@link MAX_SESSIONS_FOR_TOUR}.
+ * When an eligible user sends a request, we wait {@link VISIBILITY_DELAY_MS}
+ * and only then pulse the "New Session" button — and only if that session is
+ * still visible in the sessions grid (so we don't interrupt a session the user
+ * immediately closed or navigated away from). Pressing the pulsing button opens
+ * the new-session view and flips the tour's trigger signal. The onboarding
+ * engine gates the pulse on the tour's experiment and handles showing the tour
+ * at most once.
+ *
+ * The `onboarding.developerMode` setting bypasses the session-count gate so the
+ * tour can be triggered on demand for testing.
+ */
+export declare class NewSessionTourContribution extends Disposable implements IWorkbenchContribution {
+    private readonly onboardingScenarioService;
+    private readonly sessionsService;
+    private readonly configurationService;
+    static readonly ID = "sessions.contrib.onboardingTours.newSessionTour";
+    /** Only nudge users who are still in their first few sessions. */
+    private static readonly MAX_SESSIONS_FOR_TOUR;
+    /** Delay after a request before checking the session is still visible. */
+    private static readonly VISIBILITY_DELAY_MS;
+    /** Drives the tour's `observable` trigger. Flipped to `true` exactly once. */
+    private readonly _trigger;
+    private readonly _pendingCheck;
+    private readonly _pulse;
+    private readonly _usage;
+    constructor(sessionsManagementService: ISessionsManagementService, onboardingScenarioService: IOnboardingScenarioService, sessionsService: ISessionsService, storageService: IStorageService, configurationService: IConfigurationService);
+    private _onWillSendRequest;
+    private _startNewSessionButtonPulse;
+}

package/vscode/src/vs/sessions/contrib/onboardingTours/browser/newSessionTourContribution.js

@@ -6,8 +6,8 @@ import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/
 import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+import { AgentsWindowUsage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/agentsWindowUsage';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { onboardingScenarioRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/onboarding/common/onboardingRegistry';
 import { isOnboardingDeveloperModeEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/onboarding/common/onboardingScenarioService';
@@ -15,9 +15,9 @@ import { IOnboardingScenarioService } from '@codingame/monaco-vscode-api/vscode/
 import { findOnboardingTarget, pulseOnboardingTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/onboarding/browser/spotlight/onboardingTarget';
 import { ISessionsManagementService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement.service';
 import { ISessionsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service';
-import { TOTAL_SESSIONS_KEY } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessions/browser/sessionsLifecycleTracker';
 import { createNewSessionTour, NEW_SESSION_TOUR_ID } from './tours/newSessionTour.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var NewSessionTourContribution_1;
 const NEW_SESSION_BUTTON_TARGET = "sessions.newSession.button";
@@ -44,11 +44,11 @@ let NewSessionTourContribution = class NewSessionTourContribution extends Dispos
         super();
         this.onboardingScenarioService = onboardingScenarioService;
         this.sessionsService = sessionsService;
-        this.storageService = storageService;
         this.configurationService = configurationService;
         this._trigger = observableValue(this, false);
         this._pendingCheck = this._register(( new MutableDisposable()));
         this._pulse = this._register(( new MutableDisposable()));
+        this._usage = ( new AgentsWindowUsage(storageService));
         this._register(onboardingScenarioRegistry.register(createNewSessionTour(this._trigger)));
         this._register(
             sessionsManagementService.onWillSendRequest(session => this._onWillSendRequest(session))
@@ -62,24 +62,26 @@ let NewSessionTourContribution = class NewSessionTourContribution extends Dispos
         }
         const developerMode = isOnboardingDeveloperModeEnabled(this.configurationService, NEW_SESSION_TOUR_ID);
         if (!developerMode) {
-            const sessionsStarted = this.storageService.getNumber(TOTAL_SESSIONS_KEY, StorageScope.APPLICATION, 0);
+            const sessionsStarted = this._usage.createdSessionCount;
             if (sessionsStarted > NewSessionTourContribution_1.MAX_SESSIONS_FOR_TOUR) {
                 return;
             }
         }
         this._pendingCheck.value = disposableTimeout(() => {
-            const stillVisible = ( this.sessionsService.visibleSessions.get().some(s => s?.sessionId === session.sessionId));
-            if (stillVisible) {
-                this._startNewSessionButtonPulse();
-            }
+            this._pendingCheck.value = autorun(reader => {
+                const stillVisible = ( this.sessionsService.visibleSessions.read(undefined).some(s => s?.sessionId === session.sessionId));
+                if (stillVisible) {
+                    this._startNewSessionButtonPulse(reader);
+                }
+            });
         }, NewSessionTourContribution_1.VISIBILITY_DELAY_MS);
     }
-    _startNewSessionButtonPulse() {
+    _startNewSessionButtonPulse(reader) {
         if (this._pulse.value || this._trigger.get() || this.onboardingScenarioService.hasBeenShown(NEW_SESSION_TOUR_ID)) {
             return;
         }
         const target = findOnboardingTarget(mainWindow, NEW_SESSION_BUTTON_TARGET);
-        if (!target) {
+        if (!target || !this.onboardingScenarioService.shouldShowNudge(NEW_SESSION_TOUR_ID, reader)) {
             return;
         }
         const pulse = ( new DisposableStore());
@@ -107,3 +109,5 @@ registerWorkbenchContribution2(
     NewSessionTourContribution,
     WorkbenchPhase.AfterRestored
 );
+
+export { NewSessionTourContribution };

package/vscode/src/vs/sessions/contrib/onboardingTours/browser/newSessionViewTourContribution.js

@@ -5,15 +5,14 @@ import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monac
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+import { AgentsWindowUsage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/agentsWindowUsage';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { onboardingScenarioRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/onboarding/common/onboardingRegistry';
 import { isOnboardingDeveloperModeEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/onboarding/common/onboardingScenarioService';
 import { IOnboardingScenarioService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/onboarding/common/onboardingScenarioService.service';
 import { ISessionsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service';
 import { SessionWorkspacePickerVisibleContext, SessionHarnessPickerVisibleContext, SessionIsolationPickerVisibleContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
-import { TOTAL_SESSIONS_KEY } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessions/browser/sessionsLifecycleTracker';
 import { createNewSessionViewTour, NEW_SESSION_VIEW_TOUR_ID } from './tours/newSessionViewTour.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -47,11 +46,11 @@ let NewSessionViewTourContribution = class NewSessionViewTourContribution extend
         super();
         this.onboardingScenarioService = onboardingScenarioService;
         this.sessionsService = sessionsService;
-        this.storageService = storageService;
         this.configurationService = configurationService;
         this.contextKeyService = contextKeyService;
         this._trigger = observableValue(this, false);
         this._pendingCheck = this._register(( new MutableDisposable()));
+        this._usage = ( new AgentsWindowUsage(storageService));
         this._register(
             onboardingScenarioRegistry.register(createNewSessionViewTour(this._trigger))
         );
@@ -78,7 +77,7 @@ let NewSessionViewTourContribution = class NewSessionViewTourContribution extend
         if (isOnboardingDeveloperModeEnabled(this.configurationService, NEW_SESSION_VIEW_TOUR_ID)) {
             return true;
         }
-        const requestsSent = this.storageService.getNumber(TOTAL_SESSIONS_KEY, StorageScope.APPLICATION, 0);
+        const requestsSent = this._usage.createdSessionCount;
         return requestsSent <= NewSessionViewTourContribution_1.MAX_REQUESTS_FOR_TOUR;
     }
     _isTriggeredOrShown() {

package/vscode/src/vs/sessions/contrib/onboardingTours/browser/newSessionViewTourTrigger.d.ts

@@ -11,13 +11,13 @@ export declare class NewSessionViewTourTrigger extends Disposable {
     private readonly _tourId;
     private readonly _onboardingScenarioService;
     private readonly _sessionsService;
-    private readonly _storageService;
     private readonly _configurationService;
     private readonly _contextKeyService;
     private readonly _chatEntitlementService;
+    private readonly _usage;
     private readonly _trigger;
     readonly signal: IObservable<boolean>;
-    constructor(_tourId: string, _onboardingScenarioService: IOnboardingScenarioService, _sessionsService: ISessionsService, _storageService: IStorageService, _configurationService: IConfigurationService, _contextKeyService: IContextKeyService, _chatEntitlementService: IChatEntitlementService);
+    constructor(_tourId: string, _onboardingScenarioService: IOnboardingScenarioService, _sessionsService: ISessionsService, storageService: IStorageService, _configurationService: IConfigurationService, _contextKeyService: IContextKeyService, _chatEntitlementService: IChatEntitlementService);
     private _isEligibleUser;
     private _isTriggeredOrShown;
     private _isReady;

package/vscode/src/vs/sessions/contrib/onboardingTours/browser/newSessionViewTourTrigger.js

@@ -1,28 +1,35 @@
 
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+import { AgentsWindowUsage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/agentsWindowUsage';
 import { isOnboardingDeveloperModeEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/onboarding/common/onboardingScenarioService';
 import { ChatEntitlement } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
 import { SessionWorkspacePickerVisibleContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
-import { TOTAL_SESSIONS_KEY } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessions/browser/sessionsLifecycleTracker';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 const MAX_REQUESTS_FOR_TOUR = 1;
 class NewSessionViewTourTrigger extends Disposable {
-    constructor(_tourId, _onboardingScenarioService, _sessionsService, _storageService, _configurationService, _contextKeyService, _chatEntitlementService) {
+    constructor(
+        _tourId,
+        _onboardingScenarioService,
+        _sessionsService,
+        storageService,
+        _configurationService,
+        _contextKeyService,
+        _chatEntitlementService
+    ) {
         super();
         this._tourId = _tourId;
         this._onboardingScenarioService = _onboardingScenarioService;
         this._sessionsService = _sessionsService;
-        this._storageService = _storageService;
         this._configurationService = _configurationService;
         this._contextKeyService = _contextKeyService;
         this._chatEntitlementService = _chatEntitlementService;
         this._trigger = observableValue(this, false);
         this.signal = this._trigger;
+        this._usage = ( new AgentsWindowUsage(storageService));
         if (!this._isEligibleUser()) {
             return;
         }
@@ -48,7 +55,7 @@ class NewSessionViewTourTrigger extends Disposable {
         if (isOnboardingDeveloperModeEnabled(this._configurationService, this._tourId)) {
             return true;
         }
-        const requestsSent = this._storageService.getNumber(TOTAL_SESSIONS_KEY, StorageScope.APPLICATION, 0);
+        const requestsSent = this._usage.createdSessionCount;
         return requestsSent <= MAX_REQUESTS_FOR_TOUR;
     }
     _isTriggeredOrShown() {
@@ -57,10 +64,7 @@ class NewSessionViewTourTrigger extends Disposable {
     _isReady() {
         const activeSession = this._sessionsService.activeSession.get();
         const newSessionViewOpen = !activeSession || !activeSession.isCreated.get();
-        return this._sessionsService.initialRestoreComplete.get()
-            && newSessionViewOpen
-            && this._chatEntitlementService.entitlement !== ChatEntitlement.Unknown
-            && this._contextKeyService.getContextKeyValue(SessionWorkspacePickerVisibleContext.key) === true;
+        return this._sessionsService.initialRestoreComplete.get() && newSessionViewOpen && this._chatEntitlementService.entitlement !== ChatEntitlement.Unknown && this._contextKeyService.getContextKeyValue(SessionWorkspacePickerVisibleContext.key) === true;
     }
 }
 

package/vscode/src/vs/sessions/contrib/onboardingTours/browser/newSessionViewV2TourContribution.js

@@ -3,13 +3,17 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { onboardingScenarioRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/onboarding/common/onboardingRegistry';
 import { IOnboardingScenarioService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/onboarding/common/onboardingScenarioService.service';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
+import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service';
 import { ISessionsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service';
 import { NewSessionViewTourTrigger } from './newSessionViewTourTrigger.js';
+import { resolveNewSessionViewV2TourVariation } from './newSessionViewV2TourVariation.js';
 import { NEW_SESSION_VIEW_V2_TOUR_ID, createNewSessionViewV2Tour } from './tours/newSessionViewV2Tour.js';
 
 let NewSessionViewV2TourContribution = class NewSessionViewV2TourContribution extends Disposable {
@@ -22,9 +26,13 @@ let NewSessionViewV2TourContribution = class NewSessionViewV2TourContribution ex
         storageService,
         configurationService,
         contextKeyService,
-        chatEntitlementService
+        chatEntitlementService,
+        assignmentService,
+        logService,
+        productService
     ) {
         super();
+        const enabledByDefault = productService.quality === "insider";
         const trigger = this._register(( new NewSessionViewTourTrigger(
             NEW_SESSION_VIEW_V2_TOUR_ID,
             onboardingScenarioService,
@@ -34,12 +42,19 @@ let NewSessionViewV2TourContribution = class NewSessionViewV2TourContribution ex
             contextKeyService,
             chatEntitlementService
         )));
-        this._register(
-            onboardingScenarioRegistry.register(createNewSessionViewV2Tour(trigger.signal))
-        );
+        this._register(onboardingScenarioRegistry.register(createNewSessionViewV2Tour(
+            trigger.signal,
+            () => resolveNewSessionViewV2TourVariation(configurationService, assignmentService, logService, {
+                defaultVariation: enabledByDefault ? "workspaceAndModel" : "default",
+                useTreatment: !enabledByDefault
+            }),
+            {
+                enabledByDefault
+            }
+        )));
     }
 };
-NewSessionViewV2TourContribution = ( __decorate([( __param(0, IOnboardingScenarioService)), ( __param(1, ISessionsService)), ( __param(2, IStorageService)), ( __param(3, IConfigurationService)), ( __param(4, IContextKeyService)), ( __param(5, IChatEntitlementService))], NewSessionViewV2TourContribution));
+NewSessionViewV2TourContribution = ( __decorate([( __param(0, IOnboardingScenarioService)), ( __param(1, ISessionsService)), ( __param(2, IStorageService)), ( __param(3, IConfigurationService)), ( __param(4, IContextKeyService)), ( __param(5, IChatEntitlementService)), ( __param(6, IWorkbenchAssignmentService)), ( __param(7, ILogService)), ( __param(8, IProductService))], NewSessionViewV2TourContribution));
 registerWorkbenchContribution2(
     NewSessionViewV2TourContribution.ID,
     NewSessionViewV2TourContribution,

package/vscode/src/vs/sessions/contrib/onboardingTours/browser/newSessionViewV2TourVariation.d.ts

@@ -0,0 +1,8 @@
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IWorkbenchAssignmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service";
+import { NewSessionViewV2Variation } from "./tours/newSessionViewV2Tour.js";
+export declare function resolveNewSessionViewV2TourVariation(configurationService: IConfigurationService, assignmentService: IWorkbenchAssignmentService, logService: ILogService, options?: {
+    defaultVariation?: NewSessionViewV2Variation;
+    useTreatment?: boolean;
+}): Promise<NewSessionViewV2Variation>;

package/vscode/src/vs/sessions/contrib/onboardingTours/browser/newSessionViewV2TourVariation.js

@@ -0,0 +1,19 @@
+
+import { getOnboardingDeveloperModeVariation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/onboarding/common/onboardingScenarioService';
+import { NEW_SESSION_VIEW_V2_TOUR_ID, NEW_SESSION_VIEW_V2_VARIATION_TREATMENT } from './tours/newSessionViewV2Tour.js';
+
+async function resolveNewSessionViewV2TourVariation(configurationService, assignmentService, logService, options = {}) {
+    const variation = getOnboardingDeveloperModeVariation(configurationService, NEW_SESSION_VIEW_V2_TOUR_ID)
+        ?? (options.useTreatment !== false ? await assignmentService.getTreatment(NEW_SESSION_VIEW_V2_VARIATION_TREATMENT) : undefined)
+        ?? options.defaultVariation
+        ?? 'default';
+    if (variation === 'workspaceAndModel') {
+        return variation;
+    }
+    if (variation !== undefined && variation !== '' && variation !== 'default') {
+        logService.warn(`[NewSessionViewV2Tour] Unsupported variation '${variation}'; using 'default'.`);
+    }
+    return 'default';
+}
+
+export { resolveNewSessionViewV2TourVariation };

package/vscode/src/vs/sessions/contrib/onboardingTours/browser/newSessionViewV3Prompt.js

@@ -14,10 +14,11 @@ import { isAgentHostProviderId } from '@codingame/monaco-vscode-api/vscode/vs/se
 import { NEW_SESSION_PROMPT_TYPING_DURATION_MS } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/chat/browser/newSessionComposerService';
 import { getGitHubRepositoryFromUri } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/github/common/utils';
 import { GitHubAuthenticationError } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/github/browser/githubApiClient';
-import { computeIssueIcon, GitHubIssueState, GitHubPullRequestState } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/github/common/types';
+import { GitHubIssueState, GitHubPullRequestState } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/github/common/types';
 import { resolveGitHubRepositoryFromGitConfig } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/gitHubRepositoryResolver';
 import { NEW_SESSION_VIEW_V3_TOUR_ID, NEW_SESSION_VIEW_V3_VARIATION_TREATMENT, NEW_SESSION_VIEW_V3_OPTIONS_VARIATION, NEW_SESSION_VIEW_V3_PROMPT_VARIATION, NEW_SESSION_VIEW_V3_GITHUB_PROMPT_VARIATION } from './tours/newSessionViewV3Tour.js';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { computeIssueIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/chatIssue';
 import { computePullRequestIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/chatPullRequest';
 
 const DEFAULT_GITHUB_LOOKUP_TIMEOUTS = {
@@ -29,9 +30,9 @@ const DEFAULT_GITHUB_LOOKUP_TIMEOUTS = {
 const LOG_PREFIX = "[NewSessionViewV3Prompt]";
 const PROMPT_TEMPLATE_TREATMENT = "onb.newSessionViewV3.promptTemplate";
 const PLACEHOLDER_TREATMENT = "onb.newSessionViewV3.placeholder";
-const DEFAULT_TASK_PLACEHOLDER = ( localize(4122, "[describe the coding task]"));
+const DEFAULT_TASK_PLACEHOLDER = ( localize(4760, "[describe the coding task]"));
 const DEFAULT_PROMPT_TEMPLATE = ( localize(
-    4123,
+    4761,
     "Help me complete {0} in this project. First, inspect the relevant files and explain your approach briefly. Then implement the solution using existing project conventions, avoid unrelated changes, and run the most relevant tests or checks. If anything is unclear, make a reasonable assumption and state it. When finished, summarize what changed and mention any remaining issues."
 ));
 const PROMPT_OPTION_COUNT = 3;
@@ -1056,7 +1057,7 @@ class NewSessionViewV3PromptRunner {
     }
     _createGitHubPromptOption(candidate) {
         const plan = this._createGitHubPrompt(candidate);
-        const title = candidate.strategy === "githubIssue" ? ( localize(4124, "Tackle issue")) : candidate.strategy === "githubMergeConflict" ? ( localize(4125, "Resolve conflicts")) : candidate.strategy === "githubCiFailure" ? ( localize(4126, "Fix CI")) : ( localize(4127, "Address PR comments"));
+        const title = candidate.strategy === "githubIssue" ? ( localize(4762, "Tackle issue")) : candidate.strategy === "githubMergeConflict" ? ( localize(4763, "Resolve conflicts")) : candidate.strategy === "githubCiFailure" ? ( localize(4764, "Fix CI")) : ( localize(4765, "Address PR comments"));
         const icon = candidate.strategy === "githubIssue" ? computeIssueIcon(GitHubIssueState.Open, undefined) : computePullRequestIcon(GitHubPullRequestState.Open, {
             hasMergeConflicts: candidate.strategy === "githubMergeConflict",
             hasFailingChecks: candidate.strategy === "githubCiFailure",
@@ -1073,15 +1074,15 @@ class NewSessionViewV3PromptRunner {
         };
     }
     _createStandardPromptOptions() {
-        const implementFeaturePlaceholder = ( localize(4128, "[describe the feature]"));
-        const fixBugPlaceholder = ( localize(4129, "[describe the bug]"));
-        const fixCiPlaceholder = ( localize(4130, "[describe the CI failure or paste a link]"));
+        const implementFeaturePlaceholder = ( localize(4766, "[describe the feature]"));
+        const fixBugPlaceholder = ( localize(4767, "[describe the bug]"));
+        const fixCiPlaceholder = ( localize(4768, "[describe the CI failure or paste a link]"));
         return [{
             id: "standard:implementFeature",
-            title: ( localize(4131, "Implement a feature")),
-            description: ( localize(4132, "Describe what you want to build")),
+            title: ( localize(4769, "Implement a feature")),
+            description: ( localize(4770, "Describe what you want to build")),
             prompt: ( localize(
-                4133,
+                4771,
                 "Help me implement {0} in this project. Ask me questions if anything is unclear regarding the intended behaviour.",
                 implementFeaturePlaceholder
             )),
@@ -1089,10 +1090,10 @@ class NewSessionViewV3PromptRunner {
             icon: Codicon.lightbulbSparkleAutofix
         }, {
             id: "standard:fixBug",
-            title: ( localize(4134, "Fix a bug")),
-            description: ( localize(4135, "Describe the unexpected behavior")),
+            title: ( localize(4772, "Fix a bug")),
+            description: ( localize(4773, "Describe the unexpected behavior")),
             prompt: ( localize(
-                4136,
+                4774,
                 "Help me fix {0} in this project. Ask me questions if anything is unclear regarding the bug or the intended behaviour.",
                 fixBugPlaceholder
             )),
@@ -1100,10 +1101,10 @@ class NewSessionViewV3PromptRunner {
             icon: Codicon.bug
         }, {
             id: "standard:fixCi",
-            title: ( localize(4137, "Fix CI")),
-            description: ( localize(4138, "Describe a failing check or paste a link")),
+            title: ( localize(4775, "Fix CI")),
+            description: ( localize(4776, "Describe a failing check or paste a link")),
             prompt: ( localize(
-                4139,
+                4777,
                 "Help me fix the failing CI for {0} in this project. Ask me questions if anything is unclear regarding the CI failure or how it should be fixed.",
                 fixCiPlaceholder
             )),
@@ -1113,22 +1114,22 @@ class NewSessionViewV3PromptRunner {
     }
     _createGitHubPrompt(candidate) {
         const prompt = candidate.strategy === "githubMergeConflict" ? ( localize(
-            4140,
+            4778,
             "The following pull request has merge conflicts: \"{0}\" ({1}). Resolve the conflicts and update the pull request.",
             candidate.title,
             candidate.url
         )) : candidate.strategy === "githubCiFailure" ? ( localize(
-            4141,
+            4779,
             "The following pull request has failing CI checks: \"{0}\" ({1}). Investigate the failures and resolve them.",
             candidate.title,
             candidate.url
         )) : candidate.strategy === "githubReviewComments" ? ( localize(
-            4142,
+            4780,
             "The following pull request has unresolved review comments that have not been addressed by a newer commit: \"{0}\" ({1}). Address the review comments and update the pull request.",
             candidate.title,
             candidate.url
         )) : ( localize(
-            4143,
+            4781,
             "Tackle the following issue and create a pull request for it: \"{0}\" ({1}).",
             candidate.title,
             candidate.url

package/vscode/src/vs/sessions/contrib/onboardingTours/browser/tours/newSessionTour.js

@@ -2,10 +2,15 @@
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { EditorPartModalContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { onboardingScenarioRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/onboarding/common/onboardingRegistry';
 import { SPOTLIGHT_PRESENTATION_KIND } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/onboarding/browser/spotlight/spotlightTypes';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { NewSessionOnboardingHandoffContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
 
 const NEW_SESSION_TOUR_ID = "sessions.onboarding.newSession";
+onboardingScenarioRegistry.registerDescriptor({
+    id: NEW_SESSION_TOUR_ID
+});
 const NEW_SESSION_ONBOARDING_SEEN_KEY = NEW_SESSION_TOUR_ID;
 const NEW_SESSION_EXPERIMENT = {
     behaviorFlag: "onb.newSession.show",
@@ -15,18 +20,18 @@ const newSessionPayload = {
     steps: [{
         id: "workspacePicker",
         targetId: "sessions.newSession.workspacePicker",
-        title: ( localize(4144, "Work Across Workspaces")),
+        title: ( localize(4782, "Work Across Workspaces")),
         description: ( localize(
-            4145,
+            4783,
             "Choose between the folders and repositories you work in. Run multiple sessions at once in a single workspace, or across many."
         )),
         placement: "above"
     }, {
         id: "isolation",
         targetId: "sessions.newSession.isolation",
-        title: ( localize(4146, "Isolate Your Work")),
+        title: ( localize(4784, "Isolate Your Work")),
         description: ( localize(
-            4147,
+            4785,
             "Use a worktree to work on multiple tasks in the same project without conflicts. Each task stays isolated, so you can experiment freely and safely."
         )),
         placement: "below"
@@ -36,7 +41,7 @@ function createNewSessionTour(signal) {
     return {
         id: NEW_SESSION_TOUR_ID,
         seenKey: NEW_SESSION_ONBOARDING_SEEN_KEY,
-        when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( EditorPartModalContext.toNegated()))),
+        when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( EditorPartModalContext.toNegated()), ( NewSessionOnboardingHandoffContext.toNegated()))),
         trigger: {
             kind: "observable",
             signal

package/vscode/src/vs/sessions/contrib/onboardingTours/browser/tours/newSessionViewTour.js

@@ -2,12 +2,16 @@
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { EditorPartModalVisibleContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { onboardingScenarioRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/onboarding/common/onboardingRegistry';
 import { SPOTLIGHT_PRESENTATION_KIND } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/onboarding/browser/spotlight/spotlightTypes';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { NEW_SESSION_ONBOARDING_SEEN_KEY } from './newSessionTour.js';
-import { SessionWorkspacePickerVisibleContext, SessionHarnessPickerVisibleContext, SessionIsolationPickerVisibleContext, IsNewChatSessionContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
+import { SessionWorkspacePickerVisibleContext, SessionHarnessPickerVisibleContext, SessionIsolationPickerVisibleContext, IsNewChatSessionContext, NewSessionOnboardingHandoffContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
 
 const NEW_SESSION_VIEW_TOUR_ID = "sessions.onboarding.newSessionView";
+onboardingScenarioRegistry.registerDescriptor({
+    id: NEW_SESSION_VIEW_TOUR_ID
+});
 const NEW_SESSION_VIEW_EXPERIMENT = {
     behaviorFlag: "onb.newSessionView.show",
     assignmentContextIdFlag: "onb.newSessionView.id"
@@ -16,9 +20,9 @@ const newSessionViewPayload = {
     steps: [{
         id: "workspacePicker",
         targetId: "sessions.newSession.workspacePicker",
-        title: ( localize(4148, "Work Across Workspaces")),
+        title: ( localize(4786, "Work Across Workspaces")),
         description: ( localize(
-            4149,
+            4787,
             "Choose between the folders and repositories you work in. Run multiple sessions at once in a single workspace, or across many."
         )),
         placement: "above",
@@ -27,9 +31,9 @@ const newSessionViewPayload = {
     }, {
         id: "harnessPicker",
         targetId: "sessions.newSession.harnessPicker",
-        title: ( localize(4150, "Choose a Harness")),
+        title: ( localize(4788, "Choose a Harness")),
         description: ( localize(
-            4151,
+            4789,
             "Each has different strengths; choose what works best for your task and switch anytime."
         )),
         placement: "above",
@@ -38,9 +42,9 @@ const newSessionViewPayload = {
     }, {
         id: "isolation",
         targetId: "sessions.newSession.isolation",
-        title: ( localize(4152, "Isolate Your Work")),
+        title: ( localize(4790, "Isolate Your Work")),
         description: ( localize(
-            4153,
+            4791,
             "Use a worktree to work on multiple tasks in the same project without conflicts. Each task stays isolated, so you can experiment freely and safely."
         )),
         placement: "below",
@@ -52,7 +56,7 @@ function createNewSessionViewTour(signal) {
     return {
         id: NEW_SESSION_VIEW_TOUR_ID,
         seenKey: NEW_SESSION_ONBOARDING_SEEN_KEY,
-        when: ( ContextKeyExpr.and(ChatContextKeys.enabled, IsNewChatSessionContext, ( EditorPartModalVisibleContext.toNegated()))),
+        when: ( ContextKeyExpr.and(ChatContextKeys.enabled, IsNewChatSessionContext, ( EditorPartModalVisibleContext.toNegated()), ( NewSessionOnboardingHandoffContext.toNegated()))),
         trigger: {
             kind: "observable",
             signal