working after merge aug13

Author: mechanicmuthu

src/core/task/Task.ts

@@ -32,7 +32,8 @@ import {
 	isBlockingAsk,
 } from "@roo-code/types"
 import { TelemetryService } from "@roo-code/telemetry"
-import { CloudService, TaskBridgeService } from "@roo-code/cloud"
+import * as CloudModule from "@roo-code/cloud"
+const { CloudService, TaskBridgeService } = (CloudModule as any).default ?? (CloudModule as any)
 
 // api
 import { ApiHandler, ApiHandlerCreateMessageMetadata, buildApiHandler } from "../../api"
@@ -240,7 +241,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 
 	// Task Bridge
 	enableTaskBridge: boolean
-	bridgeService: TaskBridgeService | null = null
+	bridgeService: any | null = null
 
 	// Streaming
 	isWaitingForFirstChunk = false

src/core/webview/ClineProvider.ts

@@ -2137,11 +2137,9 @@ export class ClineProvider
 	 * Manages UnifiedBridgeService lifecycle
 	 */
 	public async handleRemoteControlToggle(enabled: boolean) {
-		const {
-			CloudService: CloudServiceImport,
-			ExtensionBridgeService,
-			TaskBridgeService,
-		} = await import("@roo-code/cloud")
+		const cloudMod = await import("@roo-code/cloud")
+		const cloud = (cloudMod as any).default ?? (cloudMod as any)
+		const { CloudService: CloudServiceImport, ExtensionBridgeService, TaskBridgeService } = cloud
 
 		const userInfo = CloudServiceImport.instance.getUserInfo()
 

src/extension.ts

@@ -12,7 +12,8 @@ try {
 	console.warn("Failed to load environment variables:", e)
 }
 
-import { CloudService, ExtensionBridgeService } from "@roo-code/cloud"
+import * as CloudModule from "@roo-code/cloud"
+const { CloudService, ExtensionBridgeService } = (CloudModule as any).default ?? (CloudModule as any)
 import { TelemetryService, PostHogTelemetryClient } from "@roo-code/telemetry"
 
 import "./utils/path" // Necessary to have access to String.prototype.toPosix.
@@ -131,7 +132,7 @@ export async function activate(context: vscode.ExtensionContext) {
 	cloudService.on("auth-state-changed", postStateListener)
 	cloudService.on("settings-updated", postStateListener)
 
-	cloudService.on("user-info", async ({ userInfo }) => {
+	cloudService.on("user-info", async ({ userInfo }: { userInfo: any }) => {
 		postStateListener()
 
 		const bridgeConfig = await cloudService.cloudAPI?.bridgeConfig().catch(() => undefined)