It's working

Author: cte

benchmark/Dockerfile

@@ -54,10 +54,6 @@ RUN /home/vscode/.local/bin/uv sync
 
 WORKDIR /home/vscode/repo/benchmark
 
-# Copy & install extension
-COPY --chown=vscode:vscode ./bin/roo-code-latest.vsix ./
-RUN code --debug --install-extension ./roo-code-latest.vsix
-
 # Install dependencies
 COPY --chown=vscode:vscode ./benchmark/package.json ./benchmark/pnpm-lock.yaml ./benchmark/pnpm-workspace.yaml ./benchmark/.npmrc ./
 RUN mkdir -p apps/cli apps/web \
@@ -73,6 +69,10 @@ COPY --chown=vscode:vscode ./benchmark/packages/lib/package.json      ./packages
 COPY --chown=vscode:vscode ./benchmark/packages/types/package.json    ./packages/types/
 RUN pnpm install
 
+# Copy & install extension
+COPY --chown=vscode:vscode ./bin/roo-code-latest.vsix ./
+RUN code --debug --install-extension ./roo-code-latest.vsix
+
 # Copy application code
 COPY --chown=vscode:vscode ./benchmark ./
 

benchmark/README.md

@@ -29,6 +29,7 @@ Build the Roo Code extension:
 ```sh
 npm run install:all
 npx vsce package --out bin/roo-code-latest.vsix
+code --install-extension bin/roo-code-latest.vsix
 ```
 
 [Install](https://docs.docker.com/desktop/) and run Docker Desktop.

benchmark/apps/cli/src/index.ts

@@ -34,7 +34,7 @@ import { __dirname, extensionDevelopmentPath, exercisesPath } from "./paths.js"
 import { getExercises } from "./exercises.js"
 
 const maxConcurrency = 2
-const taskTimeLimit = 2 * 60 * 1_000
+const taskTimeLimit = 5 * 60 * 1_000
 
 const testCommands: Record<ExerciseLanguage, { commands: string[]; timeout?: number; cwd?: string }> = {
 	cpp: { commands: ["cmake -G 'Unix\\ Makefiles' -DEXERCISM_RUN_ALL_TESTS=1 ..", "make"], cwd: "build" }, // timeout 15s bash -c "cd '$dir' && mkdir -p build && cd build && cmake -G 'Unix Makefiles' -DEXERCISM_RUN_ALL_TESTS=1 .. >/dev/null 2>&1 && make >/dev/null 2>&1"
@@ -94,8 +94,8 @@ const run = async (toolbox: GluegunToolbox) => {
 		throw new Error("No tasks found.")
 	}
 
-	console.log(await execa({ cwd: exercisesPath })`git config --global user.name "Roo Code"`)
-	console.log(await execa({ cwd: exercisesPath })`git config --global user.email "[email protected]"`)
+	console.log(await execa({ cwd: exercisesPath })`git config user.name "Roo Code"`)
+	console.log(await execa({ cwd: exercisesPath })`git config user.email "[email protected]"`)
 	console.log(await execa({ cwd: exercisesPath })`git checkout -f`)
 	console.log(await execa({ cwd: exercisesPath })`git clean -fd`)
 	console.log(await execa({ cwd: exercisesPath })`git checkout -b runs/${run.id} main`)
@@ -170,11 +170,12 @@ const runExercise = async ({ run, task, server }: { run: Run; task: Task; server
 	const cancelSignal = controller.signal
 
 	// If debugging:
-	// Use --log trace or --verbose.
-	let codeCommand = `code --wait --log trace --disable-workspace-trust`
+	// Use --wait --log trace or --verbose.
+	let codeCommand = `code --disable-workspace-trust`
+	const isDocker = fs.existsSync("/.dockerenv")
 
-	if (fs.existsSync("/.dockerenv")) {
-		codeCommand = `xvfb-run --auto-servernum --server-num=1 ${codeCommand} --disable-gpu --password-store="basic"`
+	if (isDocker) {
+		codeCommand = `xvfb-run --auto-servernum --server-num=1 ${codeCommand} --wait --log trace --disable-gpu --password-store="basic"`
 	}
 
 	const subprocess = execa({
@@ -189,7 +190,7 @@ const runExercise = async ({ run, task, server }: { run: Run; task: Task; server
 	// subprocess.stdout.pipe(process.stdout)
 
 	// Give VSCode some time to spawn before connectint to its unix socket.
-	await new Promise((resolve) => setTimeout(resolve, 2_000))
+	await new Promise((resolve) => setTimeout(resolve, isDocker ? 5_000 : 1_000))
 	console.log(`Connecting to ${taskSocketPath} (pid: ${subprocess.pid})`)
 
 	const createClient = (taskSocketPath: string) => {
@@ -207,7 +208,7 @@ const runExercise = async ({ run, task, server }: { run: Run; task: Task; server
 
 	while (++tries < 5) {
 		try {
-			await pWaitFor(() => client.isReady, { interval: 100, timeout: 2_000 })
+			await pWaitFor(() => client.isReady, { interval: 100, timeout: 5_000 })
 			break
 		} catch (error) {
 			console.error(error)
@@ -227,8 +228,8 @@ const runExercise = async ({ run, task, server }: { run: Run; task: Task; server
 
 	const ignoreEvents: RooCodeEventName[] = [
 		RooCodeEventName.Message,
-		RooCodeEventName.TaskTokenUsageUpdated,
-		RooCodeEventName.TaskAskResponded,
+		// RooCodeEventName.TaskTokenUsageUpdated,
+		// RooCodeEventName.TaskAskResponded,
 	]
 
 	let taskStartedAt = Date.now()

benchmark/packages/types/src/roo-code-defaults.ts

@@ -41,7 +41,7 @@ export const rooCodeDefaults: RooCodeSettings = {
 	maxReadFileLine: 500,
 
 	terminalOutputLineLimit: 500,
-	terminalShellIntegrationTimeout: 5000,
+	terminalShellIntegrationTimeout: 15000,
 
 	rateLimitSeconds: 0,
 	diffEnabled: true,

src/integrations/terminal/Terminal.ts

@@ -3,7 +3,7 @@ import pWaitFor from "p-wait-for"
 import { ExitCodeDetails, mergePromise, TerminalProcess, TerminalProcessResultPromise } from "./TerminalProcess"
 import { truncateOutput, applyRunLengthEncoding } from "../misc/extract-text"
 
-export const TERMINAL_SHELL_INTEGRATION_TIMEOUT = 5000
+export const TERMINAL_SHELL_INTEGRATION_TIMEOUT = 15_000
 
 export class Terminal {
 	private static shellIntegrationTimeout: number = TERMINAL_SHELL_INTEGRATION_TIMEOUT
@@ -186,7 +186,7 @@ export class Terminal {
 					console.log(`[Terminal ${this.id}] Shell integration not available. Command execution aborted.`)
 					process.emit(
 						"no_shell_integration",
-						"Shell integration initialization sequence '\\x1b]633;A' was not received within 4 seconds. Shell integration has been disabled for this terminal instance. Increase the timeout in the settings if necessary.",
+						`Shell integration initialization sequence '\\x1b]633;A' was not received within ${Terminal.shellIntegrationTimeout / 1000}s. Shell integration has been disabled for this terminal instance. Increase the timeout in the settings if necessary.`,
 					)
 				})
 		})