Merge pull request #3 from ffp5/update_kilocode_last_commits

Update to the lastest Kilocode commit

Author: ffp5

.dockerignore

@@ -1,18 +1,91 @@
-# Build artifacts
+# git
+.git
+
+# build artifacts
 bin/
-!bin/roo-code-latest.vsix
 dist/
 **/dist/
 out/
 **/out/
+src/webview-ui/
 
-# Dependencies
+# dependencies
 node_modules/
 **/node_modules/
 
-# Test and development files
+# testing
 coverage/
 **/.vscode-test/
+**/mock/
 
+# devtools
 knip.json
 .husky/
+
+# monorepo
+.turbo/
+**/.turbo/
+
+# next.js
+**/.next/
+.vercel
+
+# Ignore common development files
+node_modules
+.git
+.gitignore
+.dockerignore
+.env*
+.vscode
+.idea
+
+# Ignore build artifacts
+dist
+build
+*.log
+*.tmp
+.cache
+coverage
+
+# Ignore OS files
+.DS_Store
+Thumbs.db
+
+# Ignore test files
+__tests__
+*.test.js
+*.spec.js
+*.test.ts
+*.spec.ts
+
+# Ignore development config files
+.eslintrc*
+.prettierrc*
+jest.config*
+
+# Ignore most directories except what we need for the build
+apps/
+evals/
+webview-ui/node_modules
+src/node_modules
+
+# Keep essential files for the build
+!README.md
+!CHANGELOG.md
+!package.json
+!pnpm-lock.yaml
+!pnpm-workspace.yaml
+!scripts/bootstrap.mjs
+!apps/web-evals/
+!src/
+!webview-ui/
+!packages/evals/.docker/entrypoints/runner.sh
+!packages/build/
+!packages/cloud/
+!packages/config-eslint/
+!packages/config-typescript/
+!packages/evals/
+!packages/ipc/
+!packages/telemetry/
+!packages/types/
+!locales/

.gitignore

@@ -42,3 +42,4 @@ logs
 # IntelliJ and Qodo plugin folders
 .idea/
 .qodo/
+.vercel

.vscode/extensions.json

@@ -6,6 +6,7 @@
 		"esbenp.prettier-vscode",
 		"csstools.postcss",
 		"bradlc.vscode-tailwindcss",
-		"connor4312.esbuild-problem-matchers"
+		"connor4312.esbuild-problem-matchers",
+		"yoavbls.pretty-ts-errors"
 	]
 }

CHANGELOG.md

@@ -1,5 +1,11 @@
 # kilo-code
 
+## [v4.34.0]
+
+### Minor Changes
+
+- [#636](https://github.com/Kilo-Org/kilocode/pull/636) [`6193029`](https://github.com/Kilo-Org/kilocode/commit/6193029fb1d5e5ec09dd57acb9547179ff01c2b1) Thanks [@kevinvandijk](https://github.com/kevinvandijk)! - Include changes from Roo Code v3.19.4
+
 ## [v4.33.2]
 
 ### Patch Changes

MONOREPO.md

@@ -34,9 +34,40 @@ To fully stress the monorepo setup, run the following:
 pnpm clean && pnpm lint
 pnpm clean && pnpm check-types
 pnpm clean && pnpm test
-pnpm clean && pnpm bundle
 pnpm clean && pnpm build
+pnpm clean && pnpm bundle
+pnpm clean && pnpm bundle:nightly
+
 pnpm clean && pnpm npx turbo watch:bundle
 pnpm clean && pnpm npx turbo watch:tsc
-cd apps/vscode-e2e && pnpm test:ci
+
+pnpm --filter @roo-code/vscode-e2e test:ci
+
+pnpm clean && \
+  pnpm vsix -- --out ../bin/roo-code.vsix && \
+  code --install-extension bin/roo-code.vsix
+
+pnpm clean && \
+  pnpm vsix:nightly -- --out ../../../bin/roo-code-nightly.vsix && \
+  code --install-extension bin/roo-code-nightly.vsix
 ```
+
+### Turborepo
+
+Note that this excludes the `build` task for next.js apps (@roo-code/web-\*).
+
+Tasks: `build` -> `bundle` -> `vsix`
+
+build:
+
+- `@roo-code/build` [input: src, package.json, tsconfig.json | output: dist]
+- `@roo-code/types` [input: src, package.json, tsconfig.json, tsup.config.ts | output: dist]
+- `@roo-code/webview-ui` [input: src, package.json, tsconfig.json, vite.config.ts | output: ../src/webview-ui]
+
+bundle:
+
+- `roo-cline` [input: * | output: dist]
+
+vsix:
+
+- `roo-cline` [input: dist | output: bin]

apps/vscode-nightly/esbuild.mjs

@@ -48,10 +48,9 @@ async function main() {
 	console.log(`[${name}] buildDir: ${buildDir}`)
 	console.log(`[${name}] distDir: ${distDir}`)
 
-	// Clean build directory before starting new build
-	if (fs.existsSync(buildDir)) {
-		console.log(`[${name}] Cleaning build directory: ${buildDir}`)
-		fs.rmSync(buildDir, { recursive: true, force: true })
+	if (fs.existsSync(distDir)) {
+		console.log(`[${name}] Cleaning dist directory: ${distDir}`)
+		fs.rmSync(distDir, { recursive: true, force: true })
 	}
 
 	/**

apps/vscode-nightly/turbo.json

@@ -0,0 +1,15 @@
+{
+	"$schema": "https://turbo.build/schema.json",
+	"extends": ["//"],
+	"tasks": {
+		"bundle:nightly": {
+			"dependsOn": ["^build", "@roo-code/vscode-webview#build:nightly"],
+			"outputs": ["build/**"]
+		},
+		"vsix:nightly": {
+			"dependsOn": ["bundle:nightly"],
+			"inputs": ["build/**"],
+			"outputs": ["../../../bin/**"]
+		}
+	}
+}

evals/apps/web/public/.gitkeep renamed to apps/web-docs/.gitkeep

@@ -0,0 +1 @@
+TODO

apps/web-docs/README.md

@@ -0,0 +1 @@
+DATABASE_URL=postgres://postgres:password@localhost:5432/evals_development

apps/web-evals/.env

@@ -0,0 +1,8 @@
+# .env
+!.env
+
+# next.js
+.next
+
+# typescript
+tsconfig.tsbuildinfo

apps/web-evals/.gitignore

@@ -1,4 +1,4 @@
-import { nextJsConfig } from "@evals/eslint-config/next-js"
+import { nextJsConfig } from "@roo-code/config-eslint/next-js"
 
 /** @type {import("eslint").Linter.Config} */
 export default [

evals/apps/web/components.json renamed to apps/web-evals/components.json

@@ -0,0 +1,5 @@
+/// <reference types="next" />
+/// <reference types="next/image-types/global" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

evals/apps/web/eslint.config.mjs renamed to apps/web-evals/eslint.config.mjs

@@ -0,0 +1,10 @@
+import type { NextConfig } from "next"
+
+const nextConfig: NextConfig = {
+	webpack: (config) => {
+		config.resolve.extensionAlias = { ".js": [".ts", ".tsx", ".js", ".jsx"] }
+		return config
+	},
+}
+
+export default nextConfig

apps/web-evals/next-env.d.ts

@@ -1,18 +1,16 @@
 {
-	"name": "@evals/web",
-	"private": true,
+	"name": "@roo-code/web-evals",
+	"version": "0.0.0",
+	"type": "module",
 	"scripts": {
 		"lint": "next lint",
 		"check-types": "tsc -b",
-		"dev": "dotenvx run -f ../../.env -- next dev --turbopack",
+		"dev": "scripts/check-services.sh && next dev --turbopack",
 		"format": "prettier --write src",
 		"build": "next build",
 		"start": "next start"
 	},
 	"dependencies": {
-		"@evals/db": "workspace:^",
-		"@evals/ipc": "workspace:^",
-		"@evals/types": "workspace:^",
 		"@hookform/resolvers": "^4.1.3",
 		"@radix-ui/react-alert-dialog": "^1.1.7",
 		"@radix-ui/react-dialog": "^1.1.6",
@@ -26,33 +24,36 @@
 		"@radix-ui/react-slot": "^1.1.2",
 		"@radix-ui/react-tabs": "^1.1.3",
 		"@radix-ui/react-tooltip": "^1.1.8",
+		"@roo-code/evals": "workspace:^",
+		"@roo-code/types": "workspace:^",
 		"@tanstack/react-query": "^5.69.0",
 		"class-variance-authority": "^0.7.1",
 		"clsx": "^2.1.1",
 		"cmdk": "^1.1.0",
 		"fuzzysort": "^3.1.0",
-		"lucide-react": "^0.511.0",
-		"next": "15.3.3",
+		"lucide-react": "^0.513.0",
+		"next": "^15.2.5",
 		"next-themes": "^0.4.6",
 		"p-map": "^7.0.3",
-		"ps-tree": "^1.2.0",
-		"react": "^19.0.0",
-		"react-dom": "^19.0.0",
-		"react-hook-form": "^7.54.2",
+		"react": "^18.3.1",
+		"react-dom": "^18.3.1",
+		"react-hook-form": "^7.57.0",
 		"react-use": "^17.6.0",
-		"sonner": "^2.0.2",
-		"tailwind-merge": "^3.0.2",
+		"redis": "^5.5.5",
+		"sonner": "^2.0.5",
+		"tailwind-merge": "^3.3.0",
 		"tailwindcss-animate": "^1.0.7",
 		"vaul": "^1.1.2",
 		"zod": "^3.24.2"
 	},
 	"devDependencies": {
-		"@evals/eslint-config": "workspace:^",
-		"@evals/typescript-config": "workspace:^",
+		"@roo-code/config-eslint": "workspace:^",
+		"@roo-code/config-typescript": "workspace:^",
 		"@tailwindcss/postcss": "^4",
 		"@types/ps-tree": "^1.1.6",
-		"@types/react": "^19",
-		"@types/react-dom": "^19",
-		"tailwindcss": "^4"
+		"@types/react": "^18.3.23",
+		"@types/react-dom": "^18.3.5",
+		"tailwindcss": "^4",
+		"vitest": "^3.2.1"
 	}
 }

apps/web-evals/next.config.ts

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+if ! docker info &> /dev/null; then
+  echo "❌ Docker is not running. Please start Docker Desktop and try again."
+  exit 1
+fi
+
+if ! nc -z localhost 5432 2>/dev/null; then
+  echo "❌ PostgreSQL is not running on port 5432"
+  echo "💡 Start it with: pnpm --filter @roo-code/evals db:start"
+  exit 1
+fi
+
+if ! nc -z localhost 6379 2>/dev/null; then
+  echo "❌ Redis is not running on port 6379"
+  echo "💡 Start it with: pnpm --filter @roo-code/evals redis:start"
+  exit 1
+fi
+
+echo "✅ All required services are running"

evals/apps/web/package.json renamed to apps/web-evals/package.json

@@ -0,0 +1,71 @@
+import type { NextRequest } from "next/server"
+
+import { taskEventSchema } from "@roo-code/types"
+import { findRun } from "@roo-code/evals"
+
+import { SSEStream } from "@/lib/server/sse-stream"
+import { redisClient } from "@/lib/server/redis"
+
+export const dynamic = "force-dynamic"
+
+export async function GET(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
+	const { id } = await params
+	const requestId = crypto.randomUUID()
+	const stream = new SSEStream()
+	const run = await findRun(Number(id))
+	const redis = await redisClient()
+
+	let isStreamClosed = false
+	const channelName = `evals:${run.id}`
+
+	const onMessage = async (data: string) => {
+		if (isStreamClosed || stream.isClosed) {
+			return
+		}
+
+		try {
+			const taskEvent = taskEventSchema.parse(JSON.parse(data))
+			// console.log(`[stream#${requestId}] task event -> ${taskEvent.eventName}`)
+			const writeSuccess = await stream.write(JSON.stringify(taskEvent))
+
+			if (!writeSuccess) {
+				await disconnect()
+			}
+		} catch (_error) {
+			console.error(`[stream#${requestId}] invalid task event:`, data)
+		}
+	}
+
+	const disconnect = async () => {
+		if (isStreamClosed) {
+			return
+		}
+
+		isStreamClosed = true
+
+		try {
+			await redis.unsubscribe(channelName)
+			console.log(`[stream#${requestId}] unsubscribed from ${channelName}`)
+		} catch (error) {
+			console.error(`[stream#${requestId}] error unsubscribing:`, error)
+		}
+
+		try {
+			await stream.close()
+		} catch (error) {
+			console.error(`[stream#${requestId}] error closing stream:`, error)
+		}
+	}
+
+	await redis.subscribe(channelName, onMessage)
+
+	request.signal.addEventListener("abort", () => {
+		console.log(`[stream#${requestId}] abort`)
+
+		disconnect().catch((error) => {
+			console.error(`[stream#${requestId}] cleanup error:`, error)
+		})
+	})
+
+	return stream.getResponse()
+}