feat(welcome): navigate to 3rd-party provider when auth completes without model selection

When a user signs up via Roo Code Cloud but doesn't select a provider model during the signup flow, they should be taken to the provider selection screen with '3rd-party Provider' pre-selected instead of automatically being configured with the Roo provider.

Changes:
- WebAuthService: Store roo-auth-skip-model flag when providerModel is not provided
- ExtensionState: Add cloudAuthSkipModel field to pass flag to webview
- ClineProvider: Read and pass the flag to webview state
- WebviewMessage: Add clearCloudAuthSkipModel message type
- webviewMessageHandler: Add handler to clear the flag
- WelcomeViewProvider: Check flag on auth completion and navigate to custom provider selection
- Tests: Add test for skip model flag behavior

Author: mrubens

packages/cloud/src/WebAuthService.ts

@@ -331,10 +331,15 @@ export class WebAuthService extends EventEmitter<AuthServiceEvents> implements A
 
 			await this.storeCredentials(credentials)
 
-			// Store the provider model if provided
+			// Store the provider model if provided, or flag that no model was selected
 			if (providerModel) {
 				await this.context.globalState.update("roo-provider-model", providerModel)
+				await this.context.globalState.update("roo-auth-skip-model", undefined)
 				this.log(`[auth] Stored provider model: ${providerModel}`)
+			} else {
+				// No model was selected during signup - flag this for the webview
+				await this.context.globalState.update("roo-auth-skip-model", true)
+				this.log(`[auth] No provider model selected during signup`)
 			}
 
 			const vscode = await importVscode()

packages/cloud/src/__tests__/WebAuthService.spec.ts

@@ -395,9 +395,38 @@ describe("WebAuthService", () => {
 			await authService.handleCallback("auth-code", storedState, null, "xai/grok-code-fast-1")
 
 			expect(mockContext.globalState.update).toHaveBeenCalledWith("roo-provider-model", "xai/grok-code-fast-1")
+			expect(mockContext.globalState.update).toHaveBeenCalledWith("roo-auth-skip-model", undefined)
 			expect(mockLog).toHaveBeenCalledWith("[auth] Stored provider model: xai/grok-code-fast-1")
 		})
 
+		it("should set skip model flag when provider model is NOT provided in callback", async () => {
+			const storedState = "valid-state"
+			mockContext.globalState.get.mockReturnValue(storedState)
+
+			// Mock successful Clerk sign-in response
+			const mockResponse = {
+				ok: true,
+				json: () =>
+					Promise.resolve({
+						response: { created_session_id: "session-123" },
+					}),
+				headers: {
+					get: (header: string) => (header === "authorization" ? "Bearer token-123" : null),
+				},
+			}
+			mockFetch.mockResolvedValue(mockResponse)
+
+			const vscode = await import("vscode")
+			const mockShowInfo = vi.fn()
+			vi.mocked(vscode.window.showInformationMessage).mockImplementation(mockShowInfo)
+
+			// Call without provider model
+			await authService.handleCallback("auth-code", storedState, null)
+
+			expect(mockContext.globalState.update).toHaveBeenCalledWith("roo-auth-skip-model", true)
+			expect(mockLog).toHaveBeenCalledWith("[auth] No provider model selected during signup")
+		})
+
 		it("should handle Clerk API errors", async () => {
 			const storedState = "valid-state"
 			mockContext.globalState.get.mockReturnValue(storedState)

src/core/webview/ClineProvider.ts

@@ -2025,6 +2025,7 @@ export class ClineProvider
 			enterBehavior: enterBehavior ?? "send",
 			cloudUserInfo,
 			cloudIsAuthenticated: cloudIsAuthenticated ?? false,
+			cloudAuthSkipModel: this.context.globalState.get<boolean>("roo-auth-skip-model") ?? false,
 			cloudOrganizations,
 			sharingEnabled: sharingEnabled ?? false,
 			publicSharingEnabled: publicSharingEnabled ?? false,

src/core/webview/webviewMessageHandler.ts

@@ -2384,6 +2384,12 @@ export const webviewMessageHandler = async (
 
 			break
 		}
+		case "clearCloudAuthSkipModel": {
+			// Clear the flag that indicates auth completed without model selection
+			await provider.context.globalState.update("roo-auth-skip-model", undefined)
+			await provider.postStateToWebview()
+			break
+		}
 		case "switchOrganization": {
 			try {
 				const organizationId = message.organizationId ?? null

src/shared/ExtensionMessage.ts

@@ -335,6 +335,7 @@ export type ExtensionState = Pick<
 
 	cloudUserInfo: CloudUserInfo | null
 	cloudIsAuthenticated: boolean
+	cloudAuthSkipModel?: boolean // Flag indicating auth completed without model selection (user should pick 3rd-party provider)
 	cloudApiUrl?: string
 	cloudOrganizations?: CloudOrganizationMembership[]
 	sharingEnabled: boolean

src/shared/WebviewMessage.ts

@@ -122,6 +122,7 @@ export interface WebviewMessage {
 		| "searchFiles"
 		| "toggleApiConfigPin"
 		| "hasOpenedModeSelector"
+		| "clearCloudAuthSkipModel"
 		| "cloudButtonClicked"
 		| "rooCloudSignIn"
 		| "cloudLandingPageSignIn"

webview-ui/src/components/welcome/WelcomeViewProvider.tsx

@@ -27,8 +27,14 @@ type ProviderOption = "roo" | "custom"
 type AuthOrigin = "landing" | "providerSelection"
 
 const WelcomeViewProvider = () => {
-	const { apiConfiguration, currentApiConfigName, setApiConfiguration, uriScheme, cloudIsAuthenticated } =
-		useExtensionState()
+	const {
+		apiConfiguration,
+		currentApiConfigName,
+		setApiConfiguration,
+		uriScheme,
+		cloudIsAuthenticated,
+		cloudAuthSkipModel,
+	} = useExtensionState()
 	const { t } = useAppTranslation()
 	const [errorMessage, setErrorMessage] = useState<string | undefined>(undefined)
 	const [selectedProvider, setSelectedProvider] = useState<ProviderOption | null>(null)
@@ -39,23 +45,33 @@ const WelcomeViewProvider = () => {
 	const [manualErrorMessage, setManualErrorMessage] = useState<boolean | undefined>(undefined)
 	const manualUrlInputRef = useRef<HTMLInputElement | null>(null)
 
-	// When auth completes during the provider signup flow, save the Roo config
-	// This will cause showWelcome to become false and navigate to chat
+	// When auth completes during the provider signup flow, either:
+	// 1. If user skipped model selection (cloudAuthSkipModel=true), navigate to provider selection with "custom" selected
+	// 2. Otherwise, save the Roo config and navigate to chat
 	useEffect(() => {
 		if (cloudIsAuthenticated && authInProgress) {
-			// Auth completed from provider signup flow - save the config now
-			const rooConfig: ProviderSettings = {
-				apiProvider: "roo",
+			if (cloudAuthSkipModel) {
+				// User skipped model selection during signup - navigate to provider selection with 3rd-party selected
+				setSelectedProvider("custom")
+				setAuthInProgress(false)
+				setShowManualEntry(false)
+				// Clear the flag so it doesn't affect future flows
+				vscode.postMessage({ type: "clearCloudAuthSkipModel" })
+			} else {
+				// Auth completed from provider signup flow - save the config now
+				const rooConfig: ProviderSettings = {
+					apiProvider: "roo",
+				}
+				vscode.postMessage({
+					type: "upsertApiConfiguration",
+					text: currentApiConfigName,
+					apiConfiguration: rooConfig,
+				})
+				setAuthInProgress(false)
+				setShowManualEntry(false)
 			}
-			vscode.postMessage({
-				type: "upsertApiConfiguration",
-				text: currentApiConfigName,
-				apiConfiguration: rooConfig,
-			})
-			setAuthInProgress(false)
-			setShowManualEntry(false)
 		}
-	}, [cloudIsAuthenticated, authInProgress, currentApiConfigName])
+	}, [cloudIsAuthenticated, authInProgress, currentApiConfigName, cloudAuthSkipModel])
 
 	// Focus the manual URL input when it becomes visible
 	useEffect(() => {