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>
357 lines
9.7 KiB
TypeScript
357 lines
9.7 KiB
TypeScript
/**
|
|
* Logging utilities that work well in both local and GitHub Actions environments
|
|
*/
|
|
|
|
import * as core from "@actions/core";
|
|
import { table } from "table";
|
|
import type { AgentUsage } from "../agents/shared.ts";
|
|
import { isGitHubActions, isInsideDocker } from "./globals.ts";
|
|
|
|
const isRunnerDebugEnabled = () => core.isDebug();
|
|
|
|
const isLocalDebugEnabled = () =>
|
|
process.env.LOG_LEVEL === "debug" || process.env.ACTIONS_STEP_DEBUG === "true";
|
|
|
|
const isDebugEnabled = () => isLocalDebugEnabled() || isRunnerDebugEnabled();
|
|
|
|
/** timestamp prefix for debug mode — empty string when debug is off */
|
|
function ts(): string {
|
|
return isDebugEnabled() ? `[${new Date().toISOString()}] ` : "";
|
|
}
|
|
|
|
/**
|
|
* Format arguments into a single string for logging
|
|
*/
|
|
function formatArgs(args: unknown[]): string {
|
|
return args
|
|
.map((arg) => {
|
|
if (typeof arg === "string") return arg;
|
|
if (arg instanceof Error) return `${arg.message}\n${arg.stack}`;
|
|
return JSON.stringify(arg);
|
|
})
|
|
.join(" ");
|
|
}
|
|
|
|
/**
|
|
* Start a collapsed group (GitHub Actions) or regular group (local)
|
|
*/
|
|
function startGroup(name: string): void {
|
|
if (isGitHubActions) {
|
|
core.startGroup(name);
|
|
} else {
|
|
console.group(name);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* End a collapsed group
|
|
*/
|
|
function endGroup(): void {
|
|
if (isGitHubActions) {
|
|
core.endGroup();
|
|
} else {
|
|
console.groupEnd();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Run a callback within a collapsed group
|
|
*/
|
|
function group(name: string, fn: () => void): void {
|
|
startGroup(name);
|
|
fn();
|
|
endGroup();
|
|
}
|
|
|
|
/**
|
|
* Print a formatted box with text (for console output)
|
|
*/
|
|
function boxString(
|
|
text: string,
|
|
options?: {
|
|
title?: string;
|
|
maxWidth?: number;
|
|
indent?: string;
|
|
padding?: number;
|
|
}
|
|
): string {
|
|
const { title, maxWidth = 80, indent = "", padding = 1 } = options || {};
|
|
|
|
const lines = text.trim().split("\n");
|
|
const wrappedLines: string[] = [];
|
|
|
|
for (const line of lines) {
|
|
if (line.length <= maxWidth - padding * 2) {
|
|
wrappedLines.push(line);
|
|
} else {
|
|
const words = line.split(" ");
|
|
let currentLine = "";
|
|
|
|
for (const word of words) {
|
|
const testLine = currentLine ? `${currentLine} ${word}` : word;
|
|
if (testLine.length <= maxWidth - padding * 2) {
|
|
currentLine = testLine;
|
|
} else {
|
|
if (currentLine) {
|
|
wrappedLines.push(currentLine);
|
|
currentLine = "";
|
|
}
|
|
// wrap long words by breaking them into chunks
|
|
const maxLineLength = maxWidth - padding * 2;
|
|
let remainingWord = word;
|
|
while (remainingWord.length > maxLineLength) {
|
|
wrappedLines.push(remainingWord.substring(0, maxLineLength));
|
|
remainingWord = remainingWord.substring(maxLineLength);
|
|
}
|
|
currentLine = remainingWord;
|
|
}
|
|
}
|
|
|
|
if (currentLine) {
|
|
wrappedLines.push(currentLine);
|
|
}
|
|
}
|
|
}
|
|
|
|
const maxLineLength = Math.max(...wrappedLines.map((line) => line.length));
|
|
const contentBoxWidth = maxLineLength + padding * 2;
|
|
|
|
// ensure box width is at least as wide as the title line when title exists
|
|
const titleLineLength = title ? ` ${title} `.length : 0;
|
|
const boxWidth = Math.max(contentBoxWidth, titleLineLength);
|
|
|
|
let result = "";
|
|
|
|
if (title) {
|
|
const titleLine = ` ${title} `;
|
|
const titlePadding = Math.max(0, boxWidth - titleLine.length);
|
|
result += `${indent}┌${titleLine}${"─".repeat(titlePadding)}┐\n`;
|
|
}
|
|
|
|
if (!title) {
|
|
result += `${indent}┌${"─".repeat(boxWidth)}┐\n`;
|
|
}
|
|
|
|
for (const line of wrappedLines) {
|
|
const paddedLine = line.padEnd(maxLineLength);
|
|
result += `${indent}│${" ".repeat(padding)}${paddedLine}${" ".repeat(padding)}│\n`;
|
|
}
|
|
|
|
result += `${indent}└${"─".repeat(boxWidth)}┘`;
|
|
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Print a formatted box with text
|
|
*/
|
|
function box(
|
|
text: string,
|
|
options?: {
|
|
title?: string;
|
|
maxWidth?: number;
|
|
}
|
|
): void {
|
|
const boxContent = boxString(text, options);
|
|
core.info(boxContent);
|
|
}
|
|
|
|
/**
|
|
* Overwrite the job summary with the given text.
|
|
* Skips if:
|
|
* - Not in GitHub Actions
|
|
* - Running inside Docker (CI tests inherit host env vars but can't access host paths)
|
|
* - GITHUB_STEP_SUMMARY not set
|
|
*/
|
|
export async function writeSummary(text: string): Promise<void> {
|
|
if (!isGitHubActions) return;
|
|
|
|
// CI tests run in Docker with GITHUB_ACTIONS=true inherited from host,
|
|
// but the GITHUB_STEP_SUMMARY path points to a host filesystem location
|
|
// that doesn't exist inside the container
|
|
if (isInsideDocker) return;
|
|
|
|
if (!process.env.GITHUB_STEP_SUMMARY) return;
|
|
|
|
await core.summary.addRaw(text).write({ overwrite: true });
|
|
}
|
|
|
|
/**
|
|
* Print a formatted table using the table package
|
|
*/
|
|
function printTable(
|
|
rows: Array<Array<{ data: string; header?: boolean } | string>>,
|
|
options?: {
|
|
title?: string;
|
|
}
|
|
): void {
|
|
const { title } = options || {};
|
|
|
|
// Convert rows to string arrays for the table package
|
|
const tableData = rows.map((row) =>
|
|
row.map((cell) => {
|
|
if (typeof cell === "string") {
|
|
return cell;
|
|
}
|
|
return cell.data;
|
|
})
|
|
);
|
|
|
|
const formatted = table(tableData);
|
|
|
|
if (title) {
|
|
core.info(`\n${title}`);
|
|
}
|
|
core.info(`\n${formatted}\n`);
|
|
}
|
|
|
|
/**
|
|
* Print a separator line
|
|
*/
|
|
function separator(length: number = 50): void {
|
|
const separatorText = "─".repeat(length);
|
|
core.info(separatorText);
|
|
}
|
|
|
|
/**
|
|
* Main logging utility object - import this once and access all utilities
|
|
*/
|
|
export const log = {
|
|
/** Print info message */
|
|
info: (...args: unknown[]): void => {
|
|
core.info(`${ts()}${formatArgs(args)}`);
|
|
},
|
|
|
|
/** Print a warning message. Use only for warnings that should be displayed in the job summary. */
|
|
warning: (...args: unknown[]): void => {
|
|
core.warning(`${ts()}${formatArgs(args)}`);
|
|
},
|
|
|
|
/** Print an error message. Use only for errors that should be displayed in the job summary. */
|
|
error: (...args: unknown[]): void => {
|
|
core.error(`${ts()}${formatArgs(args)}`);
|
|
},
|
|
|
|
/** Print success message */
|
|
success: (...args: unknown[]): void => {
|
|
core.info(`${ts()}» ${formatArgs(args)}`);
|
|
},
|
|
|
|
/** Print debug message (only when debug mode is enabled) */
|
|
debug: (...args: unknown[]): void => {
|
|
if (isRunnerDebugEnabled()) {
|
|
core.debug(formatArgs(args));
|
|
return;
|
|
}
|
|
if (isLocalDebugEnabled()) {
|
|
core.info(`${ts()}[DEBUG] ${formatArgs(args)}`);
|
|
}
|
|
},
|
|
|
|
/** Print a formatted box with text */
|
|
box,
|
|
|
|
/** Print a formatted table using the table package */
|
|
table: printTable,
|
|
|
|
/** Print a separator line */
|
|
separator,
|
|
|
|
/** Start a collapsed group (GitHub Actions) or regular group (local) */
|
|
startGroup,
|
|
|
|
/** End a collapsed group */
|
|
endGroup,
|
|
|
|
/** Run a callback within a collapsed group */
|
|
group,
|
|
|
|
/** Log tool call information to console with formatted output */
|
|
toolCall: ({ toolName, input }: { toolName: string; input: unknown }): void => {
|
|
const inputFormatted = formatJsonValue(input);
|
|
const output = inputFormatted !== "{}" ? `» ${toolName}(${inputFormatted})` : `» ${toolName}()`;
|
|
|
|
log.info(output.trimEnd());
|
|
},
|
|
};
|
|
|
|
/**
|
|
* Format a value as JSON, using compact format for simple values and pretty-printed for complex ones
|
|
*/
|
|
export function formatJsonValue(value: unknown): string {
|
|
const compact = JSON.stringify(value);
|
|
return compact.length > 80 || compact.includes("\n") ? JSON.stringify(value, null, 2) : compact;
|
|
}
|
|
|
|
/**
|
|
* Format a multi-line string with proper indentation for tool call output
|
|
* First line has the label, subsequent lines are indented 4 spaces
|
|
*/
|
|
export function formatIndentedField(label: string, content: string): string {
|
|
if (!content.includes("\n")) {
|
|
return ` ${label}: ${content}\n`;
|
|
}
|
|
|
|
const lines = content.split("\n");
|
|
let formatted = ` ${label}: ${lines[0]}\n`;
|
|
for (let i = 1; i < lines.length; i++) {
|
|
formatted += ` ${lines[i]}\n`;
|
|
}
|
|
return formatted;
|
|
}
|
|
|
|
/**
|
|
* format aggregated usage data as a markdown table for the GitHub step summary
|
|
*/
|
|
export function formatUsageSummary(entries: AgentUsage[]): string {
|
|
if (entries.length === 0) return "";
|
|
|
|
const hasCost = entries.some((e) => e.costUsd !== undefined);
|
|
|
|
const header = hasCost
|
|
? "| Agent | Input | Output | Cache Read | Cache Write | Cost |"
|
|
: "| Agent | Input | Output | Cache Read | Cache Write |";
|
|
|
|
const fmt = (n: number) => n.toLocaleString("en-US");
|
|
|
|
const separatorRow = hasCost
|
|
? "| --- | ---: | ---: | ---: | ---: | ---: |"
|
|
: "| --- | ---: | ---: | ---: | ---: |";
|
|
|
|
const rows = entries.map((e) => {
|
|
const base = `| ${e.agent} | ${fmt(e.inputTokens)} | ${fmt(e.outputTokens)} | ${fmt(e.cacheReadTokens ?? 0)} | ${fmt(e.cacheWriteTokens ?? 0)} |`;
|
|
return hasCost
|
|
? `${base} ${e.costUsd !== undefined ? `$${e.costUsd.toFixed(4)}` : "-"} |`
|
|
: base;
|
|
});
|
|
|
|
// totals row (only useful when there are multiple entries)
|
|
const totalsRows: string[] = [];
|
|
if (entries.length > 1) {
|
|
const totalInput = entries.reduce((sum, e) => sum + e.inputTokens, 0);
|
|
const totalOutput = entries.reduce((sum, e) => sum + e.outputTokens, 0);
|
|
const totalCacheRead = entries.reduce((sum, e) => sum + (e.cacheReadTokens ?? 0), 0);
|
|
const totalCacheWrite = entries.reduce((sum, e) => sum + (e.cacheWriteTokens ?? 0), 0);
|
|
const totalBase = `| **Total** | **${fmt(totalInput)}** | **${fmt(totalOutput)}** | **${fmt(totalCacheRead)}** | **${fmt(totalCacheWrite)}** |`;
|
|
|
|
if (hasCost) {
|
|
const totalCost = entries.reduce((sum, e) => sum + (e.costUsd ?? 0), 0);
|
|
totalsRows.push(`${totalBase} **$${totalCost.toFixed(4)}** |`);
|
|
} else {
|
|
totalsRows.push(totalBase);
|
|
}
|
|
}
|
|
|
|
return [
|
|
"<details>",
|
|
"<summary>Usage</summary>",
|
|
"",
|
|
header,
|
|
separatorRow,
|
|
...rows,
|
|
...totalsRows,
|
|
"",
|
|
"</details>",
|
|
].join("\n");
|
|
}
|