[feature]: Instruction table with metadata

.gitignore

@@ -42,4 +42,5 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 
-certificates
+certificates
+.env*.local

app/api/webhook/github/route.ts

@@ -207,7 +207,8 @@ export const POST = async (req: Request) => {
 	if (!customer) return new Response('Could not find customer', {status: 500})
 
 	const {id: customerId, usage, usageLimit, usageWarned, projects} = customer
-	const instructions = projects?.[0]?.customInstructions || ''
+	const instructions =
+		projects?.[0]?.customInstructions.map(ci => ci.content).join('. ') || ''
 
 	// Get GitHub app instance access token
 	const app = new App({
@@ -305,6 +306,7 @@ Your instructions: ${instructions || 'do nothing'}.
 			issueId: issue?.node_id,
 			pullUrl: issue?.pull_request?.url || pr?.url || null,
 			allLabels,
+			comment,
 			beta
 		})
 

lib/agents/maige.ts

@@ -26,6 +26,7 @@ export async function maige({
 	issueId,
 	pullUrl,
 	allLabels,
+	comment,
 	beta
 }: {
 	input: string
@@ -37,11 +38,20 @@ export async function maige({
 	issueId?: string
 	pullUrl?: string
 	allLabels: any[]
+	comment: any
 	beta?: boolean
 }) {
 	const tools = [
 		labelTool({octokit, allLabels, issueId}),
-		updateInstructionsTool({octokit, prisma, customerId, issueId, repoFullName}),
+		updateInstructionsTool({
+			octokit,
+			prisma,
+			customerId,
+			issueId,
+			repoFullName,
+			instructionCreator: comment.user.login,
+			instructionCommentLink: comment.html_url
+		}),
 		githubTool({octokit}),
 		codebaseSearch({customerId, repoFullName}),
 		...(beta ? [dispatchEngineer({issueNumber, repoFullName, customerId})] : []),

lib/tools/updateInstructions.ts

@@ -1,3 +1,4 @@
+import {PrismaClient} from '@prisma/client'
 import {DynamicStructuredTool} from 'langchain/tools'
 import {z} from 'zod'
 import {addComment} from '~/utils/github'
@@ -7,27 +8,36 @@ export default function updateInstructions({
 	customerId,
 	repoFullName,
 	issueId,
+	instructionCreator,
+	instructionCommentLink,
 	octokit
 }: {
-	prisma: any
+	prisma: PrismaClient
 	octokit: any
 	issueId: string
 	customerId: string
 	repoFullName: string
+	instructionCreator: string
+	instructionCommentLink: string
 }) {
 	return new DynamicStructuredTool({
 		description:
 			'User will explicitly ask for custom instructions to be updated.',
 		func: async ({newInstructions}) => {
-			const res = await prisma.project.update({
-				where: {
-					customerId_name: {
+			const project = (
+				await prisma.project.findMany({
+					where: {
 						customerId,
 						name: repoFullName.split('/')[1]
 					}
-				},
+				})
+			)[0]
+			const res = await prisma.instruction.create({
 				data: {
-					customInstructions: newInstructions
+					projectId: project.id,
+					content: newInstructions,
+					creatorUsername: instructionCreator,
+					githubCommentLink: instructionCommentLink
 				}
 			})
 

package.json

@@ -38,6 +38,7 @@
 		"@typescript-eslint/parser": "^6.11.0",
 		"autoprefixer": "^10.4.16",
 		"bun-types": "^1.0.12",
+		"dotenv-cli": "5.0.0",
 		"eslint": "^8.53.0",
 		"npm-check-updates": "^16.14.6",
 		"postcss": "^8.4.31",
@@ -53,7 +54,7 @@
 		"bleed": "ncu -u && bun i",
 		"build": "next build",
 		"db:push": "prisma db push",
-		"db:studio": "prisma studio",
+		"db:studio": "dotenv -e .env.local -- prisma studio",
 		"dev": "next dev",
 		"format": "prettier --write .",
 		"lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.json,.ts,.tsx",

prisma/schema.prisma

@@ -29,13 +29,25 @@ model Project {
   id   String @id @default(cuid())
   name String
 
-  customInstructions String @default("") @db.Text
-
   customerId String
   customer   Customer @relation(fields: [customerId], references: [id], onDelete: Cascade)
 
-  createdAt DateTime @default(now())
+  createdAt          DateTime      @default(now())
+  customInstructions Instruction[]
 
   @@unique([customerId, name])
   @@index([customerId])
 }
+
+model Instruction {
+  id                String  @id @default(cuid())
+  projectId         String
+  content           String  @db.Text
+  creatorUsername   String?
+  githubCommentLink String?
+
+  createdAt DateTime @default(now())
+  project   Project  @relation(fields: [projectId], references: [id], onDelete: Cascade)
+
+  @@index([projectId])
+}