cfd38d82fc
* refactor delegation system and add PR summary comments Delegation system: - replace mode-based delegation with select_mode → delegate two-step flow - orchestrator crafts self-contained subagent prompts (clean context — no system/repo/event instructions leak) - add role-based tool filtering via FastMCP authenticate hook (?role=subagent hides orchestrator-only tools) - add select_mode tool for orchestrator guidance per mode - add ask_question tool for lightweight research subagents - extract shared subagent lifecycle into subagent.ts (create, complete, stdout, instructions) - route set_output to per-subagent state when activeSubagentId is set - track per-subagent state (SubagentState Map) replacing boolean delegationActive flag - capture and aggregate AgentUsage across all agents (claude, codex, gemini, opencode) - write usage summary table to GitHub job summary - block built-in subagent spawning (Task for Claude, Task(*) for Cursor) - increase activity timeout from 60s to 300s (subagent thinking phases) - fix gh CLI misguidance in system prompt — explicitly forbid usage PR summary comments: - add prSummaryComment trigger (DB schema + migrations + Zod + UI toggle) - dispatch mini-effort summary job alongside PR review on pr.created - add update_pull_request_body MCP tool - add defaultEffort option to webhook dispatch Hardening: - rewrite delegate/selectMode tests with simulated state management - add toolFiltering.test.ts for role extraction, canAccess, set_output routing - remove non-null assertions for PULLFROG_TEMP_DIR (proper error throws) - use fetchWithRetry for direct tarball downloads - DRY fix for rate limit check in test runner Co-authored-by: Cursor <cursoragent@cursor.com> * fix: add type keyword to Effort import in handleWebhook.ts Co-authored-by: Cursor <cursoragent@cursor.com> * clean up delegation system, improve code quality across the codebase - simplify delegate tool to instructions + effort params with subagent lifecycle in subagent.ts - add select_mode and ask_question orchestrator-only tools with canAccess filtering - replace delegate.test.ts/selectMode.test.ts with toolFiltering.test.ts (live MCP integration) - add set_output routing for subagent context and AgentUsage tracking across all agents - add PR summary comment trigger (schema, UI, webhook dispatch with silent flag) - add update_pull_request_body MCP tool - fix changed-agents.sh to always include claude canary for non-agent action changes - fix cursor pagination bug in getSelectedInstallationReposPage - remove destructuring patterns, inline type definitions, and unsafe type casts - replace non-null assertions with explicit checks in install.ts - convert multi-param functions to single param objects (postCleanup, runActionLocal, etc.) - use isHttpError helper in API routes instead of catch-any patterns - add adhoc test fixtures for delegation scenarios (context isolation, error handling, synthesis, etc.) Co-authored-by: Cursor <cursoragent@cursor.com> * no subagent mutation, one mcp per subagent * address review feedback: parallel-safe usage tracking, subagent isolation, minor improvements * fix subagent state isolation: replace Object.freeze with shallow copy Object.freeze throws TypeErrors when subagent tools (checkout_pr, report_progress) write scalar properties to toolState. A shallow copy achieves the same isolation for scalar fields while allowing tools to work normally. Shared references (subagents Map, usageEntries array) remain shared for coordination. --------- Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: pullfrog[bot] <226033991+pullfrog[bot]@users.noreply.github.com>
181 lines
6.4 KiB
TypeScript
181 lines
6.4 KiB
TypeScript
import { LEAPING_INTO_ACTION_PREFIX } from "../mcp/comment.ts";
|
|
import { buildPullfrogFooter } from "./buildPullfrogFooter.ts";
|
|
import { log } from "./cli.ts";
|
|
import { createOctokit, parseRepoContext } from "./github.ts";
|
|
import { type ResolvedPromptInput, resolvePromptInput } from "./payload.ts";
|
|
import { getJobToken } from "./token.ts";
|
|
|
|
type JsonPromptInput = Extract<ResolvedPromptInput, object>; // not string
|
|
|
|
// controls whether the script should check the reason for the workflow termination.
|
|
// it can be either canceled or failed.
|
|
// YAML file cannot supply it (not in ENV), so an extra request is required to check it.
|
|
const SHOULD_CHECK_REASON = true;
|
|
|
|
type BuildErrorCommentBodyParams = {
|
|
owner: string;
|
|
repo: string;
|
|
runId: string | undefined;
|
|
isCancellation: boolean;
|
|
};
|
|
|
|
function buildErrorCommentBody(params: BuildErrorCommentBodyParams): string {
|
|
const workflowRunLink = params.runId
|
|
? `[workflow run logs](https://github.com/${params.owner}/${params.repo}/actions/runs/${params.runId})`
|
|
: "workflow run logs";
|
|
const errorMessage = params.isCancellation
|
|
? `This run was cancelled 🛑\n\nThe workflow was cancelled before completion. Please check the ${workflowRunLink} for details.`
|
|
: `This run croaked 😵\n\nThe workflow encountered an error before any progress could be reported. Please check the ${workflowRunLink} for details.`;
|
|
const footer = buildPullfrogFooter({
|
|
triggeredBy: true,
|
|
workflowRun: params.runId
|
|
? { owner: params.owner, repo: params.repo, runId: params.runId }
|
|
: undefined,
|
|
});
|
|
return `${errorMessage}${footer}`;
|
|
}
|
|
|
|
type ValidateStuckCommentParams = {
|
|
promptInput: JsonPromptInput | null;
|
|
octokit: ReturnType<typeof createOctokit>;
|
|
owner: string;
|
|
repo: string;
|
|
};
|
|
async function validateStuckProgressComment(
|
|
params: ValidateStuckCommentParams
|
|
): Promise<number | null> {
|
|
if (!params.promptInput?.progressCommentId) {
|
|
log.info("[post] no progressCommentId in prompt input, skipping cleanup");
|
|
return null;
|
|
}
|
|
|
|
const commentId = parseInt(params.promptInput.progressCommentId, 10);
|
|
log.info(`[post] validating progressCommentId from prompt input: ${commentId}`);
|
|
|
|
try {
|
|
const commentResult = await params.octokit.rest.issues.getComment({
|
|
owner: params.owner,
|
|
repo: params.repo,
|
|
comment_id: commentId,
|
|
});
|
|
|
|
if (commentResult.data.body?.startsWith(LEAPING_INTO_ACTION_PREFIX)) {
|
|
log.info(`[post] comment ${commentId} is stuck on "Leaping into action"`);
|
|
return commentId;
|
|
}
|
|
|
|
log.info(`[post] comment ${commentId} is not stuck (already updated or different content)`);
|
|
return null;
|
|
} catch (error) {
|
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
log.info(`[post] failed to get comment ${commentId}: ${errorMessage}`);
|
|
return null;
|
|
}
|
|
}
|
|
|
|
type GetIsCancelledParams = {
|
|
repoContext: ReturnType<typeof parseRepoContext>;
|
|
octokit: ReturnType<typeof createOctokit>;
|
|
runIdStr: string | undefined;
|
|
};
|
|
|
|
async function getIsCancelled(params: GetIsCancelledParams): Promise<boolean> {
|
|
if (!params.runIdStr) return false; // can't check without a run ID — assume failure
|
|
try {
|
|
const jobsResult = await params.octokit.rest.actions.listJobsForWorkflowRun({
|
|
owner: params.repoContext.owner,
|
|
repo: params.repoContext.name,
|
|
run_id: Number.parseInt(params.runIdStr, 10),
|
|
});
|
|
|
|
// find current job by matching GITHUB_JOB env var.
|
|
// GITHUB_JOB is the job ID (yaml key), but job.name is the display name.
|
|
// for matrix jobs, the name includes matrix values like "build (ubuntu-latest, node-18)"
|
|
// so we match jobs that START with the job ID
|
|
const currentJobName = process.env.GITHUB_JOB;
|
|
const currentJob = currentJobName
|
|
? jobsResult.data.jobs.find(
|
|
(j) => j.name === currentJobName || j.name.startsWith(`${currentJobName} (`)
|
|
)
|
|
: jobsResult.data.jobs[0]; // fallback to first job
|
|
|
|
if (!currentJob) {
|
|
log.warning("[post] could not find current job");
|
|
return false;
|
|
}
|
|
|
|
log.info(`[post] job status: ${currentJob.status}, conclusion: ${currentJob.conclusion}`);
|
|
if (currentJob.conclusion === "cancelled") return true; // whole job explicit cancellation
|
|
|
|
// but if it's still null, check steps for cancellation:
|
|
const cancelledStep = currentJob.steps?.find((step) => step.conclusion === "cancelled");
|
|
if (cancelledStep) {
|
|
log.info(`[post] found cancelled step: ${cancelledStep.name}`);
|
|
return true;
|
|
}
|
|
log.info("[post] no cancellation found, assuming failure");
|
|
} catch (error) {
|
|
log.info(
|
|
`[post] failed to get job status: ${error instanceof Error ? error.message : String(error)}`
|
|
);
|
|
}
|
|
return false; // assuming failure
|
|
}
|
|
|
|
export async function runPostCleanup(): Promise<void> {
|
|
log.info("» [post] starting post cleanup");
|
|
|
|
const runIdStr = process.env.GITHUB_RUN_ID;
|
|
|
|
// resolve prompt input once and use it for both issue number and comment ID extraction
|
|
// only use the object form (JSON payload), not plain string prompts
|
|
let promptInput: JsonPromptInput | null = null;
|
|
try {
|
|
const resolved = resolvePromptInput();
|
|
if (typeof resolved !== "string") promptInput = resolved;
|
|
} catch (error) {
|
|
log.info(
|
|
`[post] failed to resolve prompt input: ${error instanceof Error ? error.message : String(error)}`
|
|
);
|
|
}
|
|
|
|
// get job token for API calls
|
|
const token = getJobToken();
|
|
const repoContext = parseRepoContext();
|
|
const octokit = createOctokit(token);
|
|
|
|
const commentId = await validateStuckProgressComment({
|
|
promptInput,
|
|
octokit,
|
|
owner: repoContext.owner,
|
|
repo: repoContext.name,
|
|
});
|
|
|
|
if (!commentId) return log.info("» [post] no stuck progress comment to update, skipping cleanup");
|
|
|
|
log.info(`» [post] validated stuck comment: ${commentId}, updating with error message`);
|
|
|
|
try {
|
|
const body = buildErrorCommentBody({
|
|
owner: repoContext.owner,
|
|
repo: repoContext.name,
|
|
runId: runIdStr,
|
|
isCancellation: SHOULD_CHECK_REASON
|
|
? await getIsCancelled({ octokit, repoContext, runIdStr })
|
|
: false,
|
|
});
|
|
|
|
await octokit.rest.issues.updateComment({
|
|
owner: repoContext.owner,
|
|
repo: repoContext.name,
|
|
comment_id: commentId,
|
|
body,
|
|
});
|
|
|
|
log.info("» [post] successfully updated progress comment");
|
|
} catch (error) {
|
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
log.info(`[post] failed to update comment: ${errorMessage}`);
|
|
}
|
|
}
|