c456fae716
* Standardize on top-level `triggerer` property - Rename `triggeringUser` → `triggerer` as the single top-level payload property - Remove redundant `triggerer` from `FixReviewEvent`, add `approvedOnly` boolean - Auto-apply `approved_by` filtering in `get_review_comments` when `approvedOnly` is set - Auto-assign created PRs to the triggerer - Simplify `AddressReviews` mode prompt - Accept both `triggerer` and `triggeringUser` in schema for backward compat * Address review feedback: simplify approved_only, remove addAssignees, drop approved_by param * Fix formatting in `action/mcp/pr.ts` * re-add triggeringUser backward-compat fallback in payload schema * auto-assign created PRs to the triggerer * Revert "auto-assign created PRs to the triggerer" This reverts commit c088c425fea33793eb299a001ffd253798d2c674. * Revert "re-add triggeringUser backward-compat fallback in payload schema" This reverts commit ae5b3cb3f1377cd4a634b2d48962c785c31013f3. * backend compat * tweak prompt to ensure compat * Address review feedback * chore: remove triggeringUser fallback --------- Co-authored-by: pullfrog[bot] <226033991+pullfrog[bot]@users.noreply.github.com> Co-authored-by: Mateusz Burzyński <mateuszburzynski@gmail.com> Co-authored-by: Colin McDonnell <colinmcd94@gmail.com>
108 lines
3.6 KiB
TypeScript
108 lines
3.6 KiB
TypeScript
import { type } from "arktype";
|
|
import { buildPullfrogFooter, stripExistingFooter } from "../utils/buildPullfrogFooter.ts";
|
|
import { log } from "../utils/cli.ts";
|
|
import { $ } from "../utils/shell.ts";
|
|
import type { ToolContext } from "./server.ts";
|
|
import { execute, tool } from "./shared.ts";
|
|
|
|
export const PullRequest = type({
|
|
title: type.string.describe("the title of the pull request"),
|
|
body: type.string.describe("the body content of the pull request"),
|
|
base: type.string.describe("the base branch to merge into (e.g., 'main')"),
|
|
"draft?": type.boolean.describe(
|
|
"if true, create the pull request as a draft. use when the user explicitly asks for a draft PR."
|
|
),
|
|
});
|
|
|
|
function buildPrBodyWithFooter(ctx: ToolContext, body: string): string {
|
|
const footer = buildPullfrogFooter({
|
|
triggeredBy: true,
|
|
agent: { displayName: ctx.agent.displayName, url: ctx.agent.url },
|
|
workflowRun: ctx.runId
|
|
? { owner: ctx.repo.owner, repo: ctx.repo.name, runId: ctx.runId, jobId: ctx.jobId }
|
|
: undefined,
|
|
});
|
|
|
|
const bodyWithoutFooter = stripExistingFooter(body);
|
|
return `${bodyWithoutFooter}${footer}`;
|
|
}
|
|
|
|
export const UpdatePullRequestBody = type({
|
|
pull_number: type.number.describe("the pull request number to update"),
|
|
body: type.string.describe("the new body content for the pull request"),
|
|
});
|
|
|
|
export function UpdatePullRequestBodyTool(ctx: ToolContext) {
|
|
return tool({
|
|
name: "update_pull_request_body",
|
|
description: "Update the body/description of an existing pull request",
|
|
parameters: UpdatePullRequestBody,
|
|
execute: execute(async (params) => {
|
|
const bodyWithFooter = buildPrBodyWithFooter(ctx, params.body);
|
|
|
|
const result = await ctx.octokit.rest.pulls.update({
|
|
owner: ctx.repo.owner,
|
|
repo: ctx.repo.name,
|
|
pull_number: params.pull_number,
|
|
body: bodyWithFooter,
|
|
});
|
|
|
|
return {
|
|
success: true,
|
|
number: result.data.number,
|
|
url: result.data.html_url,
|
|
};
|
|
}),
|
|
});
|
|
}
|
|
|
|
export function CreatePullRequestTool(ctx: ToolContext) {
|
|
return tool({
|
|
name: "create_pull_request",
|
|
description: "Create a pull request from the current branch",
|
|
parameters: PullRequest,
|
|
execute: execute(async (params) => {
|
|
const currentBranch = $("git", ["rev-parse", "--abbrev-ref", "HEAD"], { log: false });
|
|
log.debug(`Current branch: ${currentBranch}`);
|
|
|
|
const bodyWithFooter = buildPrBodyWithFooter(ctx, params.body);
|
|
|
|
const result = await ctx.octokit.rest.pulls.create({
|
|
owner: ctx.repo.owner,
|
|
repo: ctx.repo.name,
|
|
title: params.title,
|
|
body: bodyWithFooter,
|
|
head: currentBranch,
|
|
base: params.base,
|
|
draft: params.draft ?? false,
|
|
});
|
|
|
|
// best-effort: request review from the user who triggered the workflow
|
|
const reviewer = ctx.payload.triggerer;
|
|
if (reviewer) {
|
|
try {
|
|
log.debug(`requesting review from ${reviewer} on PR #${result.data.number}`);
|
|
await ctx.octokit.rest.pulls.requestReviewers({
|
|
owner: ctx.repo.owner,
|
|
repo: ctx.repo.name,
|
|
pull_number: result.data.number,
|
|
reviewers: [reviewer],
|
|
});
|
|
} catch {
|
|
log.info(`failed to request review from ${reviewer} on PR #${result.data.number}`);
|
|
}
|
|
}
|
|
|
|
return {
|
|
success: true,
|
|
pullRequestId: result.data.id,
|
|
number: result.data.number,
|
|
url: result.data.html_url,
|
|
title: result.data.title,
|
|
head: result.data.head.ref,
|
|
base: result.data.base.ref,
|
|
};
|
|
}),
|
|
});
|
|
}
|