More progress

Author: cte

benchmark/.gitignore

@@ -37,6 +37,3 @@ yarn-error.log*
 # Misc
 .DS_Store
 *.pem
-
-# Roo-Code-Benchmark
-exercises

benchmark/apps/cli/src/index.ts

@@ -9,9 +9,9 @@ import { runTests } from "@vscode/test-electron"
 import { type Language, languages, type Run, findRun, createRun, getTask } from "@benchmark/db"
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
-const extensionDevelopmentPath = path.resolve(__dirname, "../../../..")
+const extensionDevelopmentPath = path.resolve(__dirname, "..", "..", "..", "..")
 const extensionTestsPath = path.resolve(extensionDevelopmentPath, "benchmark/packages/runner/dist")
-const exercisesPath = path.resolve(extensionDevelopmentPath, "benchmark/exercises")
+const exercisesPath = path.resolve(extensionDevelopmentPath, "..", "exercises")
 
 export const isLanguage = (language: string): language is Language => languages.includes(language as Language)
 
@@ -87,10 +87,12 @@ const runExercise = async ({ run, language, exercise }: { run: Run; language: La
 		extensionTestsPath,
 		launchArgs: [workspacePath, "--disable-extensions"],
 		extensionTestsEnv: {
+			RUN_ID: run.id.toString(),
+			LANGUAGE: language,
+			EXERCISE: exercise,
 			PROMPT_PATH: promptPath,
 			WORKSPACE_PATH: workspacePath,
 			OPENROUTER_MODEL_ID: run.model,
-			RUN_ID: run.id.toString(),
 		},
 	})
 

benchmark/apps/web/package.json

@@ -5,9 +5,9 @@
 		"lint": "next lint",
 		"check-types": "tsc -b",
 		"dev": "dotenvx run -f ../../.env -- next dev --turbopack",
+		"format": "prettier --write src",
 		"build": "echo 'NOP' || next build",
-		"start": "next start",
-		"format": "prettier --write src"
+		"start": "next start"
 	},
 	"dependencies": {
 		"@benchmark/db": "workspace:^",

benchmark/packages/db/package.json

@@ -12,6 +12,7 @@
 		"lint": "eslint src --ext ts --max-warnings=0",
 		"check-types": "tsc --noEmit",
 		"format": "prettier --write src",
+		"build": "tsup",
 		"drizzle-kit": "dotenvx run -f ../../.env -- tsx node_modules/drizzle-kit/bin.cjs",
 		"db:generate": "pnpm drizzle-kit generate",
 		"db:migrate": "pnpm drizzle-kit migrate",
@@ -25,7 +26,6 @@
 		"@libsql/client": "^0.14.0",
 		"drizzle-orm": "^0.40.0",
 		"drizzle-zod": "^0.7.0",
-		"libsql": "^0.5.1",
 		"zod": "^3.24.2"
 	},
 	"devDependencies": {

benchmark/packages/db/src/queries/tasks.ts

@@ -34,7 +34,13 @@ export const createTask = async (args: InsertTask) => {
 	return task
 }
 
-export const getTask = async ({ runId, language, exercise }: { runId: number; language: Language; exercise: string }) =>
+type GetTask = {
+	runId: number
+	language: Language
+	exercise: string
+}
+
+export const getTask = async ({ runId, language, exercise }: GetTask) =>
 	db.query.tasks.findFirst({
 		where: and(eq(tasks.runId, runId), eq(tasks.language, language), eq(tasks.exercise, exercise)),
 	})

benchmark/packages/db/tsconfig.cjs.json

@@ -0,0 +1,8 @@
+{
+	"extends": "@benchmark/typescript-config/cjs.json",
+	"compilerOptions": {
+		"outDir": "dist"
+	},
+	"include": ["src"],
+	"exclude": ["node_modules"]
+}

benchmark/packages/db/tsup.config.ts

@@ -0,0 +1,11 @@
+import { defineConfig } from "tsup"
+
+export default defineConfig({
+	entry: ["src/index.ts"],
+	format: ["cjs"],
+	dts: true,
+	sourcemap: true,
+	clean: true,
+	outExtension: ({ format }) => ({ js: format === "cjs" ? ".cjs" : ".js" }),
+	tsconfig: "tsconfig.cjs.json",
+})

benchmark/packages/ipc/package.json

@@ -12,9 +12,7 @@
 		"lint": "eslint src --ext ts --max-warnings=0",
 		"check-types": "tsc --noEmit",
 		"format": "prettier --write src",
-		"build": "tsup",
-		"test:server": "tsx scripts/server.ts",
-		"test:client": "tsx scripts/client.ts"
+		"build": "tsup"
 	},
 	"dependencies": {
 		"node-ipc": "^12.0.0",

benchmark/packages/ipc/src/ipcServer.ts

@@ -1,18 +1,25 @@
 import { Socket } from "node:net"
 import * as crypto from "node:crypto"
+import EventEmitter from "node:events"
 
 import ipc from "node-ipc"
 
 import { ClientMessageType, ServerMessage, ServerMessageType, clientMessageSchema } from "./types.js"
 
-export class IpcServer {
+type IpcServerEvents = {
+	client: [id: string]
+}
+
+export class IpcServer extends EventEmitter<IpcServerEvents> {
 	private readonly _socketPath: string
 	private readonly _log: (...args: unknown[]) => void
 	private readonly _clients: Map<string, Socket>
 
 	private _isListening = false
 
 	constructor(socketPath: string, log = console.log) {
+		super()
+
 		this._socketPath = socketPath
 		this._log = log
 		this._clients = new Map()
@@ -37,6 +44,7 @@ export class IpcServer {
 		this._clients.set(clientId, socket)
 		this.log(`[server#onConnect] clientId = ${clientId}, # clients = ${this._clients.size}`)
 		this.send(socket, { type: ServerMessageType.Hello, data: { clientId } })
+		this.emit("client", clientId)
 	}
 
 	private onMessage(data: unknown, socket: Socket) {
@@ -88,9 +96,18 @@ export class IpcServer {
 		ipc.server.broadcast("message", message)
 	}
 
-	public send(socket: Socket, message: ServerMessage) {
+	public send(client: string | Socket, message: ServerMessage) {
 		this.log("[server#send] message =", message)
-		ipc.server.emit(socket, "message", message)
+
+		if (typeof client === "string") {
+			const socket = this._clients.get(client)
+
+			if (socket) {
+				ipc.server.emit(socket, "message", message)
+			}
+		} else {
+			ipc.server.emit(client, "message", message)
+		}
 	}
 
 	public get socketPath() {

benchmark/packages/ipc/tsup.config.ts

@@ -8,5 +8,5 @@ export default defineConfig({
 	clean: true,
 	outExtension: ({ format }) => ({ js: format === "cjs" ? ".cjs" : ".js" }),
 	tsconfig: "tsconfig.cjs.json",
-	noExternal: ["node-ipc", "zod"],
+	noExternal: ["node-ipc"],
 })