Fix git permissions issues

Author: cte

apps/roomote/Dockerfile.worker

@@ -1,4 +1,5 @@
 # docker compose build worker
+# Note: Requires $GH_TOKEN to be set as build argument.
 
 FROM roomote-base AS base
 
@@ -25,7 +26,20 @@ RUN mkdir -p /roo/.vscode \
   && code --no-sandbox --user-data-dir /roo/.vscode --install-extension csstools.postcss \
   && code --no-sandbox --user-data-dir /roo/.vscode --install-extension RooVeterinaryInc.roo-cline
 
+# Clone repo (requires $GH_TOKEN)
+ARG GH_TOKEN
+ENV GH_TOKEN=${GH_TOKEN}
+WORKDIR /roo/repos
+RUN git config --global user.email "[email protected]"
+RUN git config --global user.name "Roo Code"
+RUN git config --global credential.helper store
+RUN echo "https://oauth2:${GH_TOKEN}@github.com" > ~/.git-credentials
+RUN gh repo clone RooCodeInc/Roo-Code
+WORKDIR /roo/repos/Roo-Code
+RUN pnpm install
+
 # Install dependencies
+WORKDIR /roo
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 COPY packages/config-eslint/package.json ./packages/config-eslint/
 COPY packages/config-typescript/package.json ./packages/config-typescript/
@@ -42,14 +56,6 @@ COPY packages/config-typescript ./packages/config-typescript/
 COPY packages/types ./packages/types/
 COPY packages/ipc ./packages/ipc/
 
-# Clone repo (requires $GH_TOKEN)
-ARG GH_TOKEN
-ENV GH_TOKEN=${GH_TOKEN}
-WORKDIR /roo/repos
-RUN gh repo clone RooCodeInc/Roo-Code
-WORKDIR /roo/repos/Roo-Code
-RUN pnpm install
-
 WORKDIR /roo/apps/roomote
 ENV NODE_ENV=production
 CMD ["pnpm", "worker"]

apps/roomote/docker-compose.yml

@@ -78,10 +78,10 @@ services:
         env_file:
             - .env
         environment:
+            - HOST_EXECUTION_METHOD=docker
             - DATABASE_URL=postgresql://postgres:password@db:5432/cloud_agents
             - REDIS_URL=redis://redis:6379
             - NODE_ENV=production
-            - HOST_EXECUTION_METHOD=docker
         volumes:
             - /var/run/docker.sock:/var/run/docker.sock
             - /tmp/roomote:/var/log/roomote

apps/roomote/src/lib/controller.ts

@@ -103,28 +103,28 @@ export class WorkerController {
 				stdio: ["ignore", "pipe", "pipe"],
 			})
 
-			const logStream = fs.createWriteStream("/tmp/roomote-worker.log", { flags: "a" })
-
 			if (childProcess.stdout) {
-				childProcess.stdout.pipe(logStream)
+				childProcess.stdout.on("data", (data) => {
+					console.log(data.toString())
+				})
 			}
 
 			if (childProcess.stderr) {
-				childProcess.stderr.pipe(logStream)
+				childProcess.stderr.on("data", (data) => {
+					console.error(data.toString())
+				})
 			}
 
 			this.activeWorkers.add(workerId)
 
 			childProcess.on("exit", (code) => {
 				console.log(`Worker ${workerId} exited with code ${code}`)
 				this.activeWorkers.delete(workerId)
-				logStream.end()
 			})
 
 			childProcess.on("error", (error) => {
 				console.error(`Worker ${workerId} error:`, error)
 				this.activeWorkers.delete(workerId)
-				logStream.end()
 			})
 
 			// Detach the process so it can run independently.

apps/roomote/src/lib/jobs/fixGitHubIssue.ts

@@ -28,10 +28,10 @@ ${jobPayload.labels && jobPayload.labels.length > 0 ? `Labels: ${jobPayload.labe
 
 Please analyze the issue, understand what needs to be fixed, and implement a solution.
 
-If you're reasonably satisfied with the solution then create and submit a pull request using the "gh" command line tool:
+When you're finished, create a git branch to store your work and then submit a pull request using the "gh" command line tool:
 gh pr create --title "Fixes #${jobPayload.issue}\n\n[Your PR description here.]" --fill --template "pull_request_template.md"
 
-You'll first need to create a new branch for the pull request.
+Your job isn't done until you've created a pull request. Try to solve any git issues that arise while creating your branch and submitting your pull request.
 `.trim()
 
 	const { repo, issue } = jobPayload

apps/roomote/src/lib/worker.ts

@@ -3,24 +3,33 @@ import { Worker } from "bullmq"
 import { redis } from "./redis"
 import { processJob } from "./job"
 
-/**
- * docker compose build worker
- * docker run \
- *   --name roomote-worker \
- *   --rm \
- *   --network roomote_default \
- *   -e HOST_EXECUTION_METHOD=docker \
- *   -v /var/run/docker.sock:/var/run/docker.sock \
- *   -v /tmp/roomote:/var/log/roomote roomote-worker \
- *   sh -c "pnpm worker"
- */
+// docker compose build worker
+// docker run \
+//   --name roomote-worker \
+//   --rm \
+//   --interactive \
+//   --tty \
+//   --network roomote_default \
+//   -e HOST_EXECUTION_METHOD=docker \
+//   -e GH_TOKEN=$GH_TOKEN \
+//   -e DATABASE_URL=postgresql://postgres:password@db:5432/cloud_agents \
+//   -e REDIS_URL=redis://redis:6379 \
+//   -e NODE_ENV=production \
+//   -v /var/run/docker.sock:/var/run/docker.sock \
+//   -v /tmp/roomote:/var/log/roomote \
+//   roomote-worker sh -c "bash"
 
 async function processSingleJob() {
-	const worker = new Worker("roomote", undefined, { autorun: false, connection: redis })
+	const worker = new Worker("roomote", undefined, {
+		autorun: false,
+		connection: redis,
+		lockDuration: 30 * 60 * 1_000, // 30 minutes
+	})
+
+	const token = crypto.randomUUID()
 
 	try {
-		console.log("Looking for a job to process...")
-		const job = await worker.getNextJob("worker-token")
+		const job = await worker.getNextJob(token)
 
 		if (!job) {
 			console.log("No jobs available, exiting...")
@@ -32,10 +41,10 @@ async function processSingleJob() {
 
 		try {
 			await processJob(job)
-			await job.moveToCompleted(undefined, "worker-token")
+			await job.moveToCompleted(undefined, token, false)
 			console.log(`Job ${job.id} completed successfully`)
 		} catch (error) {
-			await job.moveToFailed(error as Error, "worker-token")
+			await job.moveToFailed(error as Error, token, false)
 			console.error(`Job ${job.id} failed:`, error)
 		}
 	} catch (error) {
@@ -56,5 +65,8 @@ process.on("SIGINT", async () => {
 	process.exit(0)
 })
 
-console.log("Single job worker started")
+if (!process.env.GH_TOKEN) {
+	throw new Error("GH_TOKEN is not set")
+}
+
 processSingleJob()