Merge branch 'master' of git.zakscode.com:ztimson/ai-agents into review-labels

Reviewed-on: #13

.github/issue_template/ai-refinement.md

@@ -16,4 +16,4 @@ How can it be fixed or improved?
 
 Steps to reproduce?
 
-Anything other useful information, logs or screenshots?
+Any other useful information? Logs, screenshots, steps to reproduce?

.github/pull_request_template.md

@@ -9,7 +9,5 @@
 
 ## Checklist
 <!-- Complete after creating PR -->
- - [ ] Linked issues
+ - [ ] Reviewed changes (or use `Review/AI` label)
- - [ ] Reviewed changes
  - [ ] Updated comments/documentation
- 

.github/workflows/code-review.yml

@@ -2,7 +2,7 @@ name: Code review
 
 on:
     pull_request:
-        types: [opened, synchronize, reopened]
+        types: [opened, synchronize, reopened, labeled]
 
 jobs:
     review:

.github/workflows/ticket-refinement.yml

@@ -3,6 +3,7 @@ name: Ticket refinement
 on:
     issues:
         types: [labeled]
+
 jobs:
     format:
         runs-on: ubuntu-latest

package.json

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

src/refine.mjs

@@ -6,8 +6,8 @@ import * as dotenv from 'dotenv';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 
-dotenv.config({quiet: true});
+dotenv.config({quiet: true, debug: false});
-dotenv.config({path: '.env.local', override: true, quiet: true});
+dotenv.config({path: '.env.local', override: true, quiet: true, debug: false});
 
 (async () => {
 	let p = process.argv[process.argv.length - 1];
@@ -21,6 +21,10 @@ dotenv.config({path: '.env.local', override: true, quiet: true});
 		ticket = process.env['TICKET'],
 		host = process.env['AI_HOST'],
 		model = process.env['AI_MODEL'],
+		labelDupe = process.env['LABELS_DUPE'] || 'Review/Duplicate',
+		labelEnabled = process.env['LABEL_ENABLED'] || 'Review/AI',
+		labelsReq = process.env['LABELS_REQ'] || 'Kind/Aesthetic,Kind/Bug,Kind/DevOps,Kind/Document,Kind/Enhancement,Kind/Refactor,Kind/Security',
+		labelsOpt = process.env['LABELS_OPT'] || 'Breaking,Priority,QA',
 		token = process.env['AI_TOKEN'];
 
 	console.log(`Processing issue #${ticket}`);
@@ -32,13 +36,13 @@ dotenv.config({path: '.env.local', override: true, quiet: true});
 		if(resp.ok) return  resp.json();
 		else throw new Error(`${resp.status} ${await resp.text()}`);
 	});
-	if(issueData.labels.length !== 1 || issueData.labels?.[0] !== 'Review/AI') {
+	if(issueData.labels?.length !== 1 || issueData.labels[0]?.name !== labelEnabled) {
 		console.log('Skipping');
 		return process.exit();
 	}
 
 	// Gather readme & template
-	let title = '', type = '', readme = '', readmeP = path.join(process.cwd(), 'README.md');
+	let title = '', labels = [], 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
 
@@ -96,18 +100,27 @@ Implementation details, constraints, dependencies, design decisions
 			args: {title: {type: 'string', description: 'Ticket title, must match format: Module - Verb noun', required: true}},
 			fn: (args) => title = args.title
 		}, {
-			name: 'type',
+			name: 'add_label',
-			description: 'Set the ticket type, must be called EXACTLY ONCE',
+			description: 'Add a label to the ticket',
-			args: {type: {type: 'string', description: 'Ticket type', enum: ['Bug', 'DevOps', 'Document', 'Enhancement', 'Refactor', 'Security'], required: true}},
+			args: {label: {type: 'string', description: 'Label name', required: true}},
-			fn: (args) => type = args.type
+			fn: async (args) => {
+				labels.push(args.label);
+				return await fetch(`${git}/api/v1/repos/${owner}/${repo}/issues/${ticket}/labels`, {
+					method: 'POST',
+					headers: {'Authorization': `token ${auth}`, 'Content-Type': 'application/json'},
+					body: `{"labels":["${args.label}"]}`
+				}).then(async resp => { if(!resp.ok) throw new Error(`${resp.status} ${await resp.text()}`); });
+			}
 		}],
 		system: `Transform raw tickets into structured markdown following the template EXACTLY.
 
 **MANDATORY STEPS:**
-1. Identify ticket type: Bug, DevOps, Document, Enhancement, Refactor, or Security
+1. Call \`title\` tool EXACTLY ONCE in format: "[Module] - [Verb] [subject]" (example: Storage - fix file uploads)
-2. Call \`type\` tool EXACTLY ONCE with the type from step 1
+2. Identify one label from each group which best applies to the ticket: ${labelsReq.replaceAll(',', ', ')}
-3. Call \`title\` tool EXACTLY ONCE in format: "[Module] - [Verb] [subject]" (example: Storage - fix file uploads)
+3. Call the \`add_label\` tool ONCE FOR EVERY LABEL identified in the previous step
-4. Output formatted markdown matching template structure below
+4. Filter the following labels to any that apply to this ticket: ${labelsOpt.replaceAll(',', ', ')}
+5. Call the \`add_label\` tool ONCE FOR EVERY LABEL identified in the previous step
+6. Output the new ticket description in formatted markdown matching the following rules:
 
 **TEMPLATE RULES:**
 - Use ## headers (match template exactly)
@@ -128,11 +141,11 @@ Implementation details, constraints, dependencies, design decisions
 | **Total**       | **0-15** |
 
 **SCORING:**
-- Size: # of modules/layers/files changed
+- Size: # of modules/layers/files affected
 - Complexity: Technical difficulty
 - Unknowns: Research/uncertainty needed
 
-**README:**
+**PROJECT README:**
 \`\`\`markdown
 ${readme.trim() || 'No README available'}
 \`\`\`
@@ -150,11 +163,13 @@ Output ONLY markdown. No explanations, labels, or extra formatting.`});
 	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({
-			priority_repo_id: repo,
+			owner,
+			priority_repo_id: repoInfo.id,
 			type: 'issues',
 			limit: 3,
 			q: title
@@ -163,11 +178,12 @@ Output ONLY markdown. No explanations, labels, or extra formatting.`});
 	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\`\`\``, {
+	const hasDuplicates = (await ai.language.ask(`ID: ${issueData.id}\nTitle: ${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}`
+		system: `Your job is to identify duplicates. Respond ONLY with the duplicate's ID number or "NONE" if no match exists\n\n${dupes}`
 	}))?.pop()?.content;
+
 	// Handle duplicates
-	if(!!hasDuplicates && (dupeId = dupeIds.find(id => hasDuplicates.includes(id.toString()))) != null) {
+	if(hasDuplicates && !hasDuplicates.toUpperCase().includes('NONE') && (dupeId = dupeIds.find(id => id == hasDuplicates.trim())) != null && dupeId != issueData.id) {
 		await fetch(`${git}/api/v1/repos/${owner}/${repo}/issues/${ticket}/comments`, {
 			method: 'POST',
 			headers: {'Authorization': `token ${auth}`, 'Content-Type': 'application/json'},
@@ -176,7 +192,7 @@ Output ONLY markdown. No explanations, labels, or extra formatting.`});
 		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"]}'
+			body: `{"labels":["${labelDupe}"]}`
 		}).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',
@@ -188,18 +204,14 @@ Output ONLY markdown. No explanations, labels, or extra formatting.`});
 	}
 
 	// Update ticket
-	const updateRes = await fetch(`${git}/api/v1/repos/${owner}/${repo}/issues/${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}`);
+	console.log(`Title: ${title}\nLabels: ${labels.join(', ')}\nBody:\n${body}`);
-})();
+})().catch(err => {
+	console.error(`Error: ${err.message || err.toString()}`);
+	process.exit(1);
+});

src/review.mjs

@@ -19,12 +19,20 @@ dotenv.config({path: '.env.local', override: true, quiet: true, debug: false});
 		owner = process.env['GIT_OWNER'],
 		repo = process.env['GIT_REPO'],
 		auth = process.env['GIT_TOKEN'],
+		labelEnabled = process.env['LABEL_ENABLED'] || 'Review/AI',
 		pr = process.env['PULL_REQUEST'],
 		host = process.env['AI_HOST'],
 		model = process.env['AI_MODEL'],
 		token = process.env['AI_TOKEN'];
 
 	console.log(`Reviewing: ${root}\n`);
+	const info = await fetch(`${git}/api/v1/repos/${owner}/${repo}/pulls/${pr}`)
+		.then(async resp => { return resp.ok ? resp.json() : throw new Error(`${resp.status} ${await resp.text()}`); });
+	if(info.labels?.length > 0 || !info.labels.some(l => l.name === labelEnabled)) {
+		console.log('Skipping');
+		return process.exit();
+	}
+
 	const branch = process.env['GIT_BRANCH'] || await $`cd ${root} && git symbolic-ref refs/remotes/origin/HEAD`;
 	const comments = [];
 	const commit = await $`cd ${root} && git log -1 --pretty=format:%H`;
@@ -53,7 +61,7 @@ dotenv.config({path: '.env.local', override: true, quiet: true, debug: false});
 		...options,
 		model: [host, model],
 		path: process.env['path'] || os.tmpdir(),
-		system: `You are a code reviewer. Analyze the git diff and use the \`recommend\` tool for EACH issue you find. You must call \`recommend\` exactly once for every bug or improvement opportunity directly related to changes. Ignore formatting recommendations. After making all recommendations, provide some concluding remarks about the overall state of the changes.${existingComments}`,
+		system: `You are a code reviewer. Analyze the git diff and use the \`recommend\` tool for EACH issue you find. You must call \`recommend\` exactly once for every bug or improvement opportunity directly related to changes. Ignore formatting recommendations. After making all recommendations, provide a quick 75 words or less sitrep.${existingComments}`,
 		tools: [{
 			name: 'read_file',
 			description: 'Read contents of a file',
@@ -106,4 +114,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);
+});