More progress

Author: cte

apps/roomote/Dockerfile.worker

@@ -36,6 +36,7 @@ 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 gh repo set-default RooCodeInc/Roo-Code
 RUN pnpm install
 
 # Install dependencies

apps/roomote/drizzle/0002_brief_sentry.sql

@@ -0,0 +1 @@
+DROP TABLE "cloud_tasks" CASCADE;

apps/roomote/drizzle/meta/0002_snapshot.json

@@ -0,0 +1,105 @@
+{
+	"id": "16afebd7-b27a-457e-b3d5-4de50a597c2e",
+	"prevId": "4cae0c18-141d-40a3-acc8-38fcd7f07534",
+	"version": "7",
+	"dialect": "postgresql",
+	"tables": {
+		"public.cloud_jobs": {
+			"name": "cloud_jobs",
+			"schema": "",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "integer",
+					"primaryKey": true,
+					"notNull": true,
+					"identity": {
+						"type": "always",
+						"name": "cloud_jobs_id_seq",
+						"schema": "public",
+						"increment": "1",
+						"startWith": "1",
+						"minValue": "1",
+						"maxValue": "2147483647",
+						"cache": "1",
+						"cycle": false
+					}
+				},
+				"type": {
+					"name": "type",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true
+				},
+				"status": {
+					"name": "status",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"default": "'pending'"
+				},
+				"payload": {
+					"name": "payload",
+					"type": "jsonb",
+					"primaryKey": false,
+					"notNull": true
+				},
+				"result": {
+					"name": "result",
+					"type": "jsonb",
+					"primaryKey": false,
+					"notNull": false
+				},
+				"error": {
+					"name": "error",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false
+				},
+				"slack_thread_ts": {
+					"name": "slack_thread_ts",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false
+				},
+				"started_at": {
+					"name": "started_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false
+				},
+				"completed_at": {
+					"name": "completed_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false
+				},
+				"created_at": {
+					"name": "created_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"default": "now()"
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {},
+			"uniqueConstraints": {},
+			"policies": {},
+			"checkConstraints": {},
+			"isRLSEnabled": false
+		}
+	},
+	"enums": {},
+	"schemas": {},
+	"sequences": {},
+	"roles": {},
+	"policies": {},
+	"views": {},
+	"_meta": {
+		"columns": {},
+		"schemas": {},
+		"tables": {}
+	}
+}

apps/roomote/drizzle/meta/_journal.json

@@ -15,6 +15,13 @@
 			"when": 1750099429125,
 			"tag": "0001_fluffy_sasquatch",
 			"breakpoints": true
+		},
+		{
+			"idx": 2,
+			"version": "7",
+			"when": 1750107620472,
+			"tag": "0002_brief_sentry",
+			"breakpoints": true
 		}
 	]
 }

apps/roomote/src/app/api/webhooks/github/route.ts

@@ -7,7 +7,6 @@ import { type JobType, type JobPayload, githubIssueWebhookSchema, githubPullRequ
 import { db, cloudJobs } from "@/db"
 import { enqueue } from "@/lib"
 import { SlackNotifier } from "@/lib/slack"
-import { Logger } from "@/lib/logger"
 
 function verifySignature(body: string, signature: string, secret: string): boolean {
 	const expectedSignature = createHmac("sha256", secret).update(body, "utf8").digest("hex")
@@ -17,13 +16,14 @@ function verifySignature(body: string, signature: string, secret: string): boole
 
 async function handleIssueEvent(body: string) {
 	const data = githubIssueWebhookSchema.parse(JSON.parse(body))
-	console.log("🗄️ Issue Webhook ->", data)
 	const { action, repository, issue } = data
 
 	if (action !== "opened") {
 		return NextResponse.json({ message: "action_ignored" })
 	}
 
+	console.log("🗄️ Issue Webhook ->", data)
+
 	const type: JobType = "github.issue.fix"
 
 	const payload: JobPayload<typeof type> = {
@@ -48,14 +48,15 @@ async function handleIssueEvent(body: string) {
 
 async function handlePullRequestEvent(body: string) {
 	const data = githubPullRequestWebhookSchema.parse(JSON.parse(body))
-	console.log("🗄️ PR Webhook ->", data)
 	const { action, pull_request, repository } = data
 
 	if (action !== "opened") {
 		return NextResponse.json({ message: "action_ignored" })
 	}
 
-	// Extract issue number from PR title or body (looking for "Fixes #123" pattern)
+	console.log("🗄️ PR Webhook ->", data)
+
+	// Extract issue number from PR title or body (looking for "Fixes #123" pattern).
 	const issueNumberMatch =
 		pull_request.title.match(/(?:fixes|closes|resolves)\s+#(\d+)/i) ||
 		(pull_request.body && pull_request.body.match(/(?:fixes|closes|resolves)\s+#(\d+)/i))
@@ -66,10 +67,10 @@ async function handlePullRequestEvent(body: string) {
 
 	const issueNumber = parseInt(issueNumberMatch[1]!, 10)
 
-	// Find the job that corresponds to this issue
+	// Find the job that corresponds to this issue.
 	const jobs = await db.select().from(cloudJobs).where(eq(cloudJobs.type, "github.issue.fix"))
 
-	// Filter jobs to find the one matching this repo and issue
+	// Filter jobs to find the one matching this repo and issue.
 	const job = jobs.find((j) => {
 		const payload = j.payload as { repo: string; issue: number }
 		return payload.repo === repository.full_name && payload.issue === issueNumber
@@ -80,9 +81,8 @@ async function handlePullRequestEvent(body: string) {
 		return NextResponse.json({ message: "no_job_or_slack_thread_found" })
 	}
 
-	// Post to Slack thread
-	const logger = new Logger({ logDir: "/tmp/logs", filename: "webhook.log", tag: "webhook" })
-	const slackNotifier = new SlackNotifier(logger)
+	// Post to Slack thread.
+	const slackNotifier = new SlackNotifier()
 
 	await slackNotifier.postTaskUpdated(
 		job.slackThreadTs,

apps/roomote/src/db/schema.ts

@@ -1,5 +1,4 @@
 import { pgTable, text, timestamp, integer, jsonb } from "drizzle-orm/pg-core"
-import { relations } from "drizzle-orm"
 
 import type { JobType, JobStatus, JobPayload } from "@/types"
 
@@ -20,47 +19,16 @@ export const cloudJobs = pgTable("cloud_jobs", {
 	createdAt: timestamp("created_at").notNull().defaultNow(),
 })
 
-export const cloudJobsRelations = relations(cloudJobs, ({ many }) => ({
-	tasks: many(cloudTasks),
-}))
-
 export type CloudJob = typeof cloudJobs.$inferSelect
 
 export type InsertCloudJob = typeof cloudJobs.$inferInsert
 
 export type UpdateCloudJob = Partial<Omit<CloudJob, "id" | "createdAt">>
 
-/**
- * cloudTasks
- */
-
-export const cloudTasks = pgTable("cloud_tasks", {
-	id: integer().primaryKey().generatedAlwaysAsIdentity(),
-	jobId: integer("job_id")
-		.references(() => cloudJobs.id)
-		.notNull(),
-	taskId: integer("task_id"),
-	containerId: text("container_id"),
-	createdAt: timestamp("created_at").notNull().defaultNow(),
-})
-
-export const cloudTasksRelations = relations(cloudTasks, ({ one }) => ({
-	job: one(cloudJobs, { fields: [cloudTasks.jobId], references: [cloudJobs.id] }),
-}))
-
-export type CloudTask = typeof cloudTasks.$inferSelect
-
-export type InsertCloudTask = typeof cloudTasks.$inferInsert
-
-export type UpdateCloudTask = Partial<Omit<CloudTask, "id" | "createdAt">>
-
 /**
  * schema
  */
 
 export const schema = {
 	cloudJobs,
-	cloudTasks,
-	cloudJobsRelations,
-	cloudTasksRelations,
 }

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

@@ -35,7 +35,7 @@ When you're finished:
 - Create a git branch to store your work (git checkout -b fix-${jobPayload.issue})
 - Commit your changes to this branch (git commit -m "Fixes #${jobPayload.issue}")
 - Push your branch to the remote repository (git push --set-upstream origin fix-${jobPayload.issue})
-- Submit a pull request using the "gh" command line tool (gh pr create --repo RooCodeInc/Roo-Code --title "Fixes #${jobPayload.issue}\n\n[Your PR description here.]" --fill)
+- Submit a pull request using the "gh" command line tool (gh pr create --title "Fixes #${jobPayload.issue}\n\n[Your PR description here.]" --fill)
 
 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()

apps/roomote/src/lib/slack.ts

@@ -18,10 +18,10 @@ export interface SlackResponse {
 }
 
 export class SlackNotifier {
-	private readonly logger: Logger
+	private readonly logger?: Logger
 	private readonly token: string
 
-	constructor(logger: Logger, token: string = process.env.SLACK_API_TOKEN!) {
+	constructor(logger?: Logger, token: string = process.env.SLACK_API_TOKEN!) {
 		this.logger = logger
 		this.token = token
 	}
@@ -37,19 +37,19 @@ export class SlackNotifier {
 			})
 
 			if (!response.ok) {
-				this.logger.error(`Slack API failed: ${response.status} ${response.statusText}`)
+				this.logger?.error(`Slack API failed: ${response.status} ${response.statusText}`)
 				return null
 			}
 
 			const result: SlackResponse = await response.json()
 
 			if (!result.ok) {
-				this.logger.error(`Slack API error: ${result.error}`)
+				this.logger?.error(`Slack API error: ${result.error}`)
 			}
 
 			return result.ts ?? null
 		} catch (error) {
-			this.logger.error("Failed to send Slack message:", error)
+			this.logger?.error("Failed to send Slack message:", error)
 			return null
 		}
 	}