More progress

Author: cte

packages/cloud/src/bridge/BaseChannel.ts

@@ -1,11 +1,12 @@
 import type { Socket } from "socket.io-client"
 import * as vscode from "vscode"
 
-import { StaticAppProperties } from "@roo-code/types"
+import type { StaticAppProperties, GitProperties } from "@roo-code/types"
 
 export interface BaseChannelOptions {
 	instanceId: string
 	appProperties: StaticAppProperties
+	gitProperties?: GitProperties
 }
 
 /**
@@ -20,10 +21,12 @@ export abstract class BaseChannel<TCommand = unknown, TEventName extends string
 	protected socket: Socket | null = null
 	protected readonly instanceId: string
 	protected readonly appProperties: StaticAppProperties
+	protected readonly gitProperties?: GitProperties
 
 	constructor(options: BaseChannelOptions) {
 		this.instanceId = options.instanceId
 		this.appProperties = options.appProperties
+		this.gitProperties = options.gitProperties
 	}
 
 	/**

packages/cloud/src/bridge/BridgeOrchestrator.ts

@@ -8,6 +8,7 @@ import {
 	type ExtensionBridgeCommand,
 	type TaskBridgeCommand,
 	type StaticAppProperties,
+	type GitProperties,
 	ConnectionState,
 	ExtensionSocketEvents,
 	TaskSocketEvents,
@@ -42,6 +43,7 @@ export class BridgeOrchestrator {
 	private readonly provider: TaskProviderLike
 	private readonly instanceId: string
 	private readonly appProperties: StaticAppProperties
+	private readonly gitProperties?: GitProperties
 
 	// Components
 	private socketTransport: SocketTransport
@@ -79,6 +81,9 @@ export class BridgeOrchestrator {
 		if (!instance) {
 			try {
 				console.log(`[BridgeOrchestrator#connectOrDisconnect] Connecting...`)
+				// Populate telemetry properties before registering the instance.
+				await options.provider.getTelemetryProperties()
+
 				BridgeOrchestrator.instance = new BridgeOrchestrator(options)
 				await BridgeOrchestrator.instance.connect()
 			} catch (error) {
@@ -153,6 +158,7 @@ export class BridgeOrchestrator {
 		this.provider = options.provider
 		this.instanceId = options.sessionId || crypto.randomUUID()
 		this.appProperties = { ...options.provider.appProperties, hostname: os.hostname() }
+		this.gitProperties = options.provider.gitProperties
 
 		this.socketTransport = new SocketTransport({
 			url: this.socketBridgeUrl,
@@ -176,13 +182,15 @@ export class BridgeOrchestrator {
 		this.extensionChannel = new ExtensionChannel({
 			instanceId: this.instanceId,
 			appProperties: this.appProperties,
+			gitProperties: this.gitProperties,
 			userId: this.userId,
 			provider: this.provider,
 		})
 
 		this.taskChannel = new TaskChannel({
 			instanceId: this.instanceId,
 			appProperties: this.appProperties,
+			gitProperties: this.gitProperties,
 		})
 	}
 
@@ -304,9 +312,6 @@ export class BridgeOrchestrator {
 	}
 
 	private async connect(): Promise<void> {
-		// Populate the app and git properties before registering the instance.
-		await this.provider.getTelemetryProperties()
-
 		await this.socketTransport.connect()
 		this.setupSocketListeners()
 	}

packages/cloud/src/bridge/ExtensionChannel.ts

@@ -37,7 +37,11 @@ export class ExtensionChannel extends BaseChannel<
 	private eventListeners: Map<RooCodeEventName, (...args: unknown[]) => void> = new Map()
 
 	constructor(options: ExtensionChannelOptions) {
-		super({ instanceId: options.instanceId, appProperties: options.appProperties })
+		super({
+			instanceId: options.instanceId,
+			appProperties: options.appProperties,
+			gitProperties: options.gitProperties,
+		})
 
 		this.userId = options.userId
 		this.provider = options.provider
@@ -46,8 +50,8 @@ export class ExtensionChannel extends BaseChannel<
 			instanceId: this.instanceId,
 			userId: this.userId,
 			workspacePath: this.provider.cwd,
-			appProperties: this.provider.appProperties,
-			gitProperties: this.provider.gitProperties,
+			appProperties: this.appProperties,
+			gitProperties: this.gitProperties,
 			lastHeartbeat: Date.now(),
 			task: { taskId: "", taskStatus: TaskStatus.None },
 			taskHistory: [],