Organize package locations

benchmark/package.json

@@ -9,7 +9,16 @@
 		"build:extension": "cd .. && npm run vscode-test",
 		"build:runner": "turbo build --filter @benchmark/runner",
 		"cli": "pnpm --filter @benchmark/cli dev",
-		"web": "pnpm --filter @benchmark/web dev"
+		"web": "pnpm --filter @benchmark/web dev",
+		"studio": "pnpm --filter @benchmark/db db:studio",
+		"docker:build": "docker build -f Dockerfile -t roo-code-benchmark ..",
+		"docker:run": "touch /tmp/benchmarks.db && docker run -d -it -p 3000:3000 -v /tmp/benchmarks.db:/tmp/benchmarks.db roo-code-benchmark",
+		"docker:start": "npm run docker:build && npm run docker:run",
+		"docker:shell": "docker exec -it $(docker ps --filter \"ancestor=roo-code-benchmark\" -q) /bin/bash",
+		"docker:cli": "docker exec -it -w /home/vscode/repo/benchmark $(docker ps --filter \"ancestor=roo-code-benchmark\" -q) xvfb-run npm run cli --",
+		"docker:stop": "docker stop $(docker ps --filter \"ancestor=roo-code-benchmark\" -q)",
+		"docker:rm": "docker rm $(docker ps -a --filter \"ancestor=roo-code-benchmark\" -q)",
+		"docker:clean": "npm run docker:stop && npm run docker:rm"
 	},
 	"devDependencies": {
 		"@dotenvx/dotenvx": "^1.39.0",

benchmark/packages/docker/package.json

@@ -1,17 +0,0 @@
-{
-	"name": "@benchmark/docker",
-	"version": "0.1.0",
-	"private": true,
-	"scripts": {
-		"docker:build": "docker build -f Dockerfile -t roo-code-benchmark ..",
-		"docker:run": "touch /tmp/benchmarks.db && docker run -d -it -p 3000:3000 -v /tmp/benchmarks.db:/tmp/benchmarks.db roo-code-benchmark",
-		"docker:start": "npm run docker:build && npm run docker:run",
-		"docker:shell": "docker exec -it $(docker ps --filter \"ancestor=roo-code-benchmark\" -q) /bin/bash",
-		"docker:cli": "docker exec -it -w /home/vscode/repo/benchmark $(docker ps --filter \"ancestor=roo-code-benchmark\" -q) xvfb-run npm run cli --",
-		"docker:stop": "docker stop $(docker ps --filter \"ancestor=roo-code-benchmark\" -q)",
-		"docker:rm": "docker rm $(docker ps -a --filter \"ancestor=roo-code-benchmark\" -q)",
-		"docker:clean": "npm run docker:stop && npm run docker:rm"
-	},
-	"devDependencies": {},
-	"dependencies": {}
-}

benchmark/pnpm-lock.yaml

@@ -42,49 +42,11 @@ importers:
         specifier: ^8.26.0
         version: 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2)
 
-  config/eslint:
-    devDependencies:
-      '@eslint/js':
-        specifier: ^9.22.0
-        version: 9.22.0
-      '@next/eslint-plugin-next':
-        specifier: ^15.2.1
-        version: 15.2.3
-      eslint:
-        specifier: ^9.22.0
-        version: 9.22.0(jiti@2.4.2)
-      eslint-config-prettier:
-        specifier: ^10.1.1
-        version: 10.1.1(eslint@9.22.0(jiti@2.4.2))
-      eslint-plugin-only-warn:
-        specifier: ^1.1.0
-        version: 1.1.0
-      eslint-plugin-react:
-        specifier: ^7.37.4
-        version: 7.37.4(eslint@9.22.0(jiti@2.4.2))
-      eslint-plugin-react-hooks:
-        specifier: ^5.2.0
-        version: 5.2.0(eslint@9.22.0(jiti@2.4.2))
-      eslint-plugin-turbo:
-        specifier: ^2.4.4
-        version: 2.4.4(eslint@9.22.0(jiti@2.4.2))(turbo@2.4.4)
-      globals:
-        specifier: ^16.0.0
-        version: 16.0.0
-      typescript:
-        specifier: ^5
-        version: 5.8.2
-      typescript-eslint:
-        specifier: ^8.26.0
-        version: 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2)
-
-  config/typescript: {}
-
-  packages/cli:
+  apps/cli:
     dependencies:
       '@benchmark/db':
         specifier: workspace:^
-        version: link:../db
+        version: link:../../packages/db
       '@vscode/test-electron':
         specifier: ^2.4.0
         version: 2.4.1
@@ -102,82 +64,14 @@ importers:
         specifier: workspace:^
         version: link:../../config/typescript
 
-  packages/db:
-    dependencies:
-      '@libsql/client':
-        specifier: ^0.14.0
-        version: 0.14.0
-      drizzle-orm:
-        specifier: ^0.40.0
-        version: 0.40.1(@libsql/client@0.14.0)(gel@2.0.1)
-      drizzle-zod:
-        specifier: ^0.7.0
-        version: 0.7.0(drizzle-orm@0.40.1(@libsql/client@0.14.0)(gel@2.0.1))(zod@3.24.2)
-      libsql:
-        specifier: ^0.5.1
-        version: 0.5.1
-      zod:
-        specifier: ^3.24.2
-        version: 3.24.2
-    devDependencies:
-      '@benchmark/eslint-config':
-        specifier: workspace:^
-        version: link:../../config/eslint
-      '@benchmark/typescript-config':
-        specifier: workspace:^
-        version: link:../../config/typescript
-      drizzle-kit:
-        specifier: ^0.30.5
-        version: 0.30.5
-
-  packages/docker: {}
-
-  packages/ipc:
-    dependencies:
-      node-ipc:
-        specifier: ^12.0.0
-        version: 12.0.0
-      zod:
-        specifier: ^3.24.2
-        version: 3.24.2
-    devDependencies:
-      '@benchmark/eslint-config':
-        specifier: workspace:^
-        version: link:../../config/eslint
-      '@benchmark/typescript-config':
-        specifier: workspace:^
-        version: link:../../config/typescript
-      '@types/node-ipc':
-        specifier: ^9.2.3
-        version: 9.2.3
-
-  packages/runner:
-    dependencies:
-      '@benchmark/ipc':
-        specifier: workspace:^
-        version: link:../ipc
-      node-ipc:
-        specifier: ^12.0.0
-        version: 12.0.0
-    devDependencies:
-      '@benchmark/eslint-config':
-        specifier: workspace:^
-        version: link:../../config/eslint
-      '@benchmark/typescript-config':
-        specifier: workspace:^
-        version: link:../../config/typescript
-      '@types/vscode':
-        specifier: ^1.98.0
-        version: 1.98.0
-
-  packages/web:
+  apps/web:
     dependencies:
       '@benchmark/db':
         specifier: workspace:^
-        version: link:../db
+        version: link:../../packages/db
       '@benchmark/ipc':
         specifier: workspace:^
-        version: link:../ipc
+        version: link:../../packages/ipc
       '@hookform/resolvers':
         specifier: ^4.1.3
         version: 4.1.3(react-hook-form@7.54.2(react@19.0.0))
@@ -246,6 +140,109 @@ importers:
         specifier: ^4
         version: 4.0.14
 
+  config/eslint:
+    devDependencies:
+      '@eslint/js':
+        specifier: ^9.22.0
+        version: 9.22.0
+      '@next/eslint-plugin-next':
+        specifier: ^15.2.1
+        version: 15.2.3
+      eslint:
+        specifier: ^9.22.0
+        version: 9.22.0(jiti@2.4.2)
+      eslint-config-prettier:
+        specifier: ^10.1.1
+        version: 10.1.1(eslint@9.22.0(jiti@2.4.2))
+      eslint-plugin-only-warn:
+        specifier: ^1.1.0
+        version: 1.1.0
+      eslint-plugin-react:
+        specifier: ^7.37.4
+        version: 7.37.4(eslint@9.22.0(jiti@2.4.2))
+      eslint-plugin-react-hooks:
+        specifier: ^5.2.0
+        version: 5.2.0(eslint@9.22.0(jiti@2.4.2))
+      eslint-plugin-turbo:
+        specifier: ^2.4.4
+        version: 2.4.4(eslint@9.22.0(jiti@2.4.2))(turbo@2.4.4)
+      globals:
+        specifier: ^16.0.0
+        version: 16.0.0
+      typescript:
+        specifier: ^5
+        version: 5.8.2
+      typescript-eslint:
+        specifier: ^8.26.0
+        version: 8.26.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2)
+
+  config/typescript: {}
+
+  packages/db:
+    dependencies:
+      '@libsql/client':
+        specifier: ^0.14.0
+        version: 0.14.0
+      drizzle-orm:
+        specifier: ^0.40.0
+        version: 0.40.1(@libsql/client@0.14.0)(gel@2.0.1)
+      drizzle-zod:
+        specifier: ^0.7.0
+        version: 0.7.0(drizzle-orm@0.40.1(@libsql/client@0.14.0)(gel@2.0.1))(zod@3.24.2)
+      libsql:
+        specifier: ^0.5.1
+        version: 0.5.1
+      zod:
+        specifier: ^3.24.2
+        version: 3.24.2
+    devDependencies:
+      '@benchmark/eslint-config':
+        specifier: workspace:^
+        version: link:../../config/eslint
+      '@benchmark/typescript-config':
+        specifier: workspace:^
+        version: link:../../config/typescript
+      drizzle-kit:
+        specifier: ^0.30.5
+        version: 0.30.5
+
+  packages/docker: {}
+
+  packages/ipc:
+    dependencies:
+      node-ipc:
+        specifier: ^12.0.0
+        version: 12.0.0
+      zod:
+        specifier: ^3.24.2
+        version: 3.24.2
+    devDependencies:
+      '@benchmark/eslint-config':
+        specifier: workspace:^
+        version: link:../../config/eslint
+      '@benchmark/typescript-config':
+        specifier: workspace:^
+        version: link:../../config/typescript
+      '@types/node-ipc':
+        specifier: ^9.2.3
+        version: 9.2.3
+
+  packages/runner:
+    dependencies:
+      '@benchmark/ipc':
+        specifier: workspace:^
+        version: link:../ipc
+    devDependencies:
+      '@benchmark/eslint-config':
+        specifier: workspace:^
+        version: link:../../config/eslint
+      '@benchmark/typescript-config':
+        specifier: workspace:^
+        version: link:../../config/typescript
+      '@types/vscode':
+        specifier: ^1.98.0
+        version: 1.98.0
+
 packages:
 
   '@alloc/quick-lru@5.2.0':
@@ -5503,7 +5500,7 @@ snapshots:
 
   execa@5.1.1:
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       get-stream: 6.0.1
       human-signals: 2.1.0
       is-stream: 2.0.1

benchmark/pnpm-workspace.yaml

@@ -1,3 +1,4 @@
 packages:
-    - "packages/*"
     - "config/*"
+    - "apps/*"
+    - "packages/*"