feat: enhance review process and role management
- Refactor reviewPass function to identify states with review checks instead of specific review types. - Introduce review policies (HUMAN, AGENT, AUTO) to control PR review processes based on developer levels. - Update projectTick to handle review policies and step routing labels for reviewers and testers. - Add detailed reviewer instructions to templates for clarity on review responsibilities. - Implement role:level label management, allowing dynamic creation of labels based on project configuration. - Enhance task_update tool to support state and level updates, ensuring at least one parameter is provided. - Update work_finish tool to include reviewer actions (approve, reject) in task completion. - Modify work_start tool to utilize role-level detection for better level assignment. - Add tests for new functionalities, including review routing and level detection from labels.
This commit is contained in:
Lauren ten Hoor
@@ -50,6 +50,34 @@ export class GitHubProvider implements IssueProvider {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Find PRs associated with an issue.
|
||||
* Primary: match by head branch pattern (fix/123-, feature/123-, etc.)
|
||||
* Fallback: word-boundary match on #123 in title/body.
|
||||
*/
|
||||
private async findPrsForIssue<T extends { title: string; body: string; headRefName?: string }>(
|
||||
issueId: number,
|
||||
state: "open" | "merged" | "all",
|
||||
fields: string,
|
||||
): Promise<T[]> {
|
||||
try {
|
||||
const args = ["pr", "list", "--json", fields, "--limit", "50"];
|
||||
if (state !== "all") args.push("--state", state);
|
||||
const raw = await this.gh(args);
|
||||
if (!raw) return [];
|
||||
const prs = JSON.parse(raw) as T[];
|
||||
const branchPat = new RegExp(`^(?:fix|feature|chore|bugfix|hotfix)/${issueId}-`);
|
||||
const titlePat = new RegExp(`\\b#${issueId}\\b`);
|
||||
|
||||
// Primary: match by branch name
|
||||
const byBranch = prs.filter((pr) => pr.headRefName && branchPat.test(pr.headRefName));
|
||||
if (byBranch.length > 0) return byBranch;
|
||||
|
||||
// Fallback: word-boundary match in title/body
|
||||
return prs.filter((pr) => titlePat.test(pr.title) || titlePat.test(pr.body ?? ""));
|
||||
} catch { return []; }
|
||||
}
|
||||
|
||||
async ensureLabel(name: string, color: string): Promise<void> {
|
||||
try { await this.gh(["label", "create", name, "--color", color.replace(/^#/, "")]); }
|
||||
catch (err) { if (!(err as Error).message?.includes("already exists")) throw err; }
|
||||
@@ -102,6 +130,17 @@ export class GitHubProvider implements IssueProvider {
|
||||
await this.gh(args);
|
||||
}
|
||||
|
||||
async addLabel(issueId: number, label: string): Promise<void> {
|
||||
await this.gh(["issue", "edit", String(issueId), "--add-label", label]);
|
||||
}
|
||||
|
||||
async removeLabels(issueId: number, labels: string[]): Promise<void> {
|
||||
if (labels.length === 0) return;
|
||||
const args = ["issue", "edit", String(issueId)];
|
||||
for (const l of labels) args.push("--remove-label", l);
|
||||
await this.gh(args);
|
||||
}
|
||||
|
||||
async closeIssue(issueId: number): Promise<void> { await this.gh(["issue", "close", String(issueId)]); }
|
||||
async reopenIssue(issueId: number): Promise<void> { await this.gh(["issue", "reopen", String(issueId)]); }
|
||||
|
||||
@@ -113,52 +152,48 @@ export class GitHubProvider implements IssueProvider {
|
||||
}
|
||||
|
||||
async hasMergedMR(issueId: number): Promise<boolean> {
|
||||
try {
|
||||
const raw = await this.gh(["pr", "list", "--state", "merged", "--json", "title,body"]);
|
||||
const prs = JSON.parse(raw) as Array<{ title: string; body: string }>;
|
||||
const pat = `#${issueId}`;
|
||||
return prs.some((pr) => pr.title.includes(pat) || (pr.body ?? "").includes(pat));
|
||||
} catch { return false; }
|
||||
const prs = await this.findPrsForIssue(issueId, "merged", "title,body,headRefName");
|
||||
return prs.length > 0;
|
||||
}
|
||||
|
||||
async getMergedMRUrl(issueId: number): Promise<string | null> {
|
||||
try {
|
||||
const raw = await this.gh(["pr", "list", "--state", "merged", "--json", "number,title,body,url,mergedAt", "--limit", "20"]);
|
||||
const prs = JSON.parse(raw) as Array<{ number: number; title: string; body: string; url: string; mergedAt: string }>;
|
||||
const pat = `#${issueId}`;
|
||||
return prs.find((pr) => pr.title.includes(pat) || (pr.body ?? "").includes(pat))?.url ?? null;
|
||||
} catch { return null; }
|
||||
type MergedPr = { title: string; body: string; headRefName: string; url: string; mergedAt: string };
|
||||
const prs = await this.findPrsForIssue<MergedPr>(issueId, "merged", "title,body,headRefName,url,mergedAt");
|
||||
if (prs.length === 0) return null;
|
||||
prs.sort((a, b) => new Date(b.mergedAt).getTime() - new Date(a.mergedAt).getTime());
|
||||
return prs[0].url;
|
||||
}
|
||||
|
||||
async getPrStatus(issueId: number): Promise<PrStatus> {
|
||||
const pat = `#${issueId}`;
|
||||
// Check open PRs first
|
||||
try {
|
||||
const raw = await this.gh(["pr", "list", "--state", "open", "--json", "title,body,url,reviewDecision", "--limit", "20"]);
|
||||
const prs = JSON.parse(raw) as Array<{ title: string; body: string; url: string; reviewDecision: string }>;
|
||||
const pr = prs.find((p) => p.title.includes(pat) || (p.body ?? "").includes(pat));
|
||||
if (pr) {
|
||||
const state = pr.reviewDecision === "APPROVED" ? PrState.APPROVED : PrState.OPEN;
|
||||
return { state, url: pr.url };
|
||||
}
|
||||
} catch { /* continue to merged check */ }
|
||||
type OpenPr = { title: string; body: string; headRefName: string; url: string; reviewDecision: string };
|
||||
const open = await this.findPrsForIssue<OpenPr>(issueId, "open", "title,body,headRefName,url,reviewDecision");
|
||||
if (open.length > 0) {
|
||||
const pr = open[0];
|
||||
const state = pr.reviewDecision === "APPROVED" ? PrState.APPROVED : PrState.OPEN;
|
||||
return { state, url: pr.url };
|
||||
}
|
||||
// Check merged PRs
|
||||
try {
|
||||
const raw = await this.gh(["pr", "list", "--state", "merged", "--json", "title,body,url", "--limit", "20"]);
|
||||
const prs = JSON.parse(raw) as Array<{ title: string; body: string; url: string }>;
|
||||
const pr = prs.find((p) => p.title.includes(pat) || (p.body ?? "").includes(pat));
|
||||
if (pr) return { state: PrState.MERGED, url: pr.url };
|
||||
} catch { /* ignore */ }
|
||||
type MergedPr = { title: string; body: string; headRefName: string; url: string };
|
||||
const merged = await this.findPrsForIssue<MergedPr>(issueId, "merged", "title,body,headRefName,url");
|
||||
if (merged.length > 0) return { state: PrState.MERGED, url: merged[0].url };
|
||||
return { state: PrState.CLOSED, url: null };
|
||||
}
|
||||
|
||||
async mergePr(issueId: number): Promise<void> {
|
||||
const pat = `#${issueId}`;
|
||||
const raw = await this.gh(["pr", "list", "--state", "open", "--json", "number,title,body,url", "--limit", "20"]);
|
||||
const prs = JSON.parse(raw) as Array<{ number: number; title: string; body: string; url: string }>;
|
||||
const pr = prs.find((p) => p.title.includes(pat) || (p.body ?? "").includes(pat));
|
||||
if (!pr) throw new Error(`No open PR found for issue #${issueId}`);
|
||||
await this.gh(["pr", "merge", pr.url, "--merge"]);
|
||||
type OpenPr = { title: string; body: string; headRefName: string; url: string };
|
||||
const prs = await this.findPrsForIssue<OpenPr>(issueId, "open", "title,body,headRefName,url");
|
||||
if (prs.length === 0) throw new Error(`No open PR found for issue #${issueId}`);
|
||||
await this.gh(["pr", "merge", prs[0].url, "--merge"]);
|
||||
}
|
||||
|
||||
async getPrDiff(issueId: number): Promise<string | null> {
|
||||
type OpenPr = { title: string; body: string; headRefName: string; number: number };
|
||||
const prs = await this.findPrsForIssue<OpenPr>(issueId, "open", "title,body,headRefName,number");
|
||||
if (prs.length === 0) return null;
|
||||
try {
|
||||
return await this.gh(["pr", "diff", String(prs[0].number)]);
|
||||
} catch { return null; }
|
||||
}
|
||||
|
||||
async addComment(issueId: number, body: string): Promise<void> {
|
||||
|
||||
@@ -18,6 +18,16 @@ import {
|
||||
type WorkflowConfig,
|
||||
} from "../workflow.js";
|
||||
|
||||
type GitLabMR = {
|
||||
iid: number;
|
||||
title: string;
|
||||
description: string;
|
||||
web_url: string;
|
||||
state: string;
|
||||
merged_at: string | null;
|
||||
approved_by?: Array<unknown>;
|
||||
};
|
||||
|
||||
export class GitLabProvider implements IssueProvider {
|
||||
private repoPath: string;
|
||||
private workflow: WorkflowConfig;
|
||||
@@ -34,6 +44,15 @@ export class GitLabProvider implements IssueProvider {
|
||||
});
|
||||
}
|
||||
|
||||
/** Get MRs linked to an issue via GitLab's native related_merge_requests API. */
|
||||
private async getRelatedMRs(issueId: number): Promise<GitLabMR[]> {
|
||||
try {
|
||||
const raw = await this.glab(["api", `projects/:id/issues/${issueId}/related_merge_requests`, "--paginate"]);
|
||||
if (!raw) return [];
|
||||
return JSON.parse(raw) as GitLabMR[];
|
||||
} catch { return []; }
|
||||
}
|
||||
|
||||
async ensureLabel(name: string, color: string): Promise<void> {
|
||||
try { await this.glab(["label", "create", "--name", name, "--color", color]); }
|
||||
catch (err) { const msg = (err as Error).message ?? ""; if (!msg.includes("already exists") && !msg.includes("409")) throw err; }
|
||||
@@ -96,6 +115,17 @@ export class GitLabProvider implements IssueProvider {
|
||||
await this.glab(args);
|
||||
}
|
||||
|
||||
async addLabel(issueId: number, label: string): Promise<void> {
|
||||
await this.glab(["issue", "update", String(issueId), "--label", label]);
|
||||
}
|
||||
|
||||
async removeLabels(issueId: number, labels: string[]): Promise<void> {
|
||||
if (labels.length === 0) return;
|
||||
const args = ["issue", "update", String(issueId)];
|
||||
for (const l of labels) args.push("--unlabel", l);
|
||||
await this.glab(args);
|
||||
}
|
||||
|
||||
async closeIssue(issueId: number): Promise<void> { await this.glab(["issue", "close", String(issueId)]); }
|
||||
async reopenIssue(issueId: number): Promise<void> { await this.glab(["issue", "reopen", String(issueId)]); }
|
||||
|
||||
@@ -107,55 +137,56 @@ export class GitLabProvider implements IssueProvider {
|
||||
}
|
||||
|
||||
async hasMergedMR(issueId: number): Promise<boolean> {
|
||||
try {
|
||||
const raw = await this.glab(["mr", "list", "--output", "json", "--state", "merged"]);
|
||||
const mrs = JSON.parse(raw) as Array<{ title: string; description: string }>;
|
||||
const pat = `#${issueId}`;
|
||||
return mrs.some((mr) => mr.title.includes(pat) || (mr.description ?? "").includes(pat));
|
||||
} catch { return false; }
|
||||
const mrs = await this.getRelatedMRs(issueId);
|
||||
return mrs.some((mr) => mr.state === "merged");
|
||||
}
|
||||
|
||||
async getMergedMRUrl(issueId: number): Promise<string | null> {
|
||||
try {
|
||||
const raw = await this.glab(["mr", "list", "--output", "json", "--state", "merged"]);
|
||||
const mrs = JSON.parse(raw) as Array<{ iid: number; title: string; description: string; web_url: string; merged_at: string }>;
|
||||
const pat = `#${issueId}`;
|
||||
const mr = mrs
|
||||
.filter((mr) => mr.title.includes(pat) || (mr.description ?? "").includes(pat))
|
||||
.sort((a, b) => new Date(b.merged_at).getTime() - new Date(a.merged_at).getTime())[0];
|
||||
return mr?.web_url ?? null;
|
||||
} catch { return null; }
|
||||
const mrs = await this.getRelatedMRs(issueId);
|
||||
const merged = mrs
|
||||
.filter((mr) => mr.state === "merged" && mr.merged_at)
|
||||
.sort((a, b) => new Date(b.merged_at!).getTime() - new Date(a.merged_at!).getTime());
|
||||
return merged[0]?.web_url ?? null;
|
||||
}
|
||||
|
||||
async getPrStatus(issueId: number): Promise<PrStatus> {
|
||||
const pat = `#${issueId}`;
|
||||
const mrs = await this.getRelatedMRs(issueId);
|
||||
// Check open MRs first
|
||||
try {
|
||||
const raw = await this.glab(["mr", "list", "--output", "json", "--state", "opened"]);
|
||||
const mrs = JSON.parse(raw) as Array<{ title: string; description: string; web_url: string; approved_by?: Array<unknown> }>;
|
||||
const mr = mrs.find((m) => m.title.includes(pat) || (m.description ?? "").includes(pat));
|
||||
if (mr) {
|
||||
const state = mr.approved_by && mr.approved_by.length > 0 ? PrState.APPROVED : PrState.OPEN;
|
||||
return { state, url: mr.web_url };
|
||||
}
|
||||
} catch { /* continue to merged check */ }
|
||||
const open = mrs.find((mr) => mr.state === "opened");
|
||||
if (open) {
|
||||
// related_merge_requests doesn't populate approved_by — use dedicated approvals endpoint
|
||||
const approved = await this.isMrApproved(open.iid);
|
||||
return { state: approved ? PrState.APPROVED : PrState.OPEN, url: open.web_url };
|
||||
}
|
||||
// Check merged MRs
|
||||
try {
|
||||
const raw = await this.glab(["mr", "list", "--output", "json", "--state", "merged"]);
|
||||
const mrs = JSON.parse(raw) as Array<{ title: string; description: string; web_url: string }>;
|
||||
const mr = mrs.find((m) => m.title.includes(pat) || (m.description ?? "").includes(pat));
|
||||
if (mr) return { state: PrState.MERGED, url: mr.web_url };
|
||||
} catch { /* ignore */ }
|
||||
const merged = mrs.find((mr) => mr.state === "merged");
|
||||
if (merged) return { state: PrState.MERGED, url: merged.web_url };
|
||||
return { state: PrState.CLOSED, url: null };
|
||||
}
|
||||
|
||||
/** Check if an MR is approved via the dedicated approvals endpoint. */
|
||||
private async isMrApproved(mrIid: number): Promise<boolean> {
|
||||
try {
|
||||
const raw = await this.glab(["api", `projects/:id/merge_requests/${mrIid}/approvals`]);
|
||||
const data = JSON.parse(raw) as { approved?: boolean; approvals_left?: number };
|
||||
return data.approved === true || (data.approvals_left ?? 1) === 0;
|
||||
} catch { return false; }
|
||||
}
|
||||
|
||||
async mergePr(issueId: number): Promise<void> {
|
||||
const pat = `#${issueId}`;
|
||||
const raw = await this.glab(["mr", "list", "--output", "json", "--state", "opened"]);
|
||||
const mrs = JSON.parse(raw) as Array<{ iid: number; title: string; description: string }>;
|
||||
const mr = mrs.find((m) => m.title.includes(pat) || (m.description ?? "").includes(pat));
|
||||
if (!mr) throw new Error(`No open MR found for issue #${issueId}`);
|
||||
await this.glab(["mr", "merge", String(mr.iid)]);
|
||||
const mrs = await this.getRelatedMRs(issueId);
|
||||
const open = mrs.find((mr) => mr.state === "opened");
|
||||
if (!open) throw new Error(`No open MR found for issue #${issueId}`);
|
||||
await this.glab(["mr", "merge", String(open.iid)]);
|
||||
}
|
||||
|
||||
async getPrDiff(issueId: number): Promise<string | null> {
|
||||
const mrs = await this.getRelatedMRs(issueId);
|
||||
const open = mrs.find((mr) => mr.state === "opened");
|
||||
if (!open) return null;
|
||||
try {
|
||||
return await this.glab(["mr", "diff", String(open.iid)]);
|
||||
} catch { return null; }
|
||||
}
|
||||
|
||||
async addComment(issueId: number, body: string): Promise<void> {
|
||||
|
||||
@@ -54,6 +54,8 @@ export interface IssueProvider {
|
||||
getIssue(issueId: number): Promise<Issue>;
|
||||
listComments(issueId: number): Promise<IssueComment[]>;
|
||||
transitionLabel(issueId: number, from: StateLabel, to: StateLabel): Promise<void>;
|
||||
addLabel(issueId: number, label: string): Promise<void>;
|
||||
removeLabels(issueId: number, labels: string[]): Promise<void>;
|
||||
closeIssue(issueId: number): Promise<void>;
|
||||
reopenIssue(issueId: number): Promise<void>;
|
||||
hasStateLabel(issue: Issue, expected: StateLabel): boolean;
|
||||
@@ -62,6 +64,7 @@ export interface IssueProvider {
|
||||
getMergedMRUrl(issueId: number): Promise<string | null>;
|
||||
getPrStatus(issueId: number): Promise<PrStatus>;
|
||||
mergePr(issueId: number): Promise<void>;
|
||||
getPrDiff(issueId: number): Promise<string | null>;
|
||||
addComment(issueId: number, body: string): Promise<void>;
|
||||
healthCheck(): Promise<boolean>;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user