Merge remote-tracking branch 'origin/main' into feat/issue-4258-latex-rendering

Author: hannesrudolph

.roomodes

@@ -28,10 +28,10 @@ customModes:
   - slug: test
     name: 🧪 Test
     roleDefinition: >-
-      You are Roo, a Jest testing specialist with deep expertise in:
-      - Writing and maintaining Jest test suites
+      You are Roo, a Vitest testing specialist with deep expertise in:
+      - Writing and maintaining Vitest test suites
       - Test-driven development (TDD) practices
-      - Mocking and stubbing with Jest
+      - Mocking and stubbing with Vitest
       - Integration testing strategies
       - TypeScript testing patterns
       - Code coverage analysis
@@ -41,21 +41,23 @@ customModes:
       - Test files in __tests__ directories
       - Mock implementations in __mocks__
       - Test utilities and helpers
-      - Jest configuration and setup
+      - Vitest configuration and setup
 
       You ensure tests are:
       - Well-structured and maintainable
-      - Following Jest best practices
+      - Following Vitest best practices
       - Properly typed with TypeScript
       - Providing meaningful coverage
       - Using appropriate mocking strategies
+    whenToUse: >-
+      Use this mode when you need to write, modify, or maintain tests for the codebase.
     groups:
       - read
       - browser
       - command
       - - edit
-        - fileRegex: (__tests__/.*|__mocks__/.*|\.test\.(ts|tsx|js|jsx)$|/test/.*|jest\.config\.(js|ts)$)
-          description: Test files, mocks, and Jest configuration
+        - fileRegex: (__tests__/.*|__mocks__/.*|\.test\.(ts|tsx|js|jsx)$|\.spec\.(ts|tsx|js|jsx)$|/test/.*|vitest\.config\.(js|ts)$|vitest\.setup\.(js|ts)$)
+          description: Test files, mocks, and Vitest configuration
     customInstructions: |-
       When writing tests:
       - Always use describe/it blocks for clear test organization
@@ -66,6 +68,8 @@ customModes:
       - Ensure mocks are properly typed
       - Verify both positive and negative test cases
       - Always use data-testid attributes when testing webview-ui
+      - The vitest framework is used for testing; the `describe`, `test`, `it`, etc functions are defined by default in `tsconfig.json` and therefore don't need to be imported
+      - Tests must be run from the same directory as the `package.json` file that specifies `vitest` in `devDependencies`
   - slug: design-engineer
     name: 🎨 Design Engineer
     roleDefinition: >-

packages/types/npm/package.json

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

packages/types/src/telemetry.ts

@@ -43,6 +43,8 @@ export enum TelemetryEventName {
 
 	MARKETPLACE_ITEM_INSTALLED = "Marketplace Item Installed",
 	MARKETPLACE_ITEM_REMOVED = "Marketplace Item Removed",
+	MARKETPLACE_TAB_VIEWED = "Marketplace Tab Viewed",
+	MARKETPLACE_INSTALL_BUTTON_CLICKED = "Marketplace Install Button Clicked",
 
 	SCHEMA_VALIDATION_ERROR = "Schema Validation Error",
 	DIFF_APPLICATION_ERROR = "Diff Application Error",

src/core/environment/__tests__/getEnvironmentDetails.spec.ts

@@ -59,6 +59,7 @@ describe("getEnvironmentDetails", () => {
 		getLastCommand: Mock
 		getProcessesWithOutput: Mock
 		cleanCompletedProcessQueue?: Mock
+		getCurrentWorkingDirectory: Mock
 	}
 
 	let mockCline: Partial<Task>
@@ -208,6 +209,7 @@ describe("getEnvironmentDetails", () => {
 			id: "terminal-1",
 			getLastCommand: vi.fn().mockReturnValue("npm test"),
 			getProcessesWithOutput: vi.fn().mockReturnValue([]),
+			getCurrentWorkingDirectory: vi.fn().mockReturnValue("/test/path/src"),
 		} as MockTerminal
 
 		;(TerminalRegistry.getTerminals as Mock).mockReturnValue([mockActiveTerminal])
@@ -216,7 +218,9 @@ describe("getEnvironmentDetails", () => {
 		const result = await getEnvironmentDetails(mockCline as Task)
 
 		expect(result).toContain("# Actively Running Terminals")
-		expect(result).toContain("Original command: `npm test`")
+		expect(result).toContain("## Terminal terminal-1 (Active)")
+		expect(result).toContain("### Working Directory: `/test/path/src`")
+		expect(result).toContain("### Original command: `npm test`")
 		expect(result).toContain("Test output")
 
 		mockCline.didEditFile = true
@@ -234,8 +238,10 @@ describe("getEnvironmentDetails", () => {
 
 		const mockInactiveTerminal = {
 			id: "terminal-2",
+			getLastCommand: vi.fn().mockReturnValue("npm build"),
 			getProcessesWithOutput: vi.fn().mockReturnValue([mockProcess]),
 			cleanCompletedProcessQueue: vi.fn(),
+			getCurrentWorkingDirectory: vi.fn().mockReturnValue("/test/path/build"),
 		} as MockTerminal
 
 		;(TerminalRegistry.getTerminals as Mock).mockImplementation((active: boolean) =>
@@ -245,13 +251,56 @@ describe("getEnvironmentDetails", () => {
 		const result = await getEnvironmentDetails(mockCline as Task)
 
 		expect(result).toContain("# Inactive Terminals with Completed Process Output")
-		expect(result).toContain("Terminal terminal-2")
+		expect(result).toContain("## Terminal terminal-2 (Inactive)")
+		expect(result).toContain("### Working Directory: `/test/path/build`")
 		expect(result).toContain("Command: `npm build`")
 		expect(result).toContain("Build output")
 
 		expect(mockInactiveTerminal.cleanCompletedProcessQueue).toHaveBeenCalled()
 	})
 
+	it("should include working directory for terminals", async () => {
+		const mockActiveTerminal = {
+			id: "terminal-1",
+			getLastCommand: vi.fn().mockReturnValue("cd /some/path && npm start"),
+			getProcessesWithOutput: vi.fn().mockReturnValue([]),
+			getCurrentWorkingDirectory: vi.fn().mockReturnValue("/some/path"),
+		} as MockTerminal
+
+		const mockProcess = {
+			command: "npm test",
+			getUnretrievedOutput: vi.fn().mockReturnValue("Test completed"),
+		}
+
+		const mockInactiveTerminal = {
+			id: "terminal-2",
+			getLastCommand: vi.fn().mockReturnValue("npm test"),
+			getProcessesWithOutput: vi.fn().mockReturnValue([mockProcess]),
+			cleanCompletedProcessQueue: vi.fn(),
+			getCurrentWorkingDirectory: vi.fn().mockReturnValue("/another/path"),
+		} as MockTerminal
+
+		;(TerminalRegistry.getTerminals as Mock).mockImplementation((active: boolean) =>
+			active ? [mockActiveTerminal] : [mockInactiveTerminal],
+		)
+		;(TerminalRegistry.getUnretrievedOutput as Mock).mockReturnValue("Server started")
+
+		const result = await getEnvironmentDetails(mockCline as Task)
+
+		// Check active terminal working directory
+		expect(result).toContain("## Terminal terminal-1 (Active)")
+		expect(result).toContain("### Working Directory: `/some/path`")
+		expect(result).toContain("### Original command: `cd /some/path && npm start`")
+
+		// Check inactive terminal working directory
+		expect(result).toContain("## Terminal terminal-2 (Inactive)")
+		expect(result).toContain("### Working Directory: `/another/path`")
+
+		// Verify the methods were called
+		expect(mockActiveTerminal.getCurrentWorkingDirectory).toHaveBeenCalled()
+		expect(mockInactiveTerminal.getCurrentWorkingDirectory).toHaveBeenCalled()
+	})
+
 	it("should include warning when file writing is not allowed", async () => {
 		;(isToolAllowedForMode as Mock).mockReturnValue(false)
 		;(getModeBySlug as Mock).mockImplementation((slug: string) => {
@@ -310,6 +359,7 @@ describe("getEnvironmentDetails", () => {
 			id: "terminal-1",
 			getLastCommand: vi.fn().mockReturnValue("npm test"),
 			getProcessesWithOutput: vi.fn().mockReturnValue([]),
+			getCurrentWorkingDirectory: vi.fn().mockReturnValue("/test/path"),
 		} as MockTerminal
 
 		;(TerminalRegistry.getTerminals as Mock).mockReturnValue([mockErrorTerminal])

src/core/environment/getEnvironmentDetails.ts

@@ -103,7 +103,10 @@ export async function getEnvironmentDetails(cline: Task, includeFileDetails: boo
 		terminalDetails += "\n\n# Actively Running Terminals"
 
 		for (const busyTerminal of busyTerminals) {
-			terminalDetails += `\n## Original command: \`${busyTerminal.getLastCommand()}\``
+			const cwd = busyTerminal.getCurrentWorkingDirectory()
+			terminalDetails += `\n## Terminal ${busyTerminal.id} (Active)`
+			terminalDetails += `\n### Working Directory: \`${cwd}\``
+			terminalDetails += `\n### Original command: \`${busyTerminal.getLastCommand()}\``
 			let newOutput = TerminalRegistry.getUnretrievedOutput(busyTerminal.id)
 
 			if (newOutput) {
@@ -145,7 +148,9 @@ export async function getEnvironmentDetails(cline: Task, includeFileDetails: boo
 
 			// Add this terminal's outputs to the details.
 			if (terminalOutputs.length > 0) {
-				terminalDetails += `\n## Terminal ${inactiveTerminal.id}`
+				const cwd = inactiveTerminal.getCurrentWorkingDirectory()
+				terminalDetails += `\n## Terminal ${inactiveTerminal.id} (Inactive)`
+				terminalDetails += `\n### Working Directory: \`${cwd}\``
 				terminalOutputs.forEach((output) => {
 					terminalDetails += `\n### New Output\n${output}`
 				})

webview-ui/src/App.tsx

@@ -8,6 +8,7 @@ import { MarketplaceViewStateManager } from "./components/marketplace/Marketplac
 
 import { vscode } from "./utils/vscode"
 import { telemetryClient } from "./utils/TelemetryClient"
+import { TelemetryEventName } from "@roo-code/types"
 import { ExtensionStateContextProvider, useExtensionState } from "./context/ExtensionStateContext"
 import ChatView, { ChatViewRef } from "./components/chat/ChatView"
 import HistoryView from "./components/history/HistoryView"
@@ -144,6 +145,13 @@ const App = () => {
 	// Tell the extension that we are ready to receive messages.
 	useEffect(() => vscode.postMessage({ type: "webviewDidLaunch" }), [])
 
+	// Track marketplace tab views
+	useEffect(() => {
+		if (tab === "marketplace" && experiments.marketplace) {
+			telemetryClient.capture(TelemetryEventName.MARKETPLACE_TAB_VIEWED)
+		}
+	}, [tab, experiments.marketplace])
+
 	if (!didHydrateState) {
 		return null
 	}

webview-ui/src/components/marketplace/components/MarketplaceItemCard.tsx

@@ -1,6 +1,7 @@
 import React, { useMemo, useState } from "react"
-import { MarketplaceItem } from "@roo-code/types"
+import { MarketplaceItem, TelemetryEventName } from "@roo-code/types"
 import { vscode } from "@/utils/vscode"
+import { telemetryClient } from "@/utils/TelemetryClient"
 import { ViewState } from "../MarketplaceViewStateManager"
 import { useAppTranslation } from "@/i18n/TranslationContext"
 import { isValidUrl } from "../../../utils/url"
@@ -43,6 +44,13 @@ export const MarketplaceItemCard: React.FC<MarketplaceItemCardProps> = ({ item,
 	const isInstalled = isInstalledGlobally || isInstalledInProject
 
 	const handleInstallClick = () => {
+		// Send telemetry for install button click
+		telemetryClient.capture(TelemetryEventName.MARKETPLACE_INSTALL_BUTTON_CLICKED, {
+			itemId: item.id,
+			itemType: item.type,
+			itemName: item.name,
+		})
+
 		// Show modal for all item types (MCP and modes)
 		setShowInstallModal(true)
 	}