More progress

Author: cte

apps/cloud-agents/scripts/enqueue-test-job.sh

@@ -9,8 +9,8 @@ if [ -z "$ISSUE_NUMBER" ]; then
     echo "Usage: $0 <issue_number> [repo]"
     echo ""
     echo "Examples:"
-    echo "  $0 4567                           # Fetch issue #4567 from RooCodeInc/Roo-Code"
-    echo "  $0 123 owner/repo                 # Fetch issue #123 from owner/repo"
+    echo "  $0 4567           # Fetch issue #4567 from RooCodeInc/Roo-Code"
+    echo "  $0 123 owner/repo # Fetch issue #123 from owner/repo"
     echo ""
     echo "This script fetches real GitHub issue data and enqueues it as a job."
     exit 1
@@ -54,11 +54,6 @@ LABELS=$(echo "$ISSUE_DATA" | jq -r '[.labels[].name] | @json')
 TITLE_ESCAPED=$(printf '%s' "$TITLE" | sed 's/"/\\"/g' | sed 's/\n/\\n/g')
 BODY_ESCAPED=$(printf '%s' "$BODY" | sed 's/"/\\"/g' | awk '{printf "%s\\n", $0}' | sed 's/\\n$//')
 
-echo "Issue Title: $TITLE"
-echo "Issue Labels: $LABELS"
-echo ""
-echo "Enqueueing job..."
-
 JSON_PAYLOAD=$(cat <<EOF
 {
   "type": "github.issue.fix",
@@ -73,7 +68,4 @@ JSON_PAYLOAD=$(cat <<EOF
 EOF
 )
 
-curl -X POST "$JOBS_ENDPOINT" \
-  -H "Content-Type: application/json" \
-  -d "$JSON_PAYLOAD" \
-  -w "\nStatus: %{http_code}\n\n"
+curl -X POST "$JOBS_ENDPOINT" -H "Content-Type: application/json" -d "$JSON_PAYLOAD" -w "\nStatus: %{http_code}\n\n"

apps/cloud-agents/src/app/api/jobs/route.ts

@@ -9,31 +9,34 @@ export async function POST(request: NextRequest) {
 	try {
 		const body = await request.json()
 		const values = createJobSchema.parse(body)
+
 		const [job] = await db
 			.insert(cloudJobs)
 			.values({ ...values, status: "pending" })
 			.returning()
 
 		if (!job) {
-			throw new Error("Failed to create job")
+			throw new Error("Failed to create `cloudJobs` record.")
 		}
 
+		let enqueuedJob
+
 		switch (values.type) {
 			case "github.issue.fix":
-				await enqueue({ jobId: job.id, type: "github.issue.fix", payload: values.payload })
+				enqueuedJob = await enqueue({ jobId: job.id, ...values })
 				break
 			default:
 				throw new Error(`Unknown job type: ${values.type}`)
 		}
 
-		return NextResponse.json(job)
+		return NextResponse.json({ message: "job_enqueued", jobId: job.id, enqueuedJobId: enqueuedJob.id })
 	} catch (error) {
-		console.error("Error creating job:", error)
+		console.error("Create Job Error:", error)
 
 		if (error instanceof z.ZodError) {
-			return NextResponse.json({ error: "Invalid request body", details: error.errors }, { status: 400 })
+			return NextResponse.json({ error: "bad_request", details: error.errors }, { status: 400 })
 		}
 
-		return NextResponse.json({ error: "Internal server error" }, { status: 500 })
+		return NextResponse.json({ error: "internal_server_error" }, { status: 500 })
 	}
 }

apps/cloud-agents/src/app/api/webhooks/github/route.ts

@@ -2,7 +2,7 @@ import { NextRequest, NextResponse } from "next/server"
 import { createHmac } from "crypto"
 import { z } from "zod"
 
-import { type JobType, type JobStatus, type JobPayload, githubWebhookSchema } from "@/types"
+import { type JobType, type JobPayload, githubWebhookSchema } from "@/types"
 import { db, cloudJobs } from "@/db"
 import { enqueue } from "@/lib"
 
@@ -15,59 +15,58 @@ function verifySignature(body: string, signature: string, secret: string): boole
 export async function POST(request: NextRequest) {
 	try {
 		const signature = request.headers.get("x-hub-signature-256")
-		const event = request.headers.get("x-github-event")
 
 		if (!signature) {
-			return NextResponse.json({ error: "Missing signature" }, { status: 400 })
+			return NextResponse.json({ error: "missing_signature" }, { status: 400 })
 		}
 
 		const body = await request.text()
 
 		if (!verifySignature(body, signature, process.env.GITHUB_WEBHOOK_SECRET!)) {
-			return NextResponse.json({ error: "Invalid signature" }, { status: 401 })
+			return NextResponse.json({ error: "invalid_signature" }, { status: 401 })
 		}
 
-		console.log("✅ Signature verified")
-		console.log("📋 Event ->", event)
+		const event = request.headers.get("x-github-event")
 
 		if (event !== "issues") {
 			return NextResponse.json({ message: "event_ignored" })
 		}
 
 		const data = githubWebhookSchema.parse(JSON.parse(body))
+		console.log("🗄️ Webhook ->", data)
+		const { action, repository, issue } = data
 
-		console.log("🗄️ Data ->", data)
-
-		if (data.action !== "opened") {
+		if (action !== "opened") {
 			return NextResponse.json({ message: "action_ignored" })
 		}
 
 		const type: JobType = "github.issue.fix"
-		const status: JobStatus = "pending"
 
 		const payload: JobPayload<typeof type> = {
-			repo: data.repository.full_name,
-			issue: data.issue.number,
-			title: data.issue.title,
-			body: data.issue.body || "",
-			labels: data.issue.labels.map((label) => label.name),
+			repo: repository.full_name,
+			issue: issue.number,
+			title: issue.title,
+			body: issue.body || "",
+			labels: issue.labels.map(({ name }) => name),
 		}
 
-		const [job] = await db.insert(cloudJobs).values({ type, status, payload }).returning()
+		const [job] = await db.insert(cloudJobs).values({ type, payload, status: "pending" }).returning()
 
 		if (!job) {
-			throw new Error("Failed to create job")
+			throw new Error("Failed to create `cloudJobs` record.")
 		}
 
-		await enqueue({ jobId: job.id, type, payload })
-		return NextResponse.json({ message: "Job created successfully", jobId: job.id })
+		const enqueuedJob = await enqueue({ jobId: job.id, type, payload })
+		console.log("🔗 Enqueued job ->", enqueuedJob)
+
+		return NextResponse.json({ message: "job_enqueued", jobId: job.id, enqueuedJobId: enqueuedJob.id })
 	} catch (error) {
-		console.error("GitHub webhook error:", error)
+		console.error("GitHub Webhook Error:", error)
 
 		if (error instanceof z.ZodError) {
-			return NextResponse.json({ error: "Invalid webhook payload", details: error.errors }, { status: 400 })
+			return NextResponse.json({ error: "bad_request", details: error.errors }, { status: 400 })
 		}
 
-		return NextResponse.json({ error: "Internal server error" }, { status: 500 })
+		return NextResponse.json({ error: "internal_server_error" }, { status: 500 })
 	}
 }

apps/cloud-agents/src/lib/jobs/fixGitHubIssue.ts

@@ -26,6 +26,10 @@ ${payload.body}
 ${payload.labels && payload.labels.length > 0 ? `Labels: ${payload.labels.join(", ")}` : ""}
 
 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.
+You'll first need to create a new branch for the pull request.
+
+Make sure to reference the issue in the pull request description.
 `.trim()
 
 	const result = await runTask({

apps/cloud-agents/src/lib/runTask.ts

@@ -9,7 +9,7 @@ import { type TaskEvent, TaskCommandName, RooCodeEventName, IpcMessageType, EVAL
 import { IpcClient } from "@roo-code/ipc"
 
 import { Logger } from "./logger"
-import { isDockerContainer, findGitRoot } from "./utils"
+import { isDockerContainer } from "./utils"
 
 const TIMEOUT = 30 * 60 * 1_000
 
@@ -27,7 +27,7 @@ type RunTaskOptions = {
 }
 
 export const runTask = async ({ prompt, publish, logger }: RunTaskOptions) => {
-	const workspacePath = findGitRoot(process.cwd())
+	const workspacePath = "/Users/cte/Documents/Roomote-Control" // findGitRoot(process.cwd())
 	const ipcSocketPath = path.resolve(os.tmpdir(), `${crypto.randomUUID().slice(0, 8)}.sock`)
 	const env = { ROO_CODE_IPC_SOCKET_PATH: ipcSocketPath }
 	const controller = new AbortController()