Simplify and fix tests

Author: cte

packages/cloud/src/__mocks__/vscode.ts

@@ -13,6 +13,10 @@ export const Uri = {
 	parse: vi.fn((uri: string) => ({ toString: () => uri })),
 }
 
+export const commands = {
+	executeCommand: vi.fn().mockResolvedValue(undefined),
+}
+
 export interface ExtensionContext {
 	secrets: {
 		get: (key: string) => Promise<string | undefined>

packages/cloud/src/bridge/BaseChannel.ts

@@ -1,11 +1,11 @@
 import type { Socket } from "socket.io-client"
 import * as vscode from "vscode"
 
-import { ExtensionMetadata } from "@roo-code/types"
+import { StaticAppProperties } from "@roo-code/types"
 
 export interface BaseChannelOptions {
 	instanceId: string
-	extensionMetadata: ExtensionMetadata
+	appProperties: StaticAppProperties
 }
 
 /**
@@ -19,11 +19,11 @@ export interface BaseChannelOptions {
 export abstract class BaseChannel<TCommand = unknown, TEventName extends string = string, TEventData = unknown> {
 	protected socket: Socket | null = null
 	protected readonly instanceId: string
-	protected readonly extensionMetadata: ExtensionMetadata
+	protected readonly appProperties: StaticAppProperties
 
 	constructor(options: BaseChannelOptions) {
 		this.instanceId = options.instanceId
-		this.extensionMetadata = options.extensionMetadata
+		this.appProperties = options.appProperties
 	}
 
 	/**
@@ -99,10 +99,10 @@ export abstract class BaseChannel<TCommand = unknown, TEventName extends string
 	 * handleCommandImplementation method.
 	 */
 	public async handleCommand(command: TCommand): Promise<void> {
-		// Common functionality: focus the sidebar
-		await vscode.commands.executeCommand(`${this.extensionMetadata.name}.SidebarProvider.focus`)
+		// Common functionality: focus the sidebar.
+		await vscode.commands.executeCommand(`${this.appProperties.appName}.SidebarProvider.focus`)
 
-		// Delegate to subclass-specific implementation
+		// Delegate to subclass-specific implementation.
 		await this.handleCommandImplementation(command)
 	}
 

packages/cloud/src/bridge/BridgeOrchestrator.ts

@@ -1,12 +1,13 @@
 import crypto from "crypto"
+import os from "os"
 
 import {
 	type TaskProviderLike,
 	type TaskLike,
 	type CloudUserInfo,
 	type ExtensionBridgeCommand,
 	type TaskBridgeCommand,
-	type ExtensionMetadata,
+	type StaticAppProperties,
 	ConnectionState,
 	ExtensionSocketEvents,
 	TaskSocketEvents,
@@ -22,7 +23,6 @@ export interface BridgeOrchestratorOptions {
 	token: string
 	provider: TaskProviderLike
 	sessionId?: string
-	extensionMetadata: ExtensionMetadata
 }
 
 /**
@@ -41,7 +41,7 @@ export class BridgeOrchestrator {
 	private readonly token: string
 	private readonly provider: TaskProviderLike
 	private readonly instanceId: string
-	private readonly extensionMetadata: ExtensionMetadata
+	private readonly appProperties: StaticAppProperties
 
 	// Components
 	private socketTransport: SocketTransport
@@ -152,7 +152,7 @@ export class BridgeOrchestrator {
 		this.token = options.token
 		this.provider = options.provider
 		this.instanceId = options.sessionId || crypto.randomUUID()
-		this.extensionMetadata = options.extensionMetadata
+		this.appProperties = { ...options.provider.appProperties, hostname: os.hostname() }
 
 		this.socketTransport = new SocketTransport({
 			url: this.socketBridgeUrl,
@@ -175,12 +175,15 @@ export class BridgeOrchestrator {
 
 		this.extensionChannel = new ExtensionChannel({
 			instanceId: this.instanceId,
+			appProperties: this.appProperties,
 			userId: this.userId,
 			provider: this.provider,
-			extensionMetadata: this.extensionMetadata,
 		})
 
-		this.taskChannel = new TaskChannel({ instanceId: this.instanceId, extensionMetadata: this.extensionMetadata })
+		this.taskChannel = new TaskChannel({
+			instanceId: this.instanceId,
+			appProperties: this.appProperties,
+		})
 	}
 
 	private setupSocketListeners() {

packages/cloud/src/bridge/ExtensionChannel.ts

@@ -37,7 +37,7 @@ export class ExtensionChannel extends BaseChannel<
 	private eventListeners: Map<RooCodeEventName, (...args: unknown[]) => void> = new Map()
 
 	constructor(options: ExtensionChannelOptions) {
-		super({ instanceId: options.instanceId, extensionMetadata: options.extensionMetadata })
+		super({ instanceId: options.instanceId, appProperties: options.appProperties })
 
 		this.userId = options.userId
 		this.provider = options.provider
@@ -49,10 +49,7 @@ export class ExtensionChannel extends BaseChannel<
 			appProperties: this.provider.appProperties,
 			gitProperties: this.provider.gitProperties,
 			lastHeartbeat: Date.now(),
-			task: {
-				taskId: "",
-				taskStatus: TaskStatus.None,
-			},
+			task: { taskId: "", taskStatus: TaskStatus.None },
 			taskHistory: [],
 		}
 
@@ -224,8 +221,6 @@ export class ExtensionChannel extends BaseChannel<
 
 		this.extensionInstance = {
 			...this.extensionInstance,
-			appProperties: this.extensionInstance.appProperties ?? this.provider.appProperties,
-			gitProperties: this.extensionInstance.gitProperties ?? this.provider.gitProperties,
 			lastHeartbeat: Date.now(),
 			task: task
 				? {

packages/cloud/src/bridge/__tests__/ExtensionChannel.test.ts

@@ -5,6 +5,7 @@ import type { Socket } from "socket.io-client"
 import {
 	type TaskProviderLike,
 	type TaskProviderEvents,
+	type StaticAppProperties,
 	RooCodeEventName,
 	ExtensionBridgeEventName,
 	ExtensionSocketEvents,
@@ -18,12 +19,14 @@ describe("ExtensionChannel", () => {
 	let extensionChannel: ExtensionChannel
 	const instanceId = "test-instance-123"
 	const userId = "test-user-456"
-	const extensionMetadata = {
-		name: "roo-code",
-		publisher: "Roocode",
-		version: "1.0.0",
-		outputChannel: "Roo Code",
-		sha: undefined,
+
+	const appProperties: StaticAppProperties = {
+		appName: "roo-code",
+		appVersion: "1.0.0",
+		vscodeVersion: "1.0.0",
+		platform: "darwin",
+		editorName: "Roo Code",
+		hostname: "test-host",
 	}
 
 	// Track registered event listeners
@@ -89,7 +92,7 @@ describe("ExtensionChannel", () => {
 		// Create extension channel instance
 		extensionChannel = new ExtensionChannel({
 			instanceId,
-			extensionMetadata,
+			appProperties,
 			userId,
 			provider: mockProvider,
 		})
@@ -169,7 +172,7 @@ describe("ExtensionChannel", () => {
 			// Create a second channel with the same provider
 			const secondChannel = new ExtensionChannel({
 				instanceId: "instance-2",
-				extensionMetadata,
+				appProperties,
 				userId,
 				provider: mockProvider,
 			})

packages/cloud/src/bridge/__tests__/TaskChannel.test.ts

@@ -6,6 +6,7 @@ import type { Socket } from "socket.io-client"
 import {
 	type TaskLike,
 	type ClineMessage,
+	type StaticAppProperties,
 	RooCodeEventName,
 	TaskBridgeEventName,
 	TaskBridgeCommandName,
@@ -21,12 +22,14 @@ describe("TaskChannel", () => {
 	let mockTask: TaskLike
 	const instanceId = "test-instance-123"
 	const taskId = "test-task-456"
-	const extensionMetadata = {
-		name: "roo-code",
-		publisher: "Roocode",
-		version: "1.0.0",
-		outputChannel: "Roo Code",
-		sha: undefined,
+
+	const appProperties: StaticAppProperties = {
+		appName: "roo-code",
+		appVersion: "1.0.0",
+		vscodeVersion: "1.0.0",
+		platform: "darwin",
+		editorName: "Roo Code",
+		hostname: "test-host",
 	}
 
 	beforeEach(() => {
@@ -84,7 +87,7 @@ describe("TaskChannel", () => {
 		// Create task channel instance
 		taskChannel = new TaskChannel({
 			instanceId,
-			extensionMetadata,
+			appProperties,
 		})
 	})
 
@@ -330,7 +333,7 @@ describe("TaskChannel", () => {
 			channel.subscribedTasks.set(taskId, mockTask)
 		})
 
-		it("should handle Message command", () => {
+		it("should handle Message command", async () => {
 			const command = {
 				type: TaskBridgeCommandName.Message,
 				taskId,
@@ -341,7 +344,7 @@ describe("TaskChannel", () => {
 				},
 			}
 
-			taskChannel.handleCommand(command)
+			await taskChannel.handleCommand(command)
 
 			expect(mockTask.submitUserMessage).toHaveBeenCalledWith(
 				command.payload.text,
@@ -351,7 +354,7 @@ describe("TaskChannel", () => {
 			)
 		})
 
-		it("should handle ApproveAsk command", () => {
+		it("should handle ApproveAsk command", async () => {
 			const command = {
 				type: TaskBridgeCommandName.ApproveAsk,
 				taskId,
@@ -361,12 +364,12 @@ describe("TaskChannel", () => {
 				},
 			}
 
-			taskChannel.handleCommand(command)
+			await taskChannel.handleCommand(command)
 
 			expect(mockTask.approveAsk).toHaveBeenCalledWith(command.payload)
 		})
 
-		it("should handle DenyAsk command", () => {
+		it("should handle DenyAsk command", async () => {
 			const command = {
 				type: TaskBridgeCommandName.DenyAsk,
 				taskId,
@@ -376,12 +379,12 @@ describe("TaskChannel", () => {
 				},
 			}
 
-			taskChannel.handleCommand(command)
+			await taskChannel.handleCommand(command)
 
 			expect(mockTask.denyAsk).toHaveBeenCalledWith(command.payload)
 		})
 
-		it("should log error for unknown task", () => {
+		it("should log error for unknown task", async () => {
 			const errorSpy = vi.spyOn(console, "error")
 
 			const command = {
@@ -393,7 +396,7 @@ describe("TaskChannel", () => {
 				},
 			}
 
-			taskChannel.handleCommand(command)
+			await taskChannel.handleCommand(command)
 
 			expect(errorSpy).toHaveBeenCalledWith(`[TaskChannel] Unable to find task unknown-task`)
 

packages/types/npm/package.metadata.json

@@ -1,6 +1,6 @@
 {
 	"name": "@roo-code/types",
-	"version": "1.70.0",
+	"version": "1.71.0",
 	"description": "TypeScript type definitions for Roo Code.",
 	"publishConfig": {
 		"access": "public",

packages/types/src/extension.ts

@@ -3,7 +3,6 @@ export * from "./cloud.js"
 export * from "./codebase-index.js"
 export * from "./events.js"
 export * from "./experiment.js"
-export * from "./extension.js"
 export * from "./followup.js"
 export * from "./global-settings.js"
 export * from "./history.js"

packages/types/src/index.ts

@@ -78,6 +78,7 @@ export const staticAppPropertiesSchema = z.object({
 	vscodeVersion: z.string(),
 	platform: z.string(),
 	editorName: z.string(),
+	hostname: z.string().optional(),
 })
 
 export type StaticAppProperties = z.infer<typeof staticAppPropertiesSchema>