Merge pull request 'Check for duplicates before adding tickets' (#12) from ticket-duplicates into master

Reviewed-on: #12

.github/workflows/code-review.yml

@@ -16,7 +16,7 @@ jobs:
                   git fetch origin ${{ github.event.pull_request.base.ref }}
 
             - name: Run AI Review
-              run: npx -y -p @ztimson/ai-agents@latest review
+              run: npx -y -p @ztimson/ai-agents@latest review $GITHUB_WORKSPACE
               env:
                   AI_HOST: anthropic
                   AI_MODEL: claude-sonnet-4-5

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/ai-agents",
-	"version": "0.0.6",
+	"version": "0.1.0",
 	"description": "AI agents",
 	"keywords": ["ai", "review"],
 	"author": "ztimson",

src/refine.mjs

@@ -26,16 +26,18 @@ dotenv.config({path: '.env.local', override: true, quiet: true});
 	console.log(`Processing issue #${ticket}`);
 
 	// Fetch issue
-	const issueRes = await fetch(`${git}/api/v1/repos/${owner}/${repo}/issues/${ticket}`, {
+	const issueData = await fetch(`${git}/api/v1/repos/${owner}/${repo}/issues/${ticket}`, {
 		headers: {'Authorization': `token ${auth}`}
+	}).then(async resp => {
+		if(resp.ok) return  resp.json();
+		else throw new Error(`${resp.status} ${await resp.text()}`);
 	});
-	if(!issueRes.ok) throw new Error(`${issueRes.status} ${await issueRes.text()}`);
-	const issueData = await issueRes.json();
-	if(!issueData.labels?.some(l => l.name === 'Review/AI')) {
+	if(issueData.labels?.[0] !== 1 || issueData.labels?.[0]?.name !== 'Review/AI') {
 		console.log('Skipping');
 		return process.exit();
 	}
 
+	// Gather readme & template
 	let title = '', type = '', readme = '', readmeP = path.join(process.cwd(), 'README.md');
 	if(fs.existsSync(readmeP)) readme = fs.readFileSync(readmeP, 'utf-8');
 	const template = p ? fs.readFileSync(p, 'utf-8') : `## Description
@@ -80,6 +82,7 @@ Implementation details, constraints, dependencies, design decisions
 | **Total**       | **0-15** |
 `;
 
+	// Create AI
 	let options = {ollama: {model, host}};
 	if(host === 'anthropic') options = {anthropic: {model, token}};
 	else if(host === 'openai') options = {openAi: {model, token}};
@@ -90,7 +93,7 @@ Implementation details, constraints, dependencies, design decisions
 		tools: [{
 			name: 'title',
 			description: 'Set the ticket title, must be called EXACTLY ONCE',
-			args: {title: {type: 'string', description: 'Ticket title, must match format: [Module] - [Verb] [noun]', required: true}},
+			args: {title: {type: 'string', description: 'Ticket title, must match format: Module - Verb noun', required: true}},
 			fn: (args) => title = args.title
 		}, {
 			name: 'type',
@@ -103,7 +106,7 @@ Implementation details, constraints, dependencies, design decisions
 **MANDATORY STEPS:**
 1. Identify ticket type: Bug, DevOps, Document, Enhancement, Refactor, or Security
 2. Call \`type\` tool EXACTLY ONCE with the type from step 1
-3. Call \`title\` tool EXACTLY ONCE in format: "[Module] - [Verb] [subject]"
+3. Call \`title\` tool EXACTLY ONCE in format: "[Module] - [Verb] [subject]" (example: Storage - fix file uploads)
 4. Output formatted markdown matching template structure below
 
 **TEMPLATE RULES:**
@@ -141,35 +144,67 @@ ${template.trim()}
 
 Output ONLY markdown. No explanations, labels, or extra formatting.`});
 
+	// Format ticket with AI
 	const messages = await ai.language.ask(`Title: ${issueData.title}\n\nDescription:\n${issueData.body || 'No description provided'}`).catch(() => []);
 	const body = messages?.pop()?.content;
-	if(!body) {
-		console.log('Invalid response from AI');
-		return process.exit(1);
-	}
-	const updateRes = await fetch(`${git}/api/v1/repos/${owner}/${repo}/issues/${ticket}`, {
-		method: 'PATCH',
-		headers: {
-			'Authorization': `token ${auth}`,
-			'Content-Type': 'application/json'
-		},
+	if(!body) throw new Error('Invalid response from AI');
+
+	// Check for duplicates
+	const repoInfo = await fetch(`${git}/api/v1/repos/${owner}/${repo}`, {headers: {'Authorization': `token ${auth}`},}).then(resp => resp.ok ? resp.json() : null);
+	const search = await fetch(`${git}/api/v1/repos/issues/search`, {
+		method: 'POST',
+		headers: {'Authorization': `token ${auth}`, 'Content-Type': 'application/json'},
 		body: JSON.stringify({
-			title,
-			body,
+			owner,
+			priority_repo_id: repoInfo.id,
+			type: 'issues',
+			limit: 3,
+			q: title
 		})
-	});
-	if(!updateRes.ok) throw new Error(`${updateRes.status} ${await updateRes.text()}`);
-	if(type) {
-		const resp = await fetch(`${git}/api/v1/repos/${owner}/${repo}/issues/${ticket}/labels`, {
+	}).then(resp => resp.ok ? resp.json() : []);
+	let dupeId = null;
+	const dupeIds = search.map(t => t.id);
+	const dupes = search.map(t => `ID: ${t.id}\nTitle: ${t.title}\n\`\`\`markdown\n${t.body}\n\`\`\``).join('\n\n');
+	const hasDuplicates = (await ai.language.ask(`${title}\n\`\`\`markdown\n${body}\n\`\`\``, {
+		system: `Your job is to identify duplicates. Respond with the ID number of the duplicate or nothing if there are no matches \n\n${dupes}`
+	}))?.pop()?.content;
+	// Handle duplicates
+	if(!!hasDuplicates && (dupeId = dupeIds.find(id => new RegExp(`\\b${id}\\b`, 'm').test(hasDuplicates)))) {
+		await fetch(`${git}/api/v1/repos/${owner}/${repo}/issues/${ticket}/comments`, {
 			method: 'POST',
-			headers: {
-				'Authorization': `token ${auth}`,
-				'Content-Type': 'application/json'
-			},
-			body: JSON.stringify([`Kind/${type[0].toUpperCase() + type.slice(1).toLowerCase()}`])
-		});
-		if(!resp.ok) throw new Error(`${resp.status} ${await resp.text()}`);
+			headers: {'Authorization': `token ${auth}`, 'Content-Type': 'application/json'},
+			body: `{"body": "Duplicate of #${dupeId}"}`
+		}).then(async resp => { if(!resp.ok) throw new Error(`${resp.status} ${await resp.text()}`); });
+		await fetch(`${git}/api/v1/repos/${owner}/${repo}/issues/${ticket}/labels`, {
+			method: 'POST',
+			headers: {'Authorization': `token ${auth}`, 'Content-Type': 'application/json'},
+			body: '{"labels":["Reviewed/Duplicate"]}'
+		}).then(async resp => { if(!resp.ok) throw new Error(`${resp.status} ${await resp.text()}`); });
+		await fetch(`${git}/api/v1/repos/${owner}/${repo}/issues/${ticket}`, {
+			method: 'PATCH',
+			headers: {'Authorization': `token ${auth}`, 'Content-Type': 'application/json'},
+			body: '{"state": "closed"}'
+		}).then(async resp => { if(!resp.ok) throw new Error(`${resp.status} ${await resp.text()}`); });
+		console.log('Duplicate');
+		return process.exit();
+	}
+
+	// Update ticket
+	await fetch(`${git}/api/v1/repos/${owner}/${repo}/issues/${ticket}`, {
+		method: 'PATCH',
+		headers: {'Authorization': `token ${auth}`, 'Content-Type': 'application/json'},
+		body: JSON.stringify({title, body})
+	}).then(async resp => { if(!resp.ok) throw new Error(`${resp.status} ${await resp.text()}`); });
+	if(type) { // Label
+		await fetch(`${git}/api/v1/repos/${owner}/${repo}/issues/${ticket}/labels`, {
+			method: 'POST',
+			headers: {'Authorization': `token ${auth}`, 'Content-Type': 'application/json'},
+			body: `{"labels":["Reviewed/${type[0].toUpperCase() + type.slice(1).toLowerCase()}"]}`
+		}).then(async resp => { if(!resp.ok) throw new Error(`${resp.status} ${await resp.text()}`); });
 	}
 
 	console.log(`Title: ${title}\nType: ${type}\nBody:\n${body}`);
-})();
+})().catch(err => {
+	console.error(`Error: ${err.message || err.toString()}`);
+	process.exit(1);
+});

src/review.mjs

@@ -43,7 +43,7 @@ dotenv.config({path: '.env.local', override: true, quiet: true, debug: false});
 		const comments = await Promise.all(reviews.map(r => fetch(`${git}/api/v1/repos/${owner}/${repo}/pulls/${pr}/reviews/${r.id}/comments`, {
 			headers: {'Authorization': `token ${auth}`}
 		}).then(resp => resp.ok ? resp.json() : [])));
-		existingComments += comments.flatten().map(c => `${c.path}:${c.position}\n${c.body}`).join('\n\n');
+		existingComments += comments.flat().map(c => `${c.path}:${c.position}\n${c.body}`).join('\n\n');
 	}
 
 	let options = {ollama: {model, host}};
@@ -106,4 +106,7 @@ dotenv.config({path: '.env.local', override: true, quiet: true, debug: false});
 		if(!res.ok) throw new Error(`${res.status} ${await res.text()}`);
 	}
 	console.log(comments.map(c => `${c.path}${c.new_position ? `:${c.new_position}` : ''}\n${c.body}`).join('\n\n') + '\n\n' + summary);
-})();
+})().catch(err => {
+	console.error(`Error: ${err.message || err.toString()}`);
+	process.exit(1);
+});