fix(McpHub): update e2e tests for headless mode

Author: edelauna

apps/vscode-e2e/src/suite/mcp-oauth.test.ts

@@ -201,17 +201,9 @@ suite("Roo Code MCP OAuth", function () {
 		const rooDir = path.join(workspaceDir, ".roo")
 		await fs.mkdir(rooDir, { recursive: true })
 
-		const mcpConfig = {
-			mcpServers: {
-				"test-oauth-server": {
-					type: "streamable-http",
-					url: `http://localhost:${mockServerPort}/mcp`,
-				},
-			},
-		}
-
 		testFiles = { mcpConfig: path.join(rooDir, "mcp.json") }
-		await fs.writeFile(testFiles.mcpConfig, JSON.stringify(mcpConfig, null, 2))
+		// Config is written by each test to control when the connection starts,
+		// ensuring all endpoint hits are captured after endpointsHit is cleared.
 
 		console.log("[TEST] Mock server port:", mockServerPort)
 		console.log("[TEST] MCP config:", testFiles.mcpConfig)
@@ -272,7 +264,7 @@ suite("Roo Code MCP OAuth", function () {
 	})
 
 	test("Should complete the full OAuth flow when connecting to an OAuth-protected MCP server", async function () {
-		// Re-write the config to trigger the file watcher and force a reconnect.
+		// Write the config to trigger the initial connection attempt.
 		const workspaceDir = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath || tempDir
 		const mcpConfigPath = path.join(workspaceDir, ".roo", "mcp.json")
 
@@ -329,13 +321,8 @@ suite("Roo Code MCP OAuth", function () {
 	})
 
 	test("Should reuse stored token on reconnect without re-running the full OAuth flow", async function () {
-		// Ensure a token is in SecretStorage before testing reuse — this makes the
-		// test self-contained regardless of execution order.
-		await waitFor(() => endpointsHit.has("token"), { timeout: 30_000 })
-
-		// Clear hit tracking so we can assert the token endpoint is NOT re-hit.
-		endpointsHit.clear()
-
+		// Test 1 stored a valid token in SecretStorage. The per-test setup already
+		// cleared endpointsHit, so any hits here are from this reconnect only.
 		const workspaceDir = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath || tempDir
 		const mcpConfigPath = path.join(workspaceDir, ".roo", "mcp.json")
 

src/services/mcp/McpHub.ts

@@ -1204,6 +1204,27 @@ export class McpHub {
 			// Register in _oauthWatchers so deleteConnection() and dispose() can clean up
 			this._oauthWatchers.set(watcherKey, { unsubscribe, abortHandle: timeoutHandle })
 
+			// In test mode, skip user interaction and proceed directly to complete the OAuth flow.
+			if (process.env.MCP_OAUTH_TEST_MODE === "true") {
+				void (async () => {
+					cleanup()
+					try {
+						await this._completeOAuthFlow(
+							authProvider,
+							transport,
+							connection,
+							name,
+							source,
+							cancellationToken,
+						)
+					} catch {
+						// _completeOAuthFlow handles its own error state
+					}
+					resolve()
+				})()
+				return
+			}
+
 			// Non-modal toast — fires once. If dismissed without clicking Authenticate,
 			// the flow stays alive via the persistent progress bar (Cancel to abort).
 			const authenticateLabel = t("mcp:oauth.flow.authenticateButton")